/etc/

cgit logo index : guix
Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/bootloader/u-boot.scm29
-rw-r--r--gnu/build/activation.scm87
-rw-r--r--gnu/build/file-systems.scm103
-rw-r--r--gnu/build/image.scm14
-rw-r--r--gnu/build/linux-modules.scm62
-rw-r--r--gnu/ci.scm15
-rw-r--r--gnu/compression.scm3
-rw-r--r--gnu/home/services/desktop.scm14
-rw-r--r--gnu/home/services/gnupg.scm20
-rw-r--r--gnu/home/services/music.scm63
-rw-r--r--gnu/installer.scm1
-rw-r--r--gnu/installer/parted.scm10
-rw-r--r--gnu/local.mk211
-rw-r--r--gnu/machine/ssh.scm5
-rw-r--r--gnu/packages/abiword.scm66
-rw-r--r--gnu/packages/accessibility.scm100
-rw-r--r--gnu/packages/acl.scm15
-rw-r--r--gnu/packages/admin.scm408
-rw-r--r--gnu/packages/adns.scm4
-rw-r--r--gnu/packages/agda.scm2
-rw-r--r--gnu/packages/algebra.scm6
-rw-r--r--gnu/packages/android.scm2
-rw-r--r--gnu/packages/animation.scm39
-rw-r--r--gnu/packages/apl.scm2
-rw-r--r--gnu/packages/apparmor.scm2
-rw-r--r--gnu/packages/apr.scm40
-rw-r--r--gnu/packages/arcan.scm4
-rw-r--r--gnu/packages/assembly.scm82
-rw-r--r--gnu/packages/astronomy.scm2947
-rw-r--r--gnu/packages/audio.scm326
-rw-r--r--gnu/packages/augeas.scm51
-rw-r--r--gnu/packages/authentication.scm7
-rw-r--r--gnu/packages/aux-files/emacs/comp-integrity-next.el121
-rw-r--r--gnu/packages/aux-files/linux-libre/6.10-arm.conf (renamed from gnu/packages/aux-files/linux-libre/6.8-arm.conf)202
-rw-r--r--gnu/packages/aux-files/linux-libre/6.10-arm64.conf (renamed from gnu/packages/aux-files/linux-libre/6.8-arm64.conf)246
-rw-r--r--gnu/packages/aux-files/linux-libre/6.10-i686.conf (renamed from gnu/packages/aux-files/linux-libre/6.8-i686.conf)219
-rw-r--r--gnu/packages/aux-files/linux-libre/6.10-riscv.conf8279
-rw-r--r--gnu/packages/aux-files/linux-libre/6.10-x86_64.conf (renamed from gnu/packages/aux-files/linux-libre/6.8-x86_64.conf)261
-rw-r--r--gnu/packages/aux-files/python/sitecustomize.py2
-rw-r--r--gnu/packages/axoloti.scm6
-rw-r--r--gnu/packages/backup.scm65
-rw-r--r--gnu/packages/base.scm694
-rw-r--r--gnu/packages/bdw-gc.scm4
-rw-r--r--gnu/packages/benchmark.scm11
-rw-r--r--gnu/packages/bioconductor.scm3093
-rw-r--r--gnu/packages/bioinformatics.scm1494
-rw-r--r--gnu/packages/bittorrent.scm21
-rw-r--r--gnu/packages/books.scm5
-rw-r--r--gnu/packages/boost.scm57
-rw-r--r--gnu/packages/bootloaders.scm621
-rw-r--r--gnu/packages/bootstrap.scm8
-rw-r--r--gnu/packages/bqn.scm2
-rw-r--r--gnu/packages/browser-extensions.scm16
-rw-r--r--gnu/packages/build-tools.scm79
-rw-r--r--gnu/packages/busybox.scm2
-rw-r--r--gnu/packages/c.scm110
-rw-r--r--gnu/packages/calendar.scm6
-rw-r--r--gnu/packages/cdrom.scm33
-rw-r--r--gnu/packages/certs.scm65
-rw-r--r--gnu/packages/check.scm429
-rw-r--r--gnu/packages/chez.scm10
-rw-r--r--gnu/packages/chicken.scm7
-rw-r--r--gnu/packages/chromium.scm3
-rw-r--r--gnu/packages/ci.scm17
-rw-r--r--gnu/packages/clifm.scm7
-rw-r--r--gnu/packages/cluster.scm1
-rw-r--r--gnu/packages/code.scm78
-rw-r--r--gnu/packages/commencement.scm589
-rw-r--r--gnu/packages/compression.scm172
-rw-r--r--gnu/packages/configuration-management.scm138
-rw-r--r--gnu/packages/connman.scm28
-rw-r--r--gnu/packages/containers.scm327
-rw-r--r--gnu/packages/coq.scm45
-rw-r--r--gnu/packages/cpp.scm221
-rw-r--r--gnu/packages/cran.scm2500
-rw-r--r--gnu/packages/crates-apple.scm4
-rw-r--r--gnu/packages/crates-crypto.scm1015
-rw-r--r--gnu/packages/crates-graphics.scm217
-rw-r--r--gnu/packages/crates-gtk.scm86
-rw-r--r--gnu/packages/crates-io.scm17518
-rw-r--r--gnu/packages/crates-tls.scm57
-rw-r--r--gnu/packages/crates-vcs.scm2469
-rw-r--r--gnu/packages/crates-web.scm2390
-rw-r--r--gnu/packages/crates-windows.scm282
-rw-r--r--gnu/packages/cross-base.scm100
-rw-r--r--gnu/packages/crypto.scm44
-rw-r--r--gnu/packages/cryptsetup.scm140
-rw-r--r--gnu/packages/cups.scm72
-rw-r--r--gnu/packages/curl.scm49
-rw-r--r--gnu/packages/cyrus-sasl.scm3
-rw-r--r--gnu/packages/databases.scm584
-rw-r--r--gnu/packages/dbm.scm151
-rw-r--r--gnu/packages/debian.scm165
-rw-r--r--gnu/packages/debug.scm40
-rw-r--r--gnu/packages/dezyne.scm5
-rw-r--r--gnu/packages/dico.scm4
-rw-r--r--gnu/packages/dictionaries.scm29
-rw-r--r--gnu/packages/diffoscope.scm4
-rw-r--r--gnu/packages/digest.scm11
-rw-r--r--gnu/packages/disk.scm79
-rw-r--r--gnu/packages/display-managers.scm115
-rw-r--r--gnu/packages/django.scm59
-rw-r--r--gnu/packages/djvu.scm13
-rw-r--r--gnu/packages/dlang.scm88
-rw-r--r--gnu/packages/dns.scm111
-rw-r--r--gnu/packages/docbook.scm1105
-rw-r--r--gnu/packages/docker.scm38
-rw-r--r--gnu/packages/documentation.scm83
-rw-r--r--gnu/packages/easyrpg.scm12
-rw-r--r--gnu/packages/ebook.scm12
-rw-r--r--gnu/packages/education.scm374
-rw-r--r--gnu/packages/electronics.scm41
-rw-r--r--gnu/packages/elf.scm23
-rw-r--r--gnu/packages/elixir-xyz.scm84
-rw-r--r--gnu/packages/elixir.scm174
-rw-r--r--gnu/packages/emacs-xyz.scm2859
-rw-r--r--gnu/packages/emacs.scm51
-rw-r--r--gnu/packages/embedded.scm21
-rw-r--r--gnu/packages/emulators.scm450
-rw-r--r--gnu/packages/enchant.scm36
-rw-r--r--gnu/packages/engineering.scm944
-rw-r--r--gnu/packages/enlightenment.scm10
-rw-r--r--gnu/packages/entr.scm5
-rw-r--r--gnu/packages/erlang-xyz.scm666
-rw-r--r--gnu/packages/erlang.scm255
-rw-r--r--gnu/packages/esolangs.scm2
-rw-r--r--gnu/packages/fabric-management.scm2
-rw-r--r--gnu/packages/fcitx5.scm77
-rw-r--r--gnu/packages/fediverse.scm (renamed from gnu/packages/mastodon.scm)61
-rw-r--r--gnu/packages/file-systems.scm84
-rw-r--r--gnu/packages/file.scm5
-rw-r--r--gnu/packages/finance.scm136
-rw-r--r--gnu/packages/firmware.scm331
-rw-r--r--gnu/packages/flashing-tools.scm59
-rw-r--r--gnu/packages/fonts.scm248
-rw-r--r--gnu/packages/fontutils.scm133
-rw-r--r--gnu/packages/freedesktop.scm445
-rw-r--r--gnu/packages/ftp.scm3
-rw-r--r--gnu/packages/game-development.scm276
-rw-r--r--gnu/packages/games.scm590
-rw-r--r--gnu/packages/gawk.scm24
-rw-r--r--gnu/packages/gcc.scm295
-rw-r--r--gnu/packages/gd.scm75
-rw-r--r--gnu/packages/gdb.scm2
-rw-r--r--gnu/packages/genealogy.scm7
-rw-r--r--gnu/packages/genimage.scm2
-rw-r--r--gnu/packages/geo.scm624
-rw-r--r--gnu/packages/gettext.scm28
-rw-r--r--gnu/packages/ghostscript.scm42
-rw-r--r--gnu/packages/gimp.scm6
-rw-r--r--gnu/packages/gl.scm86
-rw-r--r--gnu/packages/glib.scm27
-rw-r--r--gnu/packages/gnome-xyz.scm1
-rw-r--r--gnu/packages/gnome.scm433
-rw-r--r--gnu/packages/gnucash.scm147
-rw-r--r--gnu/packages/gnunet.scm4
-rw-r--r--gnu/packages/gnupg.scm209
-rw-r--r--gnu/packages/gnustep.scm32
-rw-r--r--gnu/packages/gnuzilla.scm396
-rw-r--r--gnu/packages/golang-build.scm919
-rw-r--r--gnu/packages/golang-check.scm563
-rw-r--r--gnu/packages/golang-compression.scm202
-rw-r--r--gnu/packages/golang-crypto.scm539
-rw-r--r--gnu/packages/golang-maths.scm126
-rw-r--r--gnu/packages/golang-web.scm3536
-rw-r--r--gnu/packages/golang-xyz.scm4123
-rw-r--r--gnu/packages/golang.scm2679
-rw-r--r--gnu/packages/gps.scm111
-rw-r--r--gnu/packages/graph.scm17
-rw-r--r--gnu/packages/graphics.scm444
-rw-r--r--gnu/packages/graphviz.scm3
-rw-r--r--gnu/packages/groff.scm15
-rw-r--r--gnu/packages/gstreamer.scm42
-rw-r--r--gnu/packages/gtk.scm347
-rw-r--r--gnu/packages/guile-wm.scm3
-rw-r--r--gnu/packages/guile-xyz.scm301
-rw-r--r--gnu/packages/guile.scm51
-rw-r--r--gnu/packages/hardware.scm24
-rw-r--r--gnu/packages/haskell-apps.scm139
-rw-r--r--gnu/packages/haskell-check.scm58
-rw-r--r--gnu/packages/haskell-crypto.scm207
-rw-r--r--gnu/packages/haskell-web.scm285
-rw-r--r--gnu/packages/haskell-xyz.scm2347
-rw-r--r--gnu/packages/haskell.scm33
-rw-r--r--gnu/packages/hexedit.scm5
-rw-r--r--gnu/packages/high-availability.scm19
-rw-r--r--gnu/packages/hunspell.scm39
-rw-r--r--gnu/packages/hurd.scm122
-rw-r--r--gnu/packages/ibus.scm34
-rw-r--r--gnu/packages/icu4c.scm21
-rw-r--r--gnu/packages/image-processing.scm89
-rw-r--r--gnu/packages/image-viewers.scm7
-rw-r--r--gnu/packages/image.scm64
-rw-r--r--gnu/packages/imagemagick.scm135
-rw-r--r--gnu/packages/inklingreader.scm2
-rw-r--r--gnu/packages/inkscape.scm302
-rw-r--r--gnu/packages/installers.scm6
-rw-r--r--gnu/packages/instrumentation.scm4
-rw-r--r--gnu/packages/ipfs.scm1037
-rw-r--r--gnu/packages/irc.scm192
-rw-r--r--gnu/packages/jami.scm48
-rw-r--r--gnu/packages/java.scm396
-rw-r--r--gnu/packages/javascript.scm4
-rw-r--r--gnu/packages/jemalloc.scm2
-rw-r--r--gnu/packages/julia-xyz.scm75
-rw-r--r--gnu/packages/julia.scm4
-rw-r--r--gnu/packages/jupyter.scm84
-rw-r--r--gnu/packages/kawa.scm6
-rw-r--r--gnu/packages/kde-frameworks.scm3543
-rw-r--r--gnu/packages/kde-games.scm628
-rw-r--r--gnu/packages/kde-internet.scm158
-rw-r--r--gnu/packages/kde-multimedia.scm466
-rw-r--r--gnu/packages/kde-pim.scm1142
-rw-r--r--gnu/packages/kde-plasma.scm1488
-rw-r--r--gnu/packages/kde-systemtools.scm157
-rw-r--r--gnu/packages/kde-utils.scm571
-rw-r--r--gnu/packages/kde.scm795
-rw-r--r--gnu/packages/kerberos.scm2
-rw-r--r--gnu/packages/language.scm4
-rw-r--r--gnu/packages/ld-wrapper.in27
-rw-r--r--gnu/packages/lego.scm4
-rw-r--r--gnu/packages/less.scm5
-rw-r--r--gnu/packages/libreoffice.scm8
-rw-r--r--gnu/packages/librewolf.scm147
-rw-r--r--gnu/packages/libunistring.scm4
-rw-r--r--gnu/packages/libusb.scm5
-rw-r--r--gnu/packages/license.scm7
-rw-r--r--gnu/packages/lighting.scm4
-rw-r--r--gnu/packages/linux.scm1070
-rw-r--r--gnu/packages/lisp-xyz.scm44404
-rw-r--r--gnu/packages/lisp.scm2054
-rw-r--r--gnu/packages/llvm.scm418
-rw-r--r--gnu/packages/lua.scm184
-rw-r--r--gnu/packages/lxde.scm19
-rw-r--r--gnu/packages/lxqt.scm47
-rw-r--r--gnu/packages/machine-learning.scm1430
-rw-r--r--gnu/packages/mail.scm365
-rw-r--r--gnu/packages/make-bootstrap.scm127
-rw-r--r--gnu/packages/man.scm17
-rw-r--r--gnu/packages/mate.scm319
-rw-r--r--gnu/packages/maths.scm772
-rw-r--r--gnu/packages/mes.scm8
-rw-r--r--gnu/packages/messaging.scm768
-rw-r--r--gnu/packages/mingw.scm171
-rw-r--r--gnu/packages/mold.scm4
-rw-r--r--gnu/packages/monitoring.scm2
-rw-r--r--gnu/packages/moreutils.scm6
-rw-r--r--gnu/packages/mpd.scm11
-rw-r--r--gnu/packages/mpi.scm107
-rw-r--r--gnu/packages/mtools.scm4
-rw-r--r--gnu/packages/multiprecision.scm93
-rw-r--r--gnu/packages/music.scm474
-rw-r--r--gnu/packages/musl.scm17
-rw-r--r--gnu/packages/ncdu.scm6
-rw-r--r--gnu/packages/nettle.scm4
-rw-r--r--gnu/packages/networking.scm523
-rw-r--r--gnu/packages/node.scm5
-rw-r--r--gnu/packages/nss.scm169
-rw-r--r--gnu/packages/ntp.scm32
-rw-r--r--gnu/packages/ocaml.scm52
-rw-r--r--gnu/packages/ocr.scm1
-rw-r--r--gnu/packages/openldap.scm18
-rw-r--r--gnu/packages/openstack.scm13
-rw-r--r--gnu/packages/orange.scm4
-rw-r--r--gnu/packages/package-management.scm60
-rw-r--r--gnu/packages/pantheon.scm135
-rw-r--r--gnu/packages/parallel.scm188
-rw-r--r--gnu/packages/password-utils.scm165
-rw-r--r--gnu/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch60
-rw-r--r--gnu/packages/patches/abseil-cpp-20200923.3-duration-test.patch86
-rw-r--r--gnu/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch23
-rw-r--r--gnu/packages/patches/aegisub-boost81.patch62
-rw-r--r--gnu/packages/patches/appstream-force-reload-stemmer.patch89
-rw-r--r--gnu/packages/patches/ark-skip-xar-test.patch54
-rw-r--r--gnu/packages/patches/asli-use-system-libs.patch55
-rw-r--r--gnu/packages/patches/atf-execute-with-shell.patch39
-rw-r--r--gnu/packages/patches/audacity-ffmpeg-fallback.patch16
-rw-r--r--gnu/packages/patches/biboumi-cmake-ignore-git.patch45
-rw-r--r--gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch38
-rw-r--r--gnu/packages/patches/bpftrace-disable-bfd-disasm.patch15
-rw-r--r--gnu/packages/patches/capstone-fix-python-constants.patch84
-rw-r--r--gnu/packages/patches/cf-tool-add-languages.patch22
-rw-r--r--gnu/packages/patches/chez-scheme-backport-signal.patch87
-rw-r--r--gnu/packages/patches/clang-13-remove-crypt-interceptors.patch214
-rw-r--r--gnu/packages/patches/clang-14-remove-crypt-interceptors.patch214
-rw-r--r--gnu/packages/patches/clang-16-remove-crypt-interceptors.patch222
-rw-r--r--gnu/packages/patches/clang-cling-13-libc-search-path.patch96
-rw-r--r--gnu/packages/patches/clang-runtime-13-glibc-2.36-compat.patch50
-rw-r--r--gnu/packages/patches/clang-runtime-14-glibc-2.36-compat.patch50
-rw-r--r--gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch50
-rw-r--r--gnu/packages/patches/clasp-hide-event-ids.patch41
-rw-r--r--gnu/packages/patches/cling-use-shared-library.patch418
-rw-r--r--gnu/packages/patches/clog-fix-shared-build.patch39
-rw-r--r--gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch43
-rw-r--r--gnu/packages/patches/cpuinfo-system-libraries.patch50
-rw-r--r--gnu/packages/patches/date-ignore-zonenow.patch13
-rw-r--r--gnu/packages/patches/datefudge-gettimeofday.patch13
-rw-r--r--gnu/packages/patches/dblatex-inkscape-1.0.patch39
-rw-r--r--gnu/packages/patches/diffutils-fix-signal-processing.patch58
-rw-r--r--gnu/packages/patches/docbook-utils-documentation-edits.patch102
-rw-r--r--gnu/packages/patches/docbook-utils-escape-characters.patch36
-rw-r--r--gnu/packages/patches/docbook-utils-remove-jade-sp.patch216
-rw-r--r--gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch36
-rw-r--r--gnu/packages/patches/docbook-utils-source-date-epoch.patch31
-rw-r--r--gnu/packages/patches/docbook-utils-use-date-element.patch63
-rw-r--r--gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch40
-rw-r--r--gnu/packages/patches/docbook-xsl-support-old-url.patch17
-rw-r--r--gnu/packages/patches/docbook2x-filename-handling.patch44
-rw-r--r--gnu/packages/patches/docbook2x-fix-synopsis.patch26
-rw-r--r--gnu/packages/patches/docbook2x-manpage-typo.patch26
-rw-r--r--gnu/packages/patches/docbook2x-preprocessor-declaration.patch91
-rw-r--r--gnu/packages/patches/docbook2x-static-datadir-evaluation.patch21
-rw-r--r--gnu/packages/patches/dwarves-threading-reproducibility.patch23
-rw-r--r--gnu/packages/patches/emacs-telega-path-placeholder.patch33
-rw-r--r--gnu/packages/patches/emacs-xelb-ignore-length-element.patch19
-rw-r--r--gnu/packages/patches/enlightenment-fix-setuid-path.patch14
-rw-r--r--gnu/packages/patches/epiphany-fix-encoding-test.patch40
-rw-r--r--gnu/packages/patches/esmini-no-clutter-log.patch30
-rw-r--r--gnu/packages/patches/esmini-use-pkgconfig.patch694
-rw-r--r--gnu/packages/patches/falcosecurity-libs-install-pman.patch14
-rw-r--r--gnu/packages/patches/falcosecurity-libs-libscap-pc.patch16
-rw-r--r--gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch155
-rw-r--r--gnu/packages/patches/falcosecurity-libs-pkg-config.patch23
-rw-r--r--gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch50
-rw-r--r--gnu/packages/patches/fbgemm-use-system-libraries.patch62
-rw-r--r--gnu/packages/patches/ffmpeg-4-binutils-2.41.patch76
-rw-r--r--gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch4
-rw-r--r--gnu/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch43
-rw-r--r--gnu/packages/patches/file-32bit-time.patch40
-rw-r--r--gnu/packages/patches/flatpak-fix-fonts-icons.patch89
-rw-r--r--gnu/packages/patches/font-gnu-freefont-python3-compat.patch200
-rw-r--r--gnu/packages/patches/foxi-fix-build.patch55
-rw-r--r--gnu/packages/patches/freecad-vtk-9.3.patch43
-rw-r--r--gnu/packages/patches/freeimage-libraw-0.21-compat.patch15
-rw-r--r--gnu/packages/patches/gcc-10-libsanitizer-no-crypt.patch134
-rw-r--r--gnu/packages/patches/gcc-12-libsanitizer-no-crypt.patch134
-rw-r--r--gnu/packages/patches/gcc-13-libsanitizer-no-crypt.patch140
-rw-r--r--gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch50
-rw-r--r--gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch70
-rw-r--r--gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch402
-rw-r--r--gnu/packages/patches/gcc-7-libsanitizer-fsconfig-command.patch32
-rw-r--r--gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch179
-rw-r--r--gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch33
-rw-r--r--gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch67
-rw-r--r--gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch35
-rw-r--r--gnu/packages/patches/ghc-aeson-encodeDouble.patch25
-rw-r--r--gnu/packages/patches/ghc-basement-fix-32-bit.patch226
-rw-r--r--gnu/packages/patches/ghc-clock-realfrag.patch22
-rw-r--r--gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch10
-rw-r--r--gnu/packages/patches/ghc-unique-support-newer-hashable.patch110
-rw-r--r--gnu/packages/patches/glibc-2.37-versioned-locpath.patch90
-rw-r--r--gnu/packages/patches/glibc-2.38-ldd-x86_64.patch8
-rw-r--r--gnu/packages/patches/glibc-2.39-bootstrap-system.patch69
-rw-r--r--gnu/packages/patches/glibc-2.39-fmod-libm-a.patch98
-rw-r--r--gnu/packages/patches/glibc-2.39-git-updates.patch9653
-rw-r--r--gnu/packages/patches/glibc-bootstrap-system.patch27
-rw-r--r--gnu/packages/patches/glibc-versioned-locpath.patch35
-rw-r--r--gnu/packages/patches/gnulib-bootstrap.patch75
-rw-r--r--gnu/packages/patches/gnumach-support-noide.patch25
-rw-r--r--gnu/packages/patches/gnutls-cross.patch82
-rw-r--r--gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch85
-rw-r--r--gnu/packages/patches/gpsbabel-fix-i686-test.patch46
-rw-r--r--gnu/packages/patches/grantlee-register-metaenumvariable.patch54
-rw-r--r--gnu/packages/patches/guile-lib-fix-tests-for-guile2.2.patch52
-rw-r--r--gnu/packages/patches/gwenview-kimageannotator.patch29
-rw-r--r--gnu/packages/patches/heatshrink-add-cmake.patch111
-rw-r--r--gnu/packages/patches/hurd-add-without-rump-configure-option.patch82
-rw-r--r--gnu/packages/patches/hurd-fix-rumpdisk-build.patch41
-rw-r--r--gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch155
-rw-r--r--gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch891
-rw-r--r--gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch31
-rw-r--r--gnu/packages/patches/imagemagick-CVE-2020-27829.patch27
-rw-r--r--gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch26
-rw-r--r--gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch35
-rw-r--r--gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch25
-rw-r--r--gnu/packages/patches/inkscape-poppler-compat.patch45
-rw-r--r--gnu/packages/patches/isync-openssl3-fix.patch81
-rw-r--r--gnu/packages/patches/jami-disable-integration-tests.patch113
-rw-r--r--gnu/packages/patches/jami-enable-testing.patch26
-rw-r--r--gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch4
-rw-r--r--gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch25
-rw-r--r--gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch3
-rw-r--r--gnu/packages/patches/libgit2-uninitialized-proxy-settings.patch28
-rw-r--r--gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch24
-rw-r--r--gnu/packages/patches/libmateweather-use-TZDIR.patch42
-rw-r--r--gnu/packages/patches/libsepol-versioned-docbook.patch56
-rw-r--r--gnu/packages/patches/libvpx-CVE-2023-44488.patch107
-rw-r--r--gnu/packages/patches/lvm2-no-systemd.patch18
-rw-r--r--gnu/packages/patches/mingw-w64-6.0.0-gcc.patch65
-rw-r--r--gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch26
-rw-r--r--gnu/packages/patches/mingw-w64-reproducible-gendef.patch33
-rw-r--r--gnu/packages/patches/miniz-for-pytorch.patch47
-rw-r--r--gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch25
-rw-r--r--gnu/packages/patches/mixxx-system-googletest-benchmark.patch43
-rw-r--r--gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch36
-rw-r--r--gnu/packages/patches/openjdk-10-char-reproducibility.patch12
-rw-r--r--gnu/packages/patches/openjdk-10-classlist-reproducibility.patch27
-rw-r--r--gnu/packages/patches/openjdk-10-corba-reproducibility.patch12
-rw-r--r--gnu/packages/patches/openjdk-10-jar-reproducibility.patch103
-rw-r--r--gnu/packages/patches/openjdk-10-jtask-reproducibility.patch53
-rw-r--r--gnu/packages/patches/openjdk-10-module-reproducibility.patch305
-rw-r--r--gnu/packages/patches/openjdk-10-module3-reproducibility.patch34
-rw-r--r--gnu/packages/patches/openjdk-10-module4-reproducibility.patch14
-rw-r--r--gnu/packages/patches/openjdk-11-classlist-reproducibility.patch11
-rw-r--r--gnu/packages/patches/openjdk-13-classlist-reproducibility.patch11
-rw-r--r--gnu/packages/patches/openjdk-15-jtask-reproducibility.patch40
-rw-r--r--gnu/packages/patches/openjdk-9-classlist-reproducibility.patch31
-rw-r--r--gnu/packages/patches/openjdk-9-idlj-reproducibility.patch37
-rw-r--r--gnu/packages/patches/openjdk-9-jar-reproducibility.patch107
-rw-r--r--gnu/packages/patches/openjdk-9-module-reproducibility.patch297
-rw-r--r--gnu/packages/patches/openjdk-9-module2-reproducibility.patch125
-rw-r--r--gnu/packages/patches/openjdk-9-module3-reproducibility.patch36
-rw-r--r--gnu/packages/patches/openresolv-restartcmd-guix.patch12
-rw-r--r--gnu/packages/patches/openscad-fix-boost-join.patch62
-rw-r--r--gnu/packages/patches/openscad-with-cgal-5.3.patch47
-rw-r--r--gnu/packages/patches/openscad-with-cgal-5.4.patch38
-rw-r--r--gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch15
-rw-r--r--gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch242
-rw-r--r--gnu/packages/patches/podman-program-lookup.patch120
-rw-r--r--gnu/packages/patches/prusa-slicer-boost-fixes.patch97
-rw-r--r--gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch52
-rw-r--r--gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch112
-rw-r--r--gnu/packages/patches/pstoedit-fix-gcc12.patch12
-rw-r--r--gnu/packages/patches/pstoedit-fix-plainC.patch47
-rw-r--r--gnu/packages/patches/pstoedit-pkglibdir.patch19
-rw-r--r--gnu/packages/patches/python-3-reproducible-build.patch30
-rw-r--r--gnu/packages/patches/python-angr-addition-type-error.patch18
-rw-r--r--gnu/packages/patches/python-angr-check-exec-deps.patch93
-rw-r--r--gnu/packages/patches/python-clarabel-blas.patch38
-rw-r--r--gnu/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch84
-rw-r--r--gnu/packages/patches/python-optree-fix-32-bit.patch122
-rw-r--r--gnu/packages/patches/python-pillow-use-zlib-1.3.patch21
-rw-r--r--gnu/packages/patches/python-pysmt-fix-pow-return-type.patch258
-rw-r--r--gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch86
-rw-r--r--gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch139
-rw-r--r--gnu/packages/patches/python-pytorch-fix-codegen.patch167
-rw-r--r--gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch167
-rw-r--r--gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch399
-rw-r--r--gnu/packages/patches/python-pytorch-runpath.patch19
-rw-r--r--gnu/packages/patches/python-pytorch-system-libraries.patch317
-rw-r--r--gnu/packages/patches/python-pytorch-without-kineto.patch60
-rw-r--r--gnu/packages/patches/python-pytorch2-system-libraries.patch156
-rw-r--r--gnu/packages/patches/python-pyvex-remove-angr-dependency.patch80
-rw-r--r--gnu/packages/patches/python-scikit-bio-1887.patch109
-rw-r--r--gnu/packages/patches/python-scikit-optimize-1148.patch32
-rw-r--r--gnu/packages/patches/python-scikit-optimize-1150.patch275
-rw-r--r--gnu/packages/patches/python-waitress-fix-tests.patch29
-rw-r--r--gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch51
-rw-r--r--gnu/packages/patches/qemu-7.2.4-build-info-manual.patch62
-rw-r--r--gnu/packages/patches/qemu-disable-aarch64-migration-test.patch13
-rw-r--r--gnu/packages/patches/racket-backport-8.12-chez-configure.patch423
-rw-r--r--gnu/packages/patches/rust-poem-1-fewer-deps.patch229
-rw-r--r--gnu/packages/patches/sbcl-fast-generic-functions-fix-sbcl-2.4.patch99
-rw-r--r--gnu/packages/patches/sbcl-fix-ppc64-build.patch27
-rw-r--r--gnu/packages/patches/sbcl-fix-riscv-build.patch19
-rw-r--r--gnu/packages/patches/sbcl-s-sysdeps-bt2.patch61
-rw-r--r--gnu/packages/patches/sdl-libx11-1.6.patch13
-rw-r--r--gnu/packages/patches/slurm-23-salloc-fallback-shell.patch39
-rw-r--r--gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch84
-rw-r--r--gnu/packages/patches/transmission-4.0.5-fix-build.patch39
-rw-r--r--gnu/packages/patches/transmission-4.0.6-fix-build.patch275
-rw-r--r--gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch40
-rw-r--r--gnu/packages/patches/webrtc-audio-processing-big-endian.patch93
-rw-r--r--gnu/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch32
-rw-r--r--gnu/packages/patches/webrtc-audio-processing-x86-no-sse.patch13
-rw-r--r--gnu/packages/patches/wmfire-dont-inline-draw-fire.patch33
-rw-r--r--gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch2660
-rw-r--r--gnu/packages/patches/xnnpack-remove-broken-tests.patch337
-rw-r--r--gnu/packages/patches/xnnpack-system-libraries.patch4133
-rw-r--r--gnu/packages/patches/xpra-6.0-systemd-run.patch (renamed from gnu/packages/patches/xpra-5.0-systemd-run.patch)12
-rw-r--r--gnu/packages/patches/xpra-6.1-install_libs.patch (renamed from gnu/packages/patches/xpra-5.0-install_libs.patch)30
-rw-r--r--gnu/packages/patches/zathura-use-struct-initializers.patch68
-rw-r--r--gnu/packages/patches/zig-do-not-link-against-librt.patch10
-rw-r--r--gnu/packages/patchutils.scm2
-rw-r--r--gnu/packages/pciutils.scm18
-rw-r--r--gnu/packages/pcre.scm4
-rw-r--r--gnu/packages/pdf.scm70
-rw-r--r--gnu/packages/perl.scm190
-rw-r--r--gnu/packages/phabricator.scm3
-rw-r--r--gnu/packages/photo.scm28
-rw-r--r--gnu/packages/php.scm4
-rw-r--r--gnu/packages/piet.scm20
-rw-r--r--gnu/packages/pkg-config.scm22
-rw-r--r--gnu/packages/plan9.scm29
-rw-r--r--gnu/packages/plotutils.scm14
-rw-r--r--gnu/packages/polkit.scm41
-rw-r--r--gnu/packages/potassco.scm106
-rw-r--r--gnu/packages/presentation.scm4
-rw-r--r--gnu/packages/pretty-print.scm167
-rw-r--r--gnu/packages/prolog.scm63
-rw-r--r--gnu/packages/prometheus.scm519
-rw-r--r--gnu/packages/protobuf.scm14
-rw-r--r--gnu/packages/purescript.scm3
-rw-r--r--gnu/packages/python-build.scm69
-rw-r--r--gnu/packages/python-check.scm232
-rw-r--r--gnu/packages/python-compression.scm6
-rw-r--r--gnu/packages/python-crypto.scm95
-rw-r--r--gnu/packages/python-science.scm829
-rw-r--r--gnu/packages/python-web.scm570
-rw-r--r--gnu/packages/python-xyz.scm2232
-rw-r--r--gnu/packages/python.scm143
-rw-r--r--gnu/packages/qt.scm288
-rw-r--r--gnu/packages/racket.scm59
-rw-r--r--gnu/packages/radio.scm56
-rw-r--r--gnu/packages/raspberry-pi.scm5
-rw-r--r--gnu/packages/ratpoison.scm2
-rw-r--r--gnu/packages/rdesktop.scm5
-rw-r--r--gnu/packages/rdf.scm8
-rw-r--r--gnu/packages/rednotebook.scm12
-rw-r--r--gnu/packages/rpc.scm121
-rw-r--r--gnu/packages/rpm.scm3
-rw-r--r--gnu/packages/ruby.scm76
-rw-r--r--gnu/packages/rush.scm4
-rw-r--r--gnu/packages/rust-apps.scm394
-rw-r--r--gnu/packages/rust.scm364
-rw-r--r--gnu/packages/samba.scm30
-rw-r--r--gnu/packages/sawfish.scm6
-rw-r--r--gnu/packages/scanner.scm87
-rw-r--r--gnu/packages/scheme.scm71
-rw-r--r--gnu/packages/screen.scm8
-rw-r--r--gnu/packages/scribus.scm6
-rw-r--r--gnu/packages/sdl.scm185
-rw-r--r--gnu/packages/search.scm12
-rw-r--r--gnu/packages/security-token.scm72
-rw-r--r--gnu/packages/selinux.scm19
-rw-r--r--gnu/packages/sequoia.scm523
-rw-r--r--gnu/packages/serialization.scm122
-rw-r--r--gnu/packages/shells.scm1661
-rw-r--r--gnu/packages/shellutils.scm186
-rw-r--r--gnu/packages/simh.scm2
-rw-r--r--gnu/packages/simulation.scm168
-rw-r--r--gnu/packages/skarnet.scm3
-rw-r--r--gnu/packages/slang.scm4
-rw-r--r--gnu/packages/solidity.scm15
-rw-r--r--gnu/packages/specifications.scm59
-rw-r--r--gnu/packages/speech.scm3
-rw-r--r--gnu/packages/sphinx.scm39
-rw-r--r--gnu/packages/spice.scm5
-rw-r--r--gnu/packages/spreadsheet.scm18
-rw-r--r--gnu/packages/sqlite.scm4
-rw-r--r--gnu/packages/ssh.scm58
-rw-r--r--gnu/packages/sssd.scm8
-rw-r--r--gnu/packages/statistics.scm405
-rw-r--r--gnu/packages/stb.scm2
-rw-r--r--gnu/packages/storage.scm2
-rw-r--r--gnu/packages/suckless.scm15
-rw-r--r--gnu/packages/sugar.scm315
-rw-r--r--gnu/packages/sycl.scm20
-rw-r--r--gnu/packages/sync.scm10
-rw-r--r--gnu/packages/syncthing.scm525
-rw-r--r--gnu/packages/syndication.scm15
-rw-r--r--gnu/packages/task-management.scm60
-rw-r--r--gnu/packages/telegram.scm8
-rw-r--r--gnu/packages/telephony.scm6
-rw-r--r--gnu/packages/terminals.scm68
-rw-r--r--gnu/packages/tex.scm90837
-rw-r--r--gnu/packages/texinfo.scm9
-rw-r--r--gnu/packages/texlive.scm11
-rw-r--r--gnu/packages/text-editors.scm30
-rw-r--r--gnu/packages/textutils.scm233
-rw-r--r--gnu/packages/time.scm44
-rw-r--r--gnu/packages/tls.scm94
-rw-r--r--gnu/packages/tmux.scm7
-rw-r--r--gnu/packages/tor-browsers.scm166
-rw-r--r--gnu/packages/tor.scm4
-rw-r--r--gnu/packages/toys.scm7
-rw-r--r--gnu/packages/tree-sitter.scm94
-rw-r--r--gnu/packages/tryton.scm9
-rw-r--r--gnu/packages/uml.scm14
-rw-r--r--gnu/packages/unicode.scm51
-rw-r--r--gnu/packages/upnp.scm26
-rw-r--r--gnu/packages/uucp.scm7
-rw-r--r--gnu/packages/version-control.scm1323
-rw-r--r--gnu/packages/video.scm744
-rw-r--r--gnu/packages/vim.scm44
-rw-r--r--gnu/packages/virtualization.scm246
-rw-r--r--gnu/packages/vnc.scm131
-rw-r--r--gnu/packages/vpn.scm73
-rw-r--r--gnu/packages/vulkan.scm85
-rw-r--r--gnu/packages/weather.scm4
-rw-r--r--gnu/packages/web-browsers.scm44
-rw-r--r--gnu/packages/web.scm531
-rw-r--r--gnu/packages/webkit.scm18
-rw-r--r--gnu/packages/wget.scm9
-rw-r--r--gnu/packages/wine.scm42
-rw-r--r--gnu/packages/wm.scm231
-rw-r--r--gnu/packages/wordnet.scm6
-rw-r--r--gnu/packages/wxwidgets.scm43
-rw-r--r--gnu/packages/xdisorg.scm244
-rw-r--r--gnu/packages/xfce.scm4
-rw-r--r--gnu/packages/xiph.scm4
-rw-r--r--gnu/packages/xml.scm146
-rw-r--r--gnu/packages/xorg.scm67
-rw-r--r--gnu/packages/zig.scm6
-rw-r--r--gnu/services.scm60
-rw-r--r--gnu/services/audio.scm18
-rw-r--r--gnu/services/avahi.scm14
-rw-r--r--gnu/services/backup.scm236
-rw-r--r--gnu/services/base.scm62
-rw-r--r--gnu/services/certbot.scm4
-rw-r--r--gnu/services/cuirass.scm28
-rw-r--r--gnu/services/dbus.scm10
-rw-r--r--gnu/services/desktop.scm53
-rw-r--r--gnu/services/dns.scm24
-rw-r--r--gnu/services/docker.scm441
-rw-r--r--gnu/services/ganeti.scm2
-rw-r--r--gnu/services/guix.scm4
-rw-r--r--gnu/services/mail.scm423
-rw-r--r--gnu/services/mcron.scm63
-rw-r--r--gnu/services/monitoring.scm4
-rw-r--r--gnu/services/networking.scm20
-rw-r--r--gnu/services/nix.scm33
-rw-r--r--gnu/services/pm.scm60
-rw-r--r--gnu/services/sddm.scm17
-rw-r--r--gnu/services/shepherd.scm60
-rw-r--r--gnu/services/syncthing.scm10
-rw-r--r--gnu/services/web.scm249
-rw-r--r--gnu/services/xorg.scm113
-rw-r--r--gnu/system.scm69
-rw-r--r--gnu/system/file-systems.scm59
-rw-r--r--gnu/system/hurd.scm3
-rw-r--r--gnu/system/image.scm6
-rw-r--r--gnu/system/images/visionfive2.scm122
-rw-r--r--gnu/system/install.scm9
-rw-r--r--gnu/system/linux-initrd.scm6
-rw-r--r--gnu/system/locale.scm4
-rw-r--r--gnu/system/mapped-devices.scm3
-rw-r--r--gnu/system/privilege.scm58
-rw-r--r--gnu/system/setuid.scm44
-rw-r--r--gnu/tests/base.scm13
-rw-r--r--gnu/tests/docker.scm177
-rw-r--r--gnu/tests/emacs.scm101
-rw-r--r--gnu/tests/install.scm18
-rw-r--r--gnu/tests/ldap.scm2
-rw-r--r--gnu/tests/monitoring.scm4
-rw-r--r--gnu/tests/virtualization.scm3
-rw-r--r--gnu/tests/web.scm105
637 files changed, 191452 insertions, 98048 deletions
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 8e7cc05191..c5437a7b63 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -49,6 +49,7 @@
u-boot-rockpro64-rk3399-bootloader
u-boot-sifive-unmatched-bootloader
u-boot-qemu-riscv64-bootloader
+ u-boot-starfive-visionfive2-bootloader
u-boot-ts7970-q-2g-1000mhz-c-bootloader
u-boot-wandboard-bootloader))
@@ -159,6 +160,27 @@
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 2082 512)))))
+(define install-starfive-visionfive2-u-boot
+ #~(lambda (bootloader root-index image)
+ (let ((spl (string-append
+ bootloader "/libexec/spl/u-boot-spl.bin.normal.out"))
+ (u-boot (string-append bootloader "/libexec/u-boot.itb")))
+ (write-file-on-device spl (stat:size (stat spl))
+ image (* 34 512))
+ (write-file-on-device u-boot (stat:size (stat u-boot))
+ image (* 2082 512)))))
+
+(define install-starfive-visionfive2-uEnv.txt
+ #~(lambda (bootloader device mount-point)
+ (mkdir-p (string-append mount-point "/boot"))
+ (call-with-output-file (string-append mount-point "/boot/uEnv.txt")
+ (lambda (port)
+ (format port
+ ;; if board SPI use vender's u-boot, will find
+ ;; ""starfive/starfive_visionfive2.dtb"", We cannot guarantee
+ ;; that users will update this u-boot, so set it.
+ "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb~%")))))
+
(define install-qemu-riscv64-u-boot
#~(lambda (bootloader device mount-point)
(let ((u-boot.bin (string-append bootloader "/libexec/u-boot.bin"))
@@ -316,6 +338,13 @@
(package u-boot-sifive-unmatched)
(disk-image-installer install-sifive-unmatched-u-boot)))
+(define u-boot-starfive-visionfive2-bootloader
+ (bootloader
+ (inherit u-boot-bootloader)
+ (package u-boot-starfive-visionfive2)
+ (installer install-starfive-visionfive2-uEnv.txt)
+ (disk-image-installer install-starfive-visionfive2-u-boot)))
+
(define u-boot-qemu-riscv64-bootloader
(bootloader
(inherit u-boot-bootloader)
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index d8c0cd22a3..a57ca78a86 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -27,7 +28,7 @@
(define-module (gnu build activation)
#:use-module (gnu system accounts)
- #:use-module (gnu system setuid)
+ #:use-module (gnu system privilege)
#:use-module (gnu build accounts)
#:use-module (gnu build linux-boot)
#:use-module (guix build utils)
@@ -41,7 +42,7 @@
#:export (activate-users+groups
activate-user-home
activate-etc
- activate-setuid-programs
+ activate-privileged-programs
activate-special-files
activate-modprobe
activate-firmware
@@ -279,56 +280,80 @@ they already exist."
string<?)))
(define %setuid-directory
- ;; Place where setuid programs are stored.
+ ;; Place where setuid programs used to be stored. It exists for backwards
+ ;; compatibility & will be removed. Use %PRIVILEGED-PROGRAM-DIRECTORY instead.
"/run/setuid-programs")
-(define (activate-setuid-programs programs)
- "Turn PROGRAMS, a list of file setuid-programs record, into setuid programs
-stored under %SETUID-DIRECTORY."
- (define (make-setuid-program program setuid? setgid? uid gid)
- (let ((target (string-append %setuid-directory
+(define %privileged-program-directory
+ ;; Place where privileged copies of programs are stored.
+ "/run/privileged/bin")
+
+(define (activate-privileged-programs programs libcap)
+ "Turn PROGRAMS, a list of file privileged-programs records, into privileged
+copies stored under %PRIVILEGED-PROGRAM-DIRECTORY, using LIBCAP's setcap(8)
+binary if needed."
+ (define (ensure-empty-directory directory)
+ (if (file-exists? directory)
+ (for-each (compose delete-file
+ (cut string-append directory "/" <>))
+ (scandir directory
+ (lambda (file)
+ (not (member file '("." ".."))))
+ string<?))
+ (mkdir-p directory)) )
+
+ (define (make-privileged-program program setuid? setgid? uid gid capabilities)
+ (let ((target (string-append %privileged-program-directory
"/" (basename program)))
(mode (+ #o0555 ; base permissions
(if setuid? #o4000 0) ; setuid bit
(if setgid? #o2000 0)))) ; setgid bit
(copy-file program target)
(chown target uid gid)
- (chmod target mode)))
-
- (format #t "setting up setuid programs in '~a'...~%"
- %setuid-directory)
- (if (file-exists? %setuid-directory)
- (for-each (compose delete-file
- (cut string-append %setuid-directory "/" <>))
- (scandir %setuid-directory
- (lambda (file)
- (not (member file '("." ".."))))
- string<?))
- (mkdir-p %setuid-directory))
+ (chmod target mode)
+ (when (and capabilities libcap)
+ (system* (string-append libcap "/sbin/setcap")
+ "-q" capabilities target))))
+
+ (define (make-deprecated-wrapper program)
+ ;; This will eventually become a script that warns on usage, then vanish.
+ (symlink (string-append %privileged-program-directory
+ "/" (basename program))
+ (string-append %setuid-directory
+ "/" (basename program))))
+
+ (format #t "setting up privileged programs in '~a'...~%"
+ %privileged-program-directory)
+ (ensure-empty-directory %privileged-program-directory)
+ (ensure-empty-directory %setuid-directory)
(for-each (lambda (program)
(catch 'system-error
(lambda ()
- (let* ((program-name (setuid-program-program program))
- (setuid? (setuid-program-setuid? program))
- (setgid? (setuid-program-setgid? program))
- (user (setuid-program-user program))
- (group (setuid-program-group program))
+ (let* ((program-name (privileged-program-program program))
+ (setuid? (privileged-program-setuid? program))
+ (setgid? (privileged-program-setgid? program))
+ (user (privileged-program-user program))
+ (group (privileged-program-group program))
+ (capabilities (privileged-program-capabilities program))
(uid (match user
((? string?) (passwd:uid (getpwnam user)))
((? integer?) user)))
(gid (match group
((? string?) (group:gid (getgrnam group)))
((? integer?) group))))
- (make-setuid-program program-name setuid? setgid? uid gid)))
+ (make-privileged-program program-name
+ setuid? setgid? uid gid
+ capabilities)
+ (make-deprecated-wrapper program-name)))
(lambda args
- ;; If we fail to create a setuid program, better keep going
- ;; so that we don't leave %SETUID-DIRECTORY empty or
- ;; half-populated. This can happen if PROGRAMS contains
+ ;; If we fail to create a privileged program, better keep going
+ ;; so that we don't leave %PRIVILEGED-PROGRAM-DIRECTORY empty
+ ;; or half-populated. This can happen if PROGRAMS contains
;; incorrect file names: <https://bugs.gnu.org/38800>.
(format (current-error-port)
- "warning: failed to make ~s setuid/setgid: ~a~%"
- (setuid-program-program program)
+ "warning: failed to privilege ~s: ~a~%"
+ (privileged-program-program program)
(strerror (system-error-errno args))))))
programs))
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 78d779f398..9ceb2fda4e 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,8 @@
#:use-module (rnrs bytevectors)
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
+ #:use-module (ice-9 string-fun)
#:use-module (system foreign)
#:autoload (system repl repl) (start-repl)
#:use-module (srfi srfi-1)
@@ -1047,8 +1050,11 @@ file name or an nfs-root containing ':/')."
(match spec
((? string?)
- (if (or (string-contains spec ":/") (string=? spec "none"))
- spec ; do not resolve NFS / tmpfs devices
+ (if (or (string-contains spec ":/") ;nfs
+ (and (>= (string-length spec) 2)
+ (equal? (string-take spec 2) "//")) ;cifs
+ (string=? spec "none"))
+ spec ; do not resolve NFS / CIFS / tmpfs devices
;; Nothing to do, but wait until SPEC shows up.
(resolve identity spec identity)))
((? file-system-label?)
@@ -1078,6 +1084,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)))
@@ -1156,6 +1163,14 @@ corresponds to the symbols listed in FLAGS."
(repair (file-system-repair fs)))
"Mount the file system described by FS, a <file-system> object, under ROOT."
+ (define* (host-to-ip host #:optional service)
+ "Return the IP address for host, which may be an IP address or a hostname."
+ (let* ((aa (match (getaddrinfo host service) ((x . _) x)))
+ (sa (addrinfo:addr aa))
+ (inet-addr (inet-ntop (sockaddr:fam sa)
+ (sockaddr:addr sa))))
+ inet-addr))
+
(define (mount-nfs source mount-point type flags options)
(let* ((idx (string-rindex source #\:))
(host-part (string-take source idx))
@@ -1163,11 +1178,7 @@ corresponds to the symbols listed in FLAGS."
(host (match (string-split host-part (string->char-set "[]"))
(("" h "") h)
((h) h)))
- (aa (match (getaddrinfo host "nfs") ((x . _) x)))
- (sa (addrinfo:addr aa))
- (inet-addr (inet-ntop (sockaddr:fam sa)
- (sockaddr:addr sa))))
-
+ (inet-addr (host-to-ip host "nfs")))
;; Mounting an NFS file system requires passing the address
;; of the server in the addr= option
(mount source mount-point type flags
@@ -1176,6 +1187,82 @@ corresponds to the symbols listed in FLAGS."
(if options
(string-append "," options)
"")))))
+
+ (define (read-cifs-credential-file file)
+ ;; Read password, user and domain options from file
+ ;;
+ ;; XXX: As of version 7.0, mount.cifs strips all lines of leading
+ ;; whitespace, parses those starting with "pass", "user" and "dom" into
+ ;; "pass=", "user=" and "domain=" options respectively and ignores
+ ;; everything else. To simplify the implementation, we pass those lines
+ ;; as is. As a consequence, the "password2" option can be specified in a
+ ;; credential file with the expected semantics (see:
+ ;; https://issues.guix.gnu.org/71594#3).
+ (with-input-from-file file
+ (lambda ()
+ (let loop
+ ((next-line (read-line))
+ (lines '()))
+ (match next-line
+ ((? eof-object?)
+ lines)
+ ((= string-trim line)
+ (loop (read-line)
+ (cond
+ ((string-prefix? "pass" line)
+ ;; mount.cifs escapes commas in the password by doubling
+ ;; them
+ (cons (string-replace-substring line "," ",,")
+ lines))
+ ((or (string-prefix? "user" line)
+ (string-prefix? "dom" line))
+ (cons line lines))
+ ;; Ignore all other lines.
+ (else
+ lines)))))))))
+
+ (define (mount-cifs source mount-point type flags options)
+ ;; Source is of form "//<server-ip-or-host>/<service>"
+ (let* ((regex-match (string-match "//([^/]+)/(.+)" source))
+ (server (match:substring regex-match 1))
+ (share (match:substring regex-match 2))
+ ;; Match ",guest,", ",guest$", "^guest,", or "^guest$," not
+ ;; e.g. user=foo,pass=notaguest
+ (guest? (string-match "(^|,)(guest)($|,)" options))
+ (credential-file (and=> (string-match "(^|,)(credentials|cred)=([^,]+)(,|$)"
+ options)
+ (cut match:substring <> 3)))
+ ;; Perform DNS resolution now instead of attempting kernel dns
+ ;; resolver upcalling. /sbin/request-key does not exist and the
+ ;; kernel hardcodes the path.
+ ;;
+ ;; (getaddrinfo) doesn't support cifs service, so omit it.
+ (inet-addr (host-to-ip server)))
+ (mount source mount-point type flags
+ (string-append "ip="
+ inet-addr
+ ;; As of Linux af1a3d2ba9 (v5.11) unc is ignored
+ ;; and source is parsed by the kernel
+ ;; directly. Pass it for compatibility.
+ ",unc="
+ ;; Match format of mount.cifs's mount syscall.
+ "\\\\" server "\\" share
+ (if guest?
+ ",user=,pass="
+ "")
+ (if options
+ ;; No need to delete "guest" from options.
+ ;; linux/fs/smb/client/fs_context.c explicitly
+ ;; ignores it. Also, avoiding excess commas
+ ;; when deleting is a pain.
+ (string-append "," options)
+ "")
+ (if credential-file
+ ;; The "credentials" option is ignored too.
+ (string-join (read-cifs-credential-file credential-file)
+ "," 'prefix)
+ "")))))
+
(let* ((type (file-system-type fs))
(source (canonicalize-device-spec (file-system-device fs)))
(target (string-append root "/"
@@ -1210,6 +1297,8 @@ corresponds to the symbols listed in FLAGS."
(cond
((string-prefix? "nfs" type)
(mount-nfs source target type flags options))
+ ((string-prefix? "cifs" type)
+ (mount-cifs source target type flags options))
((memq 'shared (file-system-flags fs))
(mount source target type flags options)
(mount "none" target #f MS_SHARED))
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 49dc01c0d1..6ca0a428e0 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -328,18 +328,16 @@ GRUB configuration and OS-DRV as the stuff in it."
"-volume_date" "all_file_dates" "=1"
`(,@(if compression?
- '(;; ‘zisofs’ compression reduces the total image size by
- ;; ~60%.
+ '(;; ‘zisofs’ compression reduces the total image size by ~60%.
"-zisofs" "level=9:block_size=128k" ; highest compression
;; It's transparent to our Linux-Libre kernel but not to
- ;; GRUB. Don't compress the kernel, initrd, and other
- ;; files read by grub.cfg, as well as common
- ;; already-compressed file names.
+ ;; GRUB. Don't compress the kernel, initrd, and other files
+ ;; read by grub.cfg, as well as common already-compressed
+ ;; file names.
"-find" "/" "-type" "f"
;; XXX Even after "--" above, and despite documentation
- ;; claiming otherwise, "-or" is stolen by grub-mkrescue
- ;; which then chokes on it (as ‘-o …’) and dies. Don't use
- ;; "-or".
+ ;; claiming otherwise, "-or" is stolen by grub-mkrescue which
+ ;; then chokes on it (as ‘-o …’) and dies. Don't use "-or".
"-not" "-wholename" "/boot/*"
"-not" "-wholename" "/System/*"
"-not" "-name" "unicode.pf2"
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 68c32ff873..32baf6c525 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
#:use-module ((guix build utils) #:select (find-files invoke))
#:use-module (guix build union)
#:autoload (zlib) (call-with-gzip-input-port)
+ #:autoload (zstd) (call-with-zstd-input-port)
#:use-module (rnrs io ports)
#:use-module (rnrs bytevectors)
#:use-module (srfi srfi-1)
@@ -108,24 +110,29 @@ string list."
(cons (string->symbol (string-take str =))
(string-drop str (+ 1 =)))))
-;; Matches kernel modules, without compression, with GZIP compression or with
-;; XZ compression.
-(define module-regex "\\.ko(\\.gz|\\.xz)?$")
+;; Matches kernel modules, without compression, with GZIP, XZ or ZSTD
+;; compression.
+(define module-regex "\\.ko(\\.gz|\\.xz|\\.zst)?$")
(define (modinfo-section-contents file)
"Return the contents of the '.modinfo' section of FILE as a list of
key/value pairs.."
+ (define (decompress-file decompressor file)
+ (let ((port (open-file file "r0")))
+ (dynamic-wind
+ (lambda ()
+ #t)
+ (lambda ()
+ (decompressor port get-bytevector-all))
+ (lambda ()
+ (close-port port)))))
+
(define (get-bytevector file)
(cond
((string-suffix? ".ko.gz" file)
- (let ((port (open-file file "r0")))
- (dynamic-wind
- (lambda ()
- #t)
- (lambda ()
- (call-with-gzip-input-port port get-bytevector-all))
- (lambda ()
- (close-port port)))))
+ (decompress-file call-with-gzip-input-port file))
+ ((string-suffix? ".ko.zst" file)
+ (decompress-file call-with-zstd-input-port file))
(else
(call-with-input-file file get-bytevector-all))))
@@ -213,11 +220,12 @@ modules that can be postloaded, of the soft dependencies of module FILE."
(let ((suffix (match compression
('xz ".ko.xz")
('gzip ".ko.gz")
+ ('zstd ".ko.zst")
(else ".ko"))))
(string-append name suffix)))
(define (ensure-dot-ko name compression)
- "Return NAME with a '.ko[.gz|.xz]' suffix appended, unless it already has
+ "Return NAME with a '.ko[.gz|.xz|.zst]' suffix appended, unless it already has
it."
(if (string-contains name ".ko")
name
@@ -235,7 +243,7 @@ underscores."
(define (file-name->module-name file)
"Return the module name corresponding to FILE, stripping the trailing
-'.ko[.gz|.xz]' and normalizing it."
+'.ko[.gz|.xz|.zst]' and normalizing it."
(normalize-module-name (strip-extension (basename file))))
(define (find-module-file directory module)
@@ -333,11 +341,11 @@ not a file name."
(recursive? #t)
(lookup-module dot-ko)
(black-list (module-black-list)))
- "Load Linux module from FILE, the name of a '.ko[.gz|.xz]' file; return true
-on success, false otherwise. When RECURSIVE? is true, load its dependencies
-first (à la 'modprobe'.) The actual files containing modules depended on are
-obtained by calling LOOKUP-MODULE with the module name. Modules whose name
-appears in BLACK-LIST are not loaded."
+ "Load Linux module from FILE, the name of a '.ko[.gz|.xz|.zst]' file; return
+true on success, false otherwise. When RECURSIVE? is true, load its
+dependencies first (à la 'modprobe'.) The actual files containing modules
+depended on are obtained by calling LOOKUP-MODULE with the module name.
+Modules whose name appears in BLACK-LIST are not loaded."
(define (black-listed? module)
(let ((result (member module black-list)))
(when result
@@ -695,7 +703,7 @@ are required to access DEVICE."
"Guess the file name corresponding to NAME, a module name. That doesn't
always work because sometimes underscores in NAME map to hyphens (e.g.,
\"input-leds.ko\"), sometimes not (e.g., \"mac_hid.ko\"). If the module is
-compressed then COMPRESSED can be set to 'xz or 'gzip, depending on the
+compressed then COMPRESSED can be set to 'zstd, 'xz or 'gzip, depending on the
compression type."
(string-append directory "/" (ensure-dot-ko name compression)))
@@ -707,6 +715,8 @@ compression type."
(let ((names (list
(module-name->file-name/guess directory name)
(module-name->file-name/guess directory name
+ #:compression 'zstd)
+ (module-name->file-name/guess directory name
#:compression 'xz)
(module-name->file-name/guess directory name
#:compression 'gzip))))
@@ -729,8 +739,8 @@ compression type."
(define (write-module-name-database directory)
"Write a database that maps \"module names\" as they appear in the relevant
-ELF section of '.ko[.gz|.xz]' files, to actual file names. This format is
-Guix-specific. It aims to deal with inconsistent naming, in particular
+ELF section of '.ko[.gz|.xz|.zst]' files, to actual file names. This format
+is Guix-specific. It aims to deal with inconsistent naming, in particular
hyphens vs. underscores."
(define mapping
(map (lambda (file)
@@ -749,8 +759,8 @@ hyphens vs. underscores."
(pretty-print mapping port))))
(define (write-module-alias-database directory)
- "Traverse the '.ko[.gz|.xz]' files in DIRECTORY and create the corresponding
-'modules.alias' file."
+ "Traverse the '.ko[.gz|.xz|.zst]' files in DIRECTORY and create the
+corresponding 'modules.alias' file."
(define aliases
(map (lambda (file)
(cons (file-name->module-name file) (module-aliases file)))
@@ -796,9 +806,9 @@ are found, return a tuple (DEVNAME TYPE MAJOR MINOR), otherwise return #f."
(char-set-complement (char-set #\-)))
(define (write-module-device-database directory)
- "Traverse the '.ko[.gz|.xz]' files in DIRECTORY and create the corresponding
-'modules.devname' file. This file contains information about modules that can
-be loaded on-demand, such as file system modules."
+ "Traverse the '.ko[.gz|.xz|.zst]' files in DIRECTORY and create the
+corresponding 'modules.devname' file. This file contains information about
+modules that can be loaded on-demand, such as file system modules."
(define aliases
(filter-map (lambda (file)
(match (aliases->device-tuple (module-aliases file))
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 5d208a8e83..4e282d197f 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -65,6 +65,7 @@
#:use-module (gnu system images novena)
#:use-module (gnu system images pine64)
#:use-module (gnu system images pinebook-pro)
+ #:use-module (gnu system images visionfive2)
#:use-module (gnu tests)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
@@ -176,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)
@@ -191,13 +199,15 @@ SYSTEM."
;; Return true if SYSTEM and TARGET are the same thing. This is so we
;; don't try to cross-compile to 'mips64el-linux-gnu' from
;; 'mips64el-linux'.
- (or (string-contains target system)
+ (or (and (string-contains target system)
+ (not (string=? "x86_64-linux-gnux32" target)))
(and (string-prefix? "armhf" system) ;armhf-linux
(string-prefix? "arm" target)))) ;arm-linux-gnueabihf
(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")
@@ -246,7 +256,8 @@ SYSTEM."
(list hurd-barebones-qcow2-image
pine64-barebones-raw-image
pinebook-pro-barebones-raw-image
- novena-barebones-raw-image))
+ novena-barebones-raw-image
+ visionfive2-barebones-raw-image))
(define (hours hours)
(* 3600 hours))
diff --git a/gnu/compression.scm b/gnu/compression.scm
index 0418e80a15..6e48de5979 100644
--- a/gnu/compression.scm
+++ b/gnu/compression.scm
@@ -56,7 +56,8 @@
;; The default level 3 compresses better than gzip in a
;; fraction of the time, while the highest level 19
;; (de)compresses more slowly and worse than xz.
- #~(list #+(file-append zstd "/bin/zstd") "-3"))
+ #~(list #+(file-append zstd "/bin/zstd") "-3"
+ (format #f "--threads=~a" (parallel-job-count))))
(compressor "none" "" #f)))
(define (lookup-compressor name)
diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm
index 91465bf168..679ba31c0f 100644
--- a/gnu/home/services/desktop.scm
+++ b/gnu/home/services/desktop.scm
@@ -23,6 +23,7 @@
#:use-module (gnu home services)
#:use-module (gnu home services shepherd)
#:use-module (gnu services configuration)
+ #:use-module (gnu services xorg)
#:autoload (gnu packages glib) (dbus)
#:autoload (gnu packages xdisorg) (redshift unclutter)
#:autoload (gnu packages xorg) (setxkbmap xmodmap)
@@ -43,7 +44,9 @@
home-unclutter-service-type
home-xmodmap-configuration
- home-xmodmap-service-type))
+ home-xmodmap-service-type
+
+ home-startx-command-service-type))
;;;
@@ -429,3 +432,12 @@ defaults."))))
(default-value (home-xmodmap-configuration))
(description "Run the @code{xmodmap} utility to modify keymaps and pointer
buttons under the Xorg display server via user-defined expressions.")))
+
+
+(define home-startx-command-service-type
+ (service-type
+ (inherit (system->home-service-type startx-command-service-type))
+ (default-value (for-home (xorg-configuration)))))
+
+(define-service-type-mapping
+ startx-command-service-type => home-startx-command-service-type)
diff --git a/gnu/home/services/gnupg.scm b/gnu/home/services/gnupg.scm
index 04989666ed..7fc99f793a 100644
--- a/gnu/home/services/gnupg.scm
+++ b/gnu/home/services/gnupg.scm
@@ -19,6 +19,7 @@
(define-module (gnu home services gnupg)
#:use-module (guix gexp)
+ #:use-module (guix modules)
#:use-module ((guix records) #:select (match-record))
#:use-module (gnu services)
#:use-module (gnu services configuration)
@@ -142,6 +143,17 @@ agent, with support for handling OpenSSH material."))))
. "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"))
'()))
+(define gpg-agent-activation
+ (with-imported-modules (source-module-closure
+ '((gnu build activation)))
+ #~(begin
+ (use-modules (gnu build activation))
+
+ ;; Make sure ~/.gnupg is #o700.
+ (let* ((home (getenv "HOME"))
+ (dot-ssh (string-append home "/.gnupg")))
+ (mkdir-p/perms dot-ssh (getpw (getuid)) #o700)))))
+
(define home-gpg-agent-service-type
(service-type
(name 'home-gpg-agent)
@@ -150,6 +162,8 @@ agent, with support for handling OpenSSH material."))))
home-gpg-agent-files)
(service-extension home-shepherd-service-type
home-gpg-agent-shepherd-services)
+ (service-extension home-activation-service-type
+ (const gpg-agent-activation))
(service-extension home-environment-variables-service-type
home-gpg-agent-environment-variables)))
(default-value (home-gpg-agent-configuration))
@@ -166,7 +180,7 @@ enabled, @command{gpg-agent} acts as a drop-in replacement for OpenSSH's
(verbose?
(boolean #f)
"Provide extra output to the log file.")
- (gnupg-aleady-torified?
+ (gnupg-already-torified?
(boolean #f)
"GnuPG is already configured to use tor and parcimonie won't attempt to use
tor directly.")
@@ -180,7 +194,7 @@ tor directly.")
(define (home-parcimonie-shepherd-service config)
"Return a user service to run parcimonie."
(match-record config <home-parcimonie-configuration>
- (parcimonie verbose? gnupg-aleady-torified?
+ (parcimonie verbose? gnupg-already-torified?
refresh-guix-keyrings? extra-content)
(let ((log-file #~(string-append %user-log-dir "/parcimonie.log")))
(list (shepherd-service
@@ -194,7 +208,7 @@ tor directly.")
#$@(if verbose?
'("--verbose")
'())
- #$@(if gnupg-aleady-torified?
+ #$@(if gnupg-already-torified?
'("--gnupg_already_torified")
'())
#$@(if (not (string=? extra-content ""))
diff --git a/gnu/home/services/music.scm b/gnu/home/services/music.scm
new file mode 100644
index 0000000000..3813ea230e
--- /dev/null
+++ b/gnu/home/services/music.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Fabio Natali <me@fabionatali.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 home services music)
+ #:use-module (guix gexp)
+ #:use-module (guix records)
+ #:use-module (gnu home services)
+ #:use-module (gnu packages music)
+ #:use-module (gnu packages video)
+ #:export (home-beets-configuration
+ home-beets-service-type))
+
+;;; Commentary:
+;;;
+;;; A Guix Home service to configure Beets, a music file and metadata manager.
+;;;
+;;; Code:
+
+(define-record-type* <home-beets-configuration>
+ home-beets-configuration make-home-beets-configuration
+ home-beets-configuration?
+ (package home-beets-package (default beets))
+ (directory home-beets-directory (default #f))
+ (extra-options home-beets-extra-options (default '()))
+ (extra-packages home-beets-extra-packages (default (list ffmpeg))))
+
+(define (home-beets-configuration->file config)
+ "Return the Beets configuration file corresponding to CONFIG."
+ (match-record config <home-beets-configuration>
+ (directory extra-options)
+ (plain-file "beets.yaml"
+ (string-append "directory: " directory "\n"
+ (string-join extra-options "\n" 'suffix)))))
+
+(define home-beets-service-type
+ (service-type
+ (name 'home-beets)
+ (extensions
+ (list
+ (service-extension home-profile-service-type
+ (lambda (config)
+ (cons* (home-beets-package config)
+ (home-beets-extra-packages config))))
+ (service-extension home-xdg-configuration-files-service-type
+ (lambda (config)
+ (list `("beets/config.yaml"
+ ,(home-beets-configuration->file config)))))))
+ (description "Configure Beets, a music file and metadata manager.")))
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 3b06b4f01b..3792fc7e35 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -386,6 +386,7 @@ purposes."
guile-json-3 guile-git guile-webutils
guile-gnutls
guile-zlib ;for (gnu build linux-modules)
+ guile-zstd ;for (gnu build linux-modules)
(current-guix))
(with-imported-modules `(,@(source-module-closure
`(,@modules
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 51fa7cf9d9..dbdec1bba8 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
;;;
@@ -1187,7 +1187,13 @@ list and return the updated list."
(define (create-ext4-file-system partition)
"Create an ext4 file-system for PARTITION file-name."
- ((run-command-in-installer) "mkfs.ext4" "-F" partition))
+ ;; Enable the 'large_dir' feature so users can have a store of several TiBs.
+ ;; Failing to do that, the directory index (enabled by 'dir_index') can fill
+ ;; up and adding new files would fail with ENOSPC despite there being plenty
+ ;; of free space and inodes:
+ ;; <https://blog.merovius.de/posts/2013-10-20-ext4-mysterious-no-space-left-on/>.
+ ((run-command-in-installer) "mkfs.ext4" "-F" partition
+ "-O" "large_dir"))
(define (create-fat16-file-system partition)
"Create a fat16 file-system for PARTITION file-name."
diff --git a/gnu/local.mk b/gnu/local.mk
index aeb5a70517..37e2d35029 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -11,7 +11,7 @@
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
-# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018, 2023, 2024 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -48,7 +48,7 @@
# Copyright © 2021 Andrew Tropin <andrew@trop.in>
# Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
-# Copyright © 2022 Remco van 't Veer <remco@remworks.net>
+# Copyright © 2022, 2024 Remco van 't Veer <remco@remworks.net>
# Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
# Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
# Copyright © 2022 muradm <mail@muradm.net>
@@ -61,10 +61,12 @@
# Copyright © 2023 Andy Tai <atai@atai.org>
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
# Copyright © 2023 Bruno Victal <mirai@makinata.eu>
-# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+# Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
# Copyright © 2023 Herman Rimm <herman@rimm.ee>
# Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
# Copyright © 2024 David Elsing <david.elsing@posteo.net>
+# Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
+# Copyright © 2024 Fabio Natali <me@fabionatali.com>
#
# This file is part of GNU Guix.
#
@@ -106,6 +108,7 @@ GNU_SYSTEM_MODULES = \
%D%/home/services/mail.scm \
%D%/home/services/media.scm \
%D%/home/services/messaging.scm \
+ %D%/home/services/music.scm \
%D%/home/services/pm.scm \
%D%/home/services/shells.scm \
%D%/home/services/shepherd.scm \
@@ -268,10 +271,12 @@ GNU_SYSTEM_MODULES = \
%D%/packages/enlightenment.scm \
%D%/packages/entr.scm \
%D%/packages/erlang.scm \
+ %D%/packages/erlang-xyz.scm \
%D%/packages/esolangs.scm \
%D%/packages/fabric-management.scm \
%D%/packages/fcitx.scm \
%D%/packages/fcitx5.scm \
+ %D%/packages/fediverse.scm \
%D%/packages/figlet.scm \
%D%/packages/file.scm \
%D%/packages/file-systems.scm \
@@ -321,6 +326,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/golang-check.scm \
%D%/packages/golang-compression.scm \
%D%/packages/golang-crypto.scm \
+ %D%/packages/golang-maths.scm \
%D%/packages/golang-web.scm \
%D%/packages/golang-xyz.scm \
%D%/packages/gperf.scm \
@@ -442,7 +448,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/machine-learning.scm \
%D%/packages/magic-wormhole.scm \
%D%/packages/man.scm \
- %D%/packages/mastodon.scm \
%D%/packages/mail.scm \
%D%/packages/make-bootstrap.scm \
%D%/packages/markup.scm \
@@ -540,6 +545,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/printers.scm \
%D%/packages/profiling.scm \
%D%/packages/prolog.scm \
+ %D%/packages/prometheus.scm \
%D%/packages/pth.scm \
%D%/packages/pulseaudio.scm \
%D%/packages/pumpio.scm \
@@ -700,6 +706,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/auditd.scm \
%D%/services/avahi.scm \
%D%/services/base.scm \
+ %D%/services/backup.scm \
%D%/services/ca.scm \
%D%/services/certbot.scm \
%D%/services/cgit.scm \
@@ -769,6 +776,7 @@ GNU_SYSTEM_MODULES = \
%D%/system/mapped-devices.scm \
%D%/system/nss.scm \
%D%/system/pam.scm \
+ %D%/system/privilege.scm \
%D%/system/setuid.scm \
%D%/system/shadow.scm \
%D%/system/uuid.scm \
@@ -781,6 +789,7 @@ GNU_SYSTEM_MODULES = \
%D%/system/images/pinebook-pro.scm \
%D%/system/images/rock64.scm \
%D%/system/images/unmatched.scm \
+ %D%/system/images/visionfive2.scm \
%D%/system/images/wsl2.scm \
\
%D%/machine.scm \
@@ -814,6 +823,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 \
@@ -914,6 +924,9 @@ dist_patch_DATA = \
%D%/packages/patches/abcl-fix-build-xml.patch \
%D%/packages/patches/ableton-link-system-libraries-debian.patch \
%D%/packages/patches/abiword-explictly-cast-bools.patch \
+ %D%/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch \
+ %D%/packages/patches/abseil-cpp-20200923.3-duration-test.patch \
+ %D%/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch \
%D%/packages/patches/abseil-cpp-fix-strerror_test.patch \
%D%/packages/patches/adb-add-libraries.patch \
%D%/packages/patches/adb-libssl_11-compatibility.patch \
@@ -925,6 +938,7 @@ dist_patch_DATA = \
%D%/packages/patches/aegis-test-fixup-2.patch \
%D%/packages/patches/aegisub-icu59-include-unistr.patch \
%D%/packages/patches/aegisub-boost68.patch \
+ %D%/packages/patches/aegisub-boost81.patch \
%D%/packages/patches/aegisub-make43.patch \
%D%/packages/patches/agda-categories-remove-incompatible-flags.patch \
%D%/packages/patches/agda-categories-use-find.patch \
@@ -946,7 +960,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 \
@@ -954,11 +967,12 @@ dist_patch_DATA = \
%D%/packages/patches/asli-use-system-libs.patch \
%D%/packages/patches/aspell-CVE-2019-25051.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
+ %D%/packages/patches/atf-execute-with-shell.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \
%D%/packages/patches/atlas-gfortran-compat.patch \
- %D%/packages/patches/audacity-ffmpeg-fallback.patch \
+ %D%/packages/patches/audacity-ffmpeg-fallback.patch \
%D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \
%D%/packages/patches/audiofile-fix-sign-conversion.patch \
%D%/packages/patches/audiofile-CVE-2015-7747.patch \
@@ -988,6 +1002,7 @@ dist_patch_DATA = \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
+ %D%/packages/patches/biboumi-cmake-ignore-git.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
@@ -1010,7 +1025,7 @@ dist_patch_DATA = \
%D%/packages/patches/bloomberg-bde-cmake-module-path.patch \
%D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \
%D%/packages/patches/boolector-find-googletest.patch \
- %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
+ %D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \
%D%/packages/patches/breezy-fix-gio.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \
@@ -1020,17 +1035,20 @@ 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 \
%D%/packages/patches/cdrkit-libre-cross-compile.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
+ %D%/packages/patches/cf-tool-add-languages.patch \
%D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/cl-asdf-config-directories.patch \
%D%/packages/patches/clamav-config-llvm-libs.patch \
@@ -1046,19 +1064,27 @@ dist_patch_DATA = \
%D%/packages/patches/clang-11.0-libc-search-path.patch \
%D%/packages/patches/clang-12.0-libc-search-path.patch \
%D%/packages/patches/clang-13.0-libc-search-path.patch \
+ %D%/packages/patches/clang-13-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-14.0-libc-search-path.patch \
+ %D%/packages/patches/clang-14-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-15.0-libc-search-path.patch \
%D%/packages/patches/clang-16.0-libc-search-path.patch \
+ %D%/packages/patches/clang-16-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-17.0-libc-search-path.patch \
%D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch \
%D%/packages/patches/clang-18.0-libc-search-path.patch \
+ %D%/packages/patches/clang-cling-13-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
+ %D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-9-glibc-2.36-compat.patch \
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \
%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 \
@@ -1076,10 +1102,10 @@ dist_patch_DATA = \
%D%/packages/patches/converseen-hide-updates-checks.patch \
%D%/packages/patches/converseen-hide-non-free-pointers.patch \
%D%/packages/patches/cool-retro-term-wctype.patch \
+ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \
%D%/packages/patches/coreutils-gnulib-tests.patch \
%D%/packages/patches/cppcheck-disable-char-signedness-test.patch \
%D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\
- %D%/packages/patches/cpuinfo-system-libraries.patch \
%D%/packages/patches/cpulimit-with-glib-2.32.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crc32c-unbundle-googletest.patch \
@@ -1095,10 +1121,11 @@ dist_patch_DATA = \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
%D%/packages/patches/dante-non-darwin.patch \
+ %D%/packages/patches/date-ignore-zonenow.patch \
%D%/packages/patches/date-output-pkg-config-files.patch \
- %D%/packages/patches/datefudge-gettimeofday.patch \
%D%/packages/patches/dbacl-include-locale.h.patch \
- %D%/packages/patches/dbacl-icheck-multiple-definitions.patch \
+ %D%/packages/patches/dbacl-icheck-multiple-definitions.patch \
+ %D%/packages/patches/dblatex-inkscape-1.0.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
@@ -1107,11 +1134,19 @@ dist_patch_DATA = \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
- %D%/packages/patches/diffutils-fix-signal-processing.patch \
%D%/packages/patches/directfb-davinci-glibc-228-compat.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
- %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
- %D%/packages/patches/docbook-xsl-support-old-url.patch \
+ %D%/packages/patches/docbook-utils-documentation-edits.patch \
+ %D%/packages/patches/docbook-utils-escape-characters.patch \
+ %D%/packages/patches/docbook-utils-remove-jade-sp.patch \
+ %D%/packages/patches/docbook-utils-respect-refentry-for-name.patch \
+ %D%/packages/patches/docbook-utils-source-date-epoch.patch \
+ %D%/packages/patches/docbook-utils-use-date-element.patch \
+ %D%/packages/patches/docbook2x-filename-handling.patch \
+ %D%/packages/patches/docbook2x-fix-synopsis.patch \
+ %D%/packages/patches/docbook2x-manpage-typo.patch \
+ %D%/packages/patches/docbook2x-preprocessor-declaration.patch \
+ %D%/packages/patches/docbook2x-static-datadir-evaluation.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/dovecot-opensslv3.patch \
@@ -1126,6 +1161,7 @@ dist_patch_DATA = \
%D%/packages/patches/dune-istl-fix-solver-playground.patch \
%D%/packages/patches/durden-shadow-arcan.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \
+ %D%/packages/patches/dwarves-threading-reproducibility.patch \
%D%/packages/patches/dynaconf-unvendor-deps.patch \
%D%/packages/patches/dyninst-fix-glibc-compatibility.patch \
%D%/packages/patches/efivar-211.patch \
@@ -1160,15 +1196,14 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-telega-path-placeholder.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
- %D%/packages/patches/emacs-xelb-ignore-length-element.patch \
%D%/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch \
%D%/packages/patches/enblend-enfuse-reproducible.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
+ %D%/packages/patches/epiphany-fix-encoding-test.patch \
%D%/packages/patches/ergodox-firmware-fix-json-target.patch \
%D%/packages/patches/ergodox-firmware-fix-numpad.patch \
%D%/packages/patches/erlang-man-path.patch \
- %D%/packages/patches/esmini-no-clutter-log.patch \
%D%/packages/patches/esmini-use-pkgconfig.patch \
%D%/packages/patches/esmtp-add-lesmtp.patch \
%D%/packages/patches/eudev-rules-directory.patch \
@@ -1182,6 +1217,11 @@ dist_patch_DATA = \
%D%/packages/patches/fail2ban-python310-server-action.patch \
%D%/packages/patches/fail2ban-python310-server-actions.patch \
%D%/packages/patches/fail2ban-python310-server-jails.patch \
+ %D%/packages/patches/falcosecurity-libs-install-pman.patch \
+ %D%/packages/patches/falcosecurity-libs-libscap-pc.patch \
+ %D%/packages/patches/falcosecurity-libs-pkg-config.patch \
+ %D%/packages/patches/falcosecurity-libs-shared-library-fix.patch \
+ %D%/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch \
%D%/packages/patches/farstream-gupnp.patch \
%D%/packages/patches/farstream-make.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
@@ -1191,6 +1231,7 @@ dist_patch_DATA = \
%D%/packages/patches/fasthenry-spUtils.patch \
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
+ %D%/packages/patches/fbgemm-use-system-libraries.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
%D%/packages/patches/fbreader-fix-icon.patch \
%D%/packages/patches/feedbackd-use-system-gmobile.patch \
@@ -1206,31 +1247,39 @@ dist_patch_DATA = \
%D%/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch \
%D%/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch \
%D%/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch \
+ %D%/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch \
+ %D%/packages/patches/ffmpeg-4-binutils-2.41.patch \
%D%/packages/patches/fifengine-boost-compat.patch \
%D%/packages/patches/fifengine-python-3.9-compat.patch \
%D%/packages/patches/fifengine-swig-compat.patch \
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
+ %D%/packages/patches/file-32bit-time.patch \
%D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/firebird-riscv64-support-pt1.patch \
%D%/packages/patches/firebird-riscv64-support-pt2.patch \
%D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flatpak-fix-path.patch \
+ %D%/packages/patches/flatpak-fix-fonts-icons.patch \
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
%D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \
%D%/packages/patches/fluxbox-1.3.7-gcc.patch \
+ %D%/packages/patches/font-gnu-freefont-python3-compat.patch \
%D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
%D%/packages/patches/fontforge-hurd.patch \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/foxi-fix-build.patch \
%D%/packages/patches/fp16-implicit-double.patch \
%D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fpc-glibc-2.34-compat.patch \
%D%/packages/patches/fpm-newer-clamp-fix.patch \
+ %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 \
@@ -1271,6 +1320,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-6-fix-isl-includes.patch \
%D%/packages/patches/gcc-6-fix-buffer-size.patch \
%D%/packages/patches/gcc-6-libsanitizer-mode-size.patch \
+ %D%/packages/patches/gcc-7-libsanitizer-fsconfig-command.patch \
%D%/packages/patches/gcc-7-libsanitizer-mode-size.patch \
%D%/packages/patches/gcc-libvtv-runpath.patch \
%D%/packages/patches/gcc-strmov-store-file-names.patch \
@@ -1282,6 +1332,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-5-fix-powerpc64le-build.patch \
%D%/packages/patches/gcc-5-source-date-epoch-1.patch \
%D%/packages/patches/gcc-5-source-date-epoch-2.patch \
+ %D%/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch \
%D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \
%D%/packages/patches/gcc-6-cross-environment-variables.patch \
%D%/packages/patches/gcc-6-source-date-epoch-1.patch \
@@ -1296,15 +1347,18 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \
%D%/packages/patches/gcc-12-strmov-store-file-names.patch \
%D%/packages/patches/gcc-10-cross-environment-variables.patch \
+ %D%/packages/patches/gcc-10-libsanitizer-no-crypt.patch \
%D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \
%D%/packages/patches/gcc-12-cross-environment-variables.patch \
- %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \
%D%/packages/patches/gcc-11-libstdc++-powerpc.patch \
%D%/packages/patches/gcc-13-cross-system-header-dir.patch \
+ %D%/packages/patches/gcc-12-libsanitizer-no-crypt.patch \
+ %D%/packages/patches/gcc-13-libsanitizer-no-crypt.patch \
+ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \
+ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \
%D%/packages/patches/gcolor3-update-libportal-usage.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \
- %D%/packages/patches/gd-Revert-fix-303-gdlib.pc.patch \
%D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/gdm-elogind-support.patch \
%D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \
@@ -1316,15 +1370,21 @@ dist_patch_DATA = \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/gettext-libunicode-update.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
- %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \
+ %D%/packages/patches/ghc-9.2-cabal-support-package-path.patch \
+ %D%/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch \
%D%/packages/patches/ghc-9.2-grep-warnings.patch \
+ %D%/packages/patches/ghc-basement-fix-32-bit.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
%D%/packages/patches/ghc-testsuite-grep-compat.patch \
+ %D%/packages/patches/ghc-testsuite-recomp015-execstack.patch \
+ %D%/packages/patches/ghc-aeson-encodeDouble.patch \
%D%/packages/patches/ghc-basement-fix-32bit.patch \
%D%/packages/patches/ghc-bytestring-handle-ghc9.patch \
+ %D%/packages/patches/ghc-clock-realfrag.patch \
%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 \
@@ -1336,6 +1396,8 @@ dist_patch_DATA = \
%D%/packages/patches/glib-appinfo-watch.patch \
%D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
+ %D%/packages/patches/glibc-2.39-git-updates.patch \
+ %D%/packages/patches/glibc-2.39-fmod-libm-a.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
%D%/packages/patches/glibc-CVE-2019-9169.patch \
%D%/packages/patches/glibc-CVE-2019-19126.patch \
@@ -1346,6 +1408,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-bootstrap-system-2.2.5.patch \
%D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \
%D%/packages/patches/glibc-bootstrap-system.patch \
+ %D%/packages/patches/glibc-2.39-bootstrap-system.patch \
%D%/packages/patches/glibc-cross-objcopy.patch \
%D%/packages/patches/glibc-cross-objdump.patch \
%D%/packages/patches/glibc-dl-cache.patch \
@@ -1355,6 +1418,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \
%D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \
%D%/packages/patches/glibc-2.37-versioned-locpath.patch \
+ %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
%D%/packages/patches/glibc-hurd-getauxval.patch \
%D%/packages/patches/glibc-hurd-gettyent.patch \
@@ -1382,11 +1446,10 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
- %D%/packages/patches/gnumach-support-noide.patch \
+ %D%/packages/patches/gnulib-bootstrap.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
- %D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
@@ -1397,14 +1460,15 @@ dist_patch_DATA = \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
%D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \
%D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \
+ %D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \
%D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \
%D%/packages/patches/go-skip-gc-test.patch \
%D%/packages/patches/gourmet-sqlalchemy-compat.patch \
%D%/packages/patches/gpaste-fix-paths.patch \
%D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpodder-disable-updater.patch \
- %D%/packages/patches/gpsbabel-fix-i686-test.patch \
%D%/packages/patches/grantlee-fix-i586-precision.patch \
+ %D%/packages/patches/grantlee-register-metaenumvariable.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/grfcodec-gcc-compat.patch \
%D%/packages/patches/gromacs-tinyxml2.patch \
@@ -1421,6 +1485,7 @@ dist_patch_DATA = \
%D%/packages/patches/guile-linux-syscalls.patch \
%D%/packages/patches/guile-3.0-linux-syscalls.patch \
%D%/packages/patches/guile-ac-d-bus-fix-tests.patch \
+ %D%/packages/patches/guile-lib-fix-tests-for-guile2.2.patch \
%D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
%D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
%D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \
@@ -1444,7 +1509,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 \
@@ -1457,6 +1521,7 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
+ %D%/packages/patches/heatshrink-add-cmake.patch \
%D%/packages/patches/heimdal-CVE-2022-45142.patch \
%D%/packages/patches/helm-fix-gcc-9-build.patch \
%D%/packages/patches/highlight-gui-data-dir.patch \
@@ -1465,11 +1530,7 @@ dist_patch_DATA = \
%D%/packages/patches/htslib-for-stringtie.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hueplusplus-mbedtls.patch \
- %D%/packages/patches/hurd-add-without-rump-configure-option.patch \
- %D%/packages/patches/hurd-fix-rumpdisk-build.patch \
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
- %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \
- %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \
%D%/packages/patches/hwloc-1-test-btrfs.patch \
%D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-makeicecat.patch \
@@ -1481,25 +1542,20 @@ dist_patch_DATA = \
%D%/packages/patches/icecat-use-system-wide-dir.patch \
%D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \
%D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch \
+ %D%/packages/patches/icu4c-icu-22132-fix-vtimezone.patch \
%D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/idris-test-ffi008.patch \
%D%/packages/patches/igraph-fix-varargs-integer-size.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
- %D%/packages/patches/imagemagick-CVE-2020-27829.patch \
- %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
- %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
- %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
- %D%/packages/patches/inkscape-poppler-compat.patch \
%D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
- %D%/packages/patches/isync-openssl3-fix.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \
- %D%/packages/patches/jami-disable-integration-tests.patch \
+ %D%/packages/patches/jami-enable-testing.patch \
%D%/packages/patches/jami-libjami-headers-search.patch \
%D%/packages/patches/jami-qwindowkit.patch \
%D%/packages/patches/jami-skip-tests-requiring-internet.patch \
@@ -1572,8 +1628,9 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
- %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/kodi-mesa-eglchromium.patch \
+ %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
+ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
%D%/packages/patches/ldns-drill-examples.patch \
@@ -1602,6 +1659,7 @@ dist_patch_DATA = \
%D%/packages/patches/libgda-fix-missing-initialization.patch \
%D%/packages/patches/libgda-skip-postgresql-tests.patch \
%D%/packages/patches/libgit2-mtime-0.patch \
+ %D%/packages/patches/libgit2-uninitialized-proxy-settings.patch \
%D%/packages/patches/libgnome-encoding.patch \
%D%/packages/patches/libgnomeui-utf8.patch \
%D%/packages/patches/libgrss-CVE-2016-2001.patch \
@@ -1613,13 +1671,11 @@ 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 \
%D%/packages/patches/libmad-md_size.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \
- %D%/packages/patches/libmateweather-use-TZDIR.patch \
%D%/packages/patches/libmp4v2-c++11.patch \
%D%/packages/patches/libmpeg2-arm-private-symbols.patch \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \
@@ -1628,6 +1684,7 @@ dist_patch_DATA = \
%D%/packages/patches/libphonenumber-reproducible-build.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
+ %D%/packages/patches/libsepol-versioned-docbook.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtgvoip-disable-sse2.patch \
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
@@ -1645,6 +1702,7 @@ dist_patch_DATA = \
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libvpx-CVE-2023-5217.patch \
+ %D%/packages/patches/libvpx-CVE-2023-44488.patch \
%D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \
%D%/packages/patches/libwpd-gcc-compat.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
@@ -1699,6 +1757,7 @@ dist_patch_DATA = \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
+ %D%/packages/patches/lvm2-no-systemd.patch \
%D%/packages/patches/maturin-no-cross-compile.patch \
%D%/packages/patches/mecab-variable-param.patch \
%D%/packages/patches/memtest86+-build-reproducibly.patch \
@@ -1709,14 +1768,10 @@ 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 \
%D%/packages/patches/mit-krb5-hurd.patch \
- %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \
- %D%/packages/patches/mixxx-system-googletest-benchmark.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/mpg321-CVE-2019-14247.patch \
%D%/packages/patches/mpg321-gcc-10.patch \
@@ -1726,7 +1781,6 @@ dist_patch_DATA = \
%D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
- %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
@@ -1781,15 +1835,34 @@ dist_patch_DATA = \
%D%/packages/patches/openjdk-currency-time-bomb2.patch \
%D%/packages/patches/openjdk-9-pointer-comparison.patch \
%D%/packages/patches/openjdk-9-setsignalhandler.patch \
+ %D%/packages/patches/openjdk-9-classlist-reproducibility.patch \
+ %D%/packages/patches/openjdk-9-idlj-reproducibility.patch \
+ %D%/packages/patches/openjdk-9-jar-reproducibility.patch \
+ %D%/packages/patches/openjdk-9-module-reproducibility.patch \
+ %D%/packages/patches/openjdk-9-module2-reproducibility.patch \
+ %D%/packages/patches/openjdk-9-module3-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-char-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-classlist-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-corba-reproducibility.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-jar-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-jtask-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-module-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-module3-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-module4-reproducibility.patch \
%D%/packages/patches/openjdk-10-pointer-comparison.patch \
%D%/packages/patches/openjdk-10-setsignalhandler.patch \
+ %D%/packages/patches/openjdk-11-classlist-reproducibility.patch \
+ %D%/packages/patches/openjdk-13-classlist-reproducibility.patch \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openjdk-21-fix-rpath.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \
%D%/packages/patches/openrgb-unbundle-hueplusplus.patch \
+ %D%/packages/patches/openscad-fix-boost-join.patch \
+ %D%/packages/patches/openscad-with-cgal-5.3.patch \
+ %D%/packages/patches/openscad-with-cgal-5.4.patch \
%D%/packages/patches/opensles-add-license-file.patch \
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \
%D%/packages/patches/openssl-3.0-c-rehash-in.patch \
@@ -1814,26 +1887,26 @@ dist_patch_DATA = \
%D%/packages/patches/plasp-fix-normalization.patch \
%D%/packages/patches/plasp-include-iostream.patch \
%D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \
- %D%/packages/patches/podman-program-lookup.patch \
%D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/procps-strtod-test.patch \
- %D%/packages/patches/prusa-slicer-boost-fixes.patch \
%D%/packages/patches/prusa-slicer-fix-tests.patch \
- %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \
+ %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
%D%/packages/patches/python-3.12-fix-tests.patch \
%D%/packages/patches/python-accupy-use-matplotx.patch \
%D%/packages/patches/python-accupy-fix-use-of-perfplot.patch \
%D%/packages/patches/python-chai-drop-python2.patch \
+ %D%/packages/patches/python-clarabel-blas.patch \
%D%/packages/patches/python-docrepr-fix-tests.patch \
%D%/packages/patches/python-feedparser-missing-import.patch \
%D%/packages/patches/python-louvain-fix-test.patch \
+ %D%/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch \
%D%/packages/patches/python-random2-getrandbits-test.patch \
+ %D%/packages/patches/python-pillow-use-zlib-1.3.patch \
%D%/packages/patches/python-pyreadstat-link-libiconv.patch \
%D%/packages/patches/python-pyls-black-41.patch \
%D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \
- %D%/packages/patches/python-pytorch2-system-libraries.patch \
%D%/packages/patches/python-sip-include-dirs.patch \
%D%/packages/patches/python-sgmllib3k-assertions.patch \
%D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \
@@ -1864,7 +1937,6 @@ dist_patch_DATA = \
%D%/packages/patches/perl-5.14-no-sys-dirs.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-class-methodmaker-reproducible.patch \
- %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
%D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch \
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \
%D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch \
@@ -1887,7 +1959,6 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \
- %D%/packages/patches/po4a-partial-texinfo-menu-fix.patch \
%D%/packages/patches/polkit-disable-systemd.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \
@@ -1902,6 +1973,9 @@ dist_patch_DATA = \
%D%/packages/patches/psm-disable-memory-stats.patch \
%D%/packages/patches/psm-ldflags.patch \
%D%/packages/patches/psm-repro.patch \
+ %D%/packages/patches/pstoedit-fix-gcc12.patch \
+ %D%/packages/patches/pstoedit-fix-plainC.patch \
+ %D%/packages/patches/pstoedit-pkglibdir.patch \
%D%/packages/patches/pulseaudio-fix-mult-test.patch \
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \
%D%/packages/patches/pulseview-qt515-compat.patch \
@@ -1924,6 +1998,9 @@ 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-3-reproducible-build.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 \
@@ -1935,6 +2012,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-hiredis-fix-header.patch \
%D%/packages/patches/python-hiredis-use-system-hiredis.patch \
%D%/packages/patches/python-online-judge-api-client-tests.patch \
+ %D%/packages/patches/python-optree-fix-32-bit.patch \
%D%/packages/patches/python-pdoc3-tests.patch \
%D%/packages/patches/python-peachpy-determinism.patch \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
@@ -1950,24 +2028,27 @@ 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-1.9.0-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 \
- %D%/packages/patches/python-scikit-bio-1887.patch \
- %D%/packages/patches/python-scikit-optimize-1148.patch \
- %D%/packages/patches/python-scikit-optimize-1150.patch \
%D%/packages/patches/python-typing-inspect-fix.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \
%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 \
+ %D%/packages/patches/qemu-disable-aarch64-migration-test.patch \
%D%/packages/patches/qemu-disable-bios-tables-test.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qemu-glibc-2.30.patch \
@@ -2005,7 +2086,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 \
@@ -2033,6 +2113,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 \
@@ -2048,9 +2129,9 @@ dist_patch_DATA = \
%D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \
%D%/packages/patches/sbcl-clml-fix-types.patch \
%D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch \
- %D%/packages/patches/sbcl-fix-ppc64-build.patch \
- %D%/packages/patches/sbcl-fix-riscv-build.patch \
+ %D%/packages/patches/sbcl-fast-generic-functions-fix-sbcl-2.4.patch \
%D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \
+ %D%/packages/patches/sbcl-s-sysdeps-bt2.patch \
%D%/packages/patches/scalapack-gcc-10-compilation.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scilab-better-compiler-detection.patch \
@@ -2058,7 +2139,6 @@ dist_patch_DATA = \
%D%/packages/patches/scons-test-environment.patch \
%D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/scsh-nonstring-search-path.patch \
- %D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/seed-webkit.patch \
%D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \
%D%/packages/patches/sendgmail-remove-domain-restriction.patch \
@@ -2072,7 +2152,9 @@ dist_patch_DATA = \
%D%/packages/patches/slim-config.patch \
%D%/packages/patches/slim-login.patch \
%D%/packages/patches/slim-display.patch \
+ %D%/packages/patches/slurm-23-salloc-fallback-shell.patch \
%D%/packages/patches/stex-copy-from-immutable-store.patch \
+ %D%/packages/patches/sysdig-shared-falcosecurity-libs.patch \
%D%/packages/patches/syslinux-gcc10.patch \
%D%/packages/patches/syslinux-strip-gnu-property.patch \
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
@@ -2125,7 +2207,7 @@ dist_patch_DATA = \
%D%/packages/patches/tofi-32bit-compat.patch \
%D%/packages/patches/tpetra-remove-duplicate-using.patch \
%D%/packages/patches/transcode-ffmpeg.patch \
- %D%/packages/patches/transmission-4.0.5-fix-build.patch \
+ %D%/packages/patches/transmission-4.0.6-fix-build.patch \
%D%/packages/patches/trytond-add-egg-modules-to-path.patch \
%D%/packages/patches/trytond-add-guix_trytond_path.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
@@ -2191,6 +2273,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 \
@@ -2204,11 +2287,13 @@ dist_patch_DATA = \
%D%/packages/patches/wcstools-extend-makefiles.patch \
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
- %D%/packages/patches/webrtc-audio-processing-big-endian.patch \
+ %D%/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch \
+ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch \
%D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
%D%/packages/patches/wlroots-hwdata-fallback.patch \
%D%/packages/patches/wmctrl-64-fix.patch \
+ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
%D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \
@@ -2229,14 +2314,14 @@ dist_patch_DATA = \
%D%/packages/patches/xfce4-settings-defaults.patch \
%D%/packages/patches/xgboost-use-system-dmlc-core.patch \
%D%/packages/patches/xmonad-dynamic-linking.patch \
+ %D%/packages/patches/xnnpack-remove-broken-tests.patch \
%D%/packages/patches/xnnpack-system-libraries.patch \
- %D%/packages/patches/xnnpack-for-torch2-system-libraries.patch \
%D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
- %D%/packages/patches/xpra-5.0-systemd-run.patch \
- %D%/packages/patches/xpra-5.0-install_libs.patch \
+ %D%/packages/patches/xpra-6.0-systemd-run.patch \
+ %D%/packages/patches/xpra-6.1-install_libs.patch \
%D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
@@ -2246,9 +2331,7 @@ 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 \
%D%/packages/patches/zig-use-system-paths.patch \
%D%/packages/patches/zsh-egrep-failing-test.patch \
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index b47ce7c225..3e10d984e7 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -178,6 +178,8 @@ shell command with escalated privileges for MACHINE's configuration."
(if (string= "root" (machine-ssh-configuration-user
(machine-configuration machine)))
'()
+ ;; Use the old setuid-programs location until the remote is likely to
+ ;; have the new /run/privileged one in place.
'("/run/setuid-programs/sudo" "-n" "--")))
(define (managed-host-remote-eval machine exp)
@@ -222,7 +224,8 @@ exist on the machine."
(not (member (file-system-type fs)
%pseudo-file-system-types))
;; Don't try to validate network file systems.
- (not (string-prefix? "nfs" (file-system-type fs)))
+ (not (or (string-prefix? "nfs" (file-system-type fs))
+ (string-prefix? "cifs" (file-system-type fs))))
(not (memq 'bind-mount (file-system-flags fs)))))
(operating-system-file-systems (machine-operating-system machine))))
diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm
index 1635ed54fd..d3b08323f7 100644
--- a/gnu/packages/abiword.scm
+++ b/gnu/packages/abiword.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix gexp)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
@@ -53,7 +55,9 @@
(origin
(method url-fetch)
(uri
- (string-append "https://www.abisource.com/downloads/abiword/" version
+ ;; XXX: The main site <https://www.abisource.com/> is down. Only a (partial)
+ ;; mirror is available at <http://www.nl.abisource.com/>.
+ (string-append "http://www.nl.abisource.com/downloads/abiword/" version
"/source/abiword-" version ".tar.gz"))
(sha256
(base32 "1d1179pnslijpjhz1q155fsc828rrlqf7lsn2inqsl3hk5z28mqj"))
@@ -62,35 +66,35 @@
(build-system glib-or-gtk-build-system)
(arguments ;; NOTE: rsvg is disabled, since Abiword
- `(#:configure-flags ;; supports it directly, and its BS is broken.
- (list ;; wmf was removed from Guix for security.
- "--enable-clipart" ;; TODO: The following plugins have unresolved
- "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
- (string-append ;; wordperfect, psion, mathview.
- "--enable-plugins="
- "applix " "babelfish " "bmp " "clarisworks " "collab " "command "
- "docbook " "eml " "epub " "freetranslation " "garble " "gdict "
- "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword "
- "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
- "openwriter " "openxml " "opml " "ots " "paint " "passepartout "
- "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
- "wikipedia " "wml " "xslfo")
- "--enable-introspection"
- (string-append "--with-gir-dir="
- (assoc-ref %outputs "out")
- "/share/gir-1.0")
- (string-append "--with-typelib-dir="
- (assoc-ref %outputs "out")
- "/lib/girepository-1.0"))
- ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
- ;; assertion 'GDK_IS_SCREEN (screen)' failed
- ;; GLib-GObject-CRITICAL **: g_object_get_qdata:
- ;; assertion 'G_IS_OBJECT (object)' failed
- ;; Manually starting the X server before the test phase did not help
- ;; the tests to pass.
- #:tests? #f
- #:make-flags
- (list "gtk_update_icon_cache=true")))
+ (list #:configure-flags ;; supports it directly, and its BS is broken.
+ #~(list ;; wmf was removed from Guix for security.
+ "--enable-clipart" ;; TODO: The following plugins have unresolved
+ "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
+ (string-append ;; wordperfect, psion, mathview.
+ "--enable-plugins="
+ "applix " "babelfish " "bmp " "clarisworks " "collab " "command "
+ "docbook " "eml " "epub " "freetranslation " "garble " "gdict "
+ "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword "
+ "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
+ "openwriter " "openxml " "opml " "ots " "paint " "passepartout "
+ "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
+ "wikipedia " "wml " "xslfo")
+ "--enable-introspection"
+ (string-append "--with-gir-dir="
+ #$output
+ "/share/gir-1.0")
+ (string-append "--with-typelib-dir="
+ #$output
+ "/lib/girepository-1.0"))
+ ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
+ ;; assertion 'GDK_IS_SCREEN (screen)' failed
+ ;; GLib-GObject-CRITICAL **: g_object_get_qdata:
+ ;; assertion 'G_IS_OBJECT (object)' failed
+ ;; Manually starting the X server before the test phase did not help
+ ;; the tests to pass.
+ #:tests? #f
+ #:make-flags
+ #~(list "gtk_update_icon_cache=true")))
(inputs
(list boost
enchant
@@ -120,7 +124,7 @@
libtool
pkg-config
python-wrapper))
- (home-page "https://www.abisource.com/")
+ (home-page "http://www.nl.abisource.com/")
(synopsis "Word processing program")
;; HACKERS: The comment below is here so that it shows up early in the
diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index 1b5fd6db50..d9165190e9 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
-;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz@gmail.com>
;;; Copyright © 2023 Ivan Gankevich <igankevich@capybaramail.xyz>
;;;
@@ -33,6 +33,7 @@
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages lisp)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages pcre)
@@ -77,11 +78,31 @@
(arguments
`(#:tests? #f ; Tests require drivers
#:configure-flags
- (list
- "--disable-static"
- "--enable-fake")))
+ (list "--disable-static"
+ "--enable-fake")
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (this-package-native-input "config")
+ `((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) dir))
+ '("config.guess" "config.sub")))
+ '("." "libltdl")))))
+ '()))))
(native-inputs
- (list latex2html pkg-config python-wrapper swig))
+ (append
+ (if (or (target-aarch64?)
+ (target-ppc64le?)
+ (target-riscv64?))
+ (list config)
+ '())
+ (list latex2html pkg-config python-wrapper swig)))
(inputs
(list glib gtk+-2 libusb-compat))
(synopsis "Portable Braille Library")
@@ -152,17 +173,22 @@ terminals.")
(assoc-ref python:%standard-phases
'add-install-to-pythonpath)))))
(native-inputs
- (list clisp
- python-cython
- doxygen
- gettext-minimal
- `(,icedtea "jdk")
- ;; ("linuxdoc" ,linuxdoc-tools)
- ocaml
- ocaml-findlib
- pkg-config
- python-wrapper
- tcl))
+ (append
+ (list clisp
+ python-cython
+ doxygen
+ gettext-minimal)
+ ;; icedtea doesn't build reliably on all architectures.
+ (if (or (target-x86?)
+ (target-aarch64?))
+ (list `(,icedtea "jdk"))
+ '())
+ (list ;; ("linuxdoc" ,linuxdoc-tools)
+ ocaml
+ ocaml-findlib
+ pkg-config
+ python-wrapper
+ tcl)))
(inputs
(list alsa-lib
at-spi2-core
@@ -359,28 +385,34 @@ CONFIG_SPEAKUP_SOFT=m
(method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/v" version
"/" name "-v" version ".tar.gz"))
- (sha256 (base32 "0cvdkfakw7cix07j0c4iy10fkbqn6n8l1gr5dd3iy4f2d9bkza43"))))
+ (sha256
+ (base32 "0cvdkfakw7cix07j0c4iy10fkbqn6n8l1gr5dd3iy4f2d9bkza43"))
+ (snippet
+ #~(begin (use-modules (guix build utils))
+ (substitute* "Makefile"
+ (("-D__i386__") ""))))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; there are no tests
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'strtof
- (lambda _
- (substitute* "mouseloupe.c"
- (("\\bstrtof\\b") "mouseloupe_strtof"))))
- (replace 'install
- (lambda _
- (define out (assoc-ref %outputs "out"))
- (install-file "mouseloupe" (string-append out "/bin"))
- (install-file "mouseloupe.1.gz" (string-append out "/share/man/man1")))))))
+ (list
+ #:tests? #f ; there are no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'strtof
+ (lambda _
+ (substitute* "mouseloupe.c"
+ (("\\bstrtof\\b") "mouseloupe_strtof"))))
+ (replace 'install
+ (lambda _
+ (install-file "mouseloupe" (string-append #$output "/bin"))
+ (install-file "mouseloupe.1.gz"
+ (string-append #$output "/share/man/man1")))))))
(native-inputs
- (list pkg-config))
+ (list pkg-config))
(inputs
- (list libx11 libxext libxcomposite libxdamage libxrender))
+ (list libx11 libxext libxcomposite libxdamage libxrender))
(synopsis "Screen magnifier tool for people with low vision")
- (description "MouseLoupe is a kind of magnifying glass combined with the mouse pointer
-which allows an easy and pleasant web navigation.")
+ (description "MouseLoupe is a kind of magnifying glass combined with the
+mouse pointer which allows an easy and pleasant web navigation.")
(home-page "https://sourceforge.net/projects/mouseloupe/")
(license license:gpl2+)))
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index eb20fdd549..bc37572252 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -52,7 +52,7 @@
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:configure-flags '("--disable-static")
#:tests? ,(not (or (%current-target-system)
(target-hurd?)))
@@ -66,13 +66,11 @@
(ftw "." (lambda (file stat flag)
(unless (<= early-1980 (stat:mtime stat))
(utime file early-1980 early-1980))
- #t))
- #t)))
+ #t)))))
(add-after 'build 'patch-exec-bin-sh
(lambda _
(substitute* "test/run"
- (("/bin/sh") (which "sh")))
- #t))
+ (("/bin/sh") (which "sh")))))
(add-before 'check 'patch-tests
(lambda _
;; The coreutils do not have an ACL bit to remove from their
@@ -84,12 +82,9 @@
(substitute* "Makefile.in"
((".*test/misc\\.test.*") "")
((".*test/cp\\.test.*") "")
- ((".*test/setfacl-X\\.test.*") ""))
- #t)))))
+ ((".*test/setfacl-X\\.test.*") "")))))))
(inputs (list attr))
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("perl" ,perl)))
+ (native-inputs (list gettext-minimal perl))
(home-page "https://savannah.nongnu.org/projects/acl")
(synopsis
"Library and tools for manipulating access control lists")
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 46b4e78a39..19a75e43a4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -36,7 +36,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Hyunseok Kim <lasnesne@lagunposprasihopre.org>
@@ -47,7 +47,7 @@
;;; Copyright © 2021 muradm <mail@muradm.net>
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2021 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2021-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -65,6 +65,9 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; Copyright © 2024 dan <i@dan.games>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
+;;; Copyright © 2024 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -114,6 +117,7 @@
#:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-windows)
@@ -122,6 +126,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages datastructures)
+ #:use-module (gnu packages debian)
#:use-module (gnu packages dns)
#:use-module (gnu packages elf)
#:use-module (gnu packages file)
@@ -215,7 +220,7 @@
(lambda _
(substitute* "configure.ac"
(("supath=`which su 2>/dev/null`")
- "supath=/run/setuid-programs/su"))
+ "supath=/run/privileged/bin/su"))
#t)))))
(native-inputs
(list autoconf automake libtool pkg-config))
@@ -232,23 +237,30 @@ simplicity in mind.")
(define-public aide
(package
(name "aide")
- (version "0.16.2")
+ (version "0.18.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/aide/aide/releases/download/v"
version "/aide-" version ".tar.gz"))
(sha256
- (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"))))
+ (base32 "0q1sp0vwrwbmw6ymw1kwd4i8walijwppa0dq61b2qzni6b32srhn"))))
(build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags #~(list "--with-posix-acl"
+ "--with-selinux"
+ "--with-xattr"
+ "--with-config-file=/etc/aide.conf")))
(native-inputs
- (list bison flex))
+ (list bison flex pkg-config))
(inputs
- (list libgcrypt
+ (list acl
+ attr
+ libgcrypt
libgpg-error
libmhash
- `(,pcre "static")
- pcre
+ libselinux
+ pcre2
`(,zlib "static")
zlib))
(synopsis "File and directory integrity checker")
@@ -373,23 +385,21 @@ 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
(inherit shepherd-0.9)
- (version "0.10.4")
+ (version "0.10.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
- "0206r2l914qjahzd1qill57r1qcg1x8faj0f6qv3x42wqx6x28ky"))))
+ "0k40n9qm5r5rqf94isa1857ghd4329zc5rjf3ll2572gpiw3ij4x"))))
(native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
(replace "guile-fibers"
;; Work around
@@ -397,14 +407,15 @@ interface and is based on GNU Guile.")
;; affects any system without a functional real-time
;; clock (RTC), but in practice these are typically Arm
;; single-board computers.
- (if (target-arm?)
+ (if (or (target-arm?)
+ (target-riscv64?))
guile-fibers-1.1
guile-fibers))))
(inputs (modify-inputs (package-inputs shepherd-0.9)
(replace "guile-fibers"
(this-package-native-input "guile-fibers"))))))
-(define-public shepherd shepherd-0.9)
+(define-public shepherd shepherd-0.10)
(define-public guile2.2-shepherd
(package
@@ -521,9 +532,10 @@ inspired by @command{vi}.")
(list "bin/readlink"
"sbin/sfdisk")))))))))))
(inputs
- (list coreutils ; for readlink
+ (list bash-minimal ;for wrap-program
+ coreutils ;for readlink
python
- util-linux)) ; sfdisk for growpart
+ util-linux)) ;sfdisk for growpart
(home-page "https://launchpad.net/cloud-utils")
(synopsis "Set of utilities for cloud computing environments")
(description
@@ -617,7 +629,7 @@ services.")
"daemonize runs a command as a Unix daemon. It will close all open file
descriptors, change working directory of the process to the root filesystem,
reset its umask, run in the background, ignore I/O signals, handle
-@code{SIGCLD}, etc. Most programs that are designed to be run as daemons do
+@code{SIGCHLD}, etc. Most programs that are designed to be run as daemons do
that work for themselves. However, you’ll occasionally run across one that
does not. When you must run a daemon program that does not properly make
itself into a true Unix daemon, you can use daemonize to force it to run as a
@@ -639,7 +651,7 @@ true daemon.")
"0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; There are no tests.
- (native-inputs `(("gettext" ,gettext-minimal)))
+ (native-inputs (list gettext-minimal))
(home-page "https://projects.gw-computing.net/projects/dfc")
(synopsis "Display file system space usage using graphs and colors")
(description
@@ -755,7 +767,7 @@ console.")
(define-public btop
(package
(name "btop")
- (version "1.3.0")
+ (version "1.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -764,7 +776,7 @@ console.")
(file-name (git-file-name name version))
(sha256
(base32
- "0fbrkzg03n2vamg1pfzdb8wxm3xffy6gp4izhqppl45zngy3c0s1"))))
+ "084n0nbv1029lvfv4na2k9fqyray7m77dff1537b8ffk08ib4d4j"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no test suite
@@ -825,7 +837,7 @@ on memory usage on GNU/Linux systems.")
(define-public htop
(package
(name "htop")
- (version "3.2.2")
+ (version "3.3.0")
(source
(origin
(method git-fetch)
@@ -833,7 +845,7 @@ on memory usage on GNU/Linux systems.")
(url "https://github.com/htop-dev/htop")
(commit version)))
(sha256
- (base32 "0cyaprgnhfrc7rqq053903bjylaplvxkb65b04bsxmiva09lvf9s"))
+ (base32 "0g2rpp9plblmd9khic2f06089hfh0iy521dqqnr3vkin6s9m0f58"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
@@ -939,6 +951,7 @@ memory, disks, network and processes. It's a Python port and continuation of
(("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))))))))
(native-inputs (list bison flex))
+ (inputs (list libxcrypt))
(home-page "https://www.gnu.org.ua/software/pies/")
(synopsis "Program invocation and execution supervisor")
(description
@@ -951,45 +964,48 @@ re-executing them as necessary.")
(define-public inetutils
(package
(name "inetutils")
- (version "2.3")
+ (version "2.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/inetutils/inetutils-"
version ".tar.gz"))
(sha256
(base32
- "1dj4ilxy1wrfxhxc85iya3x28h1mhjpqc5nv862xcq3ww2gqkv8w"))))
+ "0q1257ci22g2jbdiqs00mharc1lqkbibdlkhj23f3si6qjxkn17s"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--localstatedir=/var"
-
- ;; Make sure 'PATH_PROCNET_DEV' gets defined when
- ;; cross-compiling (by default it does not.)
- ,@(if (%current-target-system)
- '("--with-path-procnet-dev=/proc/net/dev")
- '())
- ,@(if (target-hurd?)
- '("--disable-rcp"
- "--disable-rexec"
- "--disable-rexecd"
- "--disable-rlogin"
- "--disable-rlogind"
- "--disable-rsh"
- "--disable-rshd"
- "--disable-uucpd"
- "--disable-whois")
- '()))
- ;; Make sure that canonical "coreutils" package is not referred.
- #:make-flags
- (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
- (search-input-file %build-inputs "bin/cp")
- "\\\""))
- ;; On some systems, 'libls.sh' may fail with an error such as:
- ;; "Failed to tell switch -a apart from -A".
- #:parallel-tests? #f))
+ (list
+ #:configure-flags
+ #~(list "--localstatedir=/var"
+
+ ;; Make sure 'PATH_PROCNET_DEV' gets defined when
+ ;; cross-compiling (by default it does not.)
+ #$@(if (%current-target-system)
+ '("--with-path-procnet-dev=/proc/net/dev")
+ '())
+ #$@(if (target-hurd?)
+ '("--disable-rcp"
+ "--disable-rexec"
+ "--disable-rexecd"
+ "--disable-rlogin"
+ "--disable-rlogind"
+ "--disable-rsh"
+ "--disable-rshd"
+ "--disable-uucpd"
+ "--disable-whois")
+ '()))
+ ;; Make sure that canonical "coreutils" package is not referred.
+ #:make-flags
+ #~(list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
+ (search-input-file %build-inputs "bin/cp")
+ "\\\""))
+ ;; On some systems, 'libls.sh' may fail with an error such as:
+ ;; "Failed to tell switch -a apart from -A".
+ #:parallel-tests? #f))
(inputs
(list coreutils
shadow ;for login (used in telnetd and rlogind)
+ libxcrypt
ncurses
readline)) ;for 'ftp'
(native-inputs
@@ -1040,9 +1056,7 @@ hostname.")
,@(if (%current-target-system)
'((add-before 'configure 'set-runtime-shell
(lambda* (#:key inputs #:allow-other-keys)
- (let ((shell (string-append
- (assoc-ref inputs "bash")
- "/bin/bash")))
+ (let ((shell (search-input-file inputs "/bin/bash")))
(setenv "RUNTIME_SHELL" shell)
(substitute* "configure.ac"
(("\\$SHELL")
@@ -1073,12 +1087,13 @@ hostname.")
(delete-file (string-append bin "/groups"))
(for-each delete-file (find-files man "^groups\\."))))))))
(inputs
- `(,@(if (target-hurd?)
- '()
- `(("linux-pam" ,linux-pam)))
- ,@(if (%current-target-system)
- `(("bash" ,bash-minimal))
- '())))
+ (append (if (target-hurd?)
+ '()
+ (list linux-pam))
+ (if (%current-target-system)
+ (list bash-minimal)
+ '())
+ (list libxcrypt)))
(home-page "https://github.com/shadow-maint/shadow")
(synopsis "Authentication-related tools such as passwd, su, and login")
(description
@@ -1563,7 +1578,8 @@ connection alive.")
(coreutils (assoc-ref inputs "coreutils*"))
(inetutils (assoc-ref inputs "inetutils"))
(grep (assoc-ref inputs "grep*"))
- (sed (assoc-ref inputs "sed*")))
+ (sed (assoc-ref inputs "sed*"))
+ (debianutils (assoc-ref inputs "debianutils")))
(substitute* "client/scripts/linux"
(("/sbin/ip")
(search-input-file inputs "/sbin/ip")))
@@ -1578,7 +1594,7 @@ connection alive.")
,(map (lambda (dir)
(string-append dir "/bin:"
dir "/sbin"))
- (list inetutils coreutils grep sed))))))))))
+ (list inetutils coreutils grep sed debianutils))))))))))
(native-inputs
(list config perl file))
@@ -1589,6 +1605,10 @@ connection alive.")
'()
`(("iproute" ,iproute)))
+ ;; dhclient-script provides hooks to users and uses run-parts in
+ ;; order to list users defined hooks.
+ ("debianutils" ,debianutils)
+
;; isc-dhcp bundles a copy of BIND, which has proved vulnerable
;; in the past. Use a BIND-VERSION of our choosing instead.
("bind-source-tarball"
@@ -1786,8 +1806,7 @@ by bandwidth they use.")
(substitute* (list "lib/App/ClusterSSH/Config.pm"
"t/15config.t")
(("xterm")
- (which "xterm")))
- #t))
+ (which "xterm")))))
(add-before 'check 'delete-failing-tests
(lambda _
;; This checks whether all code is nicely formatted. The above
@@ -1795,8 +1814,7 @@ by bandwidth they use.")
(delete-file "t/perltidy.t")
;; Update the manifest so t/manifest.t happily passes.
(substitute* "MANIFEST"
- (("t/perltidy.t\n") ""))
- #t))
+ (("t/perltidy.t\n") ""))))
(add-after 'install 'augment-library-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -1821,8 +1839,7 @@ by bandwidth they use.")
"perl-try-tiny"
"perl-x11-protocol"
"perl-x11-protocol-other")))))))
- (find-files "." ".*")))
- #t))))))
+ (find-files "." ".*")))))))))
(native-inputs
(list perl-cpan-changes
perl-file-slurp
@@ -1837,7 +1854,8 @@ by bandwidth they use.")
perl-test-trap
perltidy))
(inputs
- (list perl-exception-class
+ (list bash-minimal ;for wrap-program
+ perl-exception-class
perl-sort-naturally
perl-tk
perl-try-tiny
@@ -1902,7 +1920,7 @@ realms/domains like Active Directory or IPA.")
(define-public rename
(package
(name "rename")
- (version "1.10")
+ (version "2.02")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1910,7 +1928,7 @@ realms/domains like Active Directory or IPA.")
version ".tar.gz"))
(sha256
(base32
- "137m8s06r4n038ivlr5r1d9a7q9l7shmwpvnyx053r9ndhvbnkh5"))))
+ "1pr0qmsb9gb5xqwpicabnr5jcxdbbvz1mgdqw3d3d0dn12060ysk"))))
(build-system perl-build-system)
(arguments
`(#:phases
@@ -1926,10 +1944,10 @@ realms/domains like Active Directory or IPA.")
(wrap-program program
`("PERL5LIB" ":" prefix
(,(string-append out "/lib/perl5/site_perl")))))
- (find-files "." ".*")))
- #t))))))
+ (find-files "." ".*")))))))))
(native-inputs
(list perl-module-build perl-test-pod perl-test-pod-coverage))
+ (inputs (list bash-minimal)) ;for wrap-program
(home-page "https://metacpan.org/pod/distribution/File-Rename/rename.PL")
(synopsis "Perl extension for renaming multiple files")
(description
@@ -2140,7 +2158,7 @@ commands and their arguments.")
(substitute* "doas.c"
(("safepath =" match)
(string-append match " \""
- "/run/setuid-programs:"
+ "/run/privileged/bin:"
"/run/current-system/profile/bin:"
"/run/current-system/profile/sbin:"
"\" ")))))
@@ -2160,6 +2178,8 @@ commands and their arguments.")
#:tests? #f)) ; no test suite
(native-inputs
(list bison))
+ (inputs
+ (list libxcrypt))
(home-page "https://github.com/Duncaen/OpenDoas")
(synopsis "Portable version of OpenBSD's doas command")
(description "Doas is a minimal replacement for the venerable sudo. It was
@@ -2318,10 +2338,14 @@ command.")
(native-inputs
;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant)
- (prepend imagemagick inkscape/stable)))
+ (prepend imagemagick/stable
+ inkscape/stable)))
(build-system qt-build-system)
(arguments
(list
+ ;; Make sure the (rarely updated) package 'imagemagick/stable'
+ ;; does not end up in the closure.
+ #:disallowed-references (list imagemagick/stable)
#:test-target "check"
#:phases
#~(modify-phases %standard-phases
@@ -2577,7 +2601,11 @@ system is under heavy load.")
(base32 "1z9vjn2131iv3pwrh04z6r5ygi1qgad5bi3jhghcvc3v1b4k5ran"))))
(build-system gnu-build-system)
(arguments
- (list #:make-flags
+ ;; XXX The test suite seems to cause instability on the VisionFive 2
+ ;; build machines, maybe it's stressing them as intended but this is
+ ;; unhelpful
+ (list #:tests? (not (target-riscv64?))
+ #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "BINDIR=" #$output "/bin")
;; XXX Really: MAN1DIR, or man pages won't be found.
@@ -2698,7 +2726,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)
@@ -2707,10 +2735,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
@@ -2725,14 +2753,14 @@ features of ls(1), find(1), stat(1) and du(1).")
(define-public direvent
(package
(name "direvent")
- (version "5.3")
+ (version "5.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/direvent/direvent-"
version ".tar.gz"))
(sha256
(base32
- "15y4jk5vlcd003bvf42c6z9zd4gz4pwqpwaapqmyk7x4gnksh1cl"))))
+ "1flmswj1by9afqal55hc70l2hshcawyn0j2if92y6rxb58cwdfqx"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -2796,7 +2824,7 @@ various ways that may be running with too much privilege.")
(define-public smartmontools
(package
(name "smartmontools")
- (version "7.3")
+ (version "7.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2804,7 +2832,7 @@ various ways that may be running with too much privilege.")
version "/smartmontools-" version ".tar.gz"))
(sha256
(base32
- "0ax2wf5j8k2fbm85s0rbj9sajn5q3j2a2k22wyqcyn0cin0ghi55"))))
+ "0gcrzcb4g7f994n6nws26g6x15yjija1gyzd359sjv7r3xj1z9p9"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
@@ -2845,13 +2873,13 @@ specified directories.")
(define-public ansible-core
(package
(name "ansible-core")
- (version "2.15.5")
+ (version "2.17.1")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "ansible-core" version))
+ (uri (pypi-uri "ansible_core" version))
(sha256
- (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc"))))
+ (base32 "007ginimzbizx2c3fp3vccizscyki0fp4yg3bzl3qz6ipdqrsi26"))))
(build-system python-build-system)
(arguments
`(#:modules ((guix build python-build-system)
@@ -2983,13 +3011,13 @@ provides the following commands:
(define-public ansible
(package
(name "ansible")
- (version "8.5.0")
+ (version "10.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
- (base32 "0bazj5h12wraf30bb2schzwk553y20n9vh45km4b5kgmvadm0z1j"))))
+ (base32 "0apj783acx4jzkf3bnibn4y5jc6jd8ly7l0rdqq8f1jpgxal933x"))))
(build-system python-build-system)
(propagated-inputs (list ansible-core))
;; The Ansible collections are found by ansible-core via the Python search
@@ -3227,31 +3255,31 @@ frequently used directories by typing only a small pattern.")
(define-public fasd
(package
(name "fasd")
- (version "1.0.1")
+ (version "1.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/clvv/fasd")
+ (url "https://github.com/whjvenyl/fasd")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1awi71jdv3mhjrmar2d4z1i90kn7apd7aq1w31sh6w4yibz9kiyj"))))
+ "0q72a54dcahc9pan5qkmnsvpqiqgjjxwdxzzm8pxzylpr329jjyh"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure)) ;no configuration
#:tests? #f ;no tests
#:make-flags (list (string-append "PREFIX=" %output))))
- (home-page "https://github.com/clvv/fasd")
+ (home-page "https://github.com/whjvenyl/fasd")
(synopsis "Quick access to files and directories for shells")
(description
- "Fasd (pronounced similar to \"fast\") is a command-line productivity
-booster. Fasd offers quick access to files and directories for POSIX shells.
-It is inspired by tools like autojump, z, and v. Fasd keeps track of files
-and directories you have accessed so that you can quickly reference them in
-the command line.")
- (license license:x11)))
+ "Fasd (pronounced similar to \"fast\") is a command-line productivity booster.
+Fasd offers quick access to files and directories for POSIX shells. It is inspired
+by tools like @code{autojump}, @code{z}, and @code{v}. Fasd keeps track of files and
+directories you have accessed so that you can quickly reference them in the command
+line.")
+ (license license:expat)))
(define-public iftop
(package
@@ -3438,7 +3466,8 @@ rules is done with the @code{auditctl} utility.")
;; Nmap can't cope with out-of-source building.
#:out-of-source? #f))
(inputs
- (list libpcap
+ (list bash-minimal ;for wrap-program
+ libpcap
lua
openssl-3.0
pcre
@@ -3474,26 +3503,26 @@ results (ndiff), and a packet generation and response analysis tool (nping).")
"dstat-skip-devices-without-io.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no make check
- #:make-flags
- (list (string-append "prefix=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-python3-DeprecationWarning
- (lambda _
- (substitute* "dstat"
- (("collections") "collections.abc"))
- #t))
- (delete 'configure) ; no configure script
- (add-after 'install 'wrap
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/dstat")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ (list
+ #:tests? #f ; no make check
+ #:make-flags
+ #~(list (string-append "prefix=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-python3-DeprecationWarning
+ (lambda _
+ (substitute* "dstat"
+ (("collections") "collections.abc"))))
+ (delete 'configure) ; no configure script
+ (add-after 'install 'wrap
+ (lambda _
+ (wrap-program (string-append #$output "/bin/dstat")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))))))))
(inputs
- `(("python" ,python-wrapper)
- ("python-six" ,python-six)))
+ (list bash-minimal ;for wrap-program
+ python-wrapper
+ python-six))
(synopsis "Versatile resource statistics tool")
(description "Dstat is a versatile replacement for @command{vmstat},
@command{iostat}, @command{netstat}, and @command{ifstat}. Dstat overcomes
@@ -3598,14 +3627,14 @@ a new command using the matched rule, and runs it.")
(define-public di
(package
(name "di")
- (version "4.52")
+ (version "4.53")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/diskinfo-di/"
"di-" version ".tar.gz"))
(sha256
- (base32 "07vsnn1gxm3r7dchbrq63iazd64gza2ac7b2m1039708rf5flxdp"))))
+ (base32 "0gp806m7jk2rfymy5r62a2lfd8jq879qy94blrjqvb0xq7pmpp80"))))
(build-system gnu-build-system)
(arguments
(list
@@ -4245,6 +4274,37 @@ everyone's screenshots nowadays.")
information tool.")
(license license:expat))))
+(define-public fastfetch
+ (package
+ (name "fastfetch")
+ (version "2.16.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fastfetch-cli/fastfetch")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "112dvfx7gvp6n20i1lkd0jbh897jf7bxjxq96bj4099j3x313y3m"))))
+ (build-system cmake-build-system)
+ (inputs (list dbus
+ glib
+ imagemagick
+ libxcb
+ mesa
+ wayland
+ zlib)) ;for imagemagick and an #ifdef
+ (native-inputs (list pkg-config))
+ (arguments (list #:tests? #f)) ; no test target
+ (home-page "https://github.com/fastfetch-cli/fastfetch")
+ (synopsis "Display system information in a stylized manner")
+ (description
+ "Fastfetch is a tool for fetching system information and displaying it in
+a stylized way. Fastfetch displays this information next to a logo of the
+system distribution, akin to many similar tools.")
+ (license license:expat)))
+
(define-public nnn
(package
(name "nnn")
@@ -4313,7 +4373,7 @@ hard-coded.")
autoconf-archive
automake
`(,glib "bin") ; for glib-genmarshal, etc.
- gtk-doc
+ gtk-doc/stable
pkg-config))
(inputs
(list dbus-glib libevdev libxml2 upower xz))
@@ -4704,7 +4764,7 @@ cache of unix and unix-like systems.")
(define-public solaar
(package
(name "solaar")
- (version "1.0.7")
+ (version "1.1.13")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4713,7 +4773,7 @@ cache of unix and unix-like systems.")
(file-name (git-file-name name version))
(sha256
(base32
- "0k7mjdfvf28fay50b2hs2z4qk6s23h71wvl8777idlrz5i5f43j5"))))
+ "1fz3qgjx3ygr4clgh7iryxgvvjy510rgy8ixr2xld2wr0xa6p0mi"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -4721,9 +4781,12 @@ cache of unix and unix-like systems.")
(add-before 'build 'setenv-PATH
(lambda _
(setenv "PYTHONPATH" "lib"))))))
+ (native-inputs (list python-pytest))
(propagated-inputs
(list python-pygobject
python-pyudev
+ python-dbus-python
+ python-evdev
;; For GUI.
python-pyyaml
python-psutil
@@ -5036,7 +5099,7 @@ text table representation to stdout.")
":" (assoc-ref %build-inputs "grep") "/bin"
":" (assoc-ref %build-inputs "ncurses") "/bin"
":" (assoc-ref %build-inputs "sed") "/bin"
- ":" "/run/setuid-programs"
+ ":" "/run/privileged/bin"
":" (getenv "PATH")))
(substitute* "hosts"
(("#!/usr/bin/env bash")
@@ -5115,14 +5178,14 @@ Netgear devices.")
(define-public atop
(package
(name "atop")
- (version "2.9.0")
+ (version "2.11.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.atoptool.nl/download/atop-"
version ".tar.gz"))
(sha256
(base32
- "09prpw20ps6cd8qr63glbcip3jrvnnic0m7j1q02g8hjnw8z50ld"))
+ "083fckjn2s3276fqyjb3rcwqrws7qc3fgk1f82zzgzrfc1kcd54v"))
(snippet
;; The 'mkdate' script generates a new 'versdate.h' header
;; containing the build date. That makes builds
@@ -5150,8 +5213,10 @@ Netgear devices.")
;; Otherwise, it creates a blank configuration file as a "default".
(("touch.*DEFPATH)/atop") "")
(("chmod.*DEFPATH)/atop") "")))))))
+ (native-inputs (list pkg-config))
(inputs
- (list ncurses
+ (list glib
+ ncurses
python-wrapper ; for `atopgpud`
zlib))
(home-page "https://www.atoptool.nl/")
@@ -5716,6 +5781,64 @@ mediate access to shared devices, such as graphics and input, for applications
that require it.")
(license license:expat)))
+(define-public sysdig
+ ;; Use the latest commit for now, as the latest 0.36.1 release does not yet
+ ;; support the falcosecurity-libs 0.16 API.
+ (let ((commit "598ad292b659425e475e5814d9e92c3c29188480")
+ (revision "0"))
+ (package
+ (name "sysdig")
+ (version (git-version "0.36.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/draios/sysdig")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0yyins3rb286dfibadfwwp2gwmdj7fsz3pdkpdvx05yvdqfkqds7"))
+ (patches
+ (search-patches "sysdig-shared-falcosecurity-libs.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:configure-flags
+ #~(list "-DUSE_BUNDLED_DEPS=OFF"
+ ;; Already built and part of falcosecurity-libs, but
+ ;; needed for the 'HAS_MODERN_BPF' define.
+ "-DBUILD_SYSDIG_MODERN_BPF=ON"
+ #$(string-append "-DSYSDIG_VERSION=" version))))
+ (native-inputs (list pkg-config))
+ (inputs
+ (list falcosecurity-libs
+ luajit
+ ncurses
+ nlohmann-json
+ yaml-cpp
+ zlib))
+ (home-page "https://github.com/draios/sysdig")
+ (synopsis "System exploration and troubleshooting tool")
+ (description "Sysdig is a simple tool for deep system visibility, with
+native support for containers. It combines features of multiple system
+administration tools such as the @command{strace}, @command{tcpdump},
+@command{htop}, @command{iftop} and @command{lsof} into a single interface.
+The novel architecture of the tool means that the performance impact of the
+tracing on the system is very light, compared to the likes of
+@command{strace}. The @command{sysdig} command has an interface similar to
+@command{strace}, while the @command{csysdig} command is better suited for
+interactive used, and has a user interface similar to @command{htop}.
+
+If you use Guix System, the kernel Linux has @acronym{BPF, Berkeley Packet
+Filter} support, and you should launch this tool using the @samp{--modern-bpf}
+argument of the @command{sysdig} or @command{csysdig} commands. The following
+Bash aliases can be added to your @file{~/.bash_profile} file, for example:
+
+alias sysdig=sudo sysdig --modern-bpf
+alias cysdig=sudo csysdig --modern-bpf
+") ;XXX no @example Texinfo support
+ (license license:asl2.0))))
+
(define-public fail2ban
(package
(name "fail2ban")
@@ -6035,7 +6158,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="
@@ -6117,7 +6239,7 @@ file or files to several hosts.")
(install-file "completions/dust.fish"
(string-append share "/fish/vendor_completions.d"))
(install-file "completions/_dust"
- (string-append share "/zsh/site-fuctions"))))))))
+ (string-append share "/zsh/site-functions"))))))))
(home-page "https://github.com/bootandy/dust")
(synopsis "Graphical disk usage analyzer")
(description "This package provides a graphical disk usage analyzer in
@@ -6236,3 +6358,27 @@ versions of @command{find}, including POSIX, GNU, and *BSD find.")
their content instead of their file names. It is useful for compressing
backup directories or just finding duplicate files.")
(license license:gpl2+)))
+
+(define-public sshguard
+ (package
+ (name "sshguard")
+ (version "2.4.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://bitbucket.org/sshguard/sshguard")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dkijr287zpwdz1bjdchxzmwf1sk6vzpkycz1skm25lkaba6nd9r"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list autoconf automake bison flex python-docutils))
+ (home-page "https://sshguard.net/")
+ (synopsis "Daemon to blocks SSH brute-force attacks")
+ (description
+ "SSHGuard protects hosts from brute-force attacks against SSH and other
+services. It aggregates system logs and blocks repeat offenders using one of
+several firewall backends.")
+ (license license:isc)))
diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index ead40bce1b..bf07219d17 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -34,7 +34,7 @@
(define-public adns
(package
(name "adns")
- (version "1.6.0")
+ (version "1.6.1")
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://gnu/adns/adns-"
@@ -44,7 +44,7 @@
version ".tar.gz")))
(sha256
(base32
- "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"))))
+ "1k81sjf0yzv6xj35vcxp0ccajxrhhmyly7a57xlbs1kmkdwb6f3i"))))
(build-system gnu-build-system)
(arguments
;; Make sure the programs under bin/ fine libadns.so.
diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm
index c2ebf09e4a..4afe583b2e 100644
--- a/gnu/packages/agda.scm
+++ b/gnu/packages/agda.scm
@@ -102,7 +102,7 @@
(add-after 'unpack 'set-ld-library-path
(lambda _
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build"))))
- (add-after 'compile 'agda-compile
+ (add-after 'build 'agda-compile
(lambda* (#:key outputs #:allow-other-keys)
(let ((agda-compiler (string-append #$output "/bin/agda")))
(for-each (cut invoke agda-compiler <>)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index ad1e70c62c..f2c5634d33 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -922,7 +922,7 @@ algorithms from the FORTRAN library MINPACK.")
(define-public symengine
(package
(name "symengine")
- (version "0.11.2")
+ (version "0.12.0")
(source
(origin
(method git-fetch)
@@ -931,7 +931,7 @@ algorithms from the FORTRAN library MINPACK.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0j6vd72hjj9fnsw5iiykmkrw8vyjcyyycgib2zxlmlzi6sj4618b"))))
+ (base32 "0vi9d0isfpdhraigpw5zffcqh5fy08anax7kji7csm3n6jx9zy29"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@@ -1540,6 +1540,8 @@ finite fields.")
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool pkg-config))
+ (propagated-inputs
+ (list zlib)) ;required by libm4ri.la
(inputs
(list libpng))
(synopsis "Arithmetic of dense matrices over F_2")
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index b6f37732b4..11e05dced9 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -532,7 +532,7 @@ that is safe to use for user space. It also includes
"LDFLAGS=-L . -lpcre")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack-core 'patch-HOST
+ (add-after 'unpack 'patch-HOST
(lambda _
;; gettid duplicates otherwise.
(substitute* "src/procattr.c"
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 3bcf1cc8f0..2d533fca8b 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -34,6 +34,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -191,7 +192,7 @@ for tweening, preventing the need to hand-draw each frame.")
(wrap-program (string-append #$output "/bin/synfigstudio")
`("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
(inputs
- (list gtkmm-3 gtk+ libsigc++ synfig))
+ (list bash-minimal gtkmm-3 gtk+ libsigc++ synfig))
(native-inputs
(list pkg-config intltool))
(home-page "https://www.synfig.org")
@@ -410,7 +411,8 @@ language.")
qt)))
#t))))))
(inputs
- `(("qt" ,qtbase-5)
+ `(("bash" ,bash-minimal)
+ ("qt" ,qtbase-5)
("qtmultimedia-5" ,qtmultimedia-5)
("libsndfile" ,libsndfile)))
(native-inputs
@@ -440,7 +442,7 @@ waveform until they line up with the proper sounds.")
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
+ (list bash-minimal qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
(arguments
(list
#:phases
@@ -468,6 +470,37 @@ lets you create traditional hand-drawn animations (cartoons) using both bitmap
and vector graphics.")
(license license:gpl2)))
+(define-public tgs2png
+ (let ((commit "25c15b7c2ca3b1a580a383d9d3cb13bf8531d04a")
+ (revision "0"))
+ (package
+ (name "tgs2png")
+ (version (git-version "0.3.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zevlg/tgs2png")
+ (commit commit)))
+ (sha256
+ (base32 "0camvzapkfvr9v0nkk96n26rdmw0g8wbpv41i5l03j6bzdgm4myl"))
+ (file-name (git-file-name "tgs2png" version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "rlottie")
+ #t))))
+ (arguments '(#:tests? #f))
+ (build-system cmake-build-system)
+ (inputs
+ (list rlottie libpng))
+ (native-inputs
+ (list pkg-config))
+ (home-page "https://github.com/zevlg/tgs2png")
+ (synopsis "Convert Telegram's animated stickers to PNG")
+ (description "Convert Telegram's animated stickers in TGS format into series of PNG images.")
+ (license license:gpl3+))))
+
(define-public swftools
;; Last release of swftools was 0.9.2 on 2012-04-21 - it is really old and
;; does not compile with what's available in guix, master on the other hand works.
diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index 0b56c8b088..1c1cd200a9 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -142,7 +142,7 @@ symbols, and almost all Latin-1 accented letters.")
(native-inputs (list `(,openjdk18 "jdk") zip))
(arguments
(list
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build ant-build-system))
#:modules `((guix build gnu-build-system)
((guix build ant-build-system) #:prefix ant:)
diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm
index ddbd9eb7a9..a65737b9a3 100644
--- a/gnu/packages/apparmor.scm
+++ b/gnu/packages/apparmor.scm
@@ -171,7 +171,7 @@ supported by Canonical since 2009.")
(chdir "../profiles")))
(add-after 'chdir-profiles 'build-profiles
(assoc-ref %standard-phases 'build))
- (add-after 'check-build 'install-profiles
+ (add-after 'build-profiles 'install-profiles
(assoc-ref %standard-phases 'install)))))))
(propagated-inputs
(list libapparmor))
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index aac3822eae..390eadc43a 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -26,6 +26,7 @@
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages perl)
#:use-module (gnu packages xml)
#:use-module (gnu packages autotools))
@@ -33,14 +34,14 @@
(define-public apr
(package
(name "apr")
- (version "1.7.0")
+ (version "1.7.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/apr/apr-"
version ".tar.bz2"))
(sha256
(base32
- "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"))
+ "0xsmqgjiyw3s6va5dm86djnjzg9r0qc1zsldwz4sd8pkhglqsr7w"))
(patches
(search-patches "apr-skip-getservbyname-test.patch"))
(patch-flags '("-p0"))))
@@ -51,16 +52,25 @@
;; Thus, build sequentially.
`(#:parallel-build? #f
#:parallel-tests? #f
- ,@(if (target-ppc32?)
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-sources
- (lambda* (#:key inputs native-inputs #:allow-other-keys)
- (invoke "patch" "-p1" "--force" "--input"
- (assoc-ref (or native-inputs inputs)
- "atomics-patch"))))))
- '())))
- (inputs (list perl libltdl))
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (target-ppc32?)
+ `((add-after 'unpack 'patch-sources
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (invoke "patch" "-p1" "--force" "--input"
+ (assoc-ref (or native-inputs inputs)
+ "atomics-patch")))))
+ '())
+ (add-after 'install 'patch-libxcrypt-reference
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (define out (assoc-ref outputs "out"))
+ (define libxcrypt
+ (dirname (search-input-file inputs "/lib/libcrypt.so.1")))
+ (substitute* (list (string-append out "/bin/apr-1-config")
+ (string-append out "/lib/pkgconfig/apr-1.pc"))
+ (("-lcrypt")
+ (string-append "-L" libxcrypt " -lcrypt"))))))))
+ (inputs (list perl libltdl libxcrypt))
(native-inputs
`(,@(if (target-ppc32?)
`(("atomics-patch"
@@ -81,17 +91,17 @@ around or take advantage of platform-specific deficiencies or features.")
(define-public apr-util
(package
(name "apr-util")
- (version "1.6.1")
+ (version "1.6.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/apr/apr-util-"
version ".tar.bz2"))
(sha256
(base32
- "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk"))))
+ "1dbjjwyfqvq7xa7xsxq2rv0clkwsmna2j12575n34ih7f7ipc454"))))
(build-system gnu-build-system)
(inputs
- (list apr))
+ (list apr libxcrypt))
(propagated-inputs
(list expat))
(arguments
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index f86e8206e5..114ca772fb 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -174,13 +174,13 @@ engine with a Lua scripting interface.")
(inputs
(modify-inputs (package-inputs arcan)
(delete "libdrm")
- (prepend glu libglvnd mesa sdl)))
+ (prepend glu libglvnd mesa sdl2)))
(arguments
`(,@(ensure-keyword-arguments
(package-arguments arcan)
'(#:configure-flags
'("-DCMAKE_C_FLAGS=-fcommon"
- "-DVIDEO_PLATFORM=sdl" "-DBUILTIN_LUA=off"
+ "-DHYBRID_SDL=on" "-DBUILTIN_LUA=off"
"-DSTATIC_OPENAL=off" "-DDISABLE_JIT=off"
"-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off"
"-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on")))))
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 3bfe0bd3e0..3e2890aa3b 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -5,16 +5,17 @@
;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
-;;; Copyright © 2019 Andy Tai <atai@atai.org>
+;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
-;;; Copyright © 2022 Andy Tai <atai@atai.org>
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -64,7 +65,7 @@
#:select (%current-system cc-for-target)))
(define-public asl
- (let ((build "247"))
+ (let ((build "267"))
(package
(name "asl")
(version (string-append "1.42-beta-" build))
@@ -75,7 +76,7 @@
"http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/"
"asl-current-142-bld" build ".tar.bz2"))
(sha256
- (base32 "1qgz5yzg50vpwzrjqvw8bgnvm67dqhfb8ldxyqwaqmrj3icshp5s"))))
+ (base32 "13j2ccfgji4jiqbbqmcchhcps11ypz8aq8fq9vd83ngbhavh6c9s"))))
(build-system gnu-build-system)
(arguments
(list
@@ -223,7 +224,7 @@ to the clients.")
(define-public simde
(package
(name "simde")
- (version "0.7.2")
+ (version "0.8.2")
(source
(origin
(method git-fetch)
@@ -232,7 +233,7 @@ to the clients.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0xkf21gbkgz6zlxabkmgwvy7py6cdnfqx9aplj90gz25gzrr1mkb"))))
+ (base32 "0giijq5n3q1nv8c5skfq2dar70rgbsm7yk0gdj22wpsa58fc624a"))))
(build-system meson-build-system)
;; We really want this for the headers, and the tests require a bundled library.
(arguments '(#:configure-flags '("-Dtests=false")))
@@ -357,7 +358,7 @@ runtime")
(define-public rgbds
(package
(name "rgbds")
- (version "0.5.2")
+ (version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -366,7 +367,7 @@ runtime")
(file-name (git-file-name name version))
(sha256
(base32
- "13zy05xzh2yxyvzf78a5h59pabwrfr6qs5m453pfbdyd3msg2s7w"))))
+ "1gy75q0ikx0ki1wsrq97hxj9dw9436fcys2w91ipm90pbhk4ljva"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -458,23 +459,25 @@ Supported architectures are:
(define-public xa
(package
(name "xa")
- (version "2.3.14")
+ (version "2.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.floodgap.com/retrotech/xa"
"/dists/xa-" version ".tar.gz"))
(sha256
(base32
- "0bph41aglxl07rnggrir2dl1x97f52hm0bl51d0vklyqvfyvm6qv"))))
+ "1hrspv9hxgk2nkbbh24g84hn0rglfwj8p7849zrn9qx869m2mhb3"))))
(build-system gnu-build-system)
(arguments
(list
- #:tests? #f ; TODO: custom test harness, not sure how it works
+ #:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'configure)) ; no "configure" script
#:make-flags
- #~(list (string-append "DESTDIR=" #$output)))) ; no $prefix support
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "LD=" #$(cc-for-target))
+ (string-append "DESTDIR=" #$output)))) ; no $prefix support
(native-inputs (list perl))
(home-page "https://www.floodgap.com/retrotech/xa/")
(synopsis "Two-pass portable cross-assembler")
@@ -646,6 +649,61 @@ SSE4.2) intrinsic functions as defined in corresponding x86 compilers headers
files.")
(license license:bsd-2))))
+(define-public cpu-features
+ (package
+ (name "cpu-features")
+ (version "0.9.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/cpu_features")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0297li3408zm1dqnibaasrb51vs7n7iscnxsji3b78g0pir7jwxr"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest
+ "-DBUILD_SHARED_LIBS=ON"
+ #$@(let ((target (%current-target-system)))
+ (if target
+ (cond ((string-prefix? "arm" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=arm"))
+ ((string-prefix? "aarch64" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
+ ((string-prefix? "i686" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=x86"))
+ ((string-prefix? "x86_64" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
+ ;; 32-bit and 64-bit
+ ((string-prefix? "powerpc" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
+ ((string-prefix? "riscv64" target)
+ '("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
+ (else '()))
+ '())))))
+ (home-page "https://github.com/google/cpu_features")
+ (synopsis "Cross platform C99 library to get cpu features at runtime")
+ (description
+ "Cpu_features is a cross-platform C library to retrieve CPU features
+(such as available instructions) at runtime, and supports these CPU architectures
+@itemize
+@item x86-64
+@item AArch64
+@item ARM
+@item MIPS
+@item POWER
+@item RISC-V
+@item LoongArch
+@item S390x
+@end itemize")
+ (license license:asl2.0)))
+
+
(define-public blinkenlights
(package
(name "blinkenlights")
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 560d5491e7..1a25681c1e 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
-;;; Copyright © 2023 Iliya Tikhonenko <tikhonenko@mpe.mpg.de>
+;;; Copyright © 2023-2024 Iliya Tikhonenko <tikhonenko@mpe.mpg.de>
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
@@ -35,6 +35,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
@@ -57,8 +58,10 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
+ #:use-module (gnu packages jupyter)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libusb)
+ #:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages maths)
@@ -83,11 +86,13 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages sphinx)
+ #:use-module (gnu packages statistics)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
+ #:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
@@ -97,7 +102,7 @@
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
- #:use-module (guix build-system python)
+ #:use-module ((guix build-system python) #:select (pypi-uri))
#:use-module (guix build-system pyproject)
#:use-module (guix download)
#:use-module (guix gexp)
@@ -127,13 +132,15 @@
#$output)
(string-append "VERSION="
#$version))
+ #:tests? (not (or (%current-target-system)
+ ;; The test suite consumes all disk space
+ (target-riscv64?)))
+ #:test-target "fittest"
#:phases #~(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(add-after 'install 'post-install-check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "make" "fittest")))))))
+ (assoc-ref %standard-phases 'check)))))
(inputs (list cfitsio gfortran))
(home-page "https://nebulousresearch.org/codes/alfa/")
(synopsis "Automated line fitting algorithm")
@@ -186,23 +193,85 @@ reused in several astronomical applications, such as @code{wsclean},
@code{aoflagger}, @code{DP3} and @code{everybeam}.")
(license license:gpl3+))))
+(define-public aoflagger
+ (package
+ (name "aoflagger")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/aroffringa/aoflagger")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0dxmcy04cayhs4s2z41wls1dnmg9hkffvlqcmc660idqziffvv1g"))
+ (patches
+ (search-patches "aoflagger-use-system-provided-pybind11.patch"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; Tests require external files download from
+ ;; https://www.astron.nl/citt/ci_data/aoflagger/
+ #:tests? #f
+ #:configure-flags
+ #~(list (string-append "-DCASACORE_ROOT_DIR="
+ #$(this-package-input "casacore")))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; aocommon and pybind11 are expected to be found as git submodules,
+ ;; link them before build.
+ (add-after 'unpack 'link-submodule-package
+ (lambda _
+ (rmdir "external/aocommon")
+ (symlink #$(this-package-native-input "aocommon")
+ (string-append (getcwd) "/external/aocommon")))))))
+ (native-inputs
+ (list aocommon
+ boost
+ pkg-config
+ python
+ pybind11))
+ (inputs
+ (list casacore
+ cfitsio
+ fftw
+ gsl
+ gtkmm-3
+ hdf5
+ libpng
+ libsigc++
+ libxml2
+ lua
+ openblas
+ zlib))
+ (home-page "https://gitlab.com/aroffringa/aoflagger")
+ (synopsis "Astronomical tool that can find and remove radio-frequency interference")
+ (description
+ "AOFlagger is a tool that can find and remove radio-frequency
+interference (RFI) in radio astronomical observations. It can make use of Lua
+scripts to make flagging strategies flexible, and the tools are applicable to a
+wide set of telescopes.")
+ (license license:gpl3+)))
+
(define-public calceph
(package
(name "calceph")
- (version "3.5.5")
+ (version "4.0.0")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.obspm.fr/imcce_calceph/calceph")
+ (commit (string-append name "_"
+ (string-replace-substring version "." "_")))))
(sha256
- (base32 "1jiaqyir2qcxzjlhk7f9fhrf6snjsiwxznvzdl996xr6m4lzbb7p"))))
- (build-system gnu-build-system)
+ (base32 "1yabdq51plg3dijp68xajhsz395gi2fyp5qkvrj3dgv8d4qw52nw"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
(native-inputs
(list gfortran))
(home-page "https://www.imcce.fr/inpop/calceph")
- (properties `((release-monitoring-url . ,home-page)))
(synopsis "Astronomical library to access the binary planetary ephemeris files")
(description
"The CALCEPH Library is designed to access the binary planetary ephemeris files,
@@ -278,67 +347,6 @@ rendering of the atmosphere model and examine its properties.
(replace "qtbase" qtbase-5)))
(synopsis "Qt5 build for the CalcMySky library.")))
-(define-public aoflagger
- (package
- (name "aoflagger")
- (version "3.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/aroffringa/aoflagger")
- (commit (string-append "v" version))))
- (sha256
- (base32 "0dxmcy04cayhs4s2z41wls1dnmg9hkffvlqcmc660idqziffvv1g"))
- (patches
- (search-patches "aoflagger-use-system-provided-pybind11.patch"))
- (file-name (git-file-name name version))))
- (build-system cmake-build-system)
- (arguments
- (list
- ;; Tests require external files download from
- ;; https://www.astron.nl/citt/ci_data/aoflagger/
- #:tests? #f
- #:configure-flags
- #~(list (string-append "-DCASACORE_ROOT_DIR="
- #$(this-package-input "casacore")))
- #:phases
- #~(modify-phases %standard-phases
- ;; aocommon and pybind11 are expected to be found as git submodules,
- ;; link them before build.
- (add-after 'unpack 'link-submodule-package
- (lambda _
- (rmdir "external/aocommon")
- (symlink #$(this-package-native-input "aocommon")
- (string-append (getcwd) "/external/aocommon")))))))
- (native-inputs
- (list aocommon
- boost
- pkg-config
- python
- pybind11))
- (inputs
- (list casacore
- cfitsio
- fftw
- gsl
- gtkmm-3
- hdf5
- libpng
- libsigc++
- libxml2
- lua
- openblas
- zlib))
- (home-page "https://gitlab.com/aroffringa/aoflagger")
- (synopsis "Astronomical tool that can find and remove radio-frequency interference")
- (description
- "AOFlagger is a tool that can find and remove radio-frequency
-interference (RFI) in radio astronomical observations. It can make use of Lua
-scripts to make flagging strategies flexible, and the tools are applicable to a
-wide set of telescopes.")
- (license license:gpl3+)))
-
(define-public casacore
(package
(name "casacore")
@@ -449,10 +457,90 @@ with namespaces, exception handling, and member template functions.")
(license (license:non-copyleft "file://License.txt"
"See License.txt in the distribution."))))
+(define-public celestia
+ (package
+ (name "celestia")
+ (version "1.6.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/celestiaproject/celestia")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0nz9k5nd2zmrbwj1qhsfwmvqymqk8c4yjxpybck44isrild2ah9j"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:modules
+ `((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1)
+ (srfi srfi-71))
+ #:configure-flags
+ #~(list "--with-glut"
+ (string-append "--with-lua=" #$(this-package-input "lua")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-lua-version
+ (lambda _
+ (let* ((_ version (package-name->name+version
+ #$(this-package-input "lua")))
+ (components (string-split version #\.))
+ (major+minor (string-join (take components 2) ".")))
+ (substitute* "configure.ac"
+ (("lua5.3")
+ (string-append "lua-" major+minor)))))))))
+ (native-inputs
+ (list autoconf
+ automake
+ gettext-minimal
+ libgit2
+ libtool
+ perl
+ pkg-config))
+ (inputs
+ (list freeglut
+ glu
+ libjpeg-turbo
+ libpng
+ libtheora
+ mesa))
+ (propagated-inputs
+ (list lua))
+ (home-page "https://celestia.space/")
+ (synopsis "Real-time 3D visualization of space")
+ (description
+ "This simulation program lets you explore our universe in three
+dimensions. Celestia simulates many different types of celestial objects.
+From planets and moons to star clusters and galaxies, you can visit every
+object in the expandable database and view it from any point in space and
+time. The position and movement of solar system objects is calculated
+accurately in real time at any rate desired.")
+ (license license:gpl2+)))
+
+(define-public celestia-gtk
+ (package/inherit celestia
+ (name "celestia-gtk")
+ (inputs
+ (modify-inputs (package-inputs celestia)
+ (replace "freeglut" gtk+-2)
+ (prepend cairo gtkglext libxmu libtheora pango-1.42)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments celestia)
+ ((#:configure-flags flags '())
+ #~(append #$flags
+ (list "--enable-cairo"
+ "--enable-theora"
+ "--without-glut"
+ "--with-gtk")))))
+ (synopsis "Real-time 3D visualization of space (using GTK+)")))
+
(define-public cfitsio
(package
(name "cfitsio")
- (version "4.4.0")
+ (version "4.4.1")
(source
(origin
(method url-fetch)
@@ -460,7 +548,7 @@ with namespaces, exception handling, and member template functions.")
"https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
"cfitsio-" version ".tar.gz"))
(sha256
- (base32 "1abb4ky6pjyi9f9ly8qjmkb5h25d5xxqlrxrgjg86q77bbwhr44m"))))
+ (base32 "098x1l8ijwsjp2ivp3v7pamrmpgwj5xmgb4yppm9w3w044zxr8b6"))))
(build-system gnu-build-system)
(arguments
(list
@@ -493,6 +581,131 @@ in FITS files.")
(license (license:non-copyleft "file://License.txt"
"See License.txt in the distribution."))))
+(define-public erfa
+ (package
+ (name "erfa")
+ (version "2.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/liberfa/erfa")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hxjbcvdlq4871r17fphbaf3bd8dsjagp1rdb3j8v6kr4f1dil9n"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake autoconf libtool pkg-config))
+ (home-page "https://github.com/liberfa/erfa")
+ (synopsis "Essential Routines for Fundamental Astronomy")
+ (description
+ "The @acronym{ERFA, Essential Routines for Fundamental Astronomy} C library
+contains key algorithms for astronomy, and is based on the @acronym{SOFA,
+Standards of Fundamental Astronomy} library published by the @acronym{IAU,
+International Astronomical Union}.")
+ (license license:bsd-3)))
+
+(define-public eye
+ (package
+ (name "eye")
+ (version "1.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/eye")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1j8rpgz3fjp6fw0qmxgfqycf3n01fzxds4w12vgyrhbnk658ia41"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "CPPFLAGS=-fcommon"))) ; fix build with GCC 10
+ (home-page "https://www.astromatic.net/software/eye")
+ (synopsis "Small image feature detector using machine learning")
+ (description
+ "In @acronym{EyE, Enhance Your Extraction} an artificial neural network
+connected to pixels of a moving window (@dfn{retina}) is trained to associate
+these input stimuli to the corresponding response in one or several output
+image(s). The resulting filter can be loaded in SExtractor to operate
+complex, wildly non-linear filters on astronomical images. Typical
+applications of EyE include adaptive filtering, feature detection and cosmetic
+corrections.")
+ (license license:cecill)))
+
+(define-public psfex
+ (package
+ (name "psfex")
+ (version "3.24.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/psfex")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ykgzyxnxjxqk6b8jng006wjilg4fqaxclpfn8plg6brk1qf39sn"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "CPPFLAGS=-fcommon"
+ "--enable-openblas"
+ "--enable-plplot"
+ (string-append "--with-fftw-libdir="
+ #$(this-package-input "fftw") "/lib")
+ (string-append "--with-fftw-incdir="
+ #$(this-package-input "fftw") "/include")
+ (string-append "--with-openblas-libdir="
+ #$(this-package-input "openblas") "/lib")
+ (string-append "--with-openblas-incdir="
+ #$(this-package-input "openblas") "/include")
+ (string-append "--with-plplot-libdir="
+ #$(this-package-input "plplot") "/lib")
+ (string-append "--with-plplot-incdir="
+ #$(this-package-input "plplot") "/include"))))
+ (native-inputs
+ (list autoconf automake libtool pkg-config))
+ (inputs
+ (list openblas fftw fftwf plplot))
+ (home-page "https://www.astromatic.net/software/psfex/")
+ (synopsis "Astronomical PSF modelling and quality assessment")
+ (description
+ "@acronym{PSFEx, PSF Extractor} extracts models of the @acronym{PSF,
+Point Spread Function} from FITS images processed with SExtractor, and
+measures the quality of images. The generated PSF models can be used for
+model-fitting photometry or morphological analyses.")
+ (license license:gpl3+)))
+
+(define-public python-ads
+ (package
+ (name "python-ads")
+ (version "0.12.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ads" version))
+ (sha256
+ (base32 "18aizbsmhwz99flz8n101mi0n0lk3m3qqzfvmxrmjwqvydfypjml"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-httpretty))
+ (propagated-inputs
+ (list python-mock
+ python-requests
+ python-six
+ python-werkzeug))
+ (home-page "http://www.github.com/andycasey/ads/")
+ (synopsis "Python client to NASA's Astrophysics Data System")
+ (description
+ "This package provdies a Python Module to Interact with NASA's
+@acronym{Astrophysics Data System,ADS} that Doesn't Suck™.")
+ (license license:expat)))
+
(define-public python-aplpy
(package
(name "python-aplpy")
@@ -553,6 +766,135 @@ Main features:
@end itemize")
(license license:expat)))
+(define-public python-asdf
+ (package
+ (name "python-asdf")
+ (version "3.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "asdf" version))
+ (sha256
+ (base32 "0pwy8p3idz40a1z07d0lvvd0mwwya8g52wrp72frgpagjkvj3ska"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "-p" "no:legacypath")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-pypojrect-toml
+ (lambda _
+ (substitute* "pyproject.toml"
+ ;; ImportError: Error importing plugin " no:legacypath": No
+ ;; module named ' no:legacypath'
+ ((".*:legacypath.*") "")
+ ;; TypeError: Configuration.__init__() got an unexpected
+ ;; keyword argument 'version_file'
+ (("version_file = \"asdf/_version.py\"") "")))))))
+ (native-inputs
+ (list python-fsspec
+ python-packaging
+ python-psutil
+ ;; 3.3.0+ requries newer version of pytest, see
+ ;; <https://github.com/asdf-format/asdf/issues/1804>.
+ python-pytest-8
+ python-pytest-doctestplus
+ python-pytest-remotedata
+ python-pytest-xdist
+ python-setuptools-scm))
+ (propagated-inputs
+ (list python-asdf-standard
+ python-asdf-transform-schemas
+ python-attrs ;; for vendorized jsonschema
+ python-importlib-metadata
+ python-jmespath
+ python-lz4
+ python-numpy
+ python-pyyaml
+ python-semantic-version))
+ (home-page "https://github.com/asdf-format/asdf")
+ (synopsis "Python tools to handle ASDF files")
+ (description
+ "The Advanced Scientific Data Format (ASDF) is a next-generation
+interchange format for scientific data. This package contains the Python
+implementation of the ASDF Standard.")
+ (license license:bsd-3)))
+
+(define-public python-asdf-astropy
+ (package
+ (name "python-asdf-astropy")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "asdf-astropy" version))
+ (sha256
+ (base32 "1ipjpjiirycj2npicbp39ka7db61vx45j8dm2iis71g5l1rzkblp"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "-n" "auto")
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'set-home-env
+ (lambda _ (setenv "HOME" "/tmp"))))))
+ (native-inputs
+ (list python-coverage
+ python-h5py
+ python-pandas
+ python-pytest
+ python-pytest-astropy
+ python-pytest-xdist
+ python-scipy
+ python-setuptools-scm))
+ (propagated-inputs
+ (list python-asdf
+ python-asdf-coordinates-schemas
+ python-asdf-transform-schemas
+ python-astropy
+ python-numpy
+ python-packaging))
+ (home-page "https://github.com/astropy/asdf-astropy")
+ (synopsis "ASDF serialization support for astropy")
+ (description
+ "This package includes plugins that provide ASDF serialization support for
+Astropy objects.")
+ (license license:bsd-3)))
+
+(define-public python-astroalign
+ (package
+ (name "python-astroalign")
+ (version "2.5.1")
+ (source
+ (origin
+ ;; There are no tests in the PyPI tarball.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/quatrope/astroalign")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1kr5cszcxvrdbksy7mvv3ps1h1jzrn4yamfr6x7whkbi6bpqf7xp"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-astropy
+ python-ccdproc
+ python-pillow
+ python-pytest))
+ (propagated-inputs
+ (list python-bottleneck
+ python-numpy
+ python-scikit-image
+ python-scipy
+ python-sep))
+ (home-page "https://astroalign.readthedocs.io/")
+ (synopsis "Astrometric Alignment of Images")
+ (description
+ "ASTROALIGN is a python module that will try to align two stellar
+astronomical images, especially when there is no WCS information available.")
+ (license license:expat)))
+
(define-public python-astroml
(package
(name "python-astroml")
@@ -609,24 +951,50 @@ Main features:
mining in astronomy.")
(license license:bsd-2)))
+(define-public python-extinction
+ (package
+ (name "python-extinction")
+ (version "0.4.6")
+ (source
+ (origin
+ (method git-fetch) ; No tests in PyPI
+ (uri (git-reference
+ (url "https://github.com/kbarbary/extinction")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1adxq926jd469mxm6llvsljgf2jqb06905h61i9qzc7m2yrm4wga"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags #~(list "test.py")))
+ (native-inputs (list python-cython python-pytest))
+ (propagated-inputs (list python-numpy))
+ (home-page "http://github.com/kbarbary/extinction")
+ (synopsis "Fast interstellar dust extinction laws")
+ (description
+ "This package provides a cython-optimized implementations of empirical dust
+exitinction laws found in the literature.")
+ (license license:expat)))
+
(define-public python-fitsio
(package
(name "python-fitsio")
- (version "1.2.1")
+ (version "1.2.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fitsio" version))
(sha256
- (base32 "19him5rcpjyz14ghkmifnd1xl3ivlyy84h45k6j2pyr5ixc60ky6"))
+ (base32 "0y7n7wh73ha6439djrhwmqbvgpagrdgaasbrikvw2zb5qx3y6zym"))
(modules '((guix build utils)))
(snippet
;; Remove the bundled cfitsio. When update the package check the
;; current bundled version.
#~(begin
- (delete-file-recursively "cfitsio-4.2.0")
+ (delete-file-recursively "cfitsio-4.4.1-20240617")
(substitute* "MANIFEST.in"
- (("recursive-include cfitsio-4.2.0.*$\n") ""))))))
+ (("recursive-include cfitsio-4.4.0.*$\n") ""))))))
(build-system pyproject-build-system)
(arguments
(list
@@ -708,13 +1076,13 @@ Python.")
(define-public python-ginga
(package
(name "python-ginga")
- (version "5.0.1")
+ (version "5.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ginga" version))
(sha256
- (base32 "1zw93487a0ilkb5w5qjgrdnavxlmdmjp6c2wyc1wp8qahby9c0xa"))))
+ (base32 "0c6vpcz59x889z8ggq6r5ci9cf10m7r9h262r6chx31mzdr010wf"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -781,79 +1149,464 @@ zooming windows, star catalog access, cuts, star pick/FWHM, thumbnails, etc.")
(prepend python-pyqt)))
(synopsis "Qt5 image viewer build based on python-ginga library")))
-(define-public qfits
+(define-public python-glue-astronomy
(package
- (name "qfits")
- (version "6.2.0")
+ (name "python-glue-astronomy")
+ (version "0.10.0")
(source
(origin
(method url-fetch)
- (uri
- (string-append "ftp://ftp.eso.org/pub/qfits/qfits-" version ".tar.gz"))
+ (uri (pypi-uri "glue-astronomy" version))
(sha256
- (base32 "0m2b21mim3a7wgfg3ph2w5hv7mdvr03jmmhzipc0wcahijglcw9j"))))
- (build-system gnu-build-system)
- (home-page "https://www.eso.org/sci/software/eclipse/qfits/")
- (synopsis "C library offering access to astronomical FITS files")
+ (base32 "1bra11i55g687ykzll5clp7mf3l9kc0x11wqc3gwfi98qx8fgpqz"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "--pyargs" "glue_astronomy"
+ ;; XXX: Findout why these tests fail to load:
+ ;; E ModuleNotFoundError: No module named 'glue.qglue'
+ ;; E ImportError: cannot import name 'make_2dspec_image' from
+ ;; 'specreduce.utils.synth_data'
+ "--ignore=glue_astronomy/io/spectral_cube/tests/test_spectral_cube.py"
+ "--ignore=glue_astronomy/io/spectral_cube/tests/test_spectral_cube.py"
+ "--ignore=glue_astronomy/translators/tests/test_trace.py"
+ "--ignore=glue_astronomy/translators/tests/test_trace.py")))
+ (propagated-inputs
+ (list python-astropy
+ python-glue-core
+ python-regions
+ python-specreduce
+ python-spectral-cube
+ python-specutils))
+ (native-inputs
+ (list python-mock
+ python-pytest-astropy
+ python-setuptools-scm))
+ (home-page "https://github.com/glue-viz/glue-astronomy")
+ (synopsis "Astronomy-specific plugins for glue")
(description
- "@code{qfits} is a C library giving access to FITS file internals, both
-for reading and writing.")
- (license license:gpl2+)))
+ "The glue-astronomy plugin for glue provides a collection of
+astronomy-specific functionality")
+ (license license:bsd-3)))
-(define-public erfa
+(define-public python-glue-core
(package
- (name "erfa")
- (version "2.0.1")
+ (name "python-glue-core")
+ (version "1.21.1")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/liberfa/erfa")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (pypi-uri "glue_core" version))
(sha256
- (base32 "1hxjbcvdlq4871r17fphbaf3bd8dsjagp1rdb3j8v6kr4f1dil9n"))))
- (build-system gnu-build-system)
+ (base32 "1xms896ds70sbym1cr5lrbjl4i8vixy3mcc6qsg1b3ppvky76vmn"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list ;; python-astrodendro ; optional, not packed
+ python-astropy
+ python-dill
+ python-echo
+ python-fast-histogram
+ python-h5py
+ python-ipython
+ python-matplotlib
+ python-mpl-scatter-density
+ python-numpy
+ python-openpyxl
+ python-pandas
+ ;; python-pyavm ; optional, not packed
+ python-pillow
+ python-scikit-image
+ python-scipy
+ python-setuptools
+ python-shapely
+ python-spectral-cube
+ python-xlrd))
(native-inputs
- (list automake autoconf libtool pkg-config))
- (home-page "https://github.com/liberfa/erfa")
- (synopsis "Essential Routines for Fundamental Astronomy")
+ (list python-h5py
+ python-objgraph
+ python-pytest
+ python-pytest-cov
+ python-pytest-mpl
+ python-setuptools
+ python-setuptools-scm))
+ (home-page "http://glueviz.org")
+ (synopsis "Multidimensional data visualization project")
(description
- "The @acronym{ERFA, Essential Routines for Fundamental Astronomy} C library
-contains key algorithms for astronomy, and is based on the @acronym{SOFA,
-Standards of Fundamental Astronomy} library published by the @acronym{IAU,
-International Astronomical Union}.")
+ "Glue is a python project to link visualizations of scientific datasets
+across many files.")
(license license:bsd-3)))
-(define-public eye
+(define-public python-glue-qt
(package
- (name "eye")
+ (name "python-glue-qt")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "glue-qt" version))
+ (sha256
+ (base32 "15ycykhg02xmsrlyv90qxckssmrq355qaqmz7p8nnqygm0gyrnx1"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'prepare-x
+ (lambda _
+ (system "Xvfb &")
+ (setenv "DISPLAY" ":0")
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-echo
+ python-glue-core
+ python-ipykernel
+ python-ipython
+ python-matplotlib
+ python-numpy
+ python-pvextractor
+ python-qtconsole
+ python-qtpy
+ python-scipy))
+ (native-inputs
+ (list python-objgraph
+ python-pytest
+ python-setuptools-scm
+ xorg-server-for-tests))
+ (home-page "http://glueviz.org")
+ (synopsis "Multidimensional data visualization across files")
+ (description "Multidimensional data visualization across files.")
+ (license license:bsd-3)))
+
+(define-public python-pvextractor
+ (package
+ (name "python-pvextractor")
+ (version "0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pvextractor" version))
+ (sha256
+ (base32 "1kl33vg5rxmdwlk36pn8zqa7k7f43fb7w417fym6ygp86mci2spd"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags #~(list "--pyargs" "pvextractor")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; See <https://github.com/radio-astro-tools/pvextractor/issues/124>.
+ (add-after 'unpack 'patch-regexp
+ (lambda _
+ (substitute* "pvextractor/pvregions.py"
+ (("coordre = re.compile.*")
+ "coordre = re.compile(\"^[a-z]*\\\\((.*)\\\\)\")\n"))))
+ (add-before 'check 'prepare-x
+ (lambda _
+ (system "Xvfb &")
+ (setenv "DISPLAY" ":0")
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-matplotlib
+ python-numpy
+ python-pyqt-6
+ python-qtpy
+ python-scipy
+ python-spectral-cube))
+ (native-inputs
+ (list python-pytest-astropy
+ python-setuptools-scm
+ xorg-server-for-tests))
+ (home-page "http://pvextractor.readthedocs.io")
+ (synopsis "Position-Velocity diagram extractor")
+ (description
+ "The concept of the pvextractor package is simple - given a path defined
+in sky coordinates, and a spectral cube, extract a slice of the cube along
+that path, and along the spectral axis, producing a position-velocity or
+position-frequency slice.")
+ (license license:bsd-3)))
+
+(define-public python-pyxsim
+ (package
+ (name "python-pyxsim")
+ (version "4.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pyxsim" version))
+ (sha256
+ (base32 "1vviy9hk2z3h0fi6c8207ps5pklsjn0a77pqq6wa4sa1n07clc8i"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; XXX: Tests require additional data, check if it may be packed
+ ;; separately, see tests/ci_install.sh.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ ;; To address sanity check warning: UserWarning: unable to write
+ ;; new config file.
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-h5py
+ python-numpy
+ python-scipy
+ python-soxs
+ python-tqdm
+ python-unyt
+ python-yt))
+ (native-inputs
+ (list python-cython-3
+ python-setuptools-scm))
+ (home-page "https://hea-www.cfa.harvard.edu/~jzuhone/pyxsim/")
+ (synopsis "Simulating X-ray observations from astrophysical sources")
+ (description
+ "This package implements functionality for simulating X-ray emission from
+astrophysical sources.
+
+X-rays probe the high-energy universe, from hot galaxy clusters to compact
+objects such as neutron stars and black holes and many interesting sources in
+between. pyXSIM makes it possible to generate synthetic X-ray observations of
+these sources from a wide variety of models, whether from grid-based
+simulation codes such as FLASH, Enzo, and Athena, to particle-based codes such
+as Gadget and AREPO, and even from datasets that have been created 'by hand',
+such as from NumPy arrays. pyXSIM also provides facilities for manipulating
+the synthetic observations it produces in various ways, as well as ways to
+export the simulated X-ray events to other software packages to simulate the
+end products of specific X-ray observatories.")
+ (license license:bsd-3)))
+
+(define-public python-sncosmo
+ (package
+ (name "python-sncosmo")
+ (version "2.11.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sncosmo" version))
+ (sha256
+ (base32 "0nmhrvaw22zxpmykl70a91mc88pxmw0x5fdxjiz3hdzkdbqrg0x9"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; Disable tests requireing remote access to download test data.
+ #~(list
+ "-k" (string-append "not test_megacampsf_bandpass"
+ " and not test_builtins_remote_aa"
+ " and not test_builtins_remote_nm"
+ " and not test_builtins_remote_um"
+ " and not test_builtins_remote_wfc3"
+ " and not test_builtins_megacampsf"
+ " and not test_builtins_timeseries_ascii"
+ " and not test_builtins_timeseries_fits"
+ " and not test_builtins_salt2model"
+ " and not test_builtins_salt3model"
+ " and not test_builtins_2011fe"
+ " and not test_builtins_mlcs2k2"
+ " and not test_builtins_snemo"
+ " and not test_builtins_sugar"
+ " and not test_builtins_magsys_fits"
+ " and not test_builtins_magsys_csp"
+ " and not test_builtins_magsys_ab_b12"
+ " and not test_builtins_magsys_jla"
+ " and not test_csp_magsystem"
+ " and not test_compositemagsystem_band_error"
+ " and not test_G10"
+ " and not test_C11"
+ " and not test_salt2source_timeseries_vs_snfit"
+ " and not test_salt2source_rcov_vs_snfit"
+ " and not test_bandflux"
+ " and not test_bandflux_multi"
+ " and not test_bandflux_zpsys"
+ " and not test_bandfluxcov"
+ " and not test_bandmag"
+ " and not test_sugarsource"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "setup.cfg"
+ ;; pyyaml>=6.0.1
+ (("6.0.1") "6.0"))))
+ (add-before 'check 'prepare-test-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-extinction
+ python-looseversion
+ python-numpy
+ python-pyyaml
+ python-scipy))
+ (native-inputs
+ (list ;; python-iminuit ; not packed, optional
+ python-cython
+ python-pytest
+ python-pytest-astropy
+ python-pytest-cov))
+ (home-page "https://sncosmo.readthedocs.org")
+ (synopsis "Package for supernova cosmology based on astropy")
+ (description
+ "SNCosmo is a Python library for supernova cosmology analysis. It aims
+to make such analysis both as flexible and clear as possible.")
+ (license license:bsd-3)))
+
+(define-public python-soxs
+ (package
+ (name "python-soxs")
+ (version "4.8.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "soxs" version))
+ (sha256
+ (base32 "1m5q3i7hk7jqdpd46h13c4a16b74p0k4mqkxhs43b4vi95h70qrj"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; XXX: Tests require additional data, check if it may be packed
+ ;; separately, see tests/ci_install.sh.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ ;; To address sanity check warning: UserWarning: unable to write
+ ;; new config file.
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-appdirs
+ python-astropy
+ python-h5py
+ python-numpy
+ python-pooch
+ python-pyyaml
+ python-regions
+ python-scipy
+ python-tqdm))
+ (native-inputs
+ (list python-cython
+ python-setuptools-scm))
+ (home-page "https://hea-www.cfa.harvard.edu/soxs/")
+ (synopsis "Simulated Observations of X-ray Sources")
+ (description
+ "SOXS is a software suite which can create simulated X-ray observations
+of astrophysical sources with almost any existing or planned X-ray
+observatory. The goal of SOXS is to provide a comprehensive set of tools to
+design source models and convolve them with simulated models of X-ray
+instruments. This package was originally developed to support the
+@url{https://www.lynxobservatory.org/,Lynx X-ray Observatory} mission concept,
+but has evolved to support other missions as well.")
+ ;; SOXS is licensed under the terms of the Modified BSD License (also
+ ;; known as New or Revised BSD).
+ (license license:bsd-3)))
+
+(define-public python-specreduce
+ (package
+ (name "python-specreduce")
(version "1.4.1")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/eye")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (pypi-uri "specreduce" version))
(sha256
- (base32 "1j8rpgz3fjp6fw0qmxgfqycf3n01fzxds4w12vgyrhbnk658ia41"))))
- (build-system gnu-build-system)
+ (base32 "14ba4ws2z3kpw007f3hpslgp5i6dx082xhql4aim7j82211gpj6s"))))
+ (build-system pyproject-build-system)
(arguments
(list
- #:configure-flags
- #~(list "CPPFLAGS=-fcommon"))) ; fix build with GCC 10
- (home-page "https://www.astromatic.net/software/eye")
- (synopsis "Small image feature detector using machine learning")
+ #:test-flags
+ ;; TODO: Try to link some test data availale in
+ ;; specification-specreduce-data package.
+ #~(list "-k" (string-append
+ "not specreduce.calibration_data.get_pypeit_data_path"
+ " and not specreduce.calibration_data.get_reference_file_path"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-pypojrect-toml
+ (lambda _
+ (substitute* "pyproject.toml"
+ ;; TypeError: Configuration.__init__() got an unexpected
+ ;; keyword argument 'version_file'
+ (("version_file = .*") ""))))
+ (add-before 'check 'set-home
+ (lambda _
+ ;; Relax matplotlib warning: ... because the default path
+ ;; (/homeless-shelter/.config/matplotlib) is not a writable
+ ;; directory ...
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-gwcs
+ python-matplotlib
+ python-photutils
+ python-specutils
+ python-synphot))
+ (native-inputs
+ (list python-photutils
+ python-setuptools-scm
+ python-pytest-astropy))
+ (home-page "https://specreduce.readthedocs.io/")
+ (synopsis "Spectroscopic Reductions")
(description
- "In @acronym{EyE, Enhance Your Extraction} an artificial neural network
-connected to pixels of a moving window (@dfn{retina}) is trained to associate
-these input stimuli to the corresponding response in one or several output
-image(s). The resulting filter can be loaded in SExtractor to operate
-complex, wildly non-linear filters on astronomical images. Typical
-applications of EyE include adaptive filtering, feature detection and cosmetic
-corrections.")
- (license license:cecill)))
+ "This package implements functionality of spectroscopic reduction in
+observations from Optical and @acronym{Near-infrared spectroscopy,NIR}
+instruments.")
+ (license (list license:bsd-3 ; licenses/LICENSE.rst, same as python-astropy
+ license:expat)))) ; licenses/KOSMOS_LICENSE
+
+(define-public python-sunkit-image
+ (package
+ (name "python-sunkit-image")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sunkit_image" version))
+ (sha256
+ (base32 "1wzii7dy0yb2lx0k8m3iak5vxc0wbybj5cdkvrk93sr14k9crqds"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; XXX: Check with upstram: assert False.
+ #:test-flags
+ #~(list "-k" (string-append
+ "not test_fnrgf"
+ " and not test_calculate_solar_rotate_shift"
+ " and not test_mapsequence_solar_derotate"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ ;; For tests: Permission denied: '/homeless-shelter'
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-matplotlib
+ python-numpy
+ python-scikit-image
+ python-scipy
+ python-sunpy))
+ (native-inputs
+ (list python-astroscrappy
+ python-beautifulsoup4
+ python-dask
+ python-drms
+ python-importlib-resources
+ python-pytest-astropy
+ python-pytest-mpl
+ python-setuptools-scm
+ python-zeep))
+ (home-page "https://github.com/sunpy/sunkit-image/")
+ (synopsis "Solar Physics image processing toolbox")
+ (description
+ "This package provides an image processing toolbox for Solar Physics.")
+ (license license:bsd-2)))
(define-public wcslib
(package
@@ -916,65 +1669,6 @@ header.")
(delete-file-recursively "C/flexed")))))
(properties '((hidden? . #t)))))
-(define-public wcstools
- (package
- (name "wcstools")
- (version "3.9.7")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://tdc-www.harvard.edu/software/wcstools/wcstools-"
- version ".tar.gz"))
- (sha256
- (base32 "125hqzspvqrx6372smzsmxwg06ib2arjc5awnwnq53w1xdq6jpsj"))
- (patches (search-patches "wcstools-extend-makefiles.patch"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:tests? #f ;No tests provided.
- #:make-flags
- #~(list (string-append "CC=" #$(cc-for-target))
- (string-append "PREFIX=" #$output))
- #:phases
- #~(modify-phases %standard-phases
- (delete 'configure))))
- (home-page "http://tdc-www.harvard.edu/software/wcstools/")
- (synopsis "Handle the WCS of a FITS image")
- (description
- "WCSTools is a set of software utilities, written in C, which create,
-display and manipulate the world coordinate system of a FITS or IRAF image,
-using specific keywords in the image header which relate pixel position within
-the image to position on the sky. Auxillary programs search star catalogs and
-manipulate images.")
- (license license:gpl2+)))
-
-(define-public weightwatcher
- (package
- (name "weightwatcher")
- (version "1.12")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/weightwatcher")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0701z6bdqq32jv7ga3n6jh27q684ni0hbfjm1mak7rh0qqx089gi"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:configure-flags
- #~(list "CFLAGS=-fcommon"))) ; fix build with GCC 10
- (home-page "https://www.astromatic.net/software/weightwatcher")
- (synopsis "Weight-map/flag-map multiplexer and rasteriser")
- (description
- "Weightwatcher is a program hat combines weight-maps, flag-maps and
-polygon data in order to produce control maps which can directly be used in
-astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
- (license license:gpl3+)))
-
(define-public glnemo2
(package
(name "glnemo2")
@@ -1131,51 +1825,6 @@ programs for the manipulation and analysis of astronomical data.")
from Stark Labs.")
(license license:bsd-3)))
-(define-public psfex
- (package
- (name "psfex")
- (version "3.24.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/psfex")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0ykgzyxnxjxqk6b8jng006wjilg4fqaxclpfn8plg6brk1qf39sn"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:configure-flags
- #~(list "CPPFLAGS=-fcommon"
- "--enable-openblas"
- "--enable-plplot"
- (string-append "--with-fftw-libdir="
- #$(this-package-input "fftw") "/lib")
- (string-append "--with-fftw-incdir="
- #$(this-package-input "fftw") "/include")
- (string-append "--with-openblas-libdir="
- #$(this-package-input "openblas") "/lib")
- (string-append "--with-openblas-incdir="
- #$(this-package-input "openblas") "/include")
- (string-append "--with-plplot-libdir="
- #$(this-package-input "plplot") "/lib")
- (string-append "--with-plplot-incdir="
- #$(this-package-input "plplot") "/include"))))
- (native-inputs
- (list autoconf automake libtool pkg-config))
- (inputs
- (list openblas fftw fftwf plplot))
- (home-page "https://www.astromatic.net/software/psfex/")
- (synopsis "Astronomical PSF modelling and quality assessment")
- (description
- "@acronym{PSFEx, PSF Extractor} extracts models of the @acronym{PSF,
-Point Spread Function} from FITS images processed with SExtractor, and
-measures the quality of images. The generated PSF models can be used for
-model-fitting photometry or morphological analyses.")
- (license license:gpl3+)))
-
(define-public sextractor
(package
(name "sextractor")
@@ -1227,40 +1876,66 @@ crowded star fields.")
(define-public siril
(package
(name "siril")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/free-astro/siril")
- (commit version)))
- (sha256
- (base32
- "1lc6ga1n18br43rlj8qmg23chfniyvjz3vx73km6sv171z4c2fwy"))
- (file-name (git-file-name name version))))
+ (version "1.2.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/free-astro/siril")
+ (commit version)))
+ (sha256
+ (base32 "0gkd8w2bpwq4ibl3vawx008yrm5k6zlj77lp98fflffcf7cj8hr5"))
+ (file-name (git-file-name name version))))
(build-system meson-build-system)
- (native-inputs (list cmake git glib libconfig pkg-config))
- (inputs (list cfitsio
- exiv2
- ffms2
- fftwf
- gsl
- gtk+
- json-glib
- libheif
- libraw
- librtprocess
- opencv))
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:imported-modules `(,@%meson-build-system-modules (guix build
+ glib-or-gtk-build-system))
+ #:modules '((guix build meson-build-system)
+ ((guix build glib-or-gtk-build-system)
+ #:prefix glib-or-gtk:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'install 'wrap-program
+ (lambda* _
+ (wrap-program (string-append #$output "/bin/siril")
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE to load icons in pure
+ ;; environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
+ (native-inputs
+ (list cmake git libconfig pkg-config))
+ (inputs
+ (list cfitsio
+ (librsvg-for-system)
+ exiv2
+ ffms2
+ fftwf
+ gsl
+ gdk-pixbuf
+ gtk+
+ json-glib
+ libheif
+ bash-minimal ;for wrap-program
+ libraw
+ librtprocess
+ opencv))
(home-page "https://siril.org/")
(synopsis "Image processing software for amateur astronomy")
(description
- "This package provides an astronomical image processing tool - SIRIL. It is
-specially tailored for noise reduction and improving the signal/noise ratio of
-an image from multiple captures, as required in astronomy. SIRIL can align
-automatically or manually, stack and enhance pictures from various file formats,
-even image sequence files (films and SER files). It works well with limited
-system resources, like in embedded platforms, but is also very fast when run on
-more powerful computers and provides conversion to FITS from a large number of
-image formats.")
+ "This package provides an astronomical image processing tool - SIRIL. It
+is specially tailored for noise reduction and improving the signal/noise ratio
+of an image from multiple captures, as required in astronomy. SIRIL can align
+automatically or manually, stack and enhance pictures from various file
+formats, even image sequence files (films and SER files). It works well with
+limited system resources, like in embedded platforms, but is also very fast
+when run on more powerful computers and provides conversion to FITS from a
+large number of image formats.")
(license license:gpl3+)))
(define-public splash
@@ -1308,43 +1983,40 @@ interactively in the plotting window.")
(license license:gpl2+)))
(define-public skymaker
- ;; XXX: No version tag available in GitHub.
- ;; See: https://github.com/astromatic/skymaker/issues/3
- (let ((commit "1a69c4716bdc9b5c6d4a917b0bc2dbd47635c459")
- (revision "0"))
- (package
- (name "skymaker")
- (version (git-version "4.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/skymaker")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1vin4vgvcmqmwjdchsxnap374559rksz55xmaliawnl3qpzxn1nk"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:configure-flags
- #~(list
- (string-append
- "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib")
- (string-append
- "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include"))))
- (native-inputs
- (list autoconf automake libtool pkg-config))
- (inputs
- (list fftwf))
- (home-page "https://www.astromatic.net/software/skymaker")
- (synopsis "Astronomical image simulator")
- (description
- "SkyMaker is a program that simulates astronomical images. It accepts
+ (package
+ (name "skymaker")
+ (version "3.10.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/skymaker")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kcy0lfm25gihahpr41ghhw3b8znzczzg9rrlkfih043h2pfsm5l"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list
+ "CPPFLAGS=-fcommon"
+ (string-append
+ "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib")
+ (string-append
+ "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include"))))
+ (native-inputs
+ (list autoconf automake libtool pkg-config))
+ (inputs
+ (list fftwf))
+ (home-page "https://www.astromatic.net/software/skymaker")
+ (synopsis "Astronomical image simulator")
+ (description
+ "SkyMaker is a program that simulates astronomical images. It accepts
object lists in ASCII generated by the Stuff program to produce realistic
astronomical fields. SkyMaker is part of the
@uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public stackistry
(package
@@ -1410,7 +2082,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(define-public stellarium
(package
(name "stellarium")
- (version "24.1")
+ (version "24.2")
(source
(origin
(method git-fetch)
@@ -1419,7 +2091,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "15r8vg1xb4q8vwy10dfs4543bg6r3463sgrpkqk6fpxx46d8axxp"))))
+ (base32 "01iq1cxbhr3xknzpk4spflxj3msf9wk19b4lqlifi1pwaz18pb5n"))))
(build-system cmake-build-system)
;; TODO: Complete documentation build and split into dedicated outputs.
(arguments
@@ -1449,7 +2121,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
openssl
qtbase-5
qtcharts
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtpositioning
qtscript
@@ -1475,149 +2147,16 @@ can be used to control telescopes over a serial port for tracking celestial
objects.")
(license license:gpl2+)))
-(define-public stuff
- (package
- (name "stuff")
- (version "2.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/stuff")
- ;; XXX: No version tag available in GitHub.
- ;; See: https://github.com/astromatic/stuff/issues/6
- (commit "9008dc022ef53331092da248cf0a794abd6783bf")))
- (file-name (git-file-name name version))
- (sha256
- (base32 "004sry5lqqm7s9x4l3agysp3n63y3ga35x1rwwda4m6dc6zvla6b"))))
- (build-system gnu-build-system)
- (native-inputs
- (list autoconf automake libtool pkg-config))
- (home-page "https://www.astromatic.net/software/stuff")
- (synopsis "Astronomical catalogue simulation")
- (description
- "Stuff is a program that simulates \"perfect\" astronomical catalogues.
-It generates object lists in ASCII which can read by the SkyMaker program to
-produce realistic astronomical fields. Stuff is part of the
-@uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.")
- (license license:gpl3+)))
-
-(define-public swarp
- (package
- (name "swarp")
- (version "2.41.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/astromatic/swarp")
- (commit (string-append version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "00463r5rd4xl74xs4h1n4gl2qk7v9p5nw9x05pbzgh8jm77q90qq"))))
- (build-system gnu-build-system)
- (native-inputs
- (list automake autoconf libtool pkg-config))
- (inputs
- (list cfitsio))
- (home-page "https://www.astromatic.net/software/swarp")
- (synopsis "FITS image resampling and co-addition")
- (description
- "SWarp is a program that resamples and co-adds together FITS images using
-any arbitrary astrometric projection defined in the WCS standard.")
- (license license:gpl3+)))
-
-(define-public celestia
- (package
- (name "celestia")
- (version "1.6.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/celestiaproject/celestia")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0nz9k5nd2zmrbwj1qhsfwmvqymqk8c4yjxpybck44isrild2ah9j"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:modules
- `((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1)
- (srfi srfi-71))
- #:configure-flags
- #~(list "--with-glut"
- (string-append "--with-lua=" #$(this-package-input "lua")))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-lua-version
- (lambda _
- (let* ((_ version (package-name->name+version
- #$(this-package-input "lua")))
- (components (string-split version #\.))
- (major+minor (string-join (take components 2) ".")))
- (substitute* "configure.ac"
- (("lua5.3")
- (string-append "lua-" major+minor)))))))))
- (native-inputs
- (list autoconf
- automake
- gettext-minimal
- libgit2
- libtool
- perl
- pkg-config))
- (inputs
- (list freeglut
- glu
- libjpeg-turbo
- libpng
- libtheora
- mesa))
- (propagated-inputs
- (list lua))
- (home-page "https://celestia.space/")
- (synopsis "Real-time 3D visualization of space")
- (description
- "This simulation program lets you explore our universe in three
-dimensions. Celestia simulates many different types of celestial objects.
-From planets and moons to star clusters and galaxies, you can visit every
-object in the expandable database and view it from any point in space and
-time. The position and movement of solar system objects is calculated
-accurately in real time at any rate desired.")
- (license license:gpl2+)))
-
-
-(define-public celestia-gtk
- (package/inherit celestia
- (name "celestia-gtk")
- (inputs
- (modify-inputs (package-inputs celestia)
- (replace "freeglut" gtk+-2)
- (prepend cairo gtkglext libxmu libtheora pango-1.42)))
- (arguments
- (substitute-keyword-arguments (package-arguments celestia)
- ((#:configure-flags flags '())
- #~(append #$flags
- (list "--enable-cairo"
- "--enable-theora"
- "--without-glut"
- "--with-gtk")))))
- (synopsis "Real-time 3D visualization of space (using GTK+)")))
-
(define-public python-astropy
(package
(name "python-astropy")
- (version "6.0.1")
+ (version "6.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astropy" version))
(sha256
- (base32 "175k2h039c0b8rsf0fdphmxbpjrszd138j8z9zkhh1kd6pg7bac9"))
+ (base32 "0fhx9zjsqp7z8z8phafpbwpb46idrbsamkfg42l8j0z94i73s452"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1641,7 +2180,9 @@ accurately in real time at any rate desired.")
"not remote_data"
;; ValueError: The truth value of an array with more than
;; one element is ambiguous. Use a.any() or a.all()
- " and not test_table_comp[t16-t26]"))
+ " and not test_table_comp[t16-t26]"
+ ;; E Unreliable test timings! <...>
+ " and not test_datetime_timedelta_roundtrip"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'preparations
@@ -1757,13 +2298,13 @@ astronomy and astrophysics.")
;; In case of changing the source method git-fetch, consider to check the
;; tag as it's not following the PyPI version, see
;; <https://github.com/astropy/astropy-iers-data/issues/17>.
- (version "0.2024.4.15.2.45.49")
+ (version "0.2024.8.12.0.32.58")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astropy_iers_data" version))
(sha256
- (base32 "15wran1d5bw1mm3xl3ibp6i5aa7icj9p6g1mqcyp596qmdjnm8wp"))))
+ (base32 "1xw4s6vyl29miccbs3ylyichj1rcmzmya3lmh27f173n7k2zb5g0"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1798,13 +2339,13 @@ celestial-to-terrestrial coordinate transformations.")
(define-public python-astroplan
(package
(name "python-astroplan")
- (version "0.10")
+ (version "0.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astroplan" version))
(sha256
- (base32 "0nl7yi0h5nn4id1jifd8hpwzqdarq9z2iq56x0j2kmj3472cjw0n"))))
+ (base32 "0nb97fz0mlypdlvs09wyh0z7mxw0d6aqqkd9yfzhlqz1fwrprn9r"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1933,13 +2474,13 @@ to access online Astronomical data. Each web service has its own sub-package.")
(define-public python-astroscrappy
(package
(name "python-astroscrappy")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astroscrappy" version))
(sha256
- (base32 "0shmfilvzpmlwz4fh0bx4kqmzr0y39fgga6vipxb5d1rx1y6q6by"))))
+ (base32 "0r2alg8imr201ykjsvr6y43bzw8mwbc4ddprn8f6qfw9k4hsx8ff"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1955,12 +2496,9 @@ to access online Astronomical data. Each web service has its own sub-package.")
(make-file-writable "astroscrappy/_compiler.c")
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
- (list python-cython
+ (list python-cython-3
python-extension-helpers
- python-h5py
- python-pandas
python-pytest-astropy
- python-scikit-image
python-scipy
python-setuptools-scm))
(propagated-inputs (list python-astropy python-numpy))
@@ -2048,13 +2586,13 @@ is independent of and does not use @code{casacore}.")
(define-public python-ccdproc
(package
(name "python-ccdproc")
- (version "2.4.1")
+ (version "2.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ccdproc" version))
(sha256
- (base32 "186plgfhrj7wivs053y65jlv1x33y8ii31jdr2rm4s6pl0j7x29z"))))
+ (base32 "14faivm9nihpdwzg0jx1c9zr7jk22gjfjw78raq6h63ypl10i6yx"))))
(build-system pyproject-build-system)
(native-inputs
(list python-memory-profiler
@@ -2076,7 +2614,7 @@ bad pixel tracking throughout the reduction process.")
(define-public python-cdflib
(package
(name "python-cdflib")
- (version "1.2.6")
+ (version "1.3.1")
(source
(origin
(method git-fetch) ; no tests in PyPI release
@@ -2085,7 +2623,7 @@ bad pixel tracking throughout the reduction process.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1wxr35sqsdqzf85xyjh1v8hmwwiyv4cn0lr7q8l1kkngfywq5l2r"))))
+ (base32 "0zmz9wjhlq43lqy5k4fld9cj5k39s1hkkaligrn3kpf9hcbd79qn"))))
(build-system pyproject-build-system)
(arguments
(list #:phases
@@ -2098,7 +2636,7 @@ bad pixel tracking throughout the reduction process.")
(lambda _
(setenv "HOME" (getcwd)))))))
(propagated-inputs
- (list python-attrs python-numpy))
+ (list python-numpy))
(native-inputs
(list python-astropy
python-hypothesis
@@ -2150,13 +2688,13 @@ monochromatic sequential colormaps like @code{blue}, @code{green}, and
(define-public python-crds
(package
(name "python-crds")
- (version "11.17.20")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "crds" version))
- (sha256
- (base32
- "0480jjklv2p60fp892dr4qglwv44k86hx29y8q1c967l9k53wc9f"))))
+ (version "11.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "crds" version))
+ (sha256
+ (base32 "0k0q76mc9a18lrjqah8yb7v97dmhlwhsxyqr9r5rk0w4iqi6j7pp"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2164,24 +2702,19 @@ monochromatic sequential colormaps like @code{blue}, @code{green}, and
;; additional test data. See:
;; https://github.com/spacetelescope/crds/blob/master/setup_test_cache
#:tests? #f))
- (propagated-inputs (list python-asdf
- python-astropy
- python-boto3
- python-filelock
- python-numpy
- python-parsley
- python-pysynphot
- python-roman-datamodels
- python-stsynphot
- python-requests))
- (native-inputs (list python-flake8
- python-ipython
- python-lockfile
- python-mock
- python-nose
- python-pylint
- python-pytest
- python-setuptools-scm))
+ (propagated-inputs
+ (list python-asdf
+ python-astropy
+ python-boto3
+ python-filelock
+ python-numpy
+ python-parsley
+ python-pysynphot
+ python-roman-datamodels
+ python-stsynphot
+ python-requests))
+ (native-inputs
+ (list python-setuptools-scm))
(home-page "https://hst-crds.stsci.edu")
(synopsis "Calibration Reference Data System for HST and JWST")
(description
@@ -2200,26 +2733,21 @@ files and provide related services.")
(define-public python-czml3
(package
(name "python-czml3")
- (version "0.7.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/poliastro/czml3")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0pbwcsmc9nw591rck586ca9hwwhmm54rjjmp8gflhzq8b7f48lkc"))))
+ (version "1.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/poliastro/czml3")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gsdffn5w7j1aridvmx4xh6axvmbmqjwawacc8fnshpcyh4md5pn"))))
(build-system pyproject-build-system)
(propagated-inputs
- (list python-attrs
- python-dateutil
- python-w3lib))
+ (list python-attrs python-dateutil python-w3lib))
(native-inputs
- (list python-astropy
- python-pytest
- python-pytest-cov
- python-pytest-mypy))
+ (list python-astropy python-pytest python-pytest-mypy))
(home-page "https://github.com/poliastro/czml3")
(synopsis "Python library to write CZML")
(description
@@ -2231,20 +2759,18 @@ Cesium.")
(define-public python-drms
(package
(name "python-drms")
- (version "0.7.1")
+ (version "0.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "drms" version))
(sha256
- (base32 "01q00zwpbhik9lgbc42z6q791ybxc41rxgrj04fpcfkl3hcl0nyr"))))
+ (base32 "19lqy510d7iyxfz445h2rn4d0rvmd4d3lnjmvbkvv270ckpfw09f"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-astropy
- python-pytest-astropy
- python-pytest
- python-setuptools-scm))
- (propagated-inputs (list python-numpy python-pandas))
+ (list python-astropy python-pytest-astropy python-setuptools-scm))
+ (propagated-inputs
+ (list python-numpy python-pandas))
(home-page "https://sunpy.org")
(synopsis "Access astronomical HMI, AIA and MDI data with Python")
(description
@@ -2257,7 +2783,7 @@ used with local NetDRMS sites.")
(define-public python-drizzle
(package
(name "python-drizzle")
- (version "1.15.1")
+ (version "1.15.2")
(source
(origin
(method git-fetch) ;PyPi doesn't have the test data sets
@@ -2266,7 +2792,7 @@ used with local NetDRMS sites.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "14l3d3bx73r7cxhcl1cfh1q088qh5wq5pz5fs9dx7w79kp8mp6pg"))))
+ (base32 "1fp6gcvp6nz4a2mmy9vjn5wwywldhkg8bjjgb4ldn0vpv9k4nv8q"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2299,13 +2825,13 @@ code to be greatly simplified.")
(define-public python-dust-extinction
(package
(name "python-dust-extinction")
- (version "1.3")
+ (version "1.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dust_extinction" version))
(sha256
- (base32 "14zy6kyrfi4ash7qg1k3im1zzgr2r7rnaggzk0ar3jlfmsii743k"))))
+ (base32 "0f0g6gh4kj83xfv0cdp30dahs80pnhsj7c6ryz3f59qf6d5zqard"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-astropy python-scipy))
@@ -2322,13 +2848,13 @@ implemented using the astropy.modeling framework.")
(package
(name "python-ephem")
(version "4.1.5")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "ephem" version))
- (sha256
- (base32
- "0ainqbnvw320pc61q5b6ad6f2mhn1pvrlnq489cwfx0m82mahr0c"))))
- (build-system python-build-system)
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ephem" version))
+ (sha256
+ (base32 "0ainqbnvw320pc61q5b6ad6f2mhn1pvrlnq489cwfx0m82mahr0c"))))
+ (build-system pyproject-build-system)
(native-inputs (list tzdata))
(home-page "https://rhodesmill.org/pyephem/")
(synopsis "Compute positions of the planets and stars")
@@ -2341,32 +2867,6 @@ for a table giving the position of a planet, asteroid, or comet for a series
of dates.")
(license license:expat)))
-(define-public python-extinction
- (package
- (name "python-extinction")
- (version "0.4.6")
- (source
- (origin
- (method git-fetch) ; No tests in PyPI
- (uri (git-reference
- (url "https://github.com/kbarbary/extinction")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1adxq926jd469mxm6llvsljgf2jqb06905h61i9qzc7m2yrm4wga"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags #~(list "test.py")))
- (native-inputs (list python-cython python-pytest))
- (propagated-inputs (list python-numpy))
- (home-page "http://github.com/kbarbary/extinction")
- (synopsis "Fast interstellar dust extinction laws")
- (description
- "This package provides a cython-optimized implementations of empirical dust
-exitinction laws found in the literature.")
- (license license:expat)))
-
(define-public python-hvpy
(package
(name "python-hvpy")
@@ -2390,20 +2890,115 @@ exitinction laws found in the literature.")
@url{Helioviewer API, https://api.helioviewer.org/docs/v2/}.")
(license license:bsd-2)))
+(define-public python-kanon
+ (package
+ (name "python-kanon")
+ (version "0.6.6")
+ (source
+ (origin
+ (method git-fetch) ; no release in PyPI
+ (uri (git-reference
+ (url "https://github.com/ALFA-project-erc/kanon")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0sg9yrsas5xmhbw6mhfyxsxh9i060af6v02whr9fqgv687fiyrhc"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list ;"--numprocesses" "auto"
+ ;; XXX: This tests failing a lot.
+ "-k" (string-append "not test_attribute_forwardin"
+ " and not test_declination"
+ " and not test_init_basedquantity"
+ " and not test_ptolemy_viz"
+ " and not test_ptolemy_viz"
+ " and not test_quantity"
+ " and not test_read"
+ " and not test_shifting"
+ " and not test_sun_true_position"
+ " and not test_sun_true_position")
+ "--ignore=kanon/tables/__init__.py")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; See <https://github.com/ALFA-project-erc/kanon/issues/149>.
+ (delete 'sanity-check)
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("version = \"0.0.0\"") (string-append "version = \"" #$version "\""))
+ ;; RuntimeError: Unable to detect version control
+ ;; system. Checked: Git. Not installed: Mercurial, Darcs,
+ ;; Subversion, Bazaar, Fossil, Pijul. See
+ ;; <https://github.com/blacklanternsecurity/bbot/issues/1257>.
+ (("enable = true") "enable = false"))))
+ (add-before 'check 'prepare-test-environment
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
+ (native-inputs
+ (list git-minimal
+ python-poetry-core
+ python-poetry-dynamic-versioning
+ python-pytest-astropy
+ python-pytest-xdist
+ python-requests-mock))
+ (propagated-inputs
+ (list python-astropy
+ python-matplotlib
+ python-numpy
+ python-pandas-1
+ python-requests
+ python-scipy
+ ;; Optional
+ python-ipykernel
+ python-papermill))
+ (home-page "https://dishas.obspm.fr")
+ (synopsis "History of astronomy")
+ (description "This package provides a history of astronomy library.
+Current Features:
+@itemize
+@item define standard positional numeral systems with standard arithmetics
+(BasedReal)
+@item set your own precision contexts and algorithms on arithmetical
+operations (PrecisionContext)
+@item keep track of all operations
+@item build or import ancient astronomical tables
+@item perform arithmetical and statistical operations
+@item support for BasedReal values
+@item define new calendar types
+@item date conversions
+@item collection of mathematical models used for all kinds of geocentric
+astronomical tables
+@end itemize")
+ (license license:bsd-3)))
+
(define-public python-mpl-animators
(package
(name "python-mpl-animators")
- (version "1.1.1")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mpl_animators" version))
(sha256
- (base32 "078dshs383ny182dac0spg7z0iilcwa0fnwv1vizsr6p1d3ar98b"))))
+ (base32 "0xxzwxp2zss2s5ci6d349nfdc4hcbm10pqmf5zf14yn66plc1r4k"))))
(build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ ;; Relax matplotlib warning: ... because the default path
+ ;; (/homeless-shelter/.config/matplotlib) is not a writable
+ ;; directory ...
+ (setenv "HOME" "/tmp"))))))
(native-inputs
(list python-pytest
+ python-pytest-doctestplus
python-pytest-mpl
+ python-pytest-xdist
python-setuptools-scm))
(propagated-inputs
(list python-astropy
@@ -2416,21 +3011,59 @@ exitinction laws found in the literature.")
the easy construction of interactive matplotlib widget based animations.")
(license license:bsd-3)))
+(define-public python-naima
+ (package
+ (name "python-naima")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "naima" version))
+ (sha256
+ (base32 "1lng2prl2kzzpgrkj11hl53cvqdh0gpk8cdqkvcg08k3bivzk8q8"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list python-astropy
+ python-corner
+ python-emcee
+ python-h5py
+ python-matplotlib
+ python-pyyaml
+ python-scipy))
+ (native-inputs
+ (list python-pytest python-setuptools-scm))
+ (home-page "http://github.com/zblz/naima")
+ (synopsis "Derivation of non-thermal particle distributions through MCMC spectral fitting")
+ (description
+ "This package implement functionality for computation of non-thermal
+radiation from relativistic particle populations. It includes tools to
+perform MCMC fitting of radiative models to X-ray, GeV, and TeV spectra using
+@code{emcee}, an affine-invariant ensemble sampler for Markov Chain Monte
+Carlo.")
+ (license license:bsd-3)))
+
(define-public python-ndcube
(package
(name "python-ndcube")
- (version "2.2.0")
+ (version "2.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ndcube" version))
(sha256
- (base32 "1b3vbnm438j5jb48vilp145lq137fbrg1l4845rc55mz2p025x34"))))
+ (base32 "0d82xldinvjw4csql4w3k44ibprbz0b0g5ixq9a5f6c7zbvfc24l"))))
(build-system pyproject-build-system)
(arguments
(list
+ ;; Break cycle: python-ndcube -> python-specutils -> python-ndcube, see
+ ;; <https://github.com/sunpy/ndcube/issues/733>.
+ #:test-flags #~(list "-k" "not test_rebin_specutils")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'break-cycle
+ (lambda _
+ (substitute* "ndcube/tests/test_ndcube.py"
+ (("from specutils import Spectrum1D") ""))))
(add-before 'check 'set-home-env
(lambda _
;; Tests require HOME to be set.
@@ -2470,13 +3103,13 @@ can be described by @acronym{WCS, World Coordinate System} translations.")
(name "python-photutils")
;; PyPI version for source archive is missing minor 0, See
;; <https://github.com/astropy/photutils/issues/1727>
- (version "1.12")
+ (version "1.13.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "photutils" version))
(sha256
- (base32 "0y4kcj6qjnzwjswc0c2iimh11b0jz6b9ianbh58w4gnb4y71lr6r"))))
+ (base32 "1lhpcxh2adknzlmrddqd712yzpwdlqlw9jn49ajj4kz5z7822dns"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2519,7 +3152,7 @@ setup(ext_modules=get_extensions())")))))
python-shapely
python-tqdm))
(native-inputs
- (list python-cython
+ (list python-cython-3
python-extension-helpers
python-pytest-astropy
python-pytest-xdist
@@ -2698,13 +3331,13 @@ interest, and which require portability between platforms or ease of scripting."
(define-public python-pyvo
(package
(name "python-pyvo")
- (version "1.5.1")
+ (version "1.5.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyvo" version))
(sha256
- (base32 "0cm6agaf1gvc5bi95wx6a70ngj9vn95rx78fs59vlrmpww7q2807"))))
+ (base32 "0wcg3jhfwjd9gqs74mw63sgi1yhmgljx1bwk3mxn0p6fv924r8mq"))))
(build-system pyproject-build-system)
(native-inputs
(list python-pytest-astropy python-requests-mock python-setuptools-scm))
@@ -2770,16 +3403,64 @@ setup(ext_modules=get_extensions())")))))
(description "Regions is an Astropy package for region handling.")
(license license:bsd-3)))
+(define-public python-regularizepsf
+ (package
+ (name "python-regularizepsf")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch) ; no tests data in the PyPI tarball
+ (uri (git-reference
+ (url "https://github.com/punch-mission/regularizepsf")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "078nklks6hjq0hgv6wpbh2x1m2yh6kmzyfgdzd9q82lxpjy1vq0i"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "setup.py"
+ ;; numpy==1.26.4
+ (("==1.26.4") ">=1.23"))))
+ (add-before 'check 'build-extensions
+ (lambda _
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs
+ (list python-astropy
+ python-dill
+ python-h5py
+ python-lmfit
+ python-matplotlib
+ python-numpy
+ python-scikit-image
+ python-scipy
+ python-sep))
+ (native-inputs
+ (list python-cython
+ python-pytest
+ python-pytest-mpl
+ python-pytest-runner))
+ (home-page "https://github.com/punch-mission/regularizepsf")
+ (synopsis "Point spread function modeling and regularization")
+ (description
+ "This package inplements functionality of @acronym{Point Spread Function,
+PSF} describing how the optical system spreads light from sources.")
+ (license license:expat)))
+
(define-public python-reproject
(package
(name "python-reproject")
- (version "0.13.1")
+ (version "0.14.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "reproject" version))
(sha256
- (base32 "1xk809h2j3zj37l5lx4l87zanf9zxbxajcrff2b2f2i0jpnmxqv3"))))
+ (base32 "1h5v74da32ai9dkhcdn3xx4h05awlxhhnrsdjj1sb644c1vlyg6x"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2816,7 +3497,6 @@ setup(ext_modules=get_extensions())")))))
(list python-asdf
python-astropy
python-astropy-healpix
- python-click
python-cloudpickle
python-dask
python-fsspec
@@ -2829,9 +3509,11 @@ setup(ext_modules=get_extensions())")))))
(native-inputs
(list python-cython-3
python-extension-helpers
- python-pytest
+ python-asdf
+ python-gwcs
python-pytest-astropy
python-pytest-xdist
+ python-pyvo
;; python-sunpy ; circular dependencies, test optional
python-setuptools-scm))
(home-page "https://reproject.readthedocs.io")
@@ -2853,7 +3535,7 @@ changing the pixel resolution, orientation, coordinate system.")
(uri (pypi-uri "sgp4" version))
(sha256
(base32 "0aalbmldks6ykgkcxwkvnp04q0avhv903m5zwvg8i7zvl99xrbfq"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-numpy))
(home-page "https://github.com/brandon-rhodes/python-sgp4")
@@ -2875,19 +3557,19 @@ orbits described in TLE files.")
(define-public python-sunpy
(package
(name "python-sunpy")
- (version "5.1.2")
+ (version "6.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sunpy" version))
(sha256
- (base32 "0h62qh74xanj2drikjch7h0a5g4dsaf3v4qxx38vjazmibc37ynp"))))
+ (base32 "1yp7x26fzxs66bfvzaim8ns5q6514l66mbz5gabhlxb9pp8i6i85"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list
- "-n" "auto"
+ "--numprocesses" "auto"
"-k" (string-append
;; XXX: Failed: DID NOT RAISE <class 'ModuleNotFoundError'>
;; It struggles to find python-opencsv package info with
@@ -2900,10 +3582,11 @@ orbits described in TLE files.")
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
- (substitute* "setup.cfg"
- ;; It's already updated in master branch, but not released yet.
- ;; drms>=0.6.1,<0.7.0
- (("0.7.0") "0.7.2"))))
+ (substitute* "pyproject.toml"
+ ;; packaging>=23.0
+ ((">=23.0") ">=21.3")
+ ;; numpy>=1.23.5
+ ((">=1.23.5") ">=1.23.2"))))
(add-before 'install 'writable-compiler
(lambda _
(make-file-writable "sunpy/_compiler.c")))
@@ -2919,10 +3602,10 @@ python_files = test_*.py"))))))))
python-aiohttp
python-extension-helpers
python-hvpy
+ python-jplephem
+ ;; python-mplcairo ; Not packed yet in Guix
python-packaging
- python-pytest
python-pytest-astropy
- python-pytest-doctestplus
python-pytest-mock
python-pytest-mpl
python-pytest-xdist
@@ -2941,16 +3624,15 @@ python_files = test_*.py"))))))))
python-h5netcdf
python-h5py
python-hypothesis
- python-jplephem
python-matplotlib
python-mpl-animators
python-numpy
python-pandas
+ python-pyerfa
python-reproject
python-scikit-image
python-scipy
;; python-spiceypy ; Not packed yet in Guix, long jorney.
- python-sqlalchemy
python-tqdm
python-zeep))
(home-page "https://sunpy.org")
@@ -3130,13 +3812,13 @@ of axis order, spatial projections, and spectral units that exist in the wild.
(define-public python-specutils
(package
(name "python-specutils")
- (version "1.14.0")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "specutils" version))
(sha256
- (base32 "06l0k8hi4hbfs825cnw948nnkl627g3w48n2pf9rspbvd3vbs2qf"))))
+ (base32 "1bv1f0bpyc8pgxywcmhd3rpmnx0l604iqn4cx6isa9jfp6gnd0z3"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3178,7 +3860,7 @@ see @url{https://github.com/astropy/astropy-APEs/blob/main/APE13.rst, APE13}.")
(define-public python-spherical-geometry
(package
(name "python-spherical-geometry")
- (version "1.3.1")
+ (version "1.3.2")
(source
(origin
(method git-fetch)
@@ -3187,7 +3869,7 @@ see @url{https://github.com/astropy/astropy-APEs/blob/main/APE13.rst, APE13}.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "172f81h42jq6mv3gpx497z2nkhkx11w4pzmcqljcicri2zqj1m6g"))))
+ (base32 "0znzfy3bmnsncvahf8qdav0c9403fn99d1gp25lainhv7kxfk44c"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3226,16 +3908,43 @@ spherical polygons that represent arbitrary regions of the sky.")
;; QD_LIBRARY_LICENSE.rst for bandeled QD source
(license license:bsd-3)))
+(define-public python-statmorph
+ (package
+ (name "python-statmorph")
+ (version "0.5.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "statmorph" version))
+ (sha256
+ (base32 "06rbwrqlvdzn9innx05kjjmm4mmacd8kwwsfdf5idbwzby5ny5lw"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list python-astropy
+ python-numpy
+ python-photutils
+ python-scikit-image
+ python-scipy))
+ (native-inputs
+ (list python-pytest))
+ (home-page "https://github.com/vrodgom/statmorph")
+ (synopsis "Non-parametric morphological diagnostics of galaxy images")
+ (description
+ "The package @code{statmorph} implements functionality of calculating
+non-parametric morphological diagnostics of galaxy images (e.g., Gini-M_{20}
+and CAS statistics), as well as fitting 2D Sérsic profiles.")
+ (license license:bsd-3)))
+
(define-public python-stsci-image
(package
(name "python-stsci-image")
- (version "2.3.5")
+ (version "2.3.9")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "stsci.image" version))
+ (uri (pypi-uri "stsci_image" version))
(sha256
- (base32 "1vnp4256nbdvapa69cmm80sjz11ygxa49abr9nbvssj6nyyp5icb"))))
+ (base32 "0w7s93jsz61ccbhj7irl28q4jgiwa7y9k8pfj24q8vc9zvs530pj"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3257,7 +3966,7 @@ Telescope Science Institute} image array manipulation functions.")
(define-public python-stsci-imagestats
(package
(name "python-stsci-imagestats")
- (version "1.8.2")
+ (version "1.8.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "stsci.imagestats" version))
@@ -3290,16 +3999,17 @@ task}.")
(name "python-stsci-stimage")
;; PyPI version was 0.2.8 but the latest version tag on GiHub was 0.2.7,
;; see <https://github.com/spacetelescope/stsci.stimage/issues/38>
- (version "0.2.8")
+ (version "0.2.9")
(source (origin
(method url-fetch)
(uri (pypi-uri "stsci_stimage" version))
(sha256
(base32
- "0p188my6djy65a8j6qsc3v0dpr2svqqv90n0pxxzy52vdjiz3w0w"))))
+ "18sqmjiyn76hzkmv3g8549vfygi136gnar6pb0s7wb44j7cvc0in"))))
(build-system pyproject-build-system)
(arguments
(list
+ #:build-backend "setuptools.build_meta"
#:test-flags #~(list "test_c")
#:phases
#~(modify-phases %standard-phases
@@ -3314,7 +4024,10 @@ task}.")
(propagated-inputs
(list python-numpy))
(native-inputs
- (list python-pytest python-setuptools-scm python-waf))
+ (list python-pytest
+ python-wheel
+ python-setuptools-scm
+ python-waf))
(home-page "https://stscistimage.readthedocs.io/en/latest/")
(synopsis "STScI image processing")
(description
@@ -3325,18 +4038,35 @@ processing functions: @code{xyxymatch}, @code{geomap}.")
(define-public python-stcal
(package
(name "python-stcal")
- (version "1.7.0")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "stcal" version))
(sha256
- (base32 "04ippj90dn2671xg4rvncf7jsbpcflr7dr6jc2h52z7xfd1msb4d"))))
+ (base32 "0vcq1462wdfi96qqsd5bidx38bbpnpcm18j6s761jz8ymi6vifap"))))
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags
+ #~(list "-k" (string-append
+ ;; Tests requiring network access.
+ "not test_absolute_align"
+ " and not test_relative_align[True]"
+ " and not test_relative_align[False]"
+ " and not test_get_catalog"
+ " and not test_create_catalog"
+ " and not test_create_catalog_graceful_failure"
+ " and not test_parse_refcat"))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-slope-fitter
+ (lambda _
+ (substitute* "src/stcal/ramp_fitting/src/slope_fitter.c"
+ ;; It's failing to build, it looks like Guix's NumPy does not
+ ;; contain the variable: error: ‘NPY_NTYPES_LEGACY’ undeclared
+ ;; (first use in this function)
+ ((".*NPY_NTYPES_LEGACY.*") ""))))
(add-before 'build 'silent-check-for-opencv
(lambda _
;; XXX: Can't detect opencv-python version. The input opencv
@@ -3351,14 +4081,17 @@ processing functions: @code{xyxymatch}, @code{geomap}.")
(list opencv ;Provides OpenCV-Python
python-asdf
python-astropy
+ python-drizzle
python-gwcs
python-numpy
- python-scipy))
+ python-requests
+ python-scikit-image
+ python-scipy
+ python-tweakwcs))
(native-inputs
(list python-cython-3
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm))
(home-page "https://github.com/spacetelescope/stcal")
@@ -3369,13 +4102,13 @@ processing functions: @code{xyxymatch}, @code{geomap}.")
(define-public python-stdatamodels
(package
(name "python-stdatamodels")
- (version "1.10.1")
+ (version "2.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "stdatamodels" version))
(sha256
- (base32 "1h0imp6j9qrjadhvvqcgrx6dq94qhi0023c8c8r2wddhqrh0h5lg"))))
+ (base32 "0a47xf1zv71kv166z6rd9v75bw0jjmg70180af4yi4v4y7gnxvmm"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3414,22 +4147,34 @@ implemented in the @acronym{JWST, James Webb Space Telescope} and
(define-public python-stpipe
(package
(name "python-stpipe")
- (version "0.5.1")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "stpipe" version))
- (sha256
- (base32
- "11ccb3v2s20lf851061s4nanljwm9s9xzkcfgb3qhv0hjwziq0vr"))))
- (arguments
- (list
- ;; See https://github.com/spacetelescope/stpipe/issues/114
- #:test-flags #~(list "-k" "not test_roman_datamodel")))
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "stpipe" version))
+ (sha256
+ (base32 "0kxm0vllyi3z149q3g3xpfl0c0wpviiyfh55rv0x6zvs0px6c81j"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Replace reference to external configobj.
+ (substitute* (find-files "." "\\.py$")
+ (("from astropy.extern import configobj") "import configobj")
+ (("from astropy.extern.configobj import validate") "import validate")
+ (("from astropy.extern.configobj.configobj import ") "from configobj import ")
+ (("from astropy.extern.configobj.validate import ") "from validate import "))))))
(build-system pyproject-build-system)
(propagated-inputs
- (list python-asdf python-astropy python-crds python-stdatamodels))
- (native-inputs (list python-pytest python-pytest-doctestplus
- python-pytest-openfiles python-setuptools-scm))
+ (list python-asdf
+ python-astropy
+ python-crds
+ python-stdatamodels))
+ (native-inputs
+ (list ;; python-jwst ; cycle: python-stpipe -> python-jwst -> python-stpipe
+ python-pytest
+ python-pytest-doctestplus
+ python-pytest-openfiles
+ python-setuptools-scm))
(home-page "https://github.com/spacetelescope/stpipe")
(synopsis "Framework for calibration pipeline software")
(description
@@ -3709,57 +4454,6 @@ R. Seaman's protocol}
@end itemize\n")
(license license:gpl3+)))
-(define-public xplanet
- (package
- (name "xplanet")
- (version "1.3.1")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append
- "mirror://sourceforge/xplanet/xplanet/"
- version "/xplanet-" version ".tar.gz"))
- (sha256
- (base32 "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"))
- (patches
- (search-patches
- "xplanet-1.3.1-cxx11-eof.patch"
- "xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch"
- "xplanet-1.3.1-libimage_gif.c.patch"
- "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:configure-flags
- #~(list
- ;; No NASA JPL cspice support.
- "--without-cspice"
- (string-append "CPPFLAGS=-I" #$(this-package-input "netpbm")
- "/include/netpbm"))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list freetype
- giflib
- libice
- libjpeg-turbo
- libpng
- libtiff
- libx11
- libxscrnsaver
- netpbm
- pango
- zlib))
- (home-page "https://xplanet.sourceforge.net/")
- (synopsis "Planetary body renderer")
- (description
- "Xplanet renders an image of a planet into an X window or file.
-All of the major planets and most satellites can be drawn and different map
-projections are also supported, including azimuthal, hemisphere, Lambert,
-Mercator, Mollweide, Peters, polyconic, orthographic and rectangular.")
- (license license:gpl2+)))
-
(define-public gpredict
;; The latest tag, 2.3, has no major difference with 2.2.1 and is dated for
;; 2018. Additionally, there is some activity on the master branch.
@@ -3971,7 +4665,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit,
(define-public indi-2.0
(package
(name "indi")
- (version "2.0.7")
+ (version "2.0.9")
(source
(origin
(method git-fetch)
@@ -3980,29 +4674,33 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit,
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0w3494by88g0sz92adgvy75g7f1609ilsblink9z37n02v83dfxi"))))
+ (base32 "08wmw7mrxx1zc89yka3c52djmpvlb8zimq8yzs95gh3p7r5jfpq9"))))
(build-system cmake-build-system)
(arguments
- ;; TODO: fix failing tests on aarch64-system.
- `(#:tests? ,(not (or (%current-target-system) (target-aarch64?)))
- #:configure-flags
- (let ((out (assoc-ref %outputs "out")))
- (list
- "-DINDI_BUILD_UNITTESTS=ON"
- "-DCMAKE_BUILD_TYPE=Release"
- (string-append "-DCMAKE_INSTALL_PREFIX=" out)
- (string-append "-DUDEVRULES_INSTALL_DIR=" out "/lib/udev/rules.d")))
- #:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (with-directory-excursion "test"
- (invoke "ctest")))))
- (add-before 'install 'set-install-directories
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/lib/udev/rules.d"))))))))
+ (list
+ #:parallel-tests? #f ; Socket address collisions between tests
+ #:configure-flags
+ #~(list "-DINDI_BUILD_UNITTESTS=ON"
+ "-DINDI_BUILD_INTEGTESTS=ON"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)
+ (string-append "-DUDEVRULES_INSTALL_DIR=" #$output "/lib/udev/rules.d"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-udev-rules
+ (lambda _
+ (substitute* (list "drivers/auxiliary/99-indi_auxiliary.rules"
+ "drivers/video/80-dbk21-camera.rules")
+ (("/bin/sh") (which "sh"))
+ (("/sbin/modprobe")
+ (string-append #$(this-package-input "kmod") "/bin/modprobe")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "integs"
+ (invoke "ctest" "-V" "--output-on-failure"))
+ (with-directory-excursion "test"
+ (invoke "ctest" "-V"))))))))
(native-inputs
(list googletest))
(inputs
@@ -4010,6 +4708,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit,
curl
fftw
gsl
+ kmod
libev
libjpeg-turbo
libnova
@@ -4047,75 +4746,16 @@ more.")
;; Default version of INDI..
indi-1.9)
-(define-public sunclock
- (let ((commit "f4106eb0a81f7594726d6b2859efd8fc64cc1225")
- (revision "1"))
- (package
- (name "sunclock")
- (version (git-version "3.57" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/nongiach/Sunclock")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1rczdpmhvfw57b9r793vq8vqlbdhlkgj52fxwrdfl6cwj95a9kv2"))))
- (build-system gnu-build-system)
- (arguments
- `(#:make-flags
- (list (string-append "DESTDIR=" %output)
- ;; Fix incorrect argument given to gcc. Error message:
- ;; "gcc: error: DefaultGcc2AMD64Opt: No such file or directory"
- "CDEBUGFLAGS=")
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda _
- (chdir "sunclock-3.57")
- (substitute* "Imakefile"
- (("^MANDIR=/X11R6/man/man1")
- "MANDIR=/share/man/man1")
- (("^BINDIR=/X11R6/bin")
- "BINDIR=/bin")
- ;; Disable ZLIB support for vmf files because zlib implements
- ;; `gzgetc` as a macro instead of a function, which results in
- ;; a compilation error.
- ((" -DZLIB") "")
- ((" -lz") "")
- (("cd \\$\\(DESTDIR\\)\\$\\(SHAREDIR\\)/earthmaps/vmf ; \
-gzip -f \\*.vmf")
- ""))
- ;; Generate Makefile.
- (invoke "xmkmf"))))
- #:tests? #f)) ; No check target.
- (inputs
- (list libjpeg-turbo libpng libx11 libxpm))
- (native-inputs
- (list imake))
- (home-page "https://github.com/nongiach/Sunclock")
- (synopsis
- "Map of the Earth that shows which portion is illuminated by the Sun")
- (description
- "Sunclock displays a map of the Earth and shows which portion is
-illuminated by the Sun. It can commute between two states, the \"clock window\"
-and the \"map window\". The clock window displays a small map of the Earth and
-therefore occupies little space on the screen, while the \"map window\" displays
-a large map and offers more advanced functions: local time of cities, Sun and
-Moon position, etc.")
- (license license:gpl2+))))
-
(define-public python-jplephem
(package
(name "python-jplephem")
- (version "2.21")
+ (version "2.22")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jplephem" version))
(sha256
- (base32 "0mcdhb22vwbyavcnkcwchj0cxnxsvaw5563v464ipwlm0rhln69l"))))
+ (base32 "0b2rgb7pvwnl72pqjryf9c812mmdxr69fwiym7mnz05l2xrcr6hd"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -4140,13 +4780,22 @@ milliarcsecond).")
(define-public python-jwst
(package
(name "python-jwst")
- (version "1.14.0")
+ (version "1.15.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "jwst" version))
(sha256
(base32
- "0knl2x0z3djsln8mi3a4bkxjz49iwmnr1v6wwsk13zvpkfq21vv4"))))
+ "1nl5fixakqvjhg9q5biivwaqpi6lzx9w4fq0n6imwccag2gv1va3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Replace reference to external configobj.
+ (substitute* (find-files "." "\\.py$")
+ (("from astropy.extern import configobj") "import configobj")
+ (("from astropy.extern.configobj import validate") "import validate")
+ (("from astropy.extern.configobj.configobj import ") "from configobj import ")
+ (("from astropy.extern.configobj.validate import ") "from validate import "))))))
(build-system pyproject-build-system)
(arguments
(list
@@ -4208,16 +4857,57 @@ science corrections sequentially, producing both fully-calibrated individual
exposures and high-level data products (mosaics, extracted spectra, etc.).")
(license license:bsd-3)))
+(define-public python-jwst-reffiles
+ (package
+ (name "python-jwst-reffiles")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "jwst_reffiles" version))
+ (sha256
+ (base32 "1dlw955cw49qczdmimglmlcbal8vd3wbv5j48ckllvjgd59pwr3s"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; FIXME: Invistigate why it failes on python-jwst side where the
+ ;; python-tweakwcs is built just fine:
+ ;;
+ ;; <...>/tweakwcs/matchutils.py:18: in <module>
+ ;; from stsci.stimage import xyxymatch
+ ;; E ModuleNotFoundError: No module named 'stsci.stimage'
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'sanity-check))))
+ (propagated-inputs
+ (list python-astropy
+ python-jwst
+ python-matplotlib
+ python-numpy
+ python-scipy))
+ (native-inputs
+ (list python-pytest
+ python-stsci-stimage))
+ (home-page "https://github.com/spacetelescope/jwst_reffiles")
+ (synopsis "Tool for JWST's CRDS-formatted reference files creation")
+ (description
+ "This package provides a tool to create @acronym{Calibration References
+Data System,CRDS}-formatted reference files for @acronym{James Webb Space
+Telescope,JWST} from a set of input dark current files and a set of flat field
+files.")
+ (license license:bsd-3)))
+
(define-public python-pyerfa
(package
(name "python-pyerfa")
- (version "2.0.1.1")
+ (version "2.0.1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyerfa" version))
(sha256
- (base32 "0swsdkipnk73iflsa7qbaw89wahbnfyvplqaxwi0yfrxippp9b6v"))
+ (base32 "1lwx4hril705r2iz4pirgn0wrpv1wk20mr669g03bsij69qsdf5c"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -4469,20 +5159,84 @@ photometric systems are available, and users can incorporate their own filters,
spectra, and data.")
(license license:bsd-3))))
-(define-public python-sep
+(define-public python-sbpy
(package
- (inherit libsep)
+ (name "python-sbpy")
+ (version "0.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sbpy" version))
+ (sha256
+ (base32 "18f3056fgzpvjj43m845wl9znl4dqxs8f8qv3gpay7kik4l8a1fc"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; See <https://github.com/NASA-Planetary-Science/sbpy/issues/397>.
+ #~(list "--ignore=sbpy/spectroscopy/tests/test_specgrad.py"
+ ;; See <https://github.com/NASA-Planetary-Science/sbpy/issues/398>
+ "-k" (string-append "not test_from_fluxd"
+ " and not test_bandpass"
+ " and not test_spectral_density_vega_bp"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home-env
+ (lambda _
+ ;; Tests require HOME to be set.
+ ;; No such file or directory: '/homeless-shelter/.astropy'
+ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-ads
+ python-astropy
+ python-astroquery
+ python-ginga
+ python-numpy
+ python-photutils
+ python-pyyaml
+ python-scipy
+ python-synphot))
+ (native-inputs
+ (list python-pytest
+ python-pytest-astropy
+ python-pytest-doctestplus
+ python-pytest-remotedata
+ python-pytest-xdist
+ python-setuptools-scm))
+ (home-page "https://sbpy.org")
+ (synopsis "Python module for small-body planetary astronomy")
+ (description
+ "@code{sbpy} is a package for small-body planetary astronomy. It is
+meant to supplement functionality provided by @code{astropy} with functions
+and methods that are frequently used in the context of planetary astronomy
+with a clear focus on asteroids and comets.
+Features:
+@itemize
+@item observation planning tools tailored to moving objects
+@item photometry models for resolved and unresolved observations
+@item wrappers and tools for astrometry and orbit fitting
+@item spectroscopy analysis tools and models for reflected solar light and
+emission from gas
+@item cometary gas and dust coma simulation and analysis tools
+@item asteroid thermal models for flux estimation and size/albedo estimation
+@item image enhancement tools for comet comae and PSF subtraction tools
+@item lightcurve and shape analysis tools
+@item access tools for various databases for orbital and physical data, as
+well as ephemerides services
+@end itemize")
+ (license license:bsd-3)))
+
+(define-public python-sep
+ (package/inherit libsep
(name "python-sep")
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- (strip-keyword-arguments
- '(#:make-flags) (package-arguments libsep)))
+ (list #:test-flags #~(list "test.py")))
(native-inputs
- (modify-inputs (package-inputs libsep)
- (prepend python-cython)))
+ (list python-cython python-pytest))
(propagated-inputs
- (modify-inputs (package-inputs libsep)
- (prepend python-numpy)))))
+ (list python-numpy))
+ (synopsis "Python library for Source Extraction and Photometry")))
(define-public python-suntime
(package
@@ -4546,94 +5300,6 @@ PYSYNPHOT, utilizing Astropy and covering the non-instrument specific portions
of the old packages.")
(license license:bsd-3)))
-(define-public python-tweakwcs
- (package
- (name "python-tweakwcs")
- (version "0.8.7")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "tweakwcs" version))
- (sha256
- (base32 "0cch4z5zmmi1s02n1wdwss8p7qhrzyiajkaik0gga510kgdsvx48"))))
- (build-system pyproject-build-system)
- (propagated-inputs
- (list python-astropy
- python-gwcs
- python-numpy
- python-packaging
- python-spherical-geometry
- python-stsci-imagestats
- python-stsci-stimage))
- (native-inputs
- (list python-codecov
- python-pytest
- python-pytest-cov
- python-scipy
- python-setuptools-scm))
- (home-page "https://tweakwcs.readthedocs.io/en/latest/")
- (synopsis
- "Algorithms for matching and aligning catalogs and for tweaking the WCS")
- (description
- "@code{tweakwcs} is a package that provides core algorithms for computing
-and applying corrections to @code{WCS} objects such as to minimize mismatch
-between image and reference catalogs. Currently only aligning images with
-@code{FITS WCS} and @code{JWST gWCS} are supported.")
- (license license:bsd-3)))
-
-(define-public python-asdf
- (package
- (name "python-asdf")
- (version "3.2.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "asdf" version))
- (sha256
- (base32 "1wj556g15gwp6ir5hg083l15sifdsf23giqkx0jbn4lgdwjffbgr"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags
- #~(list "-n" "auto" "-p" "no:legacypath")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-pypojrect-toml
- (lambda _
- (substitute* "pyproject.toml"
- ;; ImportError: Error importing plugin " no:legacypath": No
- ;; module named ' no:legacypath'
- ((".*:legacypath.*") "")
- ;; TypeError: Configuration.__init__() got an unexpected
- ;; keyword argument 'version_file'
- (("version_file = \"asdf/_version.py\"") "")))))))
- (native-inputs
- (list python-fsspec
- python-packaging
- python-psutil
- python-pytest
- python-pytest-doctestplus
- python-pytest-remotedata
- python-pytest-xdist
- python-setuptools-scm))
- (propagated-inputs
- (list python-asdf-standard
- python-asdf-transform-schemas
- python-attrs ;; for vendorized jsonschema
- python-importlib-metadata
- python-jmespath
- python-lz4
- python-numpy
- python-pyyaml
- python-semantic-version))
- (home-page "https://github.com/asdf-format/asdf")
- (synopsis "Python tools to handle ASDF files")
- (description
- "The Advanced Scientific Data Format (ASDF) is a next-generation
-interchange format for scientific data. This package contains the Python
-implementation of the ASDF Standard.")
- (license license:bsd-3)))
-
(define-public python-asdf-compression
;; TODO: No release, change to tag when it's ready.
(let ((commit "57cc7e76fb4163be3e99fb740b36b5ec5ae96e49")
@@ -4866,13 +5532,13 @@ install an implementation package such as asdf-astropy.")
(define-public python-asdf-zarr
(package
(name "python-asdf-zarr")
- (version "0.0.3")
+ (version "0.0.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "asdf_zarr" version))
(sha256
- (base32 "0ax7c9xarh6fi2yxm1z2p90mc3d57q23a7wc8av30xg8ririrl4s"))))
+ (base32 "0xddz4hnsypyvqxhi43alaqh2vl1ripcl4p63qn6dk2v90lra8c0"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-asdf python-fsspec python-zarr))
@@ -4888,47 +5554,6 @@ format for chunked, compressed, N-dimensional arrays based on an open-source
specification.")
(license license:bsd-3)))
-(define-public python-asdf-astropy
- (package
- (name "python-asdf-astropy")
- (version "0.6.1")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "asdf-astropy" version))
- (sha256
- (base32 "1ipjpjiirycj2npicbp39ka7db61vx45j8dm2iis71g5l1rzkblp"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags
- #~(list "-n" "auto")
- #:phases #~(modify-phases %standard-phases
- (add-before 'check 'set-home-env
- (lambda _ (setenv "HOME" "/tmp"))))))
- (native-inputs
- (list python-coverage
- python-h5py
- python-pandas
- python-pytest
- python-pytest-astropy
- python-pytest-xdist
- python-scipy
- python-setuptools-scm))
- (propagated-inputs
- (list python-asdf
- python-asdf-coordinates-schemas
- python-asdf-transform-schemas
- python-astropy
- python-numpy
- python-packaging))
- (home-page "https://github.com/astropy/asdf-astropy")
- (synopsis "ASDF serialization support for astropy")
- (description
- "This package includes plugins that provide ASDF serialization support for
-Astropy objects.")
- (license license:bsd-3)))
-
(define python-asdf-wcs-schemas
(package
(name "python-asdf-wcs-schemas")
@@ -5000,13 +5625,13 @@ default) to world coordinates.")
(define-public python-rad
(package
(name "python-rad")
- (version "0.19.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "rad" version))
- (sha256
- (base32
- "08dh9asdjgfmczmqyjplgdvbk3n68qw6akd8h953wq6v3yr4k4rq"))))
+ (version "0.21.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "rad" version))
+ (sha256
+ (base32 "0b2gfsyccfx9dmmh725h7qjh5rxabg5w1j52yzfi8b0a8nmg6j6a"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -5015,7 +5640,8 @@ default) to world coordinates.")
#:test-flags #~(list "--ignore=tests/test_schemas.py")))
(native-inputs
(list python-pytest python-setuptools-scm))
- (propagated-inputs (list python-asdf python-asdf-astropy))
+ (propagated-inputs
+ (list python-asdf python-asdf-astropy))
(home-page "https://github.com/spacetelescope/rad")
(synopsis "Roman Attribute Dictionary")
(description
@@ -5063,13 +5689,13 @@ channels
(define-public python-radiospectra
(package
(name "python-radiospectra")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "radiospectra" version))
(sha256
- (base32 "0nw71a7i875lfwbwhpc80nvwalb7iq3fynfkbngx6f6jb3v10dgs"))))
+ (base32 "1mqdh90hpq7sc9lybmc7y33g84vswf7w0r5hs57rf3a9hzfxad90"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -5100,35 +5726,37 @@ solar physics.")
(define-public python-roman-datamodels
(package
(name "python-roman-datamodels")
- (version "0.19.1")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "roman_datamodels" version))
- (sha256
- (base32
- "1fp9rwzm5kzm0hjwwmlx7kym7yriyhxbfg2zr3y625pyvwpnl0a8"))))
+ (version "0.21.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "roman_datamodels" version))
+ (sha256
+ (base32 "00hwyxixdk3i48nhqnn7pnkkp3fran6fn8kzwx2w4bjkwv8cd126"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
- #~(list "-n" "auto")
+ #~(list "--numprocesses" "auto")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda _
(setenv "HOME" "/tmp"))))))
- (propagated-inputs (list python-asdf
- python-asdf-astropy
- python-astropy
- python-gwcs
- python-numpy
- python-psutil
- python-rad))
- (native-inputs (list python-pytest
- python-pytest-doctestplus
- python-pytest-env
- python-pytest-xdist
- python-setuptools-scm))
+ (propagated-inputs
+ (list python-asdf
+ python-asdf-astropy
+ python-astropy
+ python-gwcs
+ python-numpy
+ python-psutil
+ python-rad))
+ (native-inputs
+ (list python-pytest
+ python-pytest-doctestplus
+ python-pytest-env
+ python-pytest-xdist
+ python-setuptools-scm))
(home-page "https://github.com/spacetelescope/roman_datamodels")
(synopsis "Roman Datamodels Support")
(description
@@ -5142,43 +5770,10 @@ for Roman since FITS format data files will not be used by the Roman calibration
pipelines.")
(license license:bsd-3)))
-(define-public python-astroalign
- (package
- (name "python-astroalign")
- (version "2.5.1")
- (source
- (origin
- ;; There are no tests in the PyPI tarball.
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/quatrope/astroalign")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1kr5cszcxvrdbksy7mvv3ps1h1jzrn4yamfr6x7whkbi6bpqf7xp"))))
- (build-system pyproject-build-system)
- (native-inputs
- (list python-astropy
- python-ccdproc
- python-pillow
- python-pytest))
- (propagated-inputs
- (list python-bottleneck
- python-numpy
- python-scikit-image
- python-scipy
- python-sep))
- (home-page "https://astroalign.readthedocs.io/")
- (synopsis "Astrometric Alignment of Images")
- (description
- "ASTROALIGN is a python module that will try to align two stellar
-astronomical images, especially when there is no WCS information available.")
- (license license:expat)))
-
(define-public python-skyfield
(package
(name "python-skyfield")
- (version "1.48")
+ (version "1.49")
(source
(origin
(method git-fetch) ; PyPI tarball lacks test data
@@ -5187,7 +5782,7 @@ astronomical images, especially when there is no WCS information available.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0l324r4pz7d5w72c7c5akvjx40287hl7sl0qv7swvn2da53vmq0r"))))
+ (base32 "1rk71lzy8w28f2kzhxb3pyndncrj91jay43nvqlrlzjxi2rbg7ix"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -5214,6 +5809,72 @@ astronomical images, especially when there is no WCS information available.")
orbit around the Earth.")
(license license:expat)))
+(define-public python-tweakwcs
+ (package
+ (name "python-tweakwcs")
+ (version "0.8.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "tweakwcs" version))
+ (sha256
+ (base32 "148as0x1szk1wv13bwk947qs3rw5xj2286ccdbhzfzarng58a386"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list python-astropy
+ python-gwcs
+ python-numpy
+ python-packaging
+ python-spherical-geometry
+ python-stsci-imagestats
+ python-stsci-stimage))
+ (native-inputs
+ (list python-codecov
+ python-pytest
+ python-pytest-cov
+ python-scipy
+ python-setuptools-scm))
+ (home-page "https://tweakwcs.readthedocs.io/en/latest/")
+ (synopsis
+ "Algorithms for matching and aligning catalogs and for tweaking the WCS")
+ (description
+ "@code{tweakwcs} is a package that provides core algorithms for computing
+and applying corrections to @code{WCS} objects such as to minimize mismatch
+between image and reference catalogs. Currently only aligning images with
+@code{FITS WCS} and @code{JWST gWCS} are supported.")
+ (license license:bsd-3)))
+
+(define-public python-viresclient
+ (package
+ (name "python-viresclient")
+ (version "0.12.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "viresclient" version))
+ (sha256
+ (base32 "1y3g59yh3ic5288f2n9r6bj7b0w3vfdfcnqfg1va0z7w9jnk55j1"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-flit-core python-pytest))
+ (propagated-inputs
+ (list python-cdflib
+ python-jinja2
+ python-netcdf4
+ python-pandas
+ python-requests
+ python-tables
+ python-tqdm
+ python-xarray))
+ (home-page "https://viresclient.readthedocs.io/en/latest/")
+ (synopsis "Python client for interacting with a VirES server")
+ (description
+ "This package provides a Python client for interacting with a
+@code{VirES} server, of which there are two: VirES for
+@url{https://vires.services, Swarm} and VirES for
+@url{https://aeolus.services, Aeolus}")
+ (license license:expat)))
+
(define-public python-wiimatch
(package
(name "python-wiimatch")
@@ -5237,6 +5898,299 @@ for optimal @code{matching} of weighted N-dimensional image intensity data
using (multivariate) polynomials.")
(license license:bsd-3)))
+(define-public python-yt
+ (package
+ (name "python-yt")
+ (version "4.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "yt" version))
+ (sha256
+ (base32 "03jy35vyniyd1pd3sv0zpd2f3ks2iyqw65xv28ids8nw6v1vavbv"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:build-backend "setuptools.build_meta"
+ #:test-flags
+ #~(list "-n" "auto")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "pyproject.toml"
+ ;; XXX: Updating ipywidgets requires long chain of rebuilds,
+ ;; maybe for python-team.
+ ;;
+ ;; ipywidgets>=8.0.0
+ ((">=8.0.0") ">=7.6.3"))))
+ (add-before 'check 'prepare-test-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs
+ (list python-cmyt
+ python-ewah-bool-utils
+ python-ipywidgets
+ python-matplotlib
+ python-more-itertools-next
+ python-numpy
+ python-packaging
+ python-pillow
+ python-tomli-w
+ python-tqdm
+ python-unyt))
+ (native-inputs
+ (list python-cython-3
+ python-nose
+ python-nose-exclude
+ python-nose-timer
+ python-pyaml
+ python-pytest
+ python-pytest-mpl
+ python-pytest-xdist
+ python-setuptools
+ python-sympy))
+ (home-page "http://yt-project.org/")
+ (synopsis "Analyzing and visualizing volumetric data framework")
+ (description
+ "This package provides a structured, variable-resolution meshes,
+ unstructured meshes, and discrete or sampled data such as particles. Focused on
+ driving physically-meaningful inquiry, it has been applied in domains such as
+ astrophysics, seismology, nuclear engineering, molecular dynamics, and
+ oceanography.")
+ (license (list
+ ;; COPYING.txt: for Python code.
+ ;;
+ ;; yt uses a shared copyright model. Each contributor maintains
+ ;; copyright over their contributions to yt. But, it is important
+ ;; to note that these contributions are typically only changes to
+ ;; the repositories. Thus, the yt source code, in its entirety is
+ ;; not the copyright of any single person or institution. Instead,
+ ;; it is the collective copyright of the entire yt Development
+ ;; Team. If individual contributors want to maintain a record of
+ ;; what changes/contributions they have specific copyright on,
+ ;; they should indicate their copyright in the commit message of
+ ;; the change, when they commit the change to one of the yt
+ ;; repositories.
+ license:bsd-3
+ ;; yt/frontends/artio/artio_headers/LICENSE: for C code.
+ license:lgpl3))))
+
+(define-public python-yt-astro-analysis
+ (package
+ (name "python-yt-astro-analysis")
+ (version "1.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "yt_astro_analysis" version))
+ (sha256
+ (base32 "1fb3sdp6hq2c4c28pd33v9yj14x9l7qizf3y3qpl594qdq1ffmpi"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; Disable test which require MPI setup and failed to run, check why.
+ #:test-flags #~(list "--ignore=test_halo_finders_ts.py")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'build-extensions
+ (lambda _
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs
+ (list python-h5py
+ python-numpy
+ python-packaging
+ python-yt))
+ (native-inputs
+ (list python-cython
+ python-nose
+ python-tomli))
+ (home-page "https://github.com/yt-project/yt_astro_analysis")
+ (synopsis "YT astrophysical analysis modules")
+ (description
+ "This package provides an @code{yt} extension package for astrophysical
+analysis. This package contains functionality for:
+
+@itemize
+@item halo finding and analysis
+@item lightcones
+@item planning cosmological simulations for making lightcones and lightrays
+@item exporting to the RADMC-3D radiation transport code
+@item creating PPV FITS cubes
+@end itemize")
+ (license (list license:bsd-3 license:lgpl3))))
+
+(define-public python-zodipy
+ (package
+ (name "python-zodipy")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch) ;; no tests in the PyPI tarball
+ (uri (git-reference
+ (url "https://github.com/Cosmoglobe/zodipy")
+ (commit (string-append "v." version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08hwicpv3wfpccr2cj1vxb8iy7av12yjs3prq0zw7qc89imrgrbn"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "pyproject.toml"
+ ;; numpy = "^1.26.4"
+ (("1.26.4") "1.23.2")
+ ;; scipy = "^1.13.0"
+ (("1.13.0") "1.12.0")))))))
+ (propagated-inputs
+ (list python-astropy
+ python-jplephem
+ python-numpy
+ python-scipy))
+ (native-inputs
+ (list python-poetry-core
+ python-pytest))
+ (home-page "https://github.com/Cosmoglobe/zodipy")
+ (synopsis "Zodiacal emission simulations")
+ (description
+ "ZodiPy is an package for simulating zodiacal light in intensity for
+arbitrary solar system observers.")
+ (license license:gpl3+)))
+
+(define-public qfits
+ (package
+ (name "qfits")
+ (version "6.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "ftp://ftp.eso.org/pub/qfits/qfits-" version ".tar.gz"))
+ (sha256
+ (base32 "0m2b21mim3a7wgfg3ph2w5hv7mdvr03jmmhzipc0wcahijglcw9j"))))
+ (build-system gnu-build-system)
+ (home-page "https://www.eso.org/sci/software/eclipse/qfits/")
+ (synopsis "C library offering access to astronomical FITS files")
+ (description
+ "@code{qfits} is a C library giving access to FITS file internals, both
+for reading and writing.")
+ (license license:gpl2+)))
+
+(define-public stuff
+ (package
+ (name "stuff")
+ (version "2.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/stuff")
+ ;; XXX: No version tag available in GitHub.
+ ;; See: https://github.com/astromatic/stuff/issues/6
+ (commit "9008dc022ef53331092da248cf0a794abd6783bf")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "004sry5lqqm7s9x4l3agysp3n63y3ga35x1rwwda4m6dc6zvla6b"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list autoconf automake libtool pkg-config))
+ (home-page "https://www.astromatic.net/software/stuff")
+ (synopsis "Astronomical catalogue simulation")
+ (description
+ "Stuff is a program that simulates \"perfect\" astronomical catalogues.
+It generates object lists in ASCII which can read by the SkyMaker program to
+produce realistic astronomical fields. Stuff is part of the
+@uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.")
+ (license license:gpl3+)))
+
+(define-public sunclock
+ (let ((commit "f4106eb0a81f7594726d6b2859efd8fc64cc1225")
+ (revision "1"))
+ (package
+ (name "sunclock")
+ (version (git-version "3.57" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nongiach/Sunclock")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rczdpmhvfw57b9r793vq8vqlbdhlkgj52fxwrdfl6cwj95a9kv2"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ (list (string-append "DESTDIR=" %output)
+ ;; Fix incorrect argument given to gcc. Error message:
+ ;; "gcc: error: DefaultGcc2AMD64Opt: No such file or directory"
+ "CDEBUGFLAGS=")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (chdir "sunclock-3.57")
+ (substitute* "Imakefile"
+ (("^MANDIR=/X11R6/man/man1")
+ "MANDIR=/share/man/man1")
+ (("^BINDIR=/X11R6/bin")
+ "BINDIR=/bin")
+ ;; Disable ZLIB support for vmf files because zlib implements
+ ;; `gzgetc` as a macro instead of a function, which results in
+ ;; a compilation error.
+ ((" -DZLIB") "")
+ ((" -lz") "")
+ (("cd \\$\\(DESTDIR\\)\\$\\(SHAREDIR\\)/earthmaps/vmf ; \
+gzip -f \\*.vmf")
+ ""))
+ ;; Generate Makefile.
+ (invoke "xmkmf"))))
+ #:tests? #f)) ; No check target.
+ (inputs
+ (list libjpeg-turbo libpng libx11 libxpm))
+ (native-inputs
+ (list imake))
+ (home-page "https://github.com/nongiach/Sunclock")
+ (synopsis
+ "Map of the Earth that shows which portion is illuminated by the Sun")
+ (description
+ "Sunclock displays a map of the Earth and shows which portion is
+illuminated by the Sun. It can commute between two states, the \"clock window\"
+and the \"map window\". The clock window displays a small map of the Earth and
+therefore occupies little space on the screen, while the \"map window\" displays
+a large map and offers more advanced functions: local time of cities, Sun and
+Moon position, etc.")
+ (license license:gpl2+))))
+
+(define-public swarp
+ (package
+ (name "swarp")
+ (version "2.41.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/swarp")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00463r5rd4xl74xs4h1n4gl2qk7v9p5nw9x05pbzgh8jm77q90qq"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake autoconf libtool pkg-config))
+ (inputs
+ (list cfitsio))
+ (home-page "https://www.astromatic.net/software/swarp")
+ (synopsis "FITS image resampling and co-addition")
+ (description
+ "SWarp is a program that resamples and co-adds together FITS images using
+any arbitrary astrometric projection defined in the WCS standard.")
+ (license license:gpl3+)))
+
(define-public unsio
;; There is no versioned tag, use the latest commit.
(let ((commit "25e52468298e1194c9726ef5dba9d5fbb46870f5")
@@ -5271,3 +6225,118 @@ using (multivariate) polynomials.")
an API for performing input and output operations on different kinds of
n-body file formats (nemo, Gadget binaries 1 and 2, Gadget hdf5, Ramses).")
(license license:cecill))))
+
+(define-public wcstools
+ (package
+ (name "wcstools")
+ (version "3.9.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://tdc-www.harvard.edu/software/wcstools/wcstools-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "125hqzspvqrx6372smzsmxwg06ib2arjc5awnwnq53w1xdq6jpsj"))
+ (patches (search-patches "wcstools-extend-makefiles.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;No tests provided.
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure))))
+ (home-page "http://tdc-www.harvard.edu/software/wcstools/")
+ (synopsis "Handle the WCS of a FITS image")
+ (description
+ "WCSTools is a set of software utilities, written in C, which create,
+display and manipulate the world coordinate system of a FITS or IRAF image,
+using specific keywords in the image header which relate pixel position within
+the image to position on the sky. Auxillary programs search star catalogs and
+manipulate images.")
+ (license license:gpl2+)))
+
+(define-public weightwatcher
+ (package
+ (name "weightwatcher")
+ (version "1.12")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astromatic/weightwatcher")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0701z6bdqq32jv7ga3n6jh27q684ni0hbfjm1mak7rh0qqx089gi"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "CFLAGS=-fcommon"))) ; fix build with GCC 10
+ (home-page "https://www.astromatic.net/software/weightwatcher")
+ (synopsis "Weight-map/flag-map multiplexer and rasteriser")
+ (description
+ "Weightwatcher is a program hat combines weight-maps, flag-maps and
+polygon data in order to produce control maps which can directly be used in
+astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
+ (license license:gpl3+)))
+
+(define-public xplanet
+ (package
+ (name "xplanet")
+ (version "1.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "mirror://sourceforge/xplanet/xplanet/"
+ version "/xplanet-" version ".tar.gz"))
+ (sha256
+ (base32 "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"))
+ (patches
+ (search-patches
+ "xplanet-1.3.1-cxx11-eof.patch"
+ "xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch"
+ "xplanet-1.3.1-libimage_gif.c.patch"
+ "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list
+ ;; No NASA JPL cspice support.
+ "--without-cspice"
+ (string-append "CPPFLAGS=-I" #$(this-package-input "netpbm")
+ "/include/netpbm"))))
+ (native-inputs
+ (list pkg-config))
+ (inputs
+ (list freetype
+ giflib
+ libice
+ libjpeg-turbo
+ libpng
+ libtiff
+ libx11
+ libxscrnsaver
+ netpbm
+ pango
+ zlib))
+ (home-page "https://xplanet.sourceforge.net/")
+ (synopsis "Planetary body renderer")
+ (description
+ "Xplanet renders an image of a planet into an X window or file.
+All of the major planets and most satellites can be drawn and different map
+projections are also supported, including azimuthal, hemisphere, Lambert,
+Mercator, Mollweide, Peters, polyconic, orthographic and rectangular.")
+ (license license:gpl2+)))
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetical order.
+;;;
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1a88698165..640e256f8b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4,14 +4,14 @@
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016–2023 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2018, 2020, 2024 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 okapi <okapi@firemail.cc>
-;;; Copyright © 2018, 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2018, 2020, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2018, 2019, 2022 Marius Bakke <marius@gnu.org>
@@ -38,7 +38,7 @@
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
-;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2022, 2023 Simon Streit <simon@netpanic.org>
;;; Copyright © 2022 Andy Tai <atai@atai.org>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
@@ -46,6 +46,9 @@
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
+;;; Copyright © 2024 hapster <o.rojon@posteo.net>
+;;; Copyright © 2024 mio <stigma@disroot.org>
+;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -69,10 +72,12 @@
#:use-module (gnu packages avahi)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cdrom)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
@@ -136,6 +141,7 @@
#:use-module (gnu packages telephony)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
+ #:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages vim) ;xxd
#:use-module (gnu packages web)
@@ -299,55 +305,40 @@ displays a histogram of the roundtrip time jitter.")
(define-public webrtc-audio-processing
(package
(name "webrtc-audio-processing")
- (version "0.3.1")
+ (version "1.3")
(source
(origin
(method url-fetch)
(uri
(string-append "http://freedesktop.org/software/pulseaudio/"
- name "/" name "-" version ".tar.xz"))
+ name "/" name "-" version ".tar.gz"))
(sha256
- (base32 "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"))))
- (build-system gnu-build-system)
+ (base32 "0xfvq5lxg612vfzk3zk6896zcb4cgrrb7fq76w9h40magz0jymcm"))))
+ (build-system meson-build-system)
(arguments
- ;; TODO: Move this to a snippet/patch or remove with the upgrade to 1.0.
- (if (or (target-riscv64?)
- (target-powerpc?))
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((patch-file
- #$(local-file
- (search-patch
- "webrtc-audio-processing-big-endian.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch-file)
- (substitute* "webrtc/typedefs.h"
- (("defined\\(__aarch64__\\)" all)
- (string-append
- ;; powerpc-linux
- "(defined(__PPC__) && __SIZEOF_SIZE_T__ == 4)\n"
- "#define WEBRTC_ARCH_32_BITS\n"
- "#define WEBRTC_ARCH_BIG_ENDIAN\n"
- ;; powerpc64-linux
- "#elif (defined(__PPC64__) && defined(_BIG_ENDIAN))\n"
- "#define WEBRTC_ARCH_64_BITS\n"
- "#define WEBRTC_ARCH_BIG_ENDIAN\n"
- ;; aarch64-linux
- "#elif " all
- ;; riscv64-linux
- " || (defined(__riscv) && __riscv_xlen == 64)"
- ;; powerpc64le-linux
- " || (defined(__PPC64__) && defined(_LITTLE_ENDIAN))"))))))))
- '()))
- (native-inputs
- (if (or (target-riscv64?)
- (target-powerpc?))
- (list
- (local-file (search-patch "webrtc-audio-processing-big-endian.patch"))
- patch)
- '()))
+ (list #:configure-flags (if (target-x86-32?)
+ #~(list "-Dc_args=-DPFFFT_SIMD_DISABLE")
+ #~'())
+ #:phases
+ (if (or (target-x86-32?) (target-powerpc?))
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'apply-patches
+ (lambda _
+ (define (patch file)
+ (invoke "patch" "-p1" "--force" "-i" file))
+
+ ;; https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+ ;; TODO: Move to the 'patches' field of the origin on
+ ;; the next rebuild.
+ (patch #$(local-file
+ (search-patch
+ "webrtc-audio-processing-byte-order-pointer-size.patch")))
+ (patch #$(local-file
+ (search-patch
+ "webrtc-audio-processing-x86-no-sse.patch"))))))
+ #~%standard-phases)))
+ (native-inputs (list pkg-config))
+ (inputs (list abseil-cpp))
(synopsis "WebRTC's Audio Processing Library")
(description "WebRTC-Audio-Processing library based on Google's
implementation of WebRTC.")
@@ -924,7 +915,7 @@ engineers, musicians, soundtrack editors and composers.")
(define-public audacity
(package
(name "audacity")
- (version "3.3.3") ;for ffmpeg 6 support
+ (version "3.5.1") ;for ffmpeg 6 support
(source
(origin
(method git-fetch)
@@ -933,7 +924,7 @@ engineers, musicians, soundtrack editors and composers.")
(commit (string-append "Audacity-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv"))
+ (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
(patches (search-patches "audacity-ffmpeg-fallback.patch"))
(modules '((guix build utils)))
(snippet
@@ -969,6 +960,8 @@ engineers, musicians, soundtrack editors and composers.")
;;("libsbsms" ,libsbsms) ;bundled version is modified
libsndfile
mpg123
+ opusfile
+ rapidjson
soundtouch
soxr ;replaces libsamplerate
sqlite
@@ -1024,7 +1017,7 @@ engineers, musicians, soundtrack editors and composers.")
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("libraries/lib-files/FileNames.cpp")
(("\"/usr/include/linux/magic.h\"") "<linux/magic.h>"))))
- (add-after 'wrap-program 'glib-or-gtk-wrap
+ (add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))
;; The test suite is not "well exercised" according to the developers,
;; and fails with various errors. See
@@ -1048,16 +1041,18 @@ tools.")
(define-public tenacity
(package
(name "tenacity")
- (version "1.3-beta2")
+ (version "1.3.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/tenacityteam/tenacity")
- (commit (string-append "v" version))))
+ (commit (string-append "v" version))
+ ;; TODO Unbundle vcpkg when packaged in Guix.
+ (recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "0pd2vxzqzq7ikz7l2a1h9qwq08276xicvphrpn47gvmwaslah1gn"))))
+ (base32 "0jqdza1alk524fkrssgkr7gabs44sk9a99914gwfkscvyqly4kai"))))
(build-system cmake-build-system)
(arguments
(list
@@ -1077,7 +1072,11 @@ tools.")
'i-spy-with-my-little-eye-something-in-the-wrong-folder
(lambda _
(symlink (string-append (getcwd) "/images")
- "src/images")))
+ "src/images")
+
+ (symlink (string-append (getcwd) "/images")
+ "src/tracks/images"))
+ )
(add-after 'unpack 'fix-cmake-rpath
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
@@ -1105,7 +1104,7 @@ tools.")
(lambda ()
(apply %configure args))
#:unwind? #t)))
- (add-after 'wrap-program 'glib-or-gtk-wrap
+ (add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))
;; Test suite? Which test suite?
#:tests? #f))
@@ -1128,6 +1127,8 @@ tools.")
sqlite
twolame
vamp
+ libebml
+ libmatroska
libvorbis
lv2
lilv ;for lv2
@@ -1332,10 +1333,6 @@ plugins are provided.")
fftw))
(native-inputs
(list pkg-config))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))))
(home-page "http://calf.sourceforge.net/")
(synopsis "Audio plug-in pack for LV2 and JACK environments")
(description
@@ -2441,10 +2438,6 @@ partial release of the General MIDI sound set.")
gettext-minimal
pkg-config
sassc))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))))
(home-page "https://guitarix.org/")
(synopsis "Virtual guitar amplifier")
(description "Guitarix is a virtual guitar amplifier running JACK.
@@ -2552,10 +2545,6 @@ well suited to all musical instruments and vocals.")
zita-convolver))
(native-inputs
(list pkg-config))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))))
(home-page "https://tomszilagyi.github.io/plugins/ir.lv2")
(synopsis "LV2 convolution reverb")
(description
@@ -2653,6 +2642,7 @@ synchronous execution of all clients, and low latency operation.")
prefix (,(getenv "GUIX_PYTHONPATH")))))))))
(inputs
(list alsa-lib
+ bash-minimal
dbus
expat
libsamplerate
@@ -2813,6 +2803,10 @@ plugin function as a JACK application.")
(("^CPP.*") "CPP = g++\n")))
#t))
(delete 'build))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LADSPA_PATH")
+ (files '("lib/ladspa")))))
;; Since the home page is gone, we provide a link to the archived version.
(home-page
"https://web.archive.org/web/20140729190945/http://www.ladspa.org/")
@@ -2954,13 +2948,13 @@ cross-platform audio input/output stream library.")
(define-public python-pulsectl
(package
(name "python-pulsectl")
- (version "22.3.2")
+ (version "24.4.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pulsectl" version))
(sha256
(base32
- "115ha1cwpd2r84ssnxdbr59hgs0jbx0lz3xpqli64kmxxqf4w5yc"))))
+ "0r9igs365cqgrn1m55a8qjz0hc446nwjm3p3i9kphbj5gl7dazk9"))))
(build-system python-build-system)
(inputs (list pulseaudio))
(arguments
@@ -3151,6 +3145,10 @@ significantly faster and have minimal dependencies.")
(list libsndfile))
(native-inputs
(list pkg-config))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LV2_PATH")
+ (files '("lib/lv2")))))
(home-page "https://lv2plug.in/")
(synopsis "LV2 audio plugin specification")
(description
@@ -3216,10 +3214,6 @@ generate C headers from Turtle files.")
(list lv2 lvtk))
(native-inputs
(list pkg-config ttl2c))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))))
(home-page "https://elephly.net/lv2/mdapiano.html")
(synopsis "LV2 port of the mda Piano plugin")
(description "An LV2 port of the mda Piano VSTi.")
@@ -3313,7 +3307,7 @@ lv2-c++-tools.")
(define-public openal
(package
(name "openal")
- (version "1.22.2")
+ (version "1.23.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3321,30 +3315,27 @@ lv2-c++-tools.")
version ".tar.bz2"))
(sha256
(base32
- "081xgkma2a19dscwx21xdpklh8gq399w4f1fx737qsx7rnawr55f"))))
+ "08avhhfd96x4c18p8ys3va85nhx31xgpa3bz1ckmfkjc2f4lnvvr"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no check target
- #:phases
- (modify-phases %standard-phases
- (add-after
- 'unpack 'use-full-library-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "alc/backends/pulseaudio.cpp"
- (("#define PALIB \"libpulse\\.so\\.0\"")
- (string-append "#define PALIB \""
- (assoc-ref inputs "pulseaudio")
- "/lib/libpulse.so.0"
- "\"")))
- (substitute* "alc/backends/alsa.cpp"
- (("LoadLib\\(\"libasound\\.so\\.2\"\\)")
- (string-append "LoadLib(\""
- (assoc-ref inputs "alsa-lib")
- "/lib/libasound.so.2"
- "\")")))
- #t)))))
- (inputs
- (list alsa-lib pulseaudio))
+ (list
+ #:tests? #f ; no check target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-full-library-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "alc/backends/pulseaudio.cpp"
+ (("#define PALIB \"libpulse\\.so\\.0\"")
+ (string-append "#define PALIB \""
+ (search-input-file inputs "lib/libpulse.so.0")
+ "\"")))
+ (substitute* "alc/backends/alsa.cpp"
+ (("LoadLib\\(\"libasound\\.so\\.2\"\\)")
+ (string-append "LoadLib(\""
+ (search-input-file inputs "lib/libasound.so.2")
+ "/lib/libasound.so.2"
+ "\")"))))))))
+ (inputs (list alsa-lib pulseaudio))
(synopsis "3D audio API")
(description
"OpenAL provides capabilities for playing audio in a virtual 3D
@@ -3725,13 +3716,6 @@ filters using the so-called @emph{window method}.")
(list fftw libsamplerate)) ;required by rubberband.pc
(native-inputs
(list pkg-config))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))
- (search-path-specification
- (variable "LADSPA_PATH")
- (files '("lib/ladspa")))))
(home-page "https://breakfastquay.com/rubberband/")
(synopsis "Audio time-stretching and pitch-shifting library")
(description
@@ -4002,6 +3986,44 @@ stretching and pitch scaling of audio. This package contains the library.")
;; containing gpl2.
(license license:gpl2)))
+(define-public stargate-sbsms
+ ;; Stargate's fork of sbsms.
+ (let ((commit "90fab3440063dc9b6c1c2a8f74c2d92bd0e423f9")
+ (revision "0"))
+ (package/inherit libsbsms
+ (name "stargate-sbsms")
+ (version (git-version "0" revision commit))
+ (home-page "https://github.com/stargatedaw/stargate-sbsms")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "11srnzgpavcj6n70zjdm7488jzrprk71mg9dgr1sa6vwp575hf2m"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments libsbsms)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'fix-ar-lib-path)
+ (add-before 'build 'change-directory
+ (lambda _
+ (chdir "cli")))
+ (replace 'configure
+ (lambda _
+ (setenv "DESTDIR" #$output)
+ (setenv "PREFIX" "/")))
+ (add-after 'install 'rename-sbsms
+ (lambda _
+ (with-directory-excursion (string-append #$output
+ "/bin")
+ (rename-file "sbsms" "stargate-sbsms"))))
+ (delete 'check)))))
+ (native-inputs
+ (list libsndfile))
+ (properties '((hidden? . #t))))))
+
(define-public libkeyfinder
(package
(name "libkeyfinder")
@@ -4172,7 +4194,7 @@ Tracker 3 S3M and Impulse Tracker IT files.")
(define-public soundtouch
(package
(name "soundtouch")
- (version "2.2")
+ (version "2.3.1")
(source
(origin
(method git-fetch)
@@ -4181,7 +4203,7 @@ Tracker 3 S3M and Impulse Tracker IT files.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p"))))
+ (base32 "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool file))
@@ -4195,6 +4217,33 @@ application developers writing sound processing tools that require tempo/pitch
control functionality, or just for playing around with the sound effects.")
(license license:lgpl2.1+)))
+(define-public stargate-soundtouch
+ ;; Stargate's fork of soundtouch.
+ (let ((commit "464f474c0be5d7e0970909dd30593012e4621468")
+ (revision "0"))
+ (package/inherit soundtouch
+ (name "stargate-soundtouch")
+ (version (git-version "0" revision commit))
+ (home-page "https://github.com/stargatedaw/stargate-soundtouch")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1aw2j1f10p8n4s197b1nd3g1rjvwbrrszc9gwsbwk01c6nb3nr9v"))))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'rename-soundstretch
+ (lambda _
+ (with-directory-excursion (string-append #$output
+ "/bin")
+ (rename-file "soundstretch"
+ "stargate-soundstretch")))))))
+ (properties '((hidden? . #t))))))
+
(define-public sox
(package
(name "sox")
@@ -5189,7 +5238,7 @@ representations.")
(define-public cava
(package
(name "cava")
- (version "0.8.3")
+ (version "0.10.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5198,10 +5247,10 @@ representations.")
(file-name (git-file-name name version))
(sha256
(base32
- "0v0l6al3ygj6lq224ddffb1f10yv4218k7l82hbba8d7dj2rc67b"))))
+ "0r13pf8z02pf4wlapa9nyp1h114nnk1s47bdpq3wl8wvw896axw6"))))
(build-system gnu-build-system)
- (native-inputs (list autoconf automake libtool))
- (inputs (list fftw ncurses pulseaudio iniparser))
+ (native-inputs (list autoconf automake libtool pkg-config))
+ (inputs (list alsa-lib fftw ncurses pipewire pulseaudio iniparser))
(arguments
(list #:configure-flags
#~(list (string-append "PREFIX="
@@ -5330,7 +5379,7 @@ bluetooth profile.")
(define-public libopenshot-audio
(package
(name "libopenshot-audio")
- (version "0.3.2")
+ (version "0.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5339,7 +5388,7 @@ bluetooth profile.")
(file-name (git-file-name name version))
(sha256
(base32
- "0g49akqhd0jsd0ar6sacdqz6cv8y0a4zclnyliifiidxrkv43fiw"))))
+ "1h7hb3nxladpm5mmh9njilz8wjipisd61mgkgcd39k9jr9adw8gn"))))
(build-system cmake-build-system)
(inputs
(list alsa-lib
@@ -5443,7 +5492,9 @@ other Gnaural instances, allowing synchronous sessions between many users.")
(arguments
`(#:configure-flags
(list (string-append "--with-lame-prefix="
- (assoc-ref %build-inputs "lame")))))
+ (assoc-ref %build-inputs "lame")))
+ #:make-flags
+ (list "CXXFLAGS += -std=gnu++14")))
(home-page "http://www.darkice.org/")
(synopsis "Live audio streamer")
(description "DarkIce is a live audio streamer. It takes audio input from
@@ -6296,10 +6347,6 @@ systems.")
(list lv2))
(native-inputs
(list pkg-config))
- (native-search-paths
- (list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))))
(home-page "https://drobilla.net/software/mda-lv2.html")
(synopsis "Audio plug-in pack for LV2")
(description
@@ -6459,10 +6506,40 @@ be separated.")
(home-page "https://github.com/mozilla/cubeb")
(license license:isc))))
+(define-public cyanrip
+ (package
+ (name "cyanrip")
+ (version "0.9.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cyanreg/cyanrip")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13v6gjbxw6ybviq802wmgwlwy846ma4yw94aay0h698qhjqwf0qq"))))
+ (build-system meson-build-system)
+ (native-inputs (list pkg-config))
+ (inputs (list curl
+ ffmpeg
+ libcdio-paranoia
+ libmusicbrainz
+ libxml2
+ neon))
+ (synopsis "Command line CD ripper and encoder")
+ (description
+ "cyanrip is a command line tool for ripping CDs. It uses
+MusicBrainz to name and tag each track, and to download and embed cover art.
+cyanrip supports encoding tracks to multiple formats in parallel and automatically
+verifies checksums.")
+ (home-page "https://github.com/cyanreg/cyanrip")
+ (license license:lgpl2.1+)))
+
(define-public easyeffects
(package
(name "easyeffects")
- (version "7.0.1") ; later version require gtk 4.10
+ (version "7.1.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6470,10 +6547,11 @@ be separated.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0c49yd4dfh7qarq5h651dgxdbs71is4pp1sl8r0gfswqji6bv39w"))))
+ (base32 "19r8pzlhdn7jp7lggxv3c74xbr48hwmz234rl600fnqhygpixg6b"))))
(build-system meson-build-system)
(native-inputs
(list `(,glib "bin") ;for glib-compile-resources
+ gcc-12 ; fails to build with gcc-11
gettext-minimal
itstool
pkg-config))
@@ -6494,19 +6572,19 @@ be separated.")
pango
pipewire
rnnoise
- speex
speexdsp
tbb
- zita-convolver))
+ zita-convolver
+ soundtouch))
;; Propagating these allows EasyEffects to find the plugins via their
;; search-path specification
(propagated-inputs
- (list calf
- lsp-plugins
- lv2
+ (list lv2
+ calf
+ `(,lsp-plugins "lv2")
mda-lv2
- rubberband
- zam-plugins))
+ zam-plugins
+ ladspa))
(arguments
`(#:glib-or-gtk? #t
#:phases
diff --git a/gnu/packages/augeas.scm b/gnu/packages/augeas.scm
index 2fd933604c..fa46520991 100644
--- a/gnu/packages/augeas.scm
+++ b/gnu/packages/augeas.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,11 +22,16 @@
(define-module (gnu packages augeas)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system pyproject)
#:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages readline)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xml))
@@ -33,22 +39,26 @@
(define-public augeas
(package
(name "augeas")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
+ ;; XXX: Project release has moved to GitHub which has
+ ;; pre-generated "configure" script that allows to simplify
+ ;; the package definition. Try to completely build from
+ ;; source, glibc comes as git submodule.
(method url-fetch)
- (uri (string-append "http://download.augeas.net/augeas-"
- version ".tar.gz"))
+ (uri
+ (string-append
+ "https://github.com/hercules-team/augeas/releases/download/"
+ "release-" version
+ "/augeas-" version ".tar.gz"))
(sha256
(base32
- "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j"))))
+ "1zzdp5bwnszza5q6cjw66hkicay8b49n5pda7cbcgfg4hbbzv2rn"))))
(build-system gnu-build-system)
- ;; Marked as "required" in augeas.pc.
(propagated-inputs
(list libxml2))
- (inputs
- (list readline))
(native-inputs
- (list pkg-config))
+ (list readline pkg-config))
(home-page "https://augeas.net")
(synopsis "Edit configuration files programmatically")
(description
@@ -60,3 +70,28 @@ that have been made to the tree; it does as little modeling of configurations
as possible, and focuses exclusivley on transforming the tree-oriented syntax
of its public API to the myriad syntaxes of individual configuration files.")
(license license:lgpl2.1+)))
+
+(define-public python-augeas
+ (package
+ (name "python-augeas")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hercules-team/python-augeas")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1l17gl23f5naram1jaab7gjr9bhjdj97fd9sydvs7cmpns91rbrf"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-pytest pkg-config))
+ (propagated-inputs
+ (list python-cffi))
+ (inputs
+ (list augeas libxml2))
+ (home-page "https://github.com/hercules-team/python-augeas")
+ (synopsis "Python bindings for Augeas")
+ (description "Pure Python bindings for @url{https://augeas.net, Augeas}.")
+ (license license:lgpl2.1+)))
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index 7c7fb8e861..da778de4cb 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -62,14 +62,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
- (version "2.6.9")
+ (version "2.6.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(sha256
- (base32 "11g9r1avl3d2nnkglk0g7d6z6gs5padk75xqzvbxp9pir0qwhfik"))))
+ (base32 "1d1c3r1jhd72l5ppsfa9wvvm8kffzs4k2v2qn0xc9x26bd52llgw"))))
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
@@ -83,8 +83,7 @@
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
- (for-each delete-file (find-files lib "\\.a$"))
- #t))))))
+ (for-each delete-file (find-files lib "\\.a$"))))))))
(native-inputs
(list pkg-config
;; XXX: Perhaps this should be propagated from xmlsec.
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/aux-files/linux-libre/6.8-arm.conf b/gnu/packages/aux-files/linux-libre/6.10-arm.conf
index 47ccac6e56..2b738b14ff 100644
--- a/gnu/packages/aux-files/linux-libre/6.8-arm.conf
+++ b/gnu/packages/aux-files/linux-libre/6.10-arm.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.8.1 Kernel Configuration
+# Linux/arm 6.10.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
CONFIG_CC_IS_GCC=y
@@ -17,7 +17,7 @@ CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=126
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -121,7 +121,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
@@ -142,6 +142,7 @@ CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y
CONFIG_NEED_SRCU_NMI_SAFE=y
CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
@@ -166,6 +167,7 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y
CONFIG_CC_NO_ARRAY_BOUNDS=y
CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
CONFIG_CC_NO_STRINGOP_OVERFLOW=y
+CONFIG_SLAB_OBJ_EXT=y
CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y
# CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -228,7 +230,7 @@ CONFIG_POSIX_TIMERS=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
+# CONFIG_BASE_SMALL is not set
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
@@ -267,7 +269,6 @@ CONFIG_TRACEPOINTS=y
#
# Kexec and crash features
#
-CONFIG_CRASH_CORE=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
@@ -553,13 +554,7 @@ CONFIG_OMAP5_ERRATA_801819=y
# end of TI OMAP/AM/DM/DRA Family
CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_IPQ40XX=y
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8909=y
-CONFIG_ARCH_MSM8916=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
-CONFIG_ARCH_MDM9615=y
+# CONFIG_ARCH_QCOM_RESERVE_SMEM is not set
CONFIG_ARCH_REALTEK=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_S3C64XX=y
@@ -723,7 +718,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_HEAVY_MB=y
CONFIG_DEBUG_ALIGN_RODATA=y
-CONFIG_IWMMXT=y
CONFIG_PJ4B_ERRATA_4742=y
# CONFIG_ARM_ERRATA_326103 is not set
CONFIG_ARM_ERRATA_411920=y
@@ -794,6 +788,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_HIGHMEM=y
CONFIG_HIGHPTE=y
+CONFIG_ARM_PAN=y
CONFIG_CPU_SW_DOMAIN_PAN=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_ARM_MODULE_PLTS=y
@@ -923,6 +918,9 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_HIBERNATION_COMP_LZO=y
+# CONFIG_HIBERNATION_COMP_LZ4 is not set
+CONFIG_HIBERNATION_DEF_COMP="lzo"
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
@@ -947,6 +945,8 @@ CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
# end of Power management options
+CONFIG_CPU_MITIGATIONS=y
+
#
# General architecture-dependent options
#
@@ -995,6 +995,7 @@ CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
CONFIG_HAVE_CONTEXT_TRACKING_USER=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -1007,8 +1008,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_HAVE_EXIT_THREAD=y
CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
@@ -1040,7 +1044,6 @@ CONFIG_FUNCTION_ALIGNMENT=0
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
# CONFIG_MODULE_DEBUG is not set
CONFIG_MODULE_FORCE_LOAD=y
@@ -1072,7 +1075,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
CONFIG_BLK_DEV_WRITE_MOUNTED=y
# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
# CONFIG_BLK_CGROUP_IOLATENCY is not set
@@ -1160,7 +1162,6 @@ CONFIG_ZPOOL=y
CONFIG_SWAP=y
CONFIG_ZSWAP=y
# CONFIG_ZSWAP_DEFAULT_ON is not set
-# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set
# CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
@@ -1216,13 +1217,13 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_SYSFS=y
CONFIG_CMA_AREAS=7
CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_PAGE_IDLE_FLAG=y
# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CPU_CACHE_ALIASING=y
CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
CONFIG_ZONE_DMA=y
CONFIG_HMM_MIRROR=y
@@ -1241,6 +1242,7 @@ CONFIG_LRU_GEN=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y
#
# Data Access Monitoring
@@ -1249,7 +1251,7 @@ CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
-# CONFIG_DAMON_DBGFS is not set
+# CONFIG_DAMON_DBGFS_DEPRECATED is not set
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
@@ -1268,7 +1270,6 @@ CONFIG_SKB_EXTENSIONS=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
# CONFIG_TLS is not set
@@ -1641,6 +1642,7 @@ CONFIG_IP_VS_PE_SIP=m
# IP: Netfilter Configuration
#
CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TABLES_IPV4=y
@@ -1673,6 +1675,7 @@ CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_SECURITY=m
CONFIG_IP_NF_ARPTABLES=m
+CONFIG_NFT_COMPAT_ARP=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
# end of IP: Netfilter Configuration
@@ -1680,6 +1683,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NF_TABLES_IPV6=y
@@ -1717,6 +1721,7 @@ CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1915,7 +1920,6 @@ CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
@@ -2003,7 +2007,6 @@ CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_6LOWPAN=m
@@ -2039,6 +2042,7 @@ CONFIG_BT_ATH3K=m
CONFIG_BT_MTKSDIO=m
CONFIG_BT_HCIRSI=m
CONFIG_BT_VIRTIO=m
+CONFIG_BT_INTEL_PCIE=m
# end of Bluetooth device drivers
CONFIG_AF_RXRPC=m
@@ -2120,6 +2124,7 @@ CONFIG_LWTUNNEL=y
CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
+CONFIG_NET_IEEE8021Q_HELPERS=y
CONFIG_NET_SELFTESTS=y
CONFIG_NET_SOCK_MSG=y
CONFIG_NET_DEVLINK=y
@@ -2135,6 +2140,7 @@ CONFIG_ARM_AMBA=y
CONFIG_TEGRA_AHB=y
CONFIG_HAVE_PCI=y
CONFIG_FORCE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_DOMAINS_GENERIC=y
@@ -2247,7 +2253,6 @@ CONFIG_CXL_PCI=m
CONFIG_CXL_MEM=m
CONFIG_CXL_PORT=m
CONFIG_CXL_SUSPEND=y
-CONFIG_CXL_PMU=m
# CONFIG_PCCARD is not set
# CONFIG_RAPIDIO is not set
@@ -2318,8 +2323,10 @@ CONFIG_OMAP_INTERCONNECT=y
# CONFIG_OMAP_OCP2SCP is not set
CONFIG_QCOM_EBI2=y
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
+CONFIG_STM32_FIREWALL=y
# CONFIG_SUN50I_DE2_BUS is not set
CONFIG_SUNXI_RSB=y
+# CONFIG_TEGRA_ACONNECT is not set
# CONFIG_TEGRA_GMI is not set
CONFIG_TI_SYSC=y
CONFIG_UNIPHIER_SYSTEM_BUS=y
@@ -2468,7 +2475,6 @@ CONFIG_MTD_PHYSMAP=m
# CONFIG_MTD_PHYSMAP_OF is not set
CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
CONFIG_MTD_PCI=m
-CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
# end of Mapping drivers for chip access
@@ -2581,6 +2587,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_NVMEM is not set
CONFIG_MTD_HYPERBUS=m
CONFIG_DTC=y
CONFIG_OF=y
@@ -3055,6 +3062,7 @@ CONFIG_VXLAN=m
CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m
+CONFIG_PFCP=m
CONFIG_AMT=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
@@ -3126,10 +3134,8 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_REALTEK=m
-CONFIG_NET_DSA_REALTEK_MDIO=m
-CONFIG_NET_DSA_REALTEK_SMI=m
-CONFIG_NET_DSA_REALTEK_RTL8365MB=m
-CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+# CONFIG_NET_DSA_REALTEK_MDIO is not set
+# CONFIG_NET_DSA_REALTEK_SMI is not set
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
CONFIG_NET_DSA_VITESSE_VSC73XX=m
@@ -3267,6 +3273,8 @@ CONFIG_NET_VENDOR_HISILICON=y
CONFIG_NET_VENDOR_HUAWEI=y
CONFIG_NET_VENDOR_I825XX=y
CONFIG_NET_VENDOR_INTEL=y
+CONFIG_LIBETH=m
+CONFIG_LIBIE=m
CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
@@ -3494,6 +3502,7 @@ CONFIG_SFP=m
#
# MII PHY device drivers
#
+CONFIG_AIR_EN8811H_PHY=m
CONFIG_AMD_PHY=m
# CONFIG_MESON_GXL_PHY is not set
CONFIG_ADIN_PHY=m
@@ -3531,7 +3540,11 @@ CONFIG_NXP_CBTX_PHY=m
CONFIG_NXP_C45_TJA11XX_PHY=m
CONFIG_NXP_TJA11XX_PHY=m
CONFIG_NCN26000_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
CONFIG_AT803X_PHY=m
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
+# CONFIG_QCA807X_PHY is not set
CONFIG_QSEMI_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_RENESAS_PHY=m
@@ -3551,6 +3564,8 @@ CONFIG_VITESSE_PHY=m
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PSE_CONTROLLER=y
CONFIG_PSE_REGULATOR=m
+CONFIG_PSE_PD692X0=m
+CONFIG_PSE_TPS23881=m
CONFIG_CAN_DEV=m
CONFIG_CAN_VCAN=m
# CONFIG_CAN_VXCAN is not set
@@ -3572,6 +3587,7 @@ CONFIG_CAN_SLCAN=m
CONFIG_CAN_CTUCANFD=m
CONFIG_CAN_CTUCANFD_PCI=m
CONFIG_CAN_CTUCANFD_PLATFORM=m
+# CONFIG_CAN_ESD_402_PCI is not set
# CONFIG_CAN_IFI_CANFD is not set
# CONFIG_CAN_M_CAN is not set
# CONFIG_CAN_PEAK_PCIEFD is not set
@@ -3584,7 +3600,6 @@ CONFIG_CAN_KVASER_PCI=m
CONFIG_CAN_PEAK_PCI=m
CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_SJA1000_ISA=m
# CONFIG_CAN_SJA1000_PLATFORM is not set
CONFIG_CAN_SOFTING=m
@@ -3950,6 +3965,7 @@ CONFIG_RTLWIFI_PCI=m
CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8192D_COMMON=m
CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
@@ -3962,10 +3978,12 @@ CONFIG_RTW89_8851B=m
CONFIG_RTW89_8852A=m
CONFIG_RTW89_8852B=m
CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8922A=m
CONFIG_RTW89_8851BE=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8922AE=m
# CONFIG_RTW89_DEBUGMSG is not set
# CONFIG_RTW89_DEBUGFS is not set
CONFIG_WLAN_VENDOR_RSI=y
@@ -4155,6 +4173,8 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EXC3000=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
CONFIG_TOUCHSCREEN_HIDEEP=m
CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
@@ -4326,7 +4346,6 @@ CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
@@ -4464,6 +4483,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
CONFIG_DEVMEM=y
CONFIG_DEVPORT=y
CONFIG_TCG_TPM=y
+# CONFIG_TCG_TPM2_HMAC is not set
CONFIG_TCG_TIS_CORE=y
CONFIG_TCG_TIS=y
# CONFIG_TCG_TIS_SPI is not set
@@ -4625,6 +4645,7 @@ CONFIG_SPI_MEM=y
#
# SPI Master Controller Drivers
#
+CONFIG_SPI_AIROHA_SNFI=m
# CONFIG_SPI_ALTERA is not set
# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
# CONFIG_SPI_ARMADA_3700 is not set
@@ -4751,6 +4772,7 @@ CONFIG_PTP_1588_CLOCK_DTE=y
CONFIG_PTP_1588_CLOCK_KVM=y
CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_FC3W is not set
# CONFIG_PTP_1588_CLOCK_MOCK is not set
CONFIG_PTP_1588_CLOCK_OCP=m
# end of PTP clock support
@@ -4767,6 +4789,7 @@ CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AT91=y
CONFIG_PINCTRL_AT91PIO4=y
CONFIG_PINCTRL_AXP209=m
+# CONFIG_PINCTRL_AW9523 is not set
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_DIGICOLOR=y
CONFIG_PINCTRL_MCP23S08_I2C=m
@@ -4954,6 +4977,7 @@ CONFIG_GPIO_MB86S7X=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
# CONFIG_GPIO_MXC is not set
+CONFIG_GPIO_NOMADIK=y
CONFIG_GPIO_NPCM_SGPIO=y
CONFIG_GPIO_OMAP=y
CONFIG_GPIO_PL061=y
@@ -5000,6 +5024,7 @@ CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_BD71815=m
CONFIG_GPIO_BD71828=m
CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_CROS_EC is not set
CONFIG_GPIO_DA9052=m
# CONFIG_HTC_EGPIO is not set
CONFIG_GPIO_MADERA=m
@@ -5200,9 +5225,12 @@ CONFIG_SENSORS_AHT10=m
CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
# CONFIG_SENSORS_AS370 is not set
CONFIG_SENSORS_ASC7621=m
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
CONFIG_SENSORS_AXI_FAN_CONTROL=m
# CONFIG_SENSORS_ASPEED is not set
+# CONFIG_SENSORS_ASPEED_G6 is not set
CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_CHIPCAP2 is not set
CONFIG_SENSORS_CORSAIR_CPRO=m
CONFIG_SENSORS_CORSAIR_PSU=m
CONFIG_SENSORS_DRIVETEMP=m
@@ -5244,6 +5272,7 @@ CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
# CONFIG_SENSORS_LTC4260 is not set
CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_LTC4282 is not set
CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX127=m
CONFIG_SENSORS_MAX16065=m
@@ -5293,10 +5322,12 @@ CONFIG_SENSORS_NCT6775_I2C=m
# CONFIG_SENSORS_NCT7904 is not set
# CONFIG_SENSORS_NPCM7XX is not set
# CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
# CONFIG_SENSORS_NZXT_SMART2 is not set
# CONFIG_SENSORS_OCC_P8_I2C is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PT5161L is not set
CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_SBTSI=m
CONFIG_SENSORS_SBRMI=m
@@ -5359,7 +5390,6 @@ CONFIG_THERMAL_DEBUGFS=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -5458,6 +5488,7 @@ CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
#
CONFIG_SOFT_WATCHDOG=m
CONFIG_BD957XMUF_WATCHDOG=m
+# CONFIG_CROS_EC_WATCHDOG is not set
CONFIG_DA9052_WATCHDOG=m
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
@@ -5813,6 +5844,7 @@ CONFIG_REGULATOR_SLG51000=m
# CONFIG_REGULATOR_STM32_VREFBUF is not set
# CONFIG_REGULATOR_STM32_PWR is not set
# CONFIG_REGULATOR_TI_ABB is not set
+CONFIG_REGULATOR_SUN20I=m
CONFIG_REGULATOR_SY7636A=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_SY8824X=m
@@ -6230,6 +6262,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
# Atmel media platform drivers
#
# CONFIG_VIDEO_ATMEL_ISI is not set
+CONFIG_VIDEO_BCM2835_UNICAM=m
#
# Cadence media platform drivers
@@ -6292,8 +6325,8 @@ CONFIG_VIDEO_CAFE_CCIC=m
#
# Renesas media platform drivers
#
-# CONFIG_VIDEO_RCAR_ISP is not set
# CONFIG_VIDEO_RCAR_CSI2 is not set
+# CONFIG_VIDEO_RCAR_ISP is not set
# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_RZG2L_CSI2 is not set
# CONFIG_VIDEO_RZG2L_CRU is not set
@@ -6855,8 +6888,8 @@ CONFIG_DVB_DUMMY_FE=m
# Graphics support
#
CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_SCREEN_INFO=y
+CONFIG_VIDEO=y
# CONFIG_AUXDISPLAY is not set
# CONFIG_PANEL is not set
# CONFIG_TEGRA_HOST1X is not set
@@ -6864,6 +6897,7 @@ CONFIG_VIDEO_NOMODESET=y
CONFIG_DRM=m
CONFIG_DRM_MIPI_DBI=m
CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=m
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6871,12 +6905,12 @@ CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DP_AUX_BUS=m
CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_DP_AUX_CEC=y
+CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
CONFIG_DRM_DISPLAY_DP_HELPER=y
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_TTM=m
CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m
@@ -6904,6 +6938,7 @@ CONFIG_DRM_I2C_NXP_TDA9950=m
# CONFIG_DRM_RADEON is not set
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_XE is not set
CONFIG_DRM_VGEM=m
# CONFIG_DRM_VKMS is not set
# CONFIG_DRM_EXYNOS is not set
@@ -6935,15 +6970,15 @@ CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
CONFIG_DRM_PANEL_AUO_A030JTN01=m
# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_DSI_CM=m
-# CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_EDP=m
CONFIG_DRM_PANEL_EBBG_FT8719=m
CONFIG_DRM_PANEL_ELIDA_KD35T133=m
CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+CONFIG_DRM_PANEL_DSI_CM=m
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
CONFIG_DRM_PANEL_HIMAX_HX8394=m
CONFIG_DRM_PANEL_ILITEK_IL9322=m
CONFIG_DRM_PANEL_ILITEK_ILI9341=m
@@ -6953,17 +6988,18 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=m
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_JDI_R63452 is not set
# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LG_SW43408=m
CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
CONFIG_DRM_PANEL_NEWVISION_NV3052C=m
@@ -6972,8 +7008,8 @@ CONFIG_DRM_PANEL_NOVATEK_NT35560=m
# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
CONFIG_DRM_PANEL_NOVATEK_NT36523=m
# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
@@ -6983,16 +7019,19 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
+CONFIG_DRM_PANEL_RAYDIUM_RM69380=m
# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7=m
# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -7003,19 +7042,21 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-CONFIG_DRM_PANEL_SYNAPTICS_R63353=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_SYNAPTICS_R63353=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
-# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
# end of Display Panels
@@ -7067,6 +7108,8 @@ CONFIG_DRM_ANALOGIX_DP=m
CONFIG_DRM_CDNS_DSI=m
CONFIG_DRM_CDNS_DSI_J721E=y
CONFIG_DRM_CDNS_MHDP8546=m
+# CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE is not set
+# CONFIG_DRM_IMX8MP_HDMI_PVI is not set
# CONFIG_DRM_IMX8QM_LDB is not set
# CONFIG_DRM_IMX8QXP_LDB is not set
# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
@@ -7109,6 +7152,7 @@ CONFIG_DRM_GUD=m
CONFIG_DRM_SSD130X=m
CONFIG_DRM_SSD130X_I2C=m
CONFIG_DRM_SSD130X_SPI=m
+# CONFIG_DRM_WERROR is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
@@ -7156,7 +7200,6 @@ CONFIG_FB_PM3=m
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_VT8500 is not set
# CONFIG_FB_WM8505 is not set
-# CONFIG_FB_SH_MOBILE_LCDC is not set
# CONFIG_FB_S3C is not set
CONFIG_FB_SMSCUFX=m
CONFIG_FB_UDL=m
@@ -7202,6 +7245,7 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_KTD253=m
+# CONFIG_BACKLIGHT_KTD2801 is not set
CONFIG_BACKLIGHT_KTZ8866=m
CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_DA9052 is not set
@@ -7383,6 +7427,7 @@ CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_SCODEC_COMPONENT=m
CONFIG_SND_HDA_CODEC_REALTEK=m
CONFIG_SND_HDA_CODEC_ANALOG=m
CONFIG_SND_HDA_CODEC_SIGMATEL=m
@@ -7681,6 +7726,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m
# CONFIG_SND_SOC_PCM5102A is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PCM6240=m
# CONFIG_SND_SOC_PEB2466 is not set
CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RK817=m
@@ -7915,6 +7961,7 @@ CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_U2FZERO=m
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
@@ -7974,6 +8021,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
CONFIG_USB_MON=m
#
@@ -8228,7 +8276,7 @@ CONFIG_USB_HSIC_USB3503=m
# CONFIG_USB_LINK_LAYER_TEST is not set
CONFIG_USB_CHAOSKEY=m
CONFIG_BRCM_USB_PINMAP=m
-CONFIG_USB_ONBOARD_HUB=m
+CONFIG_USB_ONBOARD_DEV=m
# CONFIG_USB_ATM is not set
#
@@ -8532,6 +8580,7 @@ CONFIG_LEDS_BCM63138=y
#
# CONFIG_LEDS_GROUP_MULTICOLOR is not set
# CONFIG_LEDS_KTD202X is not set
+# CONFIG_LEDS_NCP5623 is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_MT6370_RGB=m
@@ -8558,7 +8607,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_PANIC=y
# CONFIG_LEDS_TRIGGER_NETDEV is not set
# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m
#
@@ -8668,6 +8716,7 @@ CONFIG_RTC_DRV_TPS6594=m
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8010 is not set
+CONFIG_RTC_DRV_RX8111=m
# CONFIG_RTC_DRV_RX8581 is not set
# CONFIG_RTC_DRV_RX8025 is not set
# CONFIG_RTC_DRV_EM3027 is not set
@@ -8812,6 +8861,7 @@ CONFIG_PLX_DMA=m
# CONFIG_STM32_DMA is not set
# CONFIG_STM32_MDMA is not set
# CONFIG_TEGRA20_APB_DMA is not set
+# CONFIG_TEGRA210_ADMA is not set
# CONFIG_UNIPHIER_MDMAC is not set
# CONFIG_UNIPHIER_XDMAC is not set
# CONFIG_XILINX_DMA is not set
@@ -8864,11 +8914,11 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
CONFIG_UIO_MF624=m
# CONFIG_VFIO is not set
CONFIG_IRQ_BYPASS_MANAGER=m
CONFIG_VIRT_DRIVERS=y
+CONFIG_VMGENID=y
CONFIG_VIRTIO_ANCHOR=y
CONFIG_VIRTIO=m
CONFIG_VIRTIO_PCI_LIB=m
@@ -8882,6 +8932,7 @@ CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VIRTIO_DEBUG=y
CONFIG_VDPA=m
# CONFIG_VDPA_SIM is not set
CONFIG_VDPA_USER=m
@@ -8909,7 +8960,6 @@ CONFIG_VHOST_VDPA=m
# CONFIG_GREYBUS is not set
# CONFIG_COMEDI is not set
CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
# CONFIG_RTLLIB is not set
# CONFIG_RTL8723BS is not set
CONFIG_R8712U=m
@@ -8955,14 +9005,11 @@ CONFIG_R8712U=m
# end of IIO staging drivers
# CONFIG_FB_SM750 is not set
-# CONFIG_USB_EMXX is not set
# CONFIG_MFD_NVEC is not set
# CONFIG_STAGING_MEDIA is not set
-# CONFIG_STAGING_BOARD is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_FB_TFT is not set
# CONFIG_KS7010 is not set
-CONFIG_PI433=m
# CONFIG_XIL_AXIS_FIFO is not set
# CONFIG_FIELDBUS_DEV is not set
# CONFIG_VME_BUS is not set
@@ -9068,6 +9115,7 @@ CONFIG_CLK_VF610=y
# CONFIG_CLK_IMX8MQ is not set
# CONFIG_CLK_IMX8ULP is not set
# CONFIG_CLK_IMX93 is not set
+CONFIG_CLK_IMX95_BLK_CTL=m
CONFIG_COMMON_CLK_KEYSTONE=y
CONFIG_TI_SYSCON_CLK=y
@@ -9241,6 +9289,7 @@ CONFIG_MICROCHIP_PIT64B=y
CONFIG_MAILBOX=y
# CONFIG_ARM_MHU is not set
# CONFIG_ARM_MHU_V2 is not set
+CONFIG_ARM_MHU_V3=m
# CONFIG_IMX_MBOX is not set
# CONFIG_PLATFORM_MHU is not set
CONFIG_PL320_MBOX=y
@@ -9552,6 +9601,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IIO_SW_DEVICE is not set
# CONFIG_IIO_SW_TRIGGER is not set
# CONFIG_IIO_TRIGGERED_EVENT is not set
+CONFIG_IIO_BACKEND=m
#
# Accelerometers
@@ -9616,6 +9666,7 @@ CONFIG_AD7091R=m
CONFIG_AD7091R5=m
CONFIG_AD7091R8=m
# CONFIG_AD7124 is not set
+CONFIG_AD7173=m
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -9632,8 +9683,10 @@ CONFIG_AD7091R8=m
# CONFIG_AD7793 is not set
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
+CONFIG_AD7944=m
# CONFIG_AD7949 is not set
# CONFIG_AD799X is not set
+# CONFIG_AD9467 is not set
# CONFIG_ADI_AXI_ADC is not set
# CONFIG_ASPEED_ADC is not set
# CONFIG_AT91_ADC is not set
@@ -9677,6 +9730,7 @@ CONFIG_MESON_SARADC=m
# CONFIG_MP2629_ADC is not set
# CONFIG_NAU7802 is not set
# CONFIG_NPCM_ADC is not set
+# CONFIG_PAC1934 is not set
# CONFIG_PALMAS_GPADC is not set
# CONFIG_ROCKCHIP_SARADC is not set
CONFIG_RICHTEK_RTQ6056=m
@@ -9698,6 +9752,7 @@ CONFIG_SD_ADC_MODULATOR=m
# CONFIG_TI_ADS1015 is not set
# CONFIG_TI_ADS7924 is not set
# CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS1298 is not set
# CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8344 is not set
# CONFIG_TI_ADS8688 is not set
@@ -9801,6 +9856,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_AD5593R is not set
# CONFIG_AD5504 is not set
# CONFIG_AD5624R_SPI is not set
+CONFIG_AD9739A=m
+CONFIG_ADI_AXI_DAC=m
# CONFIG_LTC2688 is not set
# CONFIG_AD5686_SPI is not set
# CONFIG_AD5696_I2C is not set
@@ -9860,6 +9917,7 @@ CONFIG_MCP4821=m
# CONFIG_ADF4350 is not set
CONFIG_ADF4371=m
CONFIG_ADF4377=m
+# CONFIG_ADMFM2000 is not set
CONFIG_ADMV1013=m
CONFIG_ADMV4420=m
# CONFIG_ADRF6780 is not set
@@ -9946,6 +10004,7 @@ CONFIG_INV_ICM42600_SPI=m
# CONFIG_AL3010 is not set
# CONFIG_AL3320A is not set
# CONFIG_APDS9300 is not set
+CONFIG_APDS9306=m
# CONFIG_APDS9960 is not set
# CONFIG_AS73211 is not set
# CONFIG_BH1750 is not set
@@ -10002,6 +10061,7 @@ CONFIG_VEML6075=m
#
# Magnetometer sensors
#
+# CONFIG_AF8133J is not set
# CONFIG_AK8974 is not set
# CONFIG_AK8975 is not set
# CONFIG_AK09911 is not set
@@ -10152,7 +10212,6 @@ CONFIG_MCP9600=m
# CONFIG_NTB is not set
CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
# CONFIG_PWM_DEBUG is not set
# CONFIG_PWM_AB8500 is not set
# CONFIG_PWM_ATMEL is not set
@@ -10254,6 +10313,7 @@ CONFIG_RESET_CONTROLLER=y
CONFIG_RESET_BERLIN=m
CONFIG_RESET_BRCMSTB=y
CONFIG_RESET_BRCMSTB_RESCAL=y
+# CONFIG_RESET_GPIO is not set
CONFIG_RESET_IMX7=y
# CONFIG_RESET_MCHP_SPARX5 is not set
CONFIG_RESET_MESON=y
@@ -10331,10 +10391,12 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_MMP3_USB is not set
# CONFIG_PHY_MMP3_HSIC is not set
# CONFIG_PHY_MTK_PCIE is not set
+CONFIG_PHY_MTK_XFI_TPHY=m
# CONFIG_PHY_MTK_TPHY is not set
# CONFIG_PHY_MTK_UFS is not set
# CONFIG_PHY_MTK_XSPHY is not set
# CONFIG_PHY_MTK_HDMI is not set
+# CONFIG_PHY_MTK_MIPI_CSI_0_5 is not set
# CONFIG_PHY_MTK_MIPI_DSI is not set
# CONFIG_PHY_MTK_DP is not set
# CONFIG_PHY_LAN966X_SERDES is not set
@@ -10358,6 +10420,8 @@ CONFIG_PHY_QCOM_USB_HSIC=m
# CONFIG_PHY_QCOM_USB_SS is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_R8A779F0_ETHERNET_SERDES is not set
# CONFIG_PHY_RCAR_GEN2 is not set
# CONFIG_PHY_RCAR_GEN3_PCIE is not set
@@ -10372,6 +10436,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set
# CONFIG_PHY_ROCKCHIP_PCIE is not set
+# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set
# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set
# CONFIG_PHY_ROCKCHIP_TYPEC is not set
# CONFIG_PHY_ROCKCHIP_USB is not set
@@ -10418,6 +10483,7 @@ CONFIG_ARM_PMU=y
# CONFIG_FSL_IMX9_DDR_PMU is not set
CONFIG_DWC_PCIE_PMU=m
# CONFIG_MESON_DDR_PMU is not set
+CONFIG_CXL_PMU=m
# end of Performance monitor support
CONFIG_RAS=y
@@ -10596,6 +10662,7 @@ CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_PASSTHROUGH=y
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
@@ -10637,12 +10704,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FAT_DEFAULT_UTF8 is not set
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
CONFIG_NTFS3_FS=m
CONFIG_NTFS3_LZX_XPRESS=y
# CONFIG_NTFS3_FS_POSIX_ACL is not set
+CONFIG_NTFS_FS=m
# end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -11005,6 +11070,7 @@ CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
CONFIG_CRYPTO_SIG2=y
CONFIG_CRYPTO_SKCIPHER=y
CONFIG_CRYPTO_SKCIPHER2=y
@@ -11174,7 +11240,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-# CONFIG_CRYPTO_STATS is not set
# end of Userspace interface
CONFIG_CRYPTO_HASH_INFO=y
@@ -11219,6 +11284,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
@@ -11269,7 +11335,6 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
#
@@ -11362,6 +11427,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_ARCH_HAS_DMA_ALLOC=y
CONFIG_DMA_CMA=y
@@ -11379,7 +11445,6 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_GLOB=y
@@ -11391,7 +11456,7 @@ CONFIG_CLZ_TAB=y
CONFIG_IRQ_POLL=y
CONFIG_MPILIB=y
CONFIG_SIGNATURE=y
-CONFIG_DIMLIB=y
+CONFIG_DIMLIB=m
CONFIG_LIBFDT=y
CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
@@ -11462,6 +11527,8 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
# CONFIG_GDB_SCRIPTS is not set
CONFIG_FRAME_WARN=1024
CONFIG_STRIP_ASM_SYMS=y
@@ -11488,7 +11555,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
# CONFIG_UBSAN is not set
CONFIG_HAVE_KCSAN_COMPILER=y
# end of Generic Kernel Debugging Instruments
@@ -11511,7 +11578,6 @@ CONFIG_SLUB_DEBUG=y
CONFIG_PAGE_POISONING=y
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_DEBUG_WX=y
CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK is not set
CONFIG_PER_VMA_LOCK_STATS=y
@@ -11526,6 +11592,10 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_KMAP_LOCAL is not set
# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_CODE_TAGGING=y
+CONFIG_MEM_ALLOC_PROFILING=y
+CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT=y
+# CONFIG_MEM_ALLOC_PROFILING_DEBUG is not set
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -11692,8 +11762,8 @@ CONFIG_IO_STRICT_DEVMEM=y
#
# arm Debugging
#
-CONFIG_ARM_PTDUMP_CORE=y
# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+# CONFIG_ARM_DEBUG_WX is not set
CONFIG_UNWINDER_FRAME_POINTER=y
# CONFIG_UNWINDER_ARM is not set
# CONFIG_BACKTRACE_VERBOSE is not set
@@ -11734,8 +11804,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_STRING_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_PRINTF is not set
CONFIG_TEST_SCANF=m
diff --git a/gnu/packages/aux-files/linux-libre/6.8-arm64.conf b/gnu/packages/aux-files/linux-libre/6.10-arm64.conf
index b6bc55bb74..98c5f3fe9b 100644
--- a/gnu/packages/aux-files/linux-libre/6.8-arm64.conf
+++ b/gnu/packages/aux-files/linux-libre/6.10-arm64.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.8.1 Kernel Configuration
+# Linux/arm64 6.10.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
CONFIG_CC_IS_GCC=y
@@ -19,7 +19,7 @@ CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=126
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -133,7 +133,7 @@ CONFIG_PREEMPT_DYNAMIC=y
CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
@@ -154,6 +154,7 @@ CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
@@ -185,6 +186,7 @@ CONFIG_CC_NO_STRINGOP_OVERFLOW=y
CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_SLAB_OBJ_EXT=y
CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y
# CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -250,7 +252,7 @@ CONFIG_POSIX_TIMERS=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
+# CONFIG_BASE_SMALL is not set
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
@@ -289,7 +291,8 @@ CONFIG_TRACEPOINTS=y
#
# Kexec and crash features
#
-CONFIG_CRASH_CORE=y
+CONFIG_CRASH_RESERVE=y
+CONFIG_VMCORE_INFO=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC=y
CONFIG_KEXEC_FILE=y
@@ -302,7 +305,6 @@ CONFIG_ARM64=y
CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
CONFIG_64BIT=y
CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=12
CONFIG_ARM64_CONT_PTE_SHIFT=4
CONFIG_ARM64_CONT_PMD_SHIFT=4
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
@@ -330,6 +332,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
# Platform selection
#
# CONFIG_ARCH_ACTIONS is not set
+CONFIG_ARCH_AIROHA=y
CONFIG_ARCH_SUNXI=y
# CONFIG_ARCH_ALPINE is not set
CONFIG_ARCH_APPLE=y
@@ -417,6 +420,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
CONFIG_ARM64_ERRATUM_2966298=y
CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
@@ -439,6 +445,7 @@ CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_64K_PAGES is not set
# CONFIG_ARM64_VA_BITS_39 is not set
CONFIG_ARM64_VA_BITS_48=y
+# CONFIG_ARM64_VA_BITS_52 is not set
CONFIG_ARM64_VA_BITS=48
CONFIG_ARM64_PA_BITS_48=y
CONFIG_ARM64_PA_BITS=48
@@ -534,6 +541,7 @@ CONFIG_ARM64_SME=y
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+CONFIG_ARM64_CONTPTE=y
# end of Kernel Features
#
@@ -555,6 +563,9 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_HIBERNATION_COMP_LZO=y
+# CONFIG_HIBERNATION_COMP_LZ4 is not set
+CONFIG_HIBERNATION_DEF_COMP="lzo"
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
@@ -623,8 +634,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
#
CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_ACPI_CPPC_CPUFREQ=m
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
CONFIG_ARM_APPLE_SOC_CPUFREQ=y
# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
@@ -637,6 +646,8 @@ CONFIG_ARM_TEGRA20_CPUFREQ=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
# end of CPU Frequency scaling
# end of CPU Power Management
@@ -669,9 +680,9 @@ CONFIG_ACPI_TABLE_UPGRADE=y
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_CONTAINER=y
# CONFIG_ACPI_HED is not set
-# CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_BGRT is not set
CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+CONFIG_ACPI_NHLT=y
CONFIG_ACPI_NFIT=y
# CONFIG_NFIT_SECURITY_DEBUG is not set
CONFIG_ACPI_NUMA=y
@@ -689,7 +700,6 @@ CONFIG_ACPI_FFH=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_ACPI_VIOT=y
CONFIG_ACPI_PRMT=y
-CONFIG_HAVE_KVM=y
CONFIG_KVM_COMMON=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQ_ROUTING=y
@@ -698,6 +708,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y
CONFIG_KVM_MMIO=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_READONLY_MEM=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_KVM_VFIO=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
@@ -709,6 +720,7 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=y
# CONFIG_NVHE_EL2_DEBUG is not set
+CONFIG_CPU_MITIGATIONS=y
#
# General architecture-dependent options
@@ -742,6 +754,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y
CONFIG_HAVE_ASM_MODVERSIONS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_RUST=y
CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_PERF_REGS=y
@@ -782,6 +795,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
CONFIG_ARCH_WANT_PMD_MKWRITE=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_WANTS_EXECMEM_LATE=y
CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
CONFIG_SOFTIRQ_ON_OWN_STACK=y
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -789,8 +803,11 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_ARCH_MMAP_RND_BITS=18
CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
@@ -818,6 +835,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
#
# GCOV-based kernel profiling
@@ -835,7 +853,6 @@ CONFIG_FUNCTION_ALIGNMENT=8
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
# CONFIG_MODULE_DEBUG is not set
CONFIG_MODULE_FORCE_LOAD=y
@@ -868,7 +885,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=m
CONFIG_BLK_DEV_WRITE_MOUNTED=y
# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
# CONFIG_BLK_CGROUP_IOLATENCY is not set
@@ -960,7 +976,6 @@ CONFIG_ZPOOL=y
CONFIG_SWAP=y
CONFIG_ZSWAP=y
# CONFIG_ZSWAP_DEFAULT_ON is not set
-# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set
# CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
@@ -998,7 +1013,7 @@ CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -1032,12 +1047,12 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
CONFIG_THP_SWAP=y
# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_SYSFS=y
CONFIG_CMA_AREAS=7
@@ -1063,8 +1078,10 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_USERFAULTFD=y
+CONFIG_PTE_MARKER_UFFD_WP=y
CONFIG_LRU_GEN=y
# CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set
@@ -1073,6 +1090,7 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
CONFIG_IOMMU_MM_DATA=y
+CONFIG_EXECMEM=y
#
# Data Access Monitoring
@@ -1081,7 +1099,7 @@ CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
-# CONFIG_DAMON_DBGFS is not set
+# CONFIG_DAMON_DBGFS_DEPRECATED is not set
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
@@ -1101,7 +1119,6 @@ CONFIG_SKB_EXTENSIONS=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
# CONFIG_TLS is not set
@@ -1478,6 +1495,7 @@ CONFIG_IP_VS_PE_SIP=m
# IP: Netfilter Configuration
#
CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TABLES_IPV4=y
@@ -1510,6 +1528,7 @@ CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_SECURITY=m
CONFIG_IP_NF_ARPTABLES=m
+CONFIG_NFT_COMPAT_ARP=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
# end of IP: Netfilter Configuration
@@ -1517,6 +1536,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NF_TABLES_IPV6=y
@@ -1554,6 +1574,7 @@ CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1752,7 +1773,6 @@ CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
@@ -1844,7 +1864,6 @@ CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_6LOWPAN=m
@@ -1896,6 +1915,7 @@ CONFIG_BT_QCOMSMD=m
CONFIG_BT_HCIRSI=m
CONFIG_BT_VIRTIO=m
CONFIG_BT_NXPUART=m
+CONFIG_BT_INTEL_PCIE=m
# end of Bluetooth device drivers
CONFIG_AF_RXRPC=m
@@ -1979,6 +1999,7 @@ CONFIG_LWTUNNEL=y
CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
+CONFIG_NET_IEEE8021Q_HELPERS=y
CONFIG_NET_SELFTESTS=m
CONFIG_NET_SOCK_MSG=y
CONFIG_NET_DEVLINK=y
@@ -1993,6 +2014,7 @@ CONFIG_ETHTOOL_NETLINK=y
CONFIG_ARM_AMBA=y
CONFIG_TEGRA_AHB=y
CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_DOMAINS_GENERIC=y
@@ -2055,6 +2077,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HOST_COMMON=y
CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_MEDIATEK=m
CONFIG_PCIE_MICROCHIP_HOST=y
CONFIG_PCI_HYPERV_INTERFACE=m
CONFIG_PCI_TEGRA=y
@@ -2121,7 +2144,6 @@ CONFIG_CXL_PORT=y
CONFIG_CXL_SUSPEND=y
CONFIG_CXL_REGION=y
# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
-CONFIG_CXL_PMU=y
# CONFIG_PCCARD is not set
# CONFIG_RAPIDIO is not set
@@ -2189,6 +2211,7 @@ CONFIG_MOXTET=m
# CONFIG_IMX_WEIM is not set
CONFIG_QCOM_EBI2=y
CONFIG_QCOM_SSC_BLOCK_BUS=y
+CONFIG_STM32_FIREWALL=y
CONFIG_SUN50I_DE2_BUS=y
CONFIG_SUNXI_RSB=y
CONFIG_TEGRA_ACONNECT=y
@@ -2366,7 +2389,6 @@ CONFIG_MTD_RAM=m
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
CONFIG_MTD_PCI=m
-CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
# end of Mapping drivers for chip access
@@ -2472,6 +2494,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_NVMEM is not set
CONFIG_MTD_HYPERBUS=m
CONFIG_DTC=y
CONFIG_OF=y
@@ -2479,6 +2502,7 @@ CONFIG_OF=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_RESERVED_MEM=y
@@ -2928,6 +2952,7 @@ CONFIG_DM_SWITCH=m
CONFIG_DM_LOG_WRITES=m
# CONFIG_DM_INTEGRITY is not set
CONFIG_DM_AUDIT=y
+# CONFIG_DM_VDO is not set
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -2982,6 +3007,7 @@ CONFIG_VXLAN=m
CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m
+CONFIG_PFCP=m
CONFIG_AMT=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
@@ -3048,10 +3074,8 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_REALTEK=m
-CONFIG_NET_DSA_REALTEK_MDIO=m
-CONFIG_NET_DSA_REALTEK_SMI=m
-CONFIG_NET_DSA_REALTEK_RTL8365MB=m
-CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+# CONFIG_NET_DSA_REALTEK_MDIO is not set
+# CONFIG_NET_DSA_REALTEK_SMI is not set
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
CONFIG_NET_DSA_VITESSE_VSC73XX=m
@@ -3203,6 +3227,8 @@ CONFIG_NET_VENDOR_HUAWEI=y
CONFIG_HINIC=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_NET_VENDOR_INTEL=y
+CONFIG_LIBETH=m
+CONFIG_LIBIE=m
CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
@@ -3242,6 +3268,7 @@ CONFIG_OCTEONTX2_MBOX=m
CONFIG_OCTEONTX2_PF=m
CONFIG_OCTEONTX2_VF=m
CONFIG_OCTEON_EP=m
+# CONFIG_OCTEON_EP_VF is not set
CONFIG_PRESTERA=m
CONFIG_PRESTERA_PCI=m
CONFIG_NET_VENDOR_MELLANOX=y
@@ -3284,6 +3311,7 @@ CONFIG_NET_VENDOR_MICROSEMI=y
CONFIG_MSCC_OCELOT_SWITCH_LIB=m
CONFIG_MSCC_OCELOT_SWITCH=m
CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_FEALNX=m
@@ -3422,7 +3450,6 @@ CONFIG_FDDI=y
CONFIG_DEFXX=m
CONFIG_SKFP=m
# CONFIG_HIPPI is not set
-# CONFIG_NET_SB1000 is not set
CONFIG_PHYLINK=m
CONFIG_PHYLIB=m
CONFIG_SWPHY=y
@@ -3434,6 +3461,7 @@ CONFIG_SFP=m
#
# MII PHY device drivers
#
+CONFIG_AIR_EN8811H_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MESON_GXL_PHY=m
CONFIG_ADIN_PHY=m
@@ -3470,7 +3498,11 @@ CONFIG_NXP_CBTX_PHY=m
CONFIG_NXP_C45_TJA11XX_PHY=m
CONFIG_NXP_TJA11XX_PHY=m
CONFIG_NCN26000_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
CONFIG_AT803X_PHY=m
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
+# CONFIG_QCA807X_PHY is not set
CONFIG_QSEMI_PHY=m
CONFIG_REALTEK_PHY=m
# CONFIG_RENESAS_PHY is not set
@@ -3490,6 +3522,8 @@ CONFIG_VITESSE_PHY=m
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PSE_CONTROLLER=y
CONFIG_PSE_REGULATOR=m
+CONFIG_PSE_PD692X0=m
+CONFIG_PSE_TPS23881=m
CONFIG_CAN_DEV=m
CONFIG_CAN_VCAN=m
# CONFIG_CAN_VXCAN is not set
@@ -3508,6 +3542,7 @@ CONFIG_CAN_SLCAN=m
CONFIG_CAN_CTUCANFD=m
CONFIG_CAN_CTUCANFD_PCI=m
CONFIG_CAN_CTUCANFD_PLATFORM=m
+# CONFIG_CAN_ESD_402_PCI is not set
# CONFIG_CAN_IFI_CANFD is not set
# CONFIG_CAN_M_CAN is not set
# CONFIG_CAN_PEAK_PCIEFD is not set
@@ -3518,7 +3553,6 @@ CONFIG_CAN_KVASER_PCI=m
CONFIG_CAN_PEAK_PCI=m
CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_SJA1000_ISA=m
# CONFIG_CAN_SJA1000_PLATFORM is not set
CONFIG_CAN_SOFTING=m
@@ -3896,6 +3930,7 @@ CONFIG_RTLWIFI_PCI=m
CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8192D_COMMON=m
CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
@@ -3907,6 +3942,8 @@ CONFIG_RTW88_SDIO=m
CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723X=m
+CONFIG_RTW88_8703B=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
@@ -3917,6 +3954,7 @@ CONFIG_RTW88_8822CS=m
CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
CONFIG_RTW88_8723DS=m
+CONFIG_RTW88_8723CS=m
CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
CONFIG_RTW88_8821CS=m
@@ -3930,10 +3968,12 @@ CONFIG_RTW89_8851B=m
CONFIG_RTW89_8852A=m
CONFIG_RTW89_8852B=m
CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8922A=m
CONFIG_RTW89_8851BE=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8922AE=m
# CONFIG_RTW89_DEBUGMSG is not set
# CONFIG_RTW89_DEBUGFS is not set
CONFIG_WLAN_VENDOR_RSI=y
@@ -4182,7 +4222,6 @@ CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
@@ -4383,6 +4422,7 @@ CONFIG_I2C_ISCH=m
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_ZHAOXIN=m
#
# ACPI drivers
@@ -4474,6 +4514,7 @@ CONFIG_SPI_MEM=y
#
# SPI Master Controller Drivers
#
+CONFIG_SPI_AIROHA_SNFI=m
# CONFIG_SPI_ALTERA is not set
CONFIG_SPI_AMLOGIC_SPIFC_A1=m
CONFIG_SPI_ARMADA_3700=m
@@ -4510,7 +4551,6 @@ CONFIG_SPI_NPCM_PSPI=m
# CONFIG_SPI_ORION is not set
CONFIG_SPI_PCI1XXXX=m
# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PXA2XX is not set
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_ROCKCHIP_SFC=m
# CONFIG_SPI_QCOM_QSPI is not set
@@ -4583,6 +4623,7 @@ CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_FC3W is not set
# CONFIG_PTP_1588_CLOCK_MOCK is not set
CONFIG_PTP_1588_CLOCK_OCP=m
# end of PTP clock support
@@ -4597,6 +4638,7 @@ CONFIG_GENERIC_PINCONF=y
CONFIG_PINCTRL_AMD=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AXP209=m
+# CONFIG_PINCTRL_AW9523 is not set
CONFIG_PINCTRL_BM1880=y
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_KEEMBAY=m
@@ -4606,6 +4648,7 @@ CONFIG_PINCTRL_MAX77620=y
# CONFIG_PINCTRL_OCELOT is not set
# CONFIG_PINCTRL_RK805 is not set
CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SCMI=m
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SX150X is not set
@@ -4747,6 +4790,7 @@ CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_RASPBERRYPI_EXP=m
CONFIG_GPIO_CADENCE=m
# CONFIG_GPIO_DWAPB is not set
+CONFIG_GPIO_EN7523=m
# CONFIG_GPIO_EXAR is not set
# CONFIG_GPIO_FTGPIO010 is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -4796,6 +4840,7 @@ CONFIG_GPIO_PCA9570=m
#
CONFIG_GPIO_BD71815=m
CONFIG_GPIO_BD71828=m
+# CONFIG_GPIO_CROS_EC is not set
CONFIG_GPIO_LJCA=m
CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MAX77620=y
@@ -4852,6 +4897,7 @@ CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_MXC=m
CONFIG_W1_MASTER_GPIO=m
# CONFIG_W1_MASTER_SGI is not set
+# CONFIG_W1_MASTER_UART is not set
# end of 1-wire Bus Masters
#
@@ -4988,9 +5034,11 @@ CONFIG_SENSORS_AHT10=m
CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
# CONFIG_SENSORS_AS370 is not set
CONFIG_SENSORS_ASC7621=m
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
CONFIG_SENSORS_AXI_FAN_CONTROL=m
CONFIG_SENSORS_ARM_SCMI=m
CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_CHIPCAP2 is not set
CONFIG_SENSORS_CORSAIR_CPRO=m
CONFIG_SENSORS_CORSAIR_PSU=m
CONFIG_SENSORS_DRIVETEMP=m
@@ -5030,6 +5078,7 @@ CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
# CONFIG_SENSORS_LTC4260 is not set
CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_LTC4282 is not set
CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX127=m
CONFIG_SENSORS_MAX16065=m
@@ -5080,10 +5129,12 @@ CONFIG_SENSORS_NCT6775_I2C=m
# CONFIG_SENSORS_NCT7904 is not set
# CONFIG_SENSORS_NPCM7XX is not set
CONFIG_SENSORS_NZXT_KRAKEN2=m
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
CONFIG_SENSORS_NZXT_SMART2=m
# CONFIG_SENSORS_OCC_P8_I2C is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PT5161L is not set
# CONFIG_SENSORS_PWM_FAN is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_SBTSI=m
@@ -5107,6 +5158,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m
CONFIG_SENSORS_SCH5627=m
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_STTS751 is not set
+# CONFIG_SENSORS_SURFACE_FAN is not set
# CONFIG_SENSORS_ADC128D818 is not set
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_ADS7871=m
@@ -5153,7 +5205,6 @@ CONFIG_THERMAL_DEBUGFS=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -5229,6 +5280,7 @@ CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
#
CONFIG_SOFT_WATCHDOG=m
CONFIG_BD957XMUF_WATCHDOG=m
+# CONFIG_CROS_EC_WATCHDOG is not set
CONFIG_GPIO_WATCHDOG=m
# CONFIG_WDAT_WDT is not set
# CONFIG_XILINX_WATCHDOG is not set
@@ -5545,6 +5597,7 @@ CONFIG_REGULATOR_SLG51000=m
CONFIG_REGULATOR_STM32_BOOSTER=m
CONFIG_REGULATOR_STM32_VREFBUF=m
CONFIG_REGULATOR_STM32_PWR=y
+CONFIG_REGULATOR_SUN20I=m
CONFIG_REGULATOR_SY7636A=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_SY8824X=m
@@ -5964,6 +6017,7 @@ CONFIG_VIDEO_AMPHION_VPU=m
#
# Atmel media platform drivers
#
+CONFIG_VIDEO_BCM2835_UNICAM=m
#
# Cadence media platform drivers
@@ -6062,6 +6116,7 @@ CONFIG_VIDEO_HANTRO=m
CONFIG_VIDEO_HANTRO_IMX8M=y
CONFIG_VIDEO_HANTRO_ROCKCHIP=y
CONFIG_VIDEO_HANTRO_SUNXI=y
+CONFIG_VIDEO_HANTRO_STM32MP25=y
#
# VIA media platform drivers
@@ -6569,8 +6624,8 @@ CONFIG_DVB_DUMMY_FE=m
# Graphics support
#
CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_SCREEN_INFO=y
+CONFIG_VIDEO=y
# CONFIG_AUXDISPLAY is not set
# CONFIG_PANEL is not set
CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y
@@ -6579,6 +6634,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_DRM=m
CONFIG_DRM_MIPI_DBI=m
CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=m
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6586,13 +6642,13 @@ CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DP_AUX_BUS=m
CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_DP_AUX_CEC=y
+CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
CONFIG_DRM_DISPLAY_DP_HELPER=y
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_TTM=m
CONFIG_DRM_EXEC=m
CONFIG_DRM_GPUVM=m
@@ -6739,15 +6795,15 @@ CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
CONFIG_DRM_PANEL_AUO_A030JTN01=m
CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_DSI_CM=m
-# CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_EDP=m
CONFIG_DRM_PANEL_EBBG_FT8719=m
CONFIG_DRM_PANEL_ELIDA_KD35T133=m
CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+CONFIG_DRM_PANEL_DSI_CM=m
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
CONFIG_DRM_PANEL_HIMAX_HX8394=m
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
@@ -6757,17 +6813,18 @@ CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=m
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
CONFIG_DRM_PANEL_JDI_LPM102A188A=m
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_JDI_R63452 is not set
CONFIG_DRM_PANEL_KHADAS_TS050=m
# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LG_SW43408=m
CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
CONFIG_DRM_PANEL_NEWVISION_NV3052C=m
@@ -6776,8 +6833,8 @@ CONFIG_DRM_PANEL_NOVATEK_NT35560=m
CONFIG_DRM_PANEL_NOVATEK_NT35950=m
CONFIG_DRM_PANEL_NOVATEK_NT36523=m
# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
@@ -6787,16 +6844,19 @@ CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
CONFIG_DRM_PANEL_RAYDIUM_RM692E5=m
+CONFIG_DRM_PANEL_RAYDIUM_RM69380=m
# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7=m
# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0=m
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -6807,19 +6867,21 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-CONFIG_DRM_PANEL_SYNAPTICS_R63353=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_SYNAPTICS_R63353=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
-# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
# end of Display Panels
@@ -6876,6 +6938,8 @@ CONFIG_DRM_CDNS_DSI=m
CONFIG_DRM_CDNS_DSI_J721E=y
CONFIG_DRM_CDNS_MHDP8546=m
CONFIG_DRM_IMX_LDB_HELPER=m
+# CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE is not set
+# CONFIG_DRM_IMX8MP_HDMI_PVI is not set
CONFIG_DRM_IMX8QM_LDB=m
CONFIG_DRM_IMX8QXP_LDB=m
CONFIG_DRM_IMX8QXP_PIXEL_COMBINER=m
@@ -6926,6 +6990,7 @@ CONFIG_DRM_XEN=y
CONFIG_DRM_XEN_FRONTEND=m
CONFIG_DRM_LIMA=m
CONFIG_DRM_PANFROST=m
+CONFIG_DRM_PANTHOR=m
CONFIG_DRM_TIDSS=m
CONFIG_DRM_GUD=m
CONFIG_DRM_SSD130X=m
@@ -6933,8 +6998,9 @@ CONFIG_DRM_SSD130X_I2C=m
CONFIG_DRM_SSD130X_SPI=m
CONFIG_DRM_POWERVR=m
CONFIG_DRM_HYPERV=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_PRIVACY_SCREEN=y
+# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
# Frame buffer Devices
@@ -7029,6 +7095,7 @@ CONFIG_LCD_HX8357=m
CONFIG_LCD_OTM3225A=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_KTD253=m
+# CONFIG_BACKLIGHT_KTD2801 is not set
CONFIG_BACKLIGHT_KTZ8866=m
CONFIG_BACKLIGHT_PWM=m
CONFIG_BACKLIGHT_MT6370=m
@@ -7213,6 +7280,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_COMPONENT=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set
@@ -7487,6 +7555,7 @@ CONFIG_SND_SOC_AW88399=m
# CONFIG_SND_SOC_BT_SCO is not set
CONFIG_SND_SOC_CHV3_CODEC=m
CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS_AMP_LIB=m
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
# CONFIG_SND_SOC_CS35L34 is not set
@@ -7561,7 +7630,9 @@ CONFIG_SND_SOC_MAX98388=m
# CONFIG_SND_SOC_PCM5102A is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PCM6240=m
CONFIG_SND_SOC_PEB2466=m
+CONFIG_SND_SOC_RK3308=m
CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RK817=m
CONFIG_SND_SOC_RL6231=m
@@ -7814,6 +7885,7 @@ CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_U2FZERO=m
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
@@ -7883,6 +7955,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
CONFIG_USB_MON=m
#
@@ -8127,7 +8200,7 @@ CONFIG_USB_HSIC_USB3503=m
# CONFIG_USB_HSIC_USB4604 is not set
# CONFIG_USB_LINK_LAYER_TEST is not set
CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ONBOARD_HUB=m
+CONFIG_USB_ONBOARD_DEV=m
# CONFIG_USB_ATM is not set
#
@@ -8275,6 +8348,7 @@ CONFIG_TYPEC_WUSB3801=m
CONFIG_TYPEC_MUX_FSA4480=m
CONFIG_TYPEC_MUX_GPIO_SBU=m
CONFIG_TYPEC_MUX_PI3USB30532=m
+# CONFIG_TYPEC_MUX_IT5205 is not set
CONFIG_TYPEC_MUX_NB7VPQ904M=m
CONFIG_TYPEC_MUX_PTN36502=m
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
@@ -8337,6 +8411,7 @@ CONFIG_MMC_DW_PLTFM=m
# CONFIG_MMC_DW_BLUEFIELD is not set
# CONFIG_MMC_DW_EXYNOS is not set
# CONFIG_MMC_DW_HI3798CV200 is not set
+# CONFIG_MMC_DW_HI3798MV200 is not set
CONFIG_MMC_DW_K3=m
# CONFIG_MMC_DW_PCI is not set
CONFIG_MMC_DW_ROCKCHIP=m
@@ -8447,6 +8522,7 @@ CONFIG_LEDS_BCM63138=y
#
# CONFIG_LEDS_GROUP_MULTICOLOR is not set
CONFIG_LEDS_KTD202X=m
+# CONFIG_LEDS_NCP5623 is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_LPG=m
CONFIG_LEDS_MT6370_RGB=m
@@ -8474,7 +8550,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_PANIC=y
# CONFIG_LEDS_TRIGGER_NETDEV is not set
# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m
#
@@ -8513,6 +8588,7 @@ CONFIG_INFINIBAND_CXGB4=m
CONFIG_INFINIBAND_EFA=m
CONFIG_INFINIBAND_ERDMA=m
# CONFIG_INFINIBAND_HNS is not set
+CONFIG_MANA_INFINIBAND=m
CONFIG_MLX4_INFINIBAND=m
CONFIG_MLX5_INFINIBAND=m
CONFIG_INFINIBAND_MTHCA=m
@@ -8600,6 +8676,7 @@ CONFIG_RTC_DRV_TPS6594=m
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8010 is not set
+CONFIG_RTC_DRV_RX8111=m
# CONFIG_RTC_DRV_RX8581 is not set
# CONFIG_RTC_DRV_RX8025 is not set
# CONFIG_RTC_DRV_EM3027 is not set
@@ -8765,7 +8842,6 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
CONFIG_UIO_MF624=m
CONFIG_UIO_HV_GENERIC=m
CONFIG_VFIO=m
@@ -8786,6 +8862,7 @@ CONFIG_VFIO_PCI=m
CONFIG_MLX5_VFIO_PCI=m
CONFIG_HISI_ACC_VFIO_PCI=m
# CONFIG_PDS_VFIO_PCI is not set
+# CONFIG_NVGRACE_GPU_VFIO_PCI is not set
# end of VFIO support for PCI devices
#
@@ -8820,6 +8897,7 @@ CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VIRTIO_DEBUG=y
CONFIG_VDPA=m
# CONFIG_VDPA_SIM is not set
CONFIG_VDPA_USER=m
@@ -8883,7 +8961,6 @@ CONFIG_XEN_VIRTIO=y
# CONFIG_GREYBUS is not set
# CONFIG_COMEDI is not set
CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
# CONFIG_RTLLIB is not set
CONFIG_RTL8723BS=m
CONFIG_R8712U=m
@@ -8931,7 +9008,6 @@ CONFIG_R8712U=m
# CONFIG_FB_SM750 is not set
# CONFIG_MFD_NVEC is not set
# CONFIG_STAGING_MEDIA is not set
-# CONFIG_STAGING_BOARD is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_FB_TFT is not set
# CONFIG_KS7010 is not set
@@ -8939,7 +9015,6 @@ CONFIG_BCM_VIDEOCORE=y
# CONFIG_BCM2835_VCHIQ is not set
# CONFIG_SND_BCM2835 is not set
# CONFIG_VIDEO_BCM2835 is not set
-# CONFIG_PI433 is not set
# CONFIG_XIL_AXIS_FIFO is not set
# CONFIG_FIELDBUS_DEV is not set
# CONFIG_VME_BUS is not set
@@ -8981,6 +9056,8 @@ CONFIG_SURFACE_HOTPLUG=m
CONFIG_SURFACE_AGGREGATOR=m
CONFIG_SURFACE_AGGREGATOR_BUS=y
# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_ARM64_PLATFORM_DEVICES=y
+CONFIG_EC_ACER_ASPIRE1=m
CONFIG_HAVE_CLK=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -9009,6 +9086,7 @@ CONFIG_COMMON_CLK_BM1880=y
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+CONFIG_COMMON_CLK_EN7523=y
CONFIG_COMMON_CLK_AXI_CLKGEN=m
CONFIG_COMMON_CLK_XGENE=y
# CONFIG_COMMON_CLK_PWM is not set
@@ -9043,6 +9121,7 @@ CONFIG_CLK_IMX8MQ=y
CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
+CONFIG_CLK_IMX95_BLK_CTL=m
#
# Clock support for Amlogic platforms
@@ -9054,6 +9133,7 @@ CONFIG_COMMON_CLK_MESON_PHASE=m
CONFIG_COMMON_CLK_MESON_PLL=y
CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_VCLK=y
CONFIG_COMMON_CLK_MESON_CLKC_UTILS=y
CONFIG_COMMON_CLK_MESON_AO_CLKC=y
CONFIG_COMMON_CLK_MESON_EE_CLKC=y
@@ -9077,7 +9157,11 @@ CONFIG_CLK_MA35D1=y
CONFIG_QCOM_GDSC=y
CONFIG_QCOM_RPMCC=y
CONFIG_COMMON_CLK_QCOM=y
+# CONFIG_CLK_X1E80100_CAMCC is not set
+# CONFIG_CLK_X1E80100_DISPCC is not set
CONFIG_CLK_X1E80100_GCC=m
+# CONFIG_CLK_X1E80100_GPUCC is not set
+# CONFIG_CLK_X1E80100_TCSRCC is not set
CONFIG_QCOM_A53PLL=y
CONFIG_QCOM_A7PLL=m
CONFIG_QCOM_CLK_APCS_MSM8916=m
@@ -9125,7 +9209,6 @@ CONFIG_SC_GPUCC_8280XP=m
CONFIG_SC_LPASSCC_8280XP=m
CONFIG_SC_LPASS_CORECC_7180=m
CONFIG_SC_LPASS_CORECC_7280=m
-# CONFIG_SC_MSS_7180 is not set
# CONFIG_SC_VIDEOCC_7180 is not set
# CONFIG_SC_VIDEOCC_7280 is not set
# CONFIG_SDM_CAMCC_845 is not set
@@ -9211,6 +9294,7 @@ CONFIG_SUN8I_R_CCU=y
CONFIG_CLK_TEGRA_BPMP=y
CONFIG_TEGRA_CLK_DFLL=y
CONFIG_COMMON_CLK_STM32MP=y
+CONFIG_COMMON_CLK_STM32MP257=y
CONFIG_COMMON_CLK_VISCONTI=y
# CONFIG_XILINX_VCU is not set
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
@@ -9242,6 +9326,7 @@ CONFIG_TIMER_IMX_SYS_CTR=y
CONFIG_MAILBOX=y
# CONFIG_ARM_MHU is not set
# CONFIG_ARM_MHU_V2 is not set
+CONFIG_ARM_MHU_V3=m
CONFIG_IMX_MBOX=m
# CONFIG_PLATFORM_MHU is not set
# CONFIG_PL320_MBOX is not set
@@ -9280,6 +9365,7 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
CONFIG_OF_IOMMU=y
CONFIG_IOMMU_DMA=y
CONFIG_IOMMU_SVA=y
+CONFIG_IOMMU_IOPF=y
# CONFIG_IOMMUFD is not set
CONFIG_ROCKCHIP_IOMMU=y
CONFIG_SUN50I_IOMMU=y
@@ -9405,6 +9491,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
CONFIG_QCOM_APR=m
CONFIG_QCOM_ICC_BWMON=m
CONFIG_QCOM_INLINE_CRYPTO_ENGINE=m
+# CONFIG_QCOM_PBS is not set
# end of Qualcomm SoC drivers
CONFIG_ROCKCHIP_GRF=y
@@ -9416,6 +9503,7 @@ CONFIG_ARCH_TEGRA_210_SOC=y
# CONFIG_ARCH_TEGRA_186_SOC is not set
CONFIG_ARCH_TEGRA_194_SOC=y
CONFIG_ARCH_TEGRA_234_SOC=y
+# CONFIG_ARCH_TEGRA_241_SOC is not set
CONFIG_SOC_TEGRA_FUSE=y
CONFIG_SOC_TEGRA_FLOWCTRL=y
CONFIG_SOC_TEGRA_PMC=y
@@ -9530,6 +9618,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IIO_SW_DEVICE is not set
# CONFIG_IIO_SW_TRIGGER is not set
CONFIG_IIO_TRIGGERED_EVENT=m
+CONFIG_IIO_BACKEND=m
#
# Accelerometers
@@ -9593,6 +9682,7 @@ CONFIG_AD7091R=m
CONFIG_AD7091R5=m
CONFIG_AD7091R8=m
CONFIG_AD7124=m
+CONFIG_AD7173=m
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -9609,8 +9699,10 @@ CONFIG_AD7124=m
# CONFIG_AD7793 is not set
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
+CONFIG_AD7944=m
# CONFIG_AD7949 is not set
# CONFIG_AD799X is not set
+# CONFIG_AD9467 is not set
# CONFIG_ADI_AXI_ADC is not set
CONFIG_AXP20X_ADC=m
CONFIG_AXP288_ADC=m
@@ -9647,6 +9739,7 @@ CONFIG_MESON_SARADC=m
# CONFIG_MP2629_ADC is not set
# CONFIG_NAU7802 is not set
# CONFIG_NPCM_ADC is not set
+# CONFIG_PAC1934 is not set
CONFIG_QCOM_VADC_COMMON=m
# CONFIG_QCOM_SPMI_RRADC is not set
CONFIG_QCOM_SPMI_IADC=m
@@ -9670,6 +9763,7 @@ CONFIG_STM32_DFSDM_ADC=m
# CONFIG_TI_ADS1015 is not set
# CONFIG_TI_ADS7924 is not set
# CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS1298 is not set
# CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8344 is not set
# CONFIG_TI_ADS8688 is not set
@@ -9770,6 +9864,8 @@ CONFIG_AD5446=m
# CONFIG_AD5593R is not set
# CONFIG_AD5504 is not set
# CONFIG_AD5624R_SPI is not set
+CONFIG_AD9739A=m
+CONFIG_ADI_AXI_DAC=m
# CONFIG_LTC2688 is not set
# CONFIG_AD5686_SPI is not set
# CONFIG_AD5696_I2C is not set
@@ -9831,6 +9927,7 @@ CONFIG_ADMV8818=m
# CONFIG_ADF4350 is not set
CONFIG_ADF4371=m
CONFIG_ADF4377=m
+# CONFIG_ADMFM2000 is not set
CONFIG_ADMV1013=m
CONFIG_ADMV1014=m
CONFIG_ADMV4420=m
@@ -9919,6 +10016,7 @@ CONFIG_ACPI_ALS=m
# CONFIG_AL3010 is not set
# CONFIG_AL3320A is not set
# CONFIG_APDS9300 is not set
+CONFIG_APDS9306=m
# CONFIG_APDS9960 is not set
CONFIG_AS73211=m
# CONFIG_BH1750 is not set
@@ -9975,6 +10073,7 @@ CONFIG_VEML6075=m
#
# Magnetometer sensors
#
+# CONFIG_AF8133J is not set
# CONFIG_AK8974 is not set
# CONFIG_AK8975 is not set
# CONFIG_AK09911 is not set
@@ -10061,6 +10160,8 @@ CONFIG_HSC030PA_SPI=m
# CONFIG_MPL115_SPI is not set
# CONFIG_MPL3115 is not set
CONFIG_MPRLS0025PA=m
+CONFIG_MPRLS0025PA_I2C=m
+CONFIG_MPRLS0025PA_SPI=m
# CONFIG_MS5611 is not set
# CONFIG_MS5637 is not set
# CONFIG_IIO_ST_PRESS is not set
@@ -10126,7 +10227,6 @@ CONFIG_MCP9600=m
# CONFIG_NTB is not set
CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
# CONFIG_PWM_DEBUG is not set
CONFIG_PWM_APPLE=m
CONFIG_PWM_ATMEL_TCB=m
@@ -10178,6 +10278,7 @@ CONFIG_MVEBU_ODMI=y
CONFIG_MVEBU_PIC=y
CONFIG_MVEBU_SEI=y
CONFIG_PARTITION_PERCPU=y
+CONFIG_STM32_EXTI=y
CONFIG_QCOM_IRQ_COMBINER=y
CONFIG_MESON_IRQ_GPIO=y
# CONFIG_QCOM_PDC is not set
@@ -10191,6 +10292,7 @@ CONFIG_APPLE_AIC=y
# CONFIG_IPACK_BUS is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_GPIO is not set
CONFIG_RESET_IMX7=y
CONFIG_RESET_MESON=y
# CONFIG_RESET_MESON_AUDIO_ARB is not set
@@ -10245,6 +10347,7 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_MIXEL_LVDS_PHY=m
CONFIG_PHY_MIXEL_MIPI_DPHY=m
CONFIG_PHY_FSL_IMX8M_PCIE=m
+CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m
CONFIG_PHY_HI6220_USB=m
CONFIG_PHY_HI3660_USB=m
CONFIG_PHY_HI3670_USB=m
@@ -10294,9 +10397,11 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_ROCKCHIP_USBDP=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_STM32_USBPHYC=m
CONFIG_PHY_TEGRA_XUSB=m
@@ -10340,6 +10445,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
CONFIG_AMPERE_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
CONFIG_MESON_DDR_PMU=m
+CONFIG_CXL_PMU=y
# end of Performance monitor support
CONFIG_RAS=y
@@ -10410,6 +10516,7 @@ CONFIG_NVMEM_U_BOOT_ENV=m
CONFIG_TEE=m
CONFIG_OPTEE=m
# CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set
+CONFIG_ARM_TSTEE=m
CONFIG_MULTIPLEXER=m
#
@@ -10431,6 +10538,7 @@ CONFIG_INTERCONNECT_IMX8MN=m
CONFIG_INTERCONNECT_IMX8MQ=m
CONFIG_INTERCONNECT_IMX8MP=m
CONFIG_INTERCONNECT_QCOM=y
+# CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
CONFIG_INTERCONNECT_QCOM_MSM8916=m
CONFIG_INTERCONNECT_QCOM_MSM8939=m
# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
@@ -10549,6 +10657,7 @@ CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_PASSTHROUGH=y
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -10591,13 +10700,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_DEFAULT_UTF8=y
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
CONFIG_NTFS3_LZX_XPRESS=y
# CONFIG_NTFS3_FS_POSIX_ACL is not set
+CONFIG_NTFS_FS=m
# end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -10856,6 +10963,7 @@ CONFIG_KEYS=y
CONFIG_KEYS_REQUEST_CACHE=y
# CONFIG_PERSISTENT_KEYRINGS is not set
CONFIG_TRUSTED_KEYS=m
+CONFIG_HAVE_TRUSTED_KEYS=y
CONFIG_TRUSTED_KEYS_TEE=y
CONFIG_TRUSTED_KEYS_CAAM=y
# CONFIG_ENCRYPTED_KEYS is not set
@@ -10963,6 +11071,7 @@ CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
CONFIG_CRYPTO_SIG2=y
CONFIG_CRYPTO_SKCIPHER=y
CONFIG_CRYPTO_SKCIPHER2=y
@@ -11133,7 +11242,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-# CONFIG_CRYPTO_STATS is not set
# end of Userspace interface
CONFIG_CRYPTO_HASH_INFO=y
@@ -11223,6 +11331,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
CONFIG_CRYPTO_DEV_QCE=m
CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
@@ -11235,6 +11344,7 @@ CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
CONFIG_CRYPTO_DEV_QCOM_RNG=m
# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DEV_STM32_CRC=m
@@ -11286,7 +11396,6 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_STMP_DEVICE=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -11389,13 +11498,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DMA_DECLARE_COHERENT=y
CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
CONFIG_SWIOTLB=y
# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
+CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_RESTRICTED_POOL=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
@@ -11416,7 +11525,6 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_GLOB=y
@@ -11427,7 +11535,7 @@ CONFIG_CLZ_TAB=y
CONFIG_IRQ_POLL=y
CONFIG_MPILIB=y
CONFIG_SIGNATURE=y
-CONFIG_DIMLIB=y
+CONFIG_DIMLIB=m
CONFIG_LIBFDT=y
CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
@@ -11503,6 +11611,8 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
# CONFIG_GDB_SCRIPTS is not set
CONFIG_FRAME_WARN=2048
CONFIG_STRIP_ASM_SYMS=y
@@ -11530,7 +11640,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KCSAN=y
CONFIG_HAVE_KCSAN_COMPILER=y
@@ -11575,6 +11685,10 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
# CONFIG_DEBUG_VIRTUAL is not set
CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_CODE_TAGGING=y
+CONFIG_MEM_ALLOC_PROFILING=y
+CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT=y
+# CONFIG_MEM_ALLOC_PROFILING_DEBUG is not set
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
@@ -11680,6 +11794,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_DEBUG_CGROUP_REF is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -11740,6 +11855,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
@@ -11768,6 +11884,7 @@ CONFIG_IO_STRICT_DEVMEM=y
# CONFIG_KUNIT is not set
CONFIG_NOTIFIER_ERROR_INJECTION=m
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT=m
# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
CONFIG_FUNCTION_ERROR_INJECTION=y
# CONFIG_FAULT_INJECTION is not set
@@ -11787,8 +11904,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_STRING_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_PRINTF is not set
CONFIG_TEST_SCANF=m
@@ -11814,6 +11929,7 @@ CONFIG_TEST_STATIC_KEYS=m
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_TEST_FPU=m
# CONFIG_TEST_OBJPOOL is not set
CONFIG_ARCH_USE_MEMTEST=y
# CONFIG_MEMTEST is not set
diff --git a/gnu/packages/aux-files/linux-libre/6.8-i686.conf b/gnu/packages/aux-files/linux-libre/6.10-i686.conf
index 5a34e5ce7f..2517316c93 100644
--- a/gnu/packages/aux-files/linux-libre/6.8-i686.conf
+++ b/gnu/packages/aux-files/linux-libre/6.10-i686.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.8.1 Kernel Configuration
+# Linux/i386 6.10.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
CONFIG_CC_IS_GCC=y
@@ -17,7 +17,7 @@ CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=126
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -85,6 +85,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y
CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
@@ -150,6 +151,7 @@ CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
@@ -176,6 +178,7 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y
CONFIG_CC_NO_ARRAY_BOUNDS=y
CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
CONFIG_CC_NO_STRINGOP_OVERFLOW=y
+CONFIG_SLAB_OBJ_EXT=y
CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y
# CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -243,7 +246,7 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
+# CONFIG_BASE_SMALL is not set
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
@@ -282,7 +285,8 @@ CONFIG_TRACEPOINTS=y
#
# Kexec and crash features
#
-CONFIG_CRASH_CORE=y
+CONFIG_CRASH_RESERVE=y
+CONFIG_VMCORE_INFO=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC=y
CONFIG_KEXEC_JUMP=y
@@ -322,7 +326,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
#
CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
# CONFIG_X86_CPU_RESCTRL is not set
# CONFIG_X86_BIGSMP is not set
CONFIG_X86_EXTENDED_PLATFORM=y
@@ -510,17 +513,20 @@ CONFIG_MODIFY_LDT_SYSCALL=y
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
# end of Processor type and features
+CONFIG_CC_HAS_NAMED_AS=y
+CONFIG_USE_X86_SEG_SUPPORT=y
CONFIG_CC_HAS_SLS=y
CONFIG_CC_HAS_RETURN_THUNK=y
CONFIG_CC_HAS_ENTRY_PADDING=y
CONFIG_FUNCTION_PADDING_CFI=0
CONFIG_FUNCTION_PADDING_BYTES=4
-CONFIG_SPECULATION_MITIGATIONS=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_RETPOLINE=y
-CONFIG_RETHUNK=y
-# CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_CPU_MITIGATIONS=y
+CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
+CONFIG_MITIGATION_RETPOLINE=y
+# CONFIG_MITIGATION_RETHUNK is not set
+# CONFIG_MITIGATION_GDS_FORCE is not set
CONFIG_MITIGATION_RFDS=y
+CONFIG_MITIGATION_SPECTRE_BHI=y
#
# Power management and ACPI options
@@ -532,6 +538,9 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_HIBERNATION_COMP_LZO=y
+# CONFIG_HIBERNATION_COMP_LZ4 is not set
+CONFIG_HIBERNATION_DEF_COMP="lzo"
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
@@ -587,15 +596,16 @@ CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_BGRT=y
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NHLT=y
CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_EINJ_CXL=y
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
CONFIG_ACPI_DPTF=y
CONFIG_DPTF_POWER=m
@@ -712,7 +722,6 @@ CONFIG_COMPAT_32=y
# end of Binary Emulations
CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_KVM=y
CONFIG_KVM_COMMON=y
CONFIG_HAVE_KVM_PFNCACHE=y
CONFIG_HAVE_KVM_IRQCHIP=y
@@ -723,6 +732,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_READONLY_MEM=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_KVM_VFIO=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
@@ -736,6 +746,7 @@ CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_WERROR=y
CONFIG_KVM_INTEL=m
+# CONFIG_KVM_INTEL_PROVE_VE is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_SMM=y
CONFIG_KVM_HYPERV=y
@@ -747,7 +758,10 @@ CONFIG_AS_SHA1_NI=y
CONFIG_AS_SHA256_NI=y
CONFIG_AS_TPAUSE=y
CONFIG_AS_GFNI=y
+CONFIG_AS_VAES=y
+CONFIG_AS_VPCLMULQDQ=y
CONFIG_AS_WRUSS=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
#
# General architecture-dependent options
@@ -842,8 +856,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_HAVE_EXIT_THREAD=y
CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
CONFIG_ISA_BUS_API=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
@@ -870,6 +887,7 @@ CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
CONFIG_DYNAMIC_SIGFRAME=y
CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
#
# GCOV-based kernel profiling
@@ -886,7 +904,6 @@ CONFIG_FUNCTION_ALIGNMENT=4
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
# CONFIG_MODULE_DEBUG is not set
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -919,7 +936,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
CONFIG_BLK_DEV_WRITE_MOUNTED=y
CONFIG_BLK_DEV_ZONED=y
CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
# CONFIG_BLK_CGROUP_IOLATENCY is not set
@@ -927,7 +943,6 @@ CONFIG_BLK_CGROUP_FC_APPID=y
CONFIG_BLK_CGROUP_IOCOST=y
CONFIG_BLK_CGROUP_IOPRIO=y
CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_INLINE_ENCRYPTION=y
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
@@ -1008,7 +1023,6 @@ CONFIG_ZPOOL=y
CONFIG_SWAP=y
CONFIG_ZSWAP=y
# CONFIG_ZSWAP_DEFAULT_ON is not set
-# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set
# CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
@@ -1047,7 +1061,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
@@ -1072,11 +1086,11 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_SYSFS=y
CONFIG_CMA_AREAS=7
@@ -1103,6 +1117,7 @@ CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
CONFIG_USERFAULTFD=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y
#
# Data Access Monitoring
@@ -1111,7 +1126,7 @@ CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
-# CONFIG_DAMON_DBGFS is not set
+# CONFIG_DAMON_DBGFS_DEPRECATED is not set
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
@@ -1130,7 +1145,6 @@ CONFIG_SKB_EXTENSIONS=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
@@ -1509,6 +1523,7 @@ CONFIG_IP_VS_PE_SIP=m
# IP: Netfilter Configuration
#
CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TABLES_IPV4=y
@@ -1541,6 +1556,7 @@ CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_SECURITY=m
CONFIG_IP_NF_ARPTABLES=m
+CONFIG_NFT_COMPAT_ARP=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
# end of IP: Netfilter Configuration
@@ -1548,6 +1564,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NF_TABLES_IPV6=y
@@ -1585,6 +1602,7 @@ CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1781,7 +1799,6 @@ CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
@@ -1901,7 +1918,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_6LOWPAN=m
@@ -1956,6 +1972,7 @@ CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
CONFIG_BT_VIRTIO=m
CONFIG_BT_NXPUART=m
+# CONFIG_BT_INTEL_PCIE is not set
# end of Bluetooth device drivers
CONFIG_AF_RXRPC=m
@@ -2072,6 +2089,7 @@ CONFIG_LWTUNNEL=y
CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
+CONFIG_NET_IEEE8021Q_HELPERS=y
CONFIG_NET_SELFTESTS=y
CONFIG_NET_SOCK_MSG=y
CONFIG_NET_DEVLINK=y
@@ -2086,6 +2104,7 @@ CONFIG_ETHTOOL_NETLINK=y
CONFIG_HAVE_EISA=y
# CONFIG_EISA is not set
CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
@@ -2177,7 +2196,6 @@ CONFIG_CXL_PORT=m
CONFIG_CXL_SUSPEND=y
CONFIG_CXL_REGION=y
# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
-CONFIG_CXL_PMU=m
CONFIG_PCCARD=m
CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
@@ -2437,7 +2455,6 @@ CONFIG_MTD_L440GX=m
CONFIG_MTD_PCI=m
CONFIG_MTD_PCMCIA=m
# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
# end of Mapping drivers for chip access
@@ -2532,6 +2549,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_GLUEBI=m
CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_NVMEM is not set
CONFIG_MTD_HYPERBUS=m
# CONFIG_OF is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -3094,6 +3112,7 @@ CONFIG_VXLAN=m
CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m
+# CONFIG_PFCP is not set
CONFIG_AMT=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
@@ -3192,10 +3211,6 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_REALTEK=m
-# CONFIG_NET_DSA_REALTEK_MDIO is not set
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-CONFIG_NET_DSA_REALTEK_RTL8365MB=m
-CONFIG_NET_DSA_REALTEK_RTL8366RB=m
CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@@ -3327,6 +3342,8 @@ CONFIG_NET_VENDOR_HUAWEI=y
CONFIG_HINIC=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_NET_VENDOR_INTEL=y
+CONFIG_LIBETH=m
+CONFIG_LIBIE=m
CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
@@ -3350,6 +3367,7 @@ CONFIG_ICE_SWITCHDEV=y
CONFIG_ICE_HWTS=y
CONFIG_FM10K=m
CONFIG_IGC=m
+CONFIG_IGC_LEDS=y
CONFIG_IDPF=m
CONFIG_JME=m
CONFIG_NET_VENDOR_ADI=y
@@ -3560,6 +3578,7 @@ CONFIG_SFP=m
#
# MII PHY device drivers
#
+# CONFIG_AIR_EN8811H_PHY is not set
CONFIG_AMD_PHY=m
CONFIG_ADIN_PHY=m
CONFIG_ADIN1100_PHY=m
@@ -3596,7 +3615,10 @@ CONFIG_NXP_CBTX_PHY=m
CONFIG_NXP_C45_TJA11XX_PHY=m
CONFIG_NXP_TJA11XX_PHY=m
CONFIG_NCN26000_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
CONFIG_AT803X_PHY=m
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
CONFIG_QSEMI_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_RENESAS_PHY=m
@@ -3616,6 +3638,8 @@ CONFIG_XILINX_GMII2RGMII=m
CONFIG_MICREL_KS8995MA=m
CONFIG_PSE_CONTROLLER=y
CONFIG_PSE_REGULATOR=m
+# CONFIG_PSE_PD692X0 is not set
+# CONFIG_PSE_TPS23881 is not set
CONFIG_CAN_DEV=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
@@ -3634,6 +3658,7 @@ CONFIG_CAN_CC770_ISA=m
CONFIG_CAN_CC770_PLATFORM=m
CONFIG_CAN_CTUCANFD=m
CONFIG_CAN_CTUCANFD_PCI=m
+# CONFIG_CAN_ESD_402_PCI is not set
CONFIG_CAN_IFI_CANFD=m
CONFIG_CAN_M_CAN=m
CONFIG_CAN_M_CAN_PCI=m
@@ -3845,6 +3870,7 @@ CONFIG_ATH11K_PCI=m
# CONFIG_ATH11K_TRACING is not set
CONFIG_ATH12K=m
# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_DEBUGFS is not set
# CONFIG_ATH12K_TRACING is not set
CONFIG_WLAN_VENDOR_ATMEL=y
CONFIG_AT76C50X_USB=m
@@ -4028,6 +4054,7 @@ CONFIG_RTLWIFI_PCI=m
CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8192D_COMMON=m
CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
@@ -4044,6 +4071,7 @@ CONFIG_RTW89_8851BE=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_8922AE is not set
# CONFIG_RTW89_DEBUGMSG is not set
# CONFIG_RTW89_DEBUGFS is not set
CONFIG_WLAN_VENDOR_RSI=y
@@ -4315,6 +4343,8 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
CONFIG_TOUCHSCREEN_EXC3000=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
CONFIG_TOUCHSCREEN_HIDEEP=m
CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
@@ -4508,7 +4538,6 @@ CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
@@ -4568,10 +4597,9 @@ CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_LANTIQ=m
CONFIG_SERIAL_SCCNXP=y
CONFIG_SERIAL_SCCNXP_CONSOLE=y
-CONFIG_SERIAL_SC16IS7XX_CORE=m
CONFIG_SERIAL_SC16IS7XX=m
-CONFIG_SERIAL_SC16IS7XX_I2C=y
-CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_SC16IS7XX_I2C=m
+CONFIG_SERIAL_SC16IS7XX_SPI=m
CONFIG_SERIAL_TIMBERDALE=m
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
@@ -4646,6 +4674,7 @@ CONFIG_HPET_MMAP=y
CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=y
+# CONFIG_TCG_TPM2_HMAC is not set
CONFIG_HW_RANDOM_TPM=y
CONFIG_TCG_TIS_CORE=y
CONFIG_TCG_TIS=y
@@ -4714,6 +4743,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_I801=m
+CONFIG_I2C_I801_MUX=y
CONFIG_I2C_ISCH=m
CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
@@ -4726,6 +4756,7 @@ CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
+# CONFIG_I2C_ZHAOXIN is not set
#
# ACPI drivers
@@ -4883,6 +4914,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_FC3W is not set
# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_VMW is not set
CONFIG_PTP_1588_CLOCK_OCP=m
@@ -4954,6 +4986,7 @@ CONFIG_GPIO_AMDPT=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=m
+# CONFIG_GPIO_GRANITERAPIDS is not set
CONFIG_GPIO_ICH=m
CONFIG_GPIO_MB86S7X=m
CONFIG_GPIO_MENZ127=m
@@ -4993,6 +5026,7 @@ CONFIG_GPIO_TPIC2810=m
CONFIG_GPIO_ADP5520=m
CONFIG_GPIO_ARIZONA=m
CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_CROS_EC is not set
CONFIG_GPIO_CRYSTAL_COVE=m
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_DA9052=m
@@ -5071,6 +5105,7 @@ CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_GPIO=m
CONFIG_W1_MASTER_SGI=m
+# CONFIG_W1_MASTER_UART is not set
# end of 1-wire Bus Masters
#
@@ -5213,6 +5248,7 @@ CONFIG_SENSORS_AHT10=m
CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
CONFIG_SENSORS_AS370=m
CONFIG_SENSORS_ASC7621=m
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
CONFIG_SENSORS_AXI_FAN_CONTROL=m
CONFIG_SENSORS_K8TEMP=m
CONFIG_SENSORS_K10TEMP=m
@@ -5220,6 +5256,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
CONFIG_SENSORS_APPLESMC=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_CHIPCAP2 is not set
CONFIG_SENSORS_CORSAIR_CPRO=m
CONFIG_SENSORS_CORSAIR_PSU=m
CONFIG_SENSORS_DRIVETEMP=y
@@ -5252,6 +5289,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_POWERZ=m
CONFIG_SENSORS_POWR1220=m
+# CONFIG_SENSORS_LENOVO_EC is not set
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LTC2945=m
CONFIG_SENSORS_LTC2947=m
@@ -5266,6 +5304,7 @@ CONFIG_SENSORS_LTC4222=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4260=m
CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_LTC4282 is not set
CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX127=m
CONFIG_SENSORS_MAX16065=m
@@ -5316,6 +5355,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NZXT_KRAKEN2=m
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
CONFIG_SENSORS_NZXT_SMART2=m
CONFIG_SENSORS_OCC_P8_I2C=m
CONFIG_SENSORS_OCC=m
@@ -5326,6 +5366,7 @@ CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_ACBEL_FSG032=m
CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_ADM1275=m
+# CONFIG_SENSORS_ADP1050 is not set
CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BPA_RS600=m
CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
@@ -5362,6 +5403,7 @@ CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MP5990=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
CONFIG_SENSORS_MPQ7932=m
+# CONFIG_SENSORS_MPQ8785 is not set
CONFIG_SENSORS_PIM4328=m
CONFIG_SENSORS_PLI1209BC=m
CONFIG_SENSORS_PLI1209BC_REGULATOR=y
@@ -5376,10 +5418,13 @@ CONFIG_SENSORS_TPS53679=m
CONFIG_SENSORS_TPS546D24=m
CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
+# CONFIG_SENSORS_XDP710 is not set
CONFIG_SENSORS_XDPE152=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_XDPE122_REGULATOR=y
CONFIG_SENSORS_ZL6100=m
+# CONFIG_SENSORS_PT5161L is not set
+# CONFIG_SENSORS_PWM_FAN is not set
CONFIG_SENSORS_SBTSI=m
CONFIG_SENSORS_SBRMI=m
CONFIG_SENSORS_SHT15=m
@@ -5452,7 +5497,6 @@ CONFIG_THERMAL_NETLINK=y
CONFIG_THERMAL_DEBUGFS=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -5504,10 +5548,12 @@ CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+# CONFIG_CROS_EC_WATCHDOG is not set
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
CONFIG_DA9062_WATCHDOG=m
+# CONFIG_LENOVO_SE10_WDT is not set
CONFIG_MENF21BMC_WATCHDOG=m
CONFIG_MENZ069_WATCHDOG=m
CONFIG_WDAT_WDT=m
@@ -6844,20 +6890,12 @@ CONFIG_DVB_DUMMY_FE=m
# Graphics support
#
CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_SCREEN_INFO=y
+CONFIG_VIDEO=y
CONFIG_AUXDISPLAY=y
CONFIG_CHARLCD=m
-CONFIG_LINEDISP=m
CONFIG_HD44780_COMMON=m
CONFIG_HD44780=m
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_IMG_ASCII_LCD=m
-CONFIG_HT16K33=m
CONFIG_LCD2S=m
CONFIG_PARPORT_PANEL=m
CONFIG_PANEL_PARPORT=0
@@ -6866,6 +6904,16 @@ CONFIG_PANEL_PROFILE=5
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_LINEDISP=m
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+# CONFIG_MAX6959 is not set
+# CONFIG_SEG_LED_GPIO is not set
CONFIG_PANEL=m
CONFIG_AGP=y
CONFIG_AGP_ALI=m
@@ -6883,6 +6931,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_MIPI_DBI=m
CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=m
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6891,11 +6940,12 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_DISPLAY_HELPER=m
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_DP_TUNNEL=y
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_TTM=m
CONFIG_DRM_EXEC=m
CONFIG_DRM_GPUVM=m
@@ -6956,6 +7006,7 @@ CONFIG_DRM_I915_FORCE_PROBE=""
CONFIG_DRM_I915_CAPTURE_ERROR=y
CONFIG_DRM_I915_COMPRESS_ERROR=y
CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_DP_TUNNEL=y
#
# drm/i915 Debugging
@@ -6987,6 +7038,7 @@ CONFIG_DRM_I915_STOP_TIMEOUT=100
CONFIG_DRM_I915_TIMESLICE_DURATION=1
# end of drm/i915 Profile Guided Optimisation
+# CONFIG_DRM_XE is not set
CONFIG_DRM_VGEM=m
# CONFIG_DRM_VKMS is not set
CONFIG_DRM_VMWGFX=m
@@ -7004,6 +7056,7 @@ CONFIG_DRM_PANEL=y
# Display Panels
#
CONFIG_DRM_PANEL_AUO_A030JTN01=m
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -7042,8 +7095,9 @@ CONFIG_DRM_SSD130X=m
CONFIG_DRM_SSD130X_I2C=m
CONFIG_DRM_SSD130X_SPI=m
CONFIG_DRM_HYPERV=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_PRIVACY_SCREEN=y
+# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
# Frame buffer Devices
@@ -7177,6 +7231,7 @@ CONFIG_LCD_HX8357=m
CONFIG_LCD_OTM3225A=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_KTD253=m
+# CONFIG_BACKLIGHT_KTD2801 is not set
CONFIG_BACKLIGHT_KTZ8866=m
CONFIG_BACKLIGHT_LM3533=m
CONFIG_BACKLIGHT_PWM=m
@@ -7431,6 +7486,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_COMPONENT=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set
@@ -7532,7 +7588,10 @@ CONFIG_SND_AMD_ASOC_ACP70=m
CONFIG_SND_SOC_AMD_MACH_COMMON=m
CONFIG_SND_SOC_AMD_LEGACY_MACH=m
CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_AMD_SOUNDWIRE_ACPI=m
CONFIG_SND_SOC_AMD_RPL_ACP6x=m
+CONFIG_SND_SOC_AMD_ACP63_TOPLEVEL=m
+CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_AMD_PS=m
CONFIG_SND_SOC_AMD_PS_MACH=m
CONFIG_SND_ATMEL_SOC=m
@@ -7619,7 +7678,6 @@ CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -7640,7 +7698,6 @@ CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -7681,6 +7738,7 @@ CONFIG_SND_SOC_SOF_AMD_RENOIR=m
# CONFIG_SND_SOC_SOF_AMD_VANGOGH is not set
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_ACP_PROBES=m
+CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_AMD_ACP63=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
@@ -7711,6 +7769,7 @@ CONFIG_SND_SOC_SOF_METEORLAKE=m
CONFIG_SND_SOC_SOF_INTEL_LNL=m
CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_GENERIC=m
CONFIG_SND_SOC_SOF_HDA_MLINK=m
CONFIG_SND_SOC_SOF_HDA_LINK=y
CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
@@ -7771,6 +7830,7 @@ CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
CONFIG_SND_SOC_CHV3_CODEC=m
CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS_AMP_LIB=m
CONFIG_SND_SOC_CS35L32=m
CONFIG_SND_SOC_CS35L33=m
CONFIG_SND_SOC_CS35L34=m
@@ -7826,7 +7886,6 @@ CONFIG_SND_SOC_HDAC_HDA=m
CONFIG_SND_SOC_HDA=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_IDT821034=m
-CONFIG_SND_SOC_INNO_RK3036=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98090=m
CONFIG_SND_SOC_MAX98357A=m
@@ -7861,8 +7920,8 @@ CONFIG_SND_SOC_PCM5102A=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_PCM6240 is not set
CONFIG_SND_SOC_PEB2466=m
-# CONFIG_SND_SOC_RK3328 is not set
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT274=m
@@ -8134,6 +8193,7 @@ CONFIG_HID_UDRAW_PS3=m
CONFIG_HID_U2FZERO=m
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+# CONFIG_HID_WINWING is not set
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
@@ -8193,6 +8253,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
CONFIG_USB_MON=m
#
@@ -8573,6 +8634,7 @@ CONFIG_TYPEC_MUX_FSA4480=m
CONFIG_TYPEC_MUX_GPIO_SBU=m
CONFIG_TYPEC_MUX_PI3USB30532=m
CONFIG_TYPEC_MUX_INTEL_PMC=m
+# CONFIG_TYPEC_MUX_IT5205 is not set
CONFIG_TYPEC_MUX_NB7VPQ904M=m
CONFIG_TYPEC_MUX_PTN36502=m
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
@@ -8750,7 +8812,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_PANIC=y
CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m
#
@@ -8869,6 +8930,7 @@ CONFIG_RTC_DRV_RC5T583=m
CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_FM3130=m
CONFIG_RTC_DRV_RX8010=m
+# CONFIG_RTC_DRV_RX8111 is not set
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_RX8025=m
CONFIG_RTC_DRV_EM3027=m
@@ -9003,7 +9065,6 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
CONFIG_UIO_MF624=m
CONFIG_UIO_HV_GENERIC=m
CONFIG_UIO_DFL=m
@@ -9026,9 +9087,10 @@ CONFIG_VFIO_PCI_VGA=y
CONFIG_VFIO_PCI_IGD=y
CONFIG_MLX5_VFIO_PCI=m
CONFIG_VIRTIO_VFIO_PCI=m
+# CONFIG_QAT_VFIO_PCI is not set
# end of VFIO support for PCI devices
-CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VMGENID=y
CONFIG_VBOXGUEST=m
@@ -9048,6 +9110,7 @@ CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VIRTIO_DEBUG is not set
CONFIG_VDPA=m
# CONFIG_VDPA_SIM is not set
CONFIG_VDPA_USER=m
@@ -9249,7 +9312,6 @@ CONFIG_COMEDI_NI_TIO=m
CONFIG_COMEDI_NI_ROUTING=m
# CONFIG_COMEDI_TESTS is not set
CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
CONFIG_RTLLIB=m
CONFIG_RTLLIB_CRYPTO_CCMP=m
CONFIG_RTLLIB_CRYPTO_TKIP=m
@@ -9352,7 +9414,6 @@ CONFIG_MOST_NET=m
CONFIG_MOST_VIDEO=m
CONFIG_MOST_I2C=m
CONFIG_KS7010=m
-# CONFIG_PI433 is not set
CONFIG_FIELDBUS_DEV=m
CONFIG_VME_BUS=y
@@ -9366,6 +9427,7 @@ CONFIG_VME_TSI148=m
# VME Device Drivers
#
CONFIG_VME_USER=m
+# CONFIG_GOLDFISH is not set
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_ACPI=m
CONFIG_CHROMEOS_LAPTOP=m
@@ -9404,10 +9466,12 @@ CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
CONFIG_XIAOMI_WMI=m
CONFIG_GIGABYTE_WMI=m
CONFIG_YOGABOOK=m
+# CONFIG_YT2_1380 is not set
CONFIG_ACERHDF=m
CONFIG_ACER_WIRELESS=m
CONFIG_ACER_WMI=m
CONFIG_AMD_PMC=m
+CONFIG_AMD_MP2_STB=y
# CONFIG_AMD_WBRF is not set
CONFIG_ADV_SWBUTTON=m
CONFIG_APPLE_GMUX=m
@@ -9429,6 +9493,7 @@ CONFIG_DELL_SMBIOS=m
CONFIG_DELL_SMBIOS_WMI=y
CONFIG_DELL_SMBIOS_SMM=y
CONFIG_DELL_SMO8800=m
+# CONFIG_DELL_UART_BACKLIGHT is not set
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_PRIVACY=y
CONFIG_DELL_WMI_AIO=m
@@ -9482,9 +9547,12 @@ CONFIG_INTEL_PUNIT_IPC=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m
CONFIG_INTEL_VSEC=m
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_MEEGOPAD_ANX7428 is not set
CONFIG_MSI_EC=m
CONFIG_MSI_LAPTOP=m
CONFIG_MSI_WMI=m
+# CONFIG_MSI_WMI_PLATFORM is not set
CONFIG_PCENGINES_APU2=m
CONFIG_BARCO_P50_GPIO=m
CONFIG_SAMSUNG_LAPTOP=m
@@ -9505,6 +9573,7 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m
# CONFIG_MLX_PLATFORM is not set
# CONFIG_TOUCHSCREEN_DMI is not set
CONFIG_INSPUR_PLATFORM_PROFILE=m
+# CONFIG_LENOVO_WMI_CAMERA is not set
CONFIG_FW_ATTR_CLASS=m
CONFIG_INTEL_IMR=y
CONFIG_INTEL_IPS=m
@@ -9639,6 +9708,7 @@ CONFIG_WPCM450_SOC=m
#
CONFIG_QCOM_PMIC_PDCHARGER_ULOG=m
CONFIG_QCOM_QMI_HELPERS=m
+# CONFIG_QCOM_PBS is not set
# end of Qualcomm SoC drivers
CONFIG_SOC_TI=y
@@ -9756,6 +9826,7 @@ CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL_SPI=m
CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_I2C=m
CONFIG_BMI088_ACCEL_SPI=m
CONFIG_DA280=m
CONFIG_DA311=m
@@ -9804,6 +9875,7 @@ CONFIG_AD7091R=m
CONFIG_AD7091R5=m
CONFIG_AD7091R8=m
CONFIG_AD7124=m
+# CONFIG_AD7173 is not set
CONFIG_AD7192=m
CONFIG_AD7266=m
CONFIG_AD7280=m
@@ -9821,8 +9893,11 @@ CONFIG_AD7791=m
CONFIG_AD7793=m
CONFIG_AD7887=m
CONFIG_AD7923=m
+# CONFIG_AD7944 is not set
CONFIG_AD7949=m
CONFIG_AD799X=m
+# CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_AXP20X_ADC=m
CONFIG_AXP288_ADC=m
CONFIG_CC10001_ADC=m
@@ -9858,6 +9933,7 @@ CONFIG_MEDIATEK_MT6370_ADC=m
CONFIG_MEN_Z188_ADC=m
CONFIG_MP2629_ADC=m
CONFIG_NAU7802=m
+# CONFIG_PAC1934 is not set
CONFIG_PALMAS_GPADC=m
CONFIG_QCOM_VADC_COMMON=m
CONFIG_QCOM_SPMI_IADC=m
@@ -9875,6 +9951,7 @@ CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m
CONFIG_TI_ADS7924=m
CONFIG_TI_ADS1100=m
+# CONFIG_TI_ADS1298 is not set
CONFIG_TI_ADS7950=m
CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
@@ -9988,6 +10065,8 @@ CONFIG_AD5592R=m
CONFIG_AD5593R=m
CONFIG_AD5504=m
CONFIG_AD5624R_SPI=m
+# CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
CONFIG_LTC2688=m
CONFIG_AD5686=m
CONFIG_AD5686_SPI=m
@@ -10050,6 +10129,7 @@ CONFIG_AD9523=m
CONFIG_ADF4350=m
CONFIG_ADF4371=m
CONFIG_ADF4377=m
+# CONFIG_ADMFM2000 is not set
CONFIG_ADMV1013=m
CONFIG_ADMV4420=m
CONFIG_ADRF6780=m
@@ -10158,6 +10238,7 @@ CONFIG_ADUX1020=m
CONFIG_AL3010=m
CONFIG_AL3320A=m
CONFIG_APDS9300=m
+# CONFIG_APDS9306 is not set
CONFIG_APDS9960=m
CONFIG_AS73211=m
CONFIG_BH1750=m
@@ -10314,6 +10395,8 @@ CONFIG_MPL115_I2C=m
CONFIG_MPL115_SPI=m
CONFIG_MPL3115=m
CONFIG_MPRLS0025PA=m
+CONFIG_MPRLS0025PA_I2C=m
+CONFIG_MPRLS0025PA_SPI=m
CONFIG_MS5611=m
CONFIG_MS5611_I2C=m
CONFIG_MS5611_SPI=m
@@ -10395,7 +10478,6 @@ CONFIG_NTB_PERF=m
CONFIG_NTB_MSI_TEST=m
CONFIG_NTB_TRANSPORT=m
CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
# CONFIG_PWM_DEBUG is not set
CONFIG_PWM_CLK=m
CONFIG_PWM_CRC=y
@@ -10421,6 +10503,7 @@ CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_GPIO is not set
CONFIG_RESET_SIMPLE=y
CONFIG_RESET_TI_SYSCON=m
CONFIG_RESET_TI_TPS380X=m
@@ -10461,9 +10544,11 @@ CONFIG_MCB_LPC=m
# Performance monitor support
#
CONFIG_DWC_PCIE_PMU=m
+CONFIG_CXL_PMU=m
# end of Performance monitor support
CONFIG_RAS=y
+# CONFIG_AMD_ATL is not set
CONFIG_USB4=m
# CONFIG_USB4_DEBUGFS_WRITE is not set
# CONFIG_USB4_DMA_TEST is not set
@@ -10515,6 +10600,8 @@ CONFIG_FPGA=m
CONFIG_ALTERA_PR_IP_CORE=m
CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_CORE=m
+# CONFIG_FPGA_MGR_XILINX_SELECTMAP is not set
CONFIG_FPGA_MGR_XILINX_SPI=m
CONFIG_FPGA_MGR_MACHXO2_SPI=m
CONFIG_FPGA_BRIDGE=m
@@ -10657,6 +10744,7 @@ CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_PASSTHROUGH=y
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
@@ -10698,12 +10786,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FAT_DEFAULT_UTF8 is not set
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
CONFIG_NTFS3_FS=m
CONFIG_NTFS3_LZX_XPRESS=y
# CONFIG_NTFS3_FS_POSIX_ACL is not set
+CONFIG_NTFS_FS=m
# end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -10961,6 +11047,7 @@ CONFIG_KEYS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_TRUSTED_KEYS=y
+CONFIG_HAVE_TRUSTED_KEYS=y
CONFIG_TRUSTED_KEYS_TPM=y
CONFIG_ENCRYPTED_KEYS=y
# CONFIG_USER_DECRYPTED_DATA is not set
@@ -11098,6 +11185,7 @@ CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
CONFIG_CRYPTO_SIG2=y
CONFIG_CRYPTO_SKCIPHER=y
CONFIG_CRYPTO_SKCIPHER2=y
@@ -11268,7 +11356,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-# CONFIG_CRYPTO_STATS is not set
# end of Userspace interface
CONFIG_CRYPTO_HASH_INFO=y
@@ -11305,6 +11392,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DEV_SAFEXCEL=m
@@ -11345,7 +11433,6 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -11446,6 +11533,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_SWIOTLB=y
# CONFIG_SWIOTLB_DYNAMIC is not set
+CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_CMA=y
#
@@ -11461,7 +11549,6 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_GLOB=y
@@ -11479,6 +11566,7 @@ CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_32=y
CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
CONFIG_FONT_SUPPORT=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -11548,6 +11636,7 @@ CONFIG_FRAME_WARN=1024
# CONFIG_HEADERS_INSTALL is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
# CONFIG_VMLINUX_MAP is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -11575,7 +11664,7 @@ CONFIG_KDB_DEFAULT_ENABLE=0x1
CONFIG_KDB_KEYBOARD=y
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
CONFIG_ARCH_HAS_EARLY_DEBUG=y
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
# CONFIG_UBSAN is not set
CONFIG_HAVE_KCSAN_COMPILER=y
# end of Generic Kernel Debugging Instruments
@@ -11620,6 +11709,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_MEM_ALLOC_PROFILING is not set
CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
CONFIG_HAVE_ARCH_KFENCE=y
@@ -11790,6 +11880,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -11855,8 +11946,6 @@ CONFIG_PERCPU_TEST=m
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m
-# CONFIG_STRING_SELFTEST is not set
-CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
diff --git a/gnu/packages/aux-files/linux-libre/6.10-riscv.conf b/gnu/packages/aux-files/linux-libre/6.10-riscv.conf
new file mode 100644
index 0000000000..e87ed5a758
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/6.10-riscv.conf
@@ -0,0 +1,8279 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/riscv 6.10.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110300
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23800
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23800
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
+CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=126
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_WATCH_QUEUE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_IRQ_IPI=y
+CONFIG_GENERIC_IRQ_IPI_MUX=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
+CONFIG_PREEMPT_BUILD=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+# CONFIG_PREEMPT_DYNAMIC is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_PSI is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
+CONFIG_CC_NO_STRINGOP_OVERFLOW=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+# CONFIG_NUMA_BALANCING is not set
+CONFIG_SLAB_OBJ_EXT=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_SCHED_MM_CID=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_MISC is not set
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+# CONFIG_BOOT_CONFIG is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
+# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW=y
+CONFIG_EXPERT=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+# CONFIG_BUG is not set
+CONFIG_ELF_CORE=y
+# CONFIG_BASE_SMALL is not set
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+CONFIG_CACHESTAT_SYSCALL=y
+# CONFIG_PC104 is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+# CONFIG_PROFILING is not set
+CONFIG_TRACEPOINTS=y
+
+#
+# Kexec and crash features
+#
+CONFIG_CRASH_RESERVE=y
+CONFIG_VMCORE_INFO=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KEXEC=y
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
+# end of Kexec and crash features
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_RISCV=y
+CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE=y
+CONFIG_RISCV_USE_LINKER_RELAXATION=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=24
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_RISCV_SBI=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0xff60000000000000
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=5
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RISCV_DMA_NONCOHERENT=y
+CONFIG_RISCV_NONSTANDARD_CACHE_OPS=y
+
+#
+# SoC selection
+#
+CONFIG_ARCH_MICROCHIP_POLARFIRE=y
+CONFIG_ARCH_MICROCHIP=y
+CONFIG_ARCH_RENESAS=y
+CONFIG_ARCH_SIFIVE=y
+CONFIG_ARCH_SOPHGO=y
+CONFIG_ARCH_STARFIVE=y
+CONFIG_SOC_STARFIVE=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_THEAD=y
+CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_CANAAN=y
+# end of SoC selection
+
+#
+# CPU errata selection
+#
+CONFIG_ERRATA_ANDES=y
+CONFIG_ERRATA_SIFIVE=y
+CONFIG_ERRATA_SIFIVE_CIP_453=y
+CONFIG_ERRATA_SIFIVE_CIP_1200=y
+CONFIG_ERRATA_THEAD=y
+CONFIG_ERRATA_THEAD_MAE=y
+CONFIG_ERRATA_THEAD_CMO=y
+CONFIG_ERRATA_THEAD_PMU=y
+# end of CPU errata selection
+
+#
+# Platform type
+#
+CONFIG_NONPORTABLE=y
+# CONFIG_ARCH_RV32I is not set
+CONFIG_ARCH_RV64I=y
+# CONFIG_CMODEL_MEDLOW is not set
+CONFIG_CMODEL_MEDANY=y
+CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
+CONFIG_TUNE_GENERIC=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+CONFIG_RISCV_ALTERNATIVE=y
+CONFIG_RISCV_ALTERNATIVE_EARLY=y
+CONFIG_RISCV_ISA_C=y
+CONFIG_RISCV_ISA_SVNAPOT=y
+CONFIG_RISCV_ISA_SVPBMT=y
+CONFIG_RISCV_ISA_ZICBOM=y
+CONFIG_RISCV_ISA_ZICBOZ=y
+CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y
+CONFIG_FPU=y
+CONFIG_IRQ_STACKS=y
+CONFIG_THREAD_SIZE_ORDER=2
+CONFIG_RISCV_MISALIGNED=y
+CONFIG_RISCV_PROBE_UNALIGNED_ACCESS=y
+# CONFIG_RISCV_EMULATED_UNALIGNED_ACCESS is not set
+# CONFIG_RISCV_SLOW_UNALIGNED_ACCESS is not set
+# CONFIG_RISCV_EFFICIENT_UNALIGNED_ACCESS is not set
+# end of Platform type
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_RISCV_SBI_V01=y
+CONFIG_RISCV_BOOT_SPINWAIT=y
+CONFIG_ARCH_SUPPORTS_KEXEC=y
+CONFIG_ARCH_SELECTS_KEXEC=y
+CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
+CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y
+CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
+# CONFIG_COMPAT is not set
+# CONFIG_PARAVIRT is not set
+# CONFIG_RELOCATABLE is not set
+# CONFIG_RANDOMIZE_BASE is not set
+# end of Kernel features
+
+#
+# Boot options
+#
+CONFIG_CMDLINE=""
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+# CONFIG_PHYS_RAM_BASE_FIXED is not set
+# CONFIG_XIP_KERNEL is not set
+CONFIG_RISCV_ISA_FALLBACK=y
+# CONFIG_BUILTIN_DTB is not set
+# end of Boot options
+
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+# CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# end of Power management options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
+CONFIG_DT_IDLE_STATES=y
+CONFIG_DT_IDLE_GENPD=y
+
+#
+# RISC-V CPU Idle Drivers
+#
+CONFIG_RISCV_SBI_CPUIDLE=y
+# end of RISC-V CPU Idle Drivers
+# end of CPU Idle
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+# CONFIG_ACPI_CPPC_CPUFREQ is not set
+# end of CPU Frequency scaling
+# end of CPU Power Management
+
+CONFIG_KVM_COMMON=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_KVM_MMIO=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_READONLY_MEM=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_GENERIC_GSI=y
+CONFIG_ACPI_THERMAL_LIB=y
+# CONFIG_ACPI_DEBUGGER is not set
+# CONFIG_ACPI_SPCR_TABLE is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_TAD is not set
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_HED is not set
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_ACPI_PFRUT=m
+# CONFIG_ACPI_FFH is not set
+CONFIG_PMIC_OPREGION=y
+CONFIG_CPU_MITIGATIONS=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_HOTPLUG_CORE_SYNC=y
+CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
+CONFIG_GENERIC_ENTRY=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_UPROBES=y
+CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_RUST=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
+CONFIG_CLONE_BACKWARDS=y
+# CONFIG_COMPAT_32BIT_TIME is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
+# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_VDSO_DATA=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+CONFIG_FUNCTION_ALIGNMENT=0
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_WRITE_MOUNTED=y
+# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_WBT is not set
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+# CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_DEBUG_FS=y
+# CONFIG_BLK_SED_OPAL is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+# CONFIG_IOSCHED_BFQ is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_PREPARE_SYNC_CORE_CMD=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SWAP=y
+# CONFIG_ZSWAP is not set
+
+#
+# Slab allocator options
+#
+CONFIG_SLUB=y
+# CONFIG_SLUB_TINY is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
+# end of Slab allocator options
+
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+CONFIG_COMPAT_BRK=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
+CONFIG_HAVE_GUP_FAST=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PCP_BATCH_SCALE_MAX=5
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_WANTS_THP_SWAP=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_CMA=y
+CONFIG_CMA_DEBUGFS=y
+# CONFIG_CMA_SYSFS is not set
+CONFIG_CMA_AREAS=16
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
+CONFIG_ZONE_DMA32=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_SECRETMEM=y
+# CONFIG_ANON_VMA_NAME is not set
+# CONFIG_USERFAULTFD is not set
+# CONFIG_LRU_GEN is not set
+CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
+CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_XGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+CONFIG_UNIX=y
+CONFIG_AF_UNIX_OOB=y
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_INTERFACE is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_ESP=y
+# CONFIG_NET_KEY is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_NET_HANDSHAKE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IP_TUNNEL=y
+# CONFIG_IP_MROUTE is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_NET_IPVTI=y
+CONFIG_NET_UDP_TUNNEL=y
+# CONFIG_NET_FOU is not set
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+# CONFIG_INET_AH is not set
+CONFIG_INET_ESP=y
+# CONFIG_INET_ESP_OFFLOAD is not set
+# CONFIG_INET_ESPINTCP is not set
+# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_RAW_DIAG is not set
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_NV is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_DCTCP is not set
+# CONFIG_TCP_CONG_CDG is not set
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_AO is not set
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_ILA is not set
+# CONFIG_IPV6_VTI is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_MPTCP is not set
+CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_BPF_LINK=y
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_OSF is not set
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_SECMARK is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_LABELS is not set
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=y
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+CONFIG_NF_CONNTRACK_TFTP=y
+# CONFIG_NF_CT_NETLINK is not set
+CONFIG_NF_NAT=y
+CONFIG_NF_NAT_FTP=y
+CONFIG_NF_NAT_TFTP=y
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+# CONFIG_NF_TABLES is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=y
+CONFIG_NETFILTER_XT_CONNMARK=y
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+CONFIG_NETFILTER_XT_NAT=y
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+CONFIG_NETFILTER_XT_MATCH_IPVS=y
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# end of Core Netfilter Configuration
+
+# CONFIG_IP_SET is not set
+CONFIG_IP_VS=y
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+# CONFIG_IP_VS_PROTO_SCTP is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=y
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_FO is not set
+# CONFIG_IP_VS_OVF is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_MH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+# CONFIG_IP_VS_TWOS is not set
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+# CONFIG_IP_VS_FTP is not set
+CONFIG_IP_VS_NFCT=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_IP_NF_IPTABLES_LEGACY=y
+# CONFIG_NF_SOCKET_IPV4 is not set
+# CONFIG_NF_TPROXY_IPV4 is not set
+# CONFIG_NF_DUP_IPV4 is not set
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_ARPFILTER is not set
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
+# CONFIG_NF_SOCKET_IPV6 is not set
+# CONFIG_NF_TPROXY_IPV6 is not set
+# CONFIG_NF_DUP_IPV6 is not set
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_SRH is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+# CONFIG_IP6_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP6_NF_TARGET_NPT is not set
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=y
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
+CONFIG_INET_SCTP_DIAG=m
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+CONFIG_STP=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+# CONFIG_BRIDGE_MRP is not set
+# CONFIG_BRIDGE_CFM is not set
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+# CONFIG_6LOWPAN is not set
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_CBS is not set
+# CONFIG_NET_SCH_ETF is not set
+# CONFIG_NET_SCH_TAPRIO is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_SKBPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_CAKE is not set
+# CONFIG_NET_SCH_FQ is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_PIE is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_ETS is not set
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_FW is not set
+# CONFIG_NET_CLS_U32 is not set
+# CONFIG_NET_CLS_FLOW is not set
+CONFIG_NET_CLS_CGROUP=y
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOWER is not set
+# CONFIG_NET_CLS_MATCHALL is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_VSOCKETS=y
+CONFIG_VSOCKETS_DIAG=y
+# CONFIG_VSOCKETS_LOOPBACK is not set
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
+CONFIG_NETLINK_DIAG=y
+# CONFIG_MPLS is not set
+# CONFIG_NET_NSH is not set
+# CONFIG_HSR is not set
+# CONFIG_NET_SWITCHDEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+# CONFIG_QRTR_SMD is not set
+# CONFIG_QRTR_TUN is not set
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=y
+CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
+# CONFIG_BT_LEDS is not set
+# CONFIG_BT_MSFTEXT is not set
+# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=y
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBCM4377 is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MTKSDIO is not set
+CONFIG_BT_HCIRSI=m
+# CONFIG_BT_VIRTIO is not set
+CONFIG_BT_INTEL_PCIE=y
+# end of Bluetooth device drivers
+
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
+# CONFIG_MCTP is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_FD=y
+CONFIG_NET_9P_VIRTIO=y
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+# CONFIG_PSAMPLE is not set
+# CONFIG_NET_IFE is not set
+# CONFIG_LWTUNNEL is not set
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+# CONFIG_PAGE_POOL_STATS is not set
+CONFIG_FAILOVER=y
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_DYNAMIC_OF_NODES=y
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+# CONFIG_PCI_FTPCI100 is not set
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+# CONFIG_PCIE_RCAR_HOST is not set
+# CONFIG_PCIE_XILINX is not set
+
+#
+# Cadence-based PCIe controllers
+#
+# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCI_MESON is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCIE_RCAR_GEN4_HOST is not set
+CONFIG_PCIE_FU740=y
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+# CONFIG_CXL_BUS is not set
+# CONFIG_PCCARD is not set
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+# CONFIG_RAPIDIO_DMA_ENGINE is not set
+# CONFIG_RAPIDIO_DEBUG is not set
+# CONFIG_RAPIDIO_ENUM_BASIC is not set
+# CONFIG_RAPIDIO_CHMAN is not set
+# CONFIG_RAPIDIO_MPORT_CDEV is not set
+
+#
+# RapidIO Switch drivers
+#
+# CONFIG_RAPIDIO_CPS_XX is not set
+# CONFIG_RAPIDIO_CPS_GEN2 is not set
+# CONFIG_RAPIDIO_RXS_GEN3 is not set
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+CONFIG_FW_UPLOAD=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_DEVICES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=y
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_MOXTET is not set
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=m
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+# CONFIG_MHI_BUS_PCI_GENERIC is not set
+# CONFIG_MHI_BUS_EP is not set
+# end of Bus devices
+
+#
+# Cache Drivers
+#
+CONFIG_AX45MP_L2_CACHE=y
+CONFIG_SIFIVE_CCACHE=y
+# end of Cache Drivers
+
+# CONFIG_CONNECTOR is not set
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_ISCSI_IBFT is not set
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+CONFIG_EFI_EARLYCON=y
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+# CONFIG_EFI_COCO_SECRET is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+#
+# Qualcomm firmware drivers
+#
+# end of Qualcomm firmware drivers
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+# CONFIG_GNSS_USB is not set
+CONFIG_MTD=y
+CONFIG_MTD_TESTS=m
+
+#
+# Partition parsers
+#
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
+# CONFIG_MTD_MCHP48L640 is not set
+# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=y
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_RAW_NAND is not set
+CONFIG_MTD_SPI_NAND=y
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# CONFIG_MTD_NAND_ECC_MXIC is not set
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_BLOCK is not set
+CONFIG_MTD_UBI_NVMEM=m
+# CONFIG_MTD_HYPERBUS is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_ZRAM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_VIRTIO_BLK=y
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_UBLK is not set
+
+#
+# NVME Support
+#
+CONFIG_NVME_KEYRING=y
+CONFIG_NVME_CORE=y
+# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_MULTIPATH=y
+# CONFIG_NVME_VERBOSE_ERRORS is not set
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=y
+# CONFIG_NVME_FC is not set
+CONFIG_NVME_TCP=y
+# CONFIG_NVME_TCP_TLS is not set
+# CONFIG_NVME_HOST_AUTH is not set
+CONFIG_NVME_TARGET=y
+# CONFIG_NVME_TARGET_PASSTHRU is not set
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_TCP=m
+CONFIG_NVME_TARGET_TCP_TLS=y
+# CONFIG_NVME_TARGET_AUTH is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+CONFIG_TIFM_CORE=y
+CONFIG_TIFM_7XX1=y
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+# CONFIG_DW_XDATA_PCIE is not set
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+# CONFIG_HISI_HIKEY_USB is not set
+# CONFIG_OPEN_DICE is not set
+# CONFIG_VCPU_STALL_DETECTOR is not set
+# CONFIG_NSM is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=y
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+# CONFIG_BCM_VK is not set
+# CONFIG_MISC_ALCOR_PCI is not set
+# CONFIG_MISC_RTSX_PCI is not set
+# CONFIG_MISC_RTSX_USB is not set
+# CONFIG_UACCE is not set
+# CONFIG_PVPANIC is not set
+# CONFIG_GP_PCI1XXXX is not set
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPI3MR is not set
+# CONFIG_SCSI_SMARTPQI is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+# CONFIG_SCSI_SNIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_WD719X is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_VIRTIO is not set
+# CONFIG_SCSI_DH is not set
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_DWC=m
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_SUNXI=m
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+# CONFIG_SATA_RCAR is not set
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_PARPORT is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+CONFIG_MD_BITMAP_FILE=y
+# CONFIG_BCACHE is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_CACHE is not set
+# CONFIG_DM_WRITECACHE is not set
+# CONFIG_DM_EBS is not set
+# CONFIG_DM_ERA is not set
+# CONFIG_DM_CLONE is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_DUST is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_SWITCH is not set
+# CONFIG_DM_LOG_WRITES is not set
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
+CONFIG_DM_VDO=m
+CONFIG_TARGET_CORE=y
+# CONFIG_TCM_IBLOCK is not set
+# CONFIG_TCM_FILEIO is not set
+# CONFIG_TCM_PSCSI is not set
+# CONFIG_LOOPBACK_TARGET is not set
+# CONFIG_ISCSI_TARGET is not set
+# CONFIG_SBP_TARGET is not set
+# CONFIG_REMOTE_TARGET is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+# CONFIG_BONDING is not set
+CONFIG_DUMMY=y
+CONFIG_WIREGUARD=y
+# CONFIG_WIREGUARD_DEBUG is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_NET_FC=y
+CONFIG_NET_TEAM=y
+# CONFIG_NET_TEAM_MODE_BROADCAST is not set
+# CONFIG_NET_TEAM_MODE_ROUNDROBIN is not set
+# CONFIG_NET_TEAM_MODE_RANDOM is not set
+# CONFIG_NET_TEAM_MODE_ACTIVEBACKUP is not set
+# CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
+CONFIG_MACVLAN=y
+# CONFIG_MACVTAP is not set
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=y
+# CONFIG_IPVTAP is not set
+CONFIG_VXLAN=y
+CONFIG_GENEVE=m
+# CONFIG_BAREUDP is not set
+# CONFIG_GTP is not set
+CONFIG_PFCP=m
+# CONFIG_AMT is not set
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_RIONET is not set
+CONFIG_TUN=y
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=y
+CONFIG_VIRTIO_NET=y
+CONFIG_NLMON=m
+CONFIG_NETKIT=y
+CONFIG_VSOCKMON=m
+# CONFIG_MHI_NET is not set
+# CONFIG_ARCNET is not set
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_VORTEX is not set
+# CONFIG_TYPHOON is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+# CONFIG_ADAPTEC_STARFIRE is not set
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_NET_VENDOR_ALTEON=y
+# CONFIG_ACENIC is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+# CONFIG_ENA_ETHERNET is not set
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PDS_CORE is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_AQTION is not set
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ASIX=y
+# CONFIG_SPI_AX88796C is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+# CONFIG_ATL2 is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ALX is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_SYSTEMPORT is not set
+# CONFIG_BNXT is not set
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=y
+# CONFIG_MACB_PCI is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+# CONFIG_THUNDER_NIC_PF is not set
+# CONFIG_THUNDER_NIC_VF is not set
+# CONFIG_THUNDER_NIC_BGX is not set
+# CONFIG_THUNDER_NIC_RGX is not set
+# CONFIG_LIQUIDIO is not set
+# CONFIG_LIQUIDIO_VF is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_ENIC is not set
+CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_GEMINI_ETHERNET is not set
+CONFIG_NET_VENDOR_DAVICOM=y
+# CONFIG_DM9051 is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_DLINK=y
+# CONFIG_DL2K is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_NET_VENDOR_EMULEX=y
+# CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_TSNEP is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FUNGIBLE=y
+# CONFIG_FUN_ETH is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
+# CONFIG_ICE is not set
+# CONFIG_FM10K is not set
+# CONFIG_IGC is not set
+# CONFIG_IDPF is not set
+# CONFIG_JME is not set
+CONFIG_NET_VENDOR_ADI=y
+CONFIG_NET_VENDOR_LITEX=y
+# CONFIG_LITEX_LITEETH is not set
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MVMDIO is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP_VF=m
+CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX5_CORE is not set
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_LAN743X is not set
+# CONFIG_VCAP is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_NET_VENDOR_MYRI=y
+# CONFIG_MYRI10GE is not set
+# CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+# CONFIG_NATSEMI is not set
+# CONFIG_NS83820 is not set
+CONFIG_NET_VENDOR_NETERION=y
+# CONFIG_S2IO is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+# CONFIG_NFP is not set
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_NE2K_PCI is not set
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_NET_VENDOR_PENSANDO=y
+# CONFIG_IONIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_QED is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+# CONFIG_R6040 is not set
+CONFIG_NET_VENDOR_REALTEK=y
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_R8169 is not set
+CONFIG_NET_VENDOR_RENESAS=y
+# CONFIG_SH_ETH is not set
+# CONFIG_RAVB is not set
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+# CONFIG_SC92031 is not set
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+# CONFIG_SIS190 is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
+CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=y
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=y
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=y
+CONFIG_DWMAC_STARFIVE=y
+CONFIG_DWMAC_SUNXI=y
+CONFIG_DWMAC_SUN8I=y
+# CONFIG_DWMAC_INTEL_PLAT is not set
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NIU is not set
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+# CONFIG_TEHUTI is not set
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+# CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_VERTEXCOM=y
+# CONFIG_MSE102X is not set
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+CONFIG_NET_VENDOR_WANGXUN=y
+# CONFIG_NGBE is not set
+# CONFIG_TXGBE is not set
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PHYLINK=y
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_PHYLIB_LEDS=y
+CONFIG_FIXED_PHY=y
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AIR_EN8811H_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_T1S_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_CBTX_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
+CONFIG_AT803X_PHY=m
+CONFIG_QCA83XX_PHY=m
+CONFIG_QCA808X_PHY=m
+CONFIG_QCA807X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=y
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
+CONFIG_DP83TG720_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PSE_CONTROLLER=y
+CONFIG_PSE_REGULATOR=m
+CONFIG_PSE_PD692X0=m
+CONFIG_PSE_TPS23881=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_OF_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+# CONFIG_MDIO_SUN4I is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+# CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_IPQ4019 is not set
+# CONFIG_MDIO_IPQ8064 is not set
+# CONFIG_MDIO_THUNDER is not set
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=y
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=y
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_1 is not set
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+# CONFIG_ADM8211 is not set
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH5K_PCI is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+# CONFIG_ATH9K_PCI_NO_EEPROM is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+# CONFIG_ATH10K is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K_TRACING=y
+# CONFIG_ATH12K is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_AT76C50X_USB is not set
+CONFIG_WLAN_VENDOR_BROADCOM=y
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_BRCMSMAC is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR is not set
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+# CONFIG_P54_COMMON is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_MWIFIEX is not set
+# CONFIG_MWL8K is not set
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921_COMMON=m
+CONFIG_MT7921E=m
+CONFIG_MT7921S=m
+CONFIG_MT7921U=m
+CONFIG_MT7996E=m
+CONFIG_MT7925_COMMON=m
+CONFIG_MT7925E=m
+CONFIG_MT7925U=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+CONFIG_PLFXLC=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+# CONFIG_RT2800USB_RT3573 is not set
+# CONFIG_RT2800USB_RT53XX is not set
+# CONFIG_RT2800USB_RT55XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8192D_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_SDIO=m
+CONFIG_RTW88_USB=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723X=m
+CONFIG_RTW88_8703B=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
+CONFIG_RTW88_8822BU=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
+CONFIG_RTW88_8822CU=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DS=m
+CONFIG_RTW88_8723CS=m
+CONFIG_RTW88_8723DU=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
+CONFIG_RTW88_8821CU=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8851B=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8922A=m
+CONFIG_RTW89_8851BE=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8922AE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_FRAMER=y
+CONFIG_GENERIC_FRAMER=y
+CONFIG_FRAMER_PEF2256=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
+CONFIG_WWAN_HWSIM=m
+# CONFIG_MHI_WWAN_CTRL is not set
+# CONFIG_MHI_WWAN_MBIM is not set
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+# CONFIG_VMXNET3 is not set
+# CONFIG_FUJITSU_ES is not set
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=y
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_VIVALDIFMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_PINEPHONE=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_GOLDFISH_EVENTS=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
+CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CAP11XX=m
+CONFIG_KEYBOARD_BCM=m
+CONFIG_KEYBOARD_CYPRESS_SF=m
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADC is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_DB9 is not set
+# CONFIG_JOYSTICK_GAMECON is not set
+# CONFIG_JOYSTICK_TURBOGRAFX is not set
+# CONFIG_JOYSTICK_AS5011 is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_JOYSTICK_WALKERA0701 is not set
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
+# CONFIG_JOYSTICK_FSIA6B is not set
+# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP5 is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EXC3000 is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+CONFIG_TOUCHSCREEN_GOODIX=y
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m
+# CONFIG_TOUCHSCREEN_HIDEEP is not set
+# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
+# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_ILITEK is not set
+# CONFIG_TOUCHSCREEN_S6SY761 is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+# CONFIG_TOUCHSCREEN_ELAN is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+# CONFIG_TOUCHSCREEN_MSG2638 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set
+# CONFIG_TOUCHSCREEN_IMAGIS is not set
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_RM_TS is not set
+# CONFIG_TOUCHSCREEN_SILEAD is not set
+# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+# CONFIG_TOUCHSCREEN_SUN4I is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_ZET6223 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
+# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
+# CONFIG_TOUCHSCREEN_ZINITIX is not set
+# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_IQS269A is not set
+# CONFIG_INPUT_IQS626A is not set
+# CONFIG_INPUT_IQS7222 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_RMI4_CORE is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_SUN4I_PS2 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
+# CONFIG_USERIO is not set
+CONFIG_GAMEPORT=m
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_TIOCSTI=y
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=6
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_PCI1XXXX is not set
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_PERICOM=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL010 is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
+CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_SH_SCI is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_SIFIVE=y
+CONFIG_SERIAL_SIFIVE_CONSOLE=y
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_GOLDFISH_TTY is not set
+# CONFIG_N_GSM is not set
+# CONFIG_NOZOMI is not set
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+# CONFIG_HVC_RISCV_SBI is not set
+# CONFIG_RPMSG_TTY is not set
+# CONFIG_SERIAL_DEV_BUS is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_JH7110=m
+# CONFIG_APPLICOM is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVPORT=y
+# CONFIG_TCG_TPM is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_XILLYUSB is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_AMD_MP2 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_ZHAOXIN=m
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CADENCE=m
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_MICROCHIP_CORE is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_RIIC is not set
+# CONFIG_I2C_RK3X is not set
+# CONFIG_I2C_RZV2M is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2C_RCAR is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+CONFIG_I2C_LJCA=m
+# CONFIG_I2C_CP2615 is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PCI1XXXX is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_VIRTIO is not set
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_CADENCE_XSPI is not set
+CONFIG_SPI_DESIGNWARE=y
+# CONFIG_SPI_DW_DMA is not set
+# CONFIG_SPI_DW_PCI is not set
+CONFIG_SPI_DW_MMIO=y
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_LJCA=m
+# CONFIG_SPI_MICROCHIP_CORE is not set
+# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PCI1XXXX is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_RSPI is not set
+# CONFIG_SPI_RZV2M_CSI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SH_MSIOF is not set
+# CONFIG_SPI_SH_HSPI is not set
+# CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_SN_F_OSPI is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
+# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+# CONFIG_SPI_AMD is not set
+
+#
+# SPI Multiplexer support
+#
+# CONFIG_SPI_MUX is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+# CONFIG_SPMI is not set
+# CONFIG_HSI is not set
+# CONFIG_PPS is not set
+
+#
+# PTP clock support
+#
+# CONFIG_PTP_1588_CLOCK is not set
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_AW9523=m
+# CONFIG_PINCTRL_CY8C95X0 is not set
+# CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_PEF2256 is not set
+# CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set
+
+#
+# Renesas pinctrl drivers
+#
+CONFIG_PINCTRL_RENESAS=y
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_STARFIVE_JH7100=y
+CONFIG_PINCTRL_STARFIVE_JH7110=y
+CONFIG_PINCTRL_STARFIVE_JH7110_SYS=y
+CONFIG_PINCTRL_STARFIVE_JH7110_AON=y
+CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+CONFIG_PINCTRL_SUN20I_D1=y
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_A100 is not set
+# CONFIG_PINCTRL_SUN50I_A100_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
+# CONFIG_PINCTRL_SUN50I_H616 is not set
+# CONFIG_PINCTRL_SUN50I_H616_R is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_REGMAP=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AMDPT is not set
+# CONFIG_GPIO_CADENCE is not set
+CONFIG_GPIO_DWAPB=y
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HLWD is not set
+# CONFIG_GPIO_LOGICVC is not set
+# CONFIG_GPIO_MB86S7X is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_SIFIVE is not set
+# CONFIG_GPIO_SYSCON is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_FXL6408 is not set
+# CONFIG_GPIO_DS4520 is not set
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+# CONFIG_GPIO_PCA9570 is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_LJCA=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+# CONFIG_GPIO_AGGREGATOR is not set
+# CONFIG_GPIO_LATCH is not set
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# CONFIG_GPIO_SIM is not set
+# end of Virtual GPIO drivers
+
+# CONFIG_W1 is not set
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_REGULATOR is not set
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+# CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_IP5XXX_POWER is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_CHARGER_ADP5061 is not set
+# CONFIG_BATTERY_CW2015 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_RT9467 is not set
+# CONFIG_CHARGER_RT9471 is not set
+# CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHARGER_BD99954 is not set
+# CONFIG_BATTERY_UG3105 is not set
+# CONFIG_FUEL_GAUGE_MM8013 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM1177 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AHT10 is not set
+# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
+# CONFIG_SENSORS_AS370 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
+# CONFIG_SENSORS_AXI_FAN_CONTROL is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CHIPCAP2 is not set
+# CONFIG_SENSORS_CORSAIR_CPRO is not set
+# CONFIG_SENSORS_CORSAIR_PSU is not set
+# CONFIG_SENSORS_DRIVETEMP is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FTSTEUTATES is not set
+# CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HS3001 is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWERZ is not set
+# CONFIG_SENSORS_POWR1220 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC2947_I2C is not set
+# CONFIG_SENSORS_LTC2947_SPI is not set
+# CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2991 is not set
+# CONFIG_SENSORS_LTC2992 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4222 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4260 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+CONFIG_SENSORS_LTC4282=m
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX127 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX31760 is not set
+# CONFIG_MAX31827 is not set
+# CONFIG_SENSORS_MAX6620 is not set
+# CONFIG_SENSORS_MAX6621 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+# CONFIG_SENSORS_MC34VR500 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
+CONFIG_SENSORS_MR75203=y
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_NCT6683 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+CONFIG_SENSORS_NZXT_KRAKEN3=m
+# CONFIG_SENSORS_NZXT_SMART2 is not set
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+CONFIG_SENSORS_PT5161L=m
+CONFIG_SENSORS_PWM_FAN=y
+# CONFIG_SENSORS_SBTSI is not set
+# CONFIG_SENSORS_SBRMI is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHT4x is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC2305 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
+# CONFIG_SENSORS_SFCTEMP is not set
+# CONFIG_SENSORS_ADC128D818 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TMP464 is not set
+# CONFIG_SENSORS_TMP513 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83773G is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_NETLINK is not set
+# CONFIG_THERMAL_STATISTICS is not set
+# CONFIG_THERMAL_DEBUGFS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+# CONFIG_THERMAL_MMIO is not set
+# CONFIG_SUN8I_THERMAL is not set
+# CONFIG_RCAR_THERMAL is not set
+# CONFIG_RCAR_GEN3_THERMAL is not set
+# CONFIG_RZG2L_THERMAL is not set
+# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=32
+# CONFIG_WATCHDOG_SYSFS is not set
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_WDAT_WDT is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_DW_WATCHDOG=y
+# CONFIG_SUNXI_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_RENESAS_WDT is not set
+# CONFIG_RENESAS_RZAWDT is not set
+# CONFIG_RENESAS_RZN1WDT is not set
+# CONFIG_RENESAS_RZG2LWDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_STARFIVE_WATCHDOG=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_SMPRO is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
+# CONFIG_MFD_AC100 is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_MADERA is not set
+# CONFIG_MFD_MAX5970 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_GATEWORKS_GSC is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MP2629 is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_IQS62X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77541 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77650 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77714 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6360 is not set
+# CONFIG_MFD_MT6370 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_OCELOT is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_NTXEC is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_SY7636A is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT4831 is not set
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RT5120 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RK8XX_I2C is not set
+# CONFIG_MFD_RK8XX_SPI is not set
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS65219 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS6594_I2C is not set
+# CONFIG_MFD_TPS6594_SPI is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+# CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+# CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_INTEL_M10_BMC_SPI is not set
+# CONFIG_MFD_RSMU_I2C is not set
+# CONFIG_MFD_RSMU_SPI is not set
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_NETLINK_EVENTS is not set
+# CONFIG_REGULATOR_88PG86X is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_AW37503 is not set
+# CONFIG_REGULATOR_DA9121 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FAN53880 is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77503 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
+# CONFIG_REGULATOR_MAX20411 is not set
+# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MCP16502 is not set
+# CONFIG_REGULATOR_MP5416 is not set
+# CONFIG_REGULATOR_MP8859 is not set
+# CONFIG_REGULATOR_MP886X is not set
+# CONFIG_REGULATOR_MPQ7920 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
+# CONFIG_REGULATOR_PF8X00 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_RAA215300 is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT4803 is not set
+# CONFIG_REGULATOR_RT5190A is not set
+# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RT5759 is not set
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6190 is not set
+# CONFIG_REGULATOR_RT6245 is not set
+# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTMV20 is not set
+# CONFIG_REGULATOR_RTQ6752 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
+# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_SUN20I=m
+# CONFIG_REGULATOR_SY8106A is not set
+# CONFIG_REGULATOR_SY8824X is not set
+# CONFIG_REGULATOR_SY8827N is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS6286X is not set
+# CONFIG_REGULATOR_TPS6287X is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
+# CONFIG_RC_CORE is not set
+CONFIG_CEC_CORE=m
+
+#
+# CEC support
+#
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_CEC_CH7322 is not set
+# CONFIG_CEC_GPIO is not set
+# CONFIG_USB_PULSE8_CEC is not set
+# CONFIG_USB_RAINSHADOW_CEC is not set
+# end of CEC support
+
+CONFIG_MEDIA_SUPPORT=y
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=y
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_V4L2_FWNODE=y
+CONFIG_V4L2_ASYNC=y
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=16
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_GSPCA=m
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_DTCS033 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STK1135 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TOUPTEK is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_VIDEO_USBTV is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+#
+# Analog TV USB devices
+#
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_STK1160 is not set
+
+#
+# Analog/digital TV USB devices
+#
+# CONFIG_VIDEO_AU0828 is not set
+
+#
+# Digital TV USB devices
+#
+# CONFIG_DVB_AS102 is not set
+# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
+# CONFIG_DVB_USB_V2 is not set
+# CONFIG_SMS_USB_DRV is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+# CONFIG_VIDEO_EM28XX is not set
+
+#
+# Software defined radio USB devices
+#
+# CONFIG_USB_AIRSPY is not set
+# CONFIG_USB_HACKRF is not set
+# CONFIG_USB_MSI2500 is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_SHARK is not set
+# CONFIG_RADIO_SHARK2 is not set
+# CONFIG_RADIO_SI4713 is not set
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_KEENE is not set
+# CONFIG_USB_MA901 is not set
+# CONFIG_USB_MR800 is not set
+# CONFIG_USB_RAREMONO is not set
+# CONFIG_RADIO_SI470X is not set
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_VIDEO_MUX is not set
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+
+#
+# Amphion drivers
+#
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+# CONFIG_VIDEO_CADENCE_CSI2RX is not set
+# CONFIG_VIDEO_CADENCE_CSI2TX is not set
+
+#
+# Chips&Media media platform drivers
+#
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+# CONFIG_VIDEO_CAFE_CCIC is not set
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# Nuvoton media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+
+#
+# NXP media platform drivers
+#
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+# CONFIG_VIDEO_RCAR_CSI2 is not set
+# CONFIG_VIDEO_RCAR_ISP is not set
+# CONFIG_VIDEO_RCAR_VIN is not set
+# CONFIG_VIDEO_RZG2L_CSI2 is not set
+# CONFIG_VIDEO_RZG2L_CRU is not set
+# CONFIG_VIDEO_RENESAS_FCP is not set
+# CONFIG_VIDEO_RENESAS_FDP1 is not set
+# CONFIG_VIDEO_RENESAS_JPU is not set
+# CONFIG_VIDEO_RENESAS_VSP1 is not set
+
+#
+# Rockchip media platform drivers
+#
+
+#
+# Samsung media platform drivers
+#
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
+# CONFIG_VIDEO_SUN4I_CSI is not set
+# CONFIG_VIDEO_SUN6I_CSI is not set
+# CONFIG_VIDEO_SUN6I_MIPI_CSI2 is not set
+# CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2 is not set
+# CONFIG_VIDEO_SUN8I_DEINTERLACE is not set
+# CONFIG_VIDEO_SUN8I_ROTATE is not set
+
+#
+# Texas Instruments drivers
+#
+
+#
+# Verisilicon media platform drivers
+#
+# CONFIG_VIDEO_HANTRO is not set
+
+#
+# VIA media platform drivers
+#
+
+#
+# Xilinx media platform drivers
+#
+# CONFIG_VIDEO_XILINX is not set
+
+#
+# MMC/SDIO DVB adapters
+#
+# CONFIG_SMS_SDIO_DRV is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+# CONFIG_DVB_FIREDTV is not set
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_VMALLOC=m
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_CAMERA_SENSOR=y
+# CONFIG_VIDEO_ALVIUM_CSI2 is not set
+# CONFIG_VIDEO_AR0521 is not set
+# CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC2145 is not set
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
+# CONFIG_VIDEO_HI847 is not set
+# CONFIG_VIDEO_IMX208 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX296 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_IMX415 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9M114 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_OG01A1B is not set
+# CONFIG_VIDEO_OV01A10 is not set
+# CONFIG_VIDEO_OV02A10 is not set
+# CONFIG_VIDEO_OV08D10 is not set
+# CONFIG_VIDEO_OV08X40 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
+# CONFIG_VIDEO_OV2640 is not set
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2740 is not set
+# CONFIG_VIDEO_OV4689 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV64A40 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8858 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
+# CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+
+#
+# Camera ISPs
+#
+# CONFIG_VIDEO_THP7312 is not set
+# end of Camera ISPs
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
+# CONFIG_VIDEO_DW9768 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# Audio decoders, processors and mixers
+#
+# CONFIG_VIDEO_CS3308 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_TDA1997X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+# end of RDS decoders
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_ISL7998X is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TC358746 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9900 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# end of Video decoders
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+# CONFIG_VIDEO_SAA6752HS is not set
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+# CONFIG_SDR_MAX2175 is not set
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# end of Miscellaneous helper chips
+
+#
+# Video serializers and deserializers
+#
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
+# end of Video serializers and deserializers
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# CONFIG_VIDEO_GS1662 is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=y
+
+#
+# Customize TV tuners
+#
+# CONFIG_MEDIA_TUNER_E4000 is not set
+# CONFIG_MEDIA_TUNER_FC0011 is not set
+# CONFIG_MEDIA_TUNER_FC0012 is not set
+# CONFIG_MEDIA_TUNER_FC0013 is not set
+# CONFIG_MEDIA_TUNER_FC2580 is not set
+# CONFIG_MEDIA_TUNER_IT913X is not set
+# CONFIG_MEDIA_TUNER_M88RS6000T is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+# CONFIG_MEDIA_TUNER_MSI001 is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2063 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MXL301RF is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_R820T is not set
+# CONFIG_MEDIA_TUNER_SI2157 is not set
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA18212 is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_TDA18250 is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_TUA9001 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_MN88443X=m
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_VIDEO=y
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_DRM=y
+# CONFIG_DRM_DEBUG_MM is not set
+CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_CEC=y
+CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_EXEC=m
+CONFIG_DRM_BUDDY=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=m
+CONFIG_DRM_SUBALLOC_HELPER=m
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+# CONFIG_DRM_RADEON is not set
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+# CONFIG_DRM_AMDGPU_USERPTR is not set
+# CONFIG_DRM_AMDGPU_WERROR is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_FP=y
+# CONFIG_DRM_AMD_DC_SI is not set
+# CONFIG_DRM_AMD_SECURE_DISPLAY is not set
+# end of Display Engine Configuration
+
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_XE is not set
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_RZG2L_MIPI_DSI is not set
+# CONFIG_DRM_SHMOBILE is not set
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
+# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
+# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
+# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+# CONFIG_DRM_PANEL_EDP is not set
+CONFIG_DRM_PANEL_SIMPLE=y
+# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6505 is not set
+# CONFIG_DRM_LONTIUM_LT8912B is not set
+# CONFIG_DRM_LONTIUM_LT9211 is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
+# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
+# CONFIG_DRM_LVDS_CODEC is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_PARADE_PS8640 is not set
+# CONFIG_DRM_SAMSUNG_DSIM is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+# CONFIG_DRM_SIMPLE_BRIDGE is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI83 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+# CONFIG_DRM_TI_TPD12S015 is not set
+# CONFIG_DRM_ANALOGIX_ANX6345 is not set
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
+# end of Display Interface Bridges
+
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_LOGICVC is not set
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_PANEL_MIPI_DBI is not set
+# CONFIG_DRM_SIMPLEDRM is not set
+# CONFIG_TINYDRM_HX8357D is not set
+# CONFIG_TINYDRM_ILI9163 is not set
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
+# CONFIG_TINYDRM_MI0283QT is not set
+# CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_ST7586 is not set
+# CONFIG_TINYDRM_ST7735R is not set
+# CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
+# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+CONFIG_FB_CORE=y
+CONFIG_FB_NOTIFY=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_DEVICE=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYSMEM_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SYSMEM_HELPERS=y
+CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_KTD253 is not set
+CONFIG_BACKLIGHT_KTD2801=m
+# CONFIG_BACKLIGHT_KTZ8866 is not set
+CONFIG_BACKLIGHT_PWM=y
+# CONFIG_BACKLIGHT_QCOM_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_MP3309C is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# CONFIG_BACKLIGHT_LED is not set
+# end of Backlight & LCD device support
+
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+# end of Graphics support
+
+# CONFIG_DRM_ACCEL is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_PCMTEST is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+# CONFIG_SND_CS46XX_NEW_DSP is not set
+CONFIG_SND_CTXFI=m
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+# CONFIG_SND_HDA_INTEL is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_BCD2000 is not set
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
+CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_DICE is not set
+# CONFIG_SND_OXFW is not set
+# CONFIG_SND_ISIGHT is not set
+# CONFIG_SND_FIREWORKS is not set
+# CONFIG_SND_BEBOB is not set
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_ADI is not set
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_FSL_XCVR is not set
+# CONFIG_SND_SOC_FSL_RPMSG is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_SOC_CHV3_I2S is not set
+# CONFIG_SND_I2S_HI6210_I2S is not set
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_MTK_BTCVSD=m
+
+#
+# SoC Audio support for Renesas SoCs
+#
+# CONFIG_SND_SOC_SH4_FSI is not set
+# CONFIG_SND_SOC_RCAR is not set
+# end of SoC Audio support for Renesas SoCs
+
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+CONFIG_SND_SOC_STARFIVE=y
+CONFIG_SND_SOC_JH7110_PWMDAC=y
+CONFIG_SND_SOC_JH7110_TDM=y
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=y
+CONFIG_SND_SUN4I_I2S=y
+CONFIG_SND_SUN4I_SPDIF=y
+CONFIG_SND_SUN50I_DMIC=y
+# end of Allwinner SoC Audio support
+
+# CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_ADAU7118_HW is not set
+# CONFIG_SND_SOC_ADAU7118_I2C is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
+# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88395 is not set
+# CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW87390 is not set
+# CONFIG_SND_SOC_AW88399 is not set
+# CONFIG_SND_SOC_BD28623 is not set
+CONFIG_SND_SOC_BT_SCO=y
+# CONFIG_SND_SOC_CHV3_CODEC is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS35L41_SPI is not set
+# CONFIG_SND_SOC_CS35L41_I2C is not set
+# CONFIG_SND_SOC_CS35L45_SPI is not set
+# CONFIG_SND_SOC_CS35L45_I2C is not set
+# CONFIG_SND_SOC_CS35L56_I2C is not set
+# CONFIG_SND_SOC_CS35L56_SPI is not set
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS42L83 is not set
+# CONFIG_SND_SOC_CS4234 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+# CONFIG_SND_SOC_DA7213 is not set
+# CONFIG_SND_SOC_DMIC is not set
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8326 is not set
+# CONFIG_SND_SOC_ES8328_I2C is not set
+# CONFIG_SND_SOC_ES8328_SPI is not set
+CONFIG_SND_SOC_FRAMER=m
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_HDA is not set
+# CONFIG_SND_SOC_ICS43432 is not set
+# CONFIG_SND_SOC_IDT821034 is not set
+# CONFIG_SND_SOC_MAX98088 is not set
+# CONFIG_SND_SOC_MAX98090 is not set
+# CONFIG_SND_SOC_MAX98357A is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98520 is not set
+# CONFIG_SND_SOC_MAX98373_I2C is not set
+# CONFIG_SND_SOC_MAX98388 is not set
+# CONFIG_SND_SOC_MAX98390 is not set
+# CONFIG_SND_SOC_MAX98396 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PCM6240=m
+# CONFIG_SND_SOC_PEB2466 is not set
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5640 is not set
+# CONFIG_SND_SOC_RT5659 is not set
+# CONFIG_SND_SOC_RT9120 is not set
+# CONFIG_SND_SOC_RTQ9128 is not set
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+# CONFIG_SND_SOC_SMA1303 is not set
+CONFIG_SND_SOC_SPDIF=y
+# CONFIG_SND_SOC_SRC4XXX_I2C is not set
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2518 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM3515 is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
+# CONFIG_SND_SOC_TAS2780 is not set
+# CONFIG_SND_SOC_TAS2781_I2C is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TFA989X is not set
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
+# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TLV320ADCX140 is not set
+# CONFIG_SND_SOC_TS3A227E is not set
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731_I2C is not set
+# CONFIG_SND_SOC_WM8731_SPI is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
+# CONFIG_SND_SOC_WM8940 is not set
+CONFIG_SND_SOC_WM8960=y
+# CONFIG_SND_SOC_WM8961 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_ZL38060 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8821 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_AUDIO_GRAPH_CARD=y
+# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_TEST_COMPONENT is not set
+# CONFIG_SND_VIRTIO is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
+# CONFIG_HIDRAW is not set
+CONFIG_UHID=y
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACCUTOUCH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_ASUS is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_BETOP_FF is not set
+# CONFIG_HID_BIGBEN_FF is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CORSAIR is not set
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CREATIVE_SB0540 is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELAN is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EVISION is not set
+# CONFIG_HID_EZKEY is not set
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+# CONFIG_HID_GLORIOUS is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
+# CONFIG_HID_VIVALDI is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_VRC2 is not set
+# CONFIG_HID_XIAOMI is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_MEGAWORLD_FF is not set
+# CONFIG_HID_REDRAGON is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NINTENDO is not set
+# CONFIG_HID_NTI is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_NVIDIA_SHIELD is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PXRC is not set
+# CONFIG_HID_RAZER is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_RETRODE is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TOPRE is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_UDRAW_PS3 is not set
+# CONFIG_HID_U2FZERO is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+CONFIG_HID_WINWING=m
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
+# CONFIG_HID_MCP2200 is not set
+# CONFIG_HID_MCP2221 is not set
+# end of Special HID drivers
+
+#
+# HID-BPF support
+#
+# end of HID-BPF support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+# CONFIG_I2C_HID is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+# CONFIG_USB_LED_TRIG is not set
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_PCI_AMD=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
+# CONFIG_USB_MON is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_XHCI_RCAR=y
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_R8A66597_HCD=m
+# CONFIG_USB_RENESAS_USBHS_HCD is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_VUDC is not set
+# CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNS3_STARFIVE=m
+# CONFIG_USB_CDNSP_PCI is not set
+# CONFIG_USB_MUSB_HDRC is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+CONFIG_USB_DWC3_HOST=y
+# CONFIG_USB_DWC3_GADGET is not set
+# CONFIG_USB_DWC3_DUAL_ROLE is not set
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+# CONFIG_USB_DWC3_OF_SIMPLE is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+# CONFIG_USB_SERIAL_XR is not set
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_LJCA=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ONBOARD_DEV=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_RENESAS_USBHS_UDC is not set
+# CONFIG_USB_RENESAS_USB3 is not set
+# CONFIG_USB_RENESAS_USBF is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_MAX3420_UDC is not set
+# CONFIG_USB_CDNS2_UDC is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=y
+CONFIG_USB_CONFIGFS=y
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_FS=y
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_MIDI2 is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
+# CONFIG_USB_CONFIGFS_F_PRINTER is not set
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+
+#
+# USB Gadget precomposed configurations
+#
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ZERO_HNPTEST is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_MASS_STORAGE=m
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_ACM_MS is not set
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_TCPM is not set
+# CONFIG_TYPEC_UCSI is not set
+# CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_ANX7411 is not set
+# CONFIG_TYPEC_RT1719 is not set
+# CONFIG_TYPEC_HD3SS3220 is not set
+# CONFIG_TYPEC_STUSB160X is not set
+# CONFIG_TYPEC_WUSB3801 is not set
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_FSA4480 is not set
+# CONFIG_TYPEC_MUX_GPIO_SBU is not set
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+CONFIG_TYPEC_MUX_IT5205=m
+# CONFIG_TYPEC_MUX_NB7VPQ904M is not set
+# CONFIG_TYPEC_MUX_PTN36502 is not set
+# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+# CONFIG_TYPEC_DP_ALTMODE is not set
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_ARMMMCI is not set
+CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI_PCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_DWCMSHC=y
+# CONFIG_MMC_SDHCI_CADENCE is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
+CONFIG_MMC_TIFM_SD=y
+CONFIG_MMC_SPI=m
+# CONFIG_MMC_SDHI is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_PLTFM=y
+# CONFIG_MMC_DW_BLUEFIELD is not set
+# CONFIG_MMC_DW_EXYNOS is not set
+# CONFIG_MMC_DW_HI3798CV200 is not set
+CONFIG_MMC_DW_HI3798MV200=m
+# CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_STARFIVE=y
+# CONFIG_MMC_SH_MMCIF is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_SUNXI=y
+CONFIG_MMC_CQHCI=y
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_LEDS_EXPRESSWIRE=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AW200XX is not set
+# CONFIG_LEDS_AW2013 is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_EL15203000 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP8860 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2606MVV is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_LM3697 is not set
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# RGB LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_DISK is not set
+# CONFIG_LEDS_TRIGGER_MTD is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+# CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# Simple LED drivers
+#
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC_SUPPORT=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX31335 is not set
+# CONFIG_RTC_DRV_NCT3018Y is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+CONFIG_RTC_DRV_RX8111=m
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_EFI is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_SH is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_SUN6I is not set
+# CONFIG_RTC_DRV_CADENCE is not set
+# CONFIG_RTC_DRV_FTRTC010 is not set
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_GOLDFISH=y
+# CONFIG_RTC_DRV_POLARFIRE_SOC is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
+# CONFIG_AMBA_PL08X is not set
+# CONFIG_DMA_SUN6I is not set
+CONFIG_DW_AXI_DMAC=y
+# CONFIG_FSL_EDMA is not set
+# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_PL330_DMA is not set
+# CONFIG_PLX_DMA is not set
+# CONFIG_XILINX_DMA is not set
+# CONFIG_XILINX_XDMA is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+# CONFIG_DW_EDMA is not set
+# CONFIG_SF_PDMA is not set
+# CONFIG_RCAR_DMAC is not set
+# CONFIG_RENESAS_USB_DMAC is not set
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=y
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+CONFIG_DMABUF_SELFTESTS=m
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+# CONFIG_UIO is not set
+CONFIG_VFIO=m
+CONFIG_VFIO_GROUP=y
+CONFIG_VFIO_CONTAINER=y
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_VIRQFD=y
+# CONFIG_VFIO_DEBUGFS is not set
+
+#
+# VFIO support for PCI devices
+#
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+# end of VFIO support for PCI devices
+
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VMGENID=y
+CONFIG_VIRTIO_ANCHOR=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_PCI_LIB_LEGACY=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VIRTIO_DEBUG=y
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=y
+CONFIG_VHOST_TASK=y
+CONFIG_VHOST=y
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=y
+# CONFIG_VHOST_SCSI is not set
+CONFIG_VHOST_VSOCK=y
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+# CONFIG_GREYBUS is not set
+# CONFIG_COMEDI is not set
+CONFIG_STAGING=y
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+# CONFIG_R8712U is not set
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+CONFIG_STAGING_MEDIA=y
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_VIDEO_MAX96712 is not set
+
+#
+# StarFive media platform drivers
+#
+CONFIG_VIDEO_STARFIVE_CAMSS=y
+# CONFIG_VIDEO_SUNXI is not set
+# CONFIG_STAGING_MEDIA_DEPRECATED is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_VME_BUS is not set
+CONFIG_GOLDFISH=y
+# CONFIG_GOLDFISH_PIPE is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+# CONFIG_LMK04832 is not set
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_RS9_PCIE is not set
+# CONFIG_COMMON_CLK_SI521XX is not set
+# CONFIG_COMMON_CLK_VC3 is not set
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_VC7 is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_CLK_ANALOGBITS_WRPLL_CLN28HPC=y
+CONFIG_MCHP_CLK_MPFS=y
+CONFIG_CLK_RENESAS=y
+# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set
+CONFIG_CLK_SIFIVE=y
+CONFIG_CLK_SIFIVE_PRCI=y
+CONFIG_CLK_SOPHGO_CV1800=m
+CONFIG_CLK_STARFIVE_JH71X0=y
+CONFIG_CLK_STARFIVE_JH7100=y
+CONFIG_CLK_STARFIVE_JH7100_AUDIO=m
+CONFIG_CLK_STARFIVE_JH7110_PLL=y
+CONFIG_CLK_STARFIVE_JH7110_SYS=y
+CONFIG_CLK_STARFIVE_JH7110_AON=m
+CONFIG_CLK_STARFIVE_JH7110_STG=m
+CONFIG_CLK_STARFIVE_JH7110_ISP=m
+CONFIG_CLK_STARFIVE_JH7110_VOUT=m
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN20I_D1_CCU=y
+CONFIG_SUN20I_D1_R_CCU=y
+CONFIG_SUN6I_RTC_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+# CONFIG_XILINX_VCU is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_HWSPINLOCK=y
+# CONFIG_HWSPINLOCK_SUN6I is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_SUN4I_TIMER=y
+# CONFIG_RENESAS_OSTM is not set
+CONFIG_RISCV_TIMER=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+# CONFIG_ARM_MHU_V2 is not set
+CONFIG_ARM_MHU_V3=m
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PL320_MBOX is not set
+# CONFIG_PCC is not set
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
+# CONFIG_POLARFIRE_SOC_MAILBOX is not set
+CONFIG_SUN6I_MSGBOX=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+# CONFIG_IOMMUFD is not set
+# CONFIG_SUN50I_IOMMU is not set
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=y
+CONFIG_RPMSG_CHAR=y
+# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_NS=y
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=y
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+# CONFIG_WPCM450_SOC is not set
+
+#
+# Qualcomm SoC drivers
+#
+# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
+# CONFIG_QCOM_PMIC_GLINK is not set
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_RENESAS=y
+CONFIG_SUNXI_SRAM=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+#
+# PM Domains
+#
+
+#
+# Amlogic PM Domains
+#
+# end of Amlogic PM Domains
+
+#
+# Broadcom PM Domains
+#
+# end of Broadcom PM Domains
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+
+#
+# Qualcomm PM Domains
+#
+# end of Qualcomm PM Domains
+
+CONFIG_JH71XX_PMU=y
+# CONFIG_SUN20I_PPU is not set
+# end of PM Domains
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+
+#
+# DEVFREQ Drivers
+#
+# CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PTN5150 is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USB_GPIO is not set
+# CONFIG_EXTCON_USBC_TUSB320 is not set
+# CONFIG_MEMORY is not set
+CONFIG_IIO=y
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=y
+CONFIG_IIO_GTS_HELPER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=y
+# CONFIG_IIO_SW_TRIGGER is not set
+# CONFIG_IIO_TRIGGERED_EVENT is not set
+CONFIG_IIO_BACKEND=m
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL313_I2C is not set
+# CONFIG_ADXL313_SPI is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL355_I2C is not set
+# CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMA400 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_KX022A_SPI is not set
+# CONFIG_IIO_KX022A_I2C is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MSA311 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4130 is not set
+# CONFIG_AD7091R5 is not set
+# CONFIG_AD7091R8 is not set
+# CONFIG_AD7124 is not set
+CONFIG_AD7173=m
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7292 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+CONFIG_AD7944=m
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+CONFIG_AD9467=m
+# CONFIG_ADI_AXI_ADC is not set
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2309 is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2496 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX11205 is not set
+# CONFIG_MAX11410 is not set
+# CONFIG_MAX1241 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX34408 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3564 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+CONFIG_PAC1934=m
+# CONFIG_RICHTEK_RTQ6056 is not set
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_SUN20I_GPADC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7924 is not set
+# CONFIG_TI_ADS1100 is not set
+CONFIG_TI_ADS1298=m
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_ADS131E08 is not set
+# CONFIG_TI_LMP92064 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+# CONFIG_VF610_ADC is not set
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+# CONFIG_AD74115 is not set
+# CONFIG_AD74413R is not set
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
+# CONFIG_HMC425 is not set
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+# CONFIG_AOSONG_AGS02MA is not set
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_ATLAS_EZO_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_SCD30_CORE is not set
+# CONFIG_SCD4X is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+# CONFIG_SPS30_I2C is not set
+# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+#
+# Hid Sensor IIO Common
+#
+# end of Hid Sensor IIO Common
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD3552R is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+CONFIG_AD9739A=m
+CONFIG_ADI_AXI_DAC=m
+# CONFIG_LTC2688 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
+# CONFIG_AD5770R is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7293 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5522 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
+# CONFIG_MCP4821 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
+
+#
+# Filters
+#
+# CONFIG_ADMV8818 is not set
+# end of Filters
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# CONFIG_ADF4377 is not set
+CONFIG_ADMFM2000=m
+# CONFIG_ADMV1013 is not set
+# CONFIG_ADMV1014 is not set
+# CONFIG_ADMV4420 is not set
+# CONFIG_ADRF6780 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS290 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
+# CONFIG_HDC3020 is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_BMI323_I2C is not set
+# CONFIG_BMI323_SPI is not set
+# CONFIG_BOSCH_BNO055_I2C is not set
+# CONFIG_FXOS8700_I2C is not set
+# CONFIG_FXOS8700_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_ICM42600_I2C is not set
+# CONFIG_INV_ICM42600_SPI is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADUX1020 is not set
+# CONFIG_AL3010 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+CONFIG_APDS9306=m
+# CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP002 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_ISL76682 is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_ROHM_BU27008 is not set
+# CONFIG_ROHM_BU27034 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR390 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LTRF216A is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_NOA1305 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_OPT4001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2591 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6030 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VEML6075 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AF8133J=m
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_TI_TMAG5273 is not set
+# CONFIG_YAMAHA_YAS530 is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5110 is not set
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5432 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# CONFIG_X9250 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_ROHM_BM1390 is not set
+# CONFIG_BMP280 is not set
+# CONFIG_DLHL60D is not set
+# CONFIG_DPS310 is not set
+# CONFIG_HP03 is not set
+# CONFIG_HSC030PA is not set
+# CONFIG_ICP10100 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MPRLS0025PA is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_IRSD200 is not set
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_PING is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VCNL3020 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_LTC2983 is not set
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_MLX90635 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX30208 is not set
+# CONFIG_MAX31856 is not set
+# CONFIG_MAX31865 is not set
+# CONFIG_MCP9600 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+CONFIG_PWM=y
+# CONFIG_PWM_DEBUG is not set
+# CONFIG_PWM_ATMEL_TCB is not set
+# CONFIG_PWM_CLK is not set
+# CONFIG_PWM_DWC is not set
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_MICROCHIP_CORE is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_RCAR is not set
+# CONFIG_PWM_RENESAS_TPU is not set
+# CONFIG_PWM_SIFIVE is not set
+# CONFIG_PWM_SUN4I is not set
+# CONFIG_PWM_XILINX is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+# CONFIG_AL_FIC is not set
+# CONFIG_XILINX_INTC is not set
+CONFIG_RISCV_INTC=y
+CONFIG_RISCV_APLIC=y
+CONFIG_RISCV_APLIC_MSI=y
+CONFIG_RISCV_IMSIC=y
+CONFIG_RISCV_IMSIC_PCI=y
+CONFIG_SIFIVE_PLIC=y
+CONFIG_STARFIVE_JH8100_INTC=y
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_GPIO=m
+CONFIG_RESET_POLARFIRE_SOC=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
+# CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESET_TI_TPS380X is not set
+CONFIG_RESET_STARFIVE_JH71X0=y
+CONFIG_RESET_STARFIVE_JH7100=y
+CONFIG_RESET_STARFIVE_JH7110=y
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+# CONFIG_PHY_CAN_TRANSCEIVER is not set
+CONFIG_PHY_SUN4I_USB=y
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+CONFIG_PHY_SUN9I_USB=y
+CONFIG_PHY_SUN50I_USB3=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# end of PHY drivers for Broadcom platforms
+
+CONFIG_PHY_CADENCE_TORRENT=m
+CONFIG_PHY_CADENCE_DPHY=m
+CONFIG_PHY_CADENCE_DPHY_RX=m
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_CADENCE_SALVO=y
+CONFIG_PHY_PXA_28NM_HSIC=y
+CONFIG_PHY_PXA_28NM_USB2=y
+CONFIG_PHY_LAN966X_SERDES=m
+CONFIG_PHY_CPCAP_USB=y
+CONFIG_PHY_MAPPHONE_MDM6600=y
+CONFIG_PHY_OCELOT_SERDES=y
+# CONFIG_PHY_QCOM_USB_HS is not set
+# CONFIG_PHY_QCOM_USB_HSIC is not set
+# CONFIG_PHY_R8A779F0_ETHERNET_SERDES is not set
+# CONFIG_PHY_RCAR_GEN2 is not set
+# CONFIG_PHY_RCAR_GEN3_PCIE is not set
+# CONFIG_PHY_RCAR_GEN3_USB2 is not set
+# CONFIG_PHY_RCAR_GEN3_USB3 is not set
+CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y
+CONFIG_PHY_STARFIVE_JH7110_PCIE=y
+CONFIG_PHY_STARFIVE_JH7110_USB=y
+# CONFIG_PHY_TUSB1210 is not set
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_RISCV_PMU=y
+CONFIG_RISCV_PMU_LEGACY=y
+CONFIG_RISCV_PMU_SBI=y
+CONFIG_STARFIVE_STARLINK_PMU=y
+CONFIG_ANDES_CUSTOM_PMU=y
+# CONFIG_DWC_PCIE_PMU is not set
+# end of Performance monitor support
+
+# CONFIG_RAS is not set
+# CONFIG_USB4 is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID_BINDER_IPC is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=m
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_OF_PMEM=m
+CONFIG_DAX=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_LAYOUTS=y
+
+#
+# Layout Types
+#
+# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
+# CONFIG_NVMEM_RMEM is not set
+# CONFIG_NVMEM_SUNXI_SID is not set
+# CONFIG_NVMEM_U_BOOT_ENV is not set
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# CONFIG_MOST is not set
+# CONFIG_PECI is not set
+CONFIG_HTE=y
+# end of Device Drivers
+
+#
+# File systems
+#
+# CONFIG_VALIDATE_FS_PARSER is not set
+CONFIG_FS_IOMAP=y
+CONFIG_FS_STACK=y
+CONFIG_BUFFER_HEAD=y
+CONFIG_LEGACY_DIRECT_IO=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_F2FS_FS is not set
+CONFIG_BCACHEFS_FS=m
+# CONFIG_BCACHEFS_QUOTA is not set
+# CONFIG_BCACHEFS_ERASURE_CODING is not set
+# CONFIG_BCACHEFS_POSIX_ACL is not set
+# CONFIG_BCACHEFS_DEBUG is not set
+# CONFIG_BCACHEFS_TESTS is not set
+# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
+# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
+CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=y
+# CONFIG_CUSE is not set
+# CONFIG_VIRTIO_FS is not set
+CONFIG_FUSE_PASSTHROUGH=y
+CONFIG_OVERLAY_FS=y
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+# CONFIG_OVERLAY_FS_DEBUG is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=y
+# CONFIG_NETFS_STATS is not set
+# CONFIG_FSCACHE is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+# CONFIG_NTFS3_FS is not set
+# CONFIG_NTFS_FS is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
+# CONFIG_TMPFS_QUOTA is not set
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
+CONFIG_HUGETLBFS=y
+# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+# CONFIG_UBIFS_FS_AUTHENTICATION is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_EROFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_ROOT_NFS=y
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_SMB_SERVER is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=y
+# CONFIG_9P_FS_POSIX_ACL is not set
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=m
+# CONFIG_NLS_CODEPAGE_949 is not set
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+# CONFIG_UNICODE is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_TRUSTED_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+# CONFIG_HARDENED_USERCOPY is not set
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
+CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_LANDLOCK is not set
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+# CONFIG_ZERO_CALL_USED_REGS is not set
+# end of Memory initialization
+
+#
+# Hardening of kernel data structures
+#
+# CONFIG_LIST_HARDENED is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# end of Hardening of kernel data structures
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
+CONFIG_CRYPTO_SIG2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+# end of Crypto core or helper
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
+CONFIG_CRYPTO_ECC=y
+CONFIG_CRYPTO_ECDH=y
+# CONFIG_CRYPTO_ECDSA is not set
+# CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
+CONFIG_CRYPTO_CURVE25519=y
+# end of Public-key cryptography
+
+#
+# Block ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARIA is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_SM4_GENERIC is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+# CONFIG_CRYPTO_ADIANTUM is not set
+# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_CHACHA20=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=y
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_HCTR2 is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_XTS=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_GENIV=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=y
+# CONFIG_CRYPTO_ESSIV is not set
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLY1305=y
+# CONFIG_CRYPTO_RMD160 is not set
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=y
+# CONFIG_CRYPTO_SM3_GENERIC is not set
+# CONFIG_CRYPTO_STREEBOG is not set
+# CONFIG_CRYPTO_VMAC is not set
+CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_XXHASH=y
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRCT10DIF=y
+# CONFIG_CRYPTO_CRC64_ROCKSOFT is not set
+# end of CRCs (cyclic redundancy checks)
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
+CONFIG_CRYPTO_ZSTD=y
+# end of Compression
+
+#
+# Random number generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
+# end of Random number generation
+
+#
+# Userspace interface
+#
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
+CONFIG_CRYPTO_USER_API_RNG=y
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=y
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# end of Userspace interface
+
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (riscv)
+#
+# end of Accelerated Cryptographic Algorithms for CPU (riscv)
+
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_ALLWINNER=y
+# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE is not set
+# CONFIG_CRYPTO_DEV_SUN8I_SS is not set
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_420XX is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_VIRTIO is not set
+# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+# CONFIG_CRYPTO_DEV_CCREE is not set
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+# CONFIG_PACKING is not set
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+# CONFIG_CORDIC is not set
+# CONFIG_PRIME_NUMBERS is not set
+CONFIG_RATIONAL=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA=y
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
+CONFIG_CRYPTO_LIB_CURVE25519=y
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
+CONFIG_CRYPTO_LIB_POLY1305=y
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+# CONFIG_CRC64_ROCKSOFT is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+# CONFIG_XZ_DEC_MICROLZMA is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_CLOSURES=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_DMA_DEFAULT_COHERENT=y
+CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
+CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
+CONFIG_DMA_NEED_SYNC=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
+CONFIG_DMA_NONCOHERENT_MMAP=y
+CONFIG_DMA_COHERENT_POOL=y
+CONFIG_DMA_DIRECT_REMAP=y
+CONFIG_DMA_CMA=y
+# CONFIG_DMA_NUMA_CMA is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=32
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_CLZ_TAB=y
+# CONFIG_IRQ_POLL is not set
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_STACKDEPOT_MAX_FRAMES=64
+CONFIG_SBITMAP=y
+# CONFIG_LWQ_TEST is not set
+# end of Library routines
+
+CONFIG_GENERIC_IOREMAP=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_POLYNOMIAL=m
+CONFIG_FIRMWARE_TABLE=y
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+# end of printk and dmesg options
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_AS_HAS_NON_CONST_ULEB128=y
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+CONFIG_FRAME_WARN=2048
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_KCSAN_COMPILER=y
+# end of Generic Kernel Debugging Instruments
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_CODE_TAGGING=y
+CONFIG_MEM_ALLOC_PROFILING=y
+CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT=y
+# CONFIG_MEM_ALLOC_PROFILING_DEBUG is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CLOSURES is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
+# end of Debug kernel data structures
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_RETHOOK=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_SYNTH_EVENTS is not set
+# CONFIG_USER_EVENTS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_RV is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
+# CONFIG_STRICT_DEVMEM is not set
+
+#
+# riscv Debugging
+#
+
+#
+# arch/riscv/kernel Testing and Coverage
+#
+CONFIG_RUNTIME_KERNEL_TESTING_MENU=y
+# end of arch/riscv/kernel Testing and Coverage
+# end of riscv Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_SCANF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_MAPLE_TREE is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_TEST_FPU=m
+# CONFIG_TEST_OBJPOOL is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/6.8-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.10-x86_64.conf
index 8acacdb5b4..eaee6d7999 100644
--- a/gnu/packages/aux-files/linux-libre/6.8-x86_64.conf
+++ b/gnu/packages/aux-files/linux-libre/6.10-x86_64.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.1 Kernel Configuration
+# Linux/x86 6.10.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
CONFIG_CC_IS_GCC=y
@@ -19,7 +19,7 @@ CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=126
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -88,6 +88,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y
CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
@@ -156,6 +157,7 @@ CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
@@ -187,6 +189,7 @@ CONFIG_CC_NO_STRINGOP_OVERFLOW=y
CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_SLAB_OBJ_EXT=y
CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y
# CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -254,7 +257,7 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
+# CONFIG_BASE_SMALL is not set
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
@@ -294,7 +297,8 @@ CONFIG_TRACEPOINTS=y
#
# Kexec and crash features
#
-CONFIG_CRASH_CORE=y
+CONFIG_CRASH_RESERVE=y
+CONFIG_VMCORE_INFO=y
CONFIG_KEXEC_CORE=y
CONFIG_HAVE_IMA_KEXEC=y
CONFIG_KEXEC=y
@@ -341,9 +345,10 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
#
CONFIG_SMP=y
CONFIG_X86_X2APIC=y
+# CONFIG_X86_POSTED_MSI is not set
CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
# CONFIG_X86_CPU_RESCTRL is not set
+# CONFIG_X86_FRED is not set
CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_NUMACHIP=y
# CONFIG_X86_VSMP is not set
@@ -525,6 +530,8 @@ CONFIG_HAVE_LIVEPATCH=y
CONFIG_LIVEPATCH=y
# end of Processor type and features
+CONFIG_CC_HAS_NAMED_AS=y
+CONFIG_USE_X86_SEG_SUPPORT=y
CONFIG_CC_HAS_SLS=y
CONFIG_CC_HAS_RETURN_THUNK=y
CONFIG_CC_HAS_ENTRY_PADDING=y
@@ -534,19 +541,20 @@ CONFIG_CALL_PADDING=y
CONFIG_HAVE_CALL_THUNKS=y
CONFIG_CALL_THUNKS=y
CONFIG_PREFIX_SYMBOLS=y
-CONFIG_SPECULATION_MITIGATIONS=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_RETPOLINE=y
-CONFIG_RETHUNK=y
-CONFIG_CPU_UNRET_ENTRY=y
-CONFIG_CALL_DEPTH_TRACKING=y
+CONFIG_CPU_MITIGATIONS=y
+CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
+CONFIG_MITIGATION_RETPOLINE=y
+CONFIG_MITIGATION_RETHUNK=y
+CONFIG_MITIGATION_UNRET_ENTRY=y
+CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
# CONFIG_CALL_THUNKS_DEBUG is not set
-CONFIG_CPU_IBPB_ENTRY=y
-CONFIG_CPU_IBRS_ENTRY=y
-CONFIG_CPU_SRSO=y
-CONFIG_SLS=y
-# CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_IBPB_ENTRY=y
+CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_SRSO=y
+# CONFIG_MITIGATION_SLS is not set
+# CONFIG_MITIGATION_GDS_FORCE is not set
CONFIG_MITIGATION_RFDS=y
+CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -559,6 +567,9 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_HIBERNATION_COMP_LZO=y
+# CONFIG_HIBERNATION_COMP_LZ4 is not set
+CONFIG_HIBERNATION_DEF_COMP="lzo"
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
@@ -619,9 +630,9 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_BGRT=y
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NHLT=y
CONFIG_ACPI_NFIT=m
# CONFIG_NFIT_SECURITY_DEBUG is not set
CONFIG_ACPI_NUMA=y
@@ -633,6 +644,7 @@ CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_EINJ_CXL=y
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
CONFIG_ACPI_DPTF=y
CONFIG_DPTF_POWER=m
@@ -727,7 +739,6 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
# end of Binary Emulations
-CONFIG_HAVE_KVM=y
CONFIG_KVM_COMMON=y
CONFIG_HAVE_KVM_PFNCACHE=y
CONFIG_HAVE_KVM_IRQCHIP=y
@@ -738,6 +749,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_READONLY_MEM=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_KVM_VFIO=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
@@ -753,6 +765,7 @@ CONFIG_KVM=m
CONFIG_KVM_WERROR=y
# CONFIG_KVM_SW_PROTECTED_VM is not set
CONFIG_KVM_INTEL=m
+# CONFIG_KVM_INTEL_PROVE_VE is not set
CONFIG_X86_SGX_KVM=y
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
@@ -767,7 +780,10 @@ CONFIG_AS_SHA1_NI=y
CONFIG_AS_SHA256_NI=y
CONFIG_AS_TPAUSE=y
CONFIG_AS_GFNI=y
+CONFIG_AS_VAES=y
+CONFIG_AS_VPCLMULQDQ=y
CONFIG_AS_WRUSS=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
#
# General architecture-dependent options
@@ -876,8 +892,11 @@ CONFIG_ARCH_MMAP_RND_BITS=28
CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
CONFIG_HAVE_OBJTOOL=y
CONFIG_HAVE_JUMP_LABEL_HACK=y
CONFIG_HAVE_NOINSTR_HACK=y
@@ -916,6 +935,7 @@ CONFIG_DYNAMIC_SIGFRAME=y
CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y
CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
#
# GCOV-based kernel profiling
@@ -933,7 +953,6 @@ CONFIG_FUNCTION_ALIGNMENT=16
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
# CONFIG_MODULE_DEBUG is not set
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -966,7 +985,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
CONFIG_BLK_DEV_WRITE_MOUNTED=y
CONFIG_BLK_DEV_ZONED=y
CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
# CONFIG_BLK_CGROUP_IOLATENCY is not set
@@ -974,7 +992,6 @@ CONFIG_BLK_CGROUP_FC_APPID=y
CONFIG_BLK_CGROUP_IOCOST=y
CONFIG_BLK_CGROUP_IOPRIO=y
CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_DEBUG_FS_ZONED=y
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_INLINE_ENCRYPTION=y
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
@@ -1056,7 +1073,6 @@ CONFIG_ZPOOL=y
CONFIG_SWAP=y
CONFIG_ZSWAP=y
# CONFIG_ZSWAP_DEFAULT_ON is not set
-# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set
# CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
@@ -1096,7 +1112,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
CONFIG_NUMA_KEEP_MEMINFO=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -1136,12 +1152,12 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
CONFIG_THP_SWAP=y
# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_SYSFS=y
CONFIG_CMA_AREAS=7
@@ -1184,6 +1200,7 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
CONFIG_IOMMU_MM_DATA=y
+CONFIG_EXECMEM=y
#
# Data Access Monitoring
@@ -1192,7 +1209,7 @@ CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
-# CONFIG_DAMON_DBGFS is not set
+# CONFIG_DAMON_DBGFS_DEPRECATED is not set
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
@@ -1213,7 +1230,6 @@ CONFIG_SKB_EXTENSIONS=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
@@ -1595,6 +1611,7 @@ CONFIG_IP_VS_PE_SIP=m
# IP: Netfilter Configuration
#
CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TABLES_IPV4=y
@@ -1627,6 +1644,7 @@ CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_SECURITY=m
CONFIG_IP_NF_ARPTABLES=m
+CONFIG_NFT_COMPAT_ARP=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
# end of IP: Netfilter Configuration
@@ -1634,6 +1652,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NF_TABLES_IPV6=y
@@ -1671,6 +1690,7 @@ CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1867,7 +1887,6 @@ CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
@@ -1983,7 +2002,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_6LOWPAN=m
@@ -2038,6 +2056,7 @@ CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
CONFIG_BT_VIRTIO=m
CONFIG_BT_NXPUART=m
+CONFIG_BT_INTEL_PCIE=m
# end of Bluetooth device drivers
CONFIG_AF_RXRPC=m
@@ -2154,6 +2173,7 @@ CONFIG_LWTUNNEL=y
CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
+CONFIG_NET_IEEE8021Q_HELPERS=y
CONFIG_NET_SELFTESTS=y
CONFIG_NET_SOCK_MSG=y
CONFIG_NET_DEVLINK=y
@@ -2168,6 +2188,7 @@ CONFIG_ETHTOOL_NETLINK=y
CONFIG_HAVE_EISA=y
# CONFIG_EISA is not set
CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
@@ -2262,7 +2283,6 @@ CONFIG_CXL_PORT=m
CONFIG_CXL_SUSPEND=y
CONFIG_CXL_REGION=y
# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
-CONFIG_CXL_PMU=m
CONFIG_PCCARD=m
CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
@@ -2515,7 +2535,6 @@ CONFIG_MTD_L440GX=m
CONFIG_MTD_PCI=m
CONFIG_MTD_PCMCIA=m
# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
# end of Mapping drivers for chip access
@@ -2609,6 +2628,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_GLUEBI=m
CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_NVMEM is not set
CONFIG_MTD_HYPERBUS=m
# CONFIG_OF is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -3099,6 +3119,7 @@ CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_DM_ZONED=m
CONFIG_DM_AUDIT=y
+# CONFIG_DM_VDO is not set
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -3156,6 +3177,7 @@ CONFIG_VXLAN=m
CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m
+CONFIG_PFCP=m
CONFIG_AMT=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
@@ -3253,10 +3275,6 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_REALTEK=m
-# CONFIG_NET_DSA_REALTEK_MDIO is not set
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-CONFIG_NET_DSA_REALTEK_RTL8365MB=m
-CONFIG_NET_DSA_REALTEK_RTL8366RB=m
CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@@ -3391,6 +3409,8 @@ CONFIG_NET_VENDOR_HUAWEI=y
CONFIG_HINIC=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_NET_VENDOR_INTEL=y
+CONFIG_LIBETH=m
+CONFIG_LIBIE=m
CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
@@ -3416,6 +3436,7 @@ CONFIG_ICE_SWITCHDEV=y
CONFIG_ICE_HWTS=y
CONFIG_FM10K=m
CONFIG_IGC=m
+CONFIG_IGC_LEDS=y
CONFIG_IDPF=y
CONFIG_JME=m
CONFIG_NET_VENDOR_ADI=y
@@ -3429,6 +3450,7 @@ CONFIG_SKGE_GENESIS=y
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
CONFIG_OCTEON_EP=m
+# CONFIG_OCTEON_EP_VF is not set
CONFIG_PRESTERA=m
CONFIG_PRESTERA_PCI=m
CONFIG_NET_VENDOR_MELLANOX=y
@@ -3616,7 +3638,6 @@ CONFIG_FDDI=y
CONFIG_DEFXX=m
CONFIG_SKFP=m
# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
CONFIG_PHYLINK=m
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
@@ -3627,6 +3648,7 @@ CONFIG_SFP=m
#
# MII PHY device drivers
#
+CONFIG_AIR_EN8811H_PHY=m
CONFIG_AMD_PHY=m
CONFIG_ADIN_PHY=m
CONFIG_ADIN1100_PHY=m
@@ -3663,7 +3685,10 @@ CONFIG_NXP_CBTX_PHY=m
CONFIG_NXP_C45_TJA11XX_PHY=m
CONFIG_NXP_TJA11XX_PHY=m
CONFIG_NCN26000_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
CONFIG_AT803X_PHY=m
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
CONFIG_QSEMI_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_RENESAS_PHY=m
@@ -3683,6 +3708,8 @@ CONFIG_XILINX_GMII2RGMII=m
CONFIG_MICREL_KS8995MA=m
CONFIG_PSE_CONTROLLER=y
CONFIG_PSE_REGULATOR=m
+CONFIG_PSE_PD692X0=m
+CONFIG_PSE_TPS23881=m
CONFIG_CAN_DEV=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
@@ -3697,10 +3724,10 @@ CONFIG_CAN_C_CAN=m
CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_C_CAN_PCI=m
CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
CONFIG_CAN_CC770_PLATFORM=m
CONFIG_CAN_CTUCANFD=m
CONFIG_CAN_CTUCANFD_PCI=m
+# CONFIG_CAN_ESD_402_PCI is not set
CONFIG_CAN_IFI_CANFD=m
CONFIG_CAN_M_CAN=m
CONFIG_CAN_M_CAN_PCI=m
@@ -3716,7 +3743,6 @@ CONFIG_CAN_PEAK_PCI=m
CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCMCIA=m
CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_SJA1000_ISA=m
CONFIG_CAN_SJA1000_PLATFORM=m
CONFIG_CAN_SOFTING=m
CONFIG_CAN_SOFTING_CS=m
@@ -3913,6 +3939,7 @@ CONFIG_ATH11K_PCI=m
# CONFIG_ATH11K_TRACING is not set
CONFIG_ATH12K=m
# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_DEBUGFS is not set
# CONFIG_ATH12K_TRACING is not set
CONFIG_WLAN_VENDOR_ATMEL=y
CONFIG_AT76C50X_USB=m
@@ -4096,6 +4123,7 @@ CONFIG_RTLWIFI_PCI=m
CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8192D_COMMON=m
CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
@@ -4107,6 +4135,8 @@ CONFIG_RTW88_SDIO=m
CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723X=m
+CONFIG_RTW88_8703B=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
@@ -4117,6 +4147,7 @@ CONFIG_RTW88_8822CS=m
CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
CONFIG_RTW88_8723DS=m
+CONFIG_RTW88_8723CS=m
CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
CONFIG_RTW88_8821CS=m
@@ -4130,10 +4161,12 @@ CONFIG_RTW89_8851B=m
CONFIG_RTW89_8852A=m
CONFIG_RTW89_8852B=m
CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8922A=m
CONFIG_RTW89_8851BE=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8922AE=m
# CONFIG_RTW89_DEBUGMSG is not set
# CONFIG_RTW89_DEBUGFS is not set
CONFIG_WLAN_VENDOR_RSI=y
@@ -4399,6 +4432,8 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
CONFIG_TOUCHSCREEN_EXC3000=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
CONFIG_TOUCHSCREEN_HIDEEP=m
CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
@@ -4587,7 +4622,6 @@ CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
@@ -4642,10 +4676,9 @@ CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_LANTIQ=m
CONFIG_SERIAL_SCCNXP=y
CONFIG_SERIAL_SCCNXP_CONSOLE=y
-CONFIG_SERIAL_SC16IS7XX_CORE=m
CONFIG_SERIAL_SC16IS7XX=m
-CONFIG_SERIAL_SC16IS7XX_I2C=y
-CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_SC16IS7XX_I2C=m
+CONFIG_SERIAL_SC16IS7XX_SPI=m
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
@@ -4712,6 +4745,7 @@ CONFIG_HPET_MMAP=y
CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=y
+CONFIG_TCG_TPM2_HMAC=y
CONFIG_HW_RANDOM_TPM=y
CONFIG_TCG_TIS_CORE=y
CONFIG_TCG_TIS=y
@@ -4780,6 +4814,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_I801=m
+CONFIG_I2C_I801_MUX=y
CONFIG_I2C_ISCH=m
CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
@@ -4792,6 +4827,7 @@ CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_ZHAOXIN=m
#
# ACPI drivers
@@ -4946,6 +4982,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m
CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_FC3W is not set
# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_VMW is not set
CONFIG_PTP_1588_CLOCK_OCP=m
@@ -5008,6 +5045,7 @@ CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
CONFIG_GPIO_REGMAP=m
+CONFIG_GPIO_SWNODE_UNDEFINED=y
CONFIG_GPIO_MAX730X=m
CONFIG_GPIO_IDIO_16=m
@@ -5018,6 +5056,7 @@ CONFIG_GPIO_AMDPT=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_GRANITERAPIDS=m
CONFIG_GPIO_ICH=m
CONFIG_GPIO_MB86S7X=m
CONFIG_GPIO_MENZ127=m
@@ -5057,6 +5096,7 @@ CONFIG_GPIO_TPIC2810=m
CONFIG_GPIO_ADP5520=m
CONFIG_GPIO_ARIZONA=m
CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_CROS_EC is not set
CONFIG_GPIO_CRYSTAL_COVE=m
CONFIG_GPIO_DA9052=m
CONFIG_GPIO_DA9055=m
@@ -5132,6 +5172,7 @@ CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_GPIO=m
CONFIG_W1_MASTER_SGI=m
+# CONFIG_W1_MASTER_UART is not set
# end of 1-wire Bus Masters
#
@@ -5276,6 +5317,7 @@ CONFIG_SENSORS_AHT10=m
CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
CONFIG_SENSORS_AS370=m
CONFIG_SENSORS_ASC7621=m
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
CONFIG_SENSORS_AXI_FAN_CONTROL=m
CONFIG_SENSORS_K8TEMP=m
CONFIG_SENSORS_K10TEMP=m
@@ -5283,6 +5325,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
CONFIG_SENSORS_APPLESMC=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_CHIPCAP2 is not set
CONFIG_SENSORS_CORSAIR_CPRO=m
CONFIG_SENSORS_CORSAIR_PSU=m
CONFIG_SENSORS_DRIVETEMP=y
@@ -5315,6 +5358,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_POWERZ=m
CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LENOVO_EC=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LTC2945=m
CONFIG_SENSORS_LTC2947=m
@@ -5329,6 +5373,7 @@ CONFIG_SENSORS_LTC4222=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4260=m
CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_LTC4282 is not set
CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX127=m
CONFIG_SENSORS_MAX16065=m
@@ -5379,6 +5424,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NZXT_KRAKEN2=m
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
CONFIG_SENSORS_NZXT_SMART2=m
CONFIG_SENSORS_OCC_P8_I2C=m
CONFIG_SENSORS_OCC=m
@@ -5389,6 +5435,7 @@ CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_ACBEL_FSG032=m
CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_ADP1050=m
CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BPA_RS600=m
CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
@@ -5425,6 +5472,7 @@ CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MP5990=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
CONFIG_SENSORS_MPQ7932=m
+# CONFIG_SENSORS_MPQ8785 is not set
CONFIG_SENSORS_PIM4328=m
CONFIG_SENSORS_PLI1209BC=m
CONFIG_SENSORS_PLI1209BC_REGULATOR=y
@@ -5439,10 +5487,13 @@ CONFIG_SENSORS_TPS53679=m
CONFIG_SENSORS_TPS546D24=m
CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDP710=m
CONFIG_SENSORS_XDPE152=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_XDPE122_REGULATOR=y
CONFIG_SENSORS_ZL6100=m
+# CONFIG_SENSORS_PT5161L is not set
+CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_SBTSI=m
CONFIG_SENSORS_SBRMI=m
CONFIG_SENSORS_SHT15=m
@@ -5464,6 +5515,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m
CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_STTS751=m
+# CONFIG_SENSORS_SURFACE_FAN is not set
CONFIG_SENSORS_ADC128D818=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_ADS7871=m
@@ -5515,7 +5567,6 @@ CONFIG_THERMAL_NETLINK=y
CONFIG_THERMAL_DEBUGFS=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -5570,10 +5621,12 @@ CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+# CONFIG_CROS_EC_WATCHDOG is not set
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
CONFIG_DA9062_WATCHDOG=m
+CONFIG_LENOVO_SE10_WDT=m
CONFIG_MENF21BMC_WATCHDOG=m
CONFIG_MENZ069_WATCHDOG=m
CONFIG_WDAT_WDT=m
@@ -6265,6 +6318,7 @@ CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_AV=m
CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_VIDEO_INTEL_IPU6=m
CONFIG_INTEL_VSC=m
CONFIG_IPU_BRIDGE=m
CONFIG_RADIO_ADAPTERS=m
@@ -6882,20 +6936,12 @@ CONFIG_DVB_DUMMY_FE=m
# Graphics support
#
CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_SCREEN_INFO=y
+CONFIG_VIDEO=y
CONFIG_AUXDISPLAY=y
CONFIG_CHARLCD=m
-CONFIG_LINEDISP=m
CONFIG_HD44780_COMMON=m
CONFIG_HD44780=m
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_IMG_ASCII_LCD=m
-CONFIG_HT16K33=m
CONFIG_LCD2S=m
CONFIG_PARPORT_PANEL=m
CONFIG_PANEL_PARPORT=0
@@ -6904,6 +6950,16 @@ CONFIG_PANEL_PROFILE=5
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_LINEDISP=m
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+# CONFIG_MAX6959 is not set
+# CONFIG_SEG_LED_GPIO is not set
CONFIG_PANEL=m
CONFIG_AGP=y
CONFIG_AGP_AMD64=y
@@ -6915,6 +6971,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_MIPI_DBI=m
CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=m
# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6923,11 +6980,12 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_CEC=y
+CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_DP_TUNNEL=y
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_TTM=m
CONFIG_DRM_EXEC=m
CONFIG_DRM_GPUVM=m
@@ -6990,6 +7048,7 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
CONFIG_DRM_I915_COMPRESS_ERROR=y
CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_I915_GVT_KVMGT=m
+CONFIG_DRM_I915_DP_TUNNEL=y
#
# drm/i915 Debugging
@@ -7069,6 +7128,7 @@ CONFIG_DRM_PANEL=y
# Display Panels
#
CONFIG_DRM_PANEL_AUO_A030JTN01=m
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -7107,8 +7167,9 @@ CONFIG_DRM_SSD130X=m
CONFIG_DRM_SSD130X_I2C=m
CONFIG_DRM_SSD130X_SPI=m
CONFIG_DRM_HYPERV=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_PRIVACY_SCREEN=y
+# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
# Frame buffer Devices
@@ -7236,6 +7297,7 @@ CONFIG_LCD_HX8357=m
CONFIG_LCD_OTM3225A=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_KTD253=m
+# CONFIG_BACKLIGHT_KTD2801 is not set
CONFIG_BACKLIGHT_KTZ8866=m
CONFIG_BACKLIGHT_LM3533=m
CONFIG_BACKLIGHT_PWM=m
@@ -7449,6 +7511,7 @@ CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CIRRUS_SCODEC=m
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_COMPONENT=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
CONFIG_SND_HDA_SCODEC_CS35L56=m
@@ -7551,7 +7614,11 @@ CONFIG_SND_AMD_ASOC_ACP70=m
CONFIG_SND_SOC_AMD_MACH_COMMON=m
CONFIG_SND_SOC_AMD_LEGACY_MACH=m
CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_AMD_SOUNDWIRE_ACPI=m
CONFIG_SND_SOC_AMD_RPL_ACP6x=m
+CONFIG_SND_SOC_AMD_ACP63_TOPLEVEL=m
+CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_AMD_SOUNDWIRE=m
CONFIG_SND_SOC_AMD_PS=m
CONFIG_SND_SOC_AMD_PS_MACH=m
CONFIG_SND_ATMEL_SOC=m
@@ -7638,7 +7705,6 @@ CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m
CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -7659,7 +7725,6 @@ CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -7700,6 +7765,8 @@ CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_ACP_PROBES=m
+CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_AMD_ACP63=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
@@ -7730,6 +7797,7 @@ CONFIG_SND_SOC_SOF_METEORLAKE=m
CONFIG_SND_SOC_SOF_INTEL_LNL=m
CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_GENERIC=m
CONFIG_SND_SOC_SOF_HDA_MLINK=m
CONFIG_SND_SOC_SOF_HDA_LINK=y
CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
@@ -7791,6 +7859,7 @@ CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
CONFIG_SND_SOC_CHV3_CODEC=m
CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS_AMP_LIB=m
CONFIG_SND_SOC_CS35L32=m
CONFIG_SND_SOC_CS35L33=m
CONFIG_SND_SOC_CS35L34=m
@@ -7850,7 +7919,6 @@ CONFIG_SND_SOC_HDAC_HDA=m
CONFIG_SND_SOC_HDA=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_IDT821034=m
-CONFIG_SND_SOC_INNO_RK3036=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98090=m
CONFIG_SND_SOC_MAX98357A=m
@@ -7887,8 +7955,8 @@ CONFIG_SND_SOC_PCM5102A=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_PCM6240=m
CONFIG_SND_SOC_PEB2466=m
-# CONFIG_SND_SOC_RK3328 is not set
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT274=m
@@ -7990,6 +8058,7 @@ CONFIG_SND_SOC_WCD_CLASSH=m
CONFIG_SND_SOC_WCD_MBHC=m
CONFIG_SND_SOC_WCD938X=m
CONFIG_SND_SOC_WCD938X_SDW=m
+# CONFIG_SND_SOC_WCD939X_SDW is not set
CONFIG_SND_SOC_WM5102=m
CONFIG_SND_SOC_WM8510=m
CONFIG_SND_SOC_WM8523=m
@@ -8184,6 +8253,7 @@ CONFIG_HID_UDRAW_PS3=m
CONFIG_HID_U2FZERO=m
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
@@ -8265,6 +8335,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
CONFIG_USB_MON=m
#
@@ -8646,6 +8717,7 @@ CONFIG_TYPEC_MUX_FSA4480=m
CONFIG_TYPEC_MUX_GPIO_SBU=m
CONFIG_TYPEC_MUX_PI3USB30532=m
CONFIG_TYPEC_MUX_INTEL_PMC=m
+# CONFIG_TYPEC_MUX_IT5205 is not set
CONFIG_TYPEC_MUX_NB7VPQ904M=m
CONFIG_TYPEC_MUX_PTN36502=m
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
@@ -8820,7 +8892,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_PANIC=y
CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m
#
@@ -8954,6 +9025,7 @@ CONFIG_RTC_DRV_RC5T583=m
CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_FM3130=m
CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8111=m
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_RX8025=m
CONFIG_RTC_DRV_EM3027=m
@@ -9095,7 +9167,6 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
CONFIG_UIO_MF624=m
CONFIG_UIO_HV_GENERIC=m
CONFIG_UIO_DFL=m
@@ -9119,10 +9190,11 @@ CONFIG_VFIO_PCI_IGD=y
CONFIG_MLX5_VFIO_PCI=m
CONFIG_PDS_VFIO_PCI=m
CONFIG_VIRTIO_VFIO_PCI=m
+CONFIG_QAT_VFIO_PCI=m
# end of VFIO support for PCI devices
CONFIG_VFIO_MDEV=m
-CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VMGENID=y
CONFIG_VBOXGUEST=m
@@ -9146,6 +9218,7 @@ CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VIRTIO_DEBUG=y
CONFIG_VDPA=m
# CONFIG_VDPA_SIM is not set
CONFIG_VDPA_USER=m
@@ -9310,7 +9383,6 @@ CONFIG_COMEDI_NI_TIO=m
CONFIG_COMEDI_NI_ROUTING=m
# CONFIG_COMEDI_TESTS is not set
CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
CONFIG_RTLLIB=m
CONFIG_RTLLIB_CRYPTO_CCMP=m
CONFIG_RTLLIB_CRYPTO_TKIP=m
@@ -9413,7 +9485,6 @@ CONFIG_MOST_NET=m
CONFIG_MOST_VIDEO=m
CONFIG_MOST_I2C=m
CONFIG_KS7010=m
-# CONFIG_PI433 is not set
CONFIG_FIELDBUS_DEV=m
CONFIG_VME_BUS=y
@@ -9427,6 +9498,7 @@ CONFIG_VME_TSI148=m
# VME Device Drivers
#
CONFIG_VME_USER=m
+# CONFIG_GOLDFISH is not set
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_ACPI=m
CONFIG_CHROMEOS_LAPTOP=m
@@ -9481,12 +9553,14 @@ CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
CONFIG_XIAOMI_WMI=m
CONFIG_GIGABYTE_WMI=m
CONFIG_YOGABOOK=m
+CONFIG_YT2_1380=m
CONFIG_ACERHDF=m
CONFIG_ACER_WIRELESS=m
CONFIG_ACER_WMI=m
CONFIG_AMD_PMF=m
# CONFIG_AMD_PMF_DEBUG is not set
CONFIG_AMD_PMC=m
+CONFIG_AMD_MP2_STB=y
CONFIG_AMD_HSMP=m
CONFIG_AMD_WBRF=y
CONFIG_ADV_SWBUTTON=m
@@ -9509,6 +9583,7 @@ CONFIG_DELL_SMBIOS=m
CONFIG_DELL_SMBIOS_WMI=y
CONFIG_DELL_SMBIOS_SMM=y
CONFIG_DELL_SMO8800=m
+CONFIG_DELL_UART_BACKLIGHT=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_PRIVACY=y
CONFIG_DELL_WMI_AIO=m
@@ -9583,9 +9658,12 @@ CONFIG_INTEL_SMARTCONNECT=m
CONFIG_INTEL_TPMI=m
# CONFIG_INTEL_TURBO_MAX_3 is not set
CONFIG_INTEL_VSEC=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_MEEGOPAD_ANX7428=m
CONFIG_MSI_EC=m
CONFIG_MSI_LAPTOP=m
CONFIG_MSI_WMI=m
+CONFIG_MSI_WMI_PLATFORM=m
CONFIG_PCENGINES_APU2=m
CONFIG_BARCO_P50_GPIO=m
CONFIG_SAMSUNG_LAPTOP=m
@@ -9606,6 +9684,7 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m
# CONFIG_MLX_PLATFORM is not set
# CONFIG_TOUCHSCREEN_DMI is not set
CONFIG_INSPUR_PLATFORM_PROFILE=m
+CONFIG_LENOVO_WMI_CAMERA=m
CONFIG_FW_ATTR_CLASS=m
CONFIG_INTEL_IPS=m
CONFIG_INTEL_SCU_IPC=y
@@ -9669,6 +9748,7 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
CONFIG_IOMMU_DMA=y
CONFIG_IOMMU_SVA=y
+CONFIG_IOMMU_IOPF=y
CONFIG_AMD_IOMMU=y
CONFIG_DMAR_TABLE=y
CONFIG_INTEL_IOMMU=y
@@ -9752,6 +9832,7 @@ CONFIG_WPCM450_SOC=m
#
CONFIG_QCOM_PMIC_PDCHARGER_ULOG=m
CONFIG_QCOM_QMI_HELPERS=m
+# CONFIG_QCOM_PBS is not set
# end of Qualcomm SoC drivers
CONFIG_SOC_TI=y
@@ -9843,6 +9924,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_SW_DEVICE=m
CONFIG_IIO_SW_TRIGGER=m
CONFIG_IIO_TRIGGERED_EVENT=m
+CONFIG_IIO_BACKEND=m
#
# Accelerometers
@@ -9869,6 +9951,7 @@ CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL_SPI=m
CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_I2C=m
CONFIG_BMI088_ACCEL_SPI=m
CONFIG_DA280=m
CONFIG_DA311=m
@@ -9917,6 +10000,7 @@ CONFIG_AD7091R=m
CONFIG_AD7091R5=m
CONFIG_AD7091R8=m
CONFIG_AD7124=m
+CONFIG_AD7173=m
CONFIG_AD7192=m
CONFIG_AD7266=m
CONFIG_AD7280=m
@@ -9934,8 +10018,11 @@ CONFIG_AD7791=m
CONFIG_AD7793=m
CONFIG_AD7887=m
CONFIG_AD7923=m
+CONFIG_AD7944=m
CONFIG_AD7949=m
CONFIG_AD799X=m
+# CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_AXP20X_ADC=m
CONFIG_AXP288_ADC=m
CONFIG_CC10001_ADC=m
@@ -9971,6 +10058,7 @@ CONFIG_MEDIATEK_MT6370_ADC=m
CONFIG_MEN_Z188_ADC=m
CONFIG_MP2629_ADC=m
CONFIG_NAU7802=m
+# CONFIG_PAC1934 is not set
CONFIG_PALMAS_GPADC=m
CONFIG_QCOM_VADC_COMMON=m
CONFIG_QCOM_SPMI_IADC=m
@@ -9988,6 +10076,7 @@ CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m
CONFIG_TI_ADS7924=m
CONFIG_TI_ADS1100=m
+# CONFIG_TI_ADS1298 is not set
CONFIG_TI_ADS7950=m
CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
@@ -10101,6 +10190,8 @@ CONFIG_AD5592R=m
CONFIG_AD5593R=m
CONFIG_AD5504=m
CONFIG_AD5624R_SPI=m
+CONFIG_AD9739A=m
+CONFIG_ADI_AXI_DAC=m
CONFIG_LTC2688=m
CONFIG_AD5686=m
CONFIG_AD5686_SPI=m
@@ -10164,6 +10255,7 @@ CONFIG_AD9523=m
CONFIG_ADF4350=m
CONFIG_ADF4371=m
CONFIG_ADF4377=m
+# CONFIG_ADMFM2000 is not set
CONFIG_ADMV1013=m
CONFIG_ADMV1014=m
CONFIG_ADMV4420=m
@@ -10273,6 +10365,7 @@ CONFIG_ADUX1020=m
CONFIG_AL3010=m
CONFIG_AL3320A=m
CONFIG_APDS9300=m
+CONFIG_APDS9306=m
CONFIG_APDS9960=m
CONFIG_AS73211=m
CONFIG_BH1750=m
@@ -10429,6 +10522,8 @@ CONFIG_MPL115_I2C=m
CONFIG_MPL115_SPI=m
CONFIG_MPL3115=m
CONFIG_MPRLS0025PA=m
+CONFIG_MPRLS0025PA_I2C=m
+CONFIG_MPRLS0025PA_SPI=m
CONFIG_MS5611=m
CONFIG_MS5611_I2C=m
CONFIG_MS5611_SPI=m
@@ -10512,7 +10607,6 @@ CONFIG_NTB_PERF=m
CONFIG_NTB_MSI_TEST=m
CONFIG_NTB_TRANSPORT=m
CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
# CONFIG_PWM_DEBUG is not set
CONFIG_PWM_CLK=m
CONFIG_PWM_CRC=y
@@ -10538,6 +10632,7 @@ CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_GPIO is not set
CONFIG_RESET_SIMPLE=y
CONFIG_RESET_TI_SYSCON=m
CONFIG_RESET_TI_TPS380X=m
@@ -10579,10 +10674,13 @@ CONFIG_MCB_LPC=m
# Performance monitor support
#
CONFIG_DWC_PCIE_PMU=m
+CONFIG_CXL_PMU=m
# end of Performance monitor support
CONFIG_RAS=y
# CONFIG_RAS_CEC is not set
+CONFIG_AMD_ATL=m
+CONFIG_RAS_FMPM=m
CONFIG_USB4=m
# CONFIG_USB4_DEBUGFS_WRITE is not set
# CONFIG_USB4_DMA_TEST is not set
@@ -10644,6 +10742,8 @@ CONFIG_FPGA=m
CONFIG_ALTERA_PR_IP_CORE=m
CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_CORE=m
+CONFIG_FPGA_MGR_XILINX_SELECTMAP=m
CONFIG_FPGA_MGR_XILINX_SPI=m
CONFIG_FPGA_MGR_MACHXO2_SPI=m
CONFIG_FPGA_BRIDGE=m
@@ -10795,6 +10895,7 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_VIRTIO_FS=m
CONFIG_FUSE_DAX=y
+CONFIG_FUSE_PASSTHROUGH=y
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
@@ -10837,13 +10938,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FAT_DEFAULT_UTF8 is not set
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
CONFIG_NTFS3_LZX_XPRESS=y
# CONFIG_NTFS3_FS_POSIX_ACL is not set
+CONFIG_NTFS_FS=m
# end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -11104,6 +11203,7 @@ CONFIG_KEYS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_TRUSTED_KEYS=y
+CONFIG_HAVE_TRUSTED_KEYS=y
CONFIG_TRUSTED_KEYS_TPM=y
CONFIG_ENCRYPTED_KEYS=y
# CONFIG_USER_DECRYPTED_DATA is not set
@@ -11242,6 +11342,7 @@ CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
CONFIG_CRYPTO_SIG2=y
CONFIG_CRYPTO_SKCIPHER=y
CONFIG_CRYPTO_SKCIPHER2=y
@@ -11275,8 +11376,8 @@ CONFIG_CRYPTO_ENGINE=m
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_DH=y
CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECC=y
+CONFIG_CRYPTO_ECDH=y
CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
@@ -11412,7 +11513,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-# CONFIG_CRYPTO_STATS is not set
# end of Userspace interface
CONFIG_CRYPTO_HASH_INFO=y
@@ -11481,6 +11581,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
CONFIG_CRYPTO_DEV_IAA_CRYPTO=m
# CONFIG_CRYPTO_DEV_IAA_CRYPTO_STATS is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
@@ -11523,7 +11624,6 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -11534,6 +11634,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
#
CONFIG_CRYPTO_LIB_UTILS=y
CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_AESCFB=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_GF128MUL=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
@@ -11628,6 +11729,7 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_SWIOTLB=y
# CONFIG_SWIOTLB_DYNAMIC is not set
+CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_CMA=y
# CONFIG_DMA_NUMA_CMA is not set
@@ -11645,7 +11747,6 @@ CONFIG_CMA_ALIGNMENT=8
CONFIG_SGL_ALLOC=y
CONFIG_IOMMU_HELPER=y
CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_GLOB=y
@@ -11662,6 +11763,7 @@ CONFIG_UCS2_STRING=y
CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
CONFIG_FONT_SUPPORT=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -11735,6 +11837,7 @@ CONFIG_FRAME_WARN=1024
# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
CONFIG_OBJTOOL=y
CONFIG_STACK_VALIDATION=y
@@ -11764,7 +11867,7 @@ CONFIG_KDB_DEFAULT_ENABLE=0x1
CONFIG_KDB_KEYBOARD=y
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
CONFIG_ARCH_HAS_EARLY_DEBUG=y
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KCSAN=y
CONFIG_HAVE_KCSAN_COMPILER=y
@@ -11782,7 +11885,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
#
# Memory Debugging
#
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
@@ -11812,6 +11915,10 @@ CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_CODE_TAGGING=y
+CONFIG_MEM_ALLOC_PROFILING=y
+CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT=y
+CONFIG_MEM_ALLOC_PROFILING_DEBUG=y
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -11992,6 +12099,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -12062,8 +12170,6 @@ CONFIG_PERCPU_TEST=m
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m
-# CONFIG_STRING_SELFTEST is not set
-CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
@@ -12088,7 +12194,6 @@ CONFIG_TEST_STATIC_KEYS=m
# CONFIG_TEST_DYNAMIC_DEBUG is not set
# CONFIG_TEST_KMOD is not set
# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_LIVEPATCH is not set
CONFIG_TEST_OBJAGG=m
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_FREE_PAGES is not set
diff --git a/gnu/packages/aux-files/python/sitecustomize.py b/gnu/packages/aux-files/python/sitecustomize.py
index e2348e0356..82ea91104d 100644
--- a/gnu/packages/aux-files/python/sitecustomize.py
+++ b/gnu/packages/aux-files/python/sitecustomize.py
@@ -37,7 +37,7 @@ import sys
major_minor = '{}.{}'.format(*sys.version_info)
site_packages_prefix = os.path.join(
'lib', 'python' + major_minor, 'site-packages')
-python_site = os.path.join(sys.prefix, site_packages_prefix)
+python_site = os.path.normpath(os.path.join(sys.prefix, site_packages_prefix))
try:
all_sites_raw = os.environ['GUIX_PYTHONPATH'].split(os.path.pathsep)
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index ebd2e37d5c..27e80082f0 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -228,7 +228,7 @@ runtime.")
(sxml xpath)
(sxml transform))
#:imported-modules `((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
@@ -380,7 +380,7 @@ patcher application.")))
(sxml xpath)
(sxml transform))
#:imported-modules ((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-git-checkout-writable
@@ -790,7 +790,7 @@ This package provides the runtime.")
(sxml xpath)
(sxml transform))
#:imported-modules `((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 5e74439bff..155e90e34e 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -88,6 +88,7 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages prometheus)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
@@ -259,7 +260,6 @@ backups (called chunks) to allow easy burning to CD/DVD.")
(define-public libarchive
(package
(name "libarchive")
- (replacement libarchive/fixed)
(version "3.6.1")
(source
(origin
@@ -269,6 +269,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
(string-append "https://github.com/libarchive/libarchive"
"/releases/download/v" version "/libarchive-"
version ".tar.xz")))
+ (patches (search-patches "libarchive-remove-potential-backdoor.patch"))
(sha256
(base32
"1rj8q5v26lxxr8x4b4nqbrj7p06qvl91hb8cdxi3xx3qp771lhas"))))
@@ -348,25 +349,6 @@ random access nor for in-place modification. This package provides the
@command{bsdcat}, @command{bsdcpio} and @command{bsdtar} commands.")
(license license:bsd-2)))
-(define-public libarchive/fixed
- (hidden-package
- (package
- (inherit libarchive)
- (version "3.6.1")
- (source
- (origin
- (method url-fetch)
- (uri (list (string-append "https://libarchive.org/downloads/libarchive-"
- version ".tar.xz")
- (string-append "https://github.com/libarchive/libarchive"
- "/releases/download/v" version "/libarchive-"
- version ".tar.xz")))
- (patches (search-patches "libarchive-remove-potential-backdoor.patch"))
- (sha256
- (base32
- "1rj8q5v26lxxr8x4b4nqbrj7p06qvl91hb8cdxi3xx3qp771lhas")))))))
-
-
(define-public rdup
(package
(name "rdup")
@@ -675,14 +657,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 +682,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 +693,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,14 +735,15 @@ 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"
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
(copy-recursively "docs/man" man))))
- (add-after 'install-docs 'install-shell-completions
+ (add-after 'install-doc 'install-shell-completions
(lambda _
(let ((etc (string-append #$output "/etc"))
(share (string-append #$output "/share")))
@@ -844,7 +824,7 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.")
"1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb"))))
(arguments
`(#:modules ((ice-9 match) (ice-9 rdelim)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
;; This mostly mirrors the steps taken in the install.sh that ships
;; with dirvish, but simplified because we aren't prompting interactively
@@ -920,10 +900,9 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.")
;; Write out executables
(for-each write-pl executables)
;; Write out man pages
- (for-each write-man man-pages)
- #t))))))
+ (for-each write-man man-pages)))))))
(inputs
- (list perl rsync perl-libtime-period perl-libtime-parsedate))
+ (list bash-minimal perl rsync perl-libtime-period perl-libtime-parsedate))
(home-page "http://dirvish.org/")
(synopsis "Fast, disk based, rotating network backup system")
(description
@@ -952,7 +931,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
@@ -1055,7 +1038,7 @@ precious backup space.
(define-public restic-rest-server
(package
(name "restic-rest-server")
- (version "0.11.0")
+ (version "0.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1064,7 +1047,7 @@ precious backup space.
(file-name (git-file-name name version))
(sha256
(base32
- "1nvmxc9x0mlks6yfn66fmwn50k5q83ip4g9vvb0kndzd7hwcyacy"))))
+ "18jk93j91dq4639nml4qnq1fq5j3s67ca3gvfka5aafln8ir8ffk"))))
(build-system go-build-system)
(arguments
(list
@@ -1083,7 +1066,7 @@ precious backup space.
;; "rest-server" is a bit too generic.
(rename-file "bin/rest-server"
"bin/restic-rest-server")))))))
- (native-inputs (list go-github-com-coreos-go-systemd-activation
+ (native-inputs (list go-github-com-coreos-go-systemd-v22
go-github-com-gorilla-handlers
go-github-com-minio-sha256-simd
go-github-com-miolini-datacounter
@@ -1325,13 +1308,13 @@ compression parameters used by Gzip.")
(define-public borgmatic
(package
(name "borgmatic")
- (version "1.8.9")
+ (version "1.8.13")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgmatic" version))
(sha256
- (base32 "1xmqv0gg2ic7lp5kmygr9f6qkabsr86mma7pigan12vk2bcdbw31"))))
+ (base32 "08vlknlhczi98kwcrkaqvrwfxm9v284b4iaagrwgfzk32fdn57p1"))))
(build-system python-build-system)
(arguments
(list
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1213aa5b20..4e8121ae2c 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1,12 +1,12 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -19,10 +19,11 @@
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -46,8 +47,10 @@
#:use-module (gnu packages acl)
#:use-module (gnu packages algebra)
#:use-module (gnu packages attr)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages gcc)
#:use-module (gnu packages guile)
#:use-module (gnu packages multiprecision)
@@ -69,6 +72,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix search-paths)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
#:use-module (ice-9 optargs)
@@ -80,6 +84,10 @@
libc-utf8-locales-for-target
make-ld-wrapper
libiconv-if-needed
+
+ ;; Beware: the following should not be used the top level to avoid
+ ;; introducing circular module dependencies.
+ canonical-package
%final-inputs))
;;; Commentary:
@@ -111,42 +119,51 @@ command-line arguments, multiple languages, and so on.")
(define-public grep
(package
(name "grep")
- (version "3.8")
+ (version "3.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/grep/grep-"
version ".tar.xz"))
(sha256
(base32
- "10n3mc9n1xmg85hpxyr4wiqzfp27ffxzwhvkv021j27vnk0pr3a9"))
+ "1avf4x8skxbqrjp5j2qr9sp5vlf8jkw2i5bdn51fl3cxx3fsxchx"))
(patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system)
(native-inputs (list perl)) ;some of the tests require it
- (inputs (list pcre))
+ (inputs (list pcre2))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'fix-egrep-and-fgrep
- ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its
- ;; absolute file name instead of searching for it in $PATH.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (substitute* (list (string-append bin "/egrep")
- (string-append bin "/fgrep"))
- (("^exec grep")
- (string-append "exec " bin "/grep"))))))
- ,@(if (system-hurd?)
- '((add-before 'check 'skip-test
- (lambda _
- (substitute*
- ;; This test hangs
- '("tests/hash-collision-perf"
- ;; This test fails
- "tests/file")
- (("^#!.*" all)
- (string-append all "exit 77;\n"))))))
- '()))))
+ (list #:configure-flags #~(list "--enable-perl-regexp")
+
+ ;; XXX: On 32-bit Hurd platforms, 'time_t' is defined as a 32-bit
+ ;; integer in 'hurd_types.defs', so this Gnulib test always fails.
+ #:make-flags
+ #~#$(if (and (not (%current-target-system))
+ (string=? (%current-system) "i586-gnu"))
+ #~'("XFAIL_TESTS=test-year2038")
+ #~'())
+
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'fix-egrep-and-fgrep
+ ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its
+ ;; absolute file name instead of searching for it in $PATH.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (substitute* (list (string-append bin "/egrep")
+ (string-append bin "/fgrep"))
+ (("^exec grep")
+ (string-append "exec " bin "/grep"))))))
+ #$@(if (system-hurd?)
+ #~((add-before 'check 'skip-test
+ (lambda _
+ (substitute* ;; This test hangs
+ '("tests/hash-collision-perf"
+ ;; This test fails
+ "tests/file")
+ (("^#!.*" all)
+ (string-append all "exit 77;\n"))))))
+ #~()))))
(synopsis "Print lines matching a pattern")
(description
"grep is a tool for finding text inside files. Text is found by
@@ -261,51 +278,106 @@ standard utility.")
(license gpl3+)
(home-page "https://www.gnu.org/software/tar/")))
-(define-public patch
- (package
- (name "patch")
- (version "2.7.6")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/patch/patch-"
- version ".tar.xz"))
- (sha256
- (base32
- "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
- (patches (search-patches "patch-hurd-path-max.patch"))))
- (build-system gnu-build-system)
- (arguments
- ;; Work around a cross-compilation bug whereby libpatch.a would provide
- ;; '__mktime_internal', which conflicts with the one in libc.a.
- (if (%current-target-system)
- `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
- '()))
- (native-inputs (list ed))
- (synopsis "Apply differences to originals, with optional backups")
- (description
- "Patch is a program that applies changes to files based on differences
+;;; TODO: Replace/merge with 'patch' on core-updates.
+(define-public patch/pinned
+ (hidden-package
+ (package
+ (name "patch")
+ (version "2.7.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/patch/patch-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
+ (patches (search-patches "patch-hurd-path-max.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ ;; Work around a cross-compilation bug whereby libpatch.a would provide
+ ;; '__mktime_internal', which conflicts with the one in libc.a.
+ (if (%current-target-system)
+ `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
+ '()))
+ (native-inputs (list ed))
+ (synopsis "Apply differences to originals, with optional backups")
+ (description
+ "Patch is a program that applies changes to files based on differences
laid out as by the program \"diff\". The changes may be applied to one or more
files depending on the contents of the diff file. It accepts several
different diff formats. It may also be used to revert previously applied
differences.")
- (license gpl3+)
- (home-page "https://savannah.gnu.org/projects/patch/")))
+ (license gpl3+)
+ (home-page "https://savannah.gnu.org/projects/patch/"))))
+
+(define-public patch
+ ;; The latest release is from 2018, and lacks multiple security related
+ ;; patches. Since Fedora carries 23 patches, simply use the latest commit
+ ;; until a proper release is made.
+ (let ((revision "0")
+ (commit "f144b35425d9d7732ea5485034c1a6b7a106ab92")
+ (base patch/pinned))
+ (package
+ (inherit base)
+ (name "patch")
+ (version (git-version "2.7.6" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/patch.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz"))
+ (patches (search-patches "patch-hurd-path-max.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'copy-gnulib-sources
+ (lambda _
+ ;; XXX: We copy the source instead of using 'gnulib' as a
+ ;; native input to avoid introducing a dependency cycle.
+ (copy-recursively #+gnulib "gnulib")
+ (setenv "GNULIB_SRCDIR"
+ (string-append (getcwd) "/gnulib/src/gnulib"))))
+ (add-after 'copy-gnulib-sources 'update-bootstrap-script
+ (lambda _
+ (copy-file "gnulib/src/gnulib/build-aux/bootstrap"
+ "bootstrap")))
+ (add-after 'unpack 'patch-configure.ac
+ (lambda _
+ (substitute* "configure.ac"
+ ;; The gnulib-provided git-version-gen script has a plain
+ ;; shebang of #!/bin/sh; avoid using it.
+ (("build-aux/git-version-gen" all)
+ (string-append "sh " all)))))))))
+ (native-inputs (list autoconf automake bison ed))
+ (properties '()))))
(define-public diffutils
(package
(name "diffutils")
- (version "3.8")
+ (version "3.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/diffutils/diffutils-"
version ".tar.xz"))
(sha256
(base32
- "1v4g8gi0lgakqa7iix8s4fq7lq6l92vw3rjd9wfd2rhjng8xggd6"))
- (patches (search-patches "diffutils-fix-signal-processing.patch"))))
+ "17nhkdn5a2z6pwcmjs4jas2plg066hbdz06y5vhypr14qwyfkrch"))))
(build-system gnu-build-system)
(arguments
(list
+ ;; XXX: On 32-bit Hurd platforms, 'time_t' is defined as a 32-bit
+ ;; integer in 'hurd_types.defs', so this Gnulib test always fails.
+ #:make-flags
+ #~#$(if (and (not (%current-target-system))
+ (string=? (%current-system) "i586-gnu"))
+ #~'("XFAIL_TESTS=test-year2038")
+ #~'())
+
#:phases (if (system-hurd?)
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-tests
@@ -414,10 +486,6 @@ used to apply commands with arbitrarily long arguments.")
" test-renameatu"
" test-utimensat")))
'())
- ,@(if (not (target-64bit?))
- ;; Not all software is ready for 64bit time_t.
- '(#:configure-flags (list "--disable-year2038"))
- '())
#:phases (modify-phases %standard-phases
(add-before 'build 'patch-shell-references
(lambda _
@@ -520,14 +588,14 @@ standard.")
(define-public gnu-make
(package
(name "make")
- (version "4.3")
+ (version "4.4.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/make/make-" version
".tar.gz"))
(sha256
(base32
- "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"))
+ "1cwgcmwdn7gqn5da2ia91gkyiqs9birr10sy5ykpkaxzcwfzn5nx"))
(patches (search-patches "make-impure-dirs.patch"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config)) ;to detect Guile
@@ -586,54 +654,49 @@ change. GNU make offers many powerful extensions over the standard utility.")
(define-public binutils
(package
(name "binutils")
- (version "2.38")
+ (version "2.41")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.bz2"))
(sha256
- (base32 "1y0fb4qgxaxfyf81x9fqq9w5609mkah0b7wm1f7ab9kpy0fcf3h7"))
+ (base32 "02xkm9xgcrqhln742636nm43yzrpjkhqj0z64h03gf7pab0bxi54"))
(patches (search-patches "binutils-loongson-workaround.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:out-of-source? #t ;recommended in the README
- #:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
- ;; on GCC when bootstrapping.
- "LDFLAGS=-static-libgcc"
-
- ;; Turn on --enable-new-dtags by default to make the
- ;; linker set RUNPATH instead of RPATH on binaries.
- ;; This is important because RUNPATH can be overriden
- ;; using LD_LIBRARY_PATH at runtime.
- "--enable-new-dtags"
-
- ;; Don't search under /usr/lib & co.
- "--with-lib-path=/no-ld-lib-path"
-
- ;; Install BFD. It ends up in a hidden directory,
- ;; but it's here.
- "--enable-install-libbfd"
-
- ;; Make sure 'ar' and 'ranlib' produce archives in a
- ;; deterministic fashion.
- "--enable-deterministic-archives"
-
- "--enable-64-bit-bfd"
- "--enable-compressed-debug-sections=all"
- "--enable-lto"
- "--enable-separate-code"
- "--enable-threads")
- ;; XXX: binutils 2.38 was released without generated manuals:
- ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28909>. To avoid
- ;; a circular dependency on texinfo, prevent the build system from
- ;; creating the manuals by calling "true" instead of "makeinfo" ...
- #:make-flags '("MAKEINFO=true")))
-
- ;; ... and "hide" this package such that users who install binutils get
- ;; the version with documentation defined below.
- (properties '((hidden? . #t)))
-
+ (list #:out-of-source? #t ;recommended in the README
+ #:configure-flags #~'(;; Add `-static-libgcc' to not retain a dependency
+ ;; on GCC when bootstrapping.
+ "LDFLAGS=-static-libgcc"
+
+ ;; Turn on --enable-new-dtags by default to make the
+ ;; linker set RUNPATH instead of RPATH on binaries.
+ ;; This is important because RUNPATH can be overriden
+ ;; using LD_LIBRARY_PATH at runtime.
+ "--enable-new-dtags"
+
+ ;; Don't search under /usr/lib & co.
+ "--with-lib-path=/no-ld-lib-path"
+
+ ;; Install BFD. It ends up in a hidden directory,
+ ;; but it's here.
+ "--enable-install-libbfd"
+
+ ;; Make sure 'ar' and 'ranlib' produce archives in a
+ ;; deterministic fashion.
+ "--enable-deterministic-archives"
+
+ "--enable-64-bit-bfd"
+ "--enable-compressed-debug-sections=all"
+ "--enable-lto"
+ "--enable-separate-code"
+ "--enable-threads")
+
+ ;; For some reason, the build machinery insists on rebuilding .info
+ ;; files, even though they're already provided by the tarball.
+ #:make-flags #~'("MAKEINFO=true")))
+ (native-inputs (list bison)) ;needed to build 'gprofng'
(synopsis "Binary utilities: bfd gas gprof ld")
(description
"GNU Binutils is a collection of tools for working with binary files.
@@ -645,16 +708,6 @@ included.")
(license gpl3+)
(home-page "https://www.gnu.org/software/binutils/")))
-(define-public binutils+documentation
- (package/inherit binutils
- (native-inputs
- (list texinfo))
- (arguments
- (substitute-keyword-arguments (package-arguments binutils)
- ((#:make-flags flags ''())
- ''())))
- (properties '())))
-
;; FIXME: ath9k-firmware-htc-binutils.patch do not apply on 2.34 because of a
;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream).
;; Keep this version around until the patch is updated.
@@ -672,32 +725,34 @@ included.")
(patches '())))
(arguments
(substitute-keyword-arguments (package-arguments binutils)
- ((#:make-flags _ ''()) ''())))
+ ((#:make-flags _ #~'()) #~'())))
+ (native-inputs '())
(properties '())))
(define-public binutils-gold
- (package/inherit binutils+documentation
+ (package/inherit binutils
(name "binutils-gold")
(arguments
(substitute-keyword-arguments (package-arguments binutils)
((#:configure-flags flags)
- `(cons* "--enable-gold=default"
- (delete "LDFLAGS=-static-libgcc" ,flags)))
+ #~(cons* "--enable-gold=default"
+ (delete "LDFLAGS=-static-libgcc" #$flags)))
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
+ #~(modify-phases #$phases
(add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda _
(substitute* "gold/Makefile.in"
(("/bin/sh") (which "sh")))))
;; Multiple failing tests on some architectures in the gold testsuite.
- ,@(if (or (target-arm?)
- (target-ppc32?))
- '((add-after 'unpack 'skip-gold-testsuite
- (lambda _
- (substitute* "gold/Makefile.in"
- ((" testsuite") " ")))))
- '())))))
- (native-inputs (list bc))))
+ #$@(if (or (target-arm?)
+ (target-ppc32?))
+ #~((add-after 'unpack 'skip-gold-testsuite
+ (lambda _
+ (substitute* "gold/Makefile.in"
+ ((" testsuite") " ")))))
+ #~())))))
+ (native-inputs (modify-inputs (package-native-inputs binutils)
+ (append bc)))))
(define* (make-ld-wrapper name #:key
(target (const #f))
@@ -778,43 +833,33 @@ the store.")
(home-page "https://www.gnu.org/software/guix//")
(license gpl3+)))
-(define-public %glibc/hurd-configure-flags
- ;; 'configure' in glibc 2.35 omits to pass '-ffreestanding' when detecting
- ;; Mach headers. This is fixed in glibc commits
- ;; 8b8c768e3c701ed1993789bb46acb8a12c7a93df and
- ;; 7685630b98ca2a3f5de86eadf130993e6cf998a0; as a workaround, bypass those
- ;; tests.
- '("ac_cv_header_mach_mach_types_defs=yes"
- "ac_cv_header_mach_mach_types_h=yes"
- "ac_cv_header_mach_machine_ndr_def_h=no"
- "libc_cv_mach_task_creation_time=yes"))
-
(define-public glibc
;; This is the GNU C Library, used on GNU/Linux and GNU/Hurd. Prior to
;; version 2.28, GNU/Hurd used a different glibc branch.
(package
(name "glibc")
- (version "2.35")
- (replacement glibc/fixed)
+ (version "2.39")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
(sha256
(base32
- "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si"))
- (patches (search-patches "glibc-ldd-powerpc.patch"
- "glibc-ldd-x86_64.patch"
+ "09nrwb0ksbah9k35jchd28xxp2hidilqdgz7b8v5f30pz1yd8yzp"))
+ (patches (search-patches "glibc-2.39-git-updates.patch"
+ "glibc-ldd-powerpc.patch"
+ "glibc-2.38-ldd-x86_64.patch"
"glibc-dl-cache.patch"
- "glibc-versioned-locpath.patch"
- "glibc-allow-kernel-2.6.32.patch"
+ "glibc-2.37-versioned-locpath.patch"
+ ;; "glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"
- "glibc-cross-objdump.patch"
- "glibc-cross-objcopy.patch" ;must come 2nd
- "glibc-hurd-clock_t_centiseconds.patch"
- "glibc-hurd-clock_gettime_monotonic.patch"
+ "glibc-2.37-hurd-clock_t_centiseconds.patch"
+ "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
"glibc-hurd-mach-print.patch"
- "glibc-hurd-gettyent.patch"))))
+ "glibc-hurd-gettyent.patch"
+ "glibc-hurd-getauxval.patch"))))
+ (properties `((lint-hidden-cve . ("CVE-2024-33601" "CVE-2024-33602"
+ "CVE-2024-33600" "CVE-2024-33599"))))
(build-system gnu-build-system)
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -889,8 +934,7 @@ the store.")
;; On GNU/Hurd we get discarded-qualifiers warnings for
;; 'device_write_inband' among other things. Ignore them.
,@(if (target-hurd?)
- `("--disable-werror"
- ,@%glibc/hurd-configure-flags)
+ `("--disable-werror")
'()))
#:tests? #f ; XXX
@@ -965,19 +1009,13 @@ the store.")
;; and as such, it is useful to have these ".a" files in
;; OUT in addition to STATIC.
- ;; XXX: It might be better to determine whether a static
- ;; library is empty by some criterion (such as their file
- ;; size equaling eight bytes) rather than hardcoding them
- ;; by name.
-
- ;; XXX: We forgot librt.a for the current version! In
- ;; the meantime, gcc-toolchain provides it, but remove
- ;; that fix once librt.a is added here.
- (define empty-static-libraries
- '("libpthread.a" "libdl.a" "libutil.a" "libanl.a"))
(define (empty-static-library? file)
- (any (lambda (s)
- (string=? file s)) empty-static-libraries))
+ ;; Return true if FILE is an 'ar' archive with nothing
+ ;; beyond the header.
+ (let ((file (string-append (assoc-ref outputs "out")
+ "/lib/" file)))
+ (and (ar-file? file)
+ (= (stat:size (stat file)) 8))))
(define (static-library? file)
;; Return true if FILE is a static library. The
@@ -1020,14 +1058,41 @@ the store.")
(map (cut string-append slib "/" <>)
files))))))
+ (add-after 'install 'install-utf8-c-locale
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Install the C.UTF-8 locale so there's always a UTF-8
+ ;; locale around.
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (locale (string-append out "/lib/locale/"
+ ,(package-version
+ this-package))))
+ (mkdir-p locale)
+
+ ;; FIXME: When cross-compiling, attempt to use
+ ;; 'localedef' from the same libc version.
+ (invoke ,(if (%current-target-system)
+ "true"
+ '(string-append bin "/localedef"))
+ "--no-archive" "--prefix" locale
+ "-i" "C" "-f" "UTF-8"
+ (string-append locale "/C.UTF-8")))))
+
,@(if (target-hurd?)
'((add-after 'install 'augment-libc.so
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
+ (let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/lib/libc.so")
(("/[^ ]+/lib/libc.so.0.3")
(string-append out "/lib/libc.so.0.3"
- " libmachuser.so libhurduser.so")))))))
+ " libmachuser.so libhurduser.so"))))))
+ (add-after 'install 'create-machine-symlink
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (cpu "i386"))
+ (symlink cpu
+ (string-append out
+ "/include/mach/machine"))))))
'()))))
(inputs `(("static-bash" ,static-bash)))
@@ -1052,7 +1117,8 @@ the store.")
;; distros.
(list (search-path-specification
(variable "GUIX_LOCPATH")
- (files '("lib/locale")))))
+ (files '("lib/locale")))
+ $TZDIR))
(synopsis "The GNU C Library")
(description
@@ -1065,15 +1131,6 @@ with the Linux kernel.")
(license lgpl2.0+)
(home-page "https://www.gnu.org/software/libc/")))
-(define glibc/fixed
- (package
- (inherit glibc)
- (source
- (origin (inherit (package-source glibc))
- (patches
- (append (search-patches "glibc-2.35-CVE-2023-4911.patch")
- (origin-patches (package-source glibc))))))))
-
;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful
;; in FHS containers.
(define-public glibc-for-fhs
@@ -1091,9 +1148,51 @@ with the Linux kernel.")
;; Below are old libc versions, which we use mostly to build locale data in
;; the old format (which the new libc cannot cope with.)
-(define-public glibc-2.33
+(define-public glibc-2.35
(package
(inherit glibc)
+ (version "2.35")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si"))
+ (patches (search-patches "glibc-2.35-CVE-2023-4911.patch"
+ "glibc-ldd-powerpc.patch"
+ "glibc-ldd-x86_64.patch"
+ "glibc-dl-cache.patch"
+ "glibc-versioned-locpath.patch"
+ "glibc-allow-kernel-2.6.32.patch"
+ "glibc-reinstate-prlimit64-fallback.patch"
+ "glibc-supported-locales.patch"
+ "glibc-cross-objdump.patch"
+ "glibc-cross-objcopy.patch" ;must come 2nd
+ "glibc-hurd-clock_t_centiseconds.patch"
+ "glibc-hurd-clock_gettime_monotonic.patch"
+ "glibc-hurd-mach-print.patch"
+ "glibc-hurd-gettyent.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments glibc)
+ ((#:configure-flags flags #~'())
+ #~(cons* "--enable-crypt"
+ ;; We do not want to use the C++ compiler, because its
+ ;; libstdc++ is linked against a newer glibc, and so relies
+ ;; on those newer symbols. Pretend it doesn't link (the test
+ ;; doesn't actually check that the compiler works with new
+ ;; libstdc++ and older glibc).
+ "libc_cv_cxx_link_ok=no"
+ #$flags))
+ ((#:phases phases)
+ ;; The C.UTF-8 fails to build in glibc 2.35:
+ ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
+ ;; It is missing altogether in versions earlier than 2.35.
+ `(modify-phases ,phases
+ (delete 'install-utf8-c-locale)))))))
+
+(define-public glibc-2.33
+ (package
+ (inherit glibc-2.35)
(name "glibc")
(version "2.33")
(source (origin
@@ -1104,23 +1203,18 @@ with the Linux kernel.")
"1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f"))
(patches
(cons (search-patch "glibc-2.33-riscv64-miscompilation.patch")
- ;; Remove a patch that's become irrelevant and that does not
- ;; apply to this version.
- (remove (lambda (patch)
- (string=? (basename patch)
- "glibc-hurd-clock_gettime_monotonic.patch"))
- (origin-patches (package-source glibc)))))))
- (arguments
- (substitute-keyword-arguments (package-arguments glibc)
- ((#:configure-flags flags ''())
- ;; There are undefined references to pthread symbols while linking
- ;; 'support/links-dso-program.cc'. Since this isn't needed here, turn
- ;; off C++ tests.
- `(cons "libc_cv_cxx_link_ok=no" ,flags))))))
+ ;; Remove patches that are irrelevant or do not apply to
+ ;; this version.
+ (remove
+ (lambda (patch)
+ (member (basename patch)
+ '("glibc-2.35-CVE-2023-4911.patch"
+ "glibc-hurd-clock_gettime_monotonic.patch")))
+ (origin-patches (package-source glibc-2.35)))))))))
(define-public glibc-2.32
(package
- (inherit glibc)
+ (inherit glibc-2.35)
(version "2.32")
(source (origin
(inherit (package-source glibc))
@@ -1175,7 +1269,7 @@ with the Linux kernel.")
(define-public glibc-2.31
(package
- (inherit glibc)
+ (inherit glibc-2.35)
(version "2.31")
(source (origin
(inherit (package-source glibc))
@@ -1304,99 +1398,112 @@ to the @code{share/locale} sub-directory of this package.")
,@modules))
((#:imported-modules modules '())
`((gnu build locale)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
((#:phases phases)
- `(modify-phases ,phases
- (replace 'build
- (lambda _
- (invoke "make" "localedata/install-locales"
- "-j" (number->string (parallel-job-count)))))
- (add-after 'build 'symlink-normalized-codesets
- (lambda* (#:key outputs #:allow-other-keys)
- ;; The above phase does not install locales with names using
- ;; the "normalized codeset." Thus, create symlinks like:
- ;; en_US.utf8 -> en_US.UTF-8
- (define (locale-directory? file stat)
- (and (file-is-directory? file)
- (string-index (basename file) #\_)
- (string-rindex (basename file) #\.)))
-
- (let* ((out (assoc-ref outputs "out"))
- (locales (find-files out locale-directory?
- #:directories? #t)))
- (for-each (lambda (directory)
- (let*-values (((base)
- (basename directory))
- ((name codeset)
- (locale->name+codeset base))
- ((normalized)
- (normalize-codeset codeset)))
- (unless (string=? codeset normalized)
- (symlink base
- (string-append (dirname directory)
- "/" name "."
- normalized)))))
- locales))))
- (delete 'install)
- (delete 'move-static-libs)))
+ #~(modify-phases #$phases
+ (replace 'build
+ (lambda _
+ (invoke "make" "localedata/install-locales"
+ "-j" (number->string (parallel-job-count)))))
+ (add-after 'build 'symlink-normalized-codesets
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The above phase does not install locales with names using
+ ;; the "normalized codeset." Thus, create symlinks like:
+ ;; en_US.utf8 -> en_US.UTF-8
+ (define (locale-directory? file stat)
+ (and (file-is-directory? file)
+ (string-index (basename file) #\_)
+ (string-rindex (basename file) #\.)))
+
+ (let* ((locales (find-files #$output locale-directory?
+ #:directories? #t)))
+ (for-each (lambda (directory)
+ (let*-values (((base)
+ (basename directory))
+ ((name codeset)
+ (locale->name+codeset base))
+ ((normalized)
+ (normalize-codeset codeset)))
+ (unless (string=? codeset normalized)
+ (symlink base
+ (string-append (dirname directory)
+ "/" name "."
+ normalized)))))
+ locales))))
+ (delete 'install)
+ (delete 'install-utf8-c-locale)
+ (delete 'move-static-libs)))
((#:configure-flags flags)
- `(append ,flags
- ;; Use $(libdir)/locale/X.Y as is the case by default.
- (list (string-append "libc_cv_complocaledir="
- (assoc-ref %outputs "out")
- "/lib/locale/"
- ,(version-major+minor
- (package-version glibc)))))))))
+ #~(append #$flags
+ ;; Use $(libdir)/locale/X.Y as is the case by default.
+ (list (string-append "libc_cv_complocaledir="
+ #$output
+ "/lib/locale/"
+ #$(version-major+minor
+ (package-version glibc)))))))))
(properties `((upstream-name . "glibc")))))
(define %default-utf8-locales
;; These are the locales commonly used for tests---e.g., in Guile's i18n
;; tests.
- '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+ '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+
(define*-public (make-glibc-utf8-locales glibc #:key
(locales %default-utf8-locales)
(name "glibc-utf8-locales"))
- (define default-locales? (equal? locales %default-utf8-locales))
+ (define default-locales?
+ (equal? locales %default-utf8-locales))
+
(package
(name name)
(version (package-version glibc))
(source #f)
(build-system trivial-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
-
- (let* ((libc (assoc-ref %build-inputs "glibc"))
- (gzip (assoc-ref %build-inputs "gzip"))
- (out (assoc-ref %outputs "out"))
- (localedir (string-append out "/lib/locale/"
- ,(version-major+minor version))))
- ;; 'localedef' needs 'gzip'.
- (setenv "PATH" (string-append libc "/bin:" gzip "/bin"))
-
- (mkdir-p localedir)
- (for-each (lambda (locale)
- (define file
- ;; Use the "normalized codeset" by
- ;; default--e.g., "en_US.utf8".
- (string-append localedir "/" locale ".utf8"))
-
- (invoke "localedef" "--no-archive"
- "--prefix" localedir
- "-i" locale
- "-f" "UTF-8" file)
-
- ;; For backward compatibility with Guix
- ;; <= 0.8.3, add "xx_YY.UTF-8".
- (symlink (string-append locale ".utf8")
- (string-append localedir "/"
- locale ".UTF-8")))
- ',locales)
- #t))))
- (native-inputs
- `(("glibc" ,glibc)
- ("gzip" ,gzip)))
+ (list #:modules '((guix build utils))
+ #:builder
+ #~(begin
+ (use-modules (guix build utils))
+
+ (let* ((libc (dirname
+ (search-input-file %build-inputs
+ "/bin/localedef")))
+ (gzip (dirname
+ (search-input-file %build-inputs
+ "/bin/gzip")))
+ (out #$output)
+ (localedir (string-append out "/lib/locale/"
+ #$(version-major+minor
+ (package-version this-package)))))
+ ;; 'localedef' needs 'gzip'.
+ (setenv "PATH" (string-append libc ":" gzip ""))
+
+ (mkdir-p localedir)
+ (for-each (lambda (locale)
+ (define file
+ ;; Use the "normalized codeset" by
+ ;; default--e.g., "en_US.utf8".
+ (string-append localedir "/" locale ".utf8"))
+
+ (invoke "localedef" "--no-archive"
+ "--prefix" localedir
+ "-i" locale
+ "-f" "UTF-8" file)
+
+ ;; For backward compatibility with Guix
+ ;; <= 0.8.3, add "xx_YY.UTF-8".
+ (symlink (string-append locale ".utf8")
+ (string-append localedir "/"
+ locale ".UTF-8")))
+
+ ;; The C.UTF-8 locale was introduced in 2.35 but it
+ ;; fails to build there:
+ ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
+ '#$(if (version>? (package-version this-package)
+ "2.35")
+ locales
+ (delete "C" locales)))))))
+ (native-inputs (list glibc gzip))
(synopsis (if default-locales?
(P_ "Small sample of UTF-8 locales")
(P_ "Customized sample of UTF-8 locales")))
@@ -1419,6 +1526,9 @@ test environments.")
(make-glibc-utf8-locales glibc)))
;; Packages provided to ease use of binaries linked against the previous libc.
+(define-public glibc-locales-2.35
+ (package (inherit (make-glibc-locales glibc-2.35))
+ (name "glibc-locales-2.35")))
(define-public glibc-locales-2.33
(package (inherit (make-glibc-locales glibc-2.33))
(name "glibc-locales-2.33")))
@@ -1458,27 +1568,7 @@ variety of options. It is an alternative to the shell \"type\" built-in
command.")
(license gpl3+))) ; some files are under GPLv2+
-(define-public glibc/hurd
- (package/inherit glibc
- (name "glibc-hurd")
- (version "2.37")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
- (sha256
- (base32
- "0hqsp4dzrjx0iga6jv0magjw26dh82pxlmk8yis5v0d127qyymr2"))
- (patches (search-patches "glibc-ldd-powerpc.patch"
- "glibc-dl-cache.patch"
- "glibc-2.37-versioned-locpath.patch"
- "glibc-reinstate-prlimit64-fallback.patch"
- "glibc-supported-locales.patch"
- "glibc-2.37-hurd-clock_t_centiseconds.patch"
- "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
- "glibc-hurd-mach-print.patch"
- "glibc-hurd-gettyent.patch"
- "glibc-hurd-getauxval.patch"))))
- (supported-systems %hurd-systems)))
+(define-public glibc/hurd glibc)
(define-public glibc/hurd-headers
(package/inherit glibc/hurd
@@ -1496,8 +1586,7 @@ command.")
(substitute-keyword-arguments (package-arguments glibc/hurd)
;; We just pass the flags really needed to build the headers.
((#:configure-flags flags)
- `(list "--enable-add-ons"
- ,@%glibc/hurd-configure-flags))
+ `(list "--enable-add-ons"))
((#:phases _)
'(modify-phases %standard-phases
(replace 'install
@@ -1544,16 +1633,21 @@ command.")
(define* (libc-utf8-locales-for-target #:optional
(target (or (%current-target-system)
(%current-system))))
- (if (target-hurd? target)
- glibc-utf8-locales/hurd
- glibc-utf8-locales))
+ "Return the glibc UTF-8 locale package for TARGET."
+ ;; Note: To avoid circular dependencies (such as: texinfo ->
+ ;; glibc-utf8-locales -> glibc -> texinfo), refer to
+ ;; 'glibc-utf8-locales-final' via 'canonical-package'.
+ (canonical-package
+ (if (target-hurd? target)
+ glibc-utf8-locales/hurd
+ glibc-utf8-locales)))
(define-public tzdata
(package
(name "tzdata")
;; This package should be kept in sync with python-pytz and python-tzdata
;; in (gnu packages time).
- (version "2022a")
+ (version "2023d")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1561,7 +1655,7 @@ command.")
version ".tar.gz"))
(sha256
(base32
- "0r0nhwpk9nyxj5kkvjy58nr5d85568m04dcb69c4y3zmykczyzzg"))))
+ "1wq858ip55ijnlrffnnadq7vw0x93ywxghgfxh68r2qa1fbj3jnv"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f
@@ -1629,7 +1723,7 @@ command.")
version ".tar.gz"))
(sha256
(base32
- "1iysv8fdkm79k8wh8jizmjmq075q4qjhk090vxjy57my6dz5wmzq")))))
+ "07hn7hn2klw4dfyr673ril2nrk18198hbfv25gljsvc833hzk9g9")))))
(home-page "https://www.iana.org/time-zones")
(synopsis "Database of current and historical time zones")
(description "The Time Zone Database (often called tz or zoneinfo)
@@ -1686,12 +1780,18 @@ package needs iconv ,@(libiconv-if-needed) should be added."
(list libiconv)
'()))
-(define-public (canonical-package package)
+;;; Beware: canonical-package should not be used at the top level, to avoid
+;;; eagerly resolving (gnu packages commencement), which would introduce
+;;; circular module dependencies.
+(define (canonical-package package)
;; Avoid circular dependency by lazily resolving 'commencement'.
(let* ((iface (resolve-interface '(gnu packages commencement)))
(proc (module-ref iface 'canonical-package)))
(proc package)))
+;;; Beware: %final-inputs should not be used at the top level, to avoid
+;;; eagerly resolving (gnu packages commencement), which would introduce
+;;; circular module dependencies.
(define* (%final-inputs #:optional (system (%current-system)))
"Return the list of \"final inputs\"."
;; Avoid circular dependency by lazily resolving 'commencement'.
diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index 5ff4649716..8eed98d1fd 100644
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -34,7 +34,7 @@
(define-public libgc
(package
(name "libgc")
- (version "8.2.2")
+ (version "8.2.4")
(source (origin
(method url-fetch)
(uri (list (string-append "https://github.com/ivmai/bdwgc/releases"
@@ -44,7 +44,7 @@
"/gc-" version ".tar.gz")))
(sha256
(base32
- "181ni2rn9qjbl4ilqdjrd1a4h8siv5bgmzqgg4595q32n2y0f0gk"))))
+ "1hlgqkg9arc8sqf7wamvzmp3shb3np5z0h5v0qqksh3pw3dkq39x"))))
(build-system gnu-build-system)
(arguments
(append
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 2b3ab0c112..9be03cff08 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -79,18 +79,18 @@
(define-public fio
(package
(name "fio")
- (version "3.36")
+ (version "3.37")
(source (origin
(method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2"))
(sha256
(base32
- "0ppg2rn57diz2mvbbps4cjxd903zn380hdkdsrbzal4l513w32h0"))))
+ "09w35mpkrlxjy506bhifq7akc7mid9q92jkqgqwgf1ya95jzvw48"))))
(build-system gnu-build-system)
(arguments
(list #:modules
- `(,@%gnu-build-system-modules
+ `(,@%default-gnu-modules
(ice-9 textual-ports))
#:test-target "test"
#:configure-flags
@@ -137,7 +137,7 @@ is to write a job file matching the I/O load one wants to simulate.")
(define-public intel-mpi-benchmarks/openmpi
(package
(name "intel-mpi-benchmarks")
- (version "2021.3")
+ (version "2021.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -146,7 +146,7 @@ is to write a job file matching the I/O load one wants to simulate.")
(file-name (git-file-name name version))
(sha256
(base32
- "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
+ "184r4h35mzxjzzjnl4nhr1vh00iiz8kf9vf4d8lrqbr62rqrwl7w"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -663,7 +663,6 @@ its features are:
python-wrapper
which
;; For documentation
- libxml2 ;for XML_CATALOG_FILES
libxslt
docbook-xml
docbook-xsl))
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 0fca094977..ff19028006 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com>
@@ -13,6 +13,7 @@
;;; Copyright © 2021 Tim Howes <timhowes@lavabit.com>
;;; Copyright © 2021 Nicolas Vallet <nls.vallet@gmail.com>
;;; Copyright © 2023 Navid Afkhami <Navid.Afkhami@mdc-berlin.de>
+;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix gexp)
+ #:use-module (guix utils)
#:use-module (guix git-download)
#:use-module (guix build-system r)
#:use-module (gnu packages)
@@ -201,14 +203,14 @@ utilize the TFBSTools package (version 1.23.1 or higher).")
(define-public r-mafh5-gnomad-v3-1-2-grch38
(package
(name "r-mafh5-gnomad-v3-1-2-grch38")
- (version "3.15.0")
+ (version "3.15.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MafH5.gnomAD.v3.1.2.GRCh38" version
'annotation))
(sha256
- (base32 "18hzw7f41ii16qpm3ch516b773900l1m1id5z6a763m01fg0mhiq"))))
+ (base32 "1q9hlva814sjfz8vm9bzw7xzppbcfy5qq7nnz9w742yr59cjb6mp"))))
(properties `((upstream-name . "MafH5.gnomAD.v3.1.2.GRCh38")))
(build-system r-build-system)
(propagated-inputs (list r-bsgenome
@@ -290,13 +292,13 @@ even help to identify disease associations that are not obvious.")
(define-public r-org-eck12-eg-db
(package
(name "r-org-eck12-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "org.EcK12.eg.db" version 'annotation))
(sha256
- (base32 "12lqv06n49lwczv5l4h5h6lbfbcqyg9j4csffcdx495scmhc06mc"))))
+ (base32 "1af2yrbpn58z34jq39qmmwprzsffgxbrs84dsxny4rksa8k6j70s"))))
(properties
`((upstream-name . "org.EcK12.eg.db")))
(build-system r-build-system)
@@ -317,7 +319,7 @@ analysis.")
(define-public r-org-bt-eg-db
(package
(name "r-org-bt-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source
(origin
(method url-fetch)
@@ -327,7 +329,7 @@ analysis.")
'annotation))
(sha256
(base32
- "0fgrpjfrsw837ay9cq3wd6gp6sxvwjc7r9spfs4m89vqs2xb0bfc"))))
+ "0rbbjv47fadc6jgpqrimsd91f35fw6sw8d805vf61nx5xhbl3lpc"))))
(properties `((upstream-name . "org.Bt.eg.db")))
(build-system r-build-system)
(propagated-inputs
@@ -342,14 +344,14 @@ based on mapping using Entrez Gene identifiers.")
(define-public r-org-sc-sgd-db
(package
(name "r-org-sc-sgd-db")
- (version "3.18.0")
+ (version "3.19.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "org.Sc.sgd.db" version
'annotation))
(sha256
- (base32 "15ngfqimrjpn2fxzngj5m3pvqivbq65010qdx33xs32ax48z6p2r"))))
+ (base32 "1sbjwyf0ibivdhhxsaljgqa4lqp3hcf8gcrlcm2vd78bfm5cm7bg"))))
(properties `((upstream-name . "org.Sc.sgd.db")))
(build-system r-build-system)
(propagated-inputs (list r-annotationdbi))
@@ -391,14 +393,14 @@ Mapping50K_Xba240 (pd.mapping50k.xba240).")
(define-public r-reactome-db
(package
(name "r-reactome-db")
- (version "1.86.2")
+ (version "1.88.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "reactome.db" version 'annotation))
(sha256
(base32
- "02p8ihds0hpcfj5mib0ifql9404svlavfyj36c15jzmbci0rnc8c"))))
+ "1fwbf53vklhvqa6n6pijb8xqyv2pap1hskkirnm5c42wmd6g4ql7"))))
(properties `((upstream-name . "reactome.db")))
(build-system r-build-system)
(propagated-inputs
@@ -764,13 +766,13 @@ in Biostrings objects.")
(define-public r-genomeinfodbdata
(package
(name "r-genomeinfodbdata")
- (version "1.2.11")
+ (version "1.2.12")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomeInfoDbData" version 'annotation))
(sha256
(base32
- "1hkvcrp4a2g3yl1h4k5zzj5fhp3d9a1amyn19zr62q9fhj3y47ri"))))
+ "0md3jl5bz4d2wkvf4yra7rydf5dgykrijrdqwwxc7f77l30nsmgp"))))
(properties
`((upstream-name . "GenomeInfoDbData")))
(build-system r-build-system)
@@ -783,13 +785,13 @@ ID and species. It is used by functions in the GenomeInfoDb package.")
(define-public r-go-db
(package
(name "r-go-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GO.db" version 'annotation))
(sha256
(base32
- "0znqa724jvrw2xx696n48lx83kzhivfr7fc9awzgm7nigwg3907m"))))
+ "199vk4y069yik7fn25pp73nkhs1vaw9km9rcmm1cirncwm2n0vhg"))))
(properties
`((upstream-name . "GO.db")))
(build-system r-build-system)
@@ -954,13 +956,13 @@ data.")
(define-public r-org-ce-eg-db
(package
(name "r-org-ce-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "org.Ce.eg.db" version 'annotation))
(sha256
(base32
- "1fsbrbby6ka2xdsbp8b10nid99w6lkvb7pyn8gv3dsn8p9p6mc5q"))))
+ "0vg6nw4qzj8janmkv6k2z471m3l4xnd1h232h0w5i53b20c7p6ys"))))
(properties
`((upstream-name . "org.Ce.eg.db")))
(build-system r-build-system)
@@ -976,13 +978,13 @@ annotations for the genome of the model worm Caenorhabditis elegans.")
(define-public r-org-dm-eg-db
(package
(name "r-org-dm-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "org.Dm.eg.db" version 'annotation))
(sha256
(base32
- "1n0rwynw3nl4js104295kff0jk8jwymjk8imm9di6dy6b9s3qsa6"))))
+ "1sqw38z73sgq66x8qrb5xw0jxyimy7l1hs2iwm7xq9ylzrjw3yj0"))))
(properties
`((upstream-name . "org.Dm.eg.db")))
(build-system r-build-system)
@@ -998,13 +1000,13 @@ annotations for the genome of the model fruit fly Drosophila melanogaster.")
(define-public r-org-dr-eg-db
(package
(name "r-org-dr-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "org.Dr.eg.db" version 'annotation))
(sha256
(base32
- "1kk5jgbzcqhgwf5p4mpxswqhr9rkirm3fb7maflk61zcn6fs56zc"))))
+ "041hp3xhkiwh8vb4zq5kwvrsmp8paqlri6gaj1qy0a5zjlkw0fl6"))))
(properties
`((upstream-name . "org.Dr.eg.db")))
(build-system r-build-system)
@@ -1020,13 +1022,13 @@ based on mapping using Entrez Gene identifiers.")
(define-public r-org-hs-eg-db
(package
(name "r-org-hs-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "org.Hs.eg.db" version 'annotation))
(sha256
(base32
- "1jn556ql6xknfd34qz4bqh6bgc9rccmz6pk41p7ivlzlslz7bp21"))))
+ "1xrbf0zmik1j70i6bg5wqvfwz4vcf3vgypan36r1lv6lspsfychr"))))
(properties
`((upstream-name . "org.Hs.eg.db")))
(build-system r-build-system)
@@ -1042,13 +1044,13 @@ on mapping using Entrez Gene identifiers.")
(define-public r-org-mm-eg-db
(package
(name "r-org-mm-eg-db")
- (version "3.18.0")
+ (version "3.19.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "org.Mm.eg.db" version 'annotation))
(sha256
(base32
- "0i35dfllh8wf7b61ajf33gvclzg3znyx3cgp30vs3hm8ys3nras1"))))
+ "12d8lrf6bxvqzfxzdbxqmjcywy2myhwhi99kxdwpijsczxxfikj7"))))
(properties
`((upstream-name . "org.Mm.eg.db")))
(build-system r-build-system)
@@ -1171,29 +1173,29 @@ Ensembl.")
(define-public r-escape
(package
(name "r-escape")
- (version "1.12.0")
+ (version "2.0.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "escape" version))
(sha256
- (base32 "0bmin69ax7l5x3a0k9mv183277a0hl4znx02y79v2ilkgqkdm7fn"))))
+ (base32 "03wbrxd7kjyl3d4s418ql5fv7bmwdfyfp10jd8knr0xis7vxmz2x"))))
(properties `((upstream-name . "escape")))
(build-system r-build-system)
- (propagated-inputs (list r-biocparallel
- r-broom
- r-data-table
+ (propagated-inputs (list r-aucell
+ r-biocparallel
r-dplyr
+ r-ggdist
r-ggplot2
+ r-ggpointdensity
r-ggridges
r-gseabase
r-gsva
- r-matrix
r-matrixgenerics
r-msigdbr
r-patchwork
r-reshape2
- r-rlang
+ r-seuratobject
r-singlecellexperiment
r-stringr
r-summarizedexperiment
@@ -1487,13 +1489,13 @@ data (chip hgu133plus2) assembled using data from public repositories.")
(define-public r-pfam-db
(package
(name "r-pfam-db")
- (version "3.18.0")
+ (version "3.19.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "PFAM.db" version 'annotation))
(sha256
- (base32 "15m7qfvz53jkdmx90y7rvy62myr4y3hdy414yqi0w3ch32vy78nr"))))
+ (base32 "0jjba22p8x4cfnihsa3gah3amdr4yrqpfm0zfr990jcjkvf94wvk"))))
(properties `((upstream-name . "PFAM.db")))
(build-system r-build-system)
(propagated-inputs
@@ -1574,12 +1576,12 @@ All datasets are restricted to protein coding genes.")
(define-public r-adductdata
(package
(name "r-adductdata")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "adductData" version 'experiment))
(sha256
- (base32 "16c79wy55p4ryglxph80dibfm1ni8c5yfk6fnmq064ihw4zwcld5"))))
+ (base32 "1ydd7zxag0cmw7mj38srqs4w6lbp1ic5i8s1ay6pifv14arcncrz"))))
(properties `((upstream-name . "adductData")))
(build-system r-build-system)
(propagated-inputs (list r-annotationhub r-experimenthub))
@@ -1595,12 +1597,12 @@ albumin} (HSA).")
(define-public r-aneufinderdata
(package
(name "r-aneufinderdata")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AneuFinderData" version 'experiment))
(sha256
- (base32 "03kp8qkqy2wph7lbzawgnh83qjm31ih1jp986qwphfhkfk125wg0"))))
+ (base32 "1qysi874hsa4a7xz0na0cxv0sx02d3b74h77s30mfww1wsg8jy69"))))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/AneuFinderData/")
(synopsis "Data package for @code{AneuFinder}")
@@ -1611,12 +1613,12 @@ demonstration purposes in the @code{AneuFinder} package.")
(define-public r-arrmdata
(package
(name "r-arrmdata")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ARRmData" version 'experiment))
(sha256
- (base32 "0hlhc7kvw9n1bnbzingd1475qwivpx64sccnigdij8xdcm1mb4s7"))))
+ (base32 "02y44d0dappc3srl2d7lgipm6a62gvd8vivzaq4594dnmy8rvkw3"))))
(properties
`((upstream-name . "ARRmData")))
(build-system r-build-system)
@@ -1630,14 +1632,14 @@ from Illumina 450k methylation arrays.")
(define-public r-bcellviper
(package
(name "r-bcellviper")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bcellViper" version
'experiment))
(sha256
(base32
- "1q9ig5z03flq57nrhwnk6gdz4kamjmpwdfifwvnhac3l3f5z828h"))))
+ "0mx92gs9065lz0c01mzng9snalvmdb3xbsm1r3f6fnhg478da4yq"))))
(properties `((upstream-name . "bcellViper")))
(build-system r-build-system)
(propagated-inputs (list r-biobase))
@@ -1653,14 +1655,14 @@ dataset for the examples in package viper.")
(define-public r-bladderbatch
(package
(name "r-bladderbatch")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bladderbatch" version
'experiment))
(sha256
(base32
- "19dgvdbxsswy1fl68wwf4ifplppm1blzjw1dr06mz0yjq80a7rvl"))))
+ "00cgkpa6mb32q3xl5clkpdh5rkwx7c81rxmyh2qr0jpwpmd3gjwc"))))
(properties `((upstream-name . "bladderbatch")))
(build-system r-build-system)
(propagated-inputs (list r-biobase))
@@ -1674,14 +1676,14 @@ dataset for the examples in package viper.")
(define-public r-bodymaprat
(package
(name "r-bodymaprat")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bodymapRat" version
'experiment))
(sha256
- (base32 "1sfq6vxkb68l0q5qbnpm3fi53k4q9a890bv2ff9c6clhc42wx3h6"))))
+ (base32 "15kjgqq7lq94pjqg380swqrkv684kgbpkaikfxxdx4cpgx8sjzn7"))))
(properties `((upstream-name . "bodymapRat")))
(build-system r-build-system)
(arguments
@@ -1712,13 +1714,13 @@ STAR. Data is available on @code{ExperimentHub} as a data package.")
(define-public r-biscuiteerdata
(package
(name "r-biscuiteerdata")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biscuiteerData" version 'experiment))
(sha256
- (base32 "1wqdj1499psnf9y816k05m6h38yfsin4rwzqm1209ddxza6jbw1x"))))
+ (base32 "1qv2ajy312diacb3mihc3q7hrrlq48k5vd9v0g6w38cqz6gnz0as"))))
(properties
`((upstream-name . "biscuiteerData")))
(build-system r-build-system)
@@ -1735,13 +1737,13 @@ biscuiteer.")
(define-public r-breakpointrdata
(package
(name "r-breakpointrdata")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "breakpointRdata" version 'experiment))
(sha256
(base32
- "13w9vp436akpnywhsr6kz763c2yakrvpyiplggfb6w50wi2xm5xj"))))
+ "1hm190ji3s451x2hchmpyzx6v4n8p1n6fdqg7cbzmj19rzsb4wha"))))
(properties `((upstream-name . "breakpointRdata")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -1755,14 +1757,14 @@ demonstrate functionalities of the @code{breakpointR} package.")
(define-public r-breastcancervdx
(package
(name "r-breastcancervdx")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "breastCancerVDX" version
'experiment))
(sha256
- (base32 "12r8zql30ssr0cxy8v1qawwsky54321c737ny19n2yrl7sm08gf0"))))
+ (base32 "0mvm2a77mss85vi8x3i35d54z70advyshsmadhl6aysrzfiw5ifd"))))
(properties `((upstream-name . "breastCancerVDX")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/breastCancerVDX")
@@ -1775,21 +1777,29 @@ cancer study published in Wang et al. 2005 and Minn et al 2007.")
(define-public r-celldex
(package
(name "r-celldex")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "celldex" version 'experiment))
(sha256
- (base32 "1ckjdmiw9g1wdswijy3dvamv3kqi11j8b8p9dgr1yv5q2lfjbnwl"))))
+ (base32 "155hnh62ra06b52xk78f111b10gm34d1djvl5w5mabvrk4vknwj6"))))
(properties `((upstream-name . "celldex")))
(build-system r-build-system)
(propagated-inputs
- (list r-annotationdbi
+ (list r-alabaster-base
+ r-alabaster-matrix
+ r-alabaster-se
+ r-annotationdbi
r-annotationhub
+ r-dbi
r-delayedarray
r-delayedmatrixstats
r-experimenthub
+ r-gypsum
+ r-jsonlite
+ r-matrix
+ r-rsqlite
r-s4vectors
r-summarizedexperiment))
(native-inputs (list r-knitr))
@@ -1804,13 +1814,13 @@ single-cell data or deconvolution of bulk RNA-seq.")
(define-public r-champdata
(package
(name "r-champdata")
- (version "2.34.0")
+ (version "2.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ChAMPdata" version 'experiment))
(sha256
(base32
- "175vsg2bh578fdrdchcma5q3jq7cfxa8b7g8954xv6fxrwcj0ffz"))))
+ "0x006ilgqrf15135ivxv8qrcyhssl1w6pm1gpnna96za58l2f2rr"))))
(properties `((upstream-name . "ChAMPdata")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics r-genomicranges))
@@ -1824,13 +1834,13 @@ and blood controls for CNA analysis.")
(define-public r-chromstardata
(package
(name "r-chromstardata")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chromstaRData" version 'experiment))
(sha256
- (base32 "13xrdr9xrfysh714q4p00pgvwr6ryhvd3jinfqr1gb27s7bdvsi6"))))
+ (base32 "0v28zg8z5b72hci7rqbvjvcgp979zxnq6xgck4baypmkj9ac5wn3"))))
(properties `((upstream-name . "chromstaRData")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/chromstaRData/")
@@ -1843,13 +1853,13 @@ chromstaR package.")
(define-public r-copyhelper
(package
(name "r-copyhelper")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CopyhelpeR" version 'experiment))
(sha256
- (base32 "1zfsxi65lln93fb87l6fgp7vxldb4fvnf95h91dl424xyq6qjp1h"))))
+ (base32 "1ijlba601wknkj6ybbnarcdw1z54f76gkdgynpry1v8jpbpvcadr"))))
(properties `((upstream-name . "CopyhelpeR")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/CopyhelpeR/")
@@ -1866,14 +1876,14 @@ GenomicRanges Bioconductor package.")
(define-public r-flowsorted-blood-450k
(package
(name "r-flowsorted-blood-450k")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "FlowSorted.Blood.450k"
version 'experiment))
(sha256
(base32
- "08xli4a24kkyy5q1ka0vyrpk11yfkyp0gxbs0k8khycppsq9s9sn"))))
+ "0lc45dg5jq0kqycpsggrhi5fa4xj1ciqrj6iw548ccjgdyy2w1xh"))))
(properties `((upstream-name . "FlowSorted.Blood.450k")))
(build-system r-build-system)
(propagated-inputs (list r-minfi))
@@ -1889,14 +1899,14 @@ associated with cell type.")
(define-public r-flowsorted-blood-epic
(package
(name "r-flowsorted-blood-epic")
- (version "2.6.0")
+ (version "2.8.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "FlowSorted.Blood.EPIC" version
'experiment))
(sha256
(base32
- "0vfx1kpy02640nkkkpksisznybv0xb6jkvvkwsybsggcr2rdkl89"))))
+ "1b0azyslk2g08i6v1vv2niw32f0zqasw85b9klw83zdy2f5dcdvh"))))
(properties `((upstream-name . "FlowSorted.Blood.EPIC")))
(build-system r-build-system)
(propagated-inputs
@@ -1923,18 +1933,18 @@ https://www.ncbi.nlm.nih.gov/geo/query/acc.cgi?acc=GSE110554.")
(define-public r-genelendatabase
(package
(name "r-genelendatabase")
- (version "1.38.0")
+ (version "1.40.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "geneLenDataBase" version 'experiment))
(sha256
- (base32 "0skycixz0qbm8cs10kgrkl1ab1qh0mz8641mf5194y839m81d060"))))
+ (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
@@ -1945,13 +1955,13 @@ genomes and gene ID formats, largely based on the UCSC table browser.")
(define-public r-genomationdata
(package
(name "r-genomationdata")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "genomationData" version 'experiment))
(sha256
- (base32 "044q01dbcd34lxgwpg76yk0msvx7gpiibiqxp6fr9jswq6izrzq7"))))
+ (base32 "16mghhik2xzin14d7mqlwfy2dah3ccnga947z9id44vyz906wws7"))))
(properties
`((upstream-name . "genomationData")))
(build-system r-build-system)
@@ -1971,13 +1981,13 @@ downloaded from Encode.")
(define-public r-hdcytodata
(package
(name "r-hdcytodata")
- (version "1.22.1")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "HDCytoData" version 'experiment))
(sha256
(base32
- "1048xgypsw257ihy0ysfxy5443dzhzp2rkjjvpivvrhw4dzl25ir"))))
+ "0pmzgp7x1zam3b7agi8mdq14qmx8nln9lnhiglax2pvg2a5n4ii4"))))
(properties `((upstream-name . "HDCytoData")))
(build-system r-build-system)
(arguments
@@ -2012,14 +2022,14 @@ includes channel names, protein marker names, and protein marker classes.")
(define-public r-illumina450probevariants-db
(package
(name "r-illumina450probevariants-db")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Illumina450ProbeVariants.db"
version 'experiment))
(sha256
(base32
- "1h0qcdmyd22x5y5iwi1w89ppb1k3nb2awwim1lcxgdinab8km52b"))))
+ "1jpknhp624753rhalf81kvl02k4wj19xpncagzf85c878953vph0"))))
(properties `((upstream-name . "Illumina450ProbeVariants.db")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/Illumina450ProbeVariants.db")
@@ -2034,13 +2044,13 @@ European).")
(define-public r-italicsdata
(package
(name "r-italicsdata")
- (version "2.40.0")
+ (version "2.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ITALICSData" version 'experiment))
(sha256
- (base32 "0fzx2qqykma2r2ds53wik4kb9a0wvybr63vf34s91731k21mgsqn"))))
+ (base32 "1d0awis142kgx9hi0dggl6gqg17m0awqzn8ncpqh2lwaka372dq8"))))
(properties `((upstream-name . "ITALICSData")))
(build-system r-build-system)
(home-page "http://bioinfo.curie.fr")
@@ -2053,13 +2063,13 @@ package.")
(define-public r-jaspar2016
(package
(name "r-jaspar2016")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "JASPAR2016" version 'experiment))
(sha256
- (base32 "0dyx29f7jnyqcj85j2yrl8jcphi2kymx2y2mk7ws25xcahl5zzpy"))))
+ (base32 "09q5m71drbp64n26plr0a9bz71akcs4g7pqqyjmsmjrzi40kx7hr"))))
(properties `((upstream-name . "JASPAR2016")))
(build-system r-build-system)
(home-page "https://jaspar.elixir.no/")
@@ -2072,14 +2082,14 @@ please use the package TFBSTools.")
(define-public r-macrophage
(package
(name "r-macrophage")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "macrophage" version
'experiment))
(sha256
(base32
- "10d69v34fhxfy4nhw8h50j4q5kblm032cmjnparxm5gm7ksiqwxy"))))
+ "11ydl4srfxbcqnb42kwk783xd74231g6vgp1f0qs3hl8slc1hk1w"))))
(properties `((upstream-name . "macrophage")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -2092,17 +2102,65 @@ gene expression indicate a role for enhancer priming in immune response\", publi
in Nature Genetics, January 2018.")
(license license:gpl2+)))
+;; This is available only in the devel branch of Bioconductor.
+(define-public r-memes
+ (let ((commit "55f0df1fe65c8ead5252542fdc0da0ff2339049e")
+ (revision "1"))
+ (package
+ (name "r-memes")
+ (version (git-version "1.11.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snystrom/memes")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mp3a610v293prmyid3w1w8fkjkppjnim60h7p9vz2884d0wdvk4"))))
+ (properties `((upstream-name . "memes")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-biostrings
+ r-cmdfun
+ r-dplyr
+ r-genomicranges
+ r-ggplot2
+ r-ggseqlogo
+ r-magrittr
+ r-matrixstats
+ r-patchwork
+ r-processx
+ r-purrr
+ r-readr
+ r-rlang
+ r-tibble
+ r-tidyr
+ r-universalmotif
+ r-usethis
+ r-xml2))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/snystrom/memes")
+ (synopsis
+ "Motif matching, comparison, and de novo discovery using the MEME Suite")
+ (description
+ "This package facilitates motif analysis using MEME Suite tools.
+Memes provides data aware utilities for using GRanges objects as
+entrypoints to motifanalysis, data structures for examining & editing
+motif lists, and novel data visualizations. Memes functions and data
+structures are amenable to both base R and tidyverse workflows.")
+ (license license:expat))))
+
(define-public r-methylclockdata
(package
(name "r-methylclockdata")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "methylclockData" version
'experiment))
(sha256
- (base32 "0q4hiclws0fg03kwvbdwka024gghl1hbmmfficxfghslll78mc3y"))))
+ (base32 "1bwrgib7k71i4i6iq4l71n0z9adq3bg9k8j10bpi79ygn9169np5"))))
(properties `((upstream-name . "methylclockData")))
(build-system r-build-system)
(propagated-inputs (list r-experimenthub r-experimenthubdata))
@@ -2123,14 +2181,14 @@ with different methylation clocks.")
(define-public r-mousegastrulationdata
(package
(name "r-mousegastrulationdata")
- (version "1.16.0")
+ (version "1.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "MouseGastrulationData" version
'experiment))
(sha256
(base32
- "0m03wrqgfhlyc0rmjjcj8b9gcc2rv644hffnff3j1bnkjg5rldi0"))))
+ "0adw98vym1jir1jrzaws7zrlfvls6rfl8bvkpq5sjy4crb33lxy2"))))
(properties `((upstream-name . "MouseGastrulationData")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -2154,13 +2212,13 @@ timecourse of mouse gastrulation and early organogenesis.")
(define-public r-minfidata
(package
(name "r-minfidata")
- (version "0.48.0")
+ (version "0.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "minfiData" version 'experiment))
(sha256
(base32
- "12lhyv3zb8vps7v61zfm8sz4r18rpgphgy7nvdpj48dj3awdnpw8"))))
+ "1myxv7cqh7d1rjav9qhwqsmw3s1xh3zm34vbxwprqaqg87dg4bw0"))))
(properties `((upstream-name . "minfiData")))
(build-system r-build-system)
(propagated-inputs
@@ -2177,13 +2235,13 @@ methylation arrays.")
(define-public r-msdata
(package
(name "r-msdata")
- (version "0.42.0")
+ (version "0.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "msdata" version 'experiment))
(sha256
- (base32 "1jm1zjqzkd0vy8ww0k0y1fgs6i9vkg7ir6dyga001n170g11vfzr"))))
+ (base32 "0g7mlgks3nfnfipnybs7pvsnmrvmq8888g39badca8pi73q1cm25"))))
(properties `((upstream-name . "msdata")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/msdata")
@@ -2200,16 +2258,18 @@ files for various search engines.")
(define-public r-msexperiment
(package
(name "r-msexperiment")
- (version "1.4.0")
+ (version "1.6.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MsExperiment" version))
(sha256
- (base32 "06m0i60zh3xjqmsz6dpp0il833xzdfj0fm6xbhl7kmicvfrcnyfg"))))
+ (base32 "0dxv3jw5aj1i73vqrp3c031pj26i7rp0q2zs4nq3x1vni349506d"))))
(properties `((upstream-name . "MsExperiment")))
(build-system r-build-system)
- (propagated-inputs (list r-iranges
+ (propagated-inputs (list r-biocgenerics
+ r-dbi
+ r-iranges
r-protgenerics
r-qfeatures
r-s4vectors
@@ -2234,14 +2294,14 @@ containers.")
(define-public r-msigdb
(package
(name "r-msigdb")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "msigdb" version
'experiment))
(sha256
(base32
- "1fzgq31n059zhlkny3rfwfnriz81q9brk14r5yx2zhizlv8jcais"))))
+ "080wm9sjwqhaxqx1r3kly1bi1gvkssqpsadnvabx11w493356qr0"))))
(properties `((upstream-name . "msigdb")))
(build-system r-build-system)
(propagated-inputs (list r-annotationdbi
@@ -2266,13 +2326,13 @@ along with the gene set in the @code{GeneSet} class object.")
(define-public r-pasilla
(package
(name "r-pasilla")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pasilla" version 'experiment))
(sha256
- (base32 "0dga4bb7qjigy1m1yp4bs4frwynjqfy3dnnylx4maai9x2zlynd0"))))
+ (base32 "0r5i64125qq5z4c8zliazsi68035d1bsz6ingzqdh37m8prdw1cr"))))
(build-system r-build-system)
(propagated-inputs (list r-dexseq))
(native-inputs (list r-knitr))
@@ -2287,13 +2347,13 @@ by Brooks et al., Genome Research 2011.")
(define-public r-hsmmsinglecell
(package
(name "r-hsmmsinglecell")
- (version "1.22.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "HSMMSingleCell" version 'experiment))
(sha256
- (base32 "1nf6jsjvy3qacwz0dl5jc9h87xhj9q73b0g49c2yrxvv1dhayq0i"))))
+ (base32 "18p8hk2dq26pp4fvcf1m8wsvj1mn66i8nr900knl2n9vs09j70wy"))))
(properties
`((upstream-name . "HSMMSingleCell")))
(build-system r-build-system)
@@ -2316,13 +2376,13 @@ resulting in a complete gene expression profile for each cell.")
(define-public r-all
(package
(name "r-all")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ALL" version 'experiment))
(sha256
- (base32 "1ny5xv338a91gc88a1y5rrd27iawrrlmxhkidvc7xdsbrwd4flkc"))))
+ (base32 "1yl8b8q8i19kx4viwinhyq9xn9d4axlfgjvm7cpf7pys4krhnrha"))))
(properties `((upstream-name . "ALL")))
(build-system r-build-system)
(propagated-inputs
@@ -2340,13 +2400,13 @@ the form of an @code{exprSet} object.")
(define-public r-affydata
(package
(name "r-affydata")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affydata" version 'experiment))
(sha256
- (base32 "1p9gqv8xnakwhf4sani09krlrq6qs4gr8yfjmi8g3s1zq4d32h1k"))))
+ (base32 "0srmrb2pf5dhjfm1l1jd06jgnah16qxillxi5zjr8vq7pgvw8x4b"))))
(properties `((upstream-name . "affydata")))
(build-system r-build-system)
(propagated-inputs
@@ -2362,13 +2422,13 @@ package @code{affy}.")
(define-public r-gagedata
(package
(name "r-gagedata")
- (version "2.40.0")
+ (version "2.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gageData" version 'experiment))
(sha256
- (base32 "13g8hzkh34c0my75xnxdffa1d67xvn9hn592s25m18400lgsfif0"))))
+ (base32 "1kbs0fz1jnx3grd9mpclbahwbp3749ipwfs8ggl9299bhjrgh9i6"))))
(properties `((upstream-name . "gageData")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/gageData")
@@ -2388,13 +2448,13 @@ yeast are also included.")
(define-public r-curatedtcgadata
(package
(name "r-curatedtcgadata")
- (version "1.24.1")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "curatedTCGAData" version 'experiment))
(sha256
- (base32 "0hr66p8l54nzfsizcxxd2njy44xnia607wvfhrgv46f3f8s95z02"))))
+ (base32 "1xdygjwqgy6kjjxzvsy25bckc0f8j5m42wrj1vrnwy5fp0q7y287"))))
(properties
`((upstream-name . "curatedTCGAData")))
(build-system r-build-system)
@@ -2421,14 +2481,14 @@ across the entire multi-'omics experiment.")
(define-public r-parathyroidse
(package
(name "r-parathyroidse")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "parathyroidSE" version
'experiment))
(sha256
(base32
- "0lv7wlbdi05a3l4pv8x4cnc6jzqk1gb82rpmj1cv0nsq7gqhqscv"))))
+ "183cyn1i0i2p8npajwmbwzr2ncrrzwgpvh8adhjxzrdqkn3qdnr5"))))
(properties `((upstream-name . "parathyroidSE")))
(build-system r-build-system)
(propagated-inputs (list r-summarizedexperiment))
@@ -2445,14 +2505,14 @@ cultures from 4 patients at 2 time points over 3 conditions (DPN, OHT and contro
(define-public r-sesamedata
(package
(name "r-sesamedata")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "sesameData" version
'experiment))
(sha256
(base32
- "0a5xchdnlw9ixafk8p3ny58yqv74ba9j4z2sdyp990rbaqrx1gjw"))))
+ "05k67isysszzfkkbi811dkab0cmxnwz81p2ldcqz3gsq5qin3p1g"))))
(properties `((upstream-name . "sesameData")))
(build-system r-build-system)
(propagated-inputs (list r-annotationhub
@@ -2479,13 +2539,13 @@ the @code{HorvathMethylChip40} (Mammal40) array.")
(define-public r-tcgabiolinksgui-data
(package
(name "r-tcgabiolinksgui-data")
- (version "1.22.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TCGAbiolinksGUI.data" version 'experiment))
(sha256
- (base32 "04fmnqa95rb2lgflcg3d7kbz9jj990r9hlxwlhhzb79dv9wd1mfa"))))
+ (base32 "1r36f7nvvjjgkgmhha81n2iyr9k4nzy0qkkblm483rgzxav4gqa6"))))
(properties `((upstream-name . "TCGAbiolinksGUI.data")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -2498,14 +2558,14 @@ TCGAbiolinksGUI package.")
(define-public r-tximportdata
(package
(name "r-tximportdata")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tximportData" version
'experiment))
(sha256
(base32
- "0ksmg3gblkqzz40pzm35y6wghjmszrimdx7bxhq5jv4piqwii0hg"))))
+ "15wy0dhs9sbz27ii64b4i0zxlsm6v75m2f32gisdy9f6gnbgwkjg"))))
(properties `((upstream-name . "tximportData")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -2525,13 +2585,13 @@ and @code{Sailfish}. Alevin example output is also included.")
(define-public r-abarray
(package
(name "r-abarray")
- (version "1.70.0")
+ (version "1.72.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ABarray" version))
(sha256
(base32
- "0p9q2x6n6n1d4w2hfbhhj54qflc6rf1w1qm9p2zqv9fcrm3g153v"))))
+ "1kfqq4df55pxl7gnwf24aaryxijym4gzqfjyif28arlbjci9hlv6"))))
(properties `((upstream-name . "ABarray")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-multtest))
@@ -2551,13 +2611,13 @@ into folders according to the analysis settings used.")
(define-public r-absseq
(package
(name "r-absseq")
- (version "1.56.0")
+ (version "1.58.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ABSSeq" version))
(sha256
(base32
- "0y8j66yargvipwxg2ffcs62idk5q5r8vracfldbd1x5rgq7lf6nq"))))
+ "0zqb2w055x4whgl3mljarsnps6lkz90fwlx2lnirbnrgmlnalwjz"))))
(properties `((upstream-name . "ABSSeq")))
(build-system r-build-system)
(propagated-inputs (list r-limma r-locfit))
@@ -2580,13 +2640,13 @@ ranking by fold-change and visualization.")
(define-public r-adacgh2
(package
(name "r-adacgh2")
- (version "2.42.0")
+ (version "2.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ADaCGH2" version))
(sha256
- (base32 "0lzgn4zqckv37jsgd1azvshblb38khrlcncm98g74qhkswqj5wx3"))))
+ (base32 "1j9dn0xw8mdfvi2ccm1d5j9q740wb89wqi6715n6jy3dljlc8irz"))))
(properties `((upstream-name . "ADaCGH2")))
(build-system r-build-system)
(arguments
@@ -2605,7 +2665,6 @@ ranking by fold-change and visualization.")
r-dnacopy
r-ff
r-glad
- r-snapcgh
r-tilingarray
r-waveslim))
(home-page "https://github.com/rdiaz02/adacgh2")
@@ -2622,13 +2681,13 @@ storing data.")
(define-public r-adam
(package
(name "r-adam")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ADAM" version))
(sha256
(base32
- "0gz3mpkj1q4j7w08ylfzclpa6saxsz7wyp0cldllhxpcj9lxljs5"))))
+ "0z0rmpwfhd8p6c4zscviwsningsm740r3pb95cl8brasfdg1kl3v"))))
(properties `((upstream-name . "ADAM")))
(build-system r-build-system)
(propagated-inputs (list r-dplyr
@@ -2657,13 +2716,13 @@ functionally associated genes} (GFAG).")
(define-public r-adamgui
(package
(name "r-adamgui")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ADAMgui" version))
(sha256
(base32
- "10m5dplkzxsxm7dxcmybihv81yflm3f7q6fmgb1dvwr8lsn1dm03"))))
+ "08kxkb6hgbw7l9dv1wn3jfdkc0sizqdgmjkrzpq73q7rf0p4248g"))))
(properties `((upstream-name . "ADAMgui")))
(build-system r-build-system)
(propagated-inputs
@@ -2705,13 +2764,13 @@ the @code{GFAGpathUi} function.")
(define-public r-adimpute
(package
(name "r-adimpute")
- (version "1.12.0")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ADImpute" version))
(sha256
(base32
- "0299yyin2j8577db2w6mrxmsq68cjlzwyh7z1wvhbj0n1p75r871"))))
+ "0kihg0mwm2ysgnx3jg6xln7ibvgmky0x2hjbcmdqlg65znczh4b6"))))
(properties `((upstream-name . "ADImpute")))
(build-system r-build-system)
(propagated-inputs
@@ -2754,13 +2813,13 @@ results from different methods into an ensemble.")
(define-public r-adsplit
(package
(name "r-adsplit")
- (version "1.72.0")
+ (version "1.74.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "adSplit" version))
(sha256
(base32
- "0av0kji4r788cn5808g13svqpydq6xk4d2awpzpsckz7xbjyx0ya"))))
+ "13rrkb0vxkknvqhb8pgx8d13sxzy3w0wbkhhj5lrlc1kb1yqcfbh"))))
(properties `((upstream-name . "adSplit")))
(build-system r-build-system)
(propagated-inputs
@@ -2782,13 +2841,13 @@ the supporting gene set is determined.")
(define-public r-affixcan
(package
(name "r-affixcan")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AffiXcan" version))
(sha256
(base32
- "1f508sz5vsmmmvp2mcyd2l4hislg2xhnn11xxva010l3i7by8c2r"))))
+ "1241vpqkv4p3yarr6fsz1a7awvc4ff7q75ia3ra7vgkvg7gx9p93"))))
(properties `((upstream-name . "AffiXcan")))
(build-system r-build-system)
(propagated-inputs
@@ -2810,13 +2869,13 @@ expression values are known.")
(define-public r-affyilm
(package
(name "r-affyilm")
- (version "1.54.0")
+ (version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affyILM" version))
(sha256
- (base32 "1sbgc787gvcnpjhm0hv80rsms679wlvphq2ch7s28zdlaa2vz7sv"))))
+ (base32 "185kdrnvcp2jw0k71q0v4yk7583gwgi31h0n281x25hirixf6rm3"))))
(properties `((upstream-name . "affyILM")))
(build-system r-build-system)
(propagated-inputs
@@ -2837,13 +2896,13 @@ concentrations on behal of the Langmuir model.")
(define-public r-affylmgui
(package
(name "r-affylmgui")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affylmGUI" version))
(sha256
- (base32 "1431zmh9van9605lh0i96as48zih17s3cfhjw94v37rswfq09fkg"))))
+ (base32 "1qilkr3dcl6driah24kgz7lrzamq08qp2z03inm2m4r5yx8811wc"))))
(properties `((upstream-name . "affylmGUI")))
(build-system r-build-system)
(propagated-inputs
@@ -2869,13 +2928,13 @@ limma packages.")
(define-public r-affyplm
(package
(name "r-affyplm")
- (version "1.78.0")
+ (version "1.80.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affyPLM" version))
(sha256
- (base32 "0l7rfwj1bdkk9vd5j0zby2ijpapmd5k0s6l84zy4ld47vabxyaa6"))))
+ (base32 "1khknl7k45amyw58mcgw7kl511llyddw31qzwqc2l5c4j3bwnpz5"))))
(properties `((upstream-name . "affyPLM")))
(build-system r-build-system)
(inputs (list zlib))
@@ -2900,13 +2959,13 @@ also provided.")
(define-public r-affyrnadegradation
(package
(name "r-affyrnadegradation")
- (version "1.48.0")
+ (version "1.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AffyRNADegradation" version))
(sha256
(base32
- "0i7929cyqvbx81v1d629g53480m48cbdpxfv0k6lwjfzf4yvazhf"))))
+ "19lcs76jsdy5dz57rkdb8qqankpasrw2r5z4cy98q94az6582ix4"))))
(properties `((upstream-name . "AffyRNADegradation")))
(build-system r-build-system)
(propagated-inputs (list r-affy))
@@ -2925,13 +2984,13 @@ of samples that are affected by RNA degradation.")
(define-public r-agdex
(package
(name "r-agdex")
- (version "1.50.0")
+ (version "1.52.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AGDEX" version))
(sha256
(base32
- "06z74p3khw3r8dnwrpyyikq3ifcdvffxgfwcic9j8vc9s8pf921s"))))
+ "088r2ahqjv61wnzp7by4c5v9aivahmyfkzr7prnkk3ff8zh6pznl"))))
(properties `((upstream-name . "AGDEX")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-gseabase))
@@ -2952,13 +3011,13 @@ experiment.")
(define-public r-aggregatebiovar
(package
(name "r-aggregatebiovar")
- (version "1.12.0")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "aggregateBioVar" version))
(sha256
(base32
- "1i04hhncz9lhjp730gyknd8v7zakz1whc2a5pw3pn37h8k9mq5la"))))
+ "0qag99chj7n7l0wbb8ar0f58xs6883rgddkgj7jnrrlj3acrm12v"))))
(properties `((upstream-name . "aggregateBioVar")))
(build-system r-build-system)
(propagated-inputs
@@ -2986,13 +3045,13 @@ bulk RNA-seq tools.")
(define-public r-agilp
(package
(name "r-agilp")
- (version "3.34.0")
+ (version "3.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "agilp" version))
(sha256
(base32
- "0xbbcmnbnj7y3a1wndv6zhqhrwdpdj6207wh4n0qz794akciw84a"))))
+ "1mfi4xvx6ywkr7b7ma9ip6q2nsjvkri8qx48qyr98yyik7gg28d5"))))
(properties `((upstream-name . "agilp")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/agilp")
@@ -3008,13 +3067,13 @@ but which also provides utilities which may be useful for other platforms.")
(define-public r-adductomicsr
(package
(name "r-adductomicsr")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "adductomicsR" version))
(sha256
(base32
- "0fb670gxzl5aq6vmb5d2l04r0408gxrqs06k1a3b3pzkdbd7qxwm"))))
+ "0800jbfm488i6ccz48k49gpxr9sf9104cxcghgy9c4lzm5d3wfbm"))))
(properties `((upstream-name . "adductomicsR")))
(build-system r-build-system)
(propagated-inputs
@@ -3053,13 +3112,13 @@ mass spectrometry} (MS1) data.")
(define-public r-agimicrorna
(package
(name "r-agimicrorna")
- (version "2.52.0")
+ (version "2.54.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AgiMicroRna" version))
(sha256
(base32
- "0cimi60asz5mmrq2qmnyqq9x5yg14cc67j8135x9zlklblsfyf35"))))
+ "1bm8rxfdgd0fx48fi70by08qr855jv6r4xcr7al2v9akv6vphws2"))))
(properties `((upstream-name . "AgiMicroRna")))
(build-system r-build-system)
(propagated-inputs
@@ -3083,13 +3142,13 @@ objects are used so that other packages could be used as well.")
(define-public r-aims
(package
(name "r-aims")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AIMS" version))
(sha256
(base32
- "0fmzyd8vypcfadqfa8w11mxr12h4a9shgiqpi2n2y150fvhlqf6c"))))
+ "0ljdv1gww01yi0h9j9br8kp67k5wizr1dy0091kngjcbn0dxzmla"))))
(properties `((upstream-name . "AIMS")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-e1071))
@@ -3107,13 +3166,13 @@ well as on dataset of gene expression data.")
(define-public r-airpart
(package
(name "r-airpart")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "airpart" version))
(sha256
(base32
- "1bdlg078nlpibbn3y1cbkglhlm440crx3alzhv9k0psv6arg2kqb"))))
+ "05l5rgjfjln3kip72wj4ll4cgak9yz60xg6dgxxj690pxs1pw7bg"))))
(properties `((upstream-name . "airpart")))
(build-system r-build-system)
(propagated-inputs
@@ -3151,16 +3210,189 @@ quality control functions for examining single cell allelic imbalance
datasets.")
(license license:gpl2)))
+(define-public r-alabaster-base
+ (package
+ (name "r-alabaster-base")
+ (version "1.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.base" version))
+ (sha256
+ (base32 "1yf4j6dwva1d16fb8ss5hrpmj71azwjk9aqpad9wpnfapaldjzhb"))))
+ (properties `((upstream-name . "alabaster.base")))
+ (build-system r-build-system)
+ (inputs (list zlib))
+ (propagated-inputs (list r-alabaster-schemas
+ r-jsonlite
+ r-jsonvalidate
+ r-rcpp
+ r-rhdf5
+ r-rhdf5lib
+ r-s4vectors))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.base")
+ (synopsis "Save Bioconductor objects to file")
+ (description
+ "This is a package for saving Bioconductor data structures into file
+artifacts, and loading them back into memory. This is a more robust and
+portable alternative to serialization of such objects into RDS files. Each
+artifact is associated with metadata for further interpretation; downstream
+applications can enrich this metadata with context-specific properties.")
+ (license license:expat)))
+
+(define-public r-alabaster-matrix
+ (package
+ (name "r-alabaster-matrix")
+ (version "1.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.matrix" version))
+ (sha256
+ (base32 "1b32qs2baq9s492a332vh1hpyxq62z16xj2w17m8wh8a4mcabry8"))))
+ (properties `((upstream-name . "alabaster.matrix")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-alabaster-base
+ r-biocgenerics
+ r-delayedarray
+ r-hdf5array
+ r-matrix
+ r-rcpp
+ r-rhdf5
+ r-s4arrays
+ r-s4vectors
+ r-sparsearray))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.matrix")
+ (synopsis "Load and save artifacts from file")
+ (description
+ "This is a package for saving matrices, arrays and similar objects into
+file artifacts, and loading them back into memory. This is a more portable
+alternative to serialization of such objects into RDS files. Each artifact is
+associated with metadata for further interpretation; downstream applications
+can enrich this metadata with context-specific properties.")
+ (license license:expat)))
+
+(define-public r-alabaster-ranges
+ (package
+ (name "r-alabaster-ranges")
+ (version "1.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.ranges" version))
+ (sha256
+ (base32 "16r5wdlw2g9qnbvzpx5c5c04xa5dkwrmqlyc81iixkx6j98gsz2w"))))
+ (properties `((upstream-name . "alabaster.ranges")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-alabaster-base
+ r-biocgenerics
+ r-genomeinfodb
+ r-genomicranges
+ r-iranges
+ r-rhdf5
+ r-s4vectors))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.ranges")
+ (synopsis "Load and save Ranges-related artifacts from file")
+ (description
+ "This is a package for saving @code{GenomicRanges}, @code{IRanges} and
+related data structures into file artifacts, and loading them back into
+memory. This is a more portable alternative to serialization of such objects
+into RDS files. Each artifact is associated with metadata for further
+interpretation; downstream applications can enrich this metadata with
+context-specific properties.")
+ (license license:expat)))
+
+(define-public r-alabaster-sce
+ (package
+ (name "r-alabaster-sce")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.sce" version))
+ (sha256
+ (base32 "1i9nmivsfrd7fbb8njmwihfx4xpj4p3h5bnlj9fvk5308bbj3qcg"))))
+ (properties `((upstream-name . "alabaster.sce")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-alabaster-base r-alabaster-se r-jsonlite
+ r-singlecellexperiment))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.sce")
+ (synopsis "Load and save SingleCellExperiment from file")
+ (description
+ "This is a package for saving @code{SingleCellExperiment} into file
+artifacts, and loading them back into memory. This is a more portable
+alternative to serialization of such objects into RDS files. Each artifact is
+associated with metadata for further interpretation; downstream applications
+can enrich this metadata with context-specific properties.")
+ (license license:expat)))
+
+(define-public r-alabaster-schemas
+ (package
+ (name "r-alabaster-schemas")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.schemas" version))
+ (sha256
+ (base32 "1cizlslxw0nhrfjsz3x90waa9w4n2v72a0cycbzvxqbbvkh3cp1l"))))
+ (properties `((upstream-name . "alabaster.schemas")))
+ (build-system r-build-system)
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.schemas")
+ (synopsis "Schemas for the Alabaster framework")
+ (description
+ "This package stores all schemas required by various @code{alabaster.*}
+packages. No computation should be performed by this package, as that is
+handled by @code{alabaster.base}.")
+ (license license:expat)))
+
+(define-public r-alabaster-se
+ (package
+ (name "r-alabaster-se")
+ (version "1.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "alabaster.se" version))
+ (sha256
+ (base32 "134r4pwaa4nsmdgqxs16w3adn482zl70lgyd4s96pmx7hqm9i1vx"))))
+ (properties `((upstream-name . "alabaster.se")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-alabaster-base
+ r-alabaster-matrix
+ r-alabaster-ranges
+ r-biocgenerics
+ r-genomicranges
+ r-iranges
+ r-jsonlite
+ r-s4vectors
+ r-summarizedexperiment))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/alabaster.se")
+ (synopsis "Load and save SummarizedExperiments from file")
+ (description
+ "This is a package for saving @code{SummarizedExperiments} into file
+artifacts, and loading them back into memory. This is a more portable
+alternative to serialization of such objects into RDS files. Each artifact is
+associated with metadata for further interpretation; downstream applications
+can enrich this metadata with context-specific properties.")
+ (license license:expat)))
+
(define-public r-amountain
(package
(name "r-amountain")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AMOUNTAIN" version))
(sha256
(base32
- "1c65vn2k3hzzymik9ia7nk32sf0hr83q27yzf561a1hgv3m67d65"))))
+ "1y2k1vg31siic6j98700m54sswbj6wr4dvbw2mz3hlm0nmsmpxc1"))))
(properties `((upstream-name . "AMOUNTAIN")))
(build-system r-build-system)
(inputs (list gsl))
@@ -3178,13 +3410,13 @@ in multi-layer WGCN using a continuous optimization approach.")
(define-public r-amplican
(package
(name "r-amplican")
- (version "1.24.0")
+ (version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "amplican" version))
(sha256
(base32
- "0xsw6226yyyl5zgmcyfim6dxj04zrpzbd1288l0hysq1s3b1yslw"))))
+ "1nbyivd5020kqkmk5ngpaixhdxgmqpifaxnfgq6yc2njqizgbhxy"))))
(properties `((upstream-name . "amplican")))
(build-system r-build-system)
(propagated-inputs
@@ -3204,6 +3436,7 @@ in multi-layer WGCN using a continuous optimization approach.")
r-knitr
r-matrix
r-matrixstats
+ r-pwalign
r-rcpp
r-rmarkdown
r-s4vectors
@@ -3225,13 +3458,13 @@ problems.")
(define-public r-amaretto
(package
(name "r-amaretto")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AMARETTO" version))
(sha256
(base32
- "1h0ci2sak2x5dhcshmgk4hy53ggjvrz3kaj61m47w5fjkj0lz79s"))))
+ "0n3w00x1qajkg43ip3l63k2qs0d1x2zv8wv4xj0iqwl6r6cqgxnf"))))
(properties `((upstream-name . "AMARETTO")))
(build-system r-build-system)
(propagated-inputs
@@ -3277,13 +3510,13 @@ canonical cancer pathways.")
(define-public r-anaquin
(package
(name "r-anaquin")
- (version "2.26.0")
+ (version "2.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Anaquin" version))
(sha256
(base32
- "1f2xf1i9l1s7433mvqjsralpm77qg0m73dw1rq9jsxbpk1f502ld"))))
+ "0hfvwzkfy6bm2ffghax5b228k2l6wf8zq82q13h6bxfps4wz0jgb"))))
(properties `((upstream-name . "Anaquin")))
(build-system r-build-system)
(propagated-inputs
@@ -3307,13 +3540,13 @@ analysis, modelling, and visualization of spike-in controls.")
(define-public r-ancombc
(package
(name "r-ancombc")
- (version "2.4.0")
+ (version "2.6.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ANCOMBC" version))
(sha256
(base32
- "1m63k1b9xh5mv4zb5m9nlrdcqkh2h477x1zyfk8j89idcvk9jil7"))))
+ "14jdfcv3hghl1z2f7zj2mdqdyblz5sn4l1iwh8bhvih86cpigb58"))))
(properties `((upstream-name . "ANCOMBC")))
(build-system r-build-system)
(propagated-inputs
@@ -3356,13 +3589,13 @@ these biases and construct statistically consistent estimators.")
(define-public r-animalcules
(package
(name "r-animalcules")
- (version "1.18.3")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "animalcules" version))
(sha256
(base32
- "0j8fa5cr6s20bgw7v62by61q7nk8iw64v4wshwbd2cc36gr7s3c8"))))
+ "1g073n8nmckd388hy9gfiddil53wv692k69ywjc85jyp5jy2n265"))))
(properties `((upstream-name . "animalcules")))
(build-system r-build-system)
(propagated-inputs
@@ -3374,6 +3607,7 @@ these biases and construct statistically consistent estimators.")
r-dplyr
r-dt
r-forcats
+ r-ggforce
r-ggplot2
r-gunifrac
r-lattice
@@ -3391,6 +3625,7 @@ these biases and construct statistically consistent estimators.")
r-shinyjs
r-summarizedexperiment
r-tibble
+ r-tidyr
r-tsne
r-umap
r-vegan
@@ -3413,13 +3648,13 @@ to understand their data better and discover new insights.")
(define-public r-annotationhubdata
(package
(name "r-annotationhubdata")
- (version "1.32.1")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationHubData" version))
(sha256
- (base32 "09x2njf32lvj2irpjffjn2bsh42zkchirb7779xfyh745iis57mm"))))
+ (base32 "0wcbghjvgr8sx1qg9kyjxb7znkxhihy7jvzycrv4pyq746154xbi"))))
(properties `((upstream-name . "AnnotationHubData")))
(build-system r-build-system)
(arguments
@@ -3464,17 +3699,18 @@ for use in Bioconductor’s AnnotationHub.")
(define-public r-anvil
(package
(name "r-anvil")
- (version "1.14.2")
+ (version "1.16.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AnVIL" version))
(sha256
(base32
- "1vfriymy1v3mxahfdf4sd6rawi0qy7vzxrymi852w49fmy54bgp7"))))
+ "0i4skg2bpj0rbb3fbaprfs4d4nxg9aj8d6pni4a3k0wip3dw1cf9"))))
(properties `((upstream-name . "AnVIL")))
(build-system r-build-system)
(propagated-inputs
- (list r-biocmanager
+ (list r-biocbaseutils
+ r-biocmanager
r-dplyr
r-dt
r-futile-logger
@@ -3487,7 +3723,8 @@ for use in Bioconductor’s AnnotationHub.")
r-shiny
r-tibble
r-tidyr
- r-tidyselect))
+ r-tidyselect
+ r-yaml))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/AnVIL")
(synopsis "Provides access to AnVIL, Terra, Leonardo and other projects")
@@ -3505,13 +3742,13 @@ to transform JSON responses to formats more amenable to manipulation in R.")
(define-public r-aldex2
(package
(name "r-aldex2")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ALDEx2" version))
(sha256
(base32
- "0wchlw9dprw7vkw26h26ypx06xv2j0cxbidw61pcqaxmrrh14dhz"))))
+ "1bqpk93bbyajw2dm54d68f3dkc0jgcny109asfm6kcz7dg7szi3y"))))
(properties `((upstream-name . "ALDEx2")))
(build-system r-build-system)
(propagated-inputs
@@ -3549,13 +3786,13 @@ paired or unpaired study designs.")
(define-public r-alevinqc
(package
(name "r-alevinqc")
- (version "1.18.1")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "alevinQC" version))
(sha256
(base32
- "0jzvldbqsqz5j0fp41jdq3vfwp1q1ggckparzx21jlli211c9shr"))))
+ "1pq42lvgggysg28ngxipqb1l7jfj498nxpg40h02siz6nb6inbdw"))))
(properties `((upstream-name . "alevinQC")))
(build-system r-build-system)
(propagated-inputs
@@ -3583,13 +3820,13 @@ generated as HTML or PDF files, or as Shiny applications.")
(define-public r-alphabeta
(package
(name "r-alphabeta")
- (version "1.16.0")
+ (version "1.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AlphaBeta" version))
(sha256
(base32
- "0zja8mysw0ljkvk6vqdx4c9wpf45zs64iyazh90mlf6xhbrvqfvq"))))
+ "192jyfw2676x8pgcp9h4d78283p7n6gnsdw7wzphfjn12v266fb5"))))
(properties `((upstream-name . "AlphaBeta")))
(build-system r-build-system)
(propagated-inputs
@@ -3663,13 +3900,13 @@ data.")
(define-public r-alpsnmr
(package
(name "r-alpsnmr")
- (version "4.4.0")
+ (version "4.6.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AlpsNMR" version))
(sha256
(base32
- "0141kayx20mm8skqr2210bpl76ra560ik7gf71iar03r3izcfczq"))))
+ "1c8ynw9424ygc4wj4drbm9gdkdqwgb5z7p72zk3x5zh3zqai0d1d"))))
(properties `((upstream-name . "AlpsNMR")))
(build-system r-build-system)
(propagated-inputs
@@ -3717,13 +3954,13 @@ data. Efficient plotting with 1-D data is also available. Basic reading of
(define-public r-altcdfenvs
(package
(name "r-altcdfenvs")
- (version "2.64.0")
+ (version "2.66.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "altcdfenvs" version))
(sha256
(base32
- "17kgiqa5dbfp74jrm565wlx9sj4ydbds2y8ahs7dikvdvm725qsn"))))
+ "08k3j3dc93vg5c9ccw7mc4fri9xbdj7rdjyj0h6ig0s5866fqvlb"))))
(properties `((upstream-name . "altcdfenvs")))
(build-system r-build-system)
(propagated-inputs
@@ -3748,13 +3985,13 @@ create an alternative mapping from sequences.")
(define-public r-aneufinder
(package
(name "r-aneufinder")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AneuFinder" version))
(sha256
(base32
- "0x7v60j1c1g12qlqxgshpmbnwzjbmlnkrfh60wl43inr0wyllq1l"))))
+ "0dgmg0slyrh025wgz299dzzmpirlmdhmabxspci1qfarakw5yicf"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -3789,13 +4026,13 @@ sequencing data.")
(define-public r-anf
(package
(name "r-anf")
- (version "1.24.1")
+ (version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ANF" version))
(sha256
(base32
- "0yal8lbillhj3zi2rcdk7k9r748jxm3196z54y1674qxzpvp24rk"))))
+ "00s2rlkh5snqmvlz5a21ilmm0ngh4g362y7iayr6f78nh8gwp617"))))
(properties `((upstream-name . "ANF")))
(build-system r-build-system)
(propagated-inputs
@@ -3817,13 +4054,13 @@ network fusion.")
(define-public r-annmap
(package
(name "r-annmap")
- (version "1.44.0")
+ (version "1.46.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "annmap" version))
(sha256
(base32
- "1gf0qdhj4ijgb6b67fh94zx084k5r87la3d7vc0qxs413rvr4mj8"))))
+ "1xijcm0c19wj2yknrlsz2ifm097z32rc58k608482686srj0bg2i"))))
(properties `((upstream-name . "annmap")))
(build-system r-build-system)
(propagated-inputs
@@ -3851,13 +4088,13 @@ Functions to plot gene architecture and BAM file data are also provided.")
(define-public r-antiprofiles
(package
(name "r-antiprofiles")
- (version "1.42.0")
+ (version "1.44.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "antiProfiles" version))
(sha256
(base32
- "14lzyq08gnm9r99xwaqh50sz0dwzhmiyyylkg239dlbw80zmv404"))))
+ "0p2fhxzgn877mic2yv1sgcidgm74z8hxa3hdaawgvhhvi2j6v8wa"))))
(properties `((upstream-name . "antiProfiles")))
(build-system r-build-system)
(propagated-inputs
@@ -3877,13 +4114,13 @@ tumor samples from healthy controls.")
(define-public r-arrayexpress
(package
(name "r-arrayexpress")
- (version "1.62.0")
+ (version "1.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ArrayExpress" version))
(sha256
(base32
- "0cnb6r6rqbz5qph32aa1mghr0w2rhl6znyiblj0cbkv45mx2k4jr"))))
+ "1ad6h0pi04r9m3nwxrn7sha837m95kwii8z6s7j4zbka9ijy2pr4"))))
(properties `((upstream-name . "ArrayExpress")))
(build-system r-build-system)
(propagated-inputs
@@ -3904,13 +4141,13 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
(define-public r-arrayqualitymetrics
(package
(name "r-arrayqualitymetrics")
- (version "3.58.0")
+ (version "3.60.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "arrayQualityMetrics" version))
(sha256
(base32
- "1k80ih7r3hf48r9rp9dl2wl8m17620dqr4fch49kdsq97hm5q5dm"))))
+ "04y1vbpxqhqn1vsyqmscikaxn6wshsk4krcqzf2baf9x4azbdjk1"))))
(properties `((upstream-name . "arrayQualityMetrics")))
(build-system r-build-system)
(propagated-inputs (list r-affy
@@ -3942,13 +4179,13 @@ supported.")
(define-public r-arraymvout
(package
(name "r-arraymvout")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "arrayMvout" version))
(sha256
- (base32 "0z3ksx0yigan5aiq7vsdx78khlrcdxa4yd5b46rfn83gsrjbxzhz"))))
+ (base32 "11v3s972nyahdswqdcab0fj9jb73vd5dnd5kfb09572y4z0hn5xw"))))
(properties `((upstream-name . "arrayMvout")))
(build-system r-build-system)
(arguments
@@ -3978,13 +4215,13 @@ fixed Type I error rate.")
(define-public r-arrayquality
(package
(name "r-arrayquality")
- (version "1.80.0")
+ (version "1.82.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "arrayQuality" version))
(sha256
- (base32 "1bm46zf5c1i7fd848bqajv3agl05b93xsvam7034033ypyx6bf1z"))))
+ (base32 "0wmczy2wdxki9pam9q6ly5clvqbl018v1ar4zkdm8algjddyc2cp"))))
(properties `((upstream-name . "arrayQuality")))
(build-system r-build-system)
(propagated-inputs
@@ -4003,13 +4240,13 @@ quality assessment.")
(define-public r-asafe
(package
(name "r-asafe")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASAFE" version))
(sha256
(base32
- "13pn2s59npp8lhc2sk9sa7dq8fy6jlq22c71n3rcjgxrrh690nb8"))))
+ "13qf4jvf0m6i46bwqxdhd4zllac370ckwnd9xh6p56r1lrgcl4sa"))))
(properties `((upstream-name . "ASAFE")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -4026,13 +4263,13 @@ pairs.")
(define-public r-aseb
(package
(name "r-aseb")
- (version "1.46.3")
+ (version "1.48.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASEB" version))
(sha256
(base32
- "1da6ld3ij55l3saj05ink8i1f6gqwyrv896qh8g94dmh6vzn2xbr"))))
+ "1h5rgy2n7rxd72ypzwnfclw8h5hvdnac48fgbfll669z2k97dsmm"))))
(properties `((upstream-name . "ASEB")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/ASEB")
@@ -4053,13 +4290,13 @@ RNAs.")
(define-public r-asgsca
(package
(name "r-asgsca")
- (version "1.36.0")
+ (version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASGSCA" version))
(sha256
(base32
- "13nk19rccrp0xl1s5gjwydpl1ayc7zc2izjrij9iz7fh2r79gn7f"))))
+ "0gvpb1pspm7zlllg77fbi3g6csa3cpp2lbljna2m0xfi0c5zdqvw"))))
(properties `((upstream-name . "ASGSCA")))
(build-system r-build-system)
(propagated-inputs (list r-mass r-matrix))
@@ -4076,13 +4313,13 @@ model as latent variables.")
(define-public r-asics
(package
(name "r-asics")
- (version "2.18.1")
+ (version "2.20.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASICS" version))
(sha256
(base32
- "0sii6sg20l6mfm8cj8zas2dm3wq6fwcwanav6fl7wkv8msk02sxb"))))
+ "0halznbl3bflnn38rh9h5a5f0dsc88n6x6kwdffbpnin9i192q1k"))))
(properties `((upstream-name . "ASICS")))
(build-system r-build-system)
(propagated-inputs
@@ -4110,13 +4347,13 @@ the spectra of the library with a sparse penalty.")
(define-public r-aspli
(package
(name "r-aspli")
- (version "2.12.0")
+ (version "2.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASpli" version))
(sha256
(base32
- "0rj103vvff2c20r018491i71393x0idq22ri4zg3qibx2accd7jy"))))
+ "1br4apbc3zn06ilg8fjb8xcxaimz4h7rnx9i60ak4wnpvgzgbyh2"))))
(properties `((upstream-name . "ASpli")))
(build-system r-build-system)
(propagated-inputs
@@ -4139,6 +4376,7 @@ the spectra of the library with a sparse penalty.")
r-rsamtools
r-s4vectors
r-tidyr
+ r-txdbmaker
r-upsetr))
(home-page "https://bioconductor.org/packages/ASpli")
(synopsis "Analysis of alternative splicing using RNA-Seq")
@@ -4158,13 +4396,13 @@ that might arise in splicing patterns.")
(define-public r-assessorf
(package
(name "r-assessorf")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AssessORF" version))
(sha256
(base32
- "0v64d3nmvcj6bz8zplyqzslm7kz6j3y0nl316h76g094hify64lk"))))
+ "1gzaafsfqzy2x35i251gvkd1syif80qb08kkvgnf1i6c8d2czmps"))))
(properties `((upstream-name . "AssessORF")))
(build-system r-build-system)
(propagated-inputs
@@ -4187,13 +4425,13 @@ start codons as the forms of evidence.")
(define-public r-asset
(package
(name "r-asset")
- (version "2.20.0")
+ (version "2.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASSET" version))
(sha256
(base32
- "0mm15i59vsnz8zh2d10xnab3a6kq08hwd3pzm3r12g4wcrdsxfxc"))))
+ "1wqsnp7w3ml7azrx72fafcfbmjg4324jaxcijpcrlrrccxl5rwp4"))))
(properties `((upstream-name . "ASSET")))
(build-system r-build-system)
(propagated-inputs (list r-mass r-msm r-rmeta))
@@ -4214,24 +4452,27 @@ variant.")
(define-public r-atena
(package
(name "r-atena")
- (version "1.8.0")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "atena" version))
(sha256
(base32
- "1qfgy76d65hbx32fw1yf20n1vavylcafb9fgqqp02r455vk3xzng"))))
+ "1y2v8mi9awgfbcawpcir01qglxn0bdgj6v2dsdqp6if25cizl3sr"))))
(properties `((upstream-name . "atena")))
(build-system r-build-system)
(propagated-inputs
(list r-annotationhub
r-biocgenerics
r-biocparallel
+ r-cli
r-genomeinfodb
r-genomicalignments
+ r-genomicfeatures
r-genomicranges
r-iranges
r-matrix
+ r-matrixgenerics
r-matrixstats
r-rsamtools
r-s4vectors
@@ -4255,13 +4496,13 @@ transcripts in an integrated manner.")
(define-public r-atsnp
(package
(name "r-atsnp")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "atSNP" version))
(sha256
(base32
- "1nksx6al1cr6apknvrabi3gdbr7m61ms81nmkq4qykx5aysmp8mv"))))
+ "08pcbys8iy8wzqzzvlnwc3qw7m7cswkqa3x2x2x8m4ni1s4isd6z"))))
(properties `((upstream-name . "atSNP")))
(build-system r-build-system)
(propagated-inputs
@@ -4288,13 +4529,13 @@ SNP-led changes in motif matches.")
(define-public r-attract
(package
(name "r-attract")
- (version "1.54.0")
+ (version "1.56.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "attract" version))
(sha256
(base32
- "0lk8gfbccrxly7gn629497sxz0mj3m9wcwdahqv1m7l6fjnf5563"))))
+ "08l634sk6y06y2m78vsd0ld4w3h6qvx4hk6wkqflkl9jjyqpx8jy"))))
(properties `((upstream-name . "attract")))
(build-system r-build-system)
(propagated-inputs
@@ -4319,13 +4560,13 @@ transcriptionally-coordinated changes in gene expression.")
(define-public r-awfisher
(package
(name "r-awfisher")
- (version "1.16.0")
+ (version "1.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AWFisher" version))
(sha256
(base32
- "10c5qi040z2w46k7qdcd2yap11mzllllrbr0nx7gd9gfzwlx089s"))))
+ "0z5qs337zqqri2g3m69m85xg4x5sxnqlkbwz83vhnqfzmy9nqym0"))))
(properties `((upstream-name . "AWFisher")))
(build-system r-build-system)
(propagated-inputs
@@ -4343,13 +4584,13 @@ meta-pattern.")
(define-public r-awst
(package
(name "r-awst")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "awst" version))
(sha256
(base32
- "0hry7ynv69hqbwyhlsilf1f9w8yadidbn2ckm5dx9mnb5ihgkyvj"))))
+ "1iaakdjxrz4szl4lnjcszy47q5dsh2d7i3wrr3wwdhw6wjcd62hj"))))
(properties `((upstream-name . "awst")))
(build-system r-build-system)
(propagated-inputs (list r-summarizedexperiment))
@@ -4370,16 +4611,16 @@ artifacts.")
(define-public r-baalchip
(package
(name "r-baalchip")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BaalChIP" version))
(sha256
(base32
- "0d08mp12lw4qdy7w7i474ywcy2zgv940nc44w0gbb9h9dfl22crv"))))
+ "1xm6czgbfz2rjrz5996d0n7xmlh9pd1mw9i8ac66pmn5fi44pbz2"))))
(properties `((upstream-name . "BaalChIP")))
(build-system r-build-system)
- (inputs (list perl)) ; extra/get.overlaps.v2_chrXY.perl
+ (inputs (list)) ; extra/get.overlaps.v2_chrXY.perl
(propagated-inputs
(list r-coda
r-doby
@@ -4410,13 +4651,13 @@ alleles, a known phenotypical feature of cancer samples.")
(define-public r-bags
(package
(name "r-bags")
- (version "2.42.0")
+ (version "2.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BAGS" version))
(sha256
- (base32 "0356ragpcldr48yycqj91sn3bcqvvfp5spv2z02r8g6hs0dndwdh"))))
+ (base32 "1xc7gp5fljqz26lj8sjcilm01g636p4wlzy4pzy5wgqxgfcw3zps"))))
(properties `((upstream-name . "BAGS")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-breastcancervdx))
@@ -4431,13 +4672,13 @@ interest.")
(define-public r-basespacer
(package
(name "r-basespacer")
- (version "1.46.0")
+ (version "1.48.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BaseSpaceR" version))
(sha256
(base32
- "1ldsgrhxb1nm8xj7mws461apjknp9c2bhq3738f63i2qj9g25j4g"))))
+ "02f2l42p08xags155qydz97ipg5vya0prmrlw4kvahgbq5p0xm44"))))
(properties `((upstream-name . "BaseSpaceR")))
(build-system r-build-system)
(propagated-inputs (list r-rcurl r-rjsonio))
@@ -4478,13 +4719,13 @@ you will have to normalize your data beforehand.")
(define-public r-bader
(package
(name "r-bader")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BADER" version))
(sha256
(base32
- "0zmf7a7lwsnk9gcg48vmzdvfmzhvnbawwg77pb4gy3cw9sjdz5ym"))))
+ "15lsvfmp4qsrv12bcrz5q8yz8xyg9rckrcflr3k6si03z2vw812p"))))
(properties `((upstream-name . "BADER")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/BADER")
@@ -4502,13 +4743,13 @@ can be used for further down-stream analyses such as gene set enrichment.")
(define-public r-badregionfinder
(package
(name "r-badregionfinder")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BadRegionFinder" version))
(sha256
(base32
- "17smlghl8s667n6cjx64mqli9drmv0pkq51mhjlyjy2v019im7l9"))))
+ "1hs1mv8gj4w0wk6sw6r08j237vw3lhjrv9zip5nk6l1g1r0pg597"))))
(properties `((upstream-name . "BadRegionFinder")))
(build-system r-build-system)
(propagated-inputs
@@ -4529,13 +4770,13 @@ Various visual and textual types of output are available.")
(define-public r-bambu
(package
(name "r-bambu")
- (version "3.4.1")
+ (version "3.6.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bambu" version))
(sha256
(base32
- "0j2ivn93dpn7xas0bzfxhwmqzxzscgc3sjkx85y5v2ra1i6jy5k7"))))
+ "1pn6a74nvcpn0xzfb8167hbc6pdma0ybhh7kjpqdl4hgjp446w5w"))))
(properties `((upstream-name . "bambu")))
(build-system r-build-system)
(propagated-inputs
@@ -4572,13 +4813,13 @@ usage.")
(define-public r-bandits
(package
(name "r-bandits")
- (version "1.18.1")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BANDITS" version))
(sha256
(base32
- "0y81m37c5irpaw9pfm5b672wk804n4x1g9g5pfh1dp7pggfwbf1z"))))
+ "1iizs0bvs7rbkwv3vs6xk26jy222kql80fp6cki0qs9h9igpzk5h"))))
(properties `((upstream-name . "BANDITS")))
(build-system r-build-system)
(propagated-inputs
@@ -4610,13 +4851,13 @@ the posterior densities for the average relative abundance of transcripts.")
(define-public r-banocc
(package
(name "r-banocc")
- (version "1.26.0")
+ (version "1.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "banocc" version))
(sha256
(base32
- "0y6mizkbx3s2x6465g53q87q0sixxrxhjvjmvwiilhirxf4x7hgp"))))
+ "12fysw9m3rrmyfq1j97rdklaln6vgjdmz7hj85vrh10haz9j23s2"))))
(properties `((upstream-name . "banocc")))
(build-system r-build-system)
(propagated-inputs
@@ -4638,13 +4879,13 @@ estimates for each correlation element.")
(define-public r-barcodetrackr
(package
(name "r-barcodetrackr")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "barcodetrackR" version))
(sha256
(base32
- "1w5p6dqagf3g27ymqsxdim0qhnwm11rrs3nnpp4mj8jcxm8wjsh9"))))
+ "0x0fpa44lyww2l1rdc35pdlgczz4y1vxjbn0s1frlpaacmqcxrly"))))
(properties `((upstream-name . "barcodetrackR")))
(build-system r-build-system)
(propagated-inputs
@@ -4680,14 +4921,14 @@ retrieval analyses, or similar technologies.")
(define-public r-biocversion
(package
(name "r-biocversion")
- (version "3.18.1")
+ (version "3.19.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocVersion" version))
(sha256
(base32
- "15wr651ylbx3am213dsy5kdr1xc8r5c9rfq5ydxzqlmxzjgymj55"))))
+ "1zhm28313gsbscfhfdbqizvb5v67n4l0dapjmb1xq010ikly95mh"))))
(properties `((upstream-name . "BiocVersion")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/BiocVersion/")
@@ -4700,13 +4941,13 @@ of Bioconductor.")
(define-public r-biocgenerics
(package
(name "r-biocgenerics")
- (version "0.48.1")
+ (version "0.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocGenerics" version))
(sha256
(base32
- "0av525j9l0y3kjdy5wl6s35sh4nsabmdclq3687l5258kmq2dq8k"))))
+ "0500ya3df53xx1dfdmk50bh30ja28y6qkdwds1c1m4c7q0h2xmqi"))))
(properties
`((upstream-name . "BiocGenerics")))
(build-system r-build-system)
@@ -4720,13 +4961,13 @@ packages.")
(define-public r-breakpointr
(package
(name "r-breakpointr")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "breakpointR" version))
(sha256
(base32
- "1jhgimybc2ib201k6vs5nfyi1whpkkzn7nj562yhz74208fx793a"))))
+ "0imbsqrslclvfyvc00sv6ngvl5hqlr6ian07v521m63ffpx6ll78"))))
(properties `((upstream-name . "breakpointR")))
(build-system r-build-system)
(propagated-inputs
@@ -4754,13 +4995,13 @@ export of Strand-seq data.")
(define-public r-cardelino
(package
(name "r-cardelino")
- (version "1.4.0")
+ (version "1.6.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "cardelino" version))
(sha256
(base32
- "0y4d3db01jwahz01hx3dswc4gg0x5k7325v4n1illgw3ddj2mvgn"))))
+ "16mczwh41gf7ikbzxvggai7a8d64fn2k7q9w1yxf0sn6cwg3l0di"))))
(properties `((upstream-name . "cardelino")))
(build-system r-build-system)
(propagated-inputs (list r-combinat
@@ -4792,13 +5033,13 @@ stochastic dropout events as well as systematic allelic imbalance is used.")
(define-public r-cellid
(package
(name "r-cellid")
- (version "1.10.1")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CelliD" version))
(sha256
(base32
- "13hwxhdp268h3n8d8wgr75i60apa9mama9bg049yz7c6mj5ixd1v"))))
+ "0c7hls5qasjd5ahrqxp2mpd402jc12pi0pgy7spcbp1fkqm8qvbl"))))
(properties `((upstream-name . "CelliD")))
(build-system r-build-system)
(propagated-inputs
@@ -4838,13 +5079,13 @@ enrichment in single cell data.")
(define-public r-coregx
(package
(name "r-coregx")
- (version "2.6.1")
+ (version "2.8.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CoreGx" version))
(sha256
- (base32 "16i8xq98vg8xgscwj0w9bsq68vjmhsvwwdw66kcphvf3jjfmn1rv"))))
+ (base32 "05fyncpqiq08a169rjwyc117wkyckh714z0is2r0g79920i36jas"))))
(properties `((upstream-name . "CoreGx")))
(build-system r-build-system)
(propagated-inputs
@@ -4883,13 +5124,13 @@ the curve} or @acronym{SF, survival fraction} are included.")
(define-public r-coverageview
(package
(name "r-coverageview")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CoverageView" version))
(sha256
(base32
- "1sj1vr84nsbygkh5mmp7zm21zzk4zcw3bwcvcazmy54zs553blpf"))))
+ "1wgkn2adcxl6js3cvawhvzpxm3nmnnc16wbnzkrnsnd9l12aasih"))))
(build-system r-build-system)
(propagated-inputs
(list r-genomicalignments
@@ -4910,13 +5151,13 @@ how the coverage distributed across the genome.")
(define-public r-cummerbund
(package
(name "r-cummerbund")
- (version "2.44.0")
+ (version "2.46.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "cummeRbund" version))
(sha256
(base32
- "1a5x3jzagd1a385yk1brs4say02r0l21qqjak4cl6fsv8ihhy05s"))))
+ "0hdm2214waz02ybr264xis48kj2anpad80jk640p49v9r17iia9l"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -4940,13 +5181,13 @@ used visualizations.")
(define-public r-dama
(package
(name "r-dama")
- (version "1.74.0")
+ (version "1.76.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "daMA" version))
(sha256
(base32
- "1ckk8h6adylaxq6bh14ym9vvrrhsfglnaigqz16v96vsj8q9i336"))))
+ "1hv43r6rymp09fl7vgr8jf6naixkrgl282ggf6nva0jxf1jnfmb3"))))
(properties `((upstream-name . "daMA")))
(build-system r-build-system)
(propagated-inputs (list r-mass))
@@ -4962,13 +5203,13 @@ factorial microarray data.")
(define-public r-damefinder
(package
(name "r-damefinder")
- (version "1.14.0")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DAMEfinder" version))
(sha256
(base32
- "0mbm884dm30b4fwf3qr1w96j18dxdmr2bn11dw83hh0wrbhp8njm"))))
+ "1ffqa7a3a0f3m58j6al2hd7aa8bamv4z170y4yn1vr1f8jrb7kq5"))))
(properties `((upstream-name . "DAMEfinder")))
(build-system r-build-system)
(propagated-inputs
@@ -5003,14 +5244,14 @@ offers nice visualization of methyl-circle plots.")
(define-public r-dearseq
(package
(name "r-dearseq")
- (version "1.14.0")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "dearseq" version))
(sha256
(base32
- "1ldxw457zsfphm6izxz2kvxy3719gszhxb8mymx8njg6islljy27"))))
+ "0hy8cnqyvp2mrhj5wi1shh1cba79c5z8f17mfw764s2d6ivsfzz6"))))
(build-system r-build-system)
(propagated-inputs
(list r-compquadform
@@ -5042,13 +5283,13 @@ set analyses, and can deal with repeated or longitudinal data.")
(define-public r-debcam
(package
(name "r-debcam")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "debCAM" version))
(sha256
(base32
- "1swqqrlwin2i2qq46qyfziblbfsfyd5hf6w39hygp7fdkpic14b7"))
+ "1lbgwv7009fpwqw6kl94gmm44xypn60r8kcm3fjzgbjbwijriwgq"))
(snippet
'(for-each delete-file
'("inst/java/CornerDetect.jar"
@@ -5099,7 +5340,7 @@ set analyses, and can deal with repeated or longitudinal data.")
r-rjava
r-summarizedexperiment))
(native-inputs
- (list r-knitr zip))
+ (list r-knitr zip)) ;zip is needed for repacking the jar
(home-page "https://bioconductor.org/packages/debCAM")
(synopsis "Deconvolution by convex analysis of mixtures")
(description
@@ -5116,21 +5357,16 @@ knowledge can achieve semi-supervised deconvolution of mixtures.")
(define-public r-decipher
(package
(name "r-decipher")
- (version "2.30.0")
+ (version "3.0.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DECIPHER" version))
(sha256
(base32
- "1ri8ldx3dqcpfvn3mz0022f77zi6ki04mh27qp132bbrjkj6zl79"))))
+ "1bgzl3sy4l5xfgxrkw8z1dvygkn2dgcl2fl9ah13ggs8hc9h9nlm"))))
(build-system r-build-system)
(propagated-inputs
- (list r-biostrings
- r-dbi
- r-iranges
- r-rsqlite
- r-s4vectors
- r-xvector))
+ (list r-biostrings r-dbi r-iranges r-s4vectors r-xvector))
(home-page "https://www.bioconductor.org/packages/DECIPHER/")
(synopsis "Tools for deciphering and managing biological sequences")
(description "This package provides a toolset for deciphering and managing
@@ -5215,13 +5451,13 @@ mechanism based on the shared signatures.")
(define-public r-decomptumor2sig
(package
(name "r-decomptumor2sig")
- (version "2.18.0")
+ (version "2.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "decompTumor2Sig" version))
(sha256
(base32
- "13vwrg82zprb9h72azdqd0rkm5k2xm4mw7viawbzwkkqvg6azsdj"))))
+ "1pnxnxz9zsxqs7cbxgkjapr57k2m1d57w5hak0dwcy5zcxjzmai8"))))
(properties `((upstream-name . "decompTumor2Sig")))
(build-system r-build-system)
(inputs (list perl)) ;script/extractSpecColumns.pl
@@ -5258,13 +5494,13 @@ of the signatures to the mutation load of the tumor.")
(define-public r-deconrnaseq
(package
(name "r-deconrnaseq")
- (version "1.44.0")
+ (version "1.46.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DeconRNASeq" version))
(sha256
(base32
- "1k5xrx97w9g0jfvjzawyfsqyz2fj9r463nj849djxgmcw8vp53vg"))))
+ "0hwvfsc48dakh3nvz60i92yciz2m5my9w57kzpyj4jyk92cs181g"))))
(properties `((upstream-name . "DeconRNASeq")))
(build-system r-build-system)
(propagated-inputs
@@ -5285,13 +5521,13 @@ single expression profiles.")
(define-public r-decontam
(package
(name "r-decontam")
- (version "1.22.0")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "decontam" version))
(sha256
(base32
- "0m4zd6qxsrp7w9a8psg8xcrviim6plwgwn4rgdxy8ag0c442fsvk"))))
+ "1xjd9jzxlj6gfd6fnygzm21q1wy5x5pl031sq1q0svq3jlnzvgb7"))))
(properties `((upstream-name . "decontam")))
(build-system r-build-system)
(propagated-inputs
@@ -5311,13 +5547,13 @@ negative control samples.")
(define-public r-deconvr
(package
(name "r-deconvr")
- (version "1.8.0")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "deconvR" version))
(sha256
(base32
- "0pl4nwaf8swwz9nl2ynf9mm38d0x223gpz89qrj03yihxszy2n13"))))
+ "181dxjj8bzy1b9xq9hd3m3ak1698w7j0sf8h9g0bhf3blzlj4pmi"))))
(properties `((upstream-name . "deconvR")))
(build-system r-build-system)
(propagated-inputs
@@ -5356,20 +5592,22 @@ make mapping WGBS data to their probe IDs easier.")
(define-public r-decoupler
(package
(name "r-decoupler")
- (version "2.8.0")
+ (version "2.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "decoupleR" version))
(sha256
- (base32 "1vnlrkza33nb80qf810yfz66m3j84p8chhfdxak5lvpciqwx7dh9"))))
+ (base32 "060ww5hlzk0dvh7a52i1nrz1s2xq5mmlw70rxpcs6d4j08k1cmic"))))
(properties `((upstream-name . "decoupleR")))
(build-system r-build-system)
(propagated-inputs
- (list r-broom
+ (list r-biocparallel
+ r-broom
r-dplyr
r-magrittr
r-matrix
+ r-parallelly
r-purrr
r-rlang
r-stringr
@@ -5397,13 +5635,13 @@ targeted by a kinase.")
(define-public r-deepsnv
(package
(name "r-deepsnv")
- (version "1.48.0")
+ (version "1.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "deepSNV" version))
(sha256
(base32
- "16dkjqy9ba5v8nikaxdjcz7rr60dg46sfsgrjjlp82rf3256bf8r"))))
+ "1rcq2bg4z6z7czqi662w5gsdc1vd4p8vb353hqayhciv31dz51fr"))))
(properties `((upstream-name . "deepSNV")))
(build-system r-build-system)
(propagated-inputs
@@ -5433,13 +5671,13 @@ bases such as COSMIC.")
(define-public r-degreport
(package
(name "r-degreport")
- (version "1.38.5")
+ (version "1.40.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DEGreport" version))
(sha256
(base32
- "0s0d40ac1da73w7j96lb20wchgs4c2svfrafsgi9mx5hiswfz25z"))
+ "0z5wzdixw6pyfd72drh54aalmp9nd5p1xi5vn53d58w78hrb757p"))
(snippet
'(delete-file "docs/jquery.sticky-kit.min.js"))))
(properties `((upstream-name . "DEGreport")))
@@ -5506,13 +5744,13 @@ fold changes mean and variability for each selected gene.")
(define-public r-delayedarray
(package
(name "r-delayedarray")
- (version "0.28.0")
+ (version "0.30.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DelayedArray" version))
(sha256
(base32
- "0mf30vdns64mpm11zcz9qx6nh5clr6krjvcmr7dqv2xg5ig0a1f7"))))
+ "0n6pparz2fg8wgrgcwciibqz3iyrnlmk5hdvnzjppcraxanz8sm6"))))
(properties
`((upstream-name . "DelayedArray")))
(build-system r-build-system)
@@ -5541,13 +5779,13 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns),
(define-public r-densvis
(package
(name "r-densvis")
- (version "1.12.1")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "densvis" version))
(sha256
(base32
- "11a112r2ckzphqj3r3fxvablzwgri0j5lx3ggh1z6pfnv113xxwj"))))
+ "1xsafzcg6psb4ld7nk4wgdaa3xhy8i2v86asasf8h3mi1ms7lcv0"))))
(properties `((upstream-name . "densvis")))
(build-system r-build-system)
(propagated-inputs (list r-assertthat
@@ -5576,13 +5814,13 @@ heterogeneity in the original high-dimensional space.")
(define-public r-derfinder
(package
(name "r-derfinder")
- (version "1.36.0")
+ (version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "derfinder" version))
(sha256
(base32
- "0rj3szlpbxiwj3rajmr6ccnbs1mkcskql12iip8zgswmhz76rxh1"))))
+ "1i4m20wb08zncksz415jl8bd5r4gdygk7324cp6xhijrc1pfzl1i"))))
(properties `((upstream-name . "derfinder")))
(build-system r-build-system)
(propagated-inputs (list r-annotationdbi
@@ -5622,13 +5860,13 @@ The DER Finder approach can also be used to identify differentially bounded
(define-public r-derfinderhelper
(package
(name "r-derfinderhelper")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "derfinderHelper" version))
(sha256
- (base32 "01vq8xnszxqhijranzaciapw8mcn6px0jhx9zb9lyqhsvaffjh5r"))))
+ (base32 "0186wjrszf6c5amibmdblabx3cfvq7p7k6kza38gahw0p7ibwv21"))))
(properties `((upstream-name . "derfinderHelper")))
(build-system r-build-system)
(propagated-inputs
@@ -5647,17 +5885,18 @@ calculation in parallel.")
(define-public r-dmrcate
(package
(name "r-dmrcate")
- (version "2.16.1")
+ (version "3.0.8")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DMRcate" version))
(sha256
(base32
- "19dxpmjjg8v2l71yjjlfj0ycvmhi9rk04q59nwjcp0aw8nvk6l3w"))))
+ "1j3s3lcsfwywyaaifiyz1pl9wd8s5wbdwjx71827wz346gpppkbv"))))
(properties `((upstream-name . "DMRcate")))
(build-system r-build-system)
(propagated-inputs
- (list r-biomart
+ (list r-annotationhub
+ r-biomart
r-bsseq
r-edger
r-experimenthub
@@ -5687,13 +5926,13 @@ possibly confounded by SNPs and cross-hybridisation. It includes
(define-public r-drimseq
(package
(name "r-drimseq")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DRIMSeq" version))
(sha256
- (base32 "1nf044cfqywfnglm081xbppamva87z2j2xz0f51z8mra11apj6i6"))))
+ (base32 "10skx3n3r9vp1p1499ddccgabi7q3cy1dpi5pbp4ap0gff5ika5x"))))
(properties `((upstream-name . "DRIMSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -5722,13 +5961,13 @@ results.")
(define-public r-dropletutils
(package
(name "r-dropletutils")
- (version "1.22.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DropletUtils" version))
(sha256
- (base32 "0bnxk72a0ygh4nqwyjzzi79zc4md8pwk0pr6jn43in0wdk054wf6"))))
+ (base32 "01y88cnii02sn1jgyvvmbx8j60qbzqyznqfxzv06yi4y0xj37klg"))))
(properties `((upstream-name . "DropletUtils")))
(build-system r-build-system)
(propagated-inputs
@@ -5767,13 +6006,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))
@@ -5795,13 +6034,13 @@ in Python.")
(define-public r-dss
(package
(name "r-dss")
- (version "2.50.1")
+ (version "2.52.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DSS" version))
(sha256
(base32
- "1wjd428kz2w3n4ak13h3i1yknm03fh911jrcy2hkcip4z5cssla0"))))
+ "1y9xg6ic3a03xswyfvyxdhnd7ngkljc96bm5fry4ni6kpa77bkv8"))))
(properties `((upstream-name . "DSS")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-biocparallel r-bsseq))
@@ -5821,13 +6060,13 @@ Beta-Binomial distributions.")
(define-public r-dyndoc
(package
(name "r-dyndoc")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "DynDoc" version))
(sha256
(base32
- "0d2axaszy7rpi47yg4vhd1z70m53nx40znapgg5pq6ahrx7if5f1"))))
+ "174jfdyq7g7mvn7wvmdkf36n0n969aqsg9bwd1nk6a5nw1khm7js"))))
(properties `((upstream-name . "DynDoc")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/DynDoc")
@@ -5840,13 +6079,13 @@ dynamic documents and vignettes.")
(define-public r-bluster
(package
(name "r-bluster")
- (version "1.12.0")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bluster" version))
(sha256
(base32
- "16zkv567d39258syhfb215y04sq3pnfjh9pgbp5z85hcfpz4qmhc"))))
+ "1bj7wx2dnwbrv2gxcmqmq815vawfiqj2xy3624fjli11r8c1hywa"))))
(properties `((upstream-name . "bluster")))
(build-system r-build-system)
(propagated-inputs
@@ -5870,13 +6109,13 @@ and evaluate clustering results.")
(define-public r-ideoviz
(package
(name "r-ideoviz")
- (version "1.37.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "IdeoViz" version))
(sha256
(base32
- "1bhari5ghag5f5dlrgm79hckbh0bamd9567z04qi0spnfr97wf3s"))))
+ "0mq8qdhi2ccfa66rygn83hpm0fsmwiahpmrh8q522yl618mkrjcs"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -5894,14 +6133,14 @@ arbitrary genomic intervals along chromosomal ideogram.")
(define-public r-infercnv
(package
(name "r-infercnv")
- (version "1.18.1")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "infercnv" version))
(sha256
(base32
- "1d9in3hs2n91pv498715d3qi82c7xsnm42vnzgfyz096zjghgp7a"))))
+ "1fi89fqzzb9n2c9jchkkgy3yq2fvisjcdavh9r455vmy0xqsyyyd"))))
(properties `((upstream-name . "infercnv")))
(build-system r-build-system)
(inputs (list python))
@@ -5954,13 +6193,13 @@ over-abundant or less-abundant as compared to that of normal cells.")
(define-public r-iranges
(package
(name "r-iranges")
- (version "2.36.0")
+ (version "2.38.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "IRanges" version))
(sha256
(base32
- "0rhh82hrsm32bdjamfah84p7zi8fvr4shyq2rdjfxzdp9qy5rh2q"))))
+ "07q9j00rvgdbv582p01nxc99j0gfx4fsarpl1w1fjx5nb8y86k4v"))))
(properties
`((upstream-name . "IRanges")))
(build-system r-build-system)
@@ -5982,13 +6221,13 @@ possible.")
(define-public r-isoformswitchanalyzer
(package
(name "r-isoformswitchanalyzer")
- (version "2.2.0")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "IsoformSwitchAnalyzeR" version))
(sha256
- (base32 "1yin2jv06g3jrzadq6yjcr14jz1zzwyxipzna5csgr013dkkrl8h"))))
+ (base32 "0mmxyq1r4kq1igj108pr0r9215hwmyph5svx0djd460knak24y6z"))))
(properties `((upstream-name . "IsoformSwitchAnalyzeR")))
(build-system r-build-system)
(propagated-inputs
@@ -6011,6 +6250,7 @@ possible.")
r-magrittr
r-pfamanalyzer
r-plyr
+ r-pwalign
r-rcolorbrewer
r-rcurl
r-readr
@@ -6063,13 +6303,13 @@ AE et al 2011, <doi: 10.1093/bioinformatics/btr171>).")
(define-public r-italics
(package
(name "r-italics")
- (version "2.62.0")
+ (version "2.64.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ITALICS" version))
(sha256
- (base32 "0zk9n94nqw6vpw908ka32zppxwqkki9krzxib06y1nic3bri3w9i"))))
+ (base32 "06h6iqrqzlcj4hyhj1ikl9isr3ls1pph49v5n7cp87czinr0nd3s"))))
(properties `((upstream-name . "ITALICS")))
(build-system r-build-system)
(propagated-inputs
@@ -6198,13 +6438,13 @@ mapping.")
(define-public r-nebulosa
(package
(name "r-nebulosa")
- (version "1.12.1")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Nebulosa" version))
(sha256
(base32
- "11wn6l27cshhb1djsgqaqr8d33j4bipy0w0gafp3fkvg7mnpnhps"))))
+ "0m5z6rribsrk9mzcksjh0nmpf4d0x0hn8jd80h0hj0hj8sj1ifgv"))))
(properties `((upstream-name . "Nebulosa")))
(build-system r-build-system)
(propagated-inputs (list r-ggplot2
@@ -6277,14 +6517,14 @@ Michailidis G (2016) <doi:10.1093/bioinformatics/btw410>.")
(define-public r-nmf
(package
(name "r-nmf")
- (version "0.27")
+ (version "0.28")
(source
(origin
(method url-fetch)
(uri (cran-uri "NMF" version))
(sha256
(base32
- "1y9y7xpfd9y8j5b8s2x5g61455ilpgqpdhrirpz58xjarbph4hxg"))))
+ "1yzf5vcvyb2lypxcfyhah7y2yblkar1is7c50645yppf4frygpvp"))))
(properties `((upstream-name . "NMF")))
(build-system r-build-system)
(propagated-inputs
@@ -6321,14 +6561,14 @@ performing parallel computations on multicore machines.")
(define-public r-affy
(package
(name "r-affy")
- (version "1.80.0")
+ (version "1.82.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affy" version))
(sha256
(base32
- "0lsvcv7nprmsh62d0r2v44a5n915crvv1cbj9ba6fdggj7wp8zyk"))))
+ "19z22c1yd3rkwk7dp8q8xv16n0qv92iz00vzid3pniy7zr80cxxy"))))
(build-system r-build-system)
(propagated-inputs
(list r-affyio
@@ -6349,14 +6589,14 @@ analysis.")
(define-public r-affycomp
(package
(name "r-affycomp")
- (version "1.78.0")
+ (version "1.80.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affycomp" version))
(sha256
(base32
- "0818mgwny9hznw7lawrvmk11nwy0wxgjnlkf083vv3js4aq31gfp"))))
+ "02n2v1iwkhmilv1bjfza2yrqj7rsr8v46bghajcb8wdyyaj759ib"))))
(properties `((upstream-name . "affycomp")))
(build-system r-build-system)
(propagated-inputs (list r-biobase))
@@ -6415,14 +6655,14 @@ Command Console} (AGCC)-compatible sample annotation files.")
(define-public r-affycontam
(package
(name "r-affycontam")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affyContam" version))
(sha256
(base32
- "1jxp4qacclfl07ig8dfwy5gpnsqrfqnjbci1a7znc7acqg0kv0zv"))))
+ "0r4pqda9pv60b867c6yi328687kyxjglk5jmcal6xnlr75nf4w0y"))))
(properties `((upstream-name . "affyContam")))
(build-system r-build-system)
(propagated-inputs
@@ -6438,14 +6678,14 @@ problems in CEL-level data to help evaluate performance of quality metrics.")
(define-public r-affycoretools
(package
(name "r-affycoretools")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affycoretools" version))
(sha256
(base32
- "0bgv8a7hf8ns472zfryf255zqdikjv08np6k6hkpvyivad25vpwy"))))
+ "0w138n3f68ndr0innk981vf8p5wb729m31p0d3f9qp08hmv58jfw"))))
(properties `((upstream-name . "affycoretools")))
(build-system r-build-system)
(propagated-inputs
@@ -6480,14 +6720,14 @@ to streamline the more common analyses that a Biostatistician might see.")
(define-public r-affyio
(package
(name "r-affyio")
- (version "1.72.0")
+ (version "1.74.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affyio" version))
(sha256
(base32
- "01shv7936cb5yynxkdssczl752ayv2rx4qkrkddqhi5smksw13z9"))))
+ "156sijj9zy01p038m7yw58h1bw1ii0kd5q9kv3krh6bs67c3dv8h"))))
(build-system r-build-system)
(propagated-inputs
(list r-zlibbioc))
@@ -6504,14 +6744,14 @@ CDF file formats.")
(define-public r-affxparser
(package
(name "r-affxparser")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affxparser" version))
(sha256
(base32
- "18qjdsgkmdhwv2c4sbixp7fn69sbjdipn363jnms95dksdj2xvr9"))))
+ "0qqc2sq331g2ml390nhjkrnldp6bi7r6xyz7rw77hnr3qpcrhqk2"))))
(properties `((upstream-name . "affxparser")))
(build-system r-build-system)
(home-page "https://github.com/HenrikBengtsson/affxparser")
@@ -6532,14 +6772,14 @@ structure.")
(define-public r-annotate
(package
(name "r-annotate")
- (version "1.80.0")
+ (version "1.82.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "annotate" version))
(sha256
(base32
- "10mdlbgbvdj967bih6wpvxmy91r10p8frhgcwv8mhv4g94ardasd"))))
+ "1v4sq22lwrhl50whag0jil788wwvi4rpdaij03iwak93q998ls0f"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -6559,13 +6799,13 @@ microarrays.")
(define-public r-annotationdbi
(package
(name "r-annotationdbi")
- (version "1.64.1")
+ (version "1.66.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationDbi" version))
(sha256
(base32
- "1bdr303a2z03c8vc8q95a4a4a8i956vimia5yik78yddd1ig9gq3"))))
+ "1g2yzbx7djkk8kccbclxv953iijmjvsjsalfv1ihmmcai33979rs"))))
(properties
`((upstream-name . "AnnotationDbi")))
(build-system r-build-system)
@@ -6589,13 +6829,13 @@ annotation data packages using SQLite data storage.")
(define-public r-annotationfilter
(package
(name "r-annotationfilter")
- (version "1.26.0")
+ (version "1.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationFilter" version))
(sha256
(base32
- "0cd2vcnx0pn5wba3x5q32vddjjp7fvix7yd7jrwv07a2fkv9c4p5"))))
+ "1sdm85sl4d9mqbjgjh3yizcmrzgz0g4x17s25gss2f6cjwy5jp40"))))
(properties
`((upstream-name . "AnnotationFilter")))
(build-system r-build-system)
@@ -6614,14 +6854,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.")
(define-public r-annotationforge
(package
(name "r-annotationforge")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationForge" version))
(sha256
(base32
- "0dbbg0wvk1ndv20d5j80waaz0z1bsp7y2k2m17jly4ax2hc5frc9"))))
+ "1ikri9hb1s0jzw1wyfpwsl02hg8dw2xs703sp085sbsq3cwk9cn1"))))
(properties
`((upstream-name . "AnnotationForge")))
(build-system r-build-system)
@@ -6646,14 +6886,14 @@ databases. Packages produced are intended to be used with AnnotationDbi.")
(define-public r-annotationhub
(package
(name "r-annotationhub")
- (version "3.10.1")
+ (version "3.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationHub" version))
(sha256
(base32
- "12vc573gmg8bwcfa268yq7npg7mivhngx4lx16nzan56rqb475yx"))))
+ "1da2n13j2xysnd175zi7s6zm8yllnp0k59vygkx9id85jcldqf51"))))
(properties `((upstream-name . "AnnotationHub")))
(build-system r-build-system)
(propagated-inputs
@@ -6665,7 +6905,6 @@ databases. Packages produced are intended to be used with AnnotationDbi.")
r-curl
r-dplyr
r-httr
- r-interactivedisplaybase
r-rappdirs
r-rsqlite
r-s4vectors
@@ -6687,14 +6926,14 @@ by the user, helping with quick and reproducible access.")
(define-public r-aroma-light
(package
(name "r-aroma-light")
- (version "3.32.0")
+ (version "3.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "aroma.light" version))
(sha256
(base32
- "1i6rml0slfsf01a3sphyzrxp2z759psq5bv9cfy5dxx44fnav8b8"))))
+ "1v24b43knsjpw44zkrzv8pvxjiw12rcz9wqp4ahd88dg23j7pvwz"))))
(properties `((upstream-name . "aroma.light")))
(build-system r-build-system)
(propagated-inputs
@@ -6711,14 +6950,14 @@ classes.")
(define-public r-bamsignals
(package
(name "r-bamsignals")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bamsignals" version))
(sha256
(base32
- "1qv2gydn8awrkbhdrgxm8zxpicphqc29rwzkj3vyaa9glmnx2y34"))))
+ "1jq993m6b0cv3ibgjrbzyka7svb653hvi6bvqhf8ir3lgjgs23dp"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
@@ -6741,13 +6980,13 @@ paired-end data.")
(define-public r-biobase
(package
(name "r-biobase")
- (version "2.62.0")
+ (version "2.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Biobase" version))
(sha256
(base32
- "0znkawzr3hgbp2dkdk30ziqa6ylbq2nf0xmz4vi089cw9763lxgg"))))
+ "09xnl0qq4qsd981i9srw07228lgashcvcavi8k0izdzfyk6ka7m2"))))
(properties
`((upstream-name . "Biobase")))
(build-system r-build-system)
@@ -6764,13 +7003,13 @@ on Bioconductor or which replace R functions.")
(define-public r-biomart
(package
(name "r-biomart")
- (version "2.58.2")
+ (version "2.60.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "biomaRt" version))
(sha256
(base32
- "03hl64j7fknw4gzw9w653zzw5gdxyi7r95vxr5ksz0m3n9xdv124"))))
+ "0mzdxpagxwiwyznhd7h93cgy01a2j85rgb5dpnkzgp4sxw01n7rb"))))
(properties
`((upstream-name . "biomaRt")))
(build-system r-build-system)
@@ -6778,11 +7017,10 @@ on Bioconductor or which replace R functions.")
(list r-annotationdbi
r-biocfilecache
r-digest
- r-httr
+ r-httr2
r-progress
r-rappdirs
r-stringr
- r-xml
r-xml2))
(native-inputs
(list r-knitr))
@@ -6849,13 +7087,13 @@ only one command.")
(define-public r-biocparallel
(package
(name "r-biocparallel")
- (version "1.36.0")
+ (version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocParallel" version))
(sha256
(base32
- "19h80qf0zdxfg3pkcwwywh9gg0ymv92n51qpimnw4c3w5iaszy6b"))))
+ "1miw26r2a8wvgnfr9sapfv6rqk219rmsyjh6v04annafxdxy15ky"))))
(properties
`((upstream-name . "BiocParallel")))
(build-system r-build-system)
@@ -6900,13 +7138,13 @@ objects.")
(define-public r-biostrings
(package
(name "r-biostrings")
- (version "2.70.3")
+ (version "2.72.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Biostrings" version))
(sha256
(base32
- "1704fn4dlswy5silmw2ri4yjbibqv249cnrb5mdgiwjh7l51w725"))))
+ "067vy2v7spbdsknvi0fcpdi085kn8v20pyrhkc7wy357v21h7hgs"))))
(properties
`((upstream-name . "Biostrings")))
(build-system r-build-system)
@@ -6929,14 +7167,14 @@ biological sequences or sets of sequences.")
(define-public r-biovizbase
(package
(name "r-biovizbase")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biovizBase" version))
(sha256
(base32
- "01hli49aq1fjjgpk465znq1ki0qi7nxg71pqg18fz6nblg3ny9z5"))))
+ "1jbcnjjwdjy7zfy0ybgfy1y5ym7rygzkailr5bm4hnh9bn2837p7"))))
(properties `((upstream-name . "biovizBase")))
(build-system r-build-system)
(propagated-inputs
@@ -6971,13 +7209,13 @@ effort and encourages consistency.")
(define-public r-bsgenome
(package
(name "r-bsgenome")
- (version "1.70.2")
+ (version "1.72.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BSgenome" version))
(sha256
(base32
- "02qrqg7lfisj44gvlfn1gkhxxjqdh11q28inxggfpcda9b67j61d"))))
+ "1pjbkakrycvaifl7xrmri2h94zc1ap8a9d1q4c83qji3xa21cm4q"))))
(properties
`((upstream-name . "BSgenome")))
(build-system r-build-system)
@@ -7003,14 +7241,14 @@ genome data packages and support for efficient SNP representation.")
(define-public r-category
(package
(name "r-category")
- (version "2.68.0")
+ (version "2.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Category" version))
(sha256
(base32
- "19qyxqky1gsrjylmc2h0sndbqlk2ibrps7123gqwn19p8kg4nhf0"))))
+ "0paz6h8rsbqvlxxj4di8cl76aybgjr842z5gdv8xi6c2d7zwbclw"))))
(properties `((upstream-name . "Category")))
(build-system r-build-system)
(propagated-inputs
@@ -7034,13 +7272,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
@@ -7096,13 +7334,13 @@ regions and to highlight copy number alterations.")
(define-public r-chipseeker
(package
(name "r-chipseeker")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ChIPseeker" version))
(sha256
(base32
- "0bx85y5888w85miif73y0yd9j4kdmjn1cfck1xshnqnsrh7p3m50"))))
+ "00iknjk7vgj48vj1pp7l98g7nvc3x495z3jcq5nbvdiff02faj1f"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -7143,14 +7381,14 @@ annotation, distance to TSS, and overlap of peaks or genes.")
(define-public r-chipseq
(package
(name "r-chipseq")
- (version "1.52.0")
+ (version "1.54.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chipseq" version))
(sha256
(base32
- "1fw99xnll4jwdmp49jh59zxcbp3qs2850pjdg403sv4cg1bgfdyi"))))
+ "1rd56knaf0ar8d0nh0mcnrrg5jy0csixig1d4abn1b64vbzrvzpz"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
@@ -7170,14 +7408,14 @@ experiments.")
(define-public r-complexheatmap
(package
(name "r-complexheatmap")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ComplexHeatmap" version))
(sha256
(base32
- "0zzp0kci5daffpyv56advdcs05pz3nmjn07bmm7r3hwpk0nr3fcf"))))
+ "1ppzx850nvvdhz2xiggr43c79w0nr0vmsmmnszasd4flf3jm7v8v"))))
(properties
`((upstream-name . "ComplexHeatmap")))
(build-system r-build-system)
@@ -7332,14 +7570,14 @@ distribution.")
(define-public r-deseq2
(package
(name "r-deseq2")
- (version "1.42.1")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DESeq2" version))
(sha256
(base32
- "1s104b9k45b7kjrk56yw2yi4gi716nkcwnpqj4vj9w17xsb5m6zp"))))
+ "1j7ivkxbc75hzxhl9d97w8vamrmxf6527n7841i1j9n6s7hz1cdn"))))
(properties `((upstream-name . "DESeq2")))
(build-system r-build-system)
(propagated-inputs
@@ -7370,14 +7608,14 @@ distribution.")
(define-public r-dexseq
(package
(name "r-dexseq")
- (version "1.48.0")
+ (version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DEXSeq" version))
(sha256
(base32
- "1q59agaidf0nkq599iz54a253sjxzillj39za86ihfj5xws24f8w"))))
+ "13y3fhgvf7438yjv6qm28n8f42w4wgkklc0q229ypns1gfh54524"))))
(properties `((upstream-name . "DEXSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -7415,13 +7653,13 @@ exploration of the results.")
(define-public r-diffcyt
(package
(name "r-diffcyt")
- (version "1.22.1")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "diffcyt" version))
(sha256
- (base32 "1lg7c33mdnp35b15n7ydmz4wgkgls6ii3r1q699i4ifxcgxjm8pj"))))
+ (base32 "1iyqvang5j55s19skd44c1zsxkphn3qqbl4sjhsw1y820ylws5r1"))))
(properties `((upstream-name . "diffcyt")))
(build-system r-build-system)
(propagated-inputs
@@ -7453,14 +7691,14 @@ adapted from transcriptomics.")
(define-public r-dirichletmultinomial
(package
(name "r-dirichletmultinomial")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DirichletMultinomial" version))
(sha256
(base32
- "1rvic3acrf4qdag423f8xa6bnqrqr31vj7k4l7a5kzf1fjm359wy"))))
+ "0djd84vnf4skjr6m25ykqrvwa37lgs5r5aw9md81ykaqmi40szqb"))))
(properties
`((upstream-name . "DirichletMultinomial")))
(build-system r-build-system)
@@ -7480,13 +7718,13 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2):
(define-public r-dittoseq
(package
(name "r-dittoseq")
- (version "1.14.3")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "dittoSeq" version))
(sha256
(base32
- "019fdjjgzh15pbp8m16g73whbjffpm4p7hwk1nz85yc2yr1381zi"))))
+ "15p01f3yaan9x7y6ld1kx40jnbcn6vjjm5n6ir7cicdvv4w5ln49"))))
(properties `((upstream-name . "dittoSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -7524,14 +7762,14 @@ code{dittoColors()}.")
(define-public r-edaseq
(package
(name "r-edaseq")
- (version "2.36.0")
+ (version "2.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "EDASeq" version))
(sha256
(base32
- "0xvi5mynkf1n74bn2k6gxmyhp1piwzsljd37biibdfzy14r1ir08"))))
+ "18h9zlah21lghy1sjpnzy6lddmff8vh3raxnqi15v00za9azk8yq"))))
(properties `((upstream-name . "EDASeq")))
(build-system r-build-system)
(propagated-inputs
@@ -7564,13 +7802,13 @@ global-scaling and full-quantile normalization.")
(define-public r-edger
(package
(name "r-edger")
- (version "4.0.16")
+ (version "4.2.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "edgeR" version))
(sha256
(base32
- "0jflbh1wsszz98y0y294g69mm81fwwxfbhpi3kmdncin8bwf8ifi"))))
+ "0c9r4gcsaf6fqkc4r49vj8az6wplqsbkd423pb4fvrv5lka9aqi9"))))
(properties `((upstream-name . "edgeR")))
(build-system r-build-system)
(propagated-inputs
@@ -7590,13 +7828,13 @@ CAGE.")
(define-public r-enhancedvolcano
(package
(name "r-enhancedvolcano")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "EnhancedVolcano" version))
(sha256
(base32
- "097w3957m47m03iy8xc1m7pdgm3qy0kzqbllic8pd79qglrla802"))))
+ "0ry5r74d6m5x15b4azw93mjrvq4fapj4rxpi9f6macz4l5l6j1j0"))))
(properties `((upstream-name . "EnhancedVolcano")))
(build-system r-build-system)
(propagated-inputs (list r-ggplot2 r-ggrepel))
@@ -7618,13 +7856,13 @@ parameter configurations.")
(define-public r-enmix
(package
(name "r-enmix")
- (version "1.38.01")
+ (version "1.40.2")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ENmix" version))
(sha256
(base32
- "1wh9lri9dp3904c2n6562z7p9gqx39dmag55imx8zrqnayxamc03"))))
+ "1x8rzdzymibypb65axx3sgxsgrj5d1fldj9j70acvg46lqhmq8f2"))))
(properties `((upstream-name . "ENmix")))
(build-system r-build-system)
(propagated-inputs
@@ -7660,14 +7898,14 @@ visualization of Illumina DNA methylation array data.")
(define-public r-ensembldb
(package
(name "r-ensembldb")
- (version "2.26.0")
+ (version "2.28.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ensembldb" version))
(sha256
(base32
- "010fp03x1splddxmhpxlfv1i3paqgbcxm7l9z2lmm6zfixhb158a"))))
+ "0gfwz7gznxpnqis7ack3106gvpbhcarlmj41ivndxzvksnxc3yq1"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -7705,13 +7943,13 @@ chromosome region or transcript models of lincRNA genes.")
(define-public r-epidish
(package
(name "r-epidish")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "EpiDISH" version))
(sha256
- (base32 "170ym3y6gd1kxghz2g5ynvgi1wrxx87b568cjcvzidpqkrkg87s6"))))
+ (base32 "17qkm5inavfdfrim9baqxdhs3w64c6y94qadw4y5p9xsck318frq"))))
(properties `((upstream-name . "EpiDISH")))
(build-system r-build-system)
(propagated-inputs (list r-e1071
@@ -7736,14 +7974,14 @@ their directionality of change in Epigenome-Wide Association Studies.")
(define-public r-fastseg
(package
(name "r-fastseg")
- (version "1.48.0")
+ (version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "fastseg" version))
(sha256
(base32
- "10g9mdh7nzdz2b1k5gg5hk35lpapcnbs3p3z17k15aq040lpm236"))))
+ "03gl7z7q90jy47q57gfbj5fkv5n8hi43jbbrl53bdyp71f26ry2d"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase r-biocgenerics r-genomicranges r-iranges
@@ -7764,14 +8002,14 @@ microarrays or GRanges for sequencing data.")
(define-public r-gage
(package
(name "r-gage")
- (version "2.52.0")
+ (version "2.54.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gage" version))
(sha256
(base32
- "0bm5hvy3cdcm46527w45mnnnk95qm28xzdk1m53615gh55ix4iy8"))))
+ "0iwdv9y5x0na38arjqacz00s7plk7aqc1h2ynhlpbyl3nz0a0kyq"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi r-go-db r-graph r-keggrest))
@@ -7792,14 +8030,14 @@ analysis using other methods.")
(define-public r-genefilter
(package
(name "r-genefilter")
- (version "1.84.0")
+ (version "1.86.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "genefilter" version))
(sha256
(base32
- "0q80z872d3z1jy69b53qxzvmshf5zx4qssmp4gj7fwdpfxj9qqjw"))))
+ "0jp7jvgzb1bs0p76j9k8lhgliipjnif6bng7hdn5wi744jb5fmpr"))))
(build-system r-build-system)
(native-inputs
(list gfortran r-knitr))
@@ -7816,13 +8054,13 @@ high-throughput sequencing experiments.")
(define-public r-geneoverlap
(package
(name "r-geneoverlap")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GeneOverlap" version))
(sha256
(base32
- "074d3inz8sh8xxjliisa0p99rgy6r9fg9ljaka5bf1waxwpknzpw"))))
+ "0bfd4322m6g7dvas214i17k8sjsf62lza9darmhiwb4r8h30qmb2"))))
(build-system r-build-system)
(propagated-inputs
(list r-gplots r-rcolorbrewer))
@@ -7835,13 +8073,13 @@ and visualize the results.")
(define-public r-genomation
(package
(name "r-genomation")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "genomation" version))
(sha256
(base32
- "1vbpx187m5d5g307f4jiwyy1sw4jgj1s18622y3a458ixv540zkc"))))
+ "1bfy46kka77q93s42hsbxpiynfkin5mh7cz3w592smw2dzkh01j4"))))
(build-system r-build-system)
(propagated-inputs
(list r-biostrings
@@ -7882,18 +8120,19 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.")
(define-public r-genomeinfodb
(package
(name "r-genomeinfodb")
- (version "1.38.8")
+ (version "1.40.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version))
(sha256
(base32
- "126qq2549h3dpjiq36709pym5bfwk6jqbz5q2sb5hl8lwm1apv8w"))))
+ "155wj17pbdbixyg6mimv06wg3ylll8ysqh7rffjp65fw662jwhw0"))))
(properties
`((upstream-name . "GenomeInfoDb")))
(build-system r-build-system)
(propagated-inputs
- (list r-biocgenerics r-genomeinfodbdata r-iranges r-rcurl r-s4vectors))
+ (list r-biocgenerics r-genomeinfodbdata r-iranges r-s4vectors
+ r-ucsc-utils))
(native-inputs
(list r-knitr))
(home-page "https://bioconductor.org/packages/GenomeInfoDb")
@@ -7908,13 +8147,13 @@ names in their natural, rather than lexicographic, order.")
(define-public r-genomicalignments
(package
(name "r-genomicalignments")
- (version "1.38.2")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicAlignments" version))
(sha256
(base32
- "0i4n735xabdhlg7w2yd31lg65s9b6w12fhzij91hbcp0hs40fvw1"))))
+ "15jzdjna0r9n6ybvyw52v1d9f05vdsdxff0g8q0pa584a1sd2s7s"))))
(properties
`((upstream-name . "GenomicAlignments")))
(build-system r-build-system)
@@ -7941,13 +8180,13 @@ alignments.")
(define-public r-genomicdatacommons
(package
(name "r-genomicdatacommons")
- (version "1.26.0")
+ (version "1.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicDataCommons" version))
(sha256
(base32
- "1inikcczkhav6h6a46ix9ixkf7b1n8rf766m5hmhmx09sspzsm5w"))))
+ "0jg4sa1lqn028y2ympb3x4s8yr7qa8ajrwqj2hhcl8zss3sx8gr2"))))
(properties `((upstream-name . "GenomicDataCommons")))
(build-system r-build-system)
(propagated-inputs (list r-dplyr
@@ -7973,30 +8212,24 @@ Commons RESTful service.")
(define-public r-genomicfeatures
(package
(name "r-genomicfeatures")
- (version "1.54.4")
+ (version "1.56.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicFeatures" version))
(sha256
(base32
- "0g2fv4r82ql7p2allapmgs2bj4ad70c8030vzkml7ghrxsgrryp3"))))
+ "1r1d9g5vq5y946v2z2xgmfb31k0576nj8i0yg6xfj9y2a0a6akc5"))))
(properties
`((upstream-name . "GenomicFeatures")))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
- r-biobase
r-biocgenerics
- r-biocio
- r-biomart
r-biostrings
r-dbi
r-genomeinfodb
r-genomicranges
- r-httr
r-iranges
- r-rjson
- r-rsqlite
r-rtracklayer
r-s4vectors
r-xvector))
@@ -8018,14 +8251,14 @@ extracting the desired features in a convenient format.")
(define-public r-genomicfiles
(package
(name "r-genomicfiles")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GenomicFiles" version))
(sha256
(base32
- "1kvys60hhb0ndjvjdanfgciq3jc42iag8r0a199gv6w5bjaxp6wm"))))
+ "1b0n5aqvg6jb6rpikjzxndmcjxp31h6vhr1magzalqg7jmlvcv6i"))))
(properties `((upstream-name . "GenomicFiles")))
(build-system r-build-system)
(propagated-inputs
@@ -8053,13 +8286,13 @@ provide added flexibility for data combination and manipulation.")
(define-public r-genomicranges
(package
(name "r-genomicranges")
- (version "1.54.1")
+ (version "1.56.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicRanges" version))
(sha256
(base32
- "1vrs3r8dyhhwj0s3vwvr168s84x5hj10lnpg1xf5c2kbj26bdv0w"))))
+ "0g0ld9i58pdxw2pwxi9nzj82mkryag457pvh6cvbvhb28pfamkma"))))
(properties
`((upstream-name . "GenomicRanges")))
(build-system r-build-system)
@@ -8080,13 +8313,13 @@ manipulating genomic intervals and variables defined along a genome.")
(define-public r-glad
(package
(name "r-glad")
- (version "2.66.0")
+ (version "2.68.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GLAD" version))
(sha256
(base32
- "04wyzn56crz7sa453qj07p90vvg8nwrqz54m9ms9vf9z8adpck51"))))
+ "01qn4v7b7b633dz01njzmg48lga861pfqnys9f0fbk9damxc6rr1"))))
(properties `((upstream-name . "GLAD")))
(build-system r-build-system)
(inputs (list gsl))
@@ -8104,13 +8337,13 @@ regions identified.")
(define-public r-globalancova
(package
(name "r-globalancova")
- (version "4.20.0")
+ (version "4.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GlobalAncova" version))
(sha256
(base32
- "0j1ma04zjsvf668idms8hx1vnw3sh5yy8fbhwscyk1qbfy708cfh"))))
+ "0z71a5h4y740k0hx84aavfxl1kpshm4gqs7mh6zf895i2r761bqh"))))
(properties `((upstream-name . "GlobalAncova")))
(build-system r-build-system)
(propagated-inputs (list r-annotate
@@ -8136,13 +8369,13 @@ linear models via the extra sum of squares principle.")
(define-public r-globaltest
(package
(name "r-globaltest")
- (version "5.56.0")
+ (version "5.58.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "globaltest" version))
(sha256
(base32
- "14kcsx1gynl0fijq67qb5zvfxn4yqj8809p7535y455rd0vddp5r"))))
+ "1cpvs1jcp9ibis06pkbqvhhksy6cis0zynx774d0hqdbb9ljl945"))))
(properties `((upstream-name . "globaltest")))
(build-system r-build-system)
(propagated-inputs
@@ -8160,14 +8393,14 @@ facilitate the use of this test for gene set testing of GO and KEGG terms.")
(define-public r-gostats
(package
(name "r-gostats")
- (version "2.68.0")
+ (version "2.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GOstats" version))
(sha256
(base32
- "1v10ss1gf4a3qp6hbwa2f0la9sgiwhszg4c45qd6gv0dja2v30fs"))))
+ "1dygsr8nlqksfpk00lk67dhj4fcpjg1x4dbl2r4sfanlk4hq76cs"))))
(properties `((upstream-name . "GOstats")))
(build-system r-build-system)
(propagated-inputs
@@ -8192,14 +8425,14 @@ testing and other simple calculations.")
(define-public r-gseabase
(package
(name "r-gseabase")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GSEABase" version))
(sha256
(base32
- "1y7z3627shskwss8bzjz1xm02rv4s7cdi91v1xqdsbdayjkrh1nb"))))
+ "1pnd8rmpk7gm89cvrqa8qwk40dszkfkhyydxp3gl13zng9c5bq40"))))
(properties `((upstream-name . "GSEABase")))
(build-system r-build-system)
(propagated-inputs
@@ -8221,13 +8454,13 @@ Enrichment Analysis} (GSEA).")
(define-public r-gsva
(package
(name "r-gsva")
- (version "1.50.5")
+ (version "1.52.3")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GSVA" version))
(sha256
(base32
- "0n1g376jfpmnlsjdbv23hb3jny03i84jmvhrcpz2rb5bbpfbm0al"))))
+ "08nxg3q350n5gf975r6b0zq4cr7lchv2i811crc4xbb7q39kw8k4"))))
(properties `((upstream-name . "GSVA")))
(build-system r-build-system)
(propagated-inputs (list r-biobase
@@ -8242,6 +8475,7 @@ Enrichment Analysis} (GSEA).")
r-s4vectors
r-singlecellexperiment
r-sparsematrixstats
+ r-spatialexperiment
r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "https://github.com/rcastelo/GSVA")
@@ -8258,16 +8492,41 @@ CNV-pathway analysis or cross-tissue pathway analysis, in a pathway-centric
manner.")
(license license:gpl2+)))
+(define-public r-gypsum
+ (package
+ (name "r-gypsum")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "gypsum" version))
+ (sha256
+ (base32 "1zrmxmlnbiifc2p5mn10y3vpmyzqjimd2hvc3s9c0j0iv6ryxjv0"))))
+ (properties `((upstream-name . "gypsum")))
+ (build-system r-build-system)
+ (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")
+ (description
+ "This package provides a client for the gypsum REST
+API (https://gypsum.artifactdb.com), a cloud-based file store in the
+@code{ArtifactDB} ecosystem. This package provides functions for uploads,
+downloads, and various adminstrative and management tasks. Check out the
+documentation at @url{https://github.com/ArtifactDB/gypsum-worker} for more
+details.")
+ (license license:expat)))
+
(define-public r-harshlight
(package
(name "r-harshlight")
- (version "1.74.0")
+ (version "1.76.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Harshlight" version))
(sha256
(base32
- "1djs95l04b3qrqcb7jkzhfmxzbsn2riyydz8p2lmilg6z9rkdqx7"))))
+ "1nqi2ad9hnm6j8hn8f6xp9zav6rsa5wlzb2z5fjnm9q4xbjblnjl"))))
(properties `((upstream-name . "Harshlight")))
(build-system r-build-system)
(propagated-inputs
@@ -8288,14 +8547,14 @@ matrix to solve the memory problem.")
(define-public r-hpar
(package
(name "r-hpar")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "hpar" version))
(sha256
(base32
- "19jdy0q3larl5lxjzqlnyynq9rya56fyvf1yx9pwsyag1c148z08"))))
+ "1qqa0p8k3h8pbbgfz9d1k08zml5i5r9iwi2xqqj1hg84n2saqkzp"))))
(build-system r-build-system)
(arguments
(list
@@ -8323,13 +8582,13 @@ the Human Protein Atlas project.")
(define-public r-r3cseq
(package
(name "r-r3cseq")
- (version "1.48.0")
+ (version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "r3Cseq" version))
(sha256
- (base32 "1llkfcy13h0c973703jmpgp2n6xxfsizb9iw1wxzgkbp1v0iy268"))))
+ (base32 "02dc6milwymwj90x24fip8av84ik9dp69sg9g7l300kwyk0hcrb7"))))
(properties `((upstream-name . "r3Cseq")))
(build-system r-build-system)
(propagated-inputs
@@ -8355,13 +8614,13 @@ interactions from 3C-seq assay.")
(define-public r-r4rna
(package
(name "r-r4rna")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "R4RNA" version))
(sha256
- (base32 "1qmr1s7z2f126wkwxjpr9fvak4i7mzgvfflkycgavbdqshn1rk6l"))))
+ (base32 "0cpfngd11zlws756q8cnhy5451kj8hg5ckilvmhndfapkz4w93x1"))))
(properties `((upstream-name . "R4RNA")))
(build-system r-build-system)
(propagated-inputs (list r-biostrings))
@@ -8378,13 +8637,13 @@ with numerical methods for computing statistics for each.")
(define-public r-radiogx
(package
(name "r-radiogx")
- (version "2.6.0")
+ (version "2.8.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RadioGx" version))
(sha256
- (base32 "0ykmvva5h1y7x9bxhqqfc18car9nasy06v1jjban7dlm95dl8nmk"))))
+ (base32 "0ykw5hm48fh6xqxdfgmjjbqdd5hp4dmhnykg3zkmb9wrcfp4zx7f"))))
(properties `((upstream-name . "RadioGx")))
(build-system r-build-system)
(propagated-inputs
@@ -8423,13 +8682,13 @@ fraction} are included.")
(define-public r-raggedexperiment
(package
(name "r-raggedexperiment")
- (version "1.26.0")
+ (version "1.28.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "RaggedExperiment" version))
(sha256
(base32
- "07wx2icvxgrds1w7cx9pn99z6rzk2ih938j8g1laxmgx9sya74v6"))))
+ "0xfg88r5nh0qswsfc3mm595jmf2w8s2dr032apd15b3kc40hjlr9"))))
(properties `((upstream-name . "RaggedExperiment")))
(build-system r-build-system)
(propagated-inputs (list r-biocbaseutils
@@ -8457,13 +8716,13 @@ rectangular dataset.")
(define-public r-rdisop
(package
(name "r-rdisop")
- (version "1.62.0")
+ (version "1.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Rdisop" version))
(sha256
(base32
- "1jz063hsrrbrqqx8p5yknagw19hsw51arck591h95dckncxd0006"))))
+ "1gcg441mp6bdnzjkh4gg6zgjn4hnw5i8mdcvb1hfim4hsc7sdsxv"))))
(properties `((upstream-name . "Rdisop")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp))
@@ -8479,14 +8738,14 @@ be calculated to search in MS peak lists.")
(define-public r-rhtslib
(package
(name "r-rhtslib")
- (version "2.4.1")
+ (version "3.0.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhtslib" version))
(sha256
(base32
- "089b5amwxwac6wvdnndy9inc218919q9dz9x58i2cp7il18vjd0c"))))
+ "0497b43wxcfqyr4k30f0xq7yillb4fz0gqiqxxp66gvnqv4wiv6v"))))
(properties `((upstream-name . "Rhtslib")))
(build-system r-build-system)
;; Without this a temporary directory ends up in the Rhtslib.so binary,
@@ -8508,13 +8767,13 @@ of other R packages who wish to make use of HTSlib.")
(define-public r-rnbeads
(package
(name "r-rnbeads")
- (version "2.20.0")
+ (version "2.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RnBeads" version))
(sha256
- (base32 "15z7l4nmpy01xm19717l27nwf3rfsn6wjv211fn2y4ls40mz75qp"))))
+ (base32 "0v7dzmbyskq0vmja09dncg1g50dl3iycg883swb7lfvi4xzr42vj"))))
(properties `((upstream-name . "RnBeads")))
(build-system r-build-system)
(propagated-inputs
@@ -8544,13 +8803,13 @@ methylation data at the genome scale.")
(define-public r-impute
(package
(name "r-impute")
- (version "1.76.0")
+ (version "1.78.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "impute" version))
(sha256
(base32
- "0q7mnx99ndna1r2r0v7jc3w8ly8qw33flwbgkcvrfhk6dzvbn4pl"))))
+ "1g0m9298srkhjnq3mc5rd7krr9y3cy74yvg9k0j7ypc9nmgcqabr"))))
(native-inputs
(list gfortran))
(build-system r-build-system)
@@ -8564,13 +8823,13 @@ microarray data, using nearest neighbor averaging.")
(define-public r-interactivedisplay
(package
(name "r-interactivedisplay")
- (version "1.40.0")
+ (version "1.42.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "interactiveDisplay" version))
(sha256
(base32
- "0w81c5kc48gjavln50ysgr3vaf8s4fb6632ckzb1q225j9ik2gia"))
+ "14k1j8bmpbrldx61fbvn20f7l2lc50bj9iy01a5jf0ddcbi27x5g"))
(snippet
'(for-each delete-file
'("inst/www/js/d3.v2.js"
@@ -8663,14 +8922,14 @@ visualizations and interfaces for working with Bioconductor data.")
(define-public r-interactivedisplaybase
(package
(name "r-interactivedisplaybase")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "interactiveDisplayBase" version))
(sha256
(base32
- "14cw90qlp8y4k0fs7xim8qvhzwbb8sn334mc72fkxg1h4bs8bxjw"))))
+ "0ih9b6n81gr84vhmwcq49knrbmkwbh50gy5hrap654nicb3j3jzb"))))
(properties
`((upstream-name . "interactiveDisplayBase")))
(build-system r-build-system)
@@ -8688,14 +8947,14 @@ Shiny-based display methods for Bioconductor objects.")
(define-public r-keggrest
(package
(name "r-keggrest")
- (version "1.42.0")
+ (version "1.44.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "KEGGREST" version))
(sha256
(base32
- "05fc1i1bcdvvy4mr4m2cdqxd3jrj1rxkxy7c43yrliv5dlikyb07"))))
+ "09qdsdbz5ha3b2fafwv80n6pdajjgsc5w52n1dy6ds41vxgf0jis"))))
(properties `((upstream-name . "KEGGREST")))
(build-system r-build-system)
(propagated-inputs
@@ -8712,13 +8971,13 @@ Shiny-based display methods for Bioconductor objects.")
(define-public r-lea
(package
(name "r-lea")
- (version "3.14.0")
+ (version "3.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "LEA" version))
(sha256
(base32
- "1rhlrcp9rzf64rkabgk3gd8jqdg8ldwpkxvpfb6g49bgpkg1h6b1"))))
+ "0r6nj6ck77fhbmqifbx4srj1f3yr7haiinphcm0p4g8b7zn4a6fm"))))
(properties `((upstream-name . "LEA")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -8743,13 +9002,13 @@ scale with the dimensions of large data sets.")
(define-public r-lfa
(package
(name "r-lfa")
- (version "2.2.0")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "lfa" version))
(sha256
- (base32 "1xrwvw7227znd1h7426k8l86197yc24b4v608issh5fqglmhljns"))))
+ (base32 "1sbgr6h2kpfpzw3fkqd1075wrmbblb97pdywmvl8xv52vg0wqxz3"))))
(properties `((upstream-name . "lfa")))
(build-system r-build-system)
(propagated-inputs (list r-corpcor r-rspectra))
@@ -8764,13 +9023,13 @@ Binomial data via estimation of latent structure in the natural parameter.")
(define-public r-limma
(package
(name "r-limma")
- (version "3.58.1")
+ (version "3.60.4")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "limma" version))
(sha256
(base32
- "01byjnhhjyxk9x871rk8bgqq6lkp1a6dylqbdphpzp88b1jf2f9m"))))
+ "123z062fc0qf43zplmw5svzpdmpgxagyl1gi1bxa34426s1hfv6m"))))
(build-system r-build-system)
(native-inputs (list r-knitr))
(propagated-inputs (list r-statmod))
@@ -8785,13 +9044,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.")
(define-public r-maaslin2
(package
(name "r-maaslin2")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Maaslin2" version))
(sha256
- (base32 "1d95dv46b36ncwb7zdn0wvshg4v73qjfs3hij0jmbkkxvf2il9iq"))))
+ (base32 "0dl6s4lcd40nd7v0d3k3zn0mkm5rlzb8kf2cjxz298mgdif63xqh"))))
(properties `((upstream-name . "Maaslin2")))
(build-system r-build-system)
(propagated-inputs
@@ -8833,13 +9092,13 @@ of data exploration, normalization, and transformation methods.")
(define-public r-made4
(package
(name "r-made4")
- (version "1.76.0")
+ (version "1.78.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "made4" version))
(sha256
(base32
- "03fhiszlmjh8nvz3gppf45r9kpcjrdb601ar17c4f2aygjpkf0cg"))))
+ "0x96lhkz0fwp3qis8k2lllmi520b887bz26jcq3zlk1kjhbg91a8"))))
(properties `((upstream-name . "made4")))
(build-system r-build-system)
(propagated-inputs
@@ -8862,13 +9121,13 @@ datasets (coinertia analysis).")
(define-public r-makecdfenv
(package
(name "r-makecdfenv")
- (version "1.78.0")
+ (version "1.80.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "makecdfenv" version))
(sha256
(base32
- "0mggcw0390i1y2wn4k8570gjmbsx6hbipi8fkhz2zj9icsx89x1l"))))
+ "0c1ks5f2rc0mwbfji6iicvypbmm46mq8yckmdpwiyp22l7l05aqz"))))
(properties `((upstream-name . "makecdfenv")))
(build-system r-build-system)
(inputs (list zlib))
@@ -8889,13 +9148,13 @@ package that automatically loads that environment.")
(define-public r-manor
(package
(name "r-manor")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MANOR" version))
(sha256
- (base32 "10zf6c1vx6cp4wg6axpmbpxk2hlmf6mga7rdh765fznwb71r4h0x"))))
+ (base32 "0mlhv4gy4bxvdm0drwwrm4x48wy0mghzcqhvaw2rhw0h65rmy5ps"))))
(properties `((upstream-name . "MANOR")))
(build-system r-build-system)
(propagated-inputs (list r-glad))
@@ -8912,13 +9171,13 @@ experiments.")
(define-public r-maser
(package
(name "r-maser")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "maser" version))
(sha256
(base32
- "0h7x1fyfvnjc30w9ydbnlqijz58q2kcxv4yy784rf4adsrdhwh45"))))
+ "0w62dl65ysgcwixgmmb70qp6f85vhfnqjsww5snkjd48ypwx65ca"))))
(properties `((upstream-name . "maser")))
(build-system r-build-system)
(propagated-inputs
@@ -8944,13 +9203,13 @@ and visualizaton of alternative splicing events generated by rMATS.")
(define-public r-mdqc
(package
(name "r-mdqc")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mdqc" version))
(sha256
- (base32 "0q6ig9qdf2s9329wysrvgh13yq5c7n76as2c3mahqm78xb0mpplf"))))
+ (base32 "1frn6s43j6sbwnb5h2hykccvi7cwbasp8l37rc3nkxpc6szvsby6"))))
(properties `((upstream-name . "mdqc")))
(build-system r-build-system)
(propagated-inputs
@@ -8969,16 +9228,16 @@ high distances can be flagged as potentially low-quality.")
(define-public r-metabocoreutils
(package
(name "r-metabocoreutils")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MetaboCoreUtils" version))
(sha256
- (base32 "0bs24dwqlm8isp231jds51l7v16q0gjli1qmhjxyva3qmi5yb4dl"))))
+ (base32 "1y5lq1x60pcvxsl8dim5plzd3y4bqjkcam5hv9614xw0sr4h0r04"))))
(properties `((upstream-name . "MetaboCoreUtils")))
(build-system r-build-system)
- (propagated-inputs (list r-mscoreutils))
+ (propagated-inputs (list r-biocparallel r-mscoreutils))
(native-inputs (list r-knitr))
(home-page "https://github.com/RforMassSpectrometry/MetaboCoreUtils")
(synopsis "Core utils for Metabolomics data")
@@ -8995,13 +9254,13 @@ mixes commonly used in MS experiments.")
(define-public r-metagenomeseq
(package
(name "r-metagenomeseq")
- (version "1.43.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "metagenomeSeq" version))
(sha256
- (base32 "1m19qkwrbfr4yhbr1izfjka3brn1qasqql6alczv55l5h52m4s4b"))))
+ (base32 "0bjbiwbgs0lv0j6gjv5rhqhmqk0p7f80lfig4n24i4bqwkd2j26k"))))
(properties `((upstream-name . "metagenomeSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -9029,13 +9288,13 @@ correlations.")
(define-public r-metaneighbor
(package
(name "r-metaneighbor")
- (version "1.22.0")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "MetaNeighbor" version))
(sha256
(base32
- "0y8nk9jq0z48phg13mf6hsfg8l54w6z6b67g0k1c9gmsb7aqq04d"))))
+ "0sz15njb0y9vcmbv89k3x2sw4px8nmy3qhqkvyl69kxlcqdicgxi"))))
(properties `((upstream-name . "MetaNeighbor")))
(build-system r-build-system)
(propagated-inputs
@@ -9065,13 +9324,13 @@ profiles than cells of different types.")
(define-public r-methylaid
(package
(name "r-methylaid")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MethylAid" version))
(sha256
- (base32 "0mzml9j6f7yycf9747ikkpfvxnwji07h8jhwa9a54ix2d0wyxk3d"))))
+ (base32 "084mnllaj6qp5ai5bmj6wgc90bs270qbzl60sch1f863x8fv9lzr"))))
(properties `((upstream-name . "MethylAid")))
(build-system r-build-system)
(propagated-inputs
@@ -9103,13 +9362,13 @@ be explored.")
(define-public r-methylkit
(package
(name "r-methylkit")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "methylKit" version))
(sha256
(base32
- "0y45wa45kblm2g3nylvybvyfc34sjlynhsz3dirhs1favb83sdiv"))))
+ "000dvi63cjikjbq3q83hlspd7y62rpswzg6hs5z1z1pj6a8rifdj"))))
(properties `((upstream-name . "methylKit")))
(build-system r-build-system)
(propagated-inputs
@@ -9150,13 +9409,13 @@ TAB-Seq.")
(define-public r-mfuzz
(package
(name "r-mfuzz")
- (version "2.62.0")
+ (version "2.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Mfuzz" version))
(sha256
(base32
- "0v2l3fi9331lxfam6az265rfk52g4n75hh4rg12ykhp86ihplzpf"))))
+ "00sx63bg5qw22vw0yw3syhyl5ffjrqvf81b9ksgw2p0z3yiiss5h"))))
(properties `((upstream-name . "Mfuzz")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-e1071 r-tkwidgets))
@@ -9170,13 +9429,13 @@ time-series data (including a graphical user interface).")
(define-public r-mmuphin
(package
(name "r-mmuphin")
- (version "1.16.0")
+ (version "1.18.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MMUPHin" version))
(sha256
- (base32 "0lhvsx5yjvqh5d3h860sv8cf3h73nrzvljpkqrd9ks0irc4gcm6d"))
+ (base32 "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj"))
;; Delete generated files.
(snippet
'(for-each delete-file
@@ -9238,13 +9497,13 @@ It has function interfaces for:
(define-public r-modstrings
(package
(name "r-modstrings")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Modstrings" version))
(sha256
- (base32 "1jjawwkvdx02ss2vw4ah2b8psgxr01z6r1rkr2pnkmrp2ma7ygks"))))
+ (base32 "0yc8gsgxlww2g9z1m6jl02aqmama10fkr2mvibvdi01s5pqwdbky"))))
(properties `((upstream-name . "Modstrings")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -9302,14 +9561,14 @@ throughput genetic sequencing data sets using regression methods.")
(define-public r-muscat
(package
(name "r-muscat")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "muscat" version))
(sha256
(base32
- "0vasr9rwnfjxbb3y2saq7gqzis5xyamgvns2rlywdxv1jm0nr8y3"))))
+ "1gafcq3p693f28gz3p8hk8mlxd9zja95h8953sr56n7krfffy1gi"))))
(properties `((upstream-name . "muscat")))
(build-system r-build-system)
(propagated-inputs
@@ -9352,14 +9611,14 @@ platform that mimics both single and multi-sample scRNA-seq data.")
(define-public r-mutationalpatterns
(package
(name "r-mutationalpatterns")
- (version "3.12.0")
+ (version "3.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MutationalPatterns" version))
(sha256
(base32
- "19ya4ax6pa727hdn0118l9pwa9dxgh89dz54mm66dawxga3jhar4"))))
+ "0smf4l023ckwsm5ckrqqw7kjyi1awp378mzhab7v8nk9n5smsj61"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -9398,13 +9657,13 @@ in SNV base substitution data.")
(define-public r-msa
(package
(name "r-msa")
- (version "1.34.0")
+ (version "1.36.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "msa" version))
(sha256
(base32
- "1csa8j64xrfr6kdnndr3876bplclca9wf6ydy9kg97xsjq7gz8q5"))))
+ "16ixhinhcbf2nvdmqria231s4qhr8lzhr7yqr7ljrnnwiqadfr67"))))
(properties `((upstream-name . "msa")))
(build-system r-build-system)
(propagated-inputs
@@ -9429,14 +9688,14 @@ package TeXshade.")
(define-public r-msnbase
(package
(name "r-msnbase")
- (version "2.28.1")
+ (version "2.30.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MSnbase" version))
(sha256
(base32
- "1622mmm5n8yl4qjq8bda7689qdfz1rhyxyh8s3q5475al1d0mpsl"))))
+ "0cdvi2mjvhj0h8x2rh3kkzrdnmzhr7d9a41m21r6b843a0q7hp6f"))))
(properties `((upstream-name . "MSnbase")))
(build-system r-build-system)
(propagated-inputs
@@ -9457,11 +9716,11 @@ package TeXshade.")
r-pcamethods
r-plyr
r-protgenerics
+ r-psmatch
r-rcpp
r-s4vectors
r-scales
- r-vsn
- r-xml))
+ r-vsn))
(native-inputs
(list r-knitr))
(home-page "https://github.com/lgatto/MSnbase")
@@ -9474,14 +9733,14 @@ of mass spectrometry based proteomics data.")
(define-public r-msnid
(package
(name "r-msnid")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MSnID" version))
(sha256
(base32
- "1hmfh7v7p5d741x2wh1njqwkmfmf3xmwkqy88kalrcjzrdwfpv9b"))))
+ "0misrm4x4z5h8dfwcrwi24nhcjslqvbyk5n7qz6kf2zcgcwq8q44"))))
(properties `((upstream-name . "MSnID")))
(build-system r-build-system)
(arguments
@@ -9531,14 +9790,14 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
(define-public r-mzid
(package
(name "r-mzid")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mzID" version))
(sha256
(base32
- "1rgkd9iv0lxj1zxh96sifwa312ivw5kl5jw82ma4fmapr4iqhzsh"))))
+ "0kh9swzh3hvi6qi64cgr13f22s1mgvz2rid5psb1gy4l3biwadj5"))))
(properties `((upstream-name . "mzID")))
(build-system r-build-system)
(propagated-inputs
@@ -9562,14 +9821,14 @@ specific parser.")
(define-public r-mzr
(package
(name "r-mzr")
- (version "2.36.0")
+ (version "2.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mzR" version))
(sha256
(base32
- "0z6ckp69syrdzhp6n4n399k2lar3w4n2d1ji2f90951c4ds6hkh8"))
+ "02dz23xns9ryz98nip1w68h9q5ckxpyl1zvzklsp4j7p9z2400dk"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/boost"))))
@@ -9682,14 +9941,14 @@ Gao et al in Nature Biotechnology 2022}.")
(define-public r-organism-dplyr
(package
(name "r-organism-dplyr")
- (version "1.30.1")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Organism.dplyr" version))
(sha256
(base32
- "1s55fiqgxrdznn43qhm5yv9gp8d1msr2f39wxih0b5bm4wxhkq45"))))
+ "03z5pyqbaxwyrq5m858c8k69fwvclq98ksr84dc4m7r8lzz2hfxx"))))
(properties `((upstream-name . "Organism.dplyr")))
(build-system r-build-system)
(propagated-inputs
@@ -9721,14 +9980,14 @@ functionality of the @code{TxDb} packages (e.g.,
(define-public r-organismdbi
(package
(name "r-organismdbi")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "OrganismDbi" version))
(sha256
(base32
- "0g75y21lqmwsh28nx99zp2gxr6rhlhbw76f66qx5hrh6bm2zpm7j"))))
+ "1cfh632rpmklmyd5cibwiy0i2pk2kk2m39g8mq5sxfwd2am4r0jk"))))
(properties `((upstream-name . "OrganismDbi")))
(build-system r-build-system)
(propagated-inputs
@@ -9742,7 +10001,8 @@ functionality of the @code{TxDb} packages (e.g.,
r-graph
r-iranges
r-rbgl
- r-s4vectors))
+ r-s4vectors
+ r-txdbmaker))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/OrganismDbi")
(synopsis "Software to enable the smooth interfacing of database packages")
@@ -9754,13 +10014,13 @@ the fact that each of these packages implements a select methods.")
(define-public r-oscope
(package
(name "r-oscope")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Oscope" version))
(sha256
(base32
- "1li2l9mdq2q0580a7qzvfid5n15v62fr9ys87j42k3l2w5a26smf"))))
+ "16d2ngakdg73rdx0bf1pz3z1n8npjzl3b7dn94g9zbayw4vp3x5z"))))
(properties `((upstream-name . "Oscope")))
(build-system r-build-system)
(propagated-inputs (list r-biocparallel r-cluster r-ebseq r-testthat))
@@ -9780,14 +10040,14 @@ insertion module to recover the base cycle order for each oscillator group.")
(define-public r-pcaexplorer
(package
(name "r-pcaexplorer")
- (version "2.28.0")
+ (version "2.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pcaExplorer" version))
(sha256
(base32
- "0ihc9jqjy0nl4pfgcxczfdf973nb99325agk73y0222ad1mpkc07"))))
+ "1szl2gyhw55ad4phcb7qn14amjb6xg65l3p4hnjzp6rda2cy9437"))))
(properties `((upstream-name . "pcaExplorer")))
(build-system r-build-system)
(propagated-inputs
@@ -9835,14 +10095,14 @@ application encapsulates the whole analysis.")
(define-public r-pcamethods
(package
(name "r-pcamethods")
- (version "1.94.0")
+ (version "1.96.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pcaMethods" version))
(sha256
(base32
- "1asm4iafdzm98iv2j9sxvn5y9ss2p679cx7gwjipq8mf1d7bzfp0"))))
+ "1hrq0xmpr1l95hyi6ls9r86ahwf2rcbvr8m7cpg6ra0gsfyn4mpi"))))
(properties `((upstream-name . "pcaMethods")))
(build-system r-build-system)
(propagated-inputs
@@ -9862,13 +10122,13 @@ structure (pcaRes) to provide a common interface to the PCA results.")
(define-public r-pfamanalyzer
(package
(name "r-pfamanalyzer")
- (version "1.2.0")
+ (version "1.4.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "pfamAnalyzeR" version))
(sha256
(base32
- "0qxxp7kfwbb9q471mgwc4bd8dmyid56ddyzw2jlg4gb1wcq9py67"))))
+ "06bp5nghgrj8qyzqp1v869vck1j10093r9dp67w0kav4x4srkyyl"))))
(properties `((upstream-name . "pfamAnalyzeR")))
(build-system r-build-system)
(propagated-inputs (list r-dplyr r-magrittr r-readr r-stringr r-tibble))
@@ -9885,13 +10145,13 @@ domain isotypes from pfam data.")
(define-public r-piano
(package
(name "r-piano")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "piano" version))
(sha256
- (base32 "0rw55ig3pbvi2kyg10rx60ldcncsd4gki2h1zpr1nhmqg3fv0l5y"))))
+ (base32 "0v168wkwxzh70h2c08ad4dzlgklbgvx1fzwrzw2mqq0fyczj0diw"))))
(properties `((upstream-name . "piano")))
(build-system r-build-system)
(propagated-inputs
@@ -9922,13 +10182,13 @@ set analyses.")
(define-public r-polyester
(package
(name "r-polyester")
- (version "1.38.0")
+ (version "1.39.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "polyester" version))
(sha256
- (base32 "1iycdxj0jhh2faclfzflp2cjc2zmxmhy03avv75h0qg3j5kf35l4"))))
+ (base32 "0fw0qhmbygjq4ryspyqikb8rxfn33ks000j7sshgfg8hf2rmqg3x"))))
(properties `((upstream-name . "polyester")))
(build-system r-build-system)
(propagated-inputs
@@ -9950,13 +10210,13 @@ comparisons of methods for differential expression.")
(define-public r-powertcr
(package
(name "r-powertcr")
- (version "1.22.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "powerTCR" version))
(sha256
- (base32 "06fmphdq95pjbbvm8m8h1wajbp3vhl0zj7ddbzks9fy7ankp1n3i"))))
+ (base32 "04w6jhpc1vkqrm3dr5igp1iwkammmi53mqafjz694n379hamxrhg"))))
(properties `((upstream-name . "powerTCR")))
(build-system r-build-system)
(propagated-inputs
@@ -10020,16 +10280,48 @@ data and detection of regions with abnormal copy number within each parental
chromosome. Both tumor-normal paired and tumor-only analyses are supported.")
(license license:gpl2+)))
+(define-public r-psmatch
+ (package
+ (name "r-psmatch")
+ (version "1.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "PSMatch" version))
+ (sha256
+ (base32 "13w145is3d95392qqdq6qh3mrlcixbj0jzz4r590xas1qjp5d03h"))))
+ (properties `((upstream-name . "PSMatch")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-biocgenerics
+ r-biocparallel
+ r-igraph
+ r-matrix
+ r-mscoreutils
+ r-protgenerics
+ r-qfeatures
+ r-s4vectors))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/RforMassSpectrometry/PSM")
+ (synopsis "Handling and managing peptide spectrum matches")
+ (description
+ "The PSMatch package helps proteomics practitioners to load, handle and
+manage peptide spectrum matches. It provides functions to model
+peptide-protein relations as adjacency matrices and connected components,
+visualise these as graphs and make informed decision about shared peptide
+filtering. The package also provides functions to calculate and visualise MS2
+fragment ions.")
+ (license license:artistic2.0)))
+
(define-public r-protgear
(package
(name "r-protgear")
- (version "1.6.0")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "protGear" version))
(sha256
- (base32 "0r8md32vxjzarjldr9vsh3k0ms4zgqm9c7pp2flanbyinnqlfnxv"))))
+ (base32 "1wbdp7f55lbn0gcxgnp9xk0y5npn7jmk9vp7yq9v76j7f396vj2f"))))
(properties `((upstream-name . "protGear")))
(build-system r-build-system)
(arguments
@@ -10085,14 +10377,14 @@ batch correction and normalization.")
(define-public r-protgenerics
(package
(name "r-protgenerics")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ProtGenerics" version))
(sha256
(base32
- "1gjva76nxa9nzzmc9hya3bq7hswfmjd768v21f6m3gyygxvl581m"))))
+ "0h0i4dgsgvyhma5pfvycv6wyxv27vp0b2i8b6l8hj55z8cvmvfln"))))
(properties `((upstream-name . "ProtGenerics")))
(build-system r-build-system)
(home-page "https://github.com/lgatto/ProtGenerics")
@@ -10102,17 +10394,41 @@ batch correction and normalization.")
proteomics packages.")
(license license:artistic2.0)))
+(define-public r-pwalign
+ (package
+ (name "r-pwalign")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "pwalign" version))
+ (sha256
+ (base32 "1m0j1m5jif5spd9fkpzz3z3c9s8vwiy8xvpx8rz8igxj89rwrwb7"))))
+ (properties `((upstream-name . "pwalign")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-biocgenerics r-biostrings r-iranges r-s4vectors
+ r-xvector))
+ (home-page "https://bioconductor.org/packages/pwalign")
+ (synopsis "Perform pairwise sequence alignments")
+ (description
+ "The two main functions in the package are @code{pairwiseAlignment} and
+@code{stringDist}. The former solves (Needleman-Wunsch) global alignment,
+(Smith-Waterman) local alignment, and (ends-free) overlap alignment problems.
+The latter computes the Levenshtein edit distance or pairwise alignment score
+matrix for a set of strings.")
+ (license license:artistic2.0)))
+
(define-public r-rbgl
(package
(name "r-rbgl")
- (version "1.78.0")
+ (version "1.80.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RBGL" version))
(sha256
(base32
- "0hxhl1l6qdi355w5y7fdq8vlba2pknfizggkgr2fp8f1f3zqh494"))))
+ "1n6rfrcvlgi6mzz36v9sniqr05xfjzvfdpv4xwsn1xq41326wdv3"))))
(properties `((upstream-name . "RBGL")))
(build-system r-build-system)
(propagated-inputs
@@ -10128,13 +10444,13 @@ the graph algorithms contained in the Boost library.")
(define-public r-rcas
(package
(name "r-rcas")
- (version "1.28.3")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "RCAS" version))
(sha256
(base32
- "1d9icr17xwdmgm6b8ihrwxsg1fp342c2p9f8yqdjm2y52z88gmpd"))))
+ "0ll0sj2zyazw0nxbpybq9frmxvmcjkgk3hwp3flnysjxg056dhxg"))))
(properties `((upstream-name . "RCAS")))
(build-system r-build-system)
(propagated-inputs
@@ -10163,7 +10479,8 @@ the graph algorithms contained in the Boost library.")
r-rsqlite
r-rtracklayer
r-s4vectors
- r-seqlogo))
+ r-seqlogo
+ r-txdbmaker))
(native-inputs
(list r-knitr))
(synopsis "RNA-centric annotation system")
@@ -10177,13 +10494,13 @@ library implementing most of the pipeline's features.")
(define-public r-rcy3
(package
(name "r-rcy3")
- (version "2.22.1")
+ (version "2.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RCy3" version))
(sha256
- (base32 "0qkjprf2p641j3a60av1l87pd6p17za5w6bp9qyah97jmm19za7m"))))
+ (base32 "03zmskcb8n87x6m5jlhsh2b0b2qjk91y16fdcj3kz5c1j7zfs18i"))))
(properties `((upstream-name . "RCy3")))
(build-system r-build-system)
(propagated-inputs (list r-base64enc
@@ -10214,14 +10531,14 @@ with a single RCy3 function.")
(define-public r-regioner
(package
(name "r-regioner")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "regioneR" version))
(sha256
(base32
- "1qcgbj7d2fngs3p9a9apnj14x35kc651fy3m0651dnqrxz8j5yij"))))
+ "1ygdlqvhf165mqd247783pi1yzidqap8b913444vrs881n62xvrb"))))
(properties `((upstream-name . "regioneR")))
(build-system r-build-system)
(propagated-inputs
@@ -10245,14 +10562,14 @@ region sets and other genomic features.")
(define-public r-reportingtools
(package
(name "r-reportingtools")
- (version "2.42.3")
+ (version "2.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ReportingTools" version))
(sha256
(base32
- "109vmrdsjdjnfrlcdyadzbwz9a50hqaahf7dawwxkbbh4mmdih78"))
+ "0vq46dj2v3imjmf6cw8mab6k9v4rrc5r2vh100jjlsm3z15gvl17"))
(snippet
'(delete-file "inst/extdata/jslib/jquery-1.8.0.min.js"))))
(properties
@@ -10321,16 +10638,16 @@ browser.")
(define-public r-rhdf5
(package
(name "r-rhdf5")
- (version "2.46.1")
+ (version "2.48.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "rhdf5" version))
(sha256
(base32
- "0yfy0y9ywzbbdmvvraxmizv3w2x1iznhfys6hhwyi644pxh4k3xn"))))
+ "086bnwzmlwq3z9a4kb1rnzb2wnchhi4gvzpijhladgd83nqyb0wn"))))
(build-system r-build-system)
(propagated-inputs
- (list r-rhdf5filters r-rhdf5lib r-s4vectors))
+ (list r-rhdf5filters r-rhdf5lib))
(native-inputs
(list r-knitr))
(home-page "https://bioconductor.org/packages/rhdf5")
@@ -10348,14 +10665,14 @@ the available RAM.")
(define-public r-rhdf5filters
(package
(name "r-rhdf5filters")
- (version "1.14.1")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "rhdf5filters" version))
(sha256
(base32
- "0cqf7k19k4m4swd2c1wd9cyzw9k90s3d3jq0hijjwvza50nn2dk6"))))
+ "0fsfp34pfb5k030j7nfx9b9vsil02y85sv1dd1y0bfdxchi4bw8x"))))
(properties `((upstream-name . "rhdf5filters")))
(build-system r-build-system)
(arguments
@@ -10378,13 +10695,13 @@ HDF5 datasets.")
(define-public r-rsamtools
(package
(name "r-rsamtools")
- (version "2.18.0")
+ (version "2.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Rsamtools" version))
(sha256
(base32
- "0bcapiwdzv7rqgs4hmw7hq290r3pz5vvhg4apxard0yybq83na1g"))))
+ "04lz0dzwmgi8j9wyspbmjln6yb5fv4f538nqyrfd31d0g16937b8"))))
(properties
`((upstream-name . "Rsamtools")))
(build-system r-build-system)
@@ -10445,13 +10762,13 @@ tab-delimited (tabix) files.")
(define-public r-rtcga
(package
(name "r-rtcga")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "RTCGA" version))
(sha256
(base32
- "1lzdwkisvzj1wyx3wx4ll1c2j9ww3xz8kpbngmpf8cdrw4h3jrg1"))))
+ "1a967id4anjzpdlbdd8a85fvb1z7mcr759pr91aashv12bzzhnk0"))))
(properties `((upstream-name . "RTCGA")))
(build-system r-build-system)
(propagated-inputs (list r-assertthat
@@ -10490,13 +10807,13 @@ transforms TCGA data to tidy form which is convenient to use.")
(define-public r-rtcgatoolbox
(package
(name "r-rtcgatoolbox")
- (version "2.32.1")
+ (version "2.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "RTCGAToolbox" version))
(sha256
(base32
- "1a38b30nsg2bnlnijf4aa4rn4db2y4v86awfbf6a6qzqwlzknrcq"))))
+ "0l4idk6gsrnm7laj1xkm6jwmyy5l90kphm21zk7y33cpnp2ryjwr"))))
(properties `((upstream-name . "RTCGAToolbox")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -10529,13 +10846,13 @@ pre-processed data.")
(define-public r-rtracklayer
(package
(name "r-rtracklayer")
- (version "1.62.0")
+ (version "1.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "rtracklayer" version))
(sha256
(base32
- "1jxhv2fq62lz0j6kbwq43c8ggk14ccsjg0xgfqjqy941dj9ig0n2"))))
+ "0h2cqr1jqqqxvkmqpngfl8ppm1p65vvlb1wgfwl9r4f99b8vz33g"))))
(build-system r-build-system)
(arguments
`(#:phases
@@ -10549,16 +10866,17 @@ pre-processed data.")
(native-inputs
(list pkg-config))
(inputs
- (list openssl zlib))
+ (list curl openssl zlib))
(propagated-inputs
(list r-biocgenerics
r-biocio
r-biostrings
+ r-curl
r-genomeinfodb
r-genomicalignments
r-genomicranges
+ r-httr
r-iranges
- r-rcurl
r-restfulr
r-rsamtools
r-s4vectors
@@ -10608,13 +10926,13 @@ differential expression analysis, RNAseq data and related problems.")
(define-public r-saturn
(package
(name "r-saturn")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "satuRn" version))
(sha256
(base32
- "12bivj0cnp38apwi3jqmil8bwsfa96cjp5f132a5raacd2z87gqf"))))
+ "03mlb4j219w8760zm5hnryjwxns3qz9y3wl6zaqdfnl94bwyl9r8"))))
(properties `((upstream-name . "satuRn")))
(build-system r-build-system)
(propagated-inputs (list r-biocparallel
@@ -10642,13 +10960,13 @@ transcripts in groups of interest.")
(define-public r-scannotatr
(package
(name "r-scannotatr")
- (version "1.8.0")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scAnnotatR" version))
(sha256
- (base32 "13wrxxdwphngi0f9vxakykk54bqngw8g38w6wkk96999lzb3p57p"))))
+ (base32 "1gzssp7im1d9pp2mbar27k854fcc3rqyza5d77flmhshq88xrskv"))))
(properties `((upstream-name . "scAnnotatR")))
(build-system r-build-system)
(propagated-inputs
@@ -10679,13 +10997,13 @@ cell types based on specific research needs.")
(define-public r-scdblfinder
(package
(name "r-scdblfinder")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scDblFinder" version))
(sha256
- (base32 "1f3n1m6fjx965wm2jllzk51ssj92ifxb4bln4vwk25qxd3g0bna8"))))
+ (base32 "1np3arhjxxgif68i0wi0nqqbrwavy14dh9vy2g9mw4408k7789w0"))))
(properties `((upstream-name . "scDblFinder")))
(build-system r-build-system)
(propagated-inputs
@@ -10725,13 +11043,13 @@ comprehensive scDblFinder method.")
(define-public r-scgate
(package
(name "r-scgate")
- (version "1.6.0")
+ (version "1.6.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "scGate" version))
(sha256
- (base32 "0h12d36zjc6fvxbhkxrzbpvw49z9fgyn1jc941q70ajw1yqi2hhh"))))
+ (base32 "0zlbrvr6lxcihspfqgpvv5kyrzqqpy3451j0kpnqc0n93bbs4cqk"))))
(properties `((upstream-name . "scGate")))
(build-system r-build-system)
(propagated-inputs
@@ -10804,13 +11122,13 @@ method applicable to massive single-cell datasets (>10,000 cells).")
(define-public r-scmap
(package
(name "r-scmap")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scmap" version))
(sha256
- (base32 "1sd5ixs8fbiqqp1p4p505l1f0lncmagkhzh4xrk8wrca6db6k6d8"))))
+ (base32 "0acy3sg4j36znsfxpkb190wbawbngx15cr5x2lhgrjivvw3637x1"))))
(properties `((upstream-name . "scmap")))
(build-system r-build-system)
(propagated-inputs
@@ -10846,33 +11164,41 @@ different experiment.")
(define-public r-screpertoire
(package
(name "r-screpertoire")
- (version "1.12.0")
+ (version "2.0.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scRepertoire" version))
(sha256
- (base32 "1wgs8dv5zl82iciy86w5ws1gq8v2piklcifbw7gmbw60kijyr2l1"))))
+ (base32 "1ifnyfzswisacvxxf041l1snfv1b8x30pjg2pwampg804c56f1wj"))))
(properties `((upstream-name . "scRepertoire")))
(build-system r-build-system)
(propagated-inputs
- (list r-doparallel
+ (list r-cubature
r-dplyr
+ r-evmix
r-ggalluvial
+ r-ggdendro
r-ggplot2
r-ggraph
+ r-hash
r-igraph
+ r-inext
r-plyr
- r-powertcr
+ r-quantreg
+ r-rcpp
r-reshape2
+ r-rjson
r-rlang
+ r-s4vectors
r-seuratobject
r-singlecellexperiment
r-stringdist
r-stringr
r-summarizedexperiment
r-tidygraph
- r-vegan))
+ r-truncdist
+ r-vgam))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/scRepertoire")
(synopsis "Toolkit for single-cell immune receptor profiling")
@@ -10889,25 +11215,35 @@ powerTCR R packages.")
(define-public r-scrnaseq
(package
(name "r-scrnaseq")
- (version "2.16.0")
+ (version "2.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scRNAseq" version
'experiment))
(sha256
- (base32 "0dbh3sqq7lkkdf7vls5qg7fbn6y74c7hsigb4d69pvk934ll88aw"))))
+ (base32 "0jsq037ba4xsb3bwwf021jw2hqv30vb5nrjag97xadx75z5fzqlr"))))
(properties `((upstream-name . "scRNAseq")))
(build-system r-build-system)
- (propagated-inputs (list r-annotationdbi
+ (propagated-inputs (list r-alabaster-base
+ r-alabaster-matrix
+ r-alabaster-sce
+ r-annotationdbi
r-annotationhub
r-biocgenerics
+ r-dbi
+ r-delayedarray
r-ensembldb
r-experimenthub
r-genomicfeatures
r-genomicranges
+ r-gypsum
+ r-jsonlite
+ r-matrix
+ r-rsqlite
r-s4vectors
r-singlecellexperiment
+ r-sparsearray
r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/scRNAseq")
@@ -10921,13 +11257,13 @@ with cell- and gene-level metadata.")
(define-public r-scry
(package
(name "r-scry")
- (version "1.14.0")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scry" version))
(sha256
(base32
- "0hbdsjsn0jl0dr2ly5vx0wb4bnz7nl15kkypryywjvis9rdasjj3"))))
+ "16489ff1nc798nfcmqvqaczm7hqffkhpad1dfgr7dxlahd8sbnw9"))))
(properties `((upstream-name . "scry")))
(build-system r-build-system)
(propagated-inputs
@@ -10952,13 +11288,13 @@ single-cell RNA-seq.")
(define-public r-seqarray
(package
(name "r-seqarray")
- (version "1.42.4")
+ (version "1.44.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "SeqArray" version))
(sha256
(base32
- "0k7g4wkj1l35pjy6gb3bdlmz5g8q2d596glj09ggm73aaj3z4m9d"))))
+ "0b0i17kwa8141y568k2asiv46hz4z0lwiqjz687d96j6kz3r3zgg"))))
(properties `((upstream-name . "SeqArray")))
(build-system r-build-system)
(propagated-inputs (list r-biostrings
@@ -10982,14 +11318,14 @@ data access using the R programming language.")
(define-public r-seqlogo
(package
(name "r-seqlogo")
- (version "1.68.0")
+ (version "1.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "seqLogo" version))
(sha256
(base32
- "106359wn4v0m53b33x4zjsyjsj4j8h7bnvd1whamsig982h6szp2"))))
+ "154c3g4i6snsi8vkwjw4d8lyr3372d6vyw237nslw1y5n837yzir"))))
(properties `((upstream-name . "seqLogo")))
(build-system r-build-system)
(native-inputs
@@ -11005,13 +11341,13 @@ Stephens (1990).")
(define-public r-seqpattern
(package
(name "r-seqpattern")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "seqPattern" version))
(sha256
(base32
- "0rs9dy540d4agp7fc8glbrcnly4s6qcxqsq4yv8y555bbdld6dv0"))))
+ "0iv0dhs1z8i0jglh1iw6ypzh6qslnn5xly2kjfxaxk9cggnjb5h6"))))
(properties
`((upstream-name . "seqPattern")))
(build-system r-build-system)
@@ -11028,13 +11364,13 @@ reference point and sorted by a user defined feature.")
(define-public r-sesame
(package
(name "r-sesame")
- (version "1.20.0")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "sesame" version))
(sha256
(base32
- "0yh4mrsj3pqhjkrq5dwmcpcqwixs0pmjy7dfa3cr0mf52fgzcvmr"))))
+ "1d2vjglpbhmr4fjp3zwipf0nwj5pms4l9q1xngyxrsbr26x7jp1d"))))
(properties `((upstream-name . "sesame")))
(build-system r-build-system)
(propagated-inputs (list r-biocfilecache
@@ -11043,7 +11379,6 @@ reference point and sorted by a user defined feature.")
r-genomeinfodb
r-genomicranges
r-ggplot2
- r-illuminaio
r-iranges
r-mass
r-preprocesscore
@@ -11070,13 +11405,13 @@ and advanced quality control routines.")
(define-public r-shinymethyl
(package
(name "r-shinymethyl")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "shinyMethyl" version))
(sha256
(base32
- "1gkj15q1rxvsdzbsp3gkk02kvvx0kq4wsqycf3ln1bszb9688jw6"))))
+ "15r9x1fqladjviyisbhr8zff0a6g9kvbvx72xcp3bfadp3wpygds"))))
(properties `((upstream-name . "shinyMethyl")))
(build-system r-build-system)
(propagated-inputs
@@ -11098,14 +11433,14 @@ methylation array data. Both the 450k and EPIC array are supported.")
(define-public r-shortread
(package
(name "r-shortread")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ShortRead" version))
(sha256
(base32
- "0fgiszb5qhplppfngpi4s33sx62ff5sdhd6n31a3b6l7fnlvk51m"))))
+ "0x5iqx2k2xs5rwjch0bpcb8pgc0nhb571991yahdr8hsxwbas3jm"))))
(properties `((upstream-name . "ShortRead")))
(build-system r-build-system)
(inputs
@@ -11122,6 +11457,7 @@ methylation array data. Both the 450k and EPIC array are supported.")
r-iranges
r-lattice
r-latticeextra
+ r-pwalign
r-rhtslib
r-rsamtools
r-s4vectors
@@ -11141,13 +11477,13 @@ ungapped alignment formats.")
(define-public r-sictools
(package
(name "r-sictools")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SICtools" version))
(sha256
- (base32 "0bcajjvkaxmr8bdij8xln7a3nmxbm7jkjvg2v6p8kd0xr3q9a70q"))))
+ (base32 "0ymk18aj4r0526xqqkrvd75p4jrgrq2wshx7mqh2wj7nizjfn8fv"))))
(properties `((upstream-name . "SICtools")))
(build-system r-build-system)
(arguments
@@ -11184,14 +11520,14 @@ less than 2bp on both sides of indel region.")
(define-public r-simplifyenrichment
(package
(name "r-simplifyenrichment")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "simplifyEnrichment" version))
(sha256
(base32
- "0qhrlhf881mi2v0n0y410c0bf2cm3imrlglq8argnw86n9xj51pw"))))
+ "1031rkl2gcgx4k1biz4bc38hfq7r6diqk48769jhii0r06ablrhi"))))
(properties
`((upstream-name . "simplifyEnrichment")))
(build-system r-build-system)
@@ -11225,13 +11561,13 @@ and comparing the clusterings.")
(define-public r-singscore
(package
(name "r-singscore")
- (version "1.22.0")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "singscore" version))
(sha256
(base32
- "0hafzbhbik1512pisjvnnzmy8pl2shrgra6l06kpvsrczkqlmi04"))))
+ "12avzrc16mxz7v8jp4rxz5ia6008rjcja1h3hd0n60z644w9cng2"))))
(properties `((upstream-name . "singscore")))
(build-system r-build-system)
(propagated-inputs (list r-biobase
@@ -11263,13 +11599,13 @@ level.")
(define-public r-tcgautils
(package
(name "r-tcgautils")
- (version "1.22.2")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "TCGAutils" version))
(sha256
(base32
- "16pcz52ynx0syb5bcnkywllqxcfp7jipqgzgjr7q70k1z13ah7a3"))))
+ "0fmz1lfpn8ws584q4xlicg897qs36wgr78crw0d9415ci6qqb4r8"))))
(properties `((upstream-name . "TCGAutils")))
(build-system r-build-system)
(propagated-inputs (list r-annotationdbi
@@ -11302,13 +11638,13 @@ identifier translation via the GDC API.")
(define-public r-tkwidgets
(package
(name "r-tkwidgets")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tkWidgets" version))
(sha256
(base32
- "11a8rflmga2d63l5nzdlbkyfnzsf20dzg2sy6qr143hg9sjzqrrj"))))
+ "0k1d5r306mbry0h7yqp246i13adxlmxl2vhwdsfgh29v8qkg1szl"))))
(properties `((upstream-name . "tkWidgets")))
(build-system r-build-system)
(propagated-inputs (list r-dyndoc r-widgettools))
@@ -11321,13 +11657,13 @@ identifier translation via the GDC API.")
(define-public r-toast
(package
(name "r-toast")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TOAST" version))
(sha256
- (base32 "00wpgs2zdrgrh9xmp6m5h9xgv85mhdi36qvwg9gwbz9i7cfabmy1"))))
+ (base32 "0srjx9z59a65nhrxbzxzxnkyn28zskc6z4p8drihq1lhw6mvdp4r"))))
(properties `((upstream-name . "TOAST")))
(build-system r-build-system)
(propagated-inputs (list r-corpcor
@@ -11356,17 +11692,16 @@ tissues. Current functionalities include
@end enumerate")
(license license:gpl2)))
-;; TODO: check javascript
(define-public r-trackviewer
(package
(name "r-trackviewer")
- (version "1.38.2")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "trackViewer" version))
(sha256
(base32
- "1zgxp76ykgn4wk6nnpafjpswcky23jpghzzs68z0hhlzv4cc40s6"))
+ "01m0jwig3l6dfhd3w5aq4sx2krsipjg5jjxa78kalfrzrm6k05s4"))
(snippet
'(delete-file "inst/htmlwidgets/lib/d3/d3.v4.min.js"))))
(properties `((upstream-name . "trackViewer")))
@@ -11390,20 +11725,20 @@ tissues. Current functionalities include
r-genomicalignments
r-genomicfeatures
r-genomicranges
- r-graph
r-grimport
r-gviz
r-htmlwidgets
+ r-igraph
r-interactionset
r-iranges
r-plotrix
- r-rgraphviz
r-rhdf5
r-rsamtools
r-rtracklayer
r-s4vectors
r-scales
- r-strawr))
+ r-strawr
+ r-txdbmaker))
(native-inputs
(list esbuild
r-knitr
@@ -11426,13 +11761,13 @@ methylation data.")
(define-public r-transcriptr
(package
(name "r-transcriptr")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "transcriptR" version))
(sha256
- (base32 "1lbla2syljpmgdf7da7vl1260fy54xs3hk6m2gjpark0dka0kqbh"))))
+ (base32 "1lx11dyr8q4yd57l7rj0788488amhiiahfml2m69554hk94cd46i"))))
(properties `((upstream-name . "transcriptR")))
(build-system r-build-system)
(propagated-inputs
@@ -11476,14 +11811,14 @@ able to deal also with novel and case specific events.")
(define-public r-trajectoryutils
(package
(name "r-trajectoryutils")
- (version "1.10.1")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TrajectoryUtils" version))
(sha256
(base32
- "178v5r0nck9ils5k7hj92x7z1xk5zq6zyc78wqnz7s3shbnq9ld7"))))
+ "15q1mq48nclf2lqc2v769q79frrbm2l65d54vcqg06b861q2wq9h"))))
(properties
`((upstream-name . "TrajectoryUtils")))
(build-system r-build-system)
@@ -11503,14 +11838,14 @@ structures to hold pseudotime inference results.")
(define-public r-trna
(package
(name "r-trna")
- (version "1.20.1")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "tRNA" version))
(sha256
(base32
- "0mcpql3zf1gw2k6gfyqycycc8li00818gd9qzs8s3wva7kxbpn89"))))
+ "0dg4s5kxsdh2j8smqi8vm7yncy9kb79sj8xlvf4wgf3aljarms21"))))
(properties
`((upstream-name . "tRNA")))
(build-system r-build-system)
@@ -11540,13 +11875,13 @@ additional column data sets.")
(define-public r-trnadbimport
(package
(name "r-trnadbimport")
- (version "1.20.1")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "tRNAdbImport" version))
(sha256
- (base32 "1i2mismx914ijys13wwz50gkk682rklp36aci270nc7vx78hynni"))))
+ (base32 "0yvgxxf5d5mh91cmbba66krj6jz5gl1qkgjck9310k4mk7pjfww3"))))
(properties `((upstream-name . "tRNAdbImport")))
(build-system r-build-system)
(propagated-inputs (list r-biostrings
@@ -11570,13 +11905,13 @@ additional column data sets.")
(define-public r-scds
(package
(name "r-scds")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scds" version))
(sha256
(base32
- "0cmzvc1m29ijhzs2p407bhhxfqbflzsnrk7nq0jshjyw6v6pkfn0"))))
+ "19xma4kmx8s6m6dvqyw461ahqyfqb7z3n5dz4ppab4xcpmqvx0vh"))))
(properties `((upstream-name . "scds")))
(build-system r-build-system)
(propagated-inputs (list r-dplyr
@@ -11598,13 +11933,13 @@ scRNA-seq data computationally.")
(define-public r-slingshot
(package
(name "r-slingshot")
- (version "2.10.0")
+ (version "2.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "slingshot" version))
(sha256
(base32
- "0q3j0jpc4mnmjb3xha5cmfhk1qdr1jiz7kdghznk4zqxn4bchc1d"))))
+ "055dylajbn94khi0829qhxx0lbn1pvh30xw09gjn1jvxsgzj49nc"))))
(build-system r-build-system)
(propagated-inputs
(list r-igraph
@@ -11670,13 +12005,13 @@ tools either included in speaq or available elsewhere on CRAN.")
(define-public r-spectra
(package
(name "r-spectra")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Spectra" version))
(sha256
(base32
- "07zs9x5fzxzwicjc5x29sv33yidmq1ar70ss91py094zbw9i63qy"))))
+ "0mvfndd7n7varrzmv9cd3ygwbdn97x5qcgmzcxc6hr76lnkwp8al"))))
(properties `((upstream-name . "Spectra")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -11702,13 +12037,13 @@ data sets ensuring a small memory footprint.")
(define-public r-stager
(package
(name "r-stager")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "stageR" version))
(sha256
- (base32 "064hvx8qyw5hdhihwl9k0jqhg6saz4ng2m37d2ipr5pz9v8adspb"))))
+ (base32 "0ayjwv2i9q8dzq5pzhyzkxzkz9ycka2v6ccvq5y9cg7x0mw4qvbh"))))
(properties `((upstream-name . "stageR")))
(build-system r-build-system)
(propagated-inputs (list r-summarizedexperiment))
@@ -11725,13 +12060,13 @@ Biology at
(define-public r-stringdb
(package
(name "r-stringdb")
- (version "2.14.3")
+ (version "2.16.4")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "STRINGdb" version))
(sha256
- (base32 "06bckzczg2rspazcbpp3v265c1dkr9l1vpdhkc7gdn2dk960jlkh"))))
+ (base32 "02fim09w9s38hvgp1g3fxqabd5r2fjysljlfrya2nr17drqkzqyx"))))
(properties `((upstream-name . "STRINGdb")))
(build-system r-build-system)
(propagated-inputs
@@ -11758,13 +12093,13 @@ that integrates the various evidences.")
(define-public r-structstrings
(package
(name "r-structstrings")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Structstrings" version))
(sha256
- (base32 "10j1khhjd30wn9yfz4jhgx34z0yyijgwgydr8ric52337vwpx6dl"))))
+ (base32 "1ka9kixhgc9vfar18fzd8vd5ydmdkqa2s6xsmhlh927zrijs3vz9"))))
(properties `((upstream-name . "Structstrings")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -11792,13 +12127,13 @@ large extend by the @code{ViennaRNA} package.")
(define-public r-structuralvariantannotation
(package
(name "r-structuralvariantannotation")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "StructuralVariantAnnotation" version))
(sha256
- (base32 "1h3l3xbxwf2w2dl0qz72v68h5g77zhd2rr0g86l2dhn67mhy8ml2"))))
+ (base32 "0hnpa6ykfasp2hshqdny29dyw6y9dib4rsm379fm7n8iami1rjp1"))))
(build-system r-build-system)
(propagated-inputs
(list r-assertthat
@@ -11809,6 +12144,7 @@ large extend by the @code{ViennaRNA} package.")
r-genomicfeatures
r-genomicranges
r-iranges
+ r-pwalign
r-rlang
r-rtracklayer
r-s4vectors
@@ -11829,13 +12165,13 @@ involving two separate genomic loci encoded as GRanges objects.")
(define-public r-summarizedexperiment
(package
(name "r-summarizedexperiment")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "SummarizedExperiment" version))
(sha256
(base32
- "1949k2658drmcrrr7v6748b40g2qym39n0ch50jxf0xmmlb1r04z"))))
+ "02cvgq2vgg0gz1gxkc4vnr9jg4wkj32bl5a1qyv77wnw2b2v5hp0"))))
(properties
`((upstream-name . "SummarizedExperiment")))
(build-system r-build-system)
@@ -11864,13 +12200,13 @@ samples.")
(define-public r-survcomp
(package
(name "r-survcomp")
- (version "1.52.0")
+ (version "1.54.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "survcomp" version))
(sha256
(base32
- "18a81vv88xj3frkdy5l6w2fc4xzr1k6vgbz4j4marlmh6mz6skin"))))
+ "090dl580cwicn3px1khkhcix25snig0k7phb7z3nzmrbxmp82ygc"))))
(properties `((upstream-name . "survcomp")))
(build-system r-build-system)
(propagated-inputs (list r-bootstrap
@@ -11891,14 +12227,14 @@ of risk prediction (survival) models.")
(define-public r-sva
(package
(name "r-sva")
- (version "3.50.0")
+ (version "3.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "sva" version))
(sha256
(base32
- "0p4zgw1pi5vnaqxn6jmvhpy0h5hnnqp41n0k2v0chhqgqxgn67x1"))))
+ "07iq894mf5d66cxjl283pcvj1frj56pb15z984d4svk6f5cacg3z"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocparallel
@@ -11922,14 +12258,14 @@ unmodeled, or latent sources of noise.")
(define-public r-systempiper
(package
(name "r-systempiper")
- (version "2.8.0")
+ (version "2.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "systemPipeR" version))
(sha256
(base32
- "01amqib9ahrf19xpy4ivlsss82zyp3w7fbgwrwp53zfbg0cninga"))))
+ "13xxcqy5hhy45zglv6gc86ndmisfkjq4dg55x2j1kw3jqha1brnx"))))
(properties `((upstream-name . "systemPipeR")))
(build-system r-build-system)
(propagated-inputs
@@ -11965,13 +12301,13 @@ annotation infrastructure.")
(define-public r-topgo
(package
(name "r-topgo")
- (version "2.54.0")
+ (version "2.56.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "topGO" version))
(sha256
(base32
- "1sznyx11kzw8d8zg5ynl9sp6m0daf2yw3f2b24maxbpr1xkif9nx"))))
+ "0ly4rai3na88dnfizsi60r6py0qmf0pw95b0hprfkvzpjyd72p75"))))
(properties
`((upstream-name . "topGO")))
(build-system r-build-system)
@@ -11995,16 +12331,57 @@ dependencies between GO terms can be implemented and applied.")
;; Any version of the LGPL applies.
(license license:lgpl2.1+)))
+(define-public r-txdbmaker
+ (package
+ (name "r-txdbmaker")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "txdbmaker" version))
+ (sha256
+ (base32 "1nl7lr0x0kicd44gvwrdslcnnlmqaf57rgp1gb22yvz3lfzjziqi"))))
+ (properties `((upstream-name . "txdbmaker")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-annotationdbi
+ r-biobase
+ r-biocgenerics
+ r-biocio
+ r-biomart
+ r-dbi
+ r-genomeinfodb
+ r-genomicfeatures
+ r-genomicranges
+ r-httr
+ r-iranges
+ r-rjson
+ r-rsqlite
+ r-rtracklayer
+ r-s4vectors
+ r-ucsc-utils))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/txdbmaker")
+ (synopsis "Tools for making TxDb objects from genomic annotations")
+ (description
+ "This package provides a set of tools for making @code{TxDb} objects from
+genomic annotations from various sources (e.g. UCSC, Ensembl, and GFF files).
+These tools allow the user to download the genomic locations of transcripts,
+exons, and CDS, for a given assembly, and to import them in a @code{TxDb}
+object. @code{TxDb} objects are implemented in the @code{GenomicFeatures}
+package, together with flexible methods for extracting the desired features in
+convenient formats.")
+ (license license:artistic2.0)))
+
(define-public r-tximport
(package
(name "r-tximport")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tximport" version))
(sha256
(base32
- "0m6avd815xcv3py5sym083pdccvd4crdyyc7sfpxccnksgchyrf2"))))
+ "0wayib05k976wivf9xgbfz5mfvi5hmxj3wm6zw031bj4w8dkc1v6"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -12023,14 +12400,14 @@ of gene-level counts.")
(define-public r-valr
(package
(name "r-valr")
- (version "0.8.0")
+ (version "0.8.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "valr" version))
(sha256
(base32
- "0jf47yfi8dr8mgqv1gbl2kd7wgyiwsnipiwfdhf9l346yg9aj96l"))))
+ "1pp8naglh26yi8c2p15arx8jkj3jyslzw7j3n5bnzngdpfprk3as"))))
(build-system r-build-system)
(propagated-inputs
(list r-broom
@@ -12057,13 +12434,13 @@ R, enabling interactive analysis and visualization of genome-scale data.")
(define-public r-variantannotation
(package
(name "r-variantannotation")
- (version "1.48.1")
+ (version "1.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "VariantAnnotation" version))
(sha256
(base32
- "0l9xkrvsrc3m65kdjcyir6jkpa718g7idziwr0pp5yaj84bd3xia"))))
+ "0slvlhm65hkjspzlzs3gi04a6mlfwvda314z1nmzpdi3y5111fg7"))))
(properties
`((upstream-name . "VariantAnnotation")))
(build-system r-build-system)
@@ -12096,14 +12473,14 @@ coding changes and predict coding outcomes.")
(define-public r-vsn
(package
(name "r-vsn")
- (version "3.70.0")
+ (version "3.72.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "vsn" version))
(sha256
(base32
- "0li0yxf8m34xpmrgv5vciy8zdsbfdlajl9cmnxr4g4nmarik2bkh"))))
+ "1r6cd92d4xlx4zdyy1sfaxicjf4q3arflmswpdkckkc4h9c6zf8m"))))
(build-system r-build-system)
(propagated-inputs
(list r-affy r-biobase r-ggplot2 r-lattice r-limma))
@@ -12165,13 +12542,13 @@ inference.")
(define-public r-xina
(package
(name "r-xina")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "XINA" version))
(sha256
- (base32 "1cnw2zbjfs8qcgqrx557g00m59h5pldcx788v9r4gn2f70rx7vx3"))))
+ (base32 "177yzqmkf3f2xgfrz1zpcw554yzm4njd2chhmvxi2vvijvnrgdf3"))))
(properties `((upstream-name . "XINA")))
(build-system r-build-system)
(propagated-inputs
@@ -12201,13 +12578,13 @@ molecular functions, respectively, and produces intuitive graphical outputs.")
(define-public r-xmapbridge
(package
(name "r-xmapbridge")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "xmapbridge" version))
(sha256
- (base32 "0pby2h8m12xlngpk33dvh3nkrpgqi4f2mb7g9jafyiv3sl8pjd19"))))
+ (base32 "0laahd3v5m313q1iq259aikgqf7zlmpxyxhws2pr7vg97g37bbhs"))))
(properties `((upstream-name . "xmapbridge")))
(build-system r-build-system)
(home-page "https://git.bioconductor.org/packages/xmapbridge")
@@ -12228,13 +12605,13 @@ describing each of the graphs.")
(define-public r-xvector
(package
(name "r-xvector")
- (version "0.42.0")
+ (version "0.44.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "XVector" version))
(sha256
(base32
- "0h03imdl0pyy714kmddsdnsv69bd8kr7bhi9wq9z18y8ahg5cqx1"))))
+ "0fxv97m79w0ph4wbgp9drz6ahvnnzpv08grb11lr6a7laqq5x8s2"))))
(properties
`((upstream-name . "XVector")))
(build-system r-build-system)
@@ -12262,13 +12639,13 @@ describing each of the graphs.")
(define-public r-zlibbioc
(package
(name "r-zlibbioc")
- (version "1.48.2")
+ (version "1.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "zlibbioc" version))
(sha256
(base32
- "078v1iywzc0ng27r0wjchvkh4znzydq1swlalqb95xkmn72vrq8d"))))
+ "155q6983xjdjpq445lpg5n9gzf8gr18nll6dmjk7jwdq7fdxb602"))))
(properties
`((upstream-name . "zlibbioc")))
(build-system r-build-system)
@@ -12282,13 +12659,13 @@ libraries for systems that do not have these available via other means.")
(define-public r-zellkonverter
(package
(name "r-zellkonverter")
- (version "1.12.1")
+ (version "1.14.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "zellkonverter" version))
(sha256
- (base32 "029bqn25c90algvgacxbv0fdznpg879xjwfj5hiydfwq30y0kr8r"))))
+ (base32 "1fyy3v1papg46cclk5fg8iqmg0671ccr82alvv41hk5d85ck04aq"))))
(properties `((upstream-name . "zellkonverter")))
(build-system r-build-system)
(propagated-inputs
@@ -12314,14 +12691,14 @@ saving AnnData objects to disk.")
(define-public r-geneplotter
(package
(name "r-geneplotter")
- (version "1.80.0")
+ (version "1.82.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "geneplotter" version))
(sha256
(base32
- "0zvb84jlsvmr2dvwyy4xjqv353qrxpls0v2vz0nmj1q4m7lrpl1k"))))
+ "19znr3vwp20x84jiwy0im7s6vd8a71yng8w2ji88ffzq0xdkyyjm"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotate
@@ -12341,14 +12718,14 @@ saving AnnData objects to disk.")
(define-public r-oligoclasses
(package
(name "r-oligoclasses")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "oligoClasses" version))
(sha256
(base32
- "1gdvjvyjfpvvrqyj9rq1l4dnq00hr8vr8knnlb9gnjk21sbcf1d7"))))
+ "15icfcmpwrnjpyahc4v168fpcbsml6x7h4drmsyh9l8d1284yb4n"))))
(properties `((upstream-name . "oligoClasses")))
(build-system r-build-system)
(propagated-inputs
@@ -12376,14 +12753,14 @@ packages.")
(define-public r-oligo
(package
(name "r-oligo")
- (version "1.66.0")
+ (version "1.68.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "oligo" version))
(sha256
(base32
- "0pqn5qslynylx235wknwj71a6j7xf5i6pb7wjm00jwrdbqwvdlp6"))))
+ "0ch6b4rg5v6fj0fgniqiigx1gnnqgwji90bxqngllman388bx867"))))
(properties `((upstream-name . "oligo")))
(build-system r-build-system)
(inputs (list zlib))
@@ -12412,13 +12789,13 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
(define-public r-qfeatures
(package
(name "r-qfeatures")
- (version "1.12.0")
+ (version "1.14.2")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "QFeatures" version))
(sha256
(base32
- "1g744fpb6g690bjbjs4v2899wwv6qc7n5cyq977pm8f3wln0m7mx"))))
+ "1vd1kvx2kr47czz58375msc2x8p155cn0zqr4w7i1v1ki951r3a4"))))
(properties `((upstream-name . "QFeatures")))
(build-system r-build-system)
(propagated-inputs (list r-annotationfilter
@@ -12431,8 +12808,11 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
r-multiassayexperiment
r-plotly
r-protgenerics
+ r-reshape2
r-s4vectors
- r-summarizedexperiment))
+ r-summarizedexperiment
+ r-tidyr
+ r-tidyselect))
(native-inputs (list r-knitr))
(home-page "https://github.com/RforMassSpectrometry/QFeatures")
(synopsis "Quantitative features for mass spectrometry data")
@@ -12447,13 +12827,13 @@ proteins) in a coherent and tractable format.")
(define-public r-quantsmooth
(package
(name "r-quantsmooth")
- (version "1.68.0")
+ (version "1.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "quantsmooth" version))
(sha256
- (base32 "050nnwhxk3ld615f6ij4cc3d6wzrrxykvv02fr20fg5gzdj0z08a"))))
+ (base32 "1mgdrhq0j4b29l3y49h00ccwkz6vhs6hjb1236blmlzdf590q7gc"))))
(properties `((upstream-name . "quantsmooth")))
(build-system r-build-system)
(propagated-inputs (list r-quantreg))
@@ -12474,14 +12854,14 @@ on the location of the probe, and other useful tools.")
(define-public r-qvalue
(package
(name "r-qvalue")
- (version "2.34.0")
+ (version "2.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "qvalue" version))
(sha256
(base32
- "10v5khnrs1fa84d430zy52f9466rwb1byaw1l3c9nivbhmaxhvyi"))))
+ "1hgkrvbs1rf8db105ik9ar54zdx49v25hn71jgw7j5r43zngfg2a"))))
(build-system r-build-system)
(propagated-inputs
(list r-ggplot2 r-reshape2))
@@ -12529,13 +12909,13 @@ problems in genomics, brain imaging, astrophysics, and data mining.")
(define-public r-apcomplex
(package
(name "r-apcomplex")
- (version "2.68.0")
+ (version "2.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "apComplex" version))
(sha256
- (base32 "1y3c3358y7ynn5lj2gcy9ll2gxnnlv689pj0bgr2gsnhbss1kw1r"))))
+ (base32 "1fsqrds5r8bhdf7fbnw6rf3vqapl6xk1a5l6jjb98raxmjsrfyqs"))))
(properties `((upstream-name . "apComplex")))
(build-system r-build-system)
(propagated-inputs
@@ -12554,13 +12934,13 @@ spectrometry} data.")
(define-public r-apeglm
(package
(name "r-apeglm")
- (version "1.24.0")
+ (version "1.26.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "apeglm" version))
(sha256
(base32
- "0cj9yzmh9w3fk3rxmk2k5j55r42mmz9znszmr4l160mr23alkzx4"))))
+ "039my876v0k2mr50w90w3phj4cq55awf5ks07kr2fnm7w211gxvs"))))
(properties `((upstream-name . "apeglm")))
(build-system r-build-system)
(propagated-inputs
@@ -12581,13 +12961,13 @@ posterior for individual coefficients.")
(define-public r-greylistchip
(package
(name "r-greylistchip")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GreyListChIP" version))
(sha256
(base32
- "1k974cvfbkl8ffn7k2la843bv2pf33cr5f6fahiiy24d68lxwifr"))))
+ "0dj3pcycnjll8z1r61l6gnjvq74w2l0glrx6hqwcqvk5j7ixcdz7"))))
(properties `((upstream-name . "GreyListChIP")))
(build-system r-build-system)
(propagated-inputs
@@ -12608,14 +12988,14 @@ signal in the input, that lead to spurious peaks during peak calling.")
(define-public r-diffbind
(package
(name "r-diffbind")
- (version "3.12.0")
+ (version "3.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DiffBind" version))
(sha256
(base32
- "1nlcx4fl1cpcg38cn9p55f75bv6pcg6h2jv4z94g2b7g1gwjd686"))))
+ "1sr0zy5pbjmjzkwkpjmr26k4dcf3f3kxsl7z2nqw0p0a14rh57pm"))))
(properties `((upstream-name . "DiffBind")))
(build-system r-build-system)
(propagated-inputs
@@ -12686,13 +13066,13 @@ processing to visualization and annotation.")
(define-public r-mbecs
(package
(name "r-mbecs")
- (version "1.6.0")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MBECS" version))
(sha256
- (base32 "1j7vb26n2fnf5fkk8hfz552yx91g4zg719alhg4hg2vvjd1qx2l1"))))
+ (base32 "15nv5rbw158d071gscms6p42wzf6ibnabiqcq256rcz6j0r69b63"))))
(properties `((upstream-name . "MBECS")))
(build-system r-build-system)
(arguments
@@ -12736,13 +13116,13 @@ before and after correcting for batch effects.")
(define-public r-mbkmeans
(package
(name "r-mbkmeans")
- (version "1.18.0")
+ (version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "mbkmeans" version))
(sha256
(base32
- "1x7azijfs28iz2w40b9hnpgwh4jxgihl8cj6h91b2wgz79sq649l"))))
+ "0fnf6ymbcfchhlcbwpwlcq1jc3lfzh9f8mf76xfy7vrpwngds1fs"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -12768,13 +13148,13 @@ large datasets, including support for on-disk data representation.")
(define-public r-multibac
(package
(name "r-multibac")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MultiBaC" version))
(sha256
- (base32 "1mwfibakrxgs3r572bqqqmzq7ys6cs0bpn0wfrcb08ww2197xc4j"))))
+ (base32 "0m08620sii9181y0vlcrw9nbcnp4vnjjxvp96iqlgg5fsb23wbl7"))))
(properties `((upstream-name . "MultiBaC")))
(build-system r-build-system)
(propagated-inputs
@@ -12798,14 +13178,14 @@ the batches considered.")
(define-public r-multtest
(package
(name "r-multtest")
- (version "2.58.0")
+ (version "2.60.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "multtest" version))
(sha256
(base32
- "0s8x2rg2xp6awg2cikybgxrxpi9f91jah7dskk5dnfkazd20di4j"))))
+ "04dv5rcqwpv0im7j3hvcj8hjybgs4a384zgnjyqbcipcicd2rjz4"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase r-biocgenerics r-mass r-survival))
@@ -12833,13 +13213,13 @@ expressed genes in DNA microarray experiments.")
(define-public r-graph
(package
(name "r-graph")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "graph" version))
(sha256
(base32
- "0p7g7ykpkngbs3h1dsackfy93l8lvc301lr64ffsiaw60gllcx01"))))
+ "1wa10s9a8p6lajim1lbw4rxyc4fz7y6fpymrh0c0ip85971cd9hv"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics))
@@ -12876,13 +13256,13 @@ fitting of some classes of graphical Markov models.")
(define-public r-ggtreeextra
(package
(name "r-ggtreeextra")
- (version "1.12.0")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ggtreeExtra" version))
(sha256
(base32
- "0q8k81mq5q9fym4zyrkzapgyww23lkxpkyj2s9r1y0ciclk90zdc"))))
+ "1wy229rnp356hi144flm9fvhv414jxmxc967f7pyqwl4abiwlmzm"))))
(properties `((upstream-name . "ggtreeExtra")))
(build-system r-build-system)
(propagated-inputs (list r-cli
@@ -12976,13 +13356,13 @@ a given recall, F-score for single and multiple classes are available.")
(define-public r-pepsnmr
(package
(name "r-pepsnmr")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "PepsNMR" version))
(sha256
(base32
- "013jw9l7r87j4bmpjrvq5qn91kp44wj5vd68cl5axbqhjg7fq4ww"))))
+ "0z3kw8j972zmrcyikag5js20zpgc3l5bgkn5q31dzi1q7ynpkwhv"))))
(properties `((upstream-name . "PepsNMR")))
(build-system r-build-system)
(propagated-inputs
@@ -13033,14 +13413,14 @@ determining dependencies between variables, code improvement suggestions.")
(define-public r-chippeakanno
(package
(name "r-chippeakanno")
- (version "3.36.1")
+ (version "3.38.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChIPpeakAnno" version))
(sha256
(base32
- "1jmg958v8ai9v3mpizj24nc0vsl564inndm0irflprs1ky90k8vl"))))
+ "11mswd6y4c8l0adrpc4z8hh96dcx59bf70zy572r5lfsj8rz0rgk"))))
(properties `((upstream-name . "ChIPpeakAnno")))
(build-system r-build-system)
(propagated-inputs
@@ -13048,6 +13428,7 @@ determining dependencies between variables, code improvement suggestions.")
r-biocgenerics
r-biomart
r-biostrings
+ r-data-table
r-dbi
r-dplyr
r-ensembldb
@@ -13062,12 +13443,18 @@ determining dependencies between variables, code improvement suggestions.")
r-keggrest
r-matrixstats
r-multtest
+ r-pwalign
r-rbgl
r-regioner
r-rsamtools
r-rtracklayer
r-s4vectors
+ r-scales
+ r-stringr
r-summarizedexperiment
+ r-tibble
+ r-tidyr
+ r-universalmotif
r-venndiagram))
(native-inputs
(list r-knitr))
@@ -13087,13 +13474,13 @@ enrichedGO (addGeneIDs).")
(define-public r-matrixgenerics
(package
(name "r-matrixgenerics")
- (version "1.14.0")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "MatrixGenerics" version))
(sha256
(base32
- "14x5jib5xh2006lg96v3b9n2pnbjcbsd5igqybqsv0c53rk9394d"))))
+ "1r7n5p89460h47mnfh190184dbcmrbj0j5d7dswkfwh6ixan3zyc"))))
(properties
`((upstream-name . "MatrixGenerics")))
(build-system r-build-system)
@@ -13114,12 +13501,12 @@ incompatibilities.")
(define-public r-marray
(package
(name "r-marray")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "marray" version))
(sha256
- (base32 "1gj4mdbni5fk2z3zrk2cnhy610ihhhwjb9l1crglkklwxhkqlkvd"))))
+ (base32 "1h96aq92bad69ycrmrvxwdz8dg9rk44925gj83gxzqypw88j2x0y"))))
(build-system r-build-system)
(propagated-inputs
(list r-limma))
@@ -13133,12 +13520,12 @@ normalization and quality checking.")
(define-public r-cghbase
(package
(name "r-cghbase")
- (version "1.62.0")
+ (version "1.64.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CGHbase" version))
(sha256
- (base32 "1iw03gq1kvmn9a6h0kw389l9i7h99fbxcsag9f3gkfznjv0vp5k4"))))
+ (base32 "1fz39fdkfvfhzm69pfvliqvp48wsldwm3kpgbsaacrdh46jg5vzk"))))
(properties `((upstream-name . "CGHbase")))
(build-system r-build-system)
(propagated-inputs
@@ -13152,12 +13539,12 @@ the @code{arrayCGH} packages.")
(define-public r-cghcall
(package
(name "r-cghcall")
- (version "2.64.0")
+ (version "2.66.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CGHcall" version))
(sha256
- (base32 "1x2zfr40bm42zd1bljwpbz3cz1q23a3yy1g277lwsp78gxbn3zly"))))
+ (base32 "1gjd3ggiw93cwcacjb1472ia98aaapj9gln04v5pbwmp2r4xfcs7"))))
(properties `((upstream-name . "CGHcall")))
(build-system r-build-system)
(propagated-inputs
@@ -13171,12 +13558,12 @@ the @code{arrayCGH} packages.")
(define-public r-qdnaseq
(package
(name "r-qdnaseq")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "QDNAseq" version))
(sha256
- (base32 "1n2qngqqw3hfv1yscksnpg8wslc85dlvaqw1hz2qvsxf1gcq2mks"))))
+ (base32 "1myk6qgl45ya7qw6sx6xc98d8m5ffl2ghm3zvqmyh9r0sp6x184f"))))
(properties `((upstream-name . "QDNAseq")))
(build-system r-build-system)
(propagated-inputs
@@ -13203,14 +13590,14 @@ respectively.")
(define-public r-bayseq
(package
(name "r-bayseq")
- (version "2.36.2")
+ (version "2.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "baySeq" version))
(sha256
(base32
- "0c24glflznbihx81kgvlx5i3wb95c7jg4wllwawry4kb6rkjbwp0"))))
+ "0nlkynzijxl6f8983vdpmcssvrpjf6s42zx3lxfwxwlhrvz1yg9l"))))
(properties `((upstream-name . "baySeq")))
(build-system r-build-system)
(propagated-inputs
@@ -13227,14 +13614,14 @@ more complex hypotheses) via empirical Bayesian methods.")
(define-public r-chipcomp
(package
(name "r-chipcomp")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChIPComp" version))
(sha256
(base32
- "061d2z1rrcyad6cf19si14ab9a3dxdi17sfbkx3vx8kdsfs3djy9"))))
+ "013lmgdkj596gqzm0nlxjqpv0w94hap9vndp5znqpk4inq88gj8m"))))
(properties `((upstream-name . "ChIPComp")))
(build-system r-build-system)
(propagated-inputs
@@ -13261,14 +13648,14 @@ datasets.")
(define-public r-riboprofiling
(package
(name "r-riboprofiling")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RiboProfiling" version))
(sha256
(base32
- "1bd37ypxsj9p94p2851hhc9ind59b5pkg1lyalha1nfw5gf8iay3"))))
+ "0h0sxmg4knsarh7w7dnp539cs9sfxjw4413q1yyyz3gbi23bzww4"))))
(properties `((upstream-name . "RiboProfiling")))
(build-system r-build-system)
(propagated-inputs
@@ -13302,14 +13689,14 @@ assessment, principal component analysis on codon coverage.")
(define-public r-riboseqr
(package
(name "r-riboseqr")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "riboSeqR" version))
(sha256
(base32
- "1cigbp3pc70ipja9mmprkrs91723r1zwgxbzyp87n5mb0i4q8xqh"))))
+ "0p0q28n8hlai80pxxns9pzzg552pbwlxlph8zjf78bwbjagrfbz5"))))
(properties `((upstream-name . "riboSeqR")))
(build-system r-build-system)
(propagated-inputs
@@ -13319,6 +13706,7 @@ assessment, principal component analysis on codon coverage.")
r-genomicranges
r-iranges
r-rsamtools
+ r-s4vectors
r-seqlogo))
(home-page "https://bioconductor.org/packages/riboSeqR/")
(synopsis "Analysis of sequencing data from ribosome profiling experiments")
@@ -13330,14 +13718,14 @@ parsing of genetic sequencing data from ribosome profiling experiments.")
(define-public r-interactionset
(package
(name "r-interactionset")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "InteractionSet" version))
(sha256
(base32
- "0mpgxcwhb734pyn6bj93xknb704yrjkprxpa7kqwl24rbqyjydqs"))))
+ "0ikkmhz6grmhksmyypj9hqmblls4cgww0dx4kzg4cy5bpavsq1hs"))))
(properties
`((upstream-name . "InteractionSet")))
(build-system r-build-system)
@@ -13364,14 +13752,14 @@ experiments.")
(define-public r-genomicinteractions
(package
(name "r-genomicinteractions")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GenomicInteractions" version))
(sha256
(base32
- "13rnxig22agykzv3q7wm4wr9c5aw56q6q1zv8m5g5ngjcssy8l4c"))))
+ "16aaaa4nr1y5ng1hzw87q950clid28iqf4gkypcpihg3cz69axxg"))))
(properties
`((upstream-name . "GenomicInteractions")))
(build-system r-build-system)
@@ -13405,14 +13793,14 @@ information and producing various plots and statistics.")
(define-public r-ctc
(package
(name "r-ctc")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ctc" version))
(sha256
(base32
- "10a83rr0qhnzdhvlbyn0y690hxnl8q86z47dpimr6sq41w463im3"))))
+ "09whaam2r30dq8y9r6vvc0r4sisz78c921bgx7wj6cmn2nvpgf9q"))))
(build-system r-build-system)
(propagated-inputs (list r-amap))
(home-page "https://bioconductor.org/packages/ctc/")
@@ -13425,14 +13813,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
@@ -13451,14 +13839,14 @@ defined categories which are over/under represented in RNA-seq data.")
(define-public r-glimma
(package
(name "r-glimma")
- (version "2.12.0")
+ (version "2.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Glimma" version))
(sha256
(base32
- "0pkh15jjjb83pq7d49yzwb2gyc95x4rww78qnzpdrzhycgmcapii"))
+ "1d7rq3irp3n0fabfgjs2x2c9lscz70a38qf3wbxvi417qn7fpyla"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "inst/htmlwidgets/lib/"
@@ -13536,13 +13924,13 @@ information.")
(define-public r-glmgampoi
(package
(name "r-glmgampoi")
- (version "1.14.3")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "glmGamPoi" version))
(sha256
(base32
- "0lbsavr9mhka8s7i056h4jjb1v36v3sshrhdz74n8qadm7fy59l5"))))
+ "1my8v0zx5xsxjf8dj2yw92b8zp725hxhb2vrl5ccgz2w9xkn0dkj"))))
(properties `((upstream-name . "glmGamPoi")))
(build-system r-build-system)
(propagated-inputs
@@ -13572,14 +13960,14 @@ experiments.")
(define-public r-rots
(package
(name "r-rots")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ROTS" version))
(sha256
(base32
- "1zd5w3mq0vjs3ivdb23x6d28sqq0dsfv13d64k1yijr4vdk3wvp6"))))
+ "1s9hr64gpz08j638wlglcmk6c8yyj1hzrgddiphklkapc1asr320"))))
(properties `((upstream-name . "ROTS")))
(build-system r-build-system)
(propagated-inputs
@@ -13595,14 +13983,14 @@ in omics data.")
(define-public r-plgem
(package
(name "r-plgem")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "plgem" version))
(sha256
(base32
- "0s5hia3xvddi0gaawcr5zsh34v6sh2zdi5gsjis8ar2g2p7agqgg"))))
+ "0my4jpxw3xy9n40cqvdaz6ay7gpwshn2iqxr43knrk0ckpyxx2cr"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase r-mass))
@@ -13619,13 +14007,13 @@ genes or proteins in these datasets.")
(define-public r-plyranges
(package
(name "r-plyranges")
- (version "1.22.0")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "plyranges" version))
(sha256
(base32
- "1z4pc9slbd6ji3c6g9flxhvvf0anjmywrlnjblv1mpgsh88avp7w"))))
+ "0rh5l6bd80nhffqpnnc2c00mvp8p32ykld05h94c3y8c9mvmsl58"))))
(properties `((upstream-name . "plyranges")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -13653,14 +14041,14 @@ accessiblity for new Bioconductor users is hopefully increased.")
(define-public r-inspect
(package
(name "r-inspect")
- (version "1.32.1")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "INSPEcT" version))
(sha256
(base32
- "04znack6p50cmc2qyk4hf45m6v70p0bv7h3xs87j0x0h4mb920ch"))))
+ "0147ss218d3dnqbdgfwsg24an63qln8l5kkv0y4hm56bncdrm1i0"))))
(properties `((upstream-name . "INSPEcT")))
(build-system r-build-system)
(propagated-inputs
@@ -13699,14 +14087,14 @@ modeling the rates that determines changes in mature mRNA levels.")
(define-public r-dnabarcodes
(package
(name "r-dnabarcodes")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DNABarcodes" version))
(sha256
(base32
- "12x4k55kshvwyzl83zkgkp0ylryr8wd3kz44ngp60k4pkwhkl9h9"))))
+ "0vxxg6fkgck640p9plk4vx3d05794s3xgxksv819d2wicvyby4hk"))))
(properties `((upstream-name . "DNABarcodes")))
(build-system r-build-system)
(propagated-inputs
@@ -13726,14 +14114,14 @@ demultiplexed, i.e. assigned to their original reference barcode.")
(define-public r-ruvseq
(package
(name "r-ruvseq")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RUVSeq" version))
(sha256
(base32
- "04byggwsvmqrl77268smbas0wax460cdshmp4v5iqc5fghl7n0p2"))))
+ "0i91kjwransy6l217rmxfzfchb43h1sjk8ygf0y8a3rv6rp7ylfd"))))
(properties `((upstream-name . "RUVSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -13751,14 +14139,14 @@ samples.")
(define-public r-biocneighbors
(package
(name "r-biocneighbors")
- (version "1.20.2")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocNeighbors" version))
(sha256
(base32
- "0lvsw920i75di5pwq7yvk8wcxp01wrh7863xmwbrmk5jrvl3y4h4"))))
+ "1krg4cs406ymk27qcj3j1jsl8vl4j9k5zvwf4vzxgbw3x6lpywid"))))
(properties `((upstream-name . "BiocNeighbors")))
(build-system r-build-system)
(propagated-inputs
@@ -13779,14 +14167,14 @@ achieved for all methods using the BiocParallel framework.")
(define-public r-scaledmatrix
(package
(name "r-scaledmatrix")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ScaledMatrix" version))
(sha256
(base32
- "1aigca0s8cmi46458pl9p9vwlkrmqawbgi0xmbwslz646x2s2h4a"))))
+ "0c6sp5nps31ygrr7lxxc2gbg19qsk107v23x8f6acqk1xwlsfppi"))))
(properties `((upstream-name . "ScaledMatrix")))
(build-system r-build-system)
(propagated-inputs
@@ -13805,14 +14193,14 @@ multiplication.")
(define-public r-treeio
(package
(name "r-treeio")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "treeio" version))
(sha256
(base32
- "1kvzdryw74r74gwxddsrng81ww49p3s7hgxn8ggl0p8fvz3sfgir"))))
+ "0xfjq13yirfz7dzzlf2m60lk8xb3qh6k5hr66ygvjnm716x3vyh1"))))
(properties `((upstream-name . "treeio")))
(build-system r-build-system)
(propagated-inputs
@@ -13822,7 +14210,8 @@ multiplication.")
r-magrittr
r-rlang
r-tibble
- r-tidytree))
+ r-tidytree
+ r-yulab-utils))
(native-inputs (list r-knitr))
(home-page "https://github.com/YuLab-SMU/treeio")
(synopsis "Base classes and functions for Phylogenetic tree input and output")
@@ -13837,13 +14226,13 @@ platform for merging tree with associated data and converting file formats.")
(define-public r-treesummarizedexperiment
(package
(name "r-treesummarizedexperiment")
- (version "2.10.0")
+ (version "2.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "TreeSummarizedExperiment" version))
(sha256
(base32
- "1yvqixlivapasx0ircfhmc8ckr7sw86d9vfvnqj97p4r667x6z6g"))))
+ "0ygzw9nba5pxgrbib8sm7qwhzzm8m038banb0z7n42vkb1cb3d5i"))))
(properties `((upstream-name . "TreeSummarizedExperiment")))
(build-system r-build-system)
(propagated-inputs
@@ -13870,14 +14259,14 @@ data.")
(define-public r-ggtree
(package
(name "r-ggtree")
- (version "3.10.1")
+ (version "3.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ggtree" version))
(sha256
(base32
- "1p475vh567q4szb8hy2qk72pvqh5rlbyqfjcdd0i83fa2y4bi31d"))))
+ "1bm7c46k8qbajjvl8475b7fcd0dvg9s1bir8313qgm466qm6immh"))))
(properties `((upstream-name . "ggtree")))
(build-system r-build-system)
(propagated-inputs
@@ -13908,14 +14297,14 @@ data.")
(define-public r-metapod
(package
(name "r-metapod")
- (version "1.10.1")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "metapod" version))
(sha256
(base32
- "05cy3xvj78n2p9l2pxfys7aczr51gm2ywprn4qmzr7ppb6rq5f66"))))
+ "100wsg2y7069r7xk5bsk5n4n8dqvpbk297w5ishnijrvxhbs9f8n"))))
(properties `((upstream-name . "metapod")))
(build-system r-build-system)
(propagated-inputs
@@ -13937,14 +14326,14 @@ missing values and weighting where appropriate.")
(define-public r-biocsingular
(package
(name "r-biocsingular")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocSingular" version))
(sha256
(base32
- "0z1p02329wk2x058ij42q5pyvp0vhsihaxmizgzcj4sww6i28j33"))))
+ "1xl9wn3slj3ywjglb8zq2p0ifx4xwxbqsm99fjlf6hanfhmnxyay"))))
(properties `((upstream-name . "BiocSingular")))
(build-system r-build-system)
(propagated-inputs
@@ -13972,14 +14361,14 @@ possible, parallelization is achieved using the BiocParallel framework.")
(define-public r-destiny
(package
(name "r-destiny")
- (version "3.16.0")
+ (version "3.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "destiny" version))
(sha256
(base32
- "06xwyqlsas98lxmd0qw5ysjwbk397kyapd5jq5pzjrynsj4r9xn6"))))
+ "0w7j6xh0gzhahk1r8w2wgnylq5v476jzz0g14yjmszfkzm10va3h"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -13995,6 +14384,7 @@ possible, parallelization is achieved using the BiocParallel framework.")
r-rcpp
r-rcppeigen
r-rcpphnsw
+ r-rlang
r-rspectra
r-scales
r-scatterplot3d
@@ -14037,14 +14427,14 @@ Viewer (SAV) files, access data, and generate QC plots.")
(define-public r-chipexoqual
(package
(name "r-chipexoqual")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChIPexoQual" version))
(sha256
(base32
- "04dhkm8cq87x3c9f114z6q1pcw77xgs33rmhgzk4ajzxywhklq4j"))))
+ "0y39fpbnykqf5ycpi9q3rw73dkn2ksll7n6nafimxvxsh463d8ky"))))
(properties `((upstream-name . "ChIPexoQual")))
(build-system r-build-system)
(propagated-inputs
@@ -14097,14 +14487,14 @@ penalized least squares regression method.")
(define-public r-dnacopy
(package
(name "r-dnacopy")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DNAcopy" version))
(sha256
(base32
- "0hyjin75v8l2a8qymsd6rjb8m7svv2q07s6z1dllqag09wja1yfz"))))
+ "1q4s6rb6iv9cmfkjymgdyb4h3z0x0kzzd2bvfdjrzzzza6vhjpxl"))))
(properties `((upstream-name . "DNAcopy")))
(build-system r-build-system)
(native-inputs (list gfortran))
@@ -14116,6 +14506,30 @@ algorithm to segment DNA copy number data and identify genomic regions with
abnormal copy number.")
(license license:gpl2+)))
+(define-public r-hmmcopy
+ (package
+ (name "r-hmmcopy")
+ (version "1.46.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "HMMcopy" version))
+ (sha256
+ (base32 "1i2n4i4vkxqfgdcmwhz1vcbhxk716m1blc2drzh5449y6x3qd026"))))
+ (properties `((upstream-name . "HMMcopy")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-data-table))
+ (home-page "https://bioconductor.org/packages/HMMcopy")
+ (synopsis
+ "Copy number prediction with correction for GC and mappability bias for HTS data")
+ (description
+ "This package corrects GC and mappability biases for
+readcounts (i.e. coverage) in non-overlapping windows of fixed length for
+single whole genome samples, yielding a rough estimate of copy number for
+further analysis. It was designed for rapid correction of high coverage whole
+genome tumor and normal samples.")
+ (license license:gpl3)))
+
;; This is a CRAN package, but it uncharacteristically depends on a
;; Bioconductor package.
(define-public r-htscluster
@@ -14195,14 +14609,14 @@ and regression inferences from RNA-sequencing data.")
(define-public r-ebseq
(package
(name "r-ebseq")
- (version "2.0.0")
+ (version "2.2.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "EBSeq" version))
(sha256
(base32
- "07x9fh8akgiixsv1xddkvs2q8xxfsibas01kdx0kw6wak3nihn4w"))))
+ "1lbvrw6fcjhrm6v71lmnphv4hbdh03czgx3822ckdk6xrvyh54cf"))))
(properties `((upstream-name . "EBSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -14222,13 +14636,13 @@ gene and isoform level using RNA-seq data")
(define-public r-karyoploter
(package
(name "r-karyoploter")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "karyoploteR" version))
(sha256
(base32
- "0jr9lp250s9066hh40vxb6c6yhdd8yrnk0zklwylkf3jpbdgl621"))))
+ "1g4pms5dcr4cdb47gr9kw3mc06v890b38zrsapd4x1cqhgfbgjyg"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -14260,29 +14674,49 @@ coordinates.")
(define-public r-lpsymphony
(package
(name "r-lpsymphony")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "lpsymphony" version))
(sha256
(base32
- "1946wlw9zvyxdd99rs2rliks54ff5dkibavxd48aj7cqjsjh6b7g"))))
+ "1wcjmw655k389ph61v3gxjv7gk2q70h25zmdzvd4ggbxg8vh2mp1"))))
(build-system r-build-system)
(arguments
(list
#:phases
- '(modify-phases %standard-phases
- (add-after 'unpack 'make-build-order-reproducible
- (lambda _
- (substitute* '("src/SYMPHONY/Cgl/configure.ac"
- "src/SYMPHONY/Cgl/configure")
- (("for file in `ls \\*/Makefile.in`")
- "for file in `ls */Makefile.in | sort`")))))))
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'make-build-order-reproducible
+ (lambda _
+ (substitute* '("src/SYMPHONY/Cgl/configure.ac"
+ "src/SYMPHONY/Cgl/configure")
+ (("for file in `ls \\*/Makefile.in`")
+ "for file in `ls */Makefile.in | sort`"))))
+ #$@(if (or (target-aarch64?)
+ (target-riscv64?))
+ #~((add-after 'unpack 'update-config-files
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each
+ (lambda (location)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file))
+ (dirname location)))
+ '("config.guess" "config.sub")))
+ (find-files "." "config\\.guess")))))
+ #~()))))
(inputs
(list zlib))
(native-inputs
- (list pkg-config r-knitr))
+ (append
+ (list pkg-config r-knitr)
+ (if (or (target-aarch64?)
+ (target-riscv64?))
+ (list config)
+ '())))
(home-page "https://r-forge.r-project.org/projects/rsymphony")
(synopsis "Symphony integer linear programming solver in R")
(description
@@ -14299,14 +14733,14 @@ to install interface to SYMPHONY.")
(define-public r-ihw
(package
(name "r-ihw")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "IHW" version))
(sha256
(base32
- "1pix38lg9snw0jdihh8sifnmckyw1lniwp95r93ca524g6swfc8b"))))
+ "0j7rfyhpzr8zzyvjyphlfviy07z30nzsqq6isi4l0r4qgaziy1s6"))))
(properties `((upstream-name . "IHW")))
(build-system r-build-system)
(propagated-inputs
@@ -14328,14 +14762,14 @@ independent of the p-value under the null hypothesis.")
(define-public r-icobra
(package
(name "r-icobra")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "iCOBRA" version))
(sha256
(base32
- "1f0j10wha60vv592vsnv2pcqwz7g2fkld8pnar9rpwwb7qd0wcnf"))))
+ "1m3awsz8h3gbi82an73kbxcsch2gl737zaanckl1vq2ghymqykrp"))))
(properties `((upstream-name . "iCOBRA")))
(build-system r-build-system)
(propagated-inputs
@@ -14345,6 +14779,7 @@ independent of the p-value under the null hypothesis.")
r-limma
r-markdown
r-reshape2
+ r-rlang
r-rocr
r-scales
r-shiny
@@ -14365,14 +14800,14 @@ interactive exploration of results.")
(define-public r-residualmatrix
(package
(name "r-residualmatrix")
- (version "1.12.0")
+ (version "1.14.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ResidualMatrix" version))
(sha256
(base32
- "06py71xbygfwq55kawh2x340idrf5mmxmnsz5m6lph2ka086dc5v"))))
+ "1zq75i20kv0lgnh19zbhw5khxrag627ynqjvh3rj5kxbhj1l2z7c"))))
(properties
`((upstream-name . "ResidualMatrix")))
(build-system r-build-system)
@@ -14394,14 +14829,14 @@ multiplication and calculation of row/column sums or means.")
(define-public r-batchelor
(package
(name "r-batchelor")
- (version "1.18.1")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "batchelor" version))
(sha256
(base32
- "1z4ddkdd3mzqg0c6l94qmrdwrm7427k5xiwzgkzx43gh1j4911d5"))))
+ "1h70rm0h711ndj9kz3q10yd9f6npjiwvk9wmkg6w3pdgjni1nrl0"))))
(properties `((upstream-name . "batchelor")))
(build-system r-build-system)
(propagated-inputs
@@ -14437,14 +14872,14 @@ the numbers of cells across batches.")
(define-public r-mast
(package
(name "r-mast")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MAST" version))
(sha256
(base32
- "17iycxxp6jb56ra21546kh2zlrm8by2vrlvsxvx8xmbpk32fb4lp"))
+ "1k8an0ifcgx54lqzpim3q37y4rhv57i94i46dlpmdyfghqqw0fny"))
(snippet
'(delete-file "docs/jquery.sticky-kit.min.js"))))
(properties `((upstream-name . "MAST")))
@@ -14494,14 +14929,14 @@ single cell assay data.")
(define-public r-monocle
(package
(name "r-monocle")
- (version "2.30.1")
+ (version "2.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "monocle" version))
(sha256
(base32
- "0hb2s58xx5cmrn3wlppay7275mln8r5y5dsnvpcps3s6xcab00rm"))))
+ "0b09mf9fph0mb0zing0prc757d223858q9lj4j3kfpfjpd3jffai"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -14584,16 +15019,16 @@ several functions from the R igraph package.")
(define-public r-sangerseqr
(package
(name "r-sangerseqr")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "sangerseqR" version))
(sha256
(base32
- "1vggjvxfmmm2gcyfay22wahkib15i164ic148jdps36pxapl6hi3"))))
+ "01z2b7950yxhv8p73rfmq84bscrlpl956ihfyarnzdq9v9ljzzd9"))))
(properties `((upstream-name . "sangerseqR")))
(build-system r-build-system)
- (propagated-inputs (list r-biostrings r-shiny r-stringr))
+ (propagated-inputs (list r-biostrings r-pwalign r-shiny r-stringr))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/sangerseqR")
(synopsis "Tools for Sanger Sequencing data in R")
@@ -14700,14 +15135,14 @@ user-defined and/or data-driven sets of hypotheses.")
(define-public r-noiseq
(package
(name "r-noiseq")
- (version "2.46.0")
+ (version "2.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "NOISeq" version))
(sha256
(base32
- "0qs0sc47n3p9wmf5cmc39cb30i8pbsyizhr29b3ld197pi1ba5wb"))))
+ "1aph4phg58f4kpgavrxnn6dzh3lgms8sbjvip4f3gn8xs0p01mbz"))))
(properties `((upstream-name . "NOISeq")))
(build-system r-build-system)
(propagated-inputs
@@ -14726,14 +15161,14 @@ assumptions.")
(define-public r-scdd
(package
(name "r-scdd")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scDD" version))
(sha256
(base32
- "15hzsq8ckw8v8ccz30kia9qr1iymmcszc9z31g5arrx1y816zgbq"))))
+ "106hawmyln6xj9m2npibb4lkd8qvz60lwjabhn3cpx3908x88ryb"))))
(properties `((upstream-name . "scDD")))
(build-system r-build-system)
(propagated-inputs
@@ -14764,14 +15199,14 @@ distributions.")
(define-public r-scone
(package
(name "r-scone")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scone" version))
(sha256
(base32
- "1y0blhh75hb60h9jmvz2naqfzky4zgw5gn81fbj74jfph9y712lp"))))
+ "1qvnc6cds3avxh1k4z47vb2fih7q8a5b9hccnyrpfks5c0sd6yi0"))))
(build-system r-build-system)
(propagated-inputs
(list r-aroma-light
@@ -14808,14 +15243,14 @@ high-throughput analyses.")
(define-public r-geoquery
(package
(name "r-geoquery")
- (version "2.70.0")
+ (version "2.72.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GEOquery" version))
(sha256
(base32
- "1xjfh9lx2cfwzkk61pdarajsa86nzhy3dz7r4zws20pz4xkhwv87"))))
+ "0rqyv95l8h3s68ywhv3r7hm7j1mbm8prql7p2rlvv4xg31yqmnpl"))))
(properties `((upstream-name . "GEOquery")))
(build-system r-build-system)
(propagated-inputs
@@ -14843,14 +15278,14 @@ the bridge between GEO and BioConductor.")
(define-public r-illuminaio
(package
(name "r-illuminaio")
- (version "0.44.0")
+ (version "0.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "illuminaio" version))
(sha256
(base32
- "15i47b995dqh0dlg60lss5vgj31as3cwhb2z5fqbnknx3lj7s6rl"))))
+ "0l3n1plz5nvday0a1bm8173mikpfjbzrb1bp8yfvafy7lav4dsyv"))))
(build-system r-build-system)
(propagated-inputs
(list r-base64))
@@ -14864,14 +15299,14 @@ files, including IDAT.")
(define-public r-siggenes
(package
(name "r-siggenes")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "siggenes" version))
(sha256
(base32
- "0jzxwg28ih1i0f7hal99g60zply0g613b4wrjsbv738cmlsai2kc"))))
+ "0j4nhdq82dzr19x5w4w4l97clra0z1kk6n24x56hrrj0xlm2cgnm"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase r-multtest r-scrime))
@@ -14888,14 +15323,14 @@ Bayes Analyses of Microarrays} (EBAM).")
(define-public r-bumphunter
(package
(name "r-bumphunter")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bumphunter" version))
(sha256
(base32
- "0vnm0m9abf8478f7lair58vw1v4mxj8sbmrxcpf8622ygf2na4qc"))))
+ "08b5d0grmpk5pryffdh6gdafhp1brana353q2kmwhz7x55aq3w68"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -14922,13 +15357,13 @@ studies.")
(define-public r-bumpymatrix
(package
(name "r-bumpymatrix")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BumpyMatrix" version))
(sha256
(base32
- "0ic87fjxwb39nmys09zb6k3ghcx8mmmj9pifljs10449i2lgzl2r"))))
+ "1f8xa184x6l363psbqn0a5yh16ghm2mciv726aii58bkln5qwkmb"))))
(properties `((upstream-name . "BumpyMatrix")))
(build-system r-build-system)
(propagated-inputs (list r-iranges r-matrix r-s4vectors))
@@ -14948,13 +15383,13 @@ data in a format that is compatible with two-dimensional containers like the
(define-public r-mia
(package
(name "r-mia")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "mia" version))
(sha256
(base32
- "044spfxsf7xijnbh0933cwdkycmg05zsfqhbx5pkfajysh6w5cxp"))))
+ "1wn2lb7hn4zqqcs2jwavpsbk5kw8d78kxg2yv4jjpikpdz7haa2i"))))
(properties `((upstream-name . "mia")))
(build-system r-build-system)
(propagated-inputs
@@ -14998,13 +15433,13 @@ summarization.")
(define-public r-microbiome
(package
(name "r-microbiome")
- (version "1.24.0")
+ (version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "microbiome" version))
(sha256
(base32
- "0xmkwf7v89nwlpjrzqxv87lbsn6za99v7f0yxkgzfk5n6fadrf05"))))
+ "1azxfydcrxi46j6lykspzchwcj0dpghjia7vfb2bppz9gh8nvk37"))))
(properties `((upstream-name . "microbiome")))
(build-system r-build-system)
(propagated-inputs
@@ -15068,13 +15503,13 @@ experiments.")
(define-public r-milor
(package
(name "r-milor")
- (version "1.10.0")
+ (version "2.0.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "miloR" version))
(sha256
(base32
- "1hnvw9x0xwjb0br4yvzkzn73nvm8p3j3wmcw8jrid105j0fz6vcj"))))
+ "1cb5iw90h6raflgmypd2wc8y4mbsv9g8alshh30k1kjm8vlsw92y"))))
(properties `((upstream-name . "miloR")))
(build-system r-build-system)
(propagated-inputs
@@ -15094,9 +15529,13 @@ experiments.")
r-irlba
r-limma
r-matrix
+ r-matrixgenerics
r-matrixstats
+ r-numderiv
r-patchwork
r-rcolorbrewer
+ r-rcpp
+ r-rcpparmadillo
r-s4vectors
r-singlecellexperiment
r-stringr
@@ -15116,14 +15555,14 @@ model.")
(define-public r-minfi
(package
(name "r-minfi")
- (version "1.48.0")
+ (version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "minfi" version))
(sha256
(base32
- "13lldzj68vmmmrp5fi2rfxbchbivaa1scq56hl0v9mxxicw72a0x"))))
+ "1hk44wddcygh4j7jmj1b0p40hf5qdy1m78x14j19h7z9aq4azdij"))))
(build-system r-build-system)
(propagated-inputs
(list r-beanplot
@@ -15167,13 +15606,13 @@ methylation arrays.")
(define-public r-missmethyl
(package
(name "r-missmethyl")
- (version "1.36.0")
+ (version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "missMethyl" version))
(sha256
(base32
- "1nv4rm5pbx0s7m5zak3jzmwz4pkf8ghkj0ckdcsnmw3k364ny856"))))
+ "0fnqa7v6lgld4pdqnvgdzly73aj4a4cn8sgszicxsyn1damxsjiw"))))
(properties `((upstream-name . "missMethyl")))
(build-system r-build-system)
(propagated-inputs
@@ -15217,14 +15656,14 @@ into account multi-gene associated probes.")
(define-public r-methylumi
(package
(name "r-methylumi")
- (version "2.48.0")
+ (version "2.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "methylumi" version))
(sha256
(base32
- "1vracrvy56kk3hc9midxdaxhad2zf1lspn0zzxjjbsyzx3r0ip0n"))))
+ "1ms3w43yvy810mr6dml9hqp3kw5jlpr9153kd62gvhjsgikaj3ja"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotate
@@ -15264,17 +15703,22 @@ and Infinium HD arrays are also included.")
(define-public r-lefser
(package
(name "r-lefser")
- (version "1.12.1")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "lefser" version))
(sha256
(base32
- "0aywwinp4wwwa12rq60gpfk5gn28zyimayxakgj4lhfwjk0byz8m"))))
+ "1qi4q3vijys4q1gfnflvvz8ws3j6f65rpprpgmrkqgiwfn7dvi6g"))))
(properties `((upstream-name . "lefser")))
(build-system r-build-system)
(propagated-inputs
- (list r-coin r-ggplot2 r-mass r-s4vectors r-summarizedexperiment))
+ (list r-coin
+ r-dplyr
+ r-ggplot2
+ r-mass
+ r-s4vectors
+ r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "https://github.com/waldronlab/lefser")
(synopsis "LEfSE method for microbiome biomarker discovery")
@@ -15288,14 +15732,14 @@ to find biomarkers of groups and sub-groups.")
(define-public r-lumi
(package
(name "r-lumi")
- (version "2.54.0")
+ (version "2.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "lumi" version))
(sha256
(base32
- "0iwkag84w1sc703jcdfx0h799hlchdiqvlps8g8lwmil5b0xlsw5"))))
+ "04r7dw00yvjrxs0h6mwh79lwp55f5v8s4pgmzcy2fnpb2cdslpzy"))))
(build-system r-build-system)
(propagated-inputs
(list r-affy
@@ -15327,14 +15771,14 @@ especially Illumina Infinium methylation microarrays.")
(define-public r-linnorm
(package
(name "r-linnorm")
- (version "2.26.0")
+ (version "2.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Linnorm" version))
(sha256
(base32
- "1ax5zmby8zw0mgxjd8yhlk4ai0s03zq59qwzqgv8zqlms8yjpvs2"))))
+ "1la6fwaap7957rrb4cs6w48kjz4hqrw3h39lpps419d4cbnsp5jz"))))
(properties `((upstream-name . "Linnorm")))
(build-system r-build-system)
(propagated-inputs
@@ -15388,14 +15832,14 @@ evaluation of DEG analysis methods.")
(define-public r-ioniser
(package
(name "r-ioniser")
- (version "2.26.0")
+ (version "2.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "IONiseR" version))
(sha256
(base32
- "1y595hq40kpsasp74wsbf3ngd2rrriqg65z9y4svcwdygj03pgrz"))))
+ "1ihski4akl70v6kq03di6w1pz63dx6rxgmyjkm0dv0nhgkmrza22"))))
(properties `((upstream-name . "IONiseR")))
(build-system r-build-system)
(propagated-inputs
@@ -15455,14 +15899,14 @@ are standardized and usable by the accompanying mutossGUI package.")
(define-public r-metap
(package
(name "r-metap")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
(uri (cran-uri "metap" version))
(sha256
(base32
- "18l86026g5g0pdihw41h7yck1ad5k43bb7as5qih2k5xkr680mzx"))))
+ "1dwk402kbxigz5llh223z0b98cq2vs3ij049fgsj7bna7kycks1l"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice
@@ -15484,13 +15928,13 @@ published results; and a routine for graphical display.")
(define-public r-tradeseq
(package
(name "r-tradeseq")
- (version "1.16.0")
+ (version "1.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tradeSeq" version))
(sha256
(base32
- "06k0jib20nq7zqc5vbgag8v1lbadjlg0idh5jwn5bcjc74dx15vj"))))
+ "1kgvvvwvj3dgb2wik3y8j44ynda94bi05vvmiwlayrypqprwi1c1"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -15553,14 +15997,14 @@ peak definition in combination with known profile characteristics.")
(define-public r-varianttools
(package
(name "r-varianttools")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "VariantTools" version))
(sha256
(base32
- "1ibg4cdpbv4ph3y4r90j8zfwr1cy1z33p4bazhzyi2zv3xa1nrq6"))))
+ "1idil9vkd5risx9ahkagdacnj2g2a11gzsd7wmhg5gjmr77r53ww"))))
(properties `((upstream-name . "VariantTools")))
(build-system r-build-system)
(propagated-inputs
@@ -15593,14 +16037,14 @@ gmapR.")
(define-public r-heatplus
(package
(name "r-heatplus")
- (version "3.10.0")
+ (version "3.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Heatplus" version))
(sha256
(base32
- "1vs7x4dc2vrfi2wi300bjr2hl1wwp4v27sgzycr6qv6x2nx9i5xq"))))
+ "1pc63hk0smcflq4903hvs4pp8r0kzlx08j0m1kxlh14cxwppamyb"))))
(properties `((upstream-name . "Heatplus")))
(build-system r-build-system)
(propagated-inputs
@@ -15618,18 +16062,26 @@ information about samples and features can be added to the plot.")
(define-public r-gosemsim
(package
(name "r-gosemsim")
- (version "2.28.1")
+ (version "2.30.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GOSemSim" version))
(sha256
(base32
- "0p8368ia4ib61m1p8apk2d21lhdi62rfg04zl4190w6xv87k49xx"))))
+ "009rh51mndpkqw9vmr836ll2zsmsb4wlrjhvda5qiggznlhixrcv"))))
(properties `((upstream-name . "GOSemSim")))
(build-system r-build-system)
(propagated-inputs
- (list r-annotationdbi r-go-db r-rcpp r-rlang r-yulab-utils))
+ (list r-annotationdbi
+ r-dbi
+ r-digest
+ r-go-db
+ r-httr2
+ r-r-utils
+ r-rcpp
+ r-rlang
+ r-yulab-utils))
(native-inputs
(list r-knitr))
(home-page "https://guangchuangyu.github.io/software/GOSemSim")
@@ -15645,14 +16097,14 @@ sets of GO terms, gene products and gene clusters.")
(define-public r-anota
(package
(name "r-anota")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "anota" version))
(sha256
(base32
- "1b1r7jwilwvl89fw3rqascyhy8wnm8y81lnx85pwjk55ld56jlb1"))))
+ "1pg9p6982901k08iqpk0cdb9hii3k7bci9gq6an711r8a4iy3lmc"))))
(build-system r-build-system)
(propagated-inputs
(list r-multtest r-qvalue))
@@ -15675,13 +16127,13 @@ the data set is suitable for such analysis.")
(define-public r-anota2seq
(package
(name "r-anota2seq")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "anota2seq" version))
(sha256
- (base32 "0kyxwhj5vq5z4v3x3hfb9ks3h37axqskyj9rzyj2bzsy2yk9hajn"))))
+ (base32 "140k37wswl4w2136pz9y0z82sphzxmgzgk3cr400kkm39wjn7vxm"))))
(properties `((upstream-name . "anota2seq")))
(build-system r-build-system)
(propagated-inputs
@@ -15711,13 +16163,13 @@ that protein levels remain constant despite fluctuating total mRNA levels.")
(define-public r-fcscan
(package
(name "r-fcscan")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "fcScan" version))
(sha256
- (base32 "0hhad9vg43j0yz8fp2w7qdhvdy77yr7anv0fi170042x3piq1q7r"))))
+ (base32 "1gb15zrv44yn65wns7dk24rp54qv7wafqxgk1q8jnbkq9lp5wj2y"))))
(properties `((upstream-name . "fcScan")))
(build-system r-build-system)
(propagated-inputs
@@ -15744,14 +16196,14 @@ presence of additional sites within the allowed window size.")
(define-public r-fgsea
(package
(name "r-fgsea")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "fgsea" version))
(sha256
(base32
- "0sykd4ingpw41615hbr3vw9yd1ks225hdb5qxnhbk4m4wxj814ql"))))
+ "0nnvqsyrj24h5y8qw8llk9f4jgy0v734k37kcksfcpja17frdyjy"))))
(build-system r-build-system)
(propagated-inputs
(list r-bh
@@ -15777,14 +16229,14 @@ to multiple hypothesis correction.")
(define-public r-dose
(package
(name "r-dose")
- (version "3.28.2")
+ (version "3.30.4")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DOSE" version))
(sha256
(base32
- "0kk4l8cxyvcq4cjjnb59zajf4ci0igml13582qqn8123cqkbf8pf"))))
+ "07pljijlyp4labxg4q3kf6wq4acw6axyyw57k1bws3hcf4m1d92x"))))
(properties `((upstream-name . "DOSE")))
(build-system r-build-system)
(propagated-inputs
@@ -15793,10 +16245,8 @@ to multiple hypothesis correction.")
r-fgsea
r-ggplot2
r-gosemsim
- r-hdo-db
r-qvalue
- r-reshape2
- r-yulab-utils))
+ r-reshape2))
(native-inputs
(list r-knitr))
(home-page "https://guangchuangyu.github.io/software/DOSE/")
@@ -15813,13 +16263,13 @@ data.")
(define-public r-enrichedheatmap
(package
(name "r-enrichedheatmap")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "EnrichedHeatmap" version))
(sha256
(base32
- "0j87x26qimsx4gi311bm1g9bldwq9r4z3aflxf8p91zlavjbv8zp"))))
+ "0fmqz9xqs1108a5xxpsc63pplcc0i742r4zdk46p68my28ba2xfq"))))
(properties `((upstream-name . "EnrichedHeatmap")))
(build-system r-build-system)
(propagated-inputs (list r-circlize
@@ -15845,14 +16295,14 @@ correspondance between different data sources.")
(define-public r-enrichplot
(package
(name "r-enrichplot")
- (version "1.22.0")
+ (version "1.24.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "enrichplot" version))
(sha256
(base32
- "05ps96adbn4h8i0mqflzm1h6chjlrmfz6hx393232bhb995jfllx"))))
+ "03p0a1vyaznk405xpkp57f22wg8x7lxiipjh101p7dq97rbzr4r7"))))
(build-system r-build-system)
(propagated-inputs
(list r-aplot
@@ -15888,13 +16338,13 @@ All the visualization methods are developed based on ggplot2 graphics.")
(define-public r-classdiscovery
(package
(name "r-classdiscovery")
- (version "3.4.0")
+ (version "3.4.5")
(source (origin
(method url-fetch)
(uri (cran-uri "ClassDiscovery" version))
(sha256
(base32
- "06l7jvpcdynij05hb0ka33zpg7xdyqyzfzx24s0bnlspp83yc62s"))))
+ "0k70s7nlmxymxw84174ikqx854hi0pizd9acpr7ky8fb30fyxg31"))))
(properties `((upstream-name . "ClassDiscovery")))
(build-system r-build-system)
(propagated-inputs
@@ -15913,14 +16363,14 @@ attempts to assess their statistical significance.")
(define-public r-clusterprofiler
(package
(name "r-clusterprofiler")
- (version "4.10.1")
+ (version "4.12.5")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "clusterProfiler" version))
(sha256
(base32
- "1jwi9029dy7ga4hv75grib7wdaghslwh4qk5awhgw3192a0qcixf"))))
+ "139qfvfqwb09k72srjn233hw9i6rh4bp8i9nqn215cn3qvvrw9zz"))))
(properties
`((upstream-name . "clusterProfiler")))
(build-system r-build-system)
@@ -15953,13 +16403,13 @@ profiles (GO and KEGG) of gene and gene clusters.")
(define-public r-clusterexperiment
(package
(name "r-clusterexperiment")
- (version "2.22.0")
+ (version "2.24.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "clusterExperiment" version))
(sha256
(base32
- "1qnxrdpp75m342q4chwaig413l52giz1h7nd4p9y4b472dqx9hh4"))))
+ "0pi6qnchh89fhfr50fk4hrrkz1r8gfwjcd7254pgiaxcazv2380a"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -15971,7 +16421,6 @@ profiles (GO and KEGG) of gene and gene clusters.")
r-delayedarray
r-edger
r-hdf5array
- r-howmany
r-kernlab
r-limma
r-locfdr
@@ -15999,14 +16448,14 @@ expression data sets.")
(define-public r-mlinterfaces
(package
(name "r-mlinterfaces")
- (version "1.82.0")
+ (version "1.84.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MLInterfaces" version))
(sha256
(base32
- "0aga7xhx5d1xp09n2im7yqi9y1b3v22l554hi35ahg2lwwvxjiw1"))))
+ "1m8clkb5rznzv2fwrl59csq8v0ibqwdm4fphq10b8pmyvj880qpn"))))
(properties `((upstream-name . "MLInterfaces")))
(build-system r-build-system)
(propagated-inputs
@@ -16043,14 +16492,14 @@ data in R and Bioconductor containers.")
(define-public r-annaffy
(package
(name "r-annaffy")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "annaffy" version))
(sha256
(base32
- "1mdv0x9lnr0bm96h5f9104nqg2j6cjqvp5prrxx10j0d6464vmkw"))))
+ "1298mn8yz4i0qqw1i8pd4ym5f65dmyb8wcmpyahzz11na4diybmj"))))
(build-system r-build-system)
(arguments
`(#:phases
@@ -16075,14 +16524,14 @@ It allows searching of biological metadata using various criteria.")
(define-public r-a4core
(package
(name "r-a4core")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4Core" version))
(sha256
(base32
- "0iismcsnkyb7m4dwmxw5pyvscj2bhp6zw9hpdb2ff91viynbknq1"))))
+ "1jn2ikzijd282jl96i9hcvahkc6l2vsd79dxqiz7kwaqcp7hs5z9"))))
(properties `((upstream-name . "a4Core")))
(build-system r-build-system)
(propagated-inputs
@@ -16099,14 +16548,14 @@ arrays.")
(define-public r-a4classif
(package
(name "r-a4classif")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4Classif" version))
(sha256
(base32
- "1wxkyqyhb3mj04kmaisd09dapywjpc081ihaig5rs04k611ddvhi"))))
+ "15jcd66brvbjz0p3z2b43ac5k81s3vmcbkwmga0f7f5v53fp8qvw"))))
(properties `((upstream-name . "a4Classif")))
(build-system r-build-system)
(propagated-inputs
@@ -16129,14 +16578,14 @@ Affymetrix arrays.")
(define-public r-a4preproc
(package
(name "r-a4preproc")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4Preproc" version))
(sha256
(base32
- "19nf3bc0gdwixif50f3bs47a1kw1w1lir1dz4l8zqdp3h8gfmj60"))))
+ "1yphs36pk2y4qajq24y443yzb2f55b08nl81ylpf65mvxlxd23w2"))))
(properties `((upstream-name . "a4Preproc")))
(build-system r-build-system)
(propagated-inputs
@@ -16153,14 +16602,14 @@ is used for preprocessing the arrays.")
(define-public r-a4reporting
(package
(name "r-a4reporting")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4Reporting" version))
(sha256
(base32
- "16lgbwsgwp77x9a8c3hr1aqhp36skzz72xhbzm0a7w3kagmd8gn6"))))
+ "08zlg74qryqm238mld876v15a6c71brkz2y1gnbj0rnl1l9f9rbh"))))
(properties `((upstream-name . "a4Reporting")))
(build-system r-build-system)
(propagated-inputs
@@ -16177,14 +16626,14 @@ provides reporting features.")
(define-public r-a4base
(package
(name "r-a4base")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4Base" version))
(sha256
(base32
- "0hin5lpwa7cxa862jh3y7d8kq3q9bv76ri08b27jxzyr5p7xwcr2"))))
+ "19vapjmyd3ly3s2gqa2xfg99gyc6n6lv3c6rpi0ch4hzb7wiinvm"))))
(properties `((upstream-name . "a4Base")))
(build-system r-build-system)
(propagated-inputs
@@ -16208,14 +16657,14 @@ Affymetrix arrays.")
(define-public r-a4
(package
(name "r-a4")
- (version "1.50.1")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "a4" version))
(sha256
(base32
- "0sibsmn7ma2imhfn2pn1fvy6hinzlmsczmx944fzg0aj1lpjcdqr"))))
+ "1wzqpvz49wkbvqij48c3l6vqfvflgic8gzvjdigb1c6mr96l6vgg"))))
(build-system r-build-system)
(propagated-inputs
(list r-a4base r-a4classif r-a4core r-a4preproc r-a4reporting))
@@ -16229,14 +16678,14 @@ Affymetrix arrays.")
(define-public r-abseqr
(package
(name "r-abseqr")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "abseqR" version))
(sha256
(base32
- "0s865nahgm0by2nvjydkjlhkj2sxmrvcrhw7rmm46ld4g10xsrc8"))))
+ "0aj3kh4c8zk60n6yyh2jblbrvv77071r96m0mrcslqm71dwg9402"))))
(properties `((upstream-name . "abseqR")))
(build-system r-build-system)
(inputs
@@ -16277,14 +16726,14 @@ further downstream analysis on its output.")
(define-public r-bacon
(package
(name "r-bacon")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bacon" version))
(sha256
(base32
- "065b4xf5i1bx08494nm3r497bs47s5vf99l2g37nlpvxf7pypvrz"))))
+ "09lvjb0fa70kcl7mkp4agxv6jcm2ncmnrffav6zmz038imhmvdgm"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocparallel r-ellipse r-ggplot2))
@@ -16302,14 +16751,14 @@ fitting a three-component normal mixture on z-scores.")
(define-public r-rgadem
(package
(name "r-rgadem")
- (version "2.50.0")
+ (version "2.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "rGADEM" version))
(sha256
(base32
- "14jcsqb56vn67hjmcjjnwswzbilsarkk8kblc715c7da72q7fzpn"))))
+ "1d1vfnxj1p4y1074ybmkxv4x3v0i3sn5w3k4bddzlrqbzyb9kkna"))))
(properties `((upstream-name . "rGADEM")))
(build-system r-build-system)
(propagated-inputs
@@ -16356,12 +16805,12 @@ distributions, modules and filter motifs.")
(define-public r-motifdb
(package
(name "r-motifdb")
- (version "1.44.0")
+ (version "1.46.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "MotifDb" version))
(sha256
- (base32 "1z72f5f3sh2ak6zjcfc6j6rblkllmdkli0kb57nwxg2j5hrys3xr"))))
+ (base32 "1m8y76gg80625xz9g9101mfq19glk37p792yzz46807f7g6m8zbh"))))
(properties `((upstream-name . "MotifDb")))
(build-system r-build-system)
(propagated-inputs
@@ -16383,12 +16832,12 @@ frequency matrices from nine public sources, for multiple organisms.")
(define-public r-motifbreakr
(package
(name "r-motifbreakr")
- (version "2.16.0")
+ (version "2.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "motifbreakR" version))
(sha256
- (base32 "02i3hkffhhsbzmn97mv8wc2px5caq9xnp45z0l53dp1jxbmms1h0"))))
+ (base32 "1mxs83l8yrbcx353h0wpc0lczn1jc0y5vg59y9g9dabk41csib47"))))
(properties `((upstream-name . "motifbreakR")))
(build-system r-build-system)
(propagated-inputs
@@ -16403,6 +16852,7 @@ frequency matrices from nine public sources, for multiple organisms.")
r-matrixstats
r-motifdb
r-motifstack
+ r-pwalign
r-rtracklayer
r-s4vectors
r-stringr
@@ -16433,14 +16883,14 @@ Bioconductor.")
(define-public r-motifstack
(package
(name "r-motifstack")
- (version "1.46.0")
+ (version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "motifStack" version))
(sha256
(base32
- "10hmqwkysifd59as9zx00p3gj595lwj30ywn9pqb1920q6f5mx2i"))
+ "15v4z1a0kg4ic411aprzc9b7i2l6c456sfj3jaxy95anw3j3iskj"))
(snippet
'(delete-file "inst/htmlwidgets/lib/d3/d3.v4.min.js"))))
(properties `((upstream-name . "motifStack")))
@@ -16485,14 +16935,14 @@ type and symbol colors.")
(define-public r-genomicscores
(package
(name "r-genomicscores")
- (version "2.14.3")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GenomicScores" version))
(sha256
(base32
- "0rhyfbm5whz4jygar9cqcrfy92h1lyam5wd8d9svhh80f15v53m9"))))
+ "11sabicr2jm1cc9rdjr6vjqhf0gd9d7k04qlfhcdssvh02f957ia"))))
(properties `((upstream-name . "GenomicScores")))
(build-system r-build-system)
(propagated-inputs
@@ -16554,18 +17004,19 @@ these files at JHPCE.")
(define-public r-atacseqqc
(package
(name "r-atacseqqc")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ATACseqQC" version))
(sha256
(base32
- "1b53rkhyqnyh5vangh3hy4yccx1yackwbv1pxdimbp840ji6d122"))))
+ "0licdpzhh6xlma0hnvs4rr4bjr5q4q3g18kipf0is47zj4l91smy"))))
(properties `((upstream-name . "ATACseqQC")))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
+ r-biocparallel
r-biostrings
r-bsgenome
r-chippeakanno
@@ -16601,14 +17052,14 @@ footprints.")
(define-public r-gofuncr
(package
(name "r-gofuncr")
- (version "1.22.2")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GOfuncR" version))
(sha256
(base32
- "004483q584530mh5nb28ppa8wllkd639n9yyw309acs2s4rc7saa"))))
+ "1g3nppcmyj81ia3v9zvsr8jplk8kmvssspvxd94zxh6yb3wrrc6v"))))
(properties `((upstream-name . "GOfuncR")))
(build-system r-build-system)
(propagated-inputs
@@ -16706,14 +17157,14 @@ different identifieres using the Biocore Data Team data-packages (e.g.
(define-public r-annotationtools
(package
(name "r-annotationtools")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "annotationTools" version))
(sha256
(base32
- "0g086rj06k3wac24zx66dw1yc1bzv25bmlbjbpcpgdcmyjb1i8sf"))))
+ "1hwawrp0pbrm9xf7fn65nj0q4s49qlnmxfjlmrv5fykyn3i1lhpq"))))
(properties
`((upstream-name . "annotationTools")))
(build-system r-build-system)
@@ -16731,14 +17182,14 @@ text files).")
(define-public r-allelicimbalance
(package
(name "r-allelicimbalance")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AllelicImbalance" version))
(sha256
(base32
- "0p7l856a46zzla8brsg901pmh5738j63h7h7rn3da94ny8k417mf"))))
+ "0mbmw450gdlr46ggvhrgimkbir3lg5dnqsfadn7yyrn7wkcr302f"))))
(properties
`((upstream-name . "AllelicImbalance")))
(build-system r-build-system)
@@ -16774,14 +17225,14 @@ investigation using RNA-seq data.")
(define-public r-aucell
(package
(name "r-aucell")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AUCell" version))
(sha256
(base32
- "1d1icbq8i7mwsc7lv9pn4r0vs7azx1lwng5p3ghnray1ygqclbi0"))))
+ "009ha82393giapvmfw2mi8pmi88f61mr69qj64y5vphcr1smvcl0"))))
(properties `((upstream-name . "AUCell")))
(build-system r-build-system)
(propagated-inputs
@@ -16793,7 +17244,6 @@ investigation using RNA-seq data.")
r-matrix
r-mixtools
r-r-utils
- r-shiny
r-summarizedexperiment))
(native-inputs
(list r-knitr))
@@ -16815,14 +17265,14 @@ needed.")
(define-public r-ebimage
(package
(name "r-ebimage")
- (version "4.44.0")
+ (version "4.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "EBImage" version))
(sha256
(base32
- "0jdi5cn4v5ll43xb3l6sy062snd5p9n2nrryc5aqd2ki18mdmghy"))))
+ "0qaafn9l9lwrj0yph74g39pghjpg009qz7by64frxg1q0j7ksd2w"))))
(properties `((upstream-name . "EBImage")))
(build-system r-build-system)
(propagated-inputs
@@ -16854,14 +17304,14 @@ visualization with image data.")
(define-public r-yamss
(package
(name "r-yamss")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "yamss" version))
(sha256
(base32
- "16rdy35wmydcx322pf9j7l7z2mzgrksg1whr8i8xdmdqfnqz3xyb"))))
+ "0l9wqijwlq1gwybj2fy6jwgq6ja1mvx8yfdv174g5mjflx8nmc06"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
@@ -16887,14 +17337,14 @@ analysis.")
(define-public r-gtrellis
(package
(name "r-gtrellis")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gtrellis" version))
(sha256
(base32
- "022wn0l2wfizlz6d5plkphjsjbmxw2wcvxrzr4vanczjzzyxv5c5"))))
+ "1qlsjpjxcw96qhrqjlbbinpry9yagn50jc3dnz459dbfvnywr82q"))))
(build-system r-build-system)
(propagated-inputs
(list r-circlize r-genomicranges r-getoptlong r-iranges))
@@ -16913,14 +17363,14 @@ genomic categories and to add self-defined graphics in the plot.")
(define-public r-somaticsignatures
(package
(name "r-somaticsignatures")
- (version "2.38.0")
+ (version "2.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SomaticSignatures" version))
(sha256
(base32
- "0s9kjjh1n4a55ycjvcw8ymjcclcj8b35aygx4x1k5af1hf3f7wyb"))))
+ "0yvn2famnyxkxnw4r1vr0vma6ym9kb343vqgaqkvcp3zpm1fi0p8"))))
(properties
`((upstream-name . "SomaticSignatures")))
(build-system r-build-system)
@@ -16952,14 +17402,14 @@ decomposition algorithms.")
(define-public r-yapsa
(package
(name "r-yapsa")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "YAPSA" version))
(sha256
(base32
- "07dxhaywad9ivkrc454hhizfw6a5yvarrc5fp5za2jgsznv408wl"))))
+ "0908hyji07br1i1zms21a99m3mvi707xj8zbd1w64gzackghabhl"))))
(properties `((upstream-name . "YAPSA")))
(build-system r-build-system)
(propagated-inputs
@@ -17001,14 +17451,14 @@ provided.")
(define-public r-gcrma
(package
(name "r-gcrma")
- (version "2.74.0")
+ (version "2.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gcrma" version))
(sha256
(base32
- "07ina8w8p5bm382v452i2wpmv90gvgli393lsgp7xy0h9in7h6yg"))))
+ "01b9b4v19yh42552awl21yyx9vhf9yh9r3l8849x4zwjpnf6anp3"))))
(build-system r-build-system)
(propagated-inputs
(list r-affy
@@ -17083,14 +17533,14 @@ chips with the MAQC reference datasets.")
(define-public r-quantro
(package
(name "r-quantro")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "quantro" version))
(sha256
(base32
- "032qxwgldl1hbgsgb5q3fi7nfg1nx3k0yppqkvim5cif613m1nzq"))))
+ "0b8afvnczkhmbdg5zna2h5v42zdyvk1zybn9cwcbw22rijiysq99"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -17116,14 +17566,14 @@ groups.")
(define-public r-yarn
(package
(name "r-yarn")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "yarn" version))
(sha256
(base32
- "12d806pyiks5xbvxng4pxn0xqvgs4c526gp2pp2qhdxw0w2m29rj"))))
+ "1r0dj65i8xg1yb6x7ggb3s40hvzbh596k2g9bxblsbl18z867ydp"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -17153,14 +17603,14 @@ large RNA-seq experiments.")
(define-public r-roar
(package
(name "r-roar")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "roar" version))
(sha256
(base32
- "0pibk6zdqlbm0rxnb95pd94v6lbg67rwmjnpfxizq7wv36pw6kdr"))))
+ "06d1w5kknm2mb6v6glmyd97n1a33529kgqkkyfbk277ikn45hi9f"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
@@ -17221,14 +17671,14 @@ genes.")
(define-public r-massspecwavelet
(package
(name "r-massspecwavelet")
- (version "1.68.0")
+ (version "1.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MassSpecWavelet" version))
(sha256
(base32
- "044rz2xsz2v8i9ha20hxn2cwf7wa74p5f25jql8ancp6r3gim9sy"))))
+ "0ckvnah0ck5z6calgrwk0k3y1nxpcyn41y84kz5bypzr77x6ssj2"))))
(properties
`((upstream-name . "MassSpecWavelet")))
(build-system r-build-system)
@@ -17245,34 +17695,32 @@ based on @dfn{Continuous Wavelet Transform} (CWT).")
(define-public r-xcms
(package
(name "r-xcms")
- (version "4.0.2")
+ (version "4.2.3")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "xcms" version))
(sha256
(base32
- "170s260sp880d3rb256189jvfnnmyzf9nxh8bvksng6yp561r8dc"))))
+ "10b3jj7m278df0s83icbl95rbp5m7y0avhsjzfy0mkgyvm13y5ls"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
r-biocgenerics
r-biocparallel
r-iranges
+ r-jsonlite
r-lattice
r-massspecwavelet
+ r-metabocoreutils
r-mscoreutils
r-msexperiment
r-msfeatures
r-msnbase
- r-multtest
r-mzr
- r-plyr
r-progress
r-protgenerics
- r-rann
r-rcolorbrewer
- r-robustbase
r-s4vectors
r-spectra
r-summarizedexperiment))
@@ -17290,13 +17738,13 @@ data for high-throughput, untargeted analyte profiling.")
(define-public r-wppi
(package
(name "r-wppi")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "wppi" version))
(sha256
(base32
- "04wg645c0gww8mq3vg70gqlwm12dmqxmvk704zvmxcpifhrvpn2b"))))
+ "1mvr5bpsng87yl1bhd22h45830vw3sla1ysnr29px13if2q5ylmy"))))
(properties `((upstream-name . "wppi")))
(build-system r-build-system)
;; This is necessary because omnipathr attempts to write a configuration
@@ -17331,14 +17779,14 @@ scores and a path search algorithm.")
(define-public r-wrench
(package
(name "r-wrench")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Wrench" version))
(sha256
(base32
- "11g6a2315hllf197ssccybhv6i7p48n7bv2amzpgxs7bs7qg3k9d"))))
+ "1nwbqagpcs38c66r1arbby76if6pafa4snd6zbp18y71jj8rgvl7"))))
(properties `((upstream-name . "Wrench")))
(build-system r-build-system)
(propagated-inputs
@@ -17355,14 +17803,14 @@ that arising from 16s metagenomic surveys.")
(define-public r-wiggleplotr
(package
(name "r-wiggleplotr")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "wiggleplotr" version))
(sha256
(base32
- "1gq0hxmnnis0g1y6hiphz02dmk3pfjz874xb2bxqw49z7387fwm8"))))
+ "1px7rgvaj6kks6fp7yqsqjwy4knlzgllzxsiimv8nikmbd57dmi0"))))
(build-system r-build-system)
(propagated-inputs
(list r-assertthat
@@ -17389,14 +17837,14 @@ visualization of exonic read coverage.")
(define-public r-widgettools
(package
(name "r-widgettools")
- (version "1.80.0")
+ (version "1.82.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "widgetTools" version))
(sha256
(base32
- "1zkc275sb1qbban7sghqziv3xkg7wjdpghddklv451n7j282k6w1"))))
+ "0knszrfapndnjzv5948qbfsjamlf7g04yry7yx294l8iwvwip6qv"))))
(properties `((upstream-name . "widgetTools")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/widgetTools/")
@@ -17410,14 +17858,14 @@ widgets in R.")
(define-public r-webbioc
(package
(name "r-webbioc")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "webbioc" version))
(sha256
(base32
- "1ca41q7hxy6p8kvc3qbjplvn40k4jwhf0mb03njifry4xi1xipgy"))))
+ "1ws4w2kf514adk50sjadgasm7z1xvklcb8s243m12fvlg63dia9i"))))
(build-system r-build-system)
(inputs
(list netpbm perl))
@@ -17442,14 +17890,14 @@ Currently only Affymetrix oligonucleotide analysis is supported.")
(define-public r-zinbwave
(package
(name "r-zinbwave")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "zinbwave" version))
(sha256
(base32
- "1lp8x9grc07kaz9iy7yc45mk708g9dplsl86fq0ip8rs51c8f31i"))))
+ "07zlvzfs1c4gcj9hwgqbjhgbrffi301620chrf5lvzly4v7hafwi"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocparallel
@@ -17475,14 +17923,14 @@ the data.")
(define-public r-zfpkm
(package
(name "r-zfpkm")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "zFPKM" version))
(sha256
(base32
- "18pnzc51r7l1ypnhavl83r3gy7l91qnqzvl6771zid04g99pk844"))))
+ "1pgmw41xdq9gd2shc6kawgxz9sw1ydlgs0p35k99k2v50f86r2wy"))))
(properties `((upstream-name . "zFPKM")))
(build-system r-build-system)
(propagated-inputs
@@ -17500,14 +17948,14 @@ This algorithm is based on the publication by Hart et al., 2013 (Pubmed ID
(define-public r-rbowtie2
(package
(name "r-rbowtie2")
- (version "2.8.0")
+ (version "2.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rbowtie2" version))
(sha256
(base32
- "0dx1psk6f27p1kiw4qwj1nf55gpqgisibzipvlnn5m9q3q8g70gv"))))
+ "1spwpbx1jjfjcxbwjkl64ccp9k8xs6lm828546qddsgp20y3bhgp"))))
(properties `((upstream-name . "Rbowtie2")))
(build-system r-build-system)
(propagated-inputs
@@ -17527,14 +17975,14 @@ rapid adapter trimming, identification, and read merging.")
(define-public r-progeny
(package
(name "r-progeny")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "progeny" version))
(sha256
(base32
- "1plgwi2fmx7bh648fqpzzfqnh84fsgnn5jfcbdf9yia6zzigicql"))))
+ "1f5y1sza9vm7wqd4mp5g7sypc9kbf9zpl015rbl41wz4y3ai21sb"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -17559,14 +18007,14 @@ expression\".")
(define-public r-arrmnormalization
(package
(name "r-arrmnormalization")
- (version "1.42.0")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ARRmNormalization" version))
(sha256
(base32
- "1fd1pfw2ggqb0k2npvibfy8liix57m01cxfxp10shvfbzjjy4wjm"))))
+ "0wg799c5pzw9g0dbkaa5j4jyccvixqbc8x3xnwk3cgi1dsbhpk34"))))
(properties
`((upstream-name . "ARRmNormalization")))
(build-system r-build-system)
@@ -17582,14 +18030,14 @@ Infinium HumanMethylation 450k assay.")
(define-public r-biocfilecache
(package
(name "r-biocfilecache")
- (version "2.10.2")
+ (version "2.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocFileCache" version))
(sha256
(base32
- "00gnnc4yypvjnvh1xq4bzqi34j9i9ld1rnjnb2gsxbhaq5nzq31z"))))
+ "0jv6hni5x91ssvz4ilhi3y6lylrw4w3xfk8ljmq6gjvyl886sw9f"))))
(properties `((upstream-name . "BiocFileCache")))
(build-system r-build-system)
(propagated-inputs
@@ -17614,14 +18062,14 @@ and data files used across sessions.")
(define-public r-iclusterplus
(package
(name "r-iclusterplus")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "iClusterPlus" version))
(sha256
(base32
- "0p56w6431jg921416dkyiykccvr7alq6x6r1gcx5d9hkcpyncks1"))))
+ "01rf4w2p1qw4hk9shsdaffyz9g91vffcn4qi1dllsrn3m8pyd1gm"))))
(properties `((upstream-name . "iClusterPlus")))
(build-system r-build-system)
(native-inputs (list gfortran))
@@ -17644,14 +18092,14 @@ Gaussian distributions.")
(define-public r-rbowtie
(package
(name "r-rbowtie")
- (version "1.42.0")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rbowtie" version))
(sha256
(base32
- "1arwr8gisc5g9bwxlachf3lvxpd2767ahnwdf2p1lidwpfism8l8"))))
+ "1in3qani4xh5m5zpbny1nbsvh60ahs36bas8hplkdpd8hnhfla56"))))
(properties `((upstream-name . "Rbowtie")))
(build-system r-build-system)
(arguments
@@ -17680,14 +18128,14 @@ alignment tool.")
(define-public r-sgseq
(package
(name "r-sgseq")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SGSeq" version))
(sha256
(base32
- "1h44r0frrw54s9nqa539ifg270ggmm634gj9cyhn4z7nhxxh134c"))))
+ "1i3dg3fn648mzy49m15vbzr3wfnk91xyph5j4sc7ss978l25h17n"))))
(properties `((upstream-name . "SGSeq")))
(build-system r-build-system)
(propagated-inputs
@@ -17723,14 +18171,14 @@ interpretation.")
(define-public r-rhisat2
(package
(name "r-rhisat2")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhisat2" version))
(sha256
(base32
- "1pxlpwqzbdii0b1swy9vcq905934yfmyqwfx2j3f7n5n4dgglc2q"))))
+ "0a7k9p08gq537275r7dfzh34ycxx8h4fmac74jimwhsa420793r5"))))
(properties `((upstream-name . "Rhisat2")))
(build-system r-build-system)
(arguments
@@ -17746,7 +18194,7 @@ interpretation.")
(("^CPP =.*") (which "g++")))
#t)))))
(propagated-inputs
- (list r-genomicfeatures r-genomicranges r-sgseq))
+ (list r-genomicranges r-sgseq r-txdbmaker))
(native-inputs
(list r-knitr))
(home-page "https://github.com/fmicompbio/Rhisat2")
@@ -17761,14 +18209,14 @@ index.")
(define-public r-quasr
(package
(name "r-quasr")
- (version "1.42.1")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "QuasR" version))
(sha256
(base32
- "0695pjvp742qn629kxly4a9crbg6vakdx1ygnyshprjsz6xz2vnn"))))
+ "116qnp7d7z4a56fv6n55yzrdlmma9gwrw234nmy8iapkn5ms3xky"))))
(properties `((upstream-name . "QuasR")))
(build-system r-build-system)
(propagated-inputs
@@ -17788,7 +18236,8 @@ index.")
r-rsamtools
r-rtracklayer
r-s4vectors
- r-shortread))
+ r-shortread
+ r-txdbmaker))
(native-inputs
(list r-knitr))
(home-page "https://bioconductor.org/packages/QuasR/")
@@ -17803,14 +18252,14 @@ quantification of genomic regions of interest.")
(define-public r-rqc
(package
(name "r-rqc")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rqc" version))
(sha256
(base32
- "0hrhfgv0b9ycw2vmzkpmrv9m9jvvq1n6asnxnrgvzlz81xak84ic"))))
+ "0szd5ygcvpaiwqss8galxzxpslpfh93rk42s865v0qpv0s9v9x0l"))))
(properties `((upstream-name . "Rqc")))
(build-system r-build-system)
(propagated-inputs
@@ -17846,14 +18295,14 @@ graphics.")
(define-public r-birewire
(package
(name "r-birewire")
- (version "3.34.0")
+ (version "3.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiRewire" version))
(sha256
(base32
- "1h5pmd38b9zpbz1nngmk1s0cag4z0vx93yi2n7r85nca9z02cxad"))))
+ "1l3hkq6n7i9j82aym4ngwablj8jqb70a7y6skx0rjkflya6wbim7"))))
(properties `((upstream-name . "BiRewire")))
(build-system r-build-system)
(propagated-inputs
@@ -17899,14 +18348,14 @@ Markov-Chain-Monte-Carlo is applied to sample the activity states.")
(define-public r-multidataset
(package
(name "r-multidataset")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MultiDataSet" version))
(sha256
(base32
- "1n17bpzj95hkljvgqpyv92jm4bk1d3j3mdg7106pb3dffvwv52sk"))))
+ "1y1j5svi52cvixjsn13122kvd0z0c7zfki3p6rr8wjd5w7riiyqw"))))
(properties `((upstream-name . "MultiDataSet")))
(build-system r-build-system)
(propagated-inputs
@@ -17936,14 +18385,14 @@ packages.")
(define-public r-ropls
(package
(name "r-ropls")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ropls" version))
(sha256
(base32
- "1k3j1cbapzqk0qr3v4gijskp487xyz2n4lv4kia9y5pmplddxp7v"))))
+ "0cdkwzrbr6h1dfi3qdh629hi2jlm1hxgq4dvx4z3vc2r6w0c6m11"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -17978,14 +18427,14 @@ coefficients).")
(define-public r-biosigner
(package
(name "r-biosigner")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biosigner" version))
(sha256
(base32
- "1j3wkqvha6pzd6d3wm2q4lihn8p9ycw0wmddjqpnqvglb1x7c0f8"))))
+ "1c56s8lr5cdx27v0rdi4l4h680x6ga9wazf4dj1xkqyliqz65ps5"))))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
@@ -18013,14 +18462,14 @@ datasets.")
(define-public r-annotatr
(package
(name "r-annotatr")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "annotatr" version))
(sha256
(base32
- "16nkxnbsmr0y6km794x2iwbkyrkf0svg6ln3qkqnw0a47a3cbm65"))))
+ "11cc3nknbckm0v5r7dzgqzw0137w4c08ab10s9svb1y02z45a0qz"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -18054,14 +18503,14 @@ annotations.")
(define-public r-rsubread
(package
(name "r-rsubread")
- (version "2.16.1")
+ (version "2.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rsubread" version))
(sha256
(base32
- "0rgfl1kmgf2f0lpj2fzgjvdm5d7swp9wz86jl8q9mydw6z49nxz8"))))
+ "0nd5b1k0dsxpf93wqx01fgbvk40jcfs7b7w692bsx620lm42ipfg"))))
(properties `((upstream-name . "Rsubread")))
(build-system r-build-system)
(inputs (list zlib))
@@ -18080,13 +18529,13 @@ and to both short and long sequence reads.")
(define-public r-flames
(package
(name "r-flames")
- (version "1.8.0")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "FLAMES" version))
(sha256
- (base32 "0937zag0h4bvpapld267s5gz36h8zgjrgvbng9m7czdd8w6064ns"))))
+ (base32 "1fcz0v1vy0q5zmdpawlk4a7fbqd01954p0jby9nbzgbk85hl16mi"))))
(properties `((upstream-name . "FLAMES")))
(build-system r-build-system)
(arguments
@@ -18118,6 +18567,7 @@ and to both short and long sequence reads.")
r-ggplot2
r-gridextra
r-igraph
+ r-iranges
r-jsonlite
r-magrittr
r-matrix
@@ -18135,7 +18585,11 @@ and to both short and long sequence reads.")
r-singlecellexperiment
r-stringr
r-summarizedexperiment
+ r-testthat
+ r-tibble
r-tidyr
+ r-tidyselect
+ r-txdbmaker
r-withr
r-zlibbioc))
(native-inputs (list r-knitr))
@@ -18152,13 +18606,13 @@ for manual execution.")
(define-public r-flowai
(package
(name "r-flowai")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "flowAI" version))
(sha256
(base32
- "1bi13f8q7267lai71sl640w9zgd5a1iln5r4ri2dcskkwb2qxzkz"))))
+ "1siqza92iak5lz38hbfznqndrmq995ihp6sbam0n2d3mj8vwv9qa"))))
(properties `((upstream-name . "flowAI")))
(build-system r-build-system)
(propagated-inputs
@@ -18218,14 +18672,14 @@ the quality control enables the detection and removal of anomalies.")
(define-public r-consensusclusterplus
(package
(name "r-consensusclusterplus")
- (version "1.66.0")
+ (version "1.68.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ConsensusClusterPlus" version))
(sha256
(base32
- "11xcz9b4mg3inz8c8f2vckgai67s740qjyynjim4ahf9zd0j7rxs"))))
+ "0y91kz1n3byadk505432cnlj9dfiw521fgb460d6dmly9s0d9yif"))))
(properties
`((upstream-name . "ConsensusClusterPlus")))
(build-system r-build-system)
@@ -18287,14 +18741,14 @@ of the analyses while minimizing technical noise.")
(define-public r-cytolib
(package
(name "r-cytolib")
- (version "2.14.1")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "cytolib" version))
(sha256
(base32
- "1kagik93ddcl3m1i2bqzzlh18lbxywfn3pxmp47p45kayzxzldrf"))))
+ "0nrj892jihi4fv58si3il42s0vyz3gm4gmb65kidkky63gmsy6iq"))))
(properties `((upstream-name . "cytolib")))
(build-system r-build-system)
(inputs (list openblas protobuf zlib))
@@ -18312,14 +18766,14 @@ interact with gated cytometry data.")
(define-public r-flowcore
(package
(name "r-flowcore")
- (version "2.14.2")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowCore" version))
(sha256
(base32
- "1q47c6pyvcglxs1qga2814b7i84kmm5sncsnl0fhpa9zhx1sjka5"))))
+ "1zq3qypmzk9ld48r50fmygfdqwwyykii8l0l6gh5bdrdan760bfn"))))
(properties `((upstream-name . "flowCore")))
(build-system r-build-system)
(propagated-inputs
@@ -18344,14 +18798,14 @@ with flow cytometry data.")
(define-public r-flowmeans
(package
(name "r-flowmeans")
- (version "1.62.0")
+ (version "1.64.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowMeans" version))
(sha256
(base32
- "06n35c5fdkd3l8d5q8a23yslanirwhbf07b4f0zmf9a43zi642bv"))))
+ "0bkp3q71qj1r2bwfpfriflqklvcqpvh760as7sr489sb18y1xlms"))))
(properties `((upstream-name . "flowMeans")))
(build-system r-build-system)
(propagated-inputs
@@ -18367,14 +18821,14 @@ change point detection.")
(define-public r-ncdfflow
(package
(name "r-ncdfflow")
- (version "2.48.0")
+ (version "2.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ncdfFlow" version))
(sha256
(base32
- "0z9vgd8v69iq8gv23iiaxrk77j2aq8y2n5k8x9jmxphbm0cm19a0"))))
+ "1mbq3190nxlzhfb58i7s2f5f9fngda1icnihmyplagh64savlpcn"))))
(properties `((upstream-name . "ncdfFlow")))
(build-system r-build-system)
(propagated-inputs
@@ -18397,14 +18851,14 @@ manipulation of flow cytometry data.")
(define-public r-ggcyto
(package
(name "r-ggcyto")
- (version "1.30.2")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ggcyto" version))
(sha256
(base32
- "0ig23b6apyp35rxxiqd5nw46yjm2784njlafsgw98akhl8ck0g7n"))))
+ "0z4cfpylj2y3jcljzg15fpjnrhrpzgw49kcprq5sg4cxr96ia2rm"))))
(properties `((upstream-name . "ggcyto")))
(build-system r-build-system)
(propagated-inputs
@@ -18434,14 +18888,14 @@ statistics to the plot.")
(define-public r-flowviz
(package
(name "r-flowviz")
- (version "1.66.0")
+ (version "1.68.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowViz" version))
(sha256
(base32
- "1hn021p2220a47qzlya8qabc9xgmxk9gcs505m7wx6gx6ysdn418"))))
+ "1iz4skfs68jg2a59kfaxllf19mp9pk9mpfc2jh3vyas14c3l3zzj"))))
(properties `((upstream-name . "flowViz")))
(build-system r-build-system)
(propagated-inputs
@@ -18465,14 +18919,14 @@ statistics to the plot.")
(define-public r-flowclust
(package
(name "r-flowclust")
- (version "3.40.0")
+ (version "3.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowClust" version))
(sha256
(base32
- "1xg0hdxh0c1c1wc6d8gcynq8168hi61c3gjdf1223qvqwc39nsby"))))
+ "1zjjzn10nvbj7lhg9kvp8gr7m2m294pa3zdmajq65ffdynaaavnd"))))
(properties `((upstream-name . "flowClust")))
(build-system r-build-system)
(arguments
@@ -18499,14 +18953,14 @@ model with Box-Cox transformation.")
(define-public r-rprotobuflib
(package
(name "r-rprotobuflib")
- (version "2.14.1")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RProtoBufLib" version))
(sha256
(base32
- "015yaci2wimax2p772mndmy76qsj307rk4y71r5s8jcb0nwr0qg2"))))
+ "1vhp43l2iknljy240kzgvckkzbg186nkfdd1m3la9fnf9sqr33z9"))))
(properties `((upstream-name . "RProtoBufLib")))
(build-system r-build-system)
(arguments
@@ -18528,14 +18982,14 @@ for other R packages to compile and link against.")
(define-public r-flowworkspace
(package
(name "r-flowworkspace")
- (version "4.14.3")
+ (version "4.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowWorkspace" version))
(sha256
(base32
- "07hnzvzis6425j5kabdrp49wicd331k7kmkk2r7ydchxxlndz3ww"))))
+ "0k22hifg4sv0xiw983gf1d6y7zkn9072famwj72x47w8vag4i0xz"))))
(properties `((upstream-name . "flowWorkspace")))
(build-system r-build-system)
(propagated-inputs
@@ -18575,14 +19029,14 @@ matches the flowJo analysis.")
(define-public r-flowstats
(package
(name "r-flowstats")
- (version "4.14.1")
+ (version "4.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "flowStats" version))
(sha256
(base32
- "1q4m6arasq60w0x24qjxbfckfgcpfk428fca733i0q2mgv1mll05"))))
+ "0q8g3sqmbhinfrb63yhv4lsczjz7pqwhwwsdlz2cg7s8yhp0cj6v"))))
(properties `((upstream-name . "flowStats")))
(build-system r-build-system)
(propagated-inputs
@@ -18614,14 +19068,14 @@ package.")
(define-public r-opencyto
(package
(name "r-opencyto")
- (version "2.14.0")
+ (version "2.16.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "openCyto" version))
(sha256
(base32
- "12b4a65zgswzddkfdyl4j06qp7w9lkxv4h05m4z8hfff8c9x5bls"))))
+ "13ndjvm3l5pl1jgv7bqp78didqq3rx6br4p1ncqqp68mm048f2ll"))))
(properties `((upstream-name . "openCyto")))
(build-system r-build-system)
(propagated-inputs
@@ -18650,19 +19104,18 @@ sequential way to mimic the manual gating strategy.")
(define-public r-cytoml
(package
(name "r-cytoml")
- (version "2.14.0")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CytoML" version))
(sha256
(base32
- "0wq9ganas6l2jw8bnajr7vwli35kykpgv2lca4qh79nfgxlicff9"))))
+ "11kflx3yahl7xjl6x2rgpd4hl5y69qgarzhalmz4qdci7b7ln7kr"))))
(properties `((upstream-name . "CytoML")))
(build-system r-build-system)
(inputs
- (list libxml2 #;zlib
- ))
+ (list libxml2))
(propagated-inputs
(list r-bh
r-biobase
@@ -18695,14 +19148,14 @@ standard to exchange gated cytometry data with other software platforms.")
(define-public r-flowsom
(package
(name "r-flowsom")
- (version "2.10.0")
+ (version "2.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "FlowSOM" version))
(sha256
(base32
- "170xz3b4kfsxpqirfz9vk4j8dkdmz4qd0a1nm3yaya1rddpg9m3l"))))
+ "0xqrp184p00pvzzf6ddmp2r8lpg97bm0q6smjwcrfb8rn4msxmis"))))
(properties `((upstream-name . "FlowSOM")))
(build-system r-build-system)
(propagated-inputs
@@ -18731,14 +19184,14 @@ self-organizing map clustering and minimal spanning trees.")
(define-public r-mixomics
(package
(name "r-mixomics")
- (version "6.26.0")
+ (version "6.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mixOmics" version))
(sha256
(base32
- "0ifi89s611kblncnpvsrbl6sq2zi36binz63njrhya9wkyaxj6pc"))))
+ "03pdg2hz4wnyigqakb9098ak9ww8fhwypzn006hfad0s042p9wvj"))))
(properties `((upstream-name . "mixOmics")))
(build-system r-build-system)
(propagated-inputs
@@ -18777,18 +19230,19 @@ delete entire rows with missing data.")
(define-public r-depecher
(package ;Source/Weave error
(name "r-depecher")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DepecheR" version))
(sha256
(base32
- "1b3c1wg5xnhh4bdcjls26j6nsp0vx1g5y3grqv7x4ds01vmh3q2w"))))
+ "15lpn1p2p28lhmzi7svszr0p1zkyaivi69q8pxcrv4lvips38hk4"))))
(properties `((upstream-name . "DepecheR")))
(build-system r-build-system)
(propagated-inputs
(list r-beanplot
+ r-clusterr
r-collapse
r-dosnow
r-dplyr
@@ -18824,14 +19278,14 @@ data, to only emphasize the data that actually matters.")
(define-public r-rcistarget
(package
(name "r-rcistarget")
- (version "1.20.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RcisTarget" version))
(sha256
(base32
- "0dp2y85mfn995rvg698xnxlkz1kd8g0byjypxx62cpfldnkrinxl"))))
+ "1856jnvqacr12j5hnnl4w2abjjd7qvkz7cs8yhbnqpy1896wki0v"))))
(properties `((upstream-name . "RcisTarget")))
(build-system r-build-system)
(propagated-inputs
@@ -18846,7 +19300,8 @@ data, to only emphasize the data that actually matters.")
r-r-utils
r-s4vectors
r-summarizedexperiment
- r-tibble))
+ r-tibble
+ r-zoo))
(native-inputs
(list r-knitr))
(home-page "https://aertslab.org/#scenic")
@@ -18866,14 +19321,14 @@ genes in the gene-set that are ranked above the leading edge).")
(define-public r-chicago
(package
(name "r-chicago")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Chicago" version))
(sha256
(base32
- "1mcpx785ag0jcsh08df34hx3wp55zd1vggnl3fflkinb78178n38"))))
+ "05djywxsyfxb26d0clx51q7wmsw3rq56va444d6iy5n7xlhj9m94"))))
(properties `((upstream-name . "Chicago")))
(build-system r-build-system)
(propagated-inputs
@@ -18912,14 +19367,14 @@ expression space.")
(define-public r-cicero
(package
(name "r-cicero")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "cicero" version))
(sha256
(base32
- "19vn31w74r45pq5m9pn5db1sz1qg757mghzzs933cdssnqf4m6y5"))))
+ "0x5ly5hkqli5b67hiaa6ha02damyps7vb4l51p0az1j5fxl39n8r"))))
(build-system r-build-system)
(propagated-inputs
(list r-assertthat
@@ -18979,14 +19434,14 @@ accessibility data.")
(define-public r-circrnaprofiler
(package
(name "r-circrnaprofiler")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "circRNAprofiler" version))
(sha256
(base32
- "098fbrszph5cnh4n9zjhj92sg1bi6h6k57wm2vlaqkq0nab63r63"))))
+ "0gjnx4645kd7qag7dzs5dp9lhsv6zg5xn6jna3bap4mginl1jvxi"))))
(properties
`((upstream-name . "circRNAprofiler")))
(build-system r-build-system)
@@ -19114,14 +19569,14 @@ cisTopics and explore the nature and regulatory proteins driving them.")
(define-public r-genie3
(package
(name "r-genie3")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GENIE3" version))
(sha256
(base32
- "0bsid8qhcqgalqghr2b2592pzm4viyi7wq8h5dmhrrl7gky8l60k"))))
+ "0ijwyx42saqas52273c63c3yi948bh4pd4lifyqi3zjjs17bj1cg"))))
(properties `((upstream-name . "GENIE3")))
(build-system r-build-system)
(propagated-inputs
@@ -19138,14 +19593,14 @@ regulatory networks from expression data.")
(define-public r-roc
(package
(name "r-roc")
- (version "1.78.0")
+ (version "1.80.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ROC" version))
(sha256
(base32
- "12msc6skvcx4ajk20l71k32rj8lsiafjxwcsrd51kyy5x2yj2v4m"))))
+ "074c6jg0dyr3hckizpg56f8ij8szj43cx6x5bbw7a01xdjdc70yb"))))
(properties `((upstream-name . "ROC")))
(build-system r-build-system)
(native-inputs
@@ -19160,14 +19615,14 @@ Characteristic} (ROC) curves, with a focus on micro arrays.")
(define-public r-watermelon
(package
(name "r-watermelon")
- (version "2.8.0")
+ (version "2.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "wateRmelon" version))
(sha256
(base32
- "1ra21qzni9cny52ag9zxi46vb9grabyqjyk01dqqp3r9i0b4999l"))))
+ "19zlv9aglllsjq3jcnlw994bkanjdq0ib46k7wjsig04cx4apz1v"))))
(properties `((upstream-name . "wateRmelon")))
(build-system r-build-system)
(propagated-inputs
@@ -19198,14 +19653,14 @@ metrics, with methods for objects produced by the @code{methylumi} and
(define-public r-gdsfmt
(package
(name "r-gdsfmt")
- (version "1.38.0")
+ (version "1.40.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gdsfmt" version))
(sha256
(base32
- "03qgiww523kijrkciln3fw3djn20rnvwz2j0i3p518h6fbl7vlpm"))
+ "0m5ws1qnbx7a3vj8bd9ggqi5w4icgzd5zi60qcy942j6zv4sswig"))
(modules '((guix build utils)))
;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build
;; them and link with system libraries instead.
@@ -19256,14 +19711,14 @@ with multiple R processes supported by the package @code{parallel}.")
(define-public r-bigmelon
(package
(name "r-bigmelon")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bigmelon" version))
(sha256
(base32
- "1j80f7k39p23s6fym3nia73g8d1v44hdiv73igcq6fnsllxg40hr"))))
+ "0fa1dwbk6hdiwg6dmbks7hy4cg3ydyd2sv94cyl0003awhf00nn9"))))
(properties `((upstream-name . "bigmelon")))
(build-system r-build-system)
(propagated-inputs
@@ -19333,14 +19788,14 @@ format.")
(define-public r-wavcluster
(package
(name "r-wavcluster")
- (version "2.36.0")
+ (version "2.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "wavClusteR" version))
(sha256
(base32
- "1y2bk1kla0l72xgdam2l9c0k7584ckdqscqnc184cxvqm6fb335j"))))
+ "0yr4jfaxs253xg5q0kds8fm97kqacx67pw1c80yx2w79v7nqskgv"))))
(properties `((upstream-name . "wavClusteR")))
(build-system r-build-system)
(propagated-inputs
@@ -19380,13 +19835,13 @@ procedures that induce nucleotide substitutions (e.g. BisSeq).")
(define-public r-tilingarray
(package
(name "r-tilingarray")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tilingArray" version))
(sha256
(base32
- "01j4wj0mdfrlyhp2alf1xfy78f17x43w9i0wb41ljw6pm313np58"))))
+ "1408275gvfilc2k8sfsja8bm5fdgnblf2sf5wdd3if51qi61clb0"))))
(properties `((upstream-name . "tilingArray")))
(build-system r-build-system)
(propagated-inputs
@@ -19462,14 +19917,14 @@ provides methods for retrieving enriched pathways.")
(define-public r-variantfiltering
(package
(name "r-variantfiltering")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "VariantFiltering" version))
(sha256
(base32
- "01czx88dzqm8qv44kyy1n7b999wgfklxzgvmjh10chf677phnzsr"))))
+ "14kxlzgy71s8h34galx93q8kalspr1m23brssbr3wha0hxb0ghgd"))))
(properties
`((upstream-name . "VariantFiltering")))
(build-system r-build-system)
@@ -19509,14 +19964,14 @@ populations, splice site strength, conservation, etc.")
(define-public r-variancepartition
(package
(name "r-variancepartition")
- (version "1.32.5")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "variancePartition" version))
(sha256
(base32
- "1yrss51gwg73rlva0xhk34md0cx43h2j4vfk0z2hzchr2r1amzmc"))))
+ "00hrizpx05jfh7yrab6na10zkahm8ibrbxy4pa4dcldw65klqmn9"))))
(properties
`((upstream-name . "variancePartition")))
(build-system r-build-system)
@@ -19588,13 +20043,13 @@ features (e.g. genes, microRNAs).")
(define-public r-ucell
(package
(name "r-ucell")
- (version "2.6.2")
+ (version "2.8.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "UCell" version))
(sha256
(base32
- "00v4b91f7y3zyndbl4wlfay8wljnqypfc05vrw15yr62d9smd35d"))))
+ "09r64rrydwgvvvq8f5vzvn7dsh24l9sa1if21wcimrl28ci1g1mv"))))
(properties `((upstream-name . "UCell")))
(build-system r-build-system)
(propagated-inputs (list r-biocneighbors
@@ -19616,6 +20071,32 @@ UCell can be applied to any single-cell data matrix, and includes functions to
directly interact with SingleCellExperiment and Seurat objects.")
(license license:gpl3)))
+(define-public r-ucsc-utils
+ (package
+ (name "r-ucsc-utils")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "UCSC.utils" version))
+ (sha256
+ (base32 "0w9f5xd6ryniapbpcrpczn8wimph2154w45cvdgqfa3dv5qy379l"))))
+ (properties `((upstream-name . "UCSC.utils")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-httr r-jsonlite r-s4vectors))
+ (native-inputs (list r-knitr))
+ (home-page "https://bioconductor.org/packages/UCSC.utils")
+ (synopsis
+ "Low-level utilities to retrieve data from the UCSC Genome Browser")
+ (description
+ "This package provides a set of low-level utilities to retrieve data from the
+UCSC Genome Browser. Most functions in the package access the data via the UCSC
+REST API but some of them query the UCSC @code{MySQL} server directly. Note
+that the primary purpose of the package is to support higher-level
+functionalities implemented in downstream packages like @code{GenomeInfoDb} or
+txdbmaker.")
+ (license license:artistic2.0)))
+
(define-public r-unifiedwmwqpcr
(package
(name "r-unifiedwmwqpcr")
@@ -19643,14 +20124,14 @@ data.")
(define-public r-universalmotif
(package
(name "r-universalmotif")
- (version "1.20.0")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "universalmotif" version))
(sha256
(base32
- "0wy7zplypjiqv4wjq0l30xb5xj63fxb7z2wmmfrmzfkbgbm0xyha"))))
+ "12svaygg47j5smay57j5lkxj8llky1fm4s8ni0nzikq5a9j47w5y"))))
(properties
`((upstream-name . "universalmotif")))
(build-system r-build-system)
@@ -19692,13 +20173,13 @@ motifs, and others.")
(define-public r-ace
(package
(name "r-ace")
- (version "1.20.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ACE" version))
(sha256
(base32
- "0ll0lksz6nzfj5ivmyrp5w24bhfl083amjpr0m8qlzpdw6k3wi98"))))
+ "1gpn9z09cfcy2mj7m32xfb2bjjwl01g9qn9nqaivmqbi4k6icrr8"))))
(properties `((upstream-name . "ACE")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-genomicranges r-ggplot2 r-qdnaseq))
@@ -19721,13 +20202,13 @@ of @dfn{tumor cells} (cells with divergent segments).")
(define-public r-acgh
(package
(name "r-acgh")
- (version "1.80.0")
+ (version "1.82.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "aCGH" version))
(sha256
(base32
- "1qckqdil1cq8lbrj9di96w9934r1fp48xpmfdwp4f2vw9pjadi1q"))))
+ "00dcx6kcqq5xcdy7rqgi51cvc20dsgrrki8aicbj1icx0m6601wa"))))
(properties `((upstream-name . "aCGH")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-cluster r-multtest r-survival))
@@ -19745,13 +20226,13 @@ printing and plotting @code{aCGH} objects.")
(define-public r-acme
(package
(name "r-acme")
- (version "2.58.0")
+ (version "2.60.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ACME" version))
(sha256
(base32
- "0cy1f4ki4j7yxc9cws5s17ljd4ac0yxhijms0pm31im81qz2djax"))))
+ "0jak83dlavhczaa2nqk5g2l0h4grnc9v24bg6v9mjfn6bqhl1s7j"))))
(properties `((upstream-name . "ACME")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-biocgenerics))
@@ -19772,13 +20253,13 @@ on whole-genome tiling array experiments quite easily with enough memory.")
(define-public r-acde
(package
(name "r-acde")
- (version "1.32.0")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "acde" version))
(sha256
(base32
- "1rqyjj4lgqxs372qx8p3qx2napww0djh4jz8hzgv86x9r202kk9p"))))
+ "1h3drjxdmd837hc7l1xk6b4ha39i7bqkb8862h4h6s5rfa7dcc50"))))
(properties `((upstream-name . "acde")))
(build-system r-build-system)
(propagated-inputs (list r-boot))
@@ -19837,14 +20318,14 @@ using whole genome sequencing data.")
(define-public r-activepathways
(package
(name "r-activepathways")
- (version "2.0.3")
+ (version "2.0.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "ActivePathways" version))
(sha256
(base32
- "0mgvxpqaq0jncr1kzmwhqkv3pajx2fz6vwhv5arw7fgla6w09p9h"))))
+ "098p21g7rm3q03wifg0zb71ldg3dyqp3iwhqmg3ci9r73dl4agjh"))))
(properties
`((upstream-name . "ActivePathways")))
(build-system r-build-system)
@@ -19898,14 +20379,14 @@ gene expression.")
(define-public r-bgx
(package
(name "r-bgx")
- (version "1.68.3")
+ (version "1.70.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bgx" version))
(sha256
(base32
- "1a3hq2i1mxf6dpkk82b6y88q5fcjbqpdcxqplkfp5d2slzsqc3jp"))))
+ "0sglk8q12fvqk6m699v3lajwr1zb8wnrldfv2n8y7jjy2fqcvs19"))))
(properties `((upstream-name . "bgx")))
(build-system r-build-system)
(arguments
@@ -19934,14 +20415,14 @@ Affymetrix GeneChips.")
(define-public r-bhc
(package
(name "r-bhc")
- (version "1.54.0")
+ (version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BHC" version))
(sha256
(base32
- "1m289q9bs7i7d15g5mzdmzw7yppnqspr8illkya8kxlv1i2sify1"))))
+ "1fam1k42dwd0gh7dw2gz4yl6bnbkfrw0bd44v8sdpvwwyd1dq1r8"))))
(properties `((upstream-name . "BHC")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/BHC/")
@@ -19960,14 +20441,14 @@ algorithm which is more efficient for larger data sets.")
(define-public r-bicare
(package
(name "r-bicare")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BicARE" version))
(sha256
(base32
- "10inwxl1cmkdp8037wcwkj5wzxsrrcysxfbqhnkh7pzhzvwnzz9h"))))
+ "0397xg4sj988b0chzfpy23dszpjbdkch59wfynbn4pwyvl0qmp9j"))))
(properties `((upstream-name . "BicARE")))
(build-system r-build-system)
(propagated-inputs
@@ -19982,14 +20463,14 @@ results.")
(define-public r-bifet
(package
(name "r-bifet")
- (version "1.22.0")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiFET" version))
(sha256
(base32
- "056zqlql39q44snvx5nzc5snrihpr1kj3jdbpbb401hxi9r64f4r"))))
+ "148j41mawxvzyal9lfjy7h1gp0w8zwmgc7s32wiqa30qjcc82snx"))))
(properties `((upstream-name . "BiFET")))
(build-system r-build-system)
(propagated-inputs
@@ -20011,14 +20492,14 @@ the read count and GC content bias.")
(define-public r-rsbml
(package
(name "r-rsbml")
- (version "2.60.0")
+ (version "2.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "rsbml" version))
(sha256
(base32
- "0pvj0qgc6hd02g9ppfc610gvfn412rw69rxh43y4dr3n894kdm2i"))))
+ "02pmxg0ppy1asjscp13kmqyj2phw4q138fj2b3xgmcagwxqzb4bs"))))
(properties `((upstream-name . "rsbml")))
(build-system r-build-system)
(inputs
@@ -20037,13 +20518,13 @@ validating output, provides an S4 SBML DOM, converts SBML to R graph objects.")
(define-public r-hybridmtest
(package
(name "r-hybridmtest")
- (version "1.46.0")
+ (version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "HybridMTest" version))
(sha256
- (base32 "1jkihcad453d7jqb78fl03yfqz169jz75c40y53569ndp2j4rg71"))))
+ (base32 "0fh0v29fpwzramqnbxmzpmgiziwswdx38734g2lx303b0blkbv7j"))))
(properties `((upstream-name . "HybridMTest")))
(build-system r-build-system)
(propagated-inputs
@@ -20068,14 +20549,14 @@ then the law of total EBPs.")
(define-public r-hypergraph
(package
(name "r-hypergraph")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "hypergraph" version))
(sha256
(base32
- "16bjjfzcndjfqsywzw2cn551fgqlnll2gi975w0qqxhkh3jssgmi"))))
+ "12g33rw1qy1ij32k87qrw04pak20p8z04mch9lxjy5yrj5k5x812"))))
(properties `((upstream-name . "hypergraph")))
(build-system r-build-system)
(propagated-inputs
@@ -20090,14 +20571,14 @@ manipulating hypergraphs.")
(define-public r-hyperdraw
(package
(name "r-hyperdraw")
- (version "1.54.0")
+ (version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "hyperdraw" version))
(sha256
(base32
- "1lgfpw9f7095lgk46gdpxq3z52c24xw4ajl7yid3pcgw19bfcgk5"))))
+ "104xwij9vq5gwq4ml7fnhsp4apcldbgxmhppwklg6zqdfixpmig5"))))
(properties `((upstream-name . "hyperdraw")))
(build-system r-build-system)
(inputs (list graphviz))
@@ -20112,14 +20593,14 @@ manipulating hypergraphs.")
(define-public r-biggr
(package
(name "r-biggr")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiGGR" version))
(sha256
(base32
- "1pdsxkh9fkgn80f7p21902pb6xp2qafq10p29ifb55qwz8gma2ff"))))
+ "1ja5j9753rgx61jwkax0mzkxh7ybh3m4ampkr5ikw3afda23wg1z"))))
(properties `((upstream-name . "BiGGR")))
(build-system r-build-system)
(propagated-inputs
@@ -20219,13 +20700,13 @@ visualizing RNA-sequencing datasets and differentially expressed genes.")
(define-public r-chemmineob
(package
(name "r-chemmineob")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChemmineOB" version))
(sha256
- (base32 "0mfajzwzldmra6g5kni5yw7m2n719456p1vd3hxx2r7l1phdjixi"))))
+ (base32 "17yvmdg16pb1dmx160n6vcgw3sa1yf40f8yzivdyic3sckn4z4bw"))))
(properties `((upstream-name . "ChemmineOB")))
(build-system r-build-system)
(arguments
@@ -20260,14 +20741,14 @@ add-on package rather than used directly.")
(define-public r-chemminer
(package
(name "r-chemminer")
- (version "3.54.0")
+ (version "3.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChemmineR" version))
(sha256
(base32
- "1328mwmghflrvir1i3crlq8q36wq60x2an11saabg63hnx4paa81"))))
+ "1252xy33bgjrd4gh4shrgzklgxry2lf67svzxjra5yckf8am0rdc"))))
(properties `((upstream-name . "ChemmineR")))
(build-system r-build-system)
(propagated-inputs
@@ -20303,13 +20784,13 @@ structures.")
(define-public r-fmcsr
(package
(name "r-fmcsr")
- (version "1.44.0")
+ (version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "fmcsR" version))
(sha256
- (base32 "17il9mi1iagl474ia1lz0ajx1wq67jw5famkr1fmjlis8ymw8hnd"))))
+ (base32 "080src34jwkvbk98pa4ri530l9gi4ibr5mwxib1681np0cfal54g"))))
(properties `((upstream-name . "fmcsR")))
(build-system r-build-system)
(propagated-inputs
@@ -20332,14 +20813,14 @@ searching and clustering.")
(define-public r-bioassayr
(package
(name "r-bioassayr")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bioassayR" version))
(sha256
(base32
- "1mm1nzdz9cl8mf33yiyaspqkx4sbqhhs6m9jfgl42fhscrhaxfsi"))))
+ "0rckhgg73cgz0ppqaywc7nvbnp1is6cyjfa7dn2l32xxrcl57pq6"))))
(properties `((upstream-name . "bioassayR")))
(build-system r-build-system)
(propagated-inputs
@@ -20367,14 +20848,14 @@ available bioactivity data.")
(define-public r-biobroom
(package
(name "r-biobroom")
- (version "1.34.0")
+ (version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biobroom" version))
(sha256
(base32
- "1ivclipy2igf8ax7f0pqrcqflcm7h0a8ny6nfa0200vp99an8ymf"))))
+ "0flj14d8aamr1fzcpd0k7jq5rs0j5dsijpahg066qrnapn5990d0"))))
(properties `((upstream-name . "biobroom")))
(build-system r-build-system)
(propagated-inputs
@@ -20396,14 +20877,14 @@ visualize bioinformatics analyses.")
(define-public r-graphite
(package
(name "r-graphite")
- (version "1.48.0")
+ (version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "graphite" version))
(sha256
(base32
- "1h8j10jx02zsxs6rzids3gy4xchdhgzkifa5grrfbn8faf9ycy2n"))))
+ "1xymgghgj4r1k9i73zqgava79l0djz945jnl5ad193flv13fpdgs"))))
(properties `((upstream-name . "graphite")))
(build-system r-build-system)
(propagated-inputs
@@ -20420,14 +20901,14 @@ symbols).")
(define-public r-reactomepa
(package
(name "r-reactomepa")
- (version "1.46.0")
+ (version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ReactomePA" version))
(sha256
(base32
- "0kflwlmyckyivr8xh7fsmpl7jfkq5kavwpkswmvdfqckbd0n9xsc"))))
+ "0i5jrdzg6zcs1jx0lryq8d467lxi1hvd1x6p74ywwxga88p46zk6"))))
(properties `((upstream-name . "ReactomePA")))
(build-system r-build-system)
(propagated-inputs
@@ -20453,14 +20934,14 @@ enrichment analysis and several functions for visualization.")
(define-public r-ebarrays
(package
(name "r-ebarrays")
- (version "2.66.0")
+ (version "2.68.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "EBarrays" version))
(sha256
(base32
- "1m8dy1lmx9m8p5jjk0i7yllb4pvq77kynszk1nz8cc1niz6xs47q"))))
+ "17ym1y90bz85afanggdjf91a49lz89qmmi2kyhxga0cw056lkdz0"))))
(properties `((upstream-name . "EBarrays")))
(build-system r-build-system)
(propagated-inputs
@@ -20475,13 +20956,13 @@ microarray data.")
(define-public r-biocbaseutils
(package
(name "r-biocbaseutils")
- (version "1.4.0")
+ (version "1.6.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocBaseUtils" version))
(sha256
(base32
- "189jz8krhv0vdnk47m3cmy95zfg3l328w6dbhg6djvlkca17i275"))))
+ "0f8bzhpi6xla52sbvpd20sgli7mp5xfk2aqpcv6jkf8s59jsmn54"))))
(properties `((upstream-name . "BiocBaseUtils")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -20519,13 +21000,13 @@ monograph.")
(define-public r-bioccheck
(package
(name "r-bioccheck")
- (version "1.38.2")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocCheck" version))
(sha256
(base32
- "1pkh7b27ynzpdfvyzqg36jm885r5lf2zw9rppdpj31rcv1640s0k"))))
+ "0rvr68d5anir7bj913nxwwfj7i3h2dvadcfvjjdbdr3m35wyx1g8"))))
(properties
`((upstream-name . "BiocCheck")))
(build-system r-build-system)
@@ -20552,14 +21033,14 @@ checks on R packages that are to be submitted to the Bioconductor repository.")
(define-public r-biocgraph
(package
(name "r-biocgraph")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biocGraph" version))
(sha256
(base32
- "1yy0bwvfa5b531jvmbiwrd4xg8cdvrgwr8l6bxasrh6yrbv8drml"))))
+ "0ji6pa8wfj57drpnp03vgas1pird84g15nnp6469jmx773izhfq0"))))
(properties `((upstream-name . "biocGraph")))
(build-system r-build-system)
(propagated-inputs
@@ -20574,13 +21055,13 @@ different graph related packages produced by Bioconductor.")
(define-public r-biocstyle
(package
(name "r-biocstyle")
- (version "2.30.0")
+ (version "2.32.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocStyle" version))
(sha256
(base32
- "17pkdi3vn62pw1nzmgz0i45czynqjchq078ij8v1xvflg6lf7flw"))))
+ "1m0nn2m548726w576mx8mx29xj428q1rkpn7z7a7m8kzgcvvgkkr"))))
(properties
`((upstream-name . "BiocStyle")))
(build-system r-build-system)
@@ -20598,13 +21079,13 @@ functionality.")
(define-public r-biocviews
(package
(name "r-biocviews")
- (version "1.70.0")
+ (version "1.72.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "biocViews" version))
(sha256
(base32
- "0fpka47shrxcbc1k057f5zv79406daic0y34v8p5lsvxbgzh0m8b"))))
+ "10j9s50ppfx8r752wkabls0n4gxp17z7dnaf352f3dcdbfa8ijh5"))))
(properties
`((upstream-name . "biocViews")))
(build-system r-build-system)
@@ -20627,14 +21108,14 @@ also known as views, in a controlled vocabulary.")
(define-public r-experimenthub
(package
(name "r-experimenthub")
- (version "2.10.0")
+ (version "2.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ExperimentHub" version))
(sha256
(base32
- "1prl24sg5l142155z3iaxrvig2wv2xqajq02nj30jjjih4p4936w"))))
+ "0mj1aqxyp84mn5m0fwk9lijysy594hhga3kv4mddv45vqxdsr08h"))))
(properties `((upstream-name . "ExperimentHub")))
(build-system r-build-system)
(propagated-inputs
@@ -20660,13 +21141,13 @@ access.")
(define-public r-experimenthubdata
(package
(name "r-experimenthubdata")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ExperimentHubData" version))
(sha256
- (base32 "0msg3wpz1ppvwc4dsm9bz9h4y4hz67xr1xwp4vv4100sg0i5v9jn"))))
+ (base32 "1adm3b0nacbdi4x5z71iiif9d876m3ip6crhbbr2hw4mbk6is7qn"))))
(properties `((upstream-name . "ExperimentHubData")))
(build-system r-build-system)
(propagated-inputs (list r-annotationhubdata
@@ -20688,14 +21169,14 @@ db and resource files to AWS S3 buckets.")
(define-public r-grohmm
(package
(name "r-grohmm")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "groHMM" version))
(sha256
(base32
- "15ibdbpj7vqypxfnp2w06w9lync11z3azzss6s97xhadkgsbw4vq"))))
+ "1vmck9ridjjk22477sv8wx0x7n5irrsaf6nsh9lm3krk4i3iv715"))))
(properties `((upstream-name . "groHMM")))
(build-system r-build-system)
(propagated-inputs
@@ -20715,14 +21196,14 @@ db and resource files to AWS S3 buckets.")
(define-public r-multiassayexperiment
(package
(name "r-multiassayexperiment")
- (version "1.28.0")
+ (version "1.30.3")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MultiAssayExperiment" version))
(sha256
(base32
- "0dmhqymh800mljcpdf817nbyg20czp8y9bg13p3r4bfj6axxckch"))))
+ "0spws2kawf5rqhp5h5wi46sa07c2yhhnjhdxpmxz8gkvqsvdjqkp"))))
(properties
`((upstream-name . "MultiAssayExperiment")))
(build-system r-build-system)
@@ -20752,14 +21233,14 @@ rownames.")
(define-public r-bioconcotk
(package
(name "r-bioconcotk")
- (version "1.22.2")
+ (version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocOncoTK" version))
(sha256
(base32
- "0yx32yj9bw78nhbv1yvgs26sxdmnava1a89g9hs4ai26c1hy150s"))))
+ "0h4cr7lrmbyx7kdj81s7ff75svr01rvzn54svqi93vjilawmpbm3"))))
(properties `((upstream-name . "BiocOncoTK")))
(build-system r-build-system)
(propagated-inputs
@@ -20798,14 +21279,14 @@ tools for genome-scale analysis of cancer studies.")
(define-public r-biocor
(package
(name "r-biocor")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BioCor" version))
(sha256
(base32
- "0710dl05hs590fimp3dhg5hzvk6s79i0kwk6w6sj59pcawx2l6il"))))
+ "0jpi51f9cv3sv4l69974bba8c8k0inb6zxviv7i907ldaiiblr07"))))
(properties `((upstream-name . "BioCor")))
(build-system r-build-system)
(propagated-inputs
@@ -20825,14 +21306,14 @@ gene selection, testing relationships, and so on.")
(define-public r-biocpkgtools
(package
(name "r-biocpkgtools")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocPkgTools" version))
(sha256
(base32
- "0swi6xiads31xcndc2cfzh0ivdl0wc88s83s1p1gxh51rgmgkb14"))
+ "1nbzr1yjz65r0y8c312hnvagnc1pdgda4v6sxbpvlkl3z93jsy6x"))
(snippet
'(for-each delete-file
'("inst/htmlwidgets/lib/bioc_explore/bootstrap.min.js"
@@ -20939,14 +21420,14 @@ analytics on packages.")
(define-public r-biocset
(package
(name "r-biocset")
- (version "1.16.1")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocSet" version))
(sha256
(base32
- "1qmi6b0hrfzj7ixcbxlsxyy3qg7d2qrq8jcjrjrgfyrgcfws46qd"))))
+ "1r1if1k7qgni3dk7gsl4vcyvd6hnhx94rcq5yi9w7dvyyrbvnwwa"))))
(properties `((upstream-name . "BiocSet")))
(build-system r-build-system)
(propagated-inputs
@@ -20977,14 +21458,14 @@ accessing web references for elements/sets are also available in BiocSet.")
(define-public r-biocworkflowtools
(package
(name "r-biocworkflowtools")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocWorkflowTools" version))
(sha256
(base32
- "0mh7lsiprshq56ns3b8pbv1j1mjcbdzqydvli0ynmvf5smn2j4m5"))))
+ "1gw0lmdhkzp5ar54yv9jagqmpxp7j9ajfmdqb2y2qrnhh39hymzs"))))
(properties
`((upstream-name . "BiocWorkflowTools")))
(build-system r-build-system)
@@ -21010,14 +21491,14 @@ Rmarkdown and LaTeX documents when authoring a Bioconductor Workflow.")
(define-public r-biodist
(package
(name "r-biodist")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bioDist" version))
(sha256
(base32
- "0ngpysb89wag4wvcq83ddjxhy1zhl32b2fy2fg5laa4g8xfrqaxz"))))
+ "1yxr5df1y8v5c9imh27j86s7g9wjvi51j2wyn8jgma875mad41hq"))))
(properties `((upstream-name . "bioDist")))
(build-system r-build-system)
(propagated-inputs
@@ -21032,14 +21513,14 @@ distance measures.")
(define-public r-pcatools
(package
(name "r-pcatools")
- (version "2.14.0")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "PCAtools" version))
(sha256
(base32
- "18rzv4kldjmm2zvz9pzrpspig2hy6mcvb45hgmw49ba4jdcxh31s"))))
+ "04a1fvwgqxzf7992lyh9qzz2z2fgmfwfjvpw5xr21pcrpas57l2r"))))
(properties `((upstream-name . "PCAtools")))
(build-system r-build-system)
(propagated-inputs
@@ -21078,14 +21559,14 @@ dimensional mass cytometry data.")
(define-public r-rgreat
(package
(name "r-rgreat")
- (version "2.4.0")
+ (version "2.6.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "rGREAT" version))
(sha256
(base32
- "09fvmfiavawfwbxaj1585l2n00fibx9z3r17dv06hc6b40a1sa12"))))
+ "0sszyfnnzzn5xhs39zgkzr7f3da820nxr6qaw68wknblgmyyddi8"))))
(properties `((upstream-name . "rGREAT")))
(build-system r-build-system)
(propagated-inputs
@@ -21124,14 +21605,14 @@ user's input and automatically retrieving results from GREAT web server.")
(define-public r-m3c
(package
(name "r-m3c")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "M3C" version))
(sha256
(base32
- "0q6npc5pglmhzm9270pi11kbp5wg3ncvflp4rhv3w778qza2zlk1"))))
+ "1h3zxb3m68lq37g25zqxpmk2c9yrdhydyhh7ad2d30hif73qiacm"))))
(properties `((upstream-name . "M3C")))
(build-system r-build-system)
(propagated-inputs
@@ -21157,14 +21638,14 @@ hypothesis @code{K=1}.")
(define-public r-icens
(package
(name "r-icens")
- (version "1.74.0")
+ (version "1.76.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Icens" version))
(sha256
(base32
- "0fz66bchf41jzgabs1s8drpi3f7g27lid5g50lxwh6ph3i02cpaw"))))
+ "16bblkxp8pj7qaxfzmp30lfj8vy13d3q8cf5y0g40lk4rbldx3bz"))))
(properties `((upstream-name . "Icens")))
(build-system r-build-system)
(propagated-inputs
@@ -21280,14 +21761,14 @@ generated.")
(define-public r-preprocesscore
(package
(name "r-preprocesscore")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "preprocessCore" version))
(sha256
(base32
- "15fy3vwnjx6rwrkhbwxyvdykkfdis8c0m18x6y7irvyij9lm6x1y"))))
+ "1cd91iakbpf2hjysc44sqqrah63cgq4fz3n8j81virfwl3ir95xm"))))
(properties
`((upstream-name . "preprocessCore")))
(build-system r-build-system)
@@ -21301,13 +21782,13 @@ routines.")
(define-public r-s4arrays
(package
(name "r-s4arrays")
- (version "1.2.1")
+ (version "1.4.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "S4Arrays" version))
(sha256
(base32
- "1z6kcgjb5fzslr02vmsvchbilrhwpgh1ghk1zmlq0h0lyzncaapd"))))
+ "0wdzp1q6hyks4afm217yl2n770jsqaqxix71imni1r0qbxdfkdwl"))))
(properties `((upstream-name . "S4Arrays")))
(build-system r-build-system)
(propagated-inputs
@@ -21338,13 +21819,13 @@ array-like semantic. It also provides:
(define-public r-s4vectors
(package
(name "r-s4vectors")
- (version "0.40.2")
+ (version "0.42.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "S4Vectors" version))
(sha256
(base32
- "10lryil0psfyal0006rbhj0dbxyn8f7mpp11h758zc217cxsdnac"))))
+ "080fr8f4lqzvn73y50wgz19w0a0hvkd9ilwswmv5gi34sihp8795"))))
(properties
`((upstream-name . "S4Vectors")))
(build-system r-build-system)
@@ -21406,14 +21887,14 @@ data manipulation and visualization.")
(define-public r-rgraphviz
(package
(name "r-rgraphviz")
- (version "2.46.0")
+ (version "2.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rgraphviz" version))
(sha256
(base32
- "03l6yr76inv4fivy10g0h2qafgywrcjnnhs694lwqz1y6r0gm1sy"))))
+ "09i174a867vqyb6677sj88lk6bpfc4ajsmjgjkd7f7q66j46q655"))))
(properties `((upstream-name . "Rgraphviz")))
(build-system r-build-system)
(arguments
@@ -21444,13 +21925,13 @@ objects from the @code{graph} package.")
(define-public r-fishpond
(package
(name "r-fishpond")
- (version "2.8.0")
+ (version "2.10.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "fishpond" version))
(sha256
(base32
- "04vl4cp0izghm7h4xk7x48lqkq0dpl47dkd068lva33jygwwpvcz"))))
+ "02lzx8whxd3z4k0saf0vaq4np8lag00nkp3hd6da1w91vczs1kjl"))))
(properties `((upstream-name . "fishpond")))
(build-system r-build-system)
(propagated-inputs
@@ -21480,13 +21961,13 @@ working with Salmon and Alevin quantification files.")
(define-public r-fithic
(package
(name "r-fithic")
- (version "1.28.0")
+ (version "1.30.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "FitHiC" version))
(sha256
(base32
- "0ygcq3xi55swsmysn539cr3m504rfb6zm30w747pa46r63dfjda7"))))
+ "107hm9k9wfr34fradldmjym2bzxb6qx8109p4a7xrqkiya0hmwwa"))))
(properties `((upstream-name . "FitHiC")))
(build-system r-build-system)
(propagated-inputs
@@ -21504,13 +21985,13 @@ assays such as Hi-C.")
(define-public r-hitc
(package
(name "r-hitc")
- (version "1.46.0")
+ (version "1.48.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "HiTC" version))
(sha256
(base32
- "16svq29fm9xl3rl9v6lyxf564manvp8ryxj1mbxc4pb360wmi780"))))
+ "0nxk3rdfw78bwyxjd3bbm093i8hqyk63rz0fvx3fi04qpa1fv39r"))))
(properties `((upstream-name . "HiTC")))
(build-system r-build-system)
(propagated-inputs
@@ -21533,18 +22014,18 @@ provided.")
(define-public r-hdf5array
(package
(name "r-hdf5array")
- (version "1.30.1")
+ (version "1.32.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "HDF5Array" version))
(sha256
(base32
- "17cjjlgbp5kj0cpjm6915wy4cm6h5wl6d59j4na1s6kvgxx95qd0"))))
+ "1cfm15zwfp1gxgrkknyvdaqb5fm27s2nyjrhxwkrbn32yfdrgdnz"))))
(properties `((upstream-name . "HDF5Array")))
(build-system r-build-system)
(inputs
- (list zlib))
+ (list))
(propagated-inputs
(list r-biocgenerics
r-delayedarray
@@ -21565,14 +22046,14 @@ block processing.")
(define-public r-rhdf5lib
(package
(name "r-rhdf5lib")
- (version "1.24.2")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version))
(sha256
(base32
- "0b2g57dxvzmnq6dig4dz7cy8lpy3q7fih5q643i5xjcds2cj6lk5"))
+ "0q4ix3nzr69pmwm6vdna51yxlqi8frch0xyv6wmiy35n67d4fcab"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -21646,14 +22127,14 @@ packages.")
(define-public r-beachmat
(package
(name "r-beachmat")
- (version "2.18.1")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "beachmat" version))
(sha256
(base32
- "1kz8jn3kaqrhvk1dd92l7w45mmwabcqb0508fv4i4w307ja8xk2l"))))
+ "0gvxz9w2mi8scqyyhhnrasscs7hwvxxlqvh7j9m6akpi8qq91v6y"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics r-delayedarray r-matrix r-rcpp r-sparsearray))
@@ -21669,13 +22150,13 @@ matrices.")
(define-public r-beadarray
(package
(name "r-beadarray")
- (version "2.52.0")
+ (version "2.54.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "beadarray" version))
(sha256
(base32
- "0qwka7549mlv2x80bjrzdsy4a6h35yxrhj2cxss9aigwsbjb7sjr"))))
+ "0yda6maj985k374bh6zkrs8qffw1jrz9gc3mja07ibyn4pvzkclq"))))
(properties `((upstream-name . "beadarray")))
(build-system r-build-system)
(propagated-inputs (list r-annotationdbi
@@ -21722,13 +22203,13 @@ performs copy number calculations and reports.")
(define-public r-beaddatapackr
(package
(name "r-beaddatapackr")
- (version "1.54.0")
+ (version "1.56.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BeadDataPackR" version))
(sha256
(base32
- "0sfpdpw6qqffzb9skzx9w1ggcixc3wry9c6f2kwpsykbdsnk90xz"))))
+ "0wz3prri0mfjczmb432faxfjc99wg4lq26l3a60rmxyxq8mcnpkv"))))
(properties `((upstream-name . "BeadDataPackR")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -21745,13 +22226,13 @@ decompression of raw bead-level data from the Illumina BeadArray platform.")
(define-public r-cner
(package
(name "r-cner")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CNEr" version))
(sha256
- (base32 "0kpz15l3yz26s2kskxk4093313c7vwi131y24wbpcdahicpqys2m"))))
+ (base32 "19kfh7p8zlb1nbwpsj6i1b7pqy829dij7n7iavznhxw44cmif6sv"))))
(properties `((upstream-name . "CNEr")))
(build-system r-build-system)
(inputs (list zlib))
@@ -21768,6 +22249,7 @@ decompression of raw bead-level data from the Illumina BeadArray platform.")
r-iranges
r-keggrest
r-powerlaw
+ r-pwalign
r-r-utils
r-readr
r-reshape2
@@ -21793,14 +22275,14 @@ advanced visualization of sets of conserved noncoding elements.")
(define-public r-tfbstools
(package
(name "r-tfbstools")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TFBSTools" version))
(sha256
(base32
- "18msr889nygk1c3wsjxc9bv989zakkl9f1h2a6cnfy8rxhbxpvwq"))))
+ "0bmmsgmx7159bdrflykkis0v4z1ixwlnmw1kx0y0kw15lw3cjnsh"))))
(properties `((upstream-name . "TFBSTools")))
(build-system r-build-system)
(propagated-inputs
@@ -21817,6 +22299,7 @@ advanced visualization of sets of conserved noncoding elements.")
r-genomicranges
r-gtools
r-iranges
+ r-pwalign
r-rsqlite
r-rtracklayer
r-s4vectors
@@ -21839,13 +22322,13 @@ provides a wrapper of de novo motif discovery software.")
(define-public r-maftools
(package
(name "r-maftools")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "maftools" version))
(sha256
- (base32 "025wlqnx13ldzyrf72mrfj492d62i4xyjbhpmgavgld0jwfmr3ga"))))
+ (base32 "0c2sf8l1wfgz3nh9ccm10y9wwh7rv55r09awavqlrr9glcbblp32"))))
(properties `((upstream-name . "maftools")))
(build-system r-build-system)
(propagated-inputs
@@ -21868,14 +22351,14 @@ customizable visualzations with minimal effort.")
(define-public r-motifmatchr
(package
(name "r-motifmatchr")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "motifmatchr" version))
(sha256
(base32
- "13kkg9xpyvgqpsaz5f96pd43i8a45jrbnzqmax793zkv4ai8p16j"))))
+ "1wpvdg5x51cbzpqa4s2s0zl9h7fsrsp87mxxlhxs65zx6yyfj2xl"))))
(properties `((upstream-name . "motifmatchr")))
(build-system r-build-system)
(propagated-inputs
@@ -21902,13 +22385,13 @@ This package wraps C++ code from the MOODS motif calling library.")
(define-public r-chromvar
(package
(name "r-chromvar")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chromVAR" version))
(sha256
- (base32 "1vy650625b9b2dgnkgh5h0kw5bkdvfin133091asf1nw4jgnn1vx"))))
+ (base32 "092y1x1sbqvjrwmr7sv2r5216wbwwc4lk6kwn57fnvvdnc0hc3sv"))))
(properties `((upstream-name . "chromVAR")))
(build-system r-build-system)
(propagated-inputs
@@ -21949,14 +22432,14 @@ sequence (@code{DNAse-seq}) experiments.")
(define-public r-singlecellexperiment
(package
(name "r-singlecellexperiment")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SingleCellExperiment" version))
(sha256
(base32
- "0q44n97mly1ldh52r0sb1jwhz8bn4n7sfw99qs5h4s44w9s0fry4"))))
+ "09sbk0r9g55x8fbvv5rbrygdw3km4bbrj9x0abqwld2nxnxq1q3n"))))
(properties
`((upstream-name . "SingleCellExperiment")))
(build-system r-build-system)
@@ -21977,13 +22460,13 @@ libraries.")
(define-public r-singler
(package
(name "r-singler")
- (version "2.4.1")
+ (version "2.6.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SingleR" version))
(sha256
- (base32 "0zlv45diasff5ipxp99dddswclrzzdcmkqp278fm2cj7aibvb3sd"))))
+ (base32 "0l33bsi1zfj7f4hzlivhh89phhx0qscrwd08c28mqvcyp91mhq16"))))
(properties `((upstream-name . "SingleR")))
(build-system r-build-system)
(propagated-inputs
@@ -22009,14 +22492,14 @@ cell types to infer the cell of origin of each single cell independently.")
(define-public r-scuttle
(package
(name "r-scuttle")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scuttle" version))
(sha256
(base32
- "090arfacfs09x7g60qxz4bj2gqb97y3kmhafywkgnrj7pz1z0qzq"))))
+ "1cja56k5y5vi1x0jdxaxvh13fc2lzh8g30gp294pz6p61prrf3ws"))))
(properties `((upstream-name . "scuttle")))
(build-system r-build-system)
(propagated-inputs
@@ -22044,13 +22527,13 @@ of other packages.")
(define-public r-scater
(package
(name "r-scater")
- (version "1.30.1")
+ (version "1.32.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scater" version))
(sha256
(base32
- "06a4nxxsgmi435m06ir401w4fbrh0xdgh6mkv3i7vw001yrbrfcx"))))
+ "1052jlflk596q8dbzhwx150ql53lhz109lljc011ni42a5zvjnbm"))))
(build-system r-build-system)
(propagated-inputs
(list r-beachmat
@@ -22088,14 +22571,14 @@ quality control.")
(define-public r-scran
(package
(name "r-scran")
- (version "1.30.2")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "scran" version))
(sha256
(base32
- "06b454ydd8n8xbswxf1hacm3g2nr0ik0gg08pr7crgnsm0r3vpvs"))))
+ "0s1y2q4v596wxh8p5sr43mk9cnsc4kg36ld7vx71hbn3hwscqaa1"))))
(build-system r-build-system)
(propagated-inputs
(list r-beachmat
@@ -22131,13 +22614,13 @@ variable and significantly correlated genes.")
(define-public r-sparsearray
(package
(name "r-sparsearray")
- (version "1.2.4")
+ (version "1.4.8")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "SparseArray" version))
(sha256
- (base32 "0gz1j8g020bp88i5idrhj9qrixgar3wvxxna46ds60q6d8lsn4vi"))))
+ (base32 "1ahwv6ih1700h1sccv9wh7hr5bhdif0ji5jbmsprnhjxfgn6xidm"))))
(properties `((upstream-name . "SparseArray")))
(build-system r-build-system)
(propagated-inputs (list r-biocgenerics
@@ -22168,14 +22651,14 @@ in the @code{matrixStats} package from CRAN.")
(define-public r-sparsematrixstats
(package
(name "r-sparsematrixstats")
- (version "1.14.0")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "sparseMatrixStats" version))
(sha256
(base32
- "0r2jxwha2xjp8iy7al85s5vib4xvl47gmlbbvvjj4wnz2gfzic9r"))))
+ "04hk9r6sh83dyxm2j7jdcj0m4g74ln218j21rs71c2gg6mrkmlgf"))))
(properties
`((upstream-name . "sparseMatrixStats")))
(build-system r-build-system)
@@ -22193,13 +22676,13 @@ data in the column sparse format.")
(define-public r-spatialexperiment
(package
(name "r-spatialexperiment")
- (version "1.12.0")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "SpatialExperiment" version))
(sha256
(base32
- "1s42jzq95f662h39zmbf06qmrrglbch8sgygpnwqblrjbrqgm7n4"))))
+ "0f04azs6wscibcpbmc1m21wjswmgr2b8gvd1n2yavya1li0xxm4r"))))
(properties `((upstream-name . "SpatialExperiment")))
(build-system r-build-system)
(propagated-inputs (list r-biocfilecache
@@ -22224,14 +22707,14 @@ Visium platform.")
(define-public r-delayedmatrixstats
(package
(name "r-delayedmatrixstats")
- (version "1.24.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DelayedMatrixStats" version))
(sha256
(base32
- "18r5rfx46lac0kaakha4gqs4pj8vb39z0908gpclmp3ajca4hzb1"))))
+ "1cqf6y0f18469v1jgfvdjnskkc89i3sfg79axxqcwa33mfjj736s"))))
(properties
`((upstream-name . "DelayedMatrixStats")))
(build-system r-build-system)
@@ -22259,14 +22742,14 @@ memory usage and processing time is minimized.")
(define-public r-mscoreutils
(package
(name "r-mscoreutils")
- (version "1.14.1")
+ (version "1.16.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MsCoreUtils" version))
(sha256
(base32
- "0l6rdkpg89pds3n5y4khvaifgbvm38n0vlpi15h97rnk8x461rsz"))))
+ "1fjc0drsdkl9cyrq5k2kskb70x63mazbhpmlk9q7v77769v64gxb"))))
(properties `((upstream-name . "MsCoreUtils")))
(build-system r-build-system)
(propagated-inputs
@@ -22288,13 +22771,13 @@ within the R for Mass Spectrometry packages.")
(define-public r-msfeatures
(package
(name "r-msfeatures")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MsFeatures" version))
(sha256
- (base32 "0vpsc7i6j2skn6wba178iy406yvd4p8xf3lq2qmm2inimxl983cs"))))
+ (base32 "1prn45vlacj69388psimy0w05a84y8sdry6678pz611sd0ks1gka"))))
(properties `((upstream-name . "MsFeatures")))
(build-system r-build-system)
(propagated-inputs
@@ -22318,14 +22801,14 @@ the respective packages (such as e.g. @code{xcms}).")
(define-public r-biocio
(package
(name "r-biocio")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocIO" version))
(sha256
(base32
- "0bn2jknvj2ag1yv67kjqr7gsq771rmqv3my9njjkwcc9nzrxzhbp"))))
+ "0ppsldpn3vbliimjvnxadn61crck45j581dw4lc5f3w1vy5vs44h"))))
(properties `((upstream-name . "BiocIO")))
(build-system r-build-system)
(propagated-inputs
@@ -22351,14 +22834,14 @@ as well as local access. Developers can register a file extension, e.g.,
(define-public r-msmseda
(package
(name "r-msmseda")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "msmsEDA" version))
(sha256
(base32
- "0xxjkr3x654n61q2yda09cghvssyx4ml9g22gfzfhbzjp8j7pm2c"))))
+ "1fzw36181rw7z62qggq7j22qhq8zrblpmv8qkqlfg140ywvwv08a"))))
(properties `((upstream-name . "msmsEDA")))
(build-system r-build-system)
(propagated-inputs
@@ -22374,14 +22857,14 @@ experiments, and visualize de influence of the involved factors.")
(define-public r-msmstests
(package
(name "r-msmstests")
- (version "1.40.0")
+ (version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "msmsTests" version))
(sha256
(base32
- "0dif4yvm9hfrnamjph5xa9cbf41f2v8lbgyr88f11alwwbf0dg69"))))
+ "0fadwss9z4bfgkhrrqv322j8x40l5cl4ib85057h4fn03qdijqhq"))))
(properties `((upstream-name . "msmsTests")))
(build-system r-build-system)
(propagated-inputs
@@ -22403,14 +22886,14 @@ relevant, and the minimum expression of the most abundant condition.")
(define-public r-catalyst
(package
(name "r-catalyst")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CATALYST" version))
(sha256
(base32
- "1zfb4b88j0ksvsxq8kgrjs0xqlr10yzvr772r8nhl797qzwdag08"))))
+ "168yfkqlg6af8ndlw4wzb9adg4lgkgkjbsi4a435ks0n4c9dycb7"))))
(properties `((upstream-name . "CATALYST")))
(build-system r-build-system)
(propagated-inputs
@@ -22465,14 +22948,14 @@ preprocessing of cytometry data, including:
(define-public r-erma
(package
(name "r-erma")
- (version "1.18.0")
+ (version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "erma" version))
(sha256
(base32
- "0vapjfzhwlzxd049fsr00jd7lp48h9qwd95m2sqhqryqz1vsi7hz"))))
+ "0f4y0szdqhg63vaw7f1lmgzb72bhfpz20g9naq84s8bq2xsf8cy6"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -22505,14 +22988,14 @@ by Ernst and Kellis.")
(define-public r-ggbio
(package
(name "r-ggbio")
- (version "1.50.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ggbio" version))
(sha256
(base32
- "1chs58ifpwz4crcl5ymnb8ah3wf2jrn9lla3ljsywqiqn0r3i1am"))))
+ "0g6h1h8azy79pzm0g8967f58gp33nl8866b285ybq6501nj8pb1p"))))
(build-system r-build-system)
(arguments
`(#:phases
@@ -22673,14 +23156,14 @@ family of feature/genome hypotheses.")
(define-public r-gviz
(package
(name "r-gviz")
- (version "1.46.1")
+ (version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Gviz" version))
(sha256
(base32
- "0an8hd2g2hp3p1vfsmxq77fm71xlf5g73j4w5mcy28x1aj073zxf"))))
+ "07w37kq6zx99z980if4brwmw25vjgvxd8xj3l1893idbdf70py0p"))))
(properties `((upstream-name . "Gviz")))
(build-system r-build-system)
(propagated-inputs
@@ -22722,14 +23205,14 @@ with your data.")
(define-public r-gwascat
(package
(name "r-gwascat")
- (version "2.34.0")
+ (version "2.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gwascat" version))
(sha256
(base32
- "028n8v1pgkr1q5s9wslql8ayk1cbx6a9a2rjka9pdwz6rq1iyagy"))))
+ "08b70drlasws3h9d8iznaxxp0qf4n1fi943m4yngy1c65h3a30rc"))))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
@@ -22756,13 +23239,13 @@ EMBL-EBI GWAS catalog.")
(define-public r-gwastools
(package
(name "r-gwastools")
- (version "1.48.0")
+ (version "1.50.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GWASTools" version))
(sha256
(base32
- "1rjgdcw65zmmg5dy9mdaz720nvqk03bfsfvkdsa1wwhvlnxmscp8"))))
+ "013qv2wac90s1rv992bwzq4diqfq7r18qk7gcifmi22samplpnw4"))))
(properties `((upstream-name . "GWASTools")))
(build-system r-build-system)
(propagated-inputs (list r-biobase
@@ -22788,13 +23271,13 @@ annotation, and functions for GWAS data cleaning and analysis.")
(define-public r-kegggraph
(package
(name "r-kegggraph")
- (version "1.62.0")
+ (version "1.64.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "KEGGgraph" version))
(sha256
- (base32 "0i9iqr87mqih0rkbjx3wa383x4yfyzpcb0b0xzairbqgygvcq4kl"))))
+ (base32 "0lffqbvwmfjbw5ymxr969znvb53hbqfgq1zwffsc768rv3h4c6p7"))))
(properties `((upstream-name . "KEGGgraph")))
(build-system r-build-system)
(propagated-inputs
@@ -22812,14 +23295,14 @@ functionalities including parsing, graph operation, visualization and etc.")
(define-public r-ldblock
(package
(name "r-ldblock")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ldblock" version))
(sha256
(base32
- "1caxzc99kga2c90m2ydmnvcd8lfp0igmmickpl0ikrhwjlbfnc0p"))))
+ "1l4l35bpz4j1iliy9dj09qq8r4nimd9pcm0gm4g3sb4325z6cd5h"))))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
@@ -22868,14 +23351,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))
@@ -22934,13 +23417,13 @@ other functional sequencing data.")
(define-public r-parody
(package
(name "r-parody")
- (version "1.60.0")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "parody" version))
(sha256
- (base32 "05mhbkhyh92bwmx37fpviprr9i4z0i6g24l71zk17gq0f8hwb4jj"))))
+ (base32 "0k2gc8p9dk7j21n6hxdqjna09m6cggx47spkmxkqvwqm97mwqzrp"))))
(properties `((upstream-name . "parody")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -22955,13 +23438,13 @@ methods based on resistant statistics.")
(define-public r-pathview
(package
(name "r-pathview")
- (version "1.42.0")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pathview" version))
(sha256
- (base32 "17kl7yvpjhsb52kz1pw3jnk6s480lnpvvh9rragndixsl8bkmqmc"))))
+ (base32 "1papw23dhhkqmm864dc3xm028xm0ywc6sjcm7xk93f2j7yj65x0v"))))
(properties `((upstream-name . "pathview")))
(build-system r-build-system)
(propagated-inputs
@@ -23017,13 +23500,13 @@ segmented data for individual and multiple arrays.")
(define-public r-snprelate
(package
(name "r-snprelate")
- (version "1.36.1")
+ (version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "SNPRelate" version))
(sha256
(base32
- "0d15r7qwwrr6m9saikx4x6hj56kb3p2w3v1awkgm3wfqfgdf1pin"))))
+ "0znk9vvnahkypmkrx82r1ryp41xr675b4ddpgx0nl3708xhncz5f"))))
(properties `((upstream-name . "SNPRelate")))
(build-system r-build-system)
(propagated-inputs (list r-gdsfmt))
@@ -23052,14 +23535,14 @@ whole-genome and whole-exome variant data.")
(define-public r-snpstats
(package
(name "r-snpstats")
- (version "1.52.0")
+ (version "1.54.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "snpStats" version))
(sha256
(base32
- "0a4kyv93ljv7n62ghx66l81q6sw24llr0998nsalidyws1wldbyr"))))
+ "160pl3dy7v89i90x262hxqgipas4pyim600l6m50g3c03vm5in03"))))
(properties `((upstream-name . "snpStats")))
(build-system r-build-system)
(inputs (list zlib))
@@ -23076,14 +23559,14 @@ the earlier snpMatrix package, allowing for uncertainty in genotypes.")
(define-public r-chromstar
(package
(name "r-chromstar")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chromstaR" version))
(sha256
(base32
- "1yykcqxp8y7by4jgh6dfl25m0pnghj36qy21990n2sdfv1kpg2x6"))))
+ "0swkjq50p3ak0ddyg7pqg37fivdpr3v5jpakn38sk5i5ycn3qf3g"))))
(properties `((upstream-name . "chromstaR")))
(build-system r-build-system)
(propagated-inputs
@@ -23114,14 +23597,14 @@ analyses.")
(define-public r-guitar
(package
(name "r-guitar")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Guitar" version))
(sha256
(base32
- "09i6j8dcmzvd9gh9629523hw0hbng18jdqw5gf1r31ck8m8wwmnc"))))
+ "1agr3n787dqly09wy274v9dg52vdb0n0z3gdh2zsbklkbmayqxqy"))))
(properties `((upstream-name . "Guitar")))
(build-system r-build-system)
(propagated-inputs
@@ -23167,14 +23650,14 @@ visualizations for publication-quality multi-panel figures.")
(define-public r-ballgown
(package
(name "r-ballgown")
- (version "2.34.0")
+ (version "2.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ballgown" version))
(sha256
(base32
- "1r3qz6y97zhp7swcv2ls1h6cz0l66y5ap00wx9wlqxv14sljd135"))))
+ "0x3avbqf0ipmb70szf2chhbdg14ba2hwhyyz0wd66c1qwfk6aj9v"))))
(properties `((upstream-name . "ballgown")))
(build-system r-build-system)
(propagated-inputs
@@ -23201,17 +23684,17 @@ to annotation.")
(define-public r-megadepth
(package
(name "r-megadepth")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "megadepth" version))
(sha256
(base32
- "0g9d4q6vh2ys1la15fqgbc4ckfbjbzzaqa49x9liqrhpnrp59vc3"))))
+ "0394x1x81hgibvqb1dbrm8h3y72xfv9xi9fgqghjgnrw6farrkdk"))))
(properties `((upstream-name . "megadepth")))
(build-system r-build-system)
- (inputs (list megadepth))
+ (inputs (list))
(propagated-inputs
(list r-cmdfun
r-dplyr
@@ -23234,14 +23717,14 @@ regions or annotations of your choice from BigWig files.")
(define-public r-beclear
(package
(name "r-beclear")
- (version "2.18.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BEclear" version))
(sha256
(base32
- "1a8jmlx17qcx9qzcaxbnlk6qji6hqxcnzmr8zvar9jrfhx0cv9x1"))))
+ "17i93h0q1fwl8wymmlgjsh8hbnaws6baf4jid5k579aap32zb5ha"))))
(properties `((upstream-name . "BEclear")))
(build-system r-build-system)
(propagated-inputs
@@ -23268,14 +23751,14 @@ real numbers.")
(define-public r-bgeecall
(package
(name "r-bgeecall")
- (version "1.18.1")
+ (version "1.20.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BgeeCall" version))
(sha256
(base32
- "1ipypkyfqx6mahiwl0gzdsi7z9j9cm5rgfw4ybgh6blfq8kg9qyk"))))
+ "02k83a01fb4gydnw81j2vc3d1m92y0n44bskbdrlm7cb1zscvc13"))))
(properties `((upstream-name . "BgeeCall")))
(build-system r-build-system)
(propagated-inputs
@@ -23290,6 +23773,7 @@ real numbers.")
r-rslurm
r-rtracklayer
r-sjmisc
+ r-txdbmaker
r-tximport))
(native-inputs (list r-knitr))
(home-page "https://github.com/BgeeDB/BgeeCall")
@@ -23304,14 +23788,14 @@ all RNA-Seq libraries of each species integrated in Bgee.")
(define-public r-bgeedb
(package
(name "r-bgeedb")
- (version "2.28.0")
+ (version "2.30.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BgeeDB" version))
(sha256
(base32
- "1ahip21wihwg9yhq0ya1cyzd2cq423hz9pd6iql6y3yhld4j5rnn"))))
+ "16fghmms2yb7i9rj6p3jypx6m7c3flgm8dmnkng7fvxcckaa4lry"))))
(properties `((upstream-name . "BgeeDB")))
(build-system r-build-system)
(propagated-inputs
@@ -23338,14 +23822,14 @@ anatomical terms, mapped to genes by expression patterns.")
(define-public r-biobtreer
(package
(name "r-biobtreer")
- (version "1.14.0")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biobtreeR" version))
(sha256
(base32
- "18p5r67ppkw8wxxkrj76q68ljlhdbhar5hc89ffdsgr3zzdyk875"))))
+ "0660rc8b4vkic4dbf64wkky68f0hk92ip52x7gihvv203cj9fin4"))))
(properties `((upstream-name . "biobtreeR")))
(build-system r-build-system)
(propagated-inputs
@@ -23362,14 +23846,14 @@ mappings functionalities.")
(define-public r-minet
(package
(name "r-minet")
- (version "3.60.0")
+ (version "3.62.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "minet" version))
(sha256
(base32
- "17v2x7cyw74h0zfsz33pyl1kqk976pdzw7mrgprz9l7w5120niw5"))))
+ "1627gqqk8v3sx5kgm7z3wkimbz7dpf37ljrmvwbd4z6ag2yiirbj"))))
(properties `((upstream-name . "minet")))
(build-system r-build-system)
(propagated-inputs
@@ -23384,14 +23868,14 @@ information networks from data.")
(define-public r-genetclassifier
(package
(name "r-genetclassifier")
- (version "1.42.0")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "geNetClassifier" version))
(sha256
(base32
- "1k61aka780xmf1vhqm6zvzjr2626hv71f8gp1s81az939crxlrqd"))))
+ "0jfczma8sh9dza105v306xr371f8mndndm6kw3ydgqlxd8zk3a6l"))))
(properties
`((upstream-name . "geNetClassifier")))
(build-system r-build-system)
@@ -23409,14 +23893,14 @@ interface to query the classifier.")
(define-public r-dir-expiry
(package
(name "r-dir-expiry")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "dir.expiry" version))
(sha256
(base32
- "191b8qhldxvsw09l2c0ffc1ldmx0mqxgsx6m074f28l01d3c1d9q"))))
+ "03958xwwywsl5ql6ss1rbkklk49ksgvbp4nqcmmqhn1hiwwn8rvi"))))
(properties `((upstream-name . "dir.expiry")))
(build-system r-build-system)
(propagated-inputs (list r-filelock))
@@ -23433,13 +23917,13 @@ eliminating obsolete caches generated by old versions of packages.")
(define-public r-basic4cseq
(package
(name "r-basic4cseq")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Basic4Cseq" version))
(sha256
- (base32 "1vlrrkg885w77w34m2q8hngr95hhh5bkw9hrzyhnp39igjkcwqx4"))))
+ (base32 "0ipxhdsqa8q49d2i17kvwyn6w2rpyl9jmq9bhch7cjawykjla5kf"))))
(properties `((upstream-name . "Basic4Cseq")))
(build-system r-build-system)
(propagated-inputs
@@ -23464,13 +23948,13 @@ approach and a multi-scale contact profile.")
(define-public r-basics
(package
(name "r-basics")
- (version "2.14.0")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BASiCS" version))
(sha256
- (base32 "0kf215n151sxphc5w9h4i2xsk7lmysi4abwcpyz4slbwhpki3ac8"))))
+ (base32 "0rcc8na0nravf2687bcvbaklwa0z8b43lvdy0nf9xvfrfpr1zjnw"))))
(properties `((upstream-name . "BASiCS")))
(build-system r-build-system)
(propagated-inputs
@@ -23514,13 +23998,13 @@ pre-specified groups of cells.")
(define-public r-basicstarrseq
(package
(name "r-basicstarrseq")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BasicSTARRseq" version))
(sha256
- (base32 "1dw6bv1qk2bn0l3m458sqgvm3s1karh4n3431pl7r0jj2r3mr6xa"))))
+ (base32 "1w69qc81pj3c4gq158ag59wbpm2aaiqmnnb79m0h7dlsnf964cjv"))))
(properties `((upstream-name . "BasicSTARRseq")))
(build-system r-build-system)
(propagated-inputs
@@ -23549,14 +24033,14 @@ input.")
(define-public r-basilisk-utils
(package
(name "r-basilisk-utils")
- (version "1.14.1")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "basilisk.utils" version))
(sha256
(base32
- "19m4h90rkk6mizllkih2xmxag8nb45qss3vydkkyj62s5zjhfh27"))))
+ "04amc13h4ghy1zr9wkdl42wgicxz5s2iwsspxvvi18acm06nzgfh"))))
(properties
`((upstream-name . "basilisk.utils")))
(build-system r-build-system)
@@ -23573,14 +24057,14 @@ package, primarily for creation of the underlying Conda instance.")
(define-public r-basilisk
(package
(name "r-basilisk")
- (version "1.14.3")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "basilisk" version))
(sha256
(base32
- "0hmx2jpfmjv87mp99mzbbzg00m6arpkpc5prkfav065iwjqbqnpd"))))
+ "1jhaar524z4ly8d4c7nyjn094m4sgz4vhh8qljd2yvs30xxs0jin"))))
(properties `((upstream-name . "basilisk")))
(build-system r-build-system)
(propagated-inputs
@@ -23599,13 +24083,13 @@ Python environments in a single R session.")
(define-public r-bayesknockdown
(package
(name "r-bayesknockdown")
- (version "1.28.0")
+ (version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BayesKnockdown" version))
(sha256
- (base32 "1argd4gfld2yb0vvpgb5k7m6agmi58712f6g5dj4gnb7kg4rp1l8"))))
+ (base32 "05plmh36s00jh4ckcgvi2s9ypa8mxlsy23mzysazbfsr022x3vqa"))))
(properties `((upstream-name . "BayesKnockdown")))
(build-system r-build-system)
(propagated-inputs (list r-biobase))
@@ -23623,13 +24107,13 @@ targets. It can also be used for differential expression/2-class data.")
(define-public r-bayesspace
(package
(name "r-bayesspace")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BayesSpace" version))
(sha256
- (base32 "1mqgsylnrvf197cin5zzihjv31bm2q0m5a612ncbglys6n1jd105"))))
+ (base32 "0q1haqsyc61yxz1n197sv3s6csjpns4fi288kf58nnf5jgdwnyx5"))))
(properties `((upstream-name . "BayesSpace")))
(build-system r-build-system)
(propagated-inputs
@@ -23670,13 +24154,13 @@ features such as gene expression or cell type composition can be imputed.")
(define-public r-baynorm
(package
(name "r-baynorm")
- (version "1.20.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bayNorm" version))
(sha256
- (base32 "01lv4w1x43x3f9sdrqikhsr1gdvkgqzrgcd9wnjj76qsljn57ifq"))))
+ (base32 "0b05446vcqxr7smxyhmvl6rxlckzzgqhf5v1059657kihhscqr7s"))))
(properties `((upstream-name . "bayNorm")))
(build-system r-build-system)
(propagated-inputs
@@ -23709,13 +24193,13 @@ posterior (3D array).")
(define-public r-bbcanalyzer
(package
(name "r-bbcanalyzer")
- (version "1.32.0")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BBCAnalyzer" version))
(sha256
- (base32 "108jcgsf5hyj348y17hcw8m3zcfjgzpx8nz4n5jgxp2lgxjyizy1"))))
+ (base32 "16zm6fix5f5277dkdaxyxl1q1n52960ma3vw8001a5bjxhic58rn"))))
(properties `((upstream-name . "BBCAnalyzer")))
(build-system r-build-system)
(propagated-inputs
@@ -23739,13 +24223,13 @@ included in the plots.")
(define-public r-bcrank
(package
(name "r-bcrank")
- (version "1.64.0")
+ (version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BCRANK" version))
(sha256
- (base32 "1m1ccacryf8wjzp0d37n9n1kpa6734ddb8nvv1sy0sz5gplrars9"))))
+ (base32 "0ydajrbggvqakdf01pq5mqi1v3slz00irpbx4s9fmxvci9ganwp7"))))
(properties `((upstream-name . "BCRANK")))
(build-system r-build-system)
(propagated-inputs (list r-biostrings))
@@ -23759,14 +24243,14 @@ transcription factor binding consensus by heuristic search.")
(define-public r-biocthis
(package
(name "r-biocthis")
- (version "1.12.0")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biocthis" version))
(sha256
(base32
- "0lxcsw70ib8wvkp3ii1l8vd4g2ddhj6g0x22dwcmwacr2myk3bg8"))))
+ "1f09vw5qjxyirz5xbvnnjlwxg7z0i0y8yry49d1gyx0spyhzl7sp"))))
(properties `((upstream-name . "biocthis")))
(build-system r-build-system)
(arguments
@@ -23823,14 +24307,14 @@ the Bioconductor project.")
(define-public r-biodb
(package
(name "r-biodb")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biodb" version))
(sha256
(base32
- "18w062s0wwdisl6a9a79in6h4052x3janinc5isip0x6p9g9d9bk"))))
+ "0zkd6505q0myc5l9d69i1fvfhcrjqxkv208p84zr5p7xi8jmg3dw"))))
(properties `((upstream-name . "biodb")))
(build-system r-build-system)
(propagated-inputs
@@ -23869,14 +24353,14 @@ separate published packages.")
(define-public r-biomformat
(package
(name "r-biomformat")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biomformat" version))
(sha256
(base32
- "1ccnrz8rkg533kil3sc8wnjqsmiyrpqqmk7av7ls01avglcjdjq1"))))
+ "0jys0nmp833ax96vfdh1adikpyapr5gkmldx5kvv5bqiqc8aipzb"))))
(properties `((upstream-name . "biomformat")))
(build-system r-build-system)
(propagated-inputs
@@ -23898,14 +24382,14 @@ as extensions of common core functions/methods.")
(define-public r-mvcclass
(package
(name "r-mvcclass")
- (version "1.76.0")
+ (version "1.78.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MVCClass" version))
(sha256
(base32
- "16finp6q89n6x5q2v1khpfp5ys7d4dvlh3kacv5qbdh1bsb3fpax"))))
+ "1wi6acw51q48v149l72b2pp0iyjrwq1bbmr53y3m609xfadg4qim"))))
(properties `((upstream-name . "MVCClass")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/MVCClass")
@@ -23918,14 +24402,14 @@ design.")
(define-public r-biomvcclass
(package
(name "r-biomvcclass")
- (version "1.70.0")
+ (version "1.72.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BioMVCClass" version))
(sha256
(base32
- "04ckv1y5iqawd0dvnn0bbpnmyys0ivcmf0my6dld3hib3idjzwfx"))))
+ "0dfdksk3nc6pzw21sbd4cdqr05489qh4984wv0f906hyb52waxk2"))))
(properties `((upstream-name . "BioMVCClass")))
(build-system r-build-system)
(propagated-inputs
@@ -23940,14 +24424,14 @@ design.")
(define-public r-biomvrcns
(package
(name "r-biomvrcns")
- (version "1.42.2")
+ (version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biomvRCNS" version))
(sha256
(base32
- "1imni8lpjzf53w2q34ql0j9rwq6drbzxvs0nhzf6s172iqym2hq3"))))
+ "1wk0qagx9s2lxykc1fp7l35kl6q17lqy6x4fl2c57v3wa11f47mi"))))
(properties `((upstream-name . "biomvRCNS")))
(build-system r-build-system)
(arguments
@@ -23974,14 +24458,14 @@ using aCGH or sequencing.")
(define-public r-bionero
(package
(name "r-bionero")
- (version "1.10.3")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BioNERO" version))
(sha256
(base32
- "1vf3kq4lj4alvwzf0wl09lxb0ky6q0x94ajmrnihlj5saliqb73c"))))
+ "02jqlpd31mhxbvksj7ny34f6dv8skkkr76lkiaj5gm078kfr0zx5"))))
(properties `((upstream-name . "BioNERO")))
(build-system r-build-system)
(propagated-inputs
@@ -24030,14 +24514,14 @@ networks.")
(define-public r-bionet
(package
(name "r-bionet")
- (version "1.62.0")
+ (version "1.64.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BioNet" version))
(sha256
(base32
- "122rj6rg4j9q9brhxyrbkc91fml3davk044s2yxwyjnwn2yjw0bq"))))
+ "0lpqvm0cx7pnb99jh7na49x10w2v04xydiwxn9l41ngxysp8v0h6"))))
(properties `((upstream-name . "BioNet")))
(build-system r-build-system)
(propagated-inputs
@@ -24114,14 +24598,14 @@ network and metabolic pathways view.")
(define-public r-bioqc
(package
(name "r-bioqc")
- (version "1.30.0")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BioQC" version))
(sha256
(base32
- "15kmg102259h2yl3b6ncq2p545kdac4hk4kwm1s5492y5rg7qkla"))))
+ "14yrqf5wl9r596zvlpf4y48nykg0gwzlxfgi3kdx0i5pfgvi43vk"))))
(properties `((upstream-name . "BioQC")))
(build-system r-build-system)
(propagated-inputs
@@ -24170,14 +24654,14 @@ help unravel disease regulatory trajectory.")
(define-public r-biotmle
(package
(name "r-biotmle")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biotmle" version))
(sha256
(base32
- "0h796sxv7fvwx9m8ikamf3bvaac7rimp33lv1j3ngsjifigdkvfy"))))
+ "06kixhzkrzxyic44kdmqrv19v2c4a7sri8cbhbvww8km4n5l39sf"))))
(properties `((upstream-name . "biotmle")))
(build-system r-build-system)
(propagated-inputs
@@ -24212,14 +24696,14 @@ ensemble machine learning for the estimation of nuisance functions.")
(define-public r-bsseq
(package
(name "r-bsseq")
- (version "1.38.0")
+ (version "1.40.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bsseq" version))
(sha256
(base32
- "0afpzr52mf2ab7gr9swdf6609787ymw8s8wksis0d4ap0y0wdgg0"))))
+ "1b7a9ryl4lz6qy2pni3k9bk6hdf147s3m7fx0icg6fkgi0ymssyx"))))
(properties `((upstream-name . "bsseq")))
(build-system r-build-system)
(propagated-inputs
@@ -24258,13 +24742,13 @@ visualizing bisulfite sequencing data.")
(define-public r-dada2
(package
(name "r-dada2")
- (version "1.30.0")
+ (version "1.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "dada2" version))
(sha256
(base32
- "0rvnwbknvwksm50f4rw9965gnhy13rjgdfvv428xsqixgkkkyrf6"))))
+ "1ac0nb5bcmzmqpi3vjdmns6xqq3ar61dks6qb3c0k48c78w88b7b"))))
(properties `((upstream-name . "dada2")))
(build-system r-build-system)
(propagated-inputs
@@ -24295,14 +24779,14 @@ fragments by exact matching.")
(define-public r-dmrseq
(package
(name "r-dmrseq")
- (version "1.22.1")
+ (version "1.24.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "dmrseq" version))
(sha256
(base32
- "10ps9k5cp2adpx91g23gc9hl1qzzax5w1mxjcjaii7knkh70cz3p"))))
+ "0x7gwdzpn1ziq5vm80fs1fcyknapwjs8zfbjszw66zs36nqnqgw4"))))
(properties `((upstream-name . "dmrseq")))
(build-system r-build-system)
(propagated-inputs
@@ -24341,13 +24825,13 @@ interest on transformed methylation proportions.")
(define-public r-omicade4
(package
(name "r-omicade4")
- (version "1.42.0")
+ (version "1.44.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "omicade4" version))
(sha256
(base32
- "0i4ln95ayl1irr8sr3639x35ilysdi663kksw7g93q1ry91yav8r"))))
+ "18gp8qpmnbc5yjqyvvwvmrdybvm6zddc0r8bfglxz5wg4a91h4wk"))))
(properties `((upstream-name . "omicade4")))
(build-system r-build-system)
(propagated-inputs (list r-ade4 r-biobase r-made4))
@@ -24360,13 +24844,13 @@ interest on transformed methylation proportions.")
(define-public r-omnipathr
(package
(name "r-omnipathr")
- (version "3.10.1")
+ (version "3.12.3")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "OmnipathR" version))
(sha256
- (base32 "1wbzb4kh7bzsvixr3vxzih9rfkpjx00f33i0yl0dqj0yixnrghwr"))))
+ (base32 "17a8zyvqn3avr7dwy0gr3yb8zghplyjxm1yyp5plbw91yhk8f287"))))
(properties `((upstream-name . "OmnipathR")))
(build-system r-build-system)
(arguments
@@ -24417,14 +24901,14 @@ for ligand activity prediction from transcriptomics data.")
(define-public r-biscuiteer
(package
(name "r-biscuiteer")
- (version "1.16.0")
+ (version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "biscuiteer" version))
(sha256
(base32
- "1q90p14qj5plz6cbvwxq875y29in6jg7adyni5wd33pf9i4gsxzi"))))
+ "15bisrcgyiv9ndfvgm0p4igyr4jwsf68ccis1nf1hi9x291k7m6y"))))
(properties `((upstream-name . "biscuiteer")))
(build-system r-build-system)
(propagated-inputs
@@ -24469,13 +24953,13 @@ estimates, etc.")
(define-public r-tcgabiolinks
(package
(name "r-tcgabiolinks")
- (version "2.30.4")
+ (version "2.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TCGAbiolinks" version))
(sha256
- (base32 "0br0bgcvxxfy1vclfc8i20b0bsb7rcchwfdx7lkw4f2aqxny8ja8"))))
+ (base32 "1br2dxi5rvl8z5myrnj4dnfh8xgksrqjyy0fsqh3vjspifvis4ih"))))
(properties `((upstream-name . "TCGAbiolinks")))
(build-system r-build-system)
(propagated-inputs
@@ -24524,13 +25008,13 @@ starburst plots) in order to easily develop complete analysis pipelines.")
(define-public r-tricycle
(package
(name "r-tricycle")
- (version "1.10.0")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "tricycle" version))
(sha256
(base32
- "1dawkp681pz9hf7fp2nag9pcfxx5rq0z4j9czlalf0sylsjbirkd"))))
+ "11928pcd8xzmll28m0ihi3rasc4w1i0fshn4bh9n2lyigkr5ayi4"))))
(properties `((upstream-name . "tricycle")))
(build-system r-build-system)
(propagated-inputs
@@ -24563,14 +25047,14 @@ embeddings and functions to build new reference.")
(define-public r-tximeta
(package
(name "r-tximeta")
- (version "1.20.3")
+ (version "1.22.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "tximeta" version))
(sha256
(base32
- "0hlx5kvhspc62p68gz53n0scwji3zvfv915fm8rzw3l8h2hjh3y7"))))
+ "0lmkxl7zlp6z4i32jyy914kiwacnz89jnd2kqma81mq81r389p06"))))
(properties `((upstream-name . "tximeta")))
(build-system r-build-system)
(propagated-inputs
@@ -24588,6 +25072,7 @@ embeddings and functions to build new reference.")
r-s4vectors
r-summarizedexperiment
r-tibble
+ r-txdbmaker
r-tximport))
(native-inputs
(list r-knitr))
@@ -24604,13 +25089,13 @@ reproducibility.")
(define-public r-phyloseq
(package
(name "r-phyloseq")
- (version "1.46.0")
+ (version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "phyloseq" version))
(sha256
- (base32 "06gnpjcniqm8i52xh9xl3nn0wm9nn9rkqd3w3fjv7ii142xypjln"))))
+ (base32 "0a8q4wcqcxs7933bxg9bg03ps6hnybvcpqmlpz1pjy3affzghcbi"))))
(properties `((upstream-name . "phyloseq")))
(build-system r-build-system)
(propagated-inputs
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index aa6bce5591..4653360792 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018-2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
-;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
@@ -23,9 +23,10 @@
;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de>
;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
-;;; Copyright © 2022, 2023 Navid Afkhami <navid.afkhami@mdc-berlin.de>
+;;; Copyright © 2022, 2023, 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2024 Alexis Simon <alexis.simon@runbox.com>
+;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -84,6 +85,7 @@
#:use-module (gnu packages cran)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
@@ -577,6 +579,7 @@ BED, GFF/GTF, VCF.")
(description
"BitMapperBS is memory-efficient aligner that is designed for
whole-genome bisulfite sequencing (WGBS) reads from directional protocol.")
+ (supported-systems '("x86_64-linux"))
(license license:asl2.0)))
(define-public bustools
@@ -722,6 +725,83 @@ alignment-free, it runs much faster and also easier to use.")
and utilities for PacBio C++ applications.")
(license license:bsd-3)))
+(define-public r-anndatar
+ (let ((commit "5c3eb7e498d0d9bf1c522ad66f4eb8ad277238b6")
+ (revision "1"))
+ (package
+ (name "r-anndatar")
+ (version (git-version "0.99.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scverse/anndataR")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0sx87i8cb4p08ihgpgflxs0fhkr1kw6lxvky4w766rq7wqy41cgk"))))
+ (properties `((upstream-name . "anndataR")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-matrix r-r6))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/scverse/anndataR")
+ (synopsis "AnnData interoperability in R")
+ (description
+ "This package aims to bring the power and flexibility of @code{AnnData}
+to the R ecosystem, allowing you to effortlessly manipulate and analyze your
+single-cell data. This package lets you work with backed h5ad and zarr files,
+directly access various slots (e.g. X, obs, var), or convert the data into
+@code{SingleCellExperiment} and Seurat objects.")
+ (license license:expat))))
+
+(define-public r-anpan
+ (let ((commit "286b88dcf5e9e963a595482139aade154ee1dc86")
+ (revision "1"))
+ (package
+ (name "r-anpan")
+ (version (git-version "0.3.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/biobakery/anpan")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10nw5v69gn4pxb4g5gd8nh9r1ywd6yczapl3dpdfms0434wcmkxm"))))
+ (properties `((upstream-name . "anpan")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-ape
+ r-cmdstanr
+ r-data-table
+ r-dplyr
+ r-fastglm
+ r-furrr
+ r-future
+ r-ggdendro
+ r-ggnewscale
+ r-ggplot2
+ r-loo
+ r-mass
+ r-patchwork
+ r-phylogram
+ r-posterior
+ r-progressr
+ r-purrr
+ r-r-utils
+ r-stringr
+ r-tibble
+ r-tidyselect))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/biobakery/anpan")
+ (synopsis "Quantifying microbial strain-host associations")
+ (description
+ "The goal of anpan is to consolidate statistical methods for strain
+analysis. This includes automated filtering of metagenomic functional
+profiles, testing genetic elements for association with outcomes, phylogenetic
+association testing, and pathway-level random effects models.")
+ (license license:expat))))
+
(define-public r-bedtorch
(let ((commit "f5ff4f83b94f59eac660333c64e4b2f296b35cea")
(revision "1"))
@@ -1141,6 +1221,43 @@ from single-cell RNA-seq data.")
;; GPLv3.
(license license:gpl3))))
+(define-public r-scent
+ (let ((commit "f01f18ac30f8a9bcf85b738c6c7815017e2c8ee5")
+ (revision "1"))
+ (package
+ (name "r-scent")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/immunogenomics/SCENT")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18krksy8ac7yy8hghzaxscj91c61j195yg7j60zswdq97islvfzi"))))
+ (properties `((upstream-name . "SCENT")))
+ (build-system r-build-system)
+ (inputs (list bedtools))
+ (propagated-inputs (list r-boot
+ r-data-table
+ r-hmisc
+ r-lme4
+ r-mass
+ r-matrix
+ r-r-utils
+ r-stringr))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/immunogenomics/SCENT")
+ (synopsis
+ "Single-Cell enhancer target gene mapping for multimodal single-cell data")
+ (description
+ "This package contains functions for the SCENT algorithm.
+SCENT uses single-cell multimodal data and links ATAC-seq peaks
+to their target genes by modeling association between chromatin
+accessibility and gene expression across individual single cells.")
+ (license license:expat))))
+
(define-public r-saige
(let ((commit "c6717ba9c5a967bcf612e97566d845397b1b7167")
(revision "1"))
@@ -1628,7 +1745,8 @@ different from MFE computed with random sequences.")
"Ribotaper_ORF_find.sh"
"Ribotaper.sh")))))))
(inputs
- (list bedtools-2.18
+ (list bash-minimal
+ bedtools-2.18
samtools-0.1
r-minimal
r-foreach
@@ -1937,6 +2055,53 @@ cell types. Cell2cell is suitable for single-cell RNA sequencing
from high-throughput single-cell RNA sequencing (scRNA-seq) data.")
(license license:bsd-3)))
+(define-public python-celltypist
+ (package
+ (name "python-celltypist")
+ (version "1.6.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Teichlab/celltypist")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0c42cx01zkxr0dk5f1d7q71qdi18v2smlc3wpvwyjlzplya7k2iy"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:tests? #false ;there are none
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ ;; The sanity check requires a HOME directory, because celltypist
+ ;; wants to write settings.
+ (lambda _ (setenv "HOME" "/tmp")))
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'build 'set-numba-cache-dir
+ (lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+ (propagated-inputs
+ (list python-click
+ python-leidenalg
+ python-numpy
+ python-openpyxl
+ python-pandas
+ python-scanpy
+ python-scikit-learn
+ python-requests))
+ (home-page "https://github.com/Teichlab/celltypist")
+ (synopsis "Tool for semi-automatic cell type classification")
+ (description
+ "CellTypist is an automated cell type annotation tool for scRNA-seq
+datasets on the basis of logistic regression classifiers optimised by the
+stochastic gradient descent algorithm. CellTypist allows for cell prediction
+using either built-in (with a current focus on immune sub-populations) or
+custom models, in order to assist in the accurate classification of different
+cell types and subtypes.")
+ (license license:expat)))
+
(define-public python-cmseq
(package
(name "python-cmseq")
@@ -2026,71 +2191,62 @@ parsing of Variant Call Format (VCF) files.")
(license license:expat)))
(define-public python-decoupler-py
- ;; This latest commit fixes a bug in test_omnip.py.
- (let ((commit "459b235348ddd9135217a3722d9dd1caa9a14ace")
- (revision "1"))
- (package
- (name "python-decoupler-py")
- (version (git-version "1.5.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/saezlab/decoupler-py")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1c0xk006iilyffdaqar2d05qdhik22fbkny387zx0bndkgqifxhl"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags
- '(list "-k"
- ;; These tests require internet access
- (string-append "not test_get_resource"
- " and not test_show_resources"
- " and not test_get_dorothea"
- " and not test_get_progeny"
- " and not test_get_ksn_omnipath"
- ;; XXX module 'omnipath.interactions' has no
- ;; attribute 'CollecTRI'
- " and not test_get_collectri"
- ;; XXX This one fails because the "texts" list
- ;; is empty, so there are no texts to adjust.
- ;; It is not clear whether this a compatibility
- ;; problem with our adjusttext package.
- " and not test_plot_volcano"))
- #:phases
- '(modify-phases %standard-phases
- (add-before 'check 'set-home
- ;; Some tests require a home directory to be set.
- (lambda _ (setenv "HOME" "/tmp")))
- ;; Numba needs a writable dir to cache functions.
- (add-before 'build 'set-numba-cache-dir
- (lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
- (propagated-inputs (list python-adjusttext
- python-anndata
- python-ipython
- python-matplotlib
- python-nbsphinx
- python-numba
- python-numpy
- python-numpydoc
- python-omnipath
- python-scanpy
- python-scikit-learn
- python-scipy
- python-skranger
- python-tqdm
- python-typing-extensions))
- (native-inputs (list python-pytest))
- (home-page "https://github.com/saezlab/decoupler-py")
- (synopsis
- "Framework for modeling, analyzing and interpreting single-cell RNA-seq data")
- (description
- "This package provides different statistical methods to extract
+ (package
+ (name "python-decoupler-py")
+ (version "1.6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/saezlab/decoupler-py")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mqkp0i8k5hzhfnka4nc2f0phmrs0k404ynbl1lqfjzywx25y75h"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ '(list "-k"
+ ;; These tests require internet access
+ (string-append "not test_get_resource"
+ " and not test_show_resources"
+ " and not test_get_dorothea"
+ " and not test_get_progeny"
+ " and not test_get_ksn_omnipath"
+ ;; This attempts to download things for Omnipath
+ " and not test_get_collectri"))
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ ;; Some tests require a home directory to be set.
+ (lambda _ (setenv "HOME" "/tmp")))
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'build 'set-numba-cache-dir
+ (lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+ (propagated-inputs (list python-adjusttext
+ python-anndata
+ python-ipython
+ python-matplotlib
+ python-nbsphinx
+ python-numba
+ python-numpy
+ python-numpydoc
+ python-omnipath
+ python-scanpy
+ python-scikit-learn
+ python-scipy
+ python-skranger
+ python-tqdm
+ python-typing-extensions))
+ (native-inputs (list python-pytest))
+ (home-page "https://github.com/saezlab/decoupler-py")
+ (synopsis
+ "Framework for modeling, analyzing and interpreting single-cell RNA-seq data")
+ (description
+ "This package provides different statistical methods to extract
biological activities from omics data within a unified framework.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public python-demuxem
(package
@@ -2219,7 +2375,7 @@ servers supporting the protocol.")
(define-public python-liana-py
(package
(name "python-liana-py")
- (version "0.1.9")
+ (version "1.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2228,7 +2384,7 @@ servers supporting the protocol.")
(file-name (git-file-name name version))
(sha256
(base32
- "00lqrmi38wmdpjlcafgmrnkwsbp0yvm2rya6qs8y6jfizww9ff8i"))))
+ "0f5al0v55haja91q9gd409v7q78mmp1wv9znsplsbjp6lfspjfnw"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2236,9 +2392,28 @@ servers supporting the protocol.")
'(list "-k"
;; These tests require internet access.
(string-append "not test_generate_lr_resource"
- " and not test_generate_nondefault_lr_resource"))
+ " and not test_get_metalinks"
+ " and not test_get_metalinks_values"
+ " and not test_describe_metalinks"
+ " and not test_generate_nondefault_lr_resource"
+ ;; Minor accuracy difference
+ " and not test_bivar_morans_perms"
+ ;; XXX unclear failure: 'coo_matrix' object is not
+ ;; subscriptable
+ " and not test_bivar_product"
+ )
+ ;; These need the optional squidpy, which we don't have yet.
+ "--ignore=liana/tests/test_misty.py"
+ ;; These need the optional corneto.
+ "--ignore=liana/tests/test_causalnet.py")
#:phases
'(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ ;; Don't fail the sanity check when these optional inputs aren't
+ ;; available.
+ (substitute* "pyproject.toml"
+ (("^pre-commit =.*") ""))))
;; Numba needs a writable directory to cache functions.
(add-before 'build 'set-numba-cache-dir
(lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
@@ -2248,10 +2423,10 @@ servers supporting the protocol.")
python-hypothesis
python-ipykernel
python-ipython
- python-mofax
python-mudata
python-nbconvert
python-nbsphinx
+ python-numpy
python-numpydoc
python-omnipath
python-pandas
@@ -2264,7 +2439,10 @@ servers supporting the protocol.")
python-tqdm
tzdata))
(native-inputs
- (list python-black python-pytest python-pytest-cov python-numpy))
+ (list python-black
+ python-poetry-core
+ python-pytest
+ python-pytest-cov))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
@@ -2333,6 +2511,75 @@ provides data pre-processing functionality such as dimensionality reduction
and gene expression visualization.")
(license license:gpl2+)))
+(define-public python-metacells
+ (package
+ (name "python-metacells")
+ (version "0.9.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "metacells" version))
+ (sha256
+ (base32 "02f63nxz6b60vl6s4n9vapaysnq1w5f3x7c179rh2rr7j2k5cf1y"))))
+ #;
+ (properties '((tunable? . #t)))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; The package "python-igraph" has been deprecated in favor of
+ ;; just "igraph".
+ (add-after 'unpack 'rename-igraph
+ (lambda _
+ (substitute* "requirements.txt"
+ (("python-igraph") "igraph"))))
+ (add-after 'unpack 'do-not-tune
+ (lambda _
+ ;; Without this they pass -march=native to the compiler.
+ (setenv "WHEEL" "1")))
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'check 'set-numba-cache-dir
+ (lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp")))
+ (add-before 'build 'build-extensions
+ (lambda _
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs (list python-anndata
+ python-cvxpy
+ python-fastcluster
+ python-importlib-metadata
+ python-numpy
+ python-pandas
+ python-psutil
+ python-igraph
+ python-pyyaml
+ python-scanpy
+ python-scipy
+ python-threadpoolctl
+ python-umap-learn))
+ (native-inputs (list python-black
+ python-bumpversion
+ python-flake8
+ python-isort
+ python-mypy
+ python-mypy-extensions
+ python-pylint
+ python-pytest
+ python-pytest-cov
+ python-sphinx
+ python-sphinx-rtd-theme
+ python-tox
+ python-twine))
+ (home-page "https://github.com/tanaylab/metacells.git")
+ (synopsis "Single-cell RNA Sequencing Analysis")
+ (description "The metacells package implements the improved metacell
+algorithm for single-cell RNA sequencing (scRNA-seq) data analysis within the
+scipy framework, and projection algorithm based on it. The original metacell
+algorithm was implemented in R. The Python package contains various
+algorithmic improvements and is scalable for larger data sets (millions of
+cells).")
+ (license license:expat)))
+
(define-public python-parabam
(package
(name "python-parabam")
@@ -2797,7 +3044,7 @@ telomerecat can produce an estimate in ~1 hour.")
(define-public python-bioframe
(package
(name "python-bioframe")
- (version "0.3.3")
+ (version "0.6.4")
(source
(origin
(method git-fetch)
@@ -2808,18 +3055,21 @@ telomerecat can produce an estimate in ~1 hour.")
(file-name (git-file-name name version))
(sha256
(base32
- "14lvb18d4npapyi6j2zqh9q94l658dzmka5riiizw1h0zb0kp9xb"))))
- (build-system python-build-system)
+ "1m99hgxw4cb2x4qszb2lhp1isz57sdkqbmcgisnbqxqxkv4gba7v"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (setenv "MPLCONFIGDIR" "/tmp")
- (when tests?
- (invoke "pytest" "-v")))))))
+ (list
+ #:test-flags
+ '(list "-k" (string-append "not test_fetch_chromsizes"
+ " and not test_fetch_chromsizes_local_vs_ucsc"
+ " and not test_fetch_centromeres"))
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _ (setenv "MPLCONFIGDIR" "/tmp"))))))
(native-inputs
(list python-biopython
+ python-hatchling
python-pysam
python-pytest
python-wheel))
@@ -2827,6 +3077,7 @@ telomerecat can produce an estimate in ~1 hour.")
(list python-matplotlib
python-numpy
python-pandas
+ python-pyyaml
python-requests))
(home-page "https://github.com/open2c/bioframe")
(synopsis "Pandas utilities for tab-delimited and other genomic files")
@@ -2866,6 +3117,11 @@ use-case, we encourage users to compose functions to achieve their goals.")
'(modify-phases %standard-phases
(add-after 'unpack 'use-cython
(lambda _ (setenv "USE_CYTHON" "1")))
+ (add-after 'unpack 'pandas-compatibility
+ (lambda _
+ (substitute* "biom/tests/test_table.py"
+ (("import pandas.util.testing")
+ "import pandas.testing"))))
(add-after 'unpack 'disable-broken-tests
(lambda _
(substitute* "biom/tests/test_util.py"
@@ -2877,6 +3133,24 @@ use-case, we encourage users to compose functions to achieve their goals.")
(("^(.+)def test_from_hdf5_issue_731" m indent)
(string-append indent
"@npt.dec.skipif(True, msg='Guix')\n"
+ m))
+ ;; Unclear why this one fails. There is no backtrace.
+ (("^(.+)def test_to_dataframe_is_sparse" m indent)
+ (string-append indent
+ "@npt.dec.skipif(True, msg='Guix')\n"
+ m))
+ ;; These need skbio, but that neeeds biom-format.
+ (("^(.+)def test_align_tree_intersect_obs" m indent)
+ (string-append indent
+ "@npt.dec.skipif(True, msg='Guix')\n"
+ m))
+ (("^(.+)def test_align_tree_intersect_tips" m indent)
+ (string-append indent
+ "@npt.dec.skipif(True, msg='Guix')\n"
+ m))
+ (("^(.+)def test_align_tree_sample" m indent)
+ (string-append indent
+ "@npt.dec.skipif(True, msg='Guix')\n"
m))))))))
(propagated-inputs
(list python-anndata
@@ -2886,7 +3160,7 @@ use-case, we encourage users to compose functions to achieve their goals.")
python-h5py
python-numpy
python-pandas
- python-scikit-bio
+ ;;python-scikit-bio ;mutually recursive dependency
python-scipy))
(native-inputs
(list python-cython python-pytest python-pytest-cov python-nose))
@@ -3024,7 +3298,7 @@ files.")
`("PERL5LIB" ":" prefix (,path))))
(find-files bin "\\.pl$")))))))))
(inputs
- (list perl-module-build perl-data-stag perl-libwww perl-uri))
+ (list bash-minimal perl-module-build perl-data-stag perl-libwww perl-uri))
(native-inputs
(list perl-test-most))
(home-page "https://metacpan.org/release/BioPerl")
@@ -3987,38 +4261,38 @@ splice junctions between exons.")
(define-public bwa
(package
(name "bwa")
- (version "0.7.17")
+ (version "0.7.18")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/lh3/bwa/releases/download/v"
- version "/bwa-" version ".tar.bz2"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lh3/bwa")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"))))
+ "1vf3iwkzxqkzhcfz2q3qyvcv3jrvbb012qy21pfgjl8lv20ywfr1"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ;no "check" target
- #:make-flags '("CFLAGS=-fcommon")
- #:phases
- (modify-phases %standard-phases
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (lib (string-append out "/lib"))
- (doc (string-append out "/share/doc/bwa"))
- (man (string-append out "/share/man/man1")))
- (install-file "bwa" bin)
- (install-file "libbwa.a" lib)
- (install-file "README.md" doc)
- (install-file "bwa.1" man))))
- ;; no "configure" script
- (delete 'configure))))
+ (list #:tests? #f ;no "check" target
+ #:make-flags #~(list "CFLAGS=-fcommon"
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib"))
+ (doc (string-append out "/share/doc/bwa"))
+ (man (string-append out "/share/man/man1")))
+ (install-file "bwa" bin)
+ (install-file "libbwa.a" lib)
+ (install-file "README.md" doc)
+ (install-file "bwa.1" man))))
+ ;; no "configure" script
+ (delete 'configure))))
(inputs (list zlib))
- ;; Non-portable SSE instructions are used so building fails on platforms
- ;; other than x86_64.
- (supported-systems '("x86_64-linux"))
+ (supported-systems '("x86_64-linux" "aarch64-linux"))
(home-page "https://bio-bwa.sourceforge.net/")
(synopsis "Burrows-Wheeler sequence aligner")
(description
@@ -4034,7 +4308,8 @@ and more accurate. BWA-MEM also has better performance than BWA-backtrack for
(license license:gpl3+)))
(define-public bwa-pssm
- (package (inherit bwa)
+ (package
+ (inherit bwa)
(name "bwa-pssm")
(version "0.5.11")
(source (origin
@@ -4049,12 +4324,12 @@ and more accurate. BWA-MEM also has better performance than BWA-backtrack for
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments bwa)
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-after 'unpack 'patch-C-error
- (lambda _
- (substitute* "pssm.c"
- (("inline int map") "int map"))))))))
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch-C-error
+ (lambda _
+ (substitute* "pssm.c"
+ (("inline int map") "int map"))))))))
(inputs
(list gdsl zlib perl))
;; https://bwa-pssm.binf.ku.dk is down, and all Web Archived copies are
@@ -4220,6 +4495,102 @@ It is designed to provide functionality to load, process, and store multimodal
omics data.")
(license license:bsd-3)))
+(define-public python-mofapy2
+ (package
+ (name "python-mofapy2")
+ (version "0.7.1")
+ (source
+ (origin
+ ;; The tarball from PyPi doesn't include tests.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bioFAM/mofapy2")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ahhnqk6gjrhyq286mrd5n7mxcv8l6040ffsawbjx9maqx8wbam0"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; cupy is an optional dependency, which
+ ;; itself has nonfree dependencies (CUDA)
+ '(list "--ignore=mofapy2/notebooks/test_cupy.py")))
+ (propagated-inputs (list python-anndata
+ python-h5py
+ python-numpy
+ python-pandas
+ python-scikit-learn
+ python-scipy))
+ (native-inputs (list python-poetry-core
+ python-pytest))
+ (home-page "https://biofam.github.io/MOFA2/")
+ (synopsis "Multi-omics factor analysis")
+ (description "MOFA is a factor analysis model that provides a general
+framework for the integration of multi-omic data sets in an unsupervised
+fashion. Intuitively, MOFA can be viewed as a versatile and statistically
+rigorous generalization of principal component analysis to multi-omics data.
+Given several data matrices with measurements of multiple -omics data types on
+the same or on overlapping sets of samples, MOFA infers an interpretable
+low-dimensional representation in terms of a few latent factors. These learnt
+factors represent the driving sources of variation across data modalities,
+thus facilitating the identification of cellular states or disease
+subgroups.")
+ (license license:lgpl3)))
+
+(define-public python-muon
+ (package
+ (name "python-muon")
+ (version "0.1.6")
+ (source
+ (origin
+ ;; The tarball from PyPi doesn't include tests.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scverse/muon")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1kd3flgy41dc0sc71wfnirh8vk1psxgyjxkbx1zx9yskkh6anbgw"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; Even providing a random seed, scipy.sparse.rand produces inconsistent
+ ;; results across scipy versions.
+ '(list "-k" "not test_tfidf")
+ #:phases
+ '(modify-phases %standard-phases
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'build 'set-numba-cache-dir
+ (lambda _
+ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+ (propagated-inputs (list python-anndata
+ python-h5py
+ python-matplotlib
+ python-mofapy2
+ python-mudata
+ python-numba
+ python-numpy
+ python-pandas
+ python-protobuf
+ python-pybedtools
+ python-pysam
+ python-scanpy
+ python-scikit-learn
+ python-seaborn
+ python-tqdm
+ python-umap-learn))
+ (native-inputs (list python-flit-core
+ python-pytest
+ python-pytest-flake8))
+ (home-page "https://github.com/scverse/muon")
+ (synopsis "Multimodal omics analysis framework")
+ (description "muon is a multimodal omics Python framework.")
+ (license license:bsd-3)))
+
(define-public python-pyega3
(deprecated-package "python-pyega3" python-ega-download-client))
@@ -4363,7 +4734,7 @@ UCSC genome browser.")
(list openssl))
(native-inputs
`(("python-cython" ,python-cython)
- ("python-nose" ,python-nose)
+ ("python-pytest" ,python-pytest)
("test-data"
,(origin
(method url-fetch)
@@ -5186,25 +5557,24 @@ and record oriented data modeling and the Semantic Web.")
(define-public python-scikit-bio
(package
(name "python-scikit-bio")
- (version "0.5.9")
+ (version "0.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "scikit-bio" version))
(sha256
(base32
- "0429060pkyq1pm19zb2n1la7czh7b633mp4a4h01j8zfigf49q3s"))
- (patches (search-patches "python-scikit-bio-1887.patch"))))
+ "03y1n91p6m44hhxm3rpb355j6ddalydz49s94h85kbhm7iy5l40h"))))
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags
;; Accuracy problem
- #:test-flags '(list "-k" "not test_fisher_alpha")
+ '(list "-k" (string-append "not test_fisher_alpha"
+ ;; UNEXPECTED EXCEPTION: ValueError("could
+ ;; not convert string to float: 'gut'")
+ " and not skbio.diversity"))
#:phases
'(modify-phases %standard-phases
- (add-after 'unpack 'compatibility
- (lambda _
- (substitute* "skbio/diversity/__init__.py"
- ((", numeric_only=True") ""))))
(add-before 'check 'build-extensions
(lambda _
;; Cython extensions have to be built before running the tests.
@@ -5214,11 +5584,10 @@ and record oriented data modeling and the Semantic Web.")
(when tests?
(apply invoke "python3" "-m" "skbio.test" test-flags)))))))
(propagated-inputs
- (list python-decorator
+ (list python-biom-format
+ python-decorator
python-h5py
python-hdmedians
- python-ipython
- python-matplotlib
python-natsort
python-numpy
python-pandas
@@ -5806,7 +6175,8 @@ apart transcripts derived from paralogous genes.")
(wrap-program (string-append bin "/RepeatMasker")
`("PERL5LIB" ":" prefix (,path ,share)))))))))
(inputs
- (list perl
+ (list bash-minimal
+ perl
perl-text-soundex
python
python-h5py
@@ -5823,6 +6193,82 @@ be of arbitrary length. Repeats with pattern size in the range from 1 to 2000
bases are detected.")
(license license:osl2.1)))
+(define-public trust4
+ (package
+ (name "trust4")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/liulab-dfci/TRUST4")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "170k4rrchg7f2jyn3v4y4fxxq1d49n1vnvhx5xcnnr6jql8q3h08"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled samtools
+ (delete-file-recursively "samtools-0.1.19")))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;there are no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-samtools-headers
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("LINKPATH= -I./samtools-0.1.19 -L./samtools-0.1.19")
+ (string-append "LINKPATH= -I."
+ #$(this-package-native-input "samtools")
+ "/include/samtools"
+ " -L."
+ #$(this-package-native-input "samtools")
+ "/lib"))
+ (("./samtools-0.1.19/")
+ (string-append #$(this-package-native-input
+ "samtools") "/lib/")))
+ (substitute* "alignments.hpp"
+ (("samtools-0.1.19")
+ (string-append #$(this-package-native-input
+ "samtools") "/include/samtools")))))
+ (delete 'configure) ; No configure.
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
+ (scripts (string-append #$output
+ "/share/trust4/scripts")))
+ (install-file "annotator" bin)
+ (install-file "bam-extractor" bin)
+ (install-file "fastq-extractor" bin)
+ (install-file "run-trust4" bin)
+ (install-file "trust4" bin)
+ ;; install scripts stored in the scrips dir
+ (for-each (lambda (file)
+ (chmod file #o555))
+ (find-files "scripts" "\\.p(y|l)"))
+ (copy-recursively "scripts" scripts)
+ (delete-file-recursively "scripts")
+ ;; install the rest of the scripts that are in the main dir
+ (for-each (lambda (file)
+ (chmod file #o555)
+ (install-file file bin))
+ (find-files "." "\\.(pl|py|sh)"))))))))
+ (native-inputs (list automake samtools-0.1))
+ (inputs (list perl python-wrapper zlib))
+ (home-page "https://github.com/liulab-dfci/TRUST4")
+ (synopsis "TCR and BCR assembly from RNA-seq data")
+ (description "This package is analyzing @acronym{TCR, T cell receptor} and
+@acronym{BCR, B cell receptor} sequences using unselected RNA sequencing data,
+profiled from fluid and solid tissues, including tumors. TRUST4 performs de
+novo assembly on V, J, C genes including the hypervariable @acronym{CDR3,
+complementarity-determining region 3} and reports consensus contigs of BCR/TCR
+sequences. TRUST4 then realigns the contigs to IMGT reference gene sequences to
+identify the corresponding gene and CDR3 details. TRUST4 supports both single-end
+and paired-end bulk or single-cell sequencing data with any read length.")
+ (license license:gpl3)))
+
(define-public diamond
(package
(name "diamond")
@@ -6021,8 +6467,7 @@ and utility programs for sequence analysis.")
(substitute* "rchive.go"
;; This go library does not have any license.
(("github.com/fiam/gounidecode/unidecode")
- "golang.org/rainycape/unidecode"))
- #t))))
+ "golang.org/rainycape/unidecode"))))))
(build-system perl-build-system)
(arguments
`(#:phases
@@ -6035,8 +6480,7 @@ and utility programs for sequence analysis.")
;; Ignore errors about missing xtract.Linux and rchive.Linux.
(substitute* "pm-refresh"
(("cat \\\"\\$target")
- "grep ^[[:digit:]] \"$target"))
- #t))
+ "grep ^[[:digit:]] \"$target"))))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
@@ -6052,8 +6496,7 @@ and utility programs for sequence analysis.")
(symlink (string-append edirect-go "/bin/xtract.Linux")
(string-append bin "/xtract"))
(symlink (string-append edirect-go "/bin/rchive.Linux")
- (string-append bin "/rchive")))
- #t))
+ (string-append bin "/rchive")))))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure everything can run in a pure environment.
@@ -6070,16 +6513,15 @@ and utility programs for sequence analysis.")
,(dirname (which "grep"))
,(dirname (which "perl"))
,(dirname (which "uname"))))))
- (find-files out ".")))
- #t))
+ (find-files out ".")))))
(add-after 'wrap-program 'check
(lambda* (#:key outputs #:allow-other-keys)
(invoke (string-append (assoc-ref outputs "out")
"/bin/edirect.pl")
- "-filter" "-help")
- #t)))))
+ "-filter" "-help"))))))
(inputs
- (list edirect-go-programs
+ (list bash-minimal
+ edirect-go-programs
perl-html-parser
perl-encode-locale
perl-file-listing
@@ -6383,6 +6825,29 @@ Illumina paired-end data (for CASAVA 1.8+).")
average nucleotide identity.")
(license license:expat)))
+(define-public python-pyahocorasick
+ (package
+ (name "python-pyahocorasick")
+ (version "2.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WojciechMula/pyahocorasick")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fsnivwcw56q7lwz41c5kbfvxv0v17mmkx43i2a293l49fxj08j8"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-twine python-wheel))
+ (home-page "https://github.com/WojciechMula/pyahocorasick")
+ (synopsis "Library for finding multiple key strings in text")
+ (description
+ "Pyahocorasick is a fast, memory-efficient library for multi-pattern string search.
+This means that you can find multiple key strings occurrences
+at once in some input text.")
+ (license license:bsd-3)))
+
(define-public exonerate
(package
(name "exonerate")
@@ -8071,7 +8536,7 @@ translated into a human-readable text format using the @code{jellyfish dump}
command, or queried for specific k-mers with @code{jellyfish query}.")
(home-page "http://www.genome.umd.edu/jellyfish.html")
;; JELLYFISH seems to be 64-bit only.
- (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux"))
+ (supported-systems %64bit-supported-systems)
;; One of these licenses may be picked
(license (list license:gpl3+ license:bsd-3))))
@@ -8345,8 +8810,7 @@ selection, etc.).")
(("^rm -f mafft-distance mafft-distance.exe") ")#")
;; do not install MAN pages in libexec folder
(("^\t\\$\\(INSTALL\\) -m 644 \\$\\(MANPAGES\\) \
-\\$\\(DESTDIR\\)\\$\\(LIBDIR\\)") "#"))
- #t))
+\\$\\(DESTDIR\\)\\$\\(LIBDIR\\)") "#"))))
(add-after 'enter-dir 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("pairash.c"
@@ -8354,8 +8818,7 @@ selection, etc.).")
(("perl") (which "perl"))
(("([\"`| ])awk" _ prefix)
(string-append prefix (which "awk")))
- (("grep") (which "grep")))
- #t))
+ (("grep") (which "grep")))))
(delete 'configure)
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -8368,7 +8831,7 @@ selection, etc.).")
`("PATH" ":" prefix (,path))))
(find-files bin))))))))
(inputs
- (list perl ruby gawk grep coreutils))
+ (list bash-minimal perl ruby gawk grep coreutils))
(home-page "https://mafft.cbrc.jp/alignment/software/")
(synopsis "Multiple sequence alignment program")
(description
@@ -8778,7 +9241,7 @@ predicts the locations of structural units in the sequences.")
(define-public proteinortho
(package
(name "proteinortho")
- (version "6.0.14")
+ (version "6.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8787,52 +9250,48 @@ predicts the locations of structural units in the sequences.")
(file-name (git-file-name name version))
(sha256
(base32
- "0pmy617zy2z2w6hjqxjhf3rzikf5n3mpia80ysq8233vfr7wrzff"))
+ "0p8iaxq193fh67hw3cydvdah1vz1c3f18227gj1mhkww0ms7g6xa"))
(modules '((guix build utils)))
(snippet
'(begin
- ;; remove pre-built scripts
+ ;; Remove pre-built scripts and source tarballs.
(delete-file-recursively "src/BUILD/")
- #t))))
+ (delete-file "src/lapack-3.8.0.tar.gz")))))
(build-system gnu-build-system)
(arguments
- `(#:test-target "test"
- #:make-flags '("CC=gcc")
+ (list
+ #:test-target "test"
+ #:parallel-tests? #f
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "CXX=" #$(cxx-for-target))
+ (string-append "PREFIX=" #$output)
+ (string-append "INSTALLDIR=" #$output "/bin"))
#:phases
- (modify-phases %standard-phases
- (replace 'configure
- ;; There is no configure script, so we modify the Makefile directly.
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "Makefile"
- (("INSTALLDIR=.*")
- (string-append
- "INSTALLDIR=" (assoc-ref outputs "out") "/bin\n"))
- (("-llapack -lblas")
- "-lopenblas"))
- #t))
- (add-before 'install 'make-install-directory
- ;; The install directory is not created during 'make install'.
- (lambda* (#:key outputs #:allow-other-keys)
- (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))
- #t))
- (add-after 'install 'wrap-programs
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((path (getenv "PATH"))
- (out (assoc-ref outputs "out"))
- (guile (search-input-file inputs "bin/guile")))
- (for-each (lambda (script)
- (wrap-script script #:guile guile
- `("PATH" ":" prefix (,path))))
- (cons (string-append out "/bin/proteinortho")
- (find-files out "\\.(pl|py)$"))))
- #t)))))
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'make-install-directory
+ ;; The install directory is not created during 'make install'.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((path (getenv "PATH"))
+ (out (assoc-ref outputs "out"))
+ (guile (search-input-file inputs "bin/guile")))
+ (for-each (lambda (script)
+ (wrap-script script #:guile guile
+ `("PATH" ":" prefix (,path))))
+ (cons (string-append out "/bin/proteinortho")
+ (find-files out "\\.(pl|py)$")))))))))
(inputs
- `(("guile" ,guile-3.0) ; for wrap-script
- ("diamond" ,diamond)
- ("perl" ,perl)
- ("python" ,python-wrapper)
- ("blast+" ,blast+)
- ("openblas" ,openblas)))
+ (list bash-minimal
+ guile-3.0 ; for wrap-script
+ diamond
+ perl
+ python-wrapper
+ blast+
+ openblas))
(native-inputs
(list which))
(home-page "https://www.bioinf.uni-leipzig.de/Software/proteinortho")
@@ -8842,6 +9301,7 @@ predicts the locations of structural units in the sequences.")
species. For doing so, it compares similarities of given gene sequences and
clusters them to find significant groups. The algorithm was designed to handle
large-scale data and can be applied to hundreds of species at once.")
+ (properties `((tunable? . #t)))
(license license:gpl3+)))
(define-public prodigal
@@ -8906,8 +9366,7 @@ partial genes, and identifies translation initiation sites.")
(for-each (lambda (file)
(display file)(display "\n")
(invoke "perl" file))
- (find-files "t" ".*\\.t$"))
- #t))
+ (find-files "t" ".*\\.t$"))))
(replace 'install
;; There is no 'install' target in the Makefile.
(lambda* (#:key outputs #:allow-other-keys)
@@ -8918,8 +9377,7 @@ partial genes, and identifies translation initiation sites.")
(mkdir-p bin)
(mkdir-p perl)
(copy-recursively "bin" bin)
- (copy-recursively "lib" perl)
- #t)))
+ (copy-recursively "lib" perl))))
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -8945,39 +9403,39 @@ partial genes, and identifies translation initiation sites.")
(,(string-append r-site-lib ":" out "/site-library/"))))
(wrap-program file
`("PATH" ":" prefix
- (,(string-append coreutils-path ":" out "/bin"))))))
- #t)))))
+ (,(string-append coreutils-path ":" out "/bin")))))))))))
(native-inputs
(list perl-env-path perl-test-files perl-test-most perl-test-output))
(inputs
- `(("perl-array-utils" ,perl-array-utils)
- ("bioperl" ,bioperl-minimal)
- ("perl-digest-md5-file" ,perl-digest-md5-file)
- ("perl-exception-class" ,perl-exception-class)
- ("perl-file-find-rule" ,perl-file-find-rule)
- ("perl-file-grep" ,perl-file-grep)
- ("perl-file-slurper" ,perl-file-slurper)
- ("perl-file-which" ,perl-file-which)
- ("perl-graph" ,perl-graph)
- ("perl-graph-readwrite" ,perl-graph-readwrite)
- ("perl-log-log4perl" ,perl-log-log4perl)
- ("perl-moose" ,perl-moose)
- ("perl-perlio-utf8_strict" ,perl-perlio-utf8_strict)
- ("perl-text-csv" ,perl-text-csv)
- ("bedtools" ,bedtools)
- ("cd-hit" ,cd-hit)
- ("blast+" ,blast+)
- ("mcl" ,mcl)
- ("parallel" ,parallel)
- ("prank" ,prank)
- ("mafft" ,mafft)
- ("fasttree" ,fasttree)
- ("grep" ,grep)
- ("sed" ,sed)
- ("gawk" ,gawk)
- ("r-minimal" ,r-minimal)
- ("r-ggplot2" ,r-ggplot2)
- ("coreutils" ,coreutils)))
+ (list bash-minimal
+ perl-array-utils
+ bioperl-minimal
+ perl-digest-md5-file
+ perl-exception-class
+ perl-file-find-rule
+ perl-file-grep
+ perl-file-slurper
+ perl-file-which
+ perl-graph
+ perl-graph-readwrite
+ perl-log-log4perl
+ perl-moose
+ perl-perlio-utf8_strict
+ perl-text-csv
+ bedtools
+ cd-hit
+ blast+
+ mcl
+ parallel
+ prank
+ mafft
+ fasttree
+ grep
+ sed
+ gawk
+ r-minimal
+ r-ggplot2
+ coreutils))
(home-page "https://sanger-pathogens.github.io/Roary/")
(synopsis "High speed stand-alone pan genome pipeline")
(description
@@ -9109,7 +9567,7 @@ phylogenies.")
"rsem-run-ebseq"
"rsem-run-prsem-testing-procedure"))))))))
(inputs
- (list boost r-minimal perl htslib-1.3 zlib))
+ (list bash-minimal boost r-minimal perl htslib-1.3 zlib))
(home-page "https://deweylab.biostat.wisc.edu/rsem/")
(synopsis "Estimate gene expression levels from RNA-Seq data")
(description
@@ -9236,6 +9694,11 @@ to the user's query of interest.")
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list "--with-ncurses")
+ ;; The samtools test suite (and software) expects SSE-based math, even on
+ ;; i686-linux, and not 387-based math. Adjust the CPPFLAGS accordingly.
+ ,@(if (target-x86-32?)
+ `(#:make-flags (list "CPPFLAGS = -msse -mfpmath=sse"))
+ '())
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
@@ -11213,6 +11676,41 @@ tasks.")
Pore-C concatemers.")
(license license:gpl3))))
+(define-public r-cmdstanr
+ (let ((commit "a45d4f7d686aa6b57ce25f342a71eea79507f01c")
+ (revision "1"))
+ (package
+ (name "r-cmdstanr")
+ (version (git-version "0.8.1.9000" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stan-dev/cmdstanr")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01vyh3sy704rs7yvaka2hp6vld0mdl7hbrs20dpbwidgm4ksrvsi"))))
+ (properties `((upstream-name . "cmdstanr")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate
+ r-data-table
+ r-jsonlite
+ r-posterior
+ r-processx
+ r-r6
+ r-rlang
+ r-withr))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/stan-dev/cmdstanr")
+ (synopsis "R interface to 'CmdStan'")
+ (description
+ "This package provides a lightweight interface to Stan
+<https://mc-stan.org>. The @code{CmdStanR} interface is an alternative
+to RStan that calls the command line interface for compilation and
+running algorithms instead of interfacing with C++ via Rcpp'.")
+ (license license:bsd-3))))
+
(define-public r-dnamcrosshyb
;; There aren't any releases.
(let ((commit "fe8acb33667e81f00dcb84e0fa75c87ab2db5d8f")
@@ -11760,6 +12258,47 @@ analysis of cell types, subtypes, transcriptional gradients,cell-cycle
variation, gene modules and their regulatory models and more.")
(license license:expat))))
+(define-public r-metadeconfoundr
+ ;; There are some relevant updates after the release of version 0.3.0.
+ (let ((commit "90aec0226c5128bfcbbc08903452eff460d21424")
+ (revision "1"))
+ (package
+ (name "r-metadeconfoundr")
+ (version (git-version "0.3.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/TillBirkner/metadeconfoundR")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zkqar27p5qwq46xbxsw5x1pl50xbkgqiizw5bydlyhwb0ga2f3h"))))
+ (properties `((upstream-name . "metadeconfoundR")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bigmemory
+ r-detectseparation
+ r-doparallel
+ r-dosnow
+ r-foreach
+ r-futile-logger
+ r-ggplot2
+ r-lme4
+ r-lmtest
+ r-reshape2
+ r-snow))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/TillBirkner/metadeconfoundR")
+ (synopsis "Check multiple covariates for potenial confounding effects")
+ (description
+ "This package detects naive associations between omics features and
+metadata in cross-sectional data-sets using non-parametric tests. In a second
+step, confounding effects between metadata associated to the same omics
+feature are detected and labeled using nested post-hoc model comparison tests.
+The generated output can be graphically summarized using the built-in plotting
+function.")
+ (license license:gpl2))))
+
(define-public r-sleuth
(package
(name "r-sleuth")
@@ -12063,13 +12602,12 @@ expression.")
(license license:gpl3))))
(define-public r-icellnet
- ;; v1.0 tagged in 2020, last commit contains many fixes.
- ;; DESCRIPTION says Version: 0.0.0.9000.
- (let ((commit "b9c05488fb8b5ea69bd560018966eaf4e25f82a")
- (revision "0"))
+ ;; This is an arbitrary commit because there is no tag for 2.2.1.
+ (let ((commit "e10ee4ae5feaf8130764dcb0736957d2a90b828c")
+ (revision "1"))
(package
(name "r-icellnet")
- (version (git-version "1.0" revision commit))
+ (version (git-version "2.2.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -12078,15 +12616,18 @@ expression.")
(file-name (git-file-name name version))
(sha256
(base32
- "0cld7d6xqnvd0zpcpg3sx73an6vdc9divzywgnn6zxnqcd987cnw"))))
+ "0bszxw9zcsd1gxhg9q89jfzi95266wfjn74hp7z8yb99cr3j53k4"))))
(build-system r-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list
+ #:phases
+ '(modify-phases %standard-phases
(add-after 'unpack 'enter-dir
(lambda _ (chdir "icellnet"))))))
(propagated-inputs
(list r-annotationdbi
+ r-complexheatmap
+ r-circlize
r-data-table
r-dplyr
r-ggplot2
@@ -12772,7 +13313,8 @@ data. It also generates basic statistics for your sequences.")
(when tests?
(invoke "make" "check")))))))
(inputs
- (list boost
+ (list bash-minimal
+ boost
htslib
python
python-biopython
@@ -13042,55 +13584,53 @@ secondary structure and comparative analysis in R.")
(license license:gpl3+)))
(define-public rcas-web
- (package
- (name "rcas-web")
- (version "0.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/BIMSBbioinfo/rcas-web/"
- "releases/download/v" version
- "/rcas-web-" version ".tar.gz"))
- (sha256
- (base32
- "0wq951aj45gqki1bickg876i993lmawkp8x24agg264br5x716db"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'find-RCAS
- ;; The configure script can't find non-1.3.x versions of RCAS because
- ;; its R expression ‘1.10.1 >= 1.3.4’ evaluates to false.
- (lambda _
- (substitute* "configure"
- (("1\\.3\\.4") "0.0.0"))
- #t))
- (add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (json (assoc-ref inputs "guile-json"))
- (redis (assoc-ref inputs "guile-redis"))
- (path (string-append
- json "/share/guile/site/2.2:"
- redis "/share/guile/site/2.2")))
- (wrap-program (string-append out "/bin/rcas-web")
- `("GUILE_LOAD_PATH" ":" = (,path))
- `("GUILE_LOAD_COMPILED_PATH" ":" = (,path))
- `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))))
- #t)))))
- (inputs
- `(("r-minimal" ,r-minimal)
- ("r-rcas" ,r-rcas)
- ("guile" ,guile-2.2)
- ("guile-json" ,guile-json-1)
- ("guile-redis" ,guile2.2-redis)))
- (native-inputs
- (list pkg-config))
- (home-page "https://github.com/BIMSBbioinfo/rcas-web")
- (synopsis "Web interface for RNA-centric annotation system (RCAS)")
- (description "This package provides a simple web interface for the
+ (let ((commit "71c93e3835653beb4eaa6e89b860bee3779729b8")
+ (revision "2"))
+ (package
+ (name "rcas-web")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/BIMSBbioinfo/rcas-web")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0232g0f7g0w5cgaib462zbfssvfq8i0iqv5b5wfmbrbn0sw99l9a"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((json #$(this-package-input "guile-json"))
+ (redis #$(this-package-input "guile-redis"))
+ (path (string-append
+ json "/share/guile/site/3.0:"
+ redis "/share/guile/site/3.0")))
+ (wrap-program (string-append #$output "/bin/rcas-web")
+ `("GUILE_LOAD_PATH" ":" = (,path))
+ `("GUILE_LOAD_COMPILED_PATH" ":" = (,path))
+ `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))))))))))
+ (inputs
+ (list bash-minimal
+ r-minimal
+ r-rcas
+ guile-3.0
+ guile-json-4
+ guile-redis))
+ (native-inputs
+ (list autoconf
+ automake
+ pkg-config))
+ (home-page "https://github.com/BIMSBbioinfo/rcas-web")
+ (synopsis "Web interface for RNA-centric annotation system (RCAS)")
+ (description "This package provides a simple web interface for the
@dfn{RNA-centric annotation system} (RCAS).")
- (license license:agpl3+)))
+ (license license:agpl3+))))
(define-public r-chipkernels
(let ((commit "c9cfcacb626b1221094fb3490ea7bac0fd625372")
@@ -13159,6 +13699,45 @@ bound and non bound genomic regions to accurately identify transcription
factors bound at the specific regions.")
(license license:gpl2+)))
+(define-public r-seraster
+ ;; There are no tags or releases.
+ (let ((commit "4fdc1ffe5d3feb65de9880329d221cf276b393a1")
+ (revision "1"))
+ (package
+ (name "r-seraster")
+ (version (git-version "0.99.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JEFworks-Lab/SEraster")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y33lk8q0h9nfzmf7slxxvw3l0djassp4l63nsjpm3p6z4pah5s4"))))
+ (properties `((upstream-name . "SEraster")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-biocparallel
+ r-ggplot2
+ r-matrix
+ r-rearrr
+ r-sf
+ r-spatialexperiment
+ r-summarizedexperiment))
+ (home-page "https://github.com/JEFworks-Lab/SEraster")
+ (synopsis
+ "Rasterization framework for scalable spatial omics data analysis")
+ (description
+ "This package is a rasterization preprocessing framework that aggregates
+cellular information into spatial pixels to reduce resource requirements for
+spatial omics data analysis. SEraster reduces the number of points in spatial
+omics datasets for downstream analysis through a process of rasterization where
+single cells gene expression or cell-type labels are aggregated into equally
+sized pixels based on a user-defined resolution. SEraster can be incorporated
+with other packages to conduct downstream analyses for spatial omics datasets,
+such as detecting spatially variable genes.")
+ (license license:gpl3))))
+
(define-public emboss
(package
(name "emboss")
@@ -13515,6 +14094,50 @@ for analyzing gene-level association tests in meta-analyses for binary
trait.")
(license license:gpl3)))
+(define-public r-rnacrosslinkoo
+ (let ((commit "a317e0fa6ddf34c309529d57390769e2b2b5bfb7")
+ (revision "1"))
+ (package
+ (name "r-rnacrosslinkoo")
+ (version (git-version "0.1.3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cran/rnaCrosslinkOO")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0csv9924z0ish960k034qzv3gxh1yabnxni8hsrn5j6xl1r3cdpl"))))
+ (properties `((upstream-name . "rnaCrosslinkOO")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-classdiscovery
+ r-doparallel
+ r-foreach
+ r-genomicranges
+ r-ggplot2
+ r-ggrepel
+ r-heatmap3
+ r-igraph
+ r-iranges
+ r-mass
+ r-mixtools
+ r-patchwork
+ r-r4rna
+ r-rcolorbrewer
+ r-reshape2
+ r-rrna
+ r-s4vectors
+ r-seqinr
+ r-tidyverse
+ r-topdom))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/cran/rnaCrosslinkOO")
+ (synopsis "Analysis of RNA crosslinking data")
+ (description
+ "The package is ideal for analyzing RNA structure and chemical probing data.")
+ (license license:gpl3))))
+
(define-public r-rnaseqdtu
(let ((commit "5bee1e769d2e1dc6a3f1cecb78078050eeb5b9ac")
(revision "1"))
@@ -13733,6 +14356,58 @@ an important subset of samtools functionality, including view, index,
sort, markdup, and depth.")
(license license:gpl2+)))
+(define-public r-rphyloxml
+ (let ((commit "a30e39249239b2de01d6964ae2a2205a6c48b475")
+ (revision "1"))
+ (package
+ (name "r-rphyloxml")
+ (version (git-version "0.0-9000" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/USCbiostats/rphyloxml")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15ijzqvjxx6vqyqlg5asdbqlhw1g0ix6palf1rism3si0qapddgw"))
+ (snippet
+ '(delete-file "docs/jquery.sticky-kit.min.js"))))
+ (properties `((upstream-name . "rphyloxml")))
+ (build-system r-build-system)
+ (arguments
+ (list
+ #:modules
+ '((guix build r-build-system)
+ (guix build minify-build-system)
+ (guix build utils))
+ #:imported-modules
+ `(,@%r-build-system-modules (guix build minify-build-system))
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'process-javascript
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "inst/"
+ (minify (assoc-ref inputs "js-jquery-sticky-kit")
+ #:target "docs/jquery.sticky-kit.min.js")))))))
+ (propagated-inputs (list r-ape r-xml2))
+ (native-inputs
+ `(("esbuild" ,esbuild)
+ ("js-jquery-sticky-kit"
+ ,(origin
+ (method url-fetch)
+ (uri "https://raw.githubusercontent.com/leafo/sticky-kit/\
+v1.1.2/jquery.sticky-kit.js")
+ (sha256
+ (base32
+ "17c3a1hqc3ybwj7hpw8prazajp2x98aq7nyfn71h6lzjvblq297g"))))))
+ (home-page "https://github.com/USCbiostats/rphyloxml")
+ (synopsis "Read and write phyloXML files in R")
+ (description
+ "The package reads phylogenetic data in the @code{phyloXML} format.
+It also includes functions for writing data in this format.")
+ (license license:expat))))
+
(define-public ritornello
(package
(name "ritornello")
@@ -14028,8 +14703,8 @@ applications for tackling some common problems in a user-friendly way.")
;; We use this seemingly arbitrary commit because of
;; https://github.com/3DGenomes/TADbit/issues/371
(define-public tadbit
- (let ((commit "5c4c1ddaadfbaf7e6edc58173e46d801093bdc9b")
- (revision "1"))
+ (let ((commit "283812901a00078c725bd9f0ee33366af6783969")
+ (revision "2"))
(package
(name "tadbit")
(version (git-version "1.0.1" revision commit))
@@ -14041,32 +14716,43 @@ applications for tackling some common problems in a user-friendly way.")
(file-name (git-file-name name version))
(sha256
(base32
- "17nwlvjgqpa7x6jgh56m3di61ynaz34kl1jamyv7r2a5rhfcbkla"))))
+ "07q0alxah6xl1hibaj1kj7pdzq3pg6csyapsihbwlbmqyfmllbgz"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-problems-with-setup.py
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "src/test/Makefile"
- (("^CFLAGS=") "CFLAGS= -fcommon"))
-
- ;; Don't attempt to install the bash completions to
- ;; the home directory.
- (rename-file "extras/.bash_completion"
- "extras/tadbit")
- (substitute* "setup.py"
- (("\\(path.expanduser\\('~'\\)")
- (string-append "(\""
- (assoc-ref outputs "out")
- "/etc/bash_completion.d\""))
- (("extras/\\.bash_completion")
- "extras/tadbit"))))
- (replace 'check
- (lambda* (#:key tests? inputs outputs #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (invoke "python3" "test/test_all.py")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Scipy 1.12 no longer has binom_test or polyfit
+ (add-after 'unpack 'scipy-compatibility
+ (lambda _
+ (substitute* '("_pytadbit/modelling/imp_modelling.py"
+ "_pytadbit/modelling/restraints.py")
+ (("from scipy .*import polyfit")
+ "from numpy import polyfit"))
+ (substitute* "_pytadbit/mapping/restriction_enzymes.py"
+ (("from scipy.stats import binom_test")
+ "from scipy.stats import binomtest")
+ (("binom_test\\(pats[k]['count'], nreads, 0.25\\*\\*len\\(k\\), alternative='greater'\\)")
+ "binomtest(pats[k]['count'], nreads, 0.25**len(k), alternative='greater').pval"))))
+ (add-after 'unpack 'fix-problems-with-setup.py
+ (lambda _
+ (substitute* "src/test/Makefile"
+ (("^CFLAGS=") "CFLAGS= -fcommon"))
+
+ ;; Don't attempt to install the bash completions to
+ ;; the home directory.
+ (rename-file "extras/.bash_completion"
+ "extras/tadbit")
+ (substitute* "setup.py"
+ (("\\(path.expanduser\\('~'\\)")
+ (string-append "(\"" #$output
+ "/etc/bash_completion.d\""))
+ (("extras/\\.bash_completion")
+ "extras/tadbit"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python3" "test/test_all.py")))))))
(native-inputs
(list `(,glib "bin") ;for gtester
glib
@@ -14080,7 +14766,8 @@ applications for tackling some common problems in a user-friendly way.")
python-scipy
python-numpy
python-matplotlib
- python-pysam))
+ python-pysam
+ r-minimal))
(home-page "https://3dgenomes.github.io/TADbit/")
(synopsis "Analyze, model, and explore 3C-based data")
(description
@@ -15759,7 +16446,7 @@ once. This package provides tools to perform Drop-seq analyses.")
(define-public pigx-rnaseq
(package
(name "pigx-rnaseq")
- (version "0.1.0")
+ (version "0.1.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/"
@@ -15767,7 +16454,7 @@ once. This package provides tools to perform Drop-seq analyses.")
"/pigx_rnaseq-" version ".tar.gz"))
(sha256
(base32
- "0acdjimfb9ywba8zsv7lavv436pmcmp8ra683h11wr4s3681pqk8"))))
+ "0mlas0srl04mvgsyydm67gg5syijf1k2f6dy7bdqqxc70fywfd08"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f ; not supported
@@ -16328,7 +17015,7 @@ version does count multisplits.")
(define-public minimap2
(package
(name "minimap2")
- (version "2.24")
+ (version "2.28")
(source
(origin
(method url-fetch)
@@ -16337,7 +17024,7 @@ version does count multisplits.")
"minimap2-" version ".tar.bz2"))
(sha256
(base32
- "05d6h2c1h95s5vblf1fijn9g0r4g69nsvkabji42j642y0gw7m4x"))))
+ "1d50j9fdmmaj7sdf4f49xddc235f7032lwh5ijgi2afj6lkp39gz"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -16349,8 +17036,6 @@ version does count multisplits.")
(let ((system ,(or (%current-target-system)
(%current-system))))
(cond
- ((string-prefix? "x86_64" system)
- "all")
((or (string-prefix? "i586" system)
(string-prefix? "i686" system))
"sse2only=1")
@@ -16358,7 +17043,7 @@ version does count multisplits.")
"arm_neon=1")
((string-prefix? "aarch64" system)
"aarch64=1")
- (else ""))))
+ (else "all"))))
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -16389,8 +17074,7 @@ version does count multisplits.")
Description: A versatile pairwise aligner for genomic and spliced nucleotide sequence~@
Libs: -L${libdir} -lminimap2~@
Cflags: -I${includedir}~%"
- out ,version))))
- #t)))))
+ out ,version)))))))))
(inputs
(list zlib))
(home-page "https://lh3.github.io/minimap2/")
@@ -16485,29 +17169,35 @@ Thus the per-base error rate is similar to the raw input reads.")
(base32 "1bbsn5f5x8wlspg4pbibqz6m5vin8c19nl224f3z3km0pkc97rwv"))))
(build-system qt-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda _
- (invoke "qmake" "Bandage.pro")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (substitute* "tests/bandage_command_line_tests.sh"
- (("^bandagepath=.*")
- (string-append "bandagepath=" (getcwd) "/Bandage\n")))
- (with-directory-excursion "tests"
- (setenv "XDG_RUNTIME_DIR" (getcwd))
- (invoke "./bandage_command_line_tests.sh")))
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "Bandage" (string-append out "/bin"))
- #t))))))
+ (list
+ ;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed,
+ ;; consider uncommenting the following:
+ ;;
+ ;; Prevent the (rarely updated) imagemagick/stable package from
+ ;; ending up in the closure.
+ ;; #:disallowed-references (list imagemagick/stable)
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (invoke "qmake" "Bandage.pro")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (substitute* "tests/bandage_command_line_tests.sh"
+ (("^bandagepath=.*")
+ (string-append "bandagepath=" (getcwd) "/Bandage\n")))
+ (with-directory-excursion "tests"
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (invoke "./bandage_command_line_tests.sh")))))
+ (replace 'install
+ (lambda _
+ (install-file "Bandage" (string-append #$output "/bin")))))))
(inputs
(list qtbase-5 qtsvg-5))
(native-inputs
+ ;; imagemagick/stable cannot be used here, as it will end up in
+ ;; the closure. See <https://issues.guix.gnu.org/47475>.
(list imagemagick))
(home-page "https://rrwick.github.io/Bandage/")
(synopsis
@@ -17710,6 +18400,47 @@ bound.")
bgzipped text file that contains a pair of genomic coordinates per line.")
(license license:expat)))
+(define-public python-pyrodigal
+ (package
+ (name "python-pyrodigal")
+ (version "3.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/althonos/pyrodigal")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10vxbm9i33wari0ifsr78xnfn7d0yqwzqpc5pchirjflf1mmnr6w"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:modules '((ice-9 ftw)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build utils)
+ (guix build pyproject-build-system))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (let ((cwd (getcwd))
+ (libdir (find (cut string-prefix? "lib." <>)
+ (scandir "build"))))
+ (with-directory-excursion (string-append cwd "/build/" libdir)
+ (invoke "python3" "-m" "unittest" "pyrodigal.tests" "-vv")))))))))
+ (propagated-inputs (list python-archspec python-importlib-resources))
+ (native-inputs (list python-cython-3 python-mock python-unittest2))
+ (home-page "https://github.com/althonos/pyrodigal")
+ (synopsis "Cython bindings and Python interface for Prodigal")
+ (description
+ "This package offers Cython bindings and a Python interface for Prodigal.
+ Prodigal is an ORF finder designed for both genomes and metagenomes.")
+ (license license:gpl3)))
+
(define-public python-pyfaidx
(package
(name "python-pyfaidx")
@@ -17749,14 +18480,14 @@ fasta subsequences.")
(define-public python-cooler
(package
(name "python-cooler")
- (version "0.9.1")
+ (version "0.9.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cooler" version))
(sha256
(base32
- "0capn4jj3mkxfwcc65cg644zvrv4sqr2wxr0ylx5w767jx3yb7p2"))))
+ "0qqb0i5449r6w871klsbjzxsjhdkpsaas3hvs9f1hc7ssrkf1vi1"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -17803,22 +18534,14 @@ such as Hi-C contact matrices.")
(define-public python-cooltools
(package
(name "python-cooltools")
- (version "0.5.1")
+ (version "0.7.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "cooltools" version))
(sha256
(base32
- "08hyzd3kazr87nvv6rwp5i1g9rwj7jmrly925lqnvippz4wp7k4g"))))
- (build-system python-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-v")))))))
+ "076fgqzf6453cx5zs32vz0f5yvfg53w8ayq9s79jssy7gj2x89lb"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-cython
python-pytest))
@@ -17879,7 +18602,7 @@ the HiCExplorer and pyGenomeTracks packages.")
(define-public python-hicexplorer
(package
(name "python-hicexplorer")
- (version "3.7.2")
+ (version "3.7.4")
(source
(origin
;; The latest version is not available on Pypi.
@@ -17890,16 +18613,7 @@ the HiCExplorer and pyGenomeTracks packages.")
(file-name (git-file-name name version))
(sha256
(base32
- "1yavgxry38g326z10bclvdf8glmma05fxj5m73h15m1r2l9xmw3v"))
- (modules '((guix build utils)))
- ;; setup.py is malformed. The requirements are defined using a catchall
- ;; pattern for the patch version number. This has been fixed in version
- ;; 3.7.3, but we cannot upgrade to this version yet, since some Guix
- ;; packages are not new enough. (See upstream commit
- ;; 4845c715ec7b105e938d0c2426e27d0181690bfe for the fix).
- (snippet '(substitute* "setup.py"
- (("\\.\\*")
- "")))))
+ "1cjr9l0vcngd0f4dmar388ri1ah1bqybnn53jc85xwh07wfacq7l"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -17977,21 +18691,10 @@ the HiCExplorer and pyGenomeTracks packages.")
"general/test_hicHyperoptDetectLoopsHiCCUPS.py"
"general/test_hicAggregateContacts.py"
"general/test_hicInterIntraTAD.py")
- (("^memory =.*") "memory = 1\n")))))
- ;; This is fixed in version 3.7.3, but we cannot upgrade yet as we
- ;; don't have Pandas 2.
- (add-after 'unpack 'scipy-compatibility
- (lambda _
- (substitute* "hicexplorer/hicAverageRegions.py"
- (("from scipy.sparse import csr_matrix, save_npz, lil_matrix")
- "from scipy.sparse import csr_matrix, save_npz, lil_matrix, coo_matrix")
- (("summed_matrix = np.array\\(summed_matrix\\)")
- "summed_matrix = coo_matrix(summed_matrix)")
- (("data = summed_matrix\\[np.nonzero\\(summed_matrix\\)\\]")
- "data = summed_matrix.toarray()[np.nonzero(summed_matrix)]")))))))
+ (("^memory =.*") "memory = 1\n"))))))))
(propagated-inputs
(list python-biopython
- python-cleanlab-1
+ python-cleanlab
python-cooler
python-fit-nbinom
python-future
@@ -18477,7 +19180,8 @@ datasets.")
(add-after 'register 'remove-libraries
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))))))
- (inputs (list prodigal
+ (inputs (list bash-minimal
+ prodigal
bwa
samtools
minimap2
@@ -18621,7 +19325,8 @@ phase + query phase).")
(substitute* "scripts/read_info_histograms.sh"
(("awk") (which "gawk"))))))))
(inputs
- (list gawk ;for read_info_histograms.sh
+ (list bash-minimal
+ gawk ;for read_info_histograms.sh
python-wrapper ;required for histogram.py
zlib))
(home-page "https://github.com/rrwick/Filtlong/")
@@ -18694,7 +19399,8 @@ choosing which reads pass the filter.")
`("PERL5LIB" ":" prefix (,perl5lib))))
(find-files scripts "\\.pl"))))))))
(inputs
- (list guile-3.0 ;for wrappers
+ (list bash-minimal
+ guile-3.0 ;for wrappers
eigen
hdf5
htslib
@@ -19045,7 +19751,8 @@ includes a command line tool and an analysis pipeline.")
(wrap-program (string-append bin "/draw_fusions.R")
`("R_LIBS_SITE" ":" prefix (,(getenv "R_LIBS_SITE"))))))))))
(inputs
- (list htslib
+ (list bash-minimal
+ htslib
r-minimal
r-circlize
r-genomicalignments
@@ -21087,7 +21794,7 @@ scripts for manipulating 3C/4C/5C/Hi-C data.")
(license license:asl2.0)))
(define-public ensembl-vep
- (let* ((api-version "103")
+ (let* ((api-version "112")
(api-module
(lambda (name hash)
(origin (method git-fetch)
@@ -21099,7 +21806,7 @@ scripts for manipulating 3C/4C/5C/Hi-C data.")
(sha256 (base32 hash))))))
(package
(name "ensembl-vep")
- (version (string-append api-version ".1"))
+ (version api-version)
(source
(origin
(method git-fetch)
@@ -21109,7 +21816,7 @@ scripts for manipulating 3C/4C/5C/Hi-C data.")
(file-name (git-file-name name version))
(sha256
(base32
- "1iq7p72cv9b38jz2v8a4slzy2n8y0md487943180ym9xc8qvw09c"))))
+ "0nznmiln2q6bzd3xp8d5cw56higa5w3g9rmg66956bkfky53chvw"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -21200,6 +21907,7 @@ runtests(@test_files);
perl-dbi
perl-dbd-mysql
perl-libwww
+ perl-list-moreutils
perl-http-tiny
perl-json
which))
@@ -21210,18 +21918,20 @@ runtests(@test_files);
("perl" ,perl)
("api-module-ensembl"
,(api-module "ensembl"
- "0s59rj905g72hljzfpvnx5nxwz925b917y4jp912i23f5gwxh14v"))
+ "10r576iqrz1p61mqbbfs87w4w3nldi45p51z52mq76f3n00l010h"))
("api-module-ensembl-variation"
,(api-module "ensembl-variation"
- "1dvwdzzfjhzymq02b6n4p6j3a9q4jgq0g89hs7hj1apd7zhirgkq"))
+ "0ad03xnyyqpya1bkg6igq9abqxdmi58j89wn2kb3m4bvy1zs03mf"))
("api-module-ensembl-funcgen"
,(api-module "ensembl-funcgen"
- "1x23pv38dmv0w0gby6rv3wds50qghb4v3v1mf43vk55msfxzry8n"))
+ "1m3dxnr6k9x5hmcsxckpxlqx7vbc82lk74r84vcjijgxjkfa5rpp"))
("api-module-ensembl-io"
,(api-module "ensembl-io"
- "14adb2x934lzsq20035mazdkhrkcw0qzb0xhz6zps9vk4wixwaix"))
+ "1xr6kdqqzmbi3m4bls589d1dfjvbs13dxlbf1y172xjyipvmag43"))
+ ("perl-test-deep" ,perl-test-deep)
+ ("perl-test-exception" ,perl-test-exception)
("perl-test-harness" ,perl-test-harness)
- ("perl-test-exception" ,perl-test-exception)))
+ ("perl-test-warnings" ,perl-test-warnings)))
(home-page "http://www.ensembl.org/vep")
(synopsis "Predict functional effects of genomic variants")
(description
@@ -22158,9 +22868,9 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-more-source-shebangs
@@ -22181,9 +22891,9 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
(,(string-append out "/lib/guile/" effective-version "/site-ccache")
,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))
(inputs
- `(("bash" ,bash-minimal)
- ("guile" ,guile-3.0)
- ("guile-libyaml" ,guile-libyaml)))
+ (list bash-minimal
+ guile-3.0
+ guile-libyaml))
(native-inputs
(list pkg-config
lzip
@@ -22425,9 +23135,8 @@ module capable of computing base-level alignments for very large sequences.")
"-DGDCM_DOCUMENTATION:BOOL=ON"
"-DGDCM_PDF_DOCUMENTATION:BOOL=OFF"
(string-append "-DGDCM_INSTALL_DOC_DIR="
- #$output:doc "/share/doc/" #$name)
- "-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"))) ; TODO: need ‘xsl-ns’
- (native-inputs (list doxygen graphviz))
+ #$output:doc "/share/doc/" #$name))))
+ (native-inputs (list docbook-xsl doxygen graphviz libxslt))
(home-page "https://gdcm.sourceforge.net/wiki/index.php/Main_Page")
(synopsis "Grassroots DICOM library")
(description
@@ -22532,7 +23241,8 @@ sum test, etc).")
python-tqdm))
;; Used by rpy2
(inputs
- (list r-minimal ;for R_LIBS_SITE
+ (list bash-minimal
+ r-minimal ;for R_LIBS_SITE
r-apeglm ;for runDE
r-deseq2 ;for runDE
r-drimseq ;for runDS
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index d53f717f0d..2101584df6 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -87,16 +87,16 @@
(define-public transmission
(package
(name "transmission")
- (version "4.0.5")
+ (version "4.0.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/transmission/transmission"
"/releases/download/" version "/transmission-"
version ".tar.xz"))
- (patches (search-patches "transmission-4.0.5-fix-build.patch"))
+ (patches (search-patches "transmission-4.0.6-fix-build.patch"))
(sha256
(base32
- "0mv3ds3bbp1fbmdlrjinmzvk46acpafydirh7h2014j7988zys7x"))))
+ "0py4n33wk2srdfrcd5rbrbg5p1zq6nipghlins01d693i9nzwf1a"))))
(build-system cmake-build-system)
(outputs '("out" ; library and command-line interface
"gui")) ; graphical user interface
@@ -109,10 +109,10 @@
(guix build utils))
#:phases
#~(modify-phases %standard-phases
- ;; Avoid embedding kernel version for reproducible build
+ ;; Avoid embedding kernel version for reproducible build
(add-after 'unpack 'remove-kernel-version
(lambda _
- (substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh"
+ (substitute* "third-party/miniupnp/miniupnpc/updateminiupnpcstrings.sh"
(("OS_VERSION=`uname -r`") "OS_VERSION=Guix"))))
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@@ -150,7 +150,8 @@
;; its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
- (inputs (list curl
+ (inputs (list bash-minimal
+ curl
(list glib "bin")
gtkmm
libappindicator
@@ -529,7 +530,7 @@ desktops.")
(define-public qbittorrent
(package
(name "qbittorrent")
- (version "4.6.3")
+ (version "4.6.4")
(source
(origin
(method git-fetch)
@@ -538,7 +539,7 @@ desktops.")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "01d393v0v4c9rp909l3ddif984pp1z6sym74yc0kgxqq2kplj5g1"))))
+ (base32 "0fxjsad9d35pdy0cqjlip46kwgxfim10fy70x6wymn9pagwq9j7p"))))
(build-system qt-build-system)
(arguments
(list #:configure-flags #~(list "-DTESTING=ON")
@@ -583,7 +584,7 @@ features.")
(package
(inherit qbittorrent)
(name "qbittorrent-enhanced")
- (version "4.6.3.10")
+ (version "4.6.4.10")
(source
(origin
(method git-fetch)
@@ -593,7 +594,7 @@ features.")
(file-name (git-file-name name version))
(sha256
(base32
- "09b8237h0gn6y3s0a7qg247hsdra5f5kg6xhirnhhfvjd8k6qviv"))))
+ "02g7677ck5r7yrh8vv3gwg6pfvychbykgzdaxa1xxdzqa7birff2"))))
(home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition")
(description
"qBittorrent Enhanced is a bittorrent client based on qBittorrent with
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/boost.scm b/gnu/packages/boost.scm
index 71999709ed..2fdea80896 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -67,41 +67,22 @@
(define-public boost
(package
(name "boost")
- (version "1.80.0")
+ (version "1.83.0")
(source (origin
(method url-fetch)
(uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
version "/source/boost_"
(version-with-underscores version) ".tar.bz2"))
(patches
- (list (boost-patch
- ;; Boost.Filesystem directory iterators may fail to
- ;; construct for a network share on Windows prior to 10:
- ;; https://github.com/boostorg/filesystem/pull/246,
- ;; https://github.com/boostorg/filesystem/issues/245
- "0001-filesystem-win-fix-dir-it-net-share.patch" version
- "067hhylqkzzdbqzc1hkbpaqmvz248lxqrdhb2yi6iq9qabsik3lk")
- (boost-patch
- ;; In Boost.Filesystem on Windows, weakly_canonical fails
- ;; to process paths that start with the "\\?\" prefix:
- ;; https://github.com/boostorg/filesystem/issues/247
- "0002-filesystem-fix-weakly-canonical-long-paths.patch" version
- "00w3albf8527glclx85p5b2ml3vr06xpwwmfyzg005v1cp8avcpi")
- (boost-patch
- ;; Boost.Unordered containers are not in a valid state
- ;; after moving:
- ;; https://github.com/boostorg/unordered/issues/139
- "0003-unordered-valid-after-move.patch" version
- "0dw839w22cawqawfpsx7j7v9y0x2vn66m732iidpxvdxbjn2kzva")
- (boost-patch
- ;; Fixed a missing include on POSIX systems that don't
- ;; support *at APIs:
- ;; https://github.com/boostorg/filesystem/issues/250
- "0004-filesystem-posix-fix-no-at-apis-missing-include.patch" version
- "09k8k3b1306jkjls12wfghj820n828j6aaxzmcr0wpnjhp8fzi1v")))
+ (append
+ (search-patches "boost-fix-duplicate-definitions-bug.patch")
+ (list (boost-patch
+ "0001-unordered-fix-copy-assign.patch" version
+ "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66"))))
+ (patch-flags '("-p2"))
(sha256
(base32
- "1h00qp4z5k6lfz310xjwsmqs8fwxi6ngas51169cafz4h9fmc68y"))))
+ "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34"))))
(build-system gnu-build-system)
(inputs
(append
@@ -114,9 +95,9 @@
(arguments
(list
#:imported-modules `((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules `(((guix build python-build-system) #:select (python-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:tests? #f
#:configure-flags
#~(let ((icu (dirname (dirname (search-input-file
@@ -225,6 +206,24 @@ across a broad spectrum of applications.")
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
"Some components have other similar licences."))))
+(define-public boost-for-source-highlight
+ (hidden-package (package (inherit boost)
+ (name "boost")
+ (version "1.83.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
+ version "/source/boost_"
+ (version-with-underscores version) ".tar.bz2"))
+ (patches
+ (list (boost-patch
+ "0001-unordered-fix-copy-assign.patch" version
+ "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66")))
+ (patch-flags '("-p2"))
+ (sha256
+ (base32
+ "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))))))
+
;; Sadly, this is needed for irods. It won't link with 1.69 or later.
(define-public boost-for-irods
(package
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index cfe8046731..353b2c2a16 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016-2018, 2021-2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
@@ -19,6 +19,7 @@
;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -52,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)
@@ -103,160 +105,190 @@
(define-public grub
(package
(name "grub")
- (version "2.06")
+ (version "2.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz"))
(sha256
(base32
- "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp"))
+ "1ahgzvvvwdxx7rl08pv5dyqlgp76jxz0q2cflxvsdsn4yy8p7jgk"))
(patches (search-patches
"grub-efi-fat-serial-number.patch"
"grub-setup-root.patch"))
(modules '((guix build utils)))
(snippet
- '(begin
- ;; Adjust QEMU invocation to not use a deprecated device
- ;; name that was removed in QEMU 6.0. Remove for >2.06.
- (substitute* "tests/ahci_test.in"
- (("ide-drive")
- "ide-hd"))))))
+ #~(begin
+ ;; Add file missing from the release tarball.
+ (call-with-output-file "grub-core/extra_deps.lst"
+ (lambda (port)
+ (display "depends bli part_gpt\n" port)))
+
+ ;; Use exit code 77, not 99, to tell Automake that a test
+ ;; is skipped.
+ (substitute* (find-files "tests" "\\.in$")
+ (("exit 99") "exit 77"))))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- ;; 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")
- ;; Grub fails to load modules stripped with --strip-unneeded.
- #:strip-flags '("--strip-debug" "--enable-deterministic-archives")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-stuff
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (substitute* "grub-core/Makefile.in"
- (("/bin/sh") (which "sh")))
-
- ;; Give the absolute file name of 'mdadm', used to determine the
- ;; root file system when it's a RAID device. Failing to do that,
- ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH.
- (when (assoc-ref inputs "mdadm")
- (substitute* "grub-core/osdep/linux/getroot.c"
- (("argv\\[0\\] = \"mdadm\"")
- (string-append "argv[0] = \""
- (assoc-ref inputs "mdadm")
- "/sbin/mdadm\""))))
-
- ;; Make the font visible.
- (copy-file (assoc-ref (or native-inputs inputs)
- "unifont")
- "unifont.bdf.gz")
- (system* "gunzip" "unifont.bdf.gz")
-
- ;; Give the absolute file name of 'ckbcomp'.
- (substitute* "util/grub-kbdcomp.in"
- (("^ckbcomp ")
- (string-append
- (search-input-file inputs "/bin/ckbcomp")
- " ")))))
- (add-after 'unpack 'set-freetype-variables
- ;; These variables need to be set to the native versions of the
- ;; dependencies because they are used to build programs which are
- ;; executed during build time.
- (lambda* (#:key native-inputs #:allow-other-keys)
- (when (assoc-ref native-inputs "freetype")
- (let ((freetype (assoc-ref native-inputs "freetype")))
- (setenv "BUILD_FREETYPE_LIBS"
- (string-append "-L" freetype
- "/lib -lfreetype"))
- (setenv "BUILD_FREETYPE_CFLAGS"
- (string-append "-I" freetype
- "/include/freetype2"))))))
- (add-before 'check 'disable-flaky-test
- (lambda _
- ;; This test is unreliable. For more information, see:
- ;; <https://bugs.gnu.org/26936>.
- (substitute* "Makefile.in"
- (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep")
- "grub_cmd_date grub_cmd_sleep"))))
- (add-before 'check 'disable-pixel-perfect-test
- (lambda _
- ;; This test compares many screenshots rendered with an older
- ;; Unifont (9.0.06) than that packaged in Guix.
- (substitute* "Makefile.in"
- (("test_unset grub_func_test")
- "test_unset")))))
- ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling.
- #:tests? ,(not (or (any (cute string-prefix? <> (or (%current-target-system)
- (%current-system)))
- '("arm" "aarch64"))
- (%current-target-system)))))
+ (list #:configure-flags
+ ;; 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.
+ #~(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
+ #~(list "--strip-debug" "--enable-deterministic-archives")
+
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-stuff
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "grub-core/Makefile.in"
+ (("/bin/sh") (which "sh")))
+
+ ;; Give the absolute file name of 'mdadm', used to determine the
+ ;; root file system when it's a RAID device. Failing to do that,
+ ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH.
+ (let ((mdadm (false-if-exception
+ (search-input-file inputs "/sbin/mdadm"))))
+ (when mdadm
+ (substitute* "grub-core/osdep/linux/getroot.c"
+ (("argv\\[0\\] = \"mdadm\"")
+ (string-append "argv[0] = \"" mdadm "\"")))))
+
+ ;; Make the font visible.
+ (copy-file #+unifont "unifont.bdf.gz")
+ (system* "gunzip" "unifont.bdf.gz")
+
+ ;; Give the absolute file name of 'ckbcomp'.
+ (substitute* "util/grub-kbdcomp.in"
+ (("^ckbcomp ")
+ (string-append
+ (search-input-file inputs "/bin/ckbcomp")
+ " ")))))
+ (add-after 'unpack 'set-freetype-variables
+ ;; These variables need to be set to the native versions of the
+ ;; dependencies because they are used to build programs which are
+ ;; executed during build time.
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (when (assoc-ref native-inputs "freetype")
+ (let ((freetype (assoc-ref native-inputs "freetype")))
+ (setenv "BUILD_FREETYPE_LIBS"
+ (string-append "-L" freetype
+ "/lib -lfreetype"))
+ (setenv "BUILD_FREETYPE_CFLAGS"
+ (string-append "-I" freetype
+ "/include/freetype2"))))))
+ (add-before 'check 'disable-flaky-test
+ (lambda _
+ ;; This test is unreliable. For more information, see:
+ ;; <https://bugs.gnu.org/26936>.
+ (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
+ ;; Unifont (9.0.06) than that packaged in Guix.
+ (substitute* "Makefile.in"
+ (("test_unset grub_func_test")
+ "test_unset")))))
+
+ ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling.
+ #:tests? (not (or (any (cute string-prefix? <> (%current-system))
+ '("arm" "aarch64"))
+ (%current-target-system)))))
(inputs
- `(("gettext" ,gettext-minimal)
-
- ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and
- ;; 'grub-install' to recognize mapped devices (LUKS, etc.)
- ,@(if (member (or (%current-target-system)
- (%current-system))
- (package-supported-systems lvm2))
- `(("lvm2" ,lvm2))
- '())
-
- ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install'
- ;; to determine whether the root file system is RAID.
- ,@(if (member (or (%current-target-system)
- (%current-system))
- (package-supported-systems mdadm))
- `(("mdadm" ,mdadm))
- '())
-
- ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required
- ;; for generating alternative keyboard layouts.
- ("console-setup" ,console-setup)
-
- ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given
- ;; file system will be readable by GRUB without rebooting.
- ,@(if (member (or (%current-target-system)
- (%current-system))
- (package-supported-systems fuse-2))
- `(("fuse" ,fuse-2))
- '())
-
- ("freetype" ,freetype)
- ;; ("libusb" ,libusb)
- ("ncurses" ,ncurses)))
+ (append (list gettext-minimal freetype ncurses
+
+ ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It
+ ;; 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)
+ (%current-system))
+ (package-supported-systems lvm2))
+ (list lvm2)
+ '())
+
+ ;; Depend on mdadm, which is invoked by 'grub-probe' and
+ ;; 'grub-install' to determine whether the root file system is
+ ;; RAID.
+ (if (member (or (%current-target-system)
+ (%current-system))
+ (package-supported-systems mdadm))
+ (list mdadm)
+ '())
+
+ ;; Needed for ‘grub-mount’, the only reliable way to tell whether
+ ;; a given file system will be readable by GRUB without
+ ;; rebooting.
+ (if (member (or (%current-target-system)
+ (%current-system))
+ (package-supported-systems fuse-2))
+ (list fuse-2)
+ '())))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("unifont" ,unifont)
- ("bison" ,bison)
- ("flex" ,flex)
- ("texinfo" ,texinfo)
- ("help2man" ,help2man)
- ("freetype" ,freetype) ;native version needed for build-grub-mkfont
-
- ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils
- ;; capable of assembling 64-bit instructions. However, our default
- ;; binutils on 32-bit x86 is not 64-bit capable.
- ,@(if (string-match "^i[3456]86-" (%current-system))
- (let ((binutils (package/inherit
- binutils
- (name "binutils-i386")
- (arguments
- (substitute-keyword-arguments (package-arguments binutils)
- ((#:configure-flags flags ''())
- `(cons "--enable-64-bit-bfd" ,flags)))))))
- `(("ld-wrapper" ,(make-ld-wrapper "ld-wrapper-i386"
- #:binutils binutils))
- ("binutils" ,binutils)))
- '())
-
- ;; Dependencies for the test suite. The "real" QEMU is needed here,
- ;; because several targets are used.
- ("parted" ,parted)
- ,@(if (member (%current-system) (package-supported-systems qemu-minimal))
- `(("qemu" ,qemu-minimal))
- '())
- ("xorriso" ,xorriso)))
+ (append (list pkg-config
+ bison
+ flex
+ texinfo
+ help2man
+ freetype ;native version needed for build-grub-mkfont
+
+ ;; Dependencies of the test suite.
+ parted
+ xorriso)
+
+ ;; For the test suite, the "real" QEMU is needed because several
+ ;; targets are used.
+ (if (member (%current-system) (package-supported-systems qemu-minimal))
+ (list qemu-minimal)
+ '())
+
+ ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils
+ ;; capable of assembling 64-bit instructions. However, our default
+ ;; binutils on 32-bit x86 is not 64-bit capable.
+ (if (string-match "^i[3456]86-" (%current-system))
+ (let ((binutils (package/inherit
+ binutils
+ (name "binutils-i386")
+ (arguments
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags ''())
+ #~(cons* "--enable-64-bit-bfd" #$flags)))))))
+ (list (make-ld-wrapper "ld-wrapper-i386"
+ #:binutils binutils)
+ binutils))
+ '())))
(home-page "https://www.gnu.org/software/grub/")
(synopsis "GRand Unified Boot loader")
(description
@@ -281,24 +313,18 @@ 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)
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (replace 'patch-stuff
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (substitute* "grub-core/Makefile.in"
- (("/bin/sh") (which "sh")))
-
- ;; Make the font visible.
- (copy-file (assoc-ref (or native-inputs inputs)
- "unifont")
- "unifont.bdf.gz")
- (system* "gunzip" "unifont.bdf.gz")
-
- #t))))))))
+ ((#:tests? _ #t) #f)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (replace 'patch-stuff
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "grub-core/Makefile.in"
+ (("/bin/sh")
+ (which "sh")))
+
+ ;; Make the font visible.
+ (copy-file #+unifont "unifont.bdf.gz")
+ (system* "gunzip" "unifont.bdf.gz")))))))))
(define-public grub-coreboot
(package
@@ -306,64 +332,62 @@ menu to select one of the installed operating systems.")
(name "grub-coreboot")
(synopsis "GRand Unified Boot loader (Coreboot payload version)")
(arguments
- `(,@(substitute-keyword-arguments (package-arguments grub)
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-before 'check 'disable-broken-tests
- (lambda _
- (setenv "DISABLE_HARD_ERRORS" "1")
- (setenv
- "XFAIL_TESTS"
- (string-join
- ;; TODO: All the tests below use grub shell
- ;; (tests/util/grub-shell.in), and here grub-shell uses
- ;; QEMU and a Coreboot image to run the tests. Since we
- ;; don't have a Coreboot package in Guix yet these tests
- ;; are disabled. See the Guix bug #64667 for more details
- ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667).
- (list
- "pata_test"
- "ahci_test"
- "uhci_test"
- "ehci_test"
- "example_grub_script_test"
- "ohci_test"
- "grub_script_eval"
- "grub_script_echo1"
- "grub_script_test"
- "grub_script_leading_whitespace"
- "grub_script_echo_keywords"
- "grub_script_vars1"
- "grub_script_for1"
- "grub_script_while1"
- "grub_script_if"
- "grub_script_comments"
- "grub_script_functions"
- "grub_script_continue"
- "grub_script_break"
- "grub_script_shift"
- "grub_script_blockarg"
- "grub_script_return"
- "grub_script_setparams"
- "grub_cmd_date"
- "grub_cmd_sleep"
- "grub_cmd_regexp"
- "grub_script_not"
- "grub_cmd_echo"
- "grub_script_expansion"
- "grub_script_gettext"
- "grub_script_escape_comma"
- "help_test"
- "grub_script_strcmp"
- "test_sha512sum"
- "grub_cmd_tr"
- "test_unset"
- "file_filter_test")
- " "))))))
- ((#:configure-flags flags
- ''())
- `(cons* "--with-platform=coreboot"
- ,flags)))))))
+ (substitute-keyword-arguments (package-arguments grub)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-before 'check 'disable-broken-tests
+ (lambda _
+ (setenv "DISABLE_HARD_ERRORS" "1")
+ (setenv "XFAIL_TESTS"
+ (string-join
+ ;; TODO: All the tests below use grub shell
+ ;; (tests/util/grub-shell.in), and here grub-shell uses
+ ;; QEMU and a Coreboot image to run the tests. Since we
+ ;; don't have a Coreboot package in Guix yet these tests
+ ;; are disabled. See the Guix bug #64667 for more details
+ ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667).
+ (list "pata_test"
+ "ahci_test"
+ "uhci_test"
+ "ehci_test"
+ "example_grub_script_test"
+ "ohci_test"
+ "grub_script_eval"
+ "grub_script_echo1"
+ "grub_script_test"
+ "grub_script_leading_whitespace"
+ "grub_script_echo_keywords"
+ "grub_script_vars1"
+ "grub_script_for1"
+ "grub_script_while1"
+ "grub_script_if"
+ "grub_script_comments"
+ "grub_script_functions"
+ "grub_script_continue"
+ "grub_script_break"
+ "grub_script_shift"
+ "grub_script_blockarg"
+ "grub_script_return"
+ "grub_script_setparams"
+ "grub_cmd_date"
+ "grub_cmd_set_date"
+ "grub_cmd_sleep"
+ "grub_cmd_regexp"
+ "grub_cmd_test"
+ "grub_script_not"
+ "grub_cmd_echo"
+ "grub_script_expansion"
+ "grub_script_gettext"
+ "grub_script_escape_comma"
+ "help_test"
+ "grub_script_strcmp"
+ "test_sha512sum"
+ "grub_cmd_tr"
+ "test_unset"
+ "file_filter_test")
+ " "))))))
+ ((#:configure-flags flags #~'())
+ #~(cons* "--with-platform=coreboot" #$flags))))))
(define-public grub-efi
(package
@@ -378,39 +402,38 @@ menu to select one of the installed operating systems.")
(modify-inputs (package-native-inputs grub)
(delete "parted" "qemu" "xorriso")))
(arguments
- `(;; TODO: Tests need a UEFI firmware for qemu. There is one at
- ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg .
- ;; Search for 'OVMF' in "tests/util/grub-shell.in".
- ,@(substitute-keyword-arguments (package-arguments grub)
- ((#:tests? _ #f) #f)
- ((#:configure-flags flags ''())
- `(cons* "--with-platform=efi"
- ,@(if (string-prefix? "x86_64"
- (or (%current-target-system)
- (%current-system)))
- '("--enable-stack-protector") ; EFI-only for now
- '())
- ,flags))
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'patch-stuff 'use-absolute-efibootmgr-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grub-core/osdep/unix/platform.c"
- (("efibootmgr")
- (search-input-file inputs
- "/sbin/efibootmgr")))))
- (add-after 'patch-stuff 'use-absolute-mtools-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((mtools (assoc-ref inputs "mtools")))
- (substitute* "util/grub-mkrescue.c"
- (("\"mformat\"")
- (string-append "\"" mtools
- "/bin/mformat\"")))
- (substitute* "util/grub-mkrescue.c"
- (("\"mcopy\"")
- (string-append "\"" mtools
- "/bin/mcopy\"")))
- #t))))))))))
+ ;; TODO: Tests need a UEFI firmware for qemu. There is one at
+ ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg .
+ ;; Search for 'OVMF' in "tests/util/grub-shell.in".
+ (substitute-keyword-arguments (package-arguments grub)
+ ((#:tests? _ #f) #f)
+ ((#:configure-flags flags #~'())
+ #~(cons* "--with-platform=efi"
+ #$@(if (string-prefix? "x86_64"
+ (or (%current-target-system)
+ (%current-system)))
+ #~("--enable-stack-protector") ;EFI-only for now
+ #~())
+ #$flags))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'patch-stuff 'use-absolute-efibootmgr-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "grub-core/osdep/unix/platform.c"
+ (("efibootmgr")
+ (search-input-file inputs "/sbin/efibootmgr")))))
+ (add-after 'patch-stuff 'use-absolute-mtools-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "util/grub-mkrescue.c"
+ (("\"mformat\"")
+ (string-append "\""
+ (search-input-file inputs "/bin/mformat")
+ "\"")))
+ (substitute* "util/grub-mkrescue.c"
+ (("\"mcopy\"")
+ (string-append "\""
+ (search-input-file inputs "/bin/mcopy")
+ "\"")))))))))))
(define-public grub-efi32
(package
@@ -418,17 +441,19 @@ menu to select one of the installed operating systems.")
(name "grub-efi32")
(synopsis "GRand Unified Boot loader (UEFI 32bit version)")
(arguments
- `(,@(substitute-keyword-arguments (package-arguments grub-efi)
- ((#:configure-flags flags ''())
- `(cons*
- ,@(cond ((target-x86?) '("--target=i386"))
- ((target-aarch64?)
- (list "--target=arm"
- (string-append "TARGET_CC="
- (cc-for-target "arm-linux-gnueabihf"))))
- ((target-arm?) '("--target=arm"))
- (else '()))
- ,flags)))))
+ (substitute-keyword-arguments (package-arguments grub-efi)
+ ((#:configure-flags flags #~'())
+ #~(cons* #$@(cond ((target-x86?)
+ #~("--target=i386"))
+ ((target-aarch64?)
+ #~("--target=arm"
+ (string-append "TARGET_CC="
+ #$(cc-for-target
+ "arm-linux-gnueabihf"))))
+ ((target-arm?)
+ #~("--target=arm"))
+ (else #~()))
+ #$flags))))
(native-inputs
(if (target-aarch64?)
(modify-inputs (package-native-inputs grub-efi)
@@ -452,24 +477,26 @@ menu to select one of the installed operating systems.")
(prepend grub)))
(arguments
(substitute-keyword-arguments (package-arguments grub-efi)
- ((#:modules modules `((guix build utils) (guix build gnu-build-system)))
+ ((#:modules modules `((guix build utils)
+ (guix build gnu-build-system)))
`((ice-9 ftw) ,@modules))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'install 'install-non-efi
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((input-dir (search-input-directory inputs
- "/lib/grub"))
- (output-dir (string-append (assoc-ref outputs "out")
- "/lib/grub")))
- (for-each
- (lambda (basename)
- (if (not (or (string-prefix? "." basename)
- (file-exists? (string-append output-dir "/" basename))))
- (symlink (string-append input-dir "/" basename)
- (string-append output-dir "/" basename))))
- (scandir input-dir))
- #t)))))))))
+ #~(modify-phases #$phases
+ (add-after 'install 'install-non-efi
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((input-dir (search-input-directory inputs "/lib/grub"))
+ (output-dir (string-append (assoc-ref outputs "out")
+ "/lib/grub")))
+ (for-each (lambda (basename)
+ (unless (or (string-prefix? "." basename)
+ (file-exists? (string-append
+ output-dir "/"
+ basename)))
+ (symlink (string-append input-dir "/"
+ basename)
+ (string-append output-dir "/"
+ basename))))
+ (scandir input-dir)))))))))))
(define-public (make-grub-efi-netboot name subdir)
"Make a grub-efi-netboot package named NAME, which will be able to boot over
@@ -1017,7 +1044,7 @@ U-Boot must be used."
,@modules))
((#:imported-modules imported-modules '())
`((guix build kconfig)
- ,@%gnu-build-system-modules
+ ,@%default-gnu-imported-modules
,@imported-modules))
((#:test-target _ "test")
"test")
@@ -1343,6 +1370,30 @@ Documentation} for more information (for example by running @samp{info
(modify-inputs (package-inputs base)
(append opensbi-generic))))))
+(define-public u-boot-starfive-visionfive2
+ (let ((base (make-u-boot-package "starfive_visionfive2" "riscv64-linux-gnu"
+ ;; Allow kernel-arguments pass more content.
+ ;; If out of range, boot will fail.
+ #:configs '("CONFIG_SYS_CBSIZE=1024"))))
+ (package
+ (inherit base)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "OPENSBI" (search-input-file inputs
+ "fw_dynamic.bin"))))
+ (add-after 'install 'install-u-boot-spl.bin.normal.out
+ (lambda _
+ (install-file "spl/u-boot-spl.bin.normal.out"
+ (string-append #$output
+ "/libexec/spl"))))))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append opensbi-for-visionfive2))))))
+
(define-public u-boot-rock64-rk3328
(let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu")))
(package
@@ -1873,9 +1924,9 @@ order to add a suitable bootloader menu entry.")
;;
;; TODO: Bump this timestamp at each modifications of the package (not only
;; for updates) by running: date +%s.
- (let ((timestamp "1678285400")
- (commit "9e1f7a3659071004f4b8c76f2593da6287f0d575")
- (revision "1"))
+ (let ((timestamp "1706118389")
+ (commit "de8a0821c7bc737e724fa3dfb6d89dc36f591d7a")
+ (revision "2"))
(package
(name "ipxe")
(version (git-version "1.21.1" revision commit))
@@ -1887,7 +1938,7 @@ order to add a suitable bootloader menu entry.")
(file-name (git-file-name name version))
(sha256
(base32
- "1fp4bgwzy923m11dkkhk9dik7al7shzmmpqhp339z786z8bjzmkb"))))
+ "0xiffdmf8hpmsw7nm9wp10wd0rs4avm2m3q5ncx0r5zfykannlbd"))))
(build-system gnu-build-system)
(arguments
(list
@@ -1898,7 +1949,7 @@ order to add a suitable bootloader menu entry.")
(ice-9 regex)
(rnrs bytevectors))
#:imported-modules `((guix base32)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:make-flags
;; XXX: 'BUILD_ID' is used to determine when another ROM in the
;; system contains identical code in order to save space within the
@@ -2027,7 +2078,7 @@ the features of iPXE without the hassle of reflashing.")
(arguments
(substitute-keyword-arguments (package-arguments binutils)
((#:configure-flags flags ''())
- `(cons "--enable-64-bit-bfd" ,flags)))))))
+ #~(cons* "--enable-64-bit-bfd" #$flags)))))))
(modify-inputs (package-native-inputs ipxe)
(prepend edk2-tools
(make-ld-wrapper "ld-wrapper-64-bit-bfd"
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index a36bb289cd..3743abf9fe 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2020, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2020, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@@ -37,7 +37,7 @@
#:select (raw-derivation derivation-input derivation->output-path))
#:use-module (guix utils)
#:use-module ((guix build utils) #:select (elf-file?))
- #:use-module ((guix gexp) #:select (lower-object))
+ #:use-module ((guix gexp) #:select (lower-object local-file))
#:use-module (guix monads)
#:use-module (guix memoization)
#:use-module (guix i18n)
@@ -770,7 +770,7 @@ $out/bin/guile --version~%"
("powerpc64le-linux"
"/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
("i586-gnu"
- "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz")
+ "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
("powerpc-linux"
"/20200923/glibc-2.32.tar.xz")
("riscv64-linux"
@@ -800,7 +800,7 @@ $out/bin/guile --version~%"
"0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm"))
("i586-gnu"
(base32
- "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952"))
+ "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2"))
("powerpc-linux"
(base32
"0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb"))
diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm
index 4d03385d21..fd090ad433 100644
--- a/gnu/packages/bqn.scm
+++ b/gnu/packages/bqn.scm
@@ -52,7 +52,7 @@
(build-system gnu-build-system)
(arguments
(list
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build ant-build-system))
#:modules `((guix build gnu-build-system)
((guix build ant-build-system)
diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm
index 96b68bf83e..8de3d4d747 100644
--- a/gnu/packages/browser-extensions.scm
+++ b/gnu/packages/browser-extensions.scm
@@ -58,7 +58,7 @@ supported content to the Kodi media center.")
;; Arbitrary commit of branch master,
;; Update when updating uBlockOrigin.
(let* ((name "ublock-main-assets")
- (commit "1cfeef15ac031cf8ea144c7b8c7b6693fcd35664")
+ (commit "f44ac328b718bab3118f759880128fe420afb906")
(revision "2")
(version (git-version "0" revision commit)))
(origin
@@ -68,13 +68,13 @@ supported content to the Kodi media center.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0lglvynr5ap0yd4mshvj40q62vicn1rv0z661pvm134cddimz4fb")))))
+ (base32 "06rglm8fl44aazpdpc9616fncfbkqy0hj945afrkihpk3fpwgxjy")))))
(define ublock-prod-assets
;; Arbitrary commit of branch gh-pages,
;; Update when updating uBlockOrigin.
(let* ((name "ublock-prod-assets")
- (commit "17d534c817bd543bbb5be48113edefcec43bbcc9")
+ (commit "a1409d83d46d49b6cd5c40ec956cc7acdff481ef")
(revision "2")
(version (git-version "0" revision commit)))
(origin
@@ -84,12 +84,12 @@ supported content to the Kodi media center.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1iv5vqpd8bmbdp8d4d6lgrg03x23qdfalxpzxlnzx55b1wz5aagr")))))
+ (base32 "07ih6gxnv3q3cbxlaw9yk4l08v4qli3wri9rgfb6ick2wd4xp89d")))))
(define ublock-origin
(package
(name "ublock-origin")
- (version "1.57.2")
+ (version "1.59.0")
(home-page "https://github.com/gorhill/uBlock")
(source (origin
(method git-fetch)
@@ -99,7 +99,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version))
(sha256
(base32
- "168j7if0wnxk54rikd3a7y1asmm6xgl42bsnsvj9m44sayrfdinn"))))
+ "0d050fbfpja3hw0ap09bdlnqnr3vbwsjmkrpdkdp4861x8y5gbsf"))))
(build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium"))
(properties '((addon-id . "uBlock0@raymondhill.net")))
@@ -256,7 +256,7 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
(define noscript
(package
(name "noscript")
- (version "11.4.29")
+ (version "11.4.31")
(source (origin
(method url-fetch/zipbomb)
(uri (string-append
@@ -264,7 +264,7 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
".xpi"))
(sha256
(base32
- "1k94zvv2ypmhc29f5d2zrvigwh1xgi5kwm1kqfxarwjyn108if85"))))
+ "1iqhdm32mf3k4a2x66nqi17s8dm5g6x71sbq8fvqy6j76ish0b5j"))))
(build-system copy-build-system)
(properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
(arguments
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index daaf450e70..21df25e4f5 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
-;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
;;;
;;; This file is part of GNU Guix.
@@ -118,7 +118,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear
(package
(name "bear")
- (version "3.1.3")
+ (version "3.1.4")
(source
(origin
(method git-fetch)
@@ -127,7 +127,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0z8jzvxmzna7320w3hvmzb1qsv91g9npc5z5j28ncwnn0b74yxnn"))))
+ (base32 "1x99d2cycgxay62cz2ypjjkmjgrbdvz5d3pg4fyv0gnq2srnlcnm"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -293,8 +293,7 @@ files and generates build instructions for the Ninja build system.")
(define-public meson
(package
(name "meson")
- (replacement meson/newer)
- (version "1.1.0")
+ (version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
@@ -302,7 +301,7 @@ files and generates build instructions for the Ninja build system.")
version ".tar.gz"))
(sha256
(base32
- "17w2zymmvrffhfpqsaj7qcbjwgv9iaawcpzhz2gnhlvcrm26qqfr"))))
+ "1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))
(build-system python-build-system)
(arguments
(list #:tests? #f ;disabled to avoid extra dependencies
@@ -330,10 +329,10 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
resembles Python.")
(license license:asl2.0)))
-(define-public meson/newer
+(define-public meson-1.5
(package
(inherit meson)
- (version "1.2.1")
+ (version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
@@ -341,7 +340,7 @@ resembles Python.")
version ".tar.gz"))
(sha256
(base32
- "1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))))
+ "1vab706pw1q17vh9rbsmlirgiji3k6wljl735lxffp95vwx56zjn"))))))
(define-public meson-python
(package
@@ -374,7 +373,7 @@ resembles Python.")
ninja
python-colorama
python-cython
- python-pyproject-metadata-0.7
+ python-pyproject-metadata
python-tomli
python-typing-extensions
python-wheel))
@@ -396,13 +395,6 @@ resembles Python.")
(description "Meson-python is a PEP 517 build backend for Meson projects.")
(license license:expat)))
-(define-public meson-python/newer
- (package
- (inherit meson-python)
- (propagated-inputs
- (modify-inputs (package-propagated-inputs meson-python)
- (replace "meson" meson/newer)))))
-
(define-public premake4
(package
(name "premake")
@@ -853,12 +845,15 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
;; FIXME: tests/uniname/HangulSyllableNames.txt
;; seems like a UCD file but it is not distributed
;; with UCD.
- "tests/uniwbrk/WordBreakTest.txt")))))))
+ "tests/uniwbrk/WordBreakTest.txt")))))
+ (patches (search-patches "gnulib-bootstrap.patch"))))
(build-system copy-build-system)
(arguments
(list
#:install-plan
#~'(("./gnulib-tool" "bin/")
+ ("./gnulib-tool.py" "bin/")
+ ("./gnulib-tool.sh" "bin/")
("." "src/gnulib" #:exclude-regexp ("\\.git.*")))
#:modules '((ice-9 match)
(guix build utils)
@@ -866,6 +861,13 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
((guix build gnu-build-system) #:prefix gnu:))
#:phases
#~(modify-phases %standard-phases
+ ;; Since this package is intended to be used in source form, it
+ ;; should not retain references to tools (with the exception for the
+ ;; commands we install, which should be wrapper for proper
+ ;; execution).
+ (delete 'patch-source-shebangs)
+ (delete 'patch-generated-file-shebangs)
+ (delete 'patch-usr-bin-file)
(add-before 'install 'check
(assoc-ref gnu:%standard-phases 'check))
(add-before 'check 'fix-tests
@@ -889,8 +891,10 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
sc_Wundef_boolean \\
sc_copyright_check \\
sc_file_system \\
+ sc_error_message_warn_fatal \\
sc_indent \\
sc_keep_gnulib_texi_files_mostly_ascii \\
+ sc_prefer_angle_bracket_headers \\
sc_prohibit_assert_without_use \\
sc_prohibit_close_stream_without_use \\
sc_prohibit_defined_have_decl_tests \\
@@ -899,15 +903,22 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
sc_prohibit_intprops_without_use \\
sc_prohibit_openat_without_use \\
sc_prohibit_test_minus_ao \\
- sc_unportable_grep_q"))
+ sc_readme_link_copying \\
+ sc_readme_link_install \\
+ sc_unportable_grep_q \\
+ sc_unsigned_char \\
+ sc_unsigned_int \\
+ sc_unsigned_long \\
+ sc_unsigned_short"))
(substitute* "Makefile"
- (("sc_check_(sym_list|copyright)" rule)
+ (("sc_check_(sym_list|copyright|config_h_reminder)" rule)
(string-append "disabled_check_" rule))
(("sc_cpp_indent_check")
"disabled_cpp_indent_check")
(("sc_prefer_ac_check_funcs_once")
"disabled_prefer_ac_check_funcs_once")
- (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs)" rule)
+ (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs\
+|sc_omitted_at)" rule)
(string-append "disabled_prohibit_" rule)))))
(add-before 'check 'regenerate-unicode
(lambda* (#:key inputs #:allow-other-keys)
@@ -939,7 +950,8 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
(sha256
(base32
"0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh"))))
- (find-ucd-files "EastAsianWidth.txt"
+ (find-ucd-files "BidiMirroring.txt"
+ "EastAsianWidth.txt"
"LineBreak.txt"
"auxiliary/WordBreakProperty.txt"
"auxiliary/GraphemeBreakProperty.txt"
@@ -962,22 +974,9 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
("NormalizationTest.txt" . "uninorm")
("auxiliary/GraphemeBreakTest.txt" . "unigbrk")
("auxiliary/WordBreakTest.txt" . "uniwbrk")))
- (delete-file "gen-uni-tables"))))
- (add-after 'install 'restore-shebangs
- (lambda _
- (substitute* (find-files
- (string-append #$output "/src/gnulib")
- (lambda (fname stat)
- (and (not (string-suffix? "/lib/javaversion.class" fname))
- (not (string-suffix? ".mo" fname)))))
- (("^#! ?(.*)/bin/sh" _ prefix)
- "#!/bin/sh")
- (("^#! ?(.*)/bin/python3" _ prefix)
- "#!/usr/bin/env python3")
- (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program)
- (string-append "#!/usr/bin/" program))))))))
+ (delete-file "gen-uni-tables")))))))
(inputs
- (list bash-minimal)) ;shebang for gnulib-tool
+ (list bash-minimal)) ;shebang for gnulib-tool
(native-inputs
(list
bash-minimal python perl clisp
@@ -1005,9 +1004,9 @@ maintenance-related files, for convenience.")
(define-public gnulib
(gnulib-checkout
- #:version "2022-12-31"
- #:commit "875461ffdf58ac04677957b4ae4160465b83b940"
- #:hash (base32 "0bf7a6wdns9c5wwv60qfcn9llg0j6jz5ryd2qgsqqx2i6xkmp77c")))
+ #:version "2024-05-30"
+ #:commit "ac4b301ae15223c98b51cd5a0eda2e2cf57c817b"
+ #:hash (base32 "0f4w56fc97clg13mmdghx84dh9xqmaqr3j672ppfh3h66gmmmvzs")))
(define-public pdpmake
(package
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 9d3e08e1e0..a8b775b944 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -30,6 +30,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages perl))
(define-public busybox
@@ -163,6 +164,7 @@ any small or embedded system.")
(delete-file-recursively (string-append #$output "/usr")))))
#:test-target "tests"))
(native-inputs (list bc))
+ (inputs (list libxcrypt))
(synopsis "Many common UNIX utilities in a single executable")
(description "ToyBox combines tiny versions of many common UNIX utilities
into a single small executable. It provides a fairly complete environment for
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 1b168d2ca8..62234d3c9a 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -21,6 +21,7 @@
;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2023, 2024 Foundation Devices, Inc. <hello@foundation.xyz>
;;; Copyright © 2023, 2024 David Elsing <david.elsing@posteo.net>
+;;; Copyright @ 2022, Kitzman <kitzman@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,7 @@
#: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 python)
#:use-module (guix store)
#:use-module (gnu packages)
@@ -401,6 +403,36 @@ language as input.")
Python.")
(license license:bsd-3)))
+(define-public aml
+ (package
+ (name "aml")
+ (version "0.3.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/any1/aml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0r4k233hh3iqc6zlhh2agmdj8q973x49pdixhz7h5hz7md38qzq5"))))
+ (build-system meson-build-system)
+ (native-inputs
+ (list pkg-config))
+ (home-page "https://github.com/any1/aml")
+ (synopsis "Another/Andri's main loop")
+ (description "The @code{aml} library provides a portable event loop for C,
+with the following features:
+@enumerate
+@item file descriptor event handlers
+@item timers and tickers
+@item signal handlers
+@item idle dispatch callbacks
+@item thread pool support
+@end enumerate
+")
+ (license license:isc)))
+
(define-public libbytesize
(package
(name "libbytesize")
@@ -527,6 +559,26 @@ string formatting and autoresizing, option and config file parsing, type
checking casts and more.")
(license license:lgpl2.1+)))
+(define-public libcsptr
+ (package
+ (name "libcsptr")
+ (version "2.0.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Snaipe/libcsptr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "056yg1irxi90ccgf646jxzngbsm946ckyzn8ykl92h6d2mnr141a"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf automake libtool))
+ (home-page "https://snai.pe/c/c-smart-pointers/")
+ (synopsis "Smart pointers for GNU C")
+ (description "This package is an attempt at bringing smart pointers
+like C++'s unique_ptr and shared_ptr to C through GCC's cleanup attribute.")
+ (license license:expat)))
+
(define-public libwuya
;; This commit is the one before "wuy_pool.h" was removed from libwuya,
;; which libleak currently requires.
@@ -641,6 +693,64 @@ be a separate step, and tokenization rules can be written in the same way as
any other grammar rules.")
(license license:expat)))
+(define-public sfsexp
+ (package
+ (name "sfsexp")
+ (version "1.4.1")
+ (home-page "https://github.com/mjsottile/sfsexp")
+ (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 "03srnpc7p1j7ygd0wx9gybcxhqm50kjzkybh1xs75nwz97q3y2dq"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf automake libtool))
+ (synopsis "Symbolic expression library for C and C++")
+ (description
+ "sfsexp is a C/C++ library to read, parse, modify, and create symbolic
+expressions.")
+ (license license:lgpl2.1+)))
+
+(define-public c-template-sort
+ ;; The latest commit is used as there is no release.
+ (let ((commit "24f5b8b13810ad130109c7b56daf8e99ab0fe1b8")
+ (revision "0"))
+ (package
+ (name "c-template-sort")
+ (version (git-version "0.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/swenson/sort")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q3pgw51rjq7pb6gc7zx9i48pckyl930lcab4ngxrpa5a8flq850"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ #~'(("sort.h" "include/sort.h")
+ ("sort_extra.h" "include/sort_extra.h"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "test"
+ (string-append "CC=" #$(cc-for-target)))))))))
+ (home-page "https://github.com/swenson/sort")
+ (synopsis "C implementation of many sorting algorithms")
+ (description "This package provides a header-only C library,
+that implements several sorting algorithms. It is configured using
+macros and supports user-defined types.")
+ (license license:expat))))
+
(define-public sparse
(package
(name "sparse")
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index a71da5ad0e..05c00df082 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -42,6 +42,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages dav)
#:use-module (gnu packages docbook)
@@ -84,7 +85,8 @@
(patches
;; Install pkg-config files
;; https://github.com/HowardHinnant/date/pull/538
- (search-patches "date-output-pkg-config-files.patch"))))
+ (search-patches "date-ignore-zonenow.patch"
+ "date-output-pkg-config-files.patch"))))
(inputs (list tzdata))
(build-system cmake-build-system)
(arguments
@@ -270,7 +272,7 @@ interface} named 'ikhal'.")
(list "bin/cm2rem.tcl"
"bin/tkremind"))))))))
(inputs
- (list inetutils tcl tcllib tk))
+ (list bash-minimal inetutils tcl tcllib tk))
(home-page "https://dianne.skoll.ca/projects/remind/")
(synopsis "Sophisticated calendar and alarm program")
(description
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index d473ab41ed..ef02787465 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -45,6 +45,7 @@
#:use-module (gnu packages acl)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
@@ -180,8 +181,7 @@ libcdio.")
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(out-bin (string-append out "/bin")))
- (install-file "frontend/grub-mkrescue-sed.sh" out-bin)
- #t)))
+ (install-file "frontend/grub-mkrescue-sed.sh" out-bin))))
(add-after 'install 'move-gui-to-separate-output
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@@ -195,10 +195,9 @@ libcdio.")
"/share/info/xorriso-tcltk.info"
"/share/man/man1/xorriso-tcltk.1"))
(wrap-program (string-append gui "/bin/xorriso-tcltk")
- `("PATH" ":" prefix (,(string-append out "/bin"))))
- #t))))))
+ `("PATH" ":" prefix (,(string-append out "/bin"))))))))))
(inputs
- (list acl readline tk zlib))
+ (list acl bash-minimal readline tk zlib))
(home-page "https://www.gnu.org/software/xorriso/")
(synopsis "Create, manipulate, burn ISO-9660 file systems")
(description
@@ -547,6 +546,7 @@ capacity is user-selectable.")
(inputs ; TODO package bundled wxvillalib
`(("wxwidgets" ,wxwidgets)
("wssvg" ,wxsvg)
+ ("bash" ,bash-minimal) ; for wrap-program
("dbus" ,dbus)
("cdrtools" ,cdrtools)
("dvd+rw-tools" ,dvd+rw-tools)
@@ -648,8 +648,7 @@ from an audio CD.")
'(begin
(substitute* "Makefile"
(("/usr/bin/install")
- "install"))
- #t))))
+ "install"))))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -664,8 +663,7 @@ from an audio CD.")
(("^sysconfdir = .*$")
(string-append "sysconfdir = "
(assoc-ref outputs "out")
- "/etc/\n")))
- #t))
+ "/etc/\n")))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((wget (assoc-ref inputs "wget"))
@@ -698,11 +696,11 @@ from an audio CD.")
(for-each wrap
(find-files (string-append out "/bin")
- ".*")))
- #t)))
+ ".*"))))))
#:tests? #f)) ; no test target
- (inputs (list wget
+ (inputs (list bash-minimal
+ wget
which
cdparanoia
cd-discid
@@ -796,7 +794,8 @@ information is written to standard error.")
"wavpack"))))))))))
(native-inputs (list intltool pkg-config))
;; TODO: Add the necessary packages for Musepack encoding.
- (inputs `(("gtk+-2" ,gtk+-2)
+ (inputs `(("bash" ,bash-minimal) ; for wrap-program
+ ("gtk+-2" ,gtk+-2)
("glib" ,glib)
("libcddb" ,libcddb)
("cdparanoia" ,cdparanoia)
@@ -1045,7 +1044,7 @@ drive and disc (including CD-ROMs and DVD-ROMs).")
(native-inputs
(list pkg-config intltool))
(inputs
- (list python python-pygobject cdemu-daemon))
+ (list bash-minimal python python-pygobject cdemu-daemon))
(arguments
;; No tests.
`(#:tests? #f
@@ -1054,15 +1053,13 @@ drive and disc (including CD-ROMs and DVD-ROMs).")
(add-after 'install 'patch-shebang
(lambda* (#:key outputs #:allow-other-keys)
(patch-shebang (string-append (assoc-ref outputs "out")
- "/bin/cdemu"))
- #t))
+ "/bin/cdemu"))))
(add-after 'patch-shebang 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/cdemu")))
(wrap-program prog
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))))))))
(home-page "https://cdemu.sourceforge.io/")
(synopsis "Command-line client for controlling cdemu-daemon")
(description "CDEmu client is a simple command-line client for controlling
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index 00c6a93b92..e2de6b168b 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,6 +26,7 @@
(define-module (gnu packages certs)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
@@ -128,10 +130,10 @@ that was originally contributed to Debian.")
(define-public nss-certs
(package
(name "nss-certs")
- ;; XXX We used to refer to the nss package here, but that eventually caused
+ ;; FIXME We used to refer to the nss package here, but that eventually caused
;; module cycles. The below is a quick copy-paste job that must be kept in
;; sync manually. Surely there's a better way…?
- (version "3.88.1")
+ (version "3.99")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -142,7 +144,7 @@ that was originally contributed to Debian.")
"nss-" version ".tar.gz")))
(sha256
(base32
- "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))
+ "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"
@@ -188,21 +190,48 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
(home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS")
(license license:mpl2.0)))
-(define-public nss-certs-3.99
- (package
- (inherit nss-certs)
- (version "3.99")
- (source (origin
- (method url-fetch)
- (uri (let ((version-with-underscores
- (string-join (string-split version #\.) "_")))
- (string-append
- "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
- "releases/NSS_" version-with-underscores "_RTM/src/"
- "nss-" version ".tar.gz")))
- (sha256
- (base32
- "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw"))))))
+(define-public nss-certs-for-test
+ (hidden-package
+ (package
+ (inherit nss-certs)
+ (name "nss-certs-for-test")
+ (source #f)
+ (build-system trivial-build-system)
+ (native-inputs (list nss-certs))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments
+ (list #:modules '((guix build utils)
+ (rnrs io ports)
+ (srfi srfi-26))
+ #:builder
+ #~(begin
+ (use-modules (guix build utils)
+ (rnrs io ports)
+ (srfi srfi-26))
+ (define certs-dir (string-append #$output "/etc/ssl/certs/"))
+ (define ca-files
+ (find-files (string-append #+(this-package-native-input
+ "nss-certs")
+ "/etc/ssl/certs")
+ (lambda (file stat)
+ (string-suffix? ".pem" file))))
+ (define (concatenate-files files result)
+ "Make RESULT the concatenation of all of FILES."
+ (define (dump file port)
+ (display (call-with-input-file file get-string-all) port)
+ (newline port))
+ (call-with-output-file result
+ (lambda (port)
+ (for-each (cut dump <> port) files))))
+
+ (mkdir-p certs-dir)
+ (concatenate-files
+ ca-files (string-append certs-dir "/ca-certificates.crt"))
+ (for-each (cut install-file <> certs-dir) ca-files))))
+ (native-search-paths
+ (list $SSL_CERT_DIR
+ $SSL_CERT_FILE)))))
(define-public le-certs
(package
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index fafa5d3f33..855480d6db 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016, 2018-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2018-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@@ -26,7 +26,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2015, 2017, 2018, 2020, 2021, 2023, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016-2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017-2018, 2020-2021, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
@@ -35,7 +35,7 @@
;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
-;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
@@ -51,6 +51,7 @@
;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -73,18 +74,25 @@
#: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)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages lua)
+ #:use-module (gnu packages gdb)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gtk)
#: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)
@@ -93,6 +101,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-science)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
@@ -116,6 +125,44 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
+(define-public atf
+ (package
+ (name "atf")
+ (version "0.21")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freebsd/atf")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz"))
+ (patches (search-patches "atf-execute-with-shell.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list (string-append "ATF_SHELL="
+ #$(this-package-input "bash-minimal")
+ "/bin/sh"))))
+ (native-inputs (list autoconf automake libtool))
+ (inputs (list bash-minimal))
+ (home-page "https://github.com/freebsd/atf")
+ (synopsis "C/C++ Automated Testing Framework libraries")
+ (description "ATF, or Automated Testing Framework, is a collection of
+libraries to write test programs in C, C++ and POSIX shell.
+
+The ATF libraries offer a simple API. The API is orthogonal through the
+various bindings, allowing developers to quickly learn how to write test
+programs in different languages.
+
+ATF-based test programs offer a consistent end-user command-line interface to
+allow both humans and automation to run the tests.
+
+ATF-based test programs rely on an execution engine to be run and this
+execution engine is not shipped with ATF. Kyua is the engine of choice.")
+ (license (list license:bsd-2 license:bsd-3))))
+
(define-public pict
(package
(name "pict")
@@ -272,6 +319,51 @@ source code editors and IDEs.")
(base32
"0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6"))))))
+(define-public checkmake
+ (package
+ (name "checkmake")
+ (version "0.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mrtazz/checkmake")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ajrgnm5mg4b317brx53b8cpjvdw6vin1rk6yh9vrhrz014ifps2"))
+ (modules '((guix build utils)))
+ (snippet `(begin
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/mrtazz/checkmake"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-man
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (let ((man-dir (string-append #$output "/share/man")))
+ (mkdir-p man-dir)
+ (invoke "go-md2man"
+ "-in" "man/man1/checkmake.1.md"
+ "-out" (string-append man-dir "/man1")))))))))
+ (native-inputs
+ (list go-github-com-docopt-docopt-go
+ go-github-com-go-ini-ini
+ go-github-com-go-md2man
+ go-github-com-olekukonko-tablewriter
+ go-github-com-stretchr-testify))
+ (home-page "https://github.com/mrtazz/checkmake")
+ (synopsis "Linter and analyzer for @file{Makefile}")
+ (description
+ "@samp{checkmake} is an experimental tool for linting and checking
+Makefiles. It allows for a set of configurable rules being run
+against a @file{Makefile} or a set of @file{*.mk} files.")
+ (license license:expat)))
+
;;; XXX: This project is abandoned upstream, and included in modern catch2
;;; releases. It is still depended by the restinio test suite at this time,
;;; so keep it (see: https://github.com/Stiffstream/restinio/issues/181).
@@ -862,6 +954,73 @@ has been designed to be fast, light and unintrusive.")
"This package provides a simple and limited unit-test framework for C++.")
(license license:boost1.0))))
+(define-public kyua
+ (package
+ (name "kyua")
+ (version "0.13")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freebsd/kyua")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jzdal9smhmivj18683a5gy8jd2p1dbni7kcpaxq4g9jgjdidcrq"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda _
+ (substitute* '("Makefile.am"
+ "utils/process/isolation_test.cpp"
+ "utils/stacktrace_test.cpp"
+ "integration/utils.sh"
+ "integration/cmd_test_test.sh")
+ (("/bin/sh")
+ ;; The 'local-kyua' generated script in Makefile.am is used
+ ;; to run the built kyua binary for tests.
+ (which "sh")))))
+ (add-after 'unpack 'fix-to_absolute-test
+ ;; This test checks for the existence of /bin and /bin/ls.
+ (lambda _
+ (substitute* "utils/fs/path_test.cpp"
+ (("chdir\\(\"/bin\")")
+ (format #f "chdir(~s)" (dirname (which "ls"))))
+ (("\"/bin/ls\"")
+ (string-append "\"" (which "ls") "\"")))))
+ (add-before 'check 'prepare-for-tests
+ (lambda _
+ ;; The test suite expects HOME to be writable.
+ (setenv "HOME" "/tmp")
+ ;; Generate the autom4te-generated testsuite script, which
+ ;; contains a '/bin/sh' shebang.
+ (invoke "make" "bootstrap/testsuite")
+ (substitute* "bootstrap/testsuite"
+ (("/bin/sh")
+ (which "sh")))))
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ ;; The stacktrace tests expect core files to be dumped to the
+ ;; current directory, which doesn't happen with our kernel
+ ;; configuration (see:
+ ;; https://github.com/freebsd/kyua/issues/214).
+ (substitute* "utils/Kyuafile"
+ ((".*atf_test_program.*stacktrace_test.*")
+ "")))))))
+ (native-inputs (list autoconf automake gdb pkg-config))
+ (inputs (list atf lutok sqlite))
+ (home-page "https://github.com/freebsd/kyua")
+ (synopsis "Testing framework for infrastructure software")
+ (description "Kyua is a testing framework for infrastructure software.
+Kyua is lightweight and simple, and integrates well with various build systems
+and continuous integration frameworks. Kyua features an expressive test suite
+definition language, a safe runtime engine for test suites and a powerful
+report generation engine.")
+ (license license:bsd-3)))
+
(define-public python-gixy
;; The 0.1.20 release is missing some important fixes.
;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests
@@ -986,6 +1145,134 @@ 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)
+ (supported-systems '("x86_64-linux"))
+ (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")
+ (version "3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/klee/klee")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6"))))
+ (arguments
+ (list
+ #:strip-directories #~(list "bin") ;don't strip LLVM bitcode in /lib
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ ;; Allow specification of an absolute full path to uclibc.
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a")
+ "${KLEE_UCLIBC_PATH}"))
+ ;; Make sure that we retain the value of the GUIX_PYTHONPATH
+ ;; environment variable in the test environmented created by
+ ;; python-lit. Otherwise, the test scripts won't be able to
+ ;; find the python-tabulate dependency, causing test failures.
+ (substitute* "test/lit.cfg"
+ (("addEnv\\('PWD'\\)" env)
+ (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))
+ (add-after 'install 'wrap-programs
+ (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-stats finds its Python dependencies.
+ (wrap-program (string-append bin "/klee-stats")
+ `("GUIX_PYTHONPATH" ":" prefix
+ ,(search-path-as-string->list
+ (getenv "GUIX_PYTHONPATH"))))
+ ;; 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 "-DENABLE_UNIT_TESTS=ON"
+ "-DENABLE_SYSTEM_TESTS=ON"
+ (string-append "-DGTEST_SRC_DIR="
+ #+(package-source googletest))
+ (string-append "-DGTEST_INCLUDE_DIR="
+ #+(package-source googletest) "/googletest/include")
+ (string-append "-DLLVMCC="
+ (search-input-file %build-inputs "/bin/clang"))
+ (string-append "-DLLVMCXX="
+ (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 bash-minimal klee-uclibc gperftools sqlite z3 python python-tabulate))
+ (build-system cmake-build-system)
+ (supported-systems '("x86_64-linux"))
+ (home-page "https://klee-se.org/")
+ (synopsis "Symbolic execution engine")
+ (description "KLEE is a symbolic virtual machine built on top of the LLVM
+compiler infrastructure.")
+ (license license:bsd-3)))
+
(define-public cpputest
(package
(name "cpputest")
@@ -1031,10 +1318,10 @@ but it works for any C/C++ project.")
go-github-com-mattn-go-colorable
go-github-com-mattn-go-runewidth
go-github-com-robfig-cron
- go-golang.org-x-sync-errgroup
- go-golang.org-x-sync-semaphore
+ go-golang-org-x-sync
+ go-golang-org-x-sync
go-gopkg-in-yaml-v3))
- (native-inputs (list go-github-com-google-go-cmp-cmp))
+ (native-inputs (list go-github-com-google-go-cmp))
(home-page "https://rhysd.github.io/actionlint/")
(synopsis "Static checker for GitHub Actions workflow files")
(description
@@ -1278,6 +1565,36 @@ and functions, detailed info on failing assert statements, modular fixtures,
and many external plugins.")
(license license:expat)))
+(define-public python-pytest-8
+ (package/inherit python-pytest
+ (name "python-pytest")
+ (version "8.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest" version))
+ (sha256
+ (base32 "0xvr25qvmdh6z03jpgg24adhgqkvkal2g2v8vk63j6909q8bhjyy"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "-k" (string-append
+ "not test_code_highlight_continuation"
+ " and not test_code_highlight"
+ " and not test_code_highlight_custom_theme"
+ " and not test_code_highlight_invalid_theme"
+ " and not test_code_highlight_invalid_theme_mode"
+ " and not test_code_highlight_simple"
+ " and not test_color_yes"
+ " and not test_comparisons_handle_colors"
+ " and not test_empty_NO_COLOR_and_FORCE_COLOR_ignored"
+ " and not test_remove_dir_prefix"))))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-pytest)
+ (append python-exceptiongroup)
+ (replace "python-pluggy" python-pluggy-next)))))
+
(define-public python-pytest-next
(package/inherit python-pytest
(name "python-pytest")
@@ -2438,17 +2755,18 @@ seamlessly into your existing Python unit testing work flow.")
programs, something like CSmith, a random generator of C programs.")
(license license:mpl2.0)))
+;; WARNING: This package is a dependency of mesa.
(define-public python-lit
(package
(name "python-lit")
- (version "17.0.6")
+ (version "18.1.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lit" version))
(sha256
(base32
- "06z3p85gsy5hw3rbk0ym8aig9mvry1327gz7dfjhjigwandszafz"))))
+ "1nsf3ikvlgvqqf185yz5smkvw0268jipdvady0qfh6llhshp9ha7"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -3297,7 +3615,11 @@ allowing you to declaratively define \"match\" rules.")
(sha256
(base32 "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"))))
(arguments
- `(#:tests? #f)) ; It's run after build automatically.
+ (list
+ #:tests? #f ; It's run after build automatically.
+ ;; Fix 'Version:' setting in .pc file. See:
+ ;; <https://github.com/unittest-cpp/unittest-cpp/pull/188>
+ #:configure-flags #~(list (string-append "-DPACKAGE_VERSION=" #$version))))
(build-system cmake-build-system)
(home-page "https://github.com/unittest-cpp/unittest-cpp")
(synopsis "Lightweight unit testing framework for C++")
@@ -3334,6 +3656,32 @@ portable to just about any platform.")
(substitute* "src/faketime.c"
(("\"date\"")
(format #f "~s" (search-input-file inputs "bin/date"))))))
+
+ #$@(if (target-64bit?)
+ #~()
+ #~((add-after 'unpack 'switch-libc-call
+ (lambda _
+ (substitute* "src/libfaketime.c"
+ (("#define _GNU_SOURCE")
+ ;; Make sure to use the 64-bit 'struct timespec' in
+ ;; replacement functions.
+ (string-append "#define _GNU_SOURCE\n"
+ "#define _FILE_OFFSET_BITS 64\n"
+ "#define _TIME_BITS 64\n"))
+ (("\"__clock_gettime\"")
+ ;; Replace '__clock_gettime64' rather than
+ ;; '__clock_gettime64' since this is what
+ ;; newly-built applications use.
+ "\"__clock_gettime64\""))
+
+ ;; XXX: Turn off 'pthread_cond_timedwait' etc.: tests
+ ;; related to this are failing and this feature is
+ ;; probably not useful for the purposes of running
+ ;; code at a fixed date.
+ (substitute* "src/Makefile"
+ (("-DFAKE_PTHREAD")
+ ""))))))
+
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" #$(cc-for-target))
@@ -3352,8 +3700,14 @@ portable to just about any platform.")
(add-before 'check 'pre-check
(lambda _
(substitute* "test/functests/test_exclude_mono.sh"
- (("/bin/bash") (which "bash"))))))))
- (native-inputs (list perl)) ;for tests
+ (("/bin/bash") (which "bash")))
+ #$@(if (target-64bit?)
+ #~()
+ ;; XXX: This test uses Perl to call 'clock_gettime' and
+ ;; fails for unclear reasons on i686-linux.
+ #~((delete-file
+ "test/functests/test_exclude_mono.sh"))))))))
+ (native-inputs (list perl)) ;for tests
(inputs (list coreutils-minimal))
(synopsis "Fake the system time for single applications")
(description
@@ -3364,8 +3718,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))
@@ -3378,24 +3732,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++.
@@ -3752,7 +4121,7 @@ markers to simplify testing of asynchronous tornado applications.")
(add-after 'build 'check
(lambda _
(invoke "guile" "proba.scm" "run" "tests")))
- (add-after 'install 'install-wrapped-script
+ (add-after 'check 'install-wrapped-script
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin-dir (string-append out "/bin"))
@@ -3764,7 +4133,7 @@ markers to simplify testing of asynchronous tornado applications.")
`("GUILE_LOAD_PATH" prefix (,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" prefix
(,(getenv "GUILE_LOAD_COMPILED_PATH")))))))
- (add-after 'install 'install-manual
+ (add-after 'build-manual 'install-manual
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(info-dir (string-append out "/share/info")))
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index db582fa821..66e57954eb 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -295,9 +295,9 @@ will name the threaded machine type unless THREADS? is provided as #f."
(define-public chez-scheme-for-racket
(package
(name "chez-scheme-for-racket")
- ;; The version should match `(scheme-version-number #t)`.
+ ;; The version should match `(scheme-version #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)
@@ -312,7 +312,8 @@ will name the threaded machine type unless THREADS? is provided as #f."
`(,this-package "doc"))
(list stex-bootstrap
(texlive-updmap.cfg
- (list texlive-enumitem))))
+ (list texlive-enumitem
+ texlive-etoolbox))))
,chez-nanopass-bootstrap
,zuo))
(native-search-paths
@@ -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/chicken.scm b/gnu/packages/chicken.scm
index 8f5e8ce98d..3743ae3e2a 100644
--- a/gnu/packages/chicken.scm
+++ b/gnu/packages/chicken.scm
@@ -26,7 +26,6 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix svn-download)
- #:use-module (gnu packages commencement)
#:use-module ((guix licenses)
#:prefix license:))
@@ -68,7 +67,11 @@
(variable "CHICKEN_REPOSITORY_PATH")
;; TODO extract binary version into a module level definition.
(files (list "var/lib/chicken/11")))))
- (propagated-inputs (list gcc-toolchain))
+ ;; Reference gcc-toolchain lazily to avoid circular module dependency
+ ;; problems.
+ (propagated-inputs (list (module-ref (resolve-interface
+ '(gnu packages commencement))
+ 'gcc-toolchain)))
(home-page "https://www.call-cc.org/")
(synopsis "R5RS Scheme implementation that compiles native code via C")
(description
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index bc49e24f0e..cf1703cecb 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -413,7 +413,7 @@
(let ((chromium-dir (getcwd)))
(set-path-environment-variable
"PATH" '("bin")
- (list #+patch #+python-wrapper #+xz))
+ (list #+patch #+python-wrapper #+xz #+zstd))
;; Apply patches before running the ungoogled scripts because
;; domain substitution may break some of the patches.
@@ -869,6 +869,7 @@
(inputs
(list alsa-lib
at-spi2-core
+ bash-minimal
cups
curl
dbus
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 3908128361..6b6aae67a6 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -34,6 +34,7 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages docbook)
@@ -60,8 +61,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass
- (let ((commit "7bcd3d079f0ec45ac50f0dbc14eb4ec68c6a6b53")
- (revision "2"))
+ (let ((commit "ab5c751737b694b4d1e5fbbd7bc1ec559e94a7ce")
+ (revision "7"))
(package
(name "cuirass")
(version (git-version "1.2.0" revision commit))
@@ -74,7 +75,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0x92dsck8ryyqz5cbs6i11wdrsbagrl85jddzc52rmwzqzrig9j2"))))
+ "1cakc6q7gvd1qnfq47j6swqjrkgikwaq3ziwdrdvb0d23l2xzz29"))))
(build-system gnu-build-system)
(arguments
(list #:modules `((guix build utils)
@@ -135,7 +136,8 @@
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
,objs))))))))
(inputs
- (list guile-3.0-latest
+ (list bash-minimal
+ guile-3.0-latest
guile-avahi
guile-fibers
guile-gcrypt
@@ -153,7 +155,12 @@
guix))
(native-inputs
- (list autoconf-2.71 automake pkg-config texinfo ephemeralpg))
+ (list autoconf-2.71
+ automake
+ pkg-config
+ texinfo
+ ephemeralpg
+ esbuild))
(native-search-paths
;; For HTTPS access, Cuirass itself honors these variables, with the
;; same semantics as Git and OpenSSL (respectively).
diff --git a/gnu/packages/clifm.scm b/gnu/packages/clifm.scm
index 24530ada77..2718217381 100644
--- a/gnu/packages/clifm.scm
+++ b/gnu/packages/clifm.scm
@@ -30,7 +30,7 @@
(define-public clifm
(package
(name "clifm")
- (version "1.18")
+ (version "1.20")
(source
(origin
(method git-fetch)
@@ -39,7 +39,7 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1r83wx6nxsdycnj56h9s32mraisjx1w0rsnmj9xw2nf249j8c05n"))))
+ (base32 "1hmky0rdrdp5zs1pgayrcgrf0ylvl2xh135r2c0g8k4ibwv3392c"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "CC="
@@ -53,7 +53,8 @@
(inputs (list readline acl libcap))
(home-page "https://github.com/leo-arch/clifm")
(synopsis "Command-line file manager")
- (description "Clifm is a shell-like, text-based terminal file manager
+ (description
+ "Clifm is a shell-like, text-based terminal file manager
that sits on the command line.
It is built with command line principles in mind: instead of navigating
diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index f342d159e1..659b8282ab 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -139,7 +139,6 @@
(list docbook-xml
docbook-xml-4.4 ;used by documentation/ra2refentry.xsl
docbook-xsl
- libxml2 ;for XML_CATALOG_FILES
libxslt ;for xsltproc
ruby-asciidoctor)
'())))
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index d6ac8178f3..3f7a6de478 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2023 Fries <fries1234@protonmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -190,14 +191,14 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(define-public global ; a global variable
(package
(name "global")
- (version "6.6.12")
+ (version "6.6.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/global/global-"
version ".tar.gz"))
(sha256
(base32
- "00ari03n0wdzz1ib73p64h8g1p0a9js61fxl92jyq50fhh35najl"))))
+ "0yrl0dkwp24ddnb2jnirc6a9qrh1z2l1r0fraiwgf0fs62bk8pwl"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -224,22 +225,6 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(substitute* "globash/globash.in"
(("/bin/echo")
(search-input-file inputs "bin/echo")))))
- (add-after 'post-install 'install-plugins
- (lambda _
- (with-directory-excursion "plugin-factory"
- (invoke "make" "install"))))
- (add-before 'install 'dont-install-to-/var
- (lambda _
- (substitute* "gozilla/Makefile"
- (("DESTDIR\\)\\$\\{localstatedir\\}")
- "TMPDIR)"))))
- (add-after 'install-plugins 'wrap-program
- (lambda _
- (wrap-program
- (string-append #$output
- "/share/gtags/script/pygments_parser.py")
- `("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH"))))))
(add-after 'install 'post-install
(lambda _
;; Install the plugin files in the right place.
@@ -257,7 +242,23 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(rename-file (string-append data "/gtags.vim")
(string-append vim "/gtags.vim"))
(rename-file (string-append data "/gtags-cscope.vim")
- (string-append vim "/gtags-cscope.vim"))))))))
+ (string-append vim "/gtags-cscope.vim")))))
+ (add-after 'post-install 'install-plugins
+ (lambda _
+ (with-directory-excursion "plugin-factory"
+ (invoke "make" "install"))))
+ (add-before 'install 'dont-install-to-/var
+ (lambda _
+ (substitute* "gozilla/Makefile"
+ (("DESTDIR\\)\\$\\{localstatedir\\}")
+ "TMPDIR)"))))
+ (add-after 'install-plugins 'wrap-program
+ (lambda _
+ (wrap-program
+ (string-append #$output
+ "/share/gtags/script/pygments_parser.py")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))))))))
(inputs
(list bash-minimal ; for wrap-program
coreutils
@@ -348,7 +349,8 @@ COCOMO model or user-provided parameters.")
(base32 "0j7qwc5n1y05jl3rq83mf1d0pavkz9z0waqi8dxblkgw4pwwnjyv"))))
(build-system gnu-build-system)
(inputs
- (list coreutils
+ (list bash-minimal
+ coreutils
perl
perl-algorithm-diff
perl-digest-md5
@@ -389,7 +391,7 @@ cloc can handle a greater variety of programming languages.")
(define-public scc
(package
(name "scc")
- (version "3.1.0")
+ (version "3.3.5")
(source
(origin
(method git-fetch)
@@ -398,7 +400,7 @@ cloc can handle a greater variety of programming languages.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1rkkfg6jimlc2rkajk6ypd5v0m3zai25ga5idz2pmkmzakv82n21"))))
+ (base32 "0fvp9ab65vwn3dn0wm8l63rrp5fz1gpymcxs8yr0h4s5zmrsg9zf"))))
(build-system go-build-system)
(arguments
(list
@@ -574,9 +576,8 @@ expressions, and its ability to generate emacs-style TAGS files.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/geninfo")
- `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
- #t)))))
- (inputs (list perl perl-io-compress perl-json))
+ `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
+ (inputs (list bash-minimal perl perl-io-compress perl-json))
(home-page "https://ltp.sourceforge.net/coverage/lcov.php")
(synopsis "Code coverage tool that enhances GNU gcov")
(description "LCOV is an extension of @command{gcov}, a tool part of the
@@ -823,14 +824,14 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
(define-public astyle
(package
(name "astyle")
- (version "3.4.8")
+ (version "3.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/astyle/astyle/astyle%20"
- version "/astyle_" version "_linux.tar.gz"))
+ version "/astyle-" version ".tar.bz2"))
(sha256
- (base32 "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"))))
+ (base32 "0g4jyp47iz97ld9ac4wb5k59j4cs8dbw4dp8f32bwqx8pyvirz6y"))))
(build-system gnu-build-system)
(arguments
(list
@@ -839,11 +840,13 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
#~(list (string-append "prefix=" #$output)
"INSTALL=install"
"release" "shared")
- #:modules '((guix build gnu-build-system) ;FIXME use %default-modules
- (guix build utils)
- (ice-9 regex))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-makefile
+ (lambda _
+ (substitute* "build/gcc/Makefile"
+ (("CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c\\+\\+11")
+ "CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++17"))))
(replace 'configure
(lambda _
(chdir "build/gcc")))
@@ -852,12 +855,6 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
;; Libraries and headers aren't installed by default.
(let ((include (string-append #$output "/include"))
(lib (string-append #$output "/lib")))
- (define (link.so file strip-pattern)
- (symlink
- (basename file)
- (regexp-substitute #f
- (string-match strip-pattern file)
- 'pre)))
(mkdir-p include)
(copy-file "../../src/astyle.h"
(string-append include "/astyle.h"))
@@ -865,12 +862,7 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
(for-each (lambda (l)
(copy-file
l (string-append lib "/" (basename l))))
- (find-files "bin" "^lib.*\\.so"))
- (for-each
- (lambda (file)
- (link.so file "(\\.[0-9]+){3}$") ;.so
- (link.so file "(\\.[0-9]+){2}$")) ;.so.3
- (find-files lib "lib.*\\.so\\..*"))))))))
+ (find-files "bin" "^lib.*\\.so"))))))))
(home-page "https://astyle.sourceforge.net/")
(synopsis "Source code indenter, formatter, and beautifier")
(description
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b4d236c35b..ce40f0cea6 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,19 +1,20 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018, 2019, 2021, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2022, 2024 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2022, 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -57,10 +58,14 @@
#:use-module (gnu packages xml)
#:use-module (guix gexp)
#:use-module (guix packages)
- #:use-module ((guix store) #:select (%store-monad))
+ #:use-module (guix platform)
+ #:use-module ((guix store) #:select (%store-monad
+ store-lift
+ built-in-builders))
#:use-module (guix monads)
#:use-module (guix download)
- #:use-module ((guix git-download) #:select (git-reference git-file-name))
+ #:use-module ((guix git-download)
+ #:select (git-fetch git-reference git-file-name))
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:)
@@ -68,8 +73,7 @@
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (ice-9 vlist)
- #:use-module (ice-9 match)
- #:export (make-gcc-toolchain))
+ #:use-module (ice-9 match))
;;; Commentary:
;;;
@@ -93,37 +97,53 @@
;;;
;;; Code:
+(define built-in-builders*
+ (store-lift built-in-builders))
+
(define* (git-fetch-from-tarball tarball)
"Return an <origin> method equivalent to 'git-fetch', except that it fetches
the checkout from TARBALL, a tarball containing said checkout.
The purpose of this procedure is to work around bootstrapping issues:
'git-fetch' depends on Git, which is much higher in the dependency graph."
- (lambda* (url hash-algo hash
+ (lambda* (ref hash-algo hash
#:optional name
#:key (system (%current-system))
(guile %bootstrap-guile))
- (mlet %store-monad ((guile (package->derivation guile system)))
- (gexp->derivation
- (or name "git-checkout")
- (with-imported-modules '((guix build utils))
- #~(begin
- (use-modules (guix build utils)
- (ice-9 ftw)
- (ice-9 match))
- (setenv "PATH"
- #+(file-append %bootstrap-coreutils&co "/bin"))
- (invoke "tar" "xf" #$tarball)
- (match (scandir ".")
- (("." ".." directory)
- (copy-recursively directory #$output)))))
- #:recursive? #t
- #:hash-algo hash-algo
- #:hash hash
- #:system system
- #:guile-for-build guile
- #:graft? #f
- #:local-build? #t))))
+ (mlet %store-monad ((builtins (built-in-builders*)))
+ ;; Use the 'git-download' built-in builder when it's available: it's the
+ ;; preferred and most reliable method.
+ (if (member "git-download" builtins)
+ (git-fetch ref hash-algo hash name #:system system)
+
+ ;; This method is kept for compatibility with daemons that lack
+ ;; 'git-download' to work around bootstrapping issues.
+ (mlet %store-monad ((guile (package->derivation guile system)))
+ (gexp->derivation
+ (or name "git-checkout")
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils)
+ (ice-9 ftw)
+ (ice-9 match))
+ (setenv "PATH"
+ #+(file-append %bootstrap-coreutils&co "/bin"))
+
+ ;; FIXME: This assumes that TARBALL, an origin, was
+ ;; successfully downloaded under its given hash; however
+ ;; that hash is bound to change over time since it's a
+ ;; generated tarball.
+ (invoke "tar" "xf" #$tarball)
+ (match (scandir ".")
+ (("." ".." directory)
+ (copy-recursively directory #$output)))))
+ #:recursive? #t
+ #:hash-algo hash-algo
+ #:hash hash
+ #:system system
+ #:guile-for-build guile
+ #:graft? #f
+ #:local-build? #t))))))
(define bootar
(package
@@ -145,7 +165,7 @@ the checkout from TARBALL, a tarball containing said checkout.
#:tests? #f
#:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(begin
(use-modules (guix build gnu-bootstrap))
@@ -185,7 +205,7 @@ pure Scheme to Tar and decompression in one easy step.")
#:tests? #f
#:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(begin
(use-modules (guix build gnu-bootstrap))
@@ -214,7 +234,7 @@ pure Scheme to Tar and decompression in one easy step.")
#:tests? #f
#:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(begin
(use-modules (guix build gnu-bootstrap))
@@ -302,97 +322,24 @@ pure Scheme to Tar and decompression in one easy step.")
("bootar" ,bootar)
("guile" ,%bootstrap-guile)))
-(define bootstrap-seeds
- (package
- (name "bootstrap-seeds")
- (version "1.0.0")
- (source (origin
- (method url-fetch)
- (uri (list
- (string-append "mirror://gnu/guix/mirror/"
- "bootstrap-seeds-" version ".tar.gz")
- (string-append
- "https://lilypond.org/janneke/guix/20220501/"
- "bootstrap-seeds-" version ".tar.gz")))
- (sha256
- (base32
- "0scz2bx8fd8c821h6y1j3x6ywgxxns7iinyn9z32dnkiacfdcpfn"))))
- (native-inputs (list bootar))
- (build-system trivial-build-system)
- (arguments
- (list #:guile %bootstrap-guile
- #:modules '((guix build utils))
- #:builder
- #~(begin
- (use-modules (guix build utils))
- (let ((source #$(package-source this-package))
- (tar #$(this-package-native-input "bootar"))
- (out #$output))
- (setenv "PATH" (string-append tar "/bin:"))
- (invoke "tar" "xvf" source)
- (mkdir-p out)
- (copy-recursively "bootstrap-seeds" out)))))
- (home-page "https://github.com/oriansj/bootstrap-seeds")
- (synopsis "The initial bootstrap seeds: 357-byte hex0 and kaem shell")
- (description
- "This package provides pre-built binaries of the bootstrap seeds. It
-contains a hex0-seed and an optional kaem-minimal shell. The size of the hex0
-seeds are for knight: 250 bytes, x86-linux: 357 bytes, x86_64-linux: 431
-bytes, and aarch64-linux 526 bytes. These can be used to build stage0: hex0,
-hex1, hex2, M1, and M2-Planet.")
- (license license:gpl3+)))
-
(define stage0-posix
;; The initial bootstrap package: no binary inputs except those from
;; `bootstrap-seeds, for x86 a 357 byte binary seed: `x86/hex0-seed'.
- (let* ((mescc-tools-version "1.4.0")
- (m2-planet-version "1.9.0")
- (mescc-tools
- (origin
- (method url-fetch)
- (uri (list
- (string-append
- "mirror://gnu/guix/mirror/"
- "mescc-tools-" mescc-tools-version ".tar.gz")
- (string-append
- "https://lilypond.org/janneke/guix/20220502/"
- "mescc-tools-" mescc-tools-version ".tar.gz")))
- (sha256
- (base32
- "1xi6f48pf5bhajhfis189gpizxij7nbp1vzvsb1aafhz4skkiqvg"))))
- (m2-planet
- (origin
- (method url-fetch)
- (uri (list
- (string-append
- "mirror://gnu/guix/mirror/"
- "M2-Planet-" m2-planet-version ".tar.gz")
- (string-append
- "https://lilypond.org/janneke/guix/20220502/"
- "M2-Planet-" m2-planet-version ".tar.gz")))
- (sha256
- (base32
- "1xrn69sc5nz4hwaishqyrcidp1ncxwib9zswl45x378ddz3mmk7g")))))
(package
(name "stage0-posix")
- (version "1.4")
+ (version "1.6.0")
(source (origin
(method url-fetch)
- (uri (list
- (string-append "mirror://gnu/guix/mirror/"
- "stage0-posix-" version ".tar.gz")
- (string-append
- "https://lilypond.org/janneke/guix/20220502/"
- "stage0-posix-" version ".tar.gz")))
+ (uri (string-append
+ "https://github.com/oriansj/" name "/releases/download/"
+ "Release_" version "/" name "-" version ".tar.gz"))
(sha256
(base32
- "1ammifkj33205qrpfm84yb1c99lwgbn4jsl1hd08aab8c9ffz6p4"))))
+ "0p06wn95y6xbp2kcd81h2fm3wxvldd1qqyxgav0farl34xlzyq4j"))))
(supported-systems '("i686-linux" "x86_64-linux"
"aarch64-linux"
"riscv64-linux"))
- (native-inputs
- `(("bootstrap-seeds" ,bootstrap-seeds)
- ,@(%boot-gash-inputs)))
+ (native-inputs (%boot-gash-inputs))
(build-system trivial-build-system)
(arguments
(list
@@ -401,9 +348,7 @@ hex1, hex2, M1, and M2-Planet.")
#:builder
#~(begin
(use-modules (guix build utils))
- (let* ((bootstrap-seeds #$(this-package-native-input
- "bootstrap-seeds"))
- (source #$(package-source this-package))
+ (let* ((source #$(package-source this-package))
(tar #$(this-package-native-input "bootar"))
(bash #$(this-package-native-input "bash"))
(coreutils #$(this-package-native-input "coreutils"))
@@ -422,32 +367,18 @@ hex1, hex2, M1, and M2-Planet.")
"riscv64")
(else
(error "stage0-posix: system not supported" target))))
- (kaem (string-append "../bootstrap-seeds/POSIX/"
+ (kaem (string-append "bootstrap-seeds/POSIX/"
stage0-cpu "/kaem-optional-seed")))
(setenv "PATH" (string-append tar "/bin:"
coreutils "/bin:"
bash "/bin"))
(invoke "tar" "xvf" source)
(chdir (string-append "stage0-posix-" #$version))
- (copy-recursively bootstrap-seeds "bootstrap-seeds")
- (invoke "tar" "xvf" #$mescc-tools)
- (rmdir "mescc-tools")
- (symlink (string-append "mescc-tools-" #$mescc-tools-version)
- "mescc-tools")
- (invoke "tar" "xvf" #$m2-planet)
- (rmdir "M2-Planet")
- (symlink (string-append "M2-Planet-" #$m2-planet-version)
- "M2-Planet")
- (rmdir "M2libc")
- (symlink "M2-Planet/M2libc" "M2libc")
(mkdir-p bindir)
- (with-directory-excursion stage0-cpu
- (with-output-to-file "mes-m2.kaem"
- (lambda _ (display "")))
- (with-output-to-file "mescc-tools-extra.kaem"
- (lambda _ (display "")))
- (invoke kaem "kaem.run"))
- (with-directory-excursion "bin"
+ ;; Keep the same capitalization between the file name and the folder.
+ (rename-file "kaem.aarch64" "kaem.AArch64")
+ (invoke kaem (string-append "kaem." stage0-cpu))
+ (with-directory-excursion (string-append stage0-cpu "/bin")
(install-file "hex2" bindir)
(install-file "M1" bindir)
(install-file "blood-elf" bindir)
@@ -460,13 +391,14 @@ hex1, hex2, M1, and M2-Planet.")
the bootstrap-seeds, the stage0-posix package first builds hex0 and then all
the way up: hex1, catm, hex2, M0, cc_x86, M1, M2, get_machine (that's all of
MesCC-Tools), and finally M2-Planet.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
+
(define mes-boot
(package
(inherit mes)
(name "mes-boot")
- (version "0.24.2")
+ (version "0.25.1")
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://gnu/mes/"
@@ -475,10 +407,10 @@ MesCC-Tools), and finally M2-Planet.")
"mes-" version ".tar.gz")))
(sha256
(base32
- "0vp8v88zszh1imm3dvdfi3m8cywshdj7xcrsq4cgmss69s2y1nkx"))))
+ "03np6h4qx94givjdvq2rmhvab38y5f91254n0avg4vq2j0cx78in"))))
(inputs '())
(propagated-inputs '())
- (supported-systems '("i686-linux" "x86_64-linux"))
+ (supported-systems '("i686-linux" "x86_64-linux" "riscv64-linux"))
(native-inputs
`(("m2-planet" ,stage0-posix)
("nyacc-source" ,(bootstrap-origin
@@ -507,9 +439,17 @@ MesCC-Tools), and finally M2-Planet.")
dir "/nyacc-1.00.2/module"))
(invoke "gash" "configure.sh"
(string-append "--prefix=" out)
- "--host=i686-linux-gnu"))))
+ (string-append "--host="
+ #$(cond
+ ((target-x86-64?) "i686-linux-gnu")
+ (#t (platform-system->target
+ (%current-system)))))))))
(replace 'build
(lambda _
+ ;; TODO: GUILE_LOAD_PATH is leaking. We need to clean it.
+ (substitute* "kaem.run"
+ (("cp bin/mes-m2 bin/mes" all)
+ (string-append "GUILE_LOAD_PATH=/fubar\n" all)))
(invoke "gash" "bootstrap.sh")))
(delete 'check)
(replace 'install
@@ -558,7 +498,7 @@ MesCC-Tools), and finally M2-Planet.")
(package
(inherit tcc)
(name "tcc-boot0")
- (version "0.9.26-1136-g5bba73cc")
+ (version "0.9.26-1149-g46a75d0c")
(source (origin
(method url-fetch)
(uri (list
@@ -568,9 +508,9 @@ MesCC-Tools), and finally M2-Planet.")
"tcc-" version ".tar.gz")))
(sha256
(base32
- "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))
+ "068x3r55fnz7pdxb6q01s8s26pb4kpxm61q8mwsa4cf6389cxxpl"))))
(build-system gnu-build-system)
- (supported-systems '("i686-linux" "x86_64-linux"))
+ (supported-systems '("i686-linux" "x86_64-linux" "riscv64-linux"))
(inputs '())
(propagated-inputs '())
(native-inputs
@@ -605,6 +545,7 @@ MesCC-Tools), and finally M2-Planet.")
(setenv "prefix" out)
(setenv "GUILE_LOAD_PATH"
(string-append dir "/nyacc-1.00.2/module"))
+ (setenv "ONE_SOURCE" "true")
(invoke "sh" "configure"
"--cc=mescc"
(string-append "--prefix=" out)
@@ -878,7 +819,7 @@ MesCC-Tools), and finally M2-Planet.")
(define patch-mesboot
;; The initial patch.
(package
- (inherit patch)
+ (inherit patch/pinned)
(name "patch-mesboot")
(version "2.5.9")
(source (origin
@@ -937,27 +878,28 @@ MesCC-Tools), and finally M2-Planet.")
(native-inputs (%boot-tcc-inputs))
(supported-systems '("i686-linux" "x86_64-linux"))
(arguments
- `(#:implicit-inputs? #f
- #:guile ,%bootstrap-guile
- #:tests? #f ; runtest: command not found
- #:parallel-build? #f
- #:strip-binaries? #f ; no strip yet
- #:configure-flags
- (let ((cppflags (string-append " -D __GLIBC_MINOR__=6"
- " -D MES_BOOTSTRAP=1"))
- (bash (assoc-ref %build-inputs "bash")))
- `(,(string-append "CONFIG_SHELL=" bash "/bin/sh")
- ,(string-append "CPPFLAGS=" cppflags)
- "AR=tcc -ar"
- "CXX=false"
- "RANLIB=true"
- ,(string-append "CC=tcc" cppflags)
- "--disable-nls"
- "--disable-shared"
- "--disable-werror"
- "--build=i686-unknown-linux-gnu"
- "--host=i686-unknown-linux-gnu"
- "--with-sysroot=/"))))))
+ (list #:implicit-inputs? #f
+ #:guile %bootstrap-guile
+ #:tests? #f ; runtest: command not found
+ #:parallel-build? #f
+ #:strip-binaries? #f ; no strip yet
+ #:configure-flags
+ #~(let ((cppflags (string-append
+ " -D __GLIBC_MINOR__=6"
+ " -D MES_BOOTSTRAP=1"))
+ (bash (assoc-ref %build-inputs "bash")))
+ `(,(string-append "CONFIG_SHELL=" bash "/bin/sh")
+ ,(string-append "CPPFLAGS=" cppflags)
+ "AR=tcc -ar"
+ "CXX=false"
+ "RANLIB=true"
+ ,(string-append "CC=tcc" cppflags)
+ "--disable-nls"
+ "--disable-shared"
+ "--disable-werror"
+ "--build=i686-unknown-linux-gnu"
+ "--host=i686-unknown-linux-gnu"
+ "--with-sysroot=/"))))))
(define gcc-core-mesboot0
;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C
@@ -1266,14 +1208,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
(arguments
(substitute-keyword-arguments (package-arguments binutils-mesboot0)
((#:configure-flags configure-flags)
- '(let ((out (assoc-ref %outputs "out")))
- `("--disable-nls"
- "--disable-shared"
- "--disable-werror"
- "--build=i686-unknown-linux-gnu"
- "--host=i686-unknown-linux-gnu"
- "--with-sysroot=/"
- ,(string-append "--prefix=" out))))))))
+ #~(let ((out (assoc-ref %outputs "out")))
+ `("--disable-nls" "--disable-shared"
+ "--disable-werror"
+ "--build=i686-unknown-linux-gnu"
+ "--host=i686-unknown-linux-gnu"
+ "--with-sysroot=/"
+ ,(string-append "--prefix=" out))))))))
(define gnu-make-mesboot
(package
@@ -1926,6 +1867,11 @@ exec " gcc "/bin/" program
(let ((pkg (mesboot-package "grep-mesboot" grep)))
(package
(inherit pkg)
+ (arguments
+ (substitute-keyword-arguments
+ (strip-keyword-arguments
+ '(#:configure-flags)
+ (package-arguments pkg))))
(native-inputs
`(("sed" ,sed-mesboot)
,@(package-native-inputs pkg))))))
@@ -2088,10 +2034,7 @@ exec " gcc "/bin/" program
,@(%bootstrap-inputs+toolchain)))
(arguments
`(#:implicit-inputs? #f
- ;; Ignore test failure in gnulib for armhf/aarch64.
- #:tests? ,(not (target-arm?))
#:guile ,%bootstrap-guile
-
;; The build system assumes we have done a mistake when time_t is 32-bit
;; on a 64-bit system. Ignore that for our bootstrap toolchain.
,@(substitute-keyword-arguments (package-arguments findutils)
@@ -2108,17 +2051,29 @@ exec " gcc "/bin/" program
,flags))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
- ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due
- ;; to incorrect handling of the [:alpha:] regexp character
- ;; class. Ignore it.
- ,@(if (member (%current-system)
- '("x86_64-linux" "i686-linux"))
- '((add-before 'check 'skip-fnmatch-test
- (lambda _
- (substitute* "gnulib-tests/Makefile"
- (("^XFAIL_TESTS =")
- "XFAIL_TESTS = test-fnmatch ")))))
- '()))))))))
+ (add-before 'check 'skip-problematic-tests
+ (lambda _
+ ,(match (%current-system)
+ ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due
+ ;; to incorrect handling of the [:alpha:] regexp character
+ ;; class. Ignore it.
+ ((or "x86_64-linux" "i686-linux")
+ '(substitute* "gnulib-tests/Makefile"
+ (("^XFAIL_TESTS =")
+ "XFAIL_TESTS = test-fnmatch ")))
+ ("armhf-linux"
+ '(substitute* "gnulib-tests/Makefile"
+ (("^XFAIL_TESTS =")
+ "XFAIL_TESTS = test-fnmatch ")
+ (("test-pthread-thread\\$\\(EXEEXT\\)") "")))
+ (_
+ ;; XXX: The pthread tests are known to fail at least on
+ ;; ARM; skip them.
+ '(substitute* "gnulib-tests/Makefile"
+ (("test-pthread\\$\\(EXEEXT\\)") "")
+ (("test-pthread-thread\\$\\(EXEEXT\\)") "")
+ (("test-pthread_sigmask1\\$\\(EXEEXT\\)") "")
+ (("test-pthread_sigmask2\\$\\(EXEEXT\\)") "")))))))))))))
(define file
(package
@@ -2167,8 +2122,8 @@ exec " gcc "/bin/" program
(define patch-boot0
(package
- (inherit patch)
- (source (bootstrap-origin (package-source patch)))
+ (inherit patch/pinned)
+ (source (bootstrap-origin (package-source patch/pinned)))
(name "patch-boot0")
(native-inputs '())
(inputs
@@ -2244,32 +2199,40 @@ exec " gcc "/bin/" program
(source (bootstrap-origin (package-source binutils)))
(name "binutils-cross-boot0")
(arguments
- `(#:guile ,%bootstrap-guile
- #:implicit-inputs? #f
-
- #:modules ((guix build gnu-build-system)
- (guix build utils)
- (ice-9 ftw)) ; for 'scandir'
- #:phases (modify-phases %standard-phases
- (add-after 'install 'add-symlinks
- (lambda* (#:key outputs #:allow-other-keys)
- ;; The cross-gcc invokes 'as', 'ld', etc, without the
- ;; triplet prefix, so add symlinks.
- (let ((out (assoc-ref outputs "out"))
- (triplet-prefix (string-append ,(boot-triplet) "-")))
- (define (has-triplet-prefix? name)
- (string-prefix? triplet-prefix name))
- (define (remove-triplet-prefix name)
- (substring name (string-length triplet-prefix)))
- (with-directory-excursion (string-append out "/bin")
- (for-each (lambda (name)
- (symlink name (remove-triplet-prefix name)))
- (scandir "." has-triplet-prefix?)))))))
-
- ,@(substitute-keyword-arguments (package-arguments binutils)
- ((#:configure-flags cf)
- `(cons ,(string-append "--target=" (boot-triplet))
- ,cf)))))
+ (append (list #:guile %bootstrap-guile
+ #:implicit-inputs? #f
+
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 ftw)) ; for 'scandir'
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'add-symlinks
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The cross-gcc invokes 'as', 'ld', etc, without the
+ ;; triplet prefix, so add symlinks.
+ (let ((out (assoc-ref outputs "out"))
+ (triplet-prefix (string-append #$(boot-triplet)
+ "-")))
+ (define (has-triplet-prefix? name)
+ (string-prefix? triplet-prefix name))
+ (define (remove-triplet-prefix name)
+ (substring name
+ (string-length triplet-prefix)))
+
+ (with-directory-excursion (string-append out "/bin")
+ (for-each (lambda (name)
+ (symlink name
+ (remove-triplet-prefix name)))
+ (scandir "."
+ has-triplet-prefix?))))))))
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags cf)
+ #~(append (list #$(string-append "--target="
+ (boot-triplet))
+ "--disable-gprofng") ;requires Bison
+ #$cf)))))
+ (native-inputs '()) ;no Bison
(inputs (%boot0-inputs))))
(define libstdc++-boot0
@@ -2501,27 +2464,34 @@ exec " gcc "/bin/" program
(source (bootstrap-origin (package-source perl)))
(inputs (%boot0-inputs))
(arguments
- `(#:implicit-inputs? #f
- #:guile ,%bootstrap-guile
- #:validate-runpath? #f
-
- ;; At the very least, this must not depend on GCC & co.
- #:disallowed-references ,(list %bootstrap-binutils)
-
- ,@(substitute-keyword-arguments (package-arguments perl)
- ((#:phases phases)
- `(modify-phases ,phases
- ;; Pthread support is missing in the bootstrap compiler
- ;; (broken spec file), so disable it.
- (add-before 'configure 'disable-pthreads
- (lambda _
- (substitute* "Configure"
- (("^libswanted=(.*)pthread" _ before)
- (string-append "libswanted=" before)))))))
- ;; Do not configure with '-Dusethreads' since pthread
- ;; support is missing.
- ((#:configure-flags configure-flags)
- `(delete "-Dusethreads" ,configure-flags)))))))
+ (append (list #:implicit-inputs? #f
+ #:guile %bootstrap-guile
+ #:validate-runpath? #f
+
+ ;; At the very least, this must not depend on GCC & co.
+ #:disallowed-references (list %bootstrap-binutils))
+ (substitute-keyword-arguments (package-arguments perl)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ ;; Pthread support is missing in the bootstrap compiler
+ ;; (broken spec file), so disable it.
+ (add-before 'configure 'disable-pthreads
+ (lambda _
+ (substitute* "Configure"
+ (("^libswanted=(.*)pthread" _ before)
+ (string-append "libswanted=" before)))))))
+ ;; Do not configure with '-Dusethreads' since pthread
+ ;; support is missing.
+ ((#:configure-flags configure-flags)
+ #~(delete "-Dusethreads"
+
+ ;; On i586-gnu, linking fails with "undefined
+ ;; reference to `__stack_chk_guard'" so avoid
+ ;; '-fstack-protector'.
+ #$(if (target-hurd?)
+ #~(cons* "-A" "ccflags=-fno-stack-protector"
+ #$configure-flags)
+ configure-flags))))))))
(define m4-boot0
(package
@@ -2665,7 +2635,7 @@ memoized as a function of '%current-system'."
(package
(inherit gnumach-headers)
(name "gnumach-headers-boot0")
- (version "1.8+git20221224")
+ (version "1.8+git20230410")
(source
(origin
(inherit (package-source gnumach-headers))
@@ -2678,7 +2648,7 @@ memoized as a function of '%current-system'."
"gnumach-" version ".tar.gz"))
(sha256
(base32
- "0vb19ynvrxz302snqxkd0wgizwa5fw2x06a4zjsllqb9ijbq9mc8")))))))
+ "1s09256g2ny46idrn8frzs7r51la9ni45bmglmswlsmz9ii7dpi4")))))))
(native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
@@ -2717,18 +2687,18 @@ memoized as a function of '%current-system'."
gnumach-headers-boot0))
(inputs (list flex-boot0 gnumach-headers-boot0))
(arguments
- (list
- #:configure-flags
- #~(list (string-append "LDFLAGS=-Wl,-rpath="
- #$(this-package-native-input "flex")
- "/lib/")))))))
+ (substitute-keyword-arguments (package-arguments mig)
+ ((#:configure-flags flags '())
+ #~(list (string-append "LDFLAGS=-Wl,-rpath="
+ #$(this-package-native-input "flex")
+ "/lib/"))))))))
(define hurd-headers-boot0
(with-boot0
(package
(inherit hurd-headers)
(name "hurd-headers-boot0")
- (version "0.9.git20230216")
+ (version "0.9.git20230520")
(source
(origin
(inherit (package-source hurd-headers))
@@ -2741,7 +2711,7 @@ memoized as a function of '%current-system'."
"hurd-v" version ".tar.gz"))
(sha256
(base32
- "1f75nlkcl00dqnnrbrj1frvzs2qibfpygj3gwywqi85aldjl48y7")))))))
+ "0ybmx7bhy21zv1if2hfdspn13zn68vki1na72sw2jj87gj8przna")))))))
(native-inputs
(list autoconf-boot0 automake-boot0 mig-boot0))
(inputs '()))))
@@ -2822,6 +2792,7 @@ memoized as a function of '%current-system'."
;; pthreads, which is missing on non-x86 platforms at this stage.
;; Python 3.6 technically supports being built without threading
;; support, but requires additional patches.
+ (name "python-boot0")
(version "3.5.9")
(source (bootstrap-origin
(origin
@@ -3140,27 +3111,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("gcc" ,gcc-boot0-wrapped)
,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" "linux-libre-headers"))))
-(define binutils-final
- (package
- (inherit binutils)
- (source (bootstrap-origin (package-source binutils)))
- (arguments
- `(#:guile ,%bootstrap-guile
- #:implicit-inputs? #f
- #:allowed-references
- ,@(match (%current-system)
- ((? target-powerpc?)
- `(("out" ,glibc-final ,static-bash-for-glibc)))
- (_
- `(("out" ,glibc-final))))
- ,@(package-arguments binutils)))
- (inputs
- (match (%current-system)
- ((? target-powerpc?)
- `(("bash" ,static-bash-for-glibc)
- ,@(%boot2-inputs)))
- (_ (%boot2-inputs))))))
-
(define libstdc++
;; Intermediate libstdc++ that will allow us to build the final GCC
;; (remember that GCC-BOOT0 cannot build libstdc++.)
@@ -3190,6 +3140,36 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(inputs (%boot2-inputs))
(synopsis "GNU C++ standard library (intermediate)"))))
+(define binutils-final
+ (package
+ (inherit binutils)
+ (source (bootstrap-origin (package-source binutils)))
+ (arguments
+ (append (list #:guile %bootstrap-guile
+ #:implicit-inputs? #f
+ #:allowed-references `("out" ,glibc-final
+ ,(this-package-native-input
+ "libstdc++")
+ ,@(if (target-powerpc? (%current-system))
+ (list static-bash-for-glibc)
+ '())))
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags #~'())
+ ;; For gprofng, tell the build system where to look for libstdc++.
+ #~(append #$flags
+ (list (string-append "LDFLAGS=-L"
+ #$(this-package-native-input
+ "libstdc++")
+ "/lib")))))))
+ (native-inputs (list bison-boot0
+ libstdc++)) ;for gprofng
+ (inputs
+ (match (%current-system)
+ ((? target-powerpc?)
+ `(("bash" ,static-bash-for-glibc)
+ ,@(%boot2-inputs)))
+ (_ (%boot2-inputs))))))
+
(define zlib-final
;; Zlib used by GCC-FINAL.
(package
@@ -3236,7 +3216,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; Additional modules for the libstdc++ phase below.
#:modules `((srfi srfi-1)
(srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
(substitute-keyword-arguments (package-arguments gcc)
((#:make-flags flags)
@@ -3348,8 +3328,18 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define-public guile-final
;; This package must be public because other modules refer to it. However,
;; mark it as hidden so that 'fold-packages' ignores it.
- (with-boot4 (hidden-package
- (package-with-bootstrap-guile guile-3.0/pinned))))
+ (let ((parent (with-boot4 (hidden-package
+ (package-with-bootstrap-guile guile-3.0/pinned)))))
+ (package
+ (inherit parent)
+ (inputs
+ (modify-inputs (package-inputs parent)
+ (delete "libxcrypt")))
+ (arguments
+ (substitute-keyword-arguments (package-arguments parent)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (delete 'add-libxcrypt-reference-pkgconfig))))))))
(define-public glibc-utf8-locales-final
;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed
@@ -3389,27 +3379,21 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
#:guile guile-final
#:bash bash-final))
-(define (%boot5-inputs)
- ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built
- ;; with an older libc, which cannot load the new locale format. See
- ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
- `(("locales" ,(if (target-hurd?)
- glibc-utf8-locales-final/hurd
- glibc-utf8-locales-final))
- ,@(%boot4-inputs)))
+;; There used to be a "stage 5" including a variant of the
+;; 'glibc-utf8-locales' package. This is no longer necessary since 'glibc'
+;; embeds the "C.UTF-8" locale, but these aliases are kept for convenience.
+(define %boot5-inputs %boot4-inputs)
+(define with-boot5 with-boot4)
-(define with-boot5
- (package-with-explicit-inputs %boot5-inputs))
-
-(define gnu-make-final
- ;; The final GNU Make, which uses the final Guile.
+(define (make-gnu-make-final)
+ "Compute the final GNU Make, which uses the final Guile."
(let ((pkg-config (package
(inherit %pkg-config) ;the native pkg-config
(inputs `(("guile" ,guile-final)
,@(%boot5-inputs)))
(arguments
`(#:implicit-inputs? #f
- ,@(package-arguments pkg-config))))))
+ ,@(package-arguments %pkg-config))))))
(package
(inherit (package-with-bootstrap-guile gnu-make))
(inputs `(("guile" ,guile-final)
@@ -3438,8 +3422,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; built before gzip.
(let ((grep (with-boot5 (package-with-bootstrap-guile grep))))
(package/inherit grep
- (inputs (alist-delete "pcre" (package-inputs grep)))
- (native-inputs `(("perl" ,perl-boot0))))))
+ (arguments (strip-keyword-arguments '(#:configure-flags)
+ (package-arguments grep)))
+ (inputs (alist-delete "pcre2" (package-inputs grep)))
+ (native-inputs `(("perl" ,perl-boot0))))))
(define xz-final
;; The final xz. We need to replace the bootstrap xz with a newer one
@@ -3482,23 +3468,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("bzip2" ,bzip2)
("file" ,file)
("diffutils" ,diffutils)
- ("patch" ,patch)
+ ("patch" ,patch/pinned)
("findutils" ,findutils)
- ("gawk" ,gawk)))
+ ("gawk" ,(package/inherit gawk
+ (native-inputs
+ (list (if (target-hurd?)
+ glibc-utf8-locales-final/hurd
+ glibc-utf8-locales-final)))))
+ ("zstd" ,zstd)))
("sed" ,sed-final)
("grep" ,grep-final)
("xz" ,xz-final)
("coreutils" ,coreutils-final)
- ("make" ,gnu-make-final)
+ ("make" ,(make-gnu-make-final))
("bash" ,bash-final)
("ld-wrapper" ,ld-wrapper)
("binutils" ,binutils-final)
("gcc" ,gcc-final)
("libc" ,glibc-final)
- ("libc:static" ,glibc-final "static")
- ("locales" ,(if (target-hurd? (%current-system))
- glibc-utf8-locales-final/hurd
- glibc-utf8-locales-final)))))))
+ ("libc:static" ,glibc-final "static"))))))
(define-public canonical-package
(let ((name->package (mlambda (system)
@@ -3509,6 +3497,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
package result))))
vlist-null
`(("guile" ,guile-final)
+ ("glibc-utf8-locales"
+ ,(if (target-hurd? system)
+ glibc-utf8-locales-final/hurd
+ glibc-utf8-locales-final))
,@(%final-inputs system))))))
(lambda (package)
"Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of
@@ -3574,15 +3566,7 @@ COREUTILS-FINAL vs. COREUTILS, etc."
"libc-debug")))
(union-build (assoc-ref %outputs "static")
(list (assoc-ref %build-inputs
- "libc-static")))
- ;; XXX Remove once an empty librt.a is added to
- ;; libc:out.
- (copy-file
- (string-append (assoc-ref %outputs "out")
- "/lib/libpthread.a")
- (string-append (assoc-ref %outputs "out")
- "/lib/librt.a"))
- #t))))
+ "libc-static")))))))
(native-search-paths
(append (package-native-search-paths gcc)
@@ -3651,6 +3635,9 @@ is the GNU Compiler Collection.")
(define-public gcc-toolchain-13
(make-gcc-toolchain gcc-13))
+(define-public gcc-toolchain-14
+ (make-gcc-toolchain gcc-14))
+
;; The default GCC
(define-public gcc-toolchain
gcc-toolchain-11)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 55784a70de..d35666c13f 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -39,6 +39,9 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -71,6 +74,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
@@ -79,6 +83,7 @@
#:use-module (gnu packages benchmark)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages file)
@@ -86,6 +91,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages java)
#:use-module (gnu packages llvm)
@@ -106,7 +112,7 @@
(define-public zlib
(package
(name "zlib")
- (version "1.2.13")
+ (version "1.3")
(source
(origin
(method url-fetch)
@@ -116,7 +122,7 @@
version "/zlib-" version ".tar.gz")))
(sha256
(base32
- "0c5b8vw40dy178xlpddw65q9gf1h2186jcc3p4swinwggbllv8mk"))))
+ "0gjrz8p70mgkic7mxjh1vqwws4x8z7hq2fhbackvqg81jb1a82zz"))))
(build-system gnu-build-system)
(outputs '("out" "static"))
(arguments
@@ -251,14 +257,14 @@ adding and extracting files to/from a tar archive.")
(define-public gzip
(package
(name "gzip")
- (version "1.12")
+ (version "1.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gzip/gzip-"
version ".tar.xz"))
(sha256
(base32
- "0mhrx5wk9gazmxdw7vmbpg036yzqqhsww6h12kwf2dzn37jh6pnf"))))
+ "0mx0j7765l4cyj3hyvlks2s3izdyzaqf3hknamjwc5yv6mlynm3l"))))
(build-system gnu-build-system)
(synopsis "General file (de)compression (using lzw)")
(arguments
@@ -524,7 +530,7 @@ formats, including zstd, xz, gzip, and bgzf.")
(define-public xz
(package
(name "xz")
- (version "5.2.8")
+ (version "5.4.5")
(source (origin
(method url-fetch)
(uri (list (string-append "http://tukaani.org/xz/xz-" version
@@ -533,7 +539,7 @@ formats, including zstd, xz, gzip, and bgzf.")
version ".tar.gz")))
(sha256
(base32
- "0z9056ydsy76ib5cl1z60jkcqgr0x12d3lw1p2qnlcwi1fgxlp7c"))))
+ "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -570,6 +576,45 @@ than gzip and 15 % smaller output than bzip2.")
(license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
(home-page "https://tukaani.org/xz/")))
+(define-public heatshrink
+ (package
+ (name "heatshrink")
+ (version "0.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomicobject/heatshrink/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn"))
+ ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the
+ ;; only users of this library (see
+ ;; <https://github.com/NixOS/nixpkgs/pull/269758/commits/fa36136ceed0e2c58e0c9e21492a7e60c3a64470>.)
+ (patches (search-patches "heatshrink-add-cmake.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; XXX: No tests available with CMake (see
+ ;; <https://github.com/atomicobject/heatshrink/pull/77>.)
+ #:tests? #f))
+ (home-page "https://github.com/atomicobject/heatshrink/")
+ (synopsis "Data compression library for embedded/real-time systems")
+ (description
+ "A data compression/decompression library for embedded/real-time systems.
+
+Among its features are:
+@itemize
+@item Low memory usage (as low as 50 bytes.) It is useful for some cases with less
+than 50 bytes, and useful for many general cases with less than 300 bytes.
+@item Incremental, bounded CPU use. It can be used to chew on input data in
+arbitrarily tiny bites. This is a useful property in hard real-time environments.
+@item Can use either static or dynamic memory allocation.
+@end itemize
+")
+ (license license:isc)))
+
(define-public lhasa
(package
(name "lhasa")
@@ -861,6 +906,47 @@ C, forked from the zip manipulation library found in the zlib distribution.")
sfArk file format to the uncompressed sf2 format.")
(license license:gpl3+))))
+(define-public draco
+ (package
+ (name "draco")
+ (version "1.5.7")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/draco")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1v1idvqr9mww9wi36yzb10lq66ls78dlrgnxchjjjv5paw2g0mk3"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; There is a testdata directory but apparently no actual tests.
+ ;; src/draco/tools/install_test contains a sanity check, but this
+ ;; check is useless here.
+ (list #:tests? #f
+ #:configure-flags
+ #~(list "-DBUILD_SHARED_LIBS=true"
+ (string-append "-DDRACO_EIGEN_PATH="
+ #$(this-package-input "eigen"))
+ (string-append "-DDRACO_FILESYSTEM_PATH="
+ #$(this-package-input "gulrak-filesystem"))
+ (string-append "-DDRACO_TINYGLTF_PATH="
+ #$(this-package-input "tinygltf")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'delete-static-lib
+ (lambda _
+ (delete-file (string-append #$output
+ "/lib/libdraco.a")))))))
+ (inputs (list eigen gulrak-filesystem tinygltf))
+ (home-page "https://google.github.io/draco/")
+ (synopsis "Compress and decompress 3D geometric meshes and point clouds")
+ (description "Draco is a library for compressing and decompressing 3D
+geometric meshes and point clouds. It is intended to improve the storage and
+transmission of 3D graphics.")
+ (license license:asl2.0)))
+
(define-public libmspack
(package
(name "libmspack")
@@ -2150,15 +2236,18 @@ corrupted input.")
(define-public plzip
(package
(name "plzip")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/plzip/"
"plzip-" version ".tar.gz"))
(sha256
- (base32 "16408n8z21hfxp0qnx3hh1d0c47g8z9i3vflbgbrmf6qcn1abyj3"))))
+ (base32 "0sv2sp0ppxkdds4qiwb3ddvlv22ydv61n3hk74rkh8ljbkjcpqyq"))))
(build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list (string-append "CXX=" #$(cxx-for-target)))))
(inputs
(list lzlib))
(home-page "https://www.nongnu.org/lzip/plzip.html")
@@ -2591,7 +2680,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)
@@ -2600,7 +2689,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))
@@ -2869,7 +2958,7 @@ compression and decompression speed compared to Deflate using Zlib.")
(define-public unrar-free
(package
(name "unrar-free")
- (version "0.1.3")
+ (version "0.3.1")
(source
(origin
(method git-fetch)
@@ -2878,14 +2967,14 @@ compression and decompression speed compared to Deflate using Zlib.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "12idmr5rjmw7dg2mi6250q599nywrirgc8553353a4swf5n1pmx4"))))
+ (base32 "1qf2fdr4bl10kys2fsb6090r9xj0ascrk7pn0iklsv1ajwcql3qf"))))
(build-system gnu-build-system)
- (inputs
- `(("libarchive" ,libarchive)))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)))
+ (list autoconf
+ automake
+ pkg-config))
+ (inputs
+ (list libarchive))
(home-page "https://gitlab.com/bgermann/unrar-free")
(synopsis "Extract files from RAR archives")
(description
@@ -2895,3 +2984,52 @@ list and extract not only RAR archives but also other formats supported by
libarchive. It does not rival the non-free @code{unrar} in terms of features,
but special care has been taken to ensure it meets most user's needs.")
(license license:gpl2+)))
+
+(define-public miniz
+ (package
+ (name "miniz")
+ (version "3.0.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/richgel999/miniz")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0672q35vjrpakmsr1gwj9k5fwv5ihzhahm19bq4y74wqpn91p7fw"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ ''("-DBUILD_SHARED_LIBS=ON")
+ ;; No tests
+ #:tests? #f))
+ (home-page "https://github.com/richgel999/miniz")
+ (synopsis "Independent implementation of zlib and Deflate compression")
+ (description "Miniz is a lossless data compression library that implements
+the zlib (RFC 1950) and Deflate (RFC 1951) compressed data format
+specification standards. It supports the most commonly used functions
+exported by the zlib library.")
+ (license license:expat)))
+
+(define-public miniz-for-pytorch
+ (package
+ (inherit miniz)
+ (version "pytorch-2.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/richgel999/miniz")
+ (commit "2.2.0")))
+ (file-name (git-file-name (package-name miniz) version))
+ (sha256
+ (base32
+ "09j9ihigfsavgcmk8l36zmbjvdf1x1w7h2v4rkww1qk1sb43y5zf"))
+ (patches (search-patches "miniz-for-pytorch.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments miniz)
+ ((#:configure-flags flags '())
+ ;; The changes break the examples.
+ `(cons "-DBUILD_EXAMPLES=OFF" ,flags))))
+ (properties '((hidden? . #t)))))
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index de27f50e0c..ffb6762142 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,9 +20,11 @@
(define-module (gnu packages configuration-management)
#:use-module (gnu packages)
#:use-module (guix build-system go)
+ #:use-module (guix gexp)
#: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)
@@ -45,90 +48,95 @@
"0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/twpayne/chezmoi"
- #:install-source? #f
- #:phases
- (modify-phases %standard-phases
- ;; Remove test script which expect additional user's programs available
- ;; in the PATH. The testdata directory is removed in the latest version
- ;; (2.46.1) of the program.
- (add-after 'unpack 'remove-failing-test-scripts
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each (lambda (f)
- (delete-file (string-append "src/" import-path "/testdata/scripts/" f)))
- '("bitwarden.txt"
- "cd.txt"
- "cd_unix.txt"
- "completion.txt"
- "diff.txt"
- "edit.txt"
- "editconfig.txt"
- "git.txt"
- "gopass.txt"
- "keepassxc.txt"
- "lastpass.txt"
- "onepassword.txt"
- "pass.txt"
- "runscriptdir_unix.txt"
- "script_unix.txt"
- "secretgeneric.txt"
- "secretgopass.txt"
- "secretkeepassxc.txt"
- "secretlastpass.txt"
- "secretonepassword.txt"
- "secretpass.txt")))))))
+ (list
+ #:import-path "github.com/twpayne/chezmoi"
+ #:install-source? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Remove test script which expect additional user's programs available
+ ;; in the PATH. The testdata directory is removed in the latest version
+ ;; (2.46.1) of the program.
+ (add-after 'unpack 'remove-failing-test-scripts
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each (lambda (f)
+ (delete-file (string-append "src/" import-path "/testdata/scripts/" f)))
+ '("bitwarden.txt"
+ "cd.txt"
+ "cd_unix.txt"
+ "completion.txt"
+ "diff.txt"
+ "edit.txt"
+ "editconfig.txt"
+ "git.txt"
+ "gopass.txt"
+ "keepassxc.txt"
+ "lastpass.txt"
+ "onepassword.txt"
+ "pass.txt"
+ "runscriptdir_unix.txt"
+ "script_unix.txt"
+ "secretgeneric.txt"
+ "secretgopass.txt"
+ "secretkeepassxc.txt"
+ "secretlastpass.txt"
+ "secretonepassword.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-etcd-io-bbolt
- 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-google-uuid
- go-github-com-gorilla-css
- go-github-com-huandu-xstrings
- go-github-com-imdario-mergo
- go-github-com-lucasb-eyer-go-colorful
- go-github-com-masterminds-goutils
- go-github-com-masterminds-semver
- go-github-com-masterminds-sprig
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
- go-github-com-microcosm-cc-bluemonday
- go-github-com-mitchellh-copystructure
- go-github-com-mitchellh-reflectwalk
- 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-masterminds-sprig-v3
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-golang-org-x-crypto
- go-golang-org-x-net
+ go-go-etcd-io-bbolt
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/connman.scm b/gnu/packages/connman.scm
index 2696e4c751..a13b6d199e 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -30,6 +30,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages enlightenment)
#:use-module (gnu packages glib)
#:use-module (gnu packages linux)
@@ -118,13 +119,13 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(name "econnman")
(version "1.1")
(source
- (origin
- (method url-fetch)
- (uri (string-append "https://download.enlightenment.org/rel/apps/"
- "econnman/econnman-" version ".tar.gz"))
- (sha256
- (base32
- "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://download.enlightenment.org/rel/apps/"
+ "econnman/econnman-" version ".tar.gz"))
+ (sha256
+ (base32
+ "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--localstatedir=/var")
@@ -138,14 +139,15 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/econnman-bin")))
(wrap-program bin
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH"))))))))))
(native-inputs (list pkg-config))
(inputs
- `(("efl" ,efl)
- ("python" ,python-wrapper)
- ("python-dbus" ,python-dbus)
- ("python-efl" ,python-efl)))
+ (list bash-minimal ;for wrap-program
+ efl
+ python-wrapper
+ python-dbus
+ python-efl))
(home-page "https://www.enlightenment.org")
(synopsis "Connman User Interface written using the EFL")
(description
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 31260c5c0a..929234c772 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
+;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
(define-module (gnu packages containers)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix modules)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
@@ -34,6 +36,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system pyproject)
#:use-module (guix utils)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
@@ -42,13 +45,19 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages man)
+ #:use-module (gnu packages pcre)
#:use-module (gnu packages python)
#:use-module (gnu packages networking)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages python-check)
+ #:use-module (gnu packages rust-apps)
#:use-module (gnu packages selinux)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)
@@ -58,7 +67,7 @@
(define-public crun
(package
(name "crun")
- (version "1.14.1")
+ (version "1.16.1")
(source
(origin
(method url-fetch)
@@ -68,7 +77,7 @@
"/crun-" version ".tar.gz"))
(sha256
(base32
- "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x"))))
+ "17i8vwj9zmr6dvi1w9i359vwr3rzwa9g03q83rz9w32ghzj8sm3h"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-systemd")
@@ -104,7 +113,7 @@ Container Runtime fully written in C.")
(define-public conmon
(package
(name "conmon")
- (version "2.0.31")
+ (version "2.1.12")
(source
(origin
(method git-fetch)
@@ -112,7 +121,7 @@ Container Runtime fully written in C.")
(url "https://github.com/containers/conmon")
(commit (string-append "v" version))))
(sha256
- (base32 "1cxklcihb2i4ywli0fxafkp2gi1x831r37z7spnigaj6pzj1517w"))
+ (base32 "0rrj4rmz5bmxycqhdjpizwvb25bimkri9jwb3wcfwzyxnx1va849"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@@ -151,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)
@@ -159,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
@@ -240,7 +257,7 @@ containers or various tools.")
(define-public slirp4netns
(package
(name "slirp4netns")
- (version "1.2.3")
+ (version "1.3.0")
(source
(origin
(method git-fetch)
@@ -248,7 +265,7 @@ containers or various tools.")
(url "https://github.com/rootless-containers/slirp4netns")
(commit (string-append "v" version))))
(sha256
- (base32 "0czvdsdv821fz4jd9rgrlkdhhjna6frawr8klvx3k2cfh444fbii"))
+ (base32 "1zwahs9fpb61h708k416l6brihgjl6z8ms0jbz4rvw7q34k2c8vw"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@@ -257,7 +274,7 @@ containers or various tools.")
(add-after 'unpack 'fix-hardcoded-paths
(lambda _
(substitute* (find-files "tests" "\\.sh")
- (("ping") "/run/setuid-programs/ping")))))))
+ (("ping") "/run/privileged/bin/ping")))))))
(inputs
(list glib
libcap
@@ -281,14 +298,14 @@ network namespaces.")
(define-public passt
(package
(name "passt")
- (version "2023_12_30.f091893")
+ (version "2024_05_10.7288448")
(source
(origin
(method url-fetch)
(uri (string-append "https://passt.top/passt/snapshot/passt-" version
".tar.gz"))
(sha256
- (base32 "1nyd4h93qlxn1r01ffijpsd7r7ny62phki5j58in8gz021jj4f3d"))))
+ (base32 "12lg216d0r8zb0rpxmnzzfyz4v5gc7ahdvypp811px0ip0qkzj25"))))
(build-system gnu-build-system)
(arguments
(list
@@ -387,6 +404,12 @@ configure network interfaces in Linux containers.")
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
+ ;; Add -trimpath flag to avoid keeping references to go package
+ ;; in the store.
+ (add-after 'unpack 'patch-go-reference
+ (lambda _
+ (substitute* "Makefile"
+ (("go build") "go build -trimpath"))))
(add-before 'build 'setenv
(lambda _
;; For golang toolchain.
@@ -410,95 +433,129 @@ It can be used with QEMU, Hyperkit, Hyper-V and User-Mode Linux.
The binary is called @command{gvproxy}.")
(license license:asl2.0)))
-;; For podman to work, the user needs to run
-;; `sudo mount -t cgroup2 none /sys/fs/cgroup`
+(define-public catatonit
+ (package
+ (name "catatonit")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/openSUSE/catatonit/releases/download/v"
+ version "/catatonit.tar.xz"))
+ (sha256
+ (base32 "141b5lypgqib546zmldi4kqzpqfd6vvqddqqkfaz3w11fjsc4hwq"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list autoconf automake libtool))
+ (home-page "https://github.com/openSUSE/catatonit")
+ (synopsis "Container init")
+ (description
+ "Catatonit is a simple container init tool developed as a rewrite of
+@url{https://github.com/cyphar/initrs, initrs} in C due to the need for static
+compilation of Rust binaries with @code{musl}. Inspired by other container
+inits like @url{https://github.com/krallin/tini, tini} and
+@url{https://github.com/Yelp/dumb-init, dumb-init}, catatonit focuses on
+correct signal handling, utilizing @code{signalfd(2)} for improved stability.
+Its main purpose is to support the key usage by @code{docker-init}:
+@code{/dev/init} – <your program>, with minimal additional features planned.")
+ (license license:gpl2+)))
(define-public podman
(package
(name "podman")
- (version "4.9.3")
+ (version "5.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/containers/podman")
(commit (string-append "v" version))))
- (modules '((guix build utils)))
- ;; FIXME: Btrfs libraries not detected by these scripts.
- (snippet '(substitute* "Makefile"
- ((".*hack/btrfs.*") "")))
- (patches
- (search-patches
- "podman-program-lookup.patch"))
(sha256
- (base32 "17g7n09ndxhpjr39s9qwxdcv08wavjj0g5nmnrvrkz2wgdqigl1x"))
+ (base32 "1xa629vbh6mpish5cwr87pcv01hgzh92y7k7jdpm9wz7z445y1n7"))
(file-name (git-file-name name version))))
-
(build-system gnu-build-system)
(arguments
(list
#:make-flags
- #~(list #$(string-append "CC=" (cc-for-target))
- (string-append "PREFIX=" #$output))
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output)
+ (string-append "HELPER_BINARIES_DIR=" #$output "/_guix")
+ (string-append "GOMD2MAN="
+ #$go-github-com-go-md2man "/bin/go-md2man")
+ (string-append "BUILDFLAGS=-trimpath"))
#:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'set-env
- (lambda* (#:key inputs #:allow-other-keys)
- ;; when running go, things fail because
- ;; HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")))
+ (lambda _
+ ;; When running go, things fail because HOME=/homeless-shelter.
+ (setenv "HOME" "/tmp")
+ ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU
+ ;; Make <4.4 causing CC not to be propagated into $(shell ...)
+ ;; calls. Can be removed once we update to >4.3.
+ (setenv "CC" #$(cc-for-target))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- ;; (invoke "strace" "-f" "bin/podman" "version")
(invoke "make" "localsystem")
(invoke "make" "remotesystem"))))
(add-after 'unpack 'fix-hardcoded-paths
(lambda _
- (substitute* "vendor/github.com/containers/common/pkg/config/config.go"
- (("@SLIRP4NETNS_DIR@")
- (string-append #$slirp4netns "/bin"))
- (("@PASST_DIR@")
- (string-append #$passt "/bin")))
- (substitute* "hack/install_catatonit.sh"
- (("CATATONIT_PATH=\"[^\"]+\"")
- (string-append "CATATONIT_PATH=" (which "true"))))
(substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
(("/usr/local/libexec/podman")
(string-append #$output "/libexec/podman"))
(("/usr/local/lib/podman")
- (string-append #$output "/bin")))
- (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
- (("/usr/libexec/podman/conmon") (which "conmon"))
- (("/usr/local/libexec/cni")
- (string-append #$(this-package-input "cni-plugins")
- "/bin"))
- (("/usr/bin/crun") (which "crun")))))
+ (string-append #$output "/bin")))))
+ (add-after 'install 'symlink-helpers
+ (lambda _
+ (mkdir-p (string-append #$output "/_guix"))
+ (for-each
+ (lambda (what)
+ (symlink (string-append (car what) "/bin/" (cdr what))
+ (string-append #$output "/_guix/" (cdr what))))
+ ;; Only tools that cannot be discovered via $PATH are
+ ;; symlinked. Rest is handled in the 'wrap-podman phase.
+ `((#$aardvark-dns . "aardvark-dns")
+ ;; Required for podman-machine, which is *not* supported out
+ ;; of the box. But it cannot be discovered via $PATH, so
+ ;; there is no other way for the user to install it. It
+ ;; costs ~10MB, so let's leave it here.
+ (#$gvisor-tap-vsock . "gvproxy")
+ (#$netavark . "netavark")))))
+ (add-after 'install 'wrap-podman
+ (lambda _
+ (wrap-program (string-append #$output "/bin/podman")
+ `("PATH" suffix
+ (,(string-append #$catatonit "/bin")
+ ,(string-append #$conmon "/bin")
+ ,(string-append #$crun "/bin")
+ ,(string-append #$gcc "/bin") ; cpp
+ ,(string-append #$iptables "/sbin")
+ ,(string-append #$passt "/bin")
+ ,(string-append #$procps "/bin") ; ps
+ "/run/privileged/bin")))))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"
(string-append "PREFIX=" #$output)))))))
(inputs
- (list btrfs-progs
- cni-plugins
- conmon
- crun
+ (list bash-minimal
+ btrfs-progs
gpgme
- go-github-com-go-md2man
- iptables
libassuan
libseccomp
- libselinux
- passt
- slirp4netns))
+ libselinux))
(native-inputs
- (list bats
+ (list (package/inherit grep
+ (inputs (list pcre2))) ; Drop once grep on master supports -P
+ bats
git
go-1.21
- ; strace ; XXX debug
+ go-github-com-go-md2man
+ mandoc
pkg-config
python))
(home-page "https://podman.io")
@@ -508,67 +565,127 @@ The binary is called @command{gvproxy}.")
volumes mounted into those containers, and pods made from groups of
containers.
-The @code{machine} subcommand is not supported due to gvproxy not being
-packaged.")
+Not all commands are working out of the box due to requiring additional
+binaries to be present in the $PATH.
+
+To get @code{podman compose} working, install either @code{podman-compose} or
+@code{docker-compose} packages.
+
+To get @code{podman machine} working, install @code{qemu-minimal}, and
+@code{openssh} packages.")
(license license:asl2.0)))
+(define-public podman-compose
+ (package
+ (name "podman-compose")
+ (version "1.0.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containers/podman-compose")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11dwpifkm20vyi6r3fgmiiqc01mpm4r8l0p5gfh0bawi2gklrhsf"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags #~(list "pytests")))
+ (native-inputs
+ (list python-pytest))
+ (propagated-inputs
+ (list python-dotenv python-pyyaml))
+ (home-page "https://github.com/containers/podman-compose")
+ (synopsis "Script to run docker-compose.yml using podman")
+ (description "This package provides an implementation of
+@url{https://compose-spec.io/, Compose Spec} for @code{podman} focused on
+being rootless and not requiring any daemon to be running.")
+ (license license:gpl2)))
+
(define-public buildah
(package
(name "buildah")
- (version "1.29.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/containers/buildah")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1mcqkz68fjccdla1bgxw57w268a586brm6x28fcm6x425ah0w07h"))))
- (build-system go-build-system)
+ (version "1.37.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containers/buildah")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1c15djlnqiawrahcyp7nl7bsnj0nz60ngncbwbab09f28szfk61g"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
(arguments
- (list #:import-path "github.com/containers/buildah/cmd/buildah"
- #:unpack-path "github.com/containers/buildah"
-
- ;; Some dependencies require go-1.18 to build.
- #:go go-1.18
-
- #:tests? #f
- #:install-source? #f
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'prepare-install-docs
- (lambda* (#:key unpack-path #:allow-other-keys)
- (substitute* (string-append "src/"
- unpack-path
- "/docs/Makefile")
- (("../tests/tools/build/go-md2man")
- (which "go-md2man")))
- (substitute* (string-append "src/"
- unpack-path
- "/docs/Makefile")
- (("/usr/local") (string-append #$output)))))
- (add-after 'build 'build-docs
- (lambda* (#:key unpack-path #:allow-other-keys)
- (let ((doc (string-append "src/" unpack-path "/docs")))
- (invoke "make" "-C" doc))))
- (add-after 'install 'install-docs
- (lambda* (#:key unpack-path #:allow-other-keys)
- (let ((doc (string-append "src/" unpack-path "/docs")))
- (invoke "make" "-C" doc "install")))))))
- (inputs (list btrfs-progs
- cni-plugins
- conmon
+ (list
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output)
+ (string-append "GOMD2MAN="
+ #$go-github-com-go-md2man "/bin/go-md2man"))
+ #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
+ #:test-target "test-unit"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'set-env
+ (lambda _
+ ;; When running go, things fail because HOME=/homeless-shelter.
+ (setenv "HOME" "/tmp")
+ ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU
+ ;; Make <4.4 causing CC not to be propagated into $(shell ...)
+ ;; calls. Can be removed once we update to >4.3.
+ (setenv "CC" #$(cc-for-target))))
+ ;; Add -trimpath to build flags to avoid keeping references to go
+ ;; packages.
+ (add-after 'set-env 'patch-buildflags
+ (lambda _
+ (substitute* "Makefile"
+ (("BUILDFLAGS :=") "BUILDFLAGS := -trimpath "))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "test-unit")
+ (invoke "make" "test-conformance")
+ (invoke "make" "test-integration"))))
+ (add-after 'install 'symlink-helpers
+ (lambda _
+ (mkdir-p (string-append #$output "/_guix"))
+ (for-each
+ (lambda (what)
+ (symlink (string-append (car what) "/bin/" (cdr what))
+ (string-append #$output "/_guix/" (cdr what))))
+ ;; Only tools that cannot be discovered via $PATH are
+ ;; symlinked. Rest is handled in the 'wrap-buildah phase.
+ `((#$aardvark-dns . "aardvark-dns")
+ (#$netavark . "netavark")))))
+ (add-after 'install 'wrap-buildah
+ (lambda _
+ (wrap-program (string-append #$output "/bin/buildah")
+ `("CONTAINERS_HELPER_BINARY_DIR" =
+ (,(string-append #$output "/_guix")))
+ `("PATH" suffix
+ (,(string-append #$crun "/bin")
+ ,(string-append #$gcc "/bin") ; cpp
+ ,(string-append #$passt "/bin")
+ "/run/privileged/bin")))))
+ (add-after 'install 'install-completions
+ (lambda _
+ (invoke "make" "install.completions"
+ (string-append "PREFIX=" #$output)))))))
+ (inputs (list bash-minimal
+ btrfs-progs
eudev
glib
gpgme
libassuan
libseccomp
- lvm2
- runc))
+ lvm2))
(native-inputs
- (list go-github-com-go-md2man
- gnu-make
+ (list bats
+ go-1.21
+ go-github-com-go-md2man
pkg-config))
(synopsis "Build @acronym{OCI, Open Container Initiative} images")
(description
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 105b942ad3..4857426613 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2022 Garek Dyszel <garekdyszel@disroot.org>
+;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -128,14 +129,14 @@ It is developed using Objective Caml and Camlp5.")
(list lablgtk3 ocaml-lablgtk3-sourceview3))))
(define-public proof-general
- ;; The latest release is from 2016 and there has been more than 450 commits
+ ;; The latest release is from 2022 and there has been more than 100 commits
;; since then.
- ;; Commit from 2021-11-25.
- (let ((commit "1b1083e86e0cddc20ff2f1a6b25c7a7eee2edf02")
+ ;; Commit from 2024-04-29.
+ (let ((commit "cb23709ad0c9a9ca0ee48b3ee73c29caea243b98")
(revision "1"))
(package
(name "proof-general")
- (version (git-version "4.4" revision commit))
+ (version (git-version "4.5" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -144,7 +145,7 @@ It is developed using Objective Caml and Camlp5.")
(file-name (git-file-name name version))
(sha256
(base32
- "1pnysczhscapgwmvf6ix7f31lf3hnh8h977bfll1m7jlxl9b9c0j"))))
+ "1spd8rz95s1x91i4lbbb6zabb8014fihx6ai6pgad1nwyr0y9bir"))))
(build-system gnu-build-system)
(native-inputs
`(("emacs" ,emacs-minimal)
@@ -169,6 +170,12 @@ It is developed using Objective Caml and Camlp5.")
(substitute* "Makefile"
(("\\(setq byte-compile-error-on-warn t\\)")
"(setq byte-compile-error-on-warn nil)"))))
+ (add-after 'unpack 'modify-readme-name
+ ;; The README file is called "README.md", but the Make variable
+ ;; "DOC_FILES" still refers to "README".
+ (lambda _
+ (substitute* "Makefile"
+ (("README") "README.md"))))
(add-after 'unpack 'patch-hardcoded-paths
(lambda _
(substitute* "Makefile"
@@ -217,7 +224,7 @@ provers.")
(define-public coq-flocq
(package
(name "coq-flocq")
- (version "4.1.1")
+ (version "4.1.4")
(source
(origin
(method git-fetch)
@@ -227,7 +234,7 @@ provers.")
(file-name (git-file-name name version))
(sha256
(base32
- "01x38w58j95ba9679vpb5wv4bvfnrapd5dzjqlyz8k7i8a9sfqn0"))))
+ "08vrh0h909vmam1b4gfrvcmamnhmr5g0x79zx98hn7cx0vdwysh7"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
@@ -290,7 +297,7 @@ inside Coq.")
(define-public coq-gappa
(package
(name "coq-gappa")
- (version "1.5.3")
+ (version "1.5.5")
(source
(origin
(method git-fetch)
@@ -300,7 +307,7 @@ inside Coq.")
(file-name (git-file-name name version))
(sha256
(base32
- "1dzkb2sfglhik2ymw8p65khl163xxjsaqji9agnnkvlk5r6589v6"))))
+ "0w780wk10khzfx6d633dyzx9q0hvqgimqbzc3irjzvsbpvb0zm5c"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
@@ -350,7 +357,7 @@ assistant.")
(define-public coq-mathcomp
(package
(name "coq-mathcomp")
- (version "1.17.0")
+ (version "1.19.0")
(source
(origin
(method git-fetch)
@@ -359,7 +366,7 @@ assistant.")
(commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "06i6kw5p2024n6h9mf8bvwn54il1a4z2h4qrgc8y0iq8hkvx4fnd"))))
+ (base32 "0dij9zl2ag083dzgrv2j16ks2kkn2xxwnk1wr5956zw1y7ynrzb3"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml which coq))
@@ -387,7 +394,7 @@ part of the distribution.")
(define-public coq-coquelicot
(package
(name "coq-coquelicot")
- (version "3.4.0")
+ (version "3.4.1")
(source
(origin
(method git-fetch)
@@ -397,7 +404,7 @@ part of the distribution.")
(file-name (git-file-name name version))
(sha256
(base32
- "1f6zim6hnm6zrij964vas6rfbxh5p147qsxxmmbxm7gyb85hhy45"))))
+ "1y22dqdklh3c8rbhar0d7mzaj84q6zyfik7namx5q4ma76s2rx73"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
@@ -470,7 +477,7 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.")
(define-public coq-interval
(package
(name "coq-interval")
- (version "4.8.0")
+ (version "4.10.0")
(source
(origin
(method git-fetch)
@@ -480,7 +487,7 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.")
(file-name (git-file-name name version))
(sha256
(base32
- "0m3icx77p99ld9qfl3xjq62q572pyi4m77i1kc3whvipvg7834rh"))))
+ "039c29hc8mzp2is6zh9fps36k03hlvx6zz08h03vj6dhjgr7njz8"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
@@ -527,7 +534,9 @@ Coq proof assistant.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz"))))
+ (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz"))
+ (patches
+ (search-patches "coq-autosubst-1.8-remove-deprecated-files.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -644,7 +653,7 @@ also provided in Coq, without associated proofs.")
(define-public coq-stdpp
(package
(name "coq-stdpp")
- (version "1.8.0")
+ (version "1.10.0")
(synopsis "Alternative Coq standard library std++")
(source (origin
(method git-fetch)
@@ -654,7 +663,7 @@ also provided in Coq, without associated proofs.")
(file-name (git-file-name name version))
(sha256
(base32
- "0xawh3xkh76yhs689zw52k55cbzga2gyzl4g1a3pgg6yy420chjn"))))
+ "0lnvdfn4qq2lyabiq4ikb5ya46f4jp59dynyprnhki0ay9xagz3d"))))
(build-system gnu-build-system)
(inputs
(list coq))
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8a0bd62d6b..4951fdbc44 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -40,7 +40,8 @@
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2024 dan <i@dan.games>
-;;;
+;;; Copyright © 2024 Peepo Froggings <peepofroggings@tutanota.de>
+
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
@@ -74,6 +75,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages benchmark)
#:use-module (gnu packages boost)
@@ -158,8 +160,8 @@ easy to use API.")
(license license:expat))))
(define-public asmjit
- (let ((commit "4ec760a3d1f69e32ba460ecd2513f29b8428700b")
- (revision "0"))
+ (let ((commit "3ca5c186bf8922e5fe3018432e93651fd2fa4053")
+ (revision "1"))
(package
(name "asmjit")
(version (git-version "0.0.0" revision commit))
@@ -172,7 +174,7 @@ easy to use API.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0skgccbpamcbg1byawfq5n6jzxgj64hnc7jznvk35nkskaaz1nlb"))))
+ (base32 "10k1zc0w8m0vnh52id9qlm1sb99qmpvr6k0ha8ag2h223n0d591g"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~(list "-DASMJIT_TEST=TRUE")))
@@ -188,36 +190,69 @@ allocator that makes it easy to generate complex code without a significant
development effort.")
(license license:zlib))))
-(define-public castxml
+(define-public biblesync
(package
- (name "castxml")
- (version "0.6.4")
+ (name "biblesync")
+ (version "2.1.0")
(source (origin
(method git-fetch)
(uri
(git-reference
- (url "https://github.com/CastXML/CastXML")
- (commit (string-append "v" version))))
+ (url "https://github.com/karlkleinpaste/biblesync")
+ (commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0l5ys9zmllfgwhjrm897akbsf38iswfcarhxg27xfhiy0bmzcwsg"))))
+ (base32
+ "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"))))
(build-system cmake-build-system)
(arguments
(list
+ #:tests? #f ;FIXME: Not sure how to run tests, if any
#:configure-flags
- #~(list
- (string-append "-DCLANG_RESOURCE_DIR="
- #$(this-package-native-input "clang") "/lib/clang/"
- #$(version-major
- (package-version (this-package-native-input "clang")))))))
- (inputs (list libffi))
- (native-inputs (list clang-17 llvm-17))
- (home-page "https://github.com/CastXML/CastXML")
- (synopsis "C-family abstract syntax tree XML output")
- (description "CastXML is a C-family abstract syntax tree XML output tool.
+ #~(list (string-append "-DBUILD_SHARED_LIBS=TRUE"))))
+ (inputs (list `(,util-linux "lib")))
+ (synopsis "C++ library implementing the BibleSync protocol")
+ (description
+ "BibleSync is a multicast protocol to support Bible software shared
+co-navigation. The premise is that there is a local network over which to
+multicast Bible navigation, and someone, possibly several someones, will
+transmit, and others will receive. The library implementing the protocol is
+a single C++ class providing a complete yet minimal public interface to
+support mode setting, setup for packet reception, transmit on local
+navigation, and handling of incoming packets.")
+ (home-page "https://github.com/karlkleinpaste/biblesync")
+ (license license:public-domain)))
+
+(define-public castxml
+(package
+ (name "castxml")
+ (version "0.6.4")
+ (source (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/CastXML/CastXML")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0l5ys9zmllfgwhjrm897akbsf38iswfcarhxg27xfhiy0bmzcwsg"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list
+ (string-append "-DCLANG_RESOURCE_DIR="
+ #$(this-package-native-input "clang") "/lib/clang/"
+ #$(version-major
+ (package-version (this-package-native-input "clang")))))))
+ (inputs (list libffi))
+ (native-inputs (list clang-17 llvm-17))
+ (home-page "https://github.com/CastXML/CastXML")
+ (synopsis "C-family abstract syntax tree XML output")
+ (description "CastXML is a C-family abstract syntax tree XML output tool.
This project is maintained by Kitware in support of ITK, the Insight
Segmentation and Registration Toolkit.")
- (license license:asl2.0)))
+ (license license:asl2.0)))
(define-public range-v3
(package
@@ -314,23 +349,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 +379,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
@@ -882,11 +915,12 @@ intuitive syntax and trivial integration.")
(lambda _
(substitute* "tests/meson.build"
(("foreach locale : test_locales" all)
- (format #f "test_locales = ['C', ~{'~a.utf8', ~}]~%~a"
+ (format #f "test_locales = [~{'~a.utf8', ~}]~%~a"
;; %default-utf8-locales in (gnu packages base).
- '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")
+ '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")
all))))))))
- (native-inputs (list cmake-minimal))
+ ;; Tests require locales.
+ (native-inputs (list cmake-minimal (libc-utf8-locales-for-target)))
(home-page "https://marzer.github.io/tomlplusplus/")
(synopsis "Header-only TOML config file parser and serializer for C++17")
(description
@@ -1285,7 +1319,7 @@ programs.")
(define-public kokkos
(package
(name "kokkos")
- (version "4.2.01")
+ (version "4.3.01")
(source
(origin
(method git-fetch)
@@ -1294,7 +1328,7 @@ programs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bvxcy11as38ng9vdp93mrdvm7sgwqjrm67p53wr1aj7x3pq3hbp"))
+ (base32 "069j9wijw8vwp2844sdrp0wpq59wihykbhbacwadac01l467m3y7"))
(modules '((guix build utils)))
(snippet
;; Remove bundled googletest.
@@ -1379,7 +1413,9 @@ point and then, after each tween step, plugging back the result.")
(base32
"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
(patches
- (search-patches "abseil-cpp-fix-strerror_test.patch"))))
+ (search-patches "abseil-cpp-fix-strerror_test.patch"
+ "abseil-cpp-20200923.3-adjust-sysinfo.patch"
+ "abseil-cpp-20200923.3-duration-test.patch"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
@@ -1454,7 +1490,9 @@ Google's C++ code base.")
(file-name (git-file-name name version))
(sha256
(base32
- "0vxh2a74g4s45yr8kdjqnzl64k10qdlc0hbnn987a4cnwdj4bp9r"))))
+ "0vxh2a74g4s45yr8kdjqnzl64k10qdlc0hbnn987a4cnwdj4bp9r"))
+ (patches
+ (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags)
@@ -1475,9 +1513,16 @@ Google's C++ code base.")
(file-name (git-file-name name version))
(sha256
(base32
- "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))))
+ "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))
+ (patches
+ (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
+ ((#:configure-flags flags #~'())
+ (if (target-riscv64?)
+ #~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic"
+ #$flags)
+ flags))
((#:phases phases)
#~(modify-phases #$phases
(add-before 'check 'set-env-vars
@@ -1572,6 +1617,8 @@ parsers according to a Parsing Expression Grammar (PEG).")
external-memory suffix array construction algorithm called pSAscan. The
algorithm is based on the sequential external-memory suffix array construction
algorithm called SAscan.")
+ ;; Code exhibits integer size mismatches when compiled on 32-bit systems.
+ (supported-systems %64bit-supported-systems)
(license license:expat)))
(define-public cxxopts
@@ -1805,60 +1852,56 @@ written in C++.")
(license license:boost1.0)))
(define-public zug
- (let ((commit "d7e814b45fceceee3cb1442997d8b46cee4764ec")
- (revision "0"))
- (package
- (name "zug")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/arximboldi/zug")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ww4prh763n81kzzijak8z495varlvqml4ip7i09klqnw6ya72fc"))
- (modules '((guix build utils)))
- (snippet #~(delete-file-recursively "tools"))))
- (build-system cmake-build-system)
- (arguments (list #:test-target "check"))
- (native-inputs (list boost catch2))
- (home-page "https://sinusoid.es/zug")
- (synopsis "Higher-order sequence transformers")
- (description "Zug is a C++ library providing transducers, that is,
+ (package
+ (name "zug")
+ (version "0.1.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/arximboldi/zug")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06vsbzx4ripidpb6ia7y1y8pmjk6gxzr93ilby90ahj6p2x08baf"))
+ (modules '((guix build utils)))
+ (snippet #~(delete-file-recursively "tools"))))
+ (build-system cmake-build-system)
+ (arguments (list #:test-target "check"))
+ (native-inputs (list boost catch2))
+ (home-page "https://sinusoid.es/zug")
+ (synopsis "Higher-order sequence transformers")
+ (description "Zug is a C++ library providing transducers, that is,
composable sequential transformations.")
- (license license:boost1.0))))
+ (license license:boost1.0)))
(define-public lager
- (let ((commit "2016df38be90ee176bcb73ea414be2318bc1ef31")
- (revision "0"))
- (package
- (name "lager")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/arximboldi/lager")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1b7zxwqrbm7db7wxqbsrk7jjd3znvvi1cwj7jg6zkmf0199071a5"))))
- (build-system cmake-build-system)
- (arguments (list #:test-target "check"
- #:configure-flags #~(list "-Dlager_BUILD_EXAMPLES=no")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'delete-failing-tests
- (lambda _
- (delete-file-recursively "test/event_loop"))))))
- (inputs (list boost immer zug))
- (native-inputs (list cereal))
- (home-page "https://sinusoid.es/lager")
- (synopsis "Library for value-oriented design")
- (description "Lager is a library for value-oriented design implementing
+ (package
+ (name "lager")
+ (version "0.1.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/arximboldi/lager")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1by9d49qnkncifyjcq16zy605d7v4ps6hvc01q5nsp1nbswm94m4"))))
+ (build-system cmake-build-system)
+ (arguments (list #:test-target "check"
+ #:configure-flags #~(list "-Dlager_BUILD_EXAMPLES=no")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'delete-failing-tests
+ (lambda _
+ (delete-file-recursively "test/event_loop"))))))
+ (inputs (list boost immer zug))
+ (native-inputs (list catch2 cereal))
+ (home-page "https://sinusoid.es/lager")
+ (synopsis "Library for value-oriented design")
+ (description "Lager is a library for value-oriented design implementing
the unidirectional data-flow architecture. Apart from a store and various
event loops it also provides lenses and cursors.")
- (license license:expat))))
+ (license license:expat)))
(define-public atomic-queue
(package
@@ -2169,7 +2212,7 @@ pointers, containers, compiler building blocks, etc.")
(arguments
`(#:test-target "test"
#:imported-modules ((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules (((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system)
(guix build utils))
@@ -2992,7 +3035,7 @@ queues, resource pools, strings, etc.
(define-public ftxui
(package
(name "ftxui")
- (version "4.0.0")
+ (version "5.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3000,7 +3043,7 @@ queues, resource pools, strings, etc.
(commit (string-append "v" version))))
(sha256
(base32
- "01h59ln8amsj6ymxmsxhmslld2yp003n82fg3mphgkrh6lf22h6y"))
+ "1qfk6jwasxhjk410igma7pdv1q664w8cgjf95ciln3hh1kiqcpi0"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs (list googletest benchmark))
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ee0aac7f7a..4ca23a5c4e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -37,6 +37,8 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022-2024 Navid Afkhami <navid.afkhami@mdc-berlin.de>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2024 Marco Baggio <guix@mawumag.com>
+;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -101,6 +103,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)
@@ -258,14 +261,14 @@ projects via a flexible, declarative dependency loading syntax.")
(define-public r-brio
(package
(name "r-brio")
- (version "1.1.4")
+ (version "1.1.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "brio" version))
(sha256
(base32
- "1s0q1qk3w3fwf7gn4xfwhf8i8yqqb6z096x6xqsj8av8924z7fqc"))))
+ "1f6hh7mck4bb1caivcvr6ms2pyqzzzawqyxjbgi9s0rrx8sj7wm9"))))
(properties `((upstream-name . "brio")))
(build-system r-build-system)
(home-page "https://github.com/r-lib/brio")
@@ -279,13 +282,13 @@ files and provide more explicit control over line endings.")
(define-public r-broom-helpers
(package
(name "r-broom-helpers")
- (version "1.15.0")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "broom.helpers" version))
(sha256
- (base32 "0gm9k2d73p6bhcmzc43qgy6v27pi036369dldz77hd5h5i95hp7c"))))
+ (base32 "05979v4c40hzcr6sq5n9h3lg3maz6xyjhv9v1xz9mk6dg23aqyws"))))
(properties `((upstream-name . "broom.helpers")))
(build-system r-build-system)
(propagated-inputs (list r-broom
@@ -331,14 +334,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
@@ -382,13 +385,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
@@ -407,6 +410,27 @@ simulating diversification models, dating trees, comparing trees, and
reading/writing trees in Newick format.")
(license license:gpl2+)))
+(define-public r-chameleon
+ (package
+ (name "r-chameleon")
+ (version "0.2-3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "chameleon" version))
+ (sha256
+ (base32 "0a3azp0zaakpqqx0pp94hkj3vgb2apnf8gb5ga0as4i8lrn9dz8i"))))
+ (properties `((upstream-name . "chameleon")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-clue r-ggplot2 r-umap))
+ (native-inputs (list r-knitr))
+ (home-page "https://cran.r-project.org/package=chameleon")
+ (synopsis "Automatic colors for multi-dimensional data")
+ (description
+ "This package lets you assign distinct colors to arbitrary
+multi-dimensional data, considering its structure.")
+ (license license:expat)))
+
(define-public r-changepoint
(package
(name "r-changepoint")
@@ -514,13 +538,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))
@@ -537,13 +561,13 @@ labels on the node can also be achieved.")
(define-public r-collapse
(package
(name "r-collapse")
- (version "2.0.13")
+ (version "2.0.16")
(source
(origin
(method url-fetch)
(uri (cran-uri "collapse" version))
(sha256
- (base32 "11i1zw9c9fp5rnhd14b8ivqas38v8qywmmh9w4iaxrb02s77qwz5"))))
+ (base32 "1dmdqf5i1370dwwzqb79j9yvr9frmhd4y4mv69cyqcvx6f637cfc"))))
(properties `((upstream-name . "collapse")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp))
@@ -588,13 +612,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))
@@ -608,6 +632,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")
@@ -682,17 +726,51 @@ to other implementations such a @code{purrr::partial()} the operators in
etc.")
(license license:gpl2+)))
+(define-public r-cutpointr
+ (package
+ (name "r-cutpointr")
+ (version "1.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "cutpointr" version))
+ (sha256
+ (base32 "1qxnh20hs3bh9v04ls7gwwl7lfc6bwl8c88dn8lkcdqyp3nyr01j"))))
+ (properties `((upstream-name . "cutpointr")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-dplyr
+ r-foreach
+ r-ggplot2
+ r-gridextra
+ r-purrr
+ r-rcpp
+ r-rlang
+ r-tibble
+ r-tidyr
+ r-tidyselect))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/thie1e/cutpointr")
+ (synopsis "Determine optimal cutpoints for binary classification")
+ (description
+ "This package estimates optimal cutpoints for binary classification metrics.
+It also validates performance using bootstrapping. Some methods for more
+robust cutpoint estimation are supported, e.g. a parametric method assuming
+normal distributions, bootstrapped cutpoints, and smoothing of the metric
+values per cutpoint using Generalized Additive Models. Various plotting
+functions are included.")
+ (license license:gpl3)))
+
(define-public r-datawizard
(package
(name "r-datawizard")
- (version "0.10.0")
+ (version "0.12.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "datawizard" version))
(sha256
(base32
- "0z3sds2mlmyd40xrjy6lcrym5sl1hcn2dxxfmljv2667vk9nrbmg"))))
+ "10g05f6jm7q59ihsb8wpg5fyy2an56gv33l7jiimjc818hh6bqzy"))))
(properties `((upstream-name . "datawizard")))
(build-system r-build-system)
(propagated-inputs
@@ -710,16 +788,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")
@@ -931,6 +1009,34 @@ work with FlowSOM and flow-cytometry use-cases.")
Distance (EMD).")
(license license:expat)))
+(define-public r-fuzzyjoin
+ (package
+ (name "r-fuzzyjoin")
+ (version "0.1.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "fuzzyjoin" version))
+ (sha256
+ (base32 "0s5rhqz8vih4za3a8k1k7i3gq8hj0w7bqnakw40k6mg87jvyzsj7"))))
+ (properties `((upstream-name . "fuzzyjoin")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-dplyr
+ r-geosphere
+ r-purrr
+ r-stringdist
+ r-stringr
+ r-tibble
+ r-tidyr))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/dgrtwo/fuzzyjoin")
+ (synopsis "Join tables together on inexact matching")
+ (description
+ "Join tables together based not on whether columns match exactly, but
+whether they are similar by some comparison. Implementations include string
+distance and regular expression matching.")
+ (license license:expat)))
+
(define-public r-gfonts
(package
(name "r-gfonts")
@@ -1117,13 +1223,13 @@ plots.")
(define-public r-ggstatsplot
(package
(name "r-ggstatsplot")
- (version "0.12.3")
+ (version "0.12.4")
(source (origin
(method url-fetch)
(uri (cran-uri "ggstatsplot" version))
(sha256
(base32
- "0lm48b664nin8f32a3xpqvc95cizi27sls5m4vrymfz3aarcwrxr"))))
+ "07xv8d5yv08wcrmz6abjcfq9vv8h78axsnhgxgz08iswhb7a377a"))))
(properties `((upstream-name . "ggstatsplot")))
(build-system r-build-system)
(propagated-inputs (list r-correlation
@@ -1217,13 +1323,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))
@@ -1654,13 +1760,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))
@@ -1680,6 +1786,26 @@ ROCit package provides flexibility to easily evaluate threshold-bound
metrics.")
(license license:gpl3)))
+(define-public r-roi-plugin-lpsolve
+ (package
+ (name "r-roi-plugin-lpsolve")
+ (version "1.0-2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "ROI.plugin.lpsolve" version))
+ (sha256
+ (base32 "0xgg1fzq5sba3yvvrci3iw97p31walpnhv4zwnd39gw8v5z6f9dj"))))
+ (properties `((upstream-name . "ROI.plugin.lpsolve")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-lpsolveapi r-roi))
+ (home-page "https://roigrp.gitlab.io")
+ (synopsis "Plugin of lp_solve for the R optimization infrastructure")
+ (description
+ "This package enhances the @acronym{ROI, R Optimization Infrastructure} with
+the lp_solve solver.")
+ (license license:gpl3)))
+
(define-public r-rorcid
(package
(name "r-rorcid")
@@ -1707,6 +1833,23 @@ Functions include searching for people, searching by DOI, or searching by
Orcid ID.")
(license license:expat)))
+(define-public r-rrna
+ (package
+ (name "r-rrna")
+ (version "1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "RRNA" version))
+ (sha256
+ (base32 "05ijsnxxylfan4c4hnl20655qjzix2l43i5qmdzm19wqcf4ipylp"))))
+ (properties `((upstream-name . "RRNA")))
+ (build-system r-build-system)
+ (home-page "https://cran.r-project.org/package=RRNA")
+ (synopsis "Secondary structure plotting for RNA")
+ (description "This package facilitates RNA secondary structure plotting.")
+ (license license:gpl3)))
+
(define-public r-ruv
(package
(name "r-ruv")
@@ -1737,20 +1880,19 @@ RUV-I, and RUV-III, along with various supporting algorithms.")
(define-public r-waldo
(package
(name "r-waldo")
- (version "0.5.2")
+ (version "0.5.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "waldo" version))
(sha256
(base32
- "019fvypq36kwvr2znlr0fd9f2ihb08rgigf6ypdybry5n8daxkc2"))))
+ "01kv3hz4inijks4nq863ikpgvphy4hqwfqjr6vpbk3yz6i5nss6r"))))
(properties `((upstream-name . "waldo")))
(build-system r-build-system)
(propagated-inputs
(list r-cli
r-diffobj
- r-fansi
r-glue
r-rematch2
r-rlang
@@ -1764,6 +1906,175 @@ quickly isolate key differences makes understanding test failures much
easier.")
(license license:expat)))
+;; We use the git repository, because it contains the JavaScript source code.
+;; We have to use this seemingly arbitrary commit after 0.2.5, because the
+;; sources for placeholder.js were not included in the latest release.
+(define-public r-waiter
+ (let ((commit "927501bfa41c37e33d13a90bbc329a2887e0cec0")
+ (revision "1"))
+ (package
+ (name "r-waiter")
+ (version (git-version "0.2.5" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JohnCoene/waiter")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0s5d09srd1d1s35lp2fb93dvyfkjv1rasbl25ps1p137jv7zn079"))
+ (modules '((guix build utils)))
+ (snippet
+ '(delete-file-recursively "inst/packer"))))
+ (properties `((upstream-name . "waiter")))
+ (build-system r-build-system)
+ (arguments
+ (list
+ #:modules
+ '((guix build r-build-system)
+ (guix build minify-build-system)
+ (guix build utils))
+ #:imported-modules
+ `(,@%r-build-system-modules
+ (guix build minify-build-system))
+ #:phases
+ '(modify-phases (@ (guix build r-build-system) %standard-phases)
+ (add-after 'unpack 'process-javascript
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir-p "inst/packer")
+ (call-with-output-file "build.js"
+ (lambda (port)
+ (display "\
+const esbuild = require('esbuild');
+const path = require('path');
+const fs = require('fs');
+
+// Define the entries and output directory
+const entries = {
+ 'waiter': './srcjs/exts/waiter/waiter.js',
+ 'waitress': './srcjs/exts/waitress/waitress.js',
+ 'hostess': './srcjs/exts/hostess/hostess.js',
+ 'attendant': './srcjs/exts/attendant/attendant.js',
+ 'placeholder': './srcjs/exts/placeholder/placeholder.js'
+};
+
+// A little plugin to inject the CSS into the generated JavaScript file.
+let style = {
+ name: 'style',
+ setup(build) {
+ const cwd = process.cwd();
+ const opt = {
+ logLevel: 'silent',
+ bundle: true,
+ write: false,
+ minify: true,
+ charset: 'utf8'
+ };
+
+ build.onResolve({ filter: /\\.css$/, namespace: 'file' }, args => {
+ const absPath = path.join(args.resolveDir, args.path);
+ const relPath = path.relative(cwd, absPath);
+ const resolved = fs.existsSync(absPath) ? relPath : args.path;
+ return { path: resolved, namespace: 'style-stub' };
+ });
+
+ build.onResolve({ filter: /\\.css$/, namespace: 'style-stub' }, args => {
+ return { path: args.path, namespace: 'style-content' };
+ });
+
+ build.onResolve({ filter: /^__style_helper__$/, namespace: 'style-stub' }, args => ({
+ path: args.path,
+ namespace: 'style-helper',
+ sideEffects: false,
+ }));
+
+ build.onLoad({ filter: /.*/, namespace: 'style-helper' }, async () => ({
+ contents: `
+ export function injectStyle(text) {
+ if (typeof document !== 'undefined') {
+ var style = document.createElement('style')
+ var node = document.createTextNode(text)
+ style.appendChild(node)
+ document.head.appendChild(style)
+ }
+ }
+ `,
+ }));
+
+ build.onLoad({ filter: /.*/, namespace: 'style-stub' }, async args => ({
+ contents: `
+ import { injectStyle } from \"__style_helper__\"
+ import css from ${JSON.stringify(args.path)}
+ injectStyle(css)
+ `,
+ }));
+
+ build.onLoad({ filter: /.*/, namespace: 'style-content' }, async args => {
+ const options = { entryPoints: [args.path], ...opt };
+ const { errors, warnings, outputFiles } = await esbuild.build(options);
+ return { errors, warnings, contents: outputFiles[0].text, loader: \"text\" };
+ });
+ },
+};
+
+esbuild.build({
+ entryPoints: Object.values(entries),
+ entryNames: '[name]',
+ outdir: './inst/packer',
+ bundle: true,
+ minify: true,
+ format: 'iife',
+ globalName: 'waiter',
+ external: ['shiny', 'jquery'],
+ loader: {
+ '.js': 'js',
+ },
+ plugins: [style]
+})
+" port)))
+ (install-file (search-input-file inputs "/dist/loading-bar.js")
+ "srcjs/exts/hostess")
+ (install-file (search-input-file inputs "/dist/loading-bar.css")
+ "srcjs/exts/hostess")
+ (substitute* "srcjs/exts/hostess/hostess.js"
+ (("@loadingio/loading-bar/lib/") "./")
+ (("@loadingio/loading-bar/dist/") "./"))
+ (setenv "ESBUILD_BINARY_PATH" (search-input-file inputs "/bin/esbuild"))
+ (invoke "node" "build.js")
+
+ ;; Almost forgot this one...
+ (minify (search-input-file inputs "loadgo-nojquery.js")
+ #:target
+ "inst/assets/garcon/garcon.min.js"))))))
+ (propagated-inputs (list r-htmltools r-r6 r-shiny))
+ (native-inputs
+ (list esbuild-node node-lts r-knitr
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/loadingio/loading-bar")
+ (commit "0.1.0")))
+ (file-name (git-file-name "js-loading-bar" "0.1.0"))
+ (sha256
+ (base32
+ "12z8m362k3gldkjhx3l65zrw7ifqkz21zgv9b2hw6ai5blkd33nv")))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/franverona/loadgo")
+ (commit "2.2.1")))
+ (file-name (git-file-name "js-loadgo" "2.2.1"))
+ (sha256
+ (base32
+ "1n11lhlv5i48xm0x7hj296lv363dbx4cldg12vr07q01pvj5fbdl")))))
+ (home-page "https://waiter.john-coene.com/")
+ (synopsis "Loading screen for Shiny")
+ (description
+ "This package provides full screen and partial loading screens for
+Shiny with spinners, progress bars, and notifications.")
+ (license license:expat))))
+
(define-public r-wheatmap
(package
(name "r-wheatmap")
@@ -1973,13 +2284,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))
@@ -2019,14 +2330,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser
(define-public r-v8
(package
(name "r-v8")
- (version "4.4.2")
+ (version "5.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "V8" version))
(sha256
(base32
- "0w4n794l4f7hwwjr83112zf3cjx72q6ak0fn45qm6pqg8brkbg77"))))
+ "06mjjrwg9bgyfxn4gcj3bf4xc9ijx08xf8dfd8g6w0bkz5cvg3v6"))))
(properties
`((upstream-name . "V8")
(updater-extra-inputs . ("libnode"))))
@@ -2169,19 +2480,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
@@ -2244,13 +2556,13 @@ the system clipboards.")
(define-public r-clock
(package
(name "r-clock")
- (version "0.7.0")
+ (version "0.7.1")
(source (origin
(method url-fetch)
(uri (cran-uri "clock" version))
(sha256
(base32
- "0x58xhngpd2rj7da9gr1x1zwz4rliza7aakfadkqsc4c7wxpmral"))))
+ "1n7hl5mbywfshk8jid5shnsqsn1al0v636wsy14f681zkp1jyba3"))))
(properties `((upstream-name . "clock")))
(build-system r-build-system)
(propagated-inputs
@@ -2318,13 +2630,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
@@ -2469,14 +2781,14 @@ variables.")
(define-public r-ggpp
(package
(name "r-ggpp")
- (version "0.5.6")
+ (version "0.5.8-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggpp" version))
(sha256
(base32
- "0xnjbxd1lkg85c2hsx7cgxqsqb3dc0pma8jwdlqfgg7d519d60xa"))))
+ "1jk3x679rvkj3if14cai99w5sk0nj07rhppwwd7i7a1daal0grh5"))))
(properties `((upstream-name . "ggpp")))
(build-system r-build-system)
(propagated-inputs
@@ -2492,6 +2804,7 @@ variables.")
r-scales
r-stringr
r-tibble
+ r-vctrs
r-xts
r-zoo))
(native-inputs
@@ -2672,13 +2985,13 @@ axis} (SMA), and @dfn{ranged major axis} (RMA).")
(define-public r-ggpmisc
(package
(name "r-ggpmisc")
- (version "0.5.5")
+ (version "0.6.0")
(source (origin
(method url-fetch)
(uri (cran-uri "ggpmisc" version))
(sha256
(base32
- "1j49q1fbihxir5q5llqwyga111j3lggifzjk3cvq8lphim4c3jia"))))
+ "145w1pbwjdahgs06v8lms3ynpqryrrr4v0h8bgsmaqqkq1hjixmi"))))
(build-system r-build-system)
(propagated-inputs
(list r-confintr
@@ -2740,6 +3053,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")
@@ -2837,13 +3169,13 @@ higher.")
(define-public r-oompadata
(package
(name "r-oompadata")
- (version "3.1.3")
+ (version "3.1.4")
(source (origin
(method url-fetch)
(uri (cran-uri "oompaData" version))
(sha256
(base32
- "0gdp7bghgpz3q0h06w8r926x7wkpcvkpyf0v5qfi1qixbpvk5fdf"))))
+ "0g9d551djqa67y2l9nmajnsgf7kys4jcvgi3yx7az7jgm44j8986"))))
(properties `((upstream-name . "oompaData")))
(build-system r-build-system)
(home-page "https://oompa.r-forge.r-project.org/")
@@ -2955,13 +3287,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")
@@ -3051,13 +3383,13 @@ method for preprocessing data for conos.")
(define-public r-pals
(package
(name "r-pals")
- (version "1.8")
+ (version "1.9")
(source (origin
(method url-fetch)
(uri (cran-uri "pals" version))
(sha256
(base32
- "0z6lkvkq7b3wsxvizljf08sjqrdcj33p5kdx6074pc5jv36dylhb"))))
+ "1rnm6yvql39b4gbly90svbb5n9m66gc7f0abrxzkll6vsn71xfar"))))
(properties `((upstream-name . "pals")))
(build-system r-build-system)
(propagated-inputs
@@ -3429,13 +3761,13 @@ conventions.")
(define-public r-ecp
(package
(name "r-ecp")
- (version "3.1.5")
+ (version "3.1.6")
(source (origin
(method url-fetch)
(uri (cran-uri "ecp" version))
(sha256
(base32
- "17m2m3nz7kqzjw2bkkp6c1a3zhwjq2c5mw9pk5g0ma274iiqj8wy"))))
+ "1imahvby3nj1b5d1x7hq6gkfg0fyyd27ghls0v35456imy1fmhz5"))))
(build-system r-build-system)
(propagated-inputs
(list r-rcpp))
@@ -3600,13 +3932,13 @@ similar to OLS.")
(define-public r-mboost
(package
(name "r-mboost")
- (version "2.9-9")
+ (version "2.9-11")
(source (origin
(method url-fetch)
(uri (cran-uri "mboost" version))
(sha256
(base32
- "1apcd90xsr9hl5f1szhyibdx61zi4p6s9bvag8bdk2yj4kqq6fmz"))))
+ "0n5wpyayhdyd46vl87c9r70m13y48khmlwii58rvi57mgw6aadwz"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice
@@ -3629,13 +3961,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))
@@ -3671,16 +4003,41 @@ on a Solomon-Cox approximation). Estimates should be treated with caution if
the group sizes are small.")
(license license:gpl2)))
+(define-public r-mcmcglmm
+ (package
+ (name "r-mcmcglmm")
+ (version "2.36")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "MCMCglmm" version))
+ (sha256
+ (base32 "1wca9x5c9x88cryj1pkhl73chmnbc1653j08faz7lp03z2mdkzv6"))))
+ (properties `((upstream-name . "MCMCglmm")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-ape
+ r-coda
+ r-corpcor
+ r-cubature
+ r-matrix
+ r-tensora))
+ (home-page "https://github.com/jarrodhadfield/MCMCglmm")
+ (synopsis "MCMC generalised linear mixed models")
+ (description
+ "This package fits multivariate generalized linear mixed models and
+related models. This is done using Markov chain Monte Carlo techniques.")
+ (license license:gpl2+)))
+
(define-public r-shadowtext
(package
(name "r-shadowtext")
- (version "0.1.3")
+ (version "0.1.4")
(source (origin
(method url-fetch)
(uri (cran-uri "shadowtext" version))
(sha256
(base32
- "109bq4d3j7vw6rcj9cjby955bdzgghkxwvwrb974xqq16kzzc6l6"))))
+ "1s3fsh6cmblyhlqrswialc9437as306ki36dyx0dv4001slvxl47"))))
(properties `((upstream-name . "shadowtext")))
(build-system r-build-system)
(propagated-inputs
@@ -3794,18 +4151,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")
@@ -3817,16 +4173,56 @@ dissimilarity analysis. Most of its multivariate tools can be used for other
data types as well.")
(license license:gpl2+)))
+(define-public r-tglkmeans
+ (package
+ (name "r-tglkmeans")
+ (version "0.5.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "tglkmeans" version))
+ (sha256
+ (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-plyr
+ r-purrr
+ r-rcpp
+ r-rcppparallel
+ r-tgstat
+ r-tibble))
+ (native-inputs (list r-knitr))
+ (home-page "https://tanaylab.github.io/tglkmeans/")
+ (synopsis "Efficient implementation of K-Means++ algorithm")
+ (description
+ "This package provides an efficient implementation of the K-Means++
+algorithm. For more information see (1) \"kmeans++ the advantages of the
+k-means++ algorithm\" by David Arthur and Sergei Vassilvitskii (2007),
+Proceedings of the eighteenth annual ACM-SIAM symposium on Discrete
+algorithms, Society for Industrial and Applied Mathematics, Philadelphia, PA,
+USA, pp. 1027-1035, and (2) \"The Effectiveness of Lloyd-Type Methods for the
+k-Means Problem\" by Rafail Ostrovsky, Yuval Rabani, Leonard J. Schulman and
+Chaitanya Swamy <doi:10.1145/2395116.2395117>.")
+ (license license:expat)))
+
(define-public r-tgp
(package
(name "r-tgp")
- (version "2.4-22")
+ (version "2.4-22.1")
(source (origin
(method url-fetch)
(uri (cran-uri "tgp" version))
(sha256
(base32
- "0gpndjq2xiic6fb5187f4hgrqj3477pd83caajnw3yy9wan4vly6"))))
+ "1jf4mr59qp169z00pxb4kc0484mg73hgcyajg9hisdxl02qs1m4r"))))
(properties `((upstream-name . "tgp")))
(build-system r-build-system)
(propagated-inputs (list r-maptree))
@@ -4018,13 +4414,13 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.")
(define-public r-secretbase
(package
(name "r-secretbase")
- (version "0.4.0")
+ (version "1.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "secretbase" version))
(sha256
- (base32 "0b05js4vh6pkkiqms2qmipy5pq96q1i5grb951skk0h953cmwf11"))))
+ (base32 "013f9lvsgfr5way2clkrwb1r2s9kvq2d3al68yjmf1lfpdmc1fdb"))))
(properties `((upstream-name . "secretbase")))
(build-system r-build-system)
(home-page "https://shikokuchuo.net/secretbase/")
@@ -4116,14 +4512,14 @@ sources.")
(define-public r-reprex
(package
(name "r-reprex")
- (version "2.1.0")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "reprex" version))
(sha256
(base32
- "0ld90pkw2r7z115xdnyqk4p39vnxrc8jnn57sl4bkpg5frczw38a"))))
+ "174705043b90phm6aj5yb199pn1clipsnqgvhskhxybypj63cq68"))))
(build-system r-build-system)
(propagated-inputs
(list r-callr
@@ -4195,13 +4591,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))
@@ -4233,6 +4629,38 @@ categorical and continuous (time series) data, otherwise known as dependent
mixture models.")
(license license:gpl2+)))
+(define-public r-detectseparation
+ (package
+ (name "r-detectseparation")
+ (version "0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "detectseparation" version))
+ (sha256
+ (base32 "05z3p1z5mhmdj5qdknz1b8f6fwbghzckl88pv79v59cfwpbvgmz8"))))
+ (properties `((upstream-name . "detectseparation")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-lpsolveapi r-pkgload r-roi r-roi-plugin-lpsolve))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/ikosmidis/detectseparation")
+ (synopsis
+ "Detect and check for separation and infinite maximum likelihood estimates")
+ (description
+ "This package provides pre-fit and post-fit methods for detecting separation
+and infinite maximum likelihood estimates in generalized linear models with
+categorical responses. The pre-fit methods apply on binomial-response generalized
+liner models such as logit, probit and cloglog regression, and can be directly
+supplied as fitting methods to the @code{glm()} function. The post-fit methods
+apply to models with categorical responses, including binomial-response
+generalized linear models and multinomial-response models, such as baseline
+category logits and adjacent category logits models; for example, the models
+implemented in the brglm2 package. The post-fit methods successively refit the
+model with increasing number of iteratively reweighted least squares iterations,
+and monitor the ratio of the estimated standard error for each parameter to what
+it has been in the first iteration.")
+ (license license:gpl3)))
+
(define-public r-readxl
(package
(name "r-readxl")
@@ -4259,6 +4687,35 @@ the embedded @code{RapidXML} C++ library.")
;; 'rapidxml' which is Boost.
(license (list license:gpl3 license:bsd-2 license:boost1.0))))
+(define-public r-rearrr
+ (package
+ (name "r-rearrr")
+ (version "0.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "rearrr" version))
+ (sha256
+ (base32 "1inx1gikiqxaf6a8g10b02l1qs2y0zxs2yrxn6dyx9n6xlra3rnr"))))
+ (properties `((upstream-name . "rearrr")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate
+ r-dplyr
+ r-lifecycle
+ r-plyr
+ r-purrr
+ r-r6
+ r-rlang
+ r-tibble))
+ (home-page "https://github.com/ludvigolsen/rearrr")
+ (synopsis "Rearranging data by a set of methods")
+ (description
+ "This package arranges data by a set of methods. It uses rearrangers to
+reorder data points and mutators to change their values. From basic utilities,
+to centering the greatest value, to swirling in 3-dimensional space, rearrr
+enables creativity when plotting and experimenting with data.")
+ (license license:expat)))
+
(define-public r-model4you
(package
(name "r-model4you")
@@ -4377,15 +4834,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
@@ -4475,13 +4933,13 @@ particularly easy to create complete web applications using httpuv alone.")
(define-public r-httr2
(package
(name "r-httr2")
- (version "1.0.1")
+ (version "1.0.3")
(source (origin
(method url-fetch)
(uri (cran-uri "httr2" version))
(sha256
(base32
- "1cpi2yr66g0nwd5ybz6254ivggvxql0bas2hwpakrcw1161jvs9k"))))
+ "1hjc5rymkh9gz0gqf0b337wgyhnpzpi80sljfalpmpwfhyzk9vsb"))))
(properties `((upstream-name . "httr2")))
(build-system r-build-system)
(propagated-inputs
@@ -4532,13 +4990,13 @@ in Miettinen, Nordhausen and Taskinen (2017) <doi:10.18637/jss.v076.i02>.")
(define-public r-job
(package
(name "r-job")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "job" version))
(sha256
- (base32 "0d7pw3q5lqlgmav1vx63y8l6gdav96656bg378wj001rx5gx052h"))))
+ (base32 "14i0ljq2wp9k8112fr27sz0bc0zi2a68kls8vw5h3qa5n40v27cc"))))
(properties `((upstream-name . "job")))
(build-system r-build-system)
(propagated-inputs (list r-digest r-rstudioapi))
@@ -4600,6 +5058,28 @@ all edge cases are encoded and decoded consistently for use with dynamic data
in systems and applications.")
(license license:expat)))
+(define-public r-jsonvalidate
+ (package
+ (name "r-jsonvalidate")
+ (version "1.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "jsonvalidate" version))
+ (sha256
+ (base32 "0myvm93azl6mj60l8fp91qa3ln3nnwj4p48xli8k215sm6zhhv1b"))))
+ (properties `((upstream-name . "jsonvalidate")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-v8))
+ (native-inputs (list r-knitr))
+ (home-page "https://docs.ropensci.org/jsonvalidate/")
+ (synopsis "Validate JSON schema")
+ (description
+ "This package uses the node library @code{is-my-json-valid} or @code{ajv}
+to validate JSON against a JSON schema. Drafts 04, 06 and 07 of JSON schema
+are supported.")
+ (license license:expat)))
+
(define-public r-servr
(package
(name "r-servr")
@@ -4691,13 +5171,13 @@ applications.")
(define-public r-htmltable
(package
(name "r-htmltable")
- (version "2.4.2")
+ (version "2.4.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "htmlTable" version))
(sha256
- (base32 "039nnxnvw5l284n7w8q0hnplm0b58nwhsrpjfi5asg61f9hxv0va"))))
+ (base32 "1pgndsyml68d9qd747043m9g0dxhaa10m533dchcsg1izwdx0f9p"))))
(properties `((upstream-name . "htmlTable")))
(build-system r-build-system)
(arguments
@@ -4749,13 +5229,13 @@ LaTeX.")
(define-public r-curl
(package
(name "r-curl")
- (version "5.2.1")
+ (version "5.2.2")
(source (origin
(method url-fetch)
(uri (cran-uri "curl" version))
(sha256
(base32
- "147smp4am6z23c3j21bd0zcjxsmhnkkssn4wrlpwl6xa1264syja"))))
+ "1zqix8w6x7vrk5jsfjcjpxwsk8cqj33y5b22g1papqw9gl7m6n56"))))
(properties
`((upstream-name . "curl")
(updater-extra-inputs . ("curl"))))
@@ -4815,14 +5295,14 @@ objects in HTML format.")
(define-public r-rjson
(package
(name "r-rjson")
- (version "0.2.21")
+ (version "0.2.22")
(source
(origin
(method url-fetch)
(uri (cran-uri "rjson" version))
(sha256
(base32
- "1qm27r1w677zg31gsiln60hcciszbymkw78cnaq7s36cbk9mcawq"))))
+ "09qxkvrv569bdbadnz95lmgsg9gq6imigj4rsdm6l5mnf9xzdk86"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/rjson")
(synopsis "JSON library for R")
@@ -4834,13 +5314,13 @@ and vice-versa.")
(define-public r-fastdummies
(package
(name "r-fastdummies")
- (version "1.7.3")
+ (version "1.7.4")
(source (origin
(method url-fetch)
(uri (cran-uri "fastDummies" version))
(sha256
(base32
- "0sm02pxbabckxpi3mn36h5bz2wx5pyx7a1dhc2abc4c7fwpihsng"))))
+ "026xc1wrzgwyhs1h1bdn7yy56mnpr5rr9bkwljpzmhzgcx5lv44m"))))
(properties `((upstream-name . "fastDummies")))
(build-system r-build-system)
(propagated-inputs (list r-data-table r-stringr r-tibble))
@@ -4858,14 +5338,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/")
@@ -4879,6 +5359,30 @@ are used. Fastmap avoids this memory leak issue by implementing the map using
data structures in C++.")
(license license:expat)))
+(define-public r-fastglm
+ (package
+ (name "r-fastglm")
+ (version "0.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "fastglm" version))
+ (sha256
+ (base32 "0283kgk81cxbii7ljmp1rzqg5mzkvf7cj7lflhhhkgj5ljqina2i"))))
+ (properties `((upstream-name . "fastglm")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bh r-bigmemory r-rcpp r-rcppeigen))
+ (native-inputs (list r-knitr))
+ (home-page "https://cran.r-project.org/package=fastglm")
+ (synopsis
+ "Fast and stable fitting of generalized linear models using 'RcppEigen'")
+ (description
+ "This package fits generalized linear models efficiently using @code{RcppEigen}'.
+The iteratively reweighted least squares implementation utilizes the
+step-halving approach of Marschner to help safeguard against convergence
+issues.")
+ (license license:gpl2+)))
+
(define-public r-fastghquad
(package
(name "r-fastghquad")
@@ -4904,20 +5408,19 @@ rules and utility functions for adaptive GH quadrature.")
(define-public r-rstpm2
(package
(name "r-rstpm2")
- (version "1.6.3")
+ (version "1.6.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "rstpm2" version))
(sha256
(base32
- "07q3n9hv8azwiipggyb6ykhvb8qy10s4nkp5irv76d54fsl7jq2y"))))
+ "06zj540f447z0rhp7gqdd63f4jb3fmiskxrxhbx0dkaajcqlavf0"))))
(properties `((upstream-name . "rstpm2")))
(build-system r-build-system)
(propagated-inputs
(list r-bbmle
r-bh
- r-desolve
r-fastghquad
r-mgcv
r-mvtnorm
@@ -4997,13 +5500,13 @@ jQuery.")
(define-public r-jqr
(package
(name "r-jqr")
- (version "1.3.3")
+ (version "1.3.4")
(source (origin
(method url-fetch)
(uri (cran-uri "jqr" version))
(sha256
(base32
- "1w6806yx763xb0xaqh8ms20gz4h1y3c2s11lgsq3x8h6bahimn5s"))))
+ "1h7rbqjgc1hilqyzlzfsd3603hfj26cprg7cjmxw08bi6p0w4hwc"))))
(properties `((upstream-name . "jqr")))
(build-system r-build-system)
(inputs (list jq))
@@ -5106,14 +5609,14 @@ expression estimates for all genes.")
(define-public r-bslib
(package
(name "r-bslib")
- (version "0.7.0")
+ (version "0.8.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "bslib" version))
(sha256
(base32
- "181cfmdvi64j978q8x69bl7wxwpjpx54a52sh4xng0pk3a2djd91"))
+ "00sbskl5f4mif2x54h5z3m2kv8ij2wv84a61n39931hj3gdjs67x"))
(snippet
'(for-each delete-file
'("inst/components/dist/components.min.js"
@@ -5194,7 +5697,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)
@@ -5204,7 +5707,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"
@@ -5320,6 +5823,31 @@ extensive prebuilt widgets make it possible to build beautiful,
responsive, and powerful applications with minimal effort.")
(license license:artistic2.0)))
+(define-public r-shinydisconnect
+ (package
+ (name "r-shinydisconnect")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "shinydisconnect" version))
+ (sha256
+ (base32 "1yhppfx8jpvz48iwxnimcwqhj02vqjrfmh4z5rdn9d35p51c8zjc"))))
+ (properties `((upstream-name . "shinydisconnect")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate r-glue r-htmltools r-shiny))
+ (home-page "https://github.com/daattali/shinydisconnect")
+ (synopsis "Show a nice message when a Shiny app disconnects or errors")
+ (description
+ "This package provides a Shiny app that can disconnect for a variety of
+reasons: an unrecoverable error occurred in the app, the server went down, the
+user lost internet connection, or any other reason that might cause the Shiny
+app to lose connection to its server. With shinydisconnect, you can call
+@code{disonnectMessage} anywhere in a Shiny app's UI to add a nice message
+when this happens. It works locally (running Shiny apps within RStudio) and
+on Shiny servers.")
+ (license license:expat)))
+
(define-public r-shinyhelper
(package
(name "r-shinyhelper")
@@ -5484,6 +6012,89 @@ application framework for R, making it easy to create attractive dashboards.")
;; later.
(license license:gpl2+)))
+(define-public r-shinydashboardplus
+ (package
+ (name "r-shinydashboardplus")
+ (version "2.0.5")
+ (source (origin
+ (method url-fetch)
+ (uri (cran-uri "shinydashboardPlus" version))
+ (sha256
+ (base32
+ "1k53ycfdv5r58rwqsk7mkrrlz72wikhrhzlfrg3dkwbdbzblrhqb"))
+ (modules '((guix build utils)))
+ (snippet
+ `(begin
+ (with-directory-excursion
+ ,(string-append "inst/shinydashboardPlus-" version
+ "/js/")
+ (for-each delete-file
+ '("app.min.js"
+ "shinydashboardPlus.min.js"
+ "shinydashboardPlus.min.js.map")))
+ (with-directory-excursion "inst/materialDesign-1.0/js"
+ (for-each delete-file
+ '("material.min.js"
+ "ripples.min.js")))))))
+ (properties `((upstream-name . "shinydashboardPlus")))
+ (build-system r-build-system)
+ (arguments
+ (list
+ ;; The tests launch a shinyApp; they are interactive tests that
+ ;; will block forever, so we just don't run them.
+ #:tests? #false
+ #:modules
+ '((guix build r-build-system)
+ (guix build minify-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:imported-modules
+ `(,@%r-build-system-modules
+ (guix build minify-build-system))
+ #:phases
+ #~(modify-phases (@ (guix build r-build-system) %standard-phases)
+ (add-after 'unpack 'process-javascript
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion
+ (string-append "inst/shinydashboardPlus-" #$version "/js/")
+ (for-each
+ (match-lambda
+ ((source . target)
+ (minify source #:target target)))
+ `(("app.js" . "app.min.js")
+ ("shinydashboardPlus.js" . "shinydashboardPlus.min.js")
+ (,(search-input-file inputs "/dist/js/material.js")
+ . "materialDesign-1.0/js/material.min.js")
+ (,(search-input-file inputs "/dist/js/ripples.js")
+ . "materialDesign-1.0/js/ripples.min.js")))))))))
+ (propagated-inputs
+ (list r-fresh
+ r-htmltools
+ r-lifecycle
+ r-shiny
+ r-shinydashboard
+ r-waiter))
+ (native-inputs
+ (list esbuild r-knitr
+ (let ((commit "92a2284b47aed56a9d7ae92cf9b40072d27982b3"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DucThanhNguyen/MaterialAdminLTE")
+ (commit commit)))
+ (file-name (git-file-name "MaterialAdminLTE"
+ (git-version "0" "0" commit)))
+ (sha256
+ (base32
+ "0cn11hxpf25h7xj2lk473z24swgz979dz255zwk2m2fj00iljkn9"))))))
+ (home-page "https://github.com/RinteRface/shinydashboardPlus")
+ (synopsis "Add more AdminLTE2 components to shinydashboard")
+ (description
+ "This package extends shinydashboard with AdminLTE2 components.
+AdminLTE2 is a Bootstrap 3 dashboard template. Customize boxes, add timelines
+and a lot more.")
+ (license license:gpl2+)))
+
(define-public r-shinyfiles
(package
(name "r-shinyfiles")
@@ -5996,6 +6607,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")
@@ -6355,13 +6986,13 @@ XML. To learn more about the Abbyy OCR API, see @url{http://ocrsdk.com/}.")
(define-public r-colorspace
(package
(name "r-colorspace")
- (version "2.1-0")
+ (version "2.1-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "colorspace" version))
(sha256
- (base32 "0k31hazd2rq5lyg3y89y2v5jqadz2qlxd1bhvj89q4aldfxql1q4"))))
+ (base32 "02ydb0vncck0l9shfbz07gymdy5l2vinb0miivyb1r6nykjww8g7"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -6495,13 +7126,13 @@ initiative to bring PASSTEC 2000 functionalities to R.")
(define-public r-partykit
(package
(name "r-partykit")
- (version "1.2-20")
+ (version "1.2-22")
(source (origin
(method url-fetch)
(uri (cran-uri "partykit" version))
(sha256
(base32
- "1np0sa7fx7wvwxbpk5lpgbdpz0xwcvppq0sc52nifx1dxnirll33"))))
+ "1nqabizmy44c6ip7clg15wljwmd66p7jzzdb3xfsh40bjym1a00g"))))
(build-system r-build-system)
(propagated-inputs
(list r-formula
@@ -6541,13 +7172,13 @@ error stream.")
(define-public r-pls
(package
(name "r-pls")
- (version "2.8-3")
+ (version "2.8-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "pls" version))
(sha256
- (base32 "1qvbwr567vxywpfsl7cb15lpwxpd04kf01nzk1v8dm4csf6p5sz6"))))
+ (base32 "0qnmndljjnk9amsrmx402dhpc742pm3cskqjxhdq2m4pcdiinnvq"))))
(build-system r-build-system)
(home-page "https://mevik.net/work/software/pls.html")
(synopsis "Partial Least Squares and Principal Component Regression")
@@ -6575,13 +7206,13 @@ print, summary, plot, update, etc.
(define-public r-ps
(package
(name "r-ps")
- (version "1.7.6")
+ (version "1.7.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "ps" version))
(sha256
- (base32 "1lkd0mxr65sfh47dig0ck530kmsaxxqxdfy7ji59h78y7py5zhsj"))))
+ (base32 "1wi27l0a3z7wkrgn97jj5yqx6khy3brycj0y8nhlxagsp2rdrzj6"))))
(build-system r-build-system)
(home-page "https://ps.r-lib.org")
(synopsis "List, query, and manipulate system processes")
@@ -6614,22 +7245,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))
@@ -6644,13 +7276,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))
@@ -6688,13 +7320,13 @@ value for each cluster in a dendrogram.")
(define-public r-rcpp
(package
(name "r-rcpp")
- (version "1.0.12")
+ (version "1.0.13")
(source
(origin
(method url-fetch)
(uri (cran-uri "Rcpp" version))
(sha256
- (base32 "1l1b0q2r6q2bjr4wvj98kp9844fyrsn2ppx339v05vmy8g65jwqc"))))
+ (base32 "1ki2vdfavwxvpw1y47kc0fpg248836zd3iw6zlspkr8kq58cdzi1"))))
(build-system r-build-system)
(home-page "https://www.rcpp.org")
(synopsis "Seamless R and C++ integration")
@@ -6778,13 +7410,13 @@ factorization and divisive clustering for large sparse and dense matrices.")
(define-public r-rcppspdlog
(package
(name "r-rcppspdlog")
- (version "0.0.16")
+ (version "0.0.17")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppSpdlog" version))
(sha256
- (base32 "12xryg2mp00nxmpchf0lki43c13c1vsda14pcc4dcfplamwkhlza"))))
+ (base32 "0f1s0c32kid910p2q08d77rwprlxx3cq3ngy0kfgfpy13cvm34aa"))))
(properties `((upstream-name . "RcppSpdlog")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp))
@@ -7064,17 +7696,18 @@ graphics packages that comes with the base installation.")
(define-public r-ctrdata
(package
(name "r-ctrdata")
- (version "1.17.2")
+ (version "1.19.1")
(source (origin
(method url-fetch)
(uri (cran-uri "ctrdata" version))
(sha256
(base32
- "0xsi3yc08gg9h5zh9h9r2d2ixv36f6wblmkcv51h9nfmawjyd8f8"))))
+ "0w0bl39lgkb7fqvm3mg3b45kak1kjfjy2ghq31gwymyx41vh220v"))))
(properties `((upstream-name . "ctrdata")))
(build-system r-build-system)
(propagated-inputs
(list r-clipr
+ r-countrycode
r-curl
r-digest
r-dplyr
@@ -7453,13 +8086,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
@@ -7566,13 +8199,13 @@ most popular ones.")
(define-public r-sp
(package
(name "r-sp")
- (version "2.1-3")
+ (version "2.1-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "sp" version))
(sha256
- (base32 "0m44qr2l8xmqbgi95h200bwy9ca8jihiqzfarws1p09lwmr954zs"))))
+ (base32 "02lz8wcx16ay3zdqhdb57847i9qg2wzajrfp1z2xpmyjc7xyg1g1"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice))
@@ -7627,13 +8260,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))
@@ -7664,6 +8297,57 @@ installing the entire GSL.")
a variety of different samplers.")
(license license:expat)))
+(define-public r-rmapshaper
+ (package
+ (name "r-rmapshaper")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "rmapshaper" version))
+ (sha256
+ (base32 "01c1sd02ws3k2dmlj964c4j5jg93x192s3brhmaw4pi4qfjzc21x"))
+ (snippet
+ '(delete-file "inst/mapshaper/mapshaper-browserify.min.js"))))
+ (properties `((upstream-name . "rmapshaper")))
+ (build-system r-build-system)
+ (arguments
+ (list
+ #:modules
+ '((guix build r-build-system)
+ (guix build minify-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:imported-modules
+ `(,@%r-build-system-modules
+ (guix build minify-build-system))
+ #:phases
+ '(modify-phases (@ (guix build r-build-system) %standard-phases)
+ (add-after 'unpack 'process-javascript
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "inst/"
+ (for-each (match-lambda
+ ((source . target)
+ (minify source #:target target)))
+ '(("mapshaper/mapshaper-browserify.js"
+ . "mapshaper/mapshaper-browserify.min.js")))))))))
+ (propagated-inputs (list r-geojsonsf
+ r-jsonify
+ r-readr
+ r-sf
+ r-sp
+ r-v8))
+ (native-inputs (list esbuild r-knitr))
+ (home-page "https://github.com/ateucher/rmapshaper")
+ (synopsis "Client for mapshaper for geospatial operations")
+ (description
+ "This package lets you edit and simplify @code{geojson}, @code{Spatial},
+and @code{sf} objects. This is a wrapper around the @code{mapshaper}
+JavaScript library to perform topologically-aware polygon simplification, as
+well as other operations such as clipping, erasing, dissolving, and converting
+multi-part to single-part geometries.")
+ (license license:expat)))
+
(define-public r-rmdfiltr
(package
(name "r-rmdfiltr")
@@ -7743,13 +8427,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"))))
@@ -7836,13 +8520,13 @@ which should be seen for details.")
(define-public r-evd
(package
(name "r-evd")
- (version "2.3-6.1")
+ (version "2.3-7")
(source
(origin
(method url-fetch)
(uri (cran-uri "evd" version))
(sha256
- (base32 "0wc95hfj0gwkyghipdrhwd3s6q2agh9x2wy6y7dr6mjw7wnmjb36"))))
+ (base32 "0j2nnprzww1akin6mnj619wp6ihbd7jgbr2daj6lmgirbpqrv2aa"))))
(properties `((upstream-name . "evd")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=evd")
@@ -8191,6 +8875,26 @@ functions that solve general linear/integer problems, assignment problems, and
transportation problems.")
(license license:lgpl2.0)))
+(define-public r-lpsolveapi
+ (package
+ (name "r-lpsolveapi")
+ (version "5.5.2.0-17.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "lpSolveAPI" version))
+ (sha256
+ (base32 "1vvhbgd54k0ynzh1zsrcdy8ry6w642vjk9dhlkig7pamf39aj02g"))))
+ (properties `((upstream-name . "lpSolveAPI")))
+ (build-system r-build-system)
+ (home-page "https://cran.r-project.org/package=lpSolveAPI")
+ (synopsis "Interface to lp_solve")
+ (description
+ "The lpSolveAPI package provides an R interface to lp_solve, a @acronym{MILP,
+Mixed Integer Linear Programming}, solver with support for pure linear, (mixed)
+integer/binary, semi-continuous and @acronym{SOS, special ordered sets} models.")
+ (license license:lgpl2.0)))
+
(define-public r-limsolve
(package
(name "r-limsolve")
@@ -8263,17 +8967,17 @@ provides the R language without the environment.")
(define-public r-fitdistrplus
(package
(name "r-fitdistrplus")
- (version "1.1-11")
+ (version "1.2-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "fitdistrplus" version))
(sha256
(base32
- "0gdm06anjmihfj1d0yiqy36d887kmc0d8553pjl1f90bf4mly9r6"))))
+ "0n25b3f92pghkavk4j9l25v1k6wjwkmpyvxslf05ixpzkmd23d38"))))
(build-system r-build-system)
(propagated-inputs
- (list r-mass r-survival))
+ (list r-mass r-rlang r-survival))
(native-inputs
(list r-knitr))
(home-page "https://riskassessment.r-forge.r-project.org")
@@ -8292,14 +8996,14 @@ data). Weighted versions of MLE, MME and QME are available.")
(define-public r-energy
(package
(name "r-energy")
- (version "1.7-11")
+ (version "1.7-12")
(source
(origin
(method url-fetch)
(uri (cran-uri "energy" version))
(sha256
(base32
- "04b55ckmaqbnlpifg4w7smvly03kqycklvbg9x8d4yf902q8z7y2"))))
+ "0wkggv423bz9awi3dnxpmf62hdgfn5qgcvw1k4pvcsjczaz288mc"))))
(build-system r-build-system)
(propagated-inputs
(list r-boot r-gsl r-rcpp))
@@ -8320,13 +9024,13 @@ statistics/methods are implemented.")
(define-public r-envstats
(package
(name "r-envstats")
- (version "2.8.1")
+ (version "3.0.0")
(source (origin
(method url-fetch)
(uri (cran-uri "EnvStats" version))
(sha256
(base32
- "19nnab201yalxbgpvpp5lkgqs0m17b5plsswmaxbvdv4mag2p58j"))))
+ "0j6jikxf28ryh6jn7d3lag6sl2jjdzbszd2ll94ia9dk8hyyq4q4"))))
(properties `((upstream-name . "EnvStats")))
(build-system r-build-system)
(propagated-inputs (list r-ggplot2 r-mass r-nortest))
@@ -8480,17 +9184,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
@@ -8639,14 +9344,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
@@ -8787,14 +9492,14 @@ with particular emphasis on making attractive log axis plots.")
(define-public r-rmysql
(package
(name "r-rmysql")
- (version "0.10.27")
+ (version "0.10.28")
(source
(origin
(method url-fetch)
(uri (cran-uri "RMySQL" version))
(sha256
(base32
- "1axz0pqvpqs028p2j7awmgdwpignl7m3hqd1fv3vkgfrkil5nwzi"))))
+ "00kzxn7y2k9nfrkwg1xzn268aifka5k14wa15yvniidd9982wr6b"))))
(properties `((upstream-name . "RMySQL")))
(build-system r-build-system)
(inputs
@@ -8861,17 +9566,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
@@ -8910,6 +9615,50 @@ interface to @code{PostgreSQL}, a relational database.")
Optimization problems by using the simplex algorithm.")
(license license:gpl2+)))
+(define-public r-geojsonsf
+ (package
+ (name "r-geojsonsf")
+ (version "2.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "geojsonsf" version))
+ (sha256
+ (base32 "1la6zfzv14ascwds0bp67d7x3am0v14mylc4b2lyd0nrf93a2p17"))))
+ (properties `((upstream-name . "geojsonsf")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-geometries r-jsonify r-rapidjsonr r-rcpp
+ r-sfheaders))
+ (native-inputs (list r-knitr))
+ (home-page "https://github.com/SymbolixAU/geojsonsf")
+ (synopsis "GeoJSON to Simple Feature converter")
+ (description "This package converts between @code{GeoJSON} and Simple
+Feature objects.")
+ (license license:expat)))
+
+(define-public r-geometries
+ (package
+ (name "r-geometries")
+ (version "0.2.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "geometries" version))
+ (sha256
+ (base32 "040ljxmzbjdr76p81ygnn5y0gzckz5k2arxkih5m5f3b6g62laf6"))))
+ (properties `((upstream-name . "geometries")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-rcpp))
+ (native-inputs (list r-knitr))
+ (home-page "https://dcooley.github.io/geometries/")
+ (synopsis "Convert between R objects and geometric structures")
+ (description
+ "Geometry shapes in R are typically represented by matrices (points,
+lines), with more complex shapes being lists of matrices (polygons).
+Geometries will convert various R objects into these shapes. Conversion
+functions are available at both the R level, and through Rcpp.")
+ (license license:expat)))
+
(define-public r-geometry
(package
(name "r-geometry")
@@ -8998,14 +9747,14 @@ Core algorithms are executed in parallel on systems supporting OpenMP.")
(define-public r-rcpproll
(package
(name "r-rcpproll")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppRoll" version))
(sha256
(base32
- "0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"))))
+ "1prnc3svhc2v1w97vbdzfyxh545zx2h0p9d1q4753f7ynrwdkxfj"))))
(properties `((upstream-name . "RcppRoll")))
(build-system r-build-system)
(propagated-inputs
@@ -9022,14 +9771,14 @@ provided.")
(define-public r-ipred
(package
(name "r-ipred")
- (version "0.9-14")
+ (version "0.9-15")
(source
(origin
(method url-fetch)
(uri (cran-uri "ipred" version))
(sha256
(base32
- "0dcgabbqk7lb8pfqs06ix87caf5c9p6kcppi5sskv76h8z43vj41"))))
+ "0jzfq06l2vxyjy46sjgqyk6l4pp06kx3w5j39hzjy9i127hjsxd4"))))
(build-system r-build-system)
(propagated-inputs
(list r-class
@@ -9049,17 +9798,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/")
@@ -9102,19 +9851,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
@@ -9141,20 +9889,19 @@ provides a one-row summary of model-level statistics.")
(define-public r-recipes
(package
(name "r-recipes")
- (version "1.0.10")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "recipes" version))
(sha256
(base32
- "1m4v9j7by0w5avqljmwck1jsgjgwc8rsby0affa5zii3xkvvvifg"))))
+ "0v9063w4ahdc0xnwry3knykl4k2656df6jxv5f0p40k8piv8ip65"))))
(build-system r-build-system)
(propagated-inputs
(list r-cli
r-clock
r-dplyr
- r-ellipsis
r-generics
r-glue
r-gower
@@ -9261,14 +10008,14 @@ with iterators from the @code{reticulate} package.")
(define-public r-corrplot
(package
(name "r-corrplot")
- (version "0.92")
+ (version "0.94")
(source
(origin
(method url-fetch)
(uri (cran-uri "corrplot" version))
(sha256
(base32
- "1g98jk6xsl08z4n6sy5vriif99m31zhbz7j3dh1kfj4w7yb9zh78"))))
+ "1x2mgq5fnws6imywwrkshcq41qh1dmdq98kxmf6yrpwjffpmv1cf"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -9304,6 +10051,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")
@@ -9338,13 +10108,13 @@ functions for:
(define-public r-statsexpressions
(package
(name "r-statsexpressions")
- (version "1.5.4")
+ (version "1.5.5")
(source (origin
(method url-fetch)
(uri (cran-uri "statsExpressions" version))
(sha256
(base32
- "061qrhibfanh4f38pyhlj2z364y75d4njvrlr2415bww4jcwlpfd"))))
+ "0ba594rvqgczb10ldkmc637z9v6c0j3qixa1pw7jzd2bmhqfmaxh"))))
(properties `((upstream-name . "statsExpressions")))
(build-system r-build-system)
(propagated-inputs (list r-afex
@@ -9383,13 +10153,13 @@ for ggstatsplot.")
(define-public r-strawr
(package
(name "r-strawr")
- (version "0.0.91")
+ (version "0.0.92")
(source (origin
(method url-fetch)
(uri (cran-uri "strawr" version))
(sha256
(base32
- "1nbcn20g3f3f5x9sscj3020n5h4iaphr70s90n2fz31vc4snzq2m"))))
+ "0dy6pagwvmswmrlvb9ndy8lz3krcm8fqik83l0gmv9wjb9vba27s"))))
(properties `((upstream-name . "strawr")))
(build-system r-build-system)
(inputs (list curl zlib))
@@ -9451,14 +10221,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/")
@@ -9524,14 +10294,14 @@ response matrices.")
(define-public r-ordinal
(package
(name "r-ordinal")
- (version "2023.12-4")
+ (version "2023.12-4.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "ordinal" version))
(sha256
(base32
- "18lzpmf36vvc3krk7jqz7naikhrcdyplj2z9y6xgzlnzhgcjln7m"))))
+ "1c9qiv0zz77i80gbhljj9hm4lh2zs9chfg834lcgyr6972jcz79c"))))
(build-system r-build-system)
(propagated-inputs
(list r-mass r-matrix r-nlme r-numderiv r-ucminf))
@@ -9919,14 +10689,14 @@ structure.")
(define-public r-vioplot
(package
(name "r-vioplot")
- (version "0.4.0")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "vioplot" version))
(sha256
(base32
- "1db7g0378jbcd6ssb7afff4y4r0v472qnb625hfwixx4wf1v8aap"))))
+ "0r89ac9ilz1jwwfgylzscg3c8is7dsy3c4dcl89ksmqhp3692kmh"))))
(build-system r-build-system)
(propagated-inputs
(list r-sm r-zoo))
@@ -9967,14 +10737,25 @@ 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"
+ ;; These files are generated from Rnw files.
+ (for-each delete-file
+ (list "xts-faq.R"
+ "xts-faq.Rnw"
+ "xts-faq.pdf"
+ "xts.R"
+ "xts.Rnw"
+ "xts.pdf"))))))
(build-system r-build-system)
(propagated-inputs (list r-zoo))
(home-page "https://github.com/joshuaulrich/xts")
@@ -10100,13 +10881,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))
@@ -10143,16 +10924,16 @@ of Eigenmatrices} (JADE).")
(define-public r-ips
(package
(name "r-ips")
- (version "0.0.11")
+ (version "0.0.12")
(source (origin
(method url-fetch)
(uri (cran-uri "ips" version))
(sha256
(base32
- "02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"))))
+ "0vnsalm94vzagksqv4ph6x7vdwhd1lq278sak30pr4m9bc9xxchw"))))
(properties `((upstream-name . "ips")))
(build-system r-build-system)
- (propagated-inputs (list r-ape r-phangorn r-plyr r-seqinr r-xml))
+ (propagated-inputs (list r-ape r-data-table r-phangorn r-plyr r-xml))
(home-page "https://cran.r-project.org/package=ips")
(synopsis "Interfaces to phylogenetic software in R")
(description
@@ -10294,14 +11075,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")
@@ -10383,14 +11164,14 @@ functions and used in the data analysis.")
(define-public r-debugme
(package
(name "r-debugme")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "debugme" version))
(sha256
(base32
- "1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"))))
+ "16ghf60rj0l8ypm0hxjp23zxdi2ndq8ii74cilq61m107fnha9mj"))))
(build-system r-build-system)
(propagated-inputs (list r-crayon))
(home-page "https://github.com/r-lib/debugme#readme")
@@ -10569,14 +11350,14 @@ Markdown documents.")
(define-public r-seriation
(package
(name "r-seriation")
- (version "1.5.5")
+ (version "1.5.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "seriation" version))
(sha256
(base32
- "0v84pic838rpbcmrz8ip466aagz57vmzlgfk0vkhlcv8zn34r0zp"))))
+ "1a69sxzy6m5kykdr6gcmjqdh50ld0mbl94hi2gb9jcggp3g0d1yz"))))
(build-system r-build-system)
(propagated-inputs
(list r-ca
@@ -10604,13 +11385,13 @@ iVAT).")
(define-public r-xfun
(package
(name "r-xfun")
- (version "0.43")
+ (version "0.47")
(source
(origin
(method url-fetch)
(uri (cran-uri "xfun" version))
(sha256
- (base32 "1hqn9r4xk0jjm1kafn7r8jbpciqciw8gh1vqch0wlvzda8m4dbar"))))
+ (base32 "0jrc4g799nhyra8n202107mx7h42yzz4n4yblf3fdwjdpzyp964r"))))
(build-system r-build-system)
(properties
;; knitr itself depends on xfun
@@ -10799,14 +11580,14 @@ their own grammars and easily expose them in R packages.")
(define-public r-uuid
(package
(name "r-uuid")
- (version "1.2-0")
+ (version "1.2-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "uuid" version))
(sha256
(base32
- "1z9a4b7hkymkwjq69d00myy5xw8kl9g99f4m2y4lxqqjz0a0lwbk"))))
+ "15jbzj0i4qphakbi8s9yk55lm8z9s2vhgp5bj77sfvkx7mrlj3pr"))))
(build-system r-build-system)
(home-page "https://www.rforge.net/uuid")
(synopsis "Tools for generating and handling of UUIDs")
@@ -10838,14 +11619,14 @@ vectors.")
(define-public r-tinytex
(package
(name "r-tinytex")
- (version "0.50")
+ (version "0.52")
(source
(origin
(method url-fetch)
(uri (cran-uri "tinytex" version))
(sha256
(base32
- "11k0pl073b4k4wmpxkw4a071jbpvhr1g3cwm9v99rw3gh6p6x15l"))))
+ "0fji3yca7qpxpzdd8hy55v0g40jny41qvhz8d64gwlnxkwxp2alk"))))
(build-system r-build-system)
(propagated-inputs
(list r-xfun))
@@ -10923,13 +11704,13 @@ implementation of an approximate nearest neighbor search using hierarchical
(define-public r-nestedcv
(package
(name "r-nestedcv")
- (version "0.7.8")
+ (version "0.7.10")
(source
(origin
(method url-fetch)
(uri (cran-uri "nestedcv" version))
(sha256
- (base32 "1pdky7kzqs1rhl0f4hba3sggifplfgbp339imxym4dvvdb81b589"))))
+ (base32 "1cfxw9pblrn2f0bw448sxdnj7pb04l1pkfdajzcmg9yn95k1v95b"))))
(properties `((upstream-name . "nestedcv")))
(build-system r-build-system)
(propagated-inputs (list r-caret
@@ -11358,14 +12139,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/")
@@ -11501,14 +12282,14 @@ financial trading strategies.")
(define-public r-tseries
(package
(name "r-tseries")
- (version "0.10-55")
+ (version "0.10-57")
(source
(origin
(method url-fetch)
(uri (cran-uri "tseries" version))
(sha256
(base32
- "03jb2ij4jyhrbygi0gha549vq262kx1ffjmy12rf0gak0qmq5iwp"))))
+ "1vlvz009y683k3xz2bhzkfdnk5m2c9abfz7661p92a17cjvlnx8q"))))
(build-system r-build-system)
(propagated-inputs
(list r-jsonlite r-quadprog r-quantmod r-zoo))
@@ -11592,13 +12373,13 @@ multivariate distributions.")
(define-public r-fbasics
(package
(name "r-fbasics")
- (version "4032.96")
+ (version "4041.97")
(source (origin
(method url-fetch)
(uri (cran-uri "fBasics" version))
(sha256
(base32
- "14461d6ac8hcn1x3srh45a4s5imafqb0xy8bn5l6d0qwhw4njmg1"))))
+ "1aqm973km7z8b6r90j3dcqi7dgf8fxcjb5ps2q3f14p80rg0ahlr"))))
(properties `((upstream-name . "fBasics")))
(build-system r-build-system)
(propagated-inputs
@@ -11649,16 +12430,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")
@@ -11671,14 +12452,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))
@@ -11692,14 +12473,14 @@ applied econometric analysis.")
(define-public r-cubature
(package
(name "r-cubature")
- (version "2.1.0")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "cubature" version))
(sha256
(base32
- "0r9n4xpm3ssjn3vywzlgh3naynzp1cxvjsd0pvah04k115b7i0jx"))))
+ "1156gv8ca3k034f34h50g0a4dg65dpv9d676i7h11rpl6gkj0wmk"))))
(build-system r-build-system)
(propagated-inputs
(list r-rcpp))
@@ -11750,14 +12531,14 @@ sample Robust Rank-Order Distributional Test.")
(define-public r-expm
(package
(name "r-expm")
- (version "0.999-9")
+ (version "1.0-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "expm" version))
(sha256
(base32
- "1m7yiya3hyv6l87qi0vj9s9cmajnig7ah08id9y4yg4dr95278c3"))))
+ "0m5jm92mjn83zvh4jz7rdf04jdaad7lv2l0a44rb2mdgyvw3di82"))))
(build-system r-build-system)
(propagated-inputs (list r-matrix))
(native-inputs (list gfortran))
@@ -12191,6 +12972,26 @@ facilitate data exploration.")
experimental designs and random samples for common sampling designs.")
(license license:expat)))
+(define-public r-roi
+ (package
+ (name "r-roi")
+ (version "1.0-1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "ROI" version))
+ (sha256
+ (base32 "05hnj9fskfm2klz7zv97lb0r60akjq4a1cay8p62whpi0hri9zyl"))))
+ (properties `((upstream-name . "ROI")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate r-registry r-slam))
+ (home-page "https://roi.r-forge.r-project.org/")
+ (synopsis "R optimization infrastructure")
+ (description
+ "The @acronym{ROI, R Optimization Infrastructure} is a framework for handling
+optimization problems in R.")
+ (license license:gpl3)))
+
(define-public r-roptim
(package
(name "r-roptim")
@@ -12270,14 +13071,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"))))
@@ -12398,14 +13199,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))
@@ -12845,14 +13646,14 @@ used.")
(define-public r-arules
(package
(name "r-arules")
- (version "1.7-7")
+ (version "1.7-8")
(source
(origin
(method url-fetch)
(uri (cran-uri "arules" version))
(sha256
(base32
- "183isw4sy5gv5fxajiy4pm5p3nfd1pffa4h8sisl2nrw2rig9na2"))))
+ "1qc0hdkhsg1a7byldgarlbg36w37sdynz0cvkp3jcj9b131a43dl"))))
(build-system r-build-system)
(propagated-inputs
(list r-generics r-matrix))
@@ -13005,14 +13806,14 @@ custom infix operators.")
(define-public r-openxlsx
(package
(name "r-openxlsx")
- (version "4.2.5.2")
+ (version "4.2.6.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "openxlsx" version))
(sha256
(base32
- "0rwvzhk2brhbf1cdpg5jmwiwx5jhr9ybzvnhw0pg4bl3wpkqjw7f"))))
+ "1absl7kl3gzg2rwjv3qj74clcyj6xgfbxc6232ddi8fnll3ca262"))))
(build-system r-build-system)
(propagated-inputs
(list r-rcpp r-stringi r-zip))
@@ -13031,14 +13832,14 @@ dependency on Java.")
(define-public r-rio
(package
(name "r-rio")
- (version "1.0.1")
+ (version "1.2.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "rio" version))
(sha256
(base32
- "1vkvajlmp8kgmkadamy0xm885whfkwacq2jxcrshz1w8amy16k3m"))))
+ "152k0i77bzj91v3rvdc8sx0cy335c937fzfqsjpiqbnqd8l2lisi"))))
(build-system r-build-system)
(propagated-inputs
(list r-curl
@@ -13047,8 +13848,8 @@ dependency on Java.")
r-haven
r-lifecycle
r-r-utils
+ r-readr
r-readxl
- r-stringi
r-tibble
r-writexl))
(native-inputs
@@ -13309,14 +14110,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
@@ -13506,13 +14307,13 @@ the source data frame.")
(define-public r-rapiclient
(package
(name "r-rapiclient")
- (version "0.1.3")
+ (version "0.1.6")
(source (origin
(method url-fetch)
(uri (cran-uri "rapiclient" version))
(sha256
(base32
- "1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"))))
+ "0kw09zgqz25xkiyl74qsi4l3shci6a0jpvqb6qr1fgzm6h97zdxj"))))
(properties `((upstream-name . "rapiclient")))
(build-system r-build-system)
(propagated-inputs
@@ -13728,14 +14529,14 @@ always locate the files relative to your project root.")
(define-public r-reticulate
(package
(name "r-reticulate")
- (version "1.36.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "reticulate" version))
(sha256
(base32
- "0bxxdcinpw76pwnx3a3hcqhq7gjvs4sxcza464vz333xq9s2337l"))))
+ "13favs31kzzff7ii0fxsdwvwb3iijasn2mg57ghcv8si4cz32byb"))))
(build-system r-build-system)
(arguments
(list
@@ -13874,14 +14675,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))
@@ -14186,14 +14987,14 @@ results to the user.")
(define-public r-hdf5r
(package
(name "r-hdf5r")
- (version "1.3.10")
+ (version "1.3.11")
(source
(origin
(method url-fetch)
(uri (cran-uri "hdf5r" version))
(sha256
(base32
- "0khj94z6ls6dnc6fpxwf1w93mk6f3z2p39mbihf0lz52jc36wjcj"))))
+ "1i58andd3k7ghmlv9f2frfa823p6lhdcwghyrszgmb3jpikxd5cp"))))
(build-system r-build-system)
(inputs
(list hdf5 zlib))
@@ -14317,14 +15118,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/")
@@ -14338,14 +15139,14 @@ functions.")
(define-public r-rjags
(package
(name "r-rjags")
- (version "4-15")
+ (version "4-16")
(source
(origin
(method url-fetch)
(uri (cran-uri "rjags" version))
(sha256
(base32
- "188qxyanny4yb1cq8hrz0y7pjafgvj0vhly0gaw271dam8glrk9m"))))
+ "1rz7qx5prkikrvfcj3ps0sxsj44kgpqairj4zwcn5qlsa4z3k79n"))))
(build-system r-build-system)
(propagated-inputs
(list r-coda))
@@ -14386,14 +15187,14 @@ implemented in bibutils.")
(define-public r-rdpack
(package
(name "r-rdpack")
- (version "2.6")
+ (version "2.6.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "Rdpack" version))
(sha256
(base32
- "02i21i85pb5aim529byjwhmyyz9jd82mi4j26a3kay0pcn6djxba"))))
+ "0igrmi0v17jsbfa770d6rcfnkjx6l2x3shskvjzhc5xbqjbn6qir"))))
(properties `((upstream-name . "Rdpack")))
(build-system r-build-system)
(propagated-inputs
@@ -14412,14 +15213,14 @@ references and Rd files.")
(define-public r-officer
(package
(name "r-officer")
- (version "0.6.5")
+ (version "0.6.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "officer" version))
(sha256
(base32
- "1lzpabpdrwx3331b9qn43376r25bzgph1j9gbxzqjhzr1h871cpb"))))
+ "04mlmq64gjdicdlai78iy28n8z64p3k4mnk4k381znlrj9x3zz7i"))))
(build-system r-build-system)
(propagated-inputs
(list r-openssl r-r6 r-ragg r-uuid r-xml2 r-zip))
@@ -14607,14 +15408,14 @@ parse and convert strings into cases like snake or camel among others.")
(define-public r-prediction
(package
(name "r-prediction")
- (version "0.3.14")
+ (version "0.3.18")
(source
(origin
(method url-fetch)
(uri (cran-uri "prediction" version))
(sha256
(base32
- "0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"))))
+ "194p2zbypslkd7slnvqw2z456xxwfzjxd11dirhpffjcsizkgrnh"))))
(build-system r-build-system)
(propagated-inputs
(list r-data-table))
@@ -14651,14 +15452,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.10")
+ (version "0.20.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "insight" version))
(sha256
(base32
- "0sh7pwnrlggizzpi0smpdq9fds2v8ql3bwdg4yxa2z2apaq3xk6y"))))
+ "1ckb25cbf6xg425fnkz86hxvmyrdkkl7889bkj73cg6d96c1h3mn"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -14705,17 +15506,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
@@ -14737,13 +15539,13 @@ tidyverse workflow.")
(define-public r-nodbi
(package
(name "r-nodbi")
- (version "0.10.4")
+ (version "0.10.6")
(source (origin
(method url-fetch)
(uri (cran-uri "nodbi" version))
(sha256
(base32
- "0q4nsxic1jlraipdc6zi711c3316n9wgq1cgbywhjlxb52qhkmd7"))))
+ "1kgn6c0s0gac38ip5z5sm56psg912b9hg3klsymazam9r76ddaqx"))))
(properties `((upstream-name . "nodbi")))
(build-system r-build-system)
(propagated-inputs
@@ -14817,14 +15619,14 @@ functions.")
(define-public r-flextable
(package
(name "r-flextable")
- (version "0.9.5")
+ (version "0.9.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "flextable" version))
(sha256
(base32
- "14mq27k7998405qwpdpxa1csbf5pdgzj9s892xm95bd4chnshdvw"))))
+ "0acjiwrm0qn0i0v4p0n279ldvlknqhb43mcar9c5s6r3xh5habi3"))))
(build-system r-build-system)
(propagated-inputs
(list r-data-table
@@ -14872,13 +15674,13 @@ libxlsxwriter.")
(define-public r-writexls
(package
(name "r-writexls")
- (version "6.5.0")
+ (version "6.7.0")
(source (origin
(method url-fetch)
(uri (cran-uri "WriteXLS" version))
(sha256
(base32
- "1rkc0r6l7cfz7h83i7gw6g0nlyy347mdh6bj73j0f8mdv3nmwwn4"))))
+ "0vr6h7jycwiic02krgz0ignzqhpi3vc9gsa5cykvg8wxdsfyyb6k"))))
(properties `((upstream-name . "WriteXLS")))
(build-system r-build-system)
(inputs (list perl))
@@ -14919,14 +15721,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/")
@@ -14942,13 +15744,13 @@ distribution).")
(define-public r-golem
(package
(name "r-golem")
- (version "0.4.1")
+ (version "0.5.0")
(source (origin
(method url-fetch)
(uri (cran-uri "golem" version))
(sha256
(base32
- "0pcvp2rmwzvl0wi73fp9pmjq1rrknq2h45sfvbjhmbz8ilvr8zpa"))))
+ "02n1pxqxqk0wzqsv20rn5r0gm7hb02k9x7n08bwmn4r940xynizx"))))
(properties `((upstream-name . "golem")))
(build-system r-build-system)
(propagated-inputs
@@ -15137,27 +15939,30 @@ the work.")
(define-public r-doby
(package
(name "r-doby")
- (version "4.6.20")
+ (version "4.6.22")
(source
(origin
(method url-fetch)
(uri (cran-uri "doBy" version))
(sha256
(base32
- "08nsl9xzyi2k7xkwa9mn91fn77ji0z9z5lm388pfdmydbfmpy2ks"))))
+ "038b1gs039br4xzv6axij2fzdzahmk718qm4akg77bwqvqvf59ra"))))
(properties `((upstream-name . "doBy")))
(build-system r-build-system)
(propagated-inputs
- (list r-broom
+ (list r-boot
+ r-broom
+ r-cowplot
r-deriv
r-dplyr
r-ggplot2
- r-magrittr
r-mass
r-matrix
r-microbenchmark
- r-pbkrtest
- r-tibble))
+ r-modelr
+ r-rlang
+ r-tibble
+ r-tidyr))
(native-inputs
(list r-knitr))
(home-page "https://people.math.aau.dk/~sorenh/software/doBy/")
@@ -15328,13 +16133,13 @@ the analyzed items.")
(define-public r-slam
(package
(name "r-slam")
- (version "0.1-50")
+ (version "0.1-52")
(source
(origin
(method url-fetch)
(uri (cran-uri "slam" version))
(sha256
- (base32 "1ggqcf8l1z2hpi7qy4mg0d2ps48bjjb8z1y1xz6fq162cqrbz6bq"))))
+ (base32 "09j1k63nw1m1vgblnla6s52v2337ixs958jmlzkjjz1xb01yd0y3"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/slam/")
(synopsis "Sparse lightweight arrays and matrices")
@@ -15343,6 +16148,27 @@ the analyzed items.")
based on index arrays and simple triplet representations, respectively.")
(license license:gpl2)))
+(define-public r-slanter
+ (package
+ (name "r-slanter")
+ (version "0.2-0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "slanter" version))
+ (sha256
+ (base32 "024dkman0r5qzc215gw0ds932vdaz8krrhv64fjw9pni37ixc3mf"))))
+ (properties `((upstream-name . "slanter")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-matrix r-pheatmap r-pracma))
+ (native-inputs (list r-knitr))
+ (home-page "https://cran.r-project.org/package=slanter")
+ (synopsis "Slanted matrices and ordered clustering")
+ (description
+ "This is a package for slanted matrices and ordered clustering for better
+visualization of similarity data.")
+ (license license:expat)))
+
(define-public r-manipulatewidget
(package
(name "r-manipulatewidget")
@@ -15752,14 +16578,14 @@ repeated measures data, respectively.")
(define-public r-gam
(package
(name "r-gam")
- (version "1.22-3")
+ (version "1.22-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "gam" version))
(sha256
(base32
- "153ig136i3dpy87f8v9f5055x94sl74fnrf5ivpa9fc67f76ikb6"))))
+ "0wy0ia8z9mah8lr4lsbv9sn5z31zbqhrhmk6a74nzfzfyl478hbq"))))
(properties `((upstream-name . "gam")))
(build-system r-build-system)
(propagated-inputs
@@ -15940,14 +16766,14 @@ subsequence} (LCS) using a dynamic programming algorithm.")
(define-public r-labelled
(package
(name "r-labelled")
- (version "2.12.0")
+ (version "2.13.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "labelled" version))
(sha256
(base32
- "1f6jh1mrbwb3v1kc49pb65sf5ffqs0h9vizpig4r5rhhv4n3q17y"))))
+ "0dx2zwympwlys8ndyfz2qki3xywz7sqxfkbd8y52zdj34fj84bly"))))
(properties `((upstream-name . "labelled")))
(build-system r-build-system)
(propagated-inputs
@@ -15957,6 +16783,7 @@ subsequence} (LCS) using a dynamic programming algorithm.")
r-rlang
r-stringr
r-tidyr
+ r-tidyselect
r-vctrs))
(native-inputs
(list r-knitr))
@@ -16658,14 +17485,14 @@ samples is large and the number of mixture components is not too large.")
(define-public r-magick
(package
(name "r-magick")
- (version "2.8.3")
+ (version "2.8.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "magick" version))
(sha256
(base32
- "0yf08ns5qgqi2bzvxvawip521ji2rgvvfrhj747zb6ci5qnm4awk"))))
+ "02pa6kkymj4idawnffqk2fn6zgkw33ib6541vclvg5hd1wvh7j25"))))
(properties
'((updater-extra-inputs . ("imagemagick"))))
(build-system r-build-system)
@@ -16727,14 +17554,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
@@ -16809,13 +17636,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
@@ -16986,16 +17813,16 @@ estimation problem.")
(define-public r-quickjsr
(package
(name "r-quickjsr")
- (version "1.1.3")
+ (version "1.3.1")
(source (origin
(method url-fetch)
(uri (cran-uri "QuickJSR" version))
(sha256
(base32
- "0ccp7dx2jhlarfn48jc0mhci5kkj0r3ibh6rjnxswvp3yg2x2bgd"))))
+ "1lcg437b93yvbk4q63m2sh8ih4p2b6505invmjbyqf58hip9sm8h"))))
(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
@@ -17208,14 +18035,14 @@ packages maintained by Torsten Hothorn.")
(define-public r-multcomp
(package
(name "r-multcomp")
- (version "1.4-25")
+ (version "1.4-26")
(source
(origin
(method url-fetch)
(uri (cran-uri "multcomp" version))
(sha256
(base32
- "10njzzxdi3jw5f419s7chcynxkzyqmmvzf7jk7ybdrwrlqhpiylx"))))
+ "1v3979my2yzpqc5lrx7fy72765j2cw1giv4xlpwrr2zvmzgvn051"))))
(build-system r-build-system)
(propagated-inputs
(list r-codetools r-mvtnorm r-sandwich r-survival r-th-data))
@@ -17253,14 +18080,14 @@ the differences were not significantly different.")
(define-public r-emmeans
(package
(name "r-emmeans")
- (version "1.10.1")
+ (version "1.10.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "emmeans" version))
(sha256
(base32
- "175az87aj2zrjsi94vvca612krbhry7yqq6l03ybq31jhj7vc2fa"))))
+ "1hywpa7kz6i77w2f9fq7gxbrx0ivrzb131hs92x9jkwqqlikcrb6"))))
(build-system r-build-system)
(propagated-inputs
(list r-estimability r-mvtnorm r-numderiv))
@@ -17390,14 +18217,14 @@ Bayesian modeling.")
(define-public r-tmb
(package
(name "r-tmb")
- (version "1.9.11")
+ (version "1.9.14")
(source
(origin
(method url-fetch)
(uri (cran-uri "TMB" version))
(sha256
(base32
- "07z9565rn64k3ysvcgq6s792qg1v102gd9in5ifigm140zc4l45j"))))
+ "1lvbjz9w8m6awww1vkzaw1qc4mmhlmdlk9s4qd5i0568zb15m72d"))))
(properties `((upstream-name . "TMB")))
(build-system r-build-system)
(propagated-inputs
@@ -17417,33 +18244,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
@@ -17495,14 +18305,14 @@ differentiation.")
(define-public r-bayestestr
(package
(name "r-bayestestr")
- (version "0.13.2")
+ (version "0.14.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "bayestestR" version))
(sha256
(base32
- "15xnmjay0s9kgaj25z43cxky4qcjn3gv8yd1x548jzbxzxxma07n"))))
+ "10280l86a2wrlqjj8zh55pznvgjzpdzv6h3krxgg0ka19ch983zs"))))
(properties `((upstream-name . "bayestestR")))
(build-system r-build-system)
(propagated-inputs
@@ -17522,14 +18332,14 @@ ROPE percentage and pd).")
(define-public r-performance
(package
(name "r-performance")
- (version "0.11.0")
+ (version "0.12.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "performance" version))
(sha256
(base32
- "03zs162lah8yv2x2q829ifc3jwy7m89r6md4ildjz8qmfjf0js82"))))
+ "0a20xnky7h6hgd6sk9n5jb4a2s201kr0cibhbii8i3jvnhz6cpmm"))))
(build-system r-build-system)
(propagated-inputs
(list r-bayestestr r-datawizard r-insight))
@@ -17548,14 +18358,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))
@@ -17576,14 +18386,14 @@ results using @code{ggplot2}.")
(define-public r-effectsize
(package
(name "r-effectsize")
- (version "0.8.7")
+ (version "0.8.9")
(source
(origin
(method url-fetch)
(uri (cran-uri "effectsize" version))
(sha256
(base32
- "07lfa0pvqhanjyyx9hs6gdqw1zyi1y21k539jgvgnrvixfilfkb2"))))
+ "12qzz3zl5yn28ybmmryhmi29zwzwrfgqhb6wm7aqg78id463bjz9"))))
(properties `((upstream-name . "effectsize")))
(build-system r-build-system)
(propagated-inputs
@@ -17622,13 +18432,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
@@ -17777,14 +18587,14 @@ repositories.")
(define-public r-fs
(package
(name "r-fs")
- (version "1.6.3")
+ (version "1.6.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "fs" version))
(sha256
(base32
- "0wgrq0vgaf9czjyzlxdmpy7swxcyd4mryks0gr5xk96pa0g0d0ps"))))
+ "1j2sx9zxz0qcgvim8mvvjrl0z2qbn2j4idsivx7zadmy5l7jj1ky"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -17857,14 +18667,14 @@ user credentials.")
(define-public r-gert
(package
(name "r-gert")
- (version "2.0.1")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "gert" version))
(sha256
(base32
- "14nh7j0xz1s4ngsd5n3hixr534z843a38y57grwqkkh9g21q9mqf"))))
+ "0r59xn1c7axicl137a1l2mq74gzw5m7pi2x69ppyfji83c27q0s2"))))
(properties `((upstream-name . "gert")))
(build-system r-build-system)
(inputs
@@ -17891,14 +18701,14 @@ User credentials are shared with command line git through the
(define-public r-usethis
(package
(name "r-usethis")
- (version "2.2.3")
+ (version "3.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "usethis" version))
(sha256
(base32
- "1cyy1k5iansg63ziph4w76kzl59dgmam7m2wp6sz9d93bjcrh34d"))))
+ "1dfcyxvw95lhm4giarsw266833sfbckk44nddjqpxqxarvwm1y4q"))))
(build-system r-build-system)
(propagated-inputs
(list r-cli
@@ -17977,14 +18787,14 @@ the code was copied over from @code{devtools}.")
(define-public r-xopen
(package
(name "r-xopen")
- (version "1.0.0")
+ (version "1.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "xopen" version))
(sha256
(base32
- "1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"))))
+ "1v4sna4md4cpqwi7802m4mfflgi506fxh78la0kam894qfw7icp3"))))
(build-system r-build-system)
(propagated-inputs
(list r-processx))
@@ -18469,14 +19279,14 @@ parallel calculations across cluster nodes.")
(define-public r-chk
(package
(name "r-chk")
- (version "0.9.1")
+ (version "0.9.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "chk" version))
(sha256
(base32
- "19q5ylkgrkdmnzg2df1lnrp2arbfzwfz4rbrr16j9ih2237kvd7r"))))
+ "0f6ilq9pbb6mgvclp6ksbaw8353wf114p1xqhlmkwgsfh2bg63xg"))))
(properties `((upstream-name . "chk")))
(build-system r-build-system)
(propagated-inputs
@@ -18597,14 +19407,14 @@ package provides a minimal R interface by relying on the Rcpp package.")
(define-public r-rcppparallel
(package
(name "r-rcppparallel")
- (version "5.1.7")
+ (version "5.1.9")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppParallel" version))
(sha256
(base32
- "175j0plh9gzy45sxsck0wdqfkjwdsbb17m9511czrgqsrswhxhzr"))
+ "0kqivaj5swpj46gdgrccn4pawldkprsiw0lwy874xgppy3rn227x"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/tbb/"))))
@@ -18631,14 +19441,14 @@ other values.")
(define-public r-ncdf4
(package
(name "r-ncdf4")
- (version "1.22")
+ (version "1.23")
(source
(origin
(method url-fetch)
(uri (cran-uri "ncdf4" version))
(sha256
(base32
- "040jpcgsb98s6knch0z3f3f5fpmlwks1grpvb9k8s02c9w0a5adr"))))
+ "12fsjjc769hw7fc08yglr3gaxp67s8qx1mbx91g61h4xyzlzw1cb"))))
(build-system r-build-system)
(inputs
(list netcdf zlib))
@@ -18679,13 +19489,13 @@ simulation of correlated data, and more.")
(define-public r-biocmanager
(package
(name "r-biocmanager")
- (version "1.30.22")
+ (version "1.30.24")
(source
(origin
(method url-fetch)
(uri (cran-uri "BiocManager" version))
(sha256
- (base32 "0dg86nbh9h77ypaarsd79df24j0vnlm2df4zcmbhfasnsv0ck2ak"))))
+ (base32 "1lf7bsamjgyxcrqiapqijhs1lv706sypi1ihrdvd9ns4n4xl4p34"))))
(properties `((upstream-name . "BiocManager")))
(build-system r-build-system)
(native-inputs
@@ -18999,14 +19809,14 @@ circular variables).")
(define-public r-ouch
(package
(name "r-ouch")
- (version "2.19")
+ (version "2.20")
(source
(origin
(method url-fetch)
(uri (cran-uri "ouch" version))
(sha256
(base32
- "15ryd76max77zwjlbijj4v7h42mscr4zqg8b01cq3gsr51l8bwkf"))))
+ "1r1nj4m2hw4gdaw596q14d6majcz15ppa0mfhfl8f791phcyarka"))))
(build-system r-build-system)
(propagated-inputs (list r-subplex))
(home-page "https://kingaa.github.io/ouch/")
@@ -19019,13 +19829,13 @@ for evolution along a phylogenetic tree.")
(define-public r-fmri
(package
(name "r-fmri")
- (version "1.9.12")
+ (version "1.9.12.1")
(source (origin
(method url-fetch)
(uri (cran-uri "fmri" version))
(sha256
(base32
- "1cv5mxcdpyf05n5pcjdawl59j7f4k40386r4m38qf15vcy45zdfq"))))
+ "0fyvnc39la5wgd9232nw6lp6yi1v3nkjwzn0sbhm4rckknibb5s4"))))
(properties `((upstream-name . "fmri")))
(build-system r-build-system)
(propagated-inputs (list r-aws r-metafor r-nlme r-oro-nifti))
@@ -19064,14 +19874,14 @@ related functions.")
(define-public r-stabledist
(package
(name "r-stabledist")
- (version "0.7-1")
+ (version "0.7-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "stabledist" version))
(sha256
(base32
- "0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"))))
+ "1mbgl6an18dzry55pvy08zdhj1gar5mlyvkfnlawiqyqq081frr6"))))
(build-system r-build-system)
(home-page "https://www.rmetrics.org")
(synopsis "Stable distribution functions")
@@ -19127,14 +19937,15 @@ Anderson-Darling Distribution\".")
(define-public r-adimpro
(package
(name "r-adimpro")
- (version "0.9.6")
+ (version "0.9.7")
(source (origin
(method url-fetch)
(uri (cran-uri "adimpro" version))
(sha256
(base32
- "0d5viz9ayywpp1pas1yzmhllzn9rjrl8a3k7bj7h46f95l5x1586"))))
- (properties `((upstream-name . "adimpro")))
+ "1p34q78w1ib5xjvxg4c1bal680a55l5dqhiry367x9nzwq8a352c"))))
+ (properties `((upstream-name . "adimpro")
+ (updater-extra-propagated-inputs . ("imagemagick"))))
(build-system r-build-system)
(propagated-inputs
(list r-awsmethods
@@ -19352,14 +20163,14 @@ in-memory raw vectors.")
(define-public r-nlp
(package
(name "r-nlp")
- (version "0.2-1")
+ (version "0.3-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "NLP" version))
(sha256
(base32
- "1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5"))))
+ "1v5kszwj56hdyd07ya9p0caxrd4ckpa1x6d0y6d1xrsi074638n0"))))
(properties `((upstream-name . "NLP")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/NLP/")
@@ -19372,14 +20183,14 @@ Processing.")
(define-public r-tm
(package
(name "r-tm")
- (version "0.7-13")
+ (version "0.7-14")
(source
(origin
(method url-fetch)
(uri (cran-uri "tm" version))
(sha256
(base32
- "1d0xczmmfsj82183nygvb4f9h1qbydz763b3jlzxb6ns8pi6q9p5"))))
+ "103n9m9vh1s1fn2wlab5qm4i1dx4wq0ffl7v69mwa6mvdklfw7ks"))))
(properties `((upstream-name . "tm")))
(build-system r-build-system)
(propagated-inputs
@@ -19428,17 +20239,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
@@ -19718,18 +20529,19 @@ large datasets (> 100,000 samples) very efficiently.")
(define-public r-qlcmatrix
(package
(name "r-qlcmatrix")
- (version "0.9.7")
+ (version "0.9.8")
(source
(origin
(method url-fetch)
(uri (cran-uri "qlcMatrix" version))
(sha256
(base32
- "0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"))))
+ "0d38jb653787s05g8syc9wgaljaifmkviijwz5rzcd881glgs8sv"))))
(properties `((upstream-name . "qlcMatrix")))
(build-system r-build-system)
(propagated-inputs
(list r-docopt r-matrix r-slam r-sparsesvd))
+ (native-inputs (list r-knitr r-rmarkdown))
(home-page "https://cran.r-project.org/web/packages/qlcMatrix")
(synopsis "Sparse matrix functions for quantitative language comparison")
(description
@@ -19742,13 +20554,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
@@ -19819,20 +20631,20 @@ definiteness of a matrix.")
(define-public r-rspectra
(package
(name "r-rspectra")
- (version "0.16-1")
+ (version "0.16-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "RSpectra" version))
(sha256
(base32
- "16ij84wgpsmqmnxqiii8dgihy3bfxazry9znmckhwzba7m0d79fb"))))
+ "0zma49ah0sycjdx95m8mac21daa7p3gp9cg1mffygzhrjpblkwd2"))))
(properties `((upstream-name . "RSpectra")))
(build-system r-build-system)
(propagated-inputs
(list r-matrix r-rcpp r-rcppeigen))
(native-inputs
- (list r-knitr))
+ (list r-knitr r-rmarkdown))
(home-page "https://github.com/yixuan/RSpectra")
(synopsis "Solvers for large-scale Eigenvalue and SVD problems")
(description
@@ -20105,14 +20917,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))
@@ -20216,13 +21028,13 @@ handling.")
(define-public r-gridpattern
(package
(name "r-gridpattern")
- (version "1.1.1")
+ (version "1.2.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "gridpattern" version))
(sha256
- (base32 "1v7xfgbnrr4v3arr7nm0663aywn47xb89sd0rn9s9dcz7r50aa2i"))))
+ (base32 "1fa787m4ns3s7xnai1kqplz32nhy4pa1v6w7kzyjv9qlyfhvrw92"))))
(properties `((upstream-name . "gridpattern")))
(build-system r-build-system)
(propagated-inputs
@@ -20294,14 +21106,14 @@ PostScript pictures in R plots.")
(define-public r-grimport2
(package
(name "r-grimport2")
- (version "0.3-1")
+ (version "0.3-3")
(source
(origin
(method url-fetch)
(uri (cran-uri "grImport2" version))
(sha256
(base32
- "1lj58z6yc2p6ns27fkgh11ac90bcihi65hf62gxpsylcn5dilsi1"))))
+ "11glz1yi76235x3di9r7nny0nfcisk12acc4xsm4m2d9ingjh4pn"))))
(properties `((upstream-name . "grImport2")))
(build-system r-build-system)
(propagated-inputs
@@ -20510,14 +21322,14 @@ Emphasis is always given to methods for visualizing the data.")
(define-public r-pixmap
(package
(name "r-pixmap")
- (version "0.4-12")
+ (version "0.4-13")
(source
(origin
(method url-fetch)
(uri (cran-uri "pixmap" version))
(sha256
(base32
- "1v1a1adsgh5jlvvi98j4nhb1h681s97ip76zdrga12rlsjaahfw9"))))
+ "04g74v8g9r0f3czzk4r3n0wxyg7ldgfdlh21bas7axa9l10wdnz3"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/pixmap")
(synopsis "Tools for bitmap images")
@@ -20637,14 +21449,14 @@ preparing, executing, and processing HTTP requests.")
(define-public r-gmp
(package
(name "r-gmp")
- (version "0.7-4")
+ (version "0.7-5")
(source
(origin
(method url-fetch)
(uri (cran-uri "gmp" version))
(sha256
(base32
- "069r0m0jwhwaknnd1vmp3pxcbxrnfgsbhw2ivc8rqqfjfw7v9mm7"))))
+ "0y6f2fdpydjcf1iz75xnjln3gzwpc1njls0n9y923naczfdazkgm"))))
(properties
'((updater-extra-inputs . ("gmp"))))
(build-system r-build-system)
@@ -21171,13 +21983,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))
@@ -21611,13 +22423,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))
@@ -21659,14 +22471,14 @@ model with finite state space using the Aalen-Johansen estimator.")
(define-public r-epi
(package
(name "r-epi")
- (version "2.48")
+ (version "2.53")
(source
(origin
(method url-fetch)
(uri (cran-uri "Epi" version))
(sha256
(base32
- "06965d2x47hb1c7dbqyhhywgr7k9xdcms1v08m2cx52qg6cdkiyp"))))
+ "1ndyvj24j7b85l5rdldnb6ngkyv7x08jnc11nbjsbh5mn7swg4qi"))))
(properties `((upstream-name . "Epi")))
(build-system r-build-system)
(propagated-inputs
@@ -21840,14 +22652,14 @@ them in distributed compute environments.")
(define-public r-parallelly
(package
(name "r-parallelly")
- (version "1.37.1")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "parallelly" version))
(sha256
(base32
- "189ngbh9i6mqmfn4z6446in7687ddlpdq6v5rj3hr8zqinqlwznz"))))
+ "1ani63idvsx2apg3q2h9smi3sx7wbwpwpwjz585q9fyichy84b33"))))
(properties `((upstream-name . "parallelly")))
(build-system r-build-system)
(home-page "https://github.com/HenrikBengtsson/parallelly")
@@ -21868,14 +22680,14 @@ port-forwarding to your local computer.")
(define-public r-future
(package
(name "r-future")
- (version "1.33.2")
+ (version "1.34.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "future" version))
(sha256
(base32
- "0rma4h9rjy28n7csn748v9b83m2v5hyh0hgwwckfpbnd5331m9xm"))))
+ "0pgs5n5pqqr3jg71nswjrl5did9bxg0m0z3sn8c1pswb3zyx8faq"))))
(build-system r-build-system)
(arguments
`(#:phases
@@ -22589,21 +23401,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")
@@ -22706,14 +23521,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))
@@ -22728,14 +23543,14 @@ latent growth curve models.")
(define-public r-nonnest2
(package
(name "r-nonnest2")
- (version "0.5-6")
+ (version "0.5-7")
(source
(origin
(method url-fetch)
(uri (cran-uri "nonnest2" version))
(sha256
(base32
- "1s31a03c148azvc20ihmz8vhzgs7a3r0nxzf806zsr5j1zsl94dm"))))
+ "0gnv538wskgyp6v08b0grz76mfpc1qlbp0r5w19b9lrv9d3c4h74"))))
(build-system r-build-system)
(propagated-inputs
(list r-compquadform r-lavaan r-mvtnorm r-sandwich))
@@ -22992,14 +23807,14 @@ network.")
(define-public r-apcluster
(package
(name "r-apcluster")
- (version "1.4.12")
+ (version "1.4.13")
(source
(origin
(method url-fetch)
(uri (cran-uri "apcluster" version))
(sha256
(base32
- "01s4s2dr94ycbaadmvmlczldhyqspbbpy0s4d9k5xxdmlagfwzc5"))))
+ "19x1sma5pli5jl0v92c6x7jbqkigz7waaghaxi29kvvx8am5p5sy"))))
(build-system r-build-system)
(propagated-inputs
(list r-matrix r-rcpp))
@@ -23149,13 +23964,13 @@ extensions.")
(define-public r-wgaim
(package
(name "r-wgaim")
- (version "2.0-1")
+ (version "2.0-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "wgaim" version))
(sha256
- (base32 "1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"))))
+ (base32 "0i13ngp0z0l72jbzdpydp3pigggmp4bn9jfyzjkbzj2fhfixsqf0"))))
(build-system r-build-system)
(propagated-inputs
(list r-ggplot2 r-qtl))
@@ -23424,13 +24239,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))
@@ -23493,6 +24308,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")
@@ -23520,14 +24370,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
@@ -23596,14 +24446,14 @@ tessellation.")
(define-public r-wk
(package
(name "r-wk")
- (version "0.9.1")
+ (version "0.9.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "wk" version))
(sha256
(base32
- "0yxzyb09by9winspdn0585xhjmdcablb07wx6pf7ahg0q18sz85p"))))
+ "1y75hdg1p1h6pja3zxpllmbvzqlh67n5z9d3d6zhknxfkgfmwrrk"))))
(properties `((upstream-name . "wk")))
(build-system r-build-system)
(home-page "https://paleolimbot.github.io/wk/")
@@ -23620,14 +24470,14 @@ high-performance functions are provided here.")
(define-public r-s2
(package
(name "r-s2")
- (version "1.1.6")
+ (version "1.1.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "s2" version))
(sha256
(base32
- "0rm0jd5k5w725v1bnn6ix8vic40grdh61y6qdy8jy4lhg1mjx78x"))))
+ "0y38g1zy19m7xsipns3m6avmjb9vnyw683nmlgsf4wnxa1qjqxih"))))
(properties `((upstream-name . "s2")))
(build-system r-build-system)
(arguments
@@ -23644,7 +24494,7 @@ high-performance functions are provided here.")
(propagated-inputs
(list r-rcpp r-wk))
(inputs
- (list openssl))
+ (list openssl zlib))
(native-inputs
(list pkg-config))
(home-page "https://r-spatial.github.io/s2/")
@@ -23699,6 +24549,49 @@ datum transformations.")
;; Either of these licenses
(license (list license:gpl2 license:expat))))
+(define-public r-sfd
+ (package
+ (name "r-sfd")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "sfd" version))
+ (sha256
+ (base32 "0zffbjzdzgvz7vj1wn7j7sqmnsvskkn94w7lkjxmaahd62xdh6v3"))))
+ (properties `((upstream-name . "sfd")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-cli r-rlang r-tibble))
+ (home-page "https://cran.r-project.org/package=sfd")
+ (synopsis "Space-Filling Design Library")
+ (description
+ "This package provides a collection of pre-optimized space-filling
+designs, for up to ten parameters, is contained here. Functions are provided
+to access designs described by Husslage et al (2011) and Wang and Fang (2005).
+The design types included are Audze-Eglais, MaxiMin, and uniform.")
+ (license license:expat)))
+
+(define-public r-sfheaders
+ (package
+ (name "r-sfheaders")
+ (version "0.4.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "sfheaders" version))
+ (sha256
+ (base32 "01xxp7lpf333djs0lifnnhk5akv8prk0r5mq0ilynyyhn5kzwpzn"))))
+ (properties `((upstream-name . "sfheaders")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-geometries r-rcpp))
+ (home-page "https://dcooley.github.io/sfheaders/")
+ (synopsis "Converts between R objects and Simple Feature objects")
+ (description
+ "This package converts between R and Simple Feature @code{sf} objects,
+without depending on the Simple Feature library. Conversion functions are
+available at both the R level, and through Rcpp.")
+ (license license:expat)))
+
(define-public r-sftime
(package
(name "r-sftime")
@@ -23726,13 +24619,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"
@@ -23881,13 +24774,13 @@ either PDF/EPS files.")
(define-public r-polspline
(package
(name "r-polspline")
- (version "1.1.24")
+ (version "1.1.25")
(source
(origin
(method url-fetch)
(uri (cran-uri "polspline" version))
(sha256
- (base32 "0mal78f79jl6cj02xabv9vqf88m4iiadmgiv3qliv117cxkc6hb6"))))
+ (base32 "18wv3v76y4xdlrz7qdp6amr0ynhyqbja1rjqmbz0lc12v56gqhr9"))))
(build-system r-build-system)
(native-inputs (list gfortran))
(home-page "https://cran.r-project.org/web/packages/polspline/")
@@ -23901,13 +24794,13 @@ lspec, polyclass, and polymars.")
(define-public r-rms
(package
(name "r-rms")
- (version "6.8-0")
+ (version "6.8-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "rms" version))
(sha256
- (base32 "1cd6m6i2ild2f2x9rkyd2aqb33q3xy0596bs3dnvr2mnh5fcar5d"))))
+ (base32 "0zz4vdxbzvg5jc5ri0vrd676hn0x98fxmarpy5h6hywv5rqwmrw3"))))
(build-system r-build-system)
(propagated-inputs
(list r-cluster
@@ -24148,13 +25041,13 @@ SELECT or UPDATE queries to an end-point.")
(define-public r-bookdown
(package
(name "r-bookdown")
- (version "0.39")
+ (version "0.40")
(source (origin
(method url-fetch)
(uri (cran-uri "bookdown" version))
(sha256
(base32
- "1brfv50lq92m7d4d18n92ywhfr28lrbq02naf0bwdsmd0ngasxrm"))
+ "0fdciqazvsmc34hqfiqlmldigxn8gw546kkz74mc9dh48w24mpsq"))
;; TODO: there is one more file to replace:
;; inst/resources/gitbook/js/app.min.js
(snippet
@@ -24242,13 +25135,13 @@ authoring books and technical documents with R Markdown.")
(define-public r-options
(package
(name "r-options")
- (version "0.1.0")
+ (version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "options" version))
(sha256
- (base32 "0pprbp2pxvgh120f8dahswws44gpdm4f4nlq3h3nvqrlhnspwnb8"))))
+ (base32 "02qnbipdmnw01f40300pg1ycrcbnr37f8yiqbabm6jznf6r4ihm9"))))
(properties `((upstream-name . "options")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -24287,13 +25180,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))
@@ -24309,13 +25202,13 @@ multipliers. See <arXiv:1711.08013> for details.")
(define-public r-kernlab
(package
(name "r-kernlab")
- (version "0.9-32")
+ (version "0.9-33")
(source
(origin
(method url-fetch)
(uri (cran-uri "kernlab" version))
(sha256
- (base32 "1p3gbn9qgc6yqx9irkl8c23khvkx77jl96hk9hn4vsrx6i7g6kk5"))))
+ (base32 "0q9hvnams1cjjrx7hny0sjszqqg837pgn642nsdwhqipdmypih3h"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/kernlab")
(synopsis "Kernel-based machine learning tools")
@@ -24398,14 +25291,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")
@@ -24697,14 +25590,14 @@ consists of @code{grid} grobs and viewports that can then be manipulated with
(define-public r-farver
(package
(name "r-farver")
- (version "2.1.1")
+ (version "2.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "farver" version))
(sha256
(base32
- "1klnr73fhm7n46q85in1v9gi99y6rcdzzg4h4wvnbx23lxndmkqd"))))
+ "09gy2wmm3jp2k3q6zbmjl6z55a974221q7vi6xhmdd5abnwj722j"))))
(build-system r-build-system)
(home-page "https://github.com/thomasp85/farver")
(synopsis "Vectorized color conversion and comparison")
@@ -24721,18 +25614,18 @@ package.")
(define-public r-yulab-utils
(package
(name "r-yulab-utils")
- (version "0.1.4")
+ (version "0.1.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "yulab.utils" version))
(sha256
(base32
- "0m1iip6w711z92y6qw0rc0flxl9bzj85vrhm2q2rqjz9pyqf3m1j"))))
+ "0q2zjhvn4s17s098lacfp94v0v8qm5479v8al0c05r1dx3x0mkq3"))))
(properties `((upstream-name . "yulab.utils")))
(build-system r-build-system)
(propagated-inputs
- (list r-cli r-digest r-fs r-memoise r-rlang))
+ (list r-cli r-digest r-fs r-rlang))
(home-page "https://cran.r-project.org/package=yulab.utils")
(synopsis "Supporting functions for packages maintained by YuLab-SMU")
(description
@@ -24826,14 +25719,14 @@ color.")
(define-public r-polyclip
(package
(name "r-polyclip")
- (version "1.10-6")
+ (version "1.10-7")
(source
(origin
(method url-fetch)
(uri (cran-uri "polyclip" version))
(sha256
(base32
- "0qwb5w1ishbhg1nhdp8985ddvcs7ljdyrbv059hx576xmgni6brw"))))
+ "1lshalmhdaw0g0hzfy2qwid282pq3kwzy4jz1hf73xmjlp1sm3pm"))))
(build-system r-build-system)
(native-inputs (list pkg-config))
(home-page "http://www.angusj.com/delphi/clipper.php")
@@ -25095,18 +25988,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
@@ -25216,14 +26108,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))
@@ -25308,14 +26200,14 @@ using the three.js visualization library.")
(define-public r-mlbench
(package
(name "r-mlbench")
- (version "2.1-3.1")
+ (version "2.1-5")
(source
(origin
(method url-fetch)
(uri (cran-uri "mlbench" version))
(sha256
(base32
- "1w2w7nkrp69c0di0lss82jf4fbxdpqwxzqa2lrp55av8i7awdzks"))))
+ "0vz7r4f0d0k7i9dx3r7gz8i7rs9f7b96qfjdajphqz6smm9ddgsd"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/mlbench/")
(synopsis "Machine learning benchmark problems")
@@ -25396,18 +26288,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")
@@ -25734,14 +26626,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
@@ -25759,14 +26651,14 @@ matched.")
(define-public r-ggnewscale
(package
(name "r-ggnewscale")
- (version "0.4.10")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggnewscale" version))
(sha256
(base32
- "1j8d512qhdlhfp3hb36d1dqlqlxs0i303mnn31xnq1adcwwibmlz"))))
+ "0bfzqjaxg5r9qzi6hav0m6rcw1cr90h8pwwjklbv930finrxrw5p"))))
(properties `((upstream-name . "ggnewscale")))
(build-system r-build-system)
(propagated-inputs
@@ -25805,14 +26697,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 "17.0.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "arrow" version))
(sha256
(base32
- "070pp0p5h1ij7pg34l5grrx4vwfihagnvnk4kj7l3w0gh8y88ibz"))))
+ "0pp7rllpmdwsx0idqhfg4lv96cvdj6pbnypnlrr835jqv7sxn502"))))
(properties `((upstream-name . "arrow")))
(build-system r-build-system)
(inputs
@@ -25920,14 +26812,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
@@ -25989,14 +26881,14 @@ multicore machines.")
(define-public r-mcmcpack
(package
(name "r-mcmcpack")
- (version "1.7-0")
+ (version "1.7-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "MCMCpack" version))
(sha256
(base32
- "1vsx0hs8v0928lhkf2jhwc2cwq7bdb5iciibkbfc2zh123bp6q44"))))
+ "0ac5nllnsdbvbf0l578dab1i24q3kxr0dpkch8w7q694cds4c2rv"))))
(properties `((upstream-name . "MCMCpack")))
(build-system r-build-system)
(propagated-inputs
@@ -26379,14 +27271,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))
@@ -26475,14 +27367,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
@@ -26742,14 +27634,14 @@ the current document.")
(define-public r-xgboost
(package
(name "r-xgboost")
- (version "1.7.7.1")
+ (version "1.7.8.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "xgboost" version))
(sha256
(base32
- "08wpxr8jkzsqb5zaw43bmq5r7k3jnb1ibjkliwh2ffjq7b7jr4gp"))))
+ "1s8vpj0rwyvzq6q4bby0szxwsj34z26mkrm7qx4pbs9g1g86yk9r"))))
(build-system r-build-system)
(propagated-inputs
(list r-data-table r-jsonlite r-matrix))
@@ -27090,14 +27982,14 @@ OpenMP.")
(define-public r-lda
(package
(name "r-lda")
- (version "1.4.2")
+ (version "1.5.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "lda" version))
(sha256
(base32
- "03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"))))
+ "1m0g2mz7rhjsp6pm784qjngzrb6kp69zjb85fflm48q0drw59lwm"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/lda/")
(synopsis "Collapsed Gibbs sampling methods for topic models")
@@ -27438,18 +28330,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
@@ -27493,14 +28385,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
@@ -27619,14 +28511,14 @@ in pipelines.")
(define-public r-parameters
(package
(name "r-parameters")
- (version "0.21.6")
+ (version "0.22.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "parameters" version))
(sha256
(base32
- "004ld3m9qdq3bwl8qmp3h700kzqlgbmgz739d7fpiqgrs0s2gv83"))))
+ "0axyl6iwa0x6yk340g5943v1d1q023z63smxf0j6033mdikf3xm4"))))
(properties `((upstream-name . "parameters")))
(build-system r-build-system)
(propagated-inputs
@@ -27860,14 +28752,14 @@ porting.")
(define-public r-subplex
(package
(name "r-subplex")
- (version "1.8")
+ (version "1.9")
(source
(origin
(method url-fetch)
(uri (cran-uri "subplex" version))
(sha256
(base32
- "19g5bd39gmcn27xdsklkzxg99x1r5v5q8zcw1iwry31qj24ivhrv"))))
+ "1dv9bpwm7ml662yrc2jnrjf4f8n1g5rfiipq6z0fx9j6pa6fma87"))))
(build-system r-build-system)
(native-inputs
(list gfortran))
@@ -28882,14 +29774,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))
@@ -30356,14 +31248,14 @@ number embedded in the file rather than the file extension.")
(define-public r-imager
(package
(name "r-imager")
- (version "0.45.8")
+ (version "1.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "imager" version))
(sha256
(base32
- "0vrv7m9b9w8xjqa9w17xvrmpl403476zr0l9wqdp9ir6ssvnaf2f"))))
+ "0sjn3ig5p020gml200cy5bdbrbql7qv1fqhhzjpcbmhprf39113w"))))
(properties `((upstream-name . "imager")))
(build-system r-build-system)
(inputs
@@ -30449,23 +31341,22 @@ classification and regression models.")
(define-public r-caretensemble
(package
(name "r-caretensemble")
- (version "2.0.3")
+ (version "4.0.0")
(source (origin
(method url-fetch)
(uri (cran-uri "caretEnsemble" version))
(sha256
(base32
- "14d318czpqpalf18ggd9mx6f4nz3r4zilljvgxzy2a8v450y96ch"))))
+ "0hwgr7n2sahs3zlvrnhnk6yfmqpmphkl4xii8aa2x1yjgx3ssxwi"))))
(properties `((upstream-name . "caretEnsemble")))
(build-system r-build-system)
(propagated-inputs (list r-caret
r-data-table
- r-digest
r-ggplot2
- r-gridextra
r-lattice
+ r-patchwork
r-pbapply
- r-plyr))
+ r-rlang))
(native-inputs (list r-knitr))
(home-page "https://github.com/zachmayer/caretEnsemble")
(synopsis "Ensembles of caret models")
@@ -30587,17 +31478,41 @@ and multivariate regression), and analysis of variance tolerance intervals.
Visualizations are also available for most of these settings.")
(license license:gpl2+)))
+(define-public r-topdom
+ (package
+ (name "r-topdom")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "TopDom" version))
+ (sha256
+ (base32 "1rryfnwvdlpdrjgs6sciy91cxfp4jykll0swclasydjvj4n642i6"))))
+ (properties `((upstream-name . "TopDom")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-ggplot2 r-matrixstats r-reshape2 r-tibble))
+ (home-page "https://github.com/HenrikBengtsson/TopDom")
+ (synopsis "Efficient method for identifying genomic topological domains")
+ (description
+ "This method identifies topological domains in genomes from Hi-C sequence
+data. The authors published an implementation of their method as an R script.
+This package originates from those original @code{TopDom} R scripts and
+provides help pages adopted from the original @code{TopDom} PDF documentation.
+It also provides a small number of bug fixes to the original code.")
+ ;; Either version of the GPL
+ (license (list license:gpl2 license:gpl3))))
+
;; Keep this in sync with the liblantern package.
(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
@@ -30650,14 +31565,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)
@@ -30672,14 +31587,14 @@ Johnson-Graybill, LBI, Tusell and modified Tukey non-additivity tests.")
(define-public r-flexclust
(package
(name "r-flexclust")
- (version "1.4-1")
+ (version "1.4-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "flexclust" version))
(sha256
(base32
- "13akk3w6a76jpws5v9108c3hdmb8i6gm0sc06lr2hqly0pgpfyfn"))))
+ "0massgyn8vdzp40dz5l02qqzjynw1lgyw9psvb792q73j7b20iqc"))))
(properties `((upstream-name . "flexclust")))
(build-system r-build-system)
(propagated-inputs
@@ -31148,14 +32063,14 @@ Langford (2006) @url{doi:10.1145/1143844.1143857}.")
(define-public r-poibin
(package
(name "r-poibin")
- (version "1.5")
+ (version "1.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "poibin" version))
(sha256
(base32
- "1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"))))
+ "1y5wxpvp3nxn57lgnkmd92n2y5y5dh5mhk62kcv8dbly1gnpkl0a"))))
(properties `((upstream-name . "poibin")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/poibin/")
@@ -31220,19 +32135,19 @@ problems (food web problems, linear programming problems).")
(define-public r-shinycssloaders
(package
(name "r-shinycssloaders")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "shinycssloaders" version))
(sha256
(base32
- "0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl"))))
+ "0w7gw81j5d2dvjdk49dd222bqd40ll3sl8mykg68vcz64ihdg2h3"))))
(properties
`((upstream-name . "shinycssloaders")))
(build-system r-build-system)
(propagated-inputs
- (list r-digest r-glue r-shiny))
+ (list r-digest r-glue r-htmltools r-shiny))
(home-page "https://github.com/andrewsali/shinycssloaders")
(synopsis "Add CSS loading animations to Shiny outputs")
(description
@@ -31558,14 +32473,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
@@ -31581,6 +32496,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
@@ -31812,14 +32728,14 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.")
(define-public r-quanteda
(package
(name "r-quanteda")
- (version "4.0.1")
+ (version "4.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "quanteda" version))
(sha256
(base32
- "0m0iw7vm9v7dcrh9yd56kr0vagas1czqgbn2ybyxg86nwcrl73qq"))))
+ "1s046p3bnf36z2mqh5ijirq7jygqj5clal3r0l3f89gr0466a75j"))))
(properties `((upstream-name . "quanteda")))
(build-system r-build-system)
(propagated-inputs
@@ -31853,14 +32769,14 @@ machine learning, visually representing text and text analyses, and more.")
(define-public r-topicmodels
(package
(name "r-topicmodels")
- (version "0.2-16")
+ (version "0.2-17")
(source
(origin
(method url-fetch)
(uri (cran-uri "topicmodels" version))
(sha256
(base32
- "01g9avk0ldqnz15n8112vad31c1n7r6rih5dh6x3383vvmjrqp0d"))))
+ "138nsmwgg3npk3i78xagpm6fw1g4ixmikan1jmv3066kymgy2rrq"))))
(properties
'((upstream-name . "topicmodels")
(updater-extra-inputs . ("gsl"))))
@@ -32153,14 +33069,14 @@ perform @dfn{exploratory mediation} (XMed).")
(define-public r-stanheaders
(package
(name "r-stanheaders")
- (version "2.32.6")
+ (version "2.32.10")
(source
(origin
(method url-fetch)
(uri (cran-uri "StanHeaders" version))
(sha256
(base32
- "18p1rch5ipj0f4jdvr8mnlk8pg1l4njjj4cgbp7ni7kcngsn3049"))))
+ "10l523sckx3jis5x1zw99iqy9hihjmngmcjq484bgin4gn6mn4n3"))))
(properties `((upstream-name . "StanHeaders")))
(build-system r-build-system)
(inputs (list pandoc))
@@ -32219,14 +33135,14 @@ Complete access to optimized C functions is made available with
(define-public r-openmx
(package
(name "r-openmx")
- (version "2.21.11")
+ (version "2.21.12")
(source
(origin
(method url-fetch)
(uri (cran-uri "OpenMx" version))
(sha256
(base32
- "1k3i82higil43w4pryg1ghpswa8vxmc28dcv60gvkmmjrnwp098m"))))
+ "13jgm9ps4ak30ri61az8c5w4j36k77dq4gsbc0v66ydx3ciyf1n7"))))
(properties `((upstream-name . "OpenMx")))
(build-system r-build-system)
(propagated-inputs
@@ -32326,14 +33242,14 @@ output in R.")
(define-public r-bdgraph
(package
(name "r-bdgraph")
- (version "2.72")
+ (version "2.73")
(source
(origin
(method url-fetch)
(uri (cran-uri "BDgraph" version))
(sha256
(base32
- "1kc3icd7glivbjlhl9fbmxqza5w2x000w0w8ii8np9gjrhdwrybw"))))
+ "0bf1y35rc96l09pb4fyb693wkl20pyvmqav1rw2h3h8pyyvqkalh"))))
(properties `((upstream-name . "BDgraph")))
(build-system r-build-system)
(propagated-inputs
@@ -32726,14 +33642,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
@@ -32750,7 +33666,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
@@ -32906,13 +33822,13 @@ recommendations for developers.")
(define-public r-loo
(package
(name "r-loo")
- (version "2.7.0")
+ (version "2.8.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "loo" version))
(sha256
- (base32 "0dnbbflglm7b29vr11rfrawnys9s3rl4h00h6xh9smjyalqz6r3n"))))
+ (base32 "0k14cf4mmviwslq931n5l1glalmsdsm7v3hq0m80w71fbaljgdxa"))))
(properties `((upstream-name . "loo")))
(build-system r-build-system)
(inputs
@@ -33986,14 +34902,14 @@ including means, variances, intervals, and highest density regions.")
(define-public r-posterior
(package
(name "r-posterior")
- (version "1.5.0")
+ (version "1.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "posterior" version))
(sha256
(base32
- "1pp233ddrs116w1rmp3khhmibjf6l021b1x79k6z48g3r9zk042a"))))
+ "037l1cav2vglcd2pgp8n89apfpsb3822mhzmdsxf7a0mzcwjlq9l"))))
(properties `((upstream-name . "posterior")))
(build-system r-build-system)
(propagated-inputs
@@ -34087,14 +35003,14 @@ with posterior predictive checks and leave-one-out cross-validation.")
(define-public r-mstate
(package
(name "r-mstate")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "mstate" version))
(sha256
(base32
- "054dzrd5b0xjjjl7862q3aq1jwgrxbkqz7zpvbdirqsld3zksirw"))))
+ "0vxfayp9d21hgihrb3bfn04y76qgvqx0mcwbw5w6izpbqcwxlcw5"))))
(properties `((upstream-name . "mstate")))
(build-system r-build-system)
(propagated-inputs
@@ -34119,14 +35035,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
@@ -34289,14 +35205,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
@@ -34319,14 +35235,14 @@ input.")
(define-public r-lightgbm
(package
(name "r-lightgbm")
- (version "4.3.0")
+ (version "4.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "lightgbm" version))
(sha256
(base32
- "1kk2jj7d1adqi9x1q3jij7fy8h9vc6bvzcz7jhi4bd9cybw8gpnh"))))
+ "1bnyhwmmsacl0g1hhgjzdfh2kdxjqfm0r7cs5nz8vk1nrwyck02r"))))
(properties `((upstream-name . "lightgbm")))
(build-system r-build-system)
(propagated-inputs
@@ -34678,14 +35594,14 @@ simple interface for all functions.")
(define-public r-iml
(package
(name "r-iml")
- (version "0.11.2")
+ (version "0.11.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "iml" version))
(sha256
(base32
- "1sjv0cj50iivjlb2hri401z78rmidxxh6q5akscd42k98jyw2r30"))))
+ "1d0p41byqpw7niyyyqcj00y43dmhqrm2csmbarcy8mz7n0i1842b"))))
(properties `((upstream-name . "iml")))
(build-system r-build-system)
(propagated-inputs
@@ -34764,13 +35680,13 @@ diagonals. This package allows you to compute the tensor product of arrays.")
(define-public r-spatstat-explore
(package
(name "r-spatstat-explore")
- (version "3.2-7")
+ (version "3.3-2")
(source (origin
(method url-fetch)
(uri (cran-uri "spatstat.explore" version))
(sha256
(base32
- "08740yclqv86mnds0a8xhn6r2qdqhw4qgkbrb2cl93crqwcdkr2f"))))
+ "1vc5pzkngn44kc4p5ia6ldgk8hxbymbmzfybil7z5wl69b92fj52"))))
(properties `((upstream-name . "spatstat.explore")))
(build-system r-build-system)
(propagated-inputs
@@ -34782,6 +35698,7 @@ diagonals. This package allows you to compute the tensor product of arrays.")
r-spatstat-geom
r-spatstat-random
r-spatstat-sparse
+ r-spatstat-univar
r-spatstat-utils))
(home-page "https://spatstat.org/")
(synopsis "Exploratory data analysis for the spatstat family")
@@ -34804,13 +35721,13 @@ Kolmogorov-Smirnov, ANOVA) are also supported.")
(define-public r-spatstat-model
(package
(name "r-spatstat-model")
- (version "3.2-11")
+ (version "3.3-1")
(source (origin
(method url-fetch)
(uri (cran-uri "spatstat.model" version))
(sha256
(base32
- "0hvnqig6cdrp8hk2fkcajag3hrqsamfr6h66wn4cs30iblic23bh"))))
+ "19xgc4hmcyhxdk4cw7k5qyffr48vyc9dj76k3blxzgrbbydrc72w"))))
(properties `((upstream-name . "spatstat.model")))
(build-system r-build-system)
(propagated-inputs
@@ -34825,6 +35742,7 @@ Kolmogorov-Smirnov, ANOVA) are also supported.")
r-spatstat-geom
r-spatstat-random
r-spatstat-sparse
+ r-spatstat-univar
r-spatstat-utils
r-tensor))
(home-page "https://spatstat.org/")
@@ -34845,17 +35763,41 @@ tests for covariate effects (Cox-Berman-Waller-Lawson,
Kolmogorov-Smirnov, ANOVA) are also supported.")
(license license:gpl2+)))
+(define-public r-spatstat-univar
+ (package
+ (name "r-spatstat-univar")
+ (version "3.0-0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "spatstat.univar" version))
+ (sha256
+ (base32 "0wa7zys089sym8f16rg4dih81miv34rj8mph0w926cpckcfm1g00"))))
+ (properties `((upstream-name . "spatstat.univar")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-spatstat-utils))
+ (home-page "https://www.spatstat.org/")
+ (synopsis
+ "One-dimensional probability distribution support for spatstat")
+ (description
+ "This is a package for estimation of one-dimensional probability
+distributions including kernel density estimation, weighted empirical
+cumulative distribution functions, Kaplan-Meier and reduced-sample estimators
+for right-censored data, heat kernels, kernel properties, quantiles and
+integration.")
+ (license license:gpl2+)))
+
(define-public r-spatstat-utils
(package
(name "r-spatstat-utils")
- (version "3.0-4")
+ (version "3.1-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat.utils" version))
(sha256
(base32
- "1i1w1ys29s22jfjvliqnbw3zi6zar8bxxz3r8za182p2w0wqwhax"))))
+ "0g9djqpn4yl9wcv3x1qb2pvjhq8491194a5lx6xg8180f1a32363"))))
(properties
`((upstream-name . "spatstat.utils")))
(build-system r-build-system)
@@ -34869,14 +35811,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)
@@ -34893,14 +35835,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
@@ -34915,18 +35857,19 @@ package.")
(define-public r-spatstat-geom
(package
(name "r-spatstat-geom")
- (version "3.2-9")
+ (version "3.3-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat.geom" version))
(sha256
(base32
- "05ymr4h6g5kp6kinm8qi6mcwi51d2rp671cm3hqgyrhk91k72cx7"))))
+ "03spxazgjspmsialvjy2sv5yxjh049dns4q4l4g0zgzd4ilqmh6b"))))
(properties `((upstream-name . "spatstat.geom")))
(build-system r-build-system)
(propagated-inputs
- (list r-deldir r-polyclip r-spatstat-data r-spatstat-utils))
+ (list r-deldir r-polyclip r-spatstat-data r-spatstat-univar
+ r-spatstat-utils))
(home-page "https://spatstat.org/")
(synopsis "Geometrical functionality of the spatstat package")
(description
@@ -34971,14 +35914,14 @@ user-level code from spatstat, except for the code for linear networks.")
(define-public r-spatstat-linnet
(package
(name "r-spatstat-linnet")
- (version "3.1-5")
+ (version "3.2-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat.linnet" version))
(sha256
(base32
- "18zp6dsddc9js4ck6iqh5li4hw5qbyvh16vsa9vqk4ccgc1krl57"))))
+ "1gqivj8lsqn67068ygjqjjbnl2wywq3zp6mpqqbhyrbj7h3diw0s"))))
(properties
`((upstream-name . "spatstat.linnet")))
(build-system r-build-system)
@@ -34990,6 +35933,7 @@ user-level code from spatstat, except for the code for linear networks.")
r-spatstat-model
r-spatstat-random
r-spatstat-sparse
+ r-spatstat-univar
r-spatstat-utils))
(home-page "https://spatstat.org/")
(synopsis "Linear networks functionality of the spatstat package")
@@ -35001,16 +35945,17 @@ for spatial data on a linear network.")
(define-public r-spatstat-random
(package
(name "r-spatstat-random")
- (version "3.2-3")
+ (version "3.3-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat.random" version))
(sha256
- (base32 "19rl757lccr169fj00zmhb1a20bxw4kljzb81hbbr5xhj0za6lp0"))))
+ (base32 "1lxvi1wkbv6z0hcargcjb5b79vvrhaf0y2psxlil9q82i376n0l3"))))
(properties `((upstream-name . "spatstat.random")))
(build-system r-build-system)
- (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-utils))
+ (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-univar
+ r-spatstat-utils))
(home-page "https://spatstat.org/")
(synopsis "Random Generation Functionality for the 'spatstat' Family")
(description
@@ -35029,19 +35974,24 @@ sampler).")
(define-public r-spatstat
(package
(name "r-spatstat")
- (version "3.0-8")
+ (version "3.1-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat" version))
(sha256
(base32
- "0ghhj161n7bxd6hpk3hz6lq2gv8bwx5clrdp729lfyi9d1xjw162"))))
+ "04jmyngwzdb1v5yzcmnsj26kaaxxvhjnmdp7is5nrry632c30jan"))))
(properties `((upstream-name . "spatstat")))
(build-system r-build-system)
(propagated-inputs
- (list r-spatstat-data r-spatstat-explore r-spatstat-geom
- r-spatstat-linnet r-spatstat-model r-spatstat-random
+ (list r-spatstat-data
+ r-spatstat-explore
+ r-spatstat-geom
+ r-spatstat-linnet
+ r-spatstat-model
+ r-spatstat-random
+ r-spatstat-univar
r-spatstat-utils))
(home-page "https://www.spatstat.org")
(synopsis "Spatial Point Pattern analysis, model-fitting, simulation, tests")
@@ -35086,14 +36036,14 @@ for linear mixed models (AIREML).")
(define-public r-cpp11
(package
(name "r-cpp11")
- (version "0.4.7")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "cpp11" version))
(sha256
(base32
- "0i234s1g1vc6m2sqxia5r1gaca05znjv4bff5dj74fach9k147c0"))))
+ "18rl8g68iwmdxiy0c3aqw17limx74hpc5q3irdqj9ndzlnvn9pbm"))))
(properties `((upstream-name . "cpp11")))
(build-system r-build-system)
(native-inputs (list r-knitr))
@@ -35206,14 +36156,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
@@ -35497,14 +36447,14 @@ censored data.")
(define-public r-flexsurv
(package
(name "r-flexsurv")
- (version "2.3")
+ (version "2.3.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "flexsurv" version))
(sha256
(base32
- "1y31ghfn02fcpss3aliy5r7kk0a7h0h2krnj665h13y8jgqkc6j7"))))
+ "1171m8rx98bdkij0vp1w87msfjvbqsrh4jkzpm39yz0vg8charsv"))))
(properties `((upstream-name . "flexsurv")))
(build-system r-build-system)
(propagated-inputs
@@ -36225,14 +37175,14 @@ prediction of kriging models.")
(define-public r-dials
(package
(name "r-dials")
- (version "1.2.1")
+ (version "1.3.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "dials" version))
(sha256
(base32
- "0xrvvz4pkzmjsizjqfcvpn6f1cl9yp56lyc2iw8vcvwa18gb6szf"))))
+ "08q18cl187n98q72hnx3ildd0jk7qmrcdpcrmz7z1l0rb5iyjjj2"))))
(properties `((upstream-name . "dials")))
(build-system r-build-system)
(propagated-inputs
@@ -36246,6 +37196,7 @@ prediction of kriging models.")
r-purrr
r-rlang
r-scales
+ r-sfd
r-tibble
r-vctrs
r-withr))
@@ -36518,14 +37469,14 @@ consistent interface, and the package is built on the @code{stringi} and
(define-public r-hunspell
(package
(name "r-hunspell")
- (version "3.0.3")
+ (version "3.0.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "hunspell" version))
(sha256
(base32
- "1ws2hhrn3iw89vs17q9claf0cip5hy6rbgdr4dcjmzrdlrri9apx"))))
+ "1yvrvjyiki4qh3b98npc2ppiwva0pxkv58a5pk7kzdnxk2gfcxwv"))))
(properties `((upstream-name . "hunspell")))
(build-system r-build-system)
(propagated-inputs
@@ -36665,14 +37616,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
@@ -36953,14 +37904,14 @@ covariate (usually group indicator) and the scores.")
(define-public r-qtl
(package
(name "r-qtl")
- (version "1.66")
+ (version "1.70")
(source
(origin
(method url-fetch)
(uri (cran-uri "qtl" version))
(sha256
(base32
- "10fnc3ms97rdqsqxz5jpvg2cmrwmz69wjxxs3h65r1yhy94pssnl"))))
+ "06zlp6m0w3gxxa04q7jhfh29r0d8xa0lgn9jaz80axn94css243m"))))
(build-system r-build-system)
(home-page "https://rqtl.org/")
(synopsis "R package for analyzing QTL experiments in genetics")
@@ -36976,12 +37927,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
@@ -37024,14 +37975,14 @@ data (variant call format, e.g. VCF or BCF) or meta-analysis results in R.")
(define-public r-maldiquant
(package
(name "r-maldiquant")
- (version "1.22.2")
+ (version "1.22.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "MALDIquant" version))
(sha256
(base32
- "1zygmn8cny5r4s0ni2kgqbg2xzjvjh9rzmqnw256jg0035qb0lb0"))))
+ "10wk8ykraw1swnlfhp5fh9fhfxkshanqkrwhs8dssqx1l474y2gx"))))
(properties `((upstream-name . "MALDIquant")))
(build-system r-build-system)
(native-inputs
@@ -37075,14 +38026,14 @@ data to rasters. It speeds up plotting of data with millions of points.")
(define-public r-seuratobject
(package
(name "r-seuratobject")
- (version "5.0.1")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "SeuratObject" version))
(sha256
(base32
- "0hgrymldcqja40prr23gwx1c7lvwjjwcla3dld6x8wzkzqh1gkjs"))))
+ "1kx0icqzjck7vynxj5962sz9zlassia4j32azr9y7ds5yhhhvlyy"))))
(properties `((upstream-name . "SeuratObject")))
(build-system r-build-system)
(propagated-inputs
@@ -37141,13 +38092,13 @@ other R users.")
(define-public r-seurat
(package
(name "r-seurat")
- (version "5.0.3")
+ (version "5.1.0")
(source (origin
(method url-fetch)
(uri (cran-uri "Seurat" version))
(sha256
(base32
- "08r5l6sk8i134izd29ydfm7hva7a9b3lfglmgngc9w73qs9dzwz4"))))
+ "0nad49g13v5zg4rr2099m1cl1qcmmj1a0m09gam5xiccg8yv9kxd"))))
(properties `((upstream-name . "Seurat")))
(build-system r-build-system)
(propagated-inputs
@@ -37660,13 +38611,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
@@ -37747,16 +38698,193 @@ visualization, and logging. Its modular implementation allows easy
customization by the user.")
(license license:bsd-2)))
+(define-public r-mlr3cluster
+ (package
+ (name "r-mlr3cluster")
+ (version "0.1.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3cluster" version))
+ (sha256
+ (base32 "09fsw2b43f9m7clv1qwylimyz622snhn9ykq3xwbiric7zr4ca91"))))
+ (properties `((upstream-name . "mlr3cluster")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-backports
+ r-checkmate
+ r-clue
+ r-cluster
+ r-data-table
+ r-fpc
+ r-mlr3
+ r-mlr3misc
+ r-paradox
+ r-r6))
+ (home-page "https://mlr3cluster.mlr-org.com")
+ (synopsis "Cluster extension for mlr3")
+ (description
+ "This package extends the mlr3 package with cluster analysis.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3data
+ (package
+ (name "r-mlr3data")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3data" version))
+ (sha256
+ (base32 "04hwmj8cdszwgd845va26pgzdw0k4cm025zjrmp3fr7ypp73mirg"))))
+ (properties `((upstream-name . "mlr3data")))
+ (build-system r-build-system)
+ (home-page "https://github.com/mlr-org/mlr3data")
+ (synopsis "Collection of machine learning data Sets for mlr3")
+ (description
+ "This package provides a small collection of interesting and educational
+machine learning data sets which are used as examples in the mlr3 book Applied
+machine learning using mlr3 in R @url{https://mlr3book.mlr-org.com}, the use case
+gallery @url{https://mlr3gallery.mlr-org.com}, or in other examples. All data
+sets are properly preprocessed and ready to be analyzed by most machine learning
+algorithms. Data sets are automatically added to the dictionary of tasks if
+mlr3 is loaded.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3filters
+ (package
+ (name "r-mlr3filters")
+ (version "0.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3filters" version))
+ (sha256
+ (base32 "16z359bc2li7f35xk4g08np3r2a3127avv0ak6bn9bywcs13z6bl"))))
+ (properties `((upstream-name . "mlr3filters")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-backports
+ r-checkmate
+ r-data-table
+ r-mlr3
+ r-mlr3misc
+ r-paradox
+ r-r6))
+ (home-page "https://mlr3filters.mlr-org.com")
+ (synopsis "Filter based feature selection for mlr3")
+ (description
+ "This package extends mlr3 with filter methods for feature selection. Besides
+standalone filter methods built-in methods of any machine-learning algorithm are
+supported. Partial scoring of multivariate filter methods is supported.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3fselect
+ (package
+ (name "r-mlr3fselect")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3fselect" version))
+ (sha256
+ (base32 "0bw5gxcxydvh14j6zy9q1k32b84v76lm6ksa4dh1l6pck14a76pj"))))
+ (properties `((upstream-name . "mlr3fselect")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bbotk
+ r-checkmate
+ r-data-table
+ r-lgr
+ r-mlr3
+ r-mlr3misc
+ r-paradox
+ r-r6
+ r-stabm))
+ (home-page "https://mlr3fselect.mlr-org.com")
+ (synopsis "Feature selection for mlr3")
+ (description
+ "This package is a feature selection package of the mlr3 ecosystem. It
+selects the optimal feature set for any mlr3 learner. The package works with
+several optimization algorithms e.g. random search, Recursive feature elimination,
+and genetic search. Moreover, it can automatically optimize learners and estimate
+the performance of optimized feature sets with nested resampling.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3hyperband
+ (package
+ (name "r-mlr3hyperband")
+ (version "0.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3hyperband" version))
+ (sha256
+ (base32 "1sr9bccy1zmbj83i6nlwkfmi98b40bl1l9q4lzl8n0knnavnzcj7"))))
+ (properties `((upstream-name . "mlr3hyperband")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bbotk
+ r-checkmate
+ r-data-table
+ r-lgr
+ r-mlr3
+ r-mlr3misc
+ r-mlr3tuning
+ r-paradox
+ r-r6))
+ (home-page "https://mlr3hyperband.mlr-org.com")
+ (synopsis "Hyperband for mlr3")
+ (description
+ "This package implements a successive halving and hyperband optimization
+algorithm for the mlr3 ecosystem. The implementation in mlr3hyperband features
+improved scheduling and parallelizes the evaluation of configurations. The package
+includes tuners for hyperparameter optimization in mlr3tuning and optimizers for
+black-box optimization in bbotk.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3mbo
+ (package
+ (name "r-mlr3mbo")
+ (version "0.2.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3mbo" version))
+ (sha256
+ (base32 "1i97mqsxgdipl2gklp2h7d7s3jm977jzm6arxn6hvshw6a2ikzgm"))))
+ (properties `((upstream-name . "mlr3mbo")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bbotk
+ r-checkmate
+ r-data-table
+ r-lgr
+ r-mlr3
+ r-mlr3misc
+ r-mlr3tuning
+ r-paradox
+ r-r6
+ r-spacefillr))
+ (native-inputs (list r-knitr))
+ (home-page "https://mlr3mbo.mlr-org.com")
+ (synopsis "Flexible Bayesian optimization")
+ (description
+ "This package provides a flexible approach to Bayesian optimization / model
+based optimization building on the bbotk package. The mlr3mbo is a toolbox
+providing both ready-to-use optimization algorithms as well as their fundamental
+building blocks allowing for straightforward implementation of custom algorithms.
+Single- and multi-objective optimization is supported as well as mixed continuous,
+categorical and conditional search spaces. Moreover, using mlr3mbo for
+hyperparameter optimization of machine learning models within the mlr3 ecosystem
+is straightforward via mlr3tuning.")
+ (license license:lgpl3)))
+
(define-public r-mlr3measures
(package
(name "r-mlr3measures")
- (version "0.5.0")
+ (version "0.6.0")
(source (origin
(method url-fetch)
(uri (cran-uri "mlr3measures" version))
(sha256
(base32
- "0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57"))))
+ "0vhqcfn3fijj2lwjrly2lyb9bs5msqvlwdv1asfkr9shkw61piik"))))
(build-system r-build-system)
(propagated-inputs
(list r-checkmate r-prroc))
@@ -37772,13 +38900,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))
@@ -37794,13 +38922,13 @@ package also supersedes the package @code{BBmisc}.")
(define-public r-mlr3pipelines
(package
(name "r-mlr3pipelines")
- (version "0.5.1")
+ (version "0.6.0")
(source (origin
(method url-fetch)
(uri (cran-uri "mlr3pipelines" version))
(sha256
(base32
- "1brsvzn519yc5vq2sax0q5xwvs0180ykn6ljk2wy502aabrcxzmg"))))
+ "09wivgnj3jj39ngrxjip6ss0138fvjsmn4dmi5v0a78ppvsr96sp"))))
(build-system r-build-system)
(propagated-inputs
(list r-backports
@@ -37855,19 +38983,112 @@ resampled, benchmarked, and tuned.")
performing ordinal regression.")
(license license:expat))))
+(define-public r-mlr3tuningspaces
+ (package
+ (name "r-mlr3tuningspaces")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3tuningspaces" version))
+ (sha256
+ (base32 "0zcmhzrr9b3blg49dx3zmxnm5qh87k0rlka0vk2jp59ifd2yggrr"))))
+ (properties `((upstream-name . "mlr3tuningspaces")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate
+ r-data-table
+ r-mlr3
+ r-mlr3misc
+ r-mlr3tuning
+ r-paradox
+ r-r6))
+ (home-page "https://mlr3tuningspaces.mlr-org.com")
+ (synopsis "Search spaces for mlr3")
+ (description
+ "This package is a collection of search spaces for hyperparameter optimization
+in the mlr3 ecosystem. It features ready-to-use search spaces for many popular
+machine learning algorithms. The search spaces are from scientific articles and
+work for a wide range of data sets.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3verse
+ (package
+ (name "r-mlr3verse")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3verse" version))
+ (sha256
+ (base32 "1azkpmkki8c02vpz98ixsx17civk86dq7c8wwnvm9jlg3spr8hhd"))))
+ (properties `((upstream-name . "mlr3verse")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-bbotk
+ r-data-table
+ r-mlr3
+ r-mlr3cluster
+ r-mlr3data
+ r-mlr3filters
+ r-mlr3fselect
+ r-mlr3hyperband
+ r-mlr3learners
+ r-mlr3mbo
+ r-mlr3misc
+ r-mlr3pipelines
+ r-mlr3tuning
+ r-mlr3tuningspaces
+ r-mlr3viz
+ r-paradox))
+ (home-page "https://mlr3verse.mlr-org.com")
+ (synopsis "Easily install and load of the mlr3 package family")
+ (description
+ "The mlr3 package family is a set of packages for machine-learning purposes
+built in a modular fashion. This wrapper package is aimed to simplify the
+installation and loading of the core mlr3 packages.")
+ (license license:lgpl3)))
+
+(define-public r-mlr3viz
+ (package
+ (name "r-mlr3viz")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "mlr3viz" version))
+ (sha256
+ (base32 "1dm0xkrmd4c9hs22rxpxvvd4xxki4nxh2x7s06s2d7n3dhr4l3xh"))))
+ (properties `((upstream-name . "mlr3viz")))
+ (build-system r-build-system)
+ (propagated-inputs (list r-checkmate
+ r-data-table
+ r-ggplot2
+ r-mlr3misc
+ r-scales
+ r-viridis))
+ (home-page "https://mlr3viz.mlr-org.com")
+ (synopsis "Visualizations for mlr3")
+ (description
+ "This package offers features plots for mlr3 objects such as tasks, learners,
+predictions, benchmark results, tuning instances and filters via the
+@code{autoplot()} generic of ggplot2. The mlr3viz package draws plots with
+the viridis color palette and applies the minimal theme. Visualizations include
+barplots, boxplots, histograms, ROC curves, and precision-recall curves.")
+ (license license:lgpl3)))
+
(define-public r-paradox
(package
(name "r-paradox")
- (version "0.11.1")
+ (version "1.0.1")
(source (origin
(method url-fetch)
(uri (cran-uri "paradox" version))
(sha256
(base32
- "0igza40ycirnf5chs7z2nnh0w6d48v4wv102zn2vnvh0kkvgv3hd"))))
+ "120ll8xrdg9s7ip0053m0i83gshxh3n79spsfwv6dzjwsj3mmpkj"))))
(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,
@@ -37879,13 +39100,13 @@ implemented as @code{R6} classes.")
(define-public r-mlr3
(package
(name "r-mlr3")
- (version "0.18.0")
+ (version "0.20.2")
(source (origin
(method url-fetch)
(uri (cran-uri "mlr3" version))
(sha256
(base32
- "0v83lwigpm227dqr8hz5x1khcjqf3q0glqvz812sckbcf74ibhdz"))))
+ "0k3qyc2jyffdpnykn5ays5slgxzij803186xgwpjg38l9r13w9r1"))))
(build-system r-build-system)
(propagated-inputs
(list r-backports
@@ -37902,7 +39123,6 @@ implemented as @code{R6} classes.")
r-paradox
r-parallelly
r-r6
- r-rhpcblasctl
r-uuid))
(home-page "https://mlr3.mlr-org.com/")
(synopsis "Machine Learning in R - Next Generation")
@@ -37917,13 +39137,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
@@ -37944,14 +39164,14 @@ vector machines, and gradient boosting.")
(define-public r-bbotk
(package
(name "r-bbotk")
- (version "0.8.0")
+ (version "1.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "bbotk" version))
(sha256
(base32
- "1ggfl1lhvjnnkxib4svqd82agrvjcg1101cbf4g2c0kzgzm1jaj6"))))
+ "13kvqazlp3inxqzdm67q7hgjss8wib1hi3fbyx1zlm653zfc0sii"))))
(properties `((upstream-name . "bbotk")))
(build-system r-build-system)
(propagated-inputs
@@ -37974,13 +39194,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
@@ -38240,20 +39460,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")
@@ -38268,14 +39488,14 @@ the font tool-set provided by the @code{systemfonts} package.")
(define-public r-ragg
(package
(name "r-ragg")
- (version "1.3.0")
+ (version "1.3.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "ragg" version))
(sha256
(base32
- "1chlas4i6p8gigx02x1y7nanmz9jbv1h4fa145zk223bbg9j931j"))))
+ "0cb9dcp47pl0nizwy0a2ml8hm11bhf7ay20j237hmmgx159a8dw0"))))
(properties `((upstream-name . "ragg")))
(build-system r-build-system)
(inputs
@@ -38296,14 +39516,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
@@ -38330,14 +39550,14 @@ in output to the equivalent HTML.")
(define-public r-pkgdown
(package
(name "r-pkgdown")
- (version "2.0.9")
+ (version "2.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "pkgdown" version))
(sha256
(base32
- "186xzilh4079a6xjig3j4pdn99ipg4d5s5q1k75qclivq0b24m3f"))))
+ "1d4z4wv18yn00cj9wb4pizjjyvy4hqfc0mqynw6ycrldfcxxzlf4"))))
(properties `((upstream-name . "pkgdown")))
(build-system r-build-system)
(inputs (list pandoc))
@@ -38348,11 +39568,11 @@ in output to the equivalent HTML.")
r-desc
r-digest
r-downlit
+ r-fontawesome
r-fs
- r-httr
+ r-httr2
r-jsonlite
- r-magrittr
- r-memoise
+ r-openssl
r-purrr
r-ragg
r-rlang
@@ -38766,20 +39986,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
@@ -39019,14 +40238,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.")
(define-public r-stars
(package
(name "r-stars")
- (version "0.6-5")
+ (version "0.6-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "stars" version))
(sha256
(base32
- "1b5gs0qa8097f2mvz4rgl46wrvk1rbbbi2a4s901hdg4bkr15jsg"))))
+ "1b679s25f9vpzrisyxs5xzc0dv47yn3prm0hi752fhpvml4kbjkh"))))
(properties `((upstream-name . "stars")))
(build-system r-build-system)
(propagated-inputs
@@ -39131,14 +40350,14 @@ Application Program Interfaces (API)}.")
(define-public r-intervals
(package
(name "r-intervals")
- (version "0.15.4")
+ (version "0.15.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "intervals" version))
(sha256
(base32
- "13wzwg5yc1wr8ww8bhv9x5ha78yajsfmb9phq4nbgrxkmbiy3h2h"))))
+ "0p6fqw311fni5zaw4hy7zcsjrfmrvb03s4amj0szdr3yqki7p40i"))))
(properties `((upstream-name . "intervals")))
(build-system r-build-system)
(home-page "https://github.com/edzer/intervals")
@@ -39207,14 +40426,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))
@@ -39630,13 +40849,13 @@ with well defined variance functions).")
(define-public r-webutils
(package
(name "r-webutils")
- (version "1.2.0")
+ (version "1.2.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "webutils" version))
(sha256
- (base32 "0g3zrbwiyq9z0chc66dr8gndqs0xdqkc49bpisbb7ns3g0fkl92i"))))
+ (base32 "1qki96b4fahhcs8akchp1g2y06lhxn9bs5x5c1cdh4xk5xbf1x5n"))))
(properties `((upstream-name . "webutils")))
(build-system r-build-system)
(propagated-inputs
@@ -39684,13 +40903,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.13")
(source
(origin
(method url-fetch)
(uri (cran-uri "opencpu" version))
(sha256
- (base32 "1hdvfbzc8xmv8hrmchad590f91s4vq1nq83wi2ffh4n7q6ixr03s"))
+ (base32 "1gyfgv5w9bi1lng8xzkpnqr50x90qshb1q4927jxzl5l4vdzlahn"))
(snippet
'(for-each delete-file
'("inst/test/jquery-1.10.2.min.js"
@@ -39819,14 +41038,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
@@ -39843,17 +41062,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
@@ -40281,14 +41500,14 @@ fully reproducible.")
(define-public r-paws-common
(package
(name "r-paws-common")
- (version "0.7.2")
+ (version "0.7.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.common" version))
(sha256
(base32
- "0d1gj8z3c592cadngfhp8w8m6nd1ffb8k0wj8r2w1bldniq5yx70"))))
+ "1dd0cms3l0my6fpxrpsq6b7sya9ajrhaaz12a3y5iix2yklciac5"))))
(properties `((upstream-name . "paws.common")))
(build-system r-build-system)
(propagated-inputs
@@ -40312,14 +41531,14 @@ Service (S3).")
(define-public r-paws-customer-engagement
(package
(name "r-paws-customer-engagement")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.customer.engagement" version))
(sha256
(base32
- "1380waqavwga17fvdzfpag4snzynkykh3pnia5bi73476y7myj5h"))))
+ "1akwx39xmkms9zpsb7i5wx2hzvhhkmi0xlxag13cf9gjpg822361"))))
(properties
`((upstream-name . "paws.customer.engagement")))
(build-system r-build-system)
@@ -40336,14 +41555,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)
@@ -40360,13 +41579,13 @@ more.")
(define-public r-paws-developer-tools
(package
(name "r-paws-developer-tools")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.developer.tools" version))
(sha256
- (base32 "177q7x8l9asyidpc7j20xwpyk0bd9x9m20cy4qzlnnmr14anyvjm"))))
+ (base32 "1cj9k005267wpd9pblvhk0sdy2ll2n0wcq4ch5wjwkz9kgl02jjr"))))
(properties `((upstream-name . "paws.developer.tools")))
(build-system r-build-system)
(propagated-inputs
@@ -40382,13 +41601,13 @@ deployment, and more.")
(define-public r-paws-end-user-computing
(package
(name "r-paws-end-user-computing")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.end.user.computing" version))
(sha256
- (base32 "0qz5kps9819yfqjdqjmv7wx70ll7xayfxmd5dc867k14i41f91cm"))))
+ (base32 "17550n93d0lndhfk9r8zdh2yif4hw3m4wn7wzgj53akgqy1jg10y"))))
(properties `((upstream-name . "paws.end.user.computing")))
(build-system r-build-system)
(propagated-inputs
@@ -40404,14 +41623,14 @@ and more.")
(define-public r-paws-application-integration
(package
(name "r-paws-application-integration")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.application.integration" version))
(sha256
(base32
- "1sgzp0yr1jsmbyzyk26m762rhpxb89wrwqqvrrw3xr1ib0cg06ah"))))
+ "0wmkxnrjmaf88bw1xypj7n41klxxhf538krsk0xrnwjb14v7lqla"))))
(properties
`((upstream-name . "paws.application.integration")))
(build-system r-build-system)
@@ -40428,14 +41647,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)
@@ -40453,14 +41672,14 @@ more.")
(define-public r-paws-analytics
(package
(name "r-paws-analytics")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.analytics" version))
(sha256
(base32
- "07nwa39mn749a9rqb683wf19kd8si7ksws87annbldmd57r072l8"))))
+ "0w65f4bmcybp30zas20b90f1cmw1znhpjhcsf8xnq7x4s2lnpy3d"))))
(properties
`((upstream-name . "paws.analytics")))
(build-system r-build-system)
@@ -40477,14 +41696,14 @@ Elasticsearch search engine, and more.")
(define-public r-paws-machine-learning
(package
(name "r-paws-machine-learning")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.machine.learning" version))
(sha256
(base32
- "0zcw758xsw2360571dj215gyd1amaxx07i58h1r6r5zys940lxis"))))
+ "1l2gy9bzibbjwqxb5x72dpfaylxa999c3zyb3y3359ckqkxsqgpy"))))
(properties
`((upstream-name . "paws.machine.learning")))
(build-system r-build-system)
@@ -40501,14 +41720,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)
@@ -40525,14 +41744,14 @@ monitoring, Auto Scaling for automatically scaling resources, and more.")
(define-public r-paws-networking
(package
(name "r-paws-networking")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.networking" version))
(sha256
(base32
- "0qs6bp0vlbazxir9jmdcnazh90yrvhrw6k9046id73hw1j7h5zaf"))))
+ "1lfkll2gb83vw9zfb7bnmlg4alncqhp48s1w046fkh9qlg8hc7j6"))))
(properties
`((upstream-name . "paws.networking")))
(build-system r-build-system)
@@ -40549,14 +41768,14 @@ CloudFront content delivery, load balancing, and more.")
(define-public r-paws-database
(package
(name "r-paws-database")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.database" version))
(sha256
(base32
- "0nlkbnyxd3znmvqxqb3w43sznacmikq32d9fihyc1dx7ghvmf61z"))))
+ "0jm3cwl2scfc4jgxzlwnax195xlii2b3p9kjmid48p8zx6h68hb9"))))
(properties `((upstream-name . "paws.database")))
(build-system r-build-system)
(propagated-inputs
@@ -40573,14 +41792,14 @@ database, and more.")
(define-public r-paws-storage
(package
(name "r-paws-storage")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "paws.storage" version))
(sha256
(base32
- "0v2g1shv9m4h2fz2lvjad479g3nmxc92wlyrxj4s7fifzzs2pd97"))))
+ "1mngxy88r94n1zwbvimj71hw4w9myk5kgqpgyj0m3spwv7338rfd"))))
(properties `((upstream-name . "paws.storage")))
(build-system r-build-system)
(propagated-inputs
@@ -40595,14 +41814,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
@@ -40618,14 +41837,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
@@ -40738,14 +41957,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))
@@ -40948,14 +42167,14 @@ neighborhood graphs, and relatives.")
(define-public r-crul
(package
(name "r-crul")
- (version "1.4.2")
+ (version "1.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "crul" version))
(sha256
(base32
- "0is164bbdk5zy1gxrliiqzlmj47nvzsjym05ijzzs3zkj7qpfp20"))))
+ "17dx3qhdssk0zanp73g0d7h3imhwh9ydzs009fbrspw1s9w3fwyv"))))
(properties `((upstream-name . "crul")))
(build-system r-build-system)
(propagated-inputs
@@ -41109,14 +42328,14 @@ configuration of status code, short description, and verbose message.")
(define-public r-webmockr
(package
(name "r-webmockr")
- (version "0.9.0")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "webmockr" version))
(sha256
(base32
- "1a590fyzmag1p6c9a82yp93wd1s4jdznk0416i0pv8r5jwarkdv7"))))
+ "09j6j5d60cz0sjzg7zacdk3pypip3hnhf2qq24nmvy9aiz0a4lkk"))))
(properties `((upstream-name . "webmockr")))
(build-system r-build-system)
(propagated-inputs
@@ -41264,27 +42483,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")
@@ -41568,13 +42787,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))
@@ -41713,26 +42932,17 @@ calculate a dimension's unknown value from other dimensions' measurements.")
(define-public r-sungeo
(package
(name "r-sungeo")
- (version "1.1.1")
+ (version "1.3.0")
(source (origin
(method url-fetch)
(uri (cran-uri "SUNGEO" version))
(sha256
(base32
- "1sy9kw3nr69jf33034kcnv418lqyz6sfrd01646i7dfsm64aydp2"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Fortunately, the package does not actually use
- ;; rmapshaper, which has got a js/node dependency.
- ;; The only occurrence is in R/point2poly_tess.R,
- ;; where it is commented out.
- (substitute* "DESCRIPTION"
- (("rmapshaper,") ""))
- (substitute* "NAMESPACE"
- (("importFrom\\(rmapshaper,ms_dissolve\\)
-") ""))))))
+ "0ydwsrgqknngx7567xwfhwj1jdmi4ip1jxkb5jdy41f7ysy1myd0"))))
(properties `((upstream-name . "SUNGEO")))
(build-system r-build-system)
+ (native-inputs
+ (list r-codetools)) ;recommended package for checking field assignments
(propagated-inputs
(list r-automap
r-cartogram
@@ -41748,8 +42958,8 @@ calculate a dimension's unknown value from other dimensions' measurements.")
r-rcpp
r-rcurl
r-rlang
+ r-rmapshaper
r-sf
- r-sp
r-spdep
r-stringr
r-terra))
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 a67d3d74bb..0cdb071ea0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20,7 +20,7 @@
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 muradm <mail@muradm.net>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2021-2023 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Jacob Hrbek <kreyren@rixotstudio.cz>
;;; Copyright © 2021, 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
@@ -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)
@@ -99,6 +102,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages mail)
+ #:use-module (gnu packages maths)
#:use-module (gnu packages mp3)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages nettle)
@@ -110,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)
@@ -175,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
@@ -193,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
@@ -218,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
@@ -237,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" "--"
@@ -253,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))))
@@ -278,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")
@@ -448,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
@@ -459,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
@@ -478,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
@@ -646,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")
@@ -981,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
@@ -1002,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")
@@ -1097,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")
@@ -1247,6 +1408,26 @@ the code to interact with the underlying operating system ALSA interface.")
"Rust bindings for OpenAL 1.1 and extensions (including EFX).")
(license (list license:expat license:asl2.0))))
+(define-public rust-amd-0.2
+ (package
+ (name "rust-amd")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "amd" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "15ib7hhzdifb2m099561ip0fq627gaszw4sq36ys75snaw0y0yd6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2))))
+ (home-page "https://github.com/rwl/amd_order/")
+ (synopsis "Approximate Minimum Degree ordering")
+ (description "This package provides a set of routines for ordering a
+sparse matrix prior to Cholesky factorization.")
+ (license license:bsd-3)))
+
(define-public rust-android-activity-0.5
(package
(name "rust-android-activity")
@@ -1499,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
@@ -1510,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))
@@ -1519,11 +1725,27 @@ 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-annotate-snippets-0.6
+ (package
+ (inherit rust-annotate-snippets-0.10)
+ (name "rust-annotate-snippets")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "annotate-snippets" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "19x7ldklprdgf8pam8b3lfhrxqw5yldcvk5j0bw2agsajbj1q0n7"))))
+ (arguments
+ `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.11))
+ #:cargo-development-inputs (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-difference" ,rust-difference-2)
+ ("rust-glob" ,rust-glob-0.3)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-yaml" ,rust-serde-yaml-0.8))))))
(define-public rust-ansi-parser-0.8
(package
@@ -1563,17 +1785,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
@@ -1674,26 +1960,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))))
@@ -1731,17 +2038,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")
@@ -1778,6 +2085,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")
@@ -1802,14 +2134,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
@@ -1834,22 +2166,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")
@@ -1945,8 +2396,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))))))
@@ -1969,18 +2419,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
@@ -2010,8 +2460,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
@@ -2021,7 +2505,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" "--"
@@ -2043,12 +2526,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
@@ -2270,23 +2748,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.")
@@ -2358,6 +2872,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")
@@ -2370,7 +2902,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
@@ -2468,8 +2999,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)
@@ -2491,8 +3021,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
@@ -2650,6 +3179,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")
@@ -2676,6 +3234,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")
@@ -2797,8 +3373,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
@@ -2808,19 +3427,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
@@ -3008,6 +3621,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")
@@ -3066,6 +3697,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")
@@ -3157,8 +3868,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
@@ -3175,7 +3917,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
@@ -3188,12 +3929,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
@@ -3225,6 +3961,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")
@@ -3540,7 +4295,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))))))
@@ -3556,7 +4314,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
@@ -3566,16 +4323,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.")
@@ -3593,7 +4349,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
@@ -3633,18 +4388,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)
@@ -3776,6 +4531,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")
@@ -4010,6 +4789,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")
@@ -4102,7 +4912,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.")
@@ -4580,6 +5389,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")
@@ -4669,6 +5501,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")
@@ -4983,6 +5847,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")
@@ -5082,6 +5982,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")
@@ -5141,7 +6060,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)
@@ -5351,31 +6270,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))))
@@ -5512,6 +6431,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")
@@ -5531,6 +6481,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")
@@ -5562,27 +6549,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)
@@ -5596,6 +6582,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")
@@ -5664,31 +6672,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
@@ -6008,6 +7039,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")
@@ -6181,6 +7233,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)
@@ -6489,6 +7571,34 @@ bindings to C and C++ libraries.")
("rust-diff" ,rust-diff-0.1)
("rust-shlex" ,rust-shlex-0.1))))))
+(define-public rust-bindgen-0.37
+ (package
+ (inherit rust-bindgen-0.53)
+ (name "rust-bindgen")
+ (version "0.37.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "08f2cyzr8fc027mzj2lhmn5j3w318g2ql7yfw5ngxa3yhy1an98v"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-cexpr" ,rust-cexpr-0.2)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-clang-sys" ,rust-clang-sys-0.23)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-env-logger" ,rust-env-logger-0.5)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
+ ("rust-proc-macro2" ,rust-proc-macro2-0.3)
+ ("rust-quote" ,rust-quote-0.5)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-which" ,rust-which-1))))))
+
(define-public rust-bio-types-1
(package
(name "rust-bio-types")
@@ -6907,17 +8017,35 @@ types.")
@code{rust-bitcoin}.")
(license license:cc0)))
+(define-public rust-bitfield-0.14
+ (package
+ (name "rust-bitfield")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bitfield" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1b26k9acwss4qvrl60lf9n83l17d4hj47n5rmpd3iigf9j9n0zid"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/dzamlo/rust-bitfield")
+ (synopsis "Macros to generate bitfield-like struct")
+ (description
+ "This Rust crate provides macros to generate bitfield-like struct.")
+ (license (list license:expat license:asl2.0))))
+
(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.
@@ -7044,32 +8172,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")
@@ -7119,15 +8261,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
@@ -7139,15 +8283,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
@@ -7214,7 +8357,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)
@@ -7246,8 +8389,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)
@@ -7274,7 +8420,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)
@@ -7286,6 +8432,75 @@ streams in big-endian and little-endian formats.")
("rust-serde-test" ,rust-serde-test-1)
("rust-static-assertions" ,rust-static-assertions-1))))))
+(define-public rust-blas-sys-0.7
+ (package
+ (name "rust-blas-sys")
+ (version "0.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blas-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/blas-lapack-rs/blas-sys")
+ (synopsis "Rust bindings to BLAS (Fortran)")
+ (description "The package provides bindings to BLAS (Fortran).")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-blas-0.22
+ (package
+ (name "rust-blas")
+ (version "0.22.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blas" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1p1rs9y8fpxmrh9jj1rf4q517x5h960v4jf30f1gwnr1qdshz65f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-blas-sys" ,rust-blas-sys-0.7)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-num-complex" ,rust-num-complex-0.4))))
+ (home-page "https://github.com/blas-lapack-rs/blas")
+ (synopsis "Rust wrappers for BLAS (Fortran)")
+ (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")
@@ -7324,8 +8539,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)
@@ -7334,25 +8548,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
@@ -7679,7 +8888,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.")
@@ -7775,6 +8983,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")
@@ -7968,69 +9216,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")
@@ -8140,8 +9451,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))))
@@ -8155,20 +9465,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")
@@ -8411,6 +9721,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")
@@ -8441,18 +9776,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))
@@ -8511,6 +9846,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")
@@ -8537,18 +9893,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)))
@@ -8567,34 +9928,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")
@@ -8925,8 +10303,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
@@ -8936,18 +10337,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
@@ -9184,32 +10579,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
@@ -9217,6 +10613,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")
@@ -9341,8 +10762,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))))))
@@ -9444,8 +10864,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
@@ -9455,17 +10898,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
@@ -9485,8 +10922,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
@@ -9496,7 +10958,6 @@ encoding.")
(sha256
(base32
"0fp6lr04w50mzfpxvvrbdm9pny8ch17514y7qgcsk6giqqf808cq"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-capnp" ,rust-capnp-0.14)
@@ -9504,12 +10965,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
@@ -9531,8 +10987,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
@@ -9542,19 +11022,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
@@ -9576,26 +11048,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")
@@ -9664,104 +11153,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")
@@ -9803,14 +11194,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)
@@ -9819,7 +11210,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")
@@ -9854,14 +11245,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)
@@ -9892,6 +11283,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")
@@ -10161,17 +11598,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)
@@ -10182,17 +11619,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
@@ -10200,6 +11653,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)
@@ -10209,7 +11663,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
@@ -10250,6 +11704,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")
@@ -10262,7 +11761,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")
@@ -10344,6 +11842,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")
@@ -10456,6 +11968,23 @@ that need to represent UTF-16 data as 8-bit characters.")
#:cargo-development-inputs
(("rust-clang-sys" ,rust-clang-sys-0.28))))))
+(define-public rust-cexpr-0.2
+ (package
+ (inherit rust-cexpr-0.6)
+ (name "rust-cexpr")
+ (version "0.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cexpr" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0v1xa3758czmj8h97gh548mr8g0v13ixxvrlm1s79nb7jmgc9aj2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-nom" ,rust-nom-3))))))
+
(define-public rust-cfg-aliases-0.1
(package
(name "rust-cfg-aliases")
@@ -10468,7 +11997,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
@@ -10583,6 +12111,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")
@@ -10791,6 +12342,25 @@ Encoding Standard.")
(description "Date and time library for Rust.")
(license (list license:expat license:asl2.0))))
+(define-public rust-chic-1
+ (package
+ (name "rust-chic")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "chic" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "037pkdccj25gr4my8fq1qni9v87rydpyhfi2naf86mimkxhxpdd5"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.6))))
+ (home-page "https://github.com/yoshuawuyts/chic")
+ (synopsis "Pretty parser error reporting")
+ (description "This package provides pretty parser error reporting.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-chrono-humanize-0.2
(package
(name "rust-chrono-humanize")
@@ -11048,6 +12618,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")
@@ -11153,6 +12741,25 @@ interoperation between crates in Rust.")
(description "This package provides Rust bindings for libclang.")
(license license:asl2.0)))
+(define-public rust-clang-sys-0.23
+ (package
+ (inherit rust-clang-sys-1)
+ (name "rust-clang-sys")
+ (version "0.23.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "clang-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1hjr333izzhs6bic84qwnyzy5xzmvasib8f3zkzj4ln3a97c1xyp"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-glob" ,rust-glob-0.2)
+ ("rust-glob" ,rust-glob-0.2)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libloading" ,rust-libloading-0.5))))))
+
(define-public rust-claxon-0.4
(package
(name "rust-claxon")
@@ -11342,18 +12949,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))))
@@ -11386,7 +12993,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)
@@ -11394,7 +13001,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
@@ -11404,9 +13011,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
@@ -11492,14 +13099,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
@@ -11511,8 +13118,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))
@@ -11616,17 +13223,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")
@@ -11637,6 +13244,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)
@@ -11725,6 +13345,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")
@@ -11753,32 +13395,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")
@@ -12042,8 +13700,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
@@ -12053,17 +13759,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
@@ -12131,14 +13832,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)
@@ -12153,14 +13854,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)
@@ -12170,6 +13871,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")
@@ -12196,6 +13922,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")
@@ -12528,6 +14276,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)
@@ -12567,6 +14340,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")
@@ -12654,6 +14470,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")
@@ -12737,6 +14573,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
@@ -12824,6 +14707,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)
@@ -13198,8 +15094,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
@@ -13209,7 +15155,6 @@ queue.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0sdkxv77m65frsn3bx0r3v7asxar3gy3hmghcfk6h4rbijars6qv"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -13220,13 +15165,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
@@ -13568,7 +15507,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)
@@ -13576,7 +15515,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")
@@ -13587,14 +15526,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))
@@ -13640,17 +15579,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")
@@ -13946,14 +15886,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)
@@ -14017,24 +15957,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
@@ -14061,8 +16000,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
@@ -14072,17 +16032,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
@@ -14170,6 +16125,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")
@@ -14408,8 +16382,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
@@ -14419,17 +16415,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
@@ -14606,6 +16597,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")
@@ -14672,40 +16681,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")
@@ -14869,17 +16844,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)
@@ -14976,29 +16951,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
@@ -15485,20 +17454,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")
@@ -15530,29 +17499,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")
@@ -16026,29 +17986,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
@@ -16056,6 +18014,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")
@@ -16076,172 +18057,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"))))
- (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"))))
+ (base32 "07i8k47fmym7kzs95qfhg6zrh4yyf2vl4460rmdyvyx06vck9scv"))))
(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)
- (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)
+ (base32 "1gnmn2wjvhvkj98ygcd5jdwi0wxsigvd7j0yq0zfgfsz7vwz8gav"))))
(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
@@ -16251,7 +18146,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
@@ -16268,12 +18162,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
@@ -16336,27 +18225,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")
@@ -16443,6 +18364,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")
@@ -16527,14 +18470,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
@@ -16661,14 +18604,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
@@ -16678,8 +18621,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)
@@ -16698,7 +18641,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)
@@ -16706,7 +18649,7 @@ requests.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "07l45np3bs10ana73w1ahdax1zbb8jd44ahhr2j7izlshkc360rw"))
+ "1sn97cah732ldcwkw5knm6kh57hx0gfxqmniiwgd2iy42j1xrjr9"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "curl")))))
@@ -16721,7 +18664,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
@@ -17258,24 +19201,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
@@ -17403,23 +19342,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
@@ -17531,20 +19468,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
@@ -17606,6 +19541,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")
@@ -17675,29 +19634,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")
@@ -17864,8 +19881,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
@@ -17875,7 +19924,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
@@ -17884,12 +19932,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
@@ -18229,20 +20313,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
@@ -18253,23 +20340,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")
@@ -18278,16 +20368,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
@@ -18421,20 +20513,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
@@ -18443,7 +20535,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
@@ -18452,23 +20545,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)
@@ -18481,6 +20578,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)
@@ -18568,32 +20687,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)
@@ -18682,30 +20820,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)
@@ -18842,8 +20994,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
@@ -18853,17 +21028,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
@@ -18893,6 +21090,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")
@@ -18935,6 +21171,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)
@@ -18948,10 +21200,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
@@ -18975,6 +21230,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
@@ -18989,10 +21259,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
@@ -19020,6 +21293,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)
@@ -19033,12 +21326,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
@@ -19053,7 +21349,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)
@@ -19161,26 +21459,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)
@@ -19206,16 +21556,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
@@ -19226,7 +21605,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
@@ -19241,13 +21619,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
@@ -19278,6 +21650,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")
@@ -19367,23 +21758,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")
@@ -19406,6 +21780,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")
@@ -19683,20 +22079,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")))
@@ -19774,6 +22169,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")
@@ -19854,6 +22297,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")
@@ -20280,26 +22752,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
@@ -20307,6 +22777,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")
@@ -20341,20 +22830,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
@@ -20384,20 +22874,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")
@@ -20405,6 +22895,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")
@@ -20791,33 +23297,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
@@ -21721,14 +24236,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)
@@ -22146,8 +24661,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
@@ -22157,18 +24692,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
@@ -22267,6 +24814,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")
@@ -22299,6 +24915,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")
@@ -22413,6 +25093,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")
@@ -22464,6 +25186,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")
@@ -22544,14 +25283,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
@@ -22621,6 +25360,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")
@@ -22678,6 +25500,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")
@@ -22780,18 +25624,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")
@@ -22799,8 +25642,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
@@ -22819,24 +25674,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
@@ -22847,6 +25704,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)
@@ -22887,6 +25763,78 @@ 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-fasthash-0.4
+ (package
+ (name "rust-fasthash")
+ (version "0.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fasthash" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "03v9g4ajw0zk9pv2ranq65xcly1b68hg0qzc2y8y1ajfdfa168h3"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-fasthash-sys" ,rust-fasthash-sys-0.3)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-seahash" ,rust-seahash-3)
+ ("rust-xoroshiro128" ,rust-xoroshiro128-0.3))))
+ (home-page "https://github.com/flier/rust-fasthash")
+ (synopsis "Suite of non-cryptographic hash functions for Rust")
+ (description
+ "This package provides a suite of non-cryptographic hash functions for
+Rust.")
+ (license license:asl2.0)))
+
+(define-public rust-fasthash-sys-0.3
+ (package
+ (name "rust-fasthash-sys")
+ (version "0.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fasthash-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1y18v8yya5pnzgfji9lwnrz5jl7q8q2xj2a0sg6ibrz2pwd99pmn"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.37)
+ ("rust-gcc" ,rust-gcc-0.3))))
+ (home-page "https://github.com/flier/rust-fasthash")
+ (synopsis "Suite of non-cryptographic hash functions for Rust")
+ (description
+ "This package provides a suite of non-cryptographic hash functions for
+Rust.")
+ (license license:asl2.0)))
+
(define-public rust-faster-hex-0.9
(package
(name "rust-faster-hex")
@@ -23022,8 +25970,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
@@ -23033,20 +26005,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
@@ -23066,6 +26030,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")
@@ -23513,22 +26499,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
@@ -23548,6 +26549,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")
@@ -23598,7 +26623,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)
@@ -23606,14 +26631,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")
@@ -23647,6 +26672,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")
@@ -23740,6 +26788,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")
@@ -24402,6 +27473,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")
@@ -24534,6 +27639,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")
@@ -24579,25 +27701,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")
@@ -24929,8 +28066,10 @@ There are multiple main modules for fsio:
("rust-rustix" ,rust-rustix-0.37)
("rust-windows-sys" ,rust-windows-sys-0.48))))
(home-page "https://github.com/bytecodealliance/fs-set-times")
- (synopsis "Set filesystem timestamps")
- (description "Set filesystem timestamps")
+ (synopsis "Set file system timestamps")
+ (description
+ "This Rust crate provides functions to set timestamps on files,
+directories, and other file system objects.")
(license (list license:asl2.0 license:expat))))
(define-public rust-fs-utils-1
@@ -25121,46 +28260,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
@@ -25362,6 +28488,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")
@@ -26034,6 +29194,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")
@@ -26434,14 +29635,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
@@ -26465,27 +29666,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
@@ -26644,6 +29845,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")
@@ -26671,8 +29893,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
@@ -26682,7 +29933,6 @@ permitted in ordinary Rust.")
(sha256
(base32
"1d5v6jjchf4872jynjsg5ni4vankm1341bas8qindygb6g9962md"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
@@ -26700,13 +29950,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
@@ -27038,8 +30282,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
@@ -27050,7 +30334,6 @@ graphics.")
(sha256
(base32
"06cfsq3mgjlq3bnxv7jh5bb5is7040xyvf8cf1x45vnq8fdz1d0a"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #true ;XXX circular dependencies
#:cargo-inputs
@@ -27066,14 +30349,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
@@ -27214,25 +30490,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)
@@ -27244,6 +30519,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")
@@ -27342,6 +30630,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")
@@ -27625,6 +30939,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")
@@ -27848,20 +31192,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}
@@ -27912,27 +31347,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)
@@ -27975,6 +31424,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")
@@ -28226,8 +31699,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
@@ -28237,19 +31734,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
@@ -28306,8 +31797,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
@@ -28317,7 +31835,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")
@@ -28330,13 +31847,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
@@ -28451,29 +31962,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
@@ -28737,6 +32260,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")
@@ -28801,35 +32337,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)
@@ -29021,9 +32582,15 @@ characters in HTML, decoding and unescaping HTML entities as well.")
("rust-walkdir" ,rust-walkdir-2))))
(home-page "https://github.com/byron/jwalk")
(synopsis
- "Filesystem walk performed in parallel with streamed and sorted results")
+ "File system walk performed in parallel with streamed and sorted results")
(description
- "Filesystem walk performed in parallel with streamed and sorted results.")
+ "This Rust crate implements a file system walk that runs in parallel
+using @code{rayon}. It attempts to combine the parallelism of @code{ignore}
+with @code{walkdir}'s streaming iterator API. Entries are streamed in sorted
+order with options for custom sorting, filtering, and skipping.
+
+Directory traversal is already pretty fast. If you don't need this crate's
+speed then walkdir provides a smaller and more tested single threaded implementation.")
(license license:expat)))
(define-public rust-koibumi-base32-0.0.2
@@ -29129,6 +32696,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")
@@ -29424,18 +33016,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
@@ -29445,14 +33036,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.
@@ -29462,7 +33053,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")
@@ -29756,6 +33347,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")
@@ -29820,6 +33440,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")
@@ -29841,6 +33522,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")
@@ -29914,6 +33613,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")
@@ -29957,24 +33673,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
@@ -29982,26 +33698,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
@@ -30012,17 +33747,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))))
@@ -30056,18 +33791,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)
@@ -30077,7 +33813,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)
@@ -30201,8 +33937,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
@@ -30212,7 +33989,6 @@ of reference counted pointers.")
(sha256
(base32
"06xyjs0kzqiqkjn60n1miwm2l87sa9p2lmzz0ymq18y72z37s81d"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-console" ,rust-console-0.15)
@@ -30222,15 +33998,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
@@ -30371,6 +34140,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")
@@ -30438,6 +34260,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")
@@ -30860,21 +34707,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
@@ -30886,20 +34734,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
@@ -30924,6 +34772,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")
@@ -31040,6 +34905,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")
@@ -31140,6 +35031,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")
@@ -31181,21 +35096,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")
@@ -31361,6 +35277,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")
@@ -31414,25 +35350,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)
@@ -31479,14 +35459,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))
@@ -31673,14 +35653,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))))
@@ -32365,7 +36345,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)
@@ -32373,7 +36353,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
@@ -32390,6 +36370,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")
@@ -32492,6 +36495,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")
@@ -32522,26 +36546,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
@@ -32549,32 +36577,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
@@ -32589,6 +36648,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")
@@ -32757,8 +36843,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
@@ -32768,7 +36893,6 @@ passwords/credentials.")
(sha256
(base32
"1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
@@ -32779,12 +36903,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
@@ -32862,8 +36981,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
@@ -32873,7 +37029,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
@@ -32894,14 +37049,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
@@ -32938,8 +37086,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
@@ -32949,16 +37118,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
@@ -32973,6 +37135,54 @@ generated by LALRPOP.")
(sha256
(base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2"))))))
+(define-public rust-lapack-sys-0.14
+ (package
+ (name "rust-lapack-sys")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lapack-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1gmw6fn4zc6106pzpi88p79b260h7hav40b7sfisf45lbz45czs4"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "lapack")
+ (substitute* "bin/wrapper.h"
+ (("\"../lapack/LAPACKE/include/lapack.h\"")
+ "<lapack.h>"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+ (inputs (list lapack))
+ (home-page "https://github.com/blas-lapack-rs/lapack-sys")
+ (synopsis "Rust bindings to LAPACK (Fortran)")
+ (description "The package provides bindings to LAPACK (Fortran).")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-lapack-0.19
+ (package
+ (name "rust-lapack")
+ (version "0.19.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lapack" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "01yja6fdjr7h6nqhlamn0mhqv5533735030av2gnmrzp9mmnlrxd"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-lapack-sys" ,rust-lapack-sys-0.14)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-num-complex" ,rust-num-complex-0.4))))
+ (home-page "https://github.com/blas-lapack-rs/lapack")
+ (synopsis "Rust wrappers for LAPACK (Fortran)")
+ (description "The package provides wrappers for LAPACK (Fortran).")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-lazy-bytes-cast-5
(package
(name "rust-lazy-bytes-cast")
@@ -32992,6 +37202,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")
@@ -33102,6 +37358,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")
@@ -33155,6 +37433,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")
@@ -33462,14 +37773,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
@@ -33624,31 +37935,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)
@@ -33672,8 +38004,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
@@ -33683,18 +38039,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
@@ -33853,25 +38204,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
@@ -33936,6 +38284,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")
@@ -34072,6 +38439,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")
@@ -34244,27 +38638,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")
@@ -34546,17 +38958,75 @@ 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-libspa-sys-0.7
+ (package
+ (name "rust-libspa-sys")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "libspa-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ifkg4k7azfqbz4i1lk31d77nhlc2w36s133yf78a3z7yfihrrxk"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66)
+ ("rust-cc" ,rust-cc-1)
+ ("rust-system-deps" ,rust-system-deps-6))))
+ (native-inputs
+ (list pkg-config clang))
+ (inputs
+ (list pipewire))
+ (home-page "https://pipewire.org")
+ (synopsis "Rust FFI bindings for libspa")
+ (description "This package provides Rust FFI bindings for libspa.")
+ (license license:expat)))
+
+(define-public rust-libspa-0.7
+ (package
+ (name "rust-libspa")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "libspa" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1i58ayw50brjh1a7gzfs9ijwl42lqmq2k4b7c2w1ijnx41q62d04"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; NOTE: 1 fail, `async_seq_panic' test should panic.
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-cc" ,rust-cc-1)
+ ("rust-convert-case" ,rust-convert-case-0.6)
+ ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+ ("rust-nix" ,rust-nix-0.26)
+ ("rust-nom" ,rust-nom-7)
+ ("rust-system-deps" ,rust-system-deps-6)
+ ("rust-pipewire" ,rust-pipewire-0.7))))
+ (native-inputs
+ (list pkg-config clang))
+ (inputs
+ (list pipewire))
+ (home-page "https://pipewire.org")
+ (synopsis "Rust bindings for libspa")
+ (description "This package provides Rust bindings for libspa.")
+ (license license:expat)))
+
+(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)
@@ -34570,9 +39040,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)
@@ -34694,15 +39187,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
@@ -34958,23 +39450,23 @@ pairs in insertion order.")
("rust-serde" ,rust-serde-0.8)
("rust-serde-test" ,rust-serde-test-0.8))))))
-(define-public rust-linkify-0.4
+(define-public rust-linkify-0.7
(package
(name "rust-linkify")
- (version "0.4.0")
+ (version "0.7.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "linkify" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "15i0q81vrhm4asskacy2z83fyj09ivcff0km82gwbli4vlkib583"))))
+ (base32 "1y99xcmy6793m6x3z2qcyiw3dfrdvza3n659lmlv7kpzq7yjin04"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-memchr" ,rust-memchr-2))
#:cargo-development-inputs
- (("rust-version-sync" ,rust-version-sync-0.8))))
+ (("rust-doc-comment" ,rust-doc-comment-0.3))))
(home-page "https://github.com/robinst/linkify")
(synopsis "Find URLs and email addresses in plain text")
(description
@@ -34983,6 +39475,24 @@ in plain text. It is smart about where a link ends, such as with trailing
punctuation.")
(license (list license:expat license:asl2.0))))
+(define-public rust-linkify-0.4
+ (package
+ (inherit rust-linkify-0.7)
+ (name "rust-linkify")
+ (version "0.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "linkify" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "15i0q81vrhm4asskacy2z83fyj09ivcff0km82gwbli4vlkib583"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-memchr" ,rust-memchr-2))
+ #:cargo-development-inputs
+ (("rust-version-sync" ,rust-version-sync-0.8))))))
+
(define-public rust-linux-keyutils-0.2
(package
(name "rust-linux-keyutils")
@@ -35157,8 +39667,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
@@ -35168,7 +39706,6 @@ Linux userspace APIs.")
(sha256
(base32
"1rwwdrzc5hmfisc9c3zcvnab14rgh0zfa636c2jbhv4az5qf73bd"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-clap" ,rust-clap-4)
@@ -35176,13 +39713,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
@@ -35227,19 +39758,67 @@ 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-libudev-sys-0.1
+ (package
+ (name "rust-libudev-sys")
+ (version "0.1.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "libudev-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09236fdzlx9l0dlrsc6xx21v5x8flpfm3d5rjq9jr5ivlas6k11w"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))))
+ (home-page "https://github.com/dcuddeback/libudev-sys")
+ (synopsis "FFI bindings to libudev")
+ (description "This package provides FFI bindings to libudev.")
+ (license license:expat)))
+
+(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
@@ -35248,6 +39827,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")
@@ -35267,6 +39860,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")
@@ -35420,7 +40056,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)
@@ -35428,7 +40064,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.
@@ -35440,6 +40076,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)
@@ -35695,18 +40332,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")
@@ -35715,8 +40351,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
@@ -35726,7 +40401,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)
@@ -35741,14 +40415,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
@@ -35864,8 +40532,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
@@ -35875,19 +40567,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
@@ -35908,35 +40594,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)
@@ -36078,6 +40805,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")
@@ -36573,23 +41321,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))))
@@ -36599,6 +41347,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)
@@ -36716,6 +41485,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")
@@ -37411,21 +42201,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
@@ -37448,22 +42235,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
@@ -37481,7 +42266,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
@@ -37555,8 +42345,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
@@ -37574,63 +42396,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
@@ -37731,6 +42497,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")
@@ -37788,6 +42674,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")
@@ -37898,7 +42807,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)
@@ -37906,15 +42815,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
@@ -38041,8 +42949,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
@@ -38052,13 +42980,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
@@ -38251,6 +43174,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")
@@ -38334,8 +43292,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
@@ -38345,7 +43331,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
@@ -38357,11 +43342,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
@@ -38490,8 +43471,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
@@ -38500,33 +43502,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)
@@ -38548,14 +43544,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
@@ -38564,7 +43560,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
@@ -38634,6 +43630,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")
@@ -38728,23 +43738,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)
@@ -38755,10 +43786,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.
@@ -38767,6 +43800,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")
@@ -38810,8 +43874,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
@@ -38821,41 +43909,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
@@ -40883,8 +45982,65 @@ nitrokey-test crate.")
(description "Unified interface for Linux network state querying.")
(license license:asl2.0)))
+(define-public rust-nix-0.28
+ (package
+ (name "rust-nix")
+ (version "0.28.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nix" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1r0rylax4ycx3iqakwjvaa178jrrwiiwghcw95ndzy72zk25c8db"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--all-features"
+ "--"
+ ; The following tests do not seem to terminate
+ "--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"
+ ; The following tests are failing
+ "--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"
+ ; The following tests are panicking
+ "--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-2)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-cfg-aliases" ,rust-cfg-aliases-0.1)
+ ("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)
+ ("rust-caps" ,rust-caps-0.5)
+ ("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))))
+ (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)))
+
(define-public rust-nix-0.27
(package
+ (inherit rust-nix-0.28)
(name "rust-nix")
(version "0.27.1")
(source
@@ -40894,7 +46050,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
@@ -40910,36 +46065,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
@@ -40996,22 +46172,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
@@ -41024,13 +46227,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)
@@ -41044,51 +46265,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-inputs
- (("rust-bitflags" ,rust-bitflags-1)
+ `(#: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.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-inputs
- (("rust-bitflags" ,rust-bitflags-1)
+ `(#: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.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
@@ -41300,29 +46592,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")
@@ -41516,6 +46821,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)
@@ -41606,6 +46932,30 @@ combinators library (fork for proposals for v8)")
(description "This package provides custom derive nom parsers from structs.")
(license (list license:expat license:asl2.0))))
+(define-public rust-nom-locate-4
+ (package
+ (name "rust-nom-locate")
+ (version "4.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nom_locate" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1wx87c2pm84h63rb4rsjrqzgx574x1zy93av1jk3swdhag086g0y"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bytecount" ,rust-bytecount-0.6)
+ ("rust-memchr" ,rust-memchr-1)
+ ("rust-nom" ,rust-nom-7)
+ ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+ (home-page "https://github.com/fflorent/nom_locate")
+ (synopsis "Special input type for @code{nom} to locate tokens")
+ (description
+ "This package provides a special input type for @code{nom} to locate
+tokens.")
+ (license license:expat)))
+
(define-public rust-nonempty-0.7
(package
(name "rust-nonempty")
@@ -41646,6 +46996,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")
@@ -41877,6 +47245,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")
@@ -41943,6 +47365,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")
@@ -42216,14 +47659,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
@@ -42476,17 +47919,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
@@ -42563,6 +48025,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")
@@ -42861,7 +48343,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)
@@ -42869,7 +48351,7 @@ directly.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1ncwavvwdmsqzxnn65phv6c6nn72pnv9xhpmjd6a429mzf4k6p92"))))
+ "13w5g54a9184cqlbsq80rnxw4jj4s0d8wv75jsq5r2lms8gncsbr"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -42885,7 +48367,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)
@@ -42893,7 +48375,7 @@ directly.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0lp22isvzmmnidbq9n5kbdh8gj0zm3yhxv1ddsn5rp65530fc0vx"))))
+ "1gzm7vc5g9qsjjl3bqk9rz1h6raxhygbrcpbfl04swlh0i506a8l"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -43020,14 +48502,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
@@ -43096,8 +48578,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
@@ -43108,13 +48622,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
@@ -43179,8 +48721,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
@@ -43190,7 +48768,6 @@ form and deobfuscated locally.")
(sha256
(base32
"0fdl7qjsz1j9kl3j7f4656fswzrqpyj2kgaizhknmjrx7mfjd1pa"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
'("--release" "--"
@@ -43205,13 +48782,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
@@ -43302,6 +48873,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")
@@ -43353,6 +48972,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")
@@ -43437,6 +49106,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")
@@ -43576,21 +49262,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
@@ -43598,23 +49285,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
@@ -43741,14 +49460,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"
@@ -43834,14 +49553,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))
@@ -43849,12 +49568,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)
@@ -43932,6 +49654,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")
@@ -44095,6 +49845,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")
@@ -44116,18 +49889,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)
@@ -44137,32 +49940,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))))))
@@ -44171,19 +49972,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
@@ -44193,18 +50020,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
@@ -44314,6 +50135,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")
@@ -44343,19 +50183,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")
@@ -44661,14 +50501,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
@@ -45034,6 +50876,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")
@@ -45378,14 +51245,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
@@ -45393,10 +51260,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
@@ -45406,7 +51273,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)
@@ -45414,14 +51281,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
@@ -45444,16 +51304,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)
@@ -45470,31 +51328,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
@@ -45621,8 +51474,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
@@ -45632,7 +51547,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
@@ -45646,12 +51560,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
@@ -45779,14 +51741,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
@@ -45878,7 +51840,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))))))
@@ -46026,25 +51988,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")
@@ -46091,8 +52069,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
@@ -46103,7 +52118,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
@@ -46113,11 +52127,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
@@ -46265,27 +52275,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")
@@ -47007,16 +53033,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)
@@ -47111,14 +53137,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)
@@ -47339,14 +53365,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)
@@ -47357,7 +53383,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))))))
@@ -47521,6 +53547,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")
@@ -47545,17 +53588,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)
@@ -47621,21 +53667,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
@@ -47756,6 +53802,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")
@@ -47813,6 +53878,63 @@ along with strong support for variations and the core header tables.")
#:cargo-development-inputs
(("rust-futures" ,rust-futures-0.3))))))
+(define-public rust-pipewire-sys-0.7
+ (package
+ (name "rust-pipewire-sys")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "pipewire-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0r4z0farzflycgfp6x7z65h57np4l1qnpj4r8z5lcwkkgd70h349"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66)
+ ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+ ("rust-system-deps" ,rust-system-deps-6))))
+ (native-inputs
+ (list pkg-config clang))
+ (inputs
+ (list pipewire))
+ (home-page "https://pipewire.org")
+ (synopsis "Rust FFI bindings for PipeWire")
+ (description
+ "This package provides Rust FFI bindings for @code{PipeWire}.")
+ (license license:expat)))
+
+(define-public rust-pipewire-0.7
+ (package
+ (name "rust-pipewire")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "pipewire" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1sg9cbvhp0s07a337zwli0xm40f8wkvm06d72nsr1s35vp40kl52"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-bitflags" ,rust-bitflags-2)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libspa" ,rust-libspa-0.7)
+ ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+ ("rust-nix" ,rust-nix-0.26)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pipewire-sys" ,rust-pipewire-sys-0.7)
+ ("rust-thiserror" ,rust-thiserror-1))))
+ (native-inputs
+ (list pkg-config))
+ (inputs
+ (list pipewire clang))
+ (home-page "https://pipewire.org")
+ (synopsis "Rust bindings for PipeWire")
+ (description "This package provides Rust bindings for @code{PipeWire}.")
+ (license license:expat)))
+
(define-public rust-pkg-config-0.3
(package
(name "rust-pkg-config")
@@ -47891,6 +54013,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")
@@ -47915,6 +54060,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")
@@ -47969,30 +54136,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
@@ -48003,16 +54193,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.")
@@ -48021,21 +54210,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.")
@@ -48044,19 +54235,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.")
@@ -48109,80 +54301,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")
@@ -48202,8 +54442,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
@@ -48213,21 +54487,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
@@ -48237,21 +54580,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
@@ -48261,10 +54696,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)
@@ -48287,15 +54720,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
@@ -48305,7 +54838,6 @@ applications.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0mq921184vwmadxz3996g0ilb4wiws3fajgxpvkkw1152pszb98i"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -48326,14 +54858,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
@@ -48343,7 +54945,6 @@ applications.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0qabh08q4978s33d2mn2m8c90spg21frr4lhpyxx2ngsw93scgns"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -48353,12 +54954,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
@@ -48467,23 +55355,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")
@@ -48580,6 +55488,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")
@@ -48748,6 +55705,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")
@@ -48800,14 +55836,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
@@ -48817,7 +55853,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))
@@ -49104,6 +56139,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)
@@ -49349,6 +56404,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")
@@ -49628,22 +56706,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
@@ -49711,7 +56792,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)
@@ -49720,9 +56801,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")
@@ -49743,8 +56845,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
@@ -49754,7 +57048,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)
@@ -49785,14 +57078,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
@@ -49940,6 +57226,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")
@@ -50120,8 +57431,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
@@ -50131,7 +57479,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
@@ -50141,13 +57488,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
@@ -50221,6 +57562,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)
@@ -50239,6 +57601,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")
@@ -50285,6 +57716,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)
@@ -50306,67 +57756,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
@@ -50668,6 +58095,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")
@@ -50793,6 +58282,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)
@@ -50866,37 +58377,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")
@@ -50954,17 +58434,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)
@@ -50980,6 +58480,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)
@@ -51019,14 +58538,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
@@ -51057,21 +58576,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")
@@ -51079,6 +58599,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)
@@ -51117,17 +58654,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))))))
@@ -51158,29 +58694,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)
@@ -51197,7 +58754,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
@@ -51221,19 +58779,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))))))
@@ -51257,29 +58813,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)
@@ -51297,7 +58874,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
@@ -51341,18 +58919,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))))))
@@ -51375,22 +58953,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)
@@ -51402,22 +58981,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")
@@ -51427,6 +59008,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)
@@ -51529,14 +59154,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)
@@ -51550,7 +59175,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)
@@ -51558,16 +59182,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
@@ -51774,6 +59397,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")
@@ -51955,6 +59598,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)
@@ -52714,6 +60371,53 @@ radix.")
learnt from TrieMap and Sequence Trie.")
(license license:expat)))
+(define-public rust-railroad-0.2
+ (package
+ (name "rust-railroad")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "railroad" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "08y86hb3vp0i9k9dkz3lbfhrd8x051f6pcg3p87z65ss3shdmzh1"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-htmlescape" ,rust-htmlescape-0.3)
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
+ #:cargo-development-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-railroad-verification" ,rust-railroad-verification-0.1))))
+ (home-page "https://github.com/lukaslueg/railroad")
+ (synopsis "library to create syntax-diagrams as Scalable Vector Graphics")
+ (description
+ "This package provides a library to create syntax-diagrams as Scalable
+Vector Graphics.")
+ (license license:expat)))
+
+(define-public rust-railroad-verification-0.1
+ (package
+ (name "rust-railroad-verification")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "railroad_verification" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "131qx7xjs06gmna8xvnw6js31y9wmhayaiykssv45qrh3gr7c9dr"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/lukaslueg/railroad-verification")
+ (synopsis "Common verification against SVG11-DTD for @code{railroad}")
+ (description
+ "This package provides common verification against SVG11-DTD for
+@code{railroad}.")
+ (license license:expat)))
+
(define-public rust-rand-0.8
(package
(name "rust-rand")
@@ -53410,6 +61114,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")
@@ -53642,8 +61372,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
@@ -53653,7 +61536,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" "--"
@@ -53669,15 +61551,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
@@ -53802,19 +61677,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))))
@@ -53876,20 +61752,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)
@@ -53900,6 +61776,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")
@@ -53956,6 +61855,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")
@@ -53977,22 +61919,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")
@@ -54000,6 +61942,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)
@@ -54074,21 +62034,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
@@ -54137,6 +62098,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")
@@ -54255,6 +62256,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")
@@ -54282,14 +62323,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
@@ -54370,14 +62411,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.
@@ -54453,6 +62494,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")
@@ -54918,6 +62983,19 @@ Should not be used directly.")
functionality as retain but gives mutable borrow to the predicate.")
(license license:expat)))
+(define-public rust-retain-mut-0.1.7
+ (package
+ (inherit rust-retain-mut-0.1)
+ (name "rust-retain-mut")
+ (version "0.1.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "retain_mut" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "11j09lp1wqwc2r9bw58my2474zj95jz5fihff3ldv3rz0g2baccc"))))))
+
(define-public rust-rfc2047-decoder-0.2
(package
(name "rust-rfc2047-decoder")
@@ -54944,6 +63022,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")
@@ -55160,6 +63306,61 @@ MessagePack format.")
(description "Model a project roadmap as a directed acyclic graph.")
(license license:expat-0)))
+(define-public rust-roaring-0.10
+ (package
+ (name "rust-roaring")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "roaring" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0wcgprdw49xy7w00zzspbhrq8f1kvlwqasmfxh8y1gd84vlba3zg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1)
+ ("rust-byteorder" ,rust-byteorder-1)
+ ("rust-retain-mut" ,rust-retain-mut-0.1.7)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)
+ ("rust-proptest" ,rust-proptest-1)
+ ("rust-serde-json" ,rust-serde-json-1))))
+ (home-page "https://github.com/RoaringBitmap/roaring-rs")
+ (synopsis "Better compressed bitset as a pure Rust implementation")
+ (description
+ "This package provides a better compressed bitset, as a pure Rust
+implementation.")
+ (license (list license:expat license:asl2.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")
@@ -55337,23 +63538,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")
@@ -55394,6 +63597,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")
@@ -56070,123 +64393,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
@@ -56349,8 +64682,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
@@ -56360,7 +64769,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)
@@ -56382,12 +64790,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
@@ -56421,6 +64824,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")
@@ -56502,39 +64943,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
@@ -56542,8 +64993,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
@@ -56553,9 +65065,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)
@@ -56565,8 +65078,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
@@ -56576,6 +65109,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
@@ -56585,45 +65119,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")
@@ -56721,6 +65262,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")
@@ -56843,23 +65401,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")
@@ -56867,6 +65424,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)
@@ -56938,7 +65514,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)
@@ -56946,11 +65522,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")
@@ -57160,29 +65735,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
@@ -57248,26 +65822,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
@@ -57350,6 +65922,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")
@@ -57372,8 +65974,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
@@ -57383,18 +66059,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
@@ -57445,17 +66116,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$"))
@@ -57738,6 +66431,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")
@@ -57830,8 +66547,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
@@ -57841,7 +66605,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)
@@ -57867,12 +66630,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
@@ -58045,17 +66803,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)
@@ -58066,6 +66824,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)
@@ -58100,17 +66875,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
@@ -58126,7 +66901,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))))
@@ -58136,6 +66911,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")
@@ -58377,27 +67183,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
@@ -58485,6 +67304,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")
@@ -58662,18 +67662,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)
@@ -58681,15 +67683,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")
@@ -58697,32 +67703,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")
@@ -58791,7 +67845,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)
@@ -58799,7 +67853,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")
@@ -58826,6 +67880,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")
@@ -59218,6 +68291,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")
@@ -59453,17 +68539,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
@@ -59691,10 +68832,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)
@@ -59702,7 +68864,7 @@ formats:
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0wxplk1ayrsb81bdwh8zmkldw1b0xigs3qc90r5ck6374nc4848b"))))
+ "1qjcxqd3p4yh5cmmax9q4ics1zy34j5ij32cvjj5dc5rw5rwic9z"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -60131,7 +69293,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)
@@ -60139,7 +69301,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
@@ -60182,29 +69344,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)
@@ -60252,18 +69431,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)
@@ -60377,8 +69555,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
@@ -60388,7 +69603,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.
@@ -60402,15 +69616,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
@@ -60470,16 +69676,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
@@ -60589,6 +69799,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")
@@ -60690,14 +69921,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"
@@ -60705,12 +69936,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)
@@ -60718,7 +69950,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))
@@ -60726,35 +69960,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
@@ -60780,6 +70055,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")
@@ -60944,8 +70244,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
@@ -60955,7 +70285,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)
@@ -60968,12 +70297,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
@@ -61080,8 +70404,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
@@ -61091,19 +70440,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
@@ -61375,24 +70718,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
@@ -61401,6 +70754,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")
@@ -61595,14 +70966,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")
@@ -61963,7 +71334,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)
@@ -61971,7 +71342,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
@@ -61980,8 +71351,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.")
@@ -62011,6 +71381,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")
@@ -62034,14 +71457,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
@@ -62136,6 +71559,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")
@@ -62715,6 +72157,26 @@ implementations.")
("rust-mach" ,rust-mach-0.2)
("rust-winapi" ,rust-winapi-0.3))))))
+(define-public rust-slice-group-by-0.3
+ (package
+ (name "rust-slice-group-by")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "slice-group-by" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "19vbyyxqvc25fv2dmhlxijlk5sa9j34yb6hyydb9vf89kh36fqc2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.6))))
+ (home-page "https://github.com/Kerollmops/slice-group-by")
+ (synopsis "Iterators over groups in slices and strs")
+ (description
+ "This package provides iterators over groups in slices and strs.")
+ (license license:expat)))
+
(define-public rust-slog-2
(package
(name "rust-slog")
@@ -62745,25 +72207,26 @@ 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.")
+ (description
+ "This package provides an asynchronous drain for slog-rs, the Rust
+logging library.")
(license (list license:mpl2.0 license:expat license:asl2.0))))
(define-public rust-slog-kvfilter-0.7
@@ -62987,26 +72450,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
@@ -63039,14 +72501,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
@@ -63471,14 +72933,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))))
@@ -63510,8 +72972,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
@@ -63521,7 +73033,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)
@@ -63543,21 +73054,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
@@ -63675,6 +73172,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")
@@ -63885,6 +73409,19 @@ spinning. They may contain data, are usable without @code{std},and static
initializers are available.")
(license license:expat)))
+(define-public rust-spin-0.7
+ (package
+ (inherit rust-spin-0.9)
+ (name "rust-spin")
+ (version "0.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "spin" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k"))))))
+
(define-public rust-spin-0.5
(package
(inherit rust-spin-0.9)
@@ -64236,6 +73773,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")
@@ -64369,6 +73937,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")
@@ -64391,6 +74048,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")
@@ -64415,6 +74092,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")
@@ -64464,8 +74162,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
@@ -64475,18 +74197,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
@@ -64565,7 +74280,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")
@@ -64846,6 +74564,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")
@@ -64873,16 +74654,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
@@ -65102,6 +74882,30 @@ developed as part of the Servo project.")
"Code share between string_cache and string_cache_codegen.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-string-interner-0.12
+ (package
+ (name "rust-string-interner")
+ (version "0.12.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "string-interner" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "021whb6wrfq4mbdcdlrm6f01ncvh23yd2r08kxpyw5v5hz8rcc9q"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-hashbrown" ,rust-hashbrown-0.9)
+ ("rust-serde" ,rust-serde-1))))
+ (home-page "https://github.com/robbepop/string-interner")
+ (synopsis "Efficient string interner")
+ (description
+ "This package provides an efficient string interner with minimal memory
+footprint and fast access to the underlying strings.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-stringprep-0.1
(package
(name "rust-stringprep")
@@ -65168,6 +74972,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")
@@ -65222,19 +75081,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")
@@ -65243,6 +75100,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)
@@ -65315,8 +75185,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
@@ -65326,21 +75267,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
@@ -65350,17 +75309,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
@@ -65484,25 +75437,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
@@ -65510,6 +75464,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)
@@ -65598,31 +75570,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)
@@ -65954,8 +75949,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
@@ -65965,20 +75981,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
@@ -65988,14 +76033,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")
@@ -66452,6 +76524,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")
@@ -67157,14 +77328,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
@@ -67177,18 +77348,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
@@ -67339,26 +77515,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
@@ -67367,6 +77542,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")
@@ -67487,8 +77682,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
@@ -67498,11 +77732,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"
@@ -67519,13 +77754,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
@@ -67559,35 +77788,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")
@@ -67750,6 +77950,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")
@@ -67879,6 +78129,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")
@@ -67900,6 +78171,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")
@@ -67936,17 +78224,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
@@ -67956,7 +78244,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))
@@ -67968,6 +78256,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")
@@ -68049,14 +78360,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")
@@ -68069,8 +78380,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/")
@@ -68084,14 +78394,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
@@ -68190,14 +78500,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
@@ -68238,8 +78548,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
@@ -68249,7 +78594,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)
@@ -68261,26 +78605,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
@@ -68393,14 +78730,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
@@ -68522,14 +78859,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
@@ -68558,6 +78895,43 @@ loading and layout routines of XeTeX as a crate, currently providing only
a C API.")
(license license:expat)))
+(define-public rust-temp-env-0.3
+ (package
+ (name "rust-temp-env")
+ (version "0.3.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "temp-env" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0l7hpkd0nhiy4w70j9xbygl1vjr9ipcfxii164n40iwg0ralhdwn"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-futures" ,rust-futures-0.3)
+ ("rust-parking-lot" ,rust-parking-lot-0.12))
+ #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+ (home-page "https://github.com/vmx/temp-env")
+ (synopsis "Set environment variables temporarily")
+ (description
+ "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")
@@ -68605,20 +78979,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
@@ -68921,6 +79294,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")
@@ -68980,8 +79376,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
@@ -68996,7 +79420,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
@@ -69005,11 +79428,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
@@ -69069,33 +79488,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
@@ -69105,7 +79572,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
@@ -69113,12 +79579,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
@@ -69144,7 +79605,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)
@@ -69152,7 +79613,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
@@ -69183,6 +79644,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")
@@ -69604,6 +80184,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")
@@ -69632,6 +80229,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")
@@ -69685,6 +80304,27 @@ handle Unicode characters correctly.")
("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
("rust-unicode-width" ,rust-unicode-width-0.1))))))
+(define-public rust-textwrap-0.14
+ (package
+ (inherit rust-textwrap-0.15)
+ (name "rust-textwrap")
+ (version "0.14.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "textwrap" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "106xjfzfpk3nj51fx9slf9kyir7xjwvpqm003v9ardgq5b8whrh0"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-hyphenation" ,rust-hyphenation-0.8)
+ ("rust-smawk" ,rust-smawk-0.3)
+ ("rust-terminal-size" ,rust-terminal-size-0.1)
+ ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1))))))
+
(define-public rust-textwrap-0.12
(package
(inherit rust-textwrap-0.15)
@@ -69750,6 +80390,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")
@@ -69843,22 +80506,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")
@@ -70039,8 +80720,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
@@ -70050,7 +80757,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
@@ -70058,12 +80764,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
@@ -70158,14 +80859,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
@@ -70174,7 +80875,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)
@@ -70182,6 +80885,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)
@@ -70314,17 +81018,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
@@ -70638,29 +81343,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
@@ -70692,39 +81391,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
@@ -70733,6 +81430,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")
@@ -70815,14 +81529,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`
@@ -70844,7 +81558,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)
@@ -71383,6 +82097,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")
@@ -72318,29 +83062,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)
@@ -72353,6 +83098,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)
@@ -72384,6 +83158,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")
@@ -72716,21 +83519,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)
@@ -72902,17 +83705,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)
@@ -72920,9 +83723,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)
@@ -72933,6 +83736,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)
@@ -73112,13 +83941,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))))
@@ -73728,8 +84557,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
@@ -73740,7 +84605,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)
@@ -73756,13 +84620,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
@@ -73945,25 +84803,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")
@@ -74001,8 +84859,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
@@ -74011,7 +84902,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)
@@ -74025,13 +84915,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
@@ -74125,6 +85009,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)
@@ -74243,8 +85143,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
@@ -74254,18 +85179,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
@@ -74353,6 +85300,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")
@@ -74393,6 +85369,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")
@@ -74414,7 +85419,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)
@@ -74423,7 +85428,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")
@@ -74469,6 +85474,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)
@@ -74509,6 +85530,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")
@@ -74555,6 +85593,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")
@@ -74646,8 +85841,55 @@ with the Unicode character database.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-udev-0.7
+ (package
+ (name "rust-udev")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "udev" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06hr927z0fdn7ay0p817b9x19i5fagmpmvz95yhl4d1pf3bbpgaf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+ ("rust-libudev-sys" ,rust-libudev-sys-0.1)
+ ("rust-mio" ,rust-mio-0.6)
+ ("rust-mio" ,rust-mio-0.7)
+ ("rust-mio" ,rust-mio-0.8)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))))
+ (home-page "https://github.com/Smithay/udev-rs")
+ (synopsis "libudev bindings for Rust")
+ (description "This package provides libudev bindings for Rust.")
+ (license 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
@@ -74658,22 +85900,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
@@ -74684,17 +85942,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
@@ -74806,25 +86059,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")
@@ -75036,6 +86304,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")
@@ -75061,6 +86350,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")
@@ -75316,17 +86675,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
@@ -75339,6 +86718,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")
@@ -75661,6 +87062,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")
@@ -75824,6 +87259,42 @@ untrusted inputs in Rust.")
Unix users and groups.")
(license license:expat)))
+(define-public rust-ustr-0.9
+ (package
+ (name "rust-ustr")
+ (version "0.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ustr" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "177sfj2gcxcxbyw756k4r7dbpsnkjrb62nrqvibdx019kw4kc51p"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ahash" ,rust-ahash-0.7)
+ ("rust-byteorder" ,rust-byteorder-1)
+ ("rust-fasthash" ,rust-fasthash-0.4)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-spin" ,rust-spin-0.7))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-string-interner" ,rust-string-interner-0.12)
+ ("rust-string-cache" ,rust-string-cache-0.8))))
+ (home-page "https://github.com/anderslanglands/ustr")
+ (synopsis "Fast, FFI-friendly string interning")
+ (description
+ "This package provides a fast and FFI-friendly string interning.")
+ (license (license:non-copyleft
+ "https://spdx.org/licenses/BSD-2-Clause-Patent.html"))))
+
(define-public rust-utf-8-0.7
(package
(name "rust-utf-8")
@@ -75945,6 +87416,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")
@@ -76097,28 +87775,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")
@@ -76272,14 +87964,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
@@ -76296,18 +87988,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)
@@ -76321,14 +88013,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
@@ -76345,6 +88037,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")
@@ -76403,6 +88143,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")
@@ -76864,17 +88627,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"
@@ -77005,14 +88767,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
@@ -77501,8 +89263,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
@@ -77512,7 +89330,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)
@@ -77522,12 +89339,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
@@ -77553,8 +89365,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
@@ -77564,50 +89430,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
@@ -77617,7 +89720,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)
@@ -77632,12 +89734,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
@@ -77698,21 +89795,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)
@@ -77720,15 +89818,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")
@@ -77851,8 +89977,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
@@ -77867,7 +90208,6 @@ using @code{bindgen}.")
'(begin (substitute* "Cargo.toml"
(("\"= *([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
(string-append "\"^" version)))))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
'("--release" "--"
@@ -77879,14 +90219,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
@@ -77950,6 +90283,22 @@ executable.")
#:cargo-development-inputs
(("rust-tempdir" ,rust-tempdir-0.3))))))
+(define-public rust-which-1
+ (package
+ (inherit rust-which-4)
+ (name "rust-which")
+ (version "1.0.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "which" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1cjwa57kzfgzs681a27m5pjmq580pv3hkcg23smf270bgqz60jp8"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
+
(define-public rust-whoami-1
(package
(name "rust-whoami")
@@ -77989,21 +90338,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
@@ -78109,14 +90457,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))
@@ -78128,32 +90476,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)
@@ -78347,21 +90742,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
@@ -78684,26 +91085,68 @@ file into an in-memory tree structure.")
(("rust-indexmap" ,rust-indexmap-1)
("rust-xml-rs" ,rust-xml-rs-0.7))))))
+(define-public rust-xoroshiro128-0.3
+ (package
+ (name "rust-xoroshiro128")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "xoroshiro128" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1kfzanis2v39r8q963q161izv0hmfsdxa11cxgqw8jgcp8sdmvp0"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-rand" ,rust-rand-0.4))))
+ (home-page "https://github.com/mscharley/rust-xoroshiro128")
+ (synopsis "Fast pseudo-random number generators")
+ (description
+ "This package provides fast pseudo-random number generators.")
+ (license license:expat)))
+
(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")
@@ -78730,7 +91173,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)
@@ -78738,17 +91181,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))
@@ -78965,6 +91411,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")
@@ -79204,7 +91672,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`
@@ -79270,7 +91743,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`
@@ -79415,6 +91893,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")
@@ -79444,7 +91924,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
@@ -79489,6 +91971,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
@@ -79565,7 +92049,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
@@ -79581,6 +92067,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
@@ -79637,31 +92125,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/cross-base.scm b/gnu/packages/cross-base.scm
index 2cc5f52e47..cecc21083e 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2018, 2020, 2023-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
@@ -80,9 +80,9 @@
(name (string-append (package-name p) "-cross-" target))
(arguments
(substitute-keyword-arguments (package-arguments p)
- ((#:configure-flags flags ''())
- `(cons ,(string-append "--target=" target)
- ,flags))))))
+ ((#:configure-flags flags #~'())
+ #~(cons #$(string-append "--target=" target)
+ #$flags))))))
(define (contains-keyword? args)
"Check if ARGS contains a keyword object."
@@ -127,7 +127,7 @@
;; to pick up native libs instead of target ones. In
;; practice the RUNPATH of target libs only refers to
;; target libs, not native libs, so this is safe.
- `(cons "--with-sysroot=/" ,flags)))))))
+ #~(cons "--with-sysroot=/" #$flags)))))))
;; For xtensa-ath9k-elf, apply Qualcomm's patch.
(cross (cond ((string=? target "xtensa-ath9k-elf")
@@ -231,8 +231,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)"
(remove
(lambda (flag)
- (or (and #$libc
- (string-prefix? "--enable-languages" flag))
+ (or (string-prefix? "--enable-languages" flag)
(and #$libc
#$(target-avr? target)
(string-prefix? "--with-native-system-header-dir"
@@ -359,7 +358,7 @@ target that libc."
(arguments
`(#:implicit-inputs? #f
#:imported-modules ((gnu build cross-toolchain)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules ((guix build gnu-build-system)
(guix build utils)
(gnu build cross-toolchain)
@@ -698,35 +697,62 @@ returned."
(guix build utils)
(srfi srfi-26))
- ,@(package-arguments libc))
- ((#:configure-flags flags)
- `(cons ,(string-append "--host=" target)
- ,(if (target-hurd? target)
- `(append (list "--disable-werror"
- ,@%glibc/hurd-configure-flags)
- ,flags)
- flags)))
- ((#:phases phases)
- `(modify-phases ,phases
- (add-before 'configure 'set-cross-kernel-headers-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((kernel (assoc-ref inputs "kernel-headers"))
- (cpath (string-append kernel "/include")))
- (for-each (cut setenv <> cpath)
- ',%gcc-cross-include-paths)
- (setenv "CROSS_LIBRARY_PATH"
- (string-append kernel "/lib")) ; for Hurd's libihash
- #t)))
- ,@(if (target-hurd? target)
- '((add-after 'install 'augment-libc.so
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (substitute* (string-append out "/lib/libc.so")
- (("/[^ ]+/lib/libc.so.0.3")
- (string-append out "/lib/libc.so.0.3"
- " libmachuser.so libhurduser.so"))))
- #t)))
- '())))))
+ ,@(package-arguments libc))
+ ((#:configure-flags flags)
+ `(cons ,(string-append "--host=" target)
+ ,(if (target-hurd? target)
+ `(append (list "--disable-werror")
+ ,flags)
+ flags)))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'configure 'set-cross-kernel-headers-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((kernel (assoc-ref inputs "kernel-headers"))
+ (cpath (string-append kernel "/include")))
+ (for-each (cut setenv <> cpath)
+ ',%gcc-cross-include-paths)
+ (setenv "CROSS_LIBRARY_PATH"
+ (string-append kernel "/lib")) ; for Hurd's libihash
+ #t)))
+ (add-before 'configure 'add-cross-binutils-to-PATH
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
+ ;; -print-prog-name=objdump' returns the correct name. See
+ ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
+ (define cross-objdump
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append ,target "/bin/objdump")))
+
+ (define cross-binutils
+ (dirname cross-objdump))
+
+ (format #t "adding '~a' to the front of 'PATH'~%"
+ cross-binutils)
+ (setenv "PATH" (string-append cross-binutils ":"
+ (getenv "PATH")))))
+
+ ;; This phase would require running 'localedef' built for
+ ;; TARGET, which is impossible by definition.
+ (delete 'install-utf8-c-locale)
+
+ ,@(if (target-hurd? target)
+ '((add-after 'install 'augment-libc.so
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/libc.so")
+ (("/[^ ]+/lib/libc.so.0.3")
+ (string-append out "/lib/libc.so.0.3"
+ " libmachuser.so libhurduser.so"))))))
+ (add-after 'install 'create-machine-symlink
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (cpu "i386"))
+ (symlink cpu
+ (string-append out
+ "/include/mach/machine"))))))
+ '())))))
;; Shadow the native "kernel-headers" because glibc's recipe expects the
;; "kernel-headers" input to point to the right thing.
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 9c62689d18..479135ee8d 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -49,6 +49,7 @@
#:use-module (gnu packages aidc)
#:use-module (gnu packages attr)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -489,7 +490,8 @@ total number of shares generated.")
(build-system gnu-build-system)
(native-inputs (list sudo)) ;presence needed for 'check' phase
(inputs
- `(("zsh" ,zsh)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("zsh" ,zsh)
("gnupg" ,gnupg)
("cryptsetup" ,cryptsetup)
("e2fsprogs" ,e2fsprogs) ;for mkfs.ext4
@@ -504,7 +506,7 @@ total number of shares generated.")
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
;; The "sudo" input is needed only to satisfy dependency checks in the
;; 'check' phase. The "sudo" used at runtime should come from the
- ;; system's setuid-programs, so ensure no reference is kept.
+ ;; system's privileged-programs, so ensure no reference is kept.
#:disallowed-references (,sudo)
;; TODO: Build and install gtk and qt trays
#:phases
@@ -1078,7 +1080,7 @@ trivial to build for local use. Portability is emphasized over performance.")
(define-public libsecp256k1
(package
(name "libsecp256k1")
- (version "0.3.2")
+ (version "0.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1087,13 +1089,17 @@ trivial to build for local use. Portability is emphasized over performance.")
(file-name (git-file-name name version))
(sha256
(base32
- "12wksk7bi3yfzmk1zwh5b6846zcaycqz1w4w4p23apjc8da4jwpn"))))
+ "1f3nq1dg6afbwp45m2rbndd8mpvx7hhggmzji22csyzwhq3fz2r1"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; These files are pre-generated, the build system is able to
+ ;; re-generate those.
+ #~(for-each delete-file '("src/precomputed_ecmult.c"
+ "src/precomputed_ecmult_gen.c")))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-module-recovery"
"--enable-experimental"
- "--enable-module-ecdh"
- "--enable-module-schnorrsig"
"--enable-shared"
"--disable-static"
"--disable-benchmark")))
@@ -1554,14 +1560,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 +1579,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))
@@ -1647,22 +1653,16 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
(version "4.4.36")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/besser82/libxcrypt")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/besser82/libxcrypt/releases/download/v" version
+ "/libxcrypt-" version ".tar.xz"))
(sha256
- (base32 "1yhpjjjv38y14nrj15bkndq824v42plndgi3k8mmc04grj1fbnjf"))))
+ (base32 "0hw9zphnbzgys5k7ja37iqmwmlyn0y417qr6xqmdw08axv5g9qg5"))))
(build-system gnu-build-system)
(native-inputs
- (list autoconf
- automake
- libtool
- perl
- pkg-config
- python-3
- python-passlib))
+ (list perl))
(synopsis
"Extended crypt library for descrypt, md5crypt, bcrypt, and others")
(description
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 3bdc68ae5a..44f9c77984 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages gnupg)
@@ -30,12 +32,13 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages web))
(define-public cryptsetup
(package
(name "cryptsetup")
- (version "2.3.7")
+ (version "2.6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
@@ -43,23 +46,34 @@
"/cryptsetup-" version ".tar.xz"))
(sha256
(base32
- "1a97rvi6arsj8dikh1qsvixx9rizm89k155q2ypifqlqllr530v1"))))
+ "14s6vbb9llpgnhmv0badxxzhi73jp4vyvp8swk4bjah7l5jys3a1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
- (list
- ;; Argon2 is always enabled, this just selects the (faster) full version.
- "--enable-libargon2"
- ;; The default is OpenSSL which provides better PBKDF performance.
- "--with-crypto_backend=gcrypt"
- ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
- "--with-default-luks-format=LUKS1"
- ;; libgcrypt is not found otherwise when cross-compiling.
- ;; <https://issues.guix.gnu.org/63864>
- (string-append "--with-libgcrypt-prefix="
- (assoc-ref %build-inputs "libgcrypt")))))
+ (append
+ (if (assoc-ref %build-inputs "ruby-asciidoctor")
+ '()
+ (list "--disable-asciidoc"))
+ (list
+ ;; Argon2 is always enabled, this just selects the (faster) full version.
+ "--enable-libargon2"
+ ;; The default is OpenSSL which provides better PBKDF performance.
+ "--with-crypto_backend=gcrypt"
+ ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
+ "--with-default-luks-format=LUKS1"
+ ;; External tokens would need an env variable to work on Guix, and we
+ ;; don't have users for it yet.
+ "--disable-external-tokens"
+ "--disable-ssh-token"
+ ;; libgcrypt is not found otherwise when cross-compiling.
+ ;; <https://issues.guix.gnu.org/63864>
+ (string-append "--with-libgcrypt-prefix="
+ (assoc-ref %build-inputs "libgcrypt"))))))
(native-inputs
- (list pkg-config))
+ (append (list pkg-config)
+ (if (supported-package? ruby-asciidoctor)
+ (list ruby-asciidoctor)
+ '())))
(inputs
(list argon2
json-c
@@ -86,6 +100,13 @@ block integrity kernel modules.")
(license license:gpl2)
(home-page "https://gitlab.com/cryptsetup/cryptsetup")))
+(define-public (libcryptsetup-propagated-inputs)
+ (list argon2
+ json-c
+ libgcrypt
+ lvm2
+ `(,util-linux "lib")))
+
(define (static-library library)
"Return a variant of package LIBRARY that provides static libraries ('.a'
files). This assumes LIBRARY uses Libtool."
@@ -94,9 +115,9 @@ files). This assumes LIBRARY uses Libtool."
(name (string-append (package-name library) "-static"))
(arguments
(substitute-keyword-arguments (package-arguments library)
- ((#:configure-flags flags ''())
- `(append '("--disable-shared" "--enable-static")
- ,flags))))))
+ ((#:configure-flags flags #~'())
+ #~(append '("--disable-shared" "--enable-static")
+ #$flags))))))
(define-public cryptsetup-static
;; Stripped-down statically-linked 'cryptsetup' command for use in initrds.
@@ -104,56 +125,59 @@ files). This assumes LIBRARY uses Libtool."
(inherit cryptsetup)
(name "cryptsetup-static")
(arguments
- '(#:configure-flags '("--disable-shared"
- "--enable-static-cryptsetup"
-
- "--disable-veritysetup"
- "--disable-cryptsetup-reencrypt"
- "--disable-integritysetup"
-
- ;; The default is OpenSSL which provides better PBKDF performance.
- "--with-crypto_backend=gcrypt"
-
- "--disable-blkid"
- ;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
- "LIBS=-ludev -pthread -lm")
-
- #:allowed-references () ;this should be self-contained
-
- #:modules ((ice-9 ftw)
- (ice-9 match)
- (guix build utils)
- (guix build gnu-build-system))
+ (substitute-keyword-arguments (package-arguments cryptsetup)
+ ((#:configure-flags flags ''())
+ `(cons* "--disable-shared"
+ "--enable-static-cryptsetup"
- #:phases (modify-phases %standard-phases
- (add-after 'install 'remove-cruft
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Remove everything except the 'cryptsetup' command.
- (let ((out (assoc-ref outputs "out")))
- (with-directory-excursion out
- (let ((dirs (scandir "."
- (match-lambda
- ((or "." "..") #f)
- (_ #t)))))
- (for-each delete-file-recursively
- (delete "sbin" dirs))
- (for-each (lambda (file)
- (rename-file (string-append file
- ".static")
- file)
- (remove-store-references file))
- '("sbin/cryptsetup"))
- #t))))))))
+ "--disable-veritysetup"
+ "--disable-integritysetup"
+ ;; Bypass broken pkg-config paths for the static output of
+ ;; util-linux. Only blkid is located through pkg-config, not
+ ;; uuid.
+ (format #f "BLKID_CFLAGS=-I~a"
+ (search-input-directory %build-inputs "include/blkid"))
+ (format #f "BLKID_LIBS=-L~a -lblkid"
+ (dirname (search-input-file %build-inputs "lib/libblkid.a")))
+ ,flags))
+ ((#:allowed-references refs '())
+ '())
+ ((#:modules modules '())
+ '((ice-9 ftw)
+ (ice-9 match)
+ (guix build utils)
+ (guix build gnu-build-system)))
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'install 'remove-cruft
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Remove everything except the 'cryptsetup' command.
+ (let ((out (assoc-ref outputs "out")))
+ (with-directory-excursion out
+ (let ((dirs (scandir "."
+ (match-lambda
+ ((or "." "..") #f)
+ (_ #t)))))
+ (for-each delete-file-recursively
+ (delete "sbin" dirs))
+ (for-each (lambda (file)
+ (rename-file (string-append file
+ ".static")
+ file)
+ (remove-store-references file))
+ '("sbin/cryptsetup"))
+ #t)))))))))
(inputs
(let ((libgcrypt-static
(package
(inherit (static-library libgcrypt))
(propagated-inputs
`(("libgpg-error-host" ,(static-library libgpg-error)))))))
- `(("json-c" ,json-c-0.13)
+ `(("argon2" ,(static-library argon2))
+ ("json-c" ,(static-library json-c-0.13))
("libgcrypt" ,libgcrypt-static)
("lvm2" ,lvm2-static)
("util-linux" ,util-linux "static")
("util-linux" ,util-linux "lib")
- ("popt" ,popt))))
+ ("popt" ,(static-library popt)))))
(synopsis "Hard disk encryption tool (statically linked)")))
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 3b86b7f610..e8f972c34a 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,13 +1,13 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015-2018, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
@@ -31,7 +31,9 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages fonts) ; font-dejavu
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript)
@@ -42,6 +44,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages pretty-print)
@@ -128,7 +131,7 @@ driver is known to work with these printers:
(define-public cups-filters
(package
(name "cups-filters")
- (version "1.28.15")
+ (version "1.28.16")
(source
(origin
(method url-fetch)
@@ -136,7 +139,7 @@ driver is known to work with these printers:
(string-append "https://openprinting.org/download/cups-filters/"
"cups-filters-" version ".tar.xz"))
(sha256
- (base32 "12s7s2jgnh4q7ws7r2is6xp3pqq818jhnm4vpyzyywmvkxvfq1x9"))
+ (base32 "1h4s35xkbxhxpid39yaiy0gmaj3lck8lhzfdfl3h58hxfpx0nh1s"))
(modules '((guix build utils)))
(snippet
;; Install backends, banners and filters to cups-filters output
@@ -179,7 +182,11 @@ driver is known to work with these printers:
(assoc-ref %build-inputs "bash")
"/bin/bash")
(string-append "--with-rcdir="
- #$output "/etc/rc.d"))
+ #$output "/etc/rc.d")
+ ;; QPDF headers include C++17 libraries such as
+ ;; std::string_view.
+ "CFLAGS=-std=gnu17"
+ "CXXFLAGS=-std=gnu++17")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-foomatic-hardcoded-file-names
@@ -199,9 +206,11 @@ driver is known to work with these printers:
(wrap-program file
`("PATH" ":" prefix
(,(string-append
+ #$(this-package-input "coreutils") "/bin:"
#$(this-package-input "ghostscript-with-cups")
"/bin:"
- #$(this-package-input "grep") "/bin")))))
+ #$(this-package-input "grep") "/bin:"
+ #$(this-package-input "sed") "/bin")))))
(find-files (string-append #$output
"/lib/cups/filter"))))))))
(native-inputs
@@ -212,21 +221,25 @@ driver is known to work with these printers:
pkg-config)))
(inputs
(list avahi
+ bash-minimal
+ coreutils
+ cups-minimal
+ dbus
+ font-dejavu ;also needed by test suite
fontconfig
freetype
- font-dejavu ; also needed by test suite
ghostscript/cups
+ glib
grep
ijs
- dbus
lcms
+ libexif
libjpeg-turbo
libpng
libtiff
- glib
- qpdf
poppler
- cups-minimal))
+ qpdf
+ sed))
(home-page "https://wiki.linuxfoundation.org/openprinting/cups-filters")
(synopsis "OpenPrinting CUPS filters and backends")
(description
@@ -249,8 +262,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
(define-public cups-minimal
(package
(name "cups-minimal")
- (version "2.4.2")
- (replacement cups-minimal/fixed)
+ (version "2.4.9")
(source
(origin
(method git-fetch)
@@ -260,7 +272,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
;; Avoid NAME confusion: these are the complete CUPS sources.
(file-name (git-file-name "cups" version))
(sha256
- (base32 "01nn6ij7kpf2vzikinn7mk4crjx4ab8m4pplvsccc8gg30a2q9y9"))))
+ (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -323,7 +335,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
(if (%current-target-system)
(list this-package)
'())))
- (inputs (list zlib gnutls))
+ (inputs (list zlib gnutls libxcrypt))
(home-page "https://openprinting.github.io/cups")
(synopsis "The Common Unix Printing System")
(description
@@ -340,20 +352,6 @@ applications''. These must be installed separately.")
;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
(license license:asl2.0)))
-(define cups-minimal/fixed
- (package
- (inherit cups-minimal)
- (version "2.4.7")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/OpenPrinting/cups")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cups" version))
- (sha256
- (base32 "0cj3gs7ki9v0drj19l326s8f1kxrpq7jkzrdfdk7ykrlk7sj645f"))))))
-
(define-public cups
(package/inherit cups-minimal
(name "cups")
@@ -565,7 +563,7 @@ should only be used as part of the Guix cups-pk-helper service.")
(arguments
(list
#:imported-modules `((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules '((guix build gnu-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))
@@ -847,7 +845,11 @@ printer/driver specific, but spooler-independent PPD file.")
#:tests? #f ;no tests
#:make-flags '("CC=gcc")))
(inputs
- (list coreutils sed ghostscript foomatic-filters)) ;for 'foomatic-rip'
+ (list bash-minimal
+ coreutils
+ sed
+ ghostscript
+ foomatic-filters)) ;for 'foomatic-rip'
(native-inputs
(list bc groff))
;; The domain has expired and no one has meaningfully taken up the torch.
@@ -884,7 +886,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(arguments
(list #:modules
`((srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:configure-flags
#~(list "--disable-static"
(string-append "--prefix=" #$output)
@@ -945,7 +947,7 @@ language.")
(arguments
`(#:modules
((srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:make-flags
(list (string-append "CUPSDRV="
(assoc-ref %outputs "out") "/share/cups/drv")
@@ -995,14 +997,14 @@ obtained and installed separately.")
(define-public python-pycups
(package
(name "python-pycups")
- (version "1.9.74")
+ (version "2.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pycups" version ".tar.bz2"))
(sha256
(base32
- "1ffp7sswhdsfpy88zg0cc8kl04wygkjs01rlm9f0spbwk8jhy2c6"))))
+ "140c7073bkhx8w9qpaynllhynkkg0rzj3a4wjh9fnj15yvjlqhsp"))))
(build-system python-build-system)
(arguments
'(;; Tests require CUPS to be running
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 3a6776be59..9f74018205 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2017, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -66,34 +66,18 @@
(define-public curl
(package
(name "curl")
- (version "8.5.0")
+ (version "8.6.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
- "1sqfflilf7mcz1g03lazyr6v6pf1rsrzprrknsir10hdwawqvas2"))
+ "05fv468yjrb7qwrxmfprxkrcckbkij0myql0vwwnalgr3bcmbk9w"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
- (build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
- (inputs
- (list gnutls libidn mit-krb5 `(,nghttp2 "lib") zlib))
- (native-inputs
- (list nghttp2 perl pkg-config python-minimal-wrapper))
- (native-search-paths
- ;; These variables are introduced by curl-use-ssl-cert-env.patch.
- (list $SSL_CERT_DIR
- $SSL_CERT_FILE
- ;; Note: This search path is respected by the `curl` command-line
- ;; tool only. Patching libcurl to read it too would bring no
- ;; advantages and require maintaining a more complex patch.
- (search-path-specification
- (variable "CURL_CA_BUNDLE")
- (file-type 'regular)
- (separator #f) ;single entry
- (files '("etc/ssl/certs/ca-certificates.crt")))))
+ (build-system gnu-build-system)
(arguments
(list
#:disallowed-references '("doc")
@@ -104,6 +88,7 @@
(search-input-file
%build-inputs "lib/libgssrpc.so"))))
"--disable-static")
+ #:test-target "test-nonflaky" ;avoid tests marked as "flaky"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-record-configure-flags
@@ -162,6 +147,22 @@
(display "1501\n" port)
(close port)))))
#~()))))
+ (native-inputs
+ (list nghttp2 perl pkg-config python-minimal-wrapper))
+ (inputs
+ (list gnutls libidn libpsl mit-krb5 `(,nghttp2 "lib") zlib))
+ (native-search-paths
+ ;; These variables are introduced by curl-use-ssl-cert-env.patch.
+ (list $SSL_CERT_DIR
+ $SSL_CERT_FILE
+ ;; Note: This search path is respected by the `curl` command-line
+ ;; tool only. Patching libcurl to read it too would bring no
+ ;; advantages and require maintaining a more complex patch.
+ (search-path-specification
+ (variable "CURL_CA_BUNDLE")
+ (file-type 'regular)
+ (separator #f) ;single entry
+ (files '("etc/ssl/certs/ca-certificates.crt")))))
(synopsis "Command line tool for transferring data with URL syntax")
(description
"curl is a command line tool for transferring data with URL syntax,
@@ -246,9 +247,9 @@ not offer a replacement for libcurl.")
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:configure-flags (list (string-append
"--with-guilesitedir="
(assoc-ref %outputs "out")
@@ -370,7 +371,7 @@ curl to obtain exactly that HTTP request.")
(define-public coeurl
(package
(name "coeurl")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method git-fetch)
@@ -379,7 +380,7 @@ curl to obtain exactly that HTTP request.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1b435c2szwibm4i4r7mh22klyv9ncdkwkiy95p4xjfalsx4ripxh"))))
+ (base32 "1l9lx8chpc4bx7xxycdgr8mgqqjdrvipljmq869c2x1zjwrnasil"))))
(build-system meson-build-system)
(native-inputs
(list doctest pkg-config))
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 70d579c127..ef408f2dd7 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -23,6 +23,7 @@
(define-module (gnu packages cyrus-sasl)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages tls)
@@ -45,7 +46,7 @@
(base32
"135kbgyfpa1mwqp5dm223yr6ddzi4vjm7cr414d7rmhys2mwdkvw"))))
(build-system gnu-build-system)
- (inputs (list gdbm mit-krb5 openssl))
+ (inputs (list gdbm libxcrypt mit-krb5 openssl))
(arguments
(list
#:configure-flags #~(list (string-append "--with-plugindir="
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 238ba34053..106d6372ee 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016, 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
-;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
@@ -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
@@ -254,11 +254,10 @@ persistent, single-file databases with support for secondary indexes.")
,(string-append (assoc-ref inputs "postgresql")
"/bin")
;; For getsocket.
- ,(string-append out "/bin")))))
- #t)))
+ ,(string-append out "/bin"))))))))
#:test-target "test"))
(inputs
- (list postgresql util-linux))
+ (list bash-minimal postgresql util-linux))
(native-inputs
;; For tests.
(list ruby which))
@@ -527,14 +526,14 @@ mapping from string keys to string values.")
(define-public memcached
(package
(name "memcached")
- (version "1.6.21")
+ (version "1.6.28")
(source
(origin
(method url-fetch)
(uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256
- (base32 "1vm27la2yanjhwwdwabci4c21yv9hy5iqas47kcxaza1zh79i267"))))
+ (base32 "0ma8qn97hng8vp52s3906g9id75yicf96950hm40zn47k1z2vl5i"))))
(build-system gnu-build-system)
(inputs
(list libevent cyrus-sasl))
@@ -614,6 +613,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")
@@ -854,7 +885,6 @@ autocompletion and syntax highlighting.")
(list python-cli-helpers
python-click
python-configobj
- python-cryptography
python-prompt-toolkit
python-pyaes
python-pygments
@@ -942,12 +972,12 @@ auto-completion and syntax highlighting.")
,(string-append coreutils "/bin")
,(string-append grep "/bin")
,(string-append ps "/bin")
- ,(string-append sed "/bin"))))
- #t))))))
+ ,(string-append sed "/bin"))))))))))
(native-inputs
(list bison perl pkg-config))
(inputs
- (list boost-for-mysql
+ (list bash-minimal
+ boost-for-mysql
coreutils
gawk
grep
@@ -1235,7 +1265,7 @@ developed in C/C++ to MariaDB and MySQL databases.")
(define-public galera
(package
(name "galera")
- (version "26.4.13")
+ (version "26.4.18")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1244,10 +1274,12 @@ developed in C/C++ to MariaDB and MySQL databases.")
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "06kf6w0bjkgcmddjd3k1q4cjpg8i78l0c7hcf368h09i1hqd23i6"))))
+ (base32 "1agw763qx9778krcpmgvwcps73ipyjwl0niwsykcxldvzzs314r5"))))
(build-system cmake-build-system)
(inputs
- (list check boost openssl))
+ (list boost openssl))
+ (native-inputs
+ (list check))
(home-page "https://github.com/codership/galera/")
(synopsis "Extension to the MariaDB database server")
(description
@@ -1259,14 +1291,14 @@ and high-availability (HA).")
(define-public postgresql-15
(package
(name "postgresql")
- (version "15.4")
+ (version "15.7")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "1yf8cfg9j2pfxh5lxfaq1ifbvrcvv2g5vjxnadk36ds4vi5mmv5s"))
+ "1xwq1592k1r64ki9bmkcyw39416kymabdfxbkpiqaqxbhnaf8vx4"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
@@ -1334,27 +1366,27 @@ pictures, sounds, or video.")
(define-public postgresql-13
(package
(inherit postgresql-14)
- (version "13.12")
+ (version "13.15")
(source (origin
(inherit (package-source postgresql-14))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "12r1kwjaclq2qn4qg3k6j0asrs4r0k0g1fkdpb3pnjsiwg7fv88d"))))))
+ "09f99rp5q1xp769r71if9ckb4cbm0nnx2xmy8b1bhcvd8hax9va2"))))))
(define-public postgresql-11
(package
(inherit postgresql-13)
(name "postgresql")
- (version "11.21")
+ (version "11.22")
(source (origin
(inherit (package-source postgresql-13))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0l7qrwzwyiy5dwg6j7nnd9mq245sycc4gcv6a6r7gpfmf5s87c07"))))
+ "1w71xf97i3hha6vl05xqf960k75nczs6375w3f2phwhdg9ywkdrc"))))
(native-inputs
(modify-inputs (package-native-inputs postgresql-13)
(replace "docbook-xml" docbook-xml-4.2)))))
@@ -1614,16 +1646,16 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
(define-public python-pymysql
(package
(name "python-pymysql")
- (version "1.0.2")
+ (version "1.1.1")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "PyMySQL" version))
+ (uri (pypi-uri "pymysql" version))
(sha256
- (base32 "0dmdszskfri11b9m6n3lag31vzi10aqxz9gc583md3gka2ijfsc1"))))
- (build-system python-build-system)
- (inputs
- (list python-cryptography))
+ (base32 "1l2cj0ps96g3bblvhdszgyjv9bi405bxrx0bqq1p8h9bmwd629z1"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list python-cryptography python-pynacl))
(arguments
`(#:tests? #f)) ; tests expect a running MySQL
(home-page "https://github.com/PyMySQL/PyMySQL/")
@@ -1900,8 +1932,7 @@ for example from a shell script.")
(add-before 'check 'set-check-environment
(lambda _
(setenv "TZ" "UTC")
- (setenv "HOME" "/tmp")
- #t))
+ (setenv "HOME" "/tmp")))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -1910,8 +1941,7 @@ for example from a shell script.")
`("PERL5LIB" ":" prefix
(,(string-append out "/lib/perl5/site_perl"
":"
- path)))))
- #t)))))
+ path))))))))))
(native-inputs
(list perl-capture-tiny
perl-io-pager
@@ -1928,38 +1958,39 @@ for example from a shell script.")
perl-test-nowarnings
perl-test-warn))
(inputs
- `(("perl-class-xsaccessor" ,perl-class-xsaccessor)
- ("perl-clone" ,perl-clone)
- ("perl-config-gitlike" ,perl-config-gitlike)
- ("perl-datetime" ,perl-datetime)
- ("perl-datetime-timezone" ,perl-datetime-timezone)
- ("perl-dbd-mysql" ,perl-dbd-mysql)
- ("perl-dbd-pg" ,perl-dbd-pg)
- ("perl-dbd-sqlite" ,perl-dbd-sqlite)
- ("perl-dbi" ,perl-dbi)
- ("perl-devel-stacktrace" ,perl-devel-stacktrace)
- ("perl-encode-locale" ,perl-encode-locale)
- ("perl-hash-merge" ,perl-hash-merge)
- ("perl-ipc-run3" ,perl-ipc-run3)
- ("perl-ipc-system-simple" ,perl-ipc-system-simple)
- ("perl-libintl-perl" ,perl-libintl-perl)
- ("perl-list-moreutils" ,perl-list-moreutils)
- ("perl-moo" ,perl-moo)
- ("perl-mysql-config" ,perl-mysql-config)
- ("perl-namespace-autoclean" ,perl-namespace-autoclean)
- ("perl-path-class" ,perl-path-class)
- ("perl-perlio-utf8_strict" ,perl-perlio-utf8_strict)
- ("perl-string-formatter" ,perl-string-formatter)
- ("perl-string-shellquote" ,perl-string-shellquote)
- ("perl-sub-exporter" ,perl-sub-exporter)
- ("perl-template-tiny" ,perl-template-tiny)
- ("perl-template-toolkit" ,perl-template-toolkit)
- ("perl-throwable" ,perl-throwable)
- ("perl-try-tiny" ,perl-try-tiny)
- ("perl-type-tiny" ,perl-type-tiny)
- ("perl-type-tiny-xs" ,perl-type-tiny-xs)
- ("perl-uri" ,perl-uri)
- ("perl-uri-db" ,perl-uri-db)))
+ (list bash-minimal
+ perl-class-xsaccessor
+ perl-clone
+ perl-config-gitlike
+ perl-datetime
+ perl-datetime-timezone
+ perl-dbd-mysql
+ perl-dbd-pg
+ perl-dbd-sqlite
+ perl-dbi
+ perl-devel-stacktrace
+ perl-encode-locale
+ perl-hash-merge
+ perl-ipc-run3
+ perl-ipc-system-simple
+ perl-libintl-perl
+ perl-list-moreutils
+ perl-moo
+ perl-mysql-config
+ perl-namespace-autoclean
+ perl-path-class
+ perl-perlio-utf8_strict
+ perl-string-formatter
+ perl-string-shellquote
+ perl-sub-exporter
+ perl-template-tiny
+ perl-template-toolkit
+ perl-throwable
+ perl-try-tiny
+ perl-type-tiny
+ perl-type-tiny-xs
+ perl-uri
+ perl-uri-db))
(home-page "https://sqitch.org/")
(synopsis "Database change management tool")
(description
@@ -1985,8 +2016,7 @@ which uses SQL to describe changes.")
"0x2q4m9ryw68kifalnm3x4bv9v2xrc2ffsiap8m9wnw6lf1h05la"))))
(build-system python-build-system)
(inputs
- (list python-cryptography python-psycopg2 python-pymysql
- python-sqlalchemy))
+ (list python-psycopg2 python-pymysql python-sqlalchemy))
(home-page "https://github.com/coffeeandscripts/sqlcrush")
(synopsis "Text console-based database viewer and editor")
(description
@@ -2019,10 +2049,9 @@ changes.")
(invoke "./configure"
(string-append "--prefix=" out))))))))
(native-inputs
- (list ;; TODO: Build the documentation.
- ;; ("docbook-xsl" ,docbook-xsl)
- ;; ("libxml2" ,libxml2)
- ;; ("libxslt" ,libxslt)
+ (list docbook-xsl
+ libxcrypt
+ libxslt
python ;for the Waf build system
which))
(home-page "https://tdb.samba.org/")
@@ -2055,18 +2084,17 @@ extremely small.")
(define-public perl-dbix-class
(package
(name "perl-dbix-class")
- (version "0.082842")
+ (version "0.082843")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/"
"DBIx-Class-" version ".tar.gz"))
(sha256
- (base32 "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh"))))
+ (base32 "0lgjw7z4y2inf3yyfph1ljdp4f5zdmy9vh56fj8w9n19rdp0n7il"))))
(build-system perl-build-system)
(native-inputs
(list perl-dbd-sqlite
- perl-file-temp
perl-module-install
perl-package-stash
perl-test-deep
@@ -2084,15 +2112,13 @@ extremely small.")
perl-devel-globaldestruction
perl-hash-merge
perl-module-find
- perl-moo
+ perl-moo-2
perl-mro-compat
perl-namespace-clean
perl-path-class
- perl-scalar-list-utils
perl-scope-guard
perl-sql-abstract-classic
perl-sub-name
- perl-text-balanced
perl-try-tiny))
(home-page "https://metacpan.org/release/DBIx-Class")
(synopsis "Extensible and flexible object <-> relational mapper")
@@ -2104,6 +2130,9 @@ still providing access to as many of the capabilities of the database as
possible, including retrieving related records from multiple tables in a
single query, \"JOIN\", \"LEFT JOIN\", \"COUNT\", \"DISTINCT\", \"GROUP BY\",
\"ORDER BY\" and \"HAVING\" support.")
+ (properties
+ ;; This is needed for perl-catalyst-authentication-store-dbix-class
+ `((updater-extra-propagated-inputs . ("perl-data-page"))))
(license license:perl-license)))
(define-public perl-dbix-class-cursor-cached
@@ -2577,6 +2606,11 @@ similar to BerkeleyDB, LevelDB, etc.")
;; "background AOF rewrite to finish", perhaps because dead
;; processes persist as zombies in the build environment.
(("unit/aofrw") "")
+ ;; The OOM score tests try to raise the current OOM score, but
+ ;; our build environment already sets it for all children to
+ ;; the highest possible one (1000). We can't lower it because
+ ;; we don't have CAP_SYS_RESOURCE.
+ (("unit/oom-score-adj") "")
(("integration/aof(-multi-part)?") "")
(("integration/failover") "")
(("integration/replication-4") "")
@@ -2845,7 +2879,7 @@ more efficient access and storage of column subsets) and log-structured merge
trees (LSM), for sustained throughput under random insert workloads.")
(license license:gpl3) ; or GPL-2
;; configure.ac: WiredTiger requires a 64-bit build.
- (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))))
+ (supported-systems (delete "riscv64-linux" %64bit-supported-systems))))
(define-public wiredtiger-3
(package
@@ -2938,6 +2972,11 @@ database.")
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
+ ;; TODO: Make this unconditional on core-updates.
+ ,@(if (%current-target-system)
+ `(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
+ ,(string-append "AR=" ,(ar-for-target))))
+ '())
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -3032,34 +3071,6 @@ on another machine, accessed via TCP/IP.")
(home-page "https://pqxx.org/")
(license license:bsd-3)))
-(define-public go-go-etcd-io-bbolt
- (package
- (name "go-go-etcd-io-bbolt")
- (version "1.3.6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/etcd-io/bbolt")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "go.etcd.io/bbolt"
- ;; Extending the test timeout to 30 minutes still times out on aarch64.
- #:tests? ,(not target-arm?)))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (home-page "https://go.etcd.io/bbolt")
- (synopsis "Embedded key/value database for Go")
- (description "Bolt is a pure Go key/value store inspired by Howard Chu's
-LMDB project. The goal of the project is to provide a simple, fast, and
-reliable database for projects that don't require a full database server such as
-Postgres or MySQL.")
- (license license:expat)))
-
(define-public python-peewee
(package
(name "python-peewee")
@@ -3583,7 +3594,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
relational, graph, and document data management with web application server
and web services platform functionality.")
;; configure: error: ... can only be build on 64bit platforms
- (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))
+ (supported-systems %64bit-supported-systems)
(license license:gpl2)))
(define-public python-ccm
@@ -3643,6 +3654,53 @@ designed for efficient and high-performing database access, adapted into a
simple and Pythonic domain language.")
(license license:x11)))
+(define-public python-sqlalchemy-2
+ (package
+ (name "python-sqlalchemy")
+ (version "2.0.27")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "SQLAlchemy" version))
+ (sha256
+ (base32 "1y1l4lwhvgs7ivwhcp4vljjdsaha77x9859kz65virhzlxlyv9l6"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest))
+ (propagated-inputs (list python-typing-extensions))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-tests
+ (lambda _
+ ;; Remove expensive tests.
+ (for-each delete-file
+ '("test/ext/mypy/test_mypy_plugin_py3k.py"
+ "test/typing/test_mypy.py"
+ "test/aaa_profiling/test_memusage.py"))
+ (substitute* "test/engine/test_pool.py"
+ ;; Disable a test that fails randomly.
+ (("def test_recycle_pool_no_race")
+ "def _test_recycle_pool_no_race"))))
+ ;; According to the pyproject.toml, greenlet is optional.
+ (add-after 'unpack 'remove-dependency-on-greenlet
+ (lambda _
+ (substitute* "setup.cfg"
+ (("greenlet != 0.4.17")
+ "#greenlet != 0.4.17"))
+ (substitute* "PKG-INFO"
+ (("Requires-Dist: greenlet")
+ "#Requires-Dist: greenlet")))))))
+ (home-page "https://www.sqlalchemy.org")
+ (synopsis "SQL toolkit and object relational mapper")
+ (description
+ "SQLAlchemy is the Python SQL toolkit and @acronym{ORM, Object Relational Mapper}
+that gives application developers the full power and flexibility of SQL. It provides
+a full suite of well known enterprise-level persistence patterns, designed for
+efficient and high-performing database access, adapted into a simple and Pythonic
+domain language.")
+ (license license:expat)))
+
(define-public python-sqlalchemy-stubs
(package
(name "python-sqlalchemy-stubs")
@@ -3882,7 +3940,7 @@ PickleShare.")
(define-public python-apsw
(package
(name "python-apsw")
- (version "3.45.1.0")
+ (version "3.46.0.0")
;; The compressed release has fetching functionality disabled.
(source
(origin
@@ -3892,7 +3950,7 @@ PickleShare.")
version "/apsw-" version ".zip"))
(sha256
(base32
- "1vfrzb414pbh5k0cgcqkp039jvla2galapn4a551zgh8xi70bnrp"))))
+ "10yfbasi4mq63g0svyl1h49ylwn9znjylq78id16dzxzk9q9ipdx"))))
(build-system pyproject-build-system)
(native-inputs
(list unzip))
@@ -4461,8 +4519,8 @@ is designed to have a low barrier to entry.")
,(map (lambda (output)
(string-append output sitedir))
(list python out))))))))))
- (native-inputs
- (list python-pytest))
+ (native-inputs (list python-pytest))
+ (inputs (list bash-minimal))
(home-page "https://github.com/andialbrecht/sqlparse")
(synopsis "Non-validating SQL parser")
(description "Sqlparse is a non-validating SQL parser for Python. It
@@ -4510,12 +4568,96 @@ transforms idiomatic python function calls to well-formed SQL queries.")
the SQL language using a syntax that reflects the resulting query.")
(license license:asl2.0)))
+(define-public apache-orc
+ (package
+ (name "apache-orc")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/apache/orc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fi6d045wakks0x8clplyxgal342kljqjql7vq5gbd6a2qnaz6m2"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:build-type "Release"
+ #:configure-flags
+ #~(list "-DBUILD_JAVA=OFF"
+ "-DINSTALL_VENDORED_LIBS=OFF"
+ "-DCMAKE_CXX_FLAGS=-fPIC"
+ (string-append "-DGTEST_HOME=" #$(this-package-native-input "googletest"))
+ (string-append "-DZSTD_HOME=" (assoc-ref %build-inputs "zstd:lib"))
+ (string-append "-DZLIB_HOME=" #$(this-package-input "zlib"))
+ (string-append "-DPROTOBUF_HOME=" #$(this-package-input "protobuf"))
+ (string-append "-DLZ4_HOME=" #$(this-package-input "lz4"))
+ (string-append "-DSNAPPY_HOME=" #$(this-package-input "snappy")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-bad-test
+ (lambda _
+ ;; This one test fails with an obscure error:
+ ;;
+ ;; Expected: (std::string::npos) != (error.find(error_msg)),
+ ;; actual: 18446744073709551615 vs 18446744073709551615
+ (substitute* "tools/test/TestFileScan.cc"
+ (("findProgram\\(\"tools/src/orc-scan\"\\);" m)
+ (string-append m "return;")))))
+ (add-after 'unpack 'do-not-download-orc-format
+ (lambda _
+ (substitute* "cmake_modules/ThirdpartyToolchain.cmake"
+ (("URL \"https://archive.apache.org/dist/orc/orc-format.*")
+ (string-append "URL \"file://"
+ #$(this-package-native-input "orc-format")
+ "\"\n")))))
+ (add-after 'unpack 'timezone-fallback
+ (lambda _
+ ;; In the build container we don't have /etc/localtime
+ (substitute* "c++/src/Timezone.cc"
+ (("return getTimezoneByFilename\\(LOCAL_TIMEZONE\\);")
+ "if (!std::filesystem::exists(std::filesystem::path(LOCAL_TIMEZONE))) {
+ return getTimezoneByName(\"UTC\");
+}
+return getTimezoneByFilename(LOCAL_TIMEZONE);"))))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "TZDIR" (search-input-directory inputs
+ "share/zoneinfo")))))))
+ (inputs
+ `(("lz4" ,lz4)
+ ("protobuf" ,protobuf)
+ ("snappy" ,snappy)
+ ("zlib" ,zlib "static")
+ ("zstd" ,zstd)
+ ("zstd:lib" ,zstd "lib")))
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("orc-format" ,(origin
+ (method url-fetch)
+ (uri "https://archive.apache.org/dist/orc/orc-format-1.0.0/\
+orc-format-1.0.0.tar.gz")
+ (sha256
+ (base32
+ "1mccbna3mqhhlqs4pw0fa4pgjnq4c41jhxrh84mq27sbz5gsx7vk"))))
+ ("pkg-config" ,pkg-config)
+ ("tzdata" ,tzdata-for-tests)))
+ (home-page "https://orc.apache.org/")
+ (synopsis "Columnar storage for Hadoop workloads")
+ (description "ORC is a self-describing type-aware columnar file format
+designed for Hadoop workloads. It is optimized for large streaming reads, but
+with integrated support for finding required rows quickly.")
+ (license license:asl2.0)))
+
;; There are many wrappers for this in other languages. When touching, please
;; be sure to ensure all dependencies continue to build.
(define-public apache-arrow
(package
(name "apache-arrow")
- (version "15.0.1")
+ (version "17.0.0")
(source
(origin
(method git-fetch)
@@ -4525,7 +4667,7 @@ the SQL language using a syntax that reflects the resulting query.")
(file-name (git-file-name name version))
(sha256
(base32
- "0zrcwsq9c976xncc1kg6lw24s5r3ag8vfzhmcnkvi5z2c9x4lvvc"))))
+ "11yzhqdvvcq8k4dhcfnwhc0hl0a2k09gyijln00zbglajk7ihfsk"))))
(build-system cmake-build-system)
(arguments
(list
@@ -4542,68 +4684,69 @@ the SQL language using a syntax that reflects the resulting query.")
(setenv "BROTLI_HOME" #$(this-package-input "brotli"))
(setenv "FLATBUFFERS_HOME" #$(this-package-input "flatbuffers"))
(setenv "RAPIDJSON_HOME" #$(this-package-input "rapidjson")))))
- #:build-type "Release"
- #:configure-flags
- #~(list "-DARROW_PYTHON=ON"
- "-DARROW_GLOG=ON"
- ;; Parquet options
- "-DARROW_PARQUET=ON"
- "-DPARQUET_BUILD_EXECUTABLES=ON"
- ;; The maintainers disallow using system versions of
- ;; jemalloc:
- ;; https://issues.apache.org/jira/browse/ARROW-3507. This
- ;; is unfortunate because jemalloc increases performance:
- ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
- "-DARROW_JEMALLOC=OFF"
-
- ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
- ;; option that instructs the build system how to resolve
- ;; each dependency. SYSTEM = Finding the dependency in
- ;; system paths using CMake's built-in find_package
- ;; function, or using pkg-config for packages that do not
- ;; have this feature
- "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
- "-Dxsimd_SOURCE=SYSTEM"
-
- "-DARROW_RUNTIME_SIMD_LEVEL=NONE"
- "-DARROW_SIMD_LEVEL=NONE"
- "-DARROW_PACKAGE_KIND=Guix"
-
- ;; Split output into its component packages.
- (string-append "-DCMAKE_INSTALL_PREFIX=" #$output:lib)
- (string-append "-DCMAKE_INSTALL_RPATH=" #$output:lib "/lib")
- (string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
- (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" #$output:include
- "/share/include")
-
- "-DARROW_WITH_SNAPPY=ON"
- "-DARROW_WITH_ZLIB=ON"
- "-DARROW_WITH_ZSTD=ON"
- "-DARROW_WITH_LZ4=ON"
- "-DARROW_COMPUTE=ON"
- "-DARROW_CSV=ON"
- "-DARROW_DATASET=ON"
- "-DARROW_FILESYSTEM=ON"
- "-DARROW_HDFS=ON"
- "-DARROW_JSON=ON"
- ;; Arrow Python C++ integration library (required for
- ;; building pyarrow). This library must be built against
- ;; the same Python version for which you are building
- ;; pyarrow. NumPy must also be installed. Enabling this
- ;; option also enables ARROW_COMPUTE, ARROW_CSV,
- ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
- ;; ARROW_JSON.
- "-DARROW_PYTHON=ON"
-
- ;; Building the tests forces on all the
- ;; optional features and the use of static
- ;; libraries.
- "-DARROW_BUILD_TESTS=OFF"
- "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF"
- ;;"-DBENCHMARK_ENABLE_TESTING=OFF"
- "-DARROW_BUILD_STATIC=OFF")))
+ #:build-type "Release"
+ #:configure-flags
+ #~(list "-DARROW_PYTHON=ON"
+ ;; Parquet options
+ "-DARROW_PARQUET=ON"
+ "-DPARQUET_BUILD_EXECUTABLES=ON"
+ ;; The maintainers disallow using system versions of
+ ;; jemalloc:
+ ;; https://issues.apache.org/jira/browse/ARROW-3507. This
+ ;; is unfortunate because jemalloc increases performance:
+ ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
+ "-DARROW_JEMALLOC=OFF"
+
+ ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
+ ;; option that instructs the build system how to resolve
+ ;; each dependency. SYSTEM = Finding the dependency in
+ ;; system paths using CMake's built-in find_package
+ ;; function, or using pkg-config for packages that do not
+ ;; have this feature
+ "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
+ "-Dxsimd_SOURCE=SYSTEM"
+
+ "-DARROW_RUNTIME_SIMD_LEVEL=NONE"
+ "-DARROW_SIMD_LEVEL=NONE"
+ "-DARROW_PACKAGE_KIND=Guix"
+
+ ;; Split output into its component packages.
+ (string-append "-DCMAKE_INSTALL_PREFIX=" #$output:lib)
+ (string-append "-DCMAKE_INSTALL_RPATH=" #$output:lib "/lib")
+ (string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
+ (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" #$output:include
+ "/share/include")
+
+ "-DARROW_WITH_SNAPPY=ON"
+ "-DARROW_WITH_ZLIB=ON"
+ "-DARROW_WITH_ZSTD=ON"
+ "-DARROW_WITH_LZ4=ON"
+ "-DARROW_COMPUTE=ON"
+ "-DARROW_CSV=ON"
+ "-DARROW_DATASET=ON"
+ "-DARROW_FILESYSTEM=ON"
+ "-DARROW_HDFS=ON"
+ "-DARROW_JSON=ON"
+ ;; Arrow Python C++ integration library (required for
+ ;; building pyarrow). This library must be built against
+ ;; the same Python version for which you are building
+ ;; pyarrow. NumPy must also be installed. Enabling this
+ ;; option also enables ARROW_COMPUTE, ARROW_CSV,
+ ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
+ ;; ARROW_JSON.
+ "-DARROW_PYTHON=ON"
+ "-DARROW_ORC=ON"
+ "-DORC_SOURCE=SYSTEM"
+
+ ;; Building the tests forces on all the
+ ;; optional features and the use of static
+ ;; libraries.
+ "-DARROW_BUILD_TESTS=OFF"
+ ;;"-DBENCHMARK_ENABLE_TESTING=OFF"
+ "-DARROW_BUILD_STATIC=OFF")))
(inputs
- (list boost
+ (list apache-orc
+ boost
brotli
bzip2
double-conversion
@@ -4897,20 +5040,49 @@ algorithm implementations.")
(name "python-pyarrow")
(build-system python-build-system)
(arguments
- '(#:tests? #f ; XXX There are no tests in the "python" directory
- #:phases
- (modify-phases %standard-phases
- (delete 'build) ; XXX the build is performed again during the install phase
- (add-after 'unpack 'enter-source-directory
- (lambda _ (chdir "python")))
- (add-before 'install 'set-pyarrow-build-options
- (lambda _
- (setenv "PYARROW_BUNDLE_ARROW_CPP_HEADERS" "0")
- (setenv "PYARROW_WITH_PARQUET" "1")
- (setenv "PYARROW_WITH_DATASET" "1"))))))
+ (list
+ ;; XXX: Test data is distributed sepratly in
+ ;; <https://github.com/apache/arrow-testing> 39MiB and requires
+ ;; additional steps to be implemented, see
+ ;; <https://github.com/apache/arrow/blob/main/ci/scripts/python_build.sh>.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build) ; XXX the build is performed again during the install phase
+ (add-after 'unpack 'enter-source-directory
+ (lambda _ (chdir "python")))
+ (add-after 'enter-source-directory 'set-version
+ (lambda _
+ ;; XXX: This python-setuptools-scm option is available in v8+:
+ ;; TypeError: Configuration.__init__() got an unexpected
+ ;; keyword argument 'version_file'
+ (substitute* "pyproject.toml"
+ (("version_file = .*") ""))
+
+ ;; Version file generation ad-hoc, remove when a newer version
+ ;; of python-setuptools-scm is packed.
+ (with-output-to-file "pyarrow/_generated_version.py"
+ (let* ((version #$(package-version this-package) )
+ (version-tuple (string-join (string-split version #\.) ", ")))
+ (lambda ()
+ (format #t
+ "__version__ = version = '~a'
+__version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
+ (add-before 'install 'set-pyarrow-build-options
+ (lambda _
+ (setenv "PYARROW_BUNDLE_ARROW_CPP_HEADERS" "0")
+ (setenv "PYARROW_CMAKE_OPTIONS"
+ (string-append "-DCMAKE_INSTALL_RPATH=" #$output))
+ (setenv "PYARROW_PARALLEL"
+ (number->string (parallel-job-count)))
+ (setenv "PYARROW_WITH_DATASET" "1")
+ (setenv "PYARROW_WITH_HDFS" "1")
+ (setenv "PYARROW_WITH_ORC" "1")
+ (setenv "PYARROW_WITH_PARQUET" "1"))))))
(propagated-inputs
(list (list apache-arrow "lib")
(list apache-arrow "include")
+ apache-orc
python-numpy
python-pandas
python-six))
@@ -5235,18 +5407,15 @@ connecting to MS SQL and Sybase servers over TCP/IP.")
(define-public python-tinydb
(package
(name "python-tinydb")
- (version "4.5.2")
+ (version "4.8.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "tinydb" version))
(sha256
- (base32 "1x9c4s42930wwal3ds0plwb57kg5c3gj7kbpy64c29vq478b463x"))))
- (build-system python-build-system)
- ;; PyPi tarball does not contain tests and github repository does not
- ;; have a setup.py file (only pyproject).
- (arguments `(#:tests? #f))
- (propagated-inputs
- (list python-typing-extensions))
+ (base32 "0r6mavw0wm03lbmqbgglsyff3vws86ddg3q8h29glpd7qnlqdmkd"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-poetry-core python-pytest))
(home-page "https://github.com/msiemens/tinydb")
(synopsis "TinyDB is a lightweight document oriented database")
(description
@@ -5308,7 +5477,7 @@ a Gtk.Grid Widget.")
(define-public sqlitebrowser
(package
(name "sqlitebrowser")
- (version "3.12.2")
+ (version "3.13.0")
(source
(origin
(method git-fetch)
@@ -5317,7 +5486,7 @@ a Gtk.Grid Widget.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ljqzcx388mmni8lv9jz5r58alhsjrrqi4nzjnbfki94rn4ray6z"))
+ (base32 "0v4a59lgqng9hqvbc2k504aclinpwpk8hi6ckirbr6m1pnf26kfr"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -5353,6 +5522,8 @@ compatible with SQLite using a graphical user interface.")
(define-public sqls
(package
(name "sqls")
+ ;; TODO: The latest version requires a way more packages to be available
+ ;; in Guix.
(version "0.2.18")
(source (origin
(method git-fetch)
@@ -5368,18 +5539,19 @@ compatible with SQLite using a graphical user interface.")
(list
#:install-source? #f
#:import-path "github.com/lighttiger2505/sqls"))
- (inputs (list go-github-com-go-sql-driver-mysql
- go-github-com-lib-pq
- go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-sqlite3
- go-github-com-olekukonko-tablewriter
- go-github-com-pkg-errors
- go-github-com-sourcegraph-jsonrpc2
- go-golang-org-x-crypto
- go-golang-org-x-xerrors
- go-gopkg-in-yaml-v2))
- (native-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-k0kubun-pp))
+ (native-inputs
+ (list go-github-com-google-go-cmp
+ go-github-com-go-sql-driver-mysql
+ go-github-com-k0kubun-pp
+ go-github-com-lib-pq
+ go-github-com-mattn-go-runewidth
+ go-github-com-mattn-go-sqlite3
+ go-github-com-olekukonko-tablewriter
+ go-github-com-pkg-errors
+ go-github-com-sourcegraph-jsonrpc2
+ go-golang-org-x-crypto
+ go-golang-org-x-xerrors
+ go-gopkg-in-yaml-v2))
(home-page "https://github.com/sqls-server/sqls")
(synopsis "SQL language server written in Go")
(description
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index 19a1b503cf..7c36d30a34 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
-;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 LuHui <luhux76@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -30,6 +30,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix build-system gnu)
#:use-module (guix utils)
#:use-module (ice-9 match))
@@ -39,6 +40,29 @@
;;; This module has been separated from (gnu packages databases) to reduce the
;;; number of module references for core packages.
+(define bdb-snippet
+ ;; Remove some bundled and generated files. Some of the old
+ ;; Autotools files are too old for some architectures
+ ;; (e.g. aarch64 and powerpc64le).
+ #~(begin
+ (for-each delete-file-recursively
+ '("dist/configure"
+ "dist/config.sub"
+ "dist/config.guess"
+ "dist/install-sh"
+ "dist/ltmain.sh"
+ "dist/aclocal/libtool.m4"
+ "dist/aclocal/ltoptions.m4"
+ "dist/aclocal/ltsugar.m4"
+ "dist/aclocal/ltversion.m4"
+ "dist/aclocal/lt~obsolete.m4"))
+ (substitute* "dist/configure.ac"
+ ;; Placate 'automake'.
+ (("AC_DEFINE\\(DB_WIN32\\)")
+ "AC_DEFINE(DB_WIN32, [], [Description])")
+ (("AC_DEFINE\\(HAVE_SYSTEM_INCLUDE_FILES\\)")
+ "AC_DEFINE(HAVE_SYSTEM_INCLUDE_FILES, [], [Description])"))))
+
(define-public bdb-4.8
(package
(name "bdb")
@@ -52,78 +76,65 @@
(sha256
(base32
"0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"))
- (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch"))))
+ (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch"))
+ (modules '((guix build utils)
+ (srfi srfi-1)))
+ (snippet bdb-snippet)))
(build-system gnu-build-system)
(outputs '("out" ; programs, libraries, headers
"doc")) ; 94 MiB of HTML docs
(arguments
- `(#:tests? #f ; no check target available
- #:disallowed-references ("doc")
- #:phases
- (modify-phases %standard-phases
- ;; The configure script is too old to recognise aarch64 and
- ;; powerpc64le as valid architectures. The trick below works
- ;; for "--build", but not for "--host", so update config.sub.
- ,@(if (and (%current-target-system)
- (or (target-ppc64le? (%current-target-system))
- (target-aarch64? (%current-target-system))
- (target-riscv64? (%current-target-system))))
- `((add-after 'unpack 'update-config.sub
- (lambda* (#:key native-inputs #:allow-other-keys)
- (delete-file "dist/config.sub")
- (symlink
- (search-input-file native-inputs "/bin/config.sub")
- "dist/config.sub"))))
- '())
- (replace 'configure
- (lambda* (#:key target outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- ;; '--docdir' is not honored, so we need to patch.
- (substitute* "dist/Makefile.in"
- (("docdir[[:blank:]]*=.*")
- (string-append "docdir = " doc "/share/doc/bdb")))
-
- (chdir "build_unix")
- (invoke "../dist/configure"
- (string-append "--prefix=" out)
- (string-append "CONFIG_SHELL=" (which "bash"))
- (string-append "SHELL=" (which "bash"))
-
- ;; Bdb's config script doesn't recognize very many
- ;; architectures, and is a dependant on the 'config'
- ;; package, so we manually define the build target.
- ,@(match (%current-system)
- ("aarch64-linux"
- '("--build=aarch64-unknown-linux-gnu"))
- ("powerpc64le-linux"
- '("--build=powerpc64le-unknown-linux-gnu"))
- ("riscv64-linux"
- '("--build=riscv64-unknown-linux-gnu"))
- (_ '()))
+ (list #:tests? #f ; no check target available
+ #:disallowed-references '("doc")
+ #:out-of-source? #true
+ #:configure-flags
+ #~(list
+ ;; Remove 7 MiB of .a files.
+ "--disable-static"
- ,@(if (%current-target-system) ; cross building
- '((string-append "--host=" target))
- '())
+ ;; The compatibility mode is needed by some packages,
+ ;; notably iproute2.
+ "--enable-compat185"
- ;; Remove 7 MiB of .a files.
- "--disable-static"
-
- ;; The compatibility mode is needed by some packages,
- ;; notably iproute2.
- "--enable-compat185"
-
- ;; The following flag is needed so that the inclusion
- ;; of db_cxx.h into C++ files works; it leads to
- ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
- "--enable-cxx")))))))
- (native-inputs
- (if (and (%current-target-system)
- (or (target-ppc64le? (%current-target-system))
- (target-aarch64? (%current-target-system))
- (target-riscv64? (%current-target-system))))
- `(("config" ,config)) ; for config.sub
- '()))
+ ;; The following flag is needed so that the inclusion
+ ;; of db_cxx.h into C++ files works; it leads to
+ ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
+ "--enable-cxx")
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda* (#:key inputs native-inputs outputs
+ #:allow-other-keys #:rest arguments)
+ (with-directory-excursion "dist"
+ (for-each (lambda (x)
+ (install-file x "aclocal"))
+ (find-files "aclocal_java"))
+ (apply (assq-ref %standard-phases 'bootstrap) arguments)
+ (let ((automake-files (search-input-directory
+ (or native-inputs inputs)
+ "share/automake-1.16")))
+ (define (replace file)
+ (symlink (string-append automake-files "/" file) file))
+ (for-each replace '("config.sub" "config.guess"
+ "install-sh"))))))
+ (add-before 'configure 'pre-configure
+ (lambda _
+ (chdir "dist")
+ ;; '--docdir' is not honored, so we need to patch.
+ (substitute* "Makefile.in"
+ (("docdir[[:blank:]]*=.*")
+ (string-append "docdir = " #$output:doc
+ "/share/doc/bdb")))
+ ;; Replace __EDIT_DB_VERSION__... by actual version numbers.
+ ;; s_config is responsible for this, but also runs autoconf
+ ;; again, so patch out the autoconf bits.
+ (substitute* "s_config"
+ (("^.*(aclocal|autoconf|autoheader|config\\.hin).*$") "")
+ (("^.*auto4mte.*$") "")
+ (("rm (.*) configure") "")
+ (("chmod (.*) config.guess(.*)$") ""))
+ (invoke "sh" "s_config"))))))
+ (native-inputs (list autoconf automake libtool))
(synopsis "Berkeley database")
(description
"Berkeley DB is an embeddable database allowing developers the choice of
@@ -138,7 +149,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(name "bdb")
(version "5.3.28")
(source (origin
- (method url-fetch)
+ (inherit (package-source bdb-4.8))
(uri (string-append "https://download.oracle.com/berkeley-db/db-"
version ".tar.gz"))
(sha256
@@ -152,12 +163,14 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(name "bdb")
(version "6.2.32")
(source (origin
+ (inherit (package-source bdb-4.8))
(method url-fetch)
(uri (string-append "https://download.oracle.com/berkeley-db/db-"
version ".tar.gz"))
(sha256
(base32
- "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))))
+ "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))
+ (patches '())))
;; Starting with version 6, BDB is distributed under AGPL3. Many individual
;; files are covered by the 3-clause BSD license.
(license (list license:agpl3+ license:bsd-3))))
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index a88fb04feb..bbbcf92421 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -27,6 +27,7 @@
#:use-module (guix packages)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system perl)
#:use-module (guix build-system trivial)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
@@ -34,6 +35,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
+ #:use-module (gnu packages databases)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
@@ -43,7 +45,10 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages web)
#:use-module (gnu packages wget)
+ #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public debian-archive-keyring
@@ -236,6 +241,160 @@ contains the archive keys used for that.")
(license (list license:public-domain ; the keys
license:gpl2+)))) ; see debian/copyright
+(define-public debian-devscripts-bts
+ (package
+ (name "debian-devscripts-bts")
+ (version "2.23.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://salsa.debian.org/debian/devscripts.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "031467rclglk1hdx8z2vzx5z88vpy0sk73qi8ni0sai3jx62ji75"))))
+ (build-system perl-build-system)
+ (arguments
+ (list
+ #:tests? #f ; tests assume various Debian specific capabilities
+ #:phases
+ ;; only includes the bts command as that's useful for Guix packagers
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-programs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (with-directory-excursion "scripts"
+ (substitute* "bts.pl" (("/bin/bash") (which "bash")))
+ (substitute* "bts.pl" (("/bin/rm") (which "rm")))
+ (substitute* "bts.pl" (("/bin/cat") (which "cat")))
+ ;; Avoid having to provide Debian's sensible-browser package
+ (substitute* "bts.pl"
+ (("my \\$browser;") "my $browser = $ENV{'BROWSER'};"))
+ (substitute* "bts.pl"
+ (("'sensible-browser',") "$browser,"))
+ ;; Use Guix's debbugs - patching the source as putting a config
+ ;; file into #$output/etc doesn't work
+ (substitute* "bts.pl"
+ (("= 'https://bugs.debian.org'")
+ "= 'https://debbugs.gnu.org'"))
+ (rename-file "bts.pl" "bts"))))
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((bindir (string-append #$output "/bin"))
+ (bashcomp (string-append #$output
+ "/etc/bash_completion.d"))
+ (perl-lib (string-append #$output
+ "/lib/perl5/site_perl/Devscripts"))
+ (wrap.pl
+ (lambda (scripts keys)
+ (for-each
+ (lambda (script)
+ (wrap-program script
+ `("PERL5LIB" ":" prefix
+ ,(cons*
+ (getenv "PERL5LIB")
+ (string-append #$output
+ "/lib/perl5/site_perl")
+ (map
+ (lambda (key)
+ (string-append
+ (assoc-ref inputs key)
+ "/lib/perl5/site_perl"))
+ keys)))))
+ scripts)))
+ (doc (string-append #$output
+ "/share/doc/" #$name "-" #$version)))
+ (with-directory-excursion "scripts"
+ (for-each (lambda (f) (install-file f bindir))
+ '("bts"))
+ (mkdir-p bashcomp)
+ (copy-file "bts.bash_completion" (string-append bashcomp "/bts")))
+ (wrap.pl (find-files bindir)
+ (list "dpkg"
+ "perl-authen-sasl"
+ "perl-db-file"
+ "perl-encode"
+ "perl-encode-locale"
+ "perl-file-homedir"
+ "perl-file-listing"
+ "perl-file-which"
+ "perl-http-cookies"
+ "perl-http-daemon"
+ "perl-http-date"
+ "perl-http-message"
+ "perl-http-negotiate"
+ "perl-http-parser"
+ "perl-io-socket-ssl"
+ "perl-ipc-run"
+ "perl-json"
+ "perl-libwww"
+ "perl-list-compare"
+ "perl-lwp-protocol-https"
+ "perl-moo"
+ "perl-mozilla-ca"
+ "perl-net-http"
+ "perl-try-tiny"
+ "perl-uri"
+ "perl-www-robotrules"))
+ (with-directory-excursion "lib/Devscripts/"
+ (for-each (lambda (f) (install-file f perl-lib))
+ (find-files "./")))
+ (for-each (lambda (f) (install-file f doc))
+ '("README")))))
+ (add-after 'install 'manpage
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ( (man1 (string-append #$output "/share/man/man1"))
+ (man5 (string-append #$output "/share/man/man5")))
+ (with-directory-excursion "scripts"
+ (invoke "pod2man" "--utf8" "--center=' '" "bts" "bts.1")
+ (install-file "bts.1" man1))
+ (with-directory-excursion "doc"
+ (invoke "make" "devscripts.1")
+ (install-file "devscripts.1" man1)
+ (install-file "devscripts.conf.5" man5))))))))
+ (inputs
+ (list
+ bash-minimal
+ dpkg
+ perl-authen-sasl
+ perl-db-file
+ perl-encode
+ perl-encode-locale
+ perl-file-homedir
+ perl-file-listing
+ perl-file-which
+ perl-http-cookies
+ perl-http-daemon
+ perl-http-date
+ perl-http-message
+ perl-http-negotiate
+ perl-http-parser
+ perl-io-socket-ssl
+ perl-ipc-run
+ perl-json
+ perl-libwww
+ perl-list-compare
+ perl-lwp-protocol-https
+ perl-moo
+ perl-mozilla-ca
+ perl-net-http
+ perl-try-tiny
+ perl-uri
+ perl-www-robotrules))
+ (native-inputs
+ (list perl perl-libwww perl-uri pkg-config python))
+ (propagated-inputs
+ (list perl-lwp-protocol-https))
+ (home-page "https://tracker.debian.org/pkg/devscripts")
+ (synopsis "BTS script from Debian's devscripts")
+ (description "This package only provides the bts script from the Debian
+devscripts archive. It's useful for Guix Developers that interact with GNU's
+debbugs server.")
+ (license license:gpl2+)))
+
(define-public debootstrap
(package
(name "debootstrap")
@@ -422,7 +581,7 @@ distributions such as Debian and Trisquel.")
(arguments
(list #:modules
`((srfi srfi-71)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'bootstrap 'patch-version
@@ -566,8 +725,8 @@ handling the installation and removal of Debian software packages.")
(lambda ()
(format #t "# A couple of presets to make this work more smoothly.~@
MIRRORSITE=\"http://deb.debian.org/debian\"~@
- if [ -r /run/setuid-programs/sudo ]; then~@
- PBUILDERROOTCMD=\"/run/setuid-programs/sudo -E\"~@
+ if [ -r /run/privileged/bin/sudo ]; then~@
+ PBUILDERROOTCMD=\"/run/privileged/bin/sudo -E\"~@
fi~@
PBUILDERSATISFYDEPENDSCMD=\"~a/lib/pbuilder/pbuilder-satisfydepends-apt\"~%"
#$output)))))
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 612533b03d..cc8e05746a 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.
;;;
@@ -142,6 +143,7 @@ program to exhibit a bug.")
(native-inputs (list flex))
(inputs
`(("astyle" ,astyle)
+ ("bash" ,bash-minimal) ; for wrap-program
("llvm" ,llvm-9)
("clang" ,clang-9)
("indent" ,indent)
@@ -565,6 +567,33 @@ It is a fork of American Fuzzy Lop fuzzer and features:
redqueen, AFLfast++ power schedules, MOpt mutators, unicorn_mode, etc.
@end itemize")))
+(define-public backward-cpp
+ (package
+ (name "backward-cpp")
+ (version "1.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bombela/backward-cpp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1b2h03iwfhcsg8i4f125mlrjf8l1y7qsr2gsbkv0z03i067lykns"))))
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "-DBACKWARD_SHARED=ON")))
+ (build-system cmake-build-system)
+ (inputs
+ (list libiberty zlib))
+ (synopsis "Stack trace pretty printer for C++")
+ (description
+ "Backward-cpp is a stack trace pretty printer for C++.
+It can print annotated stack traces using debug info in the executable.")
+ (home-page "https://github.com/bombela/backward-cpp")
+ (license license:expat)))
+
(define-public stress-make
(let ((commit "97815bed8060de33952475b3498767c91f59ffd9")
(revision "2")) ;No official source distribution
@@ -691,7 +720,8 @@ input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
automake
autoconf))
(inputs
- (list readline))
+ (list bash-minimal
+ readline))
(propagated-inputs
(list python-pygobject))
(home-page "https://github.com/scanmem/scanmem")
@@ -733,7 +763,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 +771,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
@@ -781,6 +811,10 @@ error reporting, better tracing, profiling, and a debugger.")
(list pkg-config ninja which))
(inputs
(list gdb capnproto python python-pexpect zlib))
+
+ ;; List of supported systems according to 'src/preload/raw_syscall.S'.
+ (supported-systems '("x86_64-linux" "i686-linux" "aarch64-linux"))
+
(home-page "https://rr-project.org/")
(synopsis "Record and replay debugging framework")
(description
diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm
index ecf4431bcc..36678223ed 100644
--- a/gnu/packages/dezyne.scm
+++ b/gnu/packages/dezyne.scm
@@ -48,6 +48,7 @@
scmackerel))
(inputs (list bash-minimal
guile-3.0
+ (libc-utf8-locales-for-target)
mcrl2-minimal
pth
sed))
@@ -56,7 +57,7 @@
(arguments
(list
#:modules `((ice-9 popen)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'setenv
@@ -132,7 +133,7 @@ has formal semantics expressed in @url{https://mcrl2.org,mCRL2}.")
(arguments
(list
#:modules `((ice-9 popen)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'setenv
diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm
index dac61611d5..9f8c5cccc1 100644
--- a/gnu/packages/dico.scm
+++ b/gnu/packages/dico.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015-2016, 2018, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@@ -26,6 +26,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages readline)
#:use-module (gnu packages m4)
#:use-module (gnu packages groff)
@@ -75,6 +76,7 @@
readline
zlib
wordnet
+ libxcrypt ;for 'crypt'
libltdl))
(home-page "https://www.gnu.org/software/dico/")
(synopsis "Implementation of DICT server (RFC 2229)")
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 9f493d91ad..3f9b59c960 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages curl)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -242,14 +243,14 @@ and a Python library.")
(name "translate-shell")
(version "0.9.7.1")
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url"https://github.com/soimort/translate-shell")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0jfrypcz963pfvwwaz2i0xvwp2909ldzp15v68mgd2mbqkqw9d90"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url"https://github.com/soimort/translate-shell")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jfrypcz963pfvwwaz2i0xvwp2909ldzp15v68mgd2mbqkqw9d90"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -280,18 +281,18 @@ and a Python library.")
(assoc-ref emacs:%standard-phases 'build)))
#:make-flags (list (string-append "PREFIX=" %output)
"NETWORK_ACCESS=no test")
- #:imported-modules (,@%gnu-build-system-modules
- (guix build emacs-build-system)
- (guix build emacs-utils))
+ #:imported-modules (,@%default-gnu-imported-modules
+ (guix build emacs-build-system)
+ (guix build emacs-utils))
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:test-target "test"))
(inputs
- (list curl fribidi rlwrap))
+ (list bash-minimal curl fribidi rlwrap))
(native-inputs
- `(("emacs" ,emacs-minimal)
- ("util-linux" ,util-linux))) ; hexdump, for the test
+ (list emacs-minimal
+ util-linux)) ; hexdump, for the test
(home-page "https://www.soimort.org/translate-shell/")
(synopsis "Translations from the command line")
(description
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d..35007a7b80 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@
(define-public diffoscope
(package
(name "diffoscope")
- (version "265")
+ (version "277")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
+ (base32 "0b2m3mjcasyvwwrk5jwgbvmnha5smfgarjk4jchxmlhddf9y18wc"))))
(build-system python-build-system)
(arguments
(list
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 10d546b918..290b5e1f42 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -209,13 +209,13 @@ and write-back caching.")
(string-append "--sysconfdir="
(assoc-ref %outputs "out")
"/etc")
- ;; udevil expects these programs to be run with uid set as root.
- ;; user has to manually add these programs to setuid-programs.
- ;; mount and umount are default setuid-programs in guix system.
- "--with-mount-prog=/run/setuid-programs/mount"
- "--with-umount-prog=/run/setuid-programs/umount"
- "--with-losetup-prog=/run/setuid-programs/losetup"
- "--with-setfacl-prog=/run/setuid-programs/setfacl")
+ ;; udevil expects these programs to be run with an UID of root.
+ ;; mount and umount are %default-privileged-programs on Guix System;
+ ;; the others must be explicitly added if desired.
+ "--with-mount-prog=/run/privileged/bin/mount"
+ "--with-umount-prog=/run/privileged/bin/umount"
+ "--with-losetup-prog=/run/privileged/bin/losetup"
+ "--with-setfacl-prog=/run/privileged/bin/setfacl")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-root-reference
@@ -226,12 +226,12 @@ and write-back caching.")
(add-after 'unpack 'patch-udevil-reference
;; udevil expects itself to be run with uid set as root.
;; devmon also expects udevil to be run with uid set as root.
- ;; user has to manually add udevil to setuid-programs.
+ ;; user has to manually add udevil to privileged-programs.
(lambda _
(substitute* "src/udevil.c"
- (("/usr/bin/udevil") "/run/setuid-programs/udevil"))
+ (("/usr/bin/udevil") "/run/privileged/bin/udevil"))
(substitute* "src/devmon"
- (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil"))
+ (("`which udevil 2>/dev/null`") "/run/privileged/bin/udevil"))
#t)))))
(native-inputs
(list intltool pkg-config))
@@ -273,8 +273,6 @@ tmpfs/ramfs filesystems.")
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
- (substitute* "tests/t0251-gpt-unicode.sh"
- (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(inputs
@@ -327,6 +325,7 @@ tables. It includes a library and command-line utility.")
(inputs
`(("gettext" ,gettext-minimal)
("guile" ,guile-1.8)
+ ("libxcrypt" ,libxcrypt)
("util-linux" ,util-linux "lib")
("parted" ,parted)))
;; The build neglects to look for its own headers in its own tree. A next
@@ -954,7 +953,7 @@ Duperemove can also take input from the @command{fdupes} program.")
"0lfjrpv3z4h0knd3v94fijrw2zjba51mrp3mjqx2c98wr428l26f"))))
(build-system python-build-system)
(inputs
- (list w3m))
+ (list bash-minimal w3m))
(native-inputs
(list which
;; For tests.
@@ -964,7 +963,7 @@ Duperemove can also take input from the @command{fdupes} program.")
#:test-target "test_pytest"
#:phases
(modify-phases %standard-phases
- (add-after 'configure 'wrap-program
+ (add-after 'install 'wrap-program
;; Tell 'ranger' where 'w3mimgdisplay' is.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -973,8 +972,7 @@ Duperemove can also take input from the @command{fdupes} program.")
(w3mimgdisplay (string-append w3m
"/libexec/w3m/w3mimgdisplay")))
(wrap-program ranger
- `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay)))
- #t)))
+ `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay))))))
(replace 'check
;; The default check phase simply prints 'Ran 0 tests in 0.000s'.
(lambda* (#:key test-target #:allow-other-keys)
@@ -1042,12 +1040,13 @@ and its highly optimized now for efficient performance.")
(native-inputs
(list pkg-config swig python-3)) ; used to generate the Python bindings
(inputs
- `(("cryptsetup" ,cryptsetup)
- ("nss" ,nss)
- ("libblkid" ,util-linux "lib")
- ("lvm2" ,lvm2) ; for "-ldevmapper"
- ("glib" ,glib)
- ("gpgme" ,gpgme)))
+ (append
+ (cons cryptsetup (libcryptsetup-propagated-inputs))
+ (cons lvm2 (libdevmapper-propagated-inputs))
+ (list nss
+ (list util-linux "lib")
+ glib
+ gpgme)))
(arguments
`(#:tests? #f ; not sure how tests are supposed to pass, even when run manually
#:phases
@@ -1203,22 +1202,23 @@ to create devices with respective mappings for the ATARAID sets discovered.")
python-wrapper
util-linux))
(inputs
- (list btrfs-progs
- cryptsetup
- dosfstools
- dmraid
- eudev
- glib
- kmod
- libbytesize
- libyaml
- lvm2
- mdadm
- ndctl
- nss
- parted
- volume-key
- xfsprogs))
+ (append
+ (cons cryptsetup (libcryptsetup-propagated-inputs))
+ (list btrfs-progs
+ dosfstools
+ dmraid
+ eudev
+ glib
+ kmod
+ libbytesize
+ libyaml
+ lvm2
+ mdadm
+ ndctl
+ nss
+ parted
+ volume-key
+ xfsprogs)))
(home-page "https://github.com/storaged-project/libblockdev")
(synopsis "Library for manipulating block devices")
(description
@@ -1245,7 +1245,6 @@ LVM D-Bus API).")
(build-system scons-build-system)
(arguments
(list
- #:scons scons-python2
#:scons-flags
#~(list (string-append "--prefix=" #$output)
(string-append "--actual-prefix=" #$output))
@@ -1309,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
@@ -1468,6 +1466,7 @@ that support this feature).")
`(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc/" ,name "-" ,version))
+ #:parallel-build? #f ;fails otherwise
#:tests? #f ; Tests require a NUMA-enabled system.
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 3ff8fa5b65..a98c90d575 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -48,6 +48,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl)
@@ -69,7 +70,7 @@
(define-public sddm
(package
(name "sddm")
- (version "0.20.0")
+ (version "0.21.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -78,56 +79,73 @@
(file-name (git-file-name name version))
(sha256
(base32
- "1450zv03d3mbid27986p4mdshw9qf3ar8crl4idybf7khxgan22y"))))
+ "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"
- ;; 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
@@ -137,6 +155,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"))
@@ -356,6 +387,7 @@ experience for your users, your family and yourself")
(add-before 'check 'pre-check
(lambda _
(wrap-program "tests/src/test-python-greeter"
+ #:sh (which "bash")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text
@@ -501,6 +533,7 @@ GTK+, lets you select a desktop session and log in to it.")
libjpeg-turbo
libpng
libx11
+ libxcrypt
libxft
libxmu
libxrandr
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4060819a35..2be815df9b 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -10,6 +10,9 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
+;;; Copyright © 2024 Wojtek Kosior <koszko@koszko.org>
+;;; Additions and modifications by Wojtek Kosior are additionally
+;;; dual-licensed under the Creative Commons Zero v1.0.
;;;
;;; This file is part of GNU Guix.
;;;
@@ -64,9 +67,16 @@
(sha256
(base32
"1ha6c5j3pizbsfzw37r52lvdz8z5lblq4iwa99mpkdzz92aiqp2y"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- '(#:phases
+ '(#:test-flags
+ (list
+ ;; By default tests run in parallel, which may cause various race
+ ;; conditions. Run sequentially for consistent results.
+ "--parallel=1"
+ ;; The test suite fails as soon as a single test fails.
+ "--failfast")
+ #:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
@@ -82,19 +92,15 @@
;; harmless, so just ignore this test.
(substitute* "tests/settings_tests/tests.py"
((".*def test_incorrect_timezone.*" all)
- (string-append " @unittest.skipIf(True, 'Disabled by Guix')\n"
+ (string-append " @unittest.skip('Disabled by Guix')\n"
all)))))
(replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
+ (lambda* (#:key tests? test-flags #:allow-other-keys)
(if tests?
(with-directory-excursion "tests"
;; Tests expect PYTHONPATH to contain the root directory.
(setenv "PYTHONPATH" "..")
- (invoke "python" "runtests.py"
- ;; By default tests run in parallel, which may cause
- ;; various race conditions. Run sequentially for
- ;; consistent results.
- "--parallel=1"))
+ (apply invoke "python" "runtests.py" test-flags))
(format #t "test suite not run~%"))))
;; XXX: The 'wrap' phase adds native inputs as runtime dependencies,
;; see <https://bugs.gnu.org/25235>. The django-admin script typically
@@ -108,12 +114,12 @@
;; Remaining packages are test requirements taken from
;; tests/requirements/py3.txt
python-docutils
- ;; optional for tests: ("python-geoip2" ,python-geoip2)
- ;; optional for tests: ("python-memcached" ,python-memcached)
+ ;; optional for tests: python-geoip2
+ ;; optional for tests: python-memcached
python-numpy
python-pillow
python-pyyaml
- ;; optional for tests: ("python-selenium" ,python-selenium)
+ ;; optional for tests: python-selenium
python-tblib))
(propagated-inputs
(list python-asgiref
@@ -1404,6 +1410,35 @@ to ElasticSearch.")
@code{CIDR} fields for use in Django projects.")
(license license:bsd-3)))
+(define-public python-django-timezone-field
+ (package
+ (name "python-django-timezone-field")
+ (version "6.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mfogel/django-timezone-field")
+ (commit version)))
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32
+ "0hsl8fi6rv4yz973b7m7j8id0prswz3gxljjqclswpz9q35rc5mx"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; Some test dependencies are not packaged yet.
+ (list #:tests? #f))
+ (propagated-inputs (list python-django))
+ (native-inputs (list python-poetry-core python-pytest-django))
+ (home-page "https://pypi.org/project/django-timezone-field/")
+ (synopsis
+ "A Django app providing DB, form, and REST framework fields for zoneinfo
+and pytz timezone objects.")
+ (description
+ "This package provides a Django app providing DB, form, and REST
+framework fields for zoneinfo and pytz timezone objects.")
+ (license license:bsd-2)))
+
(define-public python-django-url-filter
(package
(name "python-django-url-filter")
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 743fc7e284..5326ddc7b3 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -31,6 +31,7 @@
#:use-module (guix build-system python)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages gawk)
@@ -309,7 +310,7 @@ and white.")
`(#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
#:test-target "test"
#:phases
@@ -346,7 +347,8 @@ and white.")
`("PATH" ":" prefix (,(string-append djvulibre "/bin"))))))))))
(native-inputs (list python-nose))
(inputs
- (list djvulibre
+ (list bash-minimal
+ djvulibre
minidjvu
python-gamera
python-pillow
@@ -378,9 +380,10 @@ and background layers of images, which can then be encoded into a DjVu file.")
"0x64hg9ysrk8sismxb4jgk0sq7r9j90v2i9765xhmxpiy6f0lpni"))))
(build-system gnu-build-system)
(native-inputs
- (list libxml2 python-nose python-pillow))
+ (list (libc-utf8-locales-for-target) libxml2 python-nose python-pillow))
(inputs
- (list djvulibre
+ (list bash-minimal
+ djvulibre
ocrad
python-djvulibre
python-future
@@ -395,7 +398,7 @@ and background layers of images, which can then be encoded into a DjVu file.")
#:modules '((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build python-build-system))
#:test-target "test"
#:phases
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index 37d4ad5356..8bf0ee685e 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -148,14 +148,14 @@ to a minimal test case.")
(define ldc-bootstrap
(package
(name "ldc")
- (version "1.35.0")
+ (version "1.38.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ldc-developers/ldc/releases"
"/download/v" version "/ldc-" version "-src.tar.gz"))
(sha256
- (base32 "186z4r1d8y4dfpv5cdqgz9al6w7qnfh9l4q9ws9w0xkcf29njabf"))))
+ (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))))
(build-system cmake-build-system)
(arguments
`(#:disallowed-references (,tzdata-for-tests)
@@ -177,8 +177,8 @@ to a minimal test case.")
(replace 'build
;; Building with Make would result in "make: *** [Makefile:166:
;; all] Error 2".
- (lambda* (#:key make-flags parallel-tests? #:allow-other-keys)
- (let ((job-count (number->string (or (and parallel-tests?
+ (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+ (let ((job-count (number->string (or (and parallel-build?
(parallel-job-count))
1))))
(apply invoke "cmake" "--build" "." "-j" job-count
@@ -191,8 +191,8 @@ to a minimal test case.")
("libedit" ,libedit)
("zlib" ,zlib)))
(native-inputs
- `(("lld-wrapper" ,(make-lld-wrapper lld-15 #:lld-as-ld? #t))
- ("llvm" ,llvm-15)
+ `(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
+ ("llvm" ,llvm-17)
("ldc" ,gdmd)
("ninja" ,ninja)
("python-wrapper" ,python-wrapper)
@@ -227,7 +227,10 @@ bootstrapping more recent compilers written in D.")
"ldc2-unittest" "all-test-runners"))
((#:configure-flags _ #~'())
`(list "-GNinja"
- "-DBUILD_SHARED_LIBS=ON"))
+ "-DBUILD_SHARED_LIBS=ON"
+ ,@(if (target-riscv64?)
+ `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
+ '())))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-compiler-rt-library-discovery
@@ -257,9 +260,10 @@ bootstrapping more recent compilers written in D.")
"/lib/linux\",\n"))))))
(add-after 'unpack 'patch-paths-in-tests
(lambda _
- (substitute* '("tests/dmd/Makefile"
- "runtime/druntime/test/profile/Makefile")
+ (substitute* "runtime/druntime/test/profile/Makefile"
(("/bin/bash") (which "bash")))
+ (substitute* "tests/driver/cli_CC_envvar.d"
+ (("cc") (which "clang")))
(substitute* "tests/linking/linker_switches.d"
(("echo") (which "echo")))
(substitute* "tests/dmd/dshell/test6952.d"
@@ -276,25 +280,36 @@ bootstrapping more recent compilers written in D.")
;; The following tests plugins we don't have.
(delete-file "tests/plugins/addFuncEntryCall/testPlugin.d")
(delete-file "tests/plugins/addFuncEntryCall/testPluginLegacy.d")
- ;; The following tests requires AVX instruction set in the CPU.
- (substitute* "tests/dmd/runnable/cdvecfill.sh"
- (("^// DISABLED: ") "^// DISABLED: linux64 "))
;; This unit test requires networking, fails with
;; "core.exception.RangeError@std/socket.d(778): Range
;; violation".
(substitute* "runtime/phobos/std/socket.d"
(("assert\\(ih.addrList\\[0\\] == 0x7F_00_00_01\\);.*")
""))
+
+ ;; These tests fail on riscv64-linux.
+ (substitute* "runtime/phobos/std/math/operations.d"
+ (("static assert\\(getNaNPayload\\(a\\)" all )
+ (string-append "// " all)))
+ (substitute* "runtime/phobos/std/math/traits.d"
+ (("static assert\\(signbit\\(-.*\\.nan" all)
+ (string-append "// " all)))
+
;; The GDB tests suite fails; there are a few bug reports about
;; it upstream.
(for-each delete-file (find-files "tests" "gdb.*\\.(c|d|sh)$"))
- (delete-file "tests/dmd/runnable/debug_info.d")
(delete-file "tests/dmd/runnable/b18504.d")
(substitute* "runtime/druntime/test/exceptions/Makefile"
((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*")
""))
;; Unsupported with glibc-2.35.
(delete-file "tests/dmd/compilable/stdcheaders.c")
+ (delete-file "tests/dmd/compilable/test23958.c")
+ (delete-file "tests/dmd/runnable/test23889.c")
+ (delete-file "tests/dmd/runnable/test23402.d")
+ (delete-file "tests/dmd/runnable/helloc.c")
+ ;; Only works in 2024 and without SOURCE_DATE_EPOCH
+ (delete-file "tests/dmd/compilable/ddocYear.d")
;; Drop gdb_dflags from the test suite.
(substitute* "tests/dmd/CMakeLists.txt"
(("\\$\\{gdb_dflags\\}") ""))
@@ -313,12 +328,12 @@ bootstrapping more recent compilers written in D.")
"sanitizers/msan_noerror.d"
"sanitizers/msan_uninitialized.d"
"dmd/runnable_cxx/cppa.d")))
- (,(target-aarch64?)
+ (,(target-riscv64?)
(for-each delete-file
- '("dmd/runnable/ldc_cabi1.d"
- "sanitizers/fuzz_basic.d"
- "sanitizers/msan_noerror.d"
- "sanitizers/msan_uninitialized.d")))
+ '("codegen/simd_alignment.d"
+ "dmd/runnable/argufilem.d"
+ "dmd/compilable/test23705.d"
+ "dmd/fail_compilation/diag7420.d")))
(#t '())))))
(add-before 'configure 'set-cc-and-cxx-to-use-clang
;; The tests require to be built with Clang; build everything
@@ -349,13 +364,44 @@ bootstrapping more recent compilers written in D.")
"-R" "dmd-testsuite")
(display "running the defaultlib unit tests and druntime \
integration tests...\n")
- (invoke "ctest" "--output-on-failure" "-j" job-count
- "-E" "dmd-testsuite|lit-tests|ldc2-unittest")))))))))
+ (invoke
+ "ctest" "--output-on-failure" "-j" job-count "-E"
+ (string-append
+ "dmd-testsuite|lit-tests|ldc2-unittest"
+ ,@(cond
+ ((target-aarch64?)
+ `(,(string-append
+ "|std.internal.math.gammafunction-shared"
+ "|std.math.exponential-shared"
+ "|std.internal.math.gammafunction-debug-shared"
+ "|druntime-test-exceptions-debug")))
+ ((target-riscv64?)
+ `(,(string-append
+ "|std.internal.math.errorfunction-shared"
+ "|std.internal.math.gammafunction-shared"
+ "|std.math.exponential-shared"
+ "|std.math.trigonometry-shared"
+ "|std.mathspecial-shared"
+ "|std.socket-shared"
+ "|std.internal.math.errorfunction-debug-shared"
+ "|std.internal.math.gammafunction-debug-shared"
+ "|std.math.operations-debug-shared"
+ "|std.math.exponential-debug-shared"
+ "|std.math.traits-debug-shared"
+ "|std.mathspecial-debug-shared"
+ "|std.math.trigonometry-debug-shared"
+ "|std.socket-debug-shared"
+ ;; These four hang forever
+ "|core.thread.fiber-shared"
+ "|core.thread.osthread-shared"
+ "|core.thread.fiber-debug-shared"
+ "|core.thread.osthread-debug-shared")))
+ (#t `("")))))))))))))
(native-inputs
(append (delete "llvm"
(alist-replace "ldc" (list ldc-bootstrap)
(package-native-inputs ldc-bootstrap)))
- `(("clang" ,clang-15) ;propagates llvm and clang-runtime
+ `(("clang" ,clang-17) ;propagates llvm and clang-runtime
("python-lit" ,python-lit))))))
;;; Bootstrap version of phobos that is built with GDC, using GDC's standard
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 36d3eb8b7e..ffc8eda6bb 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -18,7 +18,7 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
-;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
@@ -337,14 +337,14 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here:
;; https://www.isc.org/bind/
- (version "9.19.21")
+ (version "9.19.24")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz"))
(sha256
- (base32 "133f1aq8acaz9z03cl0gcrj4pq0hqm6c3sm4hz67d37phndsjs1b"))))
+ (base32 "171668qgjvf257m3r04lxmbsiz9lnn57djnlmn8plh1lj77fw3nh"))))
(build-system gnu-build-system)
(outputs `("out" "utils"))
(inputs
@@ -636,18 +636,18 @@ BIND and djbdns---whilst using relatively little memory.")
(define-public unbound
(package
(name "unbound")
- (version "1.19.1")
+ (version "1.21.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz"))
(sha256
- (base32 "1ad34jxprygjp7g84q1bgmvcc114f2mgyhfwk9rs0inq7mpmf7dw"))))
+ (base32 "08a5l5z0c99433pqg2i7x5d9m6as7c2z3sv4zakdy6zqn3bagp77"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(native-inputs
- (list flex swig))
+ (list flex swig python-wrapper))
(inputs
(list expat
libevent
@@ -845,7 +845,7 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
- (version "3.3.4")
+ (version "3.3.8")
(source
(origin
(method git-fetch)
@@ -854,7 +854,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0w7drq0pj94d43qn9wmzxab34mjhxj9x84rixbswc270ywh6d9pr"))
+ (base32 "0iaardlmvcp6f0vccs81f202bb53y7fkcw5n12ahgqymqzhafpmq"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -949,20 +949,20 @@ Extensions} (DNSSEC).")
ragel
texinfo))
(inputs
- `(("fstrm" ,fstrm)
- ("gnutls" ,gnutls)
- ("jansson" ,jansson)
- ("libbpf" ,libbpf)
- ("libcap-ng" ,libcap-ng)
- ("libedit" ,libedit)
- ("libelf" ,libelf)
- ("libidn" ,libidn)
- ("libmnl" ,libmnl)
- ("libnghttp2" ,nghttp2 "lib")
- ("liburcu" ,liburcu)
- ("lmdb" ,lmdb)
- ("ncurses" ,ncurses)
- ("protobuf-c" ,protobuf-c)))
+ (list fstrm
+ gnutls
+ jansson
+ libbpf-0.8
+ libcap-ng
+ libedit
+ libelf
+ libidn
+ libmnl
+ `(,nghttp2 "lib")
+ liburcu
+ lmdb
+ ncurses
+ protobuf-c))
(home-page "https://www.knot-dns.cz/")
(synopsis "Authoritative DNS name server")
(description "Knot DNS is an authoritative name server for the @dfn{Domain
@@ -984,14 +984,14 @@ synthesis, and on-the-fly re-configuration.")
(define-public knot-resolver
(package
(name "knot-resolver")
- (version "5.7.1")
+ (version "5.7.4")
(source (origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-resolver/"
"knot-resolver-" version ".tar.xz"))
(sha256
(base32
- "18n3jh17d22xmzpg8syw2dm85vv7jchdc4hzk5x78lqxqqav856s"))))
+ "1j6rig8mb4sh11q6cfhqmlsaxw41fwiglkflz8d08a38y3nacvbb"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@@ -1045,7 +1045,8 @@ synthesis, and on-the-fly re-configuration.")
python-sphinx-rtd-theme
texinfo))
(inputs
- `(("fstrm" ,fstrm)
+ `(("bash" ,bash-minimal) ;for wrap-program
+ ("fstrm" ,fstrm)
("gnutls" ,gnutls)
("knot:lib" ,knot "lib")
("libuv" ,libuv)
@@ -1228,35 +1229,41 @@ and TCP-capable recursive DNS server for finding domains on the internet.")
(define-public openresolv
(package
(name "openresolv")
- (version "3.12.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://roy.marples.name/downloads/openresolv/"
- "openresolv-" version ".tar.xz"))
- (sha256
- (base32
- "15qvp5va2yrqpz0ba54clvn8cbc66v4sl7k3bi9ji8jpx040bcs2"))
- (patches
- (search-patches "openresolv-restartcmd-guix.patch"))))
+ (version "3.13.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/NetworkConfiguration/openresolv")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "03m8n0j0kxxm5kpl66gz4lxr1qqgrp8zlkaq9j8fz27fih0g75xf"))
+ (patches
+ (search-patches "openresolv-restartcmd-guix.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No test suite
- #:configure-flags
- (list (string-append "--sysconfdir=/etc"))
- #:make-flags
- (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (coreutils (assoc-ref inputs "coreutils-minimal")))
- (substitute* (string-append out "/sbin/resolvconf")
- (("RESOLVCONF=\"\\$0\"")
- (format #f "\
-RESOLVCONF=\"$0\"
-PATH=~a/bin:$PATH"
- coreutils)))))))))
+ (list #:tests? #f ; No test suite
+
+ #:configure-flags
+ #~(list (string-append "--prefix=" #$output:out)
+ "--sysconfdir=/etc"
+ "--rundir=/run")
+
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "install"
+ (string-append "SYSCONFDIR=" #$output "/etc")
+ make-flags)))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (string-append #$output "/sbin/resolvconf")
+ (("RESOLVCONF=\"\\$0\"")
+ (format #f "RESOLVCONF=\"$0\"\nPATH=~a/bin:$PATH"
+ (assoc-ref inputs "coreutils-minimal")))))))))
(inputs
(list coreutils-minimal))
(home-page "https://roy.marples.name/projects/openresolv/")
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index c47d3db2c0..02cea45e97 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -27,8 +27,10 @@
(define-module (gnu packages docbook)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages inkscape)
#:use-module (gnu packages tex)
@@ -36,31 +38,33 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages base)
+ #:use-module (gnu packages web)
#:use-module (gnu packages web-browsers)
+ #:use-module (gnu packages xfig)
#:use-module (gnu packages xml)
#:use-module (guix gexp)
+ #:use-module (guix search-paths)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system trivial)
- #:use-module (guix build-system python))
+ #:use-module (guix build-system python)
+ #:use-module (srfi srfi-26))
-(define-public docbook-xml
+;; The fetch-plan, install-plan and phases for docbook-xml tend to vary
+;; between releases therefore we use a “template” package for the
+;; transformations that are common to these packages.
+(define* (docbook-xml-package source version)
+ "Return a package for a docbook-xml package version @var{version} and
+downloading from @var{source}, where @var{version} is a string and
+@var{source} is a @code{<origin>} record."
(package
(name "docbook-xml")
- (version "5.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbook-v" version "-os.zip"))
- (sha256
- (base32
- "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk"))))
+ (version version)
+ (source source)
(build-system copy-build-system)
(arguments
(list
@@ -71,23 +75,27 @@
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-permissions
(lambda _
- ;; XXX: These files do not need 0755 permission.
+ ;; These files do not need 0755 permission.
(for-each (cut chmod <> #o644) (find-files "."))))
(add-before 'install 'patch-catalog-xml
(lambda* (#:key inputs #:allow-other-keys)
(let ((xsltproc (search-input-file inputs "/bin/xsltproc"))
- (dtd-path (string-append #$output "/xml/dtd/docbook")))
- (invoke xsltproc "--nonet" "--noout"
- "--stringparam" "prefix" dtd-path
- "--output" "catalog.xml.new"
- #$(local-file
- (search-auxiliary-file "xml/patch-catalog-xml.xsl"))
- "catalog.xml")
- (rename-file "catalog.xml.new" "catalog.xml"))))
- (replace 'install
- (lambda _
- (let ((dtd-path (string-append #$output "/xml/dtd/docbook")))
- (copy-recursively "." dtd-path)))))))
+ (xslt-file #$(local-file
+ (search-auxiliary-file
+ "xml/patch-catalog-xml.xsl")))
+ ;; Avoid profile conflicts by installing to a
+ ;; versioned path.
+ (dest-path
+ (format #f "~a/xml/docbook/~a" #$output #$version)))
+ (for-each
+ (lambda (catalog)
+ (let ((catalog* (string-append catalog ".new")))
+ (invoke xsltproc "--nonet" "--novalid" "--noout"
+ "--stringparam" "prefix" dest-path
+ "--output" catalog*
+ xslt-file catalog)
+ (rename-file catalog* catalog)))
+ (find-files "." "catalog\\.xml$"))))))))
(native-inputs (list libxslt unzip))
(home-page "https://docbook.org")
(synopsis "DocBook XML DTDs for document authoring")
@@ -97,95 +105,241 @@ suited to books and papers about computer hardware and software (though it is
by no means limited to these applications.) This package provides XML DTDs.")
(license (license:x11-style "" "See file headers."))))
+(define-public docbook-xml-5.1
+ (let* ((version "5.1")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-v" version "-os.zip"))
+ (sha256
+ (base32
+ "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The .zip release mistakenly uses '5.1CR4' instead of
+ ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>.
+ #~(substitute* "schemas/catalog.xml"
+ (("5\\.1CR4") #$version)))))
+ (template (docbook-xml-package source version)))
+ (package
+ (inherit template)
+ (arguments
+ (let ((dest-dir (format #f "xml/docbook/~a/" version)))
+ (substitute-keyword-arguments (package-arguments template)
+ ;; XXX: A default value must be provided otherwise this
+ ;; substitution has no effect.
+ ((#:install-plan _ #f)
+ #~`(("schemas/" #$dest-dir)))))))))
+
+(define-public docbook-xml-5.0.1
+ (let* ((version "5.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-" version ".zip"))
+ (sha256
+ (base32
+ "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"))))
+ (template (docbook-xml-package source version)))
+ (package
+ (inherit template)
+ (arguments
+ (let ((dest-dir (format #f "xml/docbook/~a/" version)))
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:install-plan _ #f)
+ #~`(("catalog.xml" #$dest-dir)
+ ("docbook.nvdl" #$dest-dir)
+ ("dtd" #$dest-dir)
+ ("rng" #$dest-dir)
+ ("sch" #$dest-dir)
+ ("xsd" #$dest-dir)))))))))
+
+;; XXX: docbook-xml-4.x versions use the same #:install-plan but since the
+;; paths are versioned we can't use (inherit …).
+(define* (docbook-xml-4.x-package source version)
+ "Return a template for a docbook-xml-4.x package version @var{version} and
+downloading from @var{source}, where @var{version} is a string and
+@var{source} is a @code{<origin>} record."
+ (let ((base-template (docbook-xml-package source version)))
+ (package
+ (inherit base-template)
+ (arguments
+ (let* ((dest-dir (format #f "xml/docbook/~a/" version)))
+ (substitute-keyword-arguments (package-arguments base-template)
+ ((#:phases phases)
+ ;; Some programs, such as kdoctools, instead of using
+ ;; XML_CATALOG_FILES, prefer to use cmake to locate
+ ;; the DTDs for docbook-xml-4.x packages but
+ ;; since there's no agreed standard as to where these files
+ ;; should be placed, in practice the .cmake files
+ ;; end up searching for paths that are distribution specific.
+ #~(modify-phases #$phases
+ (add-after 'install 'symlink-alternate-path
+ (lambda _
+ ;; kdoctools searches under xml/dtd/docbook/
+ ;; which is the convention used by Nix.
+ (mkdir-p (string-append #$output "/xml/dtd"))
+ (symlink (string-append #$output "/" #$dest-dir)
+ (string-append #$output "/xml/dtd/docbook"))))))
+ ((#:install-plan _ #f)
+ #~`(("./" #$dest-dir
+ #:exclude-regexp ("ChangeLog$"
+ "README$"
+ "docbook\\.cat$"
+ "\\.txt$"))))))))))
+
(define-public docbook-xml-4.5
- (package
- (inherit docbook-xml)
- (version "4.5")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbook-xml-" version ".zip"))
- (sha256
- (base32
- "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"))))))
+ (let* ((version "4.5")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-xml-" version ".zip"))
+ (sha256
+ (base32
+ "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))))
+ (docbook-xml-4.x-package source version)))
(define-public docbook-xml-4.4
- (package (inherit docbook-xml)
- (version "4.4")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbook-xml-" version ".zip"))
- (sha256
- (base32
- "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"))))))
+ (let* ((version "4.4")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-xml-" version ".zip"))
+ (sha256
+ (base32
+ "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82")))))
+ (docbook-xml-4.x-package source version)))
(define-public docbook-xml-4.3
- (package (inherit docbook-xml)
- (version "4.3")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbook-xml-" version ".zip"))
- (sha256
- (base32
- "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"))))))
+ (let* ((version "4.3")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-xml-" version ".zip"))
+ (sha256
+ (base32
+ "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3")))))
+ (docbook-xml-4.x-package source version)))
(define-public docbook-xml-4.2
- (package (inherit docbook-xml)
- (version "4.2")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbook-xml-" version ".zip"))
- (sha256
- (base32
- "18hgwvmywh6a5jh38szjmg3hg2r4v5lb6r3ydc3rd8cp9wg61i5c"))))))
+ (let* ((version "4.2")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbook-xml-" version ".zip"))
+ (sha256
+ (base32
+ "18hgwvmywh6a5jh38szjmg3hg2r4v5lb6r3ydc3rd8cp9wg61i5c")))))
+ (docbook-xml-4.x-package source version)))
(define-public docbook-xml-4.1.2
+ (let* ((version "4.1.2")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "https://docbook.org/xml/" version
+ "/docbkx412.zip"))
+ (sha256
+ (base32
+ "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"))))
+ (template (docbook-xml-4.x-package source version)))
+ (package
+ (inherit template)
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'copy-catalog-file
+ ;; docbook-xml-4.1.2 is unique in the fact that it doesn't come
+ ;; with a catalog.xml file, requiring it to be generated by hand
+ ;; from the docbook.cat SGML catalog. We could automatically
+ ;; generate it here at the cost of enlarging the package
+ ;; definition with a rudimentary (PEG) parser for the SGML
+ ;; catalog but this is overkill since this file is unlikely to
+ ;; change, therefore we ship a pre-generated catalog.xml.
+ (lambda _
+ (copy-file
+ #$(local-file
+ (search-auxiliary-file
+ "xml/docbook-xml/catalog-4.1.2.xml"))
+ "catalog.xml")))
+ (add-after 'patch-catalog-xml 'add-rewrite-entries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmlcatalog (search-input-file inputs
+ "/bin/xmlcatalog"))
+ (dtd-path (format #f "~a/xml/docbook/~a"
+ #$output #$version)))
+ (for-each
+ (lambda (type)
+ (invoke xmlcatalog "--noout"
+ "--add" type
+ "http://www.oasis-open.org/docbook/xml/4.1.2/"
+ (string-append "file:" dtd-path "/")
+ "catalog.xml"))
+ (list "rewriteSystem" "rewriteURI")))))))))
+ (native-inputs
+ (modify-inputs (package-native-inputs template)
+ (prepend libxml2))))))
+
+(define-public docbook-mathml-1.0
(package
- (inherit docbook-xml)
- (version "4.1.2")
+ (name "docbook-mathml")
+ (version "1.0")
(source (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://docbook.org/xml/" version
- "/docbkx412.zip"))
+ (method url-fetch)
+ (uri
+ (string-append "https://www.oasis-open.org/docbook/xml/mathml/"
+ version "/dbmathml.dtd"))
(sha256
(base32
- "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"))))
+ "10vmyl29j829w4xn928rznh163pf47gyzbbjjwqrbg2bidfnk7vp"))))
+ (build-system copy-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments docbook-xml)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'copy-catalog-file
- ;; docbook-xml-4.1.2 is unique in the fact that it doesn't come
- ;; with a catalog.xml file, requiring it to be generated by hand
- ;; from the docbook.cat SGML catalog. We could automatically
- ;; generate it here at the cost of enlarging the package
- ;; definition with a rudimentary (PEG) parser for the SGML
- ;; catalog but this is overkill since this file is unlikely to
- ;; change, therefore we ship a pre-generated catalog.xml.
+ (let ((target (format #f "xml/docbook/mathml/~a/" version)))
+ (list
+ #:modules '((guix build copy-build-system)
+ (guix build utils)
+ (sxml simple)
+ (srfi srfi-1))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'generate-catalog.xml
(lambda _
- (copy-file
- #$(local-file
- (search-auxiliary-file
- "xml/docbook-xml/catalog-4.1.2.xml"))
- "catalog.xml")))
- (add-after 'patch-catalog-xml 'add-rewrite-entries
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmlcatalog (search-input-file inputs "/bin/xmlcatalog"))
- (dtd-path (string-append #$output "/xml/dtd/docbook")))
- (for-each
- (lambda (type)
- (invoke xmlcatalog "--noout"
- "--add" type
- "http://www.oasis-open.org/docbook/xml/4.1.2/"
- (string-append "file://" dtd-path "/")
- "catalog.xml"))
- (list "rewriteSystem" "rewriteURI")))))))))
- (native-inputs
- (modify-inputs (package-native-inputs docbook-xml)
- (prepend libxml2)))))
+ (let ((store-uri (string-append "file:"
+ #$output "/"
+ #$target "dbmathml.dtd")))
+ (call-with-output-file "catalog.xml"
+ (lambda (port)
+ (sxml->xml
+ `(*TOP*
+ (*PI* xml "version='1.0'")
+ (catalog (@ (xmlns "urn:oasis:names:tc:entity:xmlns:xml:catalog"))
+ (public (@ (publicId "-//OASIS//DTD DocBook MathML Module V1.0//EN")
+ (uri ,store-uri)))
+ ,@(map
+ (lambda (scheme)
+ `(system
+ (@ (systemId
+ ,(string-append scheme
+ "://www.oasis-open.org/docbook/xml/"
+ "mathml/1.0/dbmathml.dtd"))
+ (uri ,store-uri))))
+ '("http" "https"))))
+ port)))))))
+ #:install-plan
+ #~`(("catalog.xml" #$target)
+ ("dbmathml.dtd" #$target)))))
+ (propagated-inputs
+ ;; These must be propagated for the package to make sense.
+ ;; TODO: Package MathML2 DTD and propagate it as well.
+ (list docbook-xml-4.1.2))
+ (home-page
+ "https://www.oasis-open.org/docbook/xml/mathml/1.0/index.1.shtml")
+ (synopsis "MathML support for DocBook XML V4.1.2.")
+ (description "The DocBook MathML Module is an extension to DocBook XML
+V4.1.2 that adds support for MathML in equation markup.")
+ (license (license:non-copyleft "" "See file headers."))))
+
+(define-public docbook-xml docbook-xml-5.1)
;;; There's an issue in docbook-xsl 1.79.2 that causes manpages to be
;;; generated incorrectly and embed raw nroff syntax such as '.PP' when there
@@ -205,9 +359,16 @@ by no means limited to these applications.) This package provides XML DTDs.")
(url "https://github.com/docbook/xslt10-stylesheets")
(commit commit)))
(file-name (git-file-name name version))
- ;; Multiple .jar files are bundled with the sources.
(modules '((guix build utils)))
- (snippet '(for-each delete-file (find-files "." "\\.jar$")))
+ (snippet
+ #~(begin
+ ;; Multiple .jar files are bundled with the sources.
+ (for-each delete-file
+ (find-files "." "\\.jar$"))
+ ;; Do not build webhelp files, as they require a Saxon from
+ ;; 2005, which is not packaged in Guix.
+ (substitute* "xsl/Makefile"
+ ((" webhelp") ""))))
(sha256
(base32
"1bl8dwrcy7skrlh80fpsmiw045bv2j0aym231ikcv3hvm2pi98dj"))))
@@ -215,67 +376,123 @@ by no means limited to these applications.) This package provides XML DTDs.")
(arguments
(list
#:make-flags #~(list "XSLTENGINE=xsltproc")
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (sxml simple))
#:phases
- #~(modify-phases %standard-phases
- (replace 'configure
- (lambda _
- ;; The build systems insist on a ~/.xmlc, and it is simpler to
- ;; create a dummy config file than to patch it into
- ;; submission.
- (setenv "HOME" "/tmp")
- (call-with-output-file "/tmp/.xmlc"
- (lambda (port)
- (format port "\
-<?xml version='1.0' encoding='utf-8'?> <!-- -*- nxml -*- -->
-<config>
- <java xml:id=\"bigmem\">
- <java-option name=\"Xmx512m\"/>
- </java>
- <xsltproc xml:id=\"xsltproc\" exec=\"xsltproc\"></xsltproc>
- <xmllint xml:id=\"xmllint\" exec=\"xmllint\"></xmllint>
-</config>\n")))
- (substitute* "xsl/Makefile"
- ;; Do not build webhelp files, as they require a Saxon from
- ;; 2005, which is not packaged in Guix.
- ((" webhelp") ""))))
- (add-before 'install 'generate-catalog.xml
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "-C" "xsl" "catalog.xml" make-flags)))
+ #~(let ((dest-path (format #f "~a/xml/xsl/~a-~a"
+ #$output #$name #$version)))
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ ;; The build systems insist on a ~/.xmlc, and it is simpler to
+ ;; create a dummy config file than to patch it into
+ ;; submission.
+ (setenv "HOME" "/tmp")
+ (call-with-output-file "/tmp/.xmlc"
+ (lambda (port)
+ (sxml->xml
+ '(*TOP*
+ (*PI* xml "version='1.0'")
+ (config
+ (java (@ (xml:id "bigmem"))
+ (java-options (@ (name "Xmx512m"))))
+ (xsltproc (@ (xml:id "xsltproc")
+ (exec "xsltproc")))
+ (xmllint (@ (xml:id "xmllint")
+ (exec "xmllint")))))
+ port)))))
+ (add-before 'install 'generate-catalog.xml
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "-C" "xsl" "catalog.xml" make-flags)))
+ (add-after 'generate-catalog.xml 'patch-catalog.xml
+ ;; Note: URI resolutions are not recursive.
+ ;; A rewrite rule from:
+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/'
+ ;; to
+ ;; 'http://docbook.sourceforge.net/release/xsl/'
+ ;; will not trigger the rewrite rule that ultimately
+ ;; remaps to a /gnu/store URI, as can be seen by
+ ;; invoking:
+ ;; $ xmlcatalog "" \
+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/current/'
+ ;; http://docbook.sourceforge.net/release/xsl/current/
+ ;; $ xmlcatalog "" \
+ ;; 'http://docbook.sourceforge.net/release/xsl/current/'
+ ;; file:/gnu/store/…/xml/xsl/…
+ ;;
+ ;; See XML Catalog specification, item 7.2.2. for
+ ;; details.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmlcatalog (search-input-file inputs
+ "/bin/xmlcatalog"))
+ (catalog-file "xsl/catalog.xml")
+ (store-uri (string-append "file:" dest-path "/")))
+ ;; Remove /snapshot/ references.
+ (for-each
+ (lambda (scheme)
+ (invoke xmlcatalog "--noout"
+ "--del"
+ (string-append
+ scheme
+ "://cdn.docbook.org/release/xsl/snapshot/")
+ catalog-file))
+ (list "http" "https"))
+ ;; Rewrite both http:// and https:// URIs.
+ (for-each
+ (lambda (path)
+ (for-each
+ (lambda (scheme)
+ (for-each
+ (lambda (entry-type)
+ (let ((uri (string-append scheme "://" path)))
+ (invoke xmlcatalog "--noout"
+ "--add" entry-type uri store-uri
+ catalog-file)))
+ (list "rewriteSystem" "rewriteURI")))
+ (list "http" "https")))
+ (list #$(format #f "cdn.docbook.org/release/xsl/~a/"
+ base-version)
+ "cdn.docbook.org/release/xsl/current/"
+ ;; Re-add the no longer present compatibility entries for
+ ;; v.1.79.1 or earlier URIs.
+ "docbook.sourceforge.net/release/xsl/current/"
+ ;; Originally the
+ ;; "http://docbook.sourceforge.net/release/xsl/"
+ ;; URI referred to the non-namespaced docbook-xsl,
+ ;; with its namespaced version using a URI differing in
+ ;; the path component as '…/xsl-ns/'.
+ ;; At some point the namespaced version was made the
+ ;; canonical docbook-xsl package whilst preserving the
+ ;; original URI.
+ ;;
+ ;; For compatibility with XML files that still specify
+ ;; the legacy namespaced docbook-xsl URIs we re-add them
+ ;; here.
+ "docbook.sourceforge.net/release/xsl-ns/current/")))))
(replace 'install
(lambda _
- (let ((xml (string-append #$output "/xml/xsl/"
- #$name "-" #$version))
- (select-rx (make-regexp
+ (let ((select-rx (make-regexp
"(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)")))
;; Install catalog.
(chdir "xsl")
- (install-file "catalog.xml" xml)
- (install-file "VERSION.xsl" xml)
- (substitute* (string-append xml "/catalog.xml")
- ;; Re-add the no longer present compatibility entries.
- ((".*</catalog>.*" anchor)
- (string-append "\
- <!-- Also support old URI of v1.79.1 or earlier -->
- <rewriteURI uriStartString=\"http://docbook.sourceforge.net\
-/release/xsl/current/\" rewritePrefix=\"./\"/>
- <rewriteSystem systemIdStartString=\"http://docbook.sourceforge.net\
-/release/xsl/current/\" rewritePrefix=\"./\"/>\n" anchor))
- (("/snapshot/")
- (string-append "/" #$base-version "/"))
- (("rewritePrefix=\"./")
- (string-append "rewritePrefix=\"file://" xml "/")))
+ (install-file "catalog.xml" dest-path)
+ (install-file "VERSION.xsl" dest-path)
;; Install style sheets.
- (for-each (lambda (dir)
- (for-each (lambda (f)
- (install-file
- f (string-append xml "/" (dirname f))))
- (find-files dir select-rx)))
- '("assembly" "common" "eclipse" "epub" "epub3" "fo"
- "highlighting" "html" "htmlhelp" "javahelp" "lib"
- "manpages" "params" "profiling" "roundtrip"
- "template" "website"
- "xhtml" "xhtml-1_1" "xhtml5"))))))))
- (native-inputs (list libxml2
+ (for-each
+ (lambda (dir)
+ (for-each (lambda (f)
+ (install-file
+ f
+ (string-append dest-path "/" (dirname f))))
+ (find-files dir select-rx)))
+ '("assembly" "common" "eclipse" "epub" "epub3" "fo"
+ "highlighting" "html" "htmlhelp" "javahelp" "lib"
+ "manpages" "params" "profiling" "roundtrip"
+ "template" "website"
+ "xhtml" "xhtml-1_1" "xhtml5")))))))))
+ (native-inputs (list docbook-xml-4.4 ; for tests
+ libxml2
libxslt
perl
perl-xml-xpath))
@@ -285,64 +502,6 @@ by no means limited to these applications.) This package provides XML DTDs.")
"This package provides XSL style sheets for DocBook.")
(license (license:x11-style "" "See 'COPYING' file.")))))
-(define-public docbook-xsl-1.79.1
- (package
- (name "docbook-xsl")
- (version "1.79.1")
- (source (origin
- (method url-fetch)
- ;; At the time, the non namespaced version was still the
- ;; default; our latest docbook-xsl is namespaced, so for
- ;; consistency preserves this property for older versions too.
- (uri (string-append "mirror://sourceforge/docbook/"
- name "-ns/" version "/"
- name "-ns-" version ".tar.bz2"))
- (sha256
- (base32
- "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"))))
- (build-system copy-build-system)
- (outputs '("out" "doc"))
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- ;; XXX: The copy-build-system doesn't seem to allow installing to a
- ;; different output.
- (replace 'install
- (lambda _
- (let ((xml (string-append #$output "/xml/xsl/" #$name "-" #$version))
- (doc (string-append #$output:doc
- "/share/doc/" #$name "-" #$version))
- (select-rx (make-regexp
- "(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)")))
- ;; Install catalog.
- (install-file "catalog.xml" xml)
- (install-file "VERSION.xsl" xml)
- (substitute* (string-append xml "/catalog.xml")
- (("rewritePrefix=\"./")
- (string-append "rewritePrefix=\"file://" xml "/")))
- ;; Install style sheets.
- (for-each (lambda (dir)
- (for-each (lambda (f)
- (install-file
- f (string-append xml "/" (dirname f))))
- (find-files dir select-rx)))
- '("assembly" "common" "eclipse" "epub" "epub3" "fo"
- "highlighting" "html" "htmlhelp" "javahelp" "lib"
- "manpages" "params" "profiling" "roundtrip"
- "template" "website"
- "xhtml" "xhtml-1_1" "xhtml5"))
- ;; Install documentation.
- (install-file "NEWS" doc)
- (install-file "RELEASE-NOTES.html" doc)
- (copy-recursively "slides" doc)
- (copy-recursively "webhelp" doc)))))))
- (home-page "https://docbook.org")
- (synopsis "DocBook XSL namespaced style sheets for document authoring")
- (description "This package provides the @emph{namespaced} XSL style sheets
-for DocBook.")
- (license (license:x11-style "" "See 'COPYING' file."))))
-
(define-public docbook-dsssl
(package
(name "docbook-dsssl")
@@ -354,34 +513,28 @@ for DocBook.")
name "-" version ".tar.bz2"))
(sha256
(base32
- "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))))
- (build-system trivial-build-system)
+ "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))
+ (snippet
+ #~(begin
+ (chmod "bin/collateindex.pl" #o755)
+ ;; Remove empty directories.
+ (rmdir "doc")
+ (rmdir "docsrc")))))
+ (build-system copy-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- (dtd (string-append (assoc-ref %outputs "out")
- "/sgml/dtd/docbook"))
- (docbook-dsssl-doc (assoc-ref %build-inputs "docbook-dsssl-doc"))
- (doc (assoc-ref %outputs "doc"))
- (tar (assoc-ref %build-inputs "tar"))
- (bzip2 (assoc-ref %build-inputs "bzip2")))
- (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
- (mkdir-p dtd)
- (invoke "tar" "-xf" source "-C" dtd)
- ;; The doc output contains 1.4 MiB of HTML documentation.
- (symlink docbook-dsssl-doc doc)))))
+ (list
+ #:install-plan
+ #~`(("./" "sgml/dtd/docbook/" #:exclude ("bin"))
+ ("bin/collateindex.pl" "bin/")
+ ("bin/collateindex.pl.1" "share/man/man1/")
+ (#$(this-package-input "docbook-dsssl-doc") "./" #:output "doc"))))
(inputs
- (list docbook-dsssl-doc))
- (native-inputs
- (list bzip2 tar))
+ (list perl docbook-dsssl-doc))
(home-page "https://docbook.org/")
(synopsis "DSSSL style sheets for DocBook")
(description "This package provides DSSSL style sheets for DocBook.")
- (license (license:non-copyleft "file://README"))))
+ (license (license:non-copyleft "file:/README"))))
;;; Private variable, used as the 'doc' output of the docbook-dsssl package.
(define docbook-dsssl-doc
@@ -396,65 +549,54 @@ for DocBook.")
(sha256
(base32
"1plp5ngc96pbna4rwglp9glcadnirbm3hlcjb4gjvq1f8biic9lz"))))
- (build-system trivial-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- (docdir (string-append (assoc-ref %outputs "out")
- "/share/doc/" "docbook-dsssl-" ,version))
- (tar (assoc-ref %build-inputs "tar"))
- (bzip2 (assoc-ref %build-inputs "bzip2")))
- (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
- (mkdir-p docdir)
- ;; Extract the "doc" subdirectory.
- (invoke "tar" "-xf" source "--strip-components=2"
- "--no-same-owner" "-C" docdir
- (string-append "docbook-dsssl-" ,version "/doc"))))))
- (native-inputs
- `(("bzip2" ,bzip2)
- ("tar" ,tar)))
+ (list
+ #:install-plan
+ #~`(("doc/" #$(string-append "/share/doc/docbook-dsssl-" version)))))
(home-page "https://docbook.org/")
(synopsis "DocBook DSSSL style sheets documentation")
(description "Documentation for the DocBook DSSSL style sheets.")
- (license (license:non-copyleft "file://doc/LEGALNOTICE.htm"))))
+ (license (license:non-copyleft "file:/doc/LEGALNOTICE.htm"))))
(define-public docbook-sgml-4.2
(package
(name "docbook-sgml")
(version "4.2")
(source (origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri (string-append
"https://www.oasis-open.org/docbook/sgml/4.2/docbook-"
version ".zip"))
(sha256
(base32
"1hrm4qmmzi285bkxkc74lxvjvw2gbl7ycbaxhv31h9rl9g4x5sv7"))))
- (build-system trivial-build-system)
+ (build-system copy-build-system)
(arguments
- '(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- (iso-entities-dir (string-append
- (assoc-ref %build-inputs "iso-8879-entities")))
- (unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (dtd (string-append (assoc-ref %outputs "out")
- "/sgml/dtd/docbook")))
- ;; Extract the sources.
- (mkdir-p dtd)
- (chdir dtd)
- (invoke unzip source)
- ;; Reference the ISO 8879 character entities.
- ;; e.g. "iso-lat1.gml" --> "<iso-entities-dir>/ISOlat1"
- (substitute* "docbook.cat"
- (("\"iso-(.*)\\.gml\"" _ name)
- (string-append "\"" iso-entities-dir "/ISO" name "\"")))))))
+ (list
+ #:modules '((guix build copy-build-system)
+ (guix build utils)
+ (srfi srfi-26))
+ #:install-plan
+ #~`(("./" "sgml/dtd/docbook"
+ #:exclude-regexp ("catalog\\.xml$"
+ "ChangeLog$"
+ "README$"
+ "\\.txt$")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-permissions
+ (lambda _
+ (for-each (cut chmod <> #o644) (find-files "."))))
+ (add-before 'install 'patch-iso-entities
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Reference the ISO 8879 character entities.
+ ;; e.g. "iso-lat1.gml" --> "<iso-entities-dir>/ISOlat1"
+ (let ((iso-entities-dir
+ (assoc-ref %build-inputs "iso-8879-entities")))
+ (substitute* "docbook.cat"
+ (("\"iso-(.*)\\.gml\"" _ name)
+ (string-append "\"" iso-entities-dir "/ISO" name "\"")))))))))
(native-inputs
(list unzip))
(inputs
@@ -469,7 +611,7 @@ for DocBook.")
(inherit docbook-sgml-4.2)
(version "4.1")
(source (origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk41.zip"))
(sha256
@@ -483,7 +625,7 @@ for DocBook.")
(inherit docbook-sgml)
(version "3.1")
(source (origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk31.zip"))
(sha256
@@ -496,23 +638,13 @@ for DocBook.")
(name "iso-8879-entities")
(version "0.0") ;no proper version
(source (origin
- (method url-fetch)
- (uri "http://www.oasis-open.org/cover/ISOEnts.zip")
+ (method url-fetch/zipbomb)
+ (uri "https://www.oasis-open.org/cover/ISOEnts.zip")
(sha256
(base32
"1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"))))
- (build-system trivial-build-system)
- (arguments
- '(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- (unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (out (string-append (assoc-ref %outputs "out"))))
- (invoke unzip source "-d" out)))))
- (native-inputs `(("unzip" ,unzip)))
+ (build-system copy-build-system)
+ (native-inputs (list unzip))
(home-page "https://www.oasis-open.org/")
(synopsis "ISO 8879 character entities")
(description "ISO 8879 character entities that are typically used in
@@ -530,56 +662,121 @@ the in DocBook SGML DTDs.")
version ".tar.bz2"))
(sha256
(base32
- "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"))))
+ "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"))
+ (patches
+ (search-patches "dblatex-inkscape-1.0.patch"))))
+ (outputs '("out" "doc"))
(build-system python-build-system)
- ;; TODO: Add fig2dev for fig2dev utility.
- (inputs
- `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize
- texlive-appendix
- texlive-changebar
- texlive-fancybox
- texlive-fancyvrb
- texlive-float
- texlive-footmisc
- texlive-jknapltx
- texlive-listings
- texlive-multirow
- texlive-overpic
- texlive-pdfpages
- texlive-refcount
- texlive-rsfs
- texlive-stmaryrd
- texlive-subfigure
- texlive-titlesec
- texlive-wasysym)))
- ("imagemagick" ,imagemagick) ;for convert
- ("inkscape" ,inkscape/stable) ;for svg conversion
- ("docbook" ,docbook-xml)
- ("libxslt" ,libxslt))) ;for xsltproc
(arguments
- `( ;; Using setuptools causes an invalid "package_base" path in
- ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused
- ;; by dblatex's setup.py stripping the root path when creating the
- ;; script. (dblatex's setup.py still uses distutils and thus has to
- ;; create the script by itself. The feature for creating scripts is one
- ;; of setuptools' features.)
- ;; See this thread for details:
- ;; https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00030.html
- #:use-setuptools? #f
- #:tests? #f ;no 'test' command
- #:phases
- (modify-phases %standard-phases
- (add-after 'wrap 'set-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; dblatex executes helper programs at runtime.
- (wrap-program (string-append out "/bin/dblatex")
- `("PATH" ":" prefix
- ,(map (lambda (input)
- (string-append (assoc-ref inputs input)
- "/bin"))
- '("libxslt" "texlive"
- "imagemagick" "inkscape"))))))))))
+ (list
+ ;; Using setuptools causes an invalid "package_base" path in
+ ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused
+ ;; by dblatex's setup.py stripping the root path when creating the
+ ;; script. (dblatex's setup.py still uses distutils and thus has to
+ ;; create the script by itself. The feature for creating scripts is one
+ ;; of setuptools' features.)
+ ;; See this thread for details:
+ ;; https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00030.html
+ #:use-setuptools? #f
+ #:tests? #f ;no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'move-doc
+ (lambda _
+ (let ((old (string-append #$output "/share/doc"))
+ (new (string-append #$output:doc "/share/doc")))
+ (mkdir-p (dirname new))
+ (rename-file old new))))
+ (add-after 'wrap 'wrap-dblatex
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path
+ (search-path-as-list
+ '("bin")
+ '#$(map (cut this-package-input <>)
+ (list "libxslt" "imagemagick" "inkscape"
+ "fig2dev" "texlive-bin")))))
+ ;; dblatex executes helper programs at runtime.
+ (wrap-program (string-append #$output "/bin/dblatex")
+ `("PATH" ":" prefix ,path)
+ `("GUIX_TEXMF" prefix (,(getenv "GUIX_TEXMF")))))))
+ (add-after 'check 'check-wrap
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (unsetenv "GUIX_TEXMF")
+ (invoke/quiet (string-append #$output "/bin/dblatex")
+ "--quiet" "tests/mathml/mmltest2.xml")))))))
+ (native-inputs (list docbook-mathml-1.0))
+ (inputs
+ (list bash-minimal
+ texlive-bin
+ (texlive-updmap.cfg (list texlive-amsmath
+ texlive-anysize
+ texlive-appendix
+ texlive-auxhook
+ texlive-bigintcalc
+ texlive-bin
+ texlive-bitset
+ texlive-bookmark
+ texlive-changebar
+ texlive-colortbl
+ texlive-courier
+ texlive-eepic
+ texlive-epstopdf-pkg
+ texlive-eso-pic
+ texlive-etexcmds
+ texlive-fancybox
+ texlive-fancyhdr
+ texlive-fancyvrb
+ texlive-float
+ texlive-footmisc
+ texlive-gettitlestring
+ texlive-graphics
+ texlive-graphics-cfg
+ texlive-helvetic
+ texlive-hycolor
+ texlive-hyperref
+ texlive-infwarerr
+ texlive-intcalc
+ texlive-jknapltx
+ texlive-kpathsea
+ texlive-kvdefinekeys
+ texlive-kvoptions
+ texlive-kvsetkeys
+ texlive-l3backend
+ texlive-latex
+ texlive-latex-bin
+ texlive-letltxmacro
+ texlive-listings
+ texlive-ltxcmds
+ texlive-multirow
+ texlive-overpic
+ texlive-pdfescape
+ texlive-pdflscape
+ texlive-pdfpages
+ texlive-pdftexcmds
+ texlive-psnfss
+ texlive-refcount
+ texlive-rerunfilecheck
+ texlive-rsfs
+ texlive-stmaryrd
+ texlive-subfigure
+ texlive-symbol
+ texlive-times
+ texlive-titlesec
+ texlive-tools
+ texlive-uniquecounter
+ texlive-url
+ texlive-wasysym
+ texlive-zapfding))
+ fig2dev
+ imagemagick ;for convert
+ inkscape ;for svg conversion
+ docbook-xml
+ libxslt)) ;for xsltproc
+ ;; lib/dbtexmf/xslt/4xslt.py shows that this package
+ ;; makes use of XML_CATALOG_FILES and also invokes
+ ;; xsltproc.
+ (native-search-paths %libxslt-search-paths)
(home-page "https://dblatex.sourceforge.net")
(synopsis "DocBook to LaTeX Publishing")
(description
@@ -598,8 +795,9 @@ DB2LaTeX.")
(define-public dblatex/stable
(hidden-package
(package/inherit dblatex
- (inputs (alist-replace "imagemagick" `(,imagemagick/stable)
- (package-inputs dblatex))))))
+ (inputs (modify-inputs (package-inputs dblatex)
+ (replace "imagemagick" imagemagick/stable)
+ (replace "inkscape" inkscape/stable))))))
(define-public docbook-utils
(package
@@ -613,45 +811,47 @@ DB2LaTeX.")
version ".orig.tar.gz"))
(sha256
(base32
- "1scj5vgw1xz872pq54a89blcxqqm11p90yzv8a9mqq57x27apyj8"))))
+ "1scj5vgw1xz872pq54a89blcxqqm11p90yzv8a9mqq57x27apyj8"))
+ (patches
+ (search-patches "docbook-utils-documentation-edits.patch"
+ "docbook-utils-escape-characters.patch"
+ "docbook-utils-remove-jade-sp.patch"
+ "docbook-utils-respect-refentry-for-name.patch"
+ "docbook-utils-use-date-element.patch"
+ "docbook-utils-source-date-epoch.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Patch build system.
+ (substitute* (find-files "." "\\.(in|am)$")
+ ;; Do not hard-code SGML_CATALOG_FILES.
+ ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") ""))
+
+ ;; Do not override the SGML_CATALOG_FILES environment
+ ;; variable.
+ (substitute* "bin/jw.in"
+ ((".*SGML_CATALOG_FILES=`find.*")
+ "")
+ (("SGML_CATALOG_FILES=`echo.*")
+ ":\n")
+ (("SGML_CATALOG_FILES=\"\"")
+ ":")
+ (("\\bwhich\\b")
+ "command -v"))
+
+ ;; Locate lynx, links or w3m from the PATH, not from
+ ;; /usr/bin.
+ (substitute* "backends/txt"
+ (("CONVERT=/usr/bin/")
+ "CONVERT=")
+ (("\\[ -x /usr/bin/([^ ]+) \\]" _ command)
+ (format #f "command -v ~a > /dev/null" command)))
+
+ ;; This forces autoreconf to be invoked, needed for patches
+ ;; to be effective.
+ (delete-file "configure")))))
+ (native-inputs (list autoconf automake libtool))
(build-system gnu-build-system)
- (arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'patch-build-system
- (lambda _
- (substitute* (find-files "." "\\.in$")
- ;; Do not hard-code SGML_CATALOG_FILES.
- ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") "")
- ;; Use OpenSP and OpenJade.
- (("\\bjade\\b")
- "openjade")
- (("\\bnsgmls\\b")
- "onsgmls"))
- #t))
- (add-after 'unpack 'patch-jw.in
- ;; Do not override the SGML_CATALOG_FILES environment
- ;; variable.
- (lambda _
- (substitute* "bin/jw.in"
- ((".*SGML_CATALOG_FILES=`find.*")
- "")
- (("SGML_CATALOG_FILES=`echo.*")
- ":\n")
- (("SGML_CATALOG_FILES=\"\"")
- ":")
- (("\\bwhich\\b")
- "command -v"))
- #t))
- (add-after 'unpack 'patch-txt-backend
- (lambda _
- ;; Locate lynx, links or w3m from the PATH, not from
- ;; /usr/bin.
- (substitute* "backends/txt"
- (("CONVERT=/usr/bin/")
- "CONVERT=")
- (("\\[ -x /usr/bin/([^ ]+) \\]" dummy command)
- (string-append "command -v " command " > /dev/null")))
- #t)))))
;; Propagated for convenience. All these tools are used at run time to
;; provide the complete functionality of the docbook-utils commands.
(propagated-inputs
@@ -672,15 +872,22 @@ Convert a SGML DocBook file to other formats such as Hyper Text Markup
Language (HTML), Rich Text Format (RTF), PostScript (PS), man, Portable
Document Format (PDF), TeX, Texinfo or plain text (txt). It can be used
more conveniently via the following wrappers:
-@itemx docbook2dvi Convert a SGML DocBook file to the DVI format.
-@itemx docbook2html Convert a SGML DocBook file to an HTML document.
-@itemx docbook2man Convert a SGML DocBook file a man page.
-@itemx docbook2pdf Convert a SGML DocBook file to a PDF document.
-@itemx docbook2ps Convert a SGML DocBook file to a PS document.
-@itemx docbook2rtf Convert a SGML DocBook file to a RTF document.
-@itemx docbook2tex Convert a SGML DocBook file to a TeX document.
-@itemx docbook2texi Convert a SGML DocBook file to a Texinfo document.
-@itemx docbook2txt Convert a SGML DocBook file to a plain text document.
+@table @command
+@item docbook2dvi
+Convert a SGML DocBook file to the DVI format.
+@item docbook2html
+Convert a SGML DocBook file to an HTML document.
+@item docbook2man
+Convert a SGML DocBook file a man page.
+@item docbook2pdf
+@itemx docbook2ps
+@itemx docbook2rtf
+@itemx docbook2tex
+@itemx docbook2texi
+Convert a SGML DocBook file to a PDF/PS/RTF/TeX document.
+@item docbook2txt
+Convert a SGML DocBook file to a plain text document.
+@end table
@item sgmldiff
Detect the differences in markup between two SGML files.
@end table")
@@ -696,66 +903,67 @@ Detect the differences in markup between two SGML files.
version "/docbook2X-" version ".tar.gz"))
(sha256
(base32
- "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"))))
+ "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"))
+ (patches
+ (search-patches "docbook2x-filename-handling.patch"
+ "docbook2x-fix-synopsis.patch"
+ "docbook2x-manpage-typo.patch"
+ "docbook2x-preprocessor-declaration.patch"
+ "docbook2x-static-datadir-evaluation.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Fix a failing test (maybe it worked with old texinfo?)
+ #~(begin
+ (substitute* "test/complete-manuals/at1.xml"
+ (("<bridgehead>")
+ "<bridgehead renderas=\"sect2\">"))
+ ;; Force a new autoreconf run.
+ (delete-file "configure")))))
+ (outputs '("out" "doc"))
(build-system gnu-build-system)
- (inputs
- (list bash-minimal
- docbook-xml-4.5
- perl
- perl-xml-namespacesupport
- perl-xml-parser
- perl-xml-sax
- perl-xml-sax-base
- texinfo
- libxslt))
(arguments
(list
+ #:make-flags ''("AM_MAKEINFOHTMLFLAGS=\"--no-split\"")
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
- (add-after 'configure 'patch-sources
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Fix failed substitution in config.pl
- (substitute* "perl/config.pl"
- (("\\$\\{prefix\\}")
- #$output))
- ;; Fix a failing test (maybe it worked with old texinfo?)
- (substitute* "test/complete-manuals/at1.xml"
- (("<bridgehead>")
- "<bridgehead renderas=\"sect2\">"))
- ;; Patch all the tests use DocBook 4.5
- (substitute* (find-files "test" "\\.xml$")
- (("\"-//OASIS//DTD DocBook XML V4\\..+//EN\"")
- "\"-//OASIS//DTD DocBook XML V4.5//EN\"")
- (("\"http://www\\.oasis-open\\.org/docbook/xml/4\\..+/docbookx.dtd\"")
- "\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""))
- ;; Set XML catalogs for tests to pass
- (setenv "XML_CATALOG_FILES"
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/catalog.xml"))))
+ (add-before 'build 'clean
+ (lambda _
+ (invoke "make" "clean")))
+ (add-after 'install 'move-doc
+ (lambda _
+ (let* ((old (string-append #$output "/share/doc"))
+ (new (string-append #$output:doc "/share/doc")))
+ (mkdir-p (dirname new))
+ (rename-file old new))))
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((programs
- (map (lambda (p)
- (search-input-file outputs
- (string-append "bin/" p)))
- '("db2x_manxml" "db2x_texixml" "db2x_xsltproc"
- "docbook2man" "docbook2texi")))
- (perl5lib
- '#$(map (lambda (i)
- (file-append (this-package-input i)
- "/lib/perl5/site_perl"))
- '("perl-xml-namespacesupport"
- "perl-xml-parser"
- "perl-xml-sax"
- "perl-xml-sax-base")))
- (xml-catalog-files
- (list (search-input-file
- inputs "xml/dtd/docbook/catalog.xml"))))
+ (let ((programs
+ (map (lambda (p)
+ (search-input-file outputs
+ (string-append "bin/" p)))
+ '("db2x_manxml" "db2x_texixml" "db2x_xsltproc"
+ "docbook2man" "docbook2texi")))
+ (perl5lib
+ (search-path-as-list
+ '("/lib/perl5/site_perl")
+ (map (cut assoc-ref inputs <>)
+ '("perl-xml-namespacesupport"
+ "perl-xml-parser"
+ "perl-xml-sax"
+ "perl-xml-sax-base")))))
(map (lambda (program)
(wrap-program program
- `("PERL5LIB" ":" prefix ,perl5lib)
- `("XML_CATALOG_FILES" " " prefix ,xml-catalog-files)))
+ `("PERL5LIB" ":" prefix ,perl5lib)))
programs))))
+ (add-after 'install 'sgml-check
+ ;; This is not covered by 'make check'.
+ ;; Test that 'sgml2xml-isoent' works.
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "installcheck"))))
(add-after 'install 'create-symlinks
(lambda _
;; Create db2x_* symlinks to satisfy some configure scripts
@@ -765,6 +973,23 @@ Detect the differences in markup between two SGML files.
(symlink prog (string-append #$output
"/bin/db2x_" prog)))
'("docbook2man" "docbook2texi")))))))
+ (inputs
+ (list bash-minimal
+ opensp
+ perl
+ perl-xml-namespacesupport
+ perl-xml-parser
+ perl-xml-sax
+ perl-xml-sax-base
+ texinfo
+ libxslt))
+ (native-inputs
+ (list autoconf automake libtool
+ tidy-html
+ ;; For tests
+ docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4
+ groff-minimal libxml2))
+ (native-search-paths %libxslt-search-paths)
(home-page "https://docbook2x.sourceforge.net")
(synopsis "Convert DocBook to man page and Texinfo format")
(description
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index b18de182fe..039cd524db 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -300,24 +300,23 @@ the required network abstractions for applications.")
(inherit docker-libnetwork)
(name "docker-libnetwork-cmd-proxy")
(arguments
- ;; The tests are unsupported on all architectures except x86_64-linux.
- `(#:tests? ,(and (not (%current-target-system))
- (target-x86-64?))
- #:import-path "github.com/docker/libnetwork/cmd/proxy"
- #:unpack-path "github.com/docker/libnetwork"
- #:install-source? #f))
+ (list
+ ;; The tests are unsupported on all architectures except x86_64-linux.
+ #:tests? (and (not (%current-target-system)) (target-x86-64?))
+ #:install-source? #f
+ #:import-path "github.com/docker/libnetwork/cmd/proxy"
+ #:unpack-path "github.com/docker/libnetwork"))
(native-inputs
- `(("go-sctp" ,go-sctp)
- ;; For tests.
- ("logrus" ,go-github-com-sirupsen-logrus)
- ("go-netlink" ,go-netlink)
- ("go-netns" ,go-netns)
- ("go-golang-org-x-crypto"
- ,go-golang-org-x-crypto)
- ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
+ (list go-github-com-sirupsen-logrus ; for tests.
+ go-github-com-vishvananda-netlink
+ go-github-com-vishvananda-netns
+ go-golang-org-x-crypto
+ go-golang-org-x-sys
+ go-sctp))
(synopsis "Docker user-space proxy")
- (description "A proxy running in the user space. It is used by the
-built-in registry server of Docker.")
+ (description
+ "This package provides a proxy running in the user space. It is used by
+the built-in registry server of Docker.")
(license license:asl2.0)))
;; TODO: Patch out modprobes for ip_vs, nf_conntrack,
@@ -344,7 +343,7 @@ built-in registry server of Docker.")
(guix build union)
(guix build utils))
#:imported-modules
- `(,@%gnu-build-system-modules
+ `(,@%default-gnu-imported-modules
(guix build union)
(guix build go-build-system))
#:phases
@@ -547,6 +546,7 @@ runcexecutor/executor.go"
;; Our LD doesn't like the statically linked relocatable things
;; that go produces, so install the dynamic version of
;; dockerd instead.
+ (setenv "BUILDFLAGS" "-trimpath")
(invoke "hack/make.sh" "dynbinary")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
@@ -570,9 +570,7 @@ runcexecutor/executor.go"
(install-file "bundles/dynbinary-daemon/dockerd" out-bin)
(install-file (string-append "bundles/dynbinary-daemon/dockerd-"
(getenv "VERSION"))
- out-bin))))
- (add-after 'install 'remove-go-references
- (assoc-ref go:%standard-phases 'remove-go-references)))))
+ out-bin)))))))
(inputs
(list btrfs-progs
containerd ; for containerd-shim
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 12fbaf1d0c..2e1d219352 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.
;;;
@@ -185,7 +186,7 @@ markup) can be customized and extended by the user.")
(define-public doxygen
(package
(name "doxygen")
- (version "1.9.5")
+ (version "1.9.8")
(home-page "https://www.doxygen.nl/")
(source (origin
(method url-fetch)
@@ -196,7 +197,7 @@ markup) can be customized and extended by the user.")
".src.tar.gz")))
(sha256
(base32
- "1v1f9cp5lyymg7xmw0ldnzi7ql8agbaqam1xdyljk0lrbnrm9d2m"))))
+ "0qjgw7bnx668hpi4r8m366vsq118s9365zf8z4x5yjrqx0ld5qq5"))))
(build-system cmake-build-system)
(native-inputs
(list bison
@@ -410,52 +411,40 @@ 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
- (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")))
- (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
+ (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
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list bash-minimal
+ 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/easyrpg.scm b/gnu/packages/easyrpg.scm
index 3a5413d94a..43e2438df5 100644
--- a/gnu/packages/easyrpg.scm
+++ b/gnu/packages/easyrpg.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,7 +42,7 @@
(define-public liblcf
(package
(name "liblcf")
- (version "0.7.0")
+ (version "0.8")
(source (origin
(method url-fetch)
(uri (string-append
@@ -49,7 +50,7 @@
"/liblcf-" version ".tar.gz"))
(sha256
(base32
- "10ghpwww5r3iwlaw1mvf6kamn142nyr2zwdabqghy3k4xv837cih"))))
+ "0kskflh2izc8q5p5x0rfxw8xa3591xfkmqf74rj72ff34xri4nj1"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@@ -76,7 +77,7 @@ It can read and write LCF and XML files.")
(define-public easyrpg-player
(package
(name "easyrpg-player")
- (version "0.7.0")
+ (version "0.8")
(source (origin
(method url-fetch)
(uri (string-append
@@ -84,11 +85,12 @@ It can read and write LCF and XML files.")
"/easyrpg-player-" version ".tar.gz"))
(sha256
(base32
- "1hm4hdi4l8c9jw0x3kcm6iwgfv8parlfj13va3r3p90040gs7s8l"))))
+ "1brx2iix9d5i2lyjjcs03pq1xgl1gyh0yas8avazahgd9sn47696"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
- (list (string-append "--with-bash-completion-dir="
+ (list "--enable-fmmidi"
+ (string-append "--with-bash-completion-dir="
%output "/etc/bash_completion.d/"))))
(native-inputs
(list pkg-config))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 16d4fcd6e3..dc30c98fdf 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Mathieu Laparie <mlaparie@disr.it>
+;;; Copyright © 2024 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,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 qt)
#:use-module (gnu packages)
@@ -159,7 +161,8 @@ with Microsoft Compiled HTML (CHM) files")
qtbase-5 ; for qmake
xdg-utils))
(inputs
- (list fontconfig
+ (list bash-minimal
+ fontconfig
font-liberation
glib
hunspell
@@ -686,14 +689,15 @@ format documents, with the following features:
(define-public python-ebooklib
(package
(name "python-ebooklib")
- (version "0.17.1")
+ (version "0.18")
(source (origin
(method url-fetch)
(uri (pypi-uri "EbookLib" version))
(sha256
(base32
- "1w972g0kmh9cdxf3kjr7v4k99wvv4lxv3rxkip39c08550nf48zy"))))
- (build-system python-build-system)
+ "0cx5q6hvaka5lsbzc5q93mfkpsg44x4hp4z9aszxk55wlx1jcmiq"))))
+ (build-system pyproject-build-system)
+ (arguments (list #:tests? #f)) ; There are no tests.
(propagated-inputs (list python-lxml python-six))
(home-page "https://github.com/aerkalov/ebooklib")
(synopsis "Ebook library which can handle EPUB2/EPUB3 and Kindle format")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 15518896ed..e2173067f4 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Luis Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,6 +50,7 @@
#: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 gtk)
#:use-module (gnu packages gstreamer)
@@ -90,6 +92,70 @@
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
+(define-public cf-tool
+ (package
+ (name "cf-tool")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xalanq/cf-tool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ad2mljjg4pr8jjk9i1asnld16xi1wdfnh25drngm3c590cmrnfj"))
+ (patches (search-patches "cf-tool-add-languages.patch"))
+ (modules '((guix build utils)))
+ ;; Remove assets and vendorized dependencies from checkout
+ (snippet '(begin
+ (delete-file-recursively "assets")
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/xalanq/cf-tool"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'add-alternate-name
+ (lambda* _
+ (let ((bin (string-append #$output "/bin")))
+ (symlink (string-append bin "/cf-tool")
+ (string-append bin "/cf"))))))))
+ (native-inputs
+ (list go-github-com-docopt-docopt-go
+ go-github-com-fatih-color
+ go-github-com-k0kubun-go-ansi
+ go-github-com-mitchellh-go-homedir
+ go-github-com-olekukonko-tablewriter
+ go-github-com-puerkitobio-goquery
+ go-github-com-sergi-go-diff
+ go-github-com-shirou-gopsutil
+ go-github-com-skratchdot-open-golang
+ go-golang-org-x-crypto
+ go-golang-org-x-term))
+ (home-page "https://github.com/xalanq/cf-tool")
+ (synopsis
+ "Command-line interface tool for @url{https://codeforces.com, Codeforces}")
+ (description
+ "Codeforces Tool is a command-line interface tool for
+@url{https://codeforces.com,Codeforces}. Its features include:
+@itemize
+@item support Contests, Gym, Groups and acmsguru
+@item support all programming languages in Codeforces
+@item submit codes
+@item watch submissions' status dynamically
+@item fetch problems' samples
+@item compile and test locally
+@item clone all codes of someone
+@item generate codes from the specified template (including timestamp, author, etc.)
+@item list problems' stats of one contest
+@item use default web browser to open problems' pages, standings' page, etc.
+@item setup a network proxy and setup a mirror host
+@end itemize")
+ (license license:expat)))
+
(define-public gcompris
(package
(name "gcompris")
@@ -154,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)
@@ -162,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
@@ -433,140 +499,124 @@ specialized device.")
(license license:gpl3)))
(define-public openboard
- ;; The last release builds from qtwebkit, which has been removed from
- ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
- ;; qtwebengine-5.
- (let ((commit "47a96e1d6bbdc0250977d22f1b79f11fcc1cbeee")
- (revision "0"))
- (package
- (name "openboard")
- (version (git-version "1.7-dev" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/OpenBoard-org/OpenBoard")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "04pwmg41vlkwigym3zzkid6srh6f05b44g4mbihd6mhj6vsagx1f"))))
- (build-system qt-build-system)
- (arguments
- (list
- #:tests? #f ;no tests
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'set-initial-values
- ;; Remove useless "Check for updates" action from menu.
- ;; Also prevent pop-up window about importing Open Sankore
- ;; documents since we don't package OpenBoard-Importer.
- (lambda _
- (substitute* "src/core/UBSettings.cpp"
- (("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end)
- (string-append beg "true" end))
- (("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg end)
- (string-append beg "false" end)))))
- (add-after 'unpack 'fix-build-error
- ;; XXX: `errorOpeningVirtualKeyboard' variable is only
- ;; defined when building for OSX. Yet,
- ;; "UBBoardController.cpp" relies on it unconditionally,
- ;; resulting in a build failure. Here, we get rid of
- ;; that variable, assuming it is always false (its
- ;; default value when building for OSX).
- (lambda _
- (substitute* "src/board/UBBoardController.cpp"
- (("if \\(!UBPlatformUtils::errorOpeningVirtualKeyboard\\)")
- ""))))
- (add-after 'unpack 'fix-hard-coded-env
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/frameworks/UBPlatformUtils_linux.cpp"
- (("/usr/bin/env") (search-input-file inputs "/bin/env")))))
- (add-after 'unpack 'fix-library-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "OpenBoard.pro"
- (("/usr/include/quazip5")
- (search-input-directory inputs "/include/quazip5"))
- (("/usr/include/poppler")
- (search-input-directory inputs "/include/poppler")))))
- (replace 'configure
- (lambda _
- (invoke "qmake" "OpenBoard.pro")))
- (replace 'install
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((share (string-append #$output "/share"))
- (openboard (string-append share "/openboard"))
- (i18n (string-append openboard "/i18n")))
- ;; Install data.
- (with-directory-excursion "resources"
- (for-each (lambda (directory)
- (let ((target
- (string-append openboard "/" directory)))
- (mkdir-p target)
- (copy-recursively directory target)))
- '("customizations" "etc" "library"))
- (mkdir-p i18n)
- (for-each (lambda (f)
- (install-file f i18n))
- (find-files "i18n" "\\.qm$")))
- ;; Install desktop file an icon.
- (install-file "resources/images/OpenBoard.png"
- (string-append share
- "/icons/hicolor/64x64/apps/"))
- (make-desktop-entry-file
- (string-append share "/applications/" #$name ".desktop")
- #:name "OpenBoard"
- #:comment "Interactive whiteboard application"
- #:exec "openboard %f"
- #:icon "OpenBoard"
- #:mime-type "application/ubz"
- #:categories '("Education"))
- ;; Install executable.
- (install-file "build/linux/release/product/OpenBoard" openboard)
- (let ((bin (string-append #$output "/bin")))
- (mkdir-p bin)
- (symlink (string-append openboard "/OpenBoard")
- (string-append bin "/openboard")))))))))
- (native-inputs
- (list qttools-5))
- (inputs
- (list alsa-lib
- coreutils-minimal ;for patched 'env' shebang
- ffmpeg-4
- freetype
- lame
- libass
- libfdk
- libressl
- libtheora
- libva
- libvorbis
- libvpx
- libx264
- opus
- poppler
- qtbase-5
- qtdeclarative-5
- qtmultimedia-5
- qtsvg-5
- qtwebchannel-5
- qtwebengine-5
- qtxmlpatterns
- quazip-0
- sdl
- zlib))
- (home-page "https://openboard.ch/")
- (synopsis "Interactive whiteboard for schools and universities")
- (description
- "OpenBoard is a teaching software for interactive whiteboard
+ (package
+ (name "openboard")
+ (version "1.7.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OpenBoard-org/OpenBoard")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1lxwf50n0bfjjnpq5z82f3apsv9mn834js7f2spw1k1f06a72z41"))))
+ (build-system qt-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-initial-values
+ ;; Remove useless "Check for updates" action from menu. Also
+ ;; prevent pop-up window about importing Open Sankore documents
+ ;; since we don't package OpenBoard-Importer.
+ (lambda _
+ (substitute* "src/core/UBSettings.cpp"
+ (("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end)
+ (string-append beg "true" end))
+ (("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg end)
+ (string-append beg "false" end)))))
+ (add-after 'unpack 'fix-hard-coded-env
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/frameworks/UBPlatformUtils_linux.cpp"
+ (("/usr/bin/env") (search-input-file inputs "/bin/env")))))
+ (add-after 'unpack 'fix-library-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "OpenBoard.pro"
+ (("/usr/include/quazip5")
+ (search-input-directory inputs "/include/quazip5"))
+ (("/usr/include/poppler")
+ (search-input-directory inputs "/include/poppler")))))
+ (replace 'configure
+ (lambda _
+ (invoke "qmake" "OpenBoard.pro")))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((share (string-append #$output "/share"))
+ (openboard (string-append share "/openboard"))
+ (i18n (string-append openboard "/i18n")))
+ ;; Install data.
+ (with-directory-excursion "resources"
+ (for-each (lambda (directory)
+ (let ((target
+ (string-append openboard "/" directory)))
+ (mkdir-p target)
+ (copy-recursively directory target)))
+ '("customizations" "etc" "library"))
+ (mkdir-p i18n)
+ (for-each (lambda (f)
+ (install-file f i18n))
+ (find-files "i18n" "\\.qm$")))
+ ;; Install desktop file an icon.
+ (install-file "resources/images/OpenBoard.png"
+ (string-append share
+ "/icons/hicolor/64x64/apps/"))
+ (make-desktop-entry-file
+ (string-append share "/applications/" #$name ".desktop")
+ #:name "OpenBoard"
+ #:comment "Interactive whiteboard application"
+ #:exec "openboard %f"
+ #:icon "OpenBoard"
+ #:mime-type "application/ubz"
+ #:categories '("Education"))
+ ;; Install executable.
+ (install-file "build/linux/release/product/OpenBoard" openboard)
+ (let ((bin (string-append #$output "/bin")))
+ (mkdir-p bin)
+ (symlink (string-append openboard "/OpenBoard")
+ (string-append bin "/openboard")))))))))
+ (native-inputs
+ (list qttools-5))
+ (inputs
+ (list alsa-lib
+ coreutils-minimal ;for patched 'env' shebang
+ ffmpeg-4
+ freetype
+ lame
+ libass
+ libfdk
+ libressl
+ libtheora
+ libva
+ libvorbis
+ libvpx
+ libx264
+ opus
+ poppler
+ qtbase-5
+ qtdeclarative-5
+ qtmultimedia-5
+ qtsvg-5
+ qtwebchannel-5
+ qtwebengine-5
+ qtxmlpatterns
+ quazip-0
+ sdl
+ zlib))
+ (home-page "https://openboard.ch/")
+ (synopsis "Interactive whiteboard for schools and universities")
+ (description
+ "OpenBoard is a teaching software for interactive whiteboard
designed primarily for use in schools and universities. It can be
used both with interactive whiteboards or in a dual-screen setup with
a pen-tablet display and a beamer.")
- (license license:gpl3))))
+ (license license:gpl3)))
(define-public fet
(package
(name "fet")
- (version "6.19.0")
+ (version "6.22.2")
(source
(origin
(method url-fetch)
@@ -575,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
@@ -627,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/electronics.scm b/gnu/packages/electronics.scm
index aaf762b02b..df0238c348 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Juliana Sims <juli@incana.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -424,6 +425,46 @@ support for ESD sources.")
(home-page "https://xoscope.sourceforge.net/")
(license license:gpl2+)))
+(define-public m8c
+ (package
+ (name "m8c")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/laamaa/m8c")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wsknqgya2vkalbjq6rvmknsdk4lrqkn0z5rpjf4pd5vxgr8qryb"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:make-flags #~(list (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f)) ;no tests
+ (native-inputs (list pkg-config))
+ (inputs (list libserialport
+ sdl2))
+ (home-page "https://github.com/laamaa/m8c")
+ (synopsis "Cross-platform M8 tracker headless client")
+ (description
+ "The @url{https://dirtywave.com/products/m8-tracker,Dirtywave M8 Tracker}
+is a portable sequencer and synthesizer, featuring 8 tracks of assignable
+instruments such as FM, waveform synthesis, virtual analog, sample playback, and
+MIDI output. It is powered by a @url{https://www.pjrc.com/teensy/,Teensy}
+micro-controller and inspired by the Gameboy tracker
+@url{https://www.littlesounddj.com/lsd/index.php,Little Sound DJ}. m8c is a
+client for @url{https://github.com/Dirtywave/M8HeadlessFirmware,M8 Headless}
+which allows one to install the M8 firmware on any Teensy.")
+ (license (list license:cc-by-sa3.0
+ license:expat
+ license:public-domain
+ license:zlib))))
+
(define-public minipro
;; Information needed to fix Makefile
(let* ((commit "c181c2cf1619d00a520627d475e3fadb1eea5dac")
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index a100038f14..dc2db83632 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -276,16 +276,16 @@ static analysis of the ELF binaries at hand.")
(define-public patchelf
(package
(name "patchelf")
- (version "0.11")
+ (version "0.18.0")
(source (origin
(method url-fetch)
(uri (string-append
- "https://nixos.org/releases/patchelf/patchelf-"
+ "https://github.com/NixOS/patchelf/releases/download/"
version
"/patchelf-" version ".tar.bz2"))
(sha256
(base32
- "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"))))
+ "02s7ap86rx6yagfh9xwp96sgsj0p6hp99vhiq9wn4mxshakv4lhr"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -300,7 +300,17 @@ static analysis of the ELF binaries at hand.")
;; Find libgcc_s.so, which is necessary for the test:
(("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib")
"/lib")))
- #t)))))
+ (substitute* "tests/replace-needed.sh"
+ ;; This test assumes that only libc will be linked alongside
+ ;; libfoo, but we also link libgcc_s.
+ (("grep -v 'foo\\\\.so'") "grep -E 'libc.*\\.so'"))
+ (substitute* "tests/set-empty-rpath.sh"
+ ;; Binaries with empty RPATHs cannot run on Guix, because
+ ;; we still need to find libgcc_s (see above).
+ (("^\"\\$\\{SCRATCH\\}\"\\/simple.$") ""))
+ ;; Skip this test for now.
+ (substitute* "tests/Makefile.in"
+ ((".*shared-rpath\\.sh \\.*") "")))))))
(native-inputs
`(("gcc:lib" ,gcc "lib")))
(home-page "https://nixos.org/patchelf.html")
@@ -308,9 +318,6 @@ static analysis of the ELF binaries at hand.")
(description
"PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be
changed.")
- ;; This can probably be removed with the next release.
- (properties
- '((release-monitoring-url . "https://github.com/NixOS/patchelf/releases")))
(license gpl3+)))
(define-public libdwarf
diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 5af8d7c1b4..f08e07bb57 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,8 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages base)
#:use-module (gnu packages)
+ #:use-module (guix build mix-build-system)
+ #:use-module (guix build utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system mix)
#:use-module (guix download)
@@ -36,13 +39,13 @@
(define-public elixir-nimble-parsec
(package
(name "elixir-nimble-parsec")
- (version "1.3.1")
+ (version "1.4.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"))))
+ (base32 "0a6gs7950gpkdax18x167g8v6dy4sbbx47cchglq7cqgh5i5hmlw"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(synopsis "Text-based parser combinators")
@@ -55,20 +58,44 @@ for higher-level combinators through composition.")
(define-public elixir-makeup
(package
(name "elixir-makeup")
- (version "1.1.0")
+ (version "1.1.2")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"))))
+ (base32 "1b3civqrznn3dxqa3iybwbpgj8dj6f7q1zlgr8gd5jzvh5mmdqfc"))))
(build-system mix-build-system)
(propagated-inputs (list elixir-nimble-parsec))
- (arguments (list #:tests? #f)) ; no tests
+ (arguments
+ `(#:tests? #f ; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'make-reproducible
+ (lambda _
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@precedence Hierarchy.hierarchy_to_precedence\\(@hierarchy\\)")
+ ""))
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@token_to_class_map Hierarchy.style_to_class_map\\(@hierarchy\\)")
+ ""))
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@standard_token_types Map.keys\\(@token_to_class_map\\)")
+ ""))
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@precedence")
+ "Hierarchy.hierarchy_to_precedence(@hierarchy)"))
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@token_to_class_map")
+ "Hierarchy.style_to_class_map(@hierarchy)"))
+ (substitute* "lib/makeup/token/utils.ex"
+ (("@standard_token_types")
+ "Map.keys(token_to_class_map())")))))))
(synopsis "Syntax highlighter for source code")
(description
- "Makeup is a generic syntax highlighter in the style of Pygments suitable for use in code hosting,
-forums, wikis or other applications that need to prettify source code.")
+ "Makeup is a generic syntax highlighter in the style of Pygments suitable
+for use in code hosting, forums, wikis or other applications that need to prettify
+source code.")
(home-page "https://hexdocs.pm/makeup/")
(license license:bsd-2)))
@@ -86,23 +113,22 @@ forums, wikis or other applications that need to prettify source code.")
(arguments (list #:tests? #f)) ; no tests
(synopsis "JSON parser and generator")
(description
- "Parser and generator are written in pure Elixir and optimized for speed. They
-are at least twice as fast as other Elixir/Erlang libraries (e.g.
-Poison). The performance is comparable to jiffy, which is implemented in C as
-a NIF.")
+ "Parser and generator are written in pure Elixir and optimized for speed. They
+are at least twice as fast as other Elixir/Erlang libraries (e.g. Poison). The
+performance is comparable to jiffy, which is implemented in C as a NIF.")
(home-page "https://hexdocs.pm/jason/")
(license license:asl2.0)))
(define-public elixir-file-system
(package
(name "elixir-file-system")
- (version "0.2.10")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"))
+ (base32 "0vakv2hmqcj0ijxlbh8bvdwislxrvpcfxvracq7a3idfcqnhjlk7"))
(snippet #~(begin
(use-modules (guix build utils) (ice-9 ftw))
(mkdir "source")
@@ -127,13 +153,13 @@ https://github.com/synrc/fs.")
(define-public elixir-bunt
(package
(name "elixir-bunt")
- (version "0.2.1")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"))))
+ (base32 "1ddnkg6w3iqzb8z18b7sr7jlmmbn9rf77w4nh1mzmxm512m8cpyw"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(synopsis "256 color ANSI coloring in the terminal")
@@ -167,13 +193,13 @@ inline docs.")
(define-public elixir-castore
(package
(name "elixir-castore")
- (version "1.0.4")
+ (version "1.0.7")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "1y44amb8falsmrfzpkmf7qp6215g9kdl76g91dpna4af2jwc264l"))))
+ (base32 "1xaw8n8g7qfygf8z8sz7f7pwmdl4lxshi9lj2b6j386jn2j8axys"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(synopsis "Up-to-date CA certificate store")
@@ -185,20 +211,20 @@ an up-to-date CA certificate store file for Elixir applications.")
(define-public elixir-excoveralls
(package
(name "elixir-excoveralls")
- (version "0.18.0")
+ (version "0.18.1")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "02x69ll5scvraky0k5gacvnnmldv5k04kgk02x087d9w3y8vn28i"))))
+ (base32 "138bls6hfk87mid2zfwsidk7j06yfich2iihyach7ckb2kdpjpyn"))))
(build-system mix-build-system)
(propagated-inputs (list elixir-castore elixir-jason))
(arguments (list #:tests? #f)) ; no tests
(synopsis "Coverage report tool with coveralls.io integration")
(description
"Library that reports test coverage statistics, with the option to
-post to coveralls.io service. It uses Erlang's cover to generate coverage
+post to coveralls.io service. It uses Erlang's cover to generate coverage
information, and posts the test coverage results to coveralls.io through the
JSON API.")
(home-page "https://hexdocs.pm/excoveralls/")
@@ -207,13 +233,13 @@ JSON API.")
(define-public elixir-credo
(package
(name "elixir-credo")
- (version "1.7.1")
+ (version "1.7.7")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "18jqi9s9r1587njzdxycvmmbma30cay9iamni4f3ih54jmh1r1z9"))))
+ (base32 "0bigri1xh29ims5gwh94pns6jys6h82pn6zhj0zxrb5ar6b79j4b"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(propagated-inputs (list elixir-bunt elixir-file-system elixir-jason))
@@ -221,7 +247,7 @@ JSON API.")
(synopsis "Static code analysis tool")
(description
"Credo is a static code analysis tool for the Elixir language with a focus on
-teaching and code consistency. Credo can show you refactoring opportunities in
+teaching and code consistency. Credo can show you refactoring opportunities in
your code, complex code fragments, warn you about common mistakes, show
inconsistencies in your naming scheme and - if needed - help you enforce a
desired coding style.")
@@ -231,13 +257,13 @@ desired coding style.")
(define-public elixir-erlex
(package
(name "elixir-erlex")
- (version "0.2.6")
+ (version "0.2.7")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"))))
+ (base32 "1c7gcm9nhf7m3pq0776sav744ak1sph63shcpzvc6i58s5wmzn9y"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(synopsis
@@ -251,13 +277,13 @@ things like Dialyzer errors and Observer.")
(define-public elixir-dialyxir
(package
(name "elixir-dialyxir")
- (version "1.4.1")
+ (version "1.4.3")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"))))
+ (base32 "11m9hxs5byidqyxpzv34m1hwd69jcqqv2h81qfz0cl2wrmsznb5z"))))
(build-system mix-build-system)
(arguments (list #:tests? #f)) ; no tests
(propagated-inputs (list elixir-erlex))
@@ -270,13 +296,13 @@ things like Dialyzer errors and Observer.")
(define-public elixir-machete
(package
(name "elixir-machete")
- (version "0.2.8")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
(uri (hexpm-uri name version))
(sha256
- (base32 "0952603bmqsf6v3ja99zpbnbx5d52i4xksjkfj3irl45ccq5pgq9"))))
+ (base32 "0705qp9l8yakdfpbafsf351b7xzqn86qcma1jm7i1n64r6bxkh31"))))
(build-system mix-build-system)
(native-inputs (list elixir-credo elixir-dialyxir))
(synopsis "Literate test matchers for ExUnit")
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 2885ddbd61..895ede25dd 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2021 Cees de Groot <cg@evrl.com>
;;; Copyright © 2024 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2024 Ivan Sokolov <ivan-p-sokolov@ya.ru>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,13 +34,14 @@
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages erlang)
#:use-module (gnu packages version-control))
(define-public elixir
(package
(name "elixir")
- (version "1.14.0")
+ (version "1.17.2")
(source
(origin
(method git-fetch)
@@ -48,7 +50,7 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "16rc4qaykddda6ax5f8zw70yhapgwraqbgx5gp3f40dvfax3d51l"))
+ (base32 "063pfz6ljy22b4nyvk8pi8ggqb6nmzqcca08vnl3h9xgh1zzddpj"))
(patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system)
(arguments
@@ -57,78 +59,107 @@
#:parallel-tests? #f ;see <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32171#23>
#:make-flags #~(list (string-append "PREFIX=" #$output))
#:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'make-git-checkout-writable
- (lambda _
- (for-each make-file-writable (find-files "."))))
- (add-after 'make-git-checkout-writable 'replace-paths
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Note: references end up obfuscated in binary BEAM files where
- ;; they may be invisible to the GC and graft code:
- ;; <https://issues.guix.gnu.org/54304#11>.
- (substitute* '("lib/mix/lib/mix/release.ex"
- "lib/mix/lib/mix/tasks/release.init.ex")
- (("#!/bin/sh")
- (string-append "#!" (search-input-file inputs "/bin/sh"))))
- (substitute* "bin/elixir"
- (("ERTS_BIN=\n")
- (string-append
- "ERTS_BIN="
- ;; Elixir Releases will prepend to ERTS_BIN the path of
- ;; a copy of erl. We detect if a release is being generated
- ;; by checking the initial ERTS_BIN value: if it's empty, we
- ;; are not in release mode and can point to the actual erl
- ;; binary in Guix store.
- "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN="
- (string-drop-right (search-input-file inputs "/bin/erl") 3)
- "; fi\n")))
- (substitute* "bin/mix"
- (("#!/usr/bin/env elixir")
- (string-append "#!" #$output "/bin/elixir")))))
- (add-before 'build 'make-current
- ;; The Elixir compiler checks whether or not to compile files by
- ;; inspecting their timestamps. When the timestamp is equal to the
- ;; epoch no compilation will be performed. Some tests fail when
- ;; files are older than Jan 1, 2000.
- (lambda _
- (for-each (lambda (file)
- (let ((recent 1400000000))
- (utime file recent recent 0 0)))
- (find-files "." ".*"))))
- (add-before 'check 'set-home
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Some tests require access to a home directory.
- (setenv "HOME" "/tmp")))
- (delete 'configure)
- (add-after 'install 'wrap-programs
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (programs '("elixir" "elixirc" "iex")))
- ;; mix can be sourced as an elixir script by other elixir
- ;; program, for example `iex -S mix`, so we should not wrap
- ;; mix into shell script.
- (substitute* (string-append out "/bin/mix")
- (("Mix.start\\(\\)")
- (format #f "\
+ #~(let* ((compiler-path "lib/elixir/src/elixir_erl_compiler.erl")
+ (compiler-path-orig (string-append compiler-path ".orig")))
+ (modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))))
+ (add-after 'make-git-checkout-writable 'replace-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Note: references end up obfuscated in binary BEAM files
+ ;; where they may be invisible to the GC and graft code:
+ ;; <https://issues.guix.gnu.org/54304#11>.
+ (substitute* '("lib/mix/lib/mix/release.ex"
+ "lib/mix/lib/mix/tasks/release.init.ex")
+ (("#!/bin/sh")
+ (string-append "#!" (search-input-file inputs "/bin/sh"))))
+ (substitute* "bin/elixir"
+ (("ERTS_BIN=\n")
+ (string-append
+ "ERTS_BIN="
+ ;; Elixir Releases will prepend to ERTS_BIN the path of
+ ;; a copy of erl. We detect if a release is being
+ ;; generated by checking the initial ERTS_BIN value: if
+ ;; it's empty, we are not in release mode and can point
+ ;; to the actual erl binary in Guix store.
+ "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN="
+ (string-drop-right
+ (search-input-file inputs "/bin/erl") 3)
+ "; fi\n")))
+ (substitute* "bin/mix"
+ (("#!/usr/bin/env elixir")
+ (string-append "#!" #$output "/bin/elixir")))))
+ (add-after 'replace-paths 'pre-install-source
+ (lambda* (#:key outputs #:allow-other-keys)
+ (copy-recursively
+ "lib"
+ (string-append (assoc-ref outputs "src") "/source/lib"))))
+ ;; Temporarily patch the compiler to place correct source
+ ;; locations into module info instead of build directory.
+ (add-after 'pre-install-source 'patch-elixir-compiler
+ (lambda* (#:key outputs #:allow-other-keys)
+ (copy-recursively compiler-path compiler-path-orig)
+ (let ((source (string-append "/tmp/guix-build-" #$name "-"
+ #$version ".drv-0"))
+ (destination (assoc-ref outputs "src")))
+ (substitute* compiler-path
+ (("source, Source")
+ (string-append "source, string:replace(Source, \""
+ source "\", \"" destination "\")"))))))
+ (add-before 'build 'make-current
+ ;; The Elixir compiler checks whether or not to compile files
+ ;; by inspecting their timestamps. When the timestamp is
+ ;; equal to the epoch no compilation will be performed. Some
+ ;; tests fail when files are older than Jan 1, 2000.
+ (lambda _
+ (for-each (lambda (file)
+ (let ((recent 1400000000))
+ (utime file recent recent 0 0)))
+ (find-files "." ".*"))))
+ ;; Unpatch the compiler and recompile it.
+ (add-after 'build 'restore-and-recompile
+ (lambda _
+ (copy-recursively compiler-path-orig compiler-path)
+ (delete-file compiler-path-orig)
+ (invoke "make")))
+ (add-before 'check 'set-home
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Some tests require access to a home directory.
+ (setenv "HOME" "/tmp")))
+ (delete 'configure)
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (programs '("elixir" "elixirc" "iex")))
+ ;; mix can be sourced as an elixir script by other elixir
+ ;; program, for example `iex -S mix`, so we should not wrap
+ ;; mix into shell script.
+ (substitute* (string-append out "/bin/mix")
+ (("Mix.CLI.main\\(\\)")
+ (format #f "\
~~w[GUIX_ELIXIR_LIBS ERL_LIBS]
|> Enum.map(&System.get_env/1)
|> Enum.reject(&is_nil/1)
|> Enum.join(\":\")
|> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end
System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\"))
-Mix.start()"
- (search-input-file inputs "/bin/rebar3"))))
- (for-each (lambda (program)
- (wrap-program (string-append out "/bin/" program)
- '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
- programs)))))))
- (inputs (list erlang rebar3 git))
+Mix.CLI.main()"
+ (search-input-file inputs "/bin/rebar3"))))
+ (for-each
+ (lambda (program)
+ (wrap-program (string-append out "/bin/" program)
+ '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
+ programs))))))))
+ (outputs '("out" "src"))
+ (inputs (list bash-minimal erlang rebar3 git))
(native-search-paths
(list (search-path-specification
(variable "GUIX_ELIXIR_LIBS")
- (files (list (string-append "lib/elixir/" (version-major+minor version)))))))
+ (files (list (string-append "lib/elixir/" (version-major+minor
+ version)))))))
(home-page "https://elixir-lang.org/")
- (synopsis "Elixir programming language")
+ (synopsis "Functional meta-programming aware language")
(description "Elixir is a dynamic, functional language used to build
scalable and maintainable applications. Elixir leverages the Erlang VM, known
for running low-latency, distributed and fault-tolerant systems, while also
@@ -138,17 +169,17 @@ being successfully used in web development and the embedded software domain.")
(define-public elixir-hex
(package
(name "elixir-hex")
- (version "2.0.5")
+ (version "2.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hexpm/hex.git")
+ (url "https://github.com/hexpm/hex")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "1kvczwvij58kgkhak68004ap81pl26600bczg21mymy2sypkgxmj"))))
+ "0fmrbl7dj8ndq1z7h13qgx3cv7vw3b1zf6krdrahcmx43bcdsix4"))))
;; The mix-build-system assumes that Hex exists.
;; We build Hex using the gnu-build-system.
;; Other Elixir packages use the mix-build-system.
@@ -170,9 +201,14 @@ being successfully used in web development and the embedded software domain.")
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(define X.Y #$(version-major+minor (package-version elixir)))
- (define out (string-append (assoc-ref outputs "out") "/lib/elixir/" X.Y "/hex"))
+ (define out (string-append (assoc-ref outputs "out")
+ "/lib/elixir/" X.Y "/hex"))
(mkdir-p out)
- (copy-recursively "_build/prod/lib/hex" out))))))
+ (let* ((prod-dir "_build/prod/lib/hex")
+ (prod-dir-mix (string-append prod-dir "/.mix")))
+ (and (directory-exists? prod-dir-mix)
+ (delete-file-recursively prod-dir-mix))
+ (copy-recursively "_build/prod/lib/hex" out)))))))
(synopsis "Package manager for the Erlang VM")
(description
"This project provides tasks that integrate with Mix, Elixir's build
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 310c4e1587..370daaf50e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -90,14 +90,14 @@
;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com>
;;; Copyright © 2020, 2021 Noah Evans <noah@nevans.me>
;;; Copyright © 2020 Brit Butler <brit@kingcons.io>
-;;; Copyright © 2021, 2022 Aleksandr Vityazev <avityazev@posteo.org>
+;;; Copyright © 2021, 2022, 2024 Aleksandr Vityazev <avityazev@disroot>
;;; Copyright © 2021 Yurii Kholodkov <urist.mckorobochka@gmail.com>
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021, 2022 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org>
-;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
@@ -126,7 +126,7 @@
;;; Copyright © 2020, 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
-;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2023 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2022-2023 Simon Josefsson <simon@josefsson.org>
;;; Copyright © 2023 Fabio Natali <me@fabionatali.com>
@@ -138,6 +138,15 @@
;;; Copyright © 2023 Ian Eure <ian@retrospec.tv>
;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
;;; Copyright © 2024 dan <i@dan.games>
+;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2024 Daniel Szmulewicz <daniel.szmulewicz@gmail.com>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Spencer King <spencer.king@nursiapress.com>
+
;;;
;;; This file is part of GNU Guix.
;;;
@@ -256,6 +265,7 @@
#:use-module (gnu packages fontutils)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages animation)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages screen)
#:use-module (gnu packages xdisorg)
@@ -283,9 +293,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")
@@ -372,14 +403,14 @@
(define-public emacs-activities
(package
(name "emacs-activities")
- (version "0.7")
+ (version "0.7.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/activities-" version ".tar"))
(sha256
- (base32 "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi"))))
+ (base32 "1khhkfyy251mag5zqybsvfg3sak0aac1qlsdl1wyiin7f6sq9563"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-persist))
(home-page "https://github.com/alphapapa/activities.el")
@@ -448,7 +479,7 @@ input via a small child-frame spawned at the position of the cursor.")
(define-public emacs-arei
(package
(name "emacs-arei")
- (version "0.9.4")
+ (version "0.9.5")
(source
(origin
(method git-fetch)
@@ -458,7 +489,7 @@ input via a small child-frame spawned at the position of the cursor.")
(file-name (git-file-name name version))
(sha256
(base32
- "0zp43h75hrbfvi507hm23yhazx6n2knxwl24wcm1dwjbk3hins7y"))))
+ "0laj9gbwhr0n8jf0y7fb3a564rsi8kghpk1g95xhckr4fggz997r"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-eros emacs-sesman emacs-queue))
(home-page "https://git.sr.ht/~abcdw/emacs-arei")
@@ -469,7 +500,7 @@ input via a small child-frame spawned at the position of the cursor.")
(define-public emacs-geiser
(package
(name "emacs-geiser")
- (version "0.30")
+ (version "0.31")
(source
(origin
(method git-fetch)
@@ -478,7 +509,7 @@ input via a small child-frame spawned at the position of the cursor.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938"))))
+ (base32 "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5"))))
(build-system emacs-build-system)
(arguments
'(#:phases
@@ -516,7 +547,7 @@ e.g. emacs-geiser-guile for Guile.")
(define-public emacs-gptel
(package
(name "emacs-gptel")
- (version "0.8.5")
+ (version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -525,7 +556,7 @@ e.g. emacs-geiser-guile for Guile.")
(file-name (git-file-name name version))
(sha256
(base32
- "1w9sji73dixch1b5i420j44qb3jd0zknpypz46g33pbyhg9xwqln"))))
+ "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4"))))
(build-system emacs-build-system)
(arguments
(list
@@ -541,7 +572,7 @@ e.g. emacs-geiser-guile for Guile.")
(emacs-substitute-variables "gptel.el"
("gptel-use-curl" 't)))))))
(inputs (list curl))
- (propagated-inputs (list emacs-compat emacs-map))
+ (propagated-inputs (list emacs-compat))
(home-page "https://github.com/karthink/gptel")
(synopsis "GPTel is a simple ChatGPT client for Emacs")
(description
@@ -555,7 +586,7 @@ API key.")
(define-public emacs-chatgpt-shell
(package
(name "emacs-chatgpt-shell")
- (version "0.74.1")
+ (version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -575,7 +606,7 @@ API key.")
(define-public emacs-geiser-guile
(package
(name "emacs-geiser-guile")
- (version "0.28.1")
+ (version "0.28.2")
(source
(origin
(method git-fetch)
@@ -584,7 +615,7 @@ API key.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f"))))
+ (base32 "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy"))))
(build-system emacs-build-system)
(arguments
(list
@@ -1198,7 +1229,7 @@ Emacs package archive}.")
(base32
"1hwl2jhv1fhsdrspfhprq77n763i4zsj350q024ajy0m2kaql6ws"))))
(build-system emacs-build-system)
- (home-page "http://mumble.net/~campbell/emacs/paredit/")
+ (home-page "https://mumble.net/~campbell/emacs/paredit/")
(synopsis "Emacs minor mode for editing parentheses")
(description
"ParEdit (paredit.el) is a minor mode for performing structured editing
@@ -1262,6 +1293,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")
@@ -1337,38 +1387,39 @@ buffer.")
(license license:gpl3+))))
(define-public emacs-prism
- (package
- (name "emacs-prism")
- (version "0.3.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/alphapapa/prism.el")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2"))))
- (build-system emacs-build-system)
- (propagated-inputs (list emacs-dash))
- (home-page "https://github.com/alphapapa/prism.el")
- (synopsis
- "Disperses bracket-bounded syntax into a spectrum of color by depth")
- (description
- "Prism is a Rainbow Blocks-like mode for Emacs. It preserves non-color
+ (let ((commit "6046a5cf793f65ff86fe0392e0edf29ffcd57567")) ;version bump
+ (package
+ (name "emacs-prism")
+ (version "0.3.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alphapapa/prism.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1p4vqyc4jm0pg4999i0k04pl0sa9nhrczxf4bng4id1r19sxm6dh"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-compat emacs-dash))
+ (home-page "https://github.com/alphapapa/prism.el")
+ (synopsis
+ "Disperses bracket-bounded syntax into a spectrum of color by depth")
+ (description
+ "Prism is a Rainbow Blocks-like mode for Emacs. It preserves non-color
face properties and allows configuration of faces and colors.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-project
(package
(name "emacs-project")
- (version "0.10.0")
+ (version "0.11.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar"))
(sha256
- (base32 "060iw06c60vjy1bp771zz0n24x4s7kpyvdjs51147v2kz35n08pb"))))
+ (base32 "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-xref))
(home-page "https://elpa.gnu.org/packages/project.html")
@@ -1455,16 +1506,16 @@ size.")
(define-public emacs-git-modes
(package
(name "emacs-git-modes")
- (version "1.4.2")
+ (version "1.4.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/git-modes")
- (commit version)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc"))))
+ (base32 "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -1481,7 +1532,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and
(define-public emacs-with-editor
(package
(name "emacs-with-editor")
- (version "3.3.2")
+ (version "3.4.1")
(source
(origin
(method git-fetch)
@@ -1490,7 +1541,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a"))))
+ (base32 "1hnc0jbjdpjr7xzh8gmhxkcbpw6mbla9vg8vy6py6mdk7ap1zqj8"))))
(build-system emacs-build-system)
(arguments
(list
@@ -1606,97 +1657,142 @@ on stdout instead of using a socket as the Emacsclient does.")
libgit2 bindings for Emacs, intended to boost the performance of Magit.")
(license license:gpl2+))))
+(define-public emacs-llama
+ (package
+ (name "emacs-llama")
+ (version "0.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tarsius/llama")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0rgm5jv9iv8b0xabdwicrpih2d3slchmv17xdjk705dqhfc18f4w"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list #:tests? #true
+ #:test-command #~(list "emacs" "-Q" "--batch"
+ "-l" "llama.el"
+ "-f" "ert-run-tests-batch-and-exit")))
+ (home-page "https://github.com/tarsius/llama")
+ (synopsis "Compact syntax for short lambda")
+ (description
+ "This package implements the macro @code{##}, which provides compact
+syntax for short lambda.")
+ (license license:gpl3+)))
+
+(define-public emacs-llm
+ (package
+ (name "emacs-llm")
+ (version "0.17.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ahyatt/llm")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1c71p7a7lsq2xwg2jh021cfdgdp5q11sqb844flbf7pn2vdk6p07"))))
+ (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")
+ (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
+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"))
- (package
- (name "emacs-magit")
- (version (git-version "3.3.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/magit/magit")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "14vqfykfzddpfka7s3pmlh3yvbfd1rpjhab4g9dinz9hn48dwb06"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:tests? #t
- #:test-command #~(list "make" "test")
- #:exclude #~(cons* "magit-libgit.el"
- "magit-libgit-pkg.el"
- %default-exclude)
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'build-info-manual
- (lambda _
- (invoke "make" "info")
- ;; Copy info files to the lisp directory, which acts as
- ;; the root of the project for the emacs-build-system.
- (for-each (lambda (f)
- (install-file f "lisp"))
- (find-files "docs" "\\.info$"))))
- (add-after 'build-info-manual 'set-magit-version
- (lambda _
- (make-file-writable "lisp/magit.el")
- (emacs-substitute-variables "lisp/magit.el"
- ("magit-version" #$version))))
- (add-after 'set-magit-version 'patch-exec-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (for-each make-file-writable
- (list "lisp/magit-git.el" "lisp/magit-sequence.el"))
- (emacs-substitute-variables "lisp/magit-git.el"
- ("magit-git-executable"
- (search-input-file inputs "/bin/git")))
- (emacs-substitute-variables "lisp/magit-sequence.el"
- ("magit-perl-executable"
- (search-input-file inputs "/bin/perl")))))
- (add-before 'check 'configure-git
- (lambda _
- ;; Otherwise some tests fail with error "unable to auto-detect
- ;; email address".
- (setenv "HOME" (getcwd))
- (invoke "git" "config" "--global" "user.name" "toto")
- (invoke "git" "config" "--global" "user.email"
- "toto@toto.com")))
- (replace 'expand-load-path
- (lambda args
- (with-directory-excursion "lisp"
- (apply (assoc-ref %standard-phases 'expand-load-path) args))))
- (replace 'make-autoloads
- (lambda args
- (with-directory-excursion "lisp"
- (apply (assoc-ref %standard-phases 'make-autoloads) args))))
- (replace 'install
- (lambda args
- (with-directory-excursion "lisp"
- (apply (assoc-ref %standard-phases 'install) args))))
- (replace 'build
- (lambda args
- (with-directory-excursion "lisp"
- (apply (assoc-ref %standard-phases 'build) args)))))))
- (native-inputs
- (list texinfo))
- (inputs
- (list git perl))
- (propagated-inputs
- ;; Note: the 'git-commit' and 'magit-section' dependencies are part of
- ;; magit itself.
- (list emacs-compat emacs-dash emacs-transient emacs-with-editor))
- (home-page "https://magit.vc/")
- (synopsis "Emacs interface for the Git version control system")
- (description
- "With Magit, you can inspect and modify your Git repositories
+ (package
+ (name "emacs-magit")
+ (version "4.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/magit/magit")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:tests? #t
+ #:test-command #~(list "make" "test")
+ #:exclude #~(cons* "magit-libgit.el"
+ "magit-libgit-pkg.el"
+ %default-exclude)
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'build-info-manual
+ (lambda _
+ (invoke "make" "info")
+ ;; Copy info files to the lisp directory, which acts as
+ ;; the root of the project for the emacs-build-system.
+ (for-each (lambda (f)
+ (install-file f "lisp"))
+ (find-files "docs" "\\.info$"))))
+ (add-after 'build-info-manual 'set-magit-version
+ (lambda _
+ (make-file-writable "lisp/magit.el")
+ (emacs-substitute-variables "lisp/magit.el"
+ ("magit-version" #$version))))
+ (add-after 'set-magit-version 'patch-exec-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each make-file-writable
+ (list "lisp/magit-git.el" "lisp/magit-sequence.el"))
+ (emacs-substitute-variables "lisp/magit-git.el"
+ ("magit-git-executable"
+ (search-input-file inputs "/bin/git")))
+ (emacs-substitute-variables "lisp/magit-sequence.el"
+ ("magit-perl-executable"
+ (search-input-file inputs "/bin/perl")))))
+ (add-before 'check 'configure-git
+ (lambda _
+ ;; Otherwise some tests fail with error "unable to auto-detect
+ ;; email address".
+ (setenv "HOME" (getcwd))
+ (invoke "git" "config" "--global" "user.name" "toto")
+ (invoke "git" "config" "--global" "user.email"
+ "toto@toto.com")))
+ (replace 'expand-load-path
+ (lambda args
+ (with-directory-excursion "lisp"
+ (apply (assoc-ref %standard-phases 'expand-load-path) args))))
+ (replace 'make-autoloads
+ (lambda args
+ (with-directory-excursion "lisp"
+ (apply (assoc-ref %standard-phases 'make-autoloads) args))))
+ (replace 'install
+ (lambda args
+ (with-directory-excursion "lisp"
+ (apply (assoc-ref %standard-phases 'install) args))))
+ (replace 'build
+ (lambda args
+ (with-directory-excursion "lisp"
+ (apply (assoc-ref %standard-phases 'build) args)))))))
+ (native-inputs
+ (list texinfo))
+ (inputs
+ (list git perl))
+ (propagated-inputs
+ ;; Note: the 'git-commit' and 'magit-section' dependencies are part of
+ ;; magit itself.
+ (list emacs-compat emacs-dash emacs-transient emacs-with-editor))
+ (home-page "https://magit.vc/")
+ (synopsis "Emacs interface for the Git version control system")
+ (description
+ "With Magit, you can inspect and modify your Git repositories
with Emacs. You can review and commit the changes you have made to
the tracked files, for example, and you can browse the history of past
changes. There is support for cherry picking, reverting, merging,
rebasing, and other common Git operations.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-magit-svn
(package
@@ -1756,7 +1852,7 @@ process, passing on the arguments as command line arguments.")
(define-public emacs-magit-annex
(package
(name "emacs-magit-annex")
- (version "1.8.1")
+ (version "1.9.0")
(source
(origin
(method git-fetch)
@@ -1765,7 +1861,7 @@ process, passing on the arguments as command line arguments.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk"))))
+ (base32 "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-magit))
(home-page "https://github.com/magit/magit-annex/")
@@ -1833,6 +1929,34 @@ leveraging built-in functionality.")
(license (list license:gpl3+
license:fdl1.3+)))) ; GFDLv1.3+ for the manual
+(define-public emacs-meyvn
+ (let ((commit "62802ab42ee021f89f980bd3de3e1336ad760944")) ;version bump
+ (package
+ (name "emacs-meyvn")
+ (version "1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/danielsz/meyvn-el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0821sk0mq1602mk3hp7igcafp8fpfg586nk41iz9syc06xbh0if7"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-cider
+ emacs-dash
+ emacs-geiser
+ emacs-parseclj
+ emacs-parseedn
+ emacs-projectile
+ emacs-s))
+ (home-page "https://github.com/danielsz/meyvn-el")
+ (synopsis "Emacs client for the Meyvn build tool")
+ (description
+ "This package provides an Emacs client for the @url{https://meyvn.org, Meyvn} build tool.")
+ (license license:gpl3+))))
+
(define-public emacs-fzf
(let ((commit "21912ebc7e1084aa88c9d8b7715e782a3978ed23")
(revision "0"))
@@ -1886,10 +2010,32 @@ 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")
- (version "1.0.0")
+ (version "1.0.2")
(source
(origin
(method git-fetch)
@@ -1898,7 +2044,7 @@ files left by ArchLinux's pacman.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m"))))
+ (base32 "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat emacs-dash))
@@ -1919,10 +2065,10 @@ Alternatively the menu can be bound globally, for example:
(license license:gpl3+)))
(define-public emacs-nano-modeline
- (let ((commit "a18780c277838983932623870752f0adddef0345")) ;version bump
+ (let ((commit "04676d57a1e602123a593836745a744d1b2028fb")) ;version bump
(package
(name "emacs-nano-modeline")
- (version "1.0.1")
+ (version "1.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1931,7 +2077,7 @@ Alternatively the menu can be bound globally, for example:
(file-name (git-file-name name version))
(sha256
(base32
- "017vxz96fh26jb2xj7jnz8w580knvybcdr4xjad4xs72l2lrkj37"))))
+ "1q10zd8aiq5xm7p4sm1mrfmw0sfgfyznyk4lvh2rl9pqh9kh700a"))))
(build-system emacs-build-system)
(home-page "https://github.com/rougier/nano-modeline")
(synopsis "Emacs minor mode controlling mode line")
@@ -1943,7 +2089,7 @@ displayed at the bottom or at the top.")
(define-public emacs-moody
(package
(name "emacs-moody")
- (version "1.0.0")
+ (version "1.1.1")
(source
(origin
(method git-fetch)
@@ -1952,7 +2098,7 @@ displayed at the bottom or at the top.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z"))))
+ (base32 "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -2082,7 +2228,7 @@ Apprentice and Sourcerer.")
(define-public emacs-suneater-theme
(package
(name "emacs-suneater-theme")
- (version "2.4.0")
+ (version "2.5.2")
(source
(origin
(method git-fetch)
@@ -2091,7 +2237,7 @@ Apprentice and Sourcerer.")
(commit version)))
(sha256
(base32
- "1j216w9c2psynlsl8gdmnya5a60cyx100ibm15zyyaav75wccn5j"))
+ "1501kj933717jw9prx03x1k8n520z7a268bl03m3m82qn5hjq0ad"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(home-page "https://git.sr.ht/~plattfot/suneater-theme")
@@ -2308,7 +2454,7 @@ organizing remote Go repository clones.")
(define-public emacs-ghub
(package
(name "emacs-ghub")
- (version "3.6.0")
+ (version "4.0.0")
(source
(origin
(method git-fetch)
@@ -2317,7 +2463,7 @@ organizing remote Go repository clones.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11nrh2lr5179r0brd9vl7r0i0dpjxdr5frplxq6j2ca7l2vzwqyr"))))
+ (base32 "1dnl4idvc96jv73gdsrp377m1782i5n0cq0y4s0mp4i1vqd5drj2"))))
(build-system emacs-build-system)
(arguments
(list
@@ -2418,7 +2564,7 @@ for editing Racket's Scribble documentation syntax in Emacs.")
`(#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags (list (string-append "--with-lispdir="
@@ -2529,8 +2675,8 @@ replacement.")
#:modules `((ice-9 match)
(srfi srfi-26)
((guix build emacs-build-system) #:prefix emacs:)
- ,@%gnu-build-system-modules)
- #:imported-modules `(,@%gnu-build-system-modules
+ ,@%default-gnu-imported-modules)
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@@ -2696,6 +2842,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
@@ -2806,6 +2975,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")
@@ -3111,13 +3312,13 @@ and ease-of-key score. Most frequently used commands have most easy keys.")
(define-public emacs-xr
(package
(name "emacs-xr")
- (version "1.25")
+ (version "2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar"))
(sha256
- (base32 "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg"))))
+ (base32 "1y5pcrph6v8q06mipv3l49qhw55yvvb1nnq0817bzm25k0s3z70v"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/xr.html")
(synopsis "Convert string regexp to rx notation")
@@ -3211,6 +3412,26 @@ on the eyes during night and day. They only support GUI and 256 colour
terminals.")
(license license:gpl3+))))
+(define-public emacs-rbs-mode
+ (package
+ (name "emacs-rbs-mode")
+ (version "0.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ybiquitous/rbs-mode")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/ybiquitous/rbs-mode")
+ (synopsis "Major mode for Ruby type signature")
+ (description
+ "RBS mode is a major mode for Ruby type signature language (RBS). It
+provides basic supports for syntax highlighting and indentation.")
+ (license license:gpl3+)))
+
(define-public emacs-reformatter
(package
(name "emacs-reformatter")
@@ -3319,14 +3540,14 @@ project root.")
(define-public emacs-relint
(package
(name "emacs-relint")
- (version "1.24")
+ (version "2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"relint-" version ".tar"))
(sha256
- (base32 "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm"))))
+ (base32 "0r89b5yk5lp92k4gnr0sx6ccilqzpv6kd5csqhxydk0xmqh8rsff"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-xr))
(home-page "https://github.com/mattiase/relint")
@@ -3363,11 +3584,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
@@ -3393,7 +3609,7 @@ or unexpected behavior inside an elisp configuration file (typically
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@@ -3520,22 +3736,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 "19")
+ (version "20.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"emms-" version ".tar"))
(sha256
- (base32 "13c884s92ddn52psgkaz3zvb94g23gq41dbidpx7x4gzdhd9qqxm"))))
+ (base32 "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx"))))
(build-system gnu-build-system)
(arguments
(list
@@ -3672,6 +3883,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.5.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
+ "1qwbxhdcl2vvdf0sjgl1iafh47rgbabzmjjwg6jq32p7q64pw6dr"))))
+ (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")
@@ -3719,11 +3965,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")
@@ -3803,7 +4044,7 @@ code completion and project management support.")
(define-public emacs-auto-compile
(package
(name "emacs-auto-compile")
- (version "2.0.0")
+ (version "2.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3812,7 +4053,7 @@ code completion and project management support.")
(file-name (git-file-name name version))
(sha256
(base32
- "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh"))))
+ "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-compat emacs-packed))
(home-page "https://github.com/emacscollective/auto-compile")
@@ -3972,7 +4213,7 @@ defined in RFC 2425 and RFC 2426 to/from The Insidious Big Brother Database
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@@ -4425,14 +4666,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex
(package
(name "emacs-auctex")
- (version "14.0.4")
+ (version "14.0.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar"))
(sha256
- (base32 "03w6qs4f0ksb8f54zsx189775w3wdyfaqg3dwn20a77y5cvisk52"))))
+ (base32 "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr"))))
(build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus).
@@ -4563,7 +4804,7 @@ a set of simplified face specifications and a user-supplied color palette.")
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@@ -4786,7 +5027,7 @@ of bibliographic references.")
(define-public emacs-corfu
(package
(name "emacs-corfu")
- (version "1.3")
+ (version "1.5")
(source
(origin
(method git-fetch)
@@ -4795,7 +5036,7 @@ of bibliographic references.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas"))))
+ (base32 "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0"))))
(build-system emacs-build-system)
(arguments
(list
@@ -4880,7 +5121,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(define-public emacs-cape
(package
(name "emacs-cape")
- (version "1.5")
+ (version "1.6")
(source
(origin
(method git-fetch)
@@ -4889,7 +5130,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw"))))
+ (base32 "0bkkb4fpga7r0rmyj8i621xmn5s0l7w49xyj1byy8z4rgl73zlhb"))))
(build-system emacs-build-system)
(arguments
(list
@@ -4917,6 +5158,24 @@ completion backends used by @code{completion-at-point} are so called
provided by Cape can also be used by Company.")
(license license:gpl3+)))
+(define-public emacs-capf-autosuggest
+ (package
+ (name "emacs-capf-autosuggest")
+ (version "0.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://elpa.gnu.org/packages/capf-autosuggest-"
+ version ".tar"))
+ (sha256
+ (base32
+ "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk"))))
+ (build-system emacs-build-system)
+ (synopsis "eshell completion suggestions for Emacs")
+ (description "This package provides comint autosuggestions for Emacs
+eshell.")
+ (home-page "https://repo.or.cz/emacs-capf-autosuggest")
+ (license license:gpl3+)))
+
(define-public emacs-direnv
(package
(name "emacs-direnv")
@@ -4977,10 +5236,35 @@ environment set through Direnv.")
that the binary uses instead of the actual binary contents.")
(license license:gpl3+)))
+(define-public emacs-ellama
+ (package
+ (name "emacs-ellama")
+ (version "0.11.13")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/s-kostyaev/ellama")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256 (base32
+ "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl"))))
+ (build-system emacs-build-system)
+ (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
+ "Ellama is a tool for interacting with large language models from Emacs.
+It allows you to ask questions and receive responses from the LLMs. Ellama
+can perform various tasks such as translation, code review, summarization,
+enhancing grammar/spelling or wording and more through the Emacs interface.
+Ellama natively supports streaming output, making it effortless to use with
+your preferred text editor.")
+ (license license:gpl3+)))
+
(define-public emacs-org-fc
(package
(name "emacs-org-fc")
- (version "0.6.1")
+ (version "0.6.2")
(source
(origin
(method git-fetch)
@@ -4989,7 +5273,7 @@ that the binary uses instead of the actual binary contents.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "12azynnz3hzbb2643chwbwzxg0q1m555k77jkxfikrmh9wzb2k35"))))
+ (base32 "1pq6l1crjfybn3bd9qp23vddplv0j05l3al0715glr925s0i4cy3"))))
(build-system emacs-build-system)
(arguments
(list
@@ -5089,18 +5373,18 @@ the Font Lock keywords.")
(define-public emacs-fontaine
(package
(name "emacs-fontaine")
- (version "1.0.0")
+ (version "2.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~protesilaos/fontaine")
+ (url "https://github.com/protesilaos/fontaine")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "0y2ys1hfz6gdhxh2sdp2v1qd3dpzyj7j451sbd4rb2q15h5hc2na"))))
+ "1fm6lw1jyy5vv314y2qhzcav9fmpgf333xrlwfdyi86z6z6f2fyy"))))
(build-system emacs-build-system)
- (home-page "https://sr.ht/~protesilaos/fontaine")
+ (home-page "https://github.com/protesilaos/fontaine")
(synopsis "Set Emacs font configurations using presets")
(description
"Fontaine lets the user specify presets of font configurations
@@ -5493,7 +5777,7 @@ Lisp developers who want to write macros with convenience.")
(define-public emacs-noman
(package
(name "emacs-noman")
- (version "0.3")
+ (version "0.6")
(source
(origin
(method git-fetch)
@@ -5502,7 +5786,7 @@ Lisp developers who want to write macros with convenience.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "04hvh816a0dvakgn22lxzw8qjmvc8grb5nhg1b5w99j5606ljqcl"))))
+ (base32 "0rh1p9nlhkmhfqmp507rz8hwfgwrdvxx0zba41lxsd2admai90wv"))))
(build-system emacs-build-system)
(synopsis "Emacs package for browsing CLI command docs without man pages")
(description
@@ -5661,7 +5945,7 @@ during idle time, while Emacs is doing nothing else.")
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@@ -5716,7 +6000,7 @@ and stored in memory.")
(define-public emacs-saveplace-pdf-view
(package
(name "emacs-saveplace-pdf-view")
- (version "1.0.6")
+ (version "1.0.7")
(source
(origin
(method git-fetch)
@@ -5725,7 +6009,7 @@ and stored in memory.")
(commit (string-append "saveplace-pdf-view-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "00cqk1qvmdw07vmmyxc843m2qgx1n9ivwzp73r27v4jxx1i38vx2"))))
+ (base32 "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc"))))
(build-system emacs-build-system)
(home-page "https://github.com/nicolaisingh/saveplace-pdf-view")
(synopsis "Save place in pdf-view buffers for Emacs")
@@ -5762,10 +6046,11 @@ inspired by the Deep Purple.")
(define-public emacs-pdfgrep
;; XXX: Upstream does not tag releases. The commit below matches latest
;; version bump.
- (let ((commit "e250376d97fc5240e07d81108bbca9b5a9ab50f4"))
+ (let ((commit "a4ca0a1e6521de93f28bb6736a5344b4974d144c")
+ (revision "1"))
(package
(name "emacs-pdfgrep")
- (version "1.4")
+ (version (git-version "1.4" revision commit))
(source
(origin
(method git-fetch)
@@ -5774,7 +6059,7 @@ inspired by the Deep Purple.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk"))))
+ (base32 "093sm3ywa338lhhz2ib3ylcgklsbxcsqck2qsaq26i2qxr0r7lq2"))))
(build-system emacs-build-system)
(arguments
(list #:phases
@@ -5869,7 +6154,7 @@ type, for example: packages, buffers, files, etc.")
#:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@@ -6086,8 +6371,8 @@ and limited version of the images provided by the KanjiVG project.")
(define-public emacs-kbd
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
- (let ((commit "a7f4c9b9770fa6a58895c5f121df82652bb1b737")
- (revision "0"))
+ (let ((commit "b9048e928ac403c8a1cf09b4fec75776dc4ecf4f")
+ (revision "1"))
(package
(name "emacs-kbd")
(version (git-version "0.0.1" revision commit))
@@ -6099,14 +6384,8 @@ and limited version of the images provided by the KanjiVG project.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0jv9yfsncgf96308c041hvps3jlc151xb0aipm0vasbma3x83ygm"))))
+ (base32 "1rcx6aasr2vnhzqx03w3y39w78w0kvqf5j4j863nk18dalx585b2"))))
(build-system emacs-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'enter-lisp-directory
- (lambda _ (chdir "lisp"))))))
(home-page "https://github.com/slotThe/kbd-mode")
(synopsis "Minor mode for syntax highlighting kmonad's @file{.kbd} files")
(description
@@ -6117,7 +6396,7 @@ kmonad's configuration files (@file{.kbd}).")
(define-public emacs-keycast
(package
(name "emacs-keycast")
- (version "1.3.3")
+ (version "1.4.1")
(source
(origin
(method git-fetch)
@@ -6126,7 +6405,7 @@ kmonad's configuration files (@file{.kbd}).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7"))))
+ (base32 "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -6186,7 +6465,7 @@ or if you want to ensure that some modes have no ligatures at all.")
(define-public emacs-olivetti
(package
(name "emacs-olivetti")
- (version "2.0.5")
+ (version "2.0.6")
(source
(origin
(method git-fetch)
@@ -6195,7 +6474,7 @@ or if you want to ensure that some modes have no ligatures at all.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1"))))
+ (base32 "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1"))))
(build-system emacs-build-system)
(home-page "https://github.com/rnkn/olivetti")
(synopsis "Emacs minor mode for a nice writing environment")
@@ -6681,7 +6960,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)
@@ -6690,7 +6969,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
@@ -6752,7 +7031,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.")
(define-public emacs-apheleia
(package
(name "emacs-apheleia")
- (version "4.1")
+ (version "4.2")
(source
(origin
(method git-fetch)
@@ -6761,7 +7040,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb"))))
+ (base32 "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj"))))
(build-system emacs-build-system)
(home-page "https://github.com/raxod502/apheleia")
(synopsis "Reformat buffer stably")
@@ -6902,17 +7181,17 @@ intended to be.")
(define-public emacs-ef-themes
(package
(name "emacs-ef-themes")
- (version "1.4.0")
+ (version "1.7.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~protesilaos/ef-themes")
+ (url "https://github.com/protesilaos/ef-themes")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "029pcca3ppbs22isym2hi3zzynmvk5dg7jcimpm7nd8m4qk46f49"))))
+ "0m7l3f4mn8xi4hv38fkm21xhs0idpb9idkj1ci0jnmcl5x6ggzxn"))))
(build-system emacs-build-system)
(home-page "https://git.sr.ht/~protesilaos/ef-themes")
(synopsis "Colorful and legible themes")
@@ -7413,16 +7692,16 @@ Lisp.")
(define-public emacs-paren-face
(package
(name "emacs-paren-face")
- (version "1.1.0")
+ (version "1.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tarsius/paren-face")
- (commit version)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba"))))
+ (base32 "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -7822,6 +8101,29 @@ colors random but consistent between same tags, colors are generated from the
hash of the tag names.")
(license license:gpl3+))))
+(define-public emacs-comment-tags
+ ;; Upstream didn't tag a working version.
+ (let ((commit "7d914097f0a03484af71e621db533737fc692f58")
+ (revision "1"))
+ (package
+ (name "emacs-comment-tags")
+ (version (git-version "0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vincekd/comment-tags.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i"))))
+ (build-system emacs-build-system)
+ (synopsis "Minor mode to show comments which have tags like TODO")
+ (description "This package provides a minor mode to show all lines that
+have a comment with a tag, for example listing them right next to each other.")
+ (home-page "https://github.com/vincekd/comment-tags")
+ (license license:gpl3+))))
+
(define-public emacs-org-rich-yank
(package
(name "emacs-org-rich-yank")
@@ -8955,7 +9257,7 @@ completion of relevant keywords.")
#:modules `((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@@ -9024,26 +9326,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")
@@ -9150,7 +9446,7 @@ src blocks.")
(define-public emacs-ol-notmuch
(package
(name "emacs-ol-notmuch")
- (version "2.0.1")
+ (version "2.0.2")
(source
(origin
(method git-fetch)
@@ -9159,7 +9455,7 @@ src blocks.")
(commit (string-append "v" version))))
(sha256
(base32
- "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd"))
+ "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
@@ -9327,7 +9623,7 @@ build jobs.")
(define-public emacs-zmq
(package
(name "emacs-zmq")
- (version "1.0.0")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
@@ -9336,7 +9632,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
@@ -9349,6 +9645,10 @@ build jobs.")
(substitute* "src/configure"
(("/bin/sh") (which "sh"))
(("/usr/bin/file") (which "file")))
+ (substitute* "zmq.el"
+ ;; This typo is already fixed in master--but no release was
+ ;; made.
+ (("zmq-mesage-more-p") "zmq-message-more-p"))
(invoke "make")))
(add-after 'install 'install-shared-object
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -9426,17 +9726,18 @@ 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 url-fetch)
- (uri (string-append "https://elpa.gnu.org/packages/"
- "compat-" version ".tar"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-compat/compat")
+ (commit version)))
(sha256
(base32
- "191cjzrw9xm5bvcf8s1yr9hdcn9i02789xfd8pz33lk65s0rq413"))))
+ "0rw4j8caiyah7k6pml8bwxd9zs6q7mlqq3lvrm013vimw2js3d12"))))
(build-system emacs-build-system)
- (home-page "https://git.sr.ht/~pkal/compat")
- (synopsis "Emacs Lisp Compatibility Library")
+ (home-page "https://elpa.gnu.org/packages/compat.html")
+ (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
@@ -10468,7 +10769,7 @@ in HTML mode.")
;; Update together with sbcl-slime-swank.
(package
(name "emacs-slime")
- (version "2.29.1")
+ (version "2.30")
(source
(origin
(method git-fetch)
@@ -10477,7 +10778,7 @@ in HTML mode.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki"))))
+ (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99"))))
(build-system emacs-build-system)
(arguments
(list
@@ -11006,7 +11307,7 @@ sgml/html integration, and indentation (working with sgml).")
(define-public emacs-jinx
(package
(name "emacs-jinx")
- (version "1.6")
+ (version "1.10")
(source
(origin
(method git-fetch)
@@ -11016,7 +11317,7 @@ sgml/html integration, and indentation (working with sgml).")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0kl9jpd6a68q1s3lc74jkx0nsk66lpwg7zx61a5h0w0m410l1g1q"))))
+ (base32 "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm"))))
(build-system emacs-build-system)
(arguments
(list
@@ -11212,7 +11513,7 @@ Cucumber tool) user stories. Also known by the name @code{cucumber.el}.")
(define-public emacs-org-appear
(package
(name "emacs-org-appear")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method git-fetch)
@@ -11221,7 +11522,7 @@ Cucumber tool) user stories. Also known by the name @code{cucumber.el}.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6"))))
+ (base32 "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4"))))
(build-system emacs-build-system)
(home-page "https://github.com/awth13/org-appear")
(synopsis "Make invisible parts of Org fragments appear visible")
@@ -11308,7 +11609,7 @@ cards created in Org mode.")
(define-public emacs-org-mime
(package
(name "emacs-org-mime")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method git-fetch)
@@ -11317,7 +11618,7 @@ cards created in Org mode.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1w5z9irzk918mj75z5m0j2h8mms8v27x50kp7r3b01wblf0jd2zc"))))
+ (base32 "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp"))))
(build-system emacs-build-system)
(home-page "https://github.com/org-mime/org-mime")
(synopsis "Send HTML email using Org mode HTML export")
@@ -12108,7 +12409,7 @@ them easier to distinguish from other, less important buffers.")
(define-public emacs-embark
(package
(name "emacs-embark")
- (version "1.0")
+ (version "1.1")
(source
(origin
(method git-fetch)
@@ -12116,7 +12417,7 @@ them easier to distinguish from other, less important buffers.")
(url "https://github.com/oantolin/embark")
(commit version)))
(sha256
- (base32 "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2"))
+ (base32 "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@@ -12157,7 +12458,7 @@ include installing, removing or visiting the homepage.")
(define-public emacs-prescient
(package
(name "emacs-prescient")
- (version "6.3")
+ (version "6.3.1")
(source
(origin
(method git-fetch)
@@ -12166,7 +12467,7 @@ include installing, removing or visiting the homepage.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"))))
+ (base32 "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-company emacs-corfu emacs-ivy emacs-selectrum emacs-vertico))
@@ -12240,7 +12541,7 @@ style, or as multiple word prefixes.")
(define-public emacs-consult
(package
(name "emacs-consult")
- (version "1.5")
+ (version "1.8")
(source
(origin
(method git-fetch)
@@ -12248,7 +12549,7 @@ style, or as multiple word prefixes.")
(url "https://github.com/minad/consult")
(commit version)))
(sha256
- (base32 "0wgc30vinc62vppakwyxzfqpxqm0nl3srz4d42xs873i5bsczkab"))
+ (base32 "06jckxwagpvp4w8hykc0wr90pba9ih8376562g1q93g0nbb3rhrg"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@@ -12296,6 +12597,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")
@@ -12529,7 +12850,7 @@ expansion and overwriting the marked region with a new snippet completion.")
(define-public emacs-marginalia
(package
(name "emacs-marginalia")
- (version "1.6")
+ (version "1.7")
(source
(origin
(method git-fetch)
@@ -12538,7 +12859,7 @@ expansion and overwriting the marked region with a new snippet completion.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0"))))
+ (base32 "1y79fhki7wbfaw24n5n5w80yvchj1ncz74yvfbgf7sna2ngz4yih"))))
(build-system emacs-build-system)
(arguments
(list
@@ -12688,7 +13009,7 @@ between symbols.")
(define-public emacs-hl-todo
(package
(name "emacs-hl-todo")
- (version "3.6.0")
+ (version "3.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -12697,7 +13018,7 @@ between symbols.")
(file-name (git-file-name name version))
(sha256
(base32
- "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq"))))
+ "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -12829,7 +13150,7 @@ perspective only its buffers are available by default.")
(define-public emacs-persp-mode
(package
(name "emacs-persp-mode")
- (version "2.9.8")
+ (version "3.0.8")
(source
(origin
(method git-fetch)
@@ -12839,7 +13160,7 @@ perspective only its buffers are available by default.")
(file-name (git-file-name name version))
(sha256
(base32
- "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"))))
+ "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr"))))
(build-system emacs-build-system)
(home-page "https://github.com/Bad-ptr/persp-mode.el")
(synopsis "Switch between named \"perspectives\" shared among frames")
@@ -13080,6 +13401,27 @@ backends. It supports url.el which is shipped with Emacs and the curl command
line program.")
(license license:gpl3+))))
+(define-public emacs-ruby-electric
+ (package
+ (name "emacs-ruby-electric")
+ (version "2.3.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ruby/elisp-ruby-electric")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/ruby/elisp-ruby-electric")
+ (synopsis "Minor mode for electrically editing Ruby code")
+ (description
+ "Ruby Electric mode accelerates code writing in Ruby by making some keys
+electric and automatically supplying with closing parentheses and @code{end}
+as appropriate.")
+ (license license:ruby)))
+
(define-public emacs-rudel
(package
(name "emacs-rudel")
@@ -13581,6 +13923,26 @@ lines that match the current text being edited. This gives you the effect of
a temporary @code{keep-lines} or @code{occur}.")
(license license:gpl3+)))
+(define-public emacs-zop-to-char
+ (package
+ (name "emacs-zop-to-char")
+ (version "1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/thierryvolpiatto/zop-to-char")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/thierryvolpiatto/zop-to-char")
+ (synopsis "Visual zap-to-char command for Emacs")
+ (description
+ "This package provides a visual zap-to-char command for Emacs.")
+ (license license:gpl3+)))
+
(define-public emacs-zoutline
(package
(name "emacs-zoutline")
@@ -13750,33 +14112,31 @@ allowing unprefixed keys to insert their respective characters as expected.")
(license license:gpl3+))))
(define-public emacs-clojure-mode
- (let ((commit "af0e518a6b86f2c6f32dfb30b99c067071ed5cd4")
- (revision "1"))
- (package
- (name "emacs-clojure-mode")
- (version (git-version "5.18.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/clojure-emacs/clojure-mode")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1wx3zgrwxywqk7f47idp2d09vjf557xf4l6p5a9xwqmpylnwaznh"))))
- (build-system emacs-build-system)
- (native-inputs
- (list emacs-buttercup emacs-dash emacs-paredit emacs-s))
- (arguments
- `(#:tests? #t
- #:test-command '("buttercup")))
- (home-page "https://github.com/clojure-emacs/clojure-mode")
- (synopsis "Major mode for Clojure code")
- (description
- "This Emacs package provides font-lock, indentation, navigation and basic
+ (package
+ (name "emacs-clojure-mode")
+ (version "5.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/clojure-emacs/clojure-mode")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"))))
+ (build-system emacs-build-system)
+ (native-inputs
+ (list emacs-buttercup emacs-dash emacs-paredit emacs-s))
+ (arguments
+ `(#:tests? #t
+ #:test-command '("buttercup")))
+ (home-page "https://github.com/clojure-emacs/clojure-mode")
+ (synopsis "Major mode for Clojure code")
+ (description
+ "This Emacs package provides font-lock, indentation, navigation and basic
refactoring for the @uref{http://clojure.org, Clojure programming language}.
It is recommended to use @code{clojure-mode} with Paredit or Smartparens.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-clj-deps-new
(let ((commit "e1cf65eb040f5a2e9a3eca970044ba71cc53fb27")
@@ -14505,6 +14865,28 @@ provides the following features:
@end itemize")
(license license:gpl3+)))
+(define-public emacs-tinysegmenter
+ (let ((commit "872134704bd25c13a4c59552433da4c6881b5230"))
+ (package
+ (name "emacs-tinysegmenter")
+ (version "0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/myuhe/tinysegmenter.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/myuhe/tinysegmenter.el")
+ (synopsis "Compact Japanese tokenizer in Emacs Lisp")
+ (description
+ "This package provides functions for tokenizing Japanese text in
+Emacs buffers.")
+ (license license:bsd-3))))
+
(define-public emacs-markdown-mode
(package
(name "emacs-markdown-mode")
@@ -14657,7 +15039,7 @@ and tooling.")
(define-public emacs-elfeed
(package
(name "emacs-elfeed")
- (version "3.4.1")
+ (version "3.4.2")
(source
(origin
(method git-fetch)
@@ -14666,7 +15048,7 @@ and tooling.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"))))
+ (base32 "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
@@ -14805,7 +15187,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)
@@ -14814,7 +15196,7 @@ with Elfeed.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q"))))
+ (base32 "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z"))))
(build-system emacs-build-system)
(arguments
(list
@@ -14923,6 +15305,63 @@ 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-org-remark
+ (package
+ (name "emacs-org-remark")
+ (version "1.2.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nobiot/org-remark")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1b6nmd64jzy6a7fz4x5p276sl36xa72y3ajbl72vr5ndqp94rlz1"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-org))
+ (home-page "https://nobiot.github.io/org-remark/")
+ (synopsis "Highlight & annotate text using Org mode")
+ (description "Org-remark lets you highlight and annotate text files,
+websites, EPUB books and Info documentation using Org mode.
+
+Features:
+
+@itemize
+@item Highlight and annotate any text file. The highlights and notes are kept
+in an Org file as the plain text database. This lets you easily manage your
+marginal notes and use the built-in Org facilities on them – e.g. create a
+sparse tree based on the category of the notes
+@item Create your your own highlighter pens with different colors, type (e.g.
+underline, squiggle, etc. optionally with Org’s category for search and filter
+on your highlights and notes)
+@item Have the same highlighting and annotating functionality for websites
+(when browsing with EWW), EPUB books with @code{nov.el}, Info documentation
+@end itemize")
+ (license license:gpl3+)))
+
(define-public emacs-mocker
(package
(name "emacs-mocker")
@@ -15679,7 +16118,7 @@ ack, ag, helm and pt.")
(define-public emacs-helm
(package
(name "emacs-helm")
- (version "3.9.8")
+ (version "3.9.9")
(source
(origin
(method git-fetch)
@@ -15688,7 +16127,7 @@ ack, ag, helm and pt.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1"))))
+ (base32 "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-async emacs-popup))
@@ -15975,7 +16414,7 @@ implementation.")
(define-public emacs-cider
(package
(name "emacs-cider")
- (version "1.13.1")
+ (version "1.15.1")
(source
(origin
(method git-fetch)
@@ -15984,7 +16423,7 @@ implementation.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h"))))
+ (base32 "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1"))))
(build-system emacs-build-system)
(arguments
'(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include)
@@ -16381,7 +16820,7 @@ Lua programming language}.")
(define-public emacs-ebuild-mode
(package
(name "emacs-ebuild-mode")
- (version "1.70")
+ (version "1.73")
(source
(origin
(method url-fetch)
@@ -16390,7 +16829,7 @@ Lua programming language}.")
"ebuild-mode-" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
- (base32 "14cy52hyh5gam1m5a4ys1zmlwabi7gv4nc8l6ki61lh5g1gqmbly"))))
+ (base32 "02ggdah56dfs6qc4zpcwqs30mgymg7wif5sd0d1yhbxl97ricx7g"))))
(build-system emacs-build-system)
(arguments
(list
@@ -17006,14 +17445,14 @@ to be a more complete implementation.")
(define-public emacs-orgalist
(package
(name "emacs-orgalist")
- (version "1.14")
+ (version "1.16")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"orgalist-" version ".tar"))
(sha256
- (base32 "08gx8aqi7ph75vhhss2xl1lfypzy8a3zmj7w8flcrvz1nk0z738s"))))
+ (base32 "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/orgalist.html")
(synopsis "Manage Org-like lists in non-Org buffers")
@@ -17069,7 +17508,7 @@ passive voice.")
(define-public emacs-org
(package
(name "emacs-org")
- (version "9.6.28")
+ (version "9.7.10")
(source
(origin
(method git-fetch)
@@ -17078,7 +17517,7 @@ passive voice.")
(commit (string-append "release_" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1fp7arax4wjzgbcqvmj7xrcjipqskhlznsc6q5cb32dvb7akn1ni"))))
+ (base32 "0wa9ah2mj6692zyycyhk3nks0q0qmwbz5765sr0a0cr7fbg2cgvq"))))
(build-system emacs-build-system)
(arguments
(list
@@ -17107,12 +17546,25 @@ passive voice.")
(for-each make-file-writable
'("babel.org"
"ob-awk-test.org"
- "ob-sed-test.org"
- "ob-shell-test.org"))
+ "ob-sed-test.org"))
;; Specify where sh executable is.
(let ((sh (search-input-file inputs "/bin/sh")))
(substitute* "babel.org"
(("/bin/sh") sh))))
+ ;; XXX: Fix failure in ob-tangle/collect-blocks. The test
+ ;; assumes that ~/../.. corresponds to /. This isn't true in
+ ;; our case.
+ (substitute* "testing/lisp/test-ob-tangle.el"
+ ((" ~/\\.\\./\\.\\./")
+ (string-append " ~"
+ ;; relative path from ${HOME} to / during
+ ;; build
+ (string-join
+ (map-in-order
+ (lambda (x)
+ (if (equal? x "") "" ".."))
+ (string-split (getcwd) #\/)) "/")
+ "/")))
;; XXX: Skip failing tests.
(substitute* "testing/lisp/test-ob-shell.el"
(("ob-shell/remote-with-stdin-or-cmdline .*" all)
@@ -17512,10 +17964,10 @@ extensibility.")
(license license:gpl3+)))
(define-public emacs-autocrypt
- (let ((commit "a90aa6b644fe8cf72af9e1615a7c50b36b739e7c")) ;version bump
+ (let ((commit "dc0223f11daf526621fda206b38bf06c29759c94")) ;version bump
(package
(name "emacs-autocrypt")
- (version "0.4.1")
+ (version "0.4.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -17524,7 +17976,7 @@ extensibility.")
(file-name (git-file-name name version))
(sha256
(base32
- "124qf96g2xbz3wz0ihix4l1g4prpa023hx0klf72clx92dhjjgjj"))))
+ "0p4fmmldsypb5v4h3p1dfi1qdbk4i6w03465b3hb0x0qnj49l695"))))
(build-system emacs-build-system)
(home-page "https://git.sr.ht/~pkal/autocrypt")
(synopsis "Autocrypt implementation for Emacs")
@@ -17679,16 +18131,16 @@ you to deal with multiple log levels.")
(define-public emacs-denote
(package
(name "emacs-denote")
- (version "2.2.0")
+ (version "3.0.8")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~protesilaos/denote")
+ (url "https://github.com/protesilaos/denote")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0w9r5d0br5hpay13vbx78ak2n0yy8bbwlaxnz4p5ggxiv8g5044q"))))
+ (base32 "1lmnb20pw7fh6mpw5jg11m8z550w0xci63pi92mfgwn0p10wn7h9"))))
(build-system emacs-build-system)
(native-inputs (list texinfo))
(home-page "https://protesilaos.com/emacs/denote/")
@@ -17704,14 +18156,14 @@ such files while providing facilities to link between them.")
(define-public emacs-denote-menu
(package
(name "emacs-denote-menu")
- (version "1.2.0")
+ (version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"denote-menu-" version ".tar"))
(sha256
- (base32 "1zm68bz6hya360g5zvs4r5naznykamgzqxhvfhpfyxb70hsnmx5w"))))
+ (base32 "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-denote))
(home-page "https://www.scss.tcd.ie/~sulimanm/posts/denote-menu.html")
@@ -17806,44 +18258,45 @@ using a convenient notation.")
license:fdl1.3+)))) ;GFDLv1.3+ for the manual
(define-public emacs-beframe
- (package
- (name "emacs-beframe")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~protesilaos/beframe")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "08k9lwfxfvpm50n1c0gcm07sicd6yw7dbyyvhp8lai6pfxl465v9"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'makeinfo
- (lambda _
- (invoke "emacs"
- "--batch"
- "--eval=(require 'ox-texinfo)"
- "--eval=(find-file \"README.org\")"
- "--eval=(org-texinfo-export-to-info)")
- (install-file "beframe.info"
- (string-append #$output "/share/info")))))))
- (native-inputs
- (list texinfo))
- (home-page "https://protesilaos.com/emacs/beframe")
- (synopsis "Isolate Emacs buffers per frame")
- (description
- "Beframe enables a frame-oriented Emacs workflow where each frame has
+ (let ((commit "c3f4583b0767e7f8c38c83ed29af40af8ba3bdfa")) ;version bump
+ (package
+ (name "emacs-beframe")
+ (version "1.1.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/protesilaos/beframe")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1j9v85wxahnm2h828c8dbjm0f81j9pxlf54dgcw443cl0kwcda9c"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'makeinfo
+ (lambda _
+ (invoke "emacs"
+ "--batch"
+ "--eval=(require 'ox-texinfo)"
+ "--eval=(find-file \"README.org\")"
+ "--eval=(org-texinfo-export-to-info)")
+ (install-file "beframe.info"
+ (string-append #$output "/share/info")))))))
+ (native-inputs
+ (list texinfo))
+ (home-page "https://protesilaos.com/emacs/beframe")
+ (synopsis "Isolate Emacs buffers per frame")
+ (description
+ "Beframe enables a frame-oriented Emacs workflow where each frame has
access to the list of buffers visited therein. In the interest of brevity, we
call buffers that belong to frames ``beframed''. Producing multiple frames
does not generate multiple buffer lists. There still is only one global list
of buffers. Beframing them simply filters the list.")
- (license (list license:gpl3+
- license:fdl1.3+)))) ; GFDLv1.3+ for the manual
+ (license (list license:gpl3+
+ license:fdl1.3+))))) ; GFDLv1.3+ for the manual
(define-public emacs-gn-mode
(package
@@ -17867,6 +18320,30 @@ 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.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.thanosapollo.org/gnosis")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd"))))
+ (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")
@@ -18182,7 +18659,7 @@ been adapted to also work with mu4e.")
(define-public emacs-tempel
(package
(name "emacs-tempel")
- (version "1.1")
+ (version "1.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -18191,7 +18668,7 @@ been adapted to also work with mu4e.")
(file-name (git-file-name name version))
(sha256
(base32
- "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5"))))
+ "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -18226,12 +18703,10 @@ the Emacs TempEl package.")
(license license:gpl3+))))
(define-public emacs-yasnippet
- ;; The latest release is more than 5 years old, has test problems.
- (let ((revision "0")
- (commit "297546f0853a6a51f5b05e954d0c6aea8caa5ec2"))
+ (let ((commit "297546f0853a6a51f5b05e954d0c6aea8caa5ec2")) ;version bump
(package
(name "emacs-yasnippet")
- (version (git-version "0.14.0" revision commit))
+ (version "0.14.1")
(source
(origin
(method git-fetch)
@@ -18264,7 +18739,7 @@ type an abbreviation and automatically expand it into function templates.")
(define-public emacs-yasnippet-snippets
(package
(name "emacs-yasnippet-snippets")
- (version "1.0")
+ (version "1.1")
(source
(origin
(method git-fetch)
@@ -18273,10 +18748,16 @@ type an abbreviation and automatically expand it into function templates.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r"))))
+ (base32 "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf"))))
(build-system emacs-build-system)
(arguments
- `(#:include (cons* "^snippets\\/" %default-include)))
+ (list
+ #:include #~(cons* "^snippets\\/" %default-include)
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-home
+ (lambda _
+ (setenv "HOME" (getcwd)))))))
(propagated-inputs
(list emacs-yasnippet))
(home-page "https://github.com/AndreaCrotti/yasnippet-snippets")
@@ -18693,7 +19174,7 @@ highlights quasi-quoted expressions.")
(define-public emacspeak
(package
(name "emacspeak")
- (version "59.0")
+ (version "60.0")
(source
(origin
(method git-fetch)
@@ -18702,7 +19183,7 @@ highlights quasi-quoted expressions.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "010c8hy8nmffaqn1h8n8hmyxvn7gx6ygx4pxgdfp1vl8bb1bz54y"))))
+ (base32 "1nry9qklhxwqpbqvhms0p25sz49s291rk2a8vf23fp4h5p37cxfh"))))
(build-system gnu-build-system)
(arguments
(list
@@ -18788,7 +19269,7 @@ actually changing the buffer's text.")
(define-public emacs-diff-hl
(package
(name "emacs-diff-hl")
- (version "1.9.2")
+ (version "1.10.0")
(source
(origin
(method git-fetch)
@@ -18797,7 +19278,7 @@ actually changing the buffer's text.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s"))))
+ (base32 "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw"))))
(build-system emacs-build-system)
(home-page "https://github.com/dgutov/diff-hl")
(synopsis "Highlight uncommitted changes using VC")
@@ -19299,6 +19780,32 @@ guidelines. It also includes a couple handy IDE-type features such as
documentation search and a source and class browser.")
(license license:gpl3+)))
+(define-public emacs-composer
+ (let ((commit "791a7104be2ef2748757a186094c1e8f7f531a01")
+ (revision "0"))
+ (package
+ (name "emacs-composer")
+ (version (git-version "0.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zonuexe/composer.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01kb74nlkp4fvpbz6wdx776q3v7jfknhax1qmg85kj2ilkadfrd0"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/zonuexe/composer.el")
+ (synopsis "Emacs interface for managing PHP dependencies with Composer")
+ (description
+ "This package provides an Emacs interface for working with PHP
+ dependencies managed by Composer. It allows users to run Composer commands
+ directly from Emacs, including installing and updating packages, and managing
+ Composer configurations. The package aims to streamline the development
+ workflow for PHP projects within Emacs.")
+ (license license:gpl3+))))
+
(define-public emacs-pippel
(let ((commit "cb194952ee150e77601d3233dabdb521b976ee79")
(revision "0"))
@@ -19397,13 +19904,13 @@ containing words from the Rime project.")
(define-public emacs-pyim
(package
(name "emacs-pyim")
- (version "5.3.3")
+ (version "5.3.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar"))
(sha256
- (base32 "04dz3gdqq6pcxycpzkzzmhbg6lk629v41y64jlh6si21jwfr6wnx"))))
+ (base32 "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-async emacs-posframe emacs-xr))
@@ -19479,7 +19986,7 @@ methods from a given list.")
(define-public emacs-mini-echo
(package
(name "emacs-mini-echo")
- (version "0.8.0")
+ (version "0.11.1")
(source
(origin
(method git-fetch)
@@ -19487,9 +19994,9 @@ methods from a given list.")
(url "https://github.com/liuyinz/mini-echo.el")
(commit (string-append "v" version))))
(sha256
- (base32 "0q4hvbypnjg5q1szwki2md45r5kkdxrr4zxqh57y7d53idjzhpnf"))))
+ (base32 "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa"))))
(build-system emacs-build-system)
- (propagated-inputs (list emacs-hide-mode-line))
+ (propagated-inputs (list emacs-dash emacs-hide-mode-line))
(home-page "https://github.com/liuyinz/mini-echo.el")
(synopsis "Echo buffer status in minibuffer window")
(description "This package lets you show buffer status in the echo area,
@@ -19671,16 +20178,14 @@ conflicts.")
(define-public emacs-xelb
(package
(name "emacs-xelb")
- (version "0.18")
+ (version "0.20")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xelb-"
version ".tar"))
(sha256
(base32
- "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7"))
- (patches
- (search-patches "emacs-xelb-ignore-length-element.patch"))))
+ "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk"))))
(build-system emacs-build-system)
;; The following functions and variables needed by emacs-xelb are
;; not included in emacs-minimal:
@@ -19688,19 +20193,22 @@ conflicts.")
;; x-hyper-keysym, x-super-keysym, libxml-parse-xml-region
;; x-display-pixel-width, x-display-pixel-height
(arguments
- `(#:emacs ,emacs
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'regenerate-el-files
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke "make"
- (string-append "PROTO_PATH="
- (assoc-ref inputs "xcb-proto")
- "/share/xcb")
- (string-append "EMACS_BIN="
- (assoc-ref inputs "emacs")
- "/bin/emacs -Q")))))))
+ (list
+ #:emacs emacs
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'expand-load-path 'regenerate-el-files
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (substitute* "xelb-gen"
+ (("/usr/bin/env") (which "env")))
+ (let ((xcb-proto #$(this-package-native-input "xcb-proto"))
+ (emacs (search-input-file (or native-inputs inputs)
+ "/bin/emacs")))
+ (invoke "make"
+ (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
@@ -19712,7 +20220,7 @@ It should enable you to implement low-level X11 applications.")
(define-public emacs-exwm
(package
(name "emacs-exwm")
- (version "0.28")
+ (version "0.31")
(synopsis "Emacs X window manager")
(source
(origin
@@ -19720,7 +20228,7 @@ It should enable you to implement low-level X11 applications.")
(uri (string-append "https://elpa.gnu.org/packages/"
"exwm-" version ".tar"))
(sha256
- (base32 "00h5awqazk807zxvb02a9dp8gd5ifi3y1kcwmr1czk6kdmkjx32l"))))
+ (base32 "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-xelb))
@@ -19731,45 +20239,44 @@ It should enable you to implement low-level X11 applications.")
;; scroll-bar-mode, fringe-mode
;; x-display-pixel-width, x-display-pixel-height
(arguments
- `(#:emacs ,emacs
- #:phases
- (modify-phases %standard-phases
- (add-after 'build 'install-xsession
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xsessions (string-append out "/share/xsessions"))
- (bin (string-append out "/bin"))
- (exwm-executable (string-append bin "/exwm")))
- ;; Add a .desktop file to xsessions
- (mkdir-p xsessions)
- (mkdir-p bin)
- (make-desktop-entry-file
- (string-append xsessions "/exwm.desktop")
- #:name ,name
- #:comment ,synopsis
- #:exec exwm-executable
- #:try-exec exwm-executable)
- ;; Add a shell wrapper to bin
- (with-output-to-file exwm-executable
- (lambda _
- (format #t "#!~a ~@
+ (list
+ #:emacs emacs
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'install-xsession
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((xsessions (string-append #$output "/share/xsessions"))
+ (bin (string-append #$output "/bin"))
+ (exwm-executable (string-append bin "/exwm")))
+ ;; Add a .desktop file to xsessions
+ (mkdir-p xsessions)
+ (mkdir-p bin)
+ (make-desktop-entry-file
+ (string-append xsessions "/exwm.desktop")
+ #:name #$name
+ #:comment #$synopsis
+ #:exec exwm-executable
+ #:try-exec exwm-executable)
+ ;; Add a shell wrapper to bin
+ (with-output-to-file exwm-executable
+ (lambda _
+ (format #t "#!~a ~@
~a +SI:localuser:$USER ~@
exec ~a --exit-with-session ~a \"$@\" --eval '~s' ~%"
- (search-input-file inputs "/bin/sh")
- (search-input-file inputs "/bin/xhost")
- (search-input-file inputs "/bin/dbus-launch")
- (search-input-file inputs "/bin/emacs")
- '(cond
- ((file-exists-p "~/.exwm")
- (load-file "~/.exwm"))
- ((not (featurep 'exwm))
- (require 'exwm)
- (require 'exwm-config)
- (exwm-config-default)
- (message (concat "exwm configuration not found. "
- "Falling back to default configuration...")))))))
- (chmod exwm-executable #o555)
- #t))))))
+ (search-input-file inputs "/bin/sh")
+ (search-input-file inputs "/bin/xhost")
+ (search-input-file inputs "/bin/dbus-launch")
+ (search-input-file inputs "/bin/emacs")
+ '(cond
+ ((file-exists-p "~/.exwm")
+ (load-file "~/.exwm"))
+ ((not (featurep 'exwm))
+ (require 'exwm)
+ (require 'exwm-config)
+ (exwm-config-example)
+ (message (concat "exwm configuration not found. "
+ "Falling back to default configuration...")))))))
+ (chmod exwm-executable #o555)))))))
(home-page "https://github.com/ch11ng/exwm")
(description
"EXWM is a full-featured tiling X window manager for Emacs built on top
@@ -20153,8 +20660,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))
@@ -20166,7 +20673,7 @@ one if it fails.")
(file-name (git-file-name name version))
(sha256
(base32
- "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq"))))
+ "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn"))))
(build-system emacs-build-system)
(arguments
(list
@@ -20235,7 +20742,7 @@ variable instead, to remind you of that variable's meaning.")
(define-public emacs-eldoc-box
(package
(name "emacs-eldoc-box")
- (version "1.11.1")
+ (version "1.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -20244,7 +20751,7 @@ variable instead, to remind you of that variable's meaning.")
(file-name (git-file-name name version))
(sha256
(base32
- "0fzcyjg61icwjw1ml3p9qzd4a10vl7n1hqdpynqr5nlq9ih7rrgq"))))
+ "1v163zk8qazz92q2iv9f0sgq2paryx80m94hbl588lhnyk227lsb"))))
(build-system emacs-build-system)
(home-page "https://github.com/casouri/eldoc-box")
(synopsis "Childframe doc for eglot and anything that uses eldoc")
@@ -20272,7 +20779,8 @@ hidden.")
"08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"))))
(build-system emacs-build-system)
(inputs
- (list emacs-ansi
+ (list bash-minimal
+ emacs-ansi
emacs-commander
emacs-dash
emacs-f
@@ -20295,8 +20803,8 @@ hidden.")
;; Do not capture the transient source directory in
;; the wrapper.
(delete source-directory
- (string-split (getenv "EMACSLOADPATH") #\:))))
- #t))))
+ (string-split (getenv "EMACSLOADPATH")
+ #\:))))))))
#:include (cons* "^reporters/.*\\.el$" %default-include)))
(home-page "https://github.com/rejeep/ert-runner.el")
(synopsis "Opinionated Ert testing workflow")
@@ -20327,10 +20835,10 @@ running tests easier.")
(license license:gpl3+)))
(define-public emacs-org-transclusion
- (let ((commit "7f4ad67bf1944b814a8763d304d4d27325504eb4")) ;version bump
+ (let ((commit "e6e638710e90198070c9b07ebdaa345a79f74706")) ;version bump
(package
(name "emacs-org-transclusion")
- (version "1.3.2")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
@@ -20339,7 +20847,7 @@ running tests easier.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0dgqbazr22y0kmyw5ki1rkca10j6fy0ps5s9gx247gqlbmqz7088"))))
+ (base32 "18v64vgr93yqx57m92hsj6s6ib315gq06dk3ib34s966iz96yi4a"))))
(build-system emacs-build-system)
(arguments
(list
@@ -20478,20 +20986,20 @@ highlighting.")
;; upstreamed. By convention, it should refer to a commit in which
;; jsonrpc.el was actually touched. In order to find this, you can refer to
;; <https://git.savannah.gnu.org/cgit/emacs.git/log/?qt=grep&q=jsonrpc>.
- (let ((commit "731cfee3b45361158d88bded3c32c9a48ace7bdb")) ;version bump
+ (let ((commit "4e8e877c377e41d72705235922f97b69d81d0267")) ;version bump
(package
(name "emacs-jsonrpc")
- (version "1.0.23")
+ (version "1.0.25")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.savannah.gnu.org/git/emacs")
+ (url "https://git.savannah.gnu.org/git/emacs/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "0xrlqjd4kj7z5ssidi159n8fm1hx35if2h1ds586ppf8y057bmhn"))))
+ "1vwk5pwmf61d7yb49wp0ljim3aw002bjdnpw45cpjcbqhbhkgsc6"))))
(build-system emacs-build-system)
(arguments
(list #:phases
@@ -20747,24 +21255,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
@@ -21003,7 +21504,7 @@ multiplexer.")
(define-public emacs-plz
(package
(name "emacs-plz")
- (version "0.8")
+ (version "0.9.1")
(source
(origin
(method git-fetch)
@@ -21012,7 +21513,7 @@ multiplexer.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0vyx6vd90ifj4aza8k9h7ccb4ijs5n5k8hcn8ccm6jrw5h148c4v"))))
+ (base32 "1xigrw84wbkr8ny6apfq1a8rws198my4ycr3grdwk5mvdx75h5qr"))))
(build-system emacs-build-system)
(inputs (list curl))
(arguments
@@ -21031,10 +21532,61 @@ multiplexer.")
which avoids some of the issues with using Emacs’s built-in Url library.")
(license license:gpl3+)))
+(define-public emacs-plz-media-type
+ (package
+ (name "emacs-plz-media-type")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/r0man/plz-media-type")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1bxrinp276rzz1jwnqrs5xginm96vzxr0b1k5q3y56lnin8sp18x"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-plz))
+ (arguments (list #:tests? #f))
+ (home-page "https://github.com/r0man/plz-media-type")
+ (synopsis "HTTP media type extension for plz.el")
+ (description
+ "The @code{plz-media-type} library enhances MIME type handling for HTTP
+requests within Emacs. It leverages the Plz HTTP library for networking calls
+and introduces a mechanism to process responses based on the content type
+header. This library defines various classes and methods for parsing and
+processing standard MIME types, including JSON, XML, HTML, and binary data, in
+a streaming and non-streaming way.")
+ (license license:gpl3+)))
+
+(define-public emacs-plz-event-source
+ (package
+ (name "emacs-plz-event-source")
+ (version "0.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/r0man/plz-event-source")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rg3dmaqnhzvzqsyfnk3y77s88jrjpwpzkj1fyz40j8b184q3qcs"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-plz-media-type))
+ (arguments (list #:tests? #f))
+ (home-page "https://github.com/r0man/plz-event-source")
+ (synopsis "Server Sent Events extension for Plz")
+ (description
+ "The @code{plz-event-source} library provides a @code{plz-media-type},
+a parser, and an event source implementation for the @acronym{SSE, Server Sent
+Event} protocol.")
+ (license license:gpl3+)))
+
(define-public emacs-ement
(package
(name "emacs-ement")
- (version "0.15")
+ (version "0.15.1")
(source
(origin
(method git-fetch)
@@ -21043,7 +21595,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0imylq7x5nb94pxzjlhnlirxp7fr4mrmaz2rqrv762fsbim0gp48"))))
+ (base32 "1wj0gzbx3m4j1h093nh8m65xmmhz2wjmlg39smxai44x7va27xmv"))))
(build-system emacs-build-system)
(arguments
(list #:emacs emacs)) ;need libxml support
@@ -21390,7 +21942,7 @@ from within Elisp using a DSL similar to CSS selectors.")
(define-public emacs-envrc
(package
(name "emacs-envrc")
- (version "0.11")
+ (version "0.12")
(source
(origin
(method git-fetch)
@@ -21400,7 +21952,7 @@ from within Elisp using a DSL similar to CSS selectors.")
(file-name (git-file-name name version))
(sha256
(base32
- "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0"))))
+ "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"))))
(build-system emacs-build-system)
(arguments
(list
@@ -21551,7 +22103,7 @@ an elisp expression.")
(define-public emacs-taxy
(package
(name "emacs-taxy")
- (version "0.10.1")
+ (version "0.10.2")
(source
(origin
(method url-fetch)
@@ -21559,7 +22111,7 @@ an elisp expression.")
"https://elpa.gnu.org/packages/taxy-" version ".tar"))
(sha256
(base32
- "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg"))))
+ "1nmlx2rvlgzvmz1h3s5yn3qnad12pn2a83gjzxf3ln79p8rv1mj6"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-magit))
@@ -21574,7 +22126,7 @@ groups.")
(define-public emacs-taxy-magit-section
(package
(name "emacs-taxy-magit-section")
- (version "0.13")
+ (version "0.14")
(source (origin
(method url-fetch)
(uri (string-append
@@ -21582,7 +22134,7 @@ groups.")
".tar"))
(sha256
(base32
- "1712hbcna0ph9chaq28a6fanv4sccdiphd5z0hg34ig3g6pslgn9"))))
+ "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-magit emacs-taxy))
(home-page "https://github.com/alphapapa/taxy.el")
@@ -21965,14 +22517,14 @@ let users kill or mark things easily.")
(define-public emacs-csv-mode
(package
(name "emacs-csv-mode")
- (version "1.23")
+ (version "1.27")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"csv-mode-" version ".tar"))
(sha256
- (base32 "0bdx56bn5aw0xjqgqhx2ccrrns3si04zy9ya755jz7n1djqn3mcz"))))
+ (base32 "0jxf4id5c9696nh666x0xbzqx3vskyv810km61y9nkg7sp4ln2qf"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/csv-mode.html")
(synopsis "Major mode for editing comma/char separated values")
@@ -22062,7 +22614,7 @@ literate programming tools for exporting, weaving and tangling.")
(define-public emacs-polymode-ansible
(package
(name "emacs-polymode-ansible")
- (version "0.4.0")
+ (version "0.5.1")
(source
(origin
(method git-fetch)
@@ -22071,13 +22623,31 @@ literate programming tools for exporting, weaving and tangling.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0fmbxhn8cbfdad37m1jssm1jblia0b4fzdv89lrz0k5wqyzlkz4g"))))
+ (base32 "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972"))))
(build-system emacs-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'move-source-files
+ (lambda _
+ (let ((el-files (find-files "./lisp" ".*\\.el$")))
+ (for-each (lambda (f) (copy-file f (basename f)))
+ el-files))))
+ ;; Autoloads file include a reference to "systemd-autoload-regexp".
+ ;; Require `systemd' to load its definition and let
+ ;; `validate-compiled-autoloads' phase run peacefully.
+ (add-after 'make-autoloads 'require-systemd-mode
+ (lambda _
+ (substitute* "polymode-ansible-autoloads.el"
+ ((";;; Code:" lead)
+ (string-append lead "\n(require 'systemd)"))))))))
(propagated-inputs
(list emacs-ansible
emacs-ansible-doc
emacs-jinja2-mode
emacs-polymode
+ emacs-systemd-mode
emacs-yaml-mode))
(properties '((upstream-name . "poly-ansible")))
(home-page "https://gitlab.com/mavit/poly-ansible/")
@@ -22422,11 +22992,11 @@ from @code{groovy-mode} for editing Jenkins declarative pipeline files.")
(license license:gpl3+))))
(define-public emacs-org-tree-slide
- (let ((commit "d6529bc2df727d09014e0e56abf4f15a8e8fc20f")
+ (let ((commit "e2599a106a26ce5511095e23df4ea04be6687a8a")
(revision "0"))
(package
(name "emacs-org-tree-slide")
- (version (git-version "2.8.18" revision commit))
+ (version (git-version "2.8.22" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -22434,7 +23004,7 @@ from @code{groovy-mode} for editing Jenkins declarative pipeline files.")
(commit commit)))
(sha256
(base32
- "1br32mpwarmrn158y2pkkmfl2ssv8q8spzknkg2avr16fil0j1pz"))
+ "0i1mzgq178sl6x2wf7k0ad57dy1d34wbk2k99fiyvv70rfbj2yy2"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(home-page "https://github.com/takaxp/org-tree-slide")
@@ -22632,32 +23202,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
@@ -23082,7 +23654,7 @@ match and total match information in the mode-line in various search modes.")
(define-public emacs-pg
(package
(name "emacs-pg")
- (version "0.32")
+ (version "0.39")
(source (origin
(method git-fetch)
(uri (git-reference (url "https://github.com/emarsden/pg-el")
@@ -23090,8 +23662,9 @@ match and total match information in the mode-line in various search modes.")
(file-name (git-file-name name version))
(sha256
(base32
- "0m1pcabz5mxxxsk0ixw8388q9fkbydkj64mnzn371a9jxdl16b0v"))))
+ "1b5dg04pd5s5pq71yc3isl312y1fw88pjvnk8bgjc1f06xhjlrj4"))))
(build-system emacs-build-system)
+ (propagated-inputs (list emacs-peg))
(home-page "https://github.com/emarsden/pg-el")
(synopsis "Emacs Lisp interface for PostgreSQL")
(description
@@ -23126,76 +23699,74 @@ object has been freed.")
(license license:unlicense)))
(define-public emacs-emacsql
- (let ((commit "29194a63ede3ee24c7457c2fde03b0f1320ca4b1")
- (revision "1"))
- (package
- (name "emacs-emacsql")
- (version (git-version "3.1.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/magit/emacsql")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "14yj53xxqi3009bdj39k2fqwyc896yp2m7gdkgyv47wlkh1xwzxh"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:tests? #true
- #:test-command #~(list "emacs" "-Q" "--batch"
- "-L" "tests"
- "-L" "."
- "-l" "tests/emacsql-tests.el"
- "-f" "ert-run-tests-batch-and-exit")
- #:modules '((guix build emacs-build-system)
- (guix build utils)
- (guix build emacs-utils)
- (srfi srfi-26))
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'install 'patch-elisp-shell-shebangs
- (lambda _
- (substitute* (find-files "." "\\.el")
- (("/bin/sh") (which "sh")))))
- (add-after 'patch-elisp-shell-shebangs 'setenv-shell
- (lambda _
- (setenv "SHELL" "sh")))
- (add-after 'setenv-shell 'build-emacsql-sqlite
- (lambda _
- (invoke "make" "binary" (string-append "CC=" #$(cc-for-target)))))
- (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite
- ;; This build phase installs emacs-emacsql binary.
- (lambda _
- (install-file "sqlite/emacsql-sqlite"
- (string-append #$output "/bin"))))
- (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el
- ;; This build phase removes interactive prompts
- ;; and makes sure Emacs look for binaries in the right places.
- (lambda _
- (emacs-substitute-variables "emacsql-sqlite.el"
- ("emacsql-sqlite-executable"
- (string-append #$output "/bin/emacsql-sqlite"))
- ;; Make sure Emacs looks for ‘GCC’ binary in the right place.
- ("emacsql-sqlite-c-compilers"
- `(list ,(which "gcc")))))))))
- (inputs
- (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql))
- (propagated-inputs
- (list emacs-finalize emacs-pg emacs-sqlite3-api))
- (home-page "https://github.com/magit/emacsql")
- (synopsis "Emacs high-level SQL database front-end")
- (description "Any readable Lisp value can be stored as a value in EmacSQL,
+ (package
+ (name "emacs-emacsql")
+ (version "4.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/magit/emacsql")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:tests? #true
+ #:test-command #~(list "emacs" "-Q" "--batch"
+ "-L" "tests"
+ "-L" "."
+ "-l" "tests/emacsql-tests.el"
+ "-f" "ert-run-tests-batch-and-exit")
+ #:modules '((guix build emacs-build-system)
+ (guix build utils)
+ (guix build emacs-utils)
+ (srfi srfi-26))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'patch-elisp-shell-shebangs
+ (lambda _
+ (substitute* (find-files "." "\\.el")
+ (("/bin/sh") (which "sh")))))
+ (add-after 'patch-elisp-shell-shebangs 'setenv-shell
+ (lambda _
+ (setenv "SHELL" "sh")))
+ (add-after 'setenv-shell 'build-emacsql-sqlite
+ (lambda _
+ (invoke "make" "binary" (string-append "CC=" #$(cc-for-target)))))
+ (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite
+ ;; This build phase installs emacs-emacsql binary.
+ (lambda _
+ (install-file "sqlite/emacsql-sqlite"
+ (string-append #$output "/bin"))))
+ (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el
+ ;; This build phase removes interactive prompts
+ ;; and makes sure Emacs look for binaries in the right places.
+ (lambda _
+ (emacs-substitute-variables "emacsql-sqlite.el"
+ ("emacsql-sqlite-executable"
+ (string-append #$output "/bin/emacsql-sqlite"))
+ ;; Make sure Emacs looks for ‘GCC’ binary in the right place.
+ ("emacsql-sqlite-c-compilers"
+ `(list ,(which "gcc")))))))))
+ (inputs
+ (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql))
+ (propagated-inputs
+ (list emacs-finalize emacs-pg emacs-sqlite3-api))
+ (home-page "https://github.com/magit/emacsql")
+ (synopsis "Emacs high-level SQL database front-end")
+ (description "Any readable Lisp value can be stored as a value in EmacSQL,
including numbers, strings, symbols, lists, vectors, and closures. EmacSQL
has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp
object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-closql
(package
(name "emacs-closql")
- (version "1.2.1")
+ (version "2.0.0")
(source
(origin
(method git-fetch)
@@ -23205,10 +23776,10 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
(file-name (git-file-name name version))
(sha256
(base32
- "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx"))))
+ "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw"))))
(build-system emacs-build-system)
(propagated-inputs
- (list emacs-emacsql))
+ (list emacs-compat emacs-emacsql))
(home-page "https://github.com/emacscollective/closql")
(synopsis "Store EIEIO objects using EmacSQL")
(description
@@ -23242,7 +23813,7 @@ match your personal coding style.")
(define-public emacs-epkg
(package
(name "emacs-epkg")
- (version "3.3.3")
+ (version "4.0.0")
(source
(origin
(method git-fetch)
@@ -23251,7 +23822,7 @@ match your personal coding style.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7"))))
+ (base32 "0w06bpwbwsl3diypywfzrwp6l0kr3h34xja34xssym2bmdl11z8p"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@@ -23277,7 +23848,7 @@ match your personal coding style.")
(native-inputs
(list texinfo))
(propagated-inputs
- (list emacs-closql emacs-dash))
+ (list emacs-closql emacs-dash emacs-llama))
(home-page "https://emacsmirror.net")
(synopsis "Browse the Emacsmirror package database")
(description "This package provides access to a local copy of the
@@ -23498,6 +24069,35 @@ as well as functions for navigating between these headings.")
for defining recurring tasks and easily scheduling them.")
(license license:gpl3+)))
+(define-public emacs-org-timeblock
+ (let ((revision "0")
+ (commit "b423b01712b9c25dff3e4203c7cde736225f62ef"))
+ (package
+ (name "emacs-org-timeblock")
+ (version (git-version "0.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/ichernyshovvv/org-timeblock")
+ (commit commit)))
+ (sha256
+ (base32 "1q0271nli4yw01rwybkzdlqcj8ivqwh5r70yv9x0qqwxa955c9k9"))
+ (file-name (git-file-name name version))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-compat))
+ (home-page "https://github.com/ichernyshovvv/org-timeblock")
+ (synopsis
+ "Schedule your day visually, using timeblocking technique inside Emacs")
+ (description "The builtin orgmode package for viewing tasks or events
+for a particular day, org-agenda, does not help you to quickly understand,
+where, for example, you have free time in your day or where you have
+overlapping tasks. Just a list of tasks is not sufficient. This package is
+created to fix this problem and provide some of the functionality that modern
+calendars provide.")
+ (license license:gpl3+))))
+
(define-public emacs-org-super-agenda
(package
(name "emacs-org-super-agenda")
@@ -23526,7 +24126,21 @@ for defining recurring tasks and easily scheduling them.")
(string-append (getcwd) "/test/results.el")))
;; The following tests fail.
(substitute* "test/test.el"
+ ;; TODO: Broken on emacs-org-super-agenda@1.3 and
+ ;; emacs-org@9.7.4. Verify when updating.
+ ((".* org-super-agenda-test--auto-parent .*" all)
+ (string-append all " (skip-unless nil)\n"))
+ ;; Some tests are using an obsolete variable; fix its use.
+ (("\\(org-super-agenda-retain-sorting ")
+ "(org-super-agenda-keep-order ")
+ ;; however, they still fail ...
+ ;; TODO: Broken on emacs-org-super-agenda@1.3 since before
+ ;; emacs-org@9.7.4. Verify when updating.
((".* org-super-agenda-test--with-retained-sorting .*" all)
+ (string-append all " (skip-unless nil)\n"))
+ ;; TODO: Broken on emacs-org-super-agenda@1.3 and
+ ;; emacs-org@9.7.4. Verify when updating.
+ ((".* org-super-agenda-test--without-retained-sorting .*" all)
(string-append all " (skip-unless nil)\n"))))))))
(native-inputs
(list emacs-f util-linux))
@@ -23652,7 +24266,7 @@ timestamps by providing a @code{ts} struct.")
(define-public emacs-circadian
(package
(name "emacs-circadian")
- (version "0.3.3")
+ (version "1.0.0")
(source
(origin
(method git-fetch)
@@ -23661,7 +24275,7 @@ timestamps by providing a @code{ts} struct.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km"))))
+ (base32 "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p"))))
(build-system emacs-build-system)
(arguments
(list
@@ -23711,7 +24325,7 @@ according to a parsing expression grammar.")
(define-public emacs-eldev
(package
(name "emacs-eldev")
- (version "1.9.1")
+ (version "1.10.1")
(source
(origin
(method git-fetch)
@@ -23720,7 +24334,7 @@ according to a parsing expression grammar.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1v0jwzwq0xpih8m4aymz90fdfvypkiqczh0ip5jg4kcvzikliw3f"))))
+ (base32 "1qir0wagqb8yhmkb12zzadl146w952p3q92bpffd0hq0y6gcp2n5"))))
(build-system emacs-build-system)
(arguments
(list
@@ -23800,7 +24414,7 @@ interactive commands and functions, such as @code{completing-read}.")
(define-public emacs-org-ql
(package
(name "emacs-org-ql")
- (version "0.8.6")
+ (version "0.8.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -23808,21 +24422,24 @@ interactive commands and functions, such as @code{completing-read}.")
(commit (string-append "v" version))))
(sha256
(base32
- "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"))
+ "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #f ;FIXME: check phase freezes
- #:test-command #~(list "buttercup" "-L" ".")))
+ #:test-command #~(list "buttercup" "-L" ".")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-helm-org-ql
+ (lambda _
+ (delete-file "helm-org-ql.el"))))))
(native-inputs
(list emacs-buttercup emacs-with-simulated-input emacs-xr))
(propagated-inputs
(list emacs-compat
emacs-dash
emacs-f
- emacs-helm
- emacs-helm-org
emacs-org
emacs-org-super-agenda
emacs-ov
@@ -23835,6 +24452,34 @@ interactive commands and functions, such as @code{completing-read}.")
files, allowing for actions to be performed based on search criteria.")
(license license:gpl3+)))
+(define-public emacs-helm-org-ql
+ (package
+ (inherit emacs-org-ql)
+ (name "emacs-helm-org-ql")
+ (arguments
+ (list
+ #:tests? #f ;no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-emacs-org-ql
+ (lambda _
+ (install-file "helm-org-ql.el" "..")
+ (let ((cwd (getcwd)))
+ (with-directory-excursion ".."
+ (delete-file-recursively cwd)
+ (mkdir cwd)
+ (install-file "helm-org-ql.el" cwd))))))))
+ (propagated-inputs
+ (list emacs-dash
+ emacs-helm
+ emacs-helm-org
+ emacs-org-ql
+ emacs-s))
+ (synopsis "Helm commands for @code{emacs-org-ql}")
+ (description "This package provides @code{emacs-helm} commands for
+@{emacs-org-ql}, a Lispy query language for Org files, allowing for actions to
+be performed based on search criteria.")))
+
(define-public emacs-bing-dict
(package
(name "emacs-bing-dict")
@@ -23926,7 +24571,7 @@ files to be expanded upon opening them.")
(define-public emacs-ebib
(package
(name "emacs-ebib")
- (version "2.41.1")
+ (version "2.42.2")
(source
(origin
(method git-fetch)
@@ -23935,7 +24580,7 @@ files to be expanded upon opening them.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d"))))
+ (base32 "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-biblio emacs-compat emacs-ivy emacs-parsebib))
@@ -24061,7 +24706,7 @@ Citar note support:
(define-public emacs-citar-denote
(package
(name "emacs-citar-denote")
- (version "2.0")
+ (version "2.2.1")
(source
(origin
(method git-fetch)
@@ -24070,7 +24715,7 @@ Citar note support:
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0g476awbrdws7k7smk1qasz15df20zilx3wqbi3wj0i1q2dbsi8z"))))
+ (base32 "0rsi2j4gfznpyvf3z1p1xxl0zxfbddha4ig4d30svwnq2maxri7r"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-citar emacs-denote))
(home-page "https://github.com/pprevos/citar-denote")
@@ -24403,6 +25048,31 @@ orient yourself in the code, and tell which statements are at a given level.")
"This package allows controlling Pulseaudio from Emacs.")
(license license:gpl3+))))
+(define-public emacs-smudge
+ (let ((commit "4a9c5b34e9bc0a694d0faf8c2f83dc244b8b6a2f")
+ (revision "1"))
+ (package
+ (name "emacs-smudge")
+ (version (git-version "1.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/danielfm/smudge")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xiqxw87sdk9mgy7fdbmzqaf58dc1grhkigirg1bd0b2q5kbnbwx"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-oauth2 emacs-request emacs-simple-httpd))
+ (home-page "https://github.com/danielfm/smudge")
+ (synopsis "Control the Spotify application from within Emacs")
+ (description
+ "Smudge allows you to control the Spotify application from Emacs,
+either via D-BUS or Spotify Connect if you have a Spotify premium
+subscription.")
+ (license license:gpl3+))))
+
(define-public emacs-pulsar
(package
(name "emacs-pulsar")
@@ -25461,7 +26131,7 @@ powerful Org contents.")
(define-public emacs-org-re-reveal
(package
(name "emacs-org-re-reveal")
- (version "3.28.2")
+ (version "3.32.0")
(source
(origin
(method git-fetch)
@@ -25470,7 +26140,7 @@ powerful Org contents.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b"))))
+ (base32 "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-htmlize emacs-org))
@@ -25573,7 +26243,7 @@ regions which @code{hideshow} can hide.")
(define-public emacs-know-your-http-well
(package
(name "emacs-know-your-http-well")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
@@ -25582,7 +26252,7 @@ regions which @code{hideshow} can hide.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k"))))
+ (base32 "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -25936,8 +26606,8 @@ browse the phrases by the paper section and fill-in the blanks if required.")
(license license:gpl3+))))
(define-public emacs-auto-yasnippet
- (let ((commit "624b0d9711222073a2a3f2186e2605eb99fc83c9")
- (revision "2"))
+ (let ((commit "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e")
+ (revision "3"))
(package
(name "emacs-auto-yasnippet")
(version (git-version "0.3.0" revision commit))
@@ -25949,7 +26619,7 @@ browse the phrases by the paper section and fill-in the blanks if required.")
(file-name (git-file-name name version))
(sha256
(base32
- "15g8wi067f345xhpi0c12w0h04p4f4lpccwmdjdfj8hzfl4gyxy9"))))
+ "0ifzbwnm2axb8kmfp3jvg05wq02j121iwp2m64pi70c7mza0i886"))))
(build-system emacs-build-system)
(arguments
'(#:tests? #t
@@ -26181,6 +26851,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"))
@@ -26542,6 +27233,26 @@ Emacs minor mode to escape sequences in code.")
sections for bookmarks, Projectile projects, Org Agenda and more.")
(license license:gpl3+)))
+(define-public emacs-enlight
+ (package
+ (name "emacs-enlight")
+ (version "0.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ichernyshovvv/enlight")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-compat))
+ (home-page "https://github.com/ichernyshovvv/enlight")
+ (synopsis "Highly customizable startup screen for Emacs")
+ (description "Lightweight yet very flexible startup screen for Emacs.")
+ (license license:gpl3+)))
+
(define-public emacs-slime-company
(package
(name "emacs-slime-company")
@@ -26827,6 +27538,54 @@ Dumb Jump performs best with The Silver Searcher @command{ag} or ripgrep
device tree files.")
(license license:gpl3+)))
+(define-public emacs-devicetree-ts-mode
+ (package
+ (name "emacs-devicetree-ts-mode")
+ (version "0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~akagi/devicetree-ts-mode")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1aif25hqs9i1aax331s4p8b59kxrq584ynfnh640p43jzmqf5p3d"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ (list tree-sitter-devicetree))
+ (home-page "https://sr.ht/~akagi/devicetree-ts-mode")
+ (synopsis "Tree-sitter major mode for editing DTS files")
+ (description "This package provides tree-sitter major mode
+for editing Devicetree files.")
+ (license license:gpl3+)))
+
+(define-public emacs-devil
+ (package
+ (name "emacs-devil")
+ (version "0.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/susam/devil")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pr9yf6f37sz5qy1snn8ag5bvg6lza7q635jh8jhaqqfp37jvv1y"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list #:tests? #true
+ #:test-command #~(list "make" "tests")))
+ (home-page "https://github.com/susam/devil")
+ (synopsis "Minor mode for translating key sequences")
+ (description
+ "Devil intercepts your devil key (comma by default) to let you type key
+sequences without using modifier keys. Devil is highly configurable and it
+can be configured to perform other key sequence translations.")
+ (license license:expat)))
+
(define-public emacs-daemons
(package
(name "emacs-daemons")
@@ -28004,7 +28763,7 @@ accept and reject GitHub pull requests.")
(define-public emacs-deadgrep
(package
(name "emacs-deadgrep")
- (version "0.12")
+ (version "0.13")
(source
(origin
(method git-fetch)
@@ -28014,7 +28773,7 @@ accept and reject GitHub pull requests.")
(file-name (git-file-name name version))
(sha256
(base32
- "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79"))))
+ "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr"))))
(build-system emacs-build-system)
(arguments
(list
@@ -28138,7 +28897,7 @@ and @code{C++} files through the @code{ccls} language server.")
(define-public emacs-cpreproc
(package
(name "emacs-cpreproc")
- (version "1.0.0")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
@@ -28147,7 +28906,7 @@ and @code{C++} files through the @code{ccls} language server.")
(commit version)))
(sha256
(base32
- "0n4lhj9bbnkbzvifrj9q6z3j7z6jqzkaa36y239cfxdcc7i86c1c"))
+ "0y4zialcw46md14az08x75vnl4kg08shnhd8q4lxiqxnpl12da8c"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(home-page "https://sr.ht/~plattfot/cpreproc")
@@ -28579,16 +29338,16 @@ buffer displays recursive dir sizes.")
(define-public emacs-dired-preview
(package
(name "emacs-dired-preview")
- (version "0.1.0")
+ (version "0.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~protesilaos/dired-preview")
+ (url "https://github.com/protesilaos/dired-preview")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "0d485812k1rv0qrw4xvzv4z3qf370apsajnf4q3pjk3q0r1fpm8b"))))
+ "0sq3dvix7lx9am0alliq4l5zaz20nld7fr2rnsyxrjqqlahf9a91"))))
(build-system emacs-build-system)
(home-page "https://protesilaos.com/emacs/dired-preview")
(synopsis "Automatically preview file at point in Dired")
@@ -28923,10 +29682,10 @@ and comments.")
(license license:gpl3+))))
(define-public emacs-yeetube
- (let ((commit "c74e4e77156297624d278a05bdd19c016a91ff9b")) ;version bump
+ (let ((commit "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640")) ;version bump
(package
(name "emacs-yeetube")
- (version "2.1.4")
+ (version "2.1.7")
(source
(origin
(method git-fetch)
@@ -28935,7 +29694,7 @@ and comments.")
(commit commit)))
(sha256
(base32
- "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9"))
+ "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@@ -28951,22 +29710,18 @@ and comments.")
(("\\(executable-find \"torsocks\"\\)")
(format #f "~s"
(search-input-file inputs "/bin/torsocks")))
- (("\\(executable-find \"wget\"\\)")
- (format #f "~s"
- (search-input-file inputs "/bin/wget")))
(("\\(executable-find \"yt-dlp\"\\)")
(format #f "~s"
(search-input-file inputs "/bin/yt-dlp")))))))))
- (inputs (list mpv torsocks wget yt-dlp))
+ (inputs (list mpv torsocks yt-dlp))
(propagated-inputs (list emacs-compat))
- (home-page "https://thanosapollo.com/blog/yeetube/")
- (synopsis "Youtube and Invidious front-end for Emacs")
+ (home-page "https://thanosapollo.org/projects/yeetube/")
+ (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
@@ -29080,7 +29835,7 @@ backends, including the @command{wordnet} offline backend.")
(define-public emacs-editorconfig
(package
(name "emacs-editorconfig")
- (version "0.10.1")
+ (version "0.11.0")
(source
(origin
(method git-fetch)
@@ -29090,7 +29845,7 @@ backends, including the @command{wordnet} offline backend.")
(file-name (git-file-name name version))
(sha256
(base32
- "1hwqhfm32sg4y0l0yn7378vjb6icgd92lkazy2z6dmnks5sbz0a3"))))
+ "0bqwmh4lcnbn5gcn38qg4jjfs9bfkbr4dj4dafglgds6a5lhznws"))))
(build-system emacs-build-system)
(home-page "https://github.com/editorconfig/editorconfig-emacs")
(synopsis "Define and maintain consistent coding styles between different
@@ -29975,7 +30730,8 @@ asynchronous communications, the RPC response is fairly good.")
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(inputs
- (list perl
+ (list bash-minimal
+ perl
perl-rpc-epc-service
perl-dbi
;; TODO: Adding support for perl-dbd-mysql and others would
@@ -29991,17 +30747,15 @@ asynchronous communications, the RPC response is fairly good.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((perl (assoc-ref inputs "perl")))
(substitute* "edbi.el"
- (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))
- #t)))
- (add-after 'wrap 'wrap-edbi-bridge
+ (("\"perl\"") (string-append "\"" perl "/bin/perl\""))))))
+ (add-after 'install 'wrap-edbi-bridge
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bridge (string-append (elpa-directory out)
"/edbi-bridge.pl")))
(chmod bridge #o555)
(wrap-program bridge
- `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
- #t)))))
+ `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
(synopsis "Database Interface for Emacs Lisp")
(description "This program connects the database server through Perl's
DBI, and provides DB-accessing API and the simple management UI.")
@@ -30081,35 +30835,38 @@ comments.")
(license license:lgpl2.1+)))
(define-public emacs-nyxt
- (package
- (name "emacs-nyxt")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~conses/nyxt.el")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hgb10pk5m3v2gsl4h6i821nyzksss0rk4hhjnfb7nm98lalzbl6"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-file-name
- (lambda* (#:key inputs #:allow-other-keys)
- (emacs-substitute-variables "nyxt.el"
- ("nyxt-path"
- (search-input-file inputs "/bin/nyxt"))))))))
- (inputs (list nyxt))
- (propagated-inputs (list emacs-sly))
- (home-page "https://git.sr.ht/~conses/nyxt.el")
- (synopsis "Interact with Nyxt from Emacs")
- (description "This package consists of custom logic to interact with Nyxt
+ ;; This forge doesn't support fetching from refs, use commits.
+ (let ((commit "5f732e3d039c9d9c316dd5fbbbc91bd015dd2659")
+ (revision "0"))
+ (package
+ (name "emacs-nyxt")
+ (version (git-version "0.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.migalmoreno.com/nyxt.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "147yin822mi49gg2gxqljnx3i261z6b8d61m83l4nns4cf67vqns"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-file-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ (emacs-substitute-variables "nyxt.el"
+ ("nyxt-path"
+ (search-input-file inputs "/bin/nyxt"))))))))
+ (inputs (list nyxt))
+ (propagated-inputs (list emacs-sly))
+ (home-page "https://git.migalmoreno.com/nyxt.el")
+ (synopsis "Interact with Nyxt from Emacs")
+ (description "This package consists of custom logic to interact with Nyxt
from Emacs.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-libmpdel
(package
@@ -30498,7 +31255,7 @@ interface to attach and interact with the processes.")
(define-public emacs-dtrt-indent
(package
(name "emacs-dtrt-indent")
- (version "1.17")
+ (version "1.18")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -30507,7 +31264,7 @@ interface to attach and interact with the processes.")
(file-name (git-file-name name version))
(sha256
(base32
- "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la"))))
+ "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"))))
(build-system emacs-build-system)
(home-page "https://github.com/jscheid/dtrt-indent")
(synopsis "Minor mode that guesses the indentation offset")
@@ -30517,6 +31274,30 @@ transparently adjusts the corresponding settings in Emacs, making it more
convenient to edit foreign files.")
(license license:gpl2+)))
+(define-public emacs-outline-indent
+ (package
+ (name "emacs-outline-indent")
+ (version "1.0.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jamescherti/outline-indent.el.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1n6k3cjacb9pqhykbxl75jli6770cb0cfc2gmjx8xkhj4yrhb5nn"))))
+ (build-system emacs-build-system)
+ (synopsis "Outline and code folding for indentation-based texts in Emacs")
+ (description "This package provides a minor mode that enables code folding
+based on indentation levels for various indentation-based text files, such as
+YAML, Python, and any other indented text files. In addition to code folding,
+outline-indent allows moving indented subtrees up and down, promoting and
+demoting sections to adjust indentation levels, customizing the ellipsis, and
+inserting a new line with the same indentation level as the current line.")
+ (home-page "https://github.com/jamescherti/outline-indent.el")
+ (license license:gpl3+)))
+
(define-public emacs-repo
(package
(name "emacs-repo")
@@ -30666,7 +31447,7 @@ recursively. The results are cached for speed.")
(define-public emacs-orgit
(package
(name "emacs-orgit")
- (version "1.9.0")
+ (version "2.0.0")
(home-page "https://github.com/magit/orgit")
(source (origin
(method git-fetch)
@@ -30676,7 +31457,7 @@ recursively. The results are cached for speed.")
(file-name (git-file-name name version))
(sha256
(base32
- "00fkj88yddan80q8zbx0jy66d958srkm06jiy1nraamxqr15mmyz"))))
+ "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-dash emacs-magit))
@@ -30796,7 +31577,6 @@ constant expressions.")
(propagated-inputs
(list emacs-aio
emacs-dash
- emacs-docker-tramp
emacs-json-mode
emacs-s
emacs-tablist))
@@ -30857,6 +31637,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.
@@ -30988,6 +31776,56 @@ and implementation of treeview controls using treemacs as a tree renderer.")
in Docker environment.")
(license license:gpl3+))))
+(define-public emacs-dape
+ (package
+ (name "emacs-dape")
+ (version "0.15.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 "04k1bppkb5sd06cy1vz8yd9jmbd9mnqb54gglxwrbk9x6gxbbcfk"))))
+ (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+)))
+
(define-public emacs-dap-mode
(package
(name "emacs-dap-mode")
@@ -31019,10 +31857,35 @@ debug server. It is similar to the LSP but provides integration with
Debug server.")
(license license:gpl3+)))
+(define-public emacs-fortran-tags
+ (package
+ (name "emacs-fortran-tags")
+ (version "1.5.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/raullaasner/fortran-tags.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1f22p0nsdayxqdh03s41qs833gamdhv4q7a4csm6vgwp4ivn3z1g"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:include #~(cons "^fortran-tags.py" %default-include)))
+ (inputs
+ (list python))
+ (synopsis "Emacs plugin for source code indexing of modern Fortran")
+ (description "This package provides an Emacs plugin for source code
+indexing of modern Fortran.")
+ (home-page "https://github.com/raullaasner/fortran-tags")
+ (license license:gpl3+)))
+
(define-public emacs-bfuture
(package
(name "emacs-bfuture")
- (version "1.0.2")
+ (version "1.0.3")
(source
(origin
(method git-fetch)
@@ -31031,7 +31894,7 @@ Debug server.")
(commit (string-append "v" version))))
(sha256
(base32
- "1qflkyr7fafw84mksxs25mka133y8ak8nsga3al29014pshbvzxn"))
+ "0604xgwrcvqsmk1vky8wdivsl43p6jgs5zchqssdmf22f5chxbzr"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@@ -31390,7 +32253,7 @@ real search.")
(define-public emacs-notmuch-indicator
(package
(name "emacs-notmuch-indicator")
- (version "1.1.0")
+ (version "1.2.0")
(home-page "https://git.sr.ht/~protesilaos/notmuch-indicator")
(source (origin
(method url-fetch)
@@ -31399,7 +32262,7 @@ real search.")
".tar"))
(sha256
(base32
- "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573"))))
+ "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz"))))
(build-system emacs-build-system)
(synopsis "Display a mode line indicator with @code{notmuch-count} output")
(description "This package renders an indicator with an email count of the
@@ -31411,7 +32274,7 @@ given search terms.")
(define-public emacs-notmuch-maildir
(package
(name "emacs-notmuch-maildir")
- (version "0.2.2")
+ (version "0.2.3")
(source
(origin
(method git-fetch)
@@ -31420,7 +32283,7 @@ given search terms.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5"))))
+ (base32 "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat emacs-notmuch))
@@ -31457,7 +32320,7 @@ as Emacs Lisp.")
(define-public emacs-transient
(package
(name "emacs-transient")
- (version "0.6.0")
+ (version "0.7.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -31466,7 +32329,7 @@ as Emacs Lisp.")
(file-name (git-file-name name version))
(sha256
(base32
- "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai"))))
+ "0ad0qkcvc9w6ry8f4b6xrdy52vlxm8nrp67k2p97w6prhyfxbp7p"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f ;no test suite
@@ -31496,7 +32359,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
(define-public emacs-forge
(package
(name "emacs-forge")
- (version "0.3.2")
+ (version "0.4.1")
(source
(origin
(method git-fetch)
@@ -31505,7 +32368,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0p1jlq169hpalhzmjm3h4q3x5xr9kdmz0qig8jwfvisyqay5vbih"))))
+ (base32 "1kn3n1a6gdsd0l2v831sh43cly4p8s1snn494gdd23cw4jkk3qsv"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f ;no tests
@@ -32693,10 +33556,149 @@ 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.11.2")
+ (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 "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa"))))
+ (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.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kickingvegas/casual-dired")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c"))))
+ (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-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.1")
+ (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 "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz"))))
+ (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.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kickingvegas/casual-lib")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list #:tests? #t
+ #:test-command #~(list "make" "tests")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'move-source-files
+ (lambda _
+ (let ((el-files (find-files "./lisp" ".*\\.el$")))
+ (for-each (lambda (f) (copy-file f (basename f)))
+ el-files)))))))
+ (native-inputs (list python-minimal))
+ (home-page "https://github.com/kickingvegas/casual-lib")
+ (synopsis "Library package for the Emacs Casual porcelains")
+ (description
+ "Casual Lib is a library package used to support the Casual porcelains.")
+ (license license:gpl3+)))
+
(define-public emacs-calibredb
(package
(name "emacs-calibredb")
- (version "2.12.0")
+ (version "2.13.0")
(source
(origin
(method git-fetch)
@@ -32705,7 +33707,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
@@ -32992,14 +33994,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.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar"))
(sha256
- (base32 "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb"))))
+ (base32 "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8"))))
(build-system emacs-build-system)
(arguments
(list
@@ -34029,7 +35031,7 @@ time.")
(define-public emacs-mastodon
(package
(name "emacs-mastodon")
- (version "1.0.19")
+ (version "1.0.25")
(source
(origin
(method git-fetch)
@@ -34038,7 +35040,7 @@ time.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "096zsjlqx2cv4zq607f9n7mr60d5avhfczf3nxsa8wkjsj97qrlh"))))
+ (base32 "02ykj4hyddd5p0idl8gvgl9q770vni69xsza99y3rpyilc2a8r66"))))
(build-system emacs-build-system)
(arguments
(list
@@ -34208,7 +35210,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)
@@ -34218,7 +35220,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
@@ -34299,12 +35301,18 @@ count matches, etc.")
(base32
"0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq"))))
(build-system emacs-build-system)
- (arguments '(#:include '("\\.el$" "\\.txt$")))
+ (arguments
+ (list #:include #~(cons* "\\.txt$" %default-include)
+ #:tests? #true
+ #:test-command #~(list "emacs" "-Q" "--batch"
+ "-L" "."
+ "-l" "test/systemd-tests.el"
+ "-f" "ert-run-tests-batch-and-exit")))
(home-page "https://github.com/holomorph/systemd-mode")
- (synopsis
- "Major mode for editing systemd units")
+ (synopsis "Major mode for editing Systemd units")
(description
- "Major mode for editing systemd units in GNU Emacs.")
+ "This package provides a major mode for editing Systemd unit files in GNU
+Emacs.")
(license license:gpl3+)))
(define-public emacs-ssh-config-mode
@@ -34363,6 +35371,28 @@ It can also be useful on Unix-like platforms to delay having to enter your
passphrase until the first time you push to a remote.")
(license license:gpl3+)))
+(define-public emacs-ssh-deploy
+ (package
+ (name "emacs-ssh-deploy")
+ (version "3.1.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://elpa.gnu.org/packages/ssh-deploy-" version
+ ".tar"))
+ (sha256
+ (base32 "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/cjohansson/emacs-ssh-deploy")
+ (synopsis "Deployment via Tramp, global or per directory")
+ (description
+ "SSH Deploy enables automatic deploys on explicit-save actions, manual
+uploads, renaming, deleting, downloads, file and directory differences,
+launching remote terminals (Eshell, Shell), detection of remote changes,
+remote directory browsing, remote SQL database sessions and running custom
+deployment scripts via Tramp.")
+ (license license:gpl3+)))
+
(define-public emacs-super-save
(package
(name "emacs-super-save")
@@ -34464,43 +35494,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
@@ -34785,6 +35817,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")
@@ -34992,11 +36046,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(license license:gpl3+)))
(define-public emacs-telega-server
- (let ((commit "d1cf1ffe289a18f366b7f3b64f827f0d0755947a")
+ (let ((commit "879a8c7afc8967942613b6b898d9ea8c1f3641bf")
(revision "0"))
(package
(name "emacs-telega-server")
- (version (git-version "0.8.250" revision commit))
+ (version (git-version "0.8.2" revision commit))
(source
(origin
(method git-fetch)
@@ -35004,11 +36058,8 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(url "https://github.com/zevlg/telega.el")
(commit commit)))
(sha256
- (base32 "0s1w4zb252d70n05dbsv2rnlfsg53paklafqxasl566nnzbi0d2q"))
- (file-name (git-file-name "emacs-telega" version))
- (patches
- (search-patches "emacs-telega-path-placeholder.patch"
- "emacs-telega-test-env.patch"))))
+ (base32 "1ic14hzzgjxpky1r3mz4v72si9hw8cw72420a9lnpdaiw99l8q7h"))
+ (file-name (git-file-name "emacs-telega" version))))
(build-system gnu-build-system)
(arguments
(list
@@ -35042,54 +36093,74 @@ service, and connect it with Emacs via inter-process communication.")
(license license:gpl3+))))
(define-public emacs-telega
- (package
- (inherit emacs-telega-server)
- (name "emacs-telega")
- (build-system emacs-build-system)
- (arguments
- (list
- #:emacs (if (target-64bit?)
- emacs-minimal
- ;; Require wide-int support for 32-bit platform.
- emacs-wide-int)
- #:include #~(cons "^etc\\/" %default-include)
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-sources
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Hard-code paths to `ffplay` and `ffmpeg`.
- (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay"))
- (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg")))
- (substitute* '("telega-ffplay.el" "telega-vvnote.el")
- (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
- all func cmd)
- (string-append func " \""
- (search-input-file
- inputs (string-append "/bin/" cmd))))
- (("\\(executable-find \"ffplay\"\\)")
- (string-append "(and (file-executable-p \"" ffplay-bin "\")"
- "\"" ffplay-bin "\")"))
- (("\\(executable-find \"ffmpeg\"\\)")
- (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
- "\"" ffmpeg-bin "\")"))))))
- (add-after 'unpack 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "telega-customize.el"
- (("@TELEGA_SERVER_BIN@")
- (search-input-file inputs "/bin/telega-server")))
- (substitute* "telega-core.el"
- (("@TELEGA_SHARE@")
- (string-append (elpa-directory (assoc-ref outputs "out"))
- "/etc"))))))))
- (inputs
- (list emacs-telega-server ffmpeg))
- (native-inputs '())
- (propagated-inputs
- (list emacs-visual-fill-column emacs-company
- emacs-rainbow-identifiers))
- (synopsis "GNU Emacs client for the Telegram messenger")
- (description "Telega is a full-featured, unofficial GNU Emacs-based client
-for the Telegram messaging platform.")))
+ (let ((commit "58b4963b292ceb723d665df100b519eb5a99c676")
+ (revision "0"))
+ (package
+ (name "emacs-telega")
+ (version (git-version "0.8.291" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zevlg/telega.el")
+ (commit commit)))
+ (sha256
+ (base32 "1q3ydbm0jhrsyvvdn0mpmxvskq0l53jkh40a5hlx7i3qkinbhbry"))
+ (file-name (git-file-name "emacs-telega" version))
+ (patches
+ (search-patches "emacs-telega-path-placeholder.patch"
+ "emacs-telega-test-env.patch"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:emacs (if (target-64bit?)
+ emacs-minimal
+ ;; Require wide-int support for 32-bit platform.
+ emacs-wide-int)
+ #:include #~(cons "^etc\\/" %default-include)
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-sources
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hard-code paths to `ffplay` and `ffmpeg`.
+ (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay"))
+ (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))
+ (tgs2png-bin (search-input-file inputs "/bin/tgs2png")))
+ (substitute* '("telega.el" "telega-sticker.el" "telega-customize.el")
+ (("\\(executable-find \"tgs2png\"\\)")
+ (string-append "\"" tgs2png-bin "\"")))
+ (substitute* '("telega-ffplay.el" "telega-vvnote.el")
+ (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
+ all func cmd)
+ (string-append func " \""
+ (search-input-file
+ inputs (string-append "/bin/" cmd))))
+ (("\\(executable-find \"ffplay\"\\)")
+ (string-append "(and (file-executable-p \"" ffplay-bin "\")"
+ "\"" ffplay-bin "\")"))
+ (("\\(executable-find \"ffmpeg\"\\)")
+ (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
+ "\"" ffmpeg-bin "\")"))))))
+ (add-after 'unpack 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "telega-customize.el"
+ (("@TELEGA_SERVER_BIN@")
+ (search-input-file inputs "/bin/telega-server")))
+ (substitute* "telega-core.el"
+ (("@TELEGA_SHARE@")
+ (string-append (elpa-directory (assoc-ref outputs "out"))
+ "/etc"))))))))
+ (inputs
+ (list emacs-telega-server ffmpeg tgs2png))
+ (native-inputs '())
+ (propagated-inputs
+ (list emacs-visual-fill-column emacs-company
+ emacs-rainbow-identifiers))
+ (home-page "https://zevlg.github.io/telega.el/")
+ (synopsis "GNU Emacs client for the Telegram messenger")
+ (description "Telega is a full-featured, unofficial GNU Emacs-based client
+for the Telegram messaging platform.")
+ (license license:gpl3+))))
(define-public emacs-telega-contrib
(package
@@ -36020,6 +37091,33 @@ Wordnet.")
@code{xref} results.")
(license license:gpl3+)))
+(define-public emacs-helm-css-scss
+ (let ((commit "2169d83d8fdc661241df208cb3235112735d936e")
+ (revision "0"))
+ (package
+ (name "emacs-helm-css-scss")
+ (version (git-version "1.3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacsorphanage/helm-css-scss")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jjjw7fw2ngrpgvd599vjd291zr8zr1m7xnxfq2dpqc3mf0s397z"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-helm))
+ (home-page "https://github.com/emacsorphanage/helm-css-scss")
+ (synopsis
+ "Helm interface for navigating CSS, SCSS, and LESS selectors in Emacs")
+ (description
+ "This package provides Helm integration for quickly navigating and
+ searching CSS, SCSS, and LESS selectors in Emacs. It enables you to view and
+ jump to selectors across multiple buffers, enhancing your workflow when
+ editing stylesheets.")
+ (license license:gpl3+))))
+
(define-public emacs-metal-mercury-mode
(let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8")
(revision "1")
@@ -36274,7 +37372,7 @@ launching other commands/applications from within Emacs, similar to the
(define-public emacs-no-littering
(package
(name "emacs-no-littering")
- (version "1.5.0")
+ (version "1.7.1")
(source
(origin
(method git-fetch)
@@ -36283,7 +37381,7 @@ launching other commands/applications from within Emacs, similar to the
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr"))))
+ (base32 "1ldsyzdnc79byg07j2fckh6m48iq8ffp19y6chhhi2dci35zard7"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -36436,14 +37534,14 @@ detected language.")
(define-public emacs-persist
(package
(name "emacs-persist")
- (version "0.6")
+ (version "0.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"persist-" version ".tar"))
(sha256
- (base32 "0n68dshbbyrs713989bllmm1vypch8766hc8b4y989nmyclixjwp"))))
+ (base32 "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/persist.html")
(synopsis "Persist variables between Emacs sessions")
@@ -36684,46 +37782,43 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.")
(license license:bsd-3)))
(define-public emacs-ddskk
- ;; XXX: Upstream adds code names to their release tags, so version and code
- ;; name below need to be updated together.
- (let ((version "17.1")
- (code-name "Neppu"))
+ (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+ (revision "0"))
(package
(name "emacs-ddskk")
- (version version)
+ (version (git-version "17.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/skk-dev/ddskk")
- (commit (string-append "ddskk-" version "_" code-name))))
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+ (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
(build-system gnu-build-system)
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (guix build emacs-utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build emacs-utils))
- #:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (make-file-writable "SKK-MK")
- (emacs-substitute-variables "SKK-MK"
- ("PREFIX" (assoc-ref outputs "out"))
- ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
- ("SKK_PREFIX" "")
- ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
- (for-each make-file-writable (find-files "./doc"))
- #t))
- (add-after 'unpack 'fix-test
- (lambda _
- (substitute* "Makefile"
- (("/bin/rm") (which "rm"))))))))
+ (list #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (guix build emacs-utils))
+ #:imported-modules `(,@%default-gnu-imported-modules
+ (guix build emacs-utils))
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (emacs-substitute-variables "SKK-MK"
+ ("PREFIX" #$output)
+ ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
+ ("SKK_PREFIX" "")
+ ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))))
+ (add-after 'unpack 'fix-test
+ (lambda _
+ (substitute* "Makefile"
+ (("/bin/rm") (which "rm")))
+ (substitute* "nicola/Makefile"
+ (("/bin/rm") (which "rm"))))))))
(native-inputs
(list emacs-minimal ruby))
(home-page "https://github.com/skk-dev/ddskk")
@@ -36740,25 +37835,23 @@ conversion program}, a Japanese input method on Emacs.")
(propagated-inputs
(list emacs-ddskk))
(arguments
- `(#:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (append
- (list (string-append "PREFIX=" out)
- (string-append "LISPDIR=" out "/share/emacs/site-lisp"))))
- #:tests? #f ; no tests in this subtree
- ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "nicola")
- #t))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (make-file-writable "NICOLA-DDSKK-CFG")
- (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
- ("setq NICOLA-DDSKK_PREFIX" ""))
- #t)))))))
+ (append
+ (list #:make-flags
+ #~(append
+ (list (string-append "PREFIX=" #$output)
+ (string-append "LISPDIR=" #$output "/share/emacs/site-lisp")))
+ ;; no tests in this subtree
+ #:tests? #f)
+ (substitute-keyword-arguments (package-arguments emacs-ddskk)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'fix-test 'chdir
+ (lambda _
+ (chdir "nicola")))
+ (replace 'configure
+ (lambda _
+ (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
+ ("setq NICOLA-DDSKK_PREFIX" "")))))))))
(synopsis "Nicola layout for Daredevil SKK")
(description
"Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji
@@ -36877,8 +37970,8 @@ go directly to where they belong.")
(license license:gpl3+))))
(define-public emacs-org-roam
- (let ((commit "74422df546a515bc984c2f3d3a681c09d6f43916")
- (revision "0"))
+ (let ((commit "0b9fcbc97b65b349826e63bad89ca121a08fd2be")
+ (revision "1"))
(package
(name "emacs-org-roam")
(version (git-version "2.2.2" revision commit))
@@ -36890,7 +37983,7 @@ go directly to where they belong.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9"))))
+ (base32 "04vqwrsb71jdb66fkahmxwvx8cssgqamrradbdgp3ygf8alwc7ml"))))
(build-system emacs-build-system)
(arguments
(list
@@ -37060,6 +38153,28 @@ ASCII UML sequence diagrams in Emacs, which can be embedded in source code,
comments or emails.")
(license license:gpl3+))))
+(define-public emacs-sv-kalender-namnsdagar
+ (let ((commit "31ef6ac82e448de3db1cf0c37df54581eb9b00f6")) ;versiom bump
+ (package
+ (name "emacs-sv-kalender-namnsdagar")
+ (version "1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/matsl/sv-kalender-namnsdagar")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sv5p2f0i4zhfrh8pv39p5aaa9wnbzxkb58p9qslw7qli1wax2l0"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/matsl/sv-kalender-namnsdagar")
+ (synopsis "Swedish name day calendar")
+ (description
+ "This package provides the current day's name from the Swedish name
+day calendar. It is integrated with the Emacs calendar and diary.")
+ (license license:gpl3+))))
+
(define-public emacs-ukrainian-holidays
;; There is no proper release.
;; The base version is extracted from the source code.
@@ -37559,16 +38674,16 @@ displayed for sharing.")
(define-public emacs-orglink
(package
(name "emacs-orglink")
- (version "1.2.2")
+ (version "1.2.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tarsius/orglink")
- (commit version)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him"))))
+ (base32 "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@@ -38078,14 +39193,14 @@ work on alists, hash-table and arrays. All functions are prefixed with
(define-public emacs-xref
(package
(name "emacs-xref")
- (version "1.6.3")
+ (version "1.7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xref-"
version ".tar"))
(sha256
- (base32 "0ccfp47y769zrb5sza8skzy4nj4793lzd0jn5c83s3g916gp304l"))))
+ (base32 "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/xref.html")
(synopsis "Cross-referencing commands")
@@ -38094,6 +39209,26 @@ work on alists, hash-table and arrays. All functions are prefixed with
commands, in particular @code{find-definition}.")
(license license:gpl3+)))
+(define-public emacs-xref-union
+ (package
+ (name "emacs-xref-union")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://elpa.gnu.org/packages/xref-union-"
+ version ".tar"))
+ (sha256
+ (base32
+ "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8"))))
+ (build-system emacs-build-system)
+ (home-page "https://elpa.gnu.org/packages/xref-union.html")
+ (synopsis "Combine multiple Xref backends")
+ (description
+ "This package provides a way to combine multiple Xref source
+(e.g., Etags and Eglot) and have the results all at once.")
+ (license license:gpl3+)))
+
(define-public emacs-burly
(package
(name "emacs-burly")
@@ -38271,7 +39406,7 @@ and preferred services can easily be configured.")
(define-public emacs-vertico
(package
(name "emacs-vertico")
- (version "1.8")
+ (version "1.9")
(source
(origin
(method git-fetch)
@@ -38280,7 +39415,7 @@ and preferred services can easily be configured.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr"))))
+ (base32 "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p"))))
(build-system emacs-build-system)
(arguments
(list
@@ -38799,7 +39934,7 @@ project.el and xref.el.")
(define-public emacs-citre
(package
(name "emacs-citre")
- (version "0.4")
+ (version "0.4.1")
(source
(origin
(method git-fetch)
@@ -38807,7 +39942,7 @@ project.el and xref.el.")
(url "https://github.com/universal-ctags/citre/")
(commit (string-append "v" version))))
(sha256
- (base32 "0fq1f03v706gj6p2fjz51kvmj1pwc9p64chqap2ajr0a9cxpwln6"))
+ (base32 "1x5kxlzhzr2x4cszcqaxcg2lc71nwmmfnm2vzx7iz7h74hn4f1ld"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@@ -38977,7 +40112,7 @@ Fennel code within Emacs.")
(define-public emacs-org-modern
(package
(name "emacs-org-modern")
- (version "1.2")
+ (version "1.5")
(source
(origin
(method git-fetch)
@@ -38985,7 +40120,7 @@ Fennel code within Emacs.")
(url "https://github.com/minad/org-modern")
(commit version)))
(sha256
- (base32 "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm"))
+ (base32 "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-compat))
@@ -38997,6 +40132,45 @@ and text properties. The package styles headlines, keywords, tables and
source blocks.")
(license license:gpl3+)))
+(define-public emacs-org-margin
+ (let* ((commit "4013b59ff829903a7ab86b95593be71aa5c9b87d")
+ (revision "0"))
+ (package
+ (name "emacs-org-margin")
+ (version (git-version "0.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rougier/org-margin")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13x5568yfqm1lfmy29vcii2bdkjxjygmhslbr0fwgm2xq9rn63yv"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'makeinfo
+ (lambda _
+ (invoke "emacs"
+ "--batch"
+ "--eval=(require 'ox-texinfo)"
+ "--eval=(find-file \"README.org\")"
+ "--eval=(org-texinfo-export-to-info)")
+ (rename-file "README.info" "org-margin.info")
+ (install-file "org-margin.info"
+ (string-append #$output "/share/info")))))))
+ (native-inputs (list texinfo))
+ (license license:gpl3+)
+ (home-page "https://github.com/rougier/org-margin")
+ (synopsis "Outdent headlines in emacs org-mode")
+ (description "@code{org-margin} mode allows to outdent org headlines by
+moving leading stars into the margin and transform them into markers depending
+on the chosen style."))))
+
(define-public emacs-pyimport
(let ((commit "a6f63cf7ed93f0c0f7c207e6595813966f8852b9")
(revision "0"))
@@ -39086,7 +40260,7 @@ hacker.")
(define-public emacs-osm
(package
(name "emacs-osm")
- (version "1.3")
+ (version "1.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -39095,7 +40269,7 @@ hacker.")
(file-name (git-file-name name version))
(sha256
(base32
- "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx"))))
+ "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8"))))
(build-system emacs-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
@@ -39226,6 +40400,53 @@ 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")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/licht1stein/context-transient.el")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/licht1stein/context-transient.el")
+ (synopsis "Context specific transients")
+ (description "This package makes it easy to define and call
+context-specific @code{emacs-transient} menus for current project, git repo,
+buffer or any other condition.")
+ (license license:gpl3+)))
+
(define-public emacs-purs-mode
;; XXX: Upstream set no tag nor any Version keyword. Using 0 as the base
;; version.
@@ -39456,7 +40677,7 @@ using mypy.")
#:tests? #f ;there are no tests
#:phases
#~(modify-phases %standard-phases
- (add-after 'set-mpv-el-version 'patch-exec-paths
+ (add-after 'unpack 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "mpv.el"
("mpv-executable"
@@ -39668,7 +40889,7 @@ The main features of Wanderlust:
#:tests? #f ;there are no tests
#:phases
#~(modify-phases %standard-phases
- (add-after 'set-waveform-el-version 'patch-exec-paths
+ (add-after 'unpack 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "waveform.el"
("waveform-ffmpeg-executable"
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 411bea3ab6..3ce01f1a24 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Declan Tsien <declantsien@riseup.net>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -100,14 +100,18 @@
(define-public emacs-minimal
(package
(name "emacs-minimal")
- (version "29.3")
+ (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"
@@ -229,6 +233,16 @@
(("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
(format #f "(or ~a (tramp-compat-process-running-p ~s))"
all (string-append "." process "-real"))))))
+ (add-after 'unpack 'disable-native-compilation
+ (lambda _
+ ;; Temporary workaround to prevent the behaviour discussed in
+ ;; <https://issues.guix.gnu.org/72333>.
+ ;; Please remove once the native-compilation for Emacs packages
+ ;; is fully supported.
+ (substitute* "lisp/transient.el"
+ ((";; End:")
+ ";; no-native-compile: t
+;; End:"))))
(add-before 'configure 'fix-/bin/pwd
(lambda _
;; Use `pwd', not `/bin/pwd'.
@@ -553,12 +567,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)
@@ -567,7 +581,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"
@@ -585,7 +599,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/embedded.scm b/gnu/packages/embedded.scm
index 1da4141519..bee65663b6 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -746,16 +746,17 @@ with a layered architecture of JTAG interface and TAP support.")
"0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck"))
(patches '())))
(arguments
- `(;; FIXME: For some reason there are many test failures. It's not
- ;; obvious how to fix the failures.
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _ (chdir "binutils") #t)))
- ,@(substitute-keyword-arguments (package-arguments xbinutils)
- ((#:configure-flags flags)
- `(cons "--disable-werror" ,flags)))))
+ (list
+ ;; FIXME: For some reason there are many test failures. It's not
+ ;; obvious how to fix the failures.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "binutils") #t))
+ #$@(substitute-keyword-arguments (package-arguments xbinutils)
+ ((#:configure-flags flags)
+ #~(cons "--disable-werror" #$flags))))))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index a935808da5..4dc61bdbff 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -15,12 +15,13 @@
;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
;;; Copyright © 2021 Felipe Balbi <balbi@kernel.org>
;;; Copyright © 2021, 2024 Felix Gruber <felgru@posteo.net>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Hendursaga <hendursaga@aol.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -61,11 +62,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,23 +116,25 @@
#: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
(package
(name "vice")
- (version "3.7.1")
+ (version "3.8")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/vice-emu/releases/"
"vice-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "165b1ixrarcqy1rl06yhaf46ni3j8lrbn8f3zf5nkc2d0bk12f3y"))))
+ (base32 "010h3aj0y9n8kcg5yvy1m7g4hc7nbm5gym5r3f3jmk5vyb8c8z8x"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--disable-html-docs"
- "--disable-pdf-docs")))
+ (list #:configure-flags #~(list "--disable-html-docs"
+ "--disable-pdf-docs")))
(native-inputs
(list bison
dos2unix
@@ -138,6 +143,7 @@
pkg-config))
(inputs
(list alsa-lib
+ curl
glew
glib
gtk+
@@ -184,7 +190,7 @@ SuperCPU.")
#:tests? #f ; No check target and custom tests don't seem to build
#:imported-modules
((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules
(((guix build copy-build-system)
#:prefix copy:)
@@ -590,6 +596,7 @@ and a game metadata scraper.")
(list pkg-config))
(inputs
`(("alsa-lib" ,alsa-lib)
+ ("bash" ,bash-minimal) ; for wrap-program
("ao" ,ao)
("eudev" ,eudev)
("gtk+" ,gtk+-2)
@@ -674,30 +681,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
@@ -792,7 +799,7 @@ and Game Boy Color games.")
(define-public sameboy
(package
(name "sameboy")
- (version "0.16.2")
+ (version "0.16.3")
(source
(origin
(method git-fetch)
@@ -801,7 +808,7 @@ and Game Boy Color games.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ckx5dm57h7ncvfqqqb2mdl5dcmhkardcn78zv965h6w1yxg0ii8"))))
+ (base32 "1jdjg59vzzkbi3c3qaxpsxqx955sb86cd3kcypb0nhjxbnwac1di"))))
(build-system gnu-build-system)
(native-inputs
(list rgbds pkg-config))
@@ -837,7 +844,7 @@ from an emulator---from save states to scaling filters.")
(define-public mupen64plus-core
(package
(name "mupen64plus-core")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -846,10 +853,10 @@ from an emulator---from save states to scaling filters.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "116fndl6652zrp1r6ag4xv3dzp1x52mlvadj8xwflq07fd5rhri1"))))
+ (base32 "1iav8r3f0r44sq9pz4zjqrdzyspk412c117ywxz02qpjkhkf91a3"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config which))
+ (list pkg-config nasm which))
(inputs
(list freetype
glu
@@ -886,7 +893,7 @@ core library.")
(define-public mupen64plus-audio-sdl
(package
(name "mupen64plus-audio-sdl")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -895,7 +902,7 @@ core library.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0z19amfg9vr2pqjjri1ipc7hs681fzjcnb0f9y7bjhp5n8d7p6bb"))))
+ (base32 "0j78xk78fj7lhi6jk6npr7wm9ix7qyr5cbaaqsmk6pqw6gfx81kz"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -920,7 +927,7 @@ core library.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus SDL input plugin")
+ (synopsis "Mupen64Plus SDL audio plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -930,7 +937,7 @@ SDL audio plugin.")
(define-public mupen64plus-input-sdl
(package
(name "mupen64plus-input-sdl")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -939,7 +946,7 @@ SDL audio plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1dyazfbdjycdfslq8jixqiqhziw0rlkvach2r9dz91229jmkyc9c"))))
+ (base32 "1nnniyiy0wpg4m9918va31xxnz8r5qvj0z08vyq2is0b47ld3kq0"))))
(build-system gnu-build-system)
(native-inputs
(list which))
@@ -974,7 +981,7 @@ SDL input plugin.")
(define-public mupen64plus-rsp-hle
(package
(name "mupen64plus-rsp-hle")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -983,7 +990,7 @@ SDL input plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0pi31qzjjp7aypdvvnz6ms18g09c4gqzxi6328zj8sji94b75gf0"))))
+ (base32 "0sblabl3dp1jy9izbwyhx90690xdj96yfmwi47kpka8axzj93naq"))))
(build-system gnu-build-system)
(inputs
(list mupen64plus-core))
@@ -1006,7 +1013,7 @@ SDL input plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus SDL input plugin")
+ (synopsis "Mupen64Plus RSP high-level emulation (HLE) plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1016,7 +1023,7 @@ high-level emulation (HLE) RSP processor plugin.")
(define-public mupen64plus-rsp-z64
(package
(name "mupen64plus-rsp-z64")
- (version "2.0.0")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1025,7 +1032,7 @@ high-level emulation (HLE) RSP processor plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0nfyjns9k8xbg3aqs7593nfaxvlj72h3l8h467442xlk8ajfcylx"))))
+ (base32 "02w7c6b7fc6q5rrvawxv48xp64crfs5jbs06f2fqqj4smysyjfcc"))))
(build-system gnu-build-system)
(inputs
(list mupen64plus-core))
@@ -1048,7 +1055,7 @@ high-level emulation (HLE) RSP processor plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus SDL input plugin")
+ (synopsis "Mupen64Plus RSP Z64 plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1058,7 +1065,7 @@ Z64 RSP processor plugin.")
(define-public mupen64plus-video-arachnoid
(package
(name "mupen64plus-video-arachnoid")
- (version "2.0.0")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1067,7 +1074,7 @@ Z64 RSP processor plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1v9fqwpb6pawr8z5cm2ki7bqkks4iyr5c4jy4v5khj6h8zcv55gc"))))
+ (base32 "1bkzbmg53qiwvza9h45d76rbyn0isbb31cfp5qqza0fzmgjxhv1d"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -1092,7 +1099,7 @@ Z64 RSP processor plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus Rice Video plugin")
+ (synopsis "Mupen64Plus Arachnoid video plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1102,7 +1109,7 @@ Arachnoid video plugin.")
(define-public mupen64plus-video-glide64
(package
(name "mupen64plus-video-glide64")
- (version "2.0.0")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1111,7 +1118,7 @@ Arachnoid video plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0qn5za7g7796kh2ag3xpmhbqg0yf71g9liz6ks0rha8pz73lgs01"))))
+ (base32 "0jscvr2imm9wj9jsgsp5815pv27f97w8g19ix0n39y9yy851qvrg"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -1123,17 +1130,9 @@ Arachnoid video plugin.")
;; The mupen64plus build system has no configure phase.
(delete 'configure)
;; Makefile is in a subdirectory.
- (add-before
- 'build 'cd-to-project-dir
+ (add-before 'build 'cd-to-project-dir
(lambda _
- (chdir "projects/unix")))
- ;; XXX Should be unnecessary with the next release.
- (add-before
- 'build 'use-sdl2
- (lambda _
- (substitute* "Makefile"
- (("SDL_CONFIG = (.*)sdl-config" all prefix)
- (string-append "SDL_CONFIG = " prefix "sdl2-config"))))))
+ (chdir "projects/unix"))))
#:make-flags
(let ((out (assoc-ref %outputs "out"))
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
@@ -1143,7 +1142,7 @@ Arachnoid video plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus Rice Video plugin")
+ (synopsis "Mupen64Plus Glide64 video plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1153,7 +1152,7 @@ Glide64 video plugin.")
(define-public mupen64plus-video-glide64mk2
(package
(name "mupen64plus-video-glide64mk2")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1162,7 +1161,7 @@ Glide64 video plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "08pm28a36dpr0cvr8pzw0n5ksdazp7jqvlmqfy2lwb4dm0cwhkqd"))))
+ (base32 "1hr0mv6y7v72101iff3zf6rd0wpqah936234m3hcb4cgna6zj9xy"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -1192,7 +1191,7 @@ Glide64 video plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus Rice Video plugin")
+ (synopsis "Mupen64Plus Glide64MK2 video plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1202,7 +1201,7 @@ Glide64MK2 video plugin.")
(define-public mupen64plus-video-rice
(package
(name "mupen64plus-video-rice")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1211,7 +1210,7 @@ Glide64MK2 video plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0rpmbcq67gsj5h5jjis146378qc1mskskvx20y1ikx59yhbamh13"))))
+ (base32 "1vn24g7ahyv70jd06f5sq0j4bjs4axl2c0kfz4qdkpqsamsgxng8"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -1236,7 +1235,7 @@ Glide64MK2 video plugin.")
;; There are no tests.
#:tests? #f))
(home-page "https://www.mupen64plus.org/")
- (synopsis "Mupen64Plus Rice Video plugin")
+ (synopsis "Mupen64Plus Rice video plugin")
(description
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
which is capable of accurately playing many games. This package contains the
@@ -1246,7 +1245,7 @@ Rice Video plugin.")
(define-public mupen64plus-video-z64
(package
(name "mupen64plus-video-z64")
- (version "2.0.0")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1255,8 +1254,7 @@ Rice Video plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "04qa2fdd6dakpk2v0d4l80xh9b4h8gm71g80c0wyyxdhmhwk1r9c"))
- (patches (search-patches "mupen64plus-video-z64-glew-correct-path.patch"))))
+ (base32 "1i8dxa0lhcsm5ss1bf74dqnzaa2bw5naj6f56ixw2qjvybrnsmk2"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config which))
@@ -1298,7 +1296,7 @@ Z64 video plugin.")
(define-public mupen64plus-ui-console
(package
(name "mupen64plus-ui-console")
- (version "2.5")
+ (version "2.5.9")
(source
(origin
(method git-fetch)
@@ -1307,7 +1305,7 @@ Z64 video plugin.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0vrf98qa6a0y3647kslsv644fag233dxh5dcr1yncjiiwickcr5a"))
+ (base32 "1dyrqdfs2jkalfd86bqidgd9y1hy03qgrgwk46d3xf3kyfmaa1cq"))
(patches (search-patches "mupen64plus-ui-console-notice.patch"))))
(build-system gnu-build-system)
(native-inputs
@@ -1327,29 +1325,27 @@ Z64 video plugin.")
mupen64plus-audio-sdl
mupen64plus-input-sdl
mupen64plus-rsp-hle
- mupen64plus-video-glide64
mupen64plus-video-glide64mk2
mupen64plus-video-rice))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- ;; The mupen64plus build system has no configure phase.
- (delete 'configure)
- ;; Makefile is in a subdirectory.
- (add-before
- 'build 'cd-to-project-dir
- (lambda _
- (chdir "projects/unix"))))
- #:make-flags
- (let ((out (assoc-ref %outputs "out"))
- (m64p (assoc-ref %build-inputs "mupen64plus-core")))
- (list "all"
- (string-append "PREFIX=" out)
- (string-append "APIDIR=" m64p "/include/mupen64plus")
- ;; Trailing slash matters here.
- (string-append "COREDIR=" m64p "/lib/")))
- ;; There are no tests.
- #:tests? #f))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; The mupen64plus build system has no configure phase.
+ (delete 'configure)
+ ;; Makefile is in a subdirectory.
+ (add-before 'build 'cd-to-project-dir
+ (lambda _
+ (chdir "projects/unix"))))
+ #:make-flags
+ #~(let ((m64p #$(this-package-input "mupen64plus-core")))
+ (list "all"
+ (string-append "PREFIX=" #$output)
+ (string-append "APIDIR=" m64p "/include/mupen64plus")
+ ;; Trailing slash matters here.
+ (string-append "COREDIR=" m64p "/lib/")))
+ ;; There are no tests.
+ #:tests? #f))
(home-page "https://www.mupen64plus.org/")
(synopsis "Mupen64Plus command line user interface")
(description
@@ -1359,6 +1355,75 @@ command line user interface. Installing this package is the easiest way
towards a working Mupen64Plus for casual users.")
(license license:gpl2+)))
+(define-public mupen64plus-video-gliden64
+ ;; The latest release is 5 years old, doesn't build with GCC 11.
+ (let ((commit "b021d8ee437266cfdd7251daf8c23203578b02b6")
+ (revision "0"))
+ (package
+ (name "mupen64plus-video-gliden64")
+ (version (git-version "4.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gonetz/GLideN64")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0kcx5m8fjgrdi2dby8qbmkl78picip3jx7hg0ah1cazk192v2x98"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Delete 20 MiB of Windows-related files.
+ (delete-file-recursively "projects/msvc")
+ ;; Delete bundled library headers.
+ (delete-file-recursively "src/GLideNHQ/inc") ;zlib, libpng
+ (delete-file-recursively "src/inc/freetype")
+ ;; Unbundle xxhash.
+ (delete-file-recursively "src/xxHash")
+ (with-fluids ((%default-port-encoding "ISO-8859-1"))
+ (substitute* (find-files "." "\\.cpp$")
+ (("#include \"xxHash/xxhash.h\"")
+ "#include <xxhash.h>")))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no test suite
+ #:configure-flags
+ #~(list "-DMUPENPLUSAPI=ON"
+ "-DUSE_SYSTEM_LIBS=ON"
+ ;; Enable some optimizations.
+ "-DVEC4_OPT=ON"
+ #$(if (target-x86?)
+ ;; FIXME: Disabled for now as it causes a segmentation
+ ;; fault (see:
+ ;; https://github.com/gonetz/GLideN64/issues/2836).
+ "-DX86_OPT=OFF" ;extra X86 ASM optimizations
+ "-DX86_OPT=OFF")
+ #$(if (target-arm?)
+ "-DNEON_OPT=ON"
+ "-DNEON_OPT=OFF")
+ #$(if (target-aarch64?)
+ "-DCRC_ARMV8=ON" ;use ARMv8 hardware to compute CRCs
+ "-DCRC_OPT=ON")) ;use xxHash to compute CRCs)
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ ;; The src/ subdirectory contains the root CMakeLists.txt file.
+ (lambda _
+ (chdir "src")))
+ (add-after 'chdir 'generate-Revision.h
+ (lambda _
+ (invoke "sh" "getRevision.sh" "--nogit"))))))
+ (inputs (list freetype libpng mesa xxhash zlib))
+ (home-page "https://github.com/gonetz/GLideN64")
+ (synopsis "Mupen64Plus GlideN64 video plugin")
+ (description "GLideN64 is a new generation graphics plugin for Nintendo
+64 emulators, which offers better performance and compatibility compared to
+the original Glide64 plugin. This version is built for use with the
+Mupen64Plus emulator.")
+ (license license:gpl2+))))
+
(define-public nestopia-ue
(package
(name "nestopia-ue")
@@ -1434,7 +1499,7 @@ as RetroArch.")
(define-public retroarch
(package
(name "retroarch")
- (version "1.18.0")
+ (version "1.19.1")
(source
(origin
(method git-fetch)
@@ -1443,7 +1508,7 @@ as RetroArch.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0wdl9zrb1gpqgrxxmv6fida1si1s5g6061aja9dm0hnbpa8cbsdq"))))
+ (base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -1462,6 +1527,10 @@ as RetroArch.")
(("/usr/local/share/wayland-protocols")
(string-append wayland-protocols "/share/wayland-protocols")))
+ ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
+ (substitute* "qb/config.libs.sh"
+ (("[$]HAVE_GLSLANG_HLSL") "notcare"))
+
;; The configure script does not yet accept the extra arguments
;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
(invoke
@@ -2092,13 +2161,13 @@ assembler, and debugger for the Intel 8085 microprocessor.
;; For GtkFileChooserDialog.
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas"))))
- #t)))))
+ "/share/glib-2.0/schemas")))))))))
(native-inputs
(list pkg-config intltool
`(,glib "bin")))
(inputs
- (list libcdio
+ (list bash-minimal
+ libcdio
sdl2
gtk+
ffmpeg-4
@@ -2192,106 +2261,66 @@ from various forks of Gens, and improved platform portability.")
performance, features, and ease of use.")
(license license:gpl3)))
-;; python-pwntools requires a -rc release of unicorn
+(define-public zsnes
+ (package
+ (name "zsnes")
+ (version "2.0.12")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xyproto/zsnes")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0g9l1ij3p1adkp97wkp0dz44i2xpmsvfpkxvlfkpr7190dibsgsz"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:system "i686-linux" ;requires 32 bit libraries to build
+ #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "CXX=" #$(cxx-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)))) ;no configure script
+ (native-inputs (list nasm pkg-config))
+ (inputs (list glib libpng mesa ncurses sdl zlib))
+ (home-page "https://www.zsnes.com")
+ (synopsis "Super Nintendo Entertainment System emulator")
+ (description "ZSNES is a @acronym{Super Nintendo Entertainment System,
+SNES} emulator that can play most games at full speed with sound and special
+graphic filters. Some of its features include:
+@itemize
+@item Support for smooth and dynamic image scaling
+@item Support for rewinding and fast-forwarding in-game
+@item JMA compression format
+@item Change the appearance of the GUI
+@item Take screenshots of currently running games
+@item Saving the game at any point by recording the console’s state
+@item Record movies of gameplay which can be played back.
+@end itemize")
+ (license license:gpl2+)
+ (supported-systems (list "x86_64-linux"))))
+
(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
@@ -2598,6 +2627,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/enchant.scm b/gnu/packages/enchant.scm
index 5efa0f2689..6892b73ab5 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -25,12 +25,14 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages hunspell)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages man)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages version-control)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix download)
@@ -71,7 +73,7 @@ dictionaries.")
(define-public enchant
(package
(name "enchant")
- (version "2.2.15")
+ (version "2.6.9")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/AbiWord/enchant/releases"
@@ -79,31 +81,31 @@ dictionaries.")
version ".tar.gz"))
(sha256
(base32
- "00vcykbb7lxh51prvmsb62a06q18a6rlk9ba5a7g45c1awaj43rv"))))
+ "0szzxx0bvkdgahlzdbrmnngf1dzbsrpcf8psl2rl72mkr46s39fr"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static"
- ;; Tests require a relocatable build.
- "--enable-relocatable")))
+ (list
+ #:configure-flags
+ #~(list"--disable-static"
+ ;; Tests require a relocatable build.
+ "--enable-relocatable")))
(inputs
- (list aspell hunspell))
+ (list aspell hunspell nuspell))
(propagated-inputs
;; Required by enchant.pc.
(list glib))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("pkg-config" ,pkg-config)
- ("unittest-cpp" ,unittest-cpp)))
+ (list `(,glib "bin") groff pkg-config unittest-cpp))
(synopsis "Multi-backend spell-checking library wrapper")
(description
- "On the surface, Enchant appears to be a generic spell checking library.
-Looking closer, you'll see the Enchant is more-or-less a fancy wrapper around
-the dlopen() system call.
-
-Enchant steps in to provide uniformity and conformity on top of these libraries,
-and implement certain features that may be lacking in any individual provider
-library. Everything should \"just work\" for any and every definition of \"just
-working\".")
+ "Enchant is a library---and command-line program---that wraps a number of
+different spelling libraries and programs with a consistent interface. By
+using Enchant, you can use a wide range of spelling libraries, including some
+specialized for particular languages, without needing to program to each
+library's interface. If it's not convenient to call a C library, you can
+access most of Enchant's functionality via the @command{enchant} program,
+which communicates over a pipe, like Ispell, and is indeed
+Ispell-compatible.")
(home-page "https://abiword.github.io/enchant/")
(license lgpl2.1+)))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 4e30772296..26f47dbf9d 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -27,18 +27,20 @@
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
-;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2022 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2022 Olivier Dion <olivier.dion@polymtl.ca>
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2022 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2023 Theofilos Pechlivanis <theofilos.pechlivanis@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
+;;; Copyright © 2024 Juliana Sims <juli@incana.org>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -88,6 +90,7 @@
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dejagnu)
@@ -161,6 +164,7 @@
#:use-module (gnu packages text-editors)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages toolkits)
#:use-module (gnu packages tree-sitter)
#:use-module (gnu packages version-control)
#:use-module (gnu packages web)
@@ -203,7 +207,7 @@
(mkdir-p share)
(copy-recursively "unix/resources" share)))))))
(inputs
- (list boost muparser freetype qtbase-5 qtsvg-5))
+ (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
(native-inputs
(list pkg-config which))
(home-page "https://librecad.org/")
@@ -255,6 +259,7 @@ plans and designs.")
glib
gtk+-2
guile-2.0
+ libxcrypt
shared-mime-info
m4
pcb
@@ -565,7 +570,7 @@ featuring various improvements and bug fixes.")))
#:parallel-build? #f
#:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(add-after 'build 'make-doc
@@ -662,7 +667,7 @@ multipole-accelerated algorithm.")
#:parallel-build? #f
#:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -818,7 +823,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
@@ -1426,9 +1431,10 @@ WiFi signal strength maps. It visualizes them using a Voronoi diagram.")
`("PATH" ":" prefix
(,(string-append python "/bin:"))))))))))
(inputs
- `(("boost" ,boost)
- ("python" ,python-wrapper)
- ("python-mako" ,python-mako)))
+ (list bash-minimal ;for wrap-program
+ boost
+ python-wrapper
+ python-mako))
(home-page "https://www.libvolk.org/")
(synopsis "Vector-Optimized Library of Kernels")
(description
@@ -1669,7 +1675,7 @@ fully-vectorial and three-dimensional methods.")
(define-public meep
(package
(name "meep")
- (version "1.8.0")
+ (version "1.29.0")
(source (origin
(method url-fetch)
(uri
@@ -1678,27 +1684,27 @@ fully-vectorial and three-dimensional methods.")
version "/meep-" version ".tar.gz"))
(sha256
(base32
- "14zyxmm3p80j5fz5b89sl7hgkgcisqjny5hjh4pi274ziqjqz8bm"))))
+ "1511849g6wlpa42kfrj6zvmc3ivad9ync8r01xp2ld7r5j39y9v8"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list (string-append "--with-libctl="
- (assoc-ref %build-inputs "libctl")
- "/share/libctl"))))
+ (list #:configure-flags
+ #~(list (string-append "--with-libctl="
+ #$(this-package-input "guile-libctl")
+ "/share/libctl"))))
(native-inputs
- `(("fortran" ,gfortran)
- ("pkg-config" ,pkg-config)
- ("swig" ,swig)))
+ (list gfortran
+ pkg-config
+ swig))
(inputs
- `(("fftw" ,fftw)
- ("gsl" ,gsl)
- ("guile" ,guile-2.2)
- ("harminv" ,harminv)
- ("hdf5" ,hdf5)
- ("openblas" ,openblas)
- ("libctl" ,guile-libctl)
- ("mpb" ,mpb)
- ("zlib" ,zlib)))
+ (list fftw
+ gsl
+ guile-2.2
+ guile-libctl
+ harminv
+ hdf5
+ mpb
+ openblas
+ zlib))
(home-page "http://ab-initio.mit.edu/wiki/index.php/Meep")
(synopsis "Finite-difference time-domain (FDTD) simulation software")
(description
@@ -1786,6 +1792,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)))
@@ -1797,7 +1804,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
@@ -1924,6 +1931,64 @@ like relocation symbols. It is able to deal with malformed binaries, making
it suitable for security research and analysis.")
(license license:lgpl3)))
+(define-public zycore
+ (package
+ (name "zycore")
+ (version "1.5.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zyantific/zycore-c")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s962pkqybh1xbs75y4jb4bqc9qnq0sviqd570mirqdhhq87agib"))))
+ (build-system cmake-build-system)
+ (native-inputs (list googletest))
+ (arguments (list #:configure-flags
+ #~(list "-DZYCORE_BUILD_SHARED_LIB=ON"
+ #$(if (%current-target-system)
+ "-DZYCORE_BUILD_TESTS=OFF"
+ "-DZYCORE_BUILD_TESTS=ON"))))
+ (home-page "https://github.com/zyantific/zycore-c")
+ (synopsis "Internal library for Zydis")
+ (description
+ "This package provides platfrom-independent types, macros
+and a fallback for environments without libc for Zydis.")
+ (license license:expat)))
+
+(define-public zydis
+ (package
+ (name "zydis")
+ (version "4.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zyantific/zydis")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15iw6wcg2van8pw54xs15zk5cniqm8d8vbd1w1br9azv8jxsqjva"))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags
+ #~(list "-DZYAN_SYSTEM_ZYCORE=ON"
+ "-DZYDIS_BUILD_SHARED_LIB=ON"
+ "-DZYDIS_BUILD_MAN=ON")))
+ (native-inputs (list python-minimal ronn-ng))
+ (inputs (list zycore))
+ (home-page "https://zydis.re")
+ (synopsis "Disassembler and code generation library for x86 and AMD64")
+ (description
+ "Zydis is a decoder and disassembler library with the following features:
+@itemize
+@item Support for all x86 and AMD64 instructions and extensions
+@item Optimization for high performance
+@item No dynamic memory allocation
+@item Thread-safe by design
+@item Smaller file-size overhead compared to other common disassembler libraries
+@end itemize")
+ (license license:expat)))
+
(define-public asco
(package
(name "asco")
@@ -1977,48 +2042,32 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
(package
(name "libngspice")
- (version "42")
+ (version "43")
(source
(origin
(method url-fetch)
- (uri (list
- (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
- version "/ngspice-" version ".tar.gz")
- (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
- "old-releases/" version
- "/ngspice-" version ".tar.gz")))
+ (uri (list (string-append
+ "mirror://sourceforge/ngspice/ng-spice-rework/" version
+ "/ngspice-" version ".tar.gz")
+ (string-append
+ "mirror://sourceforge/ngspice/ng-spice-rework/"
+ "old-releases/" version "/ngspice-" version ".tar.gz")))
(sha256
- (base32 "02p5ar1cqwn70dw5xzx5v3qhm1p1xgb1xpzs1ljklcxjda2f6zvk"))))
+ (base32 "169nn6bw5628m2k8cy77yd1vs22plj83grisq58j07sk11pnmp8l"))))
(build-system gnu-build-system)
(arguments
- `(;; No tests for libngspice exist.
- ;; The transient tests for ngspice fail.
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-timestamps
- (lambda _
- (substitute* "configure"
- (("`date`") "Thu Jan 1 00:00:01 UTC 1970"))))
- (add-after 'unpack 'delete-program-manuals
- (lambda _
- (substitute* "man/man1/Makefile.in"
- (("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1")
- "man_MANS = "))))
- (add-after 'install 'delete-scripts
- (lambda* (#:key outputs #:allow-other-keys)
- (delete-file-recursively
- (string-append (assoc-ref outputs "out")
- "/share/ngspice/scripts")))))
- #:configure-flags
- (list "--enable-openmp"
- "--enable-ciderlib"
- "--enable-xspice"
- "--with-ngshared")))
- (native-inputs
- (list bison flex))
- (inputs
- (list libxaw openmpi))
+ (list
+ #:tests? #f ;there are no tests for libngspice
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'delete-scripts
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output
+ "/share/ngspice/scripts")))))
+ #:configure-flags #~(list "--enable-openmp" "--enable-ciderlib"
+ "--enable-xspice" "--with-ngshared")))
+ (native-inputs (list bison flex))
+ (inputs (list libxaw openmpi))
(home-page "https://ngspice.sourceforge.net/")
(synopsis "Mixed-level/mixed-signal circuit simulator")
(description
@@ -2026,31 +2075,28 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that
provides code modeling support and simulation of digital components through
an embedded event driven algorithm.")
- (license (list license:lgpl2.0+ ; code in frontend/numparam
- (license:non-copyleft "file:///COPYING") ; spice3 bsd-style
- license:bsd-3 ; ciderlib
- license:public-domain)))) ; xspice
+ (license (list license:lgpl2.0+ ;code in frontend/numparam
+ (license:non-copyleft "file:///COPYING") ;spice3 bsd-style
+ license:bsd-3 ;ciderlib
+ license:public-domain)))) ;xspice
(define-public ngspice
;; The ngspice executables (see libngpsice above.)
- (package (inherit libngspice)
+ (package
+ (inherit libngspice)
(name "ngspice")
(arguments
(substitute-keyword-arguments (package-arguments libngspice)
+ ((#:tests? _ #f) #t)
((#:configure-flags flags)
- `(cons "--with-readline=yes"
- (delete "--with-ngshared" ,flags)))
+ #~(cons "--with-readline=yes"
+ (delete "--with-ngshared"
+ #$flags)))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'delete-include-files
- (lambda _
- (substitute* "src/Makefile.in"
- (("^SUBDIRS = misc maths frontend spicelib include/ngspice")
- "SUBDIRS = misc maths frontend spicelib"))))
- (delete 'delete-program-manuals)
- (delete 'delete-script-files)))))
- (inputs
- (list libngspice readline))))
+ #~(modify-phases #$phases
+ (delete 'delete-scripts)))))
+ (native-inputs (list perl))
+ (inputs (list libngspice readline))))
(define trilinos-serial-xyce
;; Note: This is a Trilinos containing only the packages Xyce needs, so we
@@ -2241,8 +2287,7 @@ parallel computing platforms. It also supports serial execution.")
(lambda _
(substitute* "v2cc/gvhdl.in"
(("--mode=link") "--mode=link --tag=CXX")
- (("-lm") "-lm FREEHDL/lib/freehdl/libieee.la"))
- #t))
+ (("-lm") "-lm FREEHDL/lib/freehdl/libieee.la"))))
(add-after 'patch-gvhdl 'patch-freehdl-gennodes
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "freehdl/freehdl-gennodes.in"
@@ -2250,8 +2295,7 @@ parallel computing platforms. It also supports serial execution.")
(search-input-file inputs "/bin/guile"))
(("\\(debug") ";(debug")
(("\\(@ ") "(apply-emit")
- (("\\(@@ ") "(apply-mini-format"))
- #t))
+ (("\\(@@ ") "(apply-mini-format"))))
(add-after 'configure 'patch-freehdl-pc
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "freehdl.pc"
@@ -2260,9 +2304,8 @@ parallel computing platforms. It also supports serial execution.")
"/bin/g++"))
(("=libtool")
(string-append "=" (assoc-ref inputs "libtool")
- "/bin/libtool")))
- #t))
- (add-after 'install-scripts 'make-wrapper
+ "/bin/libtool")))))
+ (add-after 'install 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; 'gvhdl' invokes the C compiler directly, so hard-code its
@@ -2280,10 +2323,11 @@ parallel computing platforms. It also supports serial execution.")
,(string-append (assoc-ref inputs "coreutils")
"/bin"))))
(wrap-program (string-append out "/bin/freehdl-config")
- `("PKG_CONFIG_PATH" ":" prefix (,(string-append out "/lib/pkgconfig")))))
- #t)))))
+ `("PKG_CONFIG_PATH" ":" prefix
+ (,(string-append out "/lib/pkgconfig"))))))))))
(inputs
- (list coreutils
+ (list bash-minimal
+ coreutils
;; Lazily resolve the gcc-toolchain to avoid a circular dependency.
(module-ref (resolve-interface '(gnu packages commencement))
@@ -2492,67 +2536,43 @@ analysis and AC analysis. The engine is designed to do true mixed-mode
simulation.")
(license license:gpl3+)))
-(define-public radare2-for-cutter
- (package
- (inherit radare2)
- (name "radare2")
- (version "5.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/radareorg/radare2")
- (commit version)))
- (sha256
- (base32
- "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"))
- (file-name (git-file-name name version))))))
-
(define-public cutter
(package
(name "cutter")
- (version "1.12.0")
+ (version "2.3.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rizinorg/cutter")
- (commit (string-append "v" version))))
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (modules '((guix build utils)))
+ (snippet #~(delete-file-recursively "rizin"))
(file-name (git-file-name name version))
(sha256
- (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"))))
- (build-system gnu-build-system)
+ (base32 "0d10g1wpw8p8hcxvw5q7ymfdxyrp4xqs6a49lf3gdgnmcpb248ad"))))
+ (build-system qt-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (radare2 (assoc-ref inputs "radare2")))
- ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib
- ;; override `qmake PREFIX=`.
- (substitute* "./src/lib_radare2.pri"
- (("PREFIX") "R2PREFIX")
- (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2)))
- (invoke "qmake"
- (string-append "PREFIX=" out)
- "./src/Cutter.pro")))))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list qtbase-5
- qtsvg-5
- openssl
- ;; Depends on radare2 4.5.1 officially, builds and works fine with
- ;; radare2 5.0.0 but fails to build with radare2 5.1.1.
- radare2-for-cutter))
+ (list
+ #:configure-flags #~(list "-DCUTTER_USE_BUNDLED_RIZIN=OFF")
+ #:tests? #f)) ;no tests
+ (native-inputs (list pkgconf))
+ (inputs (list libzip
+ openssl
+ qtsvg-5
+ qttools-5
+ rizin
+ zlib))
(home-page "https://cutter.re")
- (synopsis "GUI for radare2 reverse engineering framework")
- (description "Cutter is a GUI for radare2 reverse engineering framework.
-Its goal is making an advanced andcustomizable reverse-engineering platform
-while keeping the user experience at mind. Cutter is created by reverse
-engineers for reverse engineers.")
- (license (list license:cc-by-sa3.0 ;the "Iconic" icon set
- license:gpl3+)))) ;everything else
+ (synopsis "Software reverse engineering platform")
+ (description
+ "Cutter is a reverse engineering platform powered by @code{rizin}. It
+aims to be an advanced and customizable reverse engineering platform while
+keeping the user experience in mind. Cutter is created by reverse engineers
+for reverse engineers.")
+ (license (list license:cc-by-sa3.0 ;the "Iconic" icon set
+ license:gpl3+)))) ;everything else
(define-public lib3mf
(package
@@ -2649,10 +2669,69 @@ 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.11")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pandapower" version ".zip"))
+ (sha256
+ (base32 "139ahp08kci8asmv35bcibbnkfr5s1ff5j84n490s47ibsglk4yi"))))
+ (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")
- (version "0.31.0")
+ (version "1.3.0")
(source (origin
(method git-fetch) ;PyPI misses some files required for tests
(uri (git-reference
@@ -2660,7 +2739,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
(commit (string-append "v" version))))
(sha256
(base32
- "1cidv2373lwxy26kbzg4slaqvn2gpq67mvijgp0rydfx6mm6a89i"))
+ "0idr730zdwlxdqyvh3s24720pxrjhwixih24gbqzipgp8nh0713i"))
(file-name (git-file-name name version))))
(build-system pyproject-build-system)
(propagated-inputs (list python-matplotlib
@@ -2686,6 +2765,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.24")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lcapy" version))
+ (sha256
+ (base32 "0lmprghkr274l3ykiq80a31njrzj7qqgm02wifkkwh2935shbk76"))))
+ (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")
@@ -2697,44 +2811,49 @@ Microwave engineering.")
".src.tar.gz"))
(sha256
(base32
- "0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r"))))
+ "0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r"))
+ (patches
+ ;; Upstream patches to make version 2021.01 build with recent versions
+ ;; of boost and cgal.
+ (search-patches "openscad-with-cgal-5.3.patch"
+ "openscad-with-cgal-5.4.patch"
+ "openscad-fix-boost-join.patch"))))
(build-system cmake-build-system)
(inputs
- `(("boost" ,boost)
- ("cgal" ,cgal)
- ("double-conversion" ,double-conversion)
- ("eigen" ,eigen)
- ("fontconfig" ,fontconfig)
- ("glew" ,glew)
- ("gmp" ,gmp)
- ("harfbuzz" ,harfbuzz)
- ("lib3mf" ,lib3mf)
- ("libxml2" ,libxml2)
- ("libzip" ,libzip)
- ("mpfr" ,mpfr)
- ("opencsg" ,opencsg)
- ("qscintilla" ,qscintilla)
- ("qtbase" ,qtbase-5)
- ("qtmultimedia-5" ,qtmultimedia-5)))
+ (list boost
+ cgal
+ double-conversion
+ eigen
+ fontconfig
+ glew
+ gmp
+ harfbuzz
+ lib3mf
+ libxml2
+ libzip
+ mpfr
+ opencsg
+ qscintilla
+ qtbase-5
+ qtmultimedia-5))
(native-inputs
- `(("bison" ,bison)
- ("flex" ,flex)
- ("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("which" ,which)
- ;; the following are only needed for tests
- ("imagemagick" ,imagemagick)
- ("ps" ,procps)
- ("python" ,python)
- ("xvfb" ,xorg-server-for-tests)))
+ (list bison
+ flex
+ gettext-minimal
+ pkg-config
+ which
+ ;; the following are only needed for tests
+ imagemagick
+ procps
+ python
+ xorg-server-for-tests))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "qmake"
- (string-append "PREFIX=" (assoc-ref outputs "out")))
- #t))
+ (string-append "PREFIX=" (assoc-ref outputs "out")))))
(replace 'check
(lambda _
(with-directory-excursion "tests"
@@ -2760,12 +2879,19 @@ Microwave engineering.")
"cgalpngtest_nef3_broken"
"opencsgtest_nef3_broken"
"csgpngtest_nef3_broken"
- "throwntogethertest_nef3_broken")
+ "throwntogethertest_nef3_broken"
+
+ ;; FIXME: Tests probably broken by the patches allowing
+ ;; to build with recent cgal versions.
+ "cgalpngtest_polyhedron-nonplanar-tests"
+ "csgpngtest_polyhedron-nonplanar-tests"
+ "monotonepngtest_polyhedron-nonplanar-tests"
+ "cgalstlcgalpngtest_polyhedron-nonplanar-tests"
+ "cgalbinstlcgalpngtest_polyhedron-nonplanar-tests")
"|")))
;; strip python test files since lib dir ends up in out/share
(for-each delete-file
- (find-files "libraries/MCAD" ".*\\.py"))
- #t)))))
+ (find-files "libraries/MCAD" ".*\\.py")))))))
(synopsis "Script-based 3D modeling application")
(description
"OpenSCAD is a 3D Computer-aided Design (CAD) application. Unlike an
@@ -2806,7 +2932,9 @@ comments.")))
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc"))))
+ (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc"))
+ ;; https://github.com/FreeCAD/FreeCAD/pull/11496
+ (patches (search-patches "freecad-vtk-9.3.patch"))))
(build-system qt-build-system)
(native-inputs
(list doxygen
@@ -2816,7 +2944,8 @@ comments.")))
python-pyside-2-tools
swig))
(inputs
- (list boost
+ (list bash-minimal
+ boost
coin3d
double-conversion
eigen
@@ -2941,6 +3070,32 @@ arithmetic operations on fields, entity location functionalities, and
interpolation toolkit.")
(license license:gpl3+)))
+(define-public python-motulator
+ (package
+ (name "python-motulator")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "motulator" version))
+ (sha256
+ (base32 "01qv4d4rgkwk653vz1qz1nmakniv86572j5ikrxwd63rwv5ckggf"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:tests? #f)) ; there are no tests
+ (propagated-inputs (list python-matplotlib python-numpy python-scipy))
+ (native-inputs (list python-hatchling
+ python-ipykernel
+ python-toml))
+ (home-page "https://aalto-electric-drives.github.io/motulator/")
+ (synopsis "Motor Drive Simulator in Python")
+ (description "This package includes simulation models for an induction
+motor, a synchronous reluctance motor, and a permanent-magnet synchronous
+motor. The motor models are simulated in the continuous-time domain while the
+control algorithms run in discrete time. The default solver is the explicit
+Runge-Kutta method of order 5(4) from @code{scipy.integrate.solve_ivp.}")
+ (license license:expat)))
+
(define-public cgns
(package
(name "cgns")
@@ -2999,6 +3154,7 @@ format.")
(cmake (assoc-ref inputs "cmake")))
(mkdir-p "build")
(invoke "cmake"
+ "-DCMAKE_CXX_FLAGS=-DBOOST_TIMER_ENABLE_DEPRECATED"
(string-append "-DCMAKE_INSTALL_PREFIX=" out)))))
(delete 'configure))))
(home-page "https://github.com/Heeks/libarea")
@@ -3180,13 +3336,13 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
(define-public poke
(package
(name "poke")
- (version "3.3")
+ (version "4.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/poke/poke-" version
".tar.gz"))
(sha256
- (base32 "0vlm9xcr7rrfli2x4hi2q41nh8vjd2izpz4zd0xwhqshx2flb000"))
+ (base32 "1plv26x38jy2g97f7gj2kivjwlgcx5cja3m41qa56yin3vk3dbwa"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -3237,7 +3393,7 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
(list
#:imported-modules `((guix build emacs-build-system)
(guix build emacs-utils)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
@@ -3358,16 +3514,18 @@ dynamic calibration of the milling depth.")
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+")
"/share/glib-2.0/schemas")))))))))
- (inputs (list cairo
- eigen
- freetype
- gtkmm-3
- json-c
- libpng
- libspnav ;spaceware
- mimalloc
- mesa
- zlib))
+ (inputs
+ (list bash-minimal
+ cairo
+ eigen
+ freetype
+ gtkmm-3
+ json-c
+ libpng
+ libspnav ;spaceware
+ mimalloc
+ mesa
+ zlib))
(synopsis
"Parametric 2D/3D @acronym{CAD, computer-aided design} software")
(description
@@ -3531,7 +3689,7 @@ perform various useful functions such as:
(define-public libigl
(package
(name "libigl")
- (version "2.3.0")
+ (version "2.4.0")
(source
(origin
(method git-fetch)
@@ -3541,90 +3699,162 @@ perform various useful functions such as:
(file-name (git-file-name name version))
(sha256
(base32
- "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj"))))
+ "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags
- '("-DLIBIGL_USE_STATIC_LIBRARY=OFF"
- "-DLIBIGL_BUILD_TESTS=ON"
- "-DLIBIGL_BUILD_TUTORIALS=OFF"
- "-DLIBIGL_EXPORT_TARGETS=ON"
- ;; The following options disable tests for the corresponding libraries.
- ;; The options do not affect whether the libraries are linked to
- ;; libigl or not, they are used for tests.
- "-DLIBIGL_WITH_COMISO=OFF"
- "-DLIBIGL_WITH_CORK=OFF"
- "-DLIBIGL_WITH_MATLAB=OFF"
- "-DLIBIGL_WITH_MOSEK=OFF"
- "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate".
- "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF")
+ (list #:configure-flags
+ #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF"
+ "-DLIBIGL_BUILD_TESTS=ON"
+ "-DLIBIGL_BUILD_TUTORIALS=OFF"
+ "-DLIBIGL_INSTALL=ON"
+ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
+ (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/"
+ #$(this-package-input "catch2"))
+ (format #f "-DSpectra_DIR=~a/share/pectra/cmake/"
+ #$(this-package-input "spectra"))
+ ;; The following options disable tests for the corresponding
+ ;; libraries. The options do not affect whether the libraries are
+ ;; linked to libigl or not, they are used for tests.
+ "-DLIBIGL_WITH_COMISO=OFF"
+ "-DLIBIGL_WITH_CORK=OFF"
+ "-DLIBIGL_MATLAB=OFF"
+ "-DLIBIGL_MOSEK=OFF"
+ ;; XXX: GLFW tests are failing with SEGFAULT. See
+ ;; <https://github.com/libigl/libigl/issues/2313>
+ "-DLIBIGL_GLFW_TESTS=OFF")
+ #:build-type "Release"
#:phases
- (modify-phases %standard-phases
+ #~(modify-phases %standard-phases
(add-after 'unpack 'unpack-external
(lambda _
(setenv "HOME" (getcwd)) ;; cmake needs this to export modules
(mkdir "external")
- (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad")
- (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb")
- (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen")
- (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates")))
+ (copy-recursively (assoc-ref %build-inputs "libigl-glad")
+ "external/glad")
+ (copy-recursively (assoc-ref %build-inputs "libigl-test-data")
+ "external/test-data")
+ (copy-recursively (assoc-ref %build-inputs "libigl-comiso")
+ "external/comiso")
+ (copy-recursively (assoc-ref %build-inputs "libigl-tetgen")
+ "external/tetgen")
+ (copy-recursively (assoc-ref %build-inputs "libigl-predicates")
+ "external/predicates")
+ (copy-recursively (assoc-ref %build-inputs "imguizmo")
+ "external/imguizmo")
+ (copy-recursively (assoc-ref %build-inputs "eigen")
+ "external/eigen")))
(add-after 'unpack-external 'patch-cmake
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (source-dir library-name)
+ (format #f "SOURCE_DIR \"~a\""
+ (assoc-ref %build-inputs library-name)))
+ (define (fix-external-library cmake source)
+ (substitute* (format #f "cmake/recipes/external/~a.cmake"
+ cmake)
+ (("GIT_REPOSITORY.*") (source-dir source))
+ (("GIT_TAG.*") "")))
;; Fix references to external libraries
- (substitute* "cmake/libigl.cmake"
- (("if\\(NOT TARGET Eigen3::Eigen\\)" all)
- (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all))
- (("if\\(NOT TARGET CGAL::CGAL\\)" all)
- (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all))
- (("if\\(NOT TARGET tinyxml2\\)" all)
- (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n"
- "if (NOT TARGET tinyxml2::tinyxml2)"))
- (("if\\(NOT TARGET embree\\)" all)
- (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all))
- (("if\\(NOT TARGET glfw\\)" all)
- (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all))
- (("igl_download_glad\\(\\)" all) "")
- (("igl_download_stb\\(\\)" all) "")
- (("igl_download_tetgen\\(\\)" all) "")
- (("igl_download_triangle\\(\\)" all) "")
- (("igl_download_predicates\\(\\)" all) ""))
- (substitute* "tests/CMakeLists.txt"
- (("igl_download_test_data\\(\\)") "")
- (("set\\(IGL_TEST_DATA.*")
- (format #f "set(IGL_TEST_DATA ~a)\n"
- (assoc-ref %build-inputs "libigl-test-data")))
- (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)")
- (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)")
- "")
- (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") ""))
- ;; Install otherwise missing headers
- (substitute* "cmake/libigl.cmake"
- (("install_dir_files\\(copyleft\\)" all)
- (string-join (list all
- "install_dir_files(copyleft/cgal)"
- "install_dir_files(copyleft/opengl)"
- "install_dir_files(copyleft/tetgen)"
- "install_dir_files(embree)"
- "install_dir_files(opengl)"
- "install_dir_files(png)"
- "install_dir_files(predicates)"
- "install_dir_files(xml)")
- "\n"))))))))
+ (fix-external-library "comiso" "libigl-comiso")
+ (fix-external-library "tetgen" "libigl-tetgen")
+ (fix-external-library "triangle" "libigl-triangle")
+ (fix-external-library "predicates" "libigl-predicates")
+ (fix-external-library "glad" "libigl-glad")
+ (fix-external-library "libigl_tests_data" "libigl-test-data")
+ (fix-external-library "stb" "libigl-stb")
+ (substitute* "cmake/recipes/external/imguizmo.cmake"
+ (("if\\(TARGET imguizmo::imguizmo\\)")
+ "if(true)")
+ (("target_link_libraries.*")
+ (format #f "include_directories(~a/include/imgui/)"
+ (assoc-ref inputs "imgui"))))
+
+ (substitute* "cmake/igl/igl_add_test.cmake"
+ (("include\\(\".*/contrib/Catch.cmake\"\\)")
+ (format #f
+ "include(\"~a/lib/cmake/Catch2/Catch.cmake\")"
+ (assoc-ref inputs "catch2"))))
+ (substitute* "cmake/recipes/external/cgal.cmake"
+ (("FetchContent_Populate\\(cgal\\)")
+ "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()"))
+ (substitute* "cmake/recipes/external/eigen.cmake"
+ (("FetchContent_Populate\\(eigen\\)")
+ "find_package(Eigen3 CONFIG REQUIRED)\nreturn()"))
+ (substitute* "cmake/recipes/external/catch2.cmake"
+ (("message.*")
+ "find_package(Catch2 CONFIG)\nreturn()"))
+ (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake"
+ (("if\\(TARGET igl::imgui_fonts\\)")
+ "if(true)"))
+ (substitute* "cmake/recipes/external/tinyxml2.cmake"
+ (("FetchContent_Populate\\(tinyxml2\\)")
+ "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()"))
+ (substitute* "cmake/recipes/external/embree.cmake"
+ (("FetchContent_MakeAvailable\\(embree\\)")
+ (string-join (list "find_package(Embree 3 CONFIG)"
+ "add_library(embree::embree ALIAS embree)"
+ "return()")
+ "\n")))
+ (substitute* "cmake/recipes/external/glfw.cmake"
+ (("FetchContent_MakeAvailable\\(glfw\\)")
+ (string-join
+ (list "find_package(glfw3 CONFIG REQUIRED)"
+ "add_library(glfw::glfw ALIAS glfw)"
+ "return()")
+ "\n")))
+ (substitute* "cmake/recipes/external/imgui.cmake"
+ (("FetchContent_MakeAvailable\\(imgui\\)")
+ "return()"))))
+
+ (add-after 'unpack-external 'fix-assertions
+ (lambda _
+ ;; Current Tetgen version has a bug.
+ (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp"
+ (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);")
+ ";"))
+ ;; CGAL has a bug in assertion as well.
+ (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp"
+ (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);")
+ ";"))))
+
+ ;; XXX: Install modules as CMake fails to install them.
+ (add-after 'install 'install-includes
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (include-dir (string-append out "/include/igl/")))
+ (for-each (lambda (module)
+ (copy-recursively (format #f
+ "../source/include/igl/~a"
+ module)
+ (format #f
+ "~a/~a"
+ include-dir
+ module)))
+ (list "copyleft/cgal"
+ "copyleft/opengl2"
+ "copyleft/tetgen"
+ "embree"
+ "opengl"
+ "predicates"
+ "xml"))))))))
+
+ (native-inputs (list catch2))
;; XXX: Inputs are currently only used to build tests.
;; We would need to patch the CMake recipe to build a shared library
;; with all of these.
(inputs
`(("boost" ,boost)
- ("catch2" ,catch2)
("cgal" ,cgal)
("eigen" ,eigen)
("embree" ,embree)
- ("glfw" ,glfw)
+ ("glfw" ,glfw-3.4)
("gmp" ,gmp)
("mesa" ,mesa)
("mpfr" ,mpfr)
("tbb" ,tbb)
("tinyxml2" ,tinyxml2)
+ ("openblas" ,openblas)
+ ("imgui" ,imgui)
+ ("spectra" ,spectra)
;; When updating this package, update commit fields below according to
;; the hashes listed in "cmake/LibiglDownloadExternal.cmake".
("libigl-test-data"
@@ -3634,15 +3864,20 @@ perform various useful functions such as:
(url "https://github.com/libigl/libigl-tests-data")
(commit "19cedf96d70702d8b3a83eb27934780c542356fe")))
(file-name (git-file-name "libigl-test-data" version))
- (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2"))))
+ (sha256
+ (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2"))))
("libigl-glad"
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libigl/libigl-glad")
- (commit "09b4969c56779f7ddf8e6176ec1873184aec890f")))
- (file-name (git-file-name "libigl-glad" version))
- (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk"))))
+ ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a")
+ (revision "0")
+ (version (git-version "0.0.0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libigl/libigl-glad")
+ (commit commit)))
+ (file-name (git-file-name "libigl-glad" version))
+ (sha256
+ (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay")))))
("libigl-stb"
,(origin
(method git-fetch)
@@ -3650,34 +3885,124 @@ perform various useful functions such as:
(url "https://github.com/libigl/libigl-stb.git")
(commit "cd0fa3fcd90325c83be4d697b00214e029f94ca3")))
(file-name (git-file-name "libigl-stb" version))
- (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj"))))
+ (sha256
+ (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj"))))
("libigl-predicates"
+ ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f")
+ (revision "0")
+ (version (git-version "0.0.0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libigl/libigl-predicates.git")
+ (commit commit)))
+ (file-name (git-file-name "libigl-predicates" version))
+ (sha256
+ (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz")))))
+ ;; TODO: Package tetgen separately from <http://www.tetgen.org>
+ ("libigl-tetgen"
+ ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6")
+ (revision "0")
+ (version (git-version "0.0.0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libigl/tetgen.git")
+ (commit commit)))
+ (file-name (git-file-name "libigl-tetgen" version))
+ (sha256
+ (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))
+ ("libigl-comiso"
+ ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55")
+ (revision "0")
+ (version (git-version "0.0.0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libigl/comiso.git")
+ (commit commit)))
+ (file-name (git-file-name "libigl-comiso" version))
+ (sha256
+ (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba")))))
+ ("libigl-triangle"
,(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/libigl/libigl-predicates.git")
- (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4")))
- (file-name (git-file-name "libigl-predicates" version))
- (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh"))))
- ;; TODO: Package tetgen separately from <http://www.tetgen.org>
- ("libigl-tetgen"
+ (url "https://github.com/libigl/triangle.git")
+ (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68")))
+ (file-name (git-file-name "libigl-triangle" version))
+ (sha256
+ (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3"))))
+
+ ;; XXX: This is a source-only library which is currently required only
+ ;; for libigl.
+
+ ("imguizmo"
,(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/libigl/tetgen.git")
- (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6")))
- (file-name (git-file-name "libigl-tetgen" version))
- (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))))
+ (url "https://github.com/CedricGuillemet/ImGuizmo")
+ (commit "1.83")))
+ (file-name (git-file-name "imguizmo" version))
+ (sha256
+ (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0"))))))
(home-page "https://libigl.github.io/")
(synopsis "Simple C++ geometry processing library")
(description "This library provides functionality for shape modelling,
visualization, matrix manipulation.")
(license (list license:gpl3 license:mpl2.0))))
+(define-public prusa-libbgcode
+ ;; Use the latest commit since there are no proper releases nor tags, see
+ ;; <https://github.com/prusa3d/libbgcode/issues/31>.
+ (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b")
+ (revision "0"))
+ (package
+ (name "prusa-libbgcode")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prusa3d/libbgcode")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw"))))
+ (native-inputs (list catch2))
+ (propagated-inputs (list zlib boost heatshrink))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/prusa3d/libbgcode")
+ (synopsis "Prusa Block and Binary G-code reader/writer/converter")
+ (description
+ "Binary G-code is a new standard for encoding and compressing ASCII G-code
+files. G-code files are easy to read and interpret, but their downside is that the
+data is not saved efficiently, and the file size is often very large. Compression of
+the file is problematic because the printers usually run on limited hardware and they
+may not have enough memory and/or CPU power to decompress it.
+
+Block and Binary G-Code is a new G-code file format featuring the following
+improvements over the legacy G-code:
+@itemize
+@item Block structure with distinct blocks for metadata vs. G-code.
+@item Faster navigation.
+@item Coding and compression for smaller file size.
+@item Checksum for data validity.
+@item Extensibility through new (custom) blocks. For example, a file signature block
+may be welcome by corporate customers.
+@end itemize
+
+The binary G-code format is flexible and the encoding and compression of individual
+blocks is variable. @code{libbgcode} library contains the routines to convert ASCII
+G-codes to binary and vice versa.")
+ ;; See
+ ;; <https://github.com/prusa3d/libbgcode/blob/main/pyproject.toml>
+ (license license:agpl3+))))
+
(define-public prusa-slicer
(package
(name "prusa-slicer")
- (version "2.5.2")
+ (version "2.7.4")
(source
(origin
(method git-fetch)
@@ -3686,13 +4011,11 @@ visualization, matrix manipulation.")
(url "https://github.com/prusa3d/PrusaSlicer")
(commit (string-append "version_" version))))
(file-name (git-file-name name version))
- (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151"))
- (patches (search-patches "prusa-slicer-boost-fixes.patch"
- "prusa-slicer-fix-tests.patch"
- "prusa-slicer-with-cereal-1.3.1.patch"))
+ (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3"))
+ (patches (search-patches "prusa-slicer-fix-tests.patch"))
(modules '((guix build utils)))
(snippet
- '(begin
+ `(begin
;; Prusa slicer bundles a lot of dependencies in src/ directory.
;; Most of them contain prusa-specific modifications (e.g. avrdude),
;; but others do not. Here we replace the latter with Guix packages.
@@ -3700,10 +4023,12 @@ visualization, matrix manipulation.")
(delete-file-recursively "src/hidapi")
(delete-file-recursively "src/eigen")
(delete-file-recursively "src/libigl/igl")
+ (substitute* "CMakeLists.txt"
+ (("add_library\\(libexpat INTERFACE\\)")
+ ""))
+ (substitute* "src/libigl/CMakeLists.txt"
+ (("target_link_libraries\\(libigl INTERFACE igl::core\\)") ""))
(substitute* "src/CMakeLists.txt"
- (("add_subdirectory\\(libigl\\)" all)
- (string-append
- all "\ninclude_directories(libigl INTERFACE libigl::core)"))
(("add_subdirectory\\(hidapi\\)")
"pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)")
(("include_directories\\(hidapi/include\\)")
@@ -3716,13 +4041,26 @@ visualization, matrix manipulation.")
(("\\bhidapi\\b") "${HIDAPI_LIBRARIES}"))))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags
- '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard.
- "-DSLIC3R_GTK=3" ;; Use GTK+
- ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers.
- "-DSLIC3R_WX_STABLE=1")))
+ (list #:configure-flags
+ #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard.
+ "-DSLIC3R_GTK=3" ;; Use GTK+
+ ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers.
+ "-DSLIC3R_WX_STABLE=1"
+ (format #f "-Dlibigl_DIR=~a"
+ (search-input-directory %build-inputs
+ "lib/cmake/igl/"))
+ (format #f "-DCatch2_DIR=~a"
+ (search-input-directory %build-inputs
+ "lib/cmake/Catch2/")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-include-paths
+ (lambda _
+ (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp"
+ (("#include <libigl/igl/qslim.h>")
+ "#include <igl/qslim.h>")))))))
(native-inputs
- (list pkg-config))
+ (list pkg-config catch2))
(inputs
(list boost
cereal
@@ -3730,11 +4068,13 @@ visualization, matrix manipulation.")
curl
dbus
eigen
+ eudev
expat
glew
glib
gmp
gtk+
+ heatshrink
hidapi
ilmbase
libigl
@@ -3742,15 +4082,17 @@ visualization, matrix manipulation.")
libpng
mesa
mpfr
+ nanosvg
nlopt
opencascade-occt
openvdb
pango
+ prusa-libbgcode
+ ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled
+ ;; with regular wxwidgets.
+ prusa-wxwidgets
+ qhull
tbb
- eudev
- ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2
- ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299
- wxwidgets-3.0
zlib))
(home-page "https://www.prusa3d.com/prusaslicer/")
(synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)")
@@ -3764,16 +4106,17 @@ G-code instructions for FFF printers or PNG layers for mSLA 3D printers.")
(define-public wireviz
(package
(name "wireviz")
- (version "0.3.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "wireviz" version))
- (sha256
- (base32
- "1dgnlxxlna2m1fh0ybivw0psym0sa5cqsl72mjl79bwfspnif61h"))))
+ (version "0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "wireviz" version))
+ (sha256
+ (base32 "1qbh0pknpymc42k4661b8ghbfk9him75xx57siyrl9is5s6as98f"))))
(build-system python-build-system)
- (propagated-inputs (list python-graphviz python-pillow python-pyyaml))
- (home-page "https://github.com/formatc1702/WireViz")
+ (propagated-inputs
+ (list python-click python-graphviz python-pillow python-pyyaml))
+ (home-page "https://github.com/wireviz/WireViz")
(synopsis "Easily document cables and wiring harnesses")
(description
"WireViz is a tool for easily documenting cables, wiring harnesses and
@@ -4126,7 +4469,8 @@ python bindings. It belongs to the Cura project from Ultimaker.")
python-pytest
python-requests))
(inputs
- (list cura-engine
+ (list bash-minimal
+ cura-engine
libcharon
libsavitar
python
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 7860c43fef..cf9fe93b27 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -149,8 +149,8 @@
"-Dbuild-examples=false"
"-Decore-imf-loaders-disabler=scim"
"-Dglib=true"
- "-Dmount-path=/run/setuid-programs/mount"
- "-Dunmount-path=/run/setuid-programs/umount"
+ "-Dmount-path=/run/privileged/bin/mount"
+ "-Dunmount-path=/run/privileged/bin/umount"
"-Dnetwork-backend=connman"
,,@(if (member (%current-system)
(package-transitive-supported-systems luajit))
@@ -338,7 +338,7 @@ Libraries with some extra bells and whistles.")
(substitute* '("src/bin/e_sys_main.c"
"src/bin/e_util_suid.h")
(("PATH=/bin:/usr/bin:/sbin:/usr/sbin")
- (string-append "PATH=/run/setuid-programs:"
+ (string-append "PATH=/run/privileged/bin:"
"/run/current-system/profile/bin:"
"/run/current-system/profile/sbin")))
(substitute* "src/modules/everything/evry_plug_calc.c"
@@ -347,8 +347,8 @@ Libraries with some extra bells and whistles.")
(("libddcutil\\.so\\.?" libddcutil)
(string-append ddcutil "/lib/" libddcutil)))
(substitute* "data/etc/meson.build"
- (("/bin/mount") "/run/setuid-programs/mount")
- (("/bin/umount") "/run/setuid-programs/umount")
+ (("/bin/mount") "/run/privileged/bin/mount")
+ (("/bin/umount") "/run/privileged/bin/umount")
(("/usr/bin/eject") "/run/current-system/profile/bin/eject"))
(substitute* "src/bin/system/e_system_power.c"
(("systemctl") "loginctl"))))))))
diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
index 5827da1d07..5a8bbc8e4f 100644
--- a/gnu/packages/entr.scm
+++ b/gnu/packages/entr.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,14 +36,14 @@
(define-public entr
(package
(name "entr")
- (version "5.4")
+ (version "5.5")
(source (origin
(method url-fetch)
(uri (string-append "https://eradman.com/entrproject/code/entr-"
version ".tar.gz"))
(sha256
(base32
- "17hz4aca6dsh6z58625jg8fbk5m9ng3s95pl4s6ws79zrk9dw7a9"))))
+ "09p5aqbb95bysdx73n094v0b07hn3v9kqg6k7yyycnpaxzi0r30j"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
diff --git a/gnu/packages/erlang-xyz.scm b/gnu/packages/erlang-xyz.scm
new file mode 100644
index 0000000000..6f1c033aec
--- /dev/null
+++ b/gnu/packages/erlang-xyz.scm
@@ -0,0 +1,666 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
+;;;
+;;; 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 packages erlang-xyz)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages erlang)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages serialization)
+ #:use-module (gnu packages sqlite)
+ #:use-module (gnu packages tls)
+ #:use-module (guix build-system rebar)
+ #:use-module (guix download)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix utils))
+
+(define-public erlang-luerl
+ (package
+ (name "erlang-luerl")
+ (version "1.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "luerl" version))
+ (sha256
+ (base32 "0paj3gr0kn8v9g6wmdnz1f16q0iy1pb83zbqsalzbw2g17vd9bww"))))
+ (build-system rebar-build-system)
+ (synopsis "Implementation of Lua on Erlang")
+ (description "This package provides implementation of Lua on Erlang.")
+ (home-page "https://hex.pm/packages/luerl")
+ (license license:asl2.0)))
+
+(define-public erlang-jose
+ (package
+ (name "erlang-jose")
+ (version "1.11.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "jose" version))
+ (sha256
+ (base32 "0576jdjygby37qmzrs8cm5l6n622b0mi3z28j6r4s5xsz1px6v0d"))))
+ (build-system rebar-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Do not treat warnings as errors, for more info see:
+ ;; https://github.com/potatosalad/erlang-jose/issues/168
+ (add-after 'unpack 'relax-build-options
+ (lambda _
+ (substitute* "rebar.config"
+ (("debug_info,") "debug_info"))
+ (substitute* "rebar.config"
+ (("warnings_as_errors") "")))))))
+ (synopsis
+ "JSON Object Signing and Encryption for Erlang and Elixir")
+ (description
+ "This package provides JSON Object Signing and Encryption (JOSE) for
+Erlang and Elixir.")
+ (home-page "https://hex.pm/packages/jose")
+ (license license:expat)))
+
+(define-public erlang-jiffy
+ (package
+ (name "erlang-jiffy")
+ (version "1.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "jiffy" version))
+ (sha256
+ (base32 "10gkbi48in96bzkv7f2cqw9119krpd40whcsn0yd7fr0lx1bqqdv"))))
+ (build-system rebar-build-system)
+ (native-inputs (list erlang-pc
+ python)) ; for tests
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "JSON Decoder/Encoder")
+ (description "This package provides JSON Decoder/Encoder for Erlang.")
+ (home-page "https://hex.pm/packages/jiffy")
+ (license license:expat)))
+
+(define-public erlang-pkix
+ (package
+ (name "erlang-pkix")
+ (version "1.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "pkix" version))
+ (sha256
+ (base32 "03jxmjirg98r1zq7b1f3mnwm8pb1iac2iaxi85615jwl63w688g0"))))
+ (build-system rebar-build-system)
+ (synopsis "PKIX management")
+ (description "This package provides PKIX management for Erlang.")
+ (home-page "https://hex.pm/packages/pkix")
+ (license license:asl2.0)))
+
+(define-public erlang-p1-acme
+ (package
+ (name "erlang-p1-acme")
+ (version "1.0.23")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "p1_acme" version))
+ (sha256
+ (base32 "0nfxs3ldgbh7a8r7wxl0gw98r1v50jaj54c0nw8fl8ixdvr9dqcc"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-base64url erlang-idna erlang-jiffy erlang-jose
+ erlang-yconf))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
+ (synopsis "ACME client for Erlang")
+ (description "This package provides ACME client for Erlang.")
+ (home-page "https://hex.pm/packages/p1_acme")
+ (license license:asl2.0)))
+
+(define-public erlang-p1-oauth2
+ (package
+ (name "erlang-p1-oauth2")
+ (version "0.6.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "p1_oauth2" version))
+ (sha256
+ (base32 "13xfk4flaqb3nsxirf3vmy3yv67n6s6xzil7bafjswj39r3srlqz"))))
+ (build-system rebar-build-system)
+ (synopsis "OAuth 2.0 implementation for Erlang")
+ (description "This package provides OAuth 2.0 implementation for Erlang.")
+ (home-page "https://hex.pm/packages/p1_oauth2")
+ (license (list license:expat license:asl2.0))))
+
+(define-public erlang-p1-utils
+ (package
+ (name "erlang-p1-utils")
+ (version "1.0.26")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "p1_utils" version))
+ (sha256
+ (base32 "0k5hfqrjrvgh7gknqj5pzpra9k1g0bgc2ac19zb8pfan2669wdyh"))))
+ (build-system rebar-build-system)
+ (synopsis "ProcessOne utility modules for Erlang")
+ (description "This package provides ProcessOne utility modules for Erlang.")
+ (home-page "https://hex.pm/packages/p1_utils")
+ (license license:asl2.0)))
+
+(define-public erlang-p1-mysql
+ (package
+ (name "erlang-p1-mysql")
+ (version "1.0.24")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "p1_mysql" version))
+ (sha256
+ (base32 "0pv5zfpkw6sgmn6jbm5k635xnx8kkcvgynka5ix50zr5cigqcn7h"))))
+ (build-system rebar-build-system)
+ (synopsis "Pure Erlang MySQL driver")
+ (description "This package provides pure Erlang @code{MySQL} driver.")
+ (home-page "https://hex.pm/packages/p1_mysql")
+ (license license:asl2.0)))
+
+(define-public erlang-p1-pgsql
+ (package
+ (name "erlang-p1-pgsql")
+ (version "1.1.27")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "p1_pgsql" version))
+ (sha256
+ (base32 "1fgzchikv31gbyid3qqy9wzwmap1nalwb7fqal77hs6b09v1lkcf"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-xmpp))
+ (synopsis "PostgreSQL driver for Erlang")
+ (description "This package provides @code{PostgreSQL} driver for Erlang.")
+ (home-page "https://hex.pm/packages/p1_pgsql")
+ (license license:asl2.0)))
+
+(define-public erlang-sqlite3
+ (package
+ (name "erlang-sqlite3")
+ (version "1.1.15")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "sqlite3" version))
+ (sha256
+ (base32 "0mr8kpv8hf4yknx8vbmyakgasrhk64ldsbafvr4svhi26ghs82rw"))))
+ (build-system rebar-build-system)
+ (native-inputs (list erlang-pc sqlite))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "SQLite3 driver for Erlang")
+ (description "This package provides SQLite3 driver for Erlang.")
+ (home-page "https://hex.pm/packages/sqlite3")
+ (license license:asl2.0)))
+
+(define-public erlang-stringprep
+ (package
+ (name "erlang-stringprep")
+ (version "1.0.30")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "stringprep" version))
+ (sha256
+ (base32 "16hb49f9ghx8sqrs7928fjig9wyah22z7cl91y1pff50hhrrpz7n"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Fast Stringprep Erlang/Elixir implementation")
+ (description "This package provides fast Stringprep Erlang/Elixir
+implementation.")
+ (home-page "https://hex.pm/packages/stringprep")
+ (license license:asl2.0)))
+
+(define-public erlang-cache-tab
+ (package
+ (name "erlang-cache-tab")
+ (version "1.0.31")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "cache_tab" version))
+ (sha256
+ (base32 "0lb35g3p3ybij5f7fnilq3ni37nfgzhajnrmhvplgch9985bd0l5"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "In-memory cache Erlang/Elixir library")
+ (description "This package provides in-memory cache Erlang/Elixir library.")
+ (home-page "https://hex.pm/packages/cache_tab")
+ (license license:asl2.0)))
+
+(define-public erlang-eimp
+ (package
+ (name "erlang-eimp")
+ (version "1.0.23")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "eimp" version))
+ (sha256
+ (base32 "12k2df0mwq16rh77ziiahq9mjd9cy2jfdnsbzkj96a6b4c07hz4h"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Erlang/Elixir image converter")
+ (description "This package provides Erlang/Elixir image converter.")
+ (home-page "https://hex.pm/packages/eimp")
+ (license license:asl2.0)))
+
+(define-public erlang-mqtree
+ (package
+ (name "erlang-mqtree")
+ (version "1.0.17")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "mqtree" version))
+ (sha256
+ (base32 "18z23c1axn6y9799f0ydb0m29wxvq956b57bzk886ixwiz7vgs2z"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Index tree for MQTT topic filters")
+ (description "This package provides index tree for MQTT topic filters.")
+ (home-page "https://hex.pm/packages/mqtree")
+ (license license:asl2.0)))
+
+(define-public erlang-ezlib
+ (package
+ (name "erlang-ezlib")
+ (version "1.0.13")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "ezlib" version))
+ (sha256
+ (base32 "1fxz584ry1ib35r74hbmapwq71j5iv5rymm927ys0mgdz2rjmrly"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Native zlib driver for Erlang/Elixir")
+ (description "This package provides native zlib driver for Erlang/Elixir.")
+ (home-page "https://hex.pm/packages/ezlib")
+ (license license:asl2.0)))
+
+(define-public erlang-fast-tls
+ (package
+ (name "erlang-fast-tls")
+ (version "1.1.21")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "fast_tls" version))
+ (sha256
+ (base32 "0nsh5597pa1643kj2mmp05anss2r0gq83al0rm45w0ip768l458k"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils openssl))
+ (native-inputs (list erlang-pc openssl))
+ (arguments
+ (list
+ #:tests? #f ; some required files are absent
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-/bin/sh
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((sh (search-input-file inputs "/bin/sh")))
+ (substitute* "configure"
+ (("/bin/sh") sh)))))
+ (add-after 'unpack 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc")
+ (let ((openssl (assoc-ref %build-inputs "openssl")))
+ (setenv "LDFLAGS" (string-append "-L" openssl "/lib"))
+ (setenv "CFLAGS" (string-append "-I" openssl "/include")))))
+ (add-before 'build 'configure
+ (lambda _
+ (invoke "./configure"))))))
+ (synopsis "TLS/SSL OpenSSL-based native driver for Erlang/Elixir")
+ (description
+ "This package provides TLS/SSL @code{OpenSSL}-based native driver
+for Erlang/Elixir.")
+ (home-page "https://hex.pm/packages/fast_tls")
+ (license license:asl2.0)))
+
+(define-public erlang-stun
+ (package
+ (name "erlang-stun")
+ (version "1.2.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "stun" version))
+ (sha256
+ (base32 "10qm6wh6smj3ixpy251x5w2b9iv51vhgxvk49vczz3bs3dxq0d71"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-fast-tls erlang-p1-utils))
+ (synopsis "STUN and TURN library for Erlang/Elixir")
+ (description "This package provodes STUN and TURN library for
+Erlang/Elixir.")
+ (home-page "https://hex.pm/packages/stun")
+ (license license:asl2.0)))
+
+(define-public erlang-fast-xml
+ (package
+ (name "erlang-fast-xml")
+ (version "1.1.52")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "fast_xml" version))
+ (sha256
+ (base32 "1z8vrpnjx8y9qfqhhj4is8k4lzvjlnzhp6d62r8bdlh61qwr4lbr"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Fast Expat-based Erlang/Elixir XML parsing library")
+ (description "This package provides fast Expat-based Erlang/Elixir XML
+parsing library.")
+ (home-page "https://hex.pm/packages/fast_xml")
+ (license license:asl2.0)))
+
+(define-public erlang-xmpp
+ (package
+ (name "erlang-xmpp")
+ (version "1.8.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "xmpp" version))
+ (sha256
+ (base32 "04gpka0dp03jvgnin1g12ha4yzwy1h44rds3zzf1ia49k9ghcw7d"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-ezlib
+ erlang-fast-tls
+ erlang-fast-xml
+ erlang-idna
+ erlang-p1-utils
+ erlang-stringprep))
+ (native-inputs (list erlang-pc erlang-provider-asn1))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "XMPP parsing and serialization library for Erlang/Elixir")
+ (description "This package provides XMPP parsing and serialization library
+for Erlang/Elixir.")
+ (home-page "https://hex.pm/packages/xmpp")
+ (license license:asl2.0)))
+
+(define-public erlang-esip
+ (package
+ (name "erlang-esip")
+ (version "1.0.54")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "esip" version))
+ (sha256
+ (base32 "1vip49gbz1z6sgrab6021fdlqq7g7712d5znvanwsnbjkn0sz1w1"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-fast-tls erlang-p1-utils erlang-stun))
+ (native-inputs (list erlang-pc))
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "SIP server component in Erlang")
+ (description "This package provides ProcessOne SIP server component in
+Erlang.")
+ (home-page "https://hex.pm/packages/esip")
+ (license license:asl2.0)))
+
+(define-public erlang-fast-yaml
+ (package
+ (name "erlang-fast-yaml")
+ (version "1.0.37")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "fast_yaml" version))
+ (sha256
+ (base32 "0sd72nal5i6mbmicsmb494mr4g0gvs719lzp2hj1gqpp3dr6is4d"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-p1-utils))
+ (native-inputs (list erlang-pc libyaml))
+ (arguments
+ (list
+ #:tests? #f ; some required files are absent
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc")
+ (let ((openssl (assoc-ref %build-inputs "libyaml")))
+ (setenv "LDFLAGS" (string-append "-L" openssl "/lib"))
+ (setenv "CFLAGS" (string-append "-I" openssl "/include"))))))))
+ (synopsis "Fast YAML native library for Erlang/Elixir")
+ (description "This package provides fast YAML native library for
+Erlang/Elixir.")
+ (home-page "https://hex.pm/packages/fast_yaml")
+ (license license:asl2.0)))
+
+(define-public erlang-yconf
+ (package
+ (name "erlang-yconf")
+ (version "1.0.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "yconf" version))
+ (sha256
+ (base32 "12bcb0w0nc30bws4lx2ghnz7n755r6nf9a75nb3i31zkfcr82iz9"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-fast-yaml))
+ (synopsis "YAML configuration processor")
+ (description "This package provides YAML configuration processor.")
+ (home-page "https://hex.pm/packages/yconf")
+ (license license:asl2.0)))
+
+(define-public erlang-epam
+ (package
+ (name "erlang-epam")
+ (version "1.0.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "epam" version))
+ (sha256
+ (base32 "12frsirp8m0ajdb19xi1g86zghhgvld5cgw459n2m9w553kljd1g"))))
+ (build-system rebar-build-system)
+ (native-inputs (list erlang-pc linux-pam))
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc"))))))
+ (synopsis "Helper for PAM authentication support")
+ (description "This package provides epam helper for PAM authentication
+support.")
+ (home-page "https://hex.pm/packages/epam")
+ (license license:asl2.0)))
+
+(define-public erlang-eredis
+ (package
+ (name "erlang-eredis")
+ (version "1.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "eredis" version))
+ (sha256
+ (base32 "1h9wihjqs4fmgr5ihqpisf7k99h006dsf71lygp5zmgycv2m8avw"))))
+ (build-system rebar-build-system)
+ (synopsis
+ "Non-blocking Redis client with focus on performance and robustness")
+ (description
+ "This package provides non-blocking Redis client for Erlang with focus
+on performance and robustness.")
+ (home-page "https://hex.pm/packages/eredis")
+ (license license:expat)))
+
+(define-public erlang-unicode-util-compat
+ (package
+ (name "erlang-unicode-util-compat")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "unicode_util_compat" version))
+ (sha256
+ (base32 "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"))))
+ (build-system rebar-build-system)
+ (synopsis "Compatibility library for Erlang < 20")
+ (description "This package provides @code{unicode_util} compatibility
+library for Erlang < 20.")
+ (home-page "https://hex.pm/packages/unicode_util_compat")
+ (license license:asl2.0)))
+
+(define-public erlang-idna
+ (package
+ (name "erlang-idna")
+ (version "6.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "idna" version))
+ (sha256
+ (base32 "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-unicode-util-compat))
+ (synopsis "Pure Erlang IDNA implementation")
+ (description "This package provides a pure Erlang IDNA implementation.")
+ (home-page "https://hex.pm/packages/idna")
+ (license license:expat)))
+
+(define-public erlang-base64url
+ (package
+ (name "erlang-base64url")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "base64url" version))
+ (sha256
+ (base32 "0p4zf53v86zfpnk3flinjnk6cx9yndsv960386qaj0hsfgaavczr"))))
+ (build-system rebar-build-system)
+ (synopsis "URL safe base64-compatible codec")
+ (description "This package provides URL safe base64-compatible codec
+for Erlang.")
+ (home-page "https://hex.pm/packages/base64url")
+ (license license:expat)))
+
+;;;
+;;; 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
+;;; functionality or similar names.
+;;;
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index c53cb72c2e..175bbdf8a5 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 wrobell <wrobell@riseup.net>
;;; Copyright © 2023 Tim Johann <t1m@phrogstar.de>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,7 +49,7 @@
(define-public erlang
(package
(name "erlang")
- (version "25.3.2")
+ (version "27.0.1")
(source (origin
(method git-fetch)
;; The tarball from http://erlang.org/download contains many
@@ -60,7 +61,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "092lym5a181gz89nscw7kqhw1wa6qvgcpkj80q4i9p79mxmsr1nj"))
+ "1gzlvbbc1zm87910pnhi94mcpag1zxylhy7m2g4vhlmclyir7gd1"))
(patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system)
(native-inputs
@@ -68,13 +69,17 @@
;; Erlang's documentation is distributed in a separate tarball.
("erlang-manpages"
- ,(origin
- (method url-fetch)
- (uri (string-append "http://erlang.org/download/otp_doc_man_"
- (version-major+minor version) ".tar.gz"))
- (sha256
- (base32
- "0vnpds5q17xc4jjj3sbsllpx68wyhgvx70714vkzyd68rbjmhmk7"))))))
+ ;; Manpages tarball is not released for 27.0.1, so we take it from the
+ ;; previous version. Details:
+ ;; https://erlangforums.com/t/patch-package-otp-27-0-1-released/3824/4
+ ,(let ((version "27.0"))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/erlang/otp/releases/download"
+ "/OTP-" version "/otp_doc_man_" version ".tar.gz"))
+ (sha256
+ (base32
+ "0f3w2152090860aci4a38d1bd19c5sslbwadwxc7sjza487fm8lm")))))))
(inputs
(list ncurses openssl wxwidgets))
(propagated-inputs
@@ -83,6 +88,7 @@
`(#:test-target "release_tests"
#:configure-flags
(list "--disable-saved-compile-time"
+ "--enable-deterministic-build"
"--enable-dynamic-ssl-lib"
"--enable-native-libs"
"--enable-shared-zlib"
@@ -105,34 +111,22 @@
(time-utc->date
(make-time time-utc 0 (string->number
(getenv "SOURCE_DATE_EPOCH"))))))
- (substitute* "lib/reltool/src/reltool_target.erl"
- (("Date = date\\(\\),")
- (string-append "Date = "
- (date->string source-date-epoch
- "'{~Y,~m,~d}',"))))
- (substitute* "lib/reltool/src/reltool_target.erl"
- (("Time = time\\(\\),")
- (string-append "Time = "
- (date->string source-date-epoch
- "'{~H,~M,~S}',"))))
- (substitute* '("lib/reltool/src/reltool_target.erl"
- "lib/sasl/src/systools_make.erl")
- (("date\\(\\), time\\(\\),")
- (date->string source-date-epoch
- "{~Y,~m,~d}, {~H,~M,~S},")))
(substitute* "lib/dialyzer/test/small_SUITE_data/src/gs_make.erl"
(("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)")
(date->string
source-date-epoch
- "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})")))
- (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl"
- (("\\{Y,Mo,D\\} = date\\(\\),")
- (date->string source-date-epoch
- "{Y,Mo,D} = {~Y,~m,~d},")))
- (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl"
- (("\\{H,Mi,S\\} = time\\(\\),")
- (date->string source-date-epoch
- "{H,Mi,S} = {~H,~M,~S},"))))))
+ "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))))))
+ ;; When compiling with 'deterministic' option the important meta
+ ;; information is still needed for some Erlang's dependants, such as
+ ;; Elixir. We make compiler to preserve it.
+ ;; For more info see: https://github.com/erlang/otp/issues/8602
+ (add-after 'unpack 'preserve-source-meta
+ (lambda _
+ (substitute* "lib/compiler/src/compile.erl"
+ (("\\[\\{source,Source\\} \\| Info0\\];")
+ "[{source,Source} | Info0];
+ [_|_] = Source when IsDeterministic ->
+ [{source,Source} | Info0];"))))
(add-after 'unpack 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
(let ((sh (search-input-file inputs "/bin/sh")))
@@ -159,10 +153,21 @@
"lib/reltool/examples/display_args"
"lib/reltool/examples/mnesia_core_dump_viewer"
"lib/snmp/src/compile/snmpc.src"
- "make/verify_runtime_dependencies"
- "make/emd2exml.in"))))
+ "make/verify_runtime_dependencies"))))
(substitute* escripts
(("/usr/bin/env") (which "env"))))))
+ ;; Copy modified compiler to bootstrap. It is deterministic, but
+ ;; preserves 'source' meta information to be used by dependants
+ ;; of Erlang.
+ (add-after 'build 'copy-modified-compiler
+ (lambda _
+ (copy-recursively "lib/compiler/ebin/compile.beam"
+ "bootstrap/lib/compiler/ebin/compile.beam")))
+ ;; ... clean everything and rebuild with modified bootstrap.
+ (add-after 'copy-modified-compiler 'clean-and-make-again
+ (lambda _
+ (invoke "make" "clean")
+ (invoke "make")))
(add-before 'configure 'set-erl-top
(lambda _
(setenv "ERL_TOP" (getcwd))))
@@ -180,7 +185,10 @@
(share (string-append out "/share/")))
(mkdir-p share)
(with-directory-excursion share
- (invoke "tar" "xvf" manpages))))))))
+ (invoke "tar" "xvf" manpages)))))
+ (add-after 'install-doc 'install-chunks
+ (lambda _
+ (invoke "make" "install-docs" "DOC_TARGETS=chunks"))))))
(home-page "https://www.erlang.org/")
(synopsis "The Erlang programming language")
(description
@@ -247,13 +255,13 @@ Mustache template engine")
(define-public erlang-certifi
(package
(name "erlang-certifi")
- (version "2.9.0")
+ (version "2.13.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "certifi" version))
(sha256
- (base32 "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"))))
+ (base32 "1887qmxp7qmha4c8k4m4cw35iii15srrdmfmvypp0q7hl0rragcg"))))
(build-system rebar-build-system)
(arguments
`(#:tests? #f)) ;; have not been updated for latest cert bundle
@@ -286,37 +294,40 @@ printing extending the io:format syntax to add colours.")
(license license:expat)))
(define-public erlang-yamerl
- (package
- (name "erlang-yamerl")
- (version "0.10.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- ;; There are no tests included on Hex.
- (url "https://github.com/yakaz/yamerl")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0if8abgmispcfk7zhd0a5dndzwzbsmqrbyrm5shk375r2dbbwak6"))))
- (build-system rebar-build-system)
- (synopsis "YAML and JSON parser in pure Erlang")
- (description
- "Erlang application to parse YAML 1.1 and YAML 1.2 documents, as well as
+ (let ((commit "a24f448c0a8084f70b751dc38621047e56fb53cc")
+ (revision "0"))
+ (package
+ (name "erlang-yamerl")
+ (version (git-version "0.10.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ ;; There are no tests included on Hex.
+ (url "https://github.com/yakaz/yamerl")
+ ;; Fetching commit which includes Erlang 27+ related fixes.
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1csq0z4igyybjgmrynz4d49ysv437iyd2xzkhifb5x47lpdpfpkq"))))
+ (build-system rebar-build-system)
+ (synopsis "YAML and JSON parser in pure Erlang")
+ (description
+ "Erlang application to parse YAML 1.1 and YAML 1.2 documents, as well as
JSON documents.")
- (home-page "https://hexdocs.pm/yamerl/")
- (license license:bsd-2)))
+ (home-page "https://hexdocs.pm/yamerl/")
+ (license license:bsd-2))))
(define-public erlang-covertool
(package
(name "erlang-covertool")
- (version "2.0.4")
+ (version "2.0.6")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "covertool" version))
(sha256
- (base32 "1p0c1n3nl4063xwi1sv176l1x68xqf07qwvj444a5z888fx6i5aw"))))
+ (base32 "088y3m0mmqprq3vd4q0dxrd1plx846mx3m2pv15fmn4047cgrcsx"))))
(build-system rebar-build-system)
(home-page "https://github.com/covertool/covertool")
(synopsis "Convert code-coverage data generated by @code{cover} into
@@ -331,13 +342,13 @@ On @emph{hex.pm}, this plugin was previously called @code{rebar_covertool}.")
(define-public erlang-cth-readable
(package
(name "erlang-cth-readable")
- (version "1.5.1")
+ (version "1.6.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "cth_readable" version))
(sha256
- (base32 "104xgybb6iciy6i28pyyrarqzliddi8kjyq43ajaav7y5si42rb8"))))
+ (base32 "16851qzf2mjgw36s2bx3bb4x2vm8fpg8jk3dz8ph1mai5dim47lh"))))
(build-system rebar-build-system)
(propagated-inputs
(list erlang-cf))
@@ -352,13 +363,13 @@ outputs you want to be readable around all that noise they contain.")
(define-public erlang-edown
(package
(name "erlang-edown")
- (version "0.8.4")
+ (version "0.9.1")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "edown" version))
(sha256
- (base32 "0ij47gvgs6yfqphj0f54qjzj18crj8y1dsjjlzpp3dp8pscqzbqw"))))
+ (base32 "1hl27qnylbjxzmz9w2pnm0wfmkcgyc6bcpmlm6mf35ymkj659ngr"))))
(build-system rebar-build-system)
(home-page "https://github.com/uwiger/edown")
(synopsis "Markdown extension for EDoc")
@@ -369,13 +380,13 @@ Markdown.")
(define-public erlang-erlware-commons
(package
(name "erlang-erlware-commons")
- (version "1.6.0")
+ (version "1.7.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "erlware_commons" version))
(sha256
- (base32 "18qam9xdzi74wppb0cj4zc8161i0i8djr79z8662m6d276f2jz5m"))))
+ (base32 "0fxkfzw3akq1zgiy3xk63irxzfifa5mk34ik75hvlcf0zzs0x1f0"))))
(build-system rebar-build-system)
(propagated-inputs
(list erlang-cf))
@@ -412,13 +423,13 @@ of reusable Erlang components.")
(define-public erlang-getopt
(package
(name "erlang-getopt")
- (version "1.0.2")
+ (version "1.0.3")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "getopt" version))
(sha256
- (base32 "09pasi7ki1rivw9sl7xndj5qgjbdqvcscxk83yk85yr28gm9l0m0"))))
+ (base32 "0krj967wnlnfniscdgzbcsckjb8nwfqr49zp9x4j23slmj8dw0by"))))
(build-system rebar-build-system)
(home-page "https://github.com/jcomellas/getopt")
(synopsis "Command-line options parser for Erlang")
@@ -429,13 +440,13 @@ arguments using the GNU getopt syntax.")
(define-public erlang-hex-core
(package
(name "erlang-hex-core")
- (version "0.8.4")
+ (version "0.10.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "hex_core" version))
(sha256
- (base32 "06p65hlm29ky03vs3fq3qz6px2ylwp8b0f2y75wdf5cm0kx2332b"))))
+ (base32 "0mwz3n5jaabyc77q7w0pqsr5hl4r44bzr90gq30gz9zk5pmrl8hw"))))
(build-system rebar-build-system)
(arguments
`(#:phases
@@ -455,13 +466,13 @@ specifications.")
(define-public erlang-jsone
(package
(name "erlang-jsone")
- (version "1.7.0")
+ (version "1.8.1")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "jsone" version))
(sha256
- (base32 "1gaxiw76syjp3s9rygskm32y9799b917q752rw8bxj3bxq93g8x3"))))
+ (base32 "0f4px5l89a988rc8h79gb35zi0b2pjdy6y66hix1mia88491i2f7"))))
(build-system rebar-build-system)
(arguments
`(#:phases
@@ -479,13 +490,13 @@ specifications.")
(define-public erlang-parse-trans
(package
(name "erlang-parse-trans")
- (version "3.4.1")
+ (version "3.4.2")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "parse_trans" version))
(sha256
- (base32 "16p4c2xjrvz16kzpr9pmcvi6nxq6rwckqi9fp0ksibaxwxn402k2"))))
+ (base32 "1jnr4k93vgcwnphsvczkwgm0pvnfs51sns9fscr5ghxpwdyk89ac"))))
(build-system rebar-build-system)
(inputs
(list erlang-getopt))
@@ -537,6 +548,16 @@ testing of stateful systems.")
(base32
"1wr7jkxm6nlgvd52xhniav64xr9rml2ngb35rwjwqlqvq7ywhp0c"))))
(build-system rebar-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; Fix tests for running under Erlang 27+.
+ (add-after 'unpack 'fix-tests-for-erlang-27
+ (lambda _
+ (substitute* "src/jsx_decoder.erl"
+ (("\\{\"-0\\.0\", \\[\\{float, 0\\.0\\}, end_json\\], <<\"-0\\.0\">>\\},")
+ "{\"0.0\", [{float, 0.0}, end_json], <<\"0.0\">>},
+{\"-0.0\", [{float, -0.0}, end_json], <<\"-0.0\">>},")))))))
(synopsis "Streaming, evented JSON parsing toolkit")
(description
"An Erlang application for consuming, producing and manipulating json.")
@@ -561,16 +582,34 @@ testing of stateful systems.")
(description "This package provides an Erlang providers library.")
(license license:asl2.0)))
+(define-public erlang-provider-asn1
+ (package
+ (name "erlang-provider-asn1")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "provider_asn1" version))
+ (sha256
+ (base32 "01gvpwdlkpmvzi280rn66f5ijlvap6k368yzpb0mmlv2hrcsbrrj"))))
+ (build-system rebar-build-system)
+ (inputs (list erlang-providers))
+ (synopsis "Compile ASN.1 with Rebar3")
+ (description "This package contains plugin for ASN.1 compilation from
+within Rebar3.")
+ (home-page "https://hex.pm/packages/provider_asn1")
+ (license license:expat)))
+
(define-public erlang-relx
(package
(name "erlang-relx")
- (version "4.6.0")
+ (version "4.9.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "relx" version))
(sha256
- (base32 "02gmfx1vxg9m3mq4njsqhs4972l4nb8m5p1pdcf64g09ccf17y1g"))))
+ (base32 "1iamihsd3gi82sc7169rx5730drvgm0n4k7clg75pap79b6pgjqj"))))
(build-system rebar-build-system)
(propagated-inputs
(list erlang-bbmustache))
@@ -586,13 +625,13 @@ a well configured release directory.")
(define-public erlang-ssl-verify-fun
(package
(name "erlang-ssl-verify-fun")
- (version "1.1.6")
+ (version "1.1.7")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "ssl_verify_fun" version))
(sha256
- (base32 "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"))))
+ (base32 "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"))))
(build-system rebar-build-system)
(home-page "https://github.com/deadtrickster/ssl_verify_fun.erl")
(synopsis "SSL verification functions for Erlang")
@@ -603,7 +642,7 @@ Erlang.")
(define-public rebar3
(package
(name "rebar3")
- (version "3.18.0")
+ (version "3.23.0")
(source
(origin
(method git-fetch)
@@ -612,7 +651,7 @@ Erlang.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327"))))
+ (base32 "0jinjx3mk5j1kczxmblixbvhf24q0yfwih2ggs11x5ykmrqpbckl"))))
(build-system gnu-build-system)
;; TODO: remove vendored modules, install man-page, install lib(?)
(arguments
@@ -638,6 +677,29 @@ Erlang.")
"eunit_formatters" "getopt" "hex_core" "erlware_commons"
"parse_trans" "relx" "ssl_verify_fun" "providers"))))
(delete 'configure)
+ ;; By default rebar3 produces escripts with embedded ZIP archives
+ ;; with files with current timestamps which is not suitable for
+ ;; reproducible builds. We fix it by setting predefined timestamps.
+ (add-before 'build 'make-escriptize-reproducible
+ (lambda _
+ (let ((escriptize "apps/rebar/src/rebar_prv_escriptize.erl"))
+ (substitute* escriptize
+ (("\\[dir_entries\\(filename:dirname\\(Filename1\\)\\),")
+ (string-append "FilePath = filename:join(Dir, Filename),"
+ "{ok, FileInfo0} = file:read_file_info(FilePath),"
+ "DateTime = {{1970, 1, 1}, {0, 0, 1}},"
+ "FileInfo = FileInfo0#file_info{mtime = DateTime},"
+ "[dir_entries(filename:dirname(Filename1)),")))
+ (substitute* escriptize
+ (((string-append
+ "\\{Filename1, file_contents\\(filename:join\\(Dir, "
+ "Filename\\)\\)\\}\\]."))
+ "{Filename1, file_contents(FilePath), FileInfo}]."))
+ (substitute* escriptize
+ (((string-append "\\[\\{FName,FBin\\} \\|\\| \\{FName,FBin\\} <- "
+ "Files, FBin =/= <<>>\\]\\."))
+ (string-append "[{FName,FBin,FInfo} || {FName,FBin,FInfo} <- "
+ "Files, FBin =/= <<>>]."))))))
(replace 'build
(lambda _
(setenv "HOME" (getcwd))
@@ -741,19 +803,36 @@ a git checkout.")
rebar3.")
(license license:bsd-3)))
+(define-public erlang-pc
+ (package
+ (name "erlang-pc")
+ (version "1.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hexpm-uri "pc" version))
+ (sha256
+ (base32 "1cwm8pjsmjllfj41g62blkzvhiw3wy7j3nhpsm9y7jipci7ss3sc"))))
+ (build-system rebar-build-system)
+ (synopsis "Rebar3 port compiler for native code")
+ (description "This package provides support for compiling native code
+for Rebar3.")
+ (home-page "https://hex.pm/packages/pc")
+ (license license:expat)))
+
(define-public erlang-lfe
(package
(name "erlang-lfe")
- (version "2.1.2")
+ (version "2.1.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lfe/lfe")
- (commit "v2.1.2")))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "180hz1p2v3vb6yyzcfwircmljlnd86ln8z80lzy3mwlyrcxblvxy"))))
+ "0yyh8jmdi7c4y6vjrk3zw4iy7iyqcs5h88hx96ml9dx2im2aydlq"))))
(build-system gnu-build-system)
(arguments
(list
@@ -765,6 +844,13 @@ rebar3.")
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
+ ;; By default LFE compiler itself is not deterministic. We fix it
+ ;; here. For more details see: https://github.com/lfe/lfe/issues/492.
+ (add-after 'unpack 'make-deterministic
+ (lambda _
+ (substitute* "src/lfe_env.erl"
+ (("maps:fold\\(F, A, D\\)")
+ "lists:sort(maps:fold(F, A, D))"))))
;; The following is inspired by rebar-build-system.scm
(add-before 'check 'erlang-depends
(lambda* (#:key inputs #:allow-other-keys)
@@ -801,6 +887,11 @@ rebar3.")
(when tests?
(begin
(setenv "REBAR_CACHE_DIR" "/tmp")
+ (substitute* "Makefile"
+ ;; More strict argument parsing since rebar v3.23.0 seems
+ ;; to break backwards compatibility. See more info at:
+ ;; https://github.com/erlang/rebar3/pull/2813.
+ (("-n 20,ct") "-n 20, ct"))
(invoke "make" "-j" (number->string (parallel-job-count))
"tests"))))))))
(native-inputs (list rebar3 rebar3-proper erlang-proper))
diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm
index 0651dda1b0..796f8d3f23 100644
--- a/gnu/packages/esolangs.scm
+++ b/gnu/packages/esolangs.scm
@@ -135,7 +135,7 @@ are encoded as (nested) directories. Note that the switches you pass to
"shakespeare-spl-fix-grammar.patch"))))
(build-system copy-build-system)
(arguments
- `(#:imported-modules (,@%gnu-build-system-modules
+ `(#:imported-modules (,@%default-gnu-imported-modules
(guix build copy-build-system))
#:modules ((guix build copy-build-system)
((guix build gnu-build-system) #:prefix gnu:)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index f41b4e99ed..7e539406db 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -126,7 +126,7 @@ running the opensm daemon.")
"/share/doc")))
(mkdir-p doc)
(install-file "COPYING" doc))))
- (add-after 'install-file 'move-perl
+ (add-after 'install 'move-perl
;; Avoid perl in lib closure
(lambda* (#:key outputs #:allow-other-keys)
(let ((perlout (string-append (assoc-ref outputs "out")
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 435ccde45f..4ad7fa98ca 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.
;;;
@@ -88,15 +89,15 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
- (version "5.1.7")
+ (version "5.1.9")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
- version "_dict.tar.xz"))
+ version "_dict.tar.zst"))
(sha256
- (base32 "1wnky24a8jy4nwairzbb00j0rnn8qr2105va3kpymnvh0cyh0rwa"))))
+ (base32 "1r6wyxxghl673q8wmp9519s1gwg8w18mrjg3zkg9qyln3hccyhvs"))))
(arguments
(list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
(build-system cmake-build-system)
@@ -127,7 +128,9 @@ client.")
("xcb-util-wm" ,xcb-util-wm)
("xkeyboard-config" ,xkeyboard-config)))
(native-inputs
- (list extra-cmake-modules pkg-config))
+ (list extra-cmake-modules
+ zstd
+ pkg-config))
(native-search-paths
(list (search-path-specification
(variable "FCITX_ADDON_DIRS")
@@ -317,18 +320,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,22 +446,30 @@ including input methods previous bundled inside Fcitx 4:
(sha256
(base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz"))))
(build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- ;; KDE is currently not working on Guix, KCM supports doesn't make sense.
- '("-DENABLE_KCM=Off")))
+ (arguments (list #:configure-flags #~(list "-DUSE_QT6=ON")))
(inputs
- `(("fcitx5" ,fcitx5)
- ("fcitx5-qt" ,fcitx5-qt)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
- ("kitemviews" ,kitemviews)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libx11" ,libx11)
- ("xkeyboard-config" ,xkeyboard-config)
- ("libxkbfile" ,libxkbfile)
- ("gettext" ,gettext-minimal)
- ("iso-codes" ,iso-codes)))
+ (list fcitx5
+ fcitx5-qt
+ qtbase
+ qtdeclarative
+ ksvg
+ kcmutils
+ ki18n
+ kpackage
+ kdeclarative
+ kiconthemes
+ kcoreaddons
+ libplasma
+ kitemviews
+ kwidgetsaddons
+ kwindowsystem
+ kirigami
+ libxkbcommon
+ libx11
+ xkeyboard-config
+ libxkbfile
+ gettext-minimal
+ iso-codes))
(native-inputs
(list extra-cmake-modules pkg-config))
(home-page "https://github.com/fcitx/fcitx5-configtool")
diff --git a/gnu/packages/mastodon.scm b/gnu/packages/fediverse.scm
index b8006292ca..6c35f633d8 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/fediverse.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
+;;; Copyright © 2024 Sergio Durigan Junior <sergiodj@sergiodj.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,17 +19,20 @@
;;; 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 packages mastodon)
+(define-module (gnu packages fediverse)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
+ #: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 licenses) #:prefix license:)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages check)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -44,6 +48,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages time)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages xml))
(define-public toot
@@ -190,3 +195,57 @@ seamlessly with your desktop environment.")
(description
"This package provides a python wrapper for the Mastodon API.")
(license license:expat)))
+
+(define-public snac2
+ (package
+ (name "snac")
+ (version "2.55")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/grunfink/snac2")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06qmg0wy1f4r6l8j52jnma4d2b8sj8fqf52vn7qqbbs8jz7aj74s"))))
+ (build-system gnu-build-system)
+ (inputs (list curl openssl))
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'remove-usr-local
+ (lambda _
+ (substitute* "Makefile"
+ (("-I/usr/local/include")
+ "")
+ (("-L/usr/local/lib")
+ "")))))
+ #:tests? #f ; no test target
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "CFLAGS=-O2 -g -Wall -Wextra")
+ (string-append "PREFIX=" #$output))))
+ (home-page "https://codeberg.org/grunfink/snac2")
+ (synopsis
+ "Simple, minimalistic ActivityPub instance written in portable C")
+ (description
+ "Snac is a simple, minimalistic ActivityPub instance written in
+portable C.
+
+It features:
+
+@itemize
+@item Lightweight, minimal dependencies
+@item Extensive support of ActivityPub operations, e.g. write public notes,
+follow users, be followed, reply to the notes of others, admire wonderful
+content (like or boost), write private messages, etc.
+@item Multiuser support
+@item Mastodon API support, so Mastodon-compatible apps can be used
+@item Simple but effective web interface
+@item Easily-accessed MUTE button to silence users
+@item Tested interoperability with related software
+@item No database needed
+@item Totally JavaScript-free; no cookies either
+@end itemize")
+ (license license:expat)))
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 8afd853350..0d2359761a 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2022 Brian Cully <bjc@spork.org>
;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2024 Ahmad Draidi <a.r.draidi@redscript.org>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,8 @@ from a mounted file system.")
(list valgrind)
'())))
(inputs
- (list eudev
+ (list bash-minimal
+ eudev
keyutils
libaio
libscrypt
@@ -1415,6 +1417,7 @@ xfstest's \"~a\" command (with any OPTIONs) as documented below.\n\n"
(inputs
(list acl
attr
+ bash-minimal
bc
guile-3.0 ; for our xfstests-check helper script
inetutils
@@ -1442,7 +1445,7 @@ with the included @command{xfstests-check} helper.")
(define-public zfs
(package
(name "zfs")
- (version "2.1.14")
+ (version "2.2.5")
(outputs '("out" "module" "src"))
(source
(origin
@@ -1451,7 +1454,7 @@ with the included @command{xfstests-check} helper.")
"/download/zfs-" version
"/zfs-" version ".tar.gz"))
(sha256
- (base32 "0gzansmin40llxxh2zkgpdyp41ikd8s5hv5mpwhpcivk1q8fv7sh"))))
+ (base32 "15w8s0f155kpylgdan56hgwc86fl1658br05dmyyhxfd55pwz213"))))
(build-system linux-module-build-system)
(arguments
(list
@@ -1500,12 +1503,6 @@ with the included @command{xfstests-check} helper.")
"man/man7/zpool-features.7")
(("/usr/share/zfs/compatibility.d")
(string-append #$output "/share/zfs/compatibility.d")))
- (substitute* "etc/Makefile.in"
- ;; This just contains an example configuration file for
- ;; configuring ZFS on traditional init systems, skip it
- ;; since we cannot use it anyway; the install target becomes
- ;; misdirected.
- (("= default ") "= "))
(substitute* "lib/libzfs/os/linux/libzfs_util_os.c"
;; Use path to /gnu/store/*-kmod in actual path that is
;; exec'ed.
@@ -1516,9 +1513,17 @@ with the included @command{xfstests-check} helper.")
;; Just use 'modprobe' in message to user, since Guix
;; does not have a traditional /sbin/
(("'/sbin/modprobe ") "'modprobe "))
- (substitute* "contrib/Makefile.in"
- ;; This is not configurable nor is its hard-coded /usr prefix.
- ((" initramfs") ""))
+ (substitute* "configure"
+ (("/etc/default")
+ (string-append #$output "/etc/default"))
+ (("/etc/bash_completion.d")
+ (string-append #$output "/etc/bash_completion.d")))
+ (substitute* "Makefile.in"
+ (("/usr/share/initramfs-tools")
+ (string-append #$output "/usr/share/initramfs-tools")))
+ (substitute* "contrib/initramfs/Makefile.am"
+ (("/usr/share/initramfs-tools")
+ (string-append #$output "/usr/share/initramfs-tools")))
(substitute* "module/os/linux/zfs/zfs_ctldir.c"
(("/usr/bin/env\", \"umount")
(string-append (search-input-file inputs "/bin/umount")
@@ -1535,18 +1540,15 @@ with the included @command{xfstests-check} helper.")
(substitute* "config/zfs-build.m4"
(("\\$sysconfdir/init.d")
(string-append #$output "/etc/init.d")))
- (substitute* '("etc/zfs/Makefile.am"
- "cmd/zed/Makefile.am")
+ (substitute* '("cmd/zed/Makefile.am")
(("\\$\\(sysconfdir)") (string-append #$output "/etc")))
- (substitute* "cmd/vdev_id/vdev_id"
+ (substitute* "udev/vdev_id"
(("PATH=/bin:/sbin:/usr/bin:/usr/sbin")
(string-append "PATH="
(dirname (which "chmod")) ":"
(dirname (which "grep")) ":"
(dirname (which "sed")) ":"
(dirname (which "gawk")))))
- (substitute* "contrib/pyzfs/Makefile.in"
- ((".*install-lib.*") ""))
(substitute* '("Makefile.am" "Makefile.in")
(("\\$\\(prefix)/src") (string-append #$output:src "/src")))
(substitute* (find-files "udev/rules.d/" ".rules.in$")
@@ -1955,17 +1957,43 @@ memory-efficient.")
"0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/oniony/TMSU"
- #:unpack-path ".."
- #:install-source? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'post-install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; The go build system produces /bin/TMSU -> install as /bin/tmsu
- (rename-file (string-append out "/bin/TMSU")
- (string-append out "/bin/tmsu"))))))))
+ (list
+ #:import-path "github.com/oniony/TMSU"
+ #:unpack-path "github.com/oniony/TMSU"
+ #:install-source? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-makefile
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "Makefile"
+ (("SHELL=.*") (string-append "SHELL=" (which "sh") "\n"))
+ ;; Make sure we do not compile 2 more times during the check
+ ;; phase.
+ (("unit-test: compile") "unit-test:")
+ (("integration-test: compile") "integration-test:")
+ ;; Simplify install path.
+ (("usr/") "")))))
+ (replace 'build
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "make" "compile"))))
+ (replace 'check
+ (lambda* (#:key import-path tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ ;; Remove shaky test file, see
+ ;; <https://github.com/oniony/TMSU/issues/281>.
+ (for-each
+ (lambda (test-file)
+ (delete-file test-file))
+ (find-files "." "^fingerprinter_test.go$"))
+ (invoke "make" "test")))))
+ (replace 'install
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (setenv "DESTDIR" #$output)
+ (invoke "make" "install")))))))
(inputs
(list go-github-com-mattn-go-sqlite3 go-github-com-hanwen-fuse))
(home-page "https://github.com/oniony/TMSU")
diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 3f870d84a1..016572f120 100644
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -31,14 +31,15 @@
(define-public file
(package
(name "file")
- (version "5.44")
+ (version "5.45")
(source (origin
(method url-fetch)
(uri (string-append "http://ftp.astron.com/pub/file/file-"
version ".tar.gz"))
(sha256
(base32
- "0fsz8wld09qai2qghphmwn69ni9m23razj3wip5k3j6vm3xwfl9p"))))
+ "10jdg2fd19h2q3jrsaw7xqwy1w3qyvdfzzrv9sgjq3mv548gb5zw"))
+ (patches (search-patches "file-32bit-time.patch"))))
(build-system gnu-build-system)
;; When cross-compiling, this package depends upon a native install of
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3c32a220c4..4b5b5eefd5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -9,9 +9,9 @@
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com>
-;;; Copyright © 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018-2022, 2024 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>
@@ -77,6 +77,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages aidc)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
@@ -147,7 +148,7 @@
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
(package
(name "bitcoin-core")
- (version "27.0")
+ (version "27.1")
(source (origin
(method url-fetch)
(uri
@@ -155,7 +156,7 @@
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
- "0sqldg540q5d4lvr8fs9sbycxgzkij5y52rqqg6blmxisd8yc7lw"))))
+ "1npk30c4s2xihm2vxmswl2x4baw5n23gsbaw5y8sx3qvjbym240c"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
@@ -296,14 +297,14 @@ Accounting.")
(define-public homebank
(package
(name "homebank")
- (version "5.7.4")
+ (version "5.8.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.gethomebank.org/public/sources"
"/homebank-" version ".tar.gz"))
(sha256
(base32
- "1r2lpf2qjvyc9l4llgy6453dn527pylvd49kr6ihrskmr1373kj2"))))
+ "00fwadn6q2hryx7q1xf5fhb5q3ywfnlb1r4xxn7yq6ilzvm5zhv0"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool))
@@ -611,7 +612,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(define-public electron-cash
(package
(name "electron-cash")
- (version "4.4.0")
+ (version "4.4.1")
(source
(origin
(method git-fetch)
@@ -620,7 +621,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1hfkp24m1yipadanjf5wm6clmyllkcbh7fbw8whnrvxa2v7sa4l8"))))
+ (base32 "11xhlssr7bvdv3p256k87y35vjzyfd93p72w8f2xy7j5jh6abhp1"))))
(build-system python-build-system)
(arguments
(list
@@ -647,7 +648,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(wrap-qt-program "electron-cash"
#:output out #:inputs inputs)))))))
(inputs
- (list libevent
+ (list bash-minimal
+ libevent
libsecp256k1-bitcoin-cash
openssl
python-cython
@@ -687,7 +689,7 @@ blockchain.")
;; the system's dynamically linked library.
(package
(name "monero")
- (version "0.18.3.3")
+ (version "0.18.3.4")
(source
(origin
(method git-fetch)
@@ -705,7 +707,7 @@ blockchain.")
delete-file-recursively
'("external/miniupnp" "external/rapidjson"))))
(sha256
- (base32 "1d3dnkz18v0mlspafnzm301lmdiz6pwjzdbsdq23mn7cyynzgnc9"))))
+ (base32 "0rjyxcggg7pdp5026kbb49mk7vnvldvbr7qlkn76n4sq20cpk3v9"))))
(build-system cmake-build-system)
(native-inputs
(list doxygen
@@ -754,30 +756,28 @@ blockchain.")
(lambda _
(for-each make-file-writable
(find-files "tests/data/" "wallet_9svHk1.*"))))
- ;; Only try tests that don't need access to network or system
(replace 'check
+ ;; Only try tests that don't need access to network or system
(lambda* (#:key tests? #:allow-other-keys)
;; Core tests sometimes fail, at least on i686-linux.
;; Let's disable them for now and just try hash tests
;; and unit tests.
;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test")))
(when tests?
- (invoke "make" "ARGS=-R 'hash' --verbose" "test"))))
- (add-after 'check 'unit-tests
- (lambda _
- (let ((excluded-unit-tests
- (string-join
- '("AddressFromURL.Success"
- "AddressFromURL.Failure"
- "DNSResolver.IPv4Success"
- "DNSResolver.DNSSECSuccess"
- "DNSResolver.DNSSECFailure"
- "DNSResolver.GetTXTRecord"
- "is_hdd.linux_os_root")
- ":")))
- (invoke "tests/unit_tests/unit_tests"
- (string-append "--gtest_filter=-"
- excluded-unit-tests)))))
+ (invoke "make" "ARGS=-R 'hash' --verbose" "test")
+ (let ((excluded-unit-tests
+ (string-join
+ '("AddressFromURL.Success"
+ "AddressFromURL.Failure"
+ "DNSResolver.IPv4Success"
+ "DNSResolver.DNSSECSuccess"
+ "DNSResolver.DNSSECFailure"
+ "DNSResolver.GetTXTRecord"
+ "is_hdd.linux_os_root")
+ ":")))
+ (invoke "tests/unit_tests/unit_tests"
+ (string-append "--gtest_filter=-"
+ excluded-unit-tests))))))
(add-after 'install 'delete-unused-files
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively
@@ -792,7 +792,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
- (version "0.18.3.3")
+ (version "0.18.3.4")
(source
(origin
(method git-fetch)
@@ -808,7 +808,7 @@ the Monero command line client and daemon.")
;; See the 'extract-monero-sources' phase.
(delete-file-recursively "monero")))
(sha256
- (base32 "1yy98y37l5nfxj921h6rbhni6fk0fic9bs4gqbnq2n4397h7jamj"))))
+ (base32 "09x8184kbpw74qlak2x9amz7j3qkacnk9l0c1cws1d0fghlm6n9m"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@@ -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
@@ -1753,7 +1752,7 @@ following three utilities are included with the library:
(define-public bitcoin-unlimited
(package
(name "bitcoin-unlimited")
- (version "2.0.0.1")
+ (version "2.1.0.0")
(source
(origin
(method git-fetch)
@@ -1762,7 +1761,7 @@ following three utilities are included with the library:
(commit (string-append "BCHunlimited" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1kkmg0gp86qz3ya8y5a00yic1mals138b9fv2cjlm7683sfjjljx"))))
+ (base32 "0cny12s03wsgx8iijg5cbr7r6wif9ck7dn98hsv9sz8xq1i5vjk4"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
@@ -2078,29 +2077,25 @@ software Beancount with a focus on features and usability.")
(license license:expat)))
(define-public emacs-beancount
- ;; Note that upstream has not made any release since this project moved
- ;; into its own repository (it was originally part of beancount itself)
- (let ((commit "687775da63784d153a3c1cfee9801090c6b51842")
- (revision "1"))
- (package
- (name "emacs-beancount")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/beancount/beancount-mode")
- (commit commit)))
- (sha256
- (base32
- "08383yqqanx29al1hg1r6ndx3gwjg6fj7kl340f1zz9m9cfiyvg3"))
- (file-name (git-file-name name version))))
- (build-system emacs-build-system)
- (home-page "https://github.com/beancount/beancount-mode")
- (synopsis "Emacs mode for Beancount")
- (description
- "Emacs-beancount is an Emacs mode for the Beancount accounting tool.")
- (license license:gpl3+))))
+ (package
+ (name "emacs-beancount")
+ (version "0.9.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/beancount/beancount-mode")
+ (commit version)))
+ (sha256
+ (base32
+ "01ivxgv1g0pkr0xi43366pghc3j3mmhk5bshis6kkn04bq04cx7f"))
+ (file-name (git-file-name name version))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/beancount/beancount-mode")
+ (synopsis "Emacs mode for Beancount")
+ (description
+ "Emacs-beancount is an Emacs mode for the Beancount accounting tool.")
+ (license license:gpl3+)))
(define-public hledger-web
(package
@@ -2175,15 +2170,15 @@ editing on the Web.")
(define-public quantlib
(package
(name "quantlib")
- (version "1.26")
+ (version "1.34")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://github.com/lballabio/QuantLib/releases/download/QuantLib-v"
+ "https://github.com/lballabio/QuantLib/releases/download/v"
version "/QuantLib-" version ".tar.gz"))
(sha256
- (base32 "1sbk6rg51x5xpa93xmqmrj32a1l9vba51xck0017cxzblg0nrzh4"))))
+ (base32 "0l7yn9bal0csyix0ydzcfj003kma4sx7w5hyfxhh6mbnxn6am1zb"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -2228,13 +2223,13 @@ interactive controls. This package provides a GTK+ graphical user interface
(define-public python-ta-lib
(package
(name "python-ta-lib")
- (version "0.4.21")
+ (version "0.4.32")
(source
(origin
(method url-fetch)
(uri (pypi-uri "TA-Lib" version))
(sha256
- (base32 "17sf222mq2vx924f15qlz5czkkq5vsnsjy9ibwkrk8lalr6g5lkl"))))
+ (base32 "186sgkpggy50gs2pa2p22zppl57xgfhpmja5l13xiskv44iw6x7v"))))
(build-system python-build-system)
(inputs
(list ta-lib))
@@ -2322,7 +2317,7 @@ and manipulation.")
(define-public xmrig
(package
(name "xmrig")
- (version "6.21.2")
+ (version "6.22.0")
(source
(origin
(method git-fetch)
@@ -2330,7 +2325,7 @@ and manipulation.")
(url "https://github.com/xmrig/xmrig")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
- (sha256 (base32 "0rxnrn92v2w9f0zyv4zchilnrc3wa8nw4d4b4isaxx411zxgds6i"))
+ (sha256 (base32 "1h3qcs176xbfs1k2silr5rf13y0nag6qgsaz14qi3nrxxc0d8n4h"))
(modules '((guix build utils)))
(snippet
;; TODO: Try to use system libraries instead of bundled ones in
@@ -2379,7 +2374,7 @@ mining.")
(define-public p2pool
(package
(name "p2pool")
- (version "3.10")
+ (version "4.1")
(source
(origin
(method git-fetch)
@@ -2388,7 +2383,7 @@ mining.")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
- (sha256 (base32 "0lp9slfwaq3wp4x6xpsiazam5lv6dz57m20adzlzzk0anb1ascr0"))
+ (sha256 (base32 "1ijj3ci0kx87yjv29c6p9wqj15aij7r87sdbjwhzcmbdf46krj3q"))
(modules '((guix build utils)))
(snippet
#~(for-each delete-file-recursively
@@ -2397,10 +2392,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 +2407,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 6f0c2da806..7911cb3203 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 David Craven <david@craven.ch>
-;;; Copyright © 2017, 2018, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018, 2022-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -30,6 +30,7 @@
(define-module (gnu packages firmware)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix memoization)
+ #:use-module (guix deprecation)
#:use-module (guix packages)
#:use-module (guix platform)
#:use-module (guix download)
@@ -87,6 +88,7 @@
#:use-module (gnu packages xml)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
+ #:use-module (ice-9 regex)
#:export (make-ergodox-firmware
make-qmk-firmware))
@@ -585,6 +587,20 @@ executing in M-mode.")
(description
"This package contains OpenSBI firmware files for use with QEMU.")))
+(define-public opensbi-for-visionfive2
+ (package
+ (inherit opensbi-generic)
+ (name "opensbi-for-visionfive2")
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments opensbi-generic)
+ ((#:make-flags flags)
+ ;; visionfive2's u-boot need opensbi with the following flags.
+ ;; see https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html
+ #~(cons* "FW_TEXT_START=0x40000000"
+ "FW_OPTIONS=0"
+ #$flags))))))
+
(define-public seabios
(package
(name "seabios")
@@ -664,7 +680,7 @@ coreboot.")
(supported-systems %supported-systems)
(arguments
(substitute-keyword-arguments (package-arguments seabios)
- ((#:modules modules %gnu-build-system-modules)
+ ((#:modules modules %default-gnu-modules)
`((ice-9 match)
(ice-9 threads)
,@modules))
@@ -814,16 +830,18 @@ after an operating system boots.")
(define-public edk2-tools
(package
(name "edk2-tools")
- (version "202308")
+ (version "202402")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tianocore/edk2")
- (commit (string-append "edk2-stable" version))))
+ (commit (string-append "edk2-stable" version))
+ ;; EDK2 makes extensive use of submodules.
+ (recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
- "19g3g94hayvcwmn6sjs6mghq0qf5nsd785k5j8szcrj2p0vjh54f"))))
+ "0y7jfpijgi099znhzjklnsczn0k0vm1d1qznq9x2a2sa0glydsin"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
@@ -835,15 +853,6 @@ after an operating system boots.")
(add-after 'unpack 'change-directory
(lambda _
(chdir "BaseTools")))
- (add-after 'change-directory 'disable-some-tools
- (lambda _
- ;; Disable building brotli and xz, since we package them
- ;; separately, and it would require fetching submodules.
- (substitute* "Source/C/GNUmakefile"
- (("^[[:blank:]]+BrotliCompress[[:blank:]]+\\\\")
- "\\")
- (("^[[:blank:]]+LzmaCompress[[:blank:]]+\\\\")
- "\\"))))
(replace 'build
(lambda* (#:key (make-flags #~'()) #:allow-other-keys)
;; The default build target also runs tests.
@@ -874,29 +883,31 @@ 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-public ovmf
- (let ((toolchain-ver "GCC5"))
+(define* (make-ovmf-firmware arch)
+ (let ((toolchain "GCC")
+ (arch-string (match arch
+ ("x86_64" "X64")
+ ("i686" "IA32")
+ ("aarch64" "AARCH64")
+ ("armhf" "ARM")
+ ("riscv64" "RISCV64")
+ ("loongarch64" "LOONGARCH64")
+ (_ "NONE"))))
(package
- (name "ovmf")
- (version "202311")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- ;; OVMF is part of the edk2 source tree.
- (url "https://github.com/tianocore/edk2")
- (recursive? #t) ;edk2 now uses a lot of submodules
- (commit (string-append "edk2-stable" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "136dl5cxpjpg37whzlqq7jrrjsgybmwrgkbbmks8xaixqmzwhbw0"))))
- (build-system gnu-build-system)
+ (inherit edk2-tools)
+ (name (string-append "ovmf-" arch))
(arguments
(list
#:tests? #f ; No check target.
#:target #f ; Package produces firmware.
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 match))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
@@ -904,6 +915,21 @@ Executables included are:
(substitute* "edksetup.sh"
(("^return \\$\\?")
"exit $?"))))
+ (add-before 'configure 'set-env
+ (lambda _
+ (unless (string-prefix? #$arch #$(%current-system))
+ (setenv (string-append #$toolchain "_X64_PREFIX")
+ "x86_64-linux-gnu-")
+ (setenv (string-append #$toolchain "_IA32_PREFIX")
+ "i686-linux-gnu-")
+ (setenv (string-append #$toolchain "_AARCH64_PREFIX")
+ "aarch64-linux-gnu-")
+ (setenv (string-append #$toolchain "_ARM_PREFIX")
+ "arm-linux-gnueabihf-")
+ (setenv (string-append #$toolchain "_RISCV64_PREFIX")
+ "riscv64-linux-gnu-")
+ (setenv (string-append #$toolchain "_LOONGARCH64_PREFIX")
+ "loongarch64-linux-gnu-"))))
(replace 'configure
(lambda _
(let* ((cwd (getcwd))
@@ -915,19 +941,12 @@ Executables included are:
(setenv "PYTHON_COMMAND" "python3")
(setenv "PATH" (string-append (getenv "PATH") ":" bin))
(invoke "bash" "edksetup.sh")
- (substitute* "Conf/tools_def.txt"
- ;; Guix gcc is compiled without pie
- ;; The -no-pie flag causes the Ia32 build to fail
- (("-no-pie") ""))
(substitute* "Conf/target.txt"
(("^TARGET[ ]*=.*$") "TARGET = RELEASE\n")
(("^TOOL_CHAIN_TAG[ ]*=.*$")
- (string-append "TOOL_CHAIN_TAG = " #$toolchain-ver "\n"))
+ (string-append "TOOL_CHAIN_TAG = " #$toolchain "\n"))
(("^TARGET_ARCH[ ]*=.*$")
- (string-append "TARGET_ARCH = IA32"
- #$@(if (string=? "x86_64-linux" (%current-system))
- '(", X64")
- '())
+ (string-append "TARGET_ARCH = " #$arch-string
"\n"))
(("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$")
(format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%"
@@ -937,152 +956,144 @@ Executables included are:
(invoke "make" "-C" tools))))
(replace 'build
(lambda _
- (invoke "build" "-a" "IA32" "-t" #$toolchain-ver
- "-p" "OvmfPkg/OvmfPkgIa32.dsc")))
- #$@(if (string=? "x86_64-linux" (%current-system))
- #~((add-after 'build 'build-x64
- (lambda _
- (invoke "build" "-a" "X64" "-t" #$toolchain-ver
- "-p" "OvmfPkg/OvmfPkgX64.dsc"))))
- #~())
- (replace 'install
+ (invoke "build" "-a" #$arch-string "-t" #$toolchain "-p"
+ (match #$arch
+ ("x86_64"
+ "OvmfPkg/OvmfPkgX64.dsc")
+ ("i686"
+ "OvmfPkg/OvmfPkgIa32.dsc")
+ ((or "aarch64" "armhf")
+ "ArmVirtPkg/ArmVirtQemu.dsc")
+ ("riscv64"
+ "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc")
+ (_ #t)))))
+ (add-before 'install 'install-efi-shell
(lambda _
(let ((fmw (string-append #$output "/share/firmware")))
(mkdir-p fmw)
(for-each
(lambda (file)
- (copy-file (string-append "Build/OvmfIa32/RELEASE_"
- #$toolchain-ver "/FV/" file ".fd")
- (string-append fmw "/" (string-downcase file) "_ia32.bin"))
- #$@(if (string=? "x86_64-linux" (%current-system))
- #~((copy-file (string-append "Build/OvmfX64/RELEASE_"
- #$toolchain-ver "/FV/" file ".fd")
- (string-append fmw "/" (string-downcase file) "_x64.bin")))
- #~()))
- (list "OVMF"
- "OVMF_CODE"
- "OVMF_VARS"))))))))
+ (copy-file file
+ (string-append fmw "/Shell_"
+ (string-downcase #$arch-string)
+ ".efi")))
+ (find-files "Build" "Shell\\.efi"))))))))
(native-inputs
- `(("acpica" ,acpica)
- ("nasm" ,nasm)
- ("perl" ,perl)
- ("python-3" ,python-3)
- ("util-linux" ,util-linux "lib")))
- (supported-systems '("x86_64-linux" "i686-linux"))
- (home-page "https://www.tianocore.org")
+ (append
+ (list acpica
+ nasm
+ perl
+ python-3
+ (list util-linux "lib"))
+ (if (not (string-prefix? arch (%current-system)))
+ (if (string=? arch "armhf")
+ (list (cross-gcc "arm-linux-gnueabihf")
+ (cross-binutils "arm-linux-gnueabihf"))
+ (list (cross-gcc (string-append arch "-linux-gnu"))
+ (cross-binutils (string-append arch "-linux-gnu"))))
+ '())))
(synopsis "UEFI firmware for QEMU")
(description "OVMF is an EDK II based project to enable UEFI support for
Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(license (list license:expat
license:bsd-2 license:bsd-3 license:bsd-4)))))
+(define-public ovmf-x86-64
+ (let ((base (make-ovmf-firmware "x86_64")))
+ (package
+ (inherit base)
+ (name "ovmf-x86-64")
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (let ((fmw (string-append #$output "/share/firmware")))
+ (mkdir-p fmw)
+ (for-each
+ (lambda (file)
+ (copy-file
+ (string-append "Build/OvmfX64/RELEASE_GCC"
+ "/FV/" file ".fd")
+ (string-append fmw "/" (string-downcase file) "_x64.bin")))
+ (list "OVMF"
+ "OVMF_CODE"
+ "OVMF_VARS"))))))))))))
+
+(define-public ovmf-i686
+ (let ((base (make-ovmf-firmware "i686")))
+ (package
+ (inherit base)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (let ((fmw (string-append #$output "/share/firmware")))
+ (mkdir-p fmw)
+ (for-each
+ (lambda (file)
+ (copy-file
+ (string-append "Build/OvmfIa32/RELEASE_GCC"
+ "/FV/" file ".fd")
+ (string-append fmw "/" (string-downcase file) "_ia32.bin")))
+ (list "OVMF"
+ "OVMF_CODE"
+ "OVMF_VARS"))))))))))))
+
(define-public ovmf-aarch64
- (let ((toolchain-ver "GCC5"))
+ (let ((base (make-ovmf-firmware "aarch64")))
(package
- (inherit ovmf)
- (name "ovmf-aarch64")
- (native-inputs
- (append (package-native-inputs ovmf)
- (if (not (string-prefix? "aarch64" (%current-system)))
- `(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu"))
- ("cross-binutils" ,(cross-binutils "aarch64-linux-gnu")))
- '())))
+ (inherit base)
(arguments
- (substitute-keyword-arguments (package-arguments ovmf)
- ((#:phases phases)
- #~(modify-phases #$phases
- #$@(if (string-prefix? "aarch64" (%current-system))
- '()
- #~((add-before 'configure 'set-env
- (lambda _
- (setenv (string-append #$toolchain-ver "_AARCH64_PREFIX")
- "aarch64-linux-gnu-")))))
- (replace 'build
- (lambda _
- (invoke "build" "-a" "AARCH64" "-t" #$toolchain-ver
- "-p" "ArmVirtPkg/ArmVirtQemu.dsc")))
- (delete 'build-x64)
- (replace 'install
- (lambda _
- (let ((fmw (string-append #$output "/share/firmware")))
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (let ((fmw (string-append #$output "/share/firmware")))
(mkdir-p fmw)
- (copy-file (string-append "Build/ArmVirtQemu-AARCH64/RELEASE_"
- #$toolchain-ver "/FV/QEMU_EFI.fd")
- (string-append fmw "/ovmf_aarch64.bin")))))))))
- (supported-systems %supported-systems))))
+ (copy-file (string-append "Build/ArmVirtQemu-AARCH64/"
+ "RELEASE_GCC/FV/QEMU_EFI.fd")
+ (string-append fmw "/ovmf_aarch64.bin"))))))))))))
(define-public ovmf-arm
- (let ((toolchain-ver "GCC5"))
+ (let ((base (make-ovmf-firmware "armhf")))
(package
- (inherit ovmf)
+ (inherit base)
(name "ovmf-arm")
- (native-inputs
- (append (package-native-inputs ovmf)
- (if (not (string-prefix? "armhf" (%current-system)))
- `(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf"))
- ("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf")))
- '())))
(arguments
- (substitute-keyword-arguments (package-arguments ovmf)
- ((#:phases phases)
- #~(modify-phases #$phases
- #$@(if (string-prefix? "armhf" (%current-system))
- '()
- #~((add-before 'configure 'set-env
- (lambda _
- (setenv (string-append #$toolchain-ver "_ARM_PREFIX")
- "arm-linux-gnueabihf-")))))
- (replace 'build
- (lambda _
- (invoke "build" "-a" "ARM" "-t" #$toolchain-ver
- "-p" "ArmVirtPkg/ArmVirtQemu.dsc")))
- (delete 'build-x64)
- (replace 'install
- (lambda _
- (let ((fmw (string-append #$output "/share/firmware")))
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (let ((fmw (string-append #$output "/share/firmware")))
(mkdir-p fmw)
- (copy-file (string-append "Build/ArmVirtQemu-ARM/RELEASE_"
- #$toolchain-ver "/FV/QEMU_EFI.fd")
- (string-append fmw "/ovmf_arm.bin")))))))))
- (supported-systems %supported-systems))))
+ (copy-file (string-append "Build/ArmVirtQemu-ARM/"
+ "RELEASE_GCC/FV/QEMU_EFI.fd")
+ (string-append fmw "/ovmf_arm.bin"))))))))))))
(define-public ovmf-riscv64
- (let ((toolchain-ver "GCC5"))
+ (let ((base (make-ovmf-firmware "riscv64")))
(package
- (inherit ovmf)
- (name "ovmf-riscv64")
- (native-inputs
- (append (package-native-inputs ovmf)
- (if (not (string-prefix? "riscv64" (%current-system)))
- `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu"))
- ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu")))
- '())))
+ (inherit base)
(arguments
- (substitute-keyword-arguments (package-arguments ovmf)
- ((#:phases phases)
- #~(modify-phases #$phases
- #$@(if (string-prefix? "riscv64" (%current-system))
- '()
- #~((add-before 'configure 'set-env
- (lambda _
- (setenv (string-append #$toolchain-ver "_RISCV64_PREFIX")
- "riscv64-linux-gnu-")))))
- (replace 'build
- (lambda _
- (invoke "build" "-a" "RISCV64" "-t" #$toolchain-ver
- "-p" "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc")))
- (delete 'build-x64)
- (replace 'install
- (lambda _
- (let ((fmw (string-append #$output "/share/firmware")))
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (let ((fmw (string-append #$output "/share/firmware")))
(mkdir-p fmw)
- (copy-file (string-append "Build/RiscVVirtQemu/RELEASE_"
- #$toolchain-ver "/FV/RISCV_VIRT_CODE.fd")
- (string-append fmw "/RISCV_VIRT_CODE.fd"))
- (copy-file (string-append "Build/RiscVVirtQemu/RELEASE_"
- #$toolchain-ver "/FV/RISCV_VIRT_VARS.fd")
- (string-append fmw "/RISCV_VIRT_VARS.fd")))))))))
- (supported-systems %supported-systems))))
+ (with-directory-excursion "Build/RiscVVirtQemu/RELEASE_GCC/FV"
+ (install-file "RISCV_VIRT_CODE.fd" fmw)
+ (install-file "RISCV_VIRT_VARS.fd" fmw))))))))))))
+
+(define-public ovmf
+ (deprecated-package "ovmf" ovmf-x86-64))
(define* (make-arm-trusted-firmware platform
#:key (triplet "aarch64-linux-gnu"))
@@ -1513,7 +1524,9 @@ upstream repository, provide a file-like object directory containing the whole
keyboard definition in KEYBOARD-SOURCE-DIRECTORY."
(package
(name (string-append "qmk-firmware-"
- (string-replace-substring keyboard "_" "-") "-"
+ (regexp-substitute/global #f "[_/]" keyboard
+ 'pre "-" 'post)
+ "-"
(string-replace-substring keymap "_" "-")))
;; Note: When updating this package, make sure to also update the commit
;; used for the LUFA submodule in the 'copy-lufa-source' phase below.
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 83a4c3e3e7..0eced283f2 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2023 B. Wilson <x@wilsonb.com>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -112,7 +113,7 @@ programmer devices.")
(define-public 0xffff
(package
(name "0xffff")
- (version "0.9")
+ (version "0.10")
(source
(origin
(method git-fetch)
@@ -121,22 +122,21 @@ programmer devices.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0rl1xzbxl991pm2is98zbryac1lgjrc3zphmbd8agv07av0r6r6n"))))
+ (base32 "1nqbrr64kjr0h3h6gzhrj1vd106nni4y9mhjdr8mh2x9lcgn4fj5"))))
(build-system gnu-build-system)
(inputs
;; Building with libusb-compat will succeed but the result will be broken.
;; See <https://github.com/pali/0xFFFF/issues/3>.
(list libusb-0.1))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'configure)) ; no configure
- #:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- "HOST_CC=gcc"
- "BUILD_DATE=GNU Guix"
- (string-append "PREFIX=" %output))
- #:tests? #f)) ; no 'check' target
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)) ;no configure
+ #:make-flags #~(list (string-append "CC="
+ #$(cc-for-target)) "HOST_CC=gcc"
+ "BUILD_DATE=GNU Guix"
+ (string-append "PREFIX=" %output))
+ #:tests? #f)) ;no 'check' target
(home-page "https://github.com/pali/0xFFFF")
(synopsis "Flash FIASCO images on Maemo devices")
(description
@@ -149,15 +149,19 @@ brick your device.")
(define-public avrdude
(package
(name "avrdude")
- (version "6.3")
+ (version "8.0")
(source
(origin
- (method url-fetch)
- (uri (string-append "mirror://savannah/avrdude/avrdude-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/avrdudes/avrdude/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"))))
- (build-system gnu-build-system)
+ (base32 "1r8cfi1lkic8zknb7x44i2mmwxzfwfbblr894x36mffa5da0g7y3"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:tests? #f)) ; no tests
(inputs
(list libelf libusb-compat libftdi))
(native-inputs
@@ -165,9 +169,9 @@ brick your device.")
(home-page "https://www.nongnu.org/avrdude/")
(synopsis "AVR downloader and uploader")
(description
- "AVRDUDE is a utility to download/upload/manipulate the ROM and
-EEPROM contents of AVR microcontrollers using the @acronym{ISP, in-system
-programming} technique.")
+ "@code{AVRDUDE} is a utility to download/upload/manipulate the ROM and EEPROM
+contents of AVR microcontrollers using the @acronym{ISP, in-system programming}
+technique.")
(license license:gpl2+)))
(define-public dfu-programmer
@@ -650,13 +654,24 @@ It can be used to upload images to I.MX SoC's using at least their boot ROM.")
(arguments
(list
#:install-source? #f
- #:import-path "github.com/zsa/wally-cli"))
+ #:import-path "github.com/zsa/wally-cli"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Upstream Golang module name was changed from
+ ;; <gopkg.in/cheggaaa/pb.v1> to <github.com/cheggaaa/pb>, adjust
+ ;; references to it accordingly. Remove it in the new release of
+ ;; the package.
+ (add-after 'unpack 'fix-module-name
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "main.go"
+ (("gopkg.in/cheggaaa/pb.v1") "github.com/cheggaaa/pb"))))))))
(native-inputs
(list go-github-com-briandowns-spinner
go-github-com-google-gousb
go-github-com-logrusorgru-aurora
go-github-com-marcinbor85-gohex
- go-gopkg-in-cheggaaa-pb-v1
+ go-github-com-cheggaaa-pb
pkg-config))
(home-page "https://ergodox-ez.com/pages/wally")
(synopsis "Flashing tool for ZSA keyboards")
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a5c8cfadce..98c20ee90a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2016 Jookia <166291@gmail.com>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
-;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -88,6 +88,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
+ #:use-module (gnu packages)
#:use-module (gnu packages c)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
@@ -196,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")
@@ -316,12 +337,14 @@ itself."))))
(name "font-canada1500")
(version "1.101")
(source (origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri "https://typodermicfonts.com/wp-content/uploads/2017/06/canada1500.zip")
(sha256
(base32
"0cdcb89ab6q7b6jd898bnvrd1sifbd2xr42qgji98h8d5cq4b6fp"))))
(build-system font-build-system)
+ (arguments
+ '(#:license-file-regexp "^license.pdf$"))
(home-page "https://typodermicfonts.com/canada1500/")
(synopsis "Canadian typeface that supports English, French and Aboriginal languages")
(description "Canada1500 is a display typeface originally created for the
@@ -367,12 +390,36 @@ This package contains both the non-variable as well as the variable versions
of the font.")
(license license:silofl1.1))))
+(define-public font-atkinson-hyperlegible
+ (let ((commit "1cb311624b2ddf88e9e37873999d165a8cd28b46")
+ (revision "0"))
+ (package
+ (name "font-atkinson-hyperlegible")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/googlefonts/atkinson-hyperlegible")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qw0pr1dhmqrgmw1acyw8dv8kbm66xa1bq0mrn7yin4q1kk2dpj4"))))
+ (build-system font-build-system)
+ (home-page "https://github.com/googlefonts/atkinson-hyperlegible")
+ (synopsis "Typeface with greater legibility and readability for low vision readers")
+ (description
+ "Atkinson Hyperlegible is a freely available typeface built around a grotesque sans-serif core,
+intended to be optimally legible for readers who are partially visually impaired, with
+all characters maximally distinguishable from one another.")
+ (license license:silofl1.1))))
+
(define-public font-lato
(package
(name "font-lato")
(version "2.015") ; also update description
(source (origin
- (method url-fetch/zipbomb)
+ (method url-fetch)
(uri (string-append "https://www.latofonts.com/download/Lato2OFL.zip"))
(sha256
(base32
@@ -436,8 +483,6 @@ font is provided in the OpenType font (OTF) format.")
(define-public font-gnu-freefont
(package
(name "font-gnu-freefont")
- ;; Note: Remove the special FontForge input and package once the 2020
- ;; release is out.
(version "20120503")
(source (origin
(method url-fetch)
@@ -445,7 +490,10 @@ font is provided in the OpenType font (OTF) format.")
version ".tar.gz"))
(sha256
(base32
- "0yk58blhcd4hm7nyincmqq4jrzjjk82wif2zmk1l3y2m4vif4qhd"))))
+ "0yk58blhcd4hm7nyincmqq4jrzjjk82wif2zmk1l3y2m4vif4qhd"))
+ (patches (search-patches "font-gnu-freefont-python3-compat.patch"))
+ (snippet
+ '(begin (delete-file "tools/generate/buildutils.pyc")))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -491,8 +539,7 @@ font is provided in the OpenType font (OTF) format.")
(lambda (file) (string-suffix? "woff" file))
(find-files "." "")))))))
#:test-target "tests"))
- ;; FreeFont anno 2012 requires a FontForge built with Python 2.
- (native-inputs (list fontforge-20190801))
+ (native-inputs (list fontforge))
(home-page "https://www.gnu.org/software/freefont/")
(synopsis "Unicode-encoded outline fonts")
(description
@@ -547,7 +594,8 @@ and Bitstream Vera Sans Mono).
"0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"))))
(build-system font-build-system)
(arguments
- `(#:phases
+ `(#:license-file-regexp "^(GPL|LICENCE|OFL-1\\.1)\\.txt$"
+ #:phases
(modify-phases %standard-phases
(add-before 'install 'build
(lambda _
@@ -810,6 +858,8 @@ variants.")
(base32
"1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"))))
(build-system font-build-system)
+ (arguments
+ '(#:license-file-regexp "^(COPYING|README)$"))
(home-page "http://wenq.org/wqy2/")
(synopsis "CJK font")
(description
@@ -837,6 +887,8 @@ ko (Korean) locales for @code{fontconfig}.")
(base32
"0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"))))
(build-system font-build-system)
+ (arguments
+ '(#:license-file-regexp "^(LICENSE.*|README)\\.txt$"))
(home-page "http://wenq.org/wqy2/")
(synopsis "CJK font")
(description
@@ -935,9 +987,9 @@ OpenType variant of these fonts.")
(build-system gnu-build-system)
(arguments
(list
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build font-build-system))
- #:modules `(,@%gnu-build-system-modules
+ #:modules `(,@%default-gnu-modules
((guix build font-build-system) #:prefix font:))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
@@ -1081,7 +1133,7 @@ utilities to ease adding new glyphs to the font.")
(define-public font-google-noto
(package
(name "font-google-noto")
- (version "24.2.1")
+ (version "24.8.1")
(source
(origin
(method git-fetch)
@@ -1090,7 +1142,7 @@ utilities to ease adding new glyphs to the font.")
(commit (string-append "noto-monthly-release-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "087jg8ahpq35xwyrmvm9ivxl0wjic2j4r28bbrwqmgdva9brms40"))))
+ (base32 "1xihvv67182m7k7lpz5wmjzg22piaabzy9mj6akb7bgl8ynxs7z8"))))
(build-system font-build-system)
(arguments
(list
@@ -1215,7 +1267,7 @@ CJK fonts.")
(define-public font-google-noto-serif-cjk
(package
(name "font-google-noto-serif-cjk")
- (version "2.002")
+ (version "2.003")
(source
(origin
(method url-fetch)
@@ -1224,7 +1276,7 @@ CJK fonts.")
version "/02_NotoSerifCJK-OTF-VF.zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
- (base32 "007jk7rmfapq5zq4ji9d1l5gpp34p98l9ylhiw33q42d66v2g717"))))
+ (base32 "17jjsacnv5lmnidhha9xs1kz6gspbijda01c5y50vk2n86swz63q"))))
(build-system font-build-system)
(arguments
(list #:phases
@@ -1604,7 +1656,10 @@ Terminal, and is now the default font in Visual Studio as well.")
(match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
#:directories? #t)
((dir)
- (chdir dir))))))))
+ (chdir dir)))))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir "../OFL_Licence"))))))
;; While the repository has moved,
;; this specimen still works well as the home-page:
(home-page "https://mozilla.github.io/Fira/")
@@ -1644,6 +1699,13 @@ It includes regular, medium, and bold weights.")
(base32
"10rcfg1fijv00yxv5n9l3lm0axhafa1irkg42zpmasd70flgg655"))))
(build-system font-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir "OFL_Licence"))))))
(home-page "https://github.com/bBoxType/FiraGO")
(synopsis "Multilingual extension of the Fira Sans font family")
(description "FiraGO is a multilingual extension of the Fira Sans font
@@ -1796,8 +1858,7 @@ later hand-tweaked with the gbdfed(1) editor:
;; several hidden files to be installed.
(add-before 'install 'delete-macosx-files
(lambda _
- (delete-file-recursively "__MACOSX")
- #t))
+ (delete-file-recursively "__MACOSX")))
(add-after 'install 'install-conf
(lambda* (#:key outputs #:allow-other-keys)
(let ((conf-dir (string-append (assoc-ref outputs "out")
@@ -1816,8 +1877,10 @@ later hand-tweaked with the gbdfed(1) editor:
<family>Comic Neue</family>
</prefer>
</alias>
-</fontconfig>\n"))))
- #t)))))
+</fontconfig>\n"))))))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir (string-append "comic-neue-" ,version)))))))
(home-page "https://www.comicneue.com/")
(synopsis "Font that fixes the shortcomings of Comic Sans")
(description
@@ -2086,7 +2149,7 @@ weights and five widths in both Roman and Italic, plus variable fonts.")
(define-public font-sarasa-gothic
(package
(name "font-sarasa-gothic")
- (version "1.0.5")
+ (version "1.0.20")
(source
(origin
(method url-fetch)
@@ -2094,7 +2157,7 @@ weights and five widths in both Roman and Italic, plus variable fonts.")
"/releases/download/v" version
"/Sarasa-TTC-" version ".7z"))
(sha256
- (base32 "0sfmqrjfzjy2zxd26kjrdbp59ahxj7p2qr1z5qy512j2cgl1gyiq"))))
+ (base32 "1p84qqjijm618pg7mbzndyl2vjpa6wg8d5rhsi5clppmxjh70ml0"))))
(build-system font-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -2126,15 +2189,6 @@ most CJK characters are same height, and double width as ASCII characters.")))
(base32 "1aiivn0rl7ydiyqvsr0fa2hx82h3br3x48w3100fcly23n0fdcby"))))
(build-system font-build-system)
;; TODO: Package fontmake and gftools and build from source.
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'install-license-files
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/" ,name "-" ,version)))
- (install-file "OFL.txt" doc)
- #t))))))
(home-page "https://floriankarsten.github.io/space-grotesk/")
(synopsis "Proportional variant of the fixed-width Space Mono family")
(description
@@ -2165,13 +2219,17 @@ and stylistic alternates.")
"1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d"))))
(build-system font-build-system)
(arguments
- `(#:phases
+ `(#:license-file-regexp "^(LICENSE|PATENTS)$"
+ #:phases
(modify-phases %standard-phases
(add-before 'install 'chdir
(lambda _
(chdir "font/gofont/ttfs")
- #t)))))
- (home-page "https://blog.golang.org/go-fonts")
+ #t))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir "../../.."))))))
+ (home-page "https://go.dev/blog/go-fonts")
(synopsis "The Go font family")
(description
"The Go font family is a set of WGL4 TrueType fonts from the Bigelow &
@@ -2282,7 +2340,7 @@ variants.")
(version "1.7")
(source
(origin
- (method url-fetch/zipbomb)
+ (method url-fetch)
(uri (string-append "https://web.archive.org/web/20180228233737/"
"https://www.impallari.com/media/releases/dosis-"
"v" version ".zip"))
@@ -2316,7 +2374,8 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
"02akysgsqhi15cck54xcacm16q5raf4l7shgb8fnj7xr3c1pbfyp"))))
(build-system font-build-system)
(arguments
- `(#:phases
+ `(#:license-file-regexp "^GNU-GPL|LICENSE"
+ #:phases
(modify-phases %standard-phases
(add-before 'install 'build
(lambda _
@@ -2497,6 +2556,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")
@@ -2570,7 +2657,7 @@ have been designed to be very distinguishable from each other.")
(version "0.46")
(source
(origin
- (method url-fetch/zipbomb)
+ (method url-fetch)
(uri
(string-append "https://github.com/keshikan/DSEG/"
"releases/download/v" version
@@ -2581,20 +2668,17 @@ have been designed to be very distinguishable from each other.")
(base32 "13133kpa1ndsji9yq5ppkds5yq2y094qvrv2f83ah74p40sz9hm6"))))
(build-system font-build-system)
(arguments
- `(#:phases
+ `(#:license-file-regexp "^DSEG-LICENSE.txt$"
+ #:phases
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(font-dir (string-append out "/share/fonts"))
(truetype-dir (string-append font-dir "/truetype")))
- (with-directory-excursion
- (string-append "fonts-DSEG_v"
- (apply string-append (string-split ,version
- #\.)))
- (for-each (lambda (f) (install-file f truetype-dir))
- (find-files "." "\\.ttf$"))
- #t)))))))
+ (for-each (lambda (f) (install-file f truetype-dir))
+ (find-files "." "\\.ttf$"))
+ #t))))))
(home-page "https://www.keshikan.net/fonts-e.html")
(synopsis "DSEG: 7-segment and 14-segment fonts")
(description
@@ -2645,13 +2729,7 @@ a different style of marking.")
;; Find the license file outside of the default subdirectory.
(lambda _
(chdir "..")
- #t))
- (replace 'install-license-files
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/" ,name "-" ,version)))
- (install-file "OFL.txt" doc)
- #t))))))
+ #t)))))
(home-page "https://www.jetbrains.com/lp/mono/")
(synopsis "Mono typeface for developers")
(description
@@ -3035,11 +3113,11 @@ modified to cover most CJK unified ideograph characters.")
;; This directory, TrueType（サポート外）, is not properly encoded,
;; which makes rename-file fail. Instead, use shell globbing to
;; select and rename the directory.
- (invoke "sh" "-c" "mv TrueType* TrueType")
- #t)))))
- (native-inputs
- `(("bash" ,bash-minimal)
- ("coreutils" ,coreutils)))
+ (invoke "sh" "-c" "mv TrueType* TrueType")))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir "IPAexfont00201"))))))
+ (native-inputs (list bash-minimal coreutils))
(home-page "http://www.fontna.com/blog/1122/")
(synopsis "Mix font of gothic kanji and minchou kana")
(description "Antique is a font that is popular to write manga bubbles,
@@ -3266,6 +3344,7 @@ optimized for using musical symbols inline with regular text.")
(sha256
(base32 "1j8iv2dl695zrabs2knb7jsky8mjis29a2ddpna4by8mlvqrf0ml"))))
(build-system font-build-system)
+ (arguments (list #:license-file-regexp "^Charter license.txt$"))
(home-page "https://practicaltypography.com/charter.html")
(synopsis "Charter fonts in OpenType and TrueType formats")
(description "Charter was designed by Matthew Carter in 1987 and was
@@ -3399,7 +3478,7 @@ and readability. This package bundles those icons into a font.")
(define-public font-lxgw-wenkai
(package
(name "font-lxgw-wenkai")
- (version "1.320")
+ (version "1.330")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3407,7 +3486,7 @@ and readability. This package bundles those icons into a font.")
version "/lxgw-wenkai-v" version ".tar.gz"))
(sha256
(base32
- "1wvab2g2hcy8wqi23zva17rymqfrrfwd7yh0wbhfb67mz18wbjpm"))))
+ "1wpxi4jwxkjslnyi0axqyvqqbf58j7hxllsbxz94zclbri8i9iqa"))))
(build-system font-build-system)
(home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/")
(synopsis "Simplified Chinese Imitation Song typeface")
@@ -3421,7 +3500,7 @@ within GB 2312, standard glyphs for Mainland China is used.")
(package
(inherit font-lxgw-wenkai)
(name "font-lxgw-wenkai-tc")
- (version "1.320")
+ (version "1.330")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3429,7 +3508,7 @@ within GB 2312, standard glyphs for Mainland China is used.")
version "/lxgw-wenkai-tc-v" version ".tar.gz"))
(sha256
(base32
- "0lzfci4zpia62vbnyv22ajlrd8gvwj1ff7iaa0mxs66dbb0p6pq8"))))
+ "06najc2gjhsm50q4q2qlw10n1hdcfpsbnfvgdf6b27gm26rgk5da"))))
(home-page "https://github.com/lxgw/LxgwWenKaitc")
(synopsis "Traditional Chinese Imitation Song typeface")
(description
@@ -3500,7 +3579,7 @@ Mainland China.")
(define-public font-chiron-sung-hk
(package
(name "font-chiron-sung-hk")
- (version "1.011")
+ (version "1.014")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3509,7 +3588,7 @@ Mainland China.")
(file-name (git-file-name name version))
(sha256
(base32
- "1916bb834y4r4312g14zid7w3pbx1i70jcgkkfbf4z20grrj891m"))))
+ "1hvfjvflfyr35ad7hpy5zgc6i580ilfqrz4rbr814i6z9jqz459s"))))
(build-system font-build-system)
(arguments
(list #:phases
@@ -3538,7 +3617,7 @@ prevalent typefaces in Traditional Chinese regions.")
(package
(inherit font-chiron-sung-hk)
(name "font-chiron-hei-hk")
- (version "2.509")
+ (version "2.515")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3547,7 +3626,7 @@ prevalent typefaces in Traditional Chinese regions.")
(file-name (git-file-name name version))
(sha256
(base32
- "0bwx909sijpnc474355hlfjwgxin0m9yxd5k9qwmgxkp2rzqiwnk"))))
+ "00p5bhzs526ml85wm9421a6a1s7w5kgk0p5wcyfvxh1wvwi9p5gj"))))
(synopsis "Traditional Chinese Gothic typeface")
(description
"Chiron Hei HK is a Traditional Chinese Gothic typeface based on the Hong
@@ -3703,6 +3782,8 @@ Most characters are just 4px wide, which is brilliant for low dpi(90-120) displa
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))
(snippet '(delete-file "._Tuffy.otf"))))
(build-system font-build-system)
+ ;; TODO: remove this when font-build-system have 'zstd'.
+ (native-inputs (list zstd))
(home-page "http://tulrich.com/fonts/")
(synopsis "The Tuffy Truetype Font Family")
(description
@@ -3840,3 +3921,40 @@ the pixel grid of standard digital screens. Oswald is designed to be
used freely across the internet by web browsers on desktop computers,
laptops and mobile devices.")
(license license:silofl1.1))))
+
+(define-public font-teko
+ (let ((version "0")
+ (commit "2bf909d46b0061a5e3e16e8acc4fef670e36a8f2")
+ (revision "0"))
+ (package
+ (name "font-teko")
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/googlefonts/teko")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18gwb3k4a3a2406pxpxh9zcziggajl8wwki4730xsh1m066f6gk9"))))
+ (build-system font-build-system)
+ (home-page "https://github.com/googlefonts/teko")
+ (synopsis "Devanagari and Latin scripts typeface")
+ (description "Teko is a typeface that currently supports the
+Devanagari and Latin scripts. This font family has been created for
+use in headlines and other display-sized text on screen. Five font
+styles make up the initial release.
+
+The Teko typeface features letterforms with low stroke contrast,
+square proportions and a structure that appears visually simple.
+
+The Regular, Medium and Semibold fonts are recommended for use in long
+headlines, while Bold is intended primarily for setting just one or
+two words. The Light is a variant that may be put to good use in
+large headlines on websites. At display sizes, Teko works equally
+well on screen or in print. Each font contains 1090 glyphs, offering
+full support for the conjuncts and ligatures required by languages
+written with the Devanagari script.")
+ (license license:silofl1.1))))
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 212c258aca..00fb9c33ee 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
;;; Copyright © 2024 Sören Tempel <soeren@soeren-tempel.net>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1609,44 +1610,46 @@ definitions.")
(define-public fontforge
(package
- (name "fontforge")
- (version "20220308")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/fontforge/fontforge/releases/download/"
- version "/fontforge-" version ".tar.xz"))
- (sha256
- (base32 "0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01"))))
- (build-system cmake-build-system)
- (native-inputs
- (list pkg-config))
- (inputs `(("cairo" ,cairo)
- ("fontconfig" ,fontconfig) ;dlopen'd
- ("freetype" ,freetype)
- ("gettext" ,gettext-minimal)
- ("libICE" ,libice)
- ("libSM" ,libsm)
- ("libX11" ,libx11)
- ("libXi" ,libxi)
- ("libjpeg" ,libjpeg-turbo)
- ("libltdl" ,libltdl)
- ("libpng" ,libpng)
- ("libspiro" ,libspiro)
- ("libtiff" ,libtiff)
- ("libungif" ,libungif)
- ("libxft" ,libxft)
- ("libxml2" ,libxml2)
- ("pango" ,pango)
- ("potrace" ,potrace)
- ("python" ,python)
- ("zlib" ,zlib)))
- (arguments
- (list
- #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
- ;; backend, instead of the legacy X11 backend.
- ;; Currently it introduces a circular dependency.
- "-DENABLE_X11=ON")
+ (name "fontforge")
+ (version "20220308")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/fontforge/fontforge/releases/download/"
+ version "/fontforge-" version ".tar.xz"))
+ (sha256
+ (base32 "0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ (list pkg-config))
+ (inputs
+ (list cairo
+ bash-minimal
+ fontconfig ;dlopen'd
+ freetype
+ gettext-minimal
+ libice
+ libsm
+ libx11
+ libxi
+ libjpeg-turbo
+ libltdl
+ libpng
+ libspiro
+ libtiff
+ libungif
+ libxft
+ libxml2
+ pango
+ potrace
+ python
+ zlib))
+ (arguments
+ (list
+ #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
+ ;; backend, instead of the legacy X11 backend.
+ ;; Currently it introduces a circular dependency.
+ "-DENABLE_X11=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-override-RPATH
@@ -1655,8 +1658,7 @@ definitions.")
;; already does the right thing.
(substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)")
- ""))
- #t))
+ ""))))
#$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch
(lambda _
@@ -1695,45 +1697,18 @@ definitions.")
,(map (lambda (input)
(string-append (assoc-ref inputs input)
"/lib"))
- '("libtiff" "libjpeg" "libpng" "libungif"
+ '("libtiff" "libjpeg-turbo" "libpng" "libungif"
"libxml2" "zlib" "libspiro" "freetype"
- "pango" "cairo" "fontconfig")))
+ "pango" "cairo" "fontconfig-minimal")))
;; Checks for potrace program at runtime
- `("PATH" ":" prefix (,potrace)))
- #t))))))
- (synopsis "Outline font editor")
- (description
- "FontForge allows you to create and modify postscript, truetype and
+ `("PATH" ":" prefix (,potrace)))))))))
+ (synopsis "Outline font editor")
+ (description
+ "FontForge allows you to create and modify postscript, truetype and
opentype fonts. You can save fonts in many different outline formats, and
generate bitmaps.")
- (license license:gpl3+)
- (home-page "https://fontforge.github.io")))
-
-;; This is the last version that supports Python 2, which is needed for
-;; GNU FreeFont. Remove once no longer required.
-(define-public fontforge-20190801
- (package
- (inherit fontforge)
- (version "20190801")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/fontforge/fontforge/releases/download/"
- version "/fontforge-" version ".tar.gz"))
- (sha256
- (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
- (build-system gnu-build-system)
- (arguments
- (substitute-keyword-arguments (package-arguments fontforge)
- ((#:configure-flags _)
- #~'())
- ((#:phases phases)
- #~(modify-phases #$phases
- (delete 'do-not-override-RPATH)))))
- (inputs
- (modify-inputs (package-inputs fontforge)
- (prepend libuninameslist)
- (replace "python" python-2)))))
+ (license license:gpl3+)
+ (home-page "https://fontforge.github.io")))
(define-public python-statmake
(package
@@ -1751,6 +1726,9 @@ generate bitmaps.")
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags
+ ;; The code no longer raises <class 'ValueError'>
+ '(list "-k" "not test_load_stylespace_broken_range")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'adjust-for-older-attrs
@@ -1760,7 +1738,9 @@ generate bitmaps.")
(lambda _
(substitute* "pyproject.toml"
(("attrs = \">=21.3\"")
- "attrs = \">=21.2\""))
+ "attrs = \">=21.2\"")
+ (("cattrs = \">=22.2\"")
+ "cattrs = \">=22.1\""))
(substitute* (find-files "." "\\.py$")
(("from attrs\\b")
"from attr")
@@ -2023,6 +2003,7 @@ work well with other GTK+ desktop environments.")
("gettext" ,gettext-minimal)))
(inputs
`(("cairo" ,cairo)
+ ("bash-minimal", bash-minimal)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 081269ebaf..cb1d625d24 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -37,6 +37,8 @@
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Samuel Culpepper <sculpepper@newstore.com>
;;; Copyright © 2024 aurtzy <aurtzy@gmail.com>
+;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -80,6 +82,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages cups)
#:use-module (gnu packages curl)
@@ -116,6 +119,7 @@
#:use-module (gnu packages networking)
#:use-module (gnu packages nss)
#:use-module (gnu packages package-management)
+ #:use-module (gnu packages pciutils)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
@@ -142,7 +146,7 @@
(define-public appstream
(package
(name "appstream")
- (version "0.16.4")
+ (version "1.0.3")
(source
(origin
(method url-fetch)
@@ -151,9 +155,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
@@ -165,9 +167,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)))))))
@@ -183,7 +185,8 @@
itstool
libxslt
pkg-config
- python-wrapper))
+ python-wrapper
+ gi-docgen))
(inputs
(list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
(propagated-inputs
@@ -212,7 +215,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
@@ -276,7 +293,6 @@ application-centers for distributions.")
gobject-introspection
gtk-doc/stable
libtool
- libxml2 ;for XML_CATALOG_FILES
libxslt
perl
pkg-config
@@ -508,7 +524,7 @@ display servers. It supports many different languages and emoji.")
#:make-flags #~(list (string-append "DESTDIR=" #$output)
#$(string-append "CC=" (cc-for-target)))
#:imported-modules `((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules `((guix build gnu-build-system)
((guix build copy-build-system) #:prefix copy:)
(guix build utils))
@@ -578,9 +594,13 @@ display servers. It supports many different languages and emoji.")
(inputs
(list glib libxml2))
(native-inputs
- (list gettext-minimal pkg-config python xdgmime
- ;; For 'doc' output.
- docbook-xml-4.1.2 docbook-xsl xmlto))
+ (append
+ (if (%current-target-system)
+ (list libxml2 this-package)
+ '())
+ (list gettext-minimal pkg-config python xdgmime
+ ;; For 'doc' output.
+ docbook-xml-4.1.2 docbook-xsl xmlto)))
(outputs (list "out" "doc"))
(home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info")
(synopsis "Database of common MIME types")
@@ -607,7 +627,8 @@ database is translated at Transifex.")
"1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
(build-system gnu-build-system)
(native-inputs
- (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto))
+ (list docbook-xsl docbook-xml-4.1.2
+ libxslt xmlto w3m-for-tests))
(inputs
(list bash-minimal ;for 'wrap-program'
coreutils
@@ -623,7 +644,7 @@ database is translated at Transifex.")
(list
#:tests? #f ;no check target
#:modules `((srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths
@@ -634,32 +655,6 @@ database is translated at Transifex.")
(substitute* "scripts/xdg-open.in"
(("/usr/bin/printf")
(search-input-file inputs "bin/printf")))))
- (add-before 'build 'locate-catalog-files
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (let* ((native (or native-inputs inputs))
- (xmldoc (search-input-directory native
- "xml/dtd/docbook"))
- (xsldoc (search-input-directory
- native
- (string-append "xml/xsl/docbook-xsl-"
- #$(package-version
- (this-package-native-input
- "docbook-xsl"))))))
- (for-each (lambda (file)
- (substitute* file
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd"))))
- (find-files "scripts/desc" "\\.xml$"))
- (substitute* "scripts/Makefile"
- ;; Apparently `xmlto' does not bother to looks up the stylesheets
- ;; specified in the XML, unlike the above substitition. Instead it
- ;; uses a hard-coded URL. Work around it here, but if this is
- ;; common perhaps we should hardcode this path in xmlto itself.
- (("\\$\\(XMLTO\\) man")
- (string-append "$(XMLTO) -x " xsldoc
- "/manpages/docbook.xsl man")))
- (setenv "STYLESHEET"
- (string-append xsldoc "/html/docbook.xsl")))))
(add-after 'install 'wrap-executables
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
@@ -684,15 +679,16 @@ freedesktop.org project.")
;; Updating this will rebuild over 700 packages through libinput-minimal.
(package
(name "libinput")
- (version "1.22.1")
+ (version "1.24.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/libinput/libinput.git")
(commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "17a5qlym2d6lg2j8fdpxda9k7x5zr35flb4wlj1bz7h0mnkh8326"))))
+ "0xk0dljykjfmkks7kjxvbia6g3wadmy7lihfygm8icywkq8j0dw1"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=false")
@@ -702,7 +698,7 @@ freedesktop.org project.")
;; Meson target anyway.
#:build-type "release"))
(native-inputs
- (append (list check pkg-config)
+ (append (list check pkg-config python-minimal-wrapper python-pytest)
(if (%current-target-system)
(list pkg-config-for-build)
'())))
@@ -717,8 +713,8 @@ freedesktop.org project.")
(list check)
'())))
(propagated-inputs
- `(;; libinput.h requires <libudev.h>, so propagate it.
- ("udev" ,eudev)))
+ ;; libinput.h requires <libudev.h>, so propagate it.
+ (list eudev))
(home-page "https://www.freedesktop.org/wiki/Software/libinput/")
(synopsis "Input devices handling library")
(description
@@ -832,7 +828,10 @@ the freedesktop.org XDG Base Directory specification.")
"-Dcgroup-controller=elogind"
"-Dman=true"
;; Disable some tests.
- "-Dslow-tests=false"))
+ "-Dslow-tests=false"
+ ;; Adjust the default user shell to /bin/sh (otherwise it is set
+ ;; to /bin/bash).
+ "-Ddefault-user-shell=/bin/sh"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-pkttyagent-path
@@ -851,11 +850,8 @@ the freedesktop.org XDG Base Directory specification.")
(("PKGSYSCONFDIR") "\"/etc/elogind\""))))
(add-after 'unpack 'adjust-tests
(lambda _
- ;; Skip the user-util tests, which depends on users such as
- ;; 'root' existing in the build environment.
(substitute* "src/test/meson.build"
- ((".*'test-user-util.c'.*") "")
- ((".*'test-cgroup.c'.*") ""))
+ ((".*'test-cgroup.c'.*") "")) ;no cgroup in container
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
@@ -901,7 +897,6 @@ the freedesktop.org XDG Base Directory specification.")
docbook-xsl
gettext-minimal
gperf
- libxml2 ;for XML_CATALOG_FILES
m4
pkg-config
python
@@ -914,6 +909,7 @@ the freedesktop.org XDG Base Directory specification.")
'())
(list linux-pam
libcap
+ libxcrypt
`(,util-linux "lib") ;for 'libmount'
shadow ;for 'nologin'
shepherd ;for 'halt' and 'reboot', invoked
@@ -1132,7 +1128,6 @@ with localed. This package is extracted from the broader systemd package.")
gettext-minimal
`(,glib "bin")
gobject-introspection
- libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
python-wrapper
@@ -1156,48 +1151,67 @@ manager for the current system.")
(define-public power-profiles-daemon
(package
(name "power-profiles-daemon")
- (version "0.12")
+ (version "0.21")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.freedesktop.org/hadess/power-profiles-daemon")
+ (url "https://gitlab.freedesktop.org/upower/power-profiles-daemon")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1wqcajbj358zpyj6y4h1v34y2yncq76wqxd0jm431habcly0bqyr"))))
+ "0dn3ygv49q7mzs52ch3yphxf4hbry698r1ajj52f6jgw7mpwr5p4"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
- (list #:configure-flags #~(list "-Dsystemdsystemunitdir=false")
- #:glib-or-gtk? #t
+ (list #:configure-flags #~(list "-Dsystemdsystemunitdir="
+ "-Dpylint=disabled"
+ "-Dgtk_doc=true"
+ (string-append "-Dzshcomp=" #$output
+ "/share/zsh/site-functions/"))
#:phases
#~(modify-phases %standard-phases
- (add-before 'install 'fake-pkexec
- (lambda _ (setenv "PKEXEC_UID" "-1")))
(add-before 'configure 'correct-polkit-dir
(lambda _
- (substitute* "meson.build"
- (("polkit_gobject_dep\\..*")
- (string-append "'" #$output "/share/polkit-1/actions'")))))
+ (setenv "PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR"
+ (string-append #$output "/share/polkit-1/actions"))))
(add-after 'install 'wrap-program
(lambda _
(wrap-program
(string-append #$output "/bin/powerprofilesctl")
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
+ `("GUIX_PYTHONPATH" = (,(string-append
+ #$(this-package-input "python-pygobject")
+ "/lib/python"
+ #$(version-major+minor
+ (package-version (this-package-input "python")))
+ "/site-packages"))))))
+ (add-after 'install 'move-docs
+ (lambda _
+ (mkdir-p (string-append #$output:doc "/share"))
+ (rename-file
+ (string-append #$output "/share/gtk-doc")
+ (string-append #$output:doc "/share/gtk-doc")))))))
(native-inputs
- (list `(,glib "bin") gobject-introspection pkg-config python vala))
+ (list `(,glib "bin")
+ gtk-doc/stable
+ libxslt
+ pkg-config
+ python
+ python-argparse-manpage
+ python-dbusmock
+ python-shtab
+ umockdev))
(inputs
- (list bash-minimal ;for 'wrap-program'
- dbus
- dbus-glib
+ (list bash-minimal ;for 'wrap-program'
+ bash-completion
libgudev
- glib polkit
+ glib
+ polkit
python
python-pygobject
upower))
- (home-page "https://gitlab.freedesktop.org/hadess/power-profiles-daemon")
+ (home-page "https://gitlab.freedesktop.org/upower/power-profiles-daemon")
(synopsis "Power profile handling over D-Bus")
(description
"power-profiles-daemon offers to modify system behaviour based upon
@@ -1338,7 +1352,7 @@ Python.")
(list pkg-config-for-build
this-package) ;for wayland-scanner
'())))
- (inputs (list expat libxml2)) ;for XML_CATALOG_FILES
+ (inputs (list expat libxml2))
(propagated-inputs (list libffi))
(home-page "https://wayland.freedesktop.org/")
(synopsis "Core Wayland window system code and protocol")
@@ -1381,10 +1395,23 @@ 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")
- (version "1.1.0")
+ (version "1.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1393,7 +1420,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.")
(file-name (git-file-name name version))
(sha256
(base32
- "04k1yhyh7h4xawbhpz9pf6cpfmmp1l862fdgsvvnyp4hg9n3j9aj"))))
+ "1dj9p7vrv3a0fflqkwps8im2hz3ari385a3nqb4ar1ci3crxp204"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(inputs (list libdrm wayland wayland-protocols))
@@ -1708,85 +1735,65 @@ Analysis and Reporting Technology) functionality.")
"06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
(build-system gnu-build-system)
(native-inputs
- `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages
- ("docbook-xsl" ,docbook-xsl)
- ("glib:bin" ,glib "bin") ; for glib-mkenums
- ("gnome-common" ,gnome-common) ; TODO: Why is this needed?
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("xsltproc" ,libxslt)))
+ (list docbook-xml-4.3 ; to build the manpages
+ docbook-xsl
+ `(,glib "bin") ; for glib-mkenums
+ gnome-common ; TODO: Why is this needed?
+ gobject-introspection
+ gtk-doc/stable
+ intltool
+ pkg-config
+ libxslt))
(propagated-inputs
- (list glib)) ; required by udisks2.pc
+ (list glib)) ; required by udisks2.pc
(inputs
- `(,acl
- ;; TODO(staging): Make unconditional.
- ,@(if (%current-target-system)
- (list bash-minimal) ; for wrap-program
- '())
- ,cryptsetup
- ,libatasmart
- ,libblockdev
- ,libgudev
- ,polkit
- ,util-linux))
+ (list acl
+ bash-minimal
+ cryptsetup
+ kmod
+ libatasmart
+ libblockdev
+ libgudev
+ polkit
+ util-linux))
(outputs '("out"
- "doc")) ;5 MiB of gtk-doc HTML
+ "doc")) ;5 MiB of gtk-doc HTML
(arguments
- `(#:tests? #f ; requiring system message dbus
- #:disallowed-references ("doc") ;enforce separation of "doc"
- #:configure-flags
- (list "--enable-man"
- "--enable-available-modules" ; Such as lvm2, btrfs, etc.
- "--localstatedir=/var"
- "--enable-fhs-media" ;mount devices in /media, not /run/media
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/doc/udisks/html")
- (string-append "--with-udevdir=" %output "/lib/udev"))
- #:make-flags
- (let* ((docbook-xsl-name-version ,(string-append
- (package-name docbook-xsl) "-"
- (package-version docbook-xsl)))
- (docbook-xsl-catalog-file (string-append
- (assoc-ref %build-inputs "docbook-xsl")
- "/xml/xsl/"
- docbook-xsl-name-version
- "/catalog.xml"))
- (docbook-xml-catalog-file (string-append
- (assoc-ref %build-inputs "docbook-xml")
- "/xml/dtd/docbook/catalog.xml")))
- ;; Reference the catalog files required to build the manpages.
- (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " "
- docbook-xml-catalog-file)))
- #:phases
- (modify-phases %standard-phases
- (add-before
- 'configure 'fix-girdir
- (lambda _
- ;; Install introspection data to its own output.
- (substitute* "udisks/Makefile.in"
- (("girdir = .*")
- "girdir = $(datadir)/gir-1.0\n")
- (("typelibsdir = .*")
- "typelibsdir = $(libdir)/girepository-1.0\n"))))
- (add-after 'install 'wrap-udisksd
- (lambda* (#:key outputs inputs #:allow-other-keys)
- ;; Tell 'udisksd' where to find the 'mount' command.
- (let ((out (assoc-ref outputs "out"))
- (utils (assoc-ref inputs "util-linux"))
- (cryptsetup (assoc-ref inputs "cryptsetup"))
- (parted (assoc-ref inputs "parted")))
- (wrap-program (string-append out "/libexec/udisks2/udisksd")
- `("PATH" ":" prefix
- (,(string-append utils "/bin") ;for 'mount'
- ;; cryptsetup is required for setting encrypted
- ;; partitions, e.g. in gnome-disks
- ,(string-append cryptsetup "/sbin")
- "/run/current-system/profile/bin"
- "/run/current-system/profile/sbin")))
- #t))))))
+ (list
+ #:tests? #f ; requiring system message dbus
+ #:disallowed-references '("doc") ;enforce separation of "doc"
+ #:configure-flags
+ #~(list "--enable-man"
+ "--enable-available-modules" ; Such as lvm2, btrfs, etc.
+ "--localstatedir=/var"
+ "--enable-fhs-media" ;mount devices in /media, not /run/media
+ (string-append "--with-html-dir=" #$output:doc
+ "/share/doc/udisks/html")
+ (string-append "--with-udevdir=" #$output "/lib/udev"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'fix-girdir
+ (lambda _
+ ;; Install introspection data to its own output.
+ (substitute* "udisks/Makefile.in"
+ (("girdir = .*")
+ "girdir = $(datadir)/gir-1.0\n")
+ (("typelibsdir = .*")
+ "typelibsdir = $(libdir)/girepository-1.0\n"))))
+ (add-after 'install 'wrap-udisksd
+ (lambda _
+ ;; Tell 'udisksd' where to find the 'mount' command.
+ (let ((utils #$(this-package-input "util-linux"))
+ (cryptsetup #$(this-package-input "cryptsetup"))
+ (parted #$(this-package-input "parted")))
+ (wrap-program (string-append #$output "/libexec/udisks2/udisksd")
+ `("PATH" ":" prefix
+ (,(string-append utils "/bin") ;for 'mount'
+ ;; cryptsetup is required for setting encrypted
+ ;; partitions, e.g. in gnome-disks
+ ,(string-append cryptsetup "/sbin")
+ "/run/current-system/profile/bin"
+ "/run/current-system/profile/sbin")))))))))
(home-page "https://www.freedesktop.org/wiki/Software/udisks/")
(synopsis "Disk manager service")
(description
@@ -1852,7 +1859,6 @@ message bus.")
glibc-locales ;for tests
gobject-introspection
gtk-doc
- libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
vala
@@ -1867,6 +1873,7 @@ message bus.")
coreutils-minimal
dbus
elogind
+ libxcrypt
shadow))
(propagated-inputs
;; accountsservice.pc 'Requires' these:
@@ -2242,14 +2249,25 @@ iChat interoperability, and multi-user chats and Tubes using the
(sha256
(base32
"1l61ydb0zv2ffilwpapgz5mm3bznr28zl16xqbxnz6kdsrb6cimr"))))
+ (outputs '("out" "doc"))
(build-system meson-build-system)
- (arguments '(#:tests? #f ;require the colord system service
- ;; Building documentation fails with: "Cannot build man pages
- ;; without docbook-xsl-ns".
- #:configure-flags (list "-Ddocs=false" "-Dman=false")))
+ (arguments
+ (list
+ #:tests? #f ;require the colord system service
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'split-package
+ (lambda _
+ (let* ((old (string-append #$output "/share/gtk-doc"))
+ (new (string-append #$output:doc "/share/gtk-doc")))
+ (mkdir-p (dirname new))
+ (rename-file old new)))))))
(native-inputs
- (list gettext-minimal
+ (list docbook-xsl
+ gettext-minimal
gobject-introspection
+ gtk-doc/stable
+ libxslt
pkg-config
vala))
(inputs
@@ -2425,6 +2443,37 @@ files.
@end table")
(license license:gpl2+)))
+(define-public drm-info
+ (package
+ (name "drm-info")
+ (version "2.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/emersion/drm_info.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fc1rd3c16ddzbdpcj473ykszipzblj98lk376slk63v7mqvc1qm"))))
+ (build-system meson-build-system)
+ (arguments (list #:configure-flags
+ #~(list "-Dman-pages=enabled"
+ "-Dlibpci=enabled")))
+ (native-inputs
+ (append (if (%current-target-system)
+ (list pkg-config-for-build)
+ '())
+ (list pkg-config scdoc)))
+ (inputs
+ (list libdrm json-c pciutils))
+ (home-page "https://gitlab.freedesktop.org/emersion/drm_info")
+ (synopsis "Dump DRM device info")
+ (description "Displaying and dumping information on Direct
+Rendering Manager devices.")
+ (license license:expat)))
+
(define-public xdg-user-dirs
(package
(name "xdg-user-dirs")
@@ -2437,29 +2486,10 @@ files.
(base32 "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"))))
(build-system gnu-build-system)
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("docbook-xsl" ,docbook-xsl)
- ("docbook-xml" ,docbook-xml-4.3)
- ("xsltproc" ,libxslt)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'locate-catalog-files
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook"))
- (xsldoc (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl))))
- (for-each (lambda (file)
- (substitute* file
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd"))))
- (find-files "man" "\\.xml$"))
- (substitute* "man/Makefile"
- (("http://.*/docbook\\.xsl")
- (string-append xsldoc "/manpages/docbook.xsl")))
- #t))))))
+ (list gettext-minimal
+ docbook-xsl
+ docbook-xml-4.3
+ libxslt))
(home-page "https://www.freedesktop.org/wiki/Software/xdg-user-dirs/")
(synopsis "Tool to help manage \"well known\" user directories")
(description "xdg-user-dirs is a tool to help manage \"well known\" user
@@ -2534,11 +2564,7 @@ applications define in those files.")
(base32
"1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn"))))
(build-system perl-build-system)
- (inputs
- ;; TODO(staging): Make unconditional.
- (if (%current-target-system)
- (list bash-minimal) ; for wrap-program
- '()))
+ (inputs (list bash-minimal)) ;for wrap-program
;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and
;; perl-test-tiny as native-inputs.
(propagated-inputs
@@ -2569,8 +2595,7 @@ applications define in those files.")
#~(,(string-append
(getenv "PERL5LIB")
":" out "/lib/perl5/site_perl"))))))
- '("mimeopen" "mimetype")))
- #t)))))
+ '("mimeopen" "mimetype"))))))))
(home-page "https://metacpan.org/release/File-MimeInfo")
(synopsis "Determine file type from the file name")
(description
@@ -2643,19 +2668,16 @@ Python, that binds to the C library @code{uchardet} to increase performance.")
"0z0gk8l6rv4np29kfdalmy4q3900005sxhjg0jz1aa8irdcsp1qz"))))
(build-system python-build-system)
(native-inputs
- `(("asciidoc" ,asciidoc)
- ("gettext" ,gettext-minimal)
- ("gobject-introspection" ,gobject-introspection)))
+ (list asciidoc
+ gettext-minimal
+ gobject-introspection))
(inputs
- ;; TODO(staging): Make unconditional.
- `(,@(if (%current-target-system)
- (list bash-minimal)
- '())
- ,gobject-introspection
- ,gtk+
- ,libappindicator
- ,libnotify
- ,udisks))
+ (list bash-minimal
+ gobject-introspection
+ gtk+
+ libappindicator
+ libnotify
+ udisks))
(propagated-inputs
(list python-docopt python-pygobject python-keyutils python-pyxdg
python-pyyaml))
@@ -2726,7 +2748,6 @@ Its features include:
(native-inputs
(list gettext-minimal
pkg-config
- libxml2 ;for XML_CATALOG_FILES
libxslt
docbook-xsl
docbook-xml))
@@ -3087,16 +3108,22 @@ interfaces.")
(define-public xdg-desktop-portal-kde
(package
(name "xdg-desktop-portal-kde")
- (version "5.27.6")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf"))))
+ "1cm7vh179dvb4jrd70ifsgpkrnfk9imzb65cg76g5znmhvyibjiq"))))
(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
@@ -3105,20 +3132,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.")
@@ -3215,7 +3244,7 @@ notifies the user using any notification daemon implementing
(define-public waypipe
(package
(name "waypipe")
- (version "0.8.1")
+ (version "0.9.0")
(source
(origin
(method git-fetch)
@@ -3224,7 +3253,7 @@ notifies the user using any notification daemon implementing
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1v08dv3dfz420v51ahz7qgv3429073kmgrf8f66s4c3jlpch2pa1"))))
+ (base32 "0pf1q8kyqyqa7gxar99i35q9np0k4vsf7xlrg12gyzc5k36lhknf"))))
(build-system meson-build-system)
(native-inputs
(list pkg-config scdoc
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 80e346d658..bdb163435a 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -190,7 +191,7 @@ as required.")
`(#:configure-flags
(list "--disable-static")))
(native-inputs
- (list cppunit gettext-minimal pkg-config))
+ (list cppunit gettext-minimal libxcrypt pkg-config))
(inputs
(list gnutls nettle))
(home-page "https://lib.filezilla-project.org")
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 8fecd95940..62f578f3db 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.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, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
@@ -22,13 +22,14 @@
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
-;;; Copyright © 2020-2022 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2020-2022, 2024 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 dan <i@dan.games>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -248,6 +249,8 @@ is used in some video games and movies.")
(lambda _
(install-file "libdds.so"
(string-append #$output "/lib"))
+ (let ((inc (string-append #$output "/include")))
+ (copy-recursively "../include" inc))
(let ((doc (string-append #$output
"/share/doc/"
#$name "-" #$version)))
@@ -492,15 +495,15 @@ types (revolute, prismatic, wheel, etc.).")
(define-public python-sge
(package
(name "python-sge")
- (version "2.0.post0")
+ (version "2.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sge" version))
(sha256
(base32
- "0s5d5qzlzfmqb10iyrqi62n36ll94d99xjaznp5ca6dz1b91qkvr"))))
- (build-system python-build-system)
+ "1bp4spcjsmy6xv2j0ciaripfgd3pj5413hhhrj8v8mxcwhraw68p"))))
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-pygame python-uniseg))
(home-page "https://python-sge.github.io/")
@@ -543,15 +546,15 @@ levels.")
(define-public python-xsge
(package
(name "python-xsge")
- (version "2020.09.07")
+ (version "2021.10.11")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/python-sge/xsge"
"/releases/download/v" version
- "/xsge-" version ".zip"))
+ "/xsge-" version ".tar.gz"))
(sha256
(base32
- "136xgy3f9vw636wxpqbha022avk0wyxw63mm3a2dvwhh90s716f9"))))
+ "0g86p5i9lflvblzy7977lmxbsma5hdlz63sk0k8c59vnhg8sij4i"))))
(build-system python-build-system)
(arguments
'(#:phases
@@ -564,8 +567,6 @@ levels.")
(string-append "--prefix=" (assoc-ref outputs "out"))
"--root=/"))))
#:tests? #f)) ; no check target
- (native-inputs
- (list unzip))
(propagated-inputs
(list python-sge))
(home-page "https://python-sge.github.io/")
@@ -575,24 +576,26 @@ levels.")
Game Engine easier. In addition to SGE's conveniences, the user has access to a
GUI toolkit, lighting and physics frameworks and @code{Tiled} TMX format
support.")
- (license license:gpl3+)))
+ (license license:lgpl3+)))
(define-public slade
(package
(name "slade")
- (version "3.2.1")
+ (version "3.2.5a")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sirjuddington/SLADE")
(commit version)))
- (sha256 (base32 "11ab38nv190lpvkdba5r2gckdrk4h15pri0zzslz7zy8qzg5fm18"))
+ (sha256
+ (base32 "1pdrw5ysyh9s907gj6bwf16sf9nm89dlnwlpn0y8x49662kx41v3"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags
#~(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON"
+ "-DBUILD_PK3=ON"
(string-append "-DWITH_WXPATH="
#$(this-package-input "wxwidgets") "/bin")
(string-append "-DwxWidgets_LIBRARIES="
@@ -690,9 +693,9 @@ clone.")
(srfi srfi-1)
((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-command
@@ -919,7 +922,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
(define-public surgescript
(package
(name "surgescript")
- (version "0.5.6.1")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
@@ -928,7 +931,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1p1pxb4iixzq7z14bpy32dx3dhfaaf6mcz4y3g3g09bkdmm1ys6j"))))
+ (base32 "17k14108hvz329cqnr3g799ksmiv8d710slnghi2wmwswir8s0jd"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f)) ; there are no tests
@@ -1380,7 +1383,7 @@ and multimedia programs in the Python language.")
(define-public python-pygame-sdl2
(let ((real-version "2.1.0")
- (renpy-version "8.2.0"))
+ (renpy-version "8.3.0"))
(package
(inherit python-pygame)
(name "python-pygame-sdl2")
@@ -1390,7 +1393,7 @@ and multimedia programs in the Python language.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
- (sha256 (base32 "17mc39c7ha83kzv2wmq61a15mn6p8wh2y33ixhf5sb4bvyr48mhy"))
+ (sha256 (base32 "1p8a4v3r5vjxhiwxdmqqhkl38zav6c4a6w6v2nixzdhzyfkgk16n"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1431,7 +1434,7 @@ developed mainly for Ren'py.")
(define-public python-renpy
(package
(name "python-renpy")
- (version "8.2.0")
+ (version "8.3.0")
(source
(origin
(method url-fetch)
@@ -1439,7 +1442,7 @@ developed mainly for Ren'py.")
"/renpy-" version "-source.tar.bz2"))
(sha256
(base32
- "02v54qqjjigfqhdr50kzhkdvplk56bvprq65jl57kcs1qhvlf5s9"))
+ "1xb9ixb73nm271frkchrqpf64bcrdvrk3n4281dxzm4k4wj60rwb"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -1925,7 +1928,7 @@ games.")
(define-public godot-lts
(package
(name "godot")
- (version "3.4.2")
+ (version "3.5.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1934,7 +1937,7 @@ games.")
(file-name (git-file-name name version))
(sha256
(base32
- "1bm9yl995chvx6jwkdia12yjrgwcpzb1r9bmj606q8z264aw2ma5"))
+ "0zibc6am9axbbm8l57jf2d324a2m44pf6ncp2i4h1b219jjq89l6"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
@@ -1946,7 +1949,6 @@ games.")
(with-directory-excursion "thirdparty"
(let* ((preserved-files
'("README.md"
- "assimp"
"certs"
"cvtt"
"embree"
@@ -1964,105 +1966,110 @@ games.")
"oidn"
"pvrtccompressor"
"recastnavigation"
+ "rvo2"
"squish"
"stb_rect_pack"
"tinyexr"
"vhacd"
"xatlas")))
(for-each delete-file-recursively
- (lset-difference string=?
- (scandir ".")
- (cons* "." ".." preserved-files)))))))))
+ (lset-difference
+ string=?
+ (scandir ".")
+ (cons* "." ".." preserved-files)))))))))
(build-system scons-build-system)
(arguments
- `(#:scons ,scons-python2
- #:scons-flags (list "platform=x11" "target=release_debug"
- ;; Avoid using many of the bundled libs.
- ;; Note: These options can be found in the SConstruct file.
- "builtin_bullet=no"
- "builtin_freetype=no"
- "builtin_glew=no"
- "builtin_libmpdec=no"
- "builtin_libogg=no"
- "builtin_libpng=no"
- "builtin_libtheora=no"
- "builtin_libvorbis=no"
- "builtin_libvpx=no"
- "builtin_libwebp=no"
- "builtin_mbedtls=no"
- "builtin_opus=no"
- "builtin_pcre2=no"
- "builtin_wslay=no"
- "builtin_zlib=no"
- "builtin_zstd=no")
- #:tests? #f ; There are no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'scons-use-env
- (lambda _
- ;; Scons does not use the environment variables by default,
- ;; but this substitution makes it do so.
- (substitute* "SConstruct"
- (("env_base = Environment\\(tools=custom_tools\\)")
- (string-append
- "env_base = Environment(tools=custom_tools)\n"
- "env_base = Environment(ENV=os.environ)")))))
- ;; Build headless tools, used for packaging games without depending on X.
- (add-after 'build 'build-headless
- (lambda* (#:key scons-flags #:allow-other-keys)
- (apply invoke "scons"
- `(,(string-append "-j" (number->string (parallel-job-count)))
- "platform=server" ,@(delete "platform=x11" scons-flags)))))
- (replace 'install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (headless (assoc-ref outputs "headless"))
- (zenity (assoc-ref inputs "zenity")))
- ;; Strip build info from filenames.
- (with-directory-excursion "bin"
- (for-each
- (lambda (file)
- (let ((dest (car (string-split (basename file) #\.))))
- (rename-file file dest)))
- (find-files "." "godot.*\\.x11\\.opt\\.tools.*"))
- (install-file "godot" (string-append out "/bin"))
- (install-file "godot_server" (string-append headless "/bin")))
- ;; Tell the editor where to find zenity for OS.alert().
- (wrap-program (string-append out "/bin/godot")
- `("PATH" ":" prefix (,(string-append zenity "/bin")))))))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
- ;; fix of the mesa package we wrap the pcb executable such that
- ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
- ;; also append ld path for pulseaudio and alsa-lib
- (let* ((out (assoc-ref outputs "out"))
- (udev_path (string-append (assoc-ref inputs "eudev") "/lib"))
- (pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib"))
- (alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib")))
- (wrap-program (string-append out "/bin/godot")
- `("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path))))))
- (add-after 'install 'install-godot-desktop
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (applications (string-append out "/share/applications"))
- (icons (string-append out "/share/icons/hicolor")))
- (mkdir-p applications)
- (copy-file "misc/dist/linux/org.godotengine.Godot.desktop"
- (string-append applications "/godot.desktop"))
- (for-each (lambda (icon dest)
- (mkdir-p (dirname dest))
- (copy-file icon dest))
- '("icon.png" "icon.svg")
- `(,(string-append icons "/256x256/apps/godot.png")
- ,(string-append icons "/scalable/apps/godot.svg")))))))))
+ (list
+ ;; Avoid using many of the bundled libs.
+ ;; Note: These options can be found in the SConstruct file.
+ #:scons-flags #~(list "platform=x11" "target=release_debug"
+ "builtin_bullet=no"
+ "builtin_freetype=no"
+ "builtin_glew=no"
+ "builtin_libmpdec=no"
+ "builtin_libogg=no"
+ "builtin_libpng=no"
+ "builtin_libtheora=no"
+ "builtin_libvorbis=no"
+ "builtin_libvpx=no"
+ "builtin_libwebp=no"
+ "builtin_mbedtls=no"
+ "builtin_opus=no"
+ "builtin_pcre2=no"
+ "builtin_wslay=no"
+ "builtin_zlib=no"
+ "builtin_zstd=no")
+ #:tests? #f ; There are no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'scons-use-env
+ (lambda _
+ ;; Scons does not use the environment variables by default,
+ ;; but this substitution makes it do so.
+ (substitute* "SConstruct"
+ (("env_base = Environment\\(tools=custom_tools\\)")
+ (string-append
+ "env_base = Environment(tools=custom_tools)\n"
+ "env_base = Environment(ENV=os.environ)")))))
+ ;; Build headless tools, to package games without depending on X.
+ (add-after 'build 'build-headless
+ (lambda* (#:key scons-flags #:allow-other-keys)
+ (apply invoke "scons"
+ `(,(string-append
+ "-j" (number->string (parallel-job-count)))
+ "platform=server"
+ ,@(delete "platform=x11" scons-flags)))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (headless (assoc-ref outputs "headless"))
+ (zenity (assoc-ref inputs "zenity")))
+ ;; Strip build info from filenames.
+ (with-directory-excursion "bin"
+ (for-each
+ (lambda (file)
+ (let ((dest (car (string-split (basename file) #\.))))
+ (rename-file file dest)))
+ (find-files "." "godot.*\\.x11\\.opt\\.tools.*"))
+ (install-file "godot" (string-append out "/bin"))
+ (install-file "godot_server"
+ (string-append headless "/bin")))
+ ;; Tell the editor where to find zenity for OS.alert().
+ (wrap-program (string-append out "/bin/godot")
+ `("PATH" ":" prefix (,(string-append zenity "/bin")))))))
+ (add-after 'install 'wrap-ld-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (pulseaudio_path (string-append
+ (assoc-ref inputs "pulseaudio") "/lib"))
+ (alas_lib_path (string-append
+ (assoc-ref inputs "alsa-lib") "/lib")))
+ (wrap-program (string-append out "/bin/godot")
+ `("LD_LIBRARY_PATH" ":" prefix
+ (,pulseaudio_path ,alas_lib_path))))))
+ (add-after 'install 'install-godot-desktop
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (applications (string-append out "/share/applications"))
+ (icons (string-append out "/share/icons/hicolor")))
+ (mkdir-p applications)
+ (copy-file "misc/dist/linux/org.godotengine.Godot.desktop"
+ (string-append applications "/godot.desktop"))
+ (for-each (lambda (icon dest)
+ (mkdir-p (dirname dest))
+ (copy-file icon dest))
+ '("icon.png" "icon.svg")
+ `(,(string-append icons "/256x256/apps/godot.png")
+ ,(string-append icons
+ "/scalable/apps/godot.svg")))))))))
(outputs '("out" "headless"))
(native-inputs
(list pkg-config))
(inputs
(list alsa-lib
+ bash-minimal
bullet
- freetype
+ freetype-with-brotli
glew
glu
libtheora
@@ -2079,7 +2086,7 @@ games.")
opusfile
pcre2
pulseaudio
- eudev ; FIXME: required by mesa
+ eudev
wslay
zenity
`(,zstd "lib")))
@@ -2095,7 +2102,7 @@ scripted in a Python-like language.")
(define-public godot
(package
(name "godot")
- (version "4.2.1")
+ (version "4.2.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2104,7 +2111,7 @@ scripted in a Python-like language.")
(file-name (git-file-name name version))
(sha256
(base32
- "0d5y678986lx4a4xjkxs5glh2dckp8wwl3r3mw72inq7gvaa18s3"))
+ "0wm0pla6f6gvk21gbm5kiihinn05dvvprk0242m6s8c78wy60wka"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
@@ -2304,6 +2311,7 @@ scripted in a Python-like language.")
(list pkg-config))
(inputs
(list alsa-lib
+ bash-minimal
brotli
dbus
embree
@@ -2762,33 +2770,19 @@ specific knowledge of the hardware they are targeting.")
(define-public flatzebra
(package
(name "flatzebra")
- (version "0.1.7")
+ (version "0.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/"
"flatzebra-" version ".tar.gz"))
(sha256
- (base32 "1x2dy41c8vrq62bn03b82fpmk7x4rzd7qqiwvq0mgcl5rmasc2c8"))))
+ (base32 "1p1igi757m9a46v29mm7r40x61kdj7j66b9dbn53l5yfhnwa4w93"))))
(build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-sdl-config
- (lambda* (#:key inputs #:allow-other-keys)
- ;; XXX: sdl-config in sdl-union is a link to sdl-config from
- ;; plain sdl package. As a consequence, the prefix is wrong.
- ;; Force correct one with "--prefix" argument.
- (let ((sdl-union (assoc-ref inputs "sdl")))
- (setenv "SDL_CONFIG"
- (string-append sdl-union
- "/bin/sdl-config --prefix="
- sdl-union)))
- #t)))))
(native-inputs
(list pkg-config))
(inputs
- `(("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer)))))
+ (list sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf))
(home-page "http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html")
(synopsis "Generic game engine for 2D double-buffering animation")
(description
@@ -3097,23 +3091,23 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
(define-public dhewm3
(package
(name "dhewm3")
- (version "1.5.2")
+ (version "1.5.3")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/dhewm/dhewm3/releases/download/"
- version "/dhewm3-" version "-src.tar.xz"))
+ (method git-fetch)
+ (uri (git-reference (url "https://github.com/dhewm/dhewm3")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "10p0w1x5wx9b7d8mzvb6yqjia9prhkjwz04vbvphy8p383r33am6"))))
+ "1zbwhrngmgb0969izmxididyx892qk7591aa9mbigakw6dvmlm84"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; No tests.
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'change-to-build-dir
- (lambda _
- (chdir "neo"))))))
+ (list #:tests? #f ; No tests.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'change-to-build-dir
+ (lambda _
+ (chdir "neo"))))))
(inputs
(list curl
libx11
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1305bf426f..30057a4f4a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -19,7 +19,7 @@
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
@@ -72,7 +72,7 @@
;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
;;; Copyright © 2022, 2023 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
-;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022-2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Hendursaga <hendursaga@aol.com>
;;; Copyright © 2022 Parnikkapore <poomklao@yahoo.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
@@ -82,6 +82,7 @@
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
;;; Copyright © 2024 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2024 Sébastien Lerique <sl@eauchat.org>
+;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -121,6 +122,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -431,6 +433,7 @@ the style of similar games for the Commodore+4.")
libtiff
libvorbis
libx11
+ libxcrypt
libxext
pcre
sdl
@@ -784,10 +787,13 @@ terminal.")
"RELEASE=1"))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'werror-begone
+ (add-after 'unpack 'patch-sources
(lambda _
(substitute* "Makefile" (("-Werror") ""))
- #t))
+ ;; glibc 2.38 includes strlcpy and strlcat.
+ (substitute* "src/headers.h"
+ (("static inline void strlcat.*") "")
+ (("static inline void strlcpy.*") ""))))
(delete 'configure)))) ;no configure script
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -1086,7 +1092,7 @@ high a score as possible.")
(list
#:make-flags
#~(list (string-append "PREFIX=" #$output)
- "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
+ "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" "WARNINGS=-w"
"LOCALIZE=1" "LANGUAGES=all")
#:phases
#~(modify-phases %standard-phases
@@ -1221,7 +1227,8 @@ allows users to brew while offline.")
#:tests? #f)) ; TODO need busted package to run tests
;; Omit Lua-Socket dependency to disable automatic updates.
(inputs
- (list ffmpeg
+ (list bash-minimal
+ ffmpeg
fluid-3
freetype
lua
@@ -1849,7 +1856,7 @@ shadow mimic them to reach blocks you couldn't reach alone.")
(define-public opensurge
(package
(name "opensurge")
- (version "0.6.0.3")
+ (version "0.6.1.1")
(source
(origin
(method git-fetch)
@@ -1858,7 +1865,7 @@ shadow mimic them to reach blocks you couldn't reach alone.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0yia2qcva741a64qpls8a59lvnx5vynqkk2i3arkflw6f1m1vb55"))))
+ (base32 "1hwnjgkbywspmsmpmmnndqil86qqyd21y2q5krs8znwi35ychd3q"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f ; there are no tests
@@ -1890,7 +1897,7 @@ shadow mimic them to reach blocks you couldn't reach alone.")
"Roboto-Bold.ttf"
"Roboto-Medium.ttf"))))))))
(inputs
- (list allegro font-google-roboto surgescript xdg-utils))
+ (list allegro font-google-roboto mesa physfs surgescript xdg-utils))
(home-page "https://opensurge2d.org")
(synopsis "2D retro side-scrolling game")
(description "@code{Open Surge} is a 2D retro side-scrolling platformer
@@ -2065,7 +2072,8 @@ such as chess or stockfish.")
glu
gtkglext
sqlite
- libcanberra))
+ libcanberra
+ libxcrypt)) ;required by Python.h
(native-inputs `(("python-2" ,python-2)
("pkg-config" ,pkg-config)))
(arguments
@@ -2486,7 +2494,7 @@ dummy solver, it can even solve the hands it has generated for you.")
(license license:gpl3))))
(define-public retux
- (let ((release "1.6.1")
+ (let ((release "1.6.2")
(revision 0))
(package
(name "retux")
@@ -2502,7 +2510,7 @@ dummy solver, it can even solve the hands it has generated for you.")
release "-src.zip"))
(sha256
(base32
- "1bkyfm0h4kys0x7c1340fnkhgnmcrf4j2xjm250r5w8q6l7v2wj4"))))
+ "1fzsjg4k25mxjjc28ykz8n3dx5xzwxnp772fwzz5jy1wrxmjkl4x"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -4725,7 +4733,8 @@ Battle for Wesnoth}.")))
(native-inputs
(list pkg-config intltool))
(inputs
- (list gstreamer
+ (list bash-minimal
+ gstreamer
gst-plugins-base ; playbin plugin
gst-plugins-good ; for wav playback
gtk+))
@@ -4744,8 +4753,7 @@ Battle for Wesnoth}.")))
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/gamine")
- `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
- #t)))))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
(home-page "http://gamine-game.sourceforge.net/")
(synopsis "Mouse and keyboard discovery for children")
(description
@@ -4790,14 +4798,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
(define openttd-engine
(package
(name "openttd-engine")
- (version "13.4")
+ (version "14.1")
(source
(origin (method url-fetch)
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
version "/openttd-" version "-source.tar.xz"))
(sha256
(base32
- "0vql1l25ym36vm4g76xl38kijf2gzb1m1x3ri0cf4n7y3fhfn79a"))))
+ "151l05msgfknvfd2pa98n4p01nxw1ainkhc85i7qq5243zqch51c"))))
(build-system cmake-build-system)
(inputs
(list allegro
@@ -5480,8 +5488,7 @@ http://lavachat.symlynx.com/unix/")
(("data = \"data\"")
(string-append "data = \""
(assoc-ref outputs "out")
- "/share/redeclipse/data\"")))
- #t))
+ "/share/redeclipse/data\"")))))
(delete 'configure) ; no configure script
(add-after 'set-paths 'set-sdl-paths
(lambda* (#:key inputs #:allow-other-keys)
@@ -5500,8 +5507,7 @@ http://lavachat.symlynx.com/unix/")
(string-append out "/share/redeclipse/data"))
(mkdir-p (string-append out "/lib/redeclipse"))
(symlink (string-append out "/share/redeclipse/data")
- (string-append out "/lib/redeclipse/data")))
- #t))
+ (string-append out "/lib/redeclipse/data")))))
(add-after 'copy-data 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -5530,12 +5536,11 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(string-append out)
(string-append bin))))
(chmod "redeclipse_linux" #o555)
- (chmod "redeclipse_server_linux" #o555)))
- #t)))))
+ (chmod "redeclipse_server_linux" #o555))))))))
(native-inputs
(list pkg-config))
(inputs
- (list curl freetype glu
+ (list bash-minimal curl freetype glu
(sdl-union (list sdl2 sdl2-image sdl2-mixer))))
(home-page "https://redeclipse.net/")
(synopsis "Arena shooter derived from the Cube 2 engine")
@@ -5992,14 +5997,15 @@ safety of the Chromium vessel.")
(native-inputs
(list gperf pkg-config))
(inputs
- `(("cairo" ,cairo)
- ("fribidi" ,fribidi)
- ("gettext" ,gettext-minimal)
- ("libpng" ,libpng)
- ("librsvg" ,(librsvg-for-system))
- ("libpaper" ,libpaper)
- ("netpbm" ,netpbm)
- ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-ttf sdl-image)))))
+ (list bash-minimal
+ cairo
+ fribidi
+ gettext-minimal
+ libpng
+ (librsvg-for-system)
+ libpaper
+ netpbm
+ (sdl-union (list sdl sdl-mixer sdl-ttf sdl-image))))
;; TODO: Use system fonts rather than those in data/fonts
(arguments
`(#:make-flags `("VER_DATE=2018-09-02"
@@ -6016,8 +6022,7 @@ safety of the Chromium vessel.")
(add-before 'install 'no-sys-cache
(lambda _ ;do not rebuild system conf cache
(substitute* "Makefile"
- (("kbuildsycoca4") ""))
- #t))
+ (("kbuildsycoca4") ""))))
(add-after 'install 'fix-import
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -6235,7 +6240,8 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.")
"laby-use-tmpdir-from-runtime.patch"))))
(build-system glib-or-gtk-build-system)
(inputs
- (list gdk-pixbuf
+ (list bash-minimal
+ gdk-pixbuf
lablgtk3
(librsvg-for-system)
ocaml-lablgtk3-sourceview3
@@ -6730,8 +6736,8 @@ Magic, Egypt, Indians, Norsemen, Persian or Romans.")
(license license:gpl2+)))
(define-public freegish
- (let ((commit "21977ee5fc2008231b35160df00efe954c508b16")
- (revision "2"))
+ (let ((commit "caf58a2f990a939230bab82226e29cd79732f366")
+ (revision "3"))
(package
(name "freegish")
(version (string-append "0-" revision "." (string-take commit 9)))
@@ -6743,7 +6749,7 @@ Magic, Egypt, Indians, Norsemen, Persian or Romans.")
(file-name (git-file-name name version))
(sha256
(base32
- "1qh0gcnbyxyzmb13jifwba4xrzj94m4w9whdvl0gnds6ricmwply"))
+ "0980ad8xg0bzm6507bq9sbgw03i7jj33g0f955g0q8jvpb22r65v"))
(modules '((guix build utils)))
;; The audio files in the "music" directory are licensed under
;; CC-BY-NC, so we delete them.
@@ -6755,25 +6761,14 @@ Magic, Egypt, Indians, Norsemen, Persian or Romans.")
(arguments
`(#:tests? #f ; no tests included
#:configure-flags
- (list "-DCMAKE_INSTALL_FHS=ON")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'set-DATAPATH
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("^option\\(INSTALL_FHS" line)
- (string-append "add_definitions(-DDATAPATH=\""
- (assoc-ref outputs "out") "/share/freegish\")\n"
- line)))
- #t)))))
+ (list "-DINSTALL_FHS=ON")))
(inputs
- (list (sdl-union (list sdl sdl-mixer))
+ (list sdl2
openal
libvorbis
libogg
mesa
- libpng
- zlib))
+ libpng))
(home-page "https://github.com/freegish/freegish")
(synopsis "Side-scrolling physics platformer with a ball of tar")
(description "In FreeGish you control Gish, a ball of tar who lives
@@ -6912,6 +6907,7 @@ over 100 user-created campaigns.")
`(("glu" ,glu)
;; Kiki builds fine with freeglut 3.0.0 but segfaults on start.
("freeglut" ,freeglut-2.8)
+ ("libxcrypt" ,libxcrypt)
("sdl-union" ,(sdl-union (list sdl
sdl-mixer
sdl-image)))
@@ -7379,7 +7375,7 @@ fight against their plot and save his fellow rabbits from slavery.")
fmt
freetype
gloox
- icu4c-68
+ icu4c
libidn
libpng
libsodium
@@ -7502,7 +7498,7 @@ at their peak of economic growth and military prowess.
(define-public open-adventure
(package
(name "open-adventure")
- (version "1.18")
+ (version "1.19")
(source
(origin
(method git-fetch)
@@ -7511,7 +7507,7 @@ at their peak of economic growth and military prowess.
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1zl72lsp443aryzmwzh5w4j439jgf5njvh9xig6vjvmzhfcjkk9q"))))
+ (base32 "19nspsvkzh3xw70mwlvralfr2ia7a8knd9s7x7abmjvk8p5rx468"))))
(build-system gnu-build-system)
(arguments
(list
@@ -7677,32 +7673,30 @@ abilities and powers.")
(define-public quakespasm
(package
(name "quakespasm")
- (version "0.93.2")
+ (version "0.96.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/quakespasm/Source/quakespasm-"
- version ".tgz"))
+ version ".tar.gz"))
(sha256
- (base32 "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5"))))
- (arguments
- `(#:tests? #f
- #:make-flags '("CC=gcc"
- "MP3LIB=mpg123"
- "USE_CODEC_FLAC=1"
- "USE_CODEC_MIKMOD=1"
- "USE_SDL2=1"
- "-CQuake")
- #:phases (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'fix-makefile-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (substitute* "Quake/Makefile"
- (("/usr/local/games")
- (string-append out "/bin")))
- #t))))))
+ (base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw"))))
+ (arguments
+ (list #:tests? #f
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ "MP3LIB=mpg123"
+ "USE_CODEC_FLAC=1"
+ "USE_CODEC_MIKMOD=1"
+ "USE_SDL2=1"
+ "-CQuake")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'fix-makefile-paths
+ (lambda _
+ (mkdir-p (string-append #$output "/bin"))
+ (substitute* "Quake/Makefile"
+ (("/usr/local/games")
+ (string-append #$output "/bin"))))))))
(build-system gnu-build-system)
(inputs (list libmikmod
libvorbis
@@ -7776,14 +7770,14 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(define-public yamagi-quake2
(package
(name "yamagi-quake2")
- (version "7.45")
+ (version "8.30")
(source
(origin
(method url-fetch)
(uri (string-append "https://deponie.yamagi.org/quake2/quake2-"
version ".tar.xz"))
(sha256
- (base32 "0rgz8x7lzd0zb0xqd0gvnf2641nr9xpfm6v14mgh99hspxklaln7"))))
+ (base32 "11lv22y5ccd80iyhk6zj94wligcbx6x5vwbqh3jkgz96v0x5dng2"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -7883,22 +7877,20 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
(sha256
(base32
"1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"))))
- (build-system gnu-build-system)
+ (build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (delete 'configure)
- ;; There is no "install" phase. By default, tbe is installed
- ;; in the build directory. Provide our own installation.
- (replace 'install
+ (add-after 'unpack 'set-cmake-install-prefix
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (share (string-append out "/share")))
- (install-file "usr/games/tbe" bin)
- (mkdir-p share)
- (copy-recursively "usr/share" share)
- #t))))
+ (substitute* "CMakeLists.txt"
+ (("/usr") (assoc-ref outputs "out"))
+ (("TBE_BIN_DIR games") "TBE_BIN_DIR bin"))))
+ (add-after 'unpack 'disable-translations
+ ;; TODO: Re-enable translations when they no longer fail to build.
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ ((".*i18n.*") "")))))
;; Test suite requires a running Xorg server. Even when
;; provided, it fails with "D-Bus library appears to be
;; incorrectly set up; failed to read machine uuid: Failed to
@@ -7908,8 +7900,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
(inputs
(list qtbase-5 qtsvg-5))
(native-inputs
- `(("cmake" ,cmake-minimal)
- ("gettext-minimal" ,gettext-minimal)
+ `(("gettext-minimal" ,gettext-minimal)
("qttools-5" ,qttools-5)))
(synopsis "Realistic physics puzzle game")
(description "The Butterfly Effect (tbe) is a game that uses
@@ -8177,7 +8168,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
(define-public odamex
(package
(name "odamex")
- (version "10.4.0")
+ (version "10.5.0")
(source
(origin
(method url-fetch)
@@ -8185,7 +8176,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
"mirror://sourceforge/odamex/Odamex/" version "/"
"odamex-src-" version ".tar.xz"))
(sha256
- (base32 "1isrmki18471yry48mmm7lxzp1kiqma9cc7fx38cvpm2mpgfyvzk"))
+ (base32 "151dr6gygznqmp2m9wzilbrmr71lka6pwaz53lb835ry8wq3y210"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -8454,6 +8445,7 @@ original.")
unzip))
(inputs
(list alsa-lib
+ bash-minimal
curl
libjpeg-turbo
libmodplug
@@ -8531,7 +8523,7 @@ ncurses for text display.")
(define-public naev
(package
(name "naev")
- (version "0.11.4")
+ (version "0.11.5")
(source
(origin
(method git-fetch)
@@ -8541,7 +8533,7 @@ ncurses for text display.")
(recursive? #t))) ; for game data
(file-name (git-file-name name version))
(sha256
- (base32 "1gd7jgb996fgnlrlqkfyx416g1kd458vik3nviazwwj83ksafaqb"))))
+ (base32 "1wwgnlljcr3zhmxpb21lp9zgyyd198g6bisgykdj868b500f9lxx"))))
(build-system meson-build-system)
(arguments
;; XXX: Do not add debugging symbols, which cause the build to fail.
@@ -8720,8 +8712,7 @@ when packaged in Blorb container files or optionally from individual files.")
(add-after 'unpack 'prevent-build-error
(lambda _
(substitute* "inc/My/Builder.pm"
- (("-Werror") ""))
- #t))
+ (("-Werror") ""))))
(add-after 'install 'install-desktop-file-and-icons
(lambda* (#:key outputs #:allow-other-keys)
(let* ((share (string-append (assoc-ref outputs "out") "/share"))
@@ -8744,8 +8735,7 @@ when packaged in Blorb container files or optionally from individual files.")
(copy-file
(string-append "frozen-bubble-icon-" dim ".png")
(string-append dir "/frozen-bubble.png"))))
- '("16" "32" "48" "64"))))
- #t))
+ '("16" "32" "48" "64"))))))
(add-after 'install 'wrap-perl-libs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@@ -8755,20 +8745,20 @@ when packaged in Blorb container files or optionally from individual files.")
`("PERL5LIB" ":" prefix
(,(string-append perl5lib ":" out
"/lib/perl5/site_perl")))))
- (find-files "bin" ".")))
- #t)))))
+ (find-files "bin" "."))))))))
(native-inputs
(list perl-alien-sdl perl-capture-tiny perl-locale-maketext-lexicon
perl-module-build pkg-config))
(inputs
- `(("glib" ,glib)
- ("perl-compress-bzip2" ,perl-compress-bzip2)
- ("perl-file-sharedir" ,perl-file-sharedir)
- ("perl-file-slurp" ,perl-file-slurp)
- ("perl-file-which" ,perl-file-which)
- ("perl-ipc-system-simple" ,perl-ipc-system-simple)
- ("perl-sdl" ,perl-sdl)
- ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-pango sdl-ttf)))))
+ (list bash-minimal
+ glib
+ perl-compress-bzip2
+ perl-file-sharedir
+ perl-file-slurp
+ perl-file-which
+ perl-ipc-system-simple
+ perl-sdl
+ (sdl-union (list sdl sdl-image sdl-mixer sdl-pango sdl-ttf))))
(home-page "http://frozen-bubble.org/")
(synopsis "Puzzle with bubbles")
(description
@@ -9387,94 +9377,100 @@ a fortress beyond the forbidden swamp.")
(package
(name "openclonk")
(version "8.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.openclonk.org/builds/release/" version "/"
- "openclonk-" version "-src.tar.bz2"))
- (sha256
- (base32
- "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://www.openclonk.org/builds/release/" version "/"
+ "openclonk-" version "-src.tar.bz2"))
+ (sha256
+ (base32
+ "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ (delete-file-recursively "thirdparty")
+ (substitute* "CMakeLists.txt"
+ (("add_subdirectory\\(thirdparty/.*\\)") "")
+ (("set_property\\(.*Third-party.*\\)") "")
+ (("blake2") "b2")
+ (("thirdparty/timsort/sort\\.h") "")
+ (("thirdparty/pcg/.*\\.hpp") ""))
+ (substitute* '("src/lib/C4Random.cpp"
+ "src/landscape/C4Particles.h")
+ (("#include <pcg/pcg_random.hpp>")
+ "#include <pcg_random.hpp>"))
+ (substitute* "src/script/C4ScriptLibraries.cpp"
+ (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.")
+ "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)"))
+ (substitute* '("src/script/C4AulParse.cpp"
+ "src/editor/C4EditCursor.cpp"
+ "src/gui/C4ScriptGuiWindow.cpp")
+ (("#include .C4Include\\.h." all)
+ (string-append "#include <limits>\n" all)))
+ (substitute* "src/lib/StdMesh.cpp"
+ (("#include .timsort/sort\\.h.")
+ "#include <sort.h>"))))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DAudio_TK=OpenAL")
- #:test-target "tests"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'prepare-gmock
- (lambda* (#:key inputs #:allow-other-keys)
- (mkdir "gmock")
- (copy-recursively (assoc-ref inputs "googlemock") "gmock")
- (substitute* "tests/CMakeLists.txt"
- (("/usr/src/gmock")
- (string-append (getcwd) "/gmock/googlemock"))
- (("/usr/src/gtest")
- (string-append (getcwd) "/gmock/googletest"))
- (("PATH_SUFFIXES \"src\" \"gtest\"")
- "PATH_SUFFIXES \"src\""))
- #t))
- (add-after 'unpack 'adjust-backward-cpp-includes
- (lambda _
- ;; XXX: The bundled backward-cpp exports a CMake "interface"
- ;; that includes external libraries such as libdl from glibc.
- ;; By default, CMake interface includes are treated as "system
- ;; headers", and GCC behaves poorly when glibc is passed as a
- ;; system header (causing #include_next failures).
-
- ;; Here we prevent targets that consume the Backward::Backward
- ;; interface from treating it as "system includes".
- (substitute* "CMakeLists.txt"
- (("target_link_libraries\\((.+) Backward::Backward\\)" all target)
- (string-append "set_property(TARGET " target " PROPERTY "
- "NO_SYSTEM_FROM_IMPORTED true)\n"
- all)))
- #t))
- (add-after 'unpack 'add-libiberty
- ;; Build fails upon linking executables without this.
- (lambda _
- (substitute* "thirdparty/backward-cpp/BackwardConfig.cmake"
- (("set\\(LIBBFD_LIBRARIES (.*?)\\)" _ libraries)
- (string-append "set(LIBBFD_LIBRARIES " libraries " iberty)")))
- #t))
- (add-after 'add-libiberty 'lax-freealut-requirement
- ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects
- ;; it as 1.0.1. Force minimal version.
- (lambda _
- (substitute* "cmake/FindAudio.cmake"
- (("freealut>=1.1.0") "freealut>=1.0.1"))
- #t))
- (add-after 'lax-freealut-requirement 'fix-directories
- ;; Prefer "$out/share/openclonk" over
- ;; "$out/share/games/openclonk". Also install "openclonk"
- ;; binary in "bin/", not "games/".
- (lambda _
- (substitute* "CMakeLists.txt"
- (("share/games/openclonk") "share/openclonk")
- (("TARGETS openclonk DESTINATION games")
- "TARGETS openclonk DESTINATION bin"))
- #t)))))
+ (list
+ #:configure-flags
+ #~(list "-DAudio_TK=OpenAL")
+ #:test-target "tests"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'prepare-gmock
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gmock (search-input-directory inputs "/googlemock"))
+ (gtest (search-input-directory inputs "/googletest")))
+ (mkdir "gmock")
+ (copy-recursively gmock "gmock/googlemock")
+ (copy-recursively gtest "gmock/googletest")
+ (substitute* "tests/CMakeLists.txt"
+ (("/usr/src/gmock")
+ (string-append (getcwd) "/gmock/googlemock"))
+ (("/usr/src/gtest")
+ (string-append (getcwd) "/gmock/googletest"))
+ (("PATH_SUFFIXES \"src\" \"gtest\"")
+ "PATH_SUFFIXES \"src\"")))))
+ (add-after 'prepare-gmock 'lax-freealut-requirement
+ ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects
+ ;; it as 1.0.1. Force minimal version.
+ (lambda _
+ (substitute* "cmake/FindAudio.cmake"
+ (("freealut>=1.1.0") "freealut>=1.0.1"))))
+ (add-after 'lax-freealut-requirement 'fix-directories
+ ;; Prefer "$out/share/openclonk" over
+ ;; "$out/share/games/openclonk". Also install "openclonk"
+ ;; binary in "bin/", not "games/".
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("share/games/openclonk") "share/openclonk")
+ (("TARGETS openclonk DESTINATION games")
+ "TARGETS openclonk DESTINATION bin")))))))
(native-inputs
- `(("googlemock" ,(package-source googletest))
- ("googletest" ,googletest)
- ("pkg-config" ,pkg-config)))
+ (list (package-source googletest)
+ googletest
+ pkg-config))
(inputs
- `(("freealut" ,freealut)
- ("freetype" ,freetype)
- ("glew" ,glew)
- ("libiberty" ,libiberty)
- ("libjpeg" ,libjpeg-turbo)
- ("libogg" ,libogg)
- ("libpng" ,libpng)
- ("libvorbis" ,libvorbis)
- ("libxrandr" ,libxrandr)
- ("mesa" ,mesa)
- ("miniupnpc" ,miniupnpc)
- ("openal" ,openal)
- ("qtbase" ,qtbase-5)
- ("readline" ,readline)
- ("sdl" ,sdl2)
- ("tinyxml" ,tinyxml)
- ("zlib" ,zlib)))
+ (list c-template-sort
+ freealut
+ freetype
+ glew
+ libb2
+ libjpeg-turbo
+ libogg
+ libpng
+ libvorbis
+ libxrandr
+ mesa
+ miniupnpc
+ openal
+ pcg-cpp
+ qtbase-5
+ readline
+ sdl2
+ tinyxml))
(home-page "https://www.openclonk.org/")
(synopsis
"Multiplayer action game where you control small and nimble humanoids")
@@ -10112,7 +10108,7 @@ on items and player adaptability for character progression.")
"07gi3lsmbzzsjambgixj6xy79lh22km84z7bnzgwzxdy806lyvwb"))))
(build-system gnu-build-system)
(inputs
- (list glib gtk+-2 vte/gtk+-2 readline guile-1.8))
+ (list glib gtk+-2 vte/gtk+-2 readline guile-1.8 libxcrypt))
(native-inputs
(list pkg-config))
(arguments
@@ -10274,54 +10270,104 @@ remake of that series or any other game.")
;; released under lgpl2.1+.
(license (list license:gpl2 license:cc-by-sa3.0 license:lgpl2.1+))))
+(define-public lead-solver
+ (package
+ (name "lead-solver")
+ (version "1.0.2")
+ (source (origin
+ (method url-fetch)
+ (uri (let ((v (apply string-append (string-split version #\.))))
+ (string-append
+ "https://lajollabridge.com/Software/Lead-Solver/"
+ "leadsolver-" v ".zip")))
+ (sha256
+ (base32
+ "0xsa7r6r5sprgy0pkdm1xj1jwyy6d3qak2ynviy8xplicl99q09f"))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ #~(begin
+ ;; Remove pre-built executables and cruft relative
+ ;; to other OSes.
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (f)
+ (not (member f '("." ".." "leadsolver.cpp"))))))
+ (substitute* "leadsolver.cpp"
+ (("#include \"dll.h\"") "#include <dll.h>"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #false ;no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'build
+ (lambda _
+ (invoke "g++" "leadsolver.cpp" "-ldds" "-o" "leadsolver")))
+ (replace 'install ;no install phase
+ (lambda _
+ (let ((bin (string-append #$output "/bin")))
+ (install-file "leadsolver" bin)))))))
+ (native-inputs (list unzip))
+ (inputs (list dds))
+ (home-page
+ "https://lajollabridge.com/Software/Lead-Solver/Lead-Solver-About.htm")
+ (synopsis "Analyze leads in bridge game")
+ (description
+ "Given bridge hands, Lead Solver tallies up how well each card does when
+led in terms of average tricks taken for the defense (for matchpoints) and how
+often the contract is set (for team play).")
+ (license license:gpl3)))
+
(define-public leela-zero
(package
- (name "leela-zero")
- (version "0.17")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/leela-zero/leela-zero")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17px5iny8mql5c01bymcli7zfssswkzvb2i8gnsmjcck6i2n8srl"))
- (patches (search-patches "leela-zero-gtest.patch"))))
- (build-system cmake-build-system)
- (native-inputs
- (list googletest))
- (inputs
- (list boost
- opencl-icd-loader
- openblas
- opencl-headers
- qtbase-5
- zlib))
- (arguments
- '(#:configure-flags '("-DUSE_BLAS=YES")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'fix-tests
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((home (getcwd)))
- (setenv "HOME" home)
- (substitute* "src/tests/gtests.cpp"
- (("\\.\\./src/tests/0k\\.txt")
- (string-append home "/src/tests/0k.txt"))
- (("cfg_gtp_mode = true;")
- "cfg_gtp_mode = true; cfg_cpu_only = true;")))
- #t))
- (replace 'check
- (lambda _
- (invoke "./tests"))))))
- (home-page "https://github.com/leela-zero/leela-zero")
- (synopsis "Program playing the game of Go")
- (description
- "Leela-zero is a Go engine with no human-provided knowledge, modeled after
+ (name "leela-zero")
+ (version "0.17")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/leela-zero/leela-zero")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17px5iny8mql5c01bymcli7zfssswkzvb2i8gnsmjcck6i2n8srl"))
+ (patches (search-patches "leela-zero-gtest.patch"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ (list googletest))
+ (inputs
+ (list boost
+ opencl-icd-loader
+ openblas
+ opencl-headers
+ qtbase-5
+ zlib))
+ (arguments
+ '(#:configure-flags '("-DUSE_BLAS=YES")
+ #:phases (modify-phases %standard-phases
+ (add-before 'configure 'fix-tests
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((home (getcwd)))
+ (setenv "HOME" home)
+ (substitute* "src/tests/gtests.cpp"
+ (("\\.\\./src/tests/0k\\.txt")
+ (string-append home "/src/tests/0k.txt"))
+ (("cfg_gtp_mode = true;")
+ "cfg_gtp_mode = true; cfg_cpu_only = true;")))
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "./tests"))))))
+ (home-page "https://github.com/leela-zero/leela-zero")
+ (synopsis "Program playing the game of Go")
+ (description
+ "Leela-zero is a Go engine with no human-provided knowledge, modeled after
the AlphaGo Zero paper. The current best network weights file for the engine
can be downloaded from @url{https://zero.sjeng.org/best-network}.")
- (license license:gpl3+)))
+ (license license:gpl3+)))
(define-public q5go
(package
@@ -10779,14 +10825,14 @@ get high scores.")
(define-public burgerspace
(package
(name "burgerspace")
- (version "1.9.5")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/"
"burgerspace-" version ".tar.gz"))
(sha256
- (base32 "1r2albqv2ygs58rwcldsx1mp2vy96j7k4yw5jjmvwgnxjmddq7wr"))))
+ (base32 "18ydm3014y9vhma0ml7z66xa7ihiz3xr8izicfdd3xl9f4535f6c"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@@ -10851,8 +10897,7 @@ kingdom.")
(snippet
'(begin
;; Octocat seems to be non-free. Oddly, Debian doesn't strip it.
- (delete-file-recursively "data/ball/octocat")
- #t))))
+ (delete-file-recursively "data/ball/octocat")))))
(build-system copy-build-system)
(arguments
`(#:install-plan
@@ -10917,20 +10962,19 @@ kingdom.")
(string-append "LOCALEDIR=" out "/share/locale")
(string-append "SDL_CPPFLAGS=-I"
sdl
- "/include/SDL2/")))
- #t))
+ "/include/SDL2/")))))
(add-after 'install 'fix-some-broken-fonts
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/neverball")
`("LANG" = ("en_US.utf8")))
(wrap-program (string-append out "/bin/neverputt")
- `("LANG" = ("en_US.utf8"))))
- #t)))))
+ `("LANG" = ("en_US.utf8")))))))))
(native-inputs
`(("gettext" ,gettext-minimal))) ;for msgfmt
(inputs
- `(("libjpeg" ,libjpeg-turbo)
+ `(("bash-minimal" ,bash-minimal)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libvorbis" ,libvorbis)
("physfs" ,physfs)
@@ -11317,7 +11361,7 @@ available.")
"exec ~a --path=~a glk:zcode~%"
scummvm share)))
(chmod executable #o755))))
- (add-after 'install-executable 'install-desktop-file
+ (add-after 'install 'install-desktop-file
(lambda _
(let* ((apps (string-append #$output "/share/applications"))
(share (string-append #$output "")))
@@ -11469,7 +11513,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
(define-public vcmi
(package
(name "vcmi")
- (version "1.4.5")
+ (version "1.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -11478,11 +11522,11 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
(file-name (git-file-name name version))
(sha256
(base32
- "1z4vy3drj6dra8rb243pyryr61jnlw3l7yxsxwl9rddv8cdk69lz"))
+ "1s3a23p9k081ccbkhvifx2rhg6rv82fkrsbjh6allmmsa1lhq6fd"))
(patches (search-patches "vcmi-disable-privacy-breach.patch"))))
(build-system cmake-build-system)
(arguments
- (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF")
+ (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF" "-DENABLE_INNOEXTRACT=OFF")
;; Test suites do not seem well supported upstream and are disabled by default.
;; Pass -DENABLE_TEST to configure to enable.
#:tests? #f))
@@ -11775,48 +11819,6 @@ on the pitch of the voice and the rhythm of singing.")
virtual reality devices.")
(license license:expat))))
-(define-public zsnes
- (package
- (name "zsnes")
- (version "2.0.12")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xyproto/zsnes")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0g9l1ij3p1adkp97wkp0dz44i2xpmsvfpkxvlfkpr7190dibsgsz"))))
- (build-system gnu-build-system)
- (arguments
- (list #:system "i686-linux" ;requires 32 bit libraries to build
- #:tests? #f ;no test suite
- #:make-flags
- #~(list (string-append "CC=" #$(cc-for-target))
- (string-append "CXX=" #$(cxx-for-target))
- (string-append "PREFIX=" #$output))
- #:phases #~(modify-phases %standard-phases
- (delete 'configure)))) ;no configure script
- (native-inputs (list nasm pkg-config))
- (inputs (list glib libpng mesa ncurses sdl zlib))
- (home-page "https://www.zsnes.com")
- (synopsis "Super Nintendo Entertainment System emulator")
- (description "ZSNES is a @acronym{Super Nintendo Entertainment System,
-SNES} emulator that can play most games at full speed with sound and special
-graphic filters. Some of its features include:
-@itemize
-@item Support for smooth and dynamic image scaling
-@item Support for rewinding and fast-forwarding in-game
-@item JMA compression format
-@item Change the appearance of the GUI
-@item Take screenshots of currently running games
-@item Saving the game at any point by recording the console’s state
-@item Record movies of gameplay which can be played back.
-@end itemize")
- (license license:gpl2+)
- (supported-systems (list "x86_64-linux"))))
-
;;;
;;; 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/gawk.scm b/gnu/packages/gawk.scm
index 16a4ca5b0a..1497030043 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2016, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2018, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;;
@@ -39,13 +39,13 @@
(define-public gawk
(package
(name "gawk")
- (version "5.2.1")
+ (version "5.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gawk/gawk-" version
".tar.xz"))
(sha256
- (base32 "0kvy78jdv6lww1s6y2jm1w2cj46mz1fhflgdj9bwq64y3ywm6db7"))))
+ (base32 "02x97iyl9v84as4rkdrrkfk2j4vy4r3hpp3rkp3gh3qxs79id76a"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -79,6 +79,10 @@
(("#! /usr/bin/gawk")
(string-append "#!" (which "gawk")))))))))
+ ;; Tests explicitly require en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and
+ ;; ja_JP.UTF-8.
+ (native-inputs (list (libc-utf8-locales-for-target)))
+
(inputs (list libsigsegv
;; Use the full-fledged Bash package, otherwise the test suite
;; sometimes fail non-deterministically.
@@ -179,6 +183,7 @@ of fewer features and extensions.")
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "bin/cppawk"
+ (("/bin/sh") (which "sh"))
(("/bin/bash") (which "bash"))
(("dirname") (which "dirname"))
(("mktemp") (which "mktemp"))
@@ -186,13 +191,20 @@ of fewer features and extensions.")
(("printf ") (string-append (which "printf") " "))
(("rm -f") (string-append (which "rm") " -f"))
(("prepro=cpp") (string-append "prepro=" (which "cpp")))
- (("sed -e") (string-append (which "sed") " -e")))))
+ (("sed -e") (string-append (which "sed") " -e")))
+ (substitute* '("runtests"
+ "testdir/testawk"
+ "testdir/testcpp"
+ "testdir/testdel")
+ (("/bin/sh") (which "sh")))
+ (substitute* "testsuite.awk"
+ (("/usr/bin/awk") (which "awk")))))
(add-after 'fix-paths 'fix-awk-paths
(lambda _
(substitute* "bin/cppawk"
(("awk=gawk") (string-append "awk=" (which "gawk")))
(("awk '") (string-append (which "gawk") " '")))))
- (add-after 'build 'check
+ (add-after 'fix-awk-paths 'check
(lambda _
(invoke "./runtests"))))))
(native-inputs
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 7be4cb9bb1..2f90024295 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -14,6 +14,8 @@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,6 +52,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix gexp)
+ #:use-module (guix search-paths)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
@@ -131,7 +134,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(list 'quasiquote
(append
'("--enable-plugin"
- "--enable-languages=c,c++"
+ "--enable-languages=c,c++,objc,obj-c++"
"--disable-multilib"
"--with-system-zlib"
@@ -369,25 +372,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(substitute* "Makefile"
(("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
"TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
-
- (native-search-paths
- ;; Use the language-specific variables rather than 'CPATH' because they
- ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
- ;; The intent is to allow headers that are in the search path to be
- ;; treated as "system headers" (headers exempt from warnings) just like
- ;; the typical /usr/include headers on an FHS system.
- (list (search-path-specification
- (variable "C_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "CPLUS_INCLUDE_PATH")
- ;; Add 'include/c++' here so that <cstdlib>'s "#include_next
- ;; <stdlib.h>" finds GCC's <stdlib.h>, not libc's.
- (files '("include/c++" "include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64")))))
-
+ (native-search-paths %gcc-search-paths)
(properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
(synopsis "GNU Compiler Collection")
(description
@@ -435,7 +420,7 @@ Go. It also includes runtime support libraries for these languages.")
;; For native builds of some GCC versions the C++ include path needs to
;; be adjusted so it does not interfere with GCC's own build processes.
(substitute-keyword-arguments (package-arguments parent)
- ((#:modules modules %gnu-build-system-modules)
+ ((#:modules modules %default-gnu-modules)
`((srfi srfi-1)
,@modules))
((#:phases phases)
@@ -520,6 +505,10 @@ Go. It also includes runtime support libraries for these languages.")
"gcc-5.0-libvtv-runpath.patch"
"gcc-5-source-date-epoch-1.patch"
"gcc-5-source-date-epoch-2.patch"
+ "gcc-5.5.0-libstdc++-xmlcatalog.patch"
+ "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch"
+ "gcc-13.2.0-libstdc++-info-install-fix.patch"
+ "gcc-7-libsanitizer-fsconfig-command.patch"
"gcc-6-libsanitizer-mode-size.patch"
"gcc-fix-texi2pod.patch"
"gcc-5-hurd.patch"
@@ -544,6 +533,7 @@ Go. It also includes runtime support libraries for these languages.")
(base32
"0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"))
(patches (search-patches "gcc-strmov-store-file-names.patch"
+ "gcc-7-libsanitizer-fsconfig-command.patch"
"gcc-6-libsanitizer-mode-size.patch"
"gcc-6-source-date-epoch-1.patch"
"gcc-6-source-date-epoch-2.patch"
@@ -599,6 +589,9 @@ Go. It also includes runtime support libraries for these languages.")
'("armv8.3-a" "armv8.4-a" "armv8.5-a" "armv8.6-a"
"armv8-r" "armv8.1-m.main")))
+(define %gcc-10-ppc64le-micro-architectures
+ '("power8" "power9" "power10" "powerpc64le"))
+
(define %gcc-10-x86_64-micro-architectures
;; Suitable '-march' values for GCC 10.
(append %gcc-7.5-x86_64-micro-architectures
@@ -664,6 +657,7 @@ Go. It also includes runtime support libraries for these languages.")
"0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"))
(patches (search-patches "gcc-strmov-store-file-names.patch"
"gcc-7-libsanitizer-mode-size.patch"
+ "gcc-7-libsanitizer-fsconfig-command.patch"
"gcc-5.0-libvtv-runpath.patch"))))
(description
"GCC is the GNU Compiler Collection. It provides compiler front-ends
@@ -705,7 +699,9 @@ It also includes runtime support libraries for these languages.")
(sha256
(base32
"13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"))
- (patches (search-patches "gcc-9-strmov-store-file-names.patch"
+ (patches (search-patches "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch"
+ "gcc-13.2.0-libstdc++-info-install-fix.patch"
+ "gcc-9-strmov-store-file-names.patch"
"gcc-9-asan-fix-limits-include.patch"
"gcc-5.0-libvtv-runpath.patch"))
(modules '((guix build utils)))
@@ -723,13 +719,15 @@ It also includes runtime support libraries for these languages.")
(base32
"1h87lcfaga0ydsf4pkhwlnjr8mky5ix8npbv6iy3jvzlzm1ra415"))
(patches (search-patches "gcc-9-strmov-store-file-names.patch"
- "gcc-5.0-libvtv-runpath.patch"))
+ "gcc-5.0-libvtv-runpath.patch"
+ "gcc-10-libsanitizer-no-crypt.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))
(properties
`((compiler-cpu-architectures
("aarch64" ,@%gcc-10-aarch64-micro-architectures)
("armhf" ,@%gcc-10-armhf-micro-architectures)
+ ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
("i686" ,@%gcc-10-x86_64-micro-architectures)
("x86_64" ,@%gcc-10-x86_64-micro-architectures))
,@(package-properties gcc-8)))))
@@ -737,52 +735,44 @@ It also includes runtime support libraries for these languages.")
(define-public gcc-11
(package
(inherit gcc-8)
- (version "11.3.0")
+ (version "11.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
- "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l"))
+ "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z"))
(patches (search-patches "gcc-9-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"
- "gcc-10-tree-sra-union-handling.patch"))
+ "gcc-10-libsanitizer-no-crypt.patch"
+ "gcc-11-libstdc++-hurd-libpthread.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))
- (arguments
- (substitute-keyword-arguments (package-arguments gcc-8)
- ((#:phases phases #~%standard-phases)
- (if (target-hurd?)
- #~(modify-phases #$phases
- (add-after 'unpack 'patch-hurd-libpthread
- (lambda _
- (define patch
- #$(local-file
- (search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
- (invoke "patch" "--force" "-p1" "-i" patch))))
- phases))))
(properties
`((compiler-cpu-architectures
("aarch64" ,@%gcc-11-aarch64-micro-architectures)
("armhf" ,@%gcc-11-armhf-micro-architectures)
("i686" ,@%gcc-11-x86_64-micro-architectures)
+ ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
("x86_64" ,@%gcc-11-x86_64-micro-architectures))
,@(package-properties gcc-8)))))
(define-public gcc-12
(package
(inherit gcc-11)
- (version "12.3.0")
+ (version "12.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
- "0fwcvbgpmjdfj5drfs8k6bkqsmxmz8pv4cmmjcd451p7k57mv6ll"))
+ "0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))
(patches (search-patches "gcc-12-strmov-store-file-names.patch"
- "gcc-5.0-libvtv-runpath.patch"))
+ "gcc-5.0-libvtv-runpath.patch"
+ "gcc-12-libsanitizer-no-crypt.patch"
+ "gcc-11-libstdc++-hurd-libpthread.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))
(properties
@@ -790,32 +780,65 @@ It also includes runtime support libraries for these languages.")
("aarch64" ,@%gcc-12-aarch64-micro-architectures)
("armhf" ,@%gcc-12-armhf-micro-architectures)
("i686" ,@%gcc-12-x86_64-micro-architectures)
+ ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
("x86_64" ,@%gcc-12-x86_64-micro-architectures))
,@(package-properties gcc-11)))))
(define-public gcc-13
(package
(inherit gcc-11)
- (version "13.2.0")
+ (version "13.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
- "1nj3qyswcgc650sl3h0480a171ixp33ca13zl90p61m689jffxg2"))
+ "10y0l1hx1haz4cj4d4g9f2ci5h7z9555i52f90zs2hwm3iifji88"))
(patches (search-patches "gcc-12-strmov-store-file-names.patch"
- "gcc-5.0-libvtv-runpath.patch"))
+ "gcc-5.0-libvtv-runpath.patch"
+ "gcc-13-libsanitizer-no-crypt.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gcc-11)
+ ((#:phases phases #~%standard-phases)
+ (if (target-hurd?)
+ #~(modify-phases #$phases
+ (delete 'patch-hurd-libpthread))
+ phases))))
(properties
`((compiler-cpu-architectures
("aarch64" ,@%gcc-13-aarch64-micro-architectures)
("armhf" ,@%gcc-13-armhf-micro-architectures)
("i686" ,@%gcc-13-x86_64-micro-architectures)
+ ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
("x86_64" ,@%gcc-13-x86_64-micro-architectures))
,@(package-properties gcc-11)))))
+(define-public gcc-14
+ (package
+ (inherit gcc-13)
+ (version "14.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-"
+ version "/gcc-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1j9wdznsp772q15w1kl5ip0gf0bh8wkanq2sdj12b7mzkk39pcx7"))
+ (patches (search-patches "gcc-12-strmov-store-file-names.patch"
+ "gcc-5.0-libvtv-runpath.patch"))
+ (modules '((guix build utils)))
+ (snippet gcc-canadian-cross-objdump-snippet)))
+ (arguments (substitute-keyword-arguments (package-arguments gcc-13)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-before 'configure 'pre-x86-configure
+ (lambda _
+ (substitute* "gcc/config/i386/t-linux64"
+ (("\\.\\./lib64") "../lib"))))))))))
+
;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions.
@@ -913,12 +936,8 @@ It also includes runtime support libraries for these languages.")
"MAKEINFOFLAGS = --force\n"))))))))
(native-search-paths
;; This package supports nothing but the C language.
- (list (search-path-specification
- (variable "C_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib")))))))
+ (list $C_INCLUDE_PATH
+ $LIBRARY_PATH))))
(define-public (make-libstdc++ gcc)
@@ -932,7 +951,7 @@ using compilers other than GCC."
#:out-of-source? #t
#:modules `((srfi srfi-1)
(srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
#$@(if (version>=? (package-version gcc) "11")
@@ -983,7 +1002,7 @@ using compilers other than GCC."
(assoc-ref inputs "powerpc64le-patch"))))))
'()))
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
- (add-before 'chdir 'fix-rs6000-libdir
+ (add-after 'unpack 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
@@ -1080,7 +1099,7 @@ as the 'native-search-paths' field."
(native-search-paths search-paths)
(arguments
(substitute-keyword-arguments (package-arguments gcc)
- ((#:modules modules %gnu-build-system-modules)
+ ((#:modules modules %default-gnu-modules)
`(,@modules
(srfi srfi-1)
(srfi srfi-26)
@@ -1113,6 +1132,12 @@ as the 'native-search-paths' field."
(variable "LIBRARY_PATH")
(files '("lib" "lib64")))))
+(define-public gfortran-13
+ (hidden-package
+ (custom-gcc gcc-13
+ "gfortran" '("fortran")
+ %generic-search-paths)))
+
(define-public gfortran
(hidden-package
(custom-gcc gcc
@@ -1198,8 +1223,10 @@ misnomer.")))
(define-public libgccjit-10 (make-libgccjit gcc-10))
(define-public libgccjit-11 (make-libgccjit gcc-11))
(define-public libgccjit-12 (make-libgccjit gcc-12))
+(define-public libgccjit-14 (make-libgccjit gcc-14))
-(define-public libgccjit libgccjit-10)
+;; Use the 'gcc' variable from above to track the same version.
+(define-public libgccjit (make-libgccjit gcc))
(define (make-gccgo gcc)
"Return a gccgo package based on GCC."
@@ -1214,7 +1241,12 @@ provides the GNU compiler for the Go programming language.")
(substitute-keyword-arguments (package-arguments gccgo)
((#:phases phases)
#~(modify-phases #$phases
- #$@(if (version>=? (package-version gccgo) "12.0")
+ #$@(if (and (version>=? (package-version gccgo) "12.0")
+ ;; This somehow breaks gccgo@12 on riscv64-linux.
+ (not (and (target-riscv64?)
+ (string=? (version-prefix
+ (package-version gccgo) 1)
+ "12"))))
#~((add-after 'unpack 'adjust-libgo-dependencies
(lambda _
(substitute* "Makefile.in"
@@ -1287,105 +1319,9 @@ provides the GNU compiler for the Go programming language."))
(define-public gccgo-13
(make-gccgo gcc-13))
-(define %objc-search-paths
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64")))))
-
-(define-public gcc-objc-4.8
- (custom-gcc gcc-4.8 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-4.9
- (custom-gcc gcc-4.9 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-5
- (custom-gcc gcc-5 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-6
- (custom-gcc gcc-6 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-7
- (custom-gcc gcc-7 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-8
- (custom-gcc gcc-8 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-9
- (custom-gcc gcc-9 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-10
- (custom-gcc gcc-10 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-11
- (custom-gcc gcc-11 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc-12
- (custom-gcc gcc-12 "gcc-objc" '("objc")
- %objc-search-paths))
-
-(define-public gcc-objc gcc-objc-11)
-
-(define %objc++-search-paths
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64")))))
-
-(define-public gcc-objc++-4.8
- (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-4.9
- (custom-gcc gcc-4.9 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-5
- (custom-gcc gcc-5 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-6
- (custom-gcc gcc-6 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-7
- (custom-gcc gcc-7 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-8
- (custom-gcc gcc-8 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-9
- (custom-gcc gcc-9 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-10
- (custom-gcc gcc-10 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-11
- (custom-gcc gcc-11 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++-12
- (custom-gcc gcc-12 "gcc-objc++" '("obj-c++")
- %objc++-search-paths))
-
-(define-public gcc-objc++ gcc-objc++-11)
+;; Provides go-1.18
+(define-public gccgo-14
+ (make-gccgo gcc-14))
(define (make-libstdc++-doc gcc)
"Return a package with the libstdc++ documentation for GCC."
@@ -1401,40 +1337,31 @@ provides the GNU compiler for the Go programming language."))
libxslt
docbook-xml
docbook-xsl
+ docbook2x
graphviz)) ;for 'dot', invoked by 'doxygen'
(inputs '())
(propagated-inputs '())
(arguments
- '(#:out-of-source? #t
- #:tests? #f ;it's just documentation
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'chdir
- (lambda _
- (chdir "libstdc++-v3")))
- (add-before 'configure 'set-xsl-directory
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((docbook (assoc-ref inputs "docbook-xsl")))
- (substitute* (find-files "doc"
- "^Makefile\\.in$")
- (("@XSL_STYLE_DIR@")
- (string-append
- docbook "/xml/xsl/"
- (strip-store-file-name docbook)))))))
- (replace 'build
- (lambda _
- ;; XXX: There's also a 'doc-info' target, but it
- ;; relies on docbook2X, which itself relies on
- ;; DocBook 4.1.2, which is not really usable
- ;; (lacks a catalog.xml.)
- (invoke "make"
- "doc-html"
- "doc-man")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "make"
- "doc-install-html"
- "doc-install-man")))))))
+ (list
+ #:out-of-source? #t
+ #:tests? #f ;it's just documentation
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "libstdc++-v3")))
+ (replace 'build
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke `("make" ,@make-flags
+ "doc-info"
+ "doc-html"
+ "doc-man"))))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke `("make" ,@make-flags
+ "doc-install-info"
+ "doc-install-html"
+ "doc-install-man")))))))
(properties (alist-delete 'hidden? (package-properties gcc)))))
(define-public libstdc++-doc-5
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 149b82468c..98d34cfa71 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -1,11 +1,12 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2016, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2016, 2023-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +31,7 @@
#:use-module (guix download)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages perl-check)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages fontutils)
@@ -43,38 +45,44 @@
;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing.
- (version "2.3.2")
+ (version "2.3.3")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/libgd/libgd/releases/download/gd-"
- version "/libgd-" version ".tar.xz"))
- (sha256
- (base32
- "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7"))
- (patches
- (search-patches "gd-fix-tests-on-i686.patch"
- "gd-brect-bounds.patch"
- ;; Drop when
- ;; https://github.com/libgd/libgd/issues/691
- ;; is solved.
- "gd-Revert-fix-303-gdlib.pc.patch"))))
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/libgd/libgd/releases/download/gd-"
+ version "/libgd-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z"))
+ (patches
+ (search-patches "gd-fix-tests-on-i686.patch"
+ "gd-brect-bounds.patch"))))
(build-system gnu-build-system)
(arguments
- ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding
- ;; issues on aarch64 and other architectures.
- `(#:make-flags '("CFLAGS=-ffp-contract=off")
- #:configure-flags '("--disable-static")
- #:phases
- (modify-phases %standard-phases
- ;; This test is known to fail on most architectures:
- ;; https://github.com/libgd/libgd/issues/359
- ;; TODO Replace this substitution with an upstream bug fix.
- (add-after 'unpack 'disable-failing-test
- (lambda _
- (substitute* "tests/gdimagegrayscale/basic.c"
- (("return gdNumFailures\\(\\)")
- "return 0")))))))
+ ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding
+ ;; issues on aarch64 and other architectures.
+ (list #:make-flags #~(list "CFLAGS=-ffp-contract=off"
+
+ ;; XXX: This test fails on i686-linux.
+ ;; See <https://issues.guix.gnu.org/71996>.
+ #$@(if (and (not (%current-target-system))
+ (string-prefix? "i686"
+ (%current-system)))
+ #~("XFAIL_TESTS=gdimagegrayscale/basic")
+ #~()))
+ #:configure-flags #~(list "--disable-static")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'remove-libtool-archives
+ ;; Libtool archives lists the whole transitive dependencies,
+ ;; which is unnecessary unless producing static archives and
+ ;; leads to overlinking, e.g. causing the configure script of
+ ;; texlive-bin to fail due to looking for a transitive jpeg
+ ;; library.
+ (lambda _
+ (for-each delete-file
+ (find-files (string-append #$output "/lib")
+ "\\.la$")))))))
(native-inputs
(list pkg-config))
(inputs
@@ -102,14 +110,14 @@ most common applications of GD involve website development.")
(define-public perl-gd
(package
(name "perl-gd")
- (version "2.73")
+ (version "2.78")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/"
"GD-" version ".tar.gz"))
(sha256
- (base32 "0arjpa8id6k5yjxfq0j2hsinhhjzjch5lwk6gscf48l54drrw729"))))
+ (base32 "1r3fpr8jhpwi48i66rickiphyj442hypsqnk4df4yjs2ym5hacb8"))))
(build-system perl-build-system)
(inputs
(list fontconfig
@@ -119,7 +127,8 @@ most common applications of GD involve website development.")
libjpeg-turbo
zlib))
(native-inputs
- (list perl-extutils-pkgconfig))
+ (list perl-extutils-pkgconfig
+ perl-test-nowarnings))
(arguments
(list #:make-maker-flags
#~(list (string-append "--lib_jpeg_path="
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index f832202d18..8fc2ec14a1 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -64,7 +64,7 @@
`(#:tests? #f ;FIXME: 217 unexpected failures
#:out-of-source? #t
#:modules ((srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm
index c1cd26a9c4..36c05fff28 100644
--- a/gnu/packages/genealogy.scm
+++ b/gnu/packages/genealogy.scm
@@ -22,6 +22,7 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages fonts)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages geo)
@@ -54,7 +55,8 @@
`(("gettext" ,gettext-minimal)
("intltool" ,intltool)))
(inputs
- (list cairo
+ (list bash-minimal
+ cairo
font-gnu-freefont
geocode-glib
gexiv2
@@ -100,8 +102,7 @@
#f))))
inputs)))
(wrap-program (string-append out "/bin/gramps")
- `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))
- #t))
+ `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))))
(add-after 'wrap 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(home-page "https://gramps-project.org")
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index 4a9d24fe78..13f3dd67b0 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -61,7 +61,7 @@
(arguments
`(#:modules
((ice-9 match)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'guixify
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 985fa77231..3e611911ea 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -22,6 +22,8 @@
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -83,6 +85,7 @@
#:use-module (gnu packages flex)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@@ -472,7 +475,7 @@ topology functions.")
(define-public gnome-maps
(package
(name "gnome-maps")
- (version "44.5")
+ (version "46.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -480,7 +483,7 @@ topology functions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "026488yb6azwb2sm0yy0iaipk914l3agvb7d8azks4kyjqlslyb8"))))
+ "1br1ak0cwvvv8rszj9ffyvir7qcbxys940ygy22dzzn2l2byw9az"))))
(build-system meson-build-system)
(arguments
(list
@@ -496,6 +499,12 @@ topology functions.")
"update_desktop_database"))
(string-append option ": false"))
(else all))))))
+ (add-before 'check 'check-setup
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ ;; for timeTest
+ (setenv "TZDIR"
+ (search-input-directory (or native-inputs inputs)
+ "share/zoneinfo"))))
(add-after 'install 'wrap
(lambda _
(let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
@@ -510,7 +519,9 @@ topology functions.")
(list gettext-minimal
`(,glib "bin")
gobject-introspection
- pkg-config))
+ libportal
+ pkg-config
+ tzdata-for-tests))
(inputs
(list folks
evolution-data-server
@@ -948,6 +959,32 @@ systems and integrates readily with other Python GIS packages such as
pyproj, Rtree, and Shapely.")
(license license:bsd-3)))
+(define-public python-geopack
+ (package
+ (name "python-geopack")
+ (version "1.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "geopack" version))
+ (sha256
+ (base32 "0mryjp7m4h99qlpvnn40s81sygr73qcv8rkmjp9pcli1gz829kjf"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
+ #:tests? #f))
+ (native-inputs
+ (list python-pytest))
+ (propagated-inputs
+ (list python-numpy python-scipy))
+ (home-page "https://github.com/tsssss/geopack")
+ (synopsis "Python version of geopack and Tsyganenko models")
+ (description
+ "Python version of geopack and Tsyganenko models, compatible with
+@code{geopack05} and @code{geopack08}.")
+ (license license:expat)))
+
(define-public python-geopandas
(package
(name "python-geopandas")
@@ -986,6 +1023,30 @@ enables you to easily do operations in Python that would otherwise
require a spatial database such as PostGIS.")
(license license:bsd-3)))
+(define-public python-overpass
+ (package
+ (name "python-overpass")
+ (version "0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "overpass" version))
+ (sha256
+ (base32 "0l2n01j0vslag8cf3sp7jif0d4ql6i99fvfv2mgc3ajws69aqzr6"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; tests disabled, as they require network
+ (list #:tests? #f))
+ (propagated-inputs (list python-geojson
+ python-requests
+ python-shapely))
+ (native-inputs (list python-pytest))
+ (home-page "https://github.com/mvexel/overpass-api-python-wrapper")
+ (synopsis "Python wrapper for the OpenStreetMap Overpass API")
+ (description "This package provides python-overpass, a Python wrapper
+for the @code{OpenStreetMap} Overpass API.")
+ (license license:asl2.0)))
+
(define-public python-ogr2osm
(package
(name "python-ogr2osm")
@@ -1044,7 +1105,7 @@ during conversion.")
(define-public python-osmnx
(package
(name "python-osmnx")
- (version "1.8.1")
+ (version "1.9.3")
(source
(origin
;; Fetch from github as the pypi package is missing the tests dir.
@@ -1054,7 +1115,7 @@ during conversion.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0n238n07pp5jw9cg8nqw9qhpkw8plzb5imz1gxbliw2l1idqyjcl"))))
+ (base32 "0yi9al6rrc584y24vigi7w52dq9k2l2zgblrj5ajwgk8079k8zsf"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1409,7 +1470,7 @@ utilities for data translation and processing.")
" and not test_fetch_baja_bathymetry"
" and not test_fetch_rio_magnetic"
" and not test_fetch_california_gps"))))
- (native-inputs (list python-cartopy python-distributed))
+ (native-inputs (list python-cartopy python-distributed python-pytest))
(propagated-inputs (list python-dask
python-numpy
python-pandas
@@ -1428,13 +1489,13 @@ surface (i.e., gridding) with a hint of machine learning.")
(define-public python-cartopy
(package
(name "python-cartopy")
- (version "0.22.0")
+ (version "0.23.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Cartopy" version))
(sha256
- (base32 "0jdv92az0b7qxdvalh29kasw3knsl570cz7q3vql67ck400zj05k"))))
+ (base32 "0xknmq73pvkm3k718zrsx8p4r83dbskwqna9v4qvmwh1ayrkf7r3"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1445,8 +1506,16 @@ surface (i.e., gridding) with a hint of machine learning.")
"-m" "not natural_earth and not network"
"-k"
(string-append
- ;; This one too but it's not marked as such.
- "not test_gridliner_labels_bbox_style"
+ ;; These ones too but are not marked as such.
+ "not test_feature_artist_draw"
+ " and not test_feature_artist_draw_facecolor_list"
+ " and not test_feature_artist_draw_cmap"
+ " and not test_feature_artist_draw_styled_feature"
+ " and not test_feature_artist_draw_styler"
+ " and not test_gridliner_constrained_adjust_datalim"
+ " and not test_gridliner_remove"
+ " and not test_gridliner_title_adjust"
+ " and not test_gridliner_labels_bbox_style"
;; Accuracy problems
" and not test_single_spole"
" and not test_single_npole"
@@ -1631,13 +1700,13 @@ to create databases that are optimized for rendering/tile/map-services.")
(define-public python-metpy
(package
(name "python-metpy")
- (version "1.6.1")
+ (version "1.6.3")
(source (origin
(method url-fetch)
- (uri (pypi-uri "MetPy" version))
+ (uri (pypi-uri "metpy" version))
(sha256
(base32
- "1pzzanar797wkn6ljs47vni1fwli570d5qsiw1kpw0j1xymcmfsm"))))
+ "0rh7lslwf79sgbf0933pz6mxchbrb0434pbdzqgzs1kjlsli9pr3"))))
(build-system pyproject-build-system)
(arguments
;; Too many of the tests in the files below require online data.
@@ -2314,15 +2383,15 @@ associated with an address.")
(define-public python-maxminddb
(package
(name "python-maxminddb")
- (version "2.2.0")
+ (version "2.6.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "maxminddb" version))
(sha256
(base32
- "1rc4a403r3b4vhmhb03gidd0fmsbvfpbf3qfcw25h4db9zn0fxz3"))))
- (build-system python-build-system)
+ "0r7jcqzr3hy9jims0ygjdhndysbs02hsaybx9f4vq2k2w8r2v13x"))))
+ (build-system pyproject-build-system)
(arguments
`(#:tests? #f)) ;; Tests require a copy of the maxmind database
(inputs
@@ -2337,19 +2406,21 @@ MaxMind DB files.")
(define-public python-geoip2
(package
(name "python-geoip2")
- (version "2.9.0")
+ (version "4.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "geoip2" version))
(sha256
(base32
- "1w7cay5q6zawjzivqbwz5cqx1qbdjw6kbriccb7l46p7b39fkzzp"))))
- (build-system python-build-system)
+ "0ddcm6a0f5xr66r84hpn6jr6b7hl77axb0d41qj285ylny0c376x"))))
+ (build-system pyproject-build-system)
(arguments
`(#:tests? #f)) ;; Tests require a copy of the maxmind database
(inputs
- (list python-maxminddb python-requests))
+ (list python-maxminddb
+ python-requests
+ python-aiohttp))
(home-page "https://www.maxmind.com/")
(synopsis "MaxMind GeoIP2 API")
(description "Provides an API for the GeoIP2 web services and databases.
@@ -2444,7 +2515,7 @@ data.")
proj
qtbase-5
qtdeclarative-5
- qtlocation
+ qtlocation-5
qtwebchannel-5
qtwebengine-5
quazip
@@ -2680,7 +2751,7 @@ track your position right from your laptop.")
proj
qtbase-5
qtimageformats-5
- qtlocation
+ qtlocation-5
qtsensors-5
zlib))
(native-inputs
@@ -2709,43 +2780,44 @@ orienteering sport.")
(base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms"))))
(build-system gnu-build-system)
(inputs
- `(("bzip2" ,bzip2)
- ("cairo" ,cairo)
- ("fftw" ,fftw)
- ("freetype" ,freetype)
- ("gdal" ,gdal)
- ("geos" ,geos)
- ("glu" ,glu)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("mesa" ,mesa)
- ("mariadb-dev" ,mariadb "dev")
- ("mariadb-lib" ,mariadb "lib")
- ("netcdf" ,netcdf)
- ("openblas" ,openblas)
- ("perl" ,perl)
- ("postgresql" ,postgresql)
- ("proj" ,proj)
- ("python" ,python)
- ("python-dateutil" ,python-dateutil)
- ("python-numpy" ,python-numpy)
- ("python-wxpython" ,python-wxpython)
- ("readline" ,readline)
- ("sqlite" ,sqlite)
- ("wxwidgets" ,wxwidgets)
- ("zlib" ,zlib)
- ("zstd" ,zstd "lib")))
+ (list bash-minimal
+ bzip2
+ cairo
+ fftw
+ freetype
+ gdal
+ geos
+ glu
+ libpng
+ libtiff
+ mesa
+ `(,mariadb "dev")
+ `(,mariadb "lib")
+ netcdf
+ openblas
+ perl
+ postgresql
+ proj
+ python
+ python-dateutil
+ python-numpy
+ python-wxpython
+ readline
+ sqlite
+ wxwidgets
+ zlib
+ `(,zstd "lib")))
(native-inputs
- `(("bash" ,bash-minimal)
- ("bison" ,bison)
- ("flex" ,flex)
- ("pkg-config" ,pkg-config)))
+ (list bash-minimal
+ bison
+ flex
+ pkg-config))
(arguments
- `(#:tests? #f ; No tests
+ `(#:tests? #f ; No tests
#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
#:phases
(modify-phases %standard-phases
@@ -2767,26 +2839,28 @@ orienteering sport.")
(assoc-ref outputs "out"))
"--with-blas"
"--with-bzlib"
- (string-append "--with-freetype-includes="
- (assoc-ref inputs "freetype")
- "/include/freetype2")
- (string-append "--with-freetype-libs="
- (assoc-ref inputs "freetype")
- "/lib")
+ (string-append
+ "--with-freetype-includes="
+ (search-input-directory inputs "/include/freetype2"))
+ (string-append
+ "--with-freetype-libs="
+ (dirname
+ (search-input-file inputs "/lib/libfreetype.so")))
"--with-geos"
"--with-lapack"
"--with-mysql"
- (string-append "--with-mysql-includes="
- (assoc-ref inputs "mariadb-dev")
- "/include/mysql")
- (string-append "--with-mysql-libs="
- (assoc-ref inputs "mariadb-lib")
- "/lib")
+ (string-append
+ "--with-mysql-includes="
+ (search-input-directory inputs "/include/mysql"))
+ (string-append
+ "--with-mysql-libs="
+ (dirname
+ (search-input-file inputs "/lib/libmariadb.so")))
"--with-netcdf"
"--with-postgres"
- (string-append "--with-proj-share="
- (assoc-ref inputs "proj")
- "/share/proj")
+ (string-append
+ "--with-proj-share="
+ (search-input-directory inputs "/share/proj"))
"--with-pthread"
"--with-readline"
"--with-sqlite"
@@ -2799,16 +2873,14 @@ orienteering sport.")
(symlink (string-append dir "/include")
(string-append out "/include"))
(symlink (string-append dir "/lib")
- (string-append out "/lib")))
- #t))
+ (string-append out "/lib")))))
(add-after 'install-links 'python:wrap
(assoc-ref python:%standard-phases 'wrap))
(add-after 'python:wrap 'wrap-with-python-interpreter
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/" ,grassxx)
- `("GRASS_PYTHON" = (,(which "python3"))))
- #t))))))
+ `("GRASS_PYTHON" = (,(which "python3"))))))))))
(synopsis "GRASS Geographic Information System")
(description
"GRASS (Geographic Resources Analysis Support System), is a Geographic
@@ -2875,193 +2947,248 @@ growing set of geoscientific methods.")
(define-public qgis
(package
(name "qgis")
- (version "3.30.1")
+ (version "3.34.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://qgis.org/downloads/qgis-"
version ".tar.bz2"))
(sha256
- (base32 "0mdgqyqr3nswp5qfpjrpr35lxizcrz73a1gs3ddxsd1xr9amzb5s"))))
+ (base32 "1zqyyrbv53vrrh372g503qh8kmy2dlsxcck28khhkh2262m5qfap"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((guix build cmake-build-system)
+ (list
+ #:modules '((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build qt-utils)
(guix build utils))
- #:imported-modules (,@%cmake-build-system-modules
+ #:imported-modules `(,@%cmake-build-system-modules
(guix build python-build-system)
(guix build qt-utils))
- #:configure-flags
- '("-DWITH_QTWEBKIT=NO")
- #:phases
- (modify-phases %standard-phases
- ;; Configure correct path to PyQt5 SIP directory
- (add-after 'unpack 'configure-pyqt5-sip-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((sip-dir (string-append
- (assoc-ref inputs "python-pyqt+qscintilla")
- "/lib/python"
- (python:python-version (assoc-ref inputs "python"))
- "/site-packages/PyQt5/bindings")))
- (substitute* "cmake/FindPyQt5.py"
- (("sip_dir = cfg.default_sip_dir")
- (string-append "sip_dir = \"" sip-dir "\"")))
- (substitute* "cmake/FindPyQt5.cmake"
- (("SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
- (string-append "SET(PYQT5_SIP_DIR \"" sip-dir "\")"))))
- (substitute* (list "tests/code_layout/test_qt_imports.sh"
- "tests/code_layout/test_qgsscrollarea.sh")
- (("\\$\\(git rev-parse --show-toplevel\\)")
- (getcwd)))))
- (replace 'check
- (lambda* (#:key inputs outputs tests? parallel-tests?
- #:allow-other-keys)
- (when tests?
- (setenv "HOME" "/tmp")
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- (setenv "TRAVIS" "true")
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
- (let* ((out (assoc-ref outputs "out"))
- (grass-version ,(package-version grass))
- (grass-majorminor (string-join
- (list-head
- (string-split grass-version #\.) 2)
- ""))
- (grass (string-append (assoc-ref inputs "grass")
- "/grass" grass-majorminor)))
- (setenv "GISBASE" grass))
- (invoke "ctest"
- "-j" (if parallel-tests?
- (number->string (parallel-job-count))
- "1")
- "-E" (string-join
- '(;; Disable tests that require network access
- "PyQgsExternalStorageAwsS3"
- "PyQgsExternalStorageWebDav"
- "qgis_filedownloader"
- "test_core_networkaccessmanager"
- "test_core_tiledownloadmanager"
- "test_gui_filedownloader"
- "test_provider_wcsprovider"
- ;; Disable tests that need OGR built with
- ;; libspatialite support
- "PyQgsAttributeTableModel"
- "PyQgsOGRProviderSqlite"
- "PyQgsWFSProvider"
- "PyQgsOapifProvider"
- ;; Disable tests that need Python compiled
- ;; with loadable SQLite extensions.
- "PyQgsFieldFormattersTest"
- "PyQgsSpatialiteProvider"
- "PyQgsLayerDependencies"
- "PyQgsDBManagerGpkg"
- "PyQgsDBManagerSpatialite"
- ;; Disable tests that need poppler (with Cairo)
- "PyQgsLayoutExporter"
- "PyQgsPalLabelingLayout"
- ;; Disable tests that need Orfeo ToolBox
- "ProcessingOtbAlgorithmsTest"
- ;; TODO: Find why the following tests fail
- "ProcessingQgisAlgorithmsTestPt1"
- "ProcessingQgisAlgorithmsTestPt3"
- "ProcessingQgisAlgorithmsTestPt4"
- "ProcessingGdalAlgorithmsRasterTest"
- "ProcessingGdalAlgorithmsVectorTest"
- "ProcessingGrass7AlgorithmsImageryTest"
- "ProcessingGrass7AlgorithmsRasterTestPt1"
- "ProcessingGrass7AlgorithmsRasterTestPt2"
- "ProcessingGrass7AlgorithmsVectorTest"
- "test_core_authconfig"
- "test_core_authmanager"
- "test_core_compositionconverter"
- "test_core_expression"
- "test_core_gdalutils"
- "test_core_labelingengine"
- "test_core_layoutpicture"
- "test_core_layouttable"
- "test_core_pointcloudlayerexporter"
- "test_core_projectstorage"
- "test_core_coordinatereferencesystem"
- "test_core_overlayexpression"
- "test_gui_queryresultwidget"
- "test_provider_copcprovider"
- "test_provider_eptprovider"
- "test_analysis_processingalgspt1"
- "test_analysis_processingalgspt2"
- "test_analysis_processing"
- "test_app_gpsintegration"
- "PyQgsAnnotation"
- "PyQgsAuthenticationSystem"
- "PyQgsConnectionRegistry"
- "PyQgsDatumTransform"
- "PyQgsFileUtils"
- "PyQgsGeometryTest"
- "PyQgsGoogleMapsGeocoder"
- "PyQgsGroupLayer"
- "PyQgsHashLineSymbolLayer"
- "PyQgsLayerMetadataProviderPython"
- "PyQgsLayoutHtml"
- "PyQgsLineSymbolLayers"
- "PyQgsMapLayer"
- "PyQgsOGRProviderGpkg"
- "PyQgsProcessExecutablePt1"
- "PyQgsProcessExecutablePt2"
- "PyQgsProjectionSelectionWidgets"
- "PyQgsProviderConnectionGpkg"
- "PyQgsProviderConnectionSpatialite"
- "PyQgsOGRProvider"
- "PyQgsSettingsTreeNode"
- "PyQgsTextRenderer"
- "PyQgsVectorFileWriter"
- "PyQgsVectorLayerEditBuffer"
- "PyQgsVirtualLayerProvider"
- "PyQgsAuxiliaryStorage"
- "PyQgsSelectiveMasking"
- "qgis_sipify"
- "qgis_sip_include"
- "qgis_sip_uptodate")
- "|")))))
- (add-after 'install 'wrap-python
- (assoc-ref python:%standard-phases 'wrap))
- (add-after 'wrap-python 'wrap-qt
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-qt-program "qgis" #:output out #:inputs inputs))))
- (add-after 'wrap-qt 'wrap-gis
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; TODO: Find if there is a way to get SAGA to work.
- ;; Currently QGIS says "version of SAGA not supported".
- ;; Disable it for now.
- (let* ((out (assoc-ref outputs "out"))
- ;;(saga (string-append (assoc-ref inputs "saga") "/bin"))
- (grass-version ,(package-version grass))
- (grass-majorminor (string-join
- (list-head
- (string-split grass-version #\.) 2)
- ""))
- (grass (string-append (assoc-ref inputs "grass")
- "/grass" grass-majorminor)))
- (wrap-program (string-append out "/bin/qgis")
- ;;`("PATH" ":" prefix (,saga))
- `("QGIS_PREFIX_PATH" = (,out))
- `("GISBASE" = (,grass)))))))))
+ #:configure-flags
+ #~(list "-DWITH_QTWEBKIT=NO")
+ #:phases
+ #~(let* ((ignored-tests (list
+ ;; Disable tests that require network access
+ "PyQgsExternalStorageAwsS3"
+ "PyQgsExternalStorageWebDav"
+ "test_core_networkaccessmanager"
+ "test_core_tiledownloadmanager"
+ "test_gui_filedownloader"
+ "test_provider_wcsprovider"
+ ;; Disable tests that need OGR built with
+ ;; libspatialite support
+ "PyQgsAttributeTableModel"
+ "PyQgsOGRProviderSqlite"
+ "PyQgsWFSProvider"
+ "PyQgsOapifProvider"
+ ;; Disable tests that need Python compiled
+ ;; with loadable SQLite extensions.
+ "PyQgsFieldFormattersTest"
+ "PyQgsSpatialiteProvider"
+ "PyQgsLayerDependencies"
+ "PyQgsDBManagerGpkg"
+ "PyQgsDBManagerSpatialite"
+ ;; Disable tests that need poppler (with Cairo)
+ "PyQgsLayoutExporter"
+ "PyQgsPalLabelingLayout"
+ ;; Disable tests that need Orfeo ToolBox
+ "ProcessingOtbAlgorithmsTest"
+ ;; TODO: Find why the following tests fail
+ "ProcessingQgisAlgorithmsTestPt1"
+ "ProcessingQgisAlgorithmsTestPt2"
+ "ProcessingQgisAlgorithmsTestPt3"
+ "ProcessingQgisAlgorithmsTestPt4"
+ "ProcessingGdalAlgorithmsVectorTest"
+ "ProcessingGrass7AlgorithmsImageryTest"
+ "ProcessingGrass7AlgorithmsRasterTestPt1"
+ "ProcessingGrass7AlgorithmsRasterTestPt2"
+ "ProcessingGrass7AlgorithmsVectorTest"
+ "test_core_authconfig"
+ "test_core_authmanager"
+ "test_core_compositionconverter"
+ "test_core_expression"
+ "test_core_gdalutils"
+ "test_core_labelingengine"
+ "test_core_layoutpicture"
+ "test_core_project"
+ "test_core_coordinatereferencesystem"
+ "test_core_overlayexpression"
+ "test_gui_queryresultwidget"
+ "test_provider_eptprovider"
+ "test_analysis_processingalgspt2"
+ "test_analysis_processingpdalalgs"
+ "test_analysis_processing"
+ "test_app_gpsintegration"
+ "test_3d_mesh3drendering"
+ "PyQgsAnnotation"
+ "PyQgsAnnotationLayer"
+ "PyQgsAnnotationLineItem"
+ "PyQgsAnnotationLineTextItem"
+ "PyQgsAnnotationPolygonItem"
+ "PyQgsAuthenticationSystem"
+ "PyQgsDatumTransform"
+ "PyQgsFileUtils"
+ "PyQgsGeometryTest"
+ "PyQgsGoogleMapsGeocoder"
+ "PyQgsHashLineSymbolLayer"
+ "PyQgsLayoutHtml"
+ "PyQgsLineSymbolLayers"
+ "PyQgsMapLayer"
+ "PyQgsOGRProviderGpkg"
+ "PyQgsProcessExecutablePt1"
+ "PyQgsProcessExecutablePt2"
+ "PyQgsProjectionSelectionWidgets"
+ "PyQgsProviderConnectionGpkg"
+ "PyQgsProviderConnectionSpatialite"
+ "PyQgsOGRProvider"
+ "PyQgsTextRenderer"
+ "PyQgsVectorFileWriter"
+ "PyQgsVirtualLayerProvider"
+ "PyQgsAuxiliaryStorage"
+ "PyQgsSelectiveMasking"
+ "PyPythonRepr"
+ "PyQgsAnimatedMarkerSymbolLayer"
+ "PyQgsPythonProvider"
+ "PyQgsCategorizedSymbolRenderer"
+ "PyQgsColorRampLegendNode"
+ "PyQgsEmbeddedSymbolRenderer"
+ "PyQgsFillSymbolLayers"
+ "PyQgsGeometryGeneratorSymbolLayer"
+ "PyQgsGpsLogger"
+ "PyQgsGraduatedSymbolRenderer"
+ "PyQgsHighlight"
+ "PyQgsInterpolatedLineSymbolLayer"
+ "PyQgsJsonUtils"
+ "PyQgsLayerTreeView"
+ "PyQgsLayoutAtlas"
+ "PyQgsLayoutElevationProfile"
+ "PyQgsLayoutPageCollection"
+ "PyQgsLayoutItem"
+ "PyQgsLayoutLegend"
+ "PyQgsLayoutMap"
+ "PyQgsLayoutPage"
+ "PyQgsLineburstSymbolLayer"
+ "PyQgsMapCanvas"
+ "PyQgsMapCanvasAnnotationItem"
+ "PyQgsMapHitTest"
+ "PyQgsMarkerLineSymbolLayer"
+ "PyQgsMergedFeatureRenderer"
+ "PyQgsMeshLayerProfileGenerator"
+ "PyQgsPalLabelingPlacement"
+ "PyQgsPointCloudAttributeByRampRenderer"
+ "PyQgsPointCloudExtentRenderer"
+ "PyQgsPointCloudLayerProfileGenerator"
+ "PyQgsPointClusterRenderer"
+ "PyQgsPointDisplacementRenderer"
+ "PyQgsProfileExporter"
+ "PyQgsProfileRequest"
+ "TestQgsRandomMarkerSymbolLayer"
+ "PyQgsRasterAttributeTable"
+ "PyQgsRasterFileWriterTask"
+ "PyQgsRasterLayer"
+ "PyQgsRasterLayerProfileGenerator"
+ "PyQgsRasterColorRampShader"
+ "PyQgsRasterLineSymbolLayer"
+ "PyQgsRasterPipe"
+ "PyQgsSingleSymbolRenderer"
+ "PyQgsSimpleFillSymbolLayer"
+ "PyQgsSimpleLineSymbolLayer"
+ "PyQgsSymbolLayer"
+ "PyQgsRasterRendererCreateSld"
+ "PyQgsSymbolLayerCreateSld"
+ "PyQgsArrowSymbolLayer"
+ "PyQgsSymbolExpressionVariables"
+ "PyQgsStyleModel"
+ "PyQgsSymbol"
+ "PyQgsSymbolLayerUtils"
+ "PyQgsTextFormatWidget"
+ "PyQgsVectorFieldMarkerSymbolLayer"
+ "PyQgsVectorLayer"
+ "PyQgsVectorLayerProfileGenerator"
+ "PyQgsVectorLayerRenderer"
+ "qgis_sipify"
+ "qgis_sip_include"
+ "qgis_sip_uptodate"))
+ (grass-version #$(package-version (this-package-input "grass")))
+ (grass-majorminor (string-join
+ (list-head
+ (string-split grass-version #\.) 2)
+ ""))
+ (grass-dir (string-append #$(this-package-input "grass")
+ "/grass" grass-majorminor)))
+ (modify-phases %standard-phases
+ ;; Configure correct path to PyQt5 SIP directory
+ (add-after 'unpack 'configure-pyqt5-sip-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((sip-dir (string-append
+ (assoc-ref inputs "python-pyqt+qscintilla")
+ "/lib/python"
+ (python:python-version (assoc-ref inputs "python"))
+ "/site-packages/PyQt5/bindings")))
+ (substitute* "cmake/FindPyQt5.py"
+ (("sip_dir = cfg.default_sip_dir")
+ (string-append "sip_dir = \"" sip-dir "\"")))
+ (substitute* "cmake/FindPyQt5.cmake"
+ (("\
+SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
+ (string-append "SET(PYQT5_SIP_DIR \"" sip-dir "\")"))))
+ (substitute* (list "tests/code_layout/test_qt_imports.sh"
+ "tests/code_layout/test_qgsscrollarea.sh")
+ (("\\$\\(git rev-parse --show-toplevel\\)")
+ (getcwd)))))
+ (replace 'check
+ (lambda* (#:key inputs outputs tests? parallel-tests?
+ #:allow-other-keys)
+ (if tests?
+ (begin
+ (setenv "HOME" "/tmp")
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ (setenv "TRAVIS" "true")
+ (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+ (setenv "GISBASE" grass-dir)
+ (invoke "ctest"
+ "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "-E" (string-join ignored-tests "|")))
+ (format #t "test suite not run~%"))))
+ (add-after 'install 'wrap-python
+ (assoc-ref python:%standard-phases 'wrap))
+ (add-after 'wrap-python 'wrap-qt
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-qt-program "qgis" #:output #$output #:inputs inputs)))
+ (add-after 'wrap-qt 'wrap-gis
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; TODO: Find if there is a way to get SAGA to work.
+ ;; Currently QGIS says "version of SAGA not supported".
+ ;; Disable it for now.
+ (wrap-program (string-append #$output "/bin/qgis")
+ ;; `("PATH" ":" prefix
+ ;; (,(dirname (search-input-file inputs "/bin/saga_cmd"))))
+ `("QGIS_PREFIX_PATH" = (,#$output))
+ `("GISBASE" = (,grass-dir)))))))))
(inputs
(list bash-minimal
+ draco
exiv2
expat
+ freexl
gdal
geos
gpsbabel
grass
gsl
hdf5
+ librttopo
libspatialindex
libspatialite
libxml2
libzip
+ minizip
netcdf
+ pdal
postgresql
proj
protobuf
@@ -3083,10 +3210,11 @@ growing set of geoscientific methods.")
python-urllib3
qca
qscintilla
+ qt3d-5
qtbase-5
qtdeclarative-5
qtkeychain
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtserialport-5
qtsvg-5
@@ -3096,19 +3224,19 @@ growing set of geoscientific methods.")
(list zstd "lib")))
(native-inputs
(append
- (list bison
- flex
- perl
- perl-yaml-tiny
- pkg-config
- python-mock
- python-nose2
- python-pyqt-builder
- qttools-5)
- (if (supported-package? shellcheck)
- (list shellcheck)
- '())
- (list xorg-server-for-tests)))
+ (list bison
+ flex
+ perl
+ perl-yaml-tiny
+ pkg-config
+ python-mock
+ python-nose2
+ python-pyqt-builder
+ qttools-5)
+ (if (supported-package? shellcheck)
+ (list shellcheck)
+ '())
+ (list xorg-server-for-tests)))
(home-page "https://qgis.org")
(synopsis "Geographical information system")
(description "QGIS is an easy to use Geographical Information
@@ -3298,7 +3426,7 @@ latitude and longitude.")
(define-public gplates
(package
(name "gplates")
- (version "2.4")
+ (version "2.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3306,7 +3434,7 @@ latitude and longitude.")
(commit (string-append "GPlates-" version))))
(sha256
(base32
- "1awb4igchgpmrvj6blxd1w81c617bs66w6cfrwvf30n6rjlyn6q5"))
+ "1qrislbgrsn6l1ikd3mffsqxvy61w3l53wmr8mfd8aqaj6dk1wfx"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1408cc4cb4..cabe4f3be9 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
-;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2024 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -237,7 +237,7 @@ from Markdown files.")
(define-public po4a
(package
(name "po4a")
- (version "0.69")
+ (version "0.73")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mquinson/po4a"
@@ -245,8 +245,7 @@ from Markdown files.")
version "/po4a-" version ".tar.gz"))
(sha256
(base32
- "15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))
- (patches (search-patches "po4a-partial-texinfo-menu-fix.patch"))))
+ "184f0cv0w3xa301gwm74srn5s6g8qdn3ksip84wpg8xjihnzh63g"))))
(build-system perl-build-system)
(arguments
(list
@@ -278,10 +277,6 @@ from Markdown files.")
(wrap-program file
`("PERL5LIB" ":" prefix (,path))))
(find-files bin "\\.*$")))))
- (add-before 'check 'disable-failing-tests
- (lambda _
- ;; FIXME: fails despite of importing SGMLS
- (delete-file "t/fmt-sgml.t")))
#$@(if (system-hurd?)
#~((add-after 'unpack 'skip-tests/hurd
(lambda _
@@ -293,14 +288,15 @@ from Markdown files.")
(list gettext-minimal
perl-module-build
docbook-xsl
- libxml2
libxslt
;; For tests.
- docbook-xml-4.1.2
+ docbook-sgml-4.1
+ docbook-xml-4.5
perl-test-pod
(texlive-updmap.cfg)))
(inputs
(list bash-minimal
+ opensp
perl-gettext
perl-pod-parser
perl-sgmls
@@ -317,3 +313,15 @@ from Markdown files.")
more interestingly, the maintenance of translations) using gettext tools on
areas where they were not expected like documentation.")
(license gpl2+)))
+
+(define-public po4a-minimal
+ (package/inherit po4a
+ (native-inputs
+ ;; Remove test dependencies, primarily to reduce the size of the
+ ;; dependency graph of the ‘guix’ package.
+ (modify-inputs (package-native-inputs po4a)
+ (delete "docbook-xml" "perl-test-pod" "texlive-updmap.cfg")))
+ (arguments
+ (substitute-keyword-arguments (package-arguments po4a)
+ ((#:tests? _ #t) #f)))
+ (properties '((hidden? . #t)))))
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 502b41bb99..e95069cdd1 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2015-2017, 2019, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
@@ -118,17 +118,30 @@ paper size.")
(base32
"1nmp0hb7c4a315vv1mqw2cbckvca8bzh1cv3gdvwwy24w9qba6p3"))))
(build-system gnu-build-system)
- (inputs (list perl))
+ (inputs (list perl perl-ipc-run3))
(native-inputs
(list libpaper))
(arguments
- (list #:tests? #f ;FIXME: requires files not present in tarball
- #:configure-flags
- ;; Help the build system locate Perl when cross-compiling.
- (if (%current-target-system)
- #~(list (string-append "ac_cv_path_PERL="
- (search-input-file %build-inputs "bin/perl")))
- #~'())))
+ (list
+ #:tests? #f ; FIXME: requires files not present in tarball
+ #:configure-flags
+ ;; Help the build system locate Perl when cross-compiling.
+ (if (%current-target-system)
+ #~(list (string-append "ac_cv_path_PERL="
+ (search-input-file %build-inputs "bin/perl")))
+ #~'())
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-scripts
+ (lambda _
+ (let ((perl5lib (getenv "PERL5LIB")))
+ (for-each
+ (lambda (file)
+ (wrap-program file
+ `("PERL5LIB" ":" prefix
+ (,(string-append perl5lib ":" #$output
+ "/lib/perl5/site_perl")))))
+ (find-files (string-append #$output "/bin") "."))))))))
(synopsis "Collection of utilities for manipulating PostScript documents")
(description
"PSUtils is a collection of utilities for manipulating PostScript
@@ -148,7 +161,6 @@ printing, and psresize, for adjusting page sizes.")
(package
(name "ghostscript")
(version "9.56.1")
- (replacement ghostscript/fixed)
(source
(origin
(method url-fetch)
@@ -161,7 +173,9 @@ printing, and psresize, for adjusting page sizes.")
"1r5qash65m6ignki6z72q4rlai9ka99xrxnmqd19n02has00cd6l"))
(patches (search-patches "ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch"
- "ghostscript-no-header-uuid.patch"))
+ "ghostscript-no-header-uuid.patch"
+ "ghostscript-CVE-2023-36664.patch"
+ "ghostscript-CVE-2023-36664-fixup.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries. The bundled OpenJPEG is a patched fork so
@@ -280,12 +294,6 @@ output file formats and printers.")
(home-page "https://www.ghostscript.com/")
(license license:agpl3+)))
-(define ghostscript/fixed
- (package-with-patches
- ghostscript
- (search-patches "ghostscript-CVE-2023-36664.patch"
- "ghostscript-CVE-2023-36664-fixup.patch")))
-
(define-public ghostscript/x
(package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x"))
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index b2676e654e..b29438b59c 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -338,7 +338,7 @@ buffers.")
(define-public gimp
(package
(name "gimp")
- (version "2.10.36")
+ (version "2.10.38")
(source
(origin
(method url-fetch)
@@ -346,7 +346,7 @@ buffers.")
(version-major+minor version)
"/gimp-" version ".tar.bz2"))
(sha256
- (base32 "1cnvgkni2q4psv8syyl5yd9kk84fv5g3imd2kgm3mnsbkb3c6frx"))))
+ (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML
@@ -354,7 +354,7 @@ buffers.")
(list
#:modules `((ice-9 popen)
(ice-9 rdelim)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'remove-gcc-reference
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 2100bb4872..849ca076dc 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -320,19 +321,24 @@ also known as DXTn or DXTC) for Mesa.")
libxxf86vm
xorgproto))
(inputs
- (list elfutils ;libelf required for r600 when using llvm
- expat
- (force libva-without-mesa)
- libxml2
- libxrandr
- libxvmc
- llvm-for-mesa
- vulkan-loader
- wayland
- wayland-protocols
- `(,zstd "lib")))
+ (append
+ (if (target-aarch64?)
+ (list clang-18
+ llvm-18)
+ (list llvm-for-mesa))
+ (list elfutils ;libelf required for r600 when using llvm
+ expat
+ (force libva-without-mesa)
+ libxml2
+ libxrandr
+ libxvmc
+ vulkan-loader
+ wayland
+ wayland-protocols
+ `(,zstd "lib"))))
(native-inputs
- (cons* bison
+ (append
+ (list bison
flex
gettext-minimal
glslang
@@ -340,20 +346,26 @@ also known as DXTn or DXTC) for Mesa.")
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
python-mako
python-wrapper
- (@ (gnu packages base) which)
- (if (%current-target-system)
- (list cmake-minimal-cross
- pkg-config-for-build
- wayland
- wayland-protocols)
- '())))
+ (@ (gnu packages base) which))
+ (if (target-aarch64?)
+ (list libclc)
+ '())
+ (if (%current-target-system)
+ (list cmake-minimal-cross
+ pkg-config-for-build
+ wayland
+ wayland-protocols)
+ '())))
(outputs '("out" "bin"))
(arguments
(list
#:configure-flags
#~(list
#$@(cond
- ((or (target-aarch64?) (target-arm32?))
+ ((target-aarch64?)
+ '("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,\
+nouveau,panfrost,r300,r600,svga,swrast,tegra,v3d,vc4,virgl,zink"))
+ ((target-arm32?)
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\
panfrost,r300,r600,svga,swrast,tegra,v3d,vc4,virgl,zink"))
((or (target-ppc64le?) (target-ppc32?) (target-riscv64?))
@@ -461,6 +473,10 @@ svga,swrast,virgl,zink")))
;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091).
`((substitute* "src/util/meson.build"
((".*'tests/u_debug_stack_test.cpp',.*") ""))))
+ ("aarch64-linux"
+ ;; Disable some of the llvmpipe tests.
+ `((substitute* "src/gallium/drivers/llvmpipe/meson.build"
+ (("'lp_test_format', ") ""))))
("armhf-linux"
;; Disable some of the llvmpipe tests.
`((substitute* "src/gallium/drivers/llvmpipe/meson.build"
@@ -583,8 +599,10 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(modify-inputs (package-inputs mesa)
(prepend libclc)))
(native-inputs
- (modify-inputs (package-native-inputs mesa)
- (prepend clang-15)))))
+ (if (target-aarch64?)
+ (package-native-inputs mesa)
+ (modify-inputs (package-native-inputs mesa)
+ (prepend clang-15))))))
(define-public mesa-opencl-icd
(package/inherit mesa-opencl
@@ -924,7 +942,7 @@ OpenGL.")
(define-public glfw
(package
(name "glfw")
- (version "3.3.9")
+ (version "3.3.10")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/glfw/glfw"
@@ -932,7 +950,7 @@ OpenGL.")
"/glfw-" version ".zip"))
(sha256
(base32
- "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm"))))
+ "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8"))))
(build-system cmake-build-system)
(arguments
(list
@@ -994,6 +1012,26 @@ desktop computers. It provides a simple API for creating windows, contexts
and surfaces, receiving input and events.")
(license license:zlib)))
+(define-public glfw-3.4
+ (package
+ (inherit glfw)
+ (version "3.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/glfw/glfw"
+ "/releases/download/" version
+ "/glfw-" version ".zip"))
+ (sha256
+ (base32
+ "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m"))))
+ (native-inputs (modify-inputs (package-native-inputs glfw)
+ (prepend pkg-config)))
+ ;; When building out of source, the install phase fails with:
+ ;; file INSTALL cannot find "/tmp/guix-build-glfw-3.4.drv-0/build/docs/html":
+ ;; No such file or directory
+ (arguments (substitute-keyword-arguments (package-arguments glfw)
+ ((#:out-of-source? _ #f) #f)))))
+
(define-public nanovg-for-extempore
(let ((version "0.7.1")
(revision "0")
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b11046f05d..9827856f32 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -161,7 +161,6 @@
docbook-xsl
doxygen
libtool
- libxml2 ;for XML_CATALOG_FILES
libxslt
which
xmlto
@@ -532,7 +531,7 @@ functions for strings and common data structures.")
`(("docbook-xml-4.2" ,docbook-xml-4.2)
("docbook-xml-4.5" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
- ("gtk-doc" ,gtk-doc)
+ ("gtk-doc" ,gtk-doc/stable)
("libxml2" ,libxml2)
("xsltproc" ,libxslt)
,@(package-native-inputs base)))
@@ -688,23 +687,6 @@ provide bindings to call into the C library.")
;; For tools.
license:gpl2+))))
-(define-public gobject-introspection-next
- (package
- (inherit gobject-introspection)
- (name "gobject-introspection")
- (version "1.73.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/"
- "gobject-introspection/" (version-major+minor version)
- "/gobject-introspection-" version ".tar.xz"))
- (sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
- (patches (search-patches
- "gobject-introspection-cc-1.72.patch"
- "gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
(define intltool
(package
(name "intltool")
@@ -768,7 +750,7 @@ The intltool collection can be used to do these things:
"1jl7gsr7aclb9nvqazr039m86y7f7ivfhl2pixcrbfqjkb97r6kb"))))
(build-system gnu-build-system)
(inputs
- (list libxml2 python-libxml2 python))
+ (list bash-minimal libxml2 python-libxml2 python))
(arguments
(list
#:phases
@@ -1046,7 +1028,7 @@ useful for C++.")
(define-public python-pygobject
(package
(name "python-pygobject")
- (version "3.46.0")
+ (version "3.47.0")
(source
(origin
(method url-fetch)
@@ -1054,7 +1036,8 @@ useful for C++.")
(version-major+minor version)
"/pygobject-" version ".tar.xz"))
(sha256
- (base32 "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22"))
+ (base32
+ "082dpm34a350bnhgmkdv8myxzjgnrflckkpn46vnvs36f7bbfdij"))
(modules '((guix build utils)))
(snippet
;; We disable these tests in a snippet so that they are inherited
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index e8f70f477e..a09c0befb0 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -791,6 +791,7 @@ faster window switching.")
(inputs
(list
at-spi2-core
+ bash-minimal
caribou
evolution-data-server
gjs
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 489f23865b..7339000436 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -43,7 +43,7 @@
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2019, 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2019, 2020, 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2019-2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -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.
;;;
@@ -178,7 +179,6 @@
#:use-module (gnu packages nettle)
#:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
- #:use-module (gnu packages node)
#:use-module (gnu packages nss)
#:use-module (gnu packages ocr)
#:use-module (gnu packages openldap)
@@ -288,7 +288,6 @@
gobject-introspection
gsettings-desktop-schemas
gtk-doc/stable
- libxml2 ;for XML_CATALOG_FILES
pkg-config))
(propagated-inputs
;; These libraries are required by the .pc file.
@@ -459,10 +458,28 @@ and other formats.")
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
- (list
- "--disable-static")))
+ (list "--disable-static")
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (or (target-riscv64?)
+ (target-ppc64le?)
+ (target-aarch64?))
+ `((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub")))))
+ '()))))
(native-inputs
- `(("gettext" ,gettext-minimal)
+ `(,@(if (or (target-riscv64?)
+ (target-ppc64le?)
+ (target-aarch64?))
+ `(("config" ,config))
+ `())
+ ("gettext" ,gettext-minimal)
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(synopsis "Common JS Modules")
@@ -669,7 +686,6 @@ of writing test cases for asynchronous interactions.")
gtk-doc/stable
;; Would only be required by configure flag "--enable-extended-tests".
;;gtx
- libxml2 ;for XML_CATALOG_FILES
pkg-config
python-pygobject
python-wrapper
@@ -731,7 +747,6 @@ of known objects without needing a central registrar.")
gobject-introspection
gtk-doc/stable
libtool
- libxml2 ;for XML_CATALOG_FILES
pkg-config
vala
xorg-server-for-tests))
@@ -1344,15 +1359,23 @@ It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.")
"0iil7wgix0nzhf3i2w6g1wjqly49r9rsffca97ai9kr2vfpvbv9g"))))
(build-system meson-build-system)
(arguments
- (list #:configure-flags #~'("-Dgtk_doc=true")))
+ (list #:configure-flags
+ #~(list "-Dgtk_doc=true"
+ ;; Manpages are built using pandoc.
+ #$@(if (this-package-native-input "pandoc")
+ #~("-Dmanpages=true")
+ #~("-Dmanpages=false")))))
(native-inputs
- (list gettext-minimal
- `(,glib "bin")
- gi-docgen
- gobject-introspection
- pandoc
- pkg-config
- vala))
+ (append
+ (if (supported-package? pandoc)
+ (list pandoc)
+ '())
+ (list gettext-minimal
+ `(,glib "bin")
+ gi-docgen
+ gobject-introspection
+ pkg-config
+ vala)))
(inputs
(list gtk))
(propagated-inputs
@@ -1379,6 +1402,9 @@ a debugging tool, @command{gssdp-device-sniffer}.")
(sha256
(base32
"10hm8cgh2p8441xc83kswjgghrrqpzgblvc5523jp0pvayfq8xl6"))))
+ (arguments
+ (list #:configure-flags
+ #~(list "-Dgtk_doc=true")))
(propagated-inputs (modify-inputs (package-propagated-inputs gssdp)
(replace "libsoup" libsoup-minimal-2)))))
@@ -1439,9 +1465,18 @@ for creating UPnP devices and control points, written in C using
(sha256
(base32
"0vz3ifs8mi3zaz8zj8v27zfkf6xg82y39mcgqspa38jdp01gn3sr"))))
- (propagated-inputs (modify-inputs (package-propagated-inputs gupnp)
- (replace "libsoup" libsoup-minimal-2)
- (replace "gssdp" gssdp-1.4)))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gupnp)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'meson-compatibility
+ (lambda _
+ (substitute* "subprojects/gssdp-1.2.wrap"
+ (("provides") "provide"))))))))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs gupnp)
+ (replace "libsoup" libsoup-minimal-2)
+ (replace "gssdp" gssdp-1.4)))))
(define-public gupnp-dlna
(package
@@ -1785,7 +1820,6 @@ client devices can handle.")
`(,glib "bin")
gtk-doc/stable
gobject-introspection
- libxml2 ;for XML_CATALOG_FILES
pkg-config
vala))
(inputs
@@ -2610,6 +2644,7 @@ GNOME Desktop.")
#$output "/share/p11-kit/modules/")
(string-append "--with-pkcs11-modules="
#$output "/share/p11-kit/modules/"))
+ #:parallel-tests? (not (target-riscv64?))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-/bin/sh-reference
@@ -2641,7 +2676,6 @@ GNOME Desktop.")
gettext-minimal
`(,glib "bin")
glib ;for m4 macros
- libxml2 ;for XML_CATALOG_FILES
libxslt ;for documentation
pkg-config
python-wrapper)) ;for tests
@@ -2990,6 +3024,16 @@ guidelines.")
(substitute* "Makefile.am"
(("/bin/bash") (which "bash")))
(delete-file "configure")))
+ #$@(if (this-package-native-input "config")
+ #~((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub")))))
+ #~())
(add-after 'install 'add-install-to-pythonpath
(@@ (guix build python-build-system) add-install-to-pythonpath))
(add-after 'add-install-to-pythonpath 'wrap-for-python
@@ -3022,16 +3066,20 @@ guidelines.")
libnotify
packagekit))
(native-inputs
- (list pkg-config
- desktop-file-utils
- glib
- autoconf
- automake
- gettext-minimal
- xmlto
- docbook-xml-4.1.2
- docbook-xsl
- libxml2))
+ (append
+ (if (target-riscv64?)
+ (list config)
+ '())
+ (list pkg-config
+ desktop-file-utils
+ glib
+ autoconf
+ automake
+ gettext-minimal
+ xmlto
+ docbook-xml-4.1.2
+ docbook-xsl
+ libxml2)))
(home-page "https://github.com/zdohnal/system-config-printer")
(synopsis "CUPS administration tool")
(description
@@ -3075,21 +3123,18 @@ configuring CUPS.")
(sha256
(base32
"1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
+ (outputs '("out" "doc"))
(build-system meson-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'fix-docbook
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Don't attempt to download XSL schema.
- (substitute* "meson.build"
- (("http://docbook.sourceforge.net/release/xsl-ns/current\
-/manpages/docbook.xsl")
- (string-append #$(this-package-native-input "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- #$(package-version docbook-xsl)
- "/manpages/docbook.xsl"))))))))
+ (add-after 'install 'move-doc
+ (lambda _
+ (let* ((old (string-append #$output "/share/doc"))
+ (new (string-append #$output:doc "/share/doc")))
+ (mkdir-p (dirname new))
+ (rename-file old new)))))))
(propagated-inputs (list gdk-pixbuf glib)) ;in Requires of libnotify.pc.
(inputs (list gtk+ libpng))
(native-inputs
@@ -3241,9 +3286,8 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
(setenv "DISPLAY" ":1"))))))
(inputs
(append
- ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS
- ;; dependency on other platforms (FIXME).
- (if (target-x86-64?)
+ ;; GJS depends on Rust so remove the GJS dependency on other platforms.
+ (if (supported-package? gjs)
(list gjs)
'())
(list gtk+ libxml2)))
@@ -3256,7 +3300,6 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
gobject-introspection
hicolor-icon-theme
itstool
- libxml2 ;for XML_CATALOG_FILES
libxslt ;for xsltproc
python
python-pygobject
@@ -3301,7 +3344,7 @@ the GNOME desktop environment.")
(guix build utils))
#:phases
#~(modify-phases %standard-phases
- (add-after 'wrap 'wrap-python
+ (add-after 'glib-or-gtk-wrap 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
(add-before 'check 'pre-check
(lambda _
@@ -3714,47 +3757,47 @@ diagrams.")
"1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list "--disable-static")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'pre-configure
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gdk-pixbuf-loader/Makefile.in"
- ;; By default the gdk-pixbuf loader is installed under
- ;; gdk-pixbuf's prefix. Work around that.
- (("gdk_pixbuf_moduledir = .*$")
- (string-append "gdk_pixbuf_moduledir = "
- "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
+ (list
+ #:configure-flags '(list "--disable-static")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'pre-configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gdk-pixbuf-loader/Makefile.in"
+ ;; By default the gdk-pixbuf loader is installed under
+ ;; gdk-pixbuf's prefix. Work around that.
+ (("gdk_pixbuf_moduledir = .*$")
+ (string-append "gdk_pixbuf_moduledir = "
+ "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
"loaders\n"))
- ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
- (("gdk_pixbuf_cache_file = .*$")
- "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
- #t))
- (add-before 'check 'fix-test-with-pango-1.50
- (lambda _
- ;; Changes between pango 1.48 and 1.50 caused the text to be one
- ;; pixel lower in the output image compared to the reference.
- (substitute* "tests/fixtures/reftests/bugs/587721-text-transform.svg"
- (("660\\.9") "659.9"))))
- (add-before 'check 'remove-failing-tests
- (lambda _
- (with-directory-excursion "tests/fixtures/reftests"
- (for-each delete-file
- '(;; This test fails on i686:
- "svg1.1/masking-path-04-b.svg"
- ;; This test fails on armhf:
- "svg1.1/masking-mask-01-b.svg"
- ;; This test fails on aarch64:
- "bugs/777834-empty-text-children.svg"
- ;; These two tests fail due to slightly different
- ;; text rendering (different kerning or similar),
- ;; nothing alarming.
- "bugs/340047.svg"
- "bugs/749415.svg"
- ;; These two tests fail with the update to cairo
- ;; version 1.18.0.
- "bugs/587721-text-transform.svg"
- "svg1.1/masking-path-03-b.svg"))))))))
+ ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
+ (("gdk_pixbuf_cache_file = .*$")
+ "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))))
+ (add-before 'check 'fix-test-with-pango-1.50
+ (lambda _
+ ;; Changes between pango 1.48 and 1.50 caused the text to be one
+ ;; pixel lower in the output image compared to the reference.
+ (substitute* "tests/fixtures/reftests/bugs/587721-text-transform.svg"
+ (("660\\.9") "659.9"))))
+ (add-before 'check 'remove-failing-tests
+ (lambda _
+ (with-directory-excursion "tests/fixtures/reftests"
+ (for-each delete-file
+ '( ;; This test fails on i686:
+ "svg1.1/masking-path-04-b.svg"
+ ;; This test fails on armhf:
+ "svg1.1/masking-mask-01-b.svg"
+ ;; This test fails on aarch64:
+ "bugs/777834-empty-text-children.svg"
+ ;; These two tests fail due to slightly different
+ ;; text rendering (different kerning or similar),
+ ;; nothing alarming.
+ "bugs/340047.svg"
+ "bugs/749415.svg"
+ ;; These two tests fail with the update to cairo
+ ;; version 1.18.0.
+ "bugs/587721-text-transform.svg"
+ "svg1.1/masking-path-03-b.svg"))))))))
(native-inputs
(list pkg-config
`(,glib "bin") ; glib-mkenums, etc.
@@ -4511,7 +4554,7 @@ passwords in the GNOME keyring.")
(define-public vala
(package
(name "vala")
- (version "0.56.14")
+ (version "0.56.16")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/vala/"
@@ -4519,7 +4562,7 @@ passwords in the GNOME keyring.")
"vala-" version ".tar.xz"))
(sha256
(base32
- "0mzmldhf6474dp2jkxj160kkafdz32c2l5f8xnm05p4vr9lc50lk"))))
+ "16yaiff5nl2dfyvs3bj8y7wvzh9riz6wqlx7csgg1lpm01b7nj05"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@@ -4736,7 +4779,6 @@ and RDP protocols.")
(native-inputs
(list bash-completion
libxslt ;for xsltproc
- libxml2 ;for XML_CATALOG_FILES
docbook-xml-4.2
docbook-xsl
`(,glib "bin")
@@ -5030,7 +5072,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libshumate
(package
(name "libshumate")
- (version "1.0.5")
+ (version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5038,11 +5080,10 @@ libxml to ease remote use of the RESTful API.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0v4m07vxm3m4a2vqkp2wfsc3zsf92fpigc1k8yq49vkpj7gxikx8"))))
+ "04cwakbdr68nw4kh956xhf447fawz8badpyd76hg4ir1gq3yw18i"))))
(build-system meson-build-system)
(arguments
- (list #:configure-flags #~(list "-Dlibsoup3=true")
- #:phases
+ (list #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? test-options #:allow-other-keys)
@@ -5062,6 +5103,7 @@ libxml to ease remote use of the RESTful API.")
(list gi-docgen
`(,glib "bin")
gobject-introspection
+ gperf
pkg-config
;; For tests:
xorg-server-for-tests
@@ -5072,7 +5114,9 @@ libxml to ease remote use of the RESTful API.")
(list cairo
glib
gtk
+ json-glib
libsoup
+ protobuf-c
sqlite))
(home-page "https://wiki.gnome.org/Projects/libshumate")
(synopsis "GtkWidget C library for displaying maps")
@@ -5250,7 +5294,6 @@ and the GLib main loop, to integrate well with GNOME applications.")
gettext-minimal
`(,glib "bin") ;for gdbus-codegen, etc.
gobject-introspection
- libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
python
@@ -5576,7 +5619,7 @@ keyboard shortcuts.")
(arguments
(list #:glib-or-gtk? #t))
(native-inputs (list pkg-config
- cmake
+ cmake-minimal
gettext-minimal
desktop-file-utils
appstream-glib
@@ -5707,9 +5750,8 @@ output devices.")
(native-inputs
(modify-inputs (package-native-inputs colord-minimal)
(append bash-completion
- docbook-xsl-1.79.1
+ docbook-xsl
gtk-doc/stable
- libxml2 ;for XML_CATALOG_FILES
libxslt
sane-backends
vala))))) ;for VAPI, needed by simple-scan
@@ -5878,8 +5920,7 @@ faster results and to avoid unnecessary server load.")
dbus
;; For man pages.
docbook-xsl
- libxslt ; for 'xsltproc'
- libxml2)) ; for 'XML_CATALOG_FILES'
+ libxslt)) ; for 'xsltproc'
(inputs
(list libgudev libusb))
(propagated-inputs
@@ -6052,7 +6093,6 @@ services for numerous locations.")
docbook-xsl
gettext-minimal
`(,glib "bin") ;for glib-mkenums
- libxml2 ;for XML_CATALOG_FILES
libxslt
perl
pkg-config))
@@ -6723,7 +6763,8 @@ discovery protocols.")
(propagated-inputs
(list dconf))
(inputs
- (list gtk+
+ (list bash-minimal
+ gtk+
gdk-pixbuf
at-spi2-core
cairo
@@ -7188,11 +7229,17 @@ almost all of them.")
"epiphany-" version ".tar.xz"))
(sha256
(base32
- "1n3df2skvgmjw9sybhn811l4b58ibwxc0dc208wpvxg060pyhpfk"))))
+ "1n3df2skvgmjw9sybhn811l4b58ibwxc0dc208wpvxg060pyhpfk"))
+ (patches (search-patches "epiphany-fix-encoding-test.patch"))))
(build-system meson-build-system)
(arguments
(list
#:glib-or-gtk? #t
+ #:modules '((guix build meson-build-system)
+ (guix build utils)
+ (guix build union))
+ #:imported-modules `((guix build union)
+ ,@%meson-build-system-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@@ -7222,13 +7269,25 @@ almost all of them.")
", ")
"],")))))
(replace 'check
- (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (lambda* (#:key inputs parallel-tests? tests? #:allow-other-keys)
(when tests?
+ ;(setenv "GALLIUM_DRIVER" "llvmpipe")
+ (setenv "XDG_RUNTIME_DIR" (string-append (getcwd)
+ "/runtime-dir"))
+ (mkdir (getenv "XDG_RUNTIME_DIR"))
+ (chmod (getenv "XDG_RUNTIME_DIR") #o700)
(setenv "MESON_TESTTHREADS"
(if parallel-tests?
(number->string (parallel-job-count))
"1"))
(setenv "XDG_CACHE_HOME" (getcwd))
+ ;; There are too many directories in XDG_DATA_DIRS, so
+ ;; dbus-daemon fails to start. We work around this by
+ ;; creating a single union directory of all these directories.
+ (setenv "XDG_DATA_DIRS" "/tmp/share")
+ (union-build "/tmp/share"
+ (search-path-as-list '("share") (map cdr inputs))
+ #:create-all-directories? #t)
;; Tests require a running X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
@@ -7325,7 +7384,8 @@ principles are simplicity and standards compliance.")
python-pep8
xorg-server-for-tests))
(inputs
- (list gobject-introspection
+ (list bash-minimal
+ gobject-introspection
gtk+
python-wrapper
python-pygobject))
@@ -7712,24 +7772,22 @@ such as gzip tarballs.")
(,(dirname (search-input-file (or native-inputs inputs)
"bin/gdbus"))))))))
#:configure-flags
- '("-Ddocbook=false" ; FIXME: disabled because of docbook validation error
- "-Dman=false" ; FIXME: disabled because of docbook validation error
- "-Delogind=true"
+ '("-Delogind=true"
"-Dsystemd=false"
"-Dsystemd_session=disable"
"-Dsystemd_journal=false")))
(build-system meson-build-system)
(native-inputs
- (list docbook-xml
+ (list docbook-xml-4.1.2
docbook-xsl
`(,glib "bin") ; for glib-compile-schemas, etc.
intltool
- libxml2 ;for 'XML_CATALOG_FILES'
libxslt
pkg-config
xmlto))
(inputs
- (list elogind
+ (list bash-minimal
+ elogind
gnome-desktop
gsettings-desktop-schemas
gtk+
@@ -7944,7 +8002,8 @@ to display dialog boxes from the commandline and shell scripts.")
(string-append "-Dgles2_libname="
(search-input-file %build-inputs "lib/libGLESv2.so"))
"-Degl_device=true" ;false by default
- "-Dwayland_eglstream=true") ;false by default
+ "-Dwayland_eglstream=true" ;false by default
+ (string-append "-Dudev_dir=" #$output "/lib/udev"))
#:test-options '(list "--verbose")
#:phases
#~(modify-phases %standard-phases
@@ -8237,6 +8296,10 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(delete-file-recursively "tests/book-migration")
(substitute* "tests/CMakeLists.txt"
(("add_subdirectory\\(book-migration\\)") ""))))
+ (add-after 'unpack 'patch-locale-in-test
+ (lambda _
+ (substitute* "tests/libebook/client/test-book-client-custom-summary.c"
+ (("en_US\\.UTF-8") "C.UTF-8"))))
(add-after 'unpack 'patch-paths
(lambda _
(substitute* '("tests/test-server-utils/e-test-server-utils.c"
@@ -8366,7 +8429,8 @@ Evolution (hence the name), but is now used by other packages as well.")
;; caribou-1.0.pc refers to all these.
(list libgee libxklavier libxtst gtk+))
(inputs
- `(("clutter" ,clutter)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("clutter" ,clutter)
("dconf" ,dconf)
("gtk+-2" ,gtk+-2)
("python-pygobject" ,python-pygobject)))
@@ -8782,7 +8846,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
- (version "1.34.0")
+ (version "1.36.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/network-manager-applet/"
@@ -8790,7 +8854,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.")
"network-manager-applet-" version ".tar.xz"))
(sha256
(base32
- "1a55mf4ww06lqacs6zndp29ayyby5f8rgg1lp341y5kb1x3qwdmb"))))
+ "0lz2lxj5xy65l7qcn3df83spkxxqk2sjmys7bi4f3bx3gr408ix8"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@@ -8939,7 +9003,7 @@ library.")
"--localstatedir=/var"
(string-append "-Ddefault-path="
- (string-join '("/run/setuid-programs"
+ (string-join '("/run/privileged/bin"
"/run/current-system/profile/bin"
"/run/current-system/profile/sbin")
":"))
@@ -9392,6 +9456,7 @@ properties, screen resolution, and other GNOME parameters.")
(add-after 'install 'wrap-programs
(lambda* (#:key inputs #:allow-other-keys)
(let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(python-path
(string-join
(filter (lambda (item)
@@ -9411,6 +9476,19 @@ properties, screen resolution, and other GNOME parameters.")
"path => imports.gi.GIRepository.Repository."
"prepend_search_path(path));\n"
all)))
+ ;; Screencast requires a pipewire service running
+ ;; (i.e. as provided by home-pipewire-service-type)
+ (substitute* (string-append #$output "/share/gnome-shell/"
+ "org.gnome.Shell.Screencast")
+ (("imports\\.package\\.start" all)
+ (string-append "'" gi-typelib-path "'.split(':').forEach("
+ "path => imports.gi.GIRepository.Repository."
+ "prepend_search_path(path));\n"
+ "imports.gi.GLib.setenv('GST_PLUGIN_SYSTEM_PATH',"
+ "[imports.gi.GLib.getenv('GST_PLUGIN_SYSTEM_PATH'),"
+ "'" gst-plugin-path "'].filter(v => v).join(':'),"
+ "true);\n"
+ all)))
(for-each
(lambda (prog)
(wrap-program (string-append #$output "/bin/" prog)
@@ -9476,6 +9554,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \
gnome-settings-daemon
graphene
gst-plugins-base
+ gst-plugins-good
ibus
libcanberra
libcroco
@@ -9486,6 +9565,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \
mesa-headers
mutter
network-manager-applet
+ pipewire
polkit
pulseaudio
python-pygobject
@@ -9521,15 +9601,13 @@ like switching to windows and launching applications.")
`(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
(native-inputs
(append
- ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS
- ;; dependency on other platforms (FIXME).
- (if (target-x86-64?)
- (list gjs)
- '())
+ ;; GJS depends on Rust so remove the GJS dependency on other platforms.
+ (if (supported-package? gjs)
+ (list gjs)
+ '())
(list gettext-minimal
`(,glib "bin")
gobject-introspection
- node
perl
pkg-config
python-wrapper
@@ -10282,14 +10360,9 @@ playing media, scanning, and much more.")
(gnome-meta-package
(name "gnome-meta-core-utilities")
(propagated-inputs
- (append
- ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently
- ;; only works on x86_64, so exclude it on other architectures.
- (if (string-prefix? "x86_64" (%current-system))
- (list eog)
- '())
(list baobab
cheese
+ eog
epiphany
evince
file-roller
@@ -10314,7 +10387,7 @@ playing media, scanning, and much more.")
totem
tracker-miners
xdg-desktop-portal-gnome
- yelp)))))
+ yelp))))
(define-public gnome-essential-extras
(gnome-meta-package
@@ -10444,7 +10517,8 @@ specified duration and save it as a GIF encoded animated image file.")
`(,gtk+ "bin")
pkg-config))
(inputs
- (list gsettings-desktop-schemas
+ (list bash-minimal
+ gsettings-desktop-schemas
gtk+
libhandy-0.0
libsecret
@@ -11502,34 +11576,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
@@ -11798,7 +11872,7 @@ mp3, Ogg Vorbis and FLAC")
(arguments
`(#:imported-modules ((guix build python-build-system)
(guix build glib-or-gtk-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules ((guix build glib-or-gtk-build-system)
(guix build utils)
@@ -11823,7 +11897,12 @@ mp3, Ogg Vorbis and FLAC")
("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin")))
(inputs
- (list gtk+ python python-pygobject gstreamer gst-plugins-base))
+ (list bash-minimal
+ gtk+
+ python
+ python-pygobject
+ gstreamer
+ gst-plugins-base))
(home-page "https://soundconverter.org/")
(synopsis "Convert between audio formats with a graphical interface")
(description
@@ -12088,7 +12167,7 @@ advanced image management tool")
(define-public terminator
(package
(name "terminator")
- (version "2.1.3")
+ (version "2.1.4")
(source
(origin
(method url-fetch)
@@ -12096,7 +12175,7 @@ advanced image management tool")
"releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
- (base32 "1rbarn9pq3g8k13clxiy0d62g0fxhkg5bcxw2h626wkb7lzr9s8a"))))
+ (base32 "1s65y2yjrigbvqzgxvwr8pj199199bx7m0nhf7g1vrk2x3nb09xg"))))
(build-system python-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -12108,7 +12187,8 @@ advanced image management tool")
("python-pytest-runner" ,python-pytest-runner)
("python-pytest" ,python-pytest)))
(inputs
- `(("cairo" ,cairo)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("cairo" ,cairo)
("dbus-glib" ,dbus-glib)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
@@ -12273,7 +12353,9 @@ higher level porcelain stuff.")
(build-system meson-build-system)
(arguments
(list
+ #:meson meson-1.5 ; XXX: breaks with Meson 1.2
#:glib-or-gtk? #t
+ #:build-type "release" ; don't look at -Wformat…
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-post-install-partially
@@ -12292,7 +12374,8 @@ higher level porcelain stuff.")
(wrap-program prog
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
(inputs
- (list glib
+ (list bash-minimal
+ glib
gpgme
gsettings-desktop-schemas
gspell
@@ -12723,6 +12806,7 @@ non-privileged user.")
gobject-introspection
itstool
libarchive
+ (libc-utf8-locales-for-target)
libxml2
pkg-config
python-minimal
@@ -12983,7 +13067,8 @@ It uses pandoc as back-end for parsing Markdown.")
(list valgrind)
'())))
(inputs
- `(("glib" ,glib)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("glib" ,glib)
("json-glib" ,json-glib)
("libevdev" ,libevdev)
("libsystemd" ,elogind)
@@ -13054,7 +13139,8 @@ your operating-system definition:
gobject-introspection
pkg-config))
(inputs
- (list adwaita-icon-theme
+ (list bash-minimal
+ adwaita-icon-theme
gtk+
guile-3.0 ;for wrap-script
libratbag
@@ -13155,7 +13241,8 @@ provided there is a DBus service present:
pkg-config
yelp-tools))
(inputs
- (list gst-plugins-base
+ (list bash-minimal
+ gst-plugins-base
gst-plugins-good
gstreamer
gtk+
@@ -13367,6 +13454,14 @@ libraries. Applications do not need to be recompiled--or even restarted.")
#:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-source
+ (lambda _
+ ;; With Gnome 4.14, GtkStackPage has an autoptr already, so it'd
+ ;; get redefined. Drop this phase when updating gnome-builder to
+ ;; 46.0 or newer. See also
+ ;; <https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3>
+ (substitute* "src/libide/tweaks/ide-tweaks-window.c"
+ (("G_DEFINE_AUTOPTR_CLEANUP_FUNC \\(GtkStackPage, .*\\)") ""))))
(add-after 'unpack 'patch-meson
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "meson.build"
@@ -13449,17 +13544,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
@@ -13485,7 +13580,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
@@ -13511,7 +13608,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
@@ -13519,7 +13617,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.")
@@ -13664,7 +13762,8 @@ world.")
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)))
(inputs
- `(("enchant" ,enchant)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("enchant" ,enchant)
("glib" ,glib)
("goocanvas" ,goocanvas)
("gtk" ,gtk+)
@@ -13691,7 +13790,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/"
@@ -13699,7 +13798,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 0f3217ffe3..e7c5026ea7 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
@@ -81,7 +81,7 @@
#:test-target "check"
#:configure-flags #~(list "-DWITH_PYTHON=ON")
#:make-flags #~(list "GUILE_AUTO_COMPILE=0")
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:modules '((guix build cmake-build-system)
@@ -93,7 +93,7 @@
(lambda _
(call-with-output-file "libgnucash/app-utils/test/CMakeLists.txt"
(lambda (port)
- (display "set(CTEST_CUSTOM_TESTS_IGNORE online_wiggle)" port)))))
+ (display "set(CTEST_CUSTOM_TESTS_IGNORE online_wiggle test-lots)" port)))))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
@@ -167,6 +167,7 @@
gnucash-docs
googletest
intltool
+ (libc-utf8-locales-for-target)
pkg-config
swig))
(inputs
@@ -184,6 +185,7 @@
libxslt
perl-date-manip
perl-finance-quote
+ perl-json
perl-json-parse
python
tzdata-for-tests
@@ -218,7 +220,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.
@@ -242,76 +244,77 @@ to be read using the GNOME Yelp program.")
(license (list license:fdl1.1+ license:gpl3+)))))
(define-public gwenhywfar
- (package
- (name "gwenhywfar")
- (version "5.6.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://www.aquamaniac.de/rdm/attachments/"
- "download/364/gwenhywfar-" version ".tar.gz"))
- (sha256
- (base32 "1isbj4a7vdgagp3kkvx2pjcjy8lba6kzjr11fmr06aci1694dbsp"))))
- (build-system gnu-build-system)
- (arguments
- `(#:configure-flags
- (list "--disable-network-checks"
- ;; GTK+3, GTK+2 and QT4 are supported.
- "--with-guis=gtk3"
- (string-append "--with-openssl-includes="
- (assoc-ref %build-inputs "openssl") "/include")
- (string-append "--with-openssl-libs="
- (assoc-ref %build-inputs "openssl") "/lib"))))
- (inputs
- (list libgcrypt gnutls openssl gtk+))
- (native-inputs
- (list pkg-config))
- (home-page "https://www.aquamaniac.de")
- (synopsis "Utility library for networking and security applications")
- (description
- "This package provides a helper library for networking and security
+ (let ((attachid "501")) ;; file attachid changes for each version
+ (package
+ (name "gwenhywfar")
+ (version "5.10.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.aquamaniac.de/rdm/attachments/"
+ "download/" attachid "/gwenhywfar-" version ".tar.gz"))
+ (sha256
+ (base32 "1qd950kilf9bcb51b1daykipanml6bg1h3pj10950r98ah1xm9v0"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "--disable-network-checks"
+ ;; GTK+3, GTK+2 and QT4 are supported.
+ "--with-guis=gtk3"
+ "--enable-system-certs"
+ "--with-libxml2-code=yes"
+ "--disable-binreloc")))
+ (inputs
+ (list libgcrypt gnutls openssl gtk+ libxml2))
+ (native-inputs
+ (list pkg-config))
+ (home-page "https://www.aquamaniac.de")
+ (synopsis "Utility library for networking and security applications")
+ (description
+ "This package provides a helper library for networking and security
applications and libraries. It is used by AqBanking.")
- ;; The license includes an explicit additional permission to compile and
- ;; distribute this library with the OpenSSL Toolkit.
- (license license:lgpl2.1+)))
+ ;; The license includes an explicit additional permission to compile and
+ ;; distribute this library with the OpenSSL Toolkit.
+ (license license:lgpl2.1+))))
(define-public aqbanking
- (package
- (name "aqbanking")
- (version "6.3.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://www.aquamaniac.de/rdm/attachments/"
- "download/386/aqbanking-" version ".tar.gz"))
- (sha256
- (base32 "061l7qja7x557650kphbg1gzxc52a7557nibgdhv5jwqf8pv8ym9"))))
- (build-system gnu-build-system)
- (arguments
- `(;; Parallel building fails because aqhbci is required before it's
- ;; built.
- #:parallel-build? #f
- #:phases
- (modify-phases %standard-phases
- ;; Embed the package version instead of the build date
- (add-after 'unpack 'use-version-instead-of-date
- (lambda _
- (substitute*
- "src/libs/plugins/backends/aqhbci/header.xml.in"
- (("@DATETIME@") ,version)))))))
- (propagated-inputs
- (list gwenhywfar))
- (inputs
- (list gmp xmlsec gnutls))
- (native-inputs
- (list pkg-config gettext-minimal libltdl))
- (home-page "https://www.aquamaniac.de")
- (synopsis "Interface for online banking tasks")
- (description
- "AqBanking is a modular and generic interface to online banking tasks,
+ (let ((attachid "499")) ;; file attachid changes for each version
+ (package
+ (name "aqbanking")
+ (version "6.5.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.aquamaniac.de/rdm/attachments/"
+ "download/" attachid "/aqbanking-" version ".tar.gz"))
+ (sha256
+ (base32 "16dc63gav0b4rmwj0clqilfpz4hlidx59x1qcr38wwghfspcw5hd"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(;; Parallel building fails because aqhbci is required before it's
+ ;; built.
+ #:parallel-build? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Embed the package version instead of the build date
+ (add-after 'unpack 'use-version-instead-of-date
+ (lambda _
+ (substitute*
+ "src/libs/plugins/backends/aqhbci/header.xml.in"
+ (("@DATETIME@") ,version)))))))
+ (propagated-inputs
+ (list gwenhywfar))
+ (inputs
+ (list gmp xmlsec gnutls))
+ (native-inputs
+ (list pkg-config gettext-minimal libltdl))
+ (home-page "https://www.aquamaniac.de")
+ (synopsis "Interface for online banking tasks")
+ (description
+ "AqBanking is a modular and generic interface to online banking tasks,
financial file formats (import/export) and bank/country/currency information.
AqBanking uses backend plugins to actually perform the online tasks. HBCI,
OFX DirectConnect, YellowNet, GeldKarte, and DTAUS discs are currently
supported. AqBanking is used by GnuCash, KMyMoney, and QBankManager.")
- ;; AqBanking is licensed under the GPLv2 or GPLv3
- (license (list license:gpl2 license:gpl3))))
+ ;; AqBanking is licensed under the GPLv2 or GPLv3
+ (license (list license:gpl2 license:gpl3)))))
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index ae166c2507..cf731f3fcc 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -192,7 +192,7 @@ authentication and support for SSL3 and TLS.")
(define-public gnunet
(package
(name "gnunet")
- (version "0.21.1")
+ (version "0.21.2")
(source
(origin
(method url-fetch)
@@ -200,7 +200,7 @@ authentication and support for SSL3 and TLS.")
".tar.gz"))
(sha256
(base32
- "0p3q9590bm0d6q6p17jcbq2yiciqmvk5ys6pwdrp4257mhz8prlk"))))
+ "18czv9yxxmaf7y061ngzwcc9rxwrwdy372wb52ns52wviqk528wc"))))
(build-system gnu-build-system)
(inputs
(list bluez
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e7c583a266..092476ea54 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -21,7 +21,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Nikita Domnitskii <nikita@domnitskii.me>
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
@@ -45,6 +45,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages adns)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages base)
#:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
@@ -93,69 +94,63 @@
(define-public libgpg-error
(package
(name "libgpg-error")
- (version "1.45")
+ (version "1.47")
(source
(origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
- version ".tar.bz2"))
- (sha256
- (base32
- "09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp"))))
+ (method url-fetch)
+ (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "1nwvpg5inpjzbq7r6wqsgmwcnfqyahcw9hi8discqvmrcq4nfg4y"))))
(build-system gnu-build-system)
(arguments
- (cond
- ((%current-target-system)
- (list
- #:modules '((guix build gnu-build-system)
- (guix build utils))
- #:phases
- #~(modify-phases %standard-phases
- ;; If this is left out, some generated header
- ;; files will be sprinkled with ‘\c’, which
- ;; the compiler won't like.
- (add-after 'unpack 'fix-gen-lock-obj.sh
- (lambda _
- (substitute* "src/gen-lock-obj.sh"
- (("if test -n `echo -n`") "if ! test -n `echo -n`"))))
- ;; When cross-compiling, some platform specific properties cannot
- ;; be detected. Create a symlink to the appropriate platform
- ;; file if required. Note that these platform files depend on
- ;; both the operating system and architecture!
- ;;
- ;; See Cross-Compiling section at:
- ;; https://github.com/gpg/libgpg-error/blob/master/README
- (add-after 'unpack 'cross-symlinks
- (lambda _
- (define (link triplet source)
- (symlink (string-append "lock-obj-pub." triplet ".h")
- (string-append "src/syscfg/lock-obj-pub."
- source ".h")))
- #$(let ((target (%current-target-system)))
- (cond ((target-linux? target)
- (match (string-take target
- (string-index target #\-))
- ("armhf"
- `(link "arm-unknown-linux-gnueabi" "linux-gnu"))
- ("mips64el"
- `(link "mips-unknown-linux-gnu" "linux-gnu"))
- ;; Don't always link to the "linux-gnu"
- ;; configuration, as this is not correct for
- ;; all architectures.
- (_ #t)))
- (#t #t))))))))
- ((system-hurd?)
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'skip-tests
- (lambda _
- (substitute*
- "tests/t-syserror.c"
- (("(^| )main *\\(.*" all)
- (string-append all "{\n exit (77);//"))))))))
- (else
- '())))
+ (list
+ #:configure-flags #~(list "--enable-install-gpg-error-config")
+ #:phases
+ #~(modify-phases %standard-phases
+ #$@(cond
+ ((%current-target-system)
+ ;; If this is left out, some generated header
+ ;; files will be sprinkled with ‘\c’, which
+ ;; the compiler won't like.
+ #~((add-after 'unpack 'fix-gen-lock-obj.sh
+ (lambda _
+ (substitute* "src/gen-lock-obj.sh"
+ (("if test -n `echo -n`") "if ! test -n `echo -n`"))))
+ ;; When cross-compiling, some platform specific properties cannot
+ ;; be detected. Create a symlink to the appropriate platform
+ ;; file if required. Note that these platform files depend on
+ ;; both the operating system and architecture!
+ ;;
+ ;; See Cross-Compiling section at:
+ ;; https://github.com/gpg/libgpg-error/blob/master/README
+ (add-after 'unpack 'cross-symlinks
+ (lambda _
+ (define (link triplet source)
+ (symlink (string-append "lock-obj-pub." triplet ".h")
+ (string-append "src/syscfg/lock-obj-pub."
+ source ".h")))
+ #$(let ((target (%current-target-system)))
+ (cond ((target-linux? target)
+ (match (string-take target
+ (string-index target #\-))
+ ("armhf"
+ `(link "arm-unknown-linux-gnueabi" "linux-gnu"))
+ ("mips64el"
+ `(link "mips-unknown-linux-gnu" "linux-gnu"))
+ ;; Don't always link to the "linux-gnu"
+ ;; configuration, as this is not correct for
+ ;; all architectures.
+ (_ #t)))
+ (#t #t)))))))
+ ((system-hurd?)
+ #~((add-after 'unpack 'skip-tests
+ (lambda _
+ (substitute* "tests/t-syserror.c"
+ (("(^| )main *\\(.*" all)
+ (string-append all "{\n exit (77);//")))))))
+ (else #~())))))
(native-inputs (list gettext-minimal))
(home-page "https://gnupg.org")
(synopsis "Library of error values for GnuPG components")
@@ -228,7 +223,7 @@ generation.")
(define-public libassuan
(package
(name "libassuan")
- (version "2.5.5")
+ (version "2.5.6")
(source
(origin
(method url-fetch)
@@ -236,7 +231,7 @@ generation.")
version ".tar.bz2"))
(sha256
(base32
- "1r1lvcp67gn5lfrj1g388sd77ca6qwnmxndirdysd71gk362z34f"))))
+ "09pllidbv01km8qrls21dcz1qwa22ydqyy1r9r79152kilhjgzg9"))))
(build-system gnu-build-system)
(arguments (if (%current-target-system)
(list #:configure-flags
@@ -445,7 +440,12 @@ libskba (working with X.509 certificates and CMS data).")
(sha256
(base32 "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n"))))
(build-system gnu-build-system)
- (native-inputs
+ (arguments
+ (list
+ #:configure-flags
+ #~(let ((gpg-bins (dirname (search-input-file %build-inputs "/bin/gpg"))))
+ (list (string-append "--enable-fixed-path=" gpg-bins)))))
+ (inputs
(list gnupg))
(propagated-inputs
;; As required by the pkg-config's Requires.private.
@@ -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")
@@ -749,16 +788,16 @@ parties.")
(native-inputs
;; autoconf-wrapper is required due to the non-standard
;; 'configure phase.
- `(("autoconf" ,autoconf-wrapper)
- ("automake" ,automake)))
- (inputs (list perl
+ (list autoconf-wrapper automake))
+ (inputs (list bash-minimal
+ perl
perl-text-template
perl-mime-tools
perl-gnupg-interface
perl-net-idn-encode
libmd))
(arguments
- `(#:tests? #f ; no test suite
+ `(#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -776,8 +815,7 @@ parties.")
"keylookup/Makefile" "sig2dot/Makefile"
"springgraph/Makefile")
(("/usr") out))
- (setenv "CONFIG_SHELL" (which "sh")))
- #t))
+ (setenv "CONFIG_SHELL" (which "sh")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys #:rest args)
(let ((out (assoc-ref outputs "out"))
@@ -802,15 +840,13 @@ parties.")
'("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
"gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
"gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
- "process_keys.1" "pgpring.1" "keyanalyze.1")))
- #t))
+ "process_keys.1" "pgpring.1" "keyanalyze.1")))))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(wrap-program
(string-append out "/bin/caff")
- `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
- #t)))))
+ `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
(synopsis "Collection of scripts for simplifying gnupg key signing")
(description
"Signing-party is a collection for all kinds of PGP/GnuPG related things,
@@ -958,7 +994,7 @@ passphrase when @code{gpg} is run and needs it.")))
`(#:modules
((ice-9 match)
(ice-9 ftw)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases
%standard-phases
@@ -972,14 +1008,13 @@ passphrase when @code{gpg} is run and needs it.")))
(("." ".." version)
(wrap-program
(string-append bin "pinentry-rofi")
- (list "PATH" ":" 'prefix `(,rofi-bin)))
- #t)))))
+ (list "PATH" ":" 'prefix `(,rofi-bin))))))))
(add-after 'compress-documentation 'installcheck
(lambda* rest
(invoke "make" "installcheck"))))))
(native-inputs
(list autoconf autoconf-archive automake pkg-config texinfo))
- (inputs (list guile-3.0 rofi))
+ (inputs (list bash-minimal guile-3.0 rofi))
(synopsis "Rofi GUI for GnuPG's passphrase input")
(description "Pinentry-rofi is a simple graphical user interface for
passphrase or PIN when required by @code{gpg} or other software. It is using
@@ -1095,16 +1130,15 @@ however, pgpdump produces more detailed and easier to understand output.")
(let ((out (assoc-ref outputs "out"))
(gnupg (assoc-ref inputs "gnupg")))
(wrap-program (string-append out "/bin/gpa")
- `("PATH" ":" prefix (,(string-append gnupg "/bin"))))
- #t))))))
- (native-inputs
- (list pkg-config))
+ `("PATH" ":" prefix (,(string-append gnupg "/bin"))))))))))
+ (native-inputs (list pkg-config))
(inputs
- `(("gnupg" ,gnupg)
- ("gpgme" ,gpgme)
- ("libassuan" ,libassuan)
- ("libgpg-error" ,libgpg-error)
- ("gtk+-2" ,gtk+-2)))
+ (list bash-minimal
+ gnupg
+ gpgme
+ libassuan
+ libgpg-error
+ gtk+-2))
(home-page "https://gnupg.org/software/gpa/")
(synopsis "Graphical user interface for GnuPG")
(description
@@ -1129,7 +1163,8 @@ files, to verify signatures, and to manage the private and public keys.")
"10gal2h8ihg7nnzy3adw942axd2ia1rcn1fw3a3v07n5mm8kqrx9"))))
(build-system perl-build-system)
(inputs
- (list gnupg
+ (list bash-minimal
+ gnupg
perl-clone
perl-config-general
perl-file-homedir
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 2819993d73..e9e5ac095b 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -30,6 +30,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages xorg)
#:use-module (gnu packages libffcall)
@@ -152,8 +153,7 @@ GCC runtime.
;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;")
- (string-append "len = strlen(text) + 107;")))
- #t)))
+ (string-append "len = strlen(text) + 107;"))))))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -171,8 +171,7 @@ GCC runtime.
(string-map (match-lambda
(#\newline #\space)
(chr chr))
- ,synopsis) out))))
- #t))
+ ,synopsis) out))))))
(add-after 'install-xsession 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -180,18 +179,18 @@ GCC runtime.
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst")
- `("PATH" ":" prefix (,bin)))
- #t))))))
+ `("PATH" ":" prefix (,bin)))))))))
(inputs
- `(("libxmu" ,libxmu)
- ("libxft" ,libxft)
- ("libx11" ,libx11)
- ("libxinerama" ,libxinerama)
- ("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg-turbo)
- ("giflib" ,giflib)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)))
+ (list bash-minimal ;for wrap-program
+ fontconfig
+ giflib
+ libjpeg-turbo
+ libpng
+ libtiff
+ libx11
+ libxft
+ libxinerama
+ libxmu))
(native-inputs
(list pkg-config))
(home-page "https://windowmaker.org/")
@@ -320,7 +319,8 @@ display, and can run a user-specified program on mouse click.")
(base32
"101grahd80n97y2dczb629clmcgiavdpbbwy78kk5wgs362m12z3"))
(patches
- (search-patches "wmfire-update-for-new-gdk-versions.patch"))))
+ (search-patches "wmfire-dont-inline-draw-fire.patch"
+ "wmfire-update-for-new-gdk-versions.patch"))))
(build-system gnu-build-system)
(inputs
(list gtk+-2 libgtop))
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 81c976e9a7..d7b9aa72e9 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -119,7 +119,7 @@
(list
#:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
#:modules `((guix build cargo-utils)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:test-target "check-jstests"
#:configure-flags
#~(list
@@ -176,6 +176,14 @@
((".*killed process should not have exitStatus.*")
""))
+ ;; This was fixed sometime between 102.15.1 and 115.11.0.
+ ;; These tests are supposed to be skipped on all 64-bit systems.
+ #$@(if (target-riscv64?)
+ #~((substitute* '("non262/Array/regress-157652.js"
+ "non262/regress/regress-422348.js")
+ (("mips64") "mips64|riscv64")))
+ #~())
+
;; The test suite expects a lightly patched ICU. Disable tests
;; that do not work with the system version. See
;; "intl/icu-patches" for clues.
@@ -414,7 +422,7 @@ variable defined below. It requires guile-json to be installed."
(format #t "~{~s~%~}" data)
data))))
-(define all-mozilla-locales
+(define-public all-mozilla-locales
(mozilla-locales
;; sha256 changeset locale
;;---------------------------------------------------------------------------
@@ -495,10 +503,12 @@ variable defined below. It requires guile-json to be installed."
("0c8dl12n5fjdd3bjaf8idyaxsf8ppbma132vdw8bk2wqnh4cv69a" "92110fd6e211" "rm")
("0mxxy56kj0k5jhjxjv8v4zz57pha819mz7j803lcilax7w52wgca" "5eeba1f64743" "ro")
("0jrd95n108r4sxdwgy39zjynm5nlzzmiijsfpxxfwj7886wl4faz" "47131134e349" "ru")
+ ("1lwm5jv3hvjp84a70186x2083nhr3mfcl7kpmw5in9amaflfi41b" "a5cd6d3d67ee" "sat")
("1q6pn3iixzcas9blf61bhvwgppbsh0am0wdz6a6p9f9978894d73" "880b7986692a" "sc")
("0xndsph4v725q3xcpmxxjb9vxv19sssqnng82m9215cdsv9klgpb" "bf5f6e362f6f" "sco")
("0l70n8817mbmbc09fsnn2aqjj9k9dhad2gmzgphmiilf9mqm2dpf" "1f705c926a99" "si")
("19bqjazazww08chd1qc08dsnr2521088jq5jd4j3185yb1ypm3nr" "c1bd10d70325" "sk")
+ ("12q1nv6z4bk8yaw3vhl9xs41i7kpx1415mwg635v76fx8h94ycl3" "00eaf8d9e83b" "skr")
("11nmjmy2j249588ahg4mh9lxdqr476jbh28a07qxxibfa76j9vk3" "44be3cbf69b6" "sl")
("1ww35141nixg2s03kfmmq9fk6m3qiz2vg7p5a85shjp7i89pyj1d" "800576ff8ef9" "son")
("1q7nfybwc8mxdwi9fpvfhayq18mykzygkpakr5ngfz2316k8lf5r" "4de8638ac27f" "sq")
@@ -523,9 +533,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.10.0")
-(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
-(define %icecat-build-id "20240416000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-base-version "115.15.0")
+(define %icecat-version (string-append %icecat-base-version "-guix1"))
+(define %icecat-build-id "20240903000000") ;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'
@@ -545,12 +555,12 @@ variable defined below. It requires guile-json to be installed."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
- "1wpf4vcrvnvhnfzqavbkzqbn51bds1l9f6ld4mzh9xwm7mrkrz8a"))))
+ "10dfzvkwb4mwz42j93zyxgjp5aryzsfja4f62hb8fqfrl0mdkzpg"))))
;; The upstream-icecat-base-version may be older than the
;; %icecat-base-version.
- (upstream-icecat-base-version "115.10.0")
- (gnuzilla-commit "40e114e5e8fd0b4d3621d6c8aebf0c78100578f2")
+ (upstream-icecat-base-version "115.15.0")
+ (gnuzilla-commit "53ca891e1aac86153b65a12af97eef9752503313")
(gnuzilla-source
(origin
(method git-fetch)
@@ -562,7 +572,7 @@ variable defined below. It requires guile-json to be installed."
(string-take gnuzilla-commit 8)))
(sha256
(base32
- "1x6miiafhv9ncddm7xxjz88amq9bpv6sqnw5k0yz6fy1ghw9ckw0"))))
+ "19bsci50bhg5wi9yndxwbi4f04gsmgkq2hrccqv01cjf1ajniw6k"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@@ -703,6 +713,7 @@ variable defined below. It requires guile-json to be installed."
(build-system mozilla-build-system)
(inputs
(list alsa-lib
+ bash-minimal
bzip2
cups
dbus-glib
@@ -858,7 +869,7 @@ variable defined below. It requires guile-json to be installed."
(rnrs io ports)
(guix elf)
(guix build gremlin)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'apply-guix-specific-patches
@@ -1133,11 +1144,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")
@@ -1154,282 +1161,8 @@ standards of the IceCat project.")
"ru" "sc" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "tg"
"th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
-(define all-mozilla-102-locales
- (mozilla-locales
- ;; sha256 changeset locale
- ;;---------------------------------------------------------------------------
- ("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach")
- ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af")
- ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an")
- ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar")
- ("11qqblqfffbmkdr5b6mxzq02i8rj1hjq3iy6xv5i5xxy311b3vpb" "f706d22e6910" "ast")
- ("0q2p1a437qr2nshdd4934qkv2sblmykiwzir149c8p9m5sjk0dyw" "f5c2a9800add" "az")
- ("0gxxm3lv18kj0922bw0g897azc4nkrszm5irgwdkgmkbyr97li83" "98ba7d51484f" "be")
- ("10vrbbaabjns824ndya6c09znm815pak2xpvqgjydl3r5qvacx65" "5c79c77311cd" "bg")
- ("1il7yyifx5xzj0v2lna315mppl5pk1vi4m9r66hdz1lzc485m1wp" "c80c87ef7193" "bn")
- ("1p1ig4v9pczzrnnxzr20r61g7xk85k5lgnxhzgn1rx518p85xrkm" "6a1bcb9851b2" "br")
- ("08q33bk9kdvbyc4ib58bsn2b67ki3d2yzskkf5r2n5zlglblksa2" "939779cb58d6" "bs")
- ("1bdkywrqah85fh8kfnz163qnc02ffx0a4vlnx5pq1wg9j4f1gznf" "9a45ccf144f1" "ca")
- ("0hhmp5dzc0rssykl0b2n9h0vfy4svwhxmhpsr3rcfpbg2s0r5h6l" "4f60e18fc248" "ca-valencia")
- ("18phbl9raqsbys9wa8z0gq0h0pw3b55v6ngn67r4373lfc0s9cxv" "b4ef404c7de8" "cak")
- ("0147qyw1y97mgqhkb46wblxv61lq2mvvm5n5ihwf49l5cyizi0jg" "f56ef18f05df" "cs")
- ("08sbhnsxndlsaijnxndc367qcbrzb29m7bpkcawinz9fg6mz3573" "4f9d92f04f5e" "cy")
- ("09cm5kk1sh2a6ws1fj185jrknhfa6n4bhj7nfnr4lsk339n0kvv9" "902503567e30" "da")
- ("0r630bki5d4ylicq6lzh6s2mvsq225933szswmm0sap507rj75cm" "6000baf7a412" "de")
- ("0749qjsfv3rn94rnci3ydgndw27qlr3w3w97kfwma2gmsf3m3r0p" "4a948952d1f4" "dsb")
- ("0yc64i7mpxhs4qlyyh59i2aiz0vpap0bn8slcsk8b71wd1d7cy5m" "153a16a13733" "el")
- ("0d4m5ji6ii10yap8y24cxx3fr60ba1jqi10hy3j1cq6ni7hzavga" "7ce17ae529ac" "en-CA")
- ("12jzqcfbgdhfm8f2gqp15bdnin62li07jwicjc8ynn4cl9a19xiz" "a25d9eea7c23" "en-GB")
- ("0gbb8hfc5yvjah63mapjxm53wxrf98srbrbg43b9g734zfi4n8y5" "4ed3471dad5d" "eo")
- ("19lw7zmqx2irjmv5y6r7nncp6nysn06abf10n3dzj5nzgays6sln" "853fe7acb415" "es-AR")
- ("0rq4pa380b77rkv6dq7sqx8a8i33jk3vs5rgcl8fv7slqvsw23kd" "921b67bf27a5" "es-CL")
- ("1dyxzab9hln5spch66wmfagfzmfdiaxgpq7qlzvdfg98wkqdj25n" "c9a210ea496c" "es-ES")
- ("1gwpmfl37wxl7rynqswgj41liljflgxydvljd4zdhk3jzqn605fb" "ddd35183d81c" "es-MX")
- ("0c3blniddklapifnjbz03f2frw24jjgwgwn6swl5mwm2z0y6wa9f" "82d23ffaa7d3" "et")
- ("05mq2df6n6fr8m5m2xwl0f6n1q3zgjrnk465ldx1nfr9agrhd36c" "13975626d549" "eu")
- ("1l1jyqqiy551903j6yzh9ayg1pf26q2hr9h3jj4l51xzp7x4ms2q" "039e1fdb7c71" "fa")
- ("091l05y9sggxznv0y11b9zy5qf146p0hb5faw4ix7yn5p5kca2f5" "7bd3722d82de" "ff")
- ("1lllwjvmbl5dx44fcvsqg08fbflkc8dx5as9n6nf4xlkzydx6izm" "39808e88c9d1" "fi")
- ("10ha955vvyf5vbciricm72kplj9j0s00g2333lmg46jiwi7aviiv" "426d373db6a7" "fr")
- ("11zdfk8jvdy1k9z1q162cwapplcbz35l3dq4mv45brdin3v0x8kr" "96cd93d18389" "fy-NL")
- ("1l5xr25gmssyachwmfprlnp2v2xj4b0hp8gxrf7fi5bvv9c2fynb" "de3daf7d3f9d" "ga-IE")
- ("06h9ijfsn1cgz5fvxxbisk7fvqhgsw99id92575hgyg1p8xb1n69" "f04aea656d9e" "gd")
- ("19913i5n8yyfhz9j21krlk7wqsyy89vggxc1m1swv94y2ix8rpaj" "1b8cdb87bf69" "gl")
- ("0k5x31bfl2l0r9b5dkn03frm1gd8n6igai7ch2f1kj0skflynwww" "82df570c4241" "gn")
- ("03rygnj9xhfvykark7dls117kwhid13ghvrsqiial0vp8m7ymx79" "e2e41d7beaa5" "gu-IN")
- ("0vyraplj1x7b5im15anhzdaq03k2gqfyybgklrd4f9ry6msh5jhx" "de724e943805" "he")
- ("1zqps586jrgxpf7xx2l3qw3ch3fr31r9a25y861fpxrpvh7ygw7g" "898598e1a5c6" "hi-IN")
- ("0czq68l3qdhdc0mgazlrh8x83a6d5qrjwgjv8xvsmmzi7h68ww0l" "2711d1515af0" "hr")
- ("1wwvrnm38gk2rnw4vmcranh8hk61gjcj9292pck3ckiv6mq7kd4s" "03e02f3d0676" "hsb")
- ("0yvgdxlbyhhg3lk43hxx9gx66rcm7gaj02zzzx5zni8dhvlk2v6m" "d423ada9dc00" "hu")
- ("1kjm7bg4990jhfbxwc38r4lqm2fbcxc82nc2d4qkqwikr4aah4b9" "06836af0bd6e" "hy-AM")
- ("1dla7r3snvagb7m985xxqyi7gl498cr5xsz8msw0zpg6xmi05rlx" "299bd950d538" "ia")
- ("0w8w9xn93akir7nqcp5iwr3kqvba5gbirg7gmzlzg7mgrhw8pcsa" "dee087477b99" "id")
- ("10iakv1c1d20ihxg1s7c3zc1zfw18vr2kspcw7bk5k02rmrffgcn" "320095d063ed" "is")
- ("1xn5pa3rc7l6k2migm3c0dx71q1hk7mjls045xpv9cy8gvirnj94" "4722680fb5bf" "it")
- ("0va9zfj3wqh1yvbgh3x808yvdyxkg780vazjg887wbxpfk1n6hxa" "cb3cfe294621" "ja")
- ("0qvjc3fhk6jg2c3g6mymmnslg1rkkxmv9gi3whf2bc5mzfgyc5zw" "7efe92bd7780" "ja-JP-mac")
- ("0zfiwwz0axbd219ar32c7a6b8h816sf04ajx6jl74s5kyij79y82" "4c1fe3a18da9" "ka")
- ("1aiik4758r5df76q2a132y5fjdjrsxshjylk7irwsr7yy0c7f63g" "acdf76048aa0" "kab")
- ("0icxh4sgv6m1yykycb9d9c43k3r6w02f9c6jr04wm8hvqq5icfl5" "9b418ff7936b" "kk")
- ("1cqlhggf46lr7w399k7qb7a1hc56f32w1dy26i2racpppzza5plc" "9771ada0b5f8" "km")
- ("0p04irnb7x7y37m6lz388x9dynn8rnk000avpp296barajnhs5i8" "645aa37a2112" "kn")
- ("1lbc1fxr5i0ccymlsd8axz3633cqggg5k8ak5yqwi704g7kvv9g2" "1cd68952d119" "ko")
- ("11b55bxg73zqfdn5gy9nn5imab2mv0hxr603whggp7vymllgb7kb" "26bb83959bfe" "lij")
- ("15jsijm6d26i0105gz0f7sh2yh2v4pmw4j95cwkdrb1d8m935jlz" "b9829891f153" "lt")
- ("0liwwv13fgyw97nizhsyy53xrbf8jks5ics7qkkxfccawjrg5rlb" "e5f09d03d959" "lv")
- ("0w420yf3hdnl7dp9mn9ghc20cq79k24fn9adn3syk723ppl6mkb0" "7884845e94f3" "mk")
- ("13wkr7rgqsv9w3d9w7k8lnxdzgfixsq4bmc27zsyc770l6062ml6" "030db7412202" "mr")
- ("06nsadcnxx0ssdp67x47dj9crihn1ycgd5mwvn5m7lkb97r4ch9f" "40a7703e875c" "ms")
- ("0mlnjdzck6dp9p59ajj3sr63r36fn0qi8r9scrqrqcisgfclw9sg" "daca40056531" "my")
- ("0z1hgx9d5i9w20f9k9azzng1y3lmm5d6hdjkj7rf6r5710bhhzh5" "664bd049e105" "nb-NO")
- ("1466qvrs13g2iix1k35cknb2pia9b66li2ncvdyqf0jsd92z9k8x" "eaa6ae781ba0" "ne-NP")
- ("0jgmz2lkzj0aspd9mabygzic6li5s2b25y0r6vjg8mv3jm5pi86j" "5ef8f1c9739e" "nl")
- ("1m46x0h20vdfbzjxlz0ac43dbaq40xnyldr2yzbf7pk5di9pzxa6" "f08e15466d5d" "nn-NO")
- ("0r3zvihqh6iya3z1qm7if0m3zfgf81s9qp7x7qc701h2q357wkgf" "6712c0e12ec2" "oc")
- ("102j89jm28c223yhhkrj76xxj4kmy58hcs2r0jn15xa1qkqv1fdk" "8f36cc819e00" "pa-IN")
- ("1j9za6s0i46abn8dsrlkpck3qxxw35rhfcg1xs1vp8sc4ckg8qwi" "c3b0c1c02b94" "pl")
- ("1k9lbsvckpwl4xax8kxp5yxsfkspq2mhqm77jh5nl9aw88dsn55b" "cc32bf9630fe" "pt-BR")
- ("0f0jyvbn2sa5m66wqdzh4607g4gd0270xq37ipd9ls52b4764bd8" "5478d7242086" "pt-PT")
- ("19znkkialh1d4np7qcp80xkagrf1j2xah2s1xxzsh854p3d30zs7" "dd934a76fb01" "rm")
- ("1xn26r8g8zzkb5myfgmnjbk8k4i0brkvbrvnhp7k5nkrnsin25di" "d57ab3dee73d" "ro")
- ("04rhkxlmpp5pyzw85ldbfkmiigqr2p9y5cbns5dqs6sz1633ccxp" "7aea98f33a20" "ru")
- ("1zzkkxl7ayxh5gx9snyvp5czflsvi77hp48li613h3c2fii4n9qk" "7c986f4b5044" "sco")
- ("1219i0ghhqj3s1i0rm68jjkvivh6y40938wav7z4ifck527sq6r1" "bc9e55d4e3ea" "si")
- ("05i5p3n3a6hgl6rf10yjs4vag7y3rn2jwgxsddcdcqiv6405zn81" "8814afd7f67e" "sk")
- ("1wcqdbm1py1ldq6cj2g201m715nql79r6szr71jvrxacb711c62a" "20013dc06e96" "sl")
- ("0g2izkaa4ipwgwyhy77ciyrxxpf4pxzj9mjqvxriy5prmkhm3zjs" "d86d5d2b6eef" "son")
- ("1cc99m6srjg8698dkc3il70crby0mdv43v3ijwy069k4w50hyjjg" "49bb5fae5d9b" "sq")
- ("13kfssq4fhq9mb36as6sxiaffl17qyg1wdw8kpz3ilqm86bsjrgl" "d6a0ab79b06f" "sr")
- ("1wx9snbm0431q97i0q0nv4wbsqcv9nhllwfr88crlp7bfj5w8czw" "4bab04993da3" "sv-SE")
- ("0laglkfl8ml0ip5vmm3z2q790hgwax9gfqwq3wm68a2nnsyck8fw" "4b3316c4aa48" "szl")
- ("15pnlic4q7m48y0mc5yh8w5yscjwzx0mmfrbj3f2b9jxxa44nx4h" "48c7aab86db8" "ta")
- ("16qar5y0wns75ryi8bfv7yln3mjsyn7qi4345zcniz3ydgkczh46" "7bbb3dac8f47" "te")
- ("112g7x8h0qz16r5faam386x4a0rgwd4zy02d5agmg9m0kbficdfx" "009fd0852454" "th")
- ("1l80kh9byqxnz5vkz357rb39g4y9sgn9pr0v29ywp6d009img1qg" "dad9caecd7a9" "tl")
- ("1nalvjlxxsa9wldhhdb93bgfc7dl084xayh7i7mgg93yjgrym93x" "0c48082d37cd" "tr")
- ("0wkxqcfgsra2ljws28kiwajv73w9aa8drsc4fqlg9krbicnjl2n8" "f6d105faedcc" "trs")
- ("18jf4ysrfv3635fyxc1vwr970dr2r05bl3h8v599pwp2g7jzyjpm" "e1011388a55e" "uk")
- ("1ihmksjsz54yii23qda5iv8cxrj9144afy75hzhvfi6m182kj4h8" "c4e927eab511" "ur")
- ("0d42dhfa2vcw24wsvwf95pw20np0pz8c0is6p4307n981n8s207y" "7063df917cb3" "uz")
- ("04khnkrg8css55hyna01jqay9c2ppxk5znbx2zj9i25knhvvx1lq" "1753054e6ab8" "vi")
- ("0fi5kxn78xp7s15svkqlf4748j4pzxh941nm52n6kbbrhyi3qcqn" "93bc595dc32e" "xh")
- ("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN")
- ("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW")))
-
-(define %icecat-102-base-version "102.15.1")
-(define %icecat-102-version (string-append %icecat-102-base-version "-guix0-preview1"))
-
-;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
-;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
-;; script from the upstream IceCat project.
-(define icecat-102-source
- (let* ((major-version (first (string-split %icecat-102-base-version #\.)))
- (minor-version (second (string-split %icecat-102-base-version #\.)))
- (sub-version (third (string-split %icecat-102-base-version #\.)))
-
- (upstream-firefox-version (string-append %icecat-102-base-version "esr"))
- (upstream-firefox-source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://ftp.mozilla.org/pub/firefox/releases/"
- upstream-firefox-version "/source/"
- "firefox-" upstream-firefox-version ".source.tar.xz"))
- (sha256
- (base32
- "04q1fjninm9lw721xgv0c2fknicc24s8iaimkabwcfwmcnvly689"))))
-
- ;; The upstream-icecat-base-version may be older than the
- ;; %icecat-base-version.
- (upstream-icecat-base-version "102.15.0")
- (gnuzilla-commit "400fbfdbc0c1ac9c68c9f52fd2ab6899bc8e8bd0")
- (gnuzilla-source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://git.savannah.gnu.org/gnuzilla.git")
- (commit gnuzilla-commit)))
- (file-name (git-file-name "gnuzilla"
- ;;upstream-icecat-base-version
- (string-take gnuzilla-commit 8)))
- (sha256
- (base32
- "1fqrf94a5vnjq56zyyxlc1zsvbblgmzcks760nj1szpws4y91m8r"))))
-
- ;; 'search-patch' returns either a valid file name or #f, so wrap it
- ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
- (makeicecat-patch
- (local-file (assume-valid-file-name
- (search-patch "icecat-102-makeicecat.patch")))))
-
- (origin
- (method computed-origin-method)
- (file-name (string-append "icecat-" %icecat-102-version ".tar.xz"))
- (sha256 #f)
- (uri
- (delay
- (with-imported-modules '((guix build utils))
- #~(begin
- (use-modules (guix build utils))
- (let ((firefox-dir
- (string-append "firefox-" #$%icecat-102-base-version))
- (icecat-dir
- (string-append "icecat-" #$%icecat-102-version)))
-
- (set-path-environment-variable
- "PATH" '("bin")
- (list #+python
- #+(canonical-package bash)
- #+(canonical-package coreutils)
- #+(canonical-package findutils)
- #+(canonical-package patch)
- #+(canonical-package xz)
- #+(canonical-package sed)
- #+(canonical-package grep)
- #+(canonical-package bzip2)
- #+(canonical-package gzip)
- #+(canonical-package tar)))
-
- (set-path-environment-variable
- "PYTHONPATH"
- (list #+(format #f "lib/python~a/site-packages"
- (version-major+minor
- (package-version python))))
- '#+(cons python-jsonschema
- (map second
- (package-transitive-propagated-inputs
- python-jsonschema))))
-
- ;; We copy the gnuzilla source directory because it is
- ;; read-only in 'gnuzilla-source', and the makeicecat script
- ;; uses "cp -a" to copy parts of it and assumes that the
- ;; copies will be writable.
- (copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
- #:log (%make-void-port "w"))
-
- (with-directory-excursion "/tmp/gnuzilla"
- (make-file-writable "makeicecat")
- (invoke "patch" "--force" "--no-backup-if-mismatch"
- "-p1" "--input" #+makeicecat-patch)
- (patch-shebang "makeicecat")
- (substitute* "makeicecat"
- (("^readonly FFMAJOR=(.*)" all ffmajor)
- (unless (string=? #$major-version
- (string-trim-both ffmajor))
- ;; The makeicecat script cannot be expected to work
- ;; properly on a different version of Firefox, even if
- ;; no errors occur during execution.
- (error "makeicecat major version mismatch"))
- (string-append "readonly FFMAJOR=" #$major-version "\n"))
- (("^readonly FFMINOR=.*")
- (string-append "readonly FFMINOR=" #$minor-version "\n"))
- (("^readonly FFSUB=.*")
- (string-append "readonly FFSUB=" #$sub-version "\n"))
- (("^readonly DATADIR=.*")
- "readonly DATADIR=/tmp/gnuzilla/data\n")
- (("^readonly SOURCEDIR=.*")
- (string-append "readonly SOURCEDIR=" icecat-dir "\n"))
- (("/bin/sed")
- #+(file-append (canonical-package sed) "/bin/sed"))))
-
- (format #t "Unpacking upstream firefox tarball...~%")
- (force-output)
- (invoke "tar" "xf" #+upstream-firefox-source)
- (rename-file firefox-dir icecat-dir)
-
- (with-directory-excursion icecat-dir
- (format #t "Populating l10n directory...~%")
- (force-output)
- (mkdir "l10n")
- (with-directory-excursion "l10n"
- (for-each
- (lambda (locale-dir)
- (let ((locale
- (string-drop (basename locale-dir)
- (+ 32 ; length of hash
- (string-length "-mozilla-locale-")))))
- (format #t " ~a~%" locale)
- (force-output)
- (copy-recursively locale-dir locale
- #:log (%make-void-port "w"))
- (for-each make-file-writable (find-files locale))
- (with-directory-excursion locale
- (when (file-exists? ".hgtags")
- (delete-file ".hgtags"))
- (mkdir-p "browser/chrome/browser/preferences")
- (call-with-output-file
- "browser/chrome/browser/preferences/advanced-scripts.dtd"
- (lambda (port) #f)))))
- '#+all-mozilla-102-locales)
- (copy-recursively #+mozilla-compare-locales
- "compare-locales"
- #:log (%make-void-port "w"))
- (delete-file "compare-locales/.gitignore")
- (delete-file "compare-locales/.hgignore")
- (delete-file "compare-locales/.hgtags")))
-
- (format #t "Running makeicecat script...~%")
- (force-output)
- (invoke "bash" "/tmp/gnuzilla/makeicecat")
-
- (format #t "Packing IceCat source tarball...~%")
- (force-output)
- (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
- (invoke "tar" "cfa" #$output
- ;; Avoid non-determinism in the archive. We set the
- ;; mtime of files in the archive to early 1980 because
- ;; the build process fails if the mtime of source
- ;; files is pre-1980, due to the creation of zip
- ;; archives.
- "--mtime=@315619200" ; 1980-01-02 UTC
- "--owner=root:0"
- "--group=root:0"
- "--sort=name"
- icecat-dir)))))))))
-
-(define %icedove-build-id "20230830000000") ;must be of the form YYYYMMDDhhmmss
-(define %icedove-version "102.15.0")
+(define %icedove-build-id "20240807000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-version "115.14.0")
;; Provides the "comm" folder which is inserted into the icecat source.
;; Avoids the duplication of Icecat's source tarball.
@@ -1437,12 +1170,12 @@ standards of the IceCat project.")
(origin
(method hg-fetch)
(uri (hg-reference
- (url "https://hg.mozilla.org/releases/comm-esr102")
- (changeset "ac0b189e3bc07ee798d5ed84e99f874bc72204a6")))
+ (url "https://hg.mozilla.org/releases/comm-esr115")
+ (changeset "99f915f469c83ab9f535e41cce590e44f6ccfa46")))
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
(sha256
(base32
- "0705grqr906rw3ps32yiw4d5iaiwlql8a1ikhr43k546szypn3wg"))))
+ "0w6ckv6d95f4ildfbwv343zpgl3j4gnramc0vnjc1l3k72pcbjn2"))))
(define (comm-source->locales+changeset source)
"Given SOURCE, a checkout of the Thunderbird 'comm' component, return the
@@ -1461,26 +1194,18 @@ list of languages supported as well as the currently used changeset."
"pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi"
"zh-CN" "zh-TW"))
-;;; To find out which changeset to use for the comm-l10n repo, use the
-;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source
-;;; checkout directory. The complete localization data should be released as
-;;; a tarball in the next release (see:
-;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball
-;;; is available, it should replace the complete 'l10n' directory at the root
-;;; of the IceCat source, instead of only the 'calendar', chat and mail
-;;; directories that it provides.
(define thunderbird-comm-l10n
- (let* ((changeset "95b46b8428d5")
- (version (git-version %icedove-version "0" changeset)))
- (origin
- (method hg-fetch)
- (uri (hg-reference
- (url "https://hg.mozilla.org/projects/comm-l10n")
- (changeset changeset)))
- (file-name (git-file-name "comm-l10n" version))
- (sha256
- (base32
- "0hfsiv9p7s2ik6648gm1774d187vlm1i1c9xwyd8g8ihk2dzyn5i")))))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/thunderbird/releases/"
+ %icedove-version
+ "/source/thunderbird-"
+ %icedove-version
+ ".strings_all.tar.zst"))
+ (sha256
+ (base32
+ "0ymnxsdlnh56bjishs1i35yq96qng1apsp5yjgn9cvvmr7mr926b"))))
(define icedove-source
(let ((name (string-append "icedove-" %icedove-version)))
@@ -1498,16 +1223,18 @@ list of languages supported as well as the currently used changeset."
(set-path-environment-variable
"PATH" '("bin")
(list #+(canonical-package tar)
- #+(canonical-package xz)))
+ #+(canonical-package xz)
+ #+(canonical-package zstd)))
;; Extract the base Icecat tarball, renaming its top-level
;; directory.
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
- "-xf" #$icecat-102-source)
+ "-xf" #$icecat-source)
(chdir #$name)
;; Merge the Thunderdbird localization data.
- (copy-recursively #$thunderbird-comm-l10n "l10n")
+ (invoke "tar" "--extract" "--file" #$thunderbird-comm-l10n
+ "--directory" "l10n/")
;; Add the Thunderbird-specific "comm" directory..
(mkdir "comm")
@@ -1618,7 +1345,7 @@ list of languages supported as well as the currently used changeset."
#:modules `((guix build utils) ;find-files
(sxml simple)
(ice-9 regex)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-cargo-checksums
@@ -1690,11 +1417,18 @@ ca495991b7852b855"))
(setenv "CXX" "clang++")
(setenv "MOZ_NOSPAM" "1")
- (setenv "MACH_USE_SYSTEM_PYTHON" "1")
+ (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system")
(setenv "PYTHON"
(search-input-file inputs "/bin/python"))
+ (setenv "GUIX_PYTHONPATH"
+ (string-append (getcwd)
+ "/obj-x86_64-pc-linux-gnu/_virtualenvs/build"))
+
(setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp
(setenv "MOZ_APP_NAME" "icedove")
+ ;; WM_CLASS (default is "$MOZ_APP_NAME-$MOZ_UPDATE_CHANNEL").
+ (setenv "MOZ_APP_REMOTINGNAME" "Icedove")
+
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output
"/lib/icedove"))
(mkdir-p (string-append (getcwd) "/builddir"))
@@ -1734,7 +1468,7 @@ ca495991b7852b855"))
"ac_add_options --with-system-jpeg\n"
"ac_add_options --with-system-libevent\n"
"ac_add_options --with-system-nspr\n"
- "ac_add_options --with-system-nss\n"
+ ; UNBUNDLE-ME! "ac_add_options --with-system-nss\n"
"ac_add_options --with-system-zlib\n"
"ac_add_options --without-wasm-sandboxed-libraries\n"
"mk_add_options MOZ_MAKE_FLAGS=-j"
@@ -1767,6 +1501,7 @@ ca495991b7852b855"))
MimeType=x-scheme-handler/mailto;~@
Type=Application~@
Actions=ComposeMessage;~@
+ StartupWMClass=Icedove;~@
[Desktop Action ComposeMessage]~@
Name=Write new message~@
Exec=~@*~a/bin/icedove -compose~%"
@@ -1802,6 +1537,7 @@ ca495991b7852b855"))
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib ,libnotify-lib)))))))))
(inputs
(list alsa-lib
+ bash-minimal
bzip2
cairo
cups
@@ -1814,7 +1550,7 @@ ca495991b7852b855"))
gtk+
gtk+-2
hunspell
- icu4c
+ icu4c-73
libcanberra
libevent
libffi
@@ -1830,7 +1566,8 @@ ca495991b7852b855"))
libxt
mesa
mit-krb5
- nss
+ nspr
+ ;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later)
pango
pixman
pulseaudio
@@ -1842,11 +1579,11 @@ ca495991b7852b855"))
zlib))
(native-inputs
(list `(,rust "cargo")
- clang
- llvm
+ clang-15
+ llvm-15
m4
nasm
- node
+ node-lts
perl
pkg-config
python-wrapper
@@ -1912,6 +1649,9 @@ their corresponding VERSION, SOURCE and LOCALES variables."
(string-append (getcwd) "/mach_state"))
(setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig"))
(setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system")
+ (setenv "GUIX_PYTHONPATH"
+ (string-append (getcwd)
+ "/obj/_virtualenvs/build/lib/python3.10/site-packages"))
(setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake")))
(replace 'build ;build and install data files
(lambda* (#:key outputs #:allow-other-keys)
@@ -2054,7 +1794,7 @@ associated with their name."))
(define-public icedove/wayland
(package
- (inherit icedove)
+ (inherit icedove-minimal)
(name "icedove-wayland")
(build-system trivial-build-system)
(arguments
@@ -2070,14 +1810,14 @@ associated with their name."))
(format port "#!~a
MOZ_ENABLE_WAYLAND=1 exec ~a \"$@\""
#$(file-append bash-minimal "/bin/bash")
- #$(file-append icedove "/bin/icedove"))))
+ #$(file-append icedove-minimal "/bin/icedove"))))
(chmod exe #o555)
;; Provide the manual and .desktop file.
- (copy-recursively (string-append #$icedove "/share")
+ (copy-recursively (string-append #$icedove-minimal "/share")
(string-append #$output "/share"))
(substitute* (string-append #$output
"/share/applications/icedove.desktop")
- ((#$icedove) #$output))))))
+ ((#$icedove-minimal) #$output))))))
(native-inputs '())
(inputs '())))
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index e13ce3afa8..a664c53c92 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,21 +1,23 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; 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 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
+;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
@@ -40,7 +42,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:
;;;
@@ -55,10 +58,86 @@
;;;
;;; Code:
+(define-public go-github-com-golang-protobuf
+ (package
+ (name "go-github-com-golang-protobuf")
+ (version "1.5.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/protobuf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/golang/protobuf"
+ #: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-google-golang-org-protobuf))
+ (home-page "https://github.com/golang/protobuf")
+ (synopsis "Go support for Protocol Buffers")
+ (description
+ "This package provides Go support for the Protocol Buffers data
+serialization format.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-google-go-cmp
+ (package
+ (name "go-github-com-google-go-cmp")
+ (version "0.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/go-cmp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/google/go-cmp/cmp"
+ #:unpack-path "github.com/google/go-cmp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? import-path inputs #:allow-other-keys)
+ (when tests?
+ ;; The tests fail when run with gccgo.
+ (let ((gccgo? (false-if-exception
+ (search-input-file inputs "/bin/gccgo"))))
+ (if gccgo?
+ (format #t "skipping tests with gccgo compiler~%")
+ ;; XXX: Workaround for go-build-system's lack of Go
+ ;; modules support.
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "go" "test" "-v" "./..."))))))))))
+ (synopsis "Determine equality of values in Go")
+ (home-page "https://github.com/google/go-cmp")
+ (description
+ "This package is intended to be a more powerful and safer
+alternative to @code{reflect.DeepEqual} for comparing whether two values are
+semantically equal.")
+ (license license:bsd-3)))
+
(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,50 +146,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.4.0")
+ (version "0.26.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 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+ (base32 "1rc5zl3gxfy4wcwqjibqgnqj8wdm0v9ff25vkyirzb71l343ydlx"))))
(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-sys))
+ (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-20240808152545-0cdaa3abc0fa")
(source
(origin
(method git-fetch)
@@ -119,26 +297,61 @@ for the Go language.")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
- (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+ (base32 "1sa03fm57326qnchvfza7am7jjlz32l1yyqbdvy6mknw5bmp8a71"))
+ (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"
- ;; Source-only package
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
+ (list
+ #:import-path "golang.org/x/exp"
+ #: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)
+ ;; Benchmark requires other modules to pass tests, delete them.
+ (delete-file-recursively "slog/benchmarks")
+ (substitute* (find-files "." "\\_test.go$")
+ ;; Disable failing tests: error running `go mod init`: go:
+ ;; modules disabled by GO111MODULE=off; see 'go help modules'
+ ;; , exit status 1
+ (("TestFailure") "OffTestFailure")
+ (("TestRelease_gitRepo_uncommittedChanges")
+ "OffTestRelease_gitRepo_uncommittedChanges")))))
+ ;; 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-google-go-cmp
+ go-golang-org-x-mod
+ go-golang-org-x-tools))
(home-page "https://golang.org/x/exp")
(synopsis "Experimental and deprecated Go packages")
- (description "This subrepository holds experimental and deprecated (in the
-@code{old} directory) packages.")
+ (description
+ "This subrepository holds experimental and deprecated (in the @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)
@@ -147,236 +360,241 @@ 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.19.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 "0nb1wvy0xr0s9xylzf336vghkblkp5b9sq2hqh6wdav1awnpry90"))))
+ (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.20.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 "0vrzahgr08idiz9g2ksngwsjhyaa0rryn4vh0lm54kkxgv9pcv7f"))))
+ (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))))
- (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")))))))
-
-(define-public go-golang-org-x-net-html
(package
- (inherit go-golang-org-x-net)
- (name "go-golang-org-x-net-html")
+ (name "go-golang-org-x-net")
+ (version "0.28.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 "1fh4rnqsxc652lhncnrdb3qcsw811565qb9619z21z0p1fdgzlar"))))
+ (build-system go-build-system)
(arguments
- '(#:import-path "golang.org/x/net/html"
- #:unpack-path "golang.org/x/net"))
- (propagated-inputs (list go-golang-org-x-text))
- (home-page "https://godoc.org/golang.org/x/net/html")
- (synopsis "HTML5-compliant tokenizer and parser")
+ (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 an HTML5-compliant tokenizer and parser.")))
+ "This package provides supplemental Go networking libraries.")
+ (license license:bsd-3)))
(define-public go-golang-org-x-sync
- (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
- (revision "1"))
- (package
- (name "go-golang-org-x-sync")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sync")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/sync"
- #:tests? #f
- ;; Source-only package
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (home-page "https://go.googlesource.com/sync/")
- (synopsis "Additional Go concurrency primitives")
- (description "This package provides Go concurrency primitives in
-addition to the ones provided by the language and “sync” and “sync/atomic”
-packages.")
- (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-errgroup
- (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
- (revision "0"))
- (package
- (name "go-golang.org-x-sync-errgroup")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sync")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/sync/errgroup"
- #:unpack-path "golang.org/x/sync"))
- (home-page "https://godoc.org/golang.org/x/sync/errgroup")
- (synopsis "Synchronization, error propagation, and Context cancellation
-for groups of goroutines working on subtasks of a common task")
- (description "This package provides synchronization, error
-propagation, and Context cancellation for groups of goroutines working on
-subtasks of a common task.")
- (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-semaphore
(package
- (inherit go-golang.org-x-sync-errgroup)
- (name "go-golang.org-x-sync-semaphore")
+ (name "go-golang-org-x-sync")
+ (version "0.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/sync")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1jssyq49g5z7dbhdb9bnzsb8gigvsy5f4aczbzn5paz07v9wbjxs"))))
+ (build-system go-build-system)
(arguments
- '(#:import-path "golang.org/x/sync/semaphore"
- #:unpack-path "golang.org/x/sync"))
- (home-page "https://godoc.org/golang.org/x/sync/semaphore")
- (synopsis "Weighted semaphore implementation in Go")
- (description "Weighted semaphore implementation in Go.")))
+ (list
+ #:import-path "golang.org/x/sync"
+ #: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://go.googlesource.com/sync/")
+ (synopsis "Additional Go concurrency primitives")
+ (description
+ "This package provides Go concurrency primitives in addition to the ones
+provided by the language and @code{sync} and @code{sync/atomic} packages.
+The package provides several Golang submodules:
+@itemize
+@item @code{errgroup} - synchronization, error propagation, and Context
+cancelation for groups of goroutines working on subtasks of a common task
+@item @code{semaphore} - a weighted semaphore implementation
+@item @code{singleflight} - a duplicate function call suppression mechanism
+@item @code{syncmap} - a concurrent map implementation
+@end itemize")
+ (license license:bsd-3)))
(define-public go-golang-org-x-sys
- (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
- (revision "0"))
- (package
- (name "go-golang-org-x-sys")
- (version (git-version "0.8.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sys")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "golang.org/x/sys"
- ;; Source-only package
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (home-page "https://go.googlesource.com/sys")
- (synopsis "Go support for low-level system interaction")
- (description "This package provides supplemental libraries offering Go
+ (package
+ (name "go-golang-org-x-sys")
+ (version "0.24.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/sys")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j5hhwrbgjh5bnwqr9g1c32175j43rqlrpv199ay1b970iwiqd4l"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/sys"
+ #: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://go.googlesource.com/sys")
+ (synopsis "Go support for low-level system interaction")
+ (description "This package provides supplemental libraries offering Go
support for low-level interaction with the operating system.")
- (license license:bsd-3))))
+ (license license:bsd-3)))
(define-public go-golang-org-x-term
(package
(name "go-golang-org-x-term")
- (version "0.3.0")
+ (version "0.23.0")
(source
(origin
(method git-fetch)
@@ -385,7 +603,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 "1pdv60bm4gfvgf98lyms92qm32zc4f4h4w1fagrhzllwflmsca8h"))))
(build-system go-build-system)
(arguments '(#:import-path "golang.org/x/term"))
(propagated-inputs
@@ -399,65 +617,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.17.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 "1jqvh4mmg3db2slh5z7fxdhkgazyld5l858rwnbpfxvfrw0k9w1h"))))
(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.6.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 "14z7f1yx3r393f94yjv09mrsfaydq6da7pswv8wvk327mxa56vw1"))))
+ (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.24.0")
(source
(origin
(method git-fetch)
@@ -466,7 +711,7 @@ time.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+ (base32 "007n9bmhxn2yspvmcdbj8h0l132vhakszv4i0bd65cvravskcw8y"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -475,27 +720,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))
@@ -507,7 +793,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"))
@@ -517,6 +803,55 @@ Go programming language.")
1.13 error values.")
(license license:bsd-3))))
+(define-public go-google-golang-org-protobuf
+ (package
+ (name "go-google-golang-org-protobuf")
+ (version "1.31.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/protobuf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"))))
+ (build-system go-build-system)
+ (arguments
+ (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)
+ (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-google-go-cmp))
+ (home-page "https://google.golang.org/protobuf")
+ (synopsis "Go library for Protocol Buffers")
+ (description
+ "The protobuf package provides a Go implementation of Protocol Buffers, a
+language and platform neutral, extensible mechanism for serializing structured
+data. It is a successor to @code{go-github-com-golang-protobuf} with an
+improved and cleaner API.")
+ (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/golang-check.scm b/gnu/packages/golang-check.scm
index 3e26f5f374..53bcc303bf 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
-;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
@@ -20,6 +20,7 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2024 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
@@ -62,10 +63,36 @@
;;; Libraries:
;;;
+(define-public go-atomicgo-dev-assert
+ (package
+ (name "go-atomicgo-dev-assert")
+ (version "0.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomicgo/assert")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ra5bx3w6vynwbxgsz5knibk2xwmfi6654fsi29zsmk77f39g8vv"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "atomicgo.dev/assert"))
+ (home-page "https://atomicgo.dev/assert")
+ (synopsis "Go package with tons of assertions")
+ (description
+ "Package assert provides obj set of assertion functions. Every assertion
+function returns obj boolean. This package does not integrate into the
+testing package automatically and requires to check the returning boolean
+value and call @code{t.Fatal()} if the assertion fails.")
+ (license license:expat)))
+
(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)
@@ -74,11 +101,11 @@
(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))
@@ -192,6 +219,35 @@ style).
@end itemize")
(license license:isc)))
+(define-public go-github-com-elgris-jsondiff
+ (package
+ (name "go-github-com-elgris-jsondiff")
+ (version "0.0.0-20160530203242-765b5c24c302")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elgris/jsondiff")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jm1q0s531hmkqdx8jqphfpmzysn44aphkpwlzqwp3hkz89g4d4q"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/elgris/jsondiff"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-mgutz-ansi))
+ (home-page "https://github.com/elgris/jsondiff")
+ (synopsis "JSON diff diagnostics for Golang")
+ (description
+ "This package provides a simple little tool that produces readable diff
+of 2 JSON-able and convertible to @code{map[string]interface{}} objects.
+Useful for diagnostics or debugging")
+ (license license:expat)))
+
(define-public go-github-com-felixge-fgprof
(package
(name "go-github-com-felixge-fgprof")
@@ -231,7 +287,7 @@ workloads. This kind of profiling is also known as wall-clock profiling.")
(define-public go-github-com-frankban-quicktest
(package
(name "go-github-com-frankban-quicktest")
- (version "1.11.1")
+ (version "1.14.6")
(source
(origin
(method git-fetch)
@@ -240,13 +296,13 @@ workloads. This kind of profiling is also known as wall-clock profiling.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938"))))
+ (base32 "0gnh9v4cg39pw8y356299zhh5jmq2p4cf9945lfiqsjsk7h6ld70"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/frankban/quicktest"))
+ (list
+ #:import-path "github.com/frankban/quicktest"))
(propagated-inputs
- (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty))
+ (list go-github-com-google-go-cmp go-github-com-kr-pretty))
(home-page "https://github.com/frankban/quicktest")
(synopsis "Quick helpers for testing Go applications")
(description
@@ -254,10 +310,36 @@ workloads. This kind of profiling is also known as wall-clock profiling.")
tests.")
(license license:expat)))
+(define-public go-github-com-go-quicktest-qt
+ (package
+ (name "go-github-com-go-quicktest-qt")
+ (version "1.101.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-quicktest/qt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1mc10cszgm760aw82jyrgvld5dqcfnrsjy9zx1dzf9px34d8vlgx"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-quicktest/qt"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp go-github-com-kr-pretty))
+ (home-page "https://github.com/go-quicktest/qt")
+ (synopsis "qt: quicker Go tests")
+ (description
+ "Package qt implements assertions and other helpers wrapped around the
+standard library's testing types.")
+ (license license:expat)))
+
(define-public go-github-com-go-test-deep
(package
(name "go-github-com-go-test-deep")
- (version "1.0.8")
+ (version "1.1.1")
(source
(origin
(method git-fetch)
@@ -266,7 +348,7 @@ tests.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1mmw2w3by7y24jjpjwmf2gfl08c65jihn3si9m0sswmagmdsk8q0"))))
+ (base32 "1vjzmd4gc3zr9hlpzhhq4g1d0k6rbhply10vdl49gvir4dzmzzrl"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/go-test/deep"))
@@ -321,7 +403,7 @@ when comparing complex types like structures and maps.")
(arguments
'(#:import-path "github.com/google/go-cmdtest"))
(propagated-inputs
- (list go-github-com-google-renameio go-github-com-google-go-cmp-cmp))
+ (list go-github-com-google-renameio go-github-com-google-go-cmp))
(home-page "https://github.com/google/go-cmdtest")
(synopsis "Testing for your CLI")
(description
@@ -548,6 +630,50 @@ Many times certain facilities are not available, or tests must run
differently.")
(license license:expat)))
+(define-public go-github-com-marvinjwendt-testza
+ (package
+ (name "go-github-com-marvinjwendt-testza")
+ (version "0.5.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/MarvinJWendt/testza")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mqvs9142wx3a352yj0zxcm8f3mclyqzzxjlpn1rsb3vrskgs8v9"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/MarvinJWendt/testza"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; An error that should be nil is not nil. Error message: "creating
+ ;; snapshot failed: <...> permission denied
+ (add-before 'check 'writable-test-file
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/"
+ import-path
+ "/testdata/snapshots")
+ (for-each make-file-writable
+ (list "TestSnapshotCreate_file_content.testza"
+ "TestSnapshotCreate_file_content_string.testza"))))))))
+ (propagated-inputs
+ (list go-atomicgo-dev-assert
+ go-github-com-sergi-go-diff
+ go-github-com-davecgh-go-spew
+ go-github-com-klauspost-cpuid-v2
+ go-github-com-pterm-pterm))
+ (home-page "https://github.com/MarvinJWendt/testza")
+ (synopsis "Full-featured test framework for Golang")
+ (description
+ "Package testza is a full-featured testing framework for Go. It
+integrates with the default test runner, so you can use it with the standard
+@code{go test} tool. Testza contains easy to use methods, like assertions,
+output capturing, mocking, and much more.")
+ (license license:expat)))
+
(define-public go-github-com-onsi-ginkgo
(package
(name "go-github-com-onsi-ginkgo")
@@ -583,7 +709,7 @@ Gomega matcher library.")
(package
(inherit go-github-com-onsi-ginkgo)
(name "go-github-com-onsi-ginkgo-v2")
- (version "2.17.1")
+ (version "2.19.0")
(source
(origin
(method git-fetch)
@@ -592,16 +718,15 @@ Gomega matcher library.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "089x6pz5563ldbxiwaqvd2g4dqfzlr25dflmas3gfq51ibwzh4vz"))))
+ (base32 "0dwnkcysb5d9dyg8p84hhx5a3sj85g3bwgki1pgay4i8glz7xa7q"))))
(arguments
(list
- #:go go-1.20
#:import-path "github.com/onsi/ginkgo/v2"))
(propagated-inputs
(list go-github-com-go-logr-logr
- ;; go-github-com-google-pprof ; not packed yet in Guix, for profiling
+ go-github-com-go-task-slim-sprig-v3
+ go-github-com-google-pprof
go-github-com-onsi-gomega
- go-github-com-go-task-slim-sprig
go-golang-org-x-net
go-golang-org-x-sys
go-golang-org-x-tools))))
@@ -609,7 +734,7 @@ Gomega matcher library.")
(define-public go-github-com-onsi-gomega
(package
(name "go-github-com-onsi-gomega")
- (version "1.19.0")
+ (version "1.33.1")
(source
(origin
(method git-fetch)
@@ -618,20 +743,21 @@ Gomega matcher library.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i"))))
+ (base32 "1jygwi2lz3q7ri85dxdxf187l1hm7r3i0c843l47iakivmld31x1"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/onsi/gomega"
- ;; Unless we disable the tests, we have a circular dependency on
- ;; ginkgo/v2.
- #:tests? #f))
+ (list
+ ;; Unless we disable the tests, we have a circular dependency on
+ ;; ginkgo/v2.
+ #:tests? #f
+ #:import-path "github.com/onsi/gomega"))
(propagated-inputs
- (list go-github-com-golang-protobuf-proto
+ (list go-github-com-golang-protobuf
go-golang-org-x-net
go-golang-org-x-sys
go-golang-org-x-text
go-google-golang-org-protobuf
- go-gopkg-in-yaml-v2))
+ go-gopkg-in-yaml-v3))
(home-page "https://github.com/onsi/gomega")
(synopsis "Matcher library for Ginkgo")
(description
@@ -639,6 +765,30 @@ Gomega matcher library.")
framework.")
(license license:expat)))
+(define-public go-github-com-otiai10-mint
+ (package
+ (name "go-github-com-otiai10-mint")
+ (version "1.6.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/otiai10/mint")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g5zhz4znp68427p2a1yvrxbq90y7caagdd7zsb4iygnhdszfm7w"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/otiai10/mint"))
+ (home-page "https://github.com/otiai10/mint")
+ (synopsis "Minimal assertion for Golang testing framework")
+ (description
+ "Mint (@code{mint.Mint}) is wrapper for @code{*testing.T} blending
+testing type to omit repeated @code{t}.")
+ (license license:expat)))
+
(define-public go-github-com-pkg-profile
(package
(name "go-github-com-pkg-profile")
@@ -701,10 +851,61 @@ Go application.")
original value once the test has been run.")
(license license:expat)))
+(define-public go-github-com-petermattis-goid
+ (let ((commit "bb94eb51e7a772d09cef11768f3248ac25adf9f9")
+ (revision "2"))
+ (package
+ (name "go-github-com-petermattis-goid")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/petermattis/goid")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hr94frr0rhac4mb9r7ixdgr6hm63rxh6z43rhn2wn7fdy8csw11"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/petermattis/goid"))
+ (home-page "https://github.com/petermattis/goid")
+ (synopsis "Identify the running goroutine")
+ (description
+ "This package offers a method of programmatically retrieving the
+current goroutine's ID.")
+ (license license:asl2.0))))
+
+(define-public go-github-com-sasha-s-go-deadlock
+ (package
+ (name "go-github-com-sasha-s-go-deadlock")
+ (version "0.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sasha-s/go-deadlock")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0arb35idnyz4n118xz7p2snazqi35gk1975h1xfk0y4riiks58yz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/sasha-s/go-deadlock"))
+ (propagated-inputs
+ (list go-github-com-petermattis-goid))
+ (home-page "https://github.com/sasha-s/go-deadlock")
+ (synopsis "Deadlock detection in go")
+ (description
+ "This package provides tools for detecting deadlocks at run-time in Go.")
+ (license license:asl2.0)))
+
(define-public go-github-com-stretchr-testify
(package
(name "go-github-com-stretchr-testify")
- (version "1.7.0")
+ (version "1.9.0")
(source
(origin
(method git-fetch)
@@ -714,7 +915,7 @@ original value once the test has been run.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10"))))
+ "12cnhk96h8b3ddlb7jfvwwavzc0j1c2iva92pszl9rv6r571ckzg"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/stretchr/testify"))
@@ -749,25 +950,34 @@ Features include:
(propagated-inputs
(list go-gopkg-in-yaml-v3)))))
-(define-public go-github-com-stretchr-testify-next
+(define-public go-github-com-stvp-go-udp-testing
(package
- (inherit go-github-com-stretchr-testify)
- (name "go-github-com-stretchr-testify")
- (version "1.9.0")
+ (name "go-github-com-stvp-go-udp-testing")
+ (version "0.0.0-20201019212854-469649b16807")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stretchr/testify")
- (commit (string-append "v" version))))
+ (url "https://github.com/stvp/go-udp-testing")
+ (commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
- (base32 "12cnhk96h8b3ddlb7jfvwwavzc0j1c2iva92pszl9rv6r571ckzg"))))))
+ (base32 "03dzhwnvbshiivbcawaxsl963d8hh18yf3ydvzvhyjgz60g8lxil"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/stvp/go-udp-testing"))
+ (home-page "https://github.com/stvp/go-udp-testing")
+ (synopsis "UDP test helpers for Golang")
+ (description
+ "This package implements UDP test helpers. It lets assert that certain
+strings must or must not be sent to a given local UDP listener.")
+ (license license:expat)))
(define-public go-github-com-tdewolff-test
(package
(name "go-github-com-tdewolff-test")
- (version "1.0.9")
+ (version "1.0.10")
(source
(origin
(method git-fetch)
@@ -776,11 +986,11 @@ Features include:
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff"))))
+ (base32 "1ihlcnygwdgxq068b29d3n9n1gdbb2j03sc0al1qk5i5dkvgziyx"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/tdewolff/test"))
+ (list
+ #:import-path "github.com/tdewolff/test"))
(home-page "https://github.com/tdewolff/test")
(synopsis "Go test helper functions")
(description
@@ -788,6 +998,33 @@ Features include:
such as readers and writers that fail after N consecutive reads/writes.")
(license license:expat)))
+(define-public go-github-com-tj-assert
+ (package
+ (name "go-github-com-tj-assert")
+ (version "0.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tj/assert")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1j5swk3fjq1h5fpqkipddz2ccnbidr7qrpm5dpdaflg9q5jnc673"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tj/assert"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/tj/assert")
+ (synopsis "Golang @code{testify/assert} but as @code{testify/require}")
+ (description
+ "Package assert implements the same assertions as the
+@url{https://github.com/stretchr/testify, assert} package but stops test
+execution when a test fails.")
+ (license license:expat)))
+
(define-public go-github.com-smartystreets-assertions
(package
(name "go-github.com-smartystreets-assertions")
@@ -837,7 +1074,7 @@ functions for writing tests in Go.")
(arguments
'(#:import-path "github.com/smartystreets/goconvey"))
(propagated-inputs
- (list go-github.com-jtolds-gls go-github.com-smartystreets-assertions))
+ (list go-github-com-jtolds-gls go-github.com-smartystreets-assertions))
(home-page "https://github.com/smartystreets/goconvey")
(synopsis "Go testing tool with both a web and terminal user interface")
(description "GoConvey is a testing tool for Go. It integrates with go
@@ -874,33 +1111,66 @@ makes extraction of setup/teardown behavior (as well as invoking the system
under test) much simpler.")
(license license:expat)))
+(define-public go-go-etcd-io-gofail
+ (package
+ (name "go-go-etcd-io-gofail")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/etcd-io/gofail")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wxjaq1v5w0wjyv84af5cazrmv369i1416ar0dx8r9ag1szcfvpc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "go.etcd.io/gofail"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))
+ (native-inputs (list go-github-com-stretchr-testify))
+ (home-page "https://pkg.go.dev/go.etcd.io/gofail")
+ (synopsis "Failpoints for go")
+ (description
+ "This package provides an implementation of
+@url{http://www.freebsd.org/cgi/man.cgi?query=fail,failpoints} for Golang.")
+ (license license:asl2.0)))
+
(define-public go-golang-org-sql-mock
- (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b")
- (version "1.3.3")
- (revision "1"))
- (package
- (name "go-golang-org-sql-mock")
- (version (git-version version revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/DATA-DOG/go-sqlmock")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs"))
- (modules '((guix build utils)))
- (snippet '(delete-file-recursively "examples"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/DATA-DOG/go-sqlmock"))
- (synopsis "Mock library implementing @code{sql/driver}")
- (description "This library simulates SQL-driver behavior in tests
-without requiring a real database connection.")
- (home-page "https://github.com/DATA-DOG/go-sqlmock")
- (license license:expat))))
+ (package
+ (name "go-golang-org-sql-mock")
+ (version "1.5.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DATA-DOG/go-sqlmock")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vpvdx9hwmx9gm27aq5r5219xpaxz0gy4q1iqskk4saz05bspn0f"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/DATA-DOG/go-sqlmock"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))
+ (home-page "https://github.com/DATA-DOG/go-sqlmock")
+ (synopsis "Mock library implementing @code{sql/driver}")
+ (description
+ "This library simulates SQL-driver behavior in tests without requiring a
+real database connection.")
+ (license license:expat)))
(define-public go-golang-org-x-lint
(let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
@@ -1003,10 +1273,63 @@ custom assertions to be used alongside native Go testing.")
(arguments
(list #:import-path "github.com/go-playground/assert/v2"))))
+(define-public go-github-com-warpfork-go-testmark
+ (package
+ (name "go-github-com-warpfork-go-testmark")
+ (version "0.12.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/warpfork/go-testmark")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06v2x3c5qgbj585a2abksr3hgvgdx61j153rjarqi9cvvzwh1xpr"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/warpfork/go-testmark"))
+ (home-page "https://github.com/warpfork/go-testmark")
+ (synopsis "Parser for @code{testmark} format")
+ (description
+ "@code{go-testmark} is a library to parse, patch data and test fixtures from
+Markdown files, using the
+@url{https://github.com/warpfork/go-testmark?tab=readme-ov-file#what-is-the-testmark-format,
+testmark} format, which itself is a subset of Markdown format.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public go-github-com-warpfork-go-wish
+ (package
+ (name "go-github-com-warpfork-go-wish")
+ (version "0.0.0-20220906213052-39a1cc7a02d0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/warpfork/go-wish")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rqbxmqwzy1q2zwy3mszp0li0pg8zzh3j9l8wlzr6p1pq2idallq"))
+ (patches (search-patches
+ "go-github-com-warpfork-go-wish-fix-tests.patch"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/warpfork/go-wish"))
+ (home-page "https://github.com/warpfork/go-wish")
+ (synopsis "Test assertions for Golang")
+ (description
+ "@code{wish} is a test assertion library for Golang, designed to
+gracefully enhance standard library testing package and behaviors of the
+@command{go test} command.")
+ (license license:expat)))
+
(define-public go-go-uber-org-goleak
(package
(name "go-go-uber-org-goleak")
- (version "1.2.0")
+ (version "1.3.0")
(source
(origin
(method git-fetch)
@@ -1015,14 +1338,13 @@ custom assertions to be used alongside native Go testing.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "1lpqw7ygffak8qki9i4vw8b99l25l8jrw8iwcplqsclk6fzkl24p"))))
+ (base32 "14rvkxh3znp9jzbdjqdkrly3zfg3rmhgg5845biqqrq17w8jvv5s"))))
(build-system go-build-system)
(arguments
(list
#:import-path "go.uber.org/goleak"))
(native-inputs
- (list go-github-com-stretchr-testify-next))
+ (list go-github-com-stretchr-testify))
(home-page "https://pkg.go.dev/go.uber.org/goleak")
(synopsis "Goroutine leak detector")
(description
@@ -1030,10 +1352,42 @@ custom assertions to be used alongside native Go testing.")
the end of a test.")
(license license:expat)))
+(define-public go-go-uber-org-mock
+ (package
+ (name "go-go-uber-org-mock")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uber-go/mock")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mz1cy02m70mdh7hyaqks8bkh9iyv4jgj6h4psww52nr3b9pnyyy"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: The project contains subdirectory which complicate it's testing
+ ;; and it does not produce any binary.
+ #:tests? #f
+ #:import-path "go.uber.org/mock"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build))))
+ (propagated-inputs
+ (list go-golang-org-x-mod go-golang-org-x-tools))
+ (home-page "https://pkg.go.dev/go.uber.org/mock")
+ (synopsis "Mocking framework for the Golang")
+ (description
+ "This package provides a mocking framework which integrates well with
+built-in @code{testing} package, but can be used in other contexts too.")
+ (license license:asl2.0)))
+
(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)
@@ -1043,17 +1397,23 @@ the end of a test.")
(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/")
@@ -1079,16 +1439,23 @@ advanced Go linter.")
(build-system go-build-system)
(arguments
(list
- #:go go-1.18
- #:import-path "pgregory.net/rapid"))
+ #:import-path "pgregory.net/rapid"
+ #: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)
+ ;; Remove test file failing on go-1.21, see
+ ;; <https://github.com/flyingmutant/rapid/issues/68>.
+ (delete-file "strings_example_test.go")))))))
(home-page "https://pgregory.net/rapid/")
(synopsis "Go property-based testing library")
(description
"@code{Rapid} is a Go library for property-based testing.
-Rapid checks that properties you define hold for a large number of automatically
-generated test cases. If a failure is found, rapid automatically minimizes the
-failing test case before presenting it.
+Rapid checks that properties you define hold for a large number of
+automatically generated test cases. If a failure is found, rapid
+automatically minimizes the failing test case before presenting it.
Features:
@itemize
@@ -1106,13 +1473,26 @@ thoroughly
;;; Executables:
;;;
+(define-public go-ginkgo
+ (package
+ (inherit go-github-com-onsi-ginkgo-v2)
+ (name "ginkgo")
+ (arguments
+ (list
+ #:import-path "github.com/onsi/ginkgo/ginkgo"
+ #:unpack-path "github.com/onsi/ginkgo"
+ #:install-source? #f))
+ (description
+ (string-append (package-description go-github-com-onsi-ginkgo-v2)
+ " This package provides an command line interface (CLI)
+tool."))))
+
(define-public go-keyify
(package
(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")
@@ -1126,7 +1506,6 @@ thoroughly
(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)
@@ -1138,8 +1517,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")
@@ -1153,8 +1531,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")
@@ -1168,8 +1545,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")
@@ -1182,8 +1558,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 f40664d8f7..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"))
@@ -63,6 +63,56 @@ the @code{c2go} tool at
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
+(define-public go-github-com-dsnet-compress
+ (package
+ (name "go-github-com-dsnet-compress")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dsnet/compress")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/dsnet/compress"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Testdata directories contains some compressed files requiring
+ ;; for running tests but not required on run time.
+ (add-after 'check 'remove-testdata
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/bzip2/testdata"))
+ (delete-file-recursively
+ (string-append "src/" import-path "/brotli/testdata"))
+ (delete-file-recursively
+ (string-append "src/" import-path "/testdata")))))))
+ (propagated-inputs
+ (list go-github-com-dsnet-golib
+ go-github-com-klauspost-compress
+ go-github-com-ulikunitz-xz))
+ (home-page "https://github.com/dsnet/compress")
+ (synopsis "Collection of compression libraries for Golang")
+ (description
+ "Package compress is a collection of compression libraries implementing
+Golang moduels:
+@table @code
+@item brotli
+Implements the Brotli format, described in RFC 7932.
+@item bzip2
+Implements the BZip2 compressed data format.
+@item flate
+Implements the DEFLATE format, described in RFC 1951.
+@item xflate
+Implements the XFLATE format, an random-access extension to DEFLATE.
+@end table")
+ (license license:bsd-3)))
+
(define-public go-github-com-golang-snappy
(package
(name "go-github-com-golang-snappy")
@@ -168,10 +218,90 @@ 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-nwaples-rardecode-v2
+(define-public go-github-com-mholt-archiver-v3
(package
- (name "go-github-com-nwaples-rardecode-v2")
- (version "2.0.0-beta.2")
+ (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")
+ (version "1.1.3")
(source
(origin
(method git-fetch)
@@ -180,7 +310,7 @@ time, as otherwise the internal gzip library will likely be faster.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1344mxfdgs5fps6mqxk6352arrfszi33kmq394rgmqpf4394f1y7"))))
+ (base32 "0s00b8a9gppka3yxkxh7z5wy0ahygl8wbb0fbyx2r0rj879a1c2z"))))
(build-system go-build-system)
(arguments
(list
@@ -191,6 +321,24 @@ time, as otherwise the internal gzip library will likely be faster.")
"This package provides a library for reading RAR archives with Golang.")
(license license:bsd-2)))
+(define-public go-github-com-nwaples-rardecode-v2
+ (package
+ (inherit go-github-com-nwaples-rardecode)
+ (name "go-github-com-nwaples-rardecode-v2")
+ (version "2.0.0-beta.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nwaples/rardecode")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1344mxfdgs5fps6mqxk6352arrfszi33kmq394rgmqpf4394f1y7"))))
+ (arguments
+ (list
+ #:import-path "github.com/nwaples/rardecode/v2"))))
+
(define-public go-github-com-pierrec-lz4
(package
(name "go-github-com-pierrec-lz4")
@@ -263,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 273879b47a..a9c8b68d4e 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,25 +1,28 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017-2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
-;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 BonfaceKilz <me@bonfacemunyoki.com>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
-;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,12 +47,14 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
+ #:use-module (gnu packages gnupg)
#: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 password-utils)
#:use-module (gnu packages specifications))
;;; Commentary:
@@ -62,10 +67,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)
@@ -74,10 +132,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
@@ -91,24 +180,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")
@@ -132,9 +203,9 @@ Go, exposing the necessary APIs to build a wide array of higher-level
primitives.")
(license license:bsd-3)))
-(define-public go-github-com-99designs-go-keyring
+(define-public go-github-com-99designs-keyring
(package
- (name "go-github-com-99designs-go-keyring")
+ (name "go-github-com-99designs-keyring")
(version "1.2.2")
(source
(origin
@@ -146,6 +217,30 @@ primitives.")
(sha256
(base32 "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
(build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/99designs/keyring"
+ #: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$")
+ ;; Disable test requring running DBus.
+ (("TestLibSecretKeysWhenEmpty")
+ "OffTestLibSecretKeysWhenEmpty")
+ (("TestLibSecretKeysWhenNotEmpty")
+ "OffTestLibSecretKeysWhenNotEmpty")
+ (("TestLibSecretGetWhenEmpty")
+ "OffTestLibSecretGetWhenEmpty")
+ (("TestLibSecretGetWhenNotEmpty")
+ "OffTestLibSecretGetWhenNotEmpty")
+ (("TestLibSecretRemoveWhenEmpty")
+ "OffTestLibSecretRemoveWhenEmpty")
+ (("TestLibSecretRemoveWhenNotEmpty")
+ "OffTestLibSecretRemoveWhenNotEmpty"))))))))
+ (native-inputs
+ (list gnupg go-github-com-stretchr-testify password-store))
(propagated-inputs
(list go-github-com-dvsekhvalnov-jose2go
go-github-com-godbus-dbus
@@ -154,9 +249,7 @@ primitives.")
go-github-com-mtibben-percent
go-golang-org-x-sys
go-golang-org-x-term))
- (arguments
- '(#:import-path "github.com/99designs/keyring"
- #:tests? #f)) ;XXX: tests require Vagrant
+ (home-page "https://github.com/99designs/keyring")
(synopsis "Go library providing a uniform interface for various secure
credential stores")
(description
@@ -167,7 +260,6 @@ workstations.
Currently Keyring supports the following backends: macOS/OSX Keychain, Windows
pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.")
- (home-page "https://github.com/99designs/keyring")
(license license:expat)))
(define-public go-github-com-aead-chacha20
@@ -290,6 +382,34 @@ the Ristretto prime-order group built from Edwards25519.")
(define-public go-github-com-cespare-xxhash
(package
(name "go-github-com-cespare-xxhash")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cespare/xxhash")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/cespare/xxhash"))
+ (propagated-inputs
+ (list go-github-com-spaolacci-murmur3
+ go-github-com-oneofone-xxhash))
+ (home-page "https://github.com/cespare/xxhash")
+ (synopsis "Go implementation of xxHash")
+ (description
+ "Package xxhash implements the 64-bit variant of @code{xxHash} (XXH64) as
+described at @url{https://xxhash.com/}.")
+ (license license:expat)))
+
+(define-public go-github-com-cespare-xxhash-v2
+ (package
+ (inherit go-github-com-cespare-xxhash)
+ (name "go-github-com-cespare-xxhash-v2")
(version "2.1.2")
(source
(origin
@@ -302,10 +422,9 @@ the Ristretto prime-order group built from Edwards25519.")
(base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "xxhashbench"))))
- (build-system go-build-system)
(arguments
(list
- #:import-path "github.com/cespare/xxhash"
+ #:import-path "github.com/cespare/xxhash/v2"
#:phases
#~(modify-phases %standard-phases
(replace 'check
@@ -314,11 +433,43 @@ the Ristretto prime-order group built from Edwards25519.")
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
- (home-page "https://github.com/cespare/xxhash/")
- (synopsis "Go implementation of xxHash")
- (description "This package provides of Go implementation of the 64-bit
-xxHash algorithm (XXH64).")
- (license license:expat)))
+ (propagated-inputs '())))
+
+(define-public go-github-com-chmduquesne-rollinghash
+ (let ((commit "9a5199be7309f50c496efc87d29bd08788605ae7")
+ (revision "1"))
+ (package
+ (name "go-github-com-chmduquesne-rollinghash")
+ (version (git-version "4.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chmduquesne/rollinghash")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1gkdgsgrmwagwyp4lmd4k11mbwi8f1yw9c9rhnkmav87gy1k84jr"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/chmduquesne/rollinghash/"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Run all tests, 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-code-cloudfoundry-org-bytefmt))
+ (home-page "https://github.com/chmduquesne/rollinghash")
+ (synopsis "Rolling hashes in Go")
+ (description
+ "This package provides a Go implementation of several rolling hashes.")
+ (license license:expat))))
(define-public go-github-com-cloudflare-circl
(package
@@ -374,10 +525,36 @@ and encrypting JSON Web Tokens (JWT). It relies only on the standard
library.")
(license license:expat)))
+(define-public go-github-com-emersion-go-bcrypt
+ (package
+ (name "go-github-com-emersion-go-bcrypt")
+ (version "0.0.0-20170822072041-6e724a1baa63")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-bcrypt")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-bcrypt"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/emersion/go-bcrypt")
+ (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt")
+ (description
+ "This package provides an extract @code{bcrypt} from
+@code{golang.org/x/crypto/bcrypt}.")
+ (license license:bsd-3)))
+
(define-public go-github-com-emersion-go-pgpmail
(package
(name "go-github-com-emersion-go-pgpmail")
- (version "0.2.0")
+ (version "0.2.1")
(source
(origin
(method git-fetch)
@@ -386,17 +563,14 @@ library.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm"))))
+ (base32 "1fiqpdwxnfba2cgij7j83dfqc0zz4mq95x15wicgm5f3vjr1xg5h"))))
(build-system go-build-system)
(arguments
- (list ;; tests don't support our version of protonmail/go-crypto; see
- ;; <https://github.com/emersion/go-pgpmail/issues/12>
- #:tests? #f
+ (list
#:import-path "github.com/emersion/go-pgpmail"))
(propagated-inputs
(list go-github-com-emersion-go-message
go-github-com-protonmail-go-crypto
- go-golang-org-x-crypto
go-golang-org-x-text))
(home-page "https://github.com/emersion/go-pgpmail")
(synopsis "PGP mail encryption for Go")
@@ -453,10 +627,34 @@ providing bidirectional mapping values to their names, plus enum convenience
for values.")
(license license:bsd-3)))
-(define-public go-github-com-golang-jwt-jwt-v4
+(define-public go-github-com-go-asn1-ber-asn1-ber
(package
- (name "go-github-com-golang-jwt-jwt-v4")
- (version "4.5.0")
+ (name "go-github-com-go-asn1-ber-asn1-ber")
+ (version "1.5.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-asn1-ber/asn1-ber")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xa1s1q2is9fr02pvrc9sq8zfq9ba6gk64yg1ncglppp30f50q52"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-asn1-ber/asn1-ber"))
+ (home-page "https://github.com/go-asn1-ber/asn1-ber")
+ (synopsis "ASN.1 BER encoding and decoding in Go")
+ (description
+ "This package provides @acronym{Abstract Syntax Notation One, ASN.1} BER
+encoding and decoding in the Go language.")
+ (license license:expat)))
+
+(define-public go-github-com-golang-jwt-jwt
+ (package
+ (name "go-github-com-golang-jwt-jwt")
+ (version "3.2.2")
(source
(origin
(method git-fetch)
@@ -465,11 +663,11 @@ for values.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1m7c9lwlmd0lnn0hyby1rb3f4nwn4xcjgca218frj0hi0krqn8kp"))))
+ (base32 "0hq8wz11g6kddx9ab0icl5h3k4lrivk1ixappnr5db2ng2wjks9c"))))
(build-system go-build-system)
(arguments
(list
- #:import-path "github.com/golang-jwt/jwt/v4"))
+ #:import-path "github.com/golang-jwt/jwt"))
(home-page "https://github.com/golang-jwt/jwt")
(synopsis "Go implementation of JSON Web Tokens")
(description
@@ -480,6 +678,24 @@ JSON Web Tokens. The currently supported signing algorithms are HMAC SHA,
RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
(license license:expat)))
+(define-public go-github-com-golang-jwt-jwt-v4
+ (package
+ (inherit go-github-com-golang-jwt-jwt)
+ (name "go-github-com-golang-jwt-jwt-v4")
+ (version "4.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang-jwt/jwt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m7c9lwlmd0lnn0hyby1rb3f4nwn4xcjgca218frj0hi0krqn8kp"))))
+ (arguments
+ (list
+ #:import-path "github.com/golang-jwt/jwt/v4"))))
+
(define-public go-github-com-golang-jwt-jwt-v5
(package
(inherit go-github-com-golang-jwt-jwt-v4)
@@ -496,9 +712,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..
@@ -852,8 +1109,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
@@ -883,6 +1139,37 @@ Architecture Processors\" by J. Guilford et al.")
(description "Multihash implementation in Go.")
(license license:expat)))
+(define-public go-github-com-oneofone-xxhash
+ (package
+ (name "go-github-com-oneofone-xxhash")
+ (version "1.2.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OneOfOne/xxhash")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/OneOfOne/xxhash"
+ #: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")))))))
+ (home-page "https://github.com/OneOfOne/xxhash")
+ (synopsis "Go implementation of xxHash")
+ (description
+ "This is a native Go implementation of the
+@url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast
+non-cryptographic hash algorithm, working at speeds close to RAM limits.")
+ (license license:asl2.0)))
+
(define-public go-github-com-operatorfoundation-ed25519
(let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4")
(revision "0"))
@@ -916,41 +1203,72 @@ Architecture Processors\" by J. Guilford et al.")
algorithm.")
(license license:bsd-3))))
+(define-public go-github-com-pion-randutil
+ (package
+ (name "go-github-com-pion-randutil")
+ (version "v0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/randutil")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "098isjyvyb8jhrrr57xi45g5m35vb1l92dm5wcy7g2q9x55lvxg5"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/randutil"))
+ (home-page "https://github.com/pion/randutil")
+ (synopsis "Helper library for cryptographic and mathmatical randoms")
+ (description
+ "This package provides primitives for generating random values.")
+ (license license:expat)))
+
(define-public go-github-com-protonmail-go-crypto
(package
(name "go-github-com-protonmail-go-crypto")
- (version "0.0.0-20220623141421-5afb4c282135")
+ (version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ProtonMail/go-crypto")
- (commit (go-version->git-ref version))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy"))))
+ (base32 "11q94983r6zjrdvflpikms4773a9s5vb9gg4qw1rj5800yhhah0n"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/ProtonMail/go-crypto"
- #:tests? #f ; Source-only package.
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package.
- (delete 'build))))
+ (list
+ #:import-path "github.com/ProtonMail/go-crypto"
+ #: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))
+ (list go-github-com-cloudflare-circl
+ go-golang-org-x-crypto))
(home-page "https://github.com/ProtonMail/go-crypto")
(synopsis "Fork of x/crypto with up-to-date OpenPGP implementation")
- (description "This package provides cryptography for Go. This version of
-the package is a fork that adds a more up-to-date OpenPGP implementation. It
-is completely backwards compatible with @code{golang.org/x/crypto}, the
-official package.")
+ (description
+ "This package provides cryptography for Go. This version of the package
+is a fork that adds a more up-to-date OpenPGP implementation. It is
+completely backwards compatible with @code{golang.org/x/crypto}, the official
+package.")
(license license:bsd-3)))
(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)
@@ -959,12 +1277,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))
@@ -990,7 +1309,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
@@ -1175,6 +1493,34 @@ package is intended for interoperability with the standard library and the
possible.")
(license license:bsd-3))))
+(define-public go-github-com-youmark-pkcs8
+ (package
+ (name "go-github-com-youmark-pkcs8")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/youmark/pkcs8")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ckdrwa5rmp2c85936qd9d0gzrnrvqfg0297ansz5frdhg6fc6nq"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/youmark/pkcs8"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/youmark/pkcs8")
+ (synopsis "Functions to parse and convert private keys in PKCS#8 format")
+ (description
+ "@code{pkcs8} implements functions to process private keys in PKCS#8
+format, as defined in RFC 5208 and RFC 5958. It can handle both unencrypted
+PKCS#8 PrivateKeyInfo format and EncryptedPrivateKeyInfo format with
+PKCS#5 (v2.0) algorithms.")
+ (license license:expat)))
+
(define-public go-lukechampine-com-blake3
(package
(name "go-lukechampine-com-blake3")
@@ -1223,6 +1569,57 @@ 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))))
+
+(define-public go-keyring
+ (package
+ (inherit go-github-com-99designs-keyring)
+ (name "go-keyring")
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/99designs/keyring/cmd/keyring"
+ #:unpack-path "github.com/99designs/keyring"))
+ (description
+ (string-append (package-description go-github-com-99designs-keyring)
+ " This package provides an command line interface (CLI)
+tool."))))
;;;
;;; 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
new file mode 100644
index 0000000000..cf783226ea
--- /dev/null
+++ b/gnu/packages/golang-maths.scm
@@ -0,0 +1,126 @@
+;;; 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.
+;;;
+;;; 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 packages golang-maths)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; Libraries:
+;;;
+
+(define-public go-github-com-montanaflynn-stats
+ (package
+ (name "go-github-com-montanaflynn-stats")
+ (version "0.7.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/montanaflynn/stats")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y38cvp7r6fb6291k82j781dbykx00mxw8ca0v9d0fijzc1x81fi"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/montanaflynn/stats"))
+ (home-page "https://github.com/montanaflynn/stats")
+ (synopsis "Statistics library for Golang")
+ (description
+ "This package provides a statistical library for Golang.")
+ (license license:expat)))
+
+(define-public go-github-com-shopspring-decimal
+ (package
+ (name "go-github-com-shopspring-decimal")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/shopspring/decimal")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p1iz0ybsjvc8k3w6lf92drs51fgrcbz0ib1p4ihp3gmdq5rnzjk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/shopspring/decimal"))
+ (home-page "https://github.com/shopspring/decimal")
+ (synopsis "Arbitrary-precision fixed-point decimal numbers in Golang")
+ (description
+ "Package decimal implements an arbitrary precision fixed-point decimal.
+Features:
+@itemize
+@item the zero-value is 0, and is safe to use without initialization
+@item addition, subtraction, multiplication with no loss of precision
+@item division with specified precision
+@item database/sql serialization/deserialization
+@item JSON and XML serialization/deserialization
+@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:
+;;;
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetic order.
+;;;
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c5c3efb7c5..0caa673f6d 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3,29 +3,36 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
-;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
-;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
+;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Filip Lajszczak <filip@lajszczak.dev>
;;; Copyright © 2023 Fries <fries1234@protonmail.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Dominic Martinez <dom@dominicm.dev>
+;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
@@ -63,8 +70,10 @@
;;; Commentary:
;;;
-;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON,
-;;; Web-framework, REST-API or similar functionality. They may provide
+;;; Golang modules (libraries) for Web related projects: HTML, CSS, SCSS,
+;;; JavaScript, JSON, Web-framework, REST-API or similar functionality; for
+;;; Network related projects: OSI layers implementation algorithms, MIME,
+;;; Email protocols implementations, and similar. They may provide
;;; executables and libraries, for which there are marked sections.
;;;
@@ -102,6 +111,66 @@
API service accounts for Go.")
(license license:asl2.0)))
+(define-public go-git-sr-ht-emersion-gqlclient
+ (package
+ (name "go-git-sr-ht-emersion-gqlclient")
+ (version "0.0.0-20230820050442-8873fe0204b9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~emersion/gqlclient")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x64kcryawdr0daq1w6fada60zqrddw75yi397835b9ij7wb5gmh"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "git.sr.ht/~emersion/gqlclient"))
+ (home-page "https://git.sr.ht/~emersion/gqlclient")
+ (synopsis "GraphQL client and code generator")
+ (description
+ "This package provides a GraphQL client and code generator for Go.")
+ (license license:expat)))
+
+(define-public go-git-sr-ht-rockorager-go-jmap
+ (package
+ (name "go-git-sr-ht-rockorager-go-jmap")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~rockorager/go-jmap")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1r8bmdlmvpk08i7xrqwgv0aaz05564wgcyji73nszdh2s32m4kzl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "git.sr.ht/~rockorager/go-jmap"
+ #: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?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "go" "test" "-v" "./..."))))))))
+ (native-inputs
+ (list
+ go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-oauth2))
+ (home-page "https://git.sr.ht/~rockorager/go-jmap")
+ (synopsis "JSON meta application protocol in Golang")
+ (description
+ "Package jmap implements JMAP Core protocol as defined in
+@@url{https://rfc-editor.org/rfc/rfc8620.html,RFC 8620} published on July
+2019.")
+ (license license:expat)))
+
(define-public go-github-com-alexliesenfeld-health
(package
(name "go-github-com-alexliesenfeld-health")
@@ -141,6 +210,34 @@ required dependencies. The HTTP response contains the aggregated health
result and details about the health status of each component.")
(license license:expat)))
+(define-public go-github-com-anaskhan96-soup
+ (package
+ (name "go-github-com-anaskhan96-soup")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/anaskhan96/soup")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s19119sy4zqf05sgpdymcbdaz5bg86n7xwgd2m1vvxjmp485k5p"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/anaskhan96/soup"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/anaskhan96/soup")
+ (synopsis "Web Scraper in Go, similar to BeautifulSoup")
+ (description
+ "Small web scraper package for Go, with its interface highly similar to
+that of BeautifulSoup.")
+ (license license:expat)))
+
(define-public go-github-com-andybalholm-cascadia
(package
(name "go-github-com-andybalholm-cascadia")
@@ -165,40 +262,82 @@ result and details about the health status of each component.")
the parse trees produced by the html package.")
(license license:bsd-2)))
-(define-public go-github-com-aws-sdk
+(define-public go-github-com-audriusbutkevicius-pfilter
(package
- (name "go-github-com-aws-sdk")
- (version "1.35.2")
+ (name "go-github-com-audriusbutkevicius-pfilter")
+ (version "0.0.11")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
+ (url "https://github.com/AudriusButkevicius/pfilter")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
+ (base32 "03kwi1hnhcz9qdblmhpaqg2063k2ch29hc5dr8cl2z7q5rp81m9i"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/aws/aws-sdk-go/aws"
- #:unpack-path "github.com/aws/aws-sdk-go"))
+ (list
+ #:import-path "github.com/AudriusButkevicius/pfilter"
+ #: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
+ ;; Remove tests requiring setting up local
+ ;; connection.
+ (list "quic_test.go"))))))))
(propagated-inputs
- (list go-github-com-go-sql-driver-mysql
- go-github-com-jmespath-go-jmespath
- go-github-com-pkg-errors
+ (list go-github-com-pkg-errors
+ go-github-com-quic-go-quic-go
go-golang-org-x-net))
- (home-page "https://github.com/aws/aws-sdk-go")
- (synopsis "Library to access Amazon Web Services (AWS)")
+ (home-page "https://github.com/AudriusButkevicius/pfilter")
+ (synopsis "Filter packets into multiple virtual connections")
(description
- "This is the official AWS SDK for the Go programming language.")
+ "Pfilter is a Go package for filtering packets into multiple virtual
+connections from a single physical connection.")
+ (license license:expat)))
+
+(define-public go-github-com-aws-aws-lambda-go
+ (package
+ (name "go-github-com-aws-aws-lambda-go")
+ (version "1.47.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-lambda-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xki0n3va9nr6dmlgrb8zarkccx5jba6ig6g8zxcznw3rlllf1zv"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/aws/aws-lambda-go"
+ #: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" "./..."))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/aws/aws-lambda-go")
+ (synopsis "AWS Lambda for Go")
+ (description
+ "Libraries, samples, and tools to help Go developers develop AWS Lambda
+functions.")
(license license:asl2.0)))
-;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not
-;; in use anywhere. Keep it here for the farther review.
(define-public go-github-com-aws-aws-sdk-go
(package
(name "go-github-com-aws-aws-sdk-go")
- (version "1.36.18")
+ (version "1.55.2")
(source
(origin
(method git-fetch)
@@ -207,17 +346,32 @@ the parse trees produced by the html package.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
+ (base32 "0wsl1vcig3j9z6v2hppfr1bvrvbisck026fwq2a7yzmx36pwnj6a"))))
(build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/aws/aws-sdk-go"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ (("TestProcessProviderTimeout")
+ "OffTestProcessProviderTimeout")))))
+ ;; 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-github-com-jmespath-go-jmespath))
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go"
- #:phases %standard-phases))
+ (home-page "https://github.com/aws/aws-sdk-go")
(synopsis "The official AWS SDK for the Go programming language")
(description
"The official AWS SDK for the Go programming language.")
- (home-page "https://github.com/aws/aws-sdk-go")
(license license:asl2.0)))
(define-public go-github-com-aws-aws-sdk-go-v2
@@ -238,7 +392,7 @@ the parse trees produced by the html package.")
'(#:import-path "github.com/aws/aws-sdk-go-v2"))
(propagated-inputs
(list go-github-com-aws-smithy-go
- go-github-com-google-go-cmp-cmp
+ go-github-com-google-go-cmp
go-github-com-jmespath-go-jmespath))
(home-page "https://github.com/aws/aws-sdk-go-v2")
(synopsis "AWS SDK for Go v2")
@@ -255,9 +409,37 @@ the parse trees produced by the html package.")
'(#:import-path "github.com/aws/aws-sdk-go-v2/config"
#:unpack-path "github.com/aws/aws-sdk-go-v2"))
(propagated-inputs
- (list go-github-com-google-go-cmp-cmp
+ (list go-github-com-google-go-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-credentials
+ (package
+ (name "go-github-com-aws-aws-sdk-go-v2-credentials")
+ (version "1.17.27")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go-v2")
+ (commit (string-append "credentials/v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jdj7wim98g80hjbw3av7ffrr3dqxzbygprmhjs0cxc16cw62wj7"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/aws/aws-sdk-go-v2/credentials"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp
+ go-github-com-aws-smithy-go))
+ (home-page "https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/credentials")
+ (synopsis "AWS SDK for Go v2 - credentials module")
+ (description
+ "Package credentials provides types for retrieving credentials from
+credentials sources.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
@@ -340,7 +522,7 @@ the parse trees produced by the html package.")
(arguments
'(#:import-path "github.com/aws/smithy-go"))
(propagated-inputs
- (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+ (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp))
(home-page "https://github.com/aws/smithy-go")
(synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators
for Go")
@@ -374,6 +556,34 @@ for Go")
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-azure-go-ntlmssp
+ (package
+ (name "go-github-com-azure-go-ntlmssp")
+ (version "0.0.0-20221128193559-754e69321358")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Azure/go-ntlmssp")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dg20fwylf5lpsc5fgnnzw7jxz0885bg97lla1b5wrlhjas6lidn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; See <https://github.com/Azure/go-ntlmssp/issues/40>.
+ #:tests? #f
+ #:import-path "github.com/Azure/go-ntlmssp"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/Azure/go-ntlmssp")
+ (synopsis "NTLM negotiation in Go")
+ (description
+ "This package provides @acronym{NT (New Technology) LAN
+Manager,NTLM}/Negotiate authentication over HTTP.")
+ (license license:expat)))
+
(define-public go-github-com-bep-golibsass
(package
(name "go-github-com-bep-golibsass")
@@ -431,6 +641,59 @@ for Go")
"This package provides SCSS compiler support for Go applications.")
(license license:expat)))
+(define-public go-github-com-ccding-go-stun
+ (package
+ (name "go-github-com-ccding-go-stun")
+ (version "0.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ccding/go-stun")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wjhckyg42kp04njhj7gni84cyk0s7m17n13kqf6r7mjzx8a83pw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ccding/go-stun"))
+ (home-page "https://github.com/ccding/go-stun")
+ (synopsis "STUN client implementation")
+ (description
+ "Go-stun is a go implementation of the STUN client (RFC 3489
+and RFC 5389).")
+ (license license:asl2.0)))
+
+(define-public go-github-com-cenkalti-backoff-v4
+ (package
+ (name "go-github-com-cenkalti-backoff-v4")
+ (version "4.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cenkalti/backoff")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1"))))
+ (build-system go-build-system)
+ (arguments
+ (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
+@url{https://github.com/google/google-http-java-client/blob/da1aa993e90285ec18579f1553339b00e19b3ab5/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java,
+Google's HTTP Client Library for Java}.
+
+@url{http://en.wikipedia.org/wiki/Exponential_backoff, Exponential backoff} is an
+algorithm that uses feedback to multiplicatively decrease the rate of some process,
+in order to gradually find an acceptable rate. The retries exponentially increase
+and stop increasing when a certain threshold is met.")
+ (license license:expat)))
+
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
@@ -459,6 +722,55 @@ for Go")
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-containerd-typeurl
+ (package
+ (name "go-github-com-containerd-typeurl")
+ (version "1.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containerd/typeurl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wvfxlxgkln11d9s6rxay965c715bnpk203klbsq8m8qpjqrz620"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/containerd/typeurl"))
+ (propagated-inputs
+ (list go-github-com-gogo-protobuf
+ go-github-com-pkg-errors))
+ (home-page "https://github.com/containerd/typeurl")
+ (synopsis "Managing marshaled types to @code{protobuf.Any}")
+ (description
+ "This package implements a functionality of managing the registration,
+marshaling, and unmarshaling of encoded types. It helps when types are sent
+over a ttrpc/GRPC API and marshaled as a protobuf
+@url{https://pkg.go.dev/google.golang.org/protobuf@@v1.27.1/types/known/anypb#Any,
+Any}.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-containerd-typeurl-v2
+ (package
+ (inherit go-github-com-containerd-typeurl)
+ (name "go-github-com-containerd-typeurl-v2")
+ (version "2.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containerd/typeurl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1n43s8zqwwrvpzb0pczm73xx4w8yb96ax31cripzxmfhj43z21b5"))))
+ (arguments
+ (list #:import-path "github.com/containerd/typeurl/v2"))
+ (propagated-inputs
+ (list go-github-com-gogo-protobuf
+ go-google-golang-org-protobuf))))
+
(define-public go-github-com-coreos-go-oidc
(package
(name "go-github-com-coreos-go-oidc")
@@ -490,7 +802,7 @@ for Go")
(package
(inherit go-github-com-coreos-go-oidc)
(name "go-github-com-coreos-go-oidc-v3")
- (version "3.6.0")
+ (version "3.11.0")
(source
(origin
(method git-fetch)
@@ -499,15 +811,295 @@ for Go")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
+ (base32 "00nbv15pjfcfxdy0i4k366ricdm2cylhpwak3hmjlgh6lrzxypl9"))))
(arguments
- (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
- #:import-path "github.com/coreos/go-oidc/v3/oidc"
- #:unpack-path "github.com/coreos/go-oidc/v3"))
+ (list
+ #:import-path "github.com/coreos/go-oidc/v3"
+ #: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-go-jose-go-jose-v3
+ (list go-github-com-go-jose-go-jose-v4
+ go-golang-org-x-net
go-golang-org-x-oauth2))))
+(define-public go-github-com-emersion-go-imap
+ (package
+ (name "go-github-com-emersion-go-imap")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-imap")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ak2ysvfcc9w0g1070msis8x9sh6gzvf0nd65ks594siwbmqddw8"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-imap"))
+ (propagated-inputs
+ (list go-golang-org-x-text
+ go-github-com-emersion-go-sasl
+ go-github-com-emersion-go-message))
+ (home-page "https://github.com/emersion/go-imap")
+ (synopsis "IMAP4rev1 library written in Go")
+ (description
+ "This package provides an IMAP4rev1 library written in Go. It can be
+used to build IMAP clients and servers.")
+ (license license:expat)))
+
+;; XXX: This repository has been archived by the owner on Sep 8, 2021. It is
+;; now read-only.
+(define-public go-github-com-emersion-go-imap-idle
+ (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9")
+ (revision "0"))
+ (package
+ (name "go-github-com-emersion-go-imap-idle")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-imap-idle")
+ (commit commit)))
+ (sha256
+ (base32
+ "0blwcadmxgqsdwgr9m4jqfbpfa2viw5ah19xbybpa1z1z4aj5cbc"))
+ (file-name (git-file-name name version))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-imap-idle"))
+ (propagated-inputs
+ (list go-github-com-emersion-go-imap))
+ (home-page "https://github.com/emersion/go-imap-idle")
+ (synopsis "IDLE extension for go-imap")
+ (description "This package provides an IDLE extension for go-imap.")
+ (license license:expat))))
+
+(define-public go-github-com-emersion-go-imap-sortthread
+ (package
+ (name "go-github-com-emersion-go-imap-sortthread")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-imap-sortthread")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1cfbgz1l5angnj52v9pxwggai2shx0h78ffcp7j4r4lr7lzflnwz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-imap-sortthread"))
+ (propagated-inputs
+ (list
+ go-github-com-emersion-go-imap))
+ (home-page "https://github.com/emersion/go-imap-sortthread")
+ (synopsis "Sorting and threading of messages for the imap package")
+ (description
+ "The sortthread package implements message sorting and threading for
+@code{go-github-com-emersion-go-imap}.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-maildir
+ (package
+ (name "go-github-com-emersion-go-maildir")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-maildir")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wa7spn3qa7ipmg29vrimw7phyybyaagdalrjklcazjb6rplvwpl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-maildir"))
+ (home-page "https://github.com/emersion/go-maildir")
+ (synopsis "Maildir interface for Go")
+ (description
+ "This package provides an interface to mailboxes in the Maildir format.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-mbox
+ (package
+ (name "go-github-com-emersion-go-mbox")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-mbox")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vnadh2khx7sxn0irrd8gz8ra02x7ij0q8zglq3rqffqil06nliv"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-mbox"))
+ (home-page "https://github.com/emersion/go-mbox")
+ (synopsis "Go library for handling @code{mbox} files")
+ (description
+ "This package provides a library for parsing and formatting @code{mbox}
+files.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-message
+ (package
+ (name "go-github-com-emersion-go-message")
+ (version "0.18.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-message")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gzcgrs5sava8fpybp5cw6f3zqnbz096wf93hcgkrg94wl1g7kqb"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/emersion/go-message"))
+ (propagated-inputs
+ (list go-golang-org-x-text))
+ (home-page "https://github.com/emersion/go-message")
+ (synopsis "Internet messages and MIME for Go")
+ (description
+ "The message package implements the Internet Message Format and
+Multipurpose Internet Mail Extensions in Go.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-milter
+ (package
+ (name "go-github-com-emersion-go-milter")
+ (version "0.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-milter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11qjwjz6ippsx9da81gylx46p1a96mk39j54ayw925m40skqhh3c"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-milter"))
+ (propagated-inputs
+ (list go-github-com-emersion-go-message))
+ (home-page "https://github.com/emersion/go-milter")
+ (synopsis "Milter mail filters in Go")
+ (description
+ "This package provides an interface for implementing milter mail filters
+for Go.")
+ (license license:bsd-2)))
+
+(define-public go-github-com-emersion-go-msgauth
+ (package
+ (name "go-github-com-emersion-go-msgauth")
+ (version "0.6.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-msgauth")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0az83i6jmk3bjglgdqw5zsvhh8698rav0mcg4dy8kr0cgq0lj5zs"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-msgauth"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; 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" "./..."))))))))
+ (propagated-inputs
+ (list go-golang-org-x-crypto
+ go-github-com-emersion-go-milter
+ go-github-com-emersion-go-message))
+ (home-page "https://github.com/emersion/go-msgauth")
+ (synopsis "Email authentication for Go")
+ (description
+ "This package provides a Go library for authenticating emails.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-sasl
+ (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9")
+ (revision "1"))
+ (package
+ (name "go-github-com-emersion-go-sasl")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-sasl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-sasl"))
+ (home-page "https://github.com/emersion/go-sasl")
+ (synopsis "SASL library written in Go")
+ (description
+ "This package provides a SASL library written in Go.")
+ (license license:expat))))
+
+(define-public go-github-com-emersion-go-smtp
+ (package
+ (name "go-github-com-emersion-go-smtp")
+ (version "0.21.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-smtp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0drvmvrkmhqhnv4m3my1hbkyyva2vi35b36j0pdi57xc9rflziq3"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-smtp"))
+ (propagated-inputs
+ (list go-github-com-emersion-go-sasl))
+ (home-page "https://github.com/emersion/go-smtp")
+ (synopsis "SMTP implementation for Go")
+ (description
+ "This package implements the Simple Mail Transfer Protocol as defined by
+RFC 5321.")
+ (license license:expat)))
+
(define-public go-github-com-emicklei-go-restful
(package
(name "go-github-com-emicklei-go-restful")
@@ -531,10 +1123,38 @@ developers to use @code{http} methods explicitly and in a way that's
consistent with the HTTP protocol definition.")
(license license:expat)))
+(define-public go-github-com-evanphx-json-patch
+ (package
+ (name "go-github-com-evanphx-json-patch")
+ (version "0.5.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/evanphx/json-patch")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00sib9ba8j1h1n3r1cxx48zn8hs6sxwnrh78p6wbs28wcpz8nqxi"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/evanphx/json-patch"))
+ (propagated-inputs
+ (list go-github-com-jessevdk-go-flags go-github-com-pkg-errors))
+ (home-page "https://github.com/evanphx/json-patch")
+ (synopsis "Apply and create JSON (RFC6902 and RFC7386) patches for Golang")
+ (description
+ "@code{jsonpatch} is a library which provides functionality for both
+applying @url{http://tools.ietf.org/html/rfc6902,RFC6902 JSON patches} against
+documents, as well as for calculating & applying
+@url{https://tools.ietf.org/html/rfc7396,RFC7396 JSON merge patches}.")
+ (license license:bsd-3)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
- (version "1.0.1")
+ (version "1.0.4")
(source
(origin
(method git-fetch)
@@ -543,7 +1163,7 @@ consistent with the HTTP protocol definition.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
+ (base32 "1xrvg5ndpz4gv9mf9xl6p6gjmvvv8bbzaspcr070qxx72jhlllkk"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/felixge/httpsnoop"))
@@ -588,6 +1208,35 @@ API and doesn't use reflection. It relies on small interfaces to
decode/encode structures and slices.")
(license license:expat)))
+(define-public go-github-com-gatherstars-com-jwz
+ (package
+ (name "go-github-com-gatherstars-com-jwz")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gatherstars-com/jwz")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1d66axc3504wqpb4axlm8m9jq8rmwndxb4asbqwryymj3yh60cla"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/gatherstars-com/jwz"))
+ (propagated-inputs
+ (list go-github-com-rivo-tview
+ go-github-com-jhillyerd-enmime
+ go-github-com-gdamore-tcell-v2))
+ (home-page "https://github.com/gatherstars-com/jwz")
+ (synopsis "Email threading algorithm in Golang")
+ (description
+ "The jwz package provides an implementation of the email threading
+algorithm originally designed for use in
+@url{https://www.jwz.org/doc/threading.html,Netscape Mail 2.0 and 3.0} for
+Golang.")
+ (license license:asl2.0)))
+
;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is
;; now read-only. The raven-go SDK is no longer maintained and was superseded
;; by the sentry-go
@@ -643,7 +1292,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)
@@ -652,14 +1301,14 @@ 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"))
(propagated-inputs
(list go-golang-org-x-crypto))
(native-inputs
- (list go-github-com-google-go-cmp-cmp
+ (list go-github-com-google-go-cmp
go-github-com-stretchr-testify))
(home-page "https://github.com/go-jose/go-jose")
(synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
@@ -669,35 +1318,569 @@ 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-telegram-bot-api-telegram-bot-api
+(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")
+ (version "3.4.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-ldap/ldap")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fbmhlc8ss5vn6zz0iiifvy4pm0mwaf13qpz70k83mmnv9vrv16x"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-ldap/ldap/v3"
+ #: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
+ ;; FAIL <...> LDAP Result Code 200 "Network Error":
+ ;; dial tcp: lookup ldap.itd.umich.edu on <...>
+ (list "ldap_test.go"))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-azure-go-ntlmssp
+ go-github-com-go-asn1-ber-asn1-ber
+ go-github-com-google-uuid))
+ (home-page "https://github.com/go-ldap/ldap")
+ (synopsis "LDAP v3 functionality for Go")
+ (description "This package provides basic LDAP v3 functionality in the Go
+language.")
+ (license license:expat)))
+
+(define-public go-github-com-go-openapi-analysis
(package
- (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
- (version "4.6.4")
+ (name "go-github-com-go-openapi-analysis")
+ (version "0.23.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
+ (url "https://github.com/go-openapi/analysis")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
+ (base32 "1i1sn6fzjv83y31b8lky0wh08xl8yj60y04jcidzcy5gmknavyfi"))
+ (snippet
+ #~(begin (use-modules (guix build utils))
+ ;; Introduce cycle with go-github-com-go-openapi-loads.
+ (delete-file-recursively "analysis_test")))))
(build-system go-build-system)
- (home-page "https://go-telegram-bot-api.dev/")
(arguments
- (list #:tests? #f ; Upstream tests are broken.
- #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
+ (list
+ #:import-path "github.com/go-openapi/analysis"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'disable-failing-tests
+ (lambda* (#:key tests? unpack-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" unpack-path)
+ (substitute* (find-files "." "\\_test.go$")
+ ;; Tests requiring network access.
+ (("TestFlatten_RemoteAbsolute")
+ "OffTestFlatten_RemoteAbsolute")))))
+ ;; FIXME: pattern schemas/*.json: cannot embed irregular file
+ ;; schemas/jsonschema-draft-04.json
+ ;;
+ ;; 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-go-openapi-spec")
+ "/src/github.com")
+ "vendor/github.com"))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "go" "test" "-v" "./...")))))
+ (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-stretchr-testify))
(propagated-inputs
- (list go-github-com-technoweenie-multipartstreamer))
- (synopsis "Golang bindings for the Telegram Bot API")
+ (list go-github-com-go-openapi-jsonpointer
+ go-github-com-go-openapi-spec
+ go-github-com-go-openapi-strfmt
+ go-github-com-go-openapi-swag))
+ (home-page "https://github.com/go-openapi/analysis")
+ (synopsis "OpenAPI specification object model analyzer")
(description
- "This package provides Golang bindings for the Telegram Bot API.")
- (license license:expat)))
+ "This package provides a foundational library to analyze an
+@acronym{OpenAPI Initiative,OAI} specification document for easier reasoning
+about the content.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-errors
+ (package
+ (name "go-github-com-go-openapi-errors")
+ (version "0.22.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/errors")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0nikzvknkv0nqdy44dfi096lcvkjnpjfrpg1gqlkg5ffccvdnd9s"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/errors"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/go-openapi/errors")
+ (synopsis "OpenAPI toolkit common errors")
+ (description
+ "Shared errors and error interface used throughout the various libraries
+found in the go-openapi toolkit.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-jsonpointer
+ (package
+ (name "go-github-com-go-openapi-jsonpointer")
+ (version "0.21.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/jsonpointer")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17gb0ab2r61j4gqbpwgpz6cvf9jy91xwn11gkbg3b1rq797if7vc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/jsonpointer"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-go-openapi-swag))
+ (home-page "https://github.com/go-openapi/jsonpointer")
+ (synopsis "JSON Pointer with structs")
+ (description
+ "This package provides an implementation of JSON Pointer, initially
+prototyped in @url{https://github.com/xeipuuv/gojsonpointer}.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-jsonreference
+ (package
+ (name "go-github-com-go-openapi-jsonreference")
+ (version "0.21.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/jsonreference")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1121cnjjh07qdl4jdrd46kmdhx4dgsxn02rvsq5xzapl8gz5nhcn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/jsonreference"))
+ (native-inputs (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-go-openapi-jsonpointer
+ go-github-com-go-openapi-swag
+ go-github-com-puerkitobio-purell))
+ (home-page "https://github.com/go-openapi/jsonreference")
+ (synopsis "JSON Reference with structs")
+ (description
+ "This package provides an implementation of JSON Reference, initially
+prototyped in @url{https://github.com/xeipuuv/gojsonreference}.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-loads
+ (package
+ (name "go-github-com-go-openapi-loads")
+ (version "0.22.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/loads")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qlcpdlm4y4v9r2r533aqvrc86b67nj31gsz29x9ilr7smr5299d"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/loads"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; FIXME: pattern schemas/*.json: cannot embed irregular file
+ ;; schemas/jsonschema-draft-04.json
+ ;;
+ ;; 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-go-openapi-spec")
+ "/src/github.com")
+ "vendor/github.com")
+ (copy-recursively
+ (string-append
+ #$(this-package-input "go-github-com-go-openapi-analysis")
+ "/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-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-go-openapi-analysis
+ go-github-com-go-openapi-spec
+ go-github-com-go-openapi-swag
+ go-gopkg-in-yaml-v3))
+ (home-page "https://github.com/go-openapi/loads")
+ (synopsis "Load OAI specification documents")
+ (description
+ "This package implements functionality of loading of @acronym{OpenAPI
+Initiative,OAI} specification documents from local or remote locations.
+Supports JSON and YAML documents.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-spec
+ (package
+ (name "go-github-com-go-openapi-spec")
+ (version "0.21.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/spec")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07qp7gakrjwznbxg1w5ww8j0ky407s9rmyyrpwv5rsp8yw6qimjc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/spec"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-go-openapi-jsonpointer
+ go-github-com-go-openapi-jsonreference
+ go-github-com-go-openapi-swag
+ go-gopkg-in-yaml-v3))
+ (home-page "https://github.com/go-openapi/spec")
+ (synopsis "OpenAPI specification object model")
+ (description
+ "This package implements functionality to marshal and unmarshal
+@url{https://swagger.io/,Swagger} API specifications into a Golang object
+model.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-strfmt
+ (package
+ (name "go-github-com-go-openapi-strfmt")
+ (version "0.23.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/strfmt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00hqmfsgknhvp7mcbxfadpv4109f9gj59223yxhvmcviqg0a6a7b"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/strfmt"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-asaskevich-govalidator
+ go-github-com-go-openapi-errors
+ go-github-com-google-uuid
+ go-github-com-mitchellh-mapstructure
+ go-github-com-oklog-ulid
+ go-go-mongodb-org-mongo-driver))
+ (home-page "https://github.com/go-openapi/strfmt")
+ (synopsis "OpenAPI toolkit common string formats")
+ (description
+ "This package exposes a registry of data types to support string formats
+in the @code{go-openapi} toolkit. @code{strfmt} represents a well known
+string format such as credit card or email. The Go toolkit for OpenAPI
+specifications knows how to deal with those.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-swag
+ (package
+ (name "go-github-com-go-openapi-swag")
+ (version "0.23.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/swag")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1c03mnmy162rrd1rzfqxiwnblvlwl4v09yklq55q4j9p4jqv740g"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/swag"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-mailru-easyjson go-gopkg-in-yaml-v3))
+ (home-page "https://github.com/go-openapi/swag")
+ (synopsis "Goodie bag in use in the go-openapi projects")
+ (description
+ "Contains a bunch of helper functions for go-openapi and go-swagger
+projects.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-openapi-validate
+ (package
+ (name "go-github-com-go-openapi-validate")
+ (version "0.24.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-openapi/validate")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04inl03ha8sqqn1ccslbsl68shzf53qqk4yi88kvis0qdhcpl9fk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-openapi/validate"
+ #: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)
+ ;; Tests requiring network access.
+ (for-each delete-file
+ (list "benchmark_test.go"
+ "example_validator_test.go"
+ "doc_test.go")))))
+ ;; FIXME: pattern schemas/*.json: cannot embed irregular file
+ ;; schemas/jsonschema-draft-04.json
+ ;;
+ ;; 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-go-openapi-loads")
+ "/src/github.com")
+ "vendor/github.com")
+ (copy-recursively
+ (string-append
+ #$(this-package-input "go-github-com-go-openapi-spec")
+ "/src/github.com")
+ "vendor/github.com")
+ (copy-recursively
+ (string-append
+ #$(this-package-input "go-github-com-go-openapi-analysis")
+ "/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-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-go-openapi-analysis
+ go-github-com-go-openapi-errors
+ go-github-com-go-openapi-jsonpointer
+ go-github-com-go-openapi-loads
+ go-github-com-go-openapi-spec
+ go-github-com-go-openapi-strfmt
+ go-github-com-go-openapi-swag
+ go-gopkg-in-yaml-v3))
+ (home-page "https://github.com/go-openapi/validate")
+ (synopsis "OpenAPI toolkit validation helpers")
+ (description
+ "This package provides helpers to validate Swagger 2.0 specification (aka
+OpenAPI 2.0).")
+ (license license:asl2.0)))
+
+(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")
- (version "0.10.2")
+ (version "0.10.3")
(source
(origin
(method git-fetch)
@@ -706,7 +1889,7 @@ Encryption, JSON Web Signature, and JSON Web Token standards.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1krid2hlvs808jl9zmv7m6zx92samc60gymhwr2mwwykicwbnks8"))
+ (base32 "0w9kjplhyzq8n4iainddapzj7dxnfbjiz4xdpb0hlb6h35grpxgn"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "benchmarks"))))
(build-system go-build-system)
@@ -737,7 +1920,7 @@ Encryption, JSON Web Signature, and JSON Web Token standards.")
(arguments
(list #:import-path "github.com/golang/groupcache"))
(propagated-inputs
- (list go-github-com-golang-protobuf-proto))
+ (list go-github-com-golang-protobuf))
(home-page "https://github.com/golang/groupcache")
(synopsis "Groupcache is a caching and cache-filling library")
(description
@@ -765,8 +1948,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
@@ -851,7 +2037,7 @@ language.")
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
- (version "1.7.0")
+ (version "1.7.2")
(source
(origin
(method git-fetch)
@@ -860,13 +2046,14 @@ language.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
+ (base32 "01d56sr9yggn6gs4lf5bnj15q6bkwvsim8kzj8m4arv1ccj7918j"))))
(build-system go-build-system)
- (propagated-inputs
- `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
- ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
(arguments
- '(#:import-path "github.com/gorilla/csrf"))
+ (list
+ #:import-path "github.com/gorilla/csrf"))
+ (propagated-inputs
+ (list go-github-com-gorilla-securecookie
+ go-github-com-pkg-errors))
(home-page "https://github.com/gorilla/csrf")
(synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
(description
@@ -1073,10 +2260,10 @@ the Go standard library, but returns a client that does not share any state
with other clients.")
(license license:mpl2.0)))
-(define-public go-github-com-hjson-hjson-go
+(define-public go-github-com-hjson-hjson-go-v4
(package
- (name "go-github-com-hjson-hjson-go")
- (version "4.3.1")
+ (name "go-github-com-hjson-hjson-go-v4")
+ (version "4.4.0")
(source
(origin
(method git-fetch)
@@ -1085,17 +2272,102 @@ with other clients.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3"))))
+ (base32 "1d4b2hpqsnzbmfhgxq15hd19rjr5hydjmpblrh5yzfgx9z3cz2by"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/hjson/hjson-go"))
+ (list
+ #:import-path "github.com/hjson/hjson-go/v4"))
(home-page "https://hjson.org/")
(synopsis "Human JSON implementation for Go")
- (description "Hjson is a syntax extension to JSON. It is intended to be
-used like a user interface for humans, to read and edit before passing the
-JSON data to the machine.")
+ (description
+ "Hjson is a syntax extension to JSON. It is intended to be used like a
+user interface for humans, to read and edit before passing the JSON data to
+the machine.")
(license license:expat)))
+(define-public go-github-com-huin-goupnp
+ (package
+ (name "go-github-com-huin-goupnp")
+ (version "1.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/huin/goupnp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04j5rmrfawjxcimiqpyjm9gm5phdndjxrmydf9f1ylij6m360nwl"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Submodules with their own go.mod files and packed as separated
+ ;; packages:
+ ;;
+ ;; - github.com/huin/goupnp/v2alpha
+ (for-each delete-file-recursively
+ (list "v2alpha"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/huin/goupnp"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Run all tests, 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" "./..."))))))))
+ (home-page "https://github.com/huin/goupnp")
+ (propagated-inputs
+ (list go-golang-org-x-sync))
+ (synopsis "UPnP client library for Go")
+ (description
+ "@code{goupnp} is a @acronym{Universal Plug and Play, UPnP} client
+library for Go.
+
+Core components:
+@itemize
+@item @code{goupnp}: core library - contains datastructures and utilities
+typically used by the implemented DCPs
+@item @code{httpu}: HTTPU implementation, underlies SSDP
+@item @code{ssdp}: SSDP client implementation (simple service discovery
+protocol) - used to discover UPnP services on a network
+@item @code{soap}: SOAP client implementation (simple object access protocol)
+- used to communicate with discovered services
+@end itemize")
+ (license license:bsd-2)))
+
+(define-public go-github-com-jackpal-gateway
+ (package
+ (name "go-github-com-jackpal-gateway")
+ (version "1.0.15")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jackpal/gateway")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dlspnbdz63b3kpavibd2764hdy53mx1v3vrqi721dsjy77r9ig3"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/jackpal/gateway"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/jackpal/gateway")
+ (synopsis "Discover the address of a LAN gateway")
+ (description
+ "@code{gateway} is a Go library for discovering the IP address of the
+default LAN gateway.")
+ (license license:bsd-3)))
+
(define-public go-github-com-jackpal-go-nat-pmp
(package
(name "go-github-com-jackpal-go-nat-pmp")
@@ -1224,6 +2496,38 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-jhillyerd-enmime
+ (package
+ (name "go-github-com-jhillyerd-enmime")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jhillyerd/enmime")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/jhillyerd/enmime"))
+ (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
+ "The enmime package implements a MIME encoding and decoding library
+geared towards parsing MIME encoded emails.")
+ (license license:expat)))
+
(define-public go-github-com-jmespath-go-jmespath
(package
(name "go-github-com-jmespath-go-jmespath")
@@ -1309,6 +2613,480 @@ jsoniter and variable type declarations (if any). jsoniter interfaces gives
router.")
(license license:bsd-3)))
+(define-public go-github-com-koron-go-ssdp
+ (package
+ (name "go-github-com-koron-go-ssdp")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/koron/go-ssdp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0agzxzlwvnhgwk6sxswjq7v1ghmf0l02gr7zpdih24i3g457af4f"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/koron/go-ssdp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; Test requiring network setup.
+ (("TestAdvertise_Alive") "OffTestAdvertise_Alive")
+ (("TestAdvertise_Bye") "OffTestAdvertise_Bye")
+ (("TestAnnounceAlive") "OffTestAnnounceAlive")
+ (("TestAnnounceBye") "OffTestAnnounceBye")
+ (("TestInterfaces") "OffTestInterfaces")
+ (("TestSearch_Request") "OffTestSearch_Request")
+ (("TestSearch_Response") "OffTestSearch_Response")
+ (("TestSearch_ServiceRawHeader") "OffTestSearch_ServiceRawHeader")))))
+ ;; XXX: Run all tests, 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-net))
+ (home-page "https://github.com/koron/go-ssdp")
+ (synopsis "SSDP library for Golang")
+ (description
+ "@code{go-ssdp} is a @url{https://tools.ietf.org/html/draft-cai-ssdp-v1-03,
+@acronym{Simple Service Discovery Protocol, SSDP}} library for Golang.")
+ (license license:expat)))
+
+(define-public go-github-com-libp2p-go-cidranger
+ (package
+ (name "go-github-com-libp2p-go-cidranger")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-cidranger")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05hzlk5hx7qna5znr3q1crr0qb7h8yrv1v96pj015dh0kbdkdaba"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: Check if the most of the tests may be enabled:
+ ;; src/github.com/libp2p/go-cidranger/trie_test.go:557:8: cannot use
+ ;; 4294967295 (untyped int constant) as int value in assignment
+ ;; (overflows).
+ #:tests? (target-64bit?)
+ #:import-path "github.com/libp2p/go-cidranger"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-ipfs-go-detect-race))
+ (home-page "https://github.com/libp2p/go-cidranger")
+ (synopsis "Fast IP to CIDR lookup in Golang")
+ (description
+ "Fast IP to @url{https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing,
+CIDR} block(s) lookup using trie in Golang, inspired by
+@url{https://vincent.bernat.im/en/blog/2017-ipv4-route-lookup-linux, IPv4
+route lookup Linux}. Possible use cases include detecting if a IP address is
+from published cloud provider CIDR blocks (e.g. 52.95.110.1 is contained in
+published AWS Route53 CIDR 52.95.110.0/24), IP routing rules, etc.")
+ (license license:expat)))
+
+(define-public go-github-com-libp2p-go-doh-resolver
+ (package
+ (name "go-github-com-libp2p-go-doh-resolver")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-doh-resolver")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0asni7f3gd65bjfqz99fqchz9y75cpgmfwkkhsbq0y2dydagw666"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-doh-resolver"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-ipfs-go-log-v2
+ go-github-com-miekg-dns
+ go-github-com-multiformats-go-multiaddr-dns))
+ (home-page "https://github.com/libp2p/go-doh-resolver")
+ (synopsis "DNS over HTTPS resolver")
+ (description
+ "This package provides an implementation DNS over HTTPS resolver as
+specified in @url{https://datatracker.ietf.org/doc/html/rfc8484, RFC 8484}.")
+ (license license:expat)))
+
+(define-public go-github-com-libp2p-go-flow-metrics
+ (package
+ (name "go-github-com-libp2p-go-flow-metrics")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-flow-metrics")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13yb68vrcn2zdi0mjjh17dphfxl6y99bkq0ia53hasyfj6l6626h"))))
+ (build-system go-build-system)
+ (arguments
+ ;; XXX: Tests may hang sometimes, see
+ ;; <https://github.com/libp2p/go-flow-metrics/issues/30>.
+ (list
+ #:import-path "github.com/libp2p/go-flow-metrics"))
+ (propagated-inputs
+ (list go-github-com-benbjohnson-clock))
+ (home-page "https://github.com/libp2p/go-flow-metrics")
+ (synopsis "Simple library for tracking flow metrics")
+ (description
+ "A simple alternative to rcrowley's @command{go-metrics} that's a lot
+faster (and only does simple bandwidth metrics).")
+ (license license:expat)))
+
+(define-public go-github-com-libp2p-go-libp2p-asn-util
+ (package
+ (name "go-github-com-libp2p-go-libp2p-asn-util")
+ (version "0.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-libp2p-asn-util")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1c94sq43bl1kp04lllcfrfyiy5z3zcfz0s65sm1vgb2s40zrwpr7"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-libp2p-asn-util"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-exp))
+ (home-page "https://github.com/libp2p/go-libp2p-asn-util")
+ (synopsis "Golang library for IP to ASN mapping")
+ (description
+ "@code{go-libp2p-asn-util} is a Golang library to lookup the
+@acronym{ASN, Autonomous System Number} for an IP address. It uses the IPv6
+to ASN database downloaded from https://iptoasn.com/. Supports only IPv6
+addresses for now.")
+ (license license:expat)))
+
+(define-public go-github-com-libp2p-go-nat
+ (package
+ (name "go-github-com-libp2p-go-nat")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-nat")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yyb3knxvfr7fi759nh7mhh88ap1jpkb7nky7niqrh75737phgh0"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-nat"))
+ (propagated-inputs
+ (list go-github-com-huin-goupnp
+ go-github-com-jackpal-go-nat-pmp
+ go-github-com-koron-go-ssdp
+ go-github-com-libp2p-go-netroute))
+ (home-page "https://github.com/libp2p/go-nat")
+ (synopsis "NAT port mapping library for Golang")
+ (description
+ "Package @code{go-nat} implements NAT handling facilities.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-libp2p-go-netroute
+ (package
+ (name "go-github-com-libp2p-go-netroute")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-netroute")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06p68j63fd5nf2gf1fz2pnksmdmv735swpbpvnhb15vrgg3r528g"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-netroute"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; Test requiring network access: no route found for 8.8.8.8
+ (("TestRoute") "OffTestRoute"))))))))
+ (propagated-inputs
+ (list go-github-com-google-gopacket
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/libp2p/go-netroute")
+ (synopsis "Routing table abstraction library for Golang")
+ (description
+ "@code{go-netroute} provides an implementation of the
+@url{https://godoc.org/github.com/google/gopacket/routing#Router,
+gopacket/routing.Router} interface for Golang.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-libp2p-go-reuseport
+ (package
+ (name "go-github-com-libp2p-go-reuseport")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-reuseport")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "012kgriw1bchf0apk6ff4y34n9mffbh0cmi15348v9vj3h4w3sa5"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-reuseport"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-google-gopacket
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/libp2p/go-reuseport")
+ (synopsis "Reuse TCP/UDP ports in Golang")
+ (description
+ "@code{go-reuseport} enables listening and dialing from the same TCP or
+UDP port. This means that @code{SO_REUSEADDR} and @code{SO_REUSEPORT} socket
+options may be set. This is particularly important when attempting to do TCP
+NAT hole-punching, which requires a process to both @code{Listen} and
+@code{Dial} on the same TCP port. @code{go-reuseport} provides some utilities
+around enabling this behaviour on various operating systems.")
+ (license license:isc)))
+
+(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))
+ (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-libp2p-go-yamux-v4
+ (package
+ (name "go-github-com-libp2p-go-yamux-v4")
+ (version "4.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-yamux")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13px8fcjjp02cricabbf3x410jkr8sb6r369nqq1zrgr7v90s22j"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-yamux/v4"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-libp2p-go-buffer-pool))
+ (home-page "https://github.com/libp2p/go-yamux")
+ (synopsis "Reuse TCP/UDP ports in Golang")
+ (description
+ "Yamux (Yet another Multiplexer) is a multiplexing library for Golang.
+It relies on an underlying connection to provide reliability and ordering,
+such as TCP or Unix domain sockets, and provides stream-oriented multiplexing.
+It is inspired by SPDY but is not interoperable with it.")
+ (license (list license:mpl2.0 license:bsd-3))))
+
+(define-public go-github-com-libp2p-zeroconf-v2
+ (package
+ (name "go-github-com-libp2p-zeroconf-v2")
+ (version "2.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/zeroconf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xrqdi7s8296963zh7gz450ivbniar7723xlr8v9nh90cyy1ah3r"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f ; it requires netwok setup
+ #:import-path "github.com/libp2p/zeroconf/v2"))
+ (propagated-inputs
+ (list go-github-com-miekg-dns go-golang-org-x-net))
+ (home-page "https://github.com/libp2p/zeroconf")
+ (synopsis "mDNS/DNS-SD Service Discovery in pure Golang")
+ (description
+ "This package implements a service discovery functionality specified in
+@url{https://tools.ietf.org/html/rfc6762, RFC 6762} (mDNS) and
+@url{https://tools.ietf.org/html/rfc6763, RFC 6763} (DNS-SD) standards which
+intends to be compatible with Avahi.")
+ (license license:expat)))
+
+(define-public go-github-com-mailru-easyjson
+ (package
+ (name "go-github-com-mailru-easyjson")
+ (version "0.7.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mailru/easyjson")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0clifkvvy8f45rv3cdyv58dglzagyvfcqb63wl6rij30c5j2pzc1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/mailru/easyjson"))
+ (propagated-inputs
+ (list go-github-com-josharian-intern))
+ (home-page "https://github.com/mailru/easyjson")
+ (synopsis "JSON serializer for Golang")
+ (description
+ "Package @code{easyjson} implements functionality to marshal/unmarshal
+Golang structs to/from JSON without the use of reflection. It also aims to
+keep generated Go code simple enough so that it can be easily optimized or
+fixed.")
+ (license license:expat)))
+
+(define-public go-github-com-makeworld-the-better-one-go-gemini
+ (package
+ (name "go-github-com-makeworld-the-better-one-go-gemini")
+ (version "0.13.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/makew0rld/go-gemini")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "196rxfg7w8s3zn87gra1mxh1l8iav6kdmg909gkbnc9cxip65zc0"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ (list go-github-com-google-go-cmp
+ go-golang-org-x-net
+ go-golang-org-x-text))
+ (arguments
+ (list
+ #:import-path "github.com/makeworld-the-better-one/go-gemini"))
+ (home-page "https://github.com/makew0rld/go-gemini")
+ (synopsis "Client/server library for the Gemini protocol, in Go")
+ (description
+ "@code{go-gemini} is a library that provides an easy interface to create
+clients that speak the Gemini protocol.")
+ (license license:isc)))
+
+(define-public go-github-com-makeworld-the-better-one-go-gemini-socks5
+ (package
+ (name "go-github-com-makeworld-the-better-one-go-gemini-socks5")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/makew0rld/go-gemini-socks5")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0r8iljs12nhyn3nk5dzsji9hi88fivashbrcb5d42x5rvzry15px"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/makeworld-the-better-one/go-gemini-socks5"))
+ (propagated-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/makeworld-the-better-one/go-gemini-socks5")
+ (synopsis "SOCKS5 proxy for go-gemini")
+ (description
+ "This package provides SOCKS5 proxy for
+@@url{https://github.com/makeworld-the-better-one/go-gemini,go-gemini}.")
+ (license license:expat)))
+
+(define-public go-github-com-mattbaird-jsonpatch
+ (package
+ (name "go-github-com-mattbaird-jsonpatch")
+ (version "0.0.0-20240118010651-0ba75a80ca38")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mattbaird/jsonpatch")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1nxbrpk8bvvmfgl4sfsbx82g0q44i2sakl7vigbsj3prx6nql5iv"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/mattbaird/jsonpatch"))
+ (native-inputs
+ (list go-github-com-evanphx-json-patch go-github-com-stretchr-testify))
+ (home-page "https://github.com/mattbaird/jsonpatch")
+ (synopsis "JSON Patch library for Go")
+ (description
+ "@url{http://jsonpatch.com/, JSON Patch} implementation for Go as
+specified in @url{https://datatracker.ietf.org/doc/html/rfc6902/, RFC 6902}
+from the IETF.
+
+JSON Patch allows you to generate JSON that describes changes you want to make
+to a document, so you don't have to send the whole doc. JSON Patch format is
+supported by HTTP PATCH method, allowing for standards based partial updates
+via REST APIs.")
+ (license license:asl2.0)))
+
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
@@ -1333,10 +3111,50 @@ router.")
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-miekg-dns
+ (package
+ (name "go-github-com-miekg-dns")
+ (version "1.1.62")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/miekg/dns")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wdsacp4ay6ji72vnszq6ksn5n060z2hv94wgjsn0pr7gpa3nk6c"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/miekg/dns"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; Unable to run test server.
+ (("TestIsPacketConn") "OffTestIsPacketConn"))))))))
+ (propagated-inputs
+ (list go-golang-org-x-tools
+ go-golang-org-x-sys
+ go-golang-org-x-sync
+ go-golang-org-x-net))
+ (home-page "https://github.com/miekg/dns")
+ (synopsis "Domain Name Service library in Go")
+ (description
+ "This package provides a fully featured interface to the @acronym{DNS,
+Domain Name System}. Both server and client side programming is supported.
+The package allows complete control over what is sent out to the @acronym{DNS,
+Domain Name Service}. The API follows the less-is-more principle, by
+presenting a small interface.")
+ (license license:bsd-3)))
+
(define-public go-github-com-multiformats-go-multiaddr
(package
(name "go-github-com-multiformats-go-multiaddr")
- (version "0.1.0")
+ (version "0.12.3")
(source
(origin
(method git-fetch)
@@ -1345,13 +3163,19 @@ router.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0cdzlzh7cb1pj9mhq45va3r6gs6pcdfa9j7vdrqlv3zd6k3bxg39"))))
+ (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/multiformats/go-multiaddr"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-multiformats-go-multihash))
+ (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))
(home-page "https://github.com/multiformats/go-multiaddr")
(synopsis "Composable and future-proof network addresses")
(description
@@ -1367,32 +3191,6 @@ following:
@end itemize")
(license license:expat)))
-;; It's for the Kubo update; remove it when it is no longer needed.
-(define-public go-github-com-multiformats-go-multiaddr-0.12
- (package
- (inherit go-github-com-multiformats-go-multiaddr)
- (name "go-github-com-multiformats-go-multiaddr")
- (version "0.12.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/multiformats/go-multiaddr")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (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))))
-
(define-public go-github-com-multiformats-go-multiaddr-dns
(package
(name "go-github-com-multiformats-go-multiaddr-dns")
@@ -1409,12 +3207,11 @@ 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
(list go-github-com-miekg-dns
- go-github-com-multiformats-go-multiaddr-0.12))
+ go-github-com-multiformats-go-multiaddr))
(home-page "https://multiformats.io/multiaddr/")
(synopsis "Library and CLI tool for DNS multiaddr resolution")
(description
@@ -1437,10 +3234,9 @@ 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))
+ (list go-github-com-multiformats-go-multiaddr))
(home-page "https://github.com/multiformats/go-multiaddr-fmt")
(synopsis "Declarative validator for multiaddrs")
(description
@@ -1449,42 +3245,6 @@ validators for common address types are provided, but creating your own
combinations is easy.")
(license license:expat)))
-(define-public go-github-com-multiformats-go-multiaddr-net
- ;; This commit is from <2018-10-01> and associated with GX package manager,
- ;; since that time the project has changed versing stile and GX is dropped.
- ;; The latest versioned tag is v0.1.5 <2020-04-30>. The project is archved
- ;; on <2021-10-05>.
- (let ((commit "1cb9a0e8a6de3c8a10f6cee60d01d793603c4f7e")
- (revision "0"))
- (package
- (name "go-github-com-multiformats-go-multiaddr-net")
- (version (git-version "1.6.3" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/multiformats/go-multiaddr-net")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ypgi47xdz3bh8lh7f8cmk7w3ql9g4izx5l3kzdg9gda1xn5zxq3"))))
- (build-system go-build-system)
- (arguments
- (list
- ;; TODO: Tests fail because they try to access the network.
- #:tests? #f
- #:import-path "github.com/multiformats/go-multiaddr-net"))
- (propagated-inputs
- (list go-github-com-multiformats-go-multiaddr))
- (home-page "https://github.com/multiformats/go-multiaddr-net")
- (synopsis "Multiaddress net tools")
- (description
- "This package provides Multiaddr specific versions of common functions
-in stdlib's @command{net} package. This means wrappers of standard net
-symbols like @command{net.Dial} and @command{net.Listen}, as well as
-conversion to and from @command{net.Addr}.")
- (license license:expat))))
-
(define-public go-github-com-multiformats-go-multistream
(package
(name "go-github-com-multiformats-go-multistream")
@@ -1501,7 +3261,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))
@@ -1513,6 +3272,30 @@ multistream-select protocol. The protocol is defined at
@url{https://github.com/multiformats/multistream-select}")
(license license:expat)))
+(define-public go-github-com-munnerz-goautoneg
+ (package
+ (name "go-github-com-munnerz-goautoneg")
+ (version "0.0.0-20191010083416-a7dc8b61c822")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/munnerz/goautoneg")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m4v6bw6yf1g0kvpc46isjp0qfhx2y8gnvlnyjf637jy64613mgg"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/munnerz/goautoneg"))
+ (home-page "https://github.com/munnerz/goautoneg")
+ (synopsis "HTTP Content-Type Autonegotiation")
+ (description
+ "This package implements @url{https://rfc-editor.org/rfc/rfc2616.html,RFC
+2616} HTTP/1.1 standard.")
+ (license license:bsd-3)))
+
(define-public go-github-com-nwidger-jsoncolor
(package
(name "go-github-com-nwidger-jsoncolor")
@@ -1539,6 +3322,41 @@ multistream-select protocol. The protocol is defined at
which produce colorized output using github.com/fatih/color.")
(license license:expat)))
+(define-public go-github-com-opentracing-contrib-go-stdlib
+ (package
+ (name "go-github-com-opentracing-contrib-go-stdlib")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/opentracing-contrib/go-stdlib")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ssnfhbpljxy2v3nsw9aqmh7xlky49dpfwj275aj0b576w46ys6m"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/opentracing-contrib/go-stdlib"
+ #: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-opentracing-opentracing-go))
+ (home-page "https://github.com/opentracing-contrib/go-stdlib")
+ (synopsis "OpenTracing instrumentation for packages in the Golang stdlib")
+ (description
+ "This package provides an OpenTracing instrumentation for @code{net/http}
+standard library.")
+ (license license:asl2.0)))
+
(define-public go-github-com-opentracing-opentracing-go
(package
(name "go-github-com-opentracing-opentracing-go")
@@ -1563,6 +3381,850 @@ which produce colorized output using github.com/fatih/color.")
(description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
(license license:asl2.0)))
+(define-public go-github-com-oschwald-geoip2-golang
+ (package
+ (name "go-github-com-oschwald-geoip2-golang")
+ (version "1.11.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oschwald/geoip2-golang")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0670cv1b9c2p0lx63rlwl7kplbvzr79apbw13109v0pv4qlapmhx"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f ; Requires some unpackaged software and test data
+ #:import-path "github.com/oschwald/geoip2-golang"))
+ (propagated-inputs
+ (list go-github-com-oschwald-maxminddb-golang))
+ (home-page "https://github.com/oschwald/geoip2-golang")
+ (synopsis "MaxMind GeoIP2 reader")
+ (description
+ "This package provides a library for reading MaxMind GeoLite2 and GeoIP2
+databases in Go.")
+ (license license:isc)))
+
+(define-public go-github-com-oschwald-maxminddb-golang
+ (package
+ (name "go-github-com-oschwald-maxminddb-golang")
+ (version "1.13.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oschwald/maxminddb-golang")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p0c10r6850znvarc9h3y0jlwika9qmq0ys7rmg2aj8x2cffz3z6"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/oschwald/maxminddb-golang"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Remove most of the tests requiring test-data from submodule
+ ;; <https://github.com/maxmind/MaxMind-DB>, there is a documented
+ ;; process on how to generate it, consider to pack and activate
+ ;; tests in the next update cycle.
+ (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 "decoder_test.go"
+ "deserializer_test.go"
+ "example_test.go"
+ "reader_test.go"
+ "traverse_test.go"
+ "verifier_test.go"))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/oschwald/maxminddb-golang")
+ (synopsis "MaxMind DB Reader for Go")
+ (description
+ "This is a Go reader for the MaxMind DB format. Although this can be
+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")
+ (version "1.5.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/dtls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qc5dbgh31lilbd1lpmajj1fjzy4jx9iadzqgl9jd1ry9fj3ly1d"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: TestClientCertificate: Client failed(x509: certificate relies on
+ ;; legacy Common Name field, use SANs instead)
+ #:tests? #f
+ #:import-path "github.com/pion/dtls"))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-transport
+ go-golang-org-x-crypto))
+ (home-page "https://github.com/pion/dtls")
+ (synopsis "DTLS 1.2 Server/Client implementation for Go")
+ (description
+ "This package provides a native
+@url{https://datatracker.ietf.org/doc/html/rfc6347, DTLS 1.2} implementation
+in Golang.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-dtls-v2
+ (package
+ (inherit go-github-com-pion-dtls)
+ (name "go-github-com-pion-dtls-v2")
+ (version "2.2.12")
+ (source
+ (origin
+ (inherit (package-source go-github-com-pion-dtls))
+ (uri (git-reference
+ (url "https://github.com/pion/dtls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fihyk4p7mqilj4ymdrgns6fg3c2pfsi12v145im5vy1gxy6lc42"))))
+ (arguments
+ (list
+ #:import-path "github.com/pion/dtls/v2"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-transport-v2
+ go-golang-org-x-crypto
+ go-golang-org-x-net))))
+
+(define-public go-github-com-pion-dtls-v3
+ (package
+ (inherit go-github-com-pion-dtls-v2)
+ (name "go-github-com-pion-dtls-v3")
+ (version "3.0.2")
+ (source
+ (origin
+ (inherit (package-source go-github-com-pion-dtls))
+ (uri (git-reference
+ (url "https://github.com/pion/dtls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0czn0v2i9czq6934sirbimgkn6avgzvw63ifm2b0bkh2qmmpim01"))))
+ (arguments
+ (list
+ #:import-path "github.com/pion/dtls/v3"))
+ (native-inputs
+ (modify-inputs (package-native-inputs go-github-com-pion-dtls-v2)
+ (delete go-github-com-stretchr-testify)))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs go-github-com-pion-dtls-v2)
+ (replace "go-github-com-pion-transport-v2"
+ go-github-com-pion-transport-v3)))))
+
+(define-public go-github-com-pion-ice
+ (package
+ (name "go-github-com-pion-ice")
+ (version "0.7.18")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/ice/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17108z4fkr9b2fxf5icxspgif29a40gi57bhp9a50mlfr36yv9vk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Source-only package
+ #:tests? #f
+ #:import-path "https://github.com/pion/ice"
+ #:phases
+ ;; Failed to build and only requried for inheritance:
+ ;;
+ ;; cannot use a.net (type *vnet.Net) as type transport.Net in field value:
+ ;; *vnet.Net does not implement transport.Net (wrong type for CreateDialer method)
+ ;; have CreateDialer(*net.Dialer) vnet.Dialer
+ ;; want CreateDialer(*net.Dialer) transport.Dialer
+ #~(modify-phases %standard-phases
+ (delete 'build))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-google-uuid
+ go-github-com-pion-dtls-v2
+ go-github-com-pion-logging
+ go-github-com-pion-mdns
+ go-github-com-pion-randutil
+ go-github-com-pion-stun
+ go-github-com-pion-transport
+ go-github-com-pion-turn-v2
+ go-golang-org-x-net))
+ (home-page "https://github.com/pion/ice/")
+ (synopsis "Go implementation of ICE")
+ (description
+ "This package provides an implementation of @acronym{ICE, Interactive
+Connectivity Establishment protocol}, specified in
+@url{https://datatracker.ietf.org/doc/html/rfc8445, RFC8445}. It is used as a
+part of @url{https://github.com/pion, Pion} WebRTC implementation.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-ice-v2
+ (package
+ (inherit go-github-com-pion-ice)
+ (name "go-github-com-pion-ice-v2")
+ (version "2.3.34")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/ice/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hiiwd3xchlybbvgd33s0i7rcwgrdiw3q963avzziycimia0qyvz"))))
+ (arguments
+ (list
+ #:tests? #f ;Tests require network access.
+ #:import-path "github.com/pion/ice/v2"))
+ (propagated-inputs
+ (list go-github-com-google-uuid
+ go-github-com-pion-dtls-v2
+ go-github-com-pion-logging
+ go-github-com-pion-mdns
+ go-github-com-pion-randutil
+ go-github-com-pion-stun
+ go-github-com-pion-transport-v2
+ go-github-com-pion-turn-v2
+ go-golang-org-x-net))))
+
+(define-public go-github-com-pion-ice-v3
+ (package
+ (inherit go-github-com-pion-ice)
+ (name "go-github-com-pion-ice-v3")
+ (version "3.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/ice/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0f9jy80law69zb26rkb6kl6w1c66vdghdrmifhwlmzngb644ihdb"))))
+ (arguments
+ (list
+ #:tests? #f ;Tests require network access.
+ #:import-path "github.com/pion/ice/v3"))
+ (propagated-inputs
+ (list go-github-com-google-uuid
+ go-github-com-pion-dtls-v2
+ go-github-com-pion-logging
+ go-github-com-pion-mdns-v2
+ go-github-com-pion-randutil
+ go-github-com-pion-stun-v2
+ go-github-com-pion-transport-v3
+ go-github-com-pion-turn-v3
+ go-golang-org-x-net))))
+
+(define-public go-github-com-pion-interceptor
+ (package
+ (name "go-github-com-pion-interceptor")
+ (version "0.1.30")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/interceptor")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b0mmrzb9m9xsskylambdcw3g9xfd1fdfagcw8k0l8886ckqjprr"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/interceptor"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-rtcp
+ go-github-com-pion-rtp
+ go-github-com-pion-transport-v3))
+ (home-page "https://github.com/pion/interceptor")
+ (synopsis "Pluggable RTP/RTCP processors for building real time communication")
+ (description
+ "Interceptor is a framework for building RTP/RTCP communication software.
+This framework defines a interface that each interceptor must satisfy. These
+interceptors are then run sequentially.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-mdns
+ (package
+ (name "go-github-com-pion-mdns")
+ (version "0.0.12")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/mdns/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18nz0vddxik3q11mn4z65zvrfhspxv0xymxv9w3kgk2kszwq2byy"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Tests are implemented in GitHub Actions and require aditional
+ ;; packaging, see
+ ;; <https://github.com/pion/.goassets/blob/master/.github/workflows/test.reusable.yml>.
+ #:tests? #f
+ #:unpack-path "github.com/pion/mdns"
+ #:import-path "github.com/pion/mdns"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-transport-v3
+ go-golang-org-x-net))
+ (home-page "https://github.com/pion/mdns/")
+ (synopsis "Pure Go implementation of Multicast DNS")
+ (description
+ "This package implements a mDNS (multicast DNS) used by
+@url{https://github.com/pion, Pion}.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-mdns-v2
+ (package
+ (inherit go-github-com-pion-mdns)
+ (name "go-github-com-pion-mdns-v2")
+ (version "2.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/mdns/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03675hx82lx3c8akkxdbkch1z4dbq54r05jk6jgdyd7mrdh9k4lm"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments
+ go-github-com-pion-mdns)
+ ((#:unpack-path flags ''())
+ "github.com/pion/mdns/v2")
+ ((#:import-path flags ''())
+ "github.com/pion/mdns/v2")))))
+
+(define-public go-github-com-pion-rtcp
+ (package
+ (name "go-github-com-pion-rtcp")
+ (version "1.2.14")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/rtcp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00hfq0l17zq47slzfbrghgfc0v808hqiyaab3ni9kh1v7nmvp5ic"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/rtcp"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/pion/rtcp")
+ (synopsis "Implementation of RTCP protocol in Golang")
+ (description
+ "Package rtcp implements encoding and decoding of RTCP packets according
+to @url{https://www.rfc-editor.org/rfc/rfc3550, RFC 3550},
+@url{https://www.rfc-editor.org/rfc/rfc5506, RFC 5506}.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-rtp
+ (package
+ (name "go-github-com-pion-rtp")
+ (version "1.8.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/rtp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vrdvswvvbqq83kbjlyblarbsn5v0sjcwrcv03nncd605cggnbkx"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/rtp"))
+ (propagated-inputs
+ (list go-github-com-pion-randutil))
+ (home-page "https://github.com/pion/rtp")
+ (synopsis "Go implementation of RTP")
+ (description
+ "This package provides a @acronym{Real-time Transport Protocol, RTP}
+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-sdp-v3
+ (package
+ (name "go-github-com-pion-sdp-v3")
+ (version "3.0.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/sdp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08d3glli1n45ayc26qwaxm7k5knrf99x5nwkllmmhf29g8kwc89n"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/sdp/v3"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-randutil))
+ (home-page "https://github.com/pion/sdp")
+ (synopsis "Implementation of the SDP protocol in Golang")
+ (description
+ "Package sdp implements @acronym{Session Description Protocol,SDP}.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-srtp-v2
+ (package
+ (name "go-github-com-pion-srtp-v2")
+ (version "2.0.20")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/srtp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ijwx9mrc0ha8fam6y6xxih59dyr8hg9ly476kv6gfw564qfp7hk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/srtp/v2"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-rtcp
+ go-github-com-pion-rtp
+ go-github-com-pion-transport-v2))
+ (home-page "https://github.com/pion/srtp")
+ (synopsis "Implementation of SRTP protocol in Golang")
+ (description
+ "Package srtp implements Secure Real-time Transport Protocol.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-stun
+ (package
+ (name "go-github-com-pion-stun")
+ (version "0.6.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/stun")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0172fcm1xvzvy3d5lcpscayzpf3i5w4bpfydifdc9l4n2wslx0sm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/stun"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-dtls-v2
+ go-github-com-pion-logging
+ go-github-com-pion-transport-v2))
+ (home-page "https://github.com/pion/stun")
+ (synopsis "Go implementation of STUN")
+ (description
+ "Package @code{stun} implements Session Traversal Utilities for
++NAT (STUN) (@url{https://tools.ietf.org/html/rfc5389, RFC 5389}) protocol and
++@url{https://pkg.go.dev/github.com/pion/stun#Client, client} with no external
++dependencies and zero allocations in hot paths. Client
++@url{https://pkg.go.dev/github.com/pion/stun#WithRTO, supports} automatic
++request retransmissions.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-stun-v2
+ (package
+ (inherit go-github-com-pion-stun)
+ (name "go-github-com-pion-stun-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (inherit (package-source go-github-com-pion-stun))
+ (uri (git-reference
+ (url "https://github.com/pion/stun")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zli55ls5izpr6cw0wj0gy44872xn9rk20i8ay9cfk7j2rb60y60"))))
+ (arguments
+ (list
+ #:import-path "github.com/pion/stun/v2"))
+ (propagated-inputs
+ (list go-github-com-pion-dtls-v2
+ go-github-com-pion-logging
+ go-github-com-pion-transport-v3
+ go-golang-org-x-crypto
+ go-golang-org-x-net))))
+
+(define-public go-github-com-pion-transport
+ (package
+ (name "go-github-com-pion-transport")
+ (version "0.14.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/transport")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0331kywqaa6fymc64wrqgwnxlhx31qdf299i927vifx1wdcl9ikp"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Source-only package
+ #:tests? #f
+ #:import-path "github.com/pion/transport"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/pion/transport")
+ (synopsis "Golang networking related functions")
+ (description
+ "This package implements a various networking related functions used
+throughout the @url{https://github.com/pion, Pion} modules.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-transport-v2
+ (package
+ (inherit go-github-com-pion-transport)
+ (name "go-github-com-pion-transport-v2")
+ (version "2.2.10")
+ (source
+ (origin
+ (inherit (package-source go-github-com-pion-transport))
+ (uri (git-reference
+ (url "https://github.com/pion/transport/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g5pg6mz61blprccxzysbwldkil84qgwp6404lsp4m9wh44312hf"))))
+ (arguments
+ (list
+ #:import-path "github.com/pion/transport/v2"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs go-github-com-pion-transport)
+ (prepend go-github-com-wlynxg-anet)))))
+
+(define-public go-github-com-pion-transport-v3
+ (package
+ (inherit go-github-com-pion-transport)
+ (name "go-github-com-pion-transport-v3")
+ (version "3.0.2")
+ (source
+ (origin
+ (inherit (package-source go-github-com-pion-transport))
+ (uri (git-reference
+ (url "https://github.com/pion/transport/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j7ljkbyf2qd7daxg7d1rd6c92md64agi59b69g6jyqpz5jww998"))))
+ (arguments
+ (list
+ #:import-path "github.com/pion/transport/v3"))))
+
+(define-public go-github-com-pion-turn
+ (package
+ (name "go-github-com-pion-turn")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/turn/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16lkgmrlks0qdzbk8jj0c0j66qfxhb54cvzgrfn4imvm56dbxp2n"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f ;Tests require network access.
+ #:import-path "github.com/pion/turn"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-stun
+ go-github-com-pion-transport
+ go-github-com-pkg-errors))
+ (home-page "https://github.com/pion/turn/")
+ (synopsis "API for building TURN clients and servers in Golang")
+ (description
+ "This package provides a toolkit for building @acronym{TURN, Traversal
+Using Relays around NAT}, specified in
+@url{https://datatracker.ietf.org/doc/html/rfc8656, RFC 8656}, servers and
+clients.
+
+@code{pion/turn} is an API for building STUN/TURN clients and servers, not a
+binary you deploy then configure. It may require copying the examples and
+making minor modifications to fit your need, no knowledge of Go is required
+however.
+
+The advantage of this is that you don't need to deal with complicated
+configuration files, or custom APIs to modify the state of Pion TURN. After
+you instantiate an instance of a Pion TURN server or client you interact with
+it like any library. The quickest way to get started is to look at the
+@url{https://github.com/pion/turn/blob/master/examples, examples} or
+@url{https://godoc.org/github.com/pion/turn, GoDoc}.")
+ (license license:expat)))
+
+(define-public go-github-com-pion-turn-v2
+ (package
+ (inherit go-github-com-pion-turn)
+ (name "go-github-com-pion-turn-v2")
+ (version "2.1.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/turn/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0iw7nvqsxpqy90k5a8mq3dyask272391m59cbiy30aak1y2wwaac"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments
+ go-github-com-pion-turn)
+ ((#:import-path flags ''())
+ "github.com/pion/turn/v2")))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-randutil
+ go-github-com-pion-stun
+ go-github-com-pion-transport-v2
+ go-golang-org-x-sys))))
+
+(define-public go-github-com-pion-turn-v3
+ (package
+ (inherit go-github-com-pion-turn)
+ (name "go-github-com-pion-turn-v3")
+ (version "3.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/turn/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0l78m9ym0sv1zfalbv95lwblmr789fc53d957ph5mdznhjx89lyx"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments
+ go-github-com-pion-turn)
+ ((#:import-path flags ''())
+ "github.com/pion/turn/v3")))
+ (propagated-inputs
+ (list go-github-com-pion-logging
+ go-github-com-pion-randutil
+ go-github-com-pion-stun-v2
+ go-github-com-pion-transport-v3
+ go-golang-org-x-sys))))
+
+(define-public go-github-com-pion-webrtc-v3
+ (package
+ (name "go-github-com-pion-webrtc-v3")
+ (version "3.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/webrtc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f421a2s00mj5l9bj96xlignwfdfkp6kwk9qjs3vhazpmvqxzsgi"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: Figure out why tests timeout and fail eventually.
+ #:tests? #f
+ #:import-path "github.com/pion/webrtc/v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples-and-benchmarks
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (for-each delete-file-recursively
+ (list "examples"))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-pion-datachannel
+ go-github-com-pion-dtls-v2
+ go-github-com-pion-ice-v2
+ go-github-com-pion-interceptor
+ go-github-com-pion-logging
+ go-github-com-pion-randutil
+ go-github-com-pion-rtcp
+ go-github-com-pion-rtp
+ go-github-com-pion-sctp
+ go-github-com-pion-sdp-v3
+ go-github-com-pion-srtp-v2
+ go-github-com-pion-stun
+ go-github-com-pion-transport-v2
+ go-golang-org-x-net))
+ (home-page "https://github.com/pion/webrtc")
+ (synopsis "Implementation of the WebRTC API in Golang")
+ (description
+ "Package webrtc implements the @code{WebRTC} (Real-Time Communication in
+Browsers) 1.0 as defined in W3C @url{https://www.w3.org/TR/webrtc/,WebRTC}
+specification document.
+Features:
+@itemize
+@item implementation of @url{https://w3c.github.io/webrtc-pc/,webrtc-pc} and
+@code{https://www.w3.org/TR/webrtc-stats/,webrtc-stats}
+@item DataChannels
+@item Send/Receive audio and video
+@item Renegotiation
+@item Plan-B and Unified Plan
+@item SettingEngine for Pion specific extensions
+@item implemented connectivity - Full ICE Agent, ICE Restart, Trickle ICE,
+STUN, TURN mDNS candidates
+@end itemize")
+ (license license:expat)))
+
+(define-public go-github-com-pires-go-proxyproto
+ (package
+ (name "go-github-com-pires-go-proxyproto")
+ (version "0.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pires/go-proxyproto")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p18w555xp187fl807h1yd092cvs8jarp98pa76zl84rxlk4k2h4"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pires/go-proxyproto"))
+ (home-page "https://github.com/pires/go-proxyproto")
+ (synopsis "Implementation of the PROXY protocol")
+ (description
+ "Package proxyproto implements Proxy Protocol (v1 and v2) parser and
+writer, as per specification:
+@@url{https://www.haproxy.org/download/2.3/doc/proxy-protocol.txt}. It is to
+be used in one of or both proxy clients and proxy servers that need to support
+said protocol. Both protocol versions, 1 (text-based) and 2 (binary-based)
+are supported. @acronym{TLV, tag-length-value} parsers extensions comming with
+this library support AWS, Azure and GCP.")
+ (license license:asl2.0)))
+
(define-public go-github-com-pkg-sftp
(package
(name "go-github-com-pkg-sftp")
@@ -1640,6 +4302,57 @@ Caching.")
to jQuery to the Go language.")
(license license:bsd-3)))
+(define-public go-github-com-puerkitobio-purell
+ (package
+ (name "go-github-com-puerkitobio-purell")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PuerkitoBio/purell")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zv1pkfvnrpv18ji3mgqa1k77h066yz5hvhdr1mxdz19kdjc5l43"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/PuerkitoBio/purell"))
+ (propagated-inputs
+ (list go-golang-org-x-net go-golang-org-x-text))
+ (home-page "https://github.com/PuerkitoBio/purell")
+ (synopsis "Tiny Go library to normalize URLs")
+ (description
+ "This package provides implements a functionality of URL normalizer as
+described in @url{http://tools.ietf.org/html/rfc3986#section-6, RFC 3986}.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-puerkitobio-urlesc
+ (package
+ (name "go-github-com-puerkitobio-urlesc")
+ (version "0.0.0-20170810143723-de5bf2ad4578")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PuerkitoBio/urlesc")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/PuerkitoBio/urlesc"))
+ (home-page "https://github.com/PuerkitoBio/urlesc")
+ (synopsis "Proper URL escaping as per RFC 3986")
+ (description
+ "Package @code{urlesc} implements query escaping as per
+@url{https://rfc-editor.org/rfc/rfc3986.html,RFC 3986}. It contains some
+parts of the @code{net/url} package, modified so as to allow some reserved
+characters incorrectly escaped by net/url.")
+ (license license:bsd-3)))
+
(define-public go-github-com-quic-go-qpack
(package
(name "go-github-com-quic-go-qpack")
@@ -1658,7 +4371,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
@@ -1677,7 +4389,7 @@ the Go standard library}.")
(define-public go-github-com-quic-go-quic-go
(package
(name "go-github-com-quic-go-quic-go")
- (version "0.42.0")
+ (version "0.43.0")
(source
(origin
(method git-fetch)
@@ -1686,20 +4398,41 @@ the Go standard library}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0bdr48nbcjajmhx1h11qfl1i7myxqpyqqk5n21007xyqw13qhb8c"))))
+ (base32 "1vqc1mb60flbm5jqf48gzhzm8m0k06klf9szpx6mgw30957qv3fn"))))
(build-system go-build-system)
(arguments
(list
- ;; XXX More packages required...
- #:tests? #f
- #:go go-1.21
- #:import-path "github.com/quic-go/quic-go"))
+ #:import-path "github.com/quic-go/quic-go"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; TODO: Figure out why some tests fail.
+ (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 "integrationtests/self/timeout_test.go"
+ "server_test.go")))))
+ ;; Test steps are taken from GitHub Actions -
+ ;; <https://github.com/quic-go/quic-go/blob/v0.42.0/.github/workflows/unit.yml>.
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "ginkgo" "-r" "-v"
+ (string-append "--procs="
+ (number->string (parallel-job-count)))
+ "--randomize-all"
+ "--randomize-suites"
+ "--skip-package"
+ "integrationtests"))))))))
+ (native-inputs
+ (list go-ginkgo
+ go-github-com-onsi-ginkgo-v2
+ go-go-uber-org-mock
+ go-golang-org-x-time))
(propagated-inputs
- (list go-github-com-cheekybits-genny
- go-github-com-golang-protobuf-proto
- go-github-com-marten-seemann-chacha20
+ (list go-github-com-francoispqt-gojay
go-github-com-quic-go-qpack
- go-github-com-quic-go-qtls-go1-20
go-golang-org-x-crypto
go-golang-org-x-exp
go-golang-org-x-net
@@ -1712,13 +4445,205 @@ the Go standard library}.")
protocol.")
(license license:expat)))
-(define-public go-github-com-lucas-clemente-quic-go
- (deprecated-package "go-github-com-lucas-clemente-quic-go" go-github-com-quic-go-quic-go))
+(define-public go-github-com-quic-go-webtransport-go
+ (package
+ (name "go-github-com-quic-go-webtransport-go")
+ (version "0.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/quic-go/webtransport-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zwr4jg4dg2b14kkypkbs8dpai5b5s44gm5gq0vrs3mmg6vq0v97"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/quic-go/webtransport-go"))
+ (native-inputs
+ (list go-go-uber-org-mock
+ go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-quic-go-quic-go
+ go-golang-org-x-exp))
+ (home-page "https://github.com/quic-go/webtransport-go")
+ (synopsis "WebTransport implementation based on quic-go")
+ (description
+ "webtransport-go is an implementation of the @code{WebTransport} protocol, based
+on @@url{https://github.com/quic-go/quic-go,quic-go}. It currently implements
+@@url{https://www.ietf.org/archive/id/draft-ietf-webtrans-http3-02.html,draft-02}
+of the specification.")
+ (license license:expat)))
+
+(define-public go-github-com-rs-cors
+ (package
+ (name "go-github-com-rs-cors")
+ (version "1.11.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rs/cors")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qbzxk1aabn8k2smrkpz3h59mwr6s2zvg4faj6kjsp78hyi172xn"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Submodule(s) with their own go.mod files and packed as
+ ;; separated packages:
+ ;;
+ ;; - github.com/rs/cors/wrapper/gin
+ (for-each delete-file-recursively
+ (list "wrapper/gin"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/rs/cors"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Examples requires additional dependencies and comes with their
+ ;; own go.mod, consider to pack it as separate package if required.
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))
+ (home-page "https://github.com/rs/cors")
+ (synopsis "Golang @code{net/http} configurable handler for CORS requests")
+ (description
+ "Package cors is @code{net/http} handler to handle @acronym{Cross-origin
+resource sharing,CORS} related requests as defined by
+@url{http://www.w3.org/TR/cors/,http://www.w3.org/TR/cors/}.")
+ (license license:expat)))
+
+(define-public go-github-com-sherclockholmes-webpush-go
+ (package
+ (name "go-github-com-sherclockholmes-webpush-go")
+ (version "1.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/SherClockHolmes/webpush-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qv16zvkd1c7q81v2ai8pfz590fxdrk4lfbgyymln0q7jn5wlvki"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/SherClockHolmes/webpush-go"))
+ (propagated-inputs
+ (list go-github-com-golang-jwt-jwt go-golang-org-x-crypto))
+ (home-page "https://github.com/SherClockHolmes/webpush-go")
+ (synopsis "Web Push API Encryption with VAPID support")
+ (description
+ "Web Push API Encryption with
+@url{https://datatracker.ietf.org/doc/html/draft-ietf-webpush-vapid-01, VAPID}
+support.")
+ (license license:expat)))
+
+(define-public go-github-com-shurcool-httpfs
+ (package
+ (name "go-github-com-shurcool-httpfs")
+ (version "0.0.0-20230704072500-f1e31cf0ba5c")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/shurcooL/httpfs")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m0jjnfzr8372cjx0zjm2zm695kwaz8l1yk7gzgn05biadsklprm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/shurcooL/httpfs"
+ #: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)
+ (invoke "go" "test" "-v" "./..."))))))))
+ (native-inputs
+ (list go-golang-org-x-tools))
+ (propagated-inputs
+ (list go-github-com-shurcool-httpgzip))
+ (home-page "https://github.com/shurcooL/httpfs")
+ (synopsis "Utilities for @code{http.FileSystem}")
+ (description
+ "Collection of Go packages for working with the +@code{http.FileSystem}
+interface.")
+ (license license:expat)))
+
+(define-public go-github-com-shurcool-httpgzip
+ (package
+ (name "go-github-com-shurcool-httpgzip")
+ (version "0.0.0-20230704072819-d1585fc322fa")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/shurcooL/httpgzip")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10fnndia8ij3hwwvknn8qy8z3955bm7xyvqd69yh5g2zh25zc5x2"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/shurcooL/httpgzip"))
+ (native-inputs
+ (list go-golang-org-x-tools))
+ (propagated-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/shurcooL/httpgzip")
+ (synopsis "Primitives of @code{net-http}-like with gzip compression")
+ (description
+ "Package @code{httpgzip} provides @code{net/http}-like primitives that
+use gzip compression when serving HTTP requests.")
+ (license license:expat)))
+
+(define-public go-github-com-shurcool-vfsgen
+ (package
+ (name "go-github-com-shurcool-vfsgen")
+ (version "0.0.0-20230704071429-0000e147ea92")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/shurcooL/vfsgen")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ypfdiv56ckb0yc7mccc2l8vc3gmfws2p7bcf9f0j415m7r0aq6q"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/shurcooL/vfsgen"))
+ (native-inputs
+ (list go-golang-org-x-tools))
+ (propagated-inputs
+ (list go-github-com-shurcool-httpfs))
+ (home-page "https://github.com/shurcooL/vfsgen")
+ (synopsis "Generate Go code from an @code{http.FileSystem}")
+ (description
+ "Package @code{vfsgen} takes an @code{http.FileSystem} (likely at
+@code{go generate} time) and generates Go code that statically implements the
+provided @code{http.FileSystem}.")
+ (license license:expat)))
(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
@@ -1728,14 +4653,12 @@ protocol.")
(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.")
@@ -1844,6 +4767,31 @@ an interface to implement any other minifier.")
sockets.")
(license license:expat))))
+(define-public go-github-com-ucarion-urlpath
+ (package
+ (name "go-github-com-ucarion-urlpath")
+ (version "0.0.0-20200424170820-7ccc79b76bbb")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ucarion/urlpath")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12ns9lqdz566agdp4y0whgksmidi0zp7759akvx0b79mjzyvypax"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ucarion/urlpath"))
+ (home-page "https://github.com/ucarion/urlpath")
+ (synopsis "REST-like URL path patterns matching")
+ (description
+ "Package urlpath matches paths against a template. It's meant for
+applications that take in REST-like URL paths, and need to validate and
+extract data from those paths.")
+ (license license:expat)))
+
(define-public go-github-com-ugorji-go-codec
(package
(name "go-github-com-ugorji-go-codec")
@@ -1917,6 +4865,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"))
@@ -1942,6 +4952,60 @@ 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-wlynxg-anet
+ (package
+ (name "go-github-com-wlynxg-anet")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wlynxg/anet")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0i8sqq9d2k19jxplqhb1phzv6qxgzchbpdazq8l26h7pihzsq1gg"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/wlynxg/anet"))
+ (home-page "https://github.com/wlynxg/anet")
+ (synopsis "Adjusted @code{net.Interfaces()} for Golang")
+ (description
+ "This package implements a functionality to resolve some problems for
+Android environment where standard @code{net} and @code{golang.org/x/net}
+missing it. It address the issues
+@url{https://github.com/golang/go/issues/40569, #40569} and
+@url{https://github.com/golang/go/issues/68082, #68082}.")
+ (license license:bsd-3)))
+
(define-public go-github-com-xeipuuv-gojsonpointer
(let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
(revision "0"))
@@ -2036,6 +5100,82 @@ programming language.")
programming language, which supports draft-04, draft-06 and draft-07.")
(license license:asl2.0))))
+(define-public go-golang-org-x-oauth2
+ (package
+ (name "go-golang-org-x-oauth2")
+ (version "0.21.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/oauth2")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/oauth2"))
+ (propagated-inputs
+ (list go-cloud-google-com-go-compute-metadata
+ go-github-com-google-go-cmp))
+ (home-page "https://go.googlesource.com/oauth2")
+ (synopsis "Client implementation of the OAuth 2.0 spec")
+ (description
+ "This package contains a client implementation for OAuth 2.0
+ spec in Go.")
+ (license license:bsd-3)))
+
+(define-public go-golang-zx2c4-com-wireguard
+ (package
+ (name "go-golang-zx2c4-com-wireguard")
+ (version "0.0.0-20231211153847-12269c276173")
+ (source
+ (origin
+ (method git-fetch)
+ ;; NOTE: module URL is a redirect
+ ;; target: git.zx2c4.com/wireguard-go
+ ;; source: golang.zx2c4.com/wireguard
+ (uri (git-reference
+ (url "https://git.zx2c4.com/wireguard-go/")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fbc6m0ahifhrd6jdrpdxi8l3b2slpp8fmv20kpq2yzz19vzzgkf"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.zx2c4.com/wireguard"
+ #: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?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "go" "test" "-v"
+ ;; "./tune/..." ; Requires gvisor.dev/gvisor, not packed yet
+ "./"
+ "./conn/..."
+ "./device/..."
+ "./ipc/..."
+ "./ratelimiter/..."
+ "./replay/..."
+ "./rwcancel/..."
+ "./tai64n/..."))))))))
+ (propagated-inputs
+ (list go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://git.zx2c4.com/wireguard")
+ (synopsis "Implementation of WireGuard in Go")
+ (description "This package is a Go Implementation of WireGuard.")
+ (license license:expat)))
+
+;; 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")
@@ -2051,11 +5191,16 @@ 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
- (list go-github-com-google-go-cmp-cmp
+ (list go-github-com-google-go-cmp
go-github-com-stretchr-testify))
(home-page "https://gopkg.in/square/go-jose.v2")
(synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
@@ -2065,6 +5210,61 @@ 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-mvdan-cc-xurls
+ (package
+ (name "go-mvdan-cc-xurls")
+ (version "2.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mvdan/xurls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1516hwlxbnhdca56qy7sx9h2n5askq6ddqpqyp3f5rvmzdkxf4zn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "mvdan.cc/xurls/v2"))
+ (propagated-inputs
+ (list go-github-com-rogpeppe-go-internal
+ go-golang-org-x-mod
+ go-golang-org-x-sync))
+ (home-page "https://mvdan.cc/xurls/v2/")
+ (synopsis "Extracts URLs from text")
+ (description
+ "Xurls extracts urls from plain text using regular expressions. It can
+be used as both a binary and a library.")
+ (license license:bsd-3)))
+
+(define-public go-nhooyr-io-websocket
+ (package
+ (name "go-nhooyr-io-websocket")
+ (version "1.8.11")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nhooyr/websocket")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "019pm2bkzwyvzl61127nqzihchk35q5xh57wy50aa2syn9214fxm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Tests require additional dependencies like `wasmbrowsertest`.
+ #:tests? #f
+ #:import-path "nhooyr.io/websocket"))
+ (home-page "https://nhooyr.io/websocket")
+ (synopsis "Minimal and idiomatic WebSocket library for Go")
+ (description
+ "Package websocket implements the
+@@url{https://rfc-editor.org/rfc/rfc6455.html,RFC 6455} @code{WebSocket}
+protocol.")
+ (license license:isc)))
+
;;;
;;; Executables:
;;;
@@ -2102,6 +5302,22 @@ go-github-com-multiformats-go-multiaddr-dns.")))
(description "This package provides a CLI binary executible built from
go-github-com-tdewolff-minify-v2 source.")))
+(define-public xurls
+ (package
+ (inherit go-mvdan-cc-xurls)
+ (name "xurls")
+ (arguments
+ (list
+ #:import-path "mvdan.cc/xurls/v2/cmd/xurls"
+ #:unpack-path "mvdan.cc/xurls/v2"
+ #:install-source? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (delete-file "testdata/script/version.txtar")))))))))
+
;;;
;;; 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/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 4e40e148f2..291f3b9063 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,26 +1,32 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017-2020 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2018, 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019, 2021 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019-2021 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021 raingloom <raingloom@riseup.net>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Guix Together <jgart@dismail.de>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 raingloom <raingloom@riseup.net>
;;; Copyright © 2021, 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
+;;; Copyright © 2022 kiasoc5 <kiasoc5@disroot.org>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Fries <fries1234@protonmail.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
@@ -32,8 +38,13 @@
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Brian Kubisiak <brian@kubisiak.com>
;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
+;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
+;;; Copyright © 2024 Luis Higino <luishenriquegh2701@gmail.com>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Spencer Peters <spencerpeters@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -59,12 +70,16 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gcc)
#: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-crypto)
+ #:use-module (gnu packages golang-maths)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages linux)
#:use-module (gnu packages specifications))
@@ -80,6 +95,116 @@
;;; Libraries:
;;;
+(define-public go-atomicgo-dev-cursor
+ (package
+ (name "go-atomicgo-dev-cursor")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomicgo/cursor")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ds85nyd3dnjr961x9g5kflx1qdb92vn7n6wc4jbk0fjjzbrnh5s"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "atomicgo.dev/cursor"))
+ (home-page "https://atomicgo.dev/cursor")
+ (synopsis "Moving terminal cursor in Golang")
+ (description
+ "Package cursor contains cross-platform methods to move the terminal cursor in
+different directions. This package can be used to create interactive CLI tools
+and games, live charts, algorithm visualizations and other updatable output of
+any kind.")
+ (license license:expat)))
+
+(define-public go-atomicgo-dev-keyboard
+ (package
+ (name "go-atomicgo-dev-keyboard")
+ (version "0.2.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomicgo/keyboard")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0axhs1ji87szirv91vvwy0l0h5f468pllp8zap2dpcy05krmi9jf"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza
+ ;; -> go-atomicgo-dev-keyboard -> go-github-com-pterm-pterm
+ #:tests? #f
+ #:import-path "atomicgo.dev/keyboard"))
+ (propagated-inputs
+ (list go-github-com-containerd-console))
+ (home-page "https://atomicgo.dev/keyboard")
+ (synopsis "Read keyboard events in CLI applications")
+ (description
+ "This package provides a functionality to read key presses from the keyboard,
+while in a terminal application, which may be combined to check for ctrl+c,
+alt+4, ctrl-shift, alt+ctrl+right, etc. It can also be used to
+simulate (mock) keypresses for CI testing.")
+ (license license:expat)))
+
+(define-public go-atomicgo-dev-schedule
+ (package
+ (name "go-atomicgo-dev-schedule")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomicgo/schedule")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13zrmf9jagqjvjjckyqlvr889y2gxf22iz42l6j2zmgy9klbn6vl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "atomicgo.dev/schedule"))
+ (home-page "https://atomicgo.dev/schedule")
+ (synopsis "Easily schedule non-blocking tasks in Golang")
+ (description
+ "This package provides a simple scheduler which, can run a function at a
+given time, in a given duration, or repeatedly at a given interval.")
+ (license license:expat)))
+
+(define-public go-bazil-org-fuse
+ (package
+ (name "go-bazil-org-fuse")
+ (version "0.0.0-20200117225306-7b5117fecadc")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bazil/fuse")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1bw2lp1nijpqp729k808xkhwmb8nn7igsv51hvv9jw74q805qg2f"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Tests require root access to mount file system.
+ #:tests? #f
+ #:import-path "bazil.org/fuse"))
+ (propagated-inputs
+ (list go-github-com-tv42-httpunix go-golang-org-x-sys))
+ (home-page "https://bazil.org/fuse")
+ (synopsis "FUSE filesystems in Golang")
+ (description
+ "Package fuse enables writing FUSE file systems. It is a from-scratch
+implementation of the kernel-userspace communication protocol, and does not
+use the C library from the project called FUSE.")
+ (license (list license:bsd-2 license:bsd-3 license:hpnd))))
+
(define-public go-code-cloudfoundry-org-bytefmt
(package
(name "go-code-cloudfoundry-org-bytefmt")
@@ -99,7 +224,6 @@
(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
@@ -111,6 +235,189 @@
a human-readable byte format.")
(license license:asl2.0)))
+(define-public go-git-sr-ht-emersion-go-scfg
+ (package
+ (name "go-git-sr-ht-emersion-go-scfg")
+ (version "0.0.0-20240128091534-2ae16e782082")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~emersion/go-scfg")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1gxhg40q4md3lj1wrrnms0jhyqsxhx2hcv6sm5yjbbqana5x26mx"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "git.sr.ht/~emersion/go-scfg"))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew))
+ (home-page "https://git.sr.ht/~emersion/go-scfg")
+ (synopsis "Go library for simple configuration file format")
+ (description
+ "Package go-scfg parses scfg files.")
+ (license license:expat)))
+
+(define-public go-git-sr-ht-emersion-go-sqlite3-fts5
+ (package
+ (name "go-git-sr-ht-emersion-go-sqlite3-fts5")
+ (version "0.0.0-20240124102820-f3a72e8b79b1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~emersion/go-sqlite3-fts5")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1plbfb1z0y3gprddwvp4n61r0cacpp7cjn3abq00xhac5vdvig0v"))))
+ (build-system go-build-system)
+ ;; XXX: fts5.c, fts5.h, generate.sh, sqlite3.h and sqlite3ext.h are
+ ;; obtained from
+ ;; <https://www.sqlite.org/2023/sqlite-preprocessed-3440000.zip>, check if
+ ;; they may be sourced from sqlite package.
+ (arguments
+ (list
+ #:import-path "git.sr.ht/~emersion/go-sqlite3-fts5"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-flags
+ (lambda _
+ ;; FIXME: Find out why it's failing without these flags:
+ ;; src/git.sr.ht/~emersion/go-sqlite3-fts5/internal/internal.go:13:
+ ;; undefined reference to `sqlite3_auto_extension'collect2:
+ ;; error: ld returned 1 exit status
+ (setenv "CGO_LDFLAGS"
+ "-Wl,--unresolved-symbols=ignore-in-object-files"))))))
+ (propagated-inputs
+ (list go-github-com-mattn-go-sqlite3))
+ (home-page "https://git.sr.ht/~emersion/go-sqlite3-fts5")
+ (synopsis "FTS5 extension for go-sqlite3")
+ (description
+ "Standalone FTS5 extension for
+@@url{https://github.com/mattn/go-sqlite3,go-sqlite3}, that provides full-text
+search functionality to database applications.")
+ (license license:expat)))
+
+(define-public go-git-sr-ht-rjarry-go-opt
+ (package
+ (name "go-git-sr-ht-rjarry-go-opt")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~rjarry/go-opt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jcs3bn43g3wv4d5w59zazy139qfkn0903lnvndfn06s81gzqpch"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "git.sr.ht/~rjarry/go-opt"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://git.sr.ht/~rjarry/go-opt")
+ (synopsis "Argument parsing and completion based on struct tags")
+ (description
+ "@code{go-opt} is a library to parse command line arguments based on tag
+annotations on struct fields. It came as a spin-off from
+@url{https://git.sr.ht/~rjarry/aerc,aerc} to deal with its internal
+commands.")
+ (license license:expat)))
+
+(define-public go-git-sr-ht-rockorager-vaxis
+ (package
+ (name "go-git-sr-ht-rockorager-vaxis")
+ (version "0.9.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~rockorager/vaxis")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0pmi4bigqgrfdlk9d6ia3jxgcr4iadiyynf6bny9fdc3yyppcxic"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "git.sr.ht/~rockorager/vaxis"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-containerd-console
+ go-github-com-creack-pty
+ go-github-com-mattn-go-runewidth
+ go-github-com-mattn-go-sixel
+ go-github-com-rivo-uniseg
+ go-golang-org-x-exp
+ go-golang-org-x-image
+ go-golang-org-x-sys))
+ (home-page "https://git.sr.ht/~rockorager/vaxis")
+ (synopsis "TUI library for Golang")
+ (description
+ "Package vaxis is a terminal user interface for modern terminals. It
+supports supports modern terminal features, such as styled underlines and
+graphics. A widgets package is provided with some useful widgets.")
+ (license license:asl2.0)))
+
+(define-public go-git-sr-ht-sircmpwn-getopt
+ (package
+ (name "go-git-sr-ht-sircmpwn-getopt")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~sircmpwn/getopt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0f9rammnmhaz21qkmz7qf76r8jlzi323g05ps3j7gwrxlw7442a6"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "git.sr.ht/~sircmpwn/getopt"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://git.sr.ht/~sircmpwn/getopt")
+ (synopsis "POSIX getopt for Go")
+ (description
+ "This package provides a POSIX-compatible implementation of
+@code{getopt} for Go.")
+ (license license:bsd-3)))
+
+(define-public go-git-sr-ht-sircmpwn-go-bare
+ (package
+ (name "go-git-sr-ht-sircmpwn-go-bare")
+ (version "0.0.0-20210406120253-ab86bc2846d9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~sircmpwn/go-bare")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zh36qppk8lscd8mysy0anm2vw5c74c10f4qvhd541wxm06di928"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "git.sr.ht/~sircmpwn/go-bare"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-git-sr-ht-sircmpwn-getopt))
+ (home-page "https://git.sr.ht/~sircmpwn/go-bare")
+ (synopsis "Implementation of the BARE message format")
+ (description
+ "This package provides an implementation of the @acronym{BARE, Binary
+Application Record Encoding} https://baremessages.org/ message format for
+Golang.")
+ (license license:asl2.0)))
+
(define-public go-github-com-a8m-envsubst
(package
(name "go-github-com-a8m-envsubst")
@@ -134,6 +441,97 @@ a human-readable byte format.")
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")
+ (version "0.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/adrg/strutil")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xkjzjllv8b2m3lgn66cb09b0f5xqy2bk8ny3lkn4z0ywlchawj9"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/adrg/strutil"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/adrg/strutil")
+ (synopsis "Golang string utility functions")
+ (description
+ "Package strutil provides string metrics for calculating string
+similarity as well as other string utility functions.")
+ (license license:expat)))
+
+(define-public go-github-com-adrg-xdg
+ (package
+ (name "go-github-com-adrg-xdg")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/adrg/xdg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xbkb8wmr6phj2ppr75akc58jdzrv20gc3mkxa1mmb968isy8s6c"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/adrg/xdg"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Tests need HOME to be set: could not create any of the following
+ ;; paths: /homeless-shelter/.local/data,
+ ;; /homeless-shelter/.local/data, /usr/share
+ (add-before 'check 'set-home
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/adrg/xdg")
+ (synopsis "XDG specification implementation for Golang")
+ (description
+ "Package xdg provides an implementation of the @acronym{XDG, X Desktop
+Group} Base Directory Specification. The specification defines a set of
+standard paths for storing application files including data and configuration
+files. For portability and flexibility reasons, applications should use the
+XDG defined locations instead of hardcoding paths. The package also includes
+the locations of well known user directories.")
+ (license license:expat)))
+
(define-public go-github-com-alecthomas-chroma
(package
(name "go-github-com-alecthomas-chroma")
@@ -168,7 +566,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)
@@ -177,16 +575,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")
@@ -238,6 +679,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")
@@ -253,8 +724,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")
@@ -266,6 +737,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")
@@ -285,6 +782,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")
@@ -366,6 +867,209 @@ optimized for sparse nodes of
@url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.")
(license license:expat)))
+(define-public go-github-com-arran4-golang-ical
+ (package
+ (name "go-github-com-arran4-golang-ical")
+ (version "0.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/arran4/golang-ical")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gcn5afds1dnq3wrl4ndi4wqqwmrnvh9pdqhyv77d3cqakn82vj3"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/arran4/golang-ical"))
+ (native-inputs
+ (list go-github-com-google-go-cmp
+ go-github-com-stretchr-testify))
+ (home-page "https://github.com/arran4/golang-ical")
+ (synopsis "Handle iCalenders in Go")
+ (description
+ "The @code{ical} package provides an ICS/iCalender parser and serialiser
+for Go.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-asaskevich-govalidator
+ (package
+ (name "go-github-com-asaskevich-govalidator")
+ (version "11.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/asaskevich/govalidator")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0aab1pym5c6di8vidynp6ly5j4kcqv6lp2737gw0a07zng0nn8lw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/asaskevich/govalidator"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; XXX: Some validation are failed in the test.
+ (("TestIsExistingEmail") "OffTestIsExistingEmail"))))))))
+ (home-page "https://github.com/asaskevich/govalidator")
+ (synopsis "Collection of various validators for Golang")
+ (description
+ "This package provides validators and sanitizers for strings, structs and
+collections. It was based on
+@url{https://github.com/chriso/validator.js,validator.js}.")
+ (license license:expat)))
+
+(define-public go-github-com-audriusbutkevicius-recli
+ (package
+ (name "go-github-com-audriusbutkevicius-recli")
+ (version "0.0.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AudriusButkevicius/recli")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mxrpn8p6ylf5qjzsqrk96nky5vgagjkkpd5jwpm6sa977qb0v3i"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/AudriusButkevicius/recli"))
+ (native-inputs
+ (list go-github-com-pkg-errors
+ go-github-com-urfave-cli))
+ (home-page "https://github.com/AudriusButkevicius/recli")
+ (synopsis "Reflection-based CLI generator")
+ (description
+ "For a given struct, @code{recli} builds a set of @code{urfave/cli}
+commands which allows you to modify it from the command line. It is useful
+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-avast-retry-go
+ (package
+ (name "go-github-com-avast-retry-go")
+ (version "2.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/avast/retry-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zkn8c2gyz8j90bf0aj6avfl3sf7j4rk5g4ak4yhglnsx72jdhbz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/avast/retry-go"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ (("TestMaxDelay") "OffTestMaxDelay")))))
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))
+ (propagated-inputs (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/avast/retry-go")
+ (synopsis "Simple golang library for retry mechanism")
+ (description
+ "This package is a simple Go library that provides retry functionality
+for functions that may fail. It includes various customizable retry
+strategies, such as fixed delay, backoff delay, and random delay.")
+ (license license:expat)))
+
+(define-public go-github-com-avast-retry-go-v3
+ (package
+ (inherit go-github-com-avast-retry-go)
+ (name "go-github-com-avast-retry-go-v3")
+ (version "3.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/avast/retry-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01mwrzjh2y3xignkivx8kaghjs3gwb3z89zqgxjfaslslazc863b"))))
+ (arguments
+ (list
+ #:import-path "github.com/avast/retry-go/v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ (("TestMaxDelay") "OffTestMaxDelay")))))
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))))
+
+(define-public go-github-com-avast-retry-go-v4
+ (package
+ (inherit go-github-com-avast-retry-go)
+ (name "go-github-com-avast-retry-go-v4")
+ (version "4.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/avast/retry-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "09gs4wmkq7ragyf2xd0h6j8f9xqq66cwa95kwp5qdwz3wwv9xq1b"))))
+ (arguments
+ (list
+ #:import-path "github.com/avast/retry-go/v4"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples")))))))))
+
+(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")
@@ -381,8 +1085,7 @@ optimized for sparse nodes of
(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
@@ -391,9 +1094,9 @@ interface around the standard library's @code{time} package so that the applicat
can use the realtime clock while tests can use the mock clock.")
(license license:expat)))
-(define-public go-github-com-beorn7-perks-quantile
+(define-public go-github-com-beorn7-perks
(package
- (name "go-github-com-beorn7-perks-quantile")
+ (name "go-github-com-beorn7-perks")
(version "1.0.1")
(source
(origin
@@ -406,8 +1109,17 @@ can use the realtime clock while tests can use the mock clock.")
(base32 "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/beorn7/perks/quantile"
- #:unpack-path "github.com/beorn7/perks"))
+ (list
+ #:import-path "github.com/beorn7/perks"
+ #: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://github.com/beorn7/perks")
(synopsis "Compute approximate quantiles over an unbounded data stream")
(description
@@ -534,6 +1246,35 @@ information and periodically output metrics")
quantiles over an unbounded data stream within low memory and CPU bounds.")
(license license:bsd-2)))
+;; XXX: This repository has been archived by the owner on Mar 9, 2019. It is
+;; now read-only.
+(define-public go-github-com-boltdb-bolt
+ (package
+ (name "go-github-com-boltdb-bolt")
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/boltdb/bolt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f ;tests are broken in upstream
+ #:import-path "github.com/boltdb/bolt"))
+ (home-page "https://github.com/boltdb/bolt")
+ (synopsis "Embedded key/value database for Golang")
+ (description
+ "Bolt is a pure Go key/value store inspired by
+@url{http://symas.com/mdb/, Howard Chu's LMDB project}. The goal of the
+project is to provide a simple, fast, and reliable database for projects that
+don't require a full database server such as Postgres or MySQL.")
+ (license license:expat)))
+
(define-public go-github-com-briandowns-spinner
(package
(name "go-github-com-briandowns-spinner")
@@ -569,7 +1310,7 @@ indicator to any terminal application.")
(define-public go-github-com-burntsushi-toml
(package
(name "go-github-com-burntsushi-toml")
- (version "1.2.1")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
@@ -578,10 +1319,19 @@ indicator to any terminal application.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
+ (base32 "1vk0s7pcn80hkx0lcyws509gqs42c8y1rppv05zxiqj0yn2zrjnx"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/BurntSushi/toml"))
+ (list
+ #:import-path "github.com/BurntSushi/toml"
+ #: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" "./..."))))))))
(home-page "https://github.com/BurntSushi/toml")
(synopsis "Toml parser and encoder for Go")
(description
@@ -589,10 +1339,62 @@ indicator to any terminal application.")
similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-cheggaaa-pb-v3
+;; XXX: This repository has been archived by the owner on Feb 21, 2018. It is
+;; now read-only.
+(define-public go-github-com-calmh-xdr
(package
- (name "go-github-com-cheggaaa-pb-v3")
- (version "3.0.8")
+ (name "go-github-com-calmh-xdr")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/calmh/xdr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/calmh/xdr"))
+ (home-page "https://github.com/calmh/xdr")
+ (synopsis "XDR marshalling and unmarshalling")
+ (description
+ "XDR is an External Data Representation (XDR)
+marshalling and unmarshalling library in Go. It uses code generation and not
+reflection.")
+ (license license:expat)))
+
+(define-public go-github-com-charlievieth-fastwalk
+ (package
+ (name "go-github-com-charlievieth-fastwalk")
+ (version "1.0.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/charlievieth/fastwalk")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17zy17q31p8b93bf703rr0xqafp02bb0slkrgpxb8r0aaxz3zg4y"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/charlievieth/fastwalk"))
+ (home-page "https://github.com/charlievieth/fastwalk")
+ (synopsis "Fast directory traversal for Golang")
+ (description
+ "Package fastwalk provides a faster version of
+@url{/path/filepath#@code{WalkDir,filepath.WalkDir}} for file system scanning
+tools.")
+ (license license:expat)))
+
+(define-public go-github-com-cheggaaa-pb
+ (package
+ (name "go-github-com-cheggaaa-pb")
+ (version "1.0.29")
(source
(origin
(method git-fetch)
@@ -601,23 +1403,44 @@ similar to Go's standard library @code{json} and @code{xml} package.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0d701s2niy39r650d1phjw19h4l27b1yfc2ih6s31f56b3zzqspx"))))
+ (base32 "0n8y589gf9aw53j72y4z8mzkgahbf6k8h19n2j0mllw5xpvpgijy"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/cheggaaa/pb/v3"
- #:unpack-path "github.com/cheggaaa/pb"))
+ (list
+ #:import-path "github.com/cheggaaa/pb"))
(propagated-inputs
(list go-github-com-fatih-color
go-github-com-mattn-go-colorable
go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
- go-github-com-vividcortex-ewma))
+ go-github-com-mattn-go-runewidth))
(home-page "https://github.com/cheggaaa/pb/")
(synopsis "Console progress bar for Go")
(description
"This package is a Go library that draws progress bars on the terminal.")
(license license:bsd-3)))
+(define-public go-github-com-cheggaaa-pb-v3
+ (package
+ (inherit go-github-com-cheggaaa-pb)
+ (name "go-github-com-cheggaaa-pb-v3")
+ (version "3.1.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cheggaaa/pb")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1mf86iav69qpyg0nd54g0f50yigjkfzdhaqzkbn4yfb3fnb75n2z"))))
+ (arguments
+ (list
+ #:import-path "github.com/cheggaaa/pb/v3"
+ #:unpack-path "github.com/cheggaaa/pb"))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
+ (append go-github-com-vividcortex-ewma)))))
+
(define-public go-github-com-chzyer-logex
(package
(name "go-github-com-chzyer-logex")
@@ -673,6 +1496,33 @@ levels that works by wrapping the standard @code{log} library.")
"Readline is a pure Go implementation of a GNU-Readline like library.")
(license license:expat)))
+(define-public go-github-com-containerd-fifo
+ (package
+ (name "go-github-com-containerd-fifo")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containerd/fifo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ddb1spairbsjkvxqysa7pzb5za07dvv1aay3mqr160gh2za3kd4"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/containerd/fifo"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/containerd/fifo")
+ (synopsis "FIFO package for Golang")
+ (description
+ "This package implements a functionality of handling FIFOs in a sane
+way.")
+ (license license:asl2.0)))
+
(define-public go-github-com-coocood-freecache
(package
(name "go-github-com-coocood-freecache")
@@ -690,7 +1540,7 @@ levels that works by wrapping the standard @code{log} library.")
(arguments
(list
#:import-path "github.com/coocood/freecache"))
- (propagated-inputs (list go-github-com-cespare-xxhash))
+ (propagated-inputs (list go-github-com-cespare-xxhash-v2))
(home-page "https://github.com/coocood/freecache")
(synopsis "Caching library for Go")
(description
@@ -700,138 +1550,138 @@ objects can be cached in memory without increased latency or degraded
throughput.")
(license license:expat)))
-(define-public go-github-com-coreos-go-systemd-activation
+(define-public go-github-com-coreos-go-systemd-v22
(package
- (name "go-github-com-coreos-go-systemd-activation")
- (version "0.0.0-20191104093116-d3cd4ed1dbcf")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-systemd")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "193mgqn7n4gbb8jb5kyn6ml4lbvh4xs55qpjnisaz7j945ik3kd8"))))
+ (name "go-github-com-coreos-go-systemd-v22")
+ (version "22.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-systemd")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vhb4cw8nw9nx8mprx829xv8w4jnwhc2lcyjljzlfafsn8nx5nyf"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/coreos/go-systemd/activation"
- #:unpack-path "github.com/coreos/go-systemd"))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd socket activation")
- (description "Go bindings to systemd socket activation; for writing and
-using socket activation from Go.")
- (license license:asl2.0)))
-
-(define-public go-github-com-coreos-go-systemd-daemon
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-daemon")
- (arguments
- '(#:import-path "github.com/coreos/go-systemd/daemon"
- #:unpack-path "github.com/coreos/go-systemd"))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for notifications")
- (description "Go bindings to systemd for notifying the daemon of service
-status changes")))
-
-(define-public go-github-com-coreos-go-systemd-dbus
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-dbus")
- (arguments
- '(#:tests? #f ;Tests require D-Bus daemon running.
- #:import-path "github.com/coreos/go-systemd/dbus"
- #:unpack-path "github.com/coreos/go-systemd"))
- (native-inputs (list go-github-com-godbus-dbus))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for managing services")
- (description "Go bindings to systemd for starting/stopping/inspecting
-running services and units.")))
-
-(define-public go-github-com-coreos-go-systemd-journal
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-journal")
- (arguments
- '(#:tests? #f ;Tests require access to journald socket.
- #:import-path "github.com/coreos/go-systemd/journal"
- #:unpack-path "github.com/coreos/go-systemd"))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for writing journald")
- (description "Go bindings to systemd for writing to systemd's logging
-service, journald.")))
-
-(define-public go-github-com-coreos-go-systemd-login1
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-login1")
- (arguments
- '(#:tests? #f ;Tests require D-Bus daemon running.
- #:import-path "github.com/coreos/go-systemd/login1"
- #:unpack-path "github.com/coreos/go-systemd"))
- (native-inputs (list go-github-com-godbus-dbus))
+ (list
+ #:import-path "github.com/coreos/go-systemd/v22"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-sdjournal-header
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "sdjournal/journal.go"
+ (("systemd/sd-journal.h") "elogind/sd-journal.h")
+ (("systemd/sd-id128.h") "elogind/sd-id128.h")))))
+ ;; XXX: Activate when go-build-system supports submodules.
+ (delete 'build)
+ (add-before 'check 'remove-failing-test-files
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (for-each delete-file
+ (list
+ ;; dial unix /var/run/dbus/system_bus_socket: connect: no such
+ ;; file or directory
+ "dbus/dbus_test.go"
+ "dbus/methods_test.go"
+ "dbus/subscription_set_test.go"
+ "dbus/subscription_test.go"
+ "import1/dbus_test.go"
+ "login1/dbus_test.go"
+ "machine1/dbus_test.go"
+ ;; journal_test.go:30: journald socket not detected
+ "journal/journal_test.go"
+ ;; exec: "systemd-run": executable file not found
+ ;; in $PATH
+ "journal/journal_unix_test.go"
+ ;; Error opening journal: unable to open a handle
+ ;; to the library
+ "sdjournal/journal_test.go"
+ ;; Error getting an existing function: unable to
+ ;; open a handle to the library
+ "sdjournal/functions_test.go")))))
+ ;; 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" "./..."))))))))
+ (inputs
+ (list elogind))
+ (propagated-inputs
+ (list go-github-com-godbus-dbus-v5))
(home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for integration with logind API")
- (description "Go bindings to systemd for integration with the systemd
-logind API.")))
+ (synopsis "Go bindings to systemd")
+ (description
+ "This package implements a various systemd bindings and provides Golang
+submodules:
-(define-public go-github-com-coreos-go-systemd-machine1
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-machine1")
- (arguments
- '(#:tests? #f ;Tests require D-Bus daemon running.
- #:import-path "github.com/coreos/go-systemd/machine1"
- #:unpack-path "github.com/coreos/go-systemd"))
- (native-inputs (list go-github-com-godbus-dbus))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for registering machines/containers")
- (description "Go bindings to systemd for registering
-machines/containers.")))
+@itemize
+@item @code{activation} - for writing and using socket activation from Go
+@item @code{daemon} - for notifying systemd of service status changes
+@item @code{dbus} - for starting/stopping/inspecting running services and units
+@item @code{journal} - for writing to systemd's logging service, journald
+@item @code{sdjournal} - for reading from journald by wrapping its C API
+@item @code{login1} - for integration with the systemd logind API
+@item @code{machine1} - for registering machines/containers with systemd
+@item @code{unit} - for (de)serialization and comparison of unit files
+@end itemize")
+ (license license:asl2.0)))
-(define-public go-github-com-coreos-go-systemd-sdjournal
+(define-public go-github-com-creack-pty
(package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-sdjournal")
+ (name "go-github-com-creack-pty")
+ (version "1.1.23")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/creack/pty")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1chx7ml9wlpk8pzgnnxb97gblmxz1j1v37m5i1asb94l5c24r1fg"))))
+ (build-system go-build-system)
(arguments
- '(#:tests? #f ;Tests require D-Bus daemon running.
- #:import-path "github.com/coreos/go-systemd/sdjournal"
- #:unpack-path "github.com/coreos/go-systemd"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-sdjournal-header
- (lambda* (#:key import-path #:allow-other-keys)
- (substitute* (format #f
- "src/~a/journal.go"
- import-path)
- (("systemd/sd-journal.h")
- "elogind/sd-journal.h")
- (("systemd/sd-id128.h")
- "elogind/sd-id128.h")))))))
- (inputs (list elogind))
- (synopsis "Go bindings to systemd for journald")
- (description "Go bindings to systemd for reading from journald by wrapping
-its C API.")))
-
-(define-public go-github-com-coreos-go-systemd-unit
- (package
- (inherit go-github-com-coreos-go-systemd-activation)
- (name "go-github-com-coreos-go-systemd-unit")
- (arguments
- '(#:tests? #f ;Tests require D-Bus daemon running.
- #:import-path "github.com/coreos/go-systemd/unit"
- #:unpack-path "github.com/coreos/go-systemd"))
- (native-inputs (list go-github-com-godbus-dbus))
- (home-page "https://github.com/coreos/go-systemd")
- (synopsis "Go bindings to systemd for working with unit files")
- (description "Go bindings to systemd for (de)serialization and comparison
-of unit files.")))
+ (list
+ #:import-path "github.com/creack/pty"
+ #:modules '((ice-9 popen)
+ (ice-9 textual-ports)
+ (guix build go-build-system)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-types
+ (lambda* (#:key import-path #:allow-other-keys)
+ ;; Generated files are included (ztypes_*). We need to remake
+ ;; them with Cgo.
+ (with-directory-excursion (string-append "src/" import-path)
+ (let* ((go-arch
+ #$(car (go-target
+ (or (%current-target-system)
+ (nix-system->gnu-triplet (%current-system))))))
+ (file (string-append "ztypes_" go-arch ".go"))
+ (pipe (open-input-pipe "go tool cgo -godefs types.go"))
+ (text (get-string-all pipe)))
+ (close-pipe pipe)
+ (for-each delete-file
+ (find-files (getcwd) (file-name-predicate
+ "ztypes_[a-zA-Z0-9_]+.go")))
+ (call-with-output-file file
+ (lambda (port)
+ (display text port))))))))))
+ (home-page "https://github.com/creack/pty")
+ (synopsis "Pseudoterminal handling in Go")
+ (description
+ "The pty package provides functions for working with Unix pseudoterminals.")
+ (license license:expat)))
(define-public go-github-com-cskr-pubsub
(package
(name "go-github-com-cskr-pubsub")
- (version "2.0.1")
+ (version "2.0.2")
(source
(origin
(method git-fetch)
@@ -840,12 +1690,11 @@ of unit files.")))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "18kqfdzkfs7z8266a5q5wldwkcvnhc7yw09b9vr8r0s7svy8d5s6"))))
+ (base32 "0iy85nxrfv6hp4i4mnqayjfx4hci7qyycqbaz4fx8wbd15n9ll66"))))
(build-system go-build-system)
(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")
@@ -882,6 +1731,73 @@ of unit files.")))
metrics to Graphite.")
(license license:bsd-2)))
+(define-public go-github-com-d4l3k-messagediff
+ (package
+ (name "go-github-com-d4l3k-messagediff")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/d4l3k/messagediff")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/d4l3k/messagediff"))
+ (home-page "https://github.com/d4l3k/messagediff")
+ (synopsis "Diff arbitrary Go structs")
+ (description
+ "Messagediff is a library for calculating diffs of arbitrary
+structs in the Go programming language.")
+ (license license:expat)))
+
+(define-public go-github-com-d5-tengo-v2
+ (package
+ (name "go-github-com-d5-tengo-v2")
+ (version "2.17.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/d5/tengo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12h7fg2hj9s64hzsv5mz0pl9q1hf1lw3b5k9fr40nfqlq1bw84da"))))
+ (build-system go-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ (list
+ #:import-path "github.com/d5/tengo/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda* (#:key import-path outputs #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (let* ((data (string-append #$output:doc "/share"))
+ (doc (string-append data "/doc/" #$name "-" #$version)))
+ (copy-recursively "docs/" doc))))))))
+ (home-page "https://github.com/d5/tengo")
+ (synopsis "Script language for Go")
+ (description
+ "Tengo is a small, dynamic, fast, secure script language for Go.
+Features:
+@itemize
+@item simple and highly readable syntax
+@item dynamic typing with type coercion
+@item higher-order functions and closures
+@item immutable values
+@item securely embeddable and extensible
+@item compiler/runtime written in native Go (no external deps or cgo)
+@item executable as a standalone language/REPL
+@item use cases: rules engine, state machine, data pipeline, transpiler
+@end itemize")
+ (license license:expat)))
+
(define-public go-github-com-danwakefield-fnmatch
(let ((commit "cbb64ac3d964b81592e64f957ad53df015803288")
(revision "0"))
@@ -925,7 +1841,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")
@@ -960,6 +1875,38 @@ gist (https://gist.github.com/kballard/272720).")
more complicated parallel cases.")
(license license:expat)))
+(define-public go-github-com-dennwc-varint
+ (package
+ (name "go-github-com-dennwc-varint")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dennwc/varint")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0w6fnh7i55155cv55cjdqq436zb2y08rglxvz58vv67bb4hj7dkk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/dennwc/varint"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; XXX: varint_test.go:94: unexpected error: -11.
+ (("TestUvarint") "OffTestUvarint"))))))))
+ (home-page "https://github.com/dennwc/varint")
+ (synopsis "Fast varint library for Golang")
+ (description
+ "This package provides an optimized implementation of protobuf's varint
+encoding/decoding. It has no dependencies.")
+ (license license:expat)))
+
(define-public go-github-com-dimchansky-utfbom
(package
(name "go-github-com-dimchansky-utfbom")
@@ -1031,6 +1978,96 @@ atimes for files.")
mtime,ctime and btime for files.")
(license license:expat)))
+(define-public go-github-com-dlclark-regexp2
+ (package
+ (name "go-github-com-dlclark-regexp2")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dlclark/regexp2")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/dlclark/regexp2"))
+ (home-page "https://github.com/dlclark/regexp2/")
+ (synopsis "Full featured regular expressions for Go")
+ (description
+ "Regexp2 is a feature-rich RegExp engine for Go.")
+ (license license:expat)))
+
+(define-public go-github-com-docopt-docopt-go
+ (let ((commit "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1")
+ (revision "0"))
+ (package
+ (name "go-github-com-docopt-docopt-go")
+ (version (git-version "0.6.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/docopt/docopt.go")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hlra7rmi5pmd7d93rv56ahiy4qkgmq8a6mz0jpadvbi5qh8lq6j"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/docopt/docopt-go"))
+ (home-page "https://github.com/docopt/docopt.go")
+ (synopsis "Implementation of docopt in Golang")
+ (description
+ "This package provides command-line arguments parser based on written
+help message which may simplify crating CLI applications, it's Golang
+implementation of http://docopt.org/.")
+ (license license:expat))))
+
+(define-public go-github-com-dsnet-golib
+ (package
+ (name "go-github-com-dsnet-golib")
+ (version "1.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dsnet/golib")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f314wzr16w6ix3bs7ginjkizgyl3b1r3j2gvvqzr8dv53r4s5cq"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/dsnet/golib"))
+ (home-page "https://github.com/dsnet/golib")
+ (synopsis "Collection of helper libraries for Golang")
+ (description
+ "@code{golib} is a collection of unrelated libraries.
+This package provides a following list of Golang models:
+@table @code
+@item bufpipe
+Implements a buffered pipe.
+@item cron
+Parses and runs cron schedules.
+@item hashmerge
+Merges hash checksums.
+@item jsoncs
+Implements JSON Canonicalization Scheme (JCS) as specified in RFC 8785.
+@item jsonfmt
+Implements a JSON formatter.
+@item memfile
+Implements an in-memory emulation of @code{os.File}.
+@item unitconv
+Implements string conversion functionality for unit prefixes.
+@end table")
+ (license license:bsd-3)))
+
(define-public go-github-com-dustin-gojson
(package
(name "go-github-com-dustin-gojson")
@@ -1058,8 +2095,7 @@ mtime,ctime and btime for files.")
"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
@@ -1067,10 +2103,46 @@ mtime,ctime and btime for files.")
scanner API made public.")
(license license:bsd-3)))
+(define-public go-github-com-edsrzf-mmap-go
+ (package
+ (name "go-github-com-edsrzf-mmap-go")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edsrzf/mmap-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11xpfcacfvmrkbp0pv4j8pg2gyjnxpfp7l93j42h0svwxywhjmrc"))))
+ (build-system go-build-system)
+ (propagated-inputs (list go-golang-org-x-sys))
+ (arguments
+ (list
+ #:import-path "github.com/edsrzf/mmap-go"))
+ (home-page "https://github.com/edsrzf/mmap-go")
+ (synopsis "Memory mapped fiels (mmap) in Golang")
+ (description
+ "This package implements functinoality of mapping files into memory. It
+tries to provide a simple interface, but doesn't go out of its way to abstract
+away every little platform detail.
+
+This specifically means:
+@itemize
+@item forked processes may or may not inherit mappings
+@item a file's timestamp may or may not be updated by writes through mappings
+@item specifying a size larger than the file's actual size can increase the
+file's size
+@item if the mapped file is being modified by another process while your
+program's running, don't expect consistent results between platforms
+@end itemize")
+ (license license:bsd-3)))
+
(define-public go-github-com-elliotchance-orderedmap
(package
(name "go-github-com-elliotchance-orderedmap")
- (version "1.5.1")
+ (version "1.6.0")
(source
(origin
(method git-fetch)
@@ -1079,19 +2151,262 @@ scanner API made public.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "06gq5hsgfmzfr46wds366ghyn16qkygyz83vrsgargf4l7db9zg7"))))
+ (base32 "1hhyk96l6mfijkay9ga6jqpczpn34fbqkjrqj3v9pf5p1hzd0xdx"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/elliotchance/orderedmap"))
+ (list
+ #:import-path "github.com/elliotchance/orderedmap"
+ #:unpack-path "github.com/elliotchance/orderedmap"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-submodule
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (delete-file-recursively "v2"))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ ;; The full test suite runs flaky performance tests, so only
+ ;; run the short tests.
+ (invoke "go" "test" "-test.short" "."))))))))
(native-inputs
(list go-github-com-stretchr-testify))
(home-page "https://github.com/elliotchance/orderedmap")
(synopsis "Go ordered map library")
(description
- "This package provides a ordered map library that maintains amortized O(1)
-for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.")
+ "This package provides a ordered map library that maintains amortized
+O(1) for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.")
(license license:expat)))
+(define-public go-github-com-elliotchance-orderedmap-v2
+ (package
+ (inherit go-github-com-elliotchance-orderedmap)
+ (name "go-github-com-elliotchance-orderedmap-v2")
+ (version "2.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elliotchance/orderedmap")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11bvia6cflq46nzc2hfgikgxyck7wskyi0i7ksy9r0d41l4jh4l9"))))
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments go-github-com-elliotchance-orderedmap)
+ ((#:import-path _) "github.com/elliotchance/orderedmap/v2")
+ ((#:phases _ '%standard-phases)
+ #~(modify-phases %standard-phases
+ (delete 'remove-submodule)))))))
+
+(define-public go-github-com-emersion-go-ical
+ (package
+ (name "go-github-com-emersion-go-ical")
+ (version "0.0.0-20240127095438-fc1c9d8fb2b6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-ical")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-ical"))
+ (propagated-inputs (list go-github-com-teambition-rrule-go))
+ (home-page "https://github.com/emersion/go-ical")
+ (synopsis "iCalendar library for Golang")
+ (description
+ "This package implements @url{https://tools.ietf.org/html/rfc5545, RFC
+5545} iCalendar specification.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-vcard
+ (package
+ (name "go-github-com-emersion-go-vcard")
+ (version "0.0.0-20230815062825-8fda7d206ec9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-vcard")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-vcard"))
+ (home-page "https://github.com/emersion/go-vcard")
+ (synopsis "Parse and format vCard in Golang")
+ (description
+ "This package implements functionality to parse and format vCard as
+specified in @url{https://datatracker.ietf.org/doc/html/rfc6350, RFC 6350}.")
+ (license license:expat)))
+
+(define-public go-github-com-emersion-go-webdav
+ (package
+ (name "go-github-com-emersion-go-webdav")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-webdav")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ay0x3c1frkj4z3j17s42yvf1hgmg8223qmsyr41yxwz88zsvjlj"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/emersion/go-webdav"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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-emersion-go-ical
+ go-github-com-emersion-go-vcard))
+ (home-page "https://github.com/emersion/go-webdav")
+ (synopsis "WebDAV, CalDAV and CardDAV implementations in Golang")
+ (description
+ "This package provides Golang modules implementing WebDAV
+@url{https://tools.ietf.org/html/rfc4918, RFC 4918}, CalDAV
+@url{https://tools.ietf.org/html/rfc4791, RFC 4791} and CardDAV
+@url{https://tools.ietf.org/html/rfc6352, RFC 6352} specifications.")
+ (license license:expat)))
+
+(define-public go-github-com-errata-ai-ini
+ (package
+ (name "go-github-com-errata-ai-ini")
+ (version "1.63.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/errata-ai/ini")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zs9dwxh8mzxm1zfck4ghs7hma1lz5ajh98kmyh888rn3npvrnm5"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/errata-ai/ini"))
+ (home-page "https://github.com/errata-ai/ini")
+ (synopsis "INI file read and write functionality in Golang")
+ (description
+ "This Package provides a functionality of INI file read and write,
+implementing features:
+@itemize
+@item load from multiple data sources(file, @code{[]byte}, @code{io.Reader}
+and @code{io.ReadCloser}) with overwrites
+@item read with recursion values
+@item read with parent-child sections
+@item read with auto-increment key names
+@item read with multiple-line values
+@item read with tons of helper methods
+@item read and convert values to Go types
+@item read and WRITE comments of sections and keys
+@item manipulate sections, keys and comments with ease
+@item keep sections and keys in order as you parse and save
+@end itemize")
+ (license license:asl2.0)))
+
+(define-public go-github-com-errata-ai-regexp2
+ (package
+ (inherit go-github-com-dlclark-regexp2)
+ (name "go-github-com-errata-ai-regexp2")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/errata-ai/regexp2")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0p28af5c7dn4knnksl9dxjb44cicsmadzb8kwzyyf20kr7hrq53q"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/errata-ai/regexp2"))
+ (home-page "https://github.com/errata-ai/regexp2")
+ (description
+ (string-append (package-description go-github-com-dlclark-regexp2)
+ " This package is a fork of dlclark/regexp2 providing a
+more similar API to regexp."))))
+
+(define-public go-github-com-expr-lang-expr
+ (package
+ (name "go-github-com-expr-lang-expr")
+ (version "1.16.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/expr-lang/expr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08p7gcxm7psgn1rzhhy2s2va59ssy77x8wd706gdp2pif7wln883"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/expr-lang/expr"))
+ (home-page "https://expr-lang.org/")
+ (synopsis "Expression language and expression evaluation for Go")
+ (description
+ "The package @strong{Expr} provides a Go-centric expression language
+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")
@@ -1120,7 +2435,7 @@ Alphanum Algorithm} developed by Dave Koelle in Go.")
(define-public go-github-com-fatih-color
(package
(name "go-github-com-fatih-color")
- (version "1.16.0")
+ (version "1.17.0")
(source
(origin
(method git-fetch)
@@ -1129,7 +2444,7 @@ Alphanum Algorithm} developed by Dave Koelle in Go.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "15689x103gy9q7g7623rlvhwrw27p079ardapmrrag0sdwrx5bq2"))))
+ (base32 "07axwr6016xwylxlsrw3cnkg1kg963zqqgf06pc3dgicfg5qrhj2"))))
(build-system go-build-system)
(arguments
(list
@@ -1144,10 +2459,72 @@ Alphanum Algorithm} developed by Dave Koelle in Go.")
defined output to the standard output.")
(license license:expat)))
+;; XXX: This repository has been archived by the owner on Nov 9, 2017. It is
+;; now read-only.
+(define-public go-github-com-flynn-archive-go-shlex
+ (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff")
+ (revision "0"))
+ (package
+ (name "go-github-com-flynn-archive-go-shlex")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/flynn-archive/go-shlex")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/flynn-archive/go-shlex"))
+ (synopsis "Go lexer")
+ (description
+ "Shlex is a simple lexer for go that supports shell-style
+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
+ ;; XXX: Check if the most of the tests may be enabled:
+ ;; src/github.com/fxamacker/cbor/v2/decode_test.go:328:9: cannot convert
+ ;; 1000000000000 (untyped int constant) to type uint
+ #:tests? (target-64bit?)
+ #: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")
- (version "1.4.3")
+ (version "1.4.5")
(source
(origin
(method git-fetch)
@@ -1156,11 +2533,10 @@ defined output to the standard output.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11swnjczhrza0xi8q2wlk056nnbcghm44vqs52zfv6rwqvy6imhj"))))
+ (base32 "1ris146v7k1x1n4vraq0xzjds0f7jw3scx9mzj8y29hql3sy4nkd"))))
(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
@@ -1195,6 +2571,61 @@ Differentiation between text and binary files}.
@end itemize")
(license license:expat)))
+(define-public go-github-com-go-kit-log
+ (package
+ (name "go-github-com-go-kit-log")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-kit/log")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xjv2g1cd1iaghhm1c1zw0lcz89a9zq5xradyjipvrbqxbxckqm6"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-kit/log"))
+ (propagated-inputs
+ (list go-github-com-go-logfmt-logfmt))
+ (home-page "https://github.com/go-kit/log")
+ (synopsis "Minimal and extensible structured logger")
+ (description
+ "This package provides a minimal interface for structured logging in
+services. It may be wrapped to encode conventions, enforce type-safety,
+provide leveled logging, and so on. It can be used for both typical
+application log events, and log-structured data streams.")
+ (license license:expat)))
+
+(define-public go-github-com-go-logfmt-logfmt
+ (package
+ (name "go-github-com-go-logfmt-logfmt")
+ (version "0.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-logfmt/logfmt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s3dz7z5a8p5ia5czihy5y2hkij7rdfyr425sw9rnxqil3d0dlj6"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-logfmt/logfmt"))
+ (home-page "https://github.com/go-logfmt/logfmt")
+ (synopsis "Marshal and unmarshal logfmt messages")
+ (description
+ "Package logfmt implements utilities to marshal and unmarshal data in the
+logfmt format. The logfmt format records key/value pairs in a way that
+balances readability for humans and simplicity of computer parsing. It is
+most commonly used as a more human friendly alternative to JSON for structured
+logging.")
+ (license license:expat)))
+
(define-public go-github-com-go-logr-logr
(package
(name "go-github-com-go-logr-logr")
@@ -1211,7 +2642,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
@@ -1231,6 +2661,151 @@ interfaces to back that API. Packages in the Go ecosystem can depend on it,
while callers can implement logging with whatever backend is appropriate.")
(license license:asl2.0)))
+(define-public go-github-com-go-logr-stdr
+ (package
+ (name "go-github-com-go-logr-stdr")
+ (version "1.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-logr/stdr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dl2rzvjacwqlnvw7azrxqbh4jvzaq8v399f6drs146l39ss21c1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests for stdr.go
+ #:import-path "github.com/go-logr/stdr"))
+ (propagated-inputs
+ (list go-github-com-go-logr-logr))
+ (home-page "https://github.com/go-logr/stdr")
+ (synopsis "Minimal Go logging using logr and Go's standard library")
+ (description
+ "Package stdr implements github.com/go-logr/logr.Logger in terms of Go's
+standard log package.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-go-playground-locales
+ (package
+ (name "go-github-com-go-playground-locales")
+ (version "0.14.1")
+ (home-page "https://github.com/go-playground/locales")
+ (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 "117nss5gv7rfzr7z40rkpwfr273wv6ahrd3ycqdarxvaxh0ldhh4"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/go-playground/locales"))
+ (propagated-inputs
+ (list go-golang-org-x-text))
+ (synopsis "Set of locales generated from the CLDR Unicode Project")
+ (description
+ "This package provides a set of locales generated from the
+@uref{http://cldr.unicode.org/, Unicode CLDR Project} which can be used
+independently or within an internalization (i18n) package. Its currently
+implemented features include
+
+@itemize
+@item Rules generated from the CLDR data, v31.0.3
+@item Contains Cardinal, Ordinal and Range Plural Rules
+@item Contains Month, Weekday and Timezone translations built in
+@item Contains Date & Time formatting functions
+@item Contains Number, Currency, Accounting and Percent formatting functions
+@item Supports the \"Gregorian\" calendar only
+@end itemize")
+ (license license:expat)))
+
+(define-public go-github-com-go-stack-stack
+ (package
+ (name "go-github-com-go-stack-stack")
+ (version "1.8.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-stack/stack")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01m6l9w84yq2yyly8bdfsgc386hla1gn9431c7vr3mfa3bchj5wb"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-stack/stack"))
+ (home-page "https://github.com/go-stack/stack")
+ (synopsis "Utilities to capture, manipulate, and format call stacks")
+ (description
+ "Package @code{stack} implements utilities to capture, manipulate,
+and format call stacks. It provides a simpler API than package
+@code{runtime}. The implementation takes care of the minutia and special
+cases of interpreting the program counter (pc) values returned by
+@code{runtime.Callers}.")
+ (license license:expat)))
+
+(define-public go-github-com-go-task-slim-sprig
+ (let ((commit "afa1e2071829e4db655eb448d6c7c16eb0bc5766")
+ (revision "0"))
+ (package
+ (name "go-github-com-go-task-slim-sprig")
+ (version (git-version "2.20.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-task/slim-sprig")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1185y8qygv8gb3wpghx5d945wq68j4dbaiffq3h0dh453g4h1w7a"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/go-task/slim-sprig"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file
+ (string-append "src/" import-path "/network_test.go")))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/go-task/slim-sprig")
+ (synopsis "Various useful template functions for Go")
+ (description
+ "Sprig provides over 100 functions that extend the Go template system.
+Slim-Sprig is a fork of Sprig that removes all external dependencies to make
+the library more lightweight.")
+ (license license:expat))))
+
+(define-public go-github-com-go-task-slim-sprig-v3
+ (package
+ (inherit go-github-com-go-task-slim-sprig)
+ (name "go-github-com-go-task-slim-sprig-v3")
+ (version "3.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-task/slim-sprig")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h6m9n8w6yk0fp1kpk574kac6l3ibkh71myjakvns1nmqphb085w"))))
+ (build-system go-build-system)
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments go-github-com-go-task-slim-sprig)
+ ((#:import-path _) "github.com/go-task/slim-sprig/v3")))))
+
(define-public go-github-com-gobwas-glob
(package
(name "go-github-com-gobwas-glob")
@@ -1255,6 +2830,210 @@ while callers can implement logging with whatever backend is appropriate.")
"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.12.0")
+ (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 "06sf7vpz8gjyivrn3yhzcbbf3qhsqq5n7lsc23j91xw5xwpn37bk"))))
+ (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))
+ (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-gofrs-flock
+ (package
+ (name "go-github-com-gofrs-flock")
+ (version "0.12.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gofrs/flock/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kfnbcahr9x61k40wsrqzxxr3ybix0jqsm4ibpjgnhfgrln7ag8v"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/gofrs/flock"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/gofrs/flock/")
+ (synopsis "Thread-safe file locking library in Go")
+ (description
+ "@code{flock} implements a thread-safe file lock. It also includes a
+non-blocking @code{TryLock} function to allow locking without blocking
+execution.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-google-renameio
+ (package
+ (name "go-github-com-google-renameio")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/renameio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qn84nra9nxqyqg4i496b6ijbhnxvx66hdndwl7qh7r6q8lz2ba5"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/google/renameio"))
+ (home-page "https://github.com/google/renameio/")
+ (synopsis "Atomically create or replace a file or symbolic link")
+ (description
+ "@code{renameio} Go package provides a way to atomically create or
+replace a file or symbolic link.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-google-renameio-v2
+ (package/inherit go-github-com-google-renameio
+ (name "go-github-com-google-renameio-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/renameio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13vc7p43zz5pmgli4k18b15khxpca1zd8v1ga0ryq7ddyz55fg7i"))))
+ (arguments
+ (list
+ #:import-path "github.com/google/renameio/v2"))))
+
+(define-public go-github-com-google-subcommands
+ (package
+ (name "go-github-com-google-subcommands")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/subcommands")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00w7fx92696z5p3isvpg71b4023g8f686xnhy56k08vc2q1r2hhw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/google/subcommands"))
+ (home-page "https://github.com/google/subcommands")
+ (synopsis "Go subcommand library")
+ (description
+ "@code{subcommands} implements a functionality for a single command to
+have many subcommands, each of which takes arguments.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-gookit-color
+ (package
+ (name "go-github-com-gookit-color")
+ (version "1.5.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gookit/color")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "012naz084chvdqzrrzv9pklqfh259hi2jcp2f3n39fppvjwmzgkf"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/gookit/color"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ ;; Error: Received unexpected
+ ;; error: open README.md: permission denied.
+ ;; Reported upstream, see
+ ;; <https://github.com/gookit/color/pull/91>.
+ (substitute* "utils_test.go"
+ (("os.O_WRONLY") "os.O_RDONLY"))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-xo-terminfo
+ go-golang-org-x-sys))
+ (home-page "https://github.com/gookit/color")
+ (synopsis "Terminal color rendering library")
+ (description
+ "This package provides a command-line color library with 16/256/True
+color support, universal API methods and Windows support.
+
+Features:
+@itemize
+@item supports rich color output: 16-color (4-bit), 256-color (8-bit), true
+color (24-bit, RGB)
+@item support converts HEX HSL value to RGB color
+@item generic API methods: @code{Print}, @code{Printf}, @code{Println},
+@code{Sprint}, @code{Sprintf}
+@item supports HTML tag-style color rendering, such as @code{<green>message</>
+<fg=red;bg=blue>text</>}
+@item basic colors: @code{Bold}, @code{Black}, @code{White}, @code{Gray},
+@code{Red}, @code{Green}, @code{Yellow}, @code{Blue}, @code{Magenta},
+@code{Cyan}
+@item additional styles: @code{Info}, @code{Note}, @code{Light}, @code{Error},
+@code{Danger}, @code{Notice}, @code{Success}, @code{Comment}, @code{Primary},
+@code{Warning}, @code{Question}, @code{Secondary}
+@item support by set @code{NO_COLOR} for disable color or use
+@code{FORCE_COLOR} for force open color render
+@item support RGB, 256, 16 color conversion
+@end itemize")
+ (license license:expat)))
+
(define-public go-github-com-hashicorp-errwrap
(package
(name "go-github-com-hashicorp-errwrap")
@@ -1455,13 +3234,61 @@ Groupcache.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0lb2ylv2bz6lsqhn6c2hsafjjcx0hsdbah6arhb778g3xbkpgvf3"))))
+ (base32 "0lb2ylv2bz6lsqhn6c2hsafjjcx0hsdbah6arhb778g3xbkpgvf3"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Submodule(s) with their own go.mod files and packed as
+ ;; separated packages:
+ ;;
+ ;; - github.com/hashicorp/golang-lru/arc/v2
+ (for-each delete-file-recursively
+ (list "arc"))))))
(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-golang-lru-arc-v2
+ (package
+ (name "go-github-com-hashicorp-golang-lru-arc-v2")
+ (version "2.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hashicorp/golang-lru")
+ (commit (string-append "arc/v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jin9spx8mv3ynnnyplfmf7plxkym398aaqq04i7zklb716ld4gq"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; It's a helper for go-build-system to compile import-path and
+ ;; unpack-path when it struggles to find module.
+ #~(begin
+ (mkdir "arc/v2")
+ (for-each (lambda (f)
+ (rename-file f (string-append "arc/v2/" (basename f))))
+ (find-files "./arc"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/hashicorp/golang-lru/arc/v2"
+ #:unpack-path "github.com/hashicorp/golang-lru"))
+ (propagated-inputs
+ (list go-github-com-hashicorp-golang-lru-v2))
+ (home-page "https://github.com/hashicorp/golang-lru")
+ (synopsis "Adaptive Replacement Cache")
+ (description
+ "@acronym{Adaptive Replacement Cache,ARC} is an enhancement over the
+standard LRU cache in that tracks both frequency and recency of use. This
+avoids a burst in access to new entries from evicting the frequently used
+older entries. It adds some additional tracking overhead to a standard LRU
+cache, computationally it is roughly 2x the cost, and the extra memory
+overhead is linear with the size of the cache.")
+ (license license:mpl2.0)))
+
(define-public go-github-com-hashicorp-hcl
(package
(name "go-github-com-hashicorp-hcl")
@@ -1551,6 +3378,57 @@ expressing configuration which is easy for both humans and machines to read.")
@end itemize")
(license license:bsd-3)))
+(define-public go-github-com-ianlancetaylor-demangle
+ ;; No release, see <https://github.com/ianlancetaylor/demangle/issues/21>.
+ (package
+ (name "go-github-com-ianlancetaylor-demangle")
+ (version "0.0.0-20230524184225-eabc099b10ab")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ianlancetaylor/demangle")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pvlg1adp50hnw8dz7il473xb197ixirg26cy5hj3ngb4qlajwvc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ianlancetaylor/demangle"))
+ (home-page "https://github.com/ianlancetaylor/demangle")
+ (synopsis "Symbol name demangler written in Go")
+ (description
+ "This package defines functions that demangle GCC/LLVM C++ and Rust
+symbol names. This package recognizes names that were mangled according to
+the C++ ABI defined at https://codesourcery.com/cxx-abi/ and the
+@url{https://rust-lang.github.io/rfcs/2603-rust-symbol-name-mangling-v0.html,Rust
+ABI}.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-itchyny-timefmt-go
+ (package
+ (name "go-github-com-itchyny-timefmt-go")
+ (version "0.1.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/itchyny/timefmt-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ldagirn1wh3klkk1rr96d5b5jbn24aib14x3j73x47cjfqi92wf"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/itchyny/timefmt-go"))
+ (home-page "https://github.com/itchyny/timefmt-go")
+ (synopsis "Efficient time formatting library (strftime, strptime) for Golang")
+ (description
+ "@code{timefmt-go} is a Go language package for formatting and parsing date
+time strings.")
+ (license license:expat)))
+
(define-public go-github-com-jbenet-go-random
(package
(name "go-github-com-jbenet-go-random")
@@ -1628,6 +3506,55 @@ more like a Context-WaitGroup hybrid. @code{goprocess} is about being able to s
and stop units of work, which may receive @code{Close} signals from many clients.")
(license license:expat)))
+(define-public go-github-com-jdkato-twine
+ (package
+ (name "go-github-com-jdkato-twine")
+ (version "0.10.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jdkato/twine")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (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
+ #:import-path "github.com/jdkato/twine"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (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
+ go-github-com-errata-ai-regexp2))
+ (home-page "https://github.com/jdkato/twine")
+ (synopsis "NLP-related string utilities")
+ (description
+ "NLP-related string utility functions for Golang.")
+ (license license:expat)))
+
(define-public go-github-com-jinzhu-copier
(package
(name "go-github-com-jinzhu-copier")
@@ -1703,33 +3630,55 @@ storing only one copy of each unique string in memory. All functions may be
called concurrently with themselves and each other.")
(license license:expat)))
-(define-public go-github-com-ianlancetaylor-demangle
- ;; No release, see <https://github.com/ianlancetaylor/demangle/issues/21>.
+(define-public go-github-com-jpillora-backoff
+ (let ((commit "fab01a9d9810a410d2d95a0a697f0afb604658f9")
+ (revision "1"))
+ (package
+ (name "go-github-com-jpillora-backoff")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jpillora/backoff")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0irpxdjvwmfd1njvws5x466ar8faiwjnnna26jnly9sw1b0h1b89"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/jpillora/backoff"))
+ (home-page "https://github.com/jpillora/backoff")
+ (synopsis "Simple exponential backoff counter in Go")
+ (description
+ "This package is a simple exponential backoff counter in Go.")
+ (license license:expat))))
+
+(define-public go-github-com-k0kubun-go-ansi
(package
- (name "go-github-com-ianlancetaylor-demangle")
- (version "0.0.0-20230524184225-eabc099b10ab")
+ (name "go-github-com-k0kubun-go-ansi")
+ (version "0.0.0-20180517002512-3bf9e2903213")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ianlancetaylor/demangle")
+ (url "https://github.com/k0kubun/go-ansi")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1pvlg1adp50hnw8dz7il473xb197ixirg26cy5hj3ngb4qlajwvc"))))
+ (base32 "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"))))
(build-system go-build-system)
(arguments
(list
- #:import-path "github.com/ianlancetaylor/demangle"))
- (home-page "https://github.com/ianlancetaylor/demangle")
- (synopsis "Symbol name demangler written in Go")
+ #:import-path "github.com/k0kubun/go-ansi"))
+ (home-page "https://github.com/k0kubun/go-ansi")
+ (synopsis "Windows-portable ANSI escape sequence utility for Golang")
(description
- "This package defines functions that demangle GCC/LLVM C++ and Rust
-symbol names. This package recognizes names that were mangled according to
-the C++ ABI defined at https://codesourcery.com/cxx-abi/ and the
-@url{https://rust-lang.github.io/rfcs/2603-rust-symbol-name-mangling-v0.html,Rust
-ABI}.")
- (license license:bsd-3)))
+ "This library converts ANSI escape sequences to Windows API calls on
+Windows environment. You can easily use this feature by replacing fmt with
+ansi.")
+ (license license:expat)))
(define-public go-github-com-k0kubun-pp
(package
@@ -1808,6 +3757,76 @@ word-splitting rules.")
(home-page "https://github.com/kballard/go-shellquote")
(license license:expat))))
+(define-public go-github-com-klauspost-cpuid
+ (package
+ (name "go-github-com-klauspost-cpuid")
+ (version "1.2.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/klauspost/cpuid")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/klauspost/cpuid"))
+ (home-page "https://github.com/klauspost/cpuid")
+ (synopsis "CPU feature identification for Go")
+ (description
+ "@code{cpuid} provides information about the CPU running the current
+program. CPU features are detected on startup, and kept for fast access
+through the life of the application. Currently x86 / x64 (AMD64) is
+supported, and no external C (cgo) code is used, which should make the library
+very eas to use.")
+ (license license:expat)))
+
+(define-public go-github-com-klauspost-cpuid-v2
+ (package
+ (inherit go-github-com-klauspost-cpuid )
+ (name "go-github-com-klauspost-cpuid-v2")
+ (version "2.2.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/klauspost/cpuid")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fys5v9vslar483arj7wy4id5kg1c7vqv4437kgjnwvki69j9mxf"))))
+ (arguments
+ (list
+ #:import-path "github.com/klauspost/cpuid/v2"))))
+
+(define-public go-github-com-kr-pretty
+ (package
+ (name "go-github-com-kr-pretty")
+ (version "0.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kr/pretty")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19d4ycy22il43s4pnr7jv1aahp87wa1p16zpis5jdiiyfgni2l8f"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/kr/pretty"))
+ (propagated-inputs
+ (list go-github-com-kr-text go-github-com-rogpeppe-go-internal))
+ (home-page "https://github.com/kr/pretty")
+ (synopsis "Pretty printer for Go values")
+ (description
+ "This package provides a pretty printer for Go values.")
+ (license license:expat)))
+
(define-public go-github-com-lestrrat-go-envload
(package
(name "go-github-com-lestrrat-go-envload")
@@ -1899,6 +3918,81 @@ pattern is called repeatedly.")
database/sql package.")
(license license:expat)))
+(define-public go-github-com-libp2p-go-buffer-pool
+ (package
+ (name "go-github-com-libp2p-go-buffer-pool")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-buffer-pool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0514rsnin6wjqifpg66dp5nrwh40smqlkgs3kxyz9cansi78c2n1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-buffer-pool"))
+ (home-page "https://github.com/libp2p/go-buffer-pool")
+ (synopsis "Variable size buffer pool for Golang")
+ (description
+ "This package provides a variable size buffer pool for Golang.
+
+@code{go-buffer-pool} provides:
+@itemize
+@item @code{BufferPool}: A pool for re-using byte slices of varied sizes.
+This pool will always return a slice with at least the size requested and a capacity
+up to the next power of two. Each size class is pooled independently which makes the
+@code{BufferPool} more space efficient than a plain @code{sync.Pool} when used in
+situations where data size may vary over an arbitrary range.
+@item @code{Buffer}: a buffer compatible with @code{bytes.Buffer} but backed by a
+@code{BufferPool}. Unlike @code{bytes.Buffer}, @code{Buffer} will automatically
+shrink on read, using the buffer pool to avoid causing too much work for the
+allocator. This is primarily useful for long lived buffers that usually sit empty.
+@end itemize")
+ ;; There are two license files provided by the project: LICENSE and
+ ;; LICENSE-BSD.
+ (license (list license:expat license:bsd-3))))
+
+(define-public go-github-com-libp2p-go-msgio
+ (package
+ (name "go-github-com-libp2p-go-msgio")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-msgio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "005cdmkcgsfqlf8478wxyzmy5iixqa8fhjrbig912n8ngnqx1029"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/libp2p/go-msgio"
+ #: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" "./..."))))))))
+ (propagated-inputs
+ (list go-github-com-gogo-protobuf
+ go-github-com-libp2p-go-buffer-pool
+ go-github-com-multiformats-go-varint
+ go-google-golang-org-protobuf))
+ (home-page "https://github.com/libp2p/go-msgio")
+ (synopsis "Read and write length-delimited slices")
+ (description
+ "@code{go-msgio} implements functionality to read and write
+length-delimited slices. It's helpful for building wire protocols.")
+ (license license:expat)))
+
(define-public go-github-com-logrusorgru-aurora
(package
(name "go-github-com-logrusorgru-aurora")
@@ -1959,7 +4053,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))))
@@ -1999,6 +4092,83 @@ implementing features like:
@end itemize")
(license license:expat))))
+(define-public go-github-com-masterminds-semver-v3
+ (package
+ (name "go-github-com-masterminds-semver-v3")
+ (version "3.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Masterminds/semver")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h4c647dgq6k5q78j3m98ccdrzd7kbcq4ahdy25j72rbxjmci8al"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/Masterminds/semver/v3"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/Masterminds/semver/")
+ (synopsis "@code{semver} helps to work with semantic versions")
+ (description
+ "The semver package provides the ability to work with
+semantic versions. Specifically it provides the ability to:
+@itemize
+@item Parse semantic versions
+@item Sort semantic versions
+@item Check if a semantic version fits within a set of constraints
+@item Optionally work with a @code{v} prefix
+@end itemize")
+ (license license:expat)))
+
+(define-public go-github-com-masterminds-sprig-v3
+ (package
+ (name "go-github-com-masterminds-sprig-v3")
+ (version "3.2.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Masterminds/sprig")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1gkwalx8j8h1jdhk6dz8bq8zp7vivxvcivr83dcq0h6nrn4xjqnl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/Masterminds/sprig/v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Tests tries to reach Google:
+ ;; tpl := `{{"www.google.com" | getHostByName}}`
+ (add-after 'unpack 'remove-network-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file
+ (string-append "src/" import-path "/network_test.go")))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-google-uuid
+ go-github-com-huandu-xstrings
+ go-github-com-imdario-mergo
+ go-github-com-masterminds-goutils
+ go-github-com-masterminds-semver-v3
+ go-github-com-mitchellh-copystructure
+ go-github-com-mitchellh-reflectwalk
+ go-github-com-shopspring-decimal
+ go-github-com-spf13-cast
+ go-golang-org-x-crypto))
+ (home-page "https://github.com/Masterminds/sprig/")
+ (synopsis "Template functions for Go templates")
+ (description
+ "Sprig is a library that provides more than 100 commonly used template
+functions.")
+ (license license:expat)))
+
(define-public go-github-com-matryer-try
(package
(name "go-github-com-matryer-try")
@@ -2111,7 +4281,7 @@ whether a file descriptor points to a terminal and the type of the terminal.")
(define-public go-github-com-mattn-go-runewidth
(package
(name "go-github-com-mattn-go-runewidth")
- (version "0.0.14")
+ (version "0.0.16")
(source
(origin
(method git-fetch)
@@ -2120,7 +4290,7 @@ whether a file descriptor points to a terminal and the type of the terminal.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1iaqw5pd7f4f2xz37540kp0828p2820g4vxx3hz089hwl331sx1v"))))
+ (base32 "0d7wbfz1kd3m0a4sx0ijrnbn4kw3bhn6myvnk76s19h8zjvafbrl"))))
(build-system go-build-system)
(arguments
(list
@@ -2164,10 +4334,36 @@ string.")
the @code{cpan} module @code{Parse::CommandLine}.")
(license license:expat)))
+(define-public go-github-com-mattn-go-sixel
+ (package
+ (name "go-github-com-mattn-go-sixel")
+ (version "0.0.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mattn/go-sixel")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0icv1mcavdw867s47kwvd16q19h2a4znph850lyq18d5z00kpjjs"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/mattn/go-sixel"))
+ (propagated-inputs
+ (list go-github-com-soniakeys-quant))
+ (home-page "https://github.com/mattn/go-sixel")
+ (synopsis "DRCS/Sixel Encoder/Decoder")
+ (description
+ "This package implements functionality to encode and decode
+@acronym{DRCS,Dynamically Redefinable Character Sets} Sixel.")
+ (license license:expat)))
+
(define-public go-github-com-mattn-go-sqlite3
(package
(name "go-github-com-mattn-go-sqlite3")
- (version "1.14.6")
+ (version "1.14.22")
(source
(origin
(method git-fetch)
@@ -2176,7 +4372,7 @@ the @code{cpan} module @code{Parse::CommandLine}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "04anvqkc37mmc3z1dy4xfa6cas67zlxnnab0ywii7sylk864mhxz"))))
+ (base32 "05fcdh6likz0hkvxnrkz3r3l5gzxfjh93w5015m9hs1wi6qpdqyb"))))
(build-system go-build-system)
(arguments
(list
@@ -2188,6 +4384,35 @@ the @code{cpan} module @code{Parse::CommandLine}.")
@code{database/sql}.")
(license license:expat)))
+(define-public go-github-com-mattn-go-tty
+ (package
+ (name "go-github-com-mattn-go-tty")
+ (version "0.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mattn/go-tty")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "09ndgwrx99jqaakmhk4v2pnai9h2mvryapc3qg6i33v2x809y6z6"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/mattn/go-tty"))
+ (propagated-inputs
+ (list go-github-com-mattn-go-colorable
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-runewidth
+ go-golang-org-x-sys))
+ (home-page "https://github.com/mattn/go-tty")
+ (synopsis "Simple TTY utility for Golang")
+ (description
+ "This package provides a TTY utilities implementation for verity of
+operation systems.")
+ (license license:expat)))
+
(define-public go-github-com-mattn-go-zglob
(package
(name "go-github-com-mattn-go-zglob")
@@ -2212,6 +4437,45 @@ the @code{cpan} module @code{Parse::CommandLine}.")
other directories. It is optimized for filewalking.")
(license license:expat)))
+(define-public go-github-com-matttproud-golang-protobuf-extensions-v2
+ (package
+ (name "go-github-com-matttproud-golang-protobuf-extensions-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/matttproud/golang_protobuf_extensions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/matttproud/golang_protobuf_extensions/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Activate when go-build-system supports submodules.
+ (delete 'build)
+ ;; 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-golang-protobuf
+ go-google-golang-org-protobuf))
+ (home-page "https://github.com/matttproud/golang_protobuf_extensions")
+ (synopsis "Streaming Protocol Buffers in Go")
+ (description
+ "This package provides various Protocol Buffer extensions for the Go
+language, namely support for record length-delimited message streaming.")
+ (license license:asl2.0)))
+
(define-public go-github-com-mgutz-ansi
(let ((commit "9520e82c474b0a04dd04f8a40959027271bab992")
(revision "0"))
@@ -2240,35 +4504,28 @@ other directories. It is optimized for filewalking.")
colored strings.")
(license license:expat))))
-(define-public go-github-com-miekg-dns
+(define-public go-github-com-mitchellh-colorstring
(package
- (name "go-github-com-miekg-dns")
- (version "1.1.48")
+ (name "go-github-com-mitchellh-colorstring")
+ (version "0.0.0-20190213212951-d06e56a500db")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/miekg/dns")
- (commit (string-append "v" version))))
+ (url "https://github.com/mitchellh/colorstring")
+ (commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
- (base32 "14m4wnbgmc1prj4ds1fsz1nwb1awaq365lhbp8clzsidxmhjf3hl"))))
+ (base32 "1d2mi5ziszfzdgaz8dg4b6sxa63nw1jnsvffacqxky6yz9m623kn"))))
(build-system go-build-system)
- (arguments '(#:import-path "github.com/miekg/dns"))
- (propagated-inputs
- (list go-golang-org-x-tools
- go-golang-org-x-sys
- go-golang-org-x-sync
- go-golang-org-x-net))
- (home-page "https://github.com/miekg/dns")
- (synopsis "Domain Name Service library in Go")
- (description
- "This package provides a fully featured interface to the @acronym{DNS,
-Domain Name System}. Both server and client side programming is supported.
-The package allows complete control over what is sent out to the @acronym{DNS,
-Domain Name Service}. The API follows the less-is-more principle, by
-presenting a small interface.")
- (license license:bsd-3)))
+ (arguments
+ (list
+ #:import-path "github.com/mitchellh/colorstring"))
+ (home-page "https://github.com/mitchellh/colorstring")
+ (synopsis "Functions to colorize strings for terminal output")
+ (description
+ "Colorstring provides functions for colorizing strings for terminal output.")
+ (license license:expat)))
(define-public go-github-com-modern-go-concurrent
(package
@@ -2317,6 +4574,31 @@ explicit ownership.")
without the runtime cost of the standard library reflect.Value.")
(license license:asl2.0)))
+(define-public go-github-com-mohae-deepcopy
+ (package
+ (name "go-github-com-mohae-deepcopy")
+ (version "0.0.0-20170308212314-bb9b5e7adda9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mohae/deepcopy")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "173j05wv4yy8jh9ccjw46xfy1knxwvv1ir6b8l6g9pc5j5damm1f"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/mohae/deepcopy"))
+ (home-page "https://github.com/mohae/deepcopy")
+ (synopsis "Copy of pointers and values for Golang")
+ (description
+ "@code{deepcopy} implements a functionality of deep copies of things. A
+standard @code{copy} will copy the pointers where @code{deepcopy} copies the
+values pointed to. Unexported field values are not copied.")
+ (license license:expat)))
+
(define-public go-github-com-mreiferson-go-options
(package
(name "go-github-com-mreiferson-go-options")
@@ -2368,6 +4650,153 @@ command line flags, config files, and default struct values.")
@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
(license license:expat))))
+(define-public go-github-com-msteinert-pam
+ (package
+ (name "go-github-com-msteinert-pam")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/msteinert/pam")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qnr0zxyxny85andq3cbj90clmz2609j8z9mp0zvdyxiwryfhyhj"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; To run the full suite, the tests must be run as the root user.
+ #:tests? #f
+ #:import-path "github.com/msteinert/pam"))
+ (propagated-inputs
+ (list go-golang-org-x-term
+ ;; For header files, otherwise it needs to be added as an input in
+ ;; final package to prevent build failure:
+ ;; ../../../github.com/msteinert/pam/transaction.go:7:10: fatal
+ ;; error: security/pam_appl.h: No such file or directory
+ linux-pam))
+ (home-page "https://github.com/msteinert/pam")
+ (synopsis "Golang wrapper module for the PAM API")
+ (description
+ "This package provides a wrapper for the @acronym{Pluggable
+Authentication Modules, PAM} application API.")
+ (license license:bsd-2)))
+
+(define-public go-github-com-msteinert-pam-v2
+ (package
+ (inherit go-github-com-msteinert-pam)
+ (name "go-github-com-msteinert-pam-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/msteinert/pam")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h02dcx00vgcsxgl5sly82dbixk8cimjb10q5p405bf4fz8z7q6k"))))
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments go-github-com-msteinert-pam)
+ ((#:import-path _ "github.com/msteinert/pam")
+ "github.com/msteinert/pam/v2")))))
+
+(define-public go-github-com-muesli-cancelreader
+ (package
+ (name "go-github-com-muesli-cancelreader")
+ (version "0.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/muesli/cancelreader")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0157mgpk0z45xizrgrz73swhky0d8nyk6fhwb089n1290k7yjhxq"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/muesli/cancelreader"))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/muesli/cancelreader")
+ (synopsis "Cancelable reader for Golang")
+ (description
+ "This package provides a cancelable reader for Go.")
+ (license license:expat)))
+
+(define-public go-github-com-muesli-reflow
+ (package
+ (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 name version))
+ (sha256
+ (base32 "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry"))))
+ (build-system go-build-system)
+ (arguments
+ (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.")
+ (license license:expat)))
+
+(define-public go-github-com-muesli-termenv
+ (package
+ (name "go-github-com-muesli-termenv")
+ (version "0.15.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/muesli/termenv")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19yhli6k79aqpra4djp0cl4q76mqxbc1f7in20y0dzhnjb7yz42p"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/muesli/termenv"))
+ (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-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 terminal.
+It gathers information about the terminal environment in terms of its ANSI and
+color support and offers you convenient methods to colorize and style your
+output, without you having to deal with all kinds of weird ANSI escape
+sequences and color conversions.")
+ (license license:expat)))
+
(define-public go-github-com-multiformats-go-base32
(package
(name "go-github-com-multiformats-go-base32")
@@ -2430,7 +4859,6 @@ command line flags, config files, and default struct values.")
(build-system go-build-system)
(arguments
(list
- #:go go-1.21
#:import-path "github.com/multiformats/go-multibase"
#:phases
#~(modify-phases %standard-phases
@@ -2470,7 +4898,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
@@ -2529,7 +4956,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
@@ -2564,33 +4990,84 @@ varints.")
very fast, and tries to be entropy pool friendly.")
(license license:asl2.0)))
-(define-public go-github-com-nbrownus-go-metrics-prometheus
+(define-public go-github-com-neurosnap-sentences
(package
- (name "go-github-com-nbrownus-go-metrics-prometheus")
- (version "0.0.0-20210712211119-974a6260965f")
+ (name "go-github-com-neurosnap-sentences")
+ (version "1.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/nbrownus/go-metrics-prometheus")
- (commit (go-version->git-ref version))))
+ (url "https://github.com/neurosnap/sentences")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0"))))
+ (base32 "0qkq635x54mqzydxmifh2l0kicacgqcbkw4vli1cnwwcs0x902f2"))))
(build-system go-build-system)
- (arguments '(#:import-path "github.com/nbrownus/go-metrics-prometheus"))
- (native-inputs
- (list go-github-com-stretchr-testify))
+ (arguments
+ (list
+ #:import-path "github.com/neurosnap/sentences"))
+ (home-page "https://github.com/neurosnap/sentences")
+ (synopsis "Multilingual command line sentence tokenizer in Golang")
+ (description
+ "This package provides functionality of converting a blob of text into a
+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-github-com-prometheus-client-golang
- go-github-com-rcrowley-go-metrics))
- (home-page "https://github.com/nbrownus/go-metrics-prometheus")
- (synopsis "Prometheus support for go-metrics")
+ (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 reporter for the @code{go-metrics} library which
-posts the metrics to the Prometheus client registry and just updates the
-registry.")
- (license license:asl2.0)))
+ "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
@@ -2641,6 +5118,93 @@ queue.")
NSQ protocol @url{https://nsq.io/}.")
(license license:expat)))
+(define-public go-github-com-oklog-run
+ (package
+ (name "go-github-com-oklog-run")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oklog/run")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/oklog/run"))
+ (home-page "https://github.com/oklog/run")
+ (synopsis "Universal mechanism to manage goroutine lifecycles")
+ (description
+ "@code{run.Group} is a universal mechanism to manage goroutine
+lifecycles, written to manage component lifecycles in @code{func main} for OK
+Log. It's useful in any circumstance where you need to orchestrate multiple
+goroutines as a unit whole.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-oklog-ulid
+ (package
+ (name "go-github-com-oklog-ulid")
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oklog/ulid")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq"))
+ (snippet
+ #~(begin (use-modules (guix build utils))
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/oklog/ulid"))
+ (home-page "https://github.com/oklog/ulid")
+ (synopsis "Universally Unique Lexicographically Sortable Identifier in Golang")
+ (description
+ "This package implements @acronym{ULID, Universally Unique
+Lexicographically Sortable Identifier} as specificed in
+@url{https://github.com/ulid/spec}.
+
+Features of ULID:
+@itemize
+@item 128-bit compatibility with UUID
+@item 1.21e+24 unique ULIDs per millisecond
+@item lexicographically sortable
+@item canonically encoded as a 26 character string, as opposed to the 36
+character UUID
+@item uses Crockford's base32 for better efficiency and readability (5 bits
+per character)
+@item case insensitive
+@item no special characters (URL safe)
+@item monotonic sort order (correctly detects and handles the same
+millisecond)
+@end itemize")
+ (license license:asl2.0)))
+
+(define-public go-github-com-oklog-ulid-v2
+ (package
+ (inherit go-github-com-oklog-ulid)
+ (name "go-github-com-oklog-ulid-v2")
+ (version "2.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oklog/ulid")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pxjrg48zrmzzdjpsz7b2d56x1vwix2wywgbbv3sdi5mqf0hz17y"))))
+ (arguments
+ (list
+ #:import-path "github.com/oklog/ulid/v2"))))
+
(define-public go-github-com-op-go-logging
(package
(name "go-github-com-op-go-logging")
@@ -2717,6 +5281,43 @@ comparison library, to Go. Both a library and a command-line tool are
included in this package.")
(license license:expat)))
+(define-public go-github-com-otiai10-copy
+ (package
+ (name "go-github-com-otiai10-copy")
+ (version "1.14.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/otiai10/copy")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fv4cwk4k5fsd3hq5akqxrd5qxj9qm6a2wlp6s1knblhzkm1jxzb"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/otiai10/copy"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'make-test-directory-writable
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (for-each make-file-writable (find-files "./test")))))
+ (add-after 'check 'remove-test-data
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (delete-file-recursively "./test")))))))
+ (native-inputs
+ (list go-github-com-otiai10-mint))
+ (propagated-inputs
+ (list go-golang-org-x-sync go-golang-org-x-sys))
+ (home-page "https://github.com/otiai10/copy")
+ (synopsis "Go copy directory recursively")
+ (description
+ "This package implments recursive copy functinoality for directory.")
+ (license license:expat)))
+
(define-public go-github-com-pbnjay-memory
(let ((commit "7b4eea64cf580186c0eceb10dc94ba3a098af46c")
(revision "2"))
@@ -2744,6 +5345,53 @@ memory accessible to the kernel. It does not account for memory used by other
processes.")
(license license:bsd-3))))
+(define-public go-github-com-pelletier-go-toml
+ (package
+ (name "go-github-com-pelletier-go-toml")
+ (version "1.9.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pelletier/go-toml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wypjrr1axkrkzp4n5gvams94f2sd7dq1pdpd2i35sgpdz6r2m6g"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/pelletier/go-toml"))
+ (propagated-inputs
+ (list go-github-com-burntsushi-toml
+ go-github-com-davecgh-go-spew
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/pelletier/go-toml")
+ (synopsis "Go library for the TOML configuration language")
+ (description
+ "Go library for the TOML configuration language")
+ (license license:expat)))
+
+(define-public go-github-com-pelletier-go-toml-v2
+ (package
+ (inherit go-github-com-pelletier-go-toml)
+ (name "go-github-com-pelletier-go-toml-v2")
+ (version "2.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pelletier/go-toml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gimgz33yxmvj0nmy56yy7zq4ay8j55ir8pfzmgwga7npgpzspk7"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/pelletier/go-toml/v2"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs '())))
+
(define-public go-github-com-pierrec-cmdflag
(package
(name "go-github-com-pierrec-cmdflag")
@@ -2768,35 +5416,94 @@ processes.")
on top of the standard library @code{flag} package.")
(license license:bsd-3)))
-(define-public go-github-com-prometheus-client-model
- (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016")
- (revision "2"))
- (package
- (name "go-github-com-prometheus-client-model")
- (version (git-version "0.0.2" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/prometheus/client_model")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/prometheus/client_model"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list go-github-com-golang-protobuf-proto))
- (synopsis "Data model artifacts for Prometheus")
- (description "This package provides data model artifacts for Prometheus.")
- (home-page "https://github.com/prometheus/client_model")
- (license license:asl2.0))))
+(define-public go-github-com-pion-logging
+ (package
+ (name "go-github-com-pion-logging")
+ (version "0.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pion/logging/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11ay8c15xk3pv7y9nd80szk3mci480x67yqlgb10vswrz4h4mx3v"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pion/logging"))
+ (home-page "https://github.com/pion/logging/")
+ (synopsis "Logging library for Golang projects")
+ (description
+"This package provides a logging library used by @url{https://github.com/pion,
+Pion}.")
+ (license license:expat)))
+
+(define-public go-github-com-polydawn-refmt
+ (package
+ (name "go-github-com-polydawn-refmt")
+ (version "0.89.1-0.20231129105047-37766d95467a")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/polydawn/refmt/")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0grgzacc7igfndk1v3n1g6k4wdz6bjsiqfq3n5br2zpr7n40ha9n"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/polydawn/refmt"))
+ (propagated-inputs
+ (list go-github-com-urfave-cli
+ go-github-com-warpfork-go-wish
+ go-github.com-smartystreets-goconvey
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/polydawn/refmt/")
+ (synopsis "Object mapping for Go language")
+ (description
+ "@code{refmt} is a serialization and object-mapping library.")
+ (license license:expat)))
+
+(define-public go-github-com-pterm-pterm
+ (package
+ (name "go-github-com-pterm-pterm")
+ (version "0.12.79")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pterm/pterm")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xvc4ywc2998r8vsi3zpp49z04kc79q60bsvxv88cjvamxfjxrvk"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza
+ ;; -> go-github-com-pterm-pterm
+ #:tests? #f
+ #:import-path "github.com/pterm/pterm"))
+ (propagated-inputs
+ (list go-atomicgo-dev-cursor
+ go-atomicgo-dev-keyboard
+ go-atomicgo-dev-schedule
+ go-github-com-gookit-color
+ go-github-com-lithammer-fuzzysearch
+ go-github-com-mattn-go-runewidth
+ go-golang-org-x-term
+ go-golang-org-x-text))
+ (home-page "https://github.com/pterm/pterm")
+ (synopsis "Configurable consol outputs in Golang")
+ (description
+ "Package pterm is a modern go module to beautify console output. It can be used
+without configuration, but if desired, everything can be customized down to the
+smallest detail.")
+ (license license:expat)))
(define-public go-github-com-rcrowley-go-metrics
(let ((commit "cac0b30c2563378d434b5af411844adff8e32960")
@@ -2828,6 +5535,92 @@ Metrics library.")
(home-page "https://github.com/rcrowley/go-metrics")
(license license:bsd-2))))
+(define-public go-github-com-remeh-sizedwaitgroup
+ (package
+ (name "go-github-com-remeh-sizedwaitgroup")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/remeh/sizedwaitgroup")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/remeh/sizedwaitgroup"))
+ (home-page "https://github.com/remeh/sizedwaitgroup")
+ (synopsis "Goroutines limit amount implementation of standard @code{sync.WaitGroup}")
+ (description
+ "This package implements a feature of limiting the maximum number of
+concurrently started routines which has the same role and API as
+@code{sync.WaitGroup}. It could for example be used to start multiples
+routines querying a database but without sending too much queries in order to
+not overload the given database.")
+ (license license:expat)))
+
+(define-public go-github-com-rogpeppe-go-internal
+ (package
+ (name "go-github-com-rogpeppe-go-internal")
+ (version "1.12.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rogpeppe/go-internal")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18szjxqrjjvgsvyjbkqs6xw4bvg5nn1myg5hhb5qzwz5xl4wvw5a"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/rogpeppe/go-internal"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ (("TestSimple") "OffTestSimple")))))
+ ;; 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-golang-org-x-mod
+ go-golang-org-x-sys
+ go-golang-org-x-tools))
+ (home-page "https://github.com/rogpeppe/go-internal/")
+ (synopsis "Internal packages from the Go standard library")
+ (description
+ "This repository factors out an opinionated selection of internal
+packages and functionality from the Go standard library. Currently this
+consists mostly of packages and testing code from within the Go tool
+implementation.
+
+Included are the following:
+@itemize
+@item dirhash: calculate hashes over directory trees the same way that the Go tool does.
+@item goproxytest: a GOPROXY implementation designed for test use.
+@item gotooltest: Use the Go tool inside test scripts (see testscript below)
+@item imports: list of known architectures and OSs, and support for reading import import statements.
+@item modfile: read and write go.mod files while preserving formatting and comments.
+@item module: module paths and versions.
+@item par: do work in parallel.
+@item semver: semantic version parsing.
+@item testenv: information on the current testing environment.
+@item testscript: script-based testing based on txtar files
+@item txtar: simple text-based file archives for testing.
+@end itemize\n")
+ (license license:bsd-3)))
+
(define-public go-github-com-schollz-progressbar-v3
(package
(name "go-github-com-schollz-progressbar-v3")
@@ -2872,6 +5665,37 @@ detect the number of bytes written to a stream, so you can use it as a
is undetermined, a customizable spinner is shown.")
(license license:expat)))
+(define-public go-github-com-sergi-go-diff
+ (package
+ (name "go-github-com-sergi-go-diff")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sergi/go-diff")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0cbj8nshllq102iiav0k1s01b8gwbkzj674g71n938qqna32y2pa"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/sergi/go-diff/diffmatchpatch"
+ #:unpack-path "github.com/sergi/go-diff"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/sergi/go-diff/")
+ (synopsis "Algorithms to perform operations for synchronizing plain text")
+ (description "@code{go-diff} offers algorithms to perform operations required for
+synchronizing plain text:
+@itemize
+@item compare two texts and return their differences
+@item perform fuzzy matching of text
+@item apply patches onto text
+@end itemize")
+ (license license:expat)))
+
(define-public go-github-com-shirou-gopsutil
(package
(name "go-github-com-shirou-gopsutil")
@@ -2888,7 +5712,6 @@ is undetermined, a customizable spinner is shown.")
(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
@@ -2932,7 +5755,6 @@ sensors).")
(base32 "1xlfcx6giqaxdah2m02q2i8ynwlzar953wr8wqx1j3004xdgaivd"))))
(arguments
(list
- #:go go-1.18
#:import-path "github.com/shirou/gopsutil"
#:phases
#~(modify-phases %standard-phases
@@ -3008,20 +5830,42 @@ 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
"@{gitconfig} is a package to get configuration values from gitconfig.")
(license license:expat)))
+(define-public go-github-com-soniakeys-quant
+ (package
+ (name "go-github-com-soniakeys-quant")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/soniakeys/quant")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y50h4d9l4v1dxhf99ys6fha5c7viflwdnlfxn7glf2jr49x5z78"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/soniakeys/quant"))
+ (home-page "https://github.com/soniakeys/quant")
+ (synopsis "Interface for image color quantizers")
+ (description
+ "Quant provides an interface for image color quantizers.")
+ (license license:expat)))
+
(define-public go-github-com-spf13-cobra
(package
(name "go-github-com-spf13-cobra")
- (version "1.8.0")
+ (version "1.8.1")
(source
(origin
(method git-fetch)
@@ -3030,7 +5874,7 @@ Use waterutil with it to work with TUN/TAP packets/frames.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0mhnqfgcwwcknlhk7n07i02q3iqq6ihksj4dwz296zci8ry3w0d0"))))
+ (base32 "0brbyy5mc6n2j6m6q1xyswh907vxd3wdzvgaci45swgj0747lcf8"))))
(build-system go-build-system)
(arguments
(list
@@ -3067,6 +5911,260 @@ 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-stretchr-objx
+ (package
+ (name "go-github-com-stretchr-objx")
+ (version "0.5.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stretchr/objx")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1jcxpfgfpk82lryjkhbd5dy7xzx08d7b9dvbx4bpkmjvn6p339jl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/stretchr/objx"
+ #: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)))))))
+ (native-inputs
+ ;; go-spew and go-difflib are to cover testify-bootstrap and not required
+ ;; for odjx itself.
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib
+ go-github-com-stretchr-testify-bootstrap))
+ (home-page "https://github.com/stretchr/objx")
+ (synopsis "Go package for dealing with maps, slices, JSON and other data")
+ (description
+ "This package provides a Go library for dealing with maps,
+slices, JSON and other data.")
+ (license license:expat)))
+
+(define-public go-github-com-syndtr-goleveldb
+ (package
+ (name "go-github-com-syndtr-goleveldb")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/syndtr/goleveldb")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "042k0gbzs5waqpxmd7nv5h93mlva861s66c3s9gfg1fym5dx4vmd"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #: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
+ go-github-com-golang-snappy))
+ (home-page "https://github.com/syndtr/goleveldb")
+ (synopsis "LevelDB implementation in Go")
+ (description
+ "This package provides a Go implementation of the LevelDB key/value
+storage system.")
+ (license license:bsd-2)))
+
+(define-public go-github-com-teambition-rrule-go
+ (package
+ (name "go-github-com-teambition-rrule-go")
+ (version "1.8.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/teambition/rrule-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/teambition/rrule-go"))
+ (home-page "https://github.com/teambition/rrule-go")
+ (synopsis "Recurrence rules for calendar dates for Golang")
+ (description
+ "This package provides a functionality to work with recurrence rules for
+calendar dates. It offers a complete implementation of the
+@url{https://www.ietf.org/rfc/rfc2445.txt,RFC 2445} specification.")
+ (license license:expat)))
+
+(define-public go-github-com-thejerf-suture
+ (package
+ (name "go-github-com-thejerf-suture")
+ (version "3.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/thejerf/suture")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "166hbjc1gn7skvq9vcp5h1xkavw9zw6dwx63vhih8fzm3nbbp0ic"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/thejerf/suture"))
+ (home-page "https://github.com/thejerf/suture")
+ (synopsis "Supervisor trees for Go")
+ (description "Suture provides Erlang-ish supervisor trees for Go.
+\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together
+when it's trying to die.
+
+It is intended to deal gracefully with the real failure cases that can occur
+with supervision trees (such as burning all your CPU time endlessly restarting
+dead services), while also making no unnecessary demands on the \"service\"
+code, and providing hooks to perform adequate logging with in a production
+environment")
+ (license license:expat)))
+
+(define-public go-github-com-thejerf-suture-v4
+ (package
+ (inherit go-github-com-thejerf-suture)
+ (name "go-github-com-thejerf-suture-v4")
+ (version "4.0.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/thejerf/suture")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15qi7v2a1kbf70yi3w6y26wbwj0sm8hv9f6xjrb4rl6nv9l8j88c"))))))
+
+(define-public go-github-com-tidwall-gjson
+ (package
+ (name "go-github-com-tidwall-gjson")
+ (version "1.17.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tidwall/gjson")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gcjzbs5in4kics39d2v3j2v9gvfxkdgp0bdgbfmcsa5arqgq7g5"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tidwall/gjson"))
+ (propagated-inputs
+ (list go-github-com-tidwall-match
+ go-github-com-tidwall-pretty))
+ (home-page "https://github.com/tidwall/gjson")
+ (synopsis "JSON parser for Golang")
+ (description
+ "This package provides a fast and simple way to get values from a JSON
+document. It has features such as one line retrieval, dot notation paths,
+iteration, and parsing JSON lines.")
+ (license license:expat)))
+
+(define-public go-github-com-tidwall-match
+ (package
+ (name "go-github-com-tidwall-match")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tidwall/match")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1n25md63xr5m66r6zc77n6fgcpv2ljrlk92ivp9hvp8xya22as9k"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tidwall/match"))
+ (home-page "https://github.com/tidwall/match")
+ (synopsis "Simple string pattern matcher for Golang")
+ (description
+ "Package match provides a simple pattern matcher with unicode support.")
+ (license license:expat)))
+
+(define-public go-github-com-tidwall-pretty
+ (package
+ (name "go-github-com-tidwall-pretty")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tidwall/pretty")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0prj9vpjgrca70rvx40kkl566yf9lw4fsbcmszwamwl364696jsb"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tidwall/pretty"))
+ (home-page "https://github.com/tidwall/pretty")
+ (synopsis "JSON beautifier and compactor for Golang")
+ (description
+ "This package provides fast methods for formatting JSON for human
+readability, or to compact JSON for smaller payloads.")
+ (license license:expat)))
+
+(define-public go-github-com-tidwall-sjson
+ (package
+ (name "go-github-com-tidwall-sjson")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tidwall/sjson")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16yaikpxiwqz00zxa70w17k2k52nr06svand88sv2br6b6i8v09r"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tidwall/sjson"))
+ (propagated-inputs
+ (list go-github-com-tidwall-gjson
+ go-github-com-tidwall-pretty))
+ (home-page "https://github.com/tidwall/sjson")
+ (synopsis "Quick value JSON values setting in Golang")
+ (description
+ "This package provides a fast and simple way to set a value in a JSON
+document.")
+ (license license:expat)))
+
(define-public go-github-com-tklauser-go-sysconf
(package
(name "go-github-com-tklauser-go-sysconf")
@@ -3083,7 +6181,6 @@ well as a program to generate applications and command files.")
(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
@@ -3120,7 +6217,6 @@ well as a program to generate applications and command files.")
(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
@@ -3172,6 +6268,34 @@ supported by the time package
@end itemize")
(license license:expat)))
+(define-public go-github-com-vitrun-qart
+ (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa")
+ (revision "0"))
+ (package
+ (name "go-github-com-vitrun-qart")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vitrun/qart")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/vitrun/qart"))
+ (home-page "https://github.com/vitrun/qart")
+ (synopsis "Create QR codes with an embedded image")
+ (description
+ "This package provides a library for embedding human-meaningful
+graphics in QR codes. However, instead of scribbling on redundant pieces and
+relying on error correction to preserve the meaning, @code{qart} engineers the
+encoded values to create the picture in a code with no inherent errors.")
+ (license license:bsd-3))))
+
(define-public go-github-com-vividcortex-ewma
(package
(name "go-github-com-vividcortex-ewma")
@@ -3195,6 +6319,57 @@ supported by the time package
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")
@@ -3248,10 +6423,112 @@ string. The string can be a string retorned for @code{time.Duration} or a
similar string with weeks or days too.")
(license license:bsd-3)))
+(define-public go-github-com-yuin-gopher-lua
+ (package
+ (name "go-github-com-yuin-gopher-lua")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/yuin/gopher-lua")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0bvmd6kywbwzcpdqmmk6gjzrc2x4q24q1p25si4sm0s18kfqnmap"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/yuin/gopher-lua"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; FIXME: "ls" needs to be substituted in _glua-tests/issues.lua and
+ ;; _lua5.1-tests/files.lua with full path, but attempt was failed:
+ ;; Throw to key `decoding-error' with args `("peek-char" "input
+ ;; decoding error" 84 #<input: _lua5.1-tests/files.lua 11>)'.
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "script_test.go"
+ ((".issues.lua.*") "")
+ ((".files.lua.*") ""))
+ (for-each delete-file
+ (list "_glua-tests/issues.lua"
+ "_lua5.1-tests/files.lua"))))))))
+ (propagated-inputs
+ (list go-github-com-chzyer-readline))
+ (home-page "https://github.com/yuin/gopher-lua")
+ (synopsis "VM and compiler for Lua in Golang")
+ (description
+ "GopherLua is a Lua5.1(+ goto statement in Lua5.2) VM and compiler. It
+provides Go APIs that allow you to easily embed a scripting language to your
+Go host programs.")
+ (license license:expat)))
+
+(define-public go-go-etcd-io-bbolt
+ (package
+ (name "go-go-etcd-io-bbolt")
+ (version "1.3.11")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/etcd-io/bbolt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16s2l1yjn55rgybc9k8kh88zg7z8igm10y1xmx2qx1a147k64d31"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; Extending the test timeout to 30 minutes still times out on aarch64.
+ #:tests? (not target-arm?)
+ #:import-path "go.etcd.io/bbolt"))
+ (native-inputs
+ (list go-github-com-stretchr-testify
+ go-go-etcd-io-gofail
+ go-golang-org-x-sync))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://go.etcd.io/bbolt")
+ (synopsis "Embedded key/value database for Go")
+ (description
+ "Bolt is a pure Go key/value store inspired by Howard Chu's LMDB project.
+The goal of the project is to provide a simple, fast, and reliable database
+for projects that don't require a full database server such as Postgres or
+MySQL.")
+ (license license:expat)))
+
+(define-public go-go-senan-xyz-flagconf
+ (package
+ (name "go-go-senan-xyz-flagconf")
+ (version "0.1.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sentriz/flagconf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rms7hj1cdi5gfyhf1am1f8c4lq9ll4ashqi87yc6aq93gqgkag0"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "go.senan.xyz/flagconf"))
+ (propagated-inputs
+ (list go-github-com-rogpeppe-go-internal))
+ (home-page "https://go.senan.xyz/flagconf")
+ (synopsis "Extensions to Go's flag package")
+ (description
+ "Flagconf provides extensions to Go's flag package to support prefixed
+environment variables and a simple config file format.")
+ (license license:expat)))
+
(define-public go-go-uber-org-atomic
(package
(name "go-go-uber-org-atomic")
- (version "1.8.0")
+ (version "1.11.0")
(source
(origin
(method git-fetch)
@@ -3260,18 +6537,10 @@ similar string with weeks or days too.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0grswsk7nkf7zmmychf6aj6032shyag1kgs6zf7qwxyn55dym1v8"))))
+ (base32 "1jdp4gfv9jx7dd066wzj7cj6wsk7fb5q04is42xn2wyp80sw5k3p"))))
(build-system go-build-system)
(arguments
(list
- ;; XXX: Disable failing tests on non-x86-64 architecture, see
- ;; <https://github.com/uber-go/atomic/issues/164>.
- ;;
- ;; go.uber.org/atomic/uintptr_test.go:72:30: cannot convert
- ;; math.MaxUint64 (untyped int constant 18446744073709551615) to type
- ;; uintptr
- #:tests? (and (not (%current-target-system))
- (target-x86-64?))
#:import-path "go.uber.org/atomic"))
(native-inputs
(list go-github-com-stretchr-testify go-github-com-davecgh-go-spew))
@@ -3323,10 +6592,9 @@ 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))
+ (list go-github-com-stretchr-testify))
(home-page "https://pkg.go.dev/go.uber.org/dig")
(synopsis "Reflection based dependency injection toolkit for Golang")
(description
@@ -3350,10 +6618,9 @@ 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))
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-go-uber-org-dig
go-go-uber-org-goleak
@@ -3409,7 +6676,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
@@ -3422,7 +6688,7 @@ applications out of reusable, composable modules.")
(string-append "src/" import-path
"/stacktrace_ext_test.go")))))))
(native-inputs
- (list go-github-com-stretchr-testify-next
+ (list go-github-com-stretchr-testify
go-go-uber-org-goleak
go-golang-org-x-lint
go-honnef-co-go-tools))
@@ -3442,27 +6708,34 @@ Go.")
(define-public go-gopkg-in-alecthomas-kingpin-v2
(package
(inherit go-github-com-alecthomas-kingpin)
+ (name "go-gopkg-in-alecthomas-kingpin-v2")
(arguments
(list
#:import-path "gopkg.in/alecthomas/kingpin.v2"))))
-(define-public go-gopkg-in-cheggaaa-pb-v1
+(define-public go-gopkg-in-ini-v1
(package
- (inherit go-github-com-cheggaaa-pb-v3)
- (name "go-gopkg-in-cheggaaa-pb-v1")
- (version "1.0.28")
+ (name "go-gopkg-in-ini-v1")
+ (version "1.67.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gopkg.in/cheggaaa/pb.v1.git")
+ (url "https://github.com/go-ini/ini")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh"))))
+ (base32 "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap"))))
+ (build-system go-build-system)
(arguments
(list
- #:import-path "gopkg.in/cheggaaa/pb.v1"))))
+ #:import-path "gopkg.in/ini.v1"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://gopkg.in/ini.v1")
+ (synopsis "Go library for ini files")
+ (description "Go library for ini files")
+ (license license:asl2.0)))
(define-public go-gopkg-in-natefinch-lumberjack.v2
(package
@@ -3537,10 +6810,216 @@ Go.")
values.")
(license license:asl2.0)))
+(define-public go-k8s-io-klog
+ (package
+ (name "go-k8s-io-klog")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kubernetes/klog")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "k8s.io/klog"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; Disable test requiring write access to creat test files.
+ (("TestRollover") "OffTestRollover"))))))))
+ (propagated-inputs
+ (list go-github-com-go-logr-logr))
+ (home-page "https://github.com/kubernetes/klog")
+ (synopsis "Leveled execution logs for Go")
+ (description
+ "Package klog implements logging analogous to the Google-internal C++
+INFO/ERROR/V setup. It provides functions @code{Info}, @code{Warning},
+@code{Error}, @code{Fatal}, plus formatting variants such as @code{Infof}. It
+also provides V-style logging controlled by the @code{-v} and
+@code{-vmodule=file=2} flags. It's a is a permanent fork of
+@code{https://github.com/golang/glog}.")
+ (license license:asl2.0)))
+
+(define-public go-k8s-io-klog-v2
+ (package
+ (inherit go-k8s-io-klog)
+ (name "go-k8s-io-klog-v2")
+ (version "2.130.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kubernetes/klog")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12q9jhxfpq75sgmdxgcz85znbgdi04ic9zy3rm0c47n24clz6z73"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "k8s.io/klog/v2"))))
+
+(define-public go-go-mongodb-org-mongo-driver
+ (package
+ (name "go-go-mongodb-org-mongo-driver")
+ (version "1.16.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mongodb/mongo-go-driver")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "160hwrk8y8h3nl9sh5v6pxnlyw1ywbssjgzb72lj0x68akgl8gff"))
+ (snippet
+ #~(begin (use-modules (guix build utils))
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "go.mongodb.org/mongo-driver"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples-and-benchmarks
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (for-each delete-file-recursively
+ (list "benchmark"
+ "examples"
+ "cmd/godriver-benchmark")))))
+ (add-before 'check 'disable-failing-tests
+ (lambda* (#:key tests? unpack-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" unpack-path)
+ (substitute* (find-files "." "\\_test.go$")
+ ;; Some tests require running database and available network connection.
+ (("TestAggregate") "OffTestAggregate")
+ (("TestPollSRVRecords") "OffTestPollSRVRecords")
+ (("TestPollSRVRecordsServiceName")
+ "OffTestPollSRVRecordsServiceName")
+ (("TestPollingSRVRecordsLoadBalanced")
+ "OffTestPollingSRVRecordsLoadBalanced")
+ (("TestPollingSRVRecordsSpec")
+ "OffTestPollingSRVRecordsSpec")
+ (("TestServerHeartbeatOffTimeout")
+ "OffTestServerHeartbeatTimeout")
+ (("TestServerHeartbeatTimeout")
+ "OffTestServerHeartbeatTimeout")
+ (("TestTimeCodec") "OffTestTimeCodec")
+ (("TestTopologyConstructionLogging")
+ "OffTestTopologyConstructionLogging")
+ (("TestURIOptionsSpec") "OffTestURIOptionsSpec")))))
+ ;; 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)
+ (for-each
+ (lambda (package)
+ (invoke "go" "test" (string-append "./" package "/...")))
+ (list "bson" "event" "internal" "tag" "x")))))))))
+ (native-inputs
+ (list go-github-com-aws-aws-lambda-go))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-golang-snappy
+ go-github-com-google-go-cmp
+ go-github-com-klauspost-compress
+ go-github-com-montanaflynn-stats
+ go-github-com-xdg-go-scram
+ go-github-com-xdg-go-stringprep
+ go-github-com-youmark-pkcs8
+ go-golang-org-x-crypto
+ go-golang-org-x-sync))
+ (home-page "https://go.mongodb.org/mongo-driver")
+ (synopsis "MongoDB Go Driver")
+ (description
+ "This package provides a driver for @code{Mongo} data base.")
+ (license license:asl2.0)))
+
+(define-public go-mvdan-cc-editorconfig
+ (package
+ (name "go-mvdan-cc-editorconfig")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mvdan/editorconfig")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mi1cp6fyaknjn7smvaas4lj03fws5qib5vbi4mrz3qrmvmhh9l4"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "mvdan.cc/editorconfig"))
+ (native-inputs
+ (list cmake))
+ (home-page "https://github.com/mvdan/editorconfig")
+ (synopsis "EditorConfig support in Go")
+ (description
+ "Package editorconfig allows parsing and using @code{EditorConfig} files, as
+defined in @url{https://editorconfig.org/,https://editorconfig.org/}.")
+ (license license:bsd-3)))
+
;;;
;;; Executables:
;;;
+(define-public glua
+ (package
+ (inherit go-github-com-yuin-gopher-lua)
+ (name "glua")
+ (arguments
+ (list
+ #:tests? #f
+ #:install-source? #f
+ #:import-path "github.com/yuin/gopher-lua/cmd/glua"
+ #:unpack-path "github.com/yuin/gopher-lua"))))
+
+(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)
@@ -3557,13 +7036,24 @@ values.")
Trace/Debug/Info/Warn/Error methods on @code{hclog.Logger} are used
correctly.")))
+(define-public go-msgio
+ (package
+ (inherit go-github-com-libp2p-go-msgio)
+ (name "go-msgio")
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:install-source? #f
+ #:import-path "github.com/libp2p/go-msgio/msgio"
+ #:unpack-path "github.com/libp2p/go-msgio"))
+ (synopsis "CLI tool to wrap messages with msgio header.")))
+
(define-public go-numcpus
(package
(inherit go-github-com-tklauser-numcpus)
(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))
@@ -3585,6 +7075,65 @@ go-github-com-tklauser-numcpus source.")))
"This package provides a CLI build from the
go-github-com-orisano-pixelmatch source.")))
+(define-public go-sentences
+ (package
+ (inherit go-github-com-neurosnap-sentences)
+ (name "go-sentences")
+ (arguments
+ (list
+ #:import-path "github.com/neurosnap/sentences/cmd/sentences"
+ #:unpack-path "github.com/neurosnap/sentences"
+ #:install-source? #f))
+ (description
+ (string-append (package-description go-github-com-neurosnap-sentences)
+ " This package provides an command line interface (CLI)
+tool."))))
+
+(define-public go-tengo
+ (package
+ (inherit go-github-com-d5-tengo-v2)
+ (name "tengo")
+ (arguments
+ (list
+ #:import-path "github.com/d5/tengo/cmd/tengo"
+ #:unpack-path "github.com/d5/tengo"
+ #:install-source? #f))
+ (description
+ (string-append (package-description go-github-com-d5-tengo-v2)
+ "\nThis package provides an command line interface (CLI)
+tool."))))
+
+(define-public go-tomlv
+ (package
+ (inherit go-github-com-burntsushi-toml)
+ (name "go-tomlv")
+ (arguments
+ (list
+ #:install-source? #f
+ #:tests? #f ; no tests.
+ #:import-path "github.com/BurntSushi/toml/cmd/tomlv"
+ #:unpack-path "github.com/BurntSushi/toml"))
+ (description
+ (string-append (package-description go-github-com-burntsushi-toml)
+ " This package provides an command line interface (CLI)
+tool."))))
+
+(define-public go-ulid
+ (package
+ (inherit go-github-com-oklog-ulid-v2)
+ (name "go-ulid")
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/oklog/ulid/v2/cmd/ulid"
+ #:unpack-path "github.com/oklog/ulid/v2"))
+ (native-inputs
+ (list go-github-com-pborman-getopt))
+ (description
+ (string-append (package-description go-github-com-oklog-ulid)
+ " This package provides an command line interface (CLI)
+tool."))))
+
;;;
;;; 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/golang.scm b/gnu/packages/golang.scm
index 4de36a3199..9f04b8e423 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2018, 2019, 2020, 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2018, 2019, 2020, 2023, 2024 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2019 Giovanni Biscuolo <g@xelera.eu>
;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -45,6 +45,7 @@
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2024 Brennan Vincent <brennan@umanwizard.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -97,7 +98,6 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages ruby)
- #:use-module (gnu packages syncthing)
#:use-module (gnu packages terminals)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
@@ -266,11 +266,11 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
(license license:bsd-3)))
-(define-public go-1.14
+(define-public go-1.16
(package
(inherit go-1.4)
(name "go")
- (version "1.14.15")
+ (version "1.16.15")
(source
(origin
(method git-fetch)
@@ -280,63 +280,39 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(file-name (git-file-name name version))
(sha256
(base32
- "1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps"))))
- (arguments
- (substitute-keyword-arguments (package-arguments go-1.4)
- ((#:system system)
- (if (string-prefix? "aarch64-linux" (or (%current-system)
- (%current-target-system)))
- "aarch64-linux"
- system))
+ "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl"))))
+ (arguments
+ (substitute-keyword-arguments
+ (strip-keyword-arguments '(#:tests? #:system) (package-arguments go-1.4))
((#:phases phases)
`(modify-phases ,phases
+ (add-after 'unpack 'remove-unused-sourcecode-generators
+ (lambda _
+ ;; Prevent perl from inclusion in closure through unused files
+ (for-each delete-file (find-files "src" "\\.pl$"))))
(replace 'prebuild
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
- (ld (string-append (assoc-ref inputs "libc") "/lib"))
- (loader (car (append (find-files ld "^ld-linux.+")
- (find-files ld "^ld(64)?\\.so.+"))))
(net-base (assoc-ref inputs "net-base"))
(tzdata-path
- (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
- (output (assoc-ref outputs "out")))
+ (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
;; Having the patch in the 'patches' field of <origin> breaks
;; the 'TestServeContent' test due to the fact that
;; timestamps are reset. Thus, apply it from here.
(invoke "patch" "-p2" "--force" "-i"
(assoc-ref inputs "go-skip-gc-test.patch"))
-
- ;; A side effect of these test scripts is testing
- ;; cgo. Attempts at using cgo flags and directives with these
- ;; scripts as specified here (https://golang.org/cmd/cgo/)
- ;; have not worked. The tests continue to state that they can
- ;; not find object files/headers despite being present.
- (for-each
- delete-file
- '("cmd/go/testdata/script/mod_case_cgo.txt"
- "cmd/go/testdata/script/list_find.txt"
- "cmd/go/testdata/script/list_compiled_imports.txt"
- "cmd/go/testdata/script/cgo_syso_issue29253.txt"
- "cmd/go/testdata/script/cover_cgo.txt"
- "cmd/go/testdata/script/cover_cgo_xtest.txt"
- "cmd/go/testdata/script/cover_cgo_extra_test.txt"
- "cmd/go/testdata/script/cover_cgo_extra_file.txt"
- "cmd/go/testdata/script/cgo_path_space.txt"
- "cmd/go/testdata/script/ldflag.txt"
- "cmd/go/testdata/script/cgo_path.txt"))
+ (invoke "patch" "-p2" "--force" "-i"
+ (assoc-ref inputs "go-fix-script-tests.patch"))
(for-each make-file-writable (find-files "."))
(substitute* "os/os_test.go"
(("/usr/bin") (getcwd))
- (("/bin/pwd") (which "pwd"))
(("/bin/sh") (which "sh")))
- ;; Backport fix for go-1.14 with GCC 9+
- ;; https://github.com/golang/go/issues/39157
- (substitute* "cmd/go/note_test.go"
- (("cannot find 'ld'") "cannot find [‘']ld[’']"))
+ (substitute* "cmd/go/testdata/script/cgo_path_space.txt"
+ (("/bin/sh") (which "sh")))
;; Add libgcc to runpath
(substitute* "cmd/link/internal/ld/lib.go"
@@ -344,7 +320,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(substitute* "cmd/go/internal/work/gccgo.go"
(("cgoldflags := \\[\\]string\\{\\}")
(string-append "cgoldflags := []string{"
- "\"-rpath=" gcclib "\""
+ "\"-Wl,-rpath=" gcclib "\""
"}"))
(("\"-lgcc_s\", ")
(string-append
@@ -413,28 +389,42 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(substitute* "net/port_unix.go"
(("/etc/services") (string-append net-base "/etc/services")))
(substitute* "time/zoneinfo_unix.go"
- (("/usr/share/zoneinfo/") tzdata-path))
- (substitute* (find-files "cmd" "\\.go")
- (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader))
- #t)))
+ (("/usr/share/zoneinfo/") tzdata-path)))))
(add-before 'build 'set-bootstrap-variables
(lambda* (#:key outputs inputs #:allow-other-keys)
;; Tell the build system where to find the bootstrap Go.
(let ((go (assoc-ref inputs "go")))
(setenv "GOROOT_BOOTSTRAP" go)
- (setenv "GOGC" "400")
- #t)))
+ (setenv "GOGC" "400"))))
(replace 'build
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs (parallel-build? #t)
+ #:allow-other-keys)
;; FIXME: Some of the .a files are not bit-reproducible.
- (let* ((output (assoc-ref outputs "out")))
+ ;; (Is this still true?)
+ (let* ((njobs (if parallel-build? (parallel-job-count) 1))
+ (output (assoc-ref outputs "out"))
+ (loader (string-append (assoc-ref inputs "libc")
+ ,(glibc-dynamic-linker))))
(setenv "CC" (which "gcc"))
+ (setenv "GO_LDSO" loader)
(setenv "GOOS" "linux")
(setenv "GOROOT" (dirname (getcwd)))
(setenv "GOROOT_FINAL" output)
(setenv "GOCACHE" "/tmp/go-cache")
- (setenv "CGO_ENABLED" "1")
- (invoke "sh" "all.bash"))))
+ (setenv "GOMAXPROCS" (number->string njobs))
+ (invoke "sh" "make.bash" "--no-banner"))))
+ (replace 'check
+ (lambda* (#:key target (tests? (not target)) (parallel-tests? #t)
+ #:allow-other-keys)
+ (let* ((njobs (if parallel-tests? (parallel-job-count) 1)))
+ (when tests?
+ (setenv "GOMAXPROCS" (number->string njobs))
+ (invoke "sh" "run.bash" "--no-rebuild")))))
+ (add-before 'install 'unpatch-perl-shebangs
+ (lambda _
+ ;; Rewrite references to perl input in test scripts
+ (substitute* "net/http/cgi/testdata/test.cgi"
+ (("^#!.*") "#!/usr/bin/env perl\n"))))
(replace 'install
;; TODO: Most of this could be factorized with Go 1.4.
(lambda* (#:key outputs #:allow-other-keys)
@@ -468,8 +458,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
'("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS"
"LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt"))
- (copy-recursively "../" output)
- #t)))))))
+ (copy-recursively "../" output))))))))
(native-inputs
`(,@(if (member (%current-system) (package-supported-systems go-1.4))
`(("go" ,go-1.4))
@@ -479,167 +468,11 @@ in the style of communicating sequential processes (@dfn{CSP}).")
((or "armhf-linux" "aarch64-linux")
`(("gold" ,binutils-gold)))
(_ `()))
+ ("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch"))
,@(package-native-inputs go-1.4)))
(supported-systems (fold delete %supported-systems
(list "powerpc-linux" "i586-gnu")))))
-(define-public go-1.16
- (package
- (inherit go-1.14)
- (name "go")
- (version "1.16.15")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/go")
- (commit (string-append "go" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl"))))
- (arguments
- (substitute-keyword-arguments
- (strip-keyword-arguments '(#:tests?) (package-arguments go-1.14))
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'remove-unused-sourcecode-generators
- (lambda _
- ;; Prevent perl from inclusion in closure through unused files
- (for-each delete-file (find-files "src" "\\.pl$"))))
- (replace 'prebuild
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
- (net-base (assoc-ref inputs "net-base"))
- (tzdata-path
- (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
-
- ;; Having the patch in the 'patches' field of <origin> breaks
- ;; the 'TestServeContent' test due to the fact that
- ;; timestamps are reset. Thus, apply it from here.
- (invoke "patch" "-p2" "--force" "-i"
- (assoc-ref inputs "go-skip-gc-test.patch"))
- (invoke "patch" "-p2" "--force" "-i"
- (assoc-ref inputs "go-fix-script-tests.patch"))
-
- (for-each make-file-writable (find-files "."))
-
- (substitute* "os/os_test.go"
- (("/usr/bin") (getcwd))
- (("/bin/sh") (which "sh")))
-
- (substitute* "cmd/go/testdata/script/cgo_path_space.txt"
- (("/bin/sh") (which "sh")))
-
- ;; Add libgcc to runpath
- (substitute* "cmd/link/internal/ld/lib.go"
- (("!rpath.set") "true"))
- (substitute* "cmd/go/internal/work/gccgo.go"
- (("cgoldflags := \\[\\]string\\{\\}")
- (string-append "cgoldflags := []string{"
- "\"-Wl,-rpath=" gcclib "\""
- "}"))
- (("\"-lgcc_s\", ")
- (string-append
- "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", ")))
- (substitute* "cmd/go/internal/work/gc.go"
- (("ldflags = setextld\\(ldflags, compiler\\)")
- (string-append
- "ldflags = setextld(ldflags, compiler)\n"
- "ldflags = append(ldflags, \"-r\")\n"
- "ldflags = append(ldflags, \"" gcclib "\")\n")))
-
- ;; Disable failing tests: these tests attempt to access
- ;; commands or network resources which are neither available
- ;; nor necessary for the build to succeed.
- (for-each
- (match-lambda
- ((file regex)
- (substitute* file
- ((regex all before test_name)
- (string-append before "Disabled" test_name)))))
- '(("net/net_test.go" "(.+)(TestShutdownUnix.+)")
- ("net/dial_test.go" "(.+)(TestDialTimeout.+)")
- ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)")
- ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)")
- ;; 127.0.0.1 doesn't exist
- ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)")
- ;; 127.0.0.1 doesn't exist
- ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)")
- ;; /etc/services doesn't exist
- ("net/parse_test.go" "(.+)(TestReadLine.+)")
- ("os/os_test.go" "(.+)(TestHostname.+)")
- ;; The user's directory doesn't exist
- ("os/os_test.go" "(.+)(TestUserHomeDir.+)")
- ("time/format_test.go" "(.+)(TestParseInSydney.+)")
- ("time/format_test.go" "(.+)(TestParseInLocation.+)")
- ("os/exec/exec_test.go" "(.+)(TestEcho.+)")
- ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)")
- ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)")
- ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)")
- ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)")
- ("os/exec/exec_test.go" "(.+)(TestPipes.+)")
- ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)")
- ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)")
- ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)")
- ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)")
- ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)")
- ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)")
- ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)")
- ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)")
- ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)")
- ("net/lookup_test.go" "(.+)(TestLookupPort.+)")
- ("syscall/exec_linux_test.go"
- "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)")))
-
- ;; These tests fail on aarch64-linux
- (substitute* "cmd/dist/test.go"
- (("t.registerHostTest\\(\"testsanitizers/msan.*") ""))
-
- ;; fix shebang for testar script
- ;; note the target script is generated at build time.
- (substitute* "../misc/cgo/testcarchive/carchive_test.go"
- (("#!/usr/bin/env") (string-append "#!" (which "env"))))
-
- (substitute* "net/lookup_unix.go"
- (("/etc/protocols") (string-append net-base "/etc/protocols")))
- (substitute* "net/port_unix.go"
- (("/etc/services") (string-append net-base "/etc/services")))
- (substitute* "time/zoneinfo_unix.go"
- (("/usr/share/zoneinfo/") tzdata-path)))))
- (replace 'build
- (lambda* (#:key inputs outputs (parallel-build? #t)
- #:allow-other-keys)
- ;; FIXME: Some of the .a files are not bit-reproducible.
- ;; (Is this still true?)
- (let* ((njobs (if parallel-build? (parallel-job-count) 1))
- (output (assoc-ref outputs "out"))
- (loader (string-append (assoc-ref inputs "libc")
- ,(glibc-dynamic-linker))))
- (setenv "CC" (which "gcc"))
- (setenv "GO_LDSO" loader)
- (setenv "GOOS" "linux")
- (setenv "GOROOT" (dirname (getcwd)))
- (setenv "GOROOT_FINAL" output)
- (setenv "GOCACHE" "/tmp/go-cache")
- (setenv "GOMAXPROCS" (number->string njobs))
- (invoke "sh" "make.bash" "--no-banner"))))
- (replace 'check
- (lambda* (#:key target (tests? (not target)) (parallel-tests? #t)
- #:allow-other-keys)
- (let* ((njobs (if parallel-tests? (parallel-job-count) 1)))
- (when tests?
- (setenv "GOMAXPROCS" (number->string njobs))
- (invoke "sh" "run.bash" "--no-rebuild")))))
- (add-before 'install 'unpatch-perl-shebangs
- (lambda _
- ;; Rewrite references to perl input in test scripts
- (substitute* "net/http/cgi/testdata/test.cgi"
- (("^#!.*") "#!/usr/bin/env perl\n"))))))))
- (native-inputs
- `(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch"))
- ,@(package-native-inputs go-1.14)))))
-
;; https://github.com/golang/go/wiki/MinimumRequirements#microarchitecture-support
(define %go-1.17-arm-micro-architectures
(list "armv5" "armv6" "armv7"))
@@ -1114,7 +947,61 @@ in the style of communicating sequential processes (@dfn{CSP}).")
("api" "share/go/api" ,tests)
("test" "share/go/test" ,tests))))))))))))
-(define-public go go-1.17)
+(define-public go-1.22
+ (package
+ (inherit go-1.21)
+ (name "go")
+ (version "1.22.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/go")
+ (commit (string-append "go" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rjplx7wa6p2c19grx6hhkhn16mmbib5cwmhz9k8ywymlbmhhsyd"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments go-1.21)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'unpatch-perl-shebangs
+ (lambda _
+ ;; Avoid inclusion of perl in closure by rewriting references
+ ;; to perl input in sourcecode generators and test scripts
+ (substitute* (find-files "src" "\\.pl$")
+ (("^#!.*")
+ "#!/usr/bin/env perl\n"))))
+ (add-after 'unpack 'remove-flakey-thread-sanitizer-tests
+ (lambda _
+ ;; These tests have been identified as flakey:
+ ;; https://github.com/golang/go/issues/66427
+ (substitute* "src/cmd/cgo/internal/testsanitizers/tsan_test.go"
+ ((".*tsan1[34].*") ""))))))))
+ (native-inputs
+ ;; Go 1.22 and later requires Go 1.20 (min. 1.20.6, which we don't have)
+ ;; as the bootstrap toolchain.
+ (alist-replace "go" (list go-1.21) (package-native-inputs go-1.21)))))
+
+(define-public go-1.23
+ (package
+ (inherit go-1.22)
+ (name "go")
+ (version "1.23.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/go")
+ (commit (string-append "go" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0yq7fmha7x6fiah68mpx7cvffsd8a7z569cfq2dj5s66pbgzmji9"))))))
+
+;;
+;; 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)
@@ -1150,13 +1037,14 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(export make-go-std)
;; Make those public so they have a corresponding Cuirass job.
-(define-public go-std-1.14 (make-go-std go-1.14))
(define-public go-std-1.16 (make-go-std go-1.16))
(define-public go-std-1.17 (make-go-std go-1.17))
(define-public go-std-1.18 (make-go-std go-1.18))
(define-public go-std-1.19 (make-go-std go-1.19))
(define-public go-std-1.20 (make-go-std go-1.20))
(define-public go-std-1.21 (make-go-std go-1.21))
+(define-public go-std-1.22 (make-go-std go-1.22))
+(define-public go-std-1.23 (make-go-std go-1.23))
(define-public go-0xacab-org-leap-shapeshifter
(let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474")
@@ -1249,39 +1137,6 @@ cluster segmentation algorithm.")
'(#:unpack-path "github.com/apparentlymart/go-textseg/autoversion"
#:import-path "github.com/apparentlymart/go-textseg/autoversion/textseg"))))
-(define-public go-github-com-avast-retry-go
- (let ((commit "a322e24d96313ab405dec28ad5711f036c6d25a3")
- (revision "0"))
- (package
- (name "go-github-com-avast-retry-go")
- (version (git-version "2.4.2" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/avast/retry-go")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/avast/retry-go"
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-examples
- (lambda* (#:key import-path #:allow-other-keys)
- (delete-file-recursively
- (string-append "src/" import-path "/examples")))))))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/avast/retry-go")
- (synopsis "Simple golang library for retry mechanism")
- (description "This package is a simple Go library that provides retry
-functionality for functions that may fail. It includes various customizable
-retry strategies, such as fixed delay, backoff delay, and random delay.")
- (license license:expat))))
-
(define-public go-github-com-operatorfoundation-shapeshifter-transports
(package
(name "go-github-com-operatorfoundation-shapeshifter-transports")
@@ -1863,32 +1718,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
@@ -2292,7 +2147,7 @@ TrueType font files in your system's user and system font directories.")
(invoke "go" "install" "-v" "-x"
"-ldflags=-s -w"
(string-append import-path "cmd/wrap"))))
- (add-after 'wrap 'wrap-fonts
+ (add-after 'install 'wrap-fonts
(lambda* (#:key inputs outputs #:allow-other-keys)
(for-each
(lambda (program)
@@ -2356,7 +2211,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
@@ -2731,7 +2585,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)))
@@ -2872,42 +2727,6 @@ way of specifying command line options.")
(home-page "https://github.com/jessevdk/go-flags")
(license license:bsd-3)))
-(define-public go-github-com-go-playground-locales
- (package
- (name "go-github-com-go-playground-locales")
- (version "0.13.0")
- (home-page "https://github.com/go-playground/locales")
- (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 "0qydcpkvss3mf8mk3xzg6a34n8i69aydrigcl2apifrkx72jw7pf"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-playground/locales"))
- (propagated-inputs
- (list go-golang-org-x-text))
- (synopsis "Set of locales generated from the CLDR Unicode Project")
- (description
- "This package provides a set of locales generated from the
-@uref{http://cldr.unicode.org/, Unicode CLDR Project} which can be used
-independently or within an internalization (i18n) package. Its currently
-implemented features include
-
-@itemize
-@item Rules generated from the CLDR data, v31.0.3
-@item Contains Cardinal, Ordinal and Range Plural Rules
-@item Contains Month, Weekday and Timezone translations built in
-@item Contains Date & Time formatting functions
-@item Contains Number, Currency, Accounting and Percent formatting functions
-@item Supports the \"Gregorian\" calendar only
-@end itemize")
- (license license:expat)))
-
(define-public go-github-com-go-playground-universal-translator
(package
(name "go-github-com-go-playground-universal-translator")
@@ -2997,7 +2816,7 @@ web framework
(package
(inherit go-gopkg-in-go-playground-validator-v9)
(name "go-github-com-go-playground-validator-v10")
- (version "10.18.0")
+ (version "10.22.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3006,9 +2825,10 @@ web framework
(file-name (git-file-name name version))
(sha256
(base32
- "1j8q3mlyhjirzr3fjaj0rx9z1pnaav1hjwjwf7982gdl2p9z3mgg"))))
+ "0zff0qpqfzwa4xazppiq7jvpncnmx52m23qi4ih754b7rzhbk0iz"))))
(arguments
- (list #:import-path "github.com/go-playground/validator/v10"))
+ (list
+ #:import-path "github.com/go-playground/validator/v10"))
(propagated-inputs
(modify-inputs (package-propagated-inputs
go-gopkg-in-go-playground-validator-v9)
@@ -3173,9 +2993,9 @@ termination.")
"t.Fatalf(`Killf(\"BO%%s")))))))
(home-page "https://gopkg.in/tomb.v1")))
-(define-public go-github.com-jtolds-gls
+(define-public go-github-com-jtolds-gls
(package
- (name "go-github.com-jtolds-gls")
+ (name "go-github-com-jtolds-gls")
(version "4.20")
(source (origin
(method git-fetch)
@@ -3279,49 +3099,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"))))
- (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))
+ (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
+ (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
+ 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
@@ -3329,184 +3145,67 @@ 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"))))
- (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))
- (home-page "https://golang.org/x/tools/gopls")
- (synopsis "Official language server for the Go language")
- (description
- "Pronounced ``Go please'', this is the official Go language server
-developed by the Go team. It provides IDE features to any LSP-compatible
-editor.")
- (license license:bsd-3)))
-
-(define-public go-golang-org-x-oauth2
- (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
- (revision "1"))
- (package
- (name "go-golang-org-x-oauth2")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/oauth2")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-oauth2-"
- version "-checkout"))
- (sha256
- (base32
- "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/oauth2"))
- (propagated-inputs
- (list go-cloud-google-com-go-compute-metadata
- go-golang-org-x-net))
- (home-page "https://go.googlesource.com/oauth2")
- (synopsis "Client implementation of the OAuth 2.0 spec")
- (description "This package contains a client implementation for OAuth 2.0
- spec in Go.")
- (license license:bsd-3))))
-
-(define-public go-github-com-jpillora-backoff
- (let ((commit
- "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d")
- (revision "0"))
- (package
- (name "go-github-com-jpillora-backoff")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jpillora/backoff")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xhvxr7bm47czdc5hy3kl508z3y4j91i2jm7vg774i52zych6k4l"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jpillora/backoff"))
- (home-page "https://github.com/jpillora/backoff")
- (synopsis "Simple exponential backoff counter in Go")
- (description "This package is a simple exponential backoff counter in
-Go.")
- (license license:expat))))
-
-(define-public go-github-com-stretchr-objx
- (package
- (name "go-github-com-stretchr-objx")
- (version "0.4.0")
+ ;; 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://github.com/stretchr/objx")
- (commit (string-append "v" version))))
+ (url "https://go.googlesource.com/tools")
+ (commit (string-append "gopls/v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "vendor")))))
+ (base32 "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx"))))
(build-system go-build-system)
(arguments
(list
- #:import-path "github.com/stretchr/objx"
- #: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)))))))
- (propagated-inputs
- (list go-github-com-davecgh-go-spew
- go-github-com-pmezard-go-difflib))
- (inputs
- (list go-github-com-stretchr-testify-bootstrap))
- (home-page "https://github.com/stretchr/objx")
- (synopsis "Go package for dealing with maps, slices, JSON and other data")
- (description "This package provides a Go library for dealing with maps,
-slices, JSON and other data.")
- (license license:expat)))
-
-(define-public go-github-com-technoweenie-multipartstreamer
- (package
- (name "go-github-com-technoweenie-multipartstreamer")
- (version "1.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/technoweenie/multipartstreamer")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "159jhcabdkds8m5777zfs8p5z3snpjhzz7q9aq9wjpcvh6xlljqa"))))
- (build-system go-build-system)
- (arguments
- (list #:tests? #f ; Upstream tests are broken.
- #:import-path "github.com/technoweenie/multipartstreamer"))
- (home-page "https://github.com/technoweenie/multipartstreamer")
- (synopsis "MIME multipart format streamer")
+ #: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
+ 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
- "This package helps you encode large files in MIME multipart format
-without reading the entire content into memory.")
- (license license:expat)))
+ "Pronounced ``Go please'', this is the official Go language server
+developed by the Go team. It provides IDE features to any LSP-compatible
+editor.")
+ (license license:bsd-3)))
(define-public go-github-com-tevino-abool
(let ((commit
@@ -3737,6 +3436,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
@@ -3751,6 +3451,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
@@ -3778,7 +3479,7 @@ all types of configuration needs and formats.")
(define-public go-github-com-fsnotify-fsnotify
(package
(name "go-github-com-fsnotify-fsnotify")
- (version "1.4.9")
+ (version "1.7.0")
(source
(origin
(method git-fetch)
@@ -3788,7 +3489,7 @@ all types of configuration needs and formats.")
(file-name (git-file-name name version))
(sha256
(base32
- "1i1r72knpbfwwql9frn9bqc3nhfc2ai5m6qllcyr6wban62lr40x"))))
+ "1h7vs21lkj4bqbw5a6mqykaf56y181r0nja7c8pzajkvbsc39y8m"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/fsnotify/fsnotify"))
@@ -3845,52 +3546,6 @@ updating files, like @command{tail -f}.")
(description "Java properties scanner for Go")
(license license:bsd-2)))
-(define-public go-github-com-pelletier-go-toml
- (package
- (name "go-github-com-pelletier-go-toml")
- (version "1.9.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pelletier/go-toml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0cqwnvlgs1wgdgjxlwv8j52f7d6syniadr51sjh2fya99m5wzvsn"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/pelletier/go-toml"))
- (native-inputs
- `(("github.com/BurntSushi/toml" ,go-github-com-burntsushi-toml)
- ("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew)
- ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2)))
- (home-page "https://github.com/pelletier/go-toml")
- (synopsis "Go library for the TOML configuration language")
- (description "Go library for the TOML configuration language")
- (license license:expat)))
-
-(define-public go-github-com-pelletier-go-toml-v2
- (package
- (inherit go-github-com-pelletier-go-toml)
- (name "go-github-com-pelletier-go-toml-v2")
- (version "2.1.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pelletier/go-toml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1k0rwg7870f4va7jaavnpwvdn6d76gxgyr7c978bx2h829a9sx2a"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/pelletier/go-toml/v2"))
- (native-inputs
- (list go-github-com-stretchr-testify))))
-
(define-public go-github-com-subosito-gotenv
(package
(name "go-github-com-subosito-gotenv")
@@ -3918,7 +3573,7 @@ updating files, like @command{tail -f}.")
(define-public go-github-com-sirupsen-logrus
(package
(name "go-github-com-sirupsen-logrus")
- (version "1.9.0")
+ (version "1.9.3")
(source
(origin
(method git-fetch)
@@ -3928,7 +3583,7 @@ updating files, like @command{tail -f}.")
(file-name (git-file-name name version))
(sha256
(base32
- "12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz"))))
+ "1jz7nyq88i9fwfpp7krl046q62kjn6lb9j4r932bxnpypl1hwc49"))))
(build-system go-build-system)
(arguments
(list
@@ -4216,30 +3871,6 @@ which satisfies the cron expression.")
(license (list license:gpl3+
license:asl2.0)))))
-(define-public go-gopkg-in-ini-v1
- (package
- (name "go-gopkg-in-ini-v1")
- (version "1.56.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-ini/ini")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0j5z0cngg6mq2f9id083jcdi7k6r2h35714pashv6sdv2q7bmfc5"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "gopkg.in/ini.v1"
- ;; Requires large unpackaged test framework
- #:tests? #f))
- (home-page "https://gopkg.in/ini.v1")
- (synopsis "Go library for ini files")
- (description "Go library for ini files")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-yaml-v3
(package
(name "go-gopkg-in-yaml-v3")
@@ -4673,34 +4304,6 @@ generation features. This code generation is used to achieve:
(home-page "https://github.com/gogo/protobuf")
(license license:bsd-3)))
-(define-public go-github-com-libp2p-go-flow-metrics
- (let ((commit "7e5a55af485341567f98d6847a373eb5ddcdcd43")
- (revision "0"))
- (package
- (name "go-github-com-libp2p-go-flow-metrics")
- (version (git-version "0.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libp2p/go-flow-metrics")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/libp2p/go-flow-metrics"
- ;; TODO: Tests hang.
- #:tests? #f))
- (home-page
- "https://github.com/libp2p/go-flow-metrics")
- (synopsis "Simple library for tracking flow metrics")
- (description "A simple alternative to rcrowley's @command{go-metrics}
-that's a lot faster (and only does simple bandwidth metrics).")
- (license license:expat))))
-
(define-public go-github-com-btcsuite-btclog
(let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a")
(revision "0"))
@@ -4831,39 +4434,6 @@ required by Go's standard Hash interface.")
(description "Just a type for protocol strings. Nothing more.")
(license license:expat))))
-(define-public go-github-com-libp2p-go-libp2p-metrics
- (let ((commit "a10ff6e75dae3c868023867e8caa534a04bdc624")
- (revision "0"))
- (package
- (name "go-github-com-libp2p-go-libp2p-metrics")
- (version (git-version "2.1.6" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libp2p/go-libp2p-metrics")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "05wy0cq4h6yg9bzgapcvm2criwriicbswx80ma82gyn4a9fdrk8m"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/libp2p/go-libp2p-metrics"))
- (propagated-inputs
- (list go-github-com-libp2p-go-flow-metrics
- go-github-com-libp2p-go-libp2p-peer
- go-github-com-libp2p-go-libp2p-protocol
- go-github-com-libp2p-go-libp2p-crypto
- go-github-com-multiformats-go-multihash
- go-github-com-btcsuite-btcd-btcec
- go-github-com-gogo-protobuf))
- (home-page "https://github.com/libp2p/go-libp2p-metrics")
- (synopsis "Connection wrapper for go-libp2p that provides bandwidth metrics")
- (description "A connection wrapper for @command{go-libp2p} that provides bandwidth
-statistics for wrapped connections.")
- (license license:expat))))
-
(define-public go-github-com-mitchellh-go-homedir
(let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4")
(revision "0"))
@@ -4906,7 +4476,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)
@@ -4916,7 +4486,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"))
@@ -5304,54 +4874,6 @@ have super fancy logs.")
"The fs package provides file-system-related Go functions.")
(license license:bsd-3))))
-(define-public go-github-com-direnv-go-dotenv
- (let ((commit "4cce6d1a66f7bc8dc730eab85cab6af1b801abed")
- (revision "0"))
- (package
- (name "go-github-com-direnv-go-dotenv")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/direnv/go-dotenv")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "00wn4fc2lma0csf6ryvlc6k9jbpbifm4n7i3kkd2xrfw5qlm29b6"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/direnv/go-dotenv"))
- (home-page "https://github.com/direnv/go-dotenv")
- (synopsis "Go dotenv parsing library")
- (description "This package provides a library for parsing the dotenv
-format in Go.")
- (license license:expat))))
-
-(define-public go-github-com-kr-pretty
- (package
- (name "go-github-com-kr-pretty")
- (version "0.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/kr/pretty")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0vzfz06y9q8gs2nxx0kys0591vzp78k0fvpb8digi5n15h3b25hy"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-kr-text))
- (arguments
- '(#:import-path "github.com/kr/pretty"))
- (synopsis "Pretty printer for Go values")
- (description "This package provides a pretty printer for Go values.")
- (home-page "https://github.com/kr/pretty")
- (license license:expat)))
-
(define-public go-github-com-kylelemons-godebug
(package
(name "go-github-com-kylelemons-godebug")
@@ -5403,7 +4925,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)
@@ -5413,11 +4935,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
@@ -5425,33 +4949,6 @@ representation suitable for computing diffs.")
golang's database/sql package.")
(license license:mpl2.0)))
-(define-public go-github-com-syndtr-goleveldb-leveldb
- (package
- (name "go-github-com-syndtr-goleveldb-leveldb")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/syndtr/goleveldb")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "042k0gbzs5waqpxmd7nv5h93mlva861s66c3s9gfg1fym5dx4vmd"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/syndtr/goleveldb/leveldb"
- #:unpack-path "github.com/syndtr/goleveldb"))
- (propagated-inputs (list go-github-com-onsi-gomega
- go-github-com-onsi-ginkgo
- go-github-com-golang-snappy))
- (home-page "https://github.com/syndtr/goleveldb")
- (synopsis "LevelDB implementation in Go")
- (description
- "This package provides a Go implementation of the LevelDB key/value
-storage system.")
- (license license:bsd-2)))
-
(define-public go-github-com-lucasb-eyer-go-colorful
(package
(name "go-github-com-lucasb-eyer-go-colorful")
@@ -5477,9 +4974,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")
@@ -5590,7 +5084,7 @@ systems.")
(package
(inherit go-github-com-gdamore-tcell)
(name "go-github-com-gdamore-tcell")
- (version "2.6.0")
+ (version "2.7.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5599,7 +5093,7 @@ systems.")
(file-name (git-file-name name version))
(sha256
(base32
- "0126hi8glnfqdx4l9zlh6dhd5f5c8bws7arv9pp4n2kqcnhdc6g2"))))
+ "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd"))))
(arguments
(list #:import-path "github.com/gdamore/tcell/v2"
#:phases
@@ -5781,6 +5275,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")
@@ -5797,15 +5293,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.")
@@ -5885,270 +5377,10 @@ a cron spec parser and job runner.")
"This is a fork of another go-libvterm library for use with aerc.")
(license license:expat))))
-(define-public go-github-com-emersion-go-imap
- (package
- (name "go-github-com-emersion-go-imap")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-imap")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ak2ysvfcc9w0g1070msis8x9sh6gzvf0nd65ks594siwbmqddw8"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-imap"))
- (propagated-inputs (list go-golang-org-x-text
- go-github-com-emersion-go-sasl
- go-github-com-emersion-go-message))
- (home-page "https://github.com/emersion/go-imap")
- (synopsis "IMAP4rev1 library written in Go")
- (description
- "This package provides an IMAP4rev1 library written in Go. It
-can be used to build IMAP clients and servers.")
- (license license:expat)))
-
-(define-public go-github-com-emersion-go-imap-sortthread
- (package
- (name "go-github-com-emersion-go-imap-sortthread")
- (version "1.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-imap-sortthread")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1cfbgz1l5angnj52v9pxwggai2shx0h78ffcp7j4r4lr7lzflnwz"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-imap-sortthread"))
- (propagated-inputs (list go-golang-org-x-text
- go-github-com-emersion-go-sasl
- go-github-com-emersion-go-imap))
- (home-page "https://github.com/emersion/go-imap-sortthread")
- (synopsis "Sorting and threading of messages for the imap package")
- (description
- "The sortthread package implements message sorting and threading for
-@code{go-github-com-emersion-go-imap}.")
- (license license:expat)))
-
-(define-public go-github-com-emersion-go-smtp
- (package
- (name "go-github-com-emersion-go-smtp")
- (version "0.15.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-smtp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1vhc0vpjd4yhxk6wrh01sdpi7nprjn98s46yy82xwlkm0cskl0h7"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-smtp"))
- (propagated-inputs (list go-github-com-emersion-go-sasl))
- (home-page "https://github.com/emersion/go-smtp")
- (synopsis "SMTP implementation for Go")
- (description
- "This package implements the Simple Mail Transfer Protocol as
-defined by RFC 5321.")
- (license license:expat)))
-
-(define-public go-github-com-emersion-go-sasl
- (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9")
- (revision "1"))
- (package
- (name "go-github-com-emersion-go-sasl")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-sasl")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-sasl"))
- (home-page "https://github.com/emersion/go-sasl")
- (synopsis "SASL library written in Go")
- (description "This package provides a SASL library written in Go.")
- (license license:expat))))
-
-(define-public go-github-com-emersion-go-imap-idle
- (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9")
- (revision "0"))
- (package
- (name "go-github-com-emersion-go-imap-idle")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-imap-idle")
- (commit commit)))
- (sha256
- (base32
- "0blwcadmxgqsdwgr9m4jqfbpfa2viw5ah19xbybpa1z1z4aj5cbc"))
- (file-name (git-file-name name version))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/emersion/go-imap-idle"))
- (native-inputs
- (list go-github-com-emersion-go-imap go-github-com-emersion-go-sasl
- go-golang-org-x-text))
- (home-page "https://github.com/emersion/go-imap-idle")
- (synopsis "IDLE extension for go-imap")
- (description "This package provides an IDLE extension for go-imap.")
- (license license:expat))))
-
-(define-public go-github-com-emersion-go-maildir
- (package
- (name "go-github-com-emersion-go-maildir")
- (version "0.3.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-maildir")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1rs9kbacjpcza25pmdkbm7sdm7r6gq4g44nihi9asyrvspx96zf2"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-maildir"))
- (home-page "https://github.com/emersion/go-maildir")
- (synopsis "Maildir interface for Go")
- (description
- "This package provides an interface to mailboxes in the Maildir
-format.")
- (license license:expat)))
-
-(define-public go-github-com-emersion-go-milter
- (package
- (name "go-github-com-emersion-go-milter")
- (version "0.3.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-milter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10vpry5gjz2bh9qchcx4p59zm7cc6cb6bfkii2n6vsn4svb950sa"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-milter"))
- (propagated-inputs (list go-github-com-emersion-go-message))
- (home-page "https://github.com/emersion/go-milter")
- (synopsis "Milter mail filters in Go")
- (description
- "This package provides an interface for implementing milter mail
-filters for Go.")
- (license license:bsd-2)))
-
-(define-public go-github-com-emersion-go-msgauth
- (package
- (name "go-github-com-emersion-go-msgauth")
- (version "0.6.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-msgauth")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ds8yr4cm9wigcxg1sxc2m0wmy4z9n6gws3mj50dmf2ayij69z9j"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-msgauth"
- #:tests? #f ; Source-only package.
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package.
- (delete 'build))))
- (propagated-inputs (list go-golang-org-x-crypto
- go-github-com-emersion-go-milter
- go-github-com-emersion-go-message))
- (home-page "https://github.com/emersion/go-msgauth")
- (synopsis "Email authentication for Go")
- (description
- "This package provides a Go library for authenticating emails.")
- (license license:expat)))
-
-(define-public go-github-com-emersion-go-mbox
- (package
- (name "go-github-com-emersion-go-mbox")
- (version "1.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-mbox")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0vnadh2khx7sxn0irrd8gz8ra02x7ij0q8zglq3rqffqil06nliv"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-mbox"))
- (home-page "https://github.com/emersion/go-mbox")
- (synopsis "Go library for handling @code{mbox} files")
- (description
- "This package provides a library for parsing and formatting
-@code{mbox} files.")
- (license license:expat)))
-
-(define-public go-github-com-google-go-cmp-cmp
- (package
- (name "go-github-com-google-go-cmp-cmp")
- (version "0.5.9")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/go-cmp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/go-cmp/cmp"
- #:unpack-path "github.com/google/go-cmp"
- #: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)))))))
- (synopsis "Determine equality of values in Go")
- (description
- "This package is intended to be a more powerful and safer
-alternative to @@code{reflect.DeepEqual} for comparing whether two values are
-semantically equal.")
- (home-page "https://github.com/google/go-cmp")
- (license license:bsd-3)))
-
(define-public go-github-com-google-uuid
(package
(name "go-github-com-google-uuid")
- (version "1.1.1")
+ (version "1.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6157,7 +5389,7 @@ semantically equal.")
(file-name (git-file-name name version))
(sha256
(base32
- "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"))))
+ "131d01minir79dq6d4jq55018343yidl5cs2bfhynx1klnr7ssam"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/google/uuid"))
@@ -6240,28 +5472,6 @@ and from termios translations, readCh, reading passwords, etc.")
into URL query parameters.")
(license license:bsd-3))))
-(define-public go-github-com-google-renameio
- (package
- (name "go-github-com-google-renameio")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/renameio")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/google/renameio"))
- (home-page "https://github.com/google/renameio/")
- (synopsis "Atomically create or replace a file or symbolic link")
- (description "@code{renameio} Go package provides a way to atomically
-create or replace a file or symbolic link.")
- (license license:asl2.0)))
-
(define (go-gotest-tools-source version sha256-base32-hash)
(origin
(method git-fetch)
@@ -6294,7 +5504,7 @@ create or replace a file or symbolic link.")
(define-public go-gotest-tools-internal-format
(package (inherit (go-gotest-tools-package "internal/format"))
(native-inputs
- (list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp))
+ (list go-github-com-pkg-errors go-github-com-google-go-cmp))
(synopsis "Formats messages for use with gotest-tools")
(description "This package provides a way to format messages for use
with gotest-tools.")))
@@ -6319,7 +5529,7 @@ with gotest-tools.")))
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args))))))))
(native-inputs
- (list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp))
+ (list go-github-com-pkg-errors go-github-com-google-go-cmp))
(synopsis "Source code AST formatters for gotest-tools")
(description "This package provides source code AST formatters for
gotest-tools.")))
@@ -6332,7 +5542,7 @@ gotest-tools.")))
#:import-path "gotest.tools/assert"
#:unpack-path "gotest.tools"))
(propagated-inputs
- (list go-github-com-google-go-cmp-cmp
+ (list go-github-com-google-go-cmp
go-github-com-pkg-errors
go-github-com-spf13-pflag
go-golang-org-x-tools))
@@ -6360,21 +5570,21 @@ test when a comparison fails.")
'(#:import-path "gotest.tools/gotestsum"))
(native-inputs
(list go-github-com-fatih-color
- go-golang.org-x-sync-errgroup
+ go-golang-org-x-sync
go-github-com-pkg-errors
go-github-com-sirupsen-logrus
go-github-com-spf13-pflag
go-github-com-jonboulle-clockwork
go-golang-org-x-crypto
go-gotest-tools-assert
- go-github-com-google-go-cmp-cmp
+ go-github-com-google-go-cmp
;; TODO: This would be better as a propagated-input of
;; go-gotest-tools-assert, but that does not work for
;; some reason.
go-gotest-tools-internal-format
go-gotest-tools-internal-difflib
go-gotest-tools-internal-source
- go-github-com-google-go-cmp-cmp))
+ go-github-com-google-go-cmp))
(synopsis "Go test runner with output optimized for humans")
(description "This package provides a @code{go test} runner with output
optimized for humans, JUnit XML for CI integration, and a summary of the
@@ -6382,64 +5592,6 @@ test results.")
(home-page "https://github.com/gotestyourself/gotestsum")
(license license:asl2.0)))
-(define-public go-github-com-golang-protobuf-proto
- (package
- (name "go-github-com-golang-protobuf-proto")
- (version "1.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/protobuf")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/golang/protobuf/proto"
- #:unpack-path "github.com/golang/protobuf"
- ;; Requires unpackaged golang.org/x/sync/errgroup
- #:tests? #f))
- (synopsis "Go support for Protocol Buffers")
- (description "This package provides Go support for the Protocol Buffers
-data serialization format.")
- (home-page "https://github.com/golang/protobuf")
- (license license:bsd-3)))
-
-(define-public go-google-golang-org-protobuf
- (package
- (name "go-google-golang-org-protobuf")
- (version "1.28.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/protobuf")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "google.golang.org/protobuf"
- #:tests? #f ; source-only package
- #:phases #~(modify-phases %standard-phases
- ;; source-only package
- (delete 'build))))
- (propagated-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-golang-protobuf-proto))
- (home-page "https://google.golang.org/protobuf")
- (synopsis "Go library for Protocol Buffers")
- (description
- "The protobuf package provides a Go implementation of Protocol Buffers, a
-language and platform neutral, extensible mechanism for serializing structured
-data.
-
-This package is a successor to @code{go-github-com-golang-protobuf} with an
-improved and cleaner API.")
- (license license:bsd-3)))
-
(define-public go-github-com-macronut-go-tproxy
(package
(name "go-github-com-macronut-go-tproxy")
@@ -6488,13 +5640,10 @@ 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
+(define-public go-github-com-bits-and-blooms-bloom-v3
(package
- (name "go-github-com-bits-and-blooms-bloom")
- (version "3.6.0")
+ (name "go-github-com-bits-and-blooms-bloom-v3")
+ (version "3.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6503,20 +5652,10 @@ efficient space usage.")
(file-name (git-file-name name version))
(sha256
(base32
- "02rpjlgl7k3755qnlsk519xazgqlk73b8wvkpqlvccywms5w77bq"))))
+ "022pyzjp862ysl30aj105i2xmapn400ambjh8h1dcyjy9c0f8agn"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/bits-and-blooms/bloom"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-import-path
- (lambda _
- ;; See 'go.mod' in the source distribution of Syncthing 1.5.0 for
- ;; more information.
- ;; <https://github.com/spaolacci/murmur3/issues/29>
- (substitute* "src/github.com/bits-and-blooms/bloom/bloom.go"
- (("spaolacci") "twmb"))
- #t)))))
+ (list #:import-path "github.com/bits-and-blooms/bloom"))
(propagated-inputs
(list go-github-com-twmb-murmur3 go-github-com-bits-and-blooms-bitset))
(synopsis "Bloom filters in Go")
@@ -6525,9 +5664,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"))
@@ -6628,31 +5764,6 @@ characters with their ASCII approximations.")
(description "Go library that pluralizes and singularizes English nouns.")
(license license:bsd-2))))
-(define-public go-github-com-klauspost-cpuid
- (package
- (name "go-github-com-klauspost-cpuid")
- (version "1.2.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/klauspost/cpuid")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/klauspost/cpuid"))
- (home-page "https://github.com/klauspost/cpuid")
- (synopsis "CPU feature identification for Go")
- (description "@code{cpuid} provides information about the CPU running the
-current program. CPU features are detected on startup, and kept for fast access
-through the life of the application. Currently x86 / x64 (AMD64) is supported,
-and no external C (cgo) code is used, which should make the library very eas
-to use.")
- (license license:expat)))
-
(define-public go-github-com-surge-glog
(let ((commit "2578deb2b95c665e6b1ebabf304ce2085c9e1985")
(revision "1"))
@@ -6729,34 +5840,6 @@ various ways. It is a Go implementation of some string manipulation libraries
of Java Apache Commons.")
(license license:asl2.0)))
-(define-public go-github-com-masterminds-semver
- (package
- (name "go-github-com-masterminds-semver")
- (version "3.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Masterminds/semver")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1g1wizfdy29d02l9dh8gsb029yr4m4swp13swf0pnh9ryh5f1msz"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/Masterminds/semver"))
- (home-page "https://github.com/Masterminds/semver/")
- (synopsis "@code{semver} helps to work with semantic versions")
- (description "The semver package provides the ability to work with
-semantic versions. Specifically it provides the ability to:
-@itemize
-@item Parse semantic versions
-@item Sort semantic versions
-@item Check if a semantic version fits within a set of constraints
-@item Optionally work with a @code{v} prefix
-@end itemize\n")
- (license license:expat)))
-
(define-public go-github-com-huandu-xstrings
(package
(name "go-github-com-huandu-xstrings")
@@ -6829,68 +5912,6 @@ maps (because they are not addressable using Go reflection).")
(native-inputs
(list go-gopkg-in-yaml-v3))))
-(define-public go-github-com-masterminds-sprig
- (package
- (name "go-github-com-masterminds-sprig")
- (version "3.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Masterminds/sprig")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18"))))
- (build-system go-build-system)
- (arguments
- `(#:tests? #f ;network tests only
- #:import-path "github.com/Masterminds/sprig"))
- (native-inputs
- (list go-github-com-masterminds-goutils
- go-github-com-masterminds-semver
- go-github-com-google-uuid
- go-github-com-huandu-xstrings
- go-github-com-imdario-mergo
- go-github-com-mitchellh-reflectwalk
- go-github-com-mitchellh-copystructure
- go-github-com-spf13-cast
- go-golang-org-x-crypto
- go-github-com-stretchr-testify))
- (home-page "https://github.com/Masterminds/sprig/")
- (synopsis "Template functions for Go templates")
- (description "Sprig is a library that provides more than 100 commonly used
-template functions.")
- (license license:expat)))
-
-(define-public go-github-com-go-task-slim-sprig
- (let ((commit "afa1e2071829e4db655eb448d6c7c16eb0bc5766")
- (revision "0"))
- (package
- (name "go-github-com-go-task-slim-sprig")
- (version (git-version "2.20.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-task/slim-sprig")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1185y8qygv8gb3wpghx5d945wq68j4dbaiffq3h0dh453g4h1w7a"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/go-task/slim-sprig"
- ;; Tests try to access the network.
- #:tests? #f))
- (home-page "https://github.com/go-task/slim-sprig")
- (synopsis "Various useful template functions for Go")
- (description
- "Sprig provides over 100 functions that extend the Go template system.
-Slim-Sprig is a fork of Sprig that removes all external dependencies to make
-the library more lightweight.")
- (license license:expat))))
-
(define-public go-github-com-bmatcuk-doublestar
(package
(name "go-github-com-bmatcuk-doublestar")
@@ -6942,196 +5963,23 @@ matching and globbing with support for \"doublestar\" patterns.")
#:unpack-path "github.com/bmatcuk/doublestar/v2"
#:import-path "github.com/bmatcuk/doublestar/v2"))))
-(define-public go-github-com-dlclark-regexp2
- (package
- (name "go-github-com-dlclark-regexp2")
- (version "1.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dlclark/regexp2")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/dlclark/regexp2"))
- (home-page "https://github.com/dlclark/regexp2/")
- (synopsis "Full featured regular expressions for Go")
- (description "Regexp2 is a feature-rich RegExp engine for Go.")
- (license license:expat)))
-
-(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-sergi-go-diff
- (package
- (name "go-github-com-sergi-go-diff")
- (version "1.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sergi/go-diff")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0cbj8nshllq102iiav0k1s01b8gwbkzj674g71n938qqna32y2pa"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/sergi/go-diff/diffmatchpatch"
- #:unpack-path "github.com/sergi/go-diff"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://github.com/sergi/go-diff/")
- (synopsis "Algorithms to perform operations for synchronizing plain text")
- (description "@code{go-diff} offers algorithms to perform operations required for
-synchronizing plain text:
-@itemize
-@item compare two texts and return their differences
-@item perform fuzzy matching of text
-@item apply patches onto text
-@end itemize\n")
- (license license:expat)))
-
-(define-public go-github-com-muesli-reflow-wordwrap
- (package
- (name "go-github-com-muesli-reflow-wordwrap")
- (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"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/muesli/reflow/wordwrap"
- #:unpack-path "github.com/muesli/reflow"))
- (native-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.")
- (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
+(define-public go-github-com-bmatcuk-doublestar-v4
(package
- (name "go-github-com-muesli-termenv")
- (version "0.8.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/muesli/termenv")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp"))))
- (build-system go-build-system)
+ (inherit go-github-com-bmatcuk-doublestar)
+ (name "go-github-com-bmatcuk-doublestar-v4")
+ (version "4.6.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bmatcuk/doublestar")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12rf4a9isgg2nh927gikgbmyaynaqp4kjahgscb4qnr04m3vpr41"))))
(arguments
- `(#:import-path "github.com/muesli/termenv"))
- (native-inputs
- (list go-github-com-google-goterm
- go-github-com-lucasb-eyer-go-colorful
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth))
- (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
-terminal. It gathers information about the terminal environment in terms of
-its ANSI and color support and offers you convenient methods to colorize and
-style your output, without you having to deal with all kinds of weird ANSI
-escape sequences and color conversions.")
- (license license:expat)))
+ (list
+ #:import-path "github.com/bmatcuk/doublestar/v4"))))
(define-public go-github-com-olekukonko-tablewriter
(package
@@ -7201,7 +6049,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
@@ -7210,43 +6058,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
@@ -7586,10 +6447,13 @@ temporal directories.")
"002yb1s2mxq2xijkl39ip1iyc3l52k23ikyi9ijfl4bgqxy79ljg"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/go-git/go-git-fixtures/v4"
- #:phases
- (modify-phases %standard-phases
- (delete 'reset-gzip-timestamps))))
+ (list
+ ;; XXX: panic: runtime error: makeslice: cap out of range
+ #:tests? (target-64bit?)
+ #:import-path "github.com/go-git/go-git-fixtures/v4"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'reset-gzip-timestamps))))
(native-inputs
(list go-github-com-alcortesm-tgz go-github-com-go-git-go-billy
go-golang-org-x-sys go-gopkg-in-check-v1))
@@ -7692,9 +6556,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)
@@ -7793,20 +6657,34 @@ RFC-5802 and RFC-7677.")
(define-public go-github-com-godbus-dbus
(package
(name "go-github-com-godbus-dbus")
- (version "5.1.0")
+ (version "0.0.0-20190726142602-4481cbc300e2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/godbus/dbus")
- (commit (string-append "v" version))))
+ (commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
- "1kayd4x7idrhi06ahh5kqkgwzgh9icvv71mjar2d0jl486dfs8r5"))))
+ "0h0cl1r136g0kxbw3i7ggb9mhavpi1yr7d7312iwhkxm93dxkphg"))))
(build-system go-build-system)
(arguments
- `(#:tests? #f ;no /var/run/dbus/system_bus_socket
- #:import-path "github.com/godbus/dbus"))
+ (list
+ #:import-path "github.com/godbus/dbus"
+ #: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$")
+ ;; Disable tests which require a system D-Bus instance.
+ (("TestSystemBus") "OffTestSystemBus")
+ (("TestConnectSystemBus") "OffTestConnectSystemBus")))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "dbus-run-session" "--" "go" "test" "./..."))))))))
(native-inputs
(list dbus)) ;dbus-launch
(home-page "https://github.com/godbus/dbus/")
@@ -7815,6 +6693,26 @@ RFC-5802 and RFC-7677.")
bindings for the D-Bus message bus system.")
(license license:bsd-2)))
+(define-public go-github-com-godbus-dbus-v5
+ (package
+ (inherit go-github-com-godbus-dbus)
+ (name "go-github-com-godbus-dbus-v5")
+ (version "5.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/godbus/dbus")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1kayd4x7idrhi06ahh5kqkgwzgh9icvv71mjar2d0jl486dfs8r5"))))
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments go-github-com-godbus-dbus)
+ ((#:import-path _ "github.com/godbus/dbus")
+ "github.com/godbus/dbus/v5")))))
+
(define-public go-github-com-delthas-go-libnp
(let ((commit "0e45ece1f878f202fee2c74801e287804668f677"))
(package
@@ -7831,7 +6729,7 @@ bindings for the D-Bus message bus system.")
"1hylpvwz3kb8wr00knba6mggjacak2vmqafwysansj0ns038lp8w"))))
(build-system go-build-system)
(arguments `(#:import-path "github.com/delthas/go-libnp"))
- (propagated-inputs (list go-github-com-godbus-dbus))
+ (propagated-inputs (list go-github-com-godbus-dbus-v5))
(home-page "https://github.com/delthas/go-libnp")
(synopsis "Tiny library providing information about now-playing media")
(description "@code{go-libnp} is a tiny cross-platform library for
@@ -7840,123 +6738,31 @@ system.")
(license license:expat))))
(define-public go-github-com-delthas-go-localeinfo
- (let ((commit "686a1e18511819b2f1625f00437f6e1246c04a5d"))
- (package
- (name "go-github-com-delthas-go-localeinfo")
- (version (git-version "0.0.0" "0" commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/delthas/go-localeinfo")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0r0v42ggvyss8327nggwinxl42pj4l0dwz96g9wk1w8h8vmfrh0z"))))
- (build-system go-build-system)
- (arguments `(#:tests? #f ; FIXME: tests assume certain locale
- #:import-path "github.com/delthas/go-localeinfo"))
- (home-page "https://github.com/delthas/go-localeinfo")
- (synopsis "Library for extracting locale information")
- (description "@code{go-localeinfo} extracts monetary/numeric/time
-formatting information, rather than the current locale name.")
- (license license:expat))))
-
-(define-public go-github-com-prometheus-common
(package
- (name "go-github-com-prometheus-common")
- (version "0.4.1")
+ (name "go-github-com-delthas-go-localeinfo")
+ (version "0.0.0-20240607105203-b2e834fc307d")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/prometheus/common")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/prometheus/common"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list go-github-com-golang-protobuf-proto
- go-github-com-matttproud-golang-protobuf-extensions-pbutil
- go-github-com-prometheus-client-model))
- (synopsis "Prometheus metrics")
- (description "This package provides tools for reading and writing
-Prometheus metrics.")
- (home-page "https://github.com/prometheus/common")
- (license license:asl2.0)))
-
-(define-public go-github-com-prometheus-procfs
- (package
- (name "go-github-com-prometheus-procfs")
- (version "0.0.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/prometheus/procfs")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/prometheus/procfs"
- ;; The tests require Go modules, which are not yet supported in Guix's
- ;; Go build system.
- #:tests? #f))
- (propagated-inputs (list go-golang.org-x-sync-errgroup))
- (synopsis "Go library for reading @file{/proc}")
- (description "The @code{procfs} Go package provides functions to retrieve
-system, kernel, and process metrics from the @file{/proc} pseudo file system.")
- (home-page "https://github.com/prometheus/procfs")
- (license license:asl2.0)))
-
-(define-public go-github-com-prometheus-client-golang
- (package
- (name "go-github-com-prometheus-client-golang")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/prometheus/client_golang")
- (commit (string-append "v" version))))
+ (url "https://github.com/delthas/go-localeinfo")
+ (commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0zs49psk23n9z8wrl02d5vib5wclpym8kaxcy6n5pk696i419065"))))
+ "0817lhic77sz9lxizy2rchwssp0vzl7qxbsfghcddg6ssy1n0zhj"))))
(build-system go-build-system)
- (arguments
- '(#:tests? #f
- #:import-path "github.com/prometheus/client_golang"
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list go-github-com-beorn7-perks-quantile
- go-github-com-golang-protobuf-proto
- go-github-com-prometheus-client-model
- go-github-com-prometheus-common
- go-github-com-prometheus-procfs
- go-github-com-cespare-xxhash))
- (synopsis "HTTP server and client tools for Prometheus")
- (description "This package @code{promhttp} provides HTTP client and
-server tools for Prometheus metrics.")
- (home-page "https://github.com/prometheus/client_golang")
- (license license:asl2.0)))
+ (arguments `(#:tests? #f ; FIXME: tests assume certain locale
+ #:import-path "github.com/delthas/go-localeinfo"))
+ (home-page "https://github.com/delthas/go-localeinfo")
+ (synopsis "Library for extracting locale information")
+ (description "@code{go-localeinfo} extracts monetary/numeric/time
+formatting information, rather than the current locale name.")
+ (license license:expat)))
(define-public go-github-com-zalando-go-keyring
(package
(name "go-github-com-zalando-go-keyring")
- (version "0.1.0")
+ (version "0.2.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7965,13 +6771,31 @@ server tools for Prometheus metrics.")
(file-name (git-file-name name version))
(sha256
(base32
- "0kj54nkiyccy6m9iy9a53f6412a54xk96j88jaiq35yzdgfa4z3p"))))
+ "1p6qlsbj9rmqiwz9ly4c7jmifcx8m45xjhsbdwdvw2jzw5jc2ch1"))))
(build-system go-build-system)
(arguments
- `(#:tests? #f ;XXX: Fix dbus tests
- #:import-path "github.com/zalando/go-keyring"))
+ (list
+ #:import-path "github.com/zalando/go-keyring"
+ #: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$")
+ ;; Disable tests which require a system DBus instance.
+ (("TestDelete") "OffTestDelete")
+ (("TestGet") "OffTestGet")
+ (("TestSet") "OffTestSet")))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "dbus-run-session" "--"
+ "go" "test" "-v" "./..."))))))))
(native-inputs
- (list go-github-com-godbus-dbus dbus))
+ (list dbus))
+ (propagated-inputs
+ (list go-github-com-godbus-dbus-v5))
(home-page "https://github.com/zalando/go-keyring/")
(synopsis "Library for working with system keyring")
(description "@code{go-keyring} is a library for setting, getting and
@@ -7996,7 +6820,7 @@ deleting secrets from the system keyring.")
'(#:unpack-path "github.com/zclconf/go-cty"
#:import-path "github.com/zclconf/go-cty/cty"))
(native-inputs
- (list go-github-com-google-go-cmp-cmp))
+ (list go-github-com-google-go-cmp))
(propagated-inputs
(list go-golang-org-x-text
go-github-com-vmihailenco-msgpack-v4
@@ -8010,75 +6834,6 @@ losing type information. The primary intended use is for implementing
configuration languages, but other uses may be possible too.")
(license license:expat)))
-(define-public go-etcd-io-bbolt
- (package
- (name "go-etcd-io-bbolt")
- (version "1.3.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/etcd-io/bbolt")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "go.etcd.io/bbolt"))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (home-page "https://pkg.go.dev/go.etcd.io/bbolt/")
- (synopsis "Low-level key/value store in Go")
- (description "This package implements a low-level key/value store in Go.")
- (license license:expat)))
-
-(define-public go-github-com-rogpeppe-go-internal
- (package
- (name "go-github-com-rogpeppe-go-internal")
- (version "1.9.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rogpeppe/go-internal")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0bh08k8fy1qcc0vzyv0xkg0sx5kjx348zd1dpjmp3rbrr6xrpaaw"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/rogpeppe/go-internal"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs
- (list go-github-com-pkg-diff))
- (home-page "https://github.com/rogpeppe/go-internal/")
- (synopsis "Internal packages from the Go standard library")
- (description "This repository factors out an opinionated selection of
-internal packages and functionality from the Go standard library. Currently
-this consists mostly of packages and testing code from within the Go tool
-implementation.
-
-Included are the following:
-@itemize
-@item dirhash: calculate hashes over directory trees the same way that the Go tool does.
-@item goproxytest: a GOPROXY implementation designed for test use.
-@item gotooltest: Use the Go tool inside test scripts (see testscript below)
-@item imports: list of known architectures and OSs, and support for reading import import statements.
-@item modfile: read and write go.mod files while preserving formatting and comments.
-@item module: module paths and versions.
-@item par: do work in parallel.
-@item semver: semantic version parsing.
-@item testenv: information on the current testing environment.
-@item testscript: script-based testing based on txtar files
-@item txtar: simple text-based file archives for testing.
-@end itemize\n")
- (license license:bsd-3)))
-
(define-public go-gopkg-in-errgo-fmt-errors
(package
(name "go-gopkg-in-errgo-fmt-errors")
@@ -8160,34 +6915,6 @@ is unchanged. This package contains a series of small enhancements and
additions.")
(license license:bsd-3))))
-(define-public go-golang-zx2c4-com-wireguard
- (package
- (name "go-golang-zx2c4-com-wireguard")
- (version "0.0.20211016")
- (source
- (origin
- (method git-fetch)
- ;; NOTE: module URL is a redirect
- ;; target: git.zx2c4.com/wireguard-go
- ;; source: golang.zx2c4.com/wireguard
- (uri (git-reference
- (url "https://git.zx2c4.com/wireguard-go/")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0"))))
- (build-system go-build-system)
- (arguments
- '(#: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))
- (home-page "https://git.zx2c4.com/wireguard")
- (synopsis "Implementation of WireGuard in Go")
- (description "This package is a Go Implementation of WireGuard.")
- (license license:expat)))
-
(define-public go-github-com-kardianos-minwinsvc
(package
(name "go-github-com-kardianos-minwinsvc")
@@ -8214,49 +6941,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"))
@@ -8402,30 +7086,6 @@ provides an API similar to that of NET/HTTP to facilitate the development of
Gemini clients and servers.")
(license license:expat)))
-(define-public go-git-sr-ht-sircmpwn-getopt
- (package
- (name "go-git-sr-ht-sircmpwn-getopt")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~sircmpwn/getopt")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0f9rammnmhaz21qkmz7qf76r8jlzi323g05ps3j7gwrxlw7442a6"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "git.sr.ht/~sircmpwn/getopt"))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://git.sr.ht/~sircmpwn/getopt")
- (synopsis "POSIX getopt for Go")
- (description
- "This package provides a POSIX-compatible implementation of
-@code{getopt} for Go.")
- (license license:bsd-3)))
-
(define-public gofumpt
(package
(name "gofumpt")
@@ -8473,8 +7133,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
@@ -8484,7 +7143,7 @@ Gemini clients and servers.")
go-golang-org-x-sync
go-golang-org-x-mod
go-github-com-rogpeppe-go-internal
- go-github-com-google-go-cmp-cmp
+ go-github-com-google-go-cmp
go-github-com-frankban-quicktest))
(home-page "https://mvdan.cc/gofumpt/")
(synopsis "Formats Go files with a stricter ruleset than gofmt")
@@ -8511,7 +7170,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
@@ -8520,13 +7179,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")
@@ -8547,52 +7209,6 @@ That is, @code{gofumpt} is happy with a subset of the formats that
(native-inputs '())
(inputs '())))
-(define-public xurls
- (package
- (name "xurls")
- (version "2.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mvdan/xurls")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0b040nbk1vwlk1qljavh8w8fn2r243q700n6gr8j2asmnz0xq84p"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "mvdan.cc/xurls/v2"
- #:unpack-path "mvdan.cc/xurls/v2"
- #:phases (modify-phases %standard-phases
- (replace 'build
- (lambda arguments
- (apply (assoc-ref %standard-phases
- 'build)
- `(,@arguments #:import-path
- "mvdan.cc/xurls/v2/cmd/xurls")))))))
- (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))
- (home-page "https://mvdan.cc/xurls/v2/")
- (synopsis "Extracts URLs from text")
- (description
- "Xurls extracts urls from plain text using regular expressions. It can
-be used as both a binary and a library.")
- (license license:bsd-3)))
-
-(define-public go-mvdan-cc-xurls
- (package
- (inherit xurls)
- (name "go-mvdan-cc-xurls")
- (arguments
- `(#:import-path "mvdan.cc/xurls"
- #:tests? #f
- #:install-source? #t
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs (package-inputs xurls))
- (native-inputs '())
- (inputs '())))
-
(define-public go-github-com-davecgh-go-xdr
(package
(name "go-github-com-davecgh-go-xdr")
@@ -8642,36 +7258,6 @@ friendly sizes. It converts boring ugly numbers to human-friendly strings and
back.")
(license license:expat)))
-(define-public go-github-com-oneofone-xxhash
- (package
- (name "go-github-com-oneofone-xxhash")
- (version "1.2.8")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/OneOfOne/xxhash")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/OneOfOne/xxhash"
- #: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")))))))
- (home-page "https://github.com/OneOfOne/xxhash")
- (synopsis "Go implementation of xxHash")
- (description "This is a native Go implementation of the
-@url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast
-non-cryptographic hash algorithm, working at speeds close to RAM limits.")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-djherbis-times-v1
(package
(name "go-gopkg-in-djherbis-times-v1")
@@ -8802,7 +7388,7 @@ parser.")
(define-public go-github-com-rivo-uniseg
(package
(name "go-github-com-rivo-uniseg")
- (version "0.2.0")
+ (version "0.4.7")
(source
(origin
(method git-fetch)
@@ -8811,7 +7397,7 @@ parser.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q"))))
+ (base32 "0nlcqyvq4vhq3hqhk84h6fp0jbqkjj88kcpcl853yr7sh4sisdxc"))))
(build-system go-build-system)
(arguments '(#:import-path "github.com/rivo/uniseg"))
(home-page "https://github.com/rivo/uniseg")
@@ -8849,11 +7435,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)
@@ -8895,7 +7479,7 @@ dependencies and a simple API.")
(define-public go-github-com-arceliar-ironwood
(package
(name "go-github-com-arceliar-ironwood")
- (version "v0.0.0-20231127131626-465b82dfb5bd")
+ (version "v0.0.0-20240529054413-b8e59574e2b2")
(source
(origin
(method git-fetch)
@@ -8905,17 +7489,29 @@ dependencies and a simple API.")
(file-name (git-file-name name version))
(sha256
(base32
- "0sywrcvrpkkzi1jxfz2ahqs855h4bmdn1l79q5sdgqiaczr7q4b7"))))
+ "06ay82gqm3k649m7x0r3a3crnqv9x0yxhyqfabrf1b7inki35mfs"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/Arceliar/ironwood"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
+ (list
+ #:import-path "github.com/Arceliar/ironwood"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/cmd/ironwood-example"))))
+ ;; 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-golang-org-x-crypto go-github-com-arceliar-phony))
+ (list go-github-com-arceliar-phony
+ go-github-com-bits-and-blooms-bitset
+ go-github-com-bits-and-blooms-bloom-v3
+ go-golang-org-x-crypto))
(home-page "https://github.com/Arceliar/ironwood")
(synopsis "Experimental network routing library")
(description
@@ -8951,76 +7547,68 @@ 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")
- (version "6.6.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/99designs/aws-vault")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0fjdslg7nhlm9hl7bg69j1izrjx6sspbhwk973d0m8ig9nkdja06"))))
+ (version "7.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/99designs/aws-vault")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dqg6d2k8r80ww70afghf823z0pijha1i0a0c0c6918yb322zkj2"))))
(build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/99designs/aws-vault"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'patch-version
+ (lambda _
+ (substitute* "src/github.com/99designs/aws-vault/main.go"
+ (("var Version = \"dev\"")
+ (string-append "var Version = \"v" #$version "\"")))))
+ (add-after 'build 'contrib
+ (lambda* (#:key import-path #:allow-other-keys)
+ (let* ((zsh-site-dir
+ (string-append #$output "/share/zsh/site-functions"))
+ (bash-completion-dir
+ (string-append #$output "/share/bash-completion/completions"))
+ (fish-completion-dir
+ (string-append #$output "/share/fish/completions")))
+ (for-each mkdir-p (list bash-completion-dir
+ fish-completion-dir
+ zsh-site-dir))
+ (with-directory-excursion
+ (string-append "src/" import-path "/contrib/completions")
+ (copy-file "zsh/aws-vault.zsh"
+ (string-append zsh-site-dir "/_aws-vault"))
+ (copy-file "bash/aws-vault.bash"
+ (string-append bash-completion-dir "/aws-vault"))
+ (copy-file "fish/aws-vault.fish"
+ (string-append fish-completion-dir "/aws-vault.fish")))))))))
(native-inputs
- (list go-github-com-99designs-go-keyring
- go-github-com-mtibben-androiddnsfix
- go-github-com-mtibben-percent
- go-github-com-jmespath-go-jmespath
- go-github-com-dvsekhvalnov-jose2go
- go-github-com-godbus-dbus
- go-github-com-gsterjov-go-libsecret
- go-github-com-mitchellh-go-homedir
- go-golang-org-x-crypto
- go-golang-org-x-sys
- go-golang-org-x-term
- go-gopkg-in-ini
- go-github-com-skratchdot-open-golang
- go-github-com-alecthomas-kingpin
- go-github-com-alecthomas-template
- go-github-com-alecthomas-units
+ (list go-github-com-99designs-keyring
+ go-github-com-alecthomas-kingpin-v2
go-github-com-aws-aws-sdk-go-v2
go-github-com-aws-aws-sdk-go-v2-config
+ go-github-com-aws-aws-sdk-go-v2-credentials
go-github-com-aws-aws-sdk-go-v2-service-iam
go-github-com-aws-aws-sdk-go-v2-service-sso
go-github-com-aws-aws-sdk-go-v2-service-ssooidc
- go-github-com-aws-aws-sdk-go-v2-service-sts))
- (arguments
- `(#:import-path "github.com/99designs/aws-vault"
- #:install-source? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-version
- (lambda _
- (substitute* "src/github.com/99designs/aws-vault/main.go"
- (("var Version = \"dev\"")
- (string-append "var Version = \"v" ,version "\"")))))
- (add-after 'build 'contrib
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (zsh-site-dir (string-append out "/share/zsh/site-functions"))
- (bash-completion-dir
- (string-append out "/share/bash-completion/completions"))
- (fish-completion-dir
- (string-append out "/share/fish/completions")))
- (for-each mkdir-p
- `(,zsh-site-dir ,bash-completion-dir ,fish-completion-dir))
- (with-directory-excursion
- "src/github.com/99designs/aws-vault/contrib/completions"
- (copy-file "zsh/aws-vault.zsh"
- (string-append zsh-site-dir "/_aws-vault"))
- (copy-file "bash/aws-vault.bash"
- (string-append bash-completion-dir "/aws-vault"))
- (copy-file "fish/aws-vault.fish"
- (string-append fish-completion-dir "/aws-vault.fish")))))))))
- (synopsis
- "Vault for securely storing and accessing AWS credentials")
+ go-github-com-aws-aws-sdk-go-v2-service-sts
+ go-github-com-google-go-cmp
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-tty
+ go-github-com-skratchdot-open-golang
+ go-golang-org-x-term
+ go-gopkg-in-ini-v1))
+ (home-page "https://github.com/99designs/aws-vault")
+ (synopsis "Vault for securely storing and accessing AWS credentials")
(description
"AWS Vault is a tool to securely store and access @acronym{Amazon Web
Services,AWS} credentials.
@@ -9029,39 +7617,33 @@ AWS Vault stores IAM credentials in your operating system's secure keystore and
then generates temporary credentials from those to expose to your shell and
applications. It's designed to be complementary to the AWS CLI tools, and is
aware of your profiles and configuration in ~/.aws/config.")
- (home-page "https://github.com/99designs/aws-vault")
(license license:expat)))
(define-public go-github-com-gsterjov-go-libsecret
- (let ((commit "a6f4afe4910cad8688db3e0e9b9ac92ad22d54e1")
- (revision "0"))
- (package
- (name "go-github-com-gsterjov-go-libsecret")
- (version "5.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gsterjov/go-libsecret")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "09zaiadnll83vs22ib89agg7anj0blw5fywvmckxllsgif6ak6v7"))))
- (build-system go-build-system)
- (native-inputs
- (list go-github-com-godbus-dbus))
- (arguments
- '(#:import-path "github.com/gsterjov/go-libsecret"
- #:phases %standard-phases))
- (synopsis "Manage secrets via the \"Secret Service\" DBus API")
- (description
- "This native Go library manages secrets via the freedesktop.org
-\"Secret Service\" DBus interface.")
- (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))
+ (package
+ (name "go-github-com-gsterjov-go-libsecret")
+ (version "0.0.0-20161001094733-a6f4afe4910c")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gsterjov/go-libsecret")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "09zaiadnll83vs22ib89agg7anj0blw5fywvmckxllsgif6ak6v7"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/gsterjov/go-libsecret"))
+ (propagated-inputs
+ (list go-github-com-godbus-dbus))
+ (home-page "https://github.com/gsterjov/go-libsecret")
+ (synopsis "Manage secrets via the @code{Secret Service} DBus API")
+ (description
+ "This native Go library manages secrets via the freedesktop.org
+@code{Secret Service} DBus interface.")
+ (license license:expat)))
(define-public go-github-com-mtibben-androiddnsfix
(let ((commit "ff02804463540c36e3a148dcf4b009d003cf2a31")
@@ -9125,7 +7707,7 @@ aware of your profiles and configuration in ~/.aws/config.")
(package
(inherit go-gopkg-in-ini)
(name "go-github-com-go-ini-ini")
- (version "1.66.6")
+ (version "1.67.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -9134,7 +7716,7 @@ aware of your profiles and configuration in ~/.aws/config.")
(file-name (git-file-name name version))
(sha256
(base32
- "0kqg13606hnw8f75cb59fsy1m85kiqf3csi2g7q2512avdmaphc9"))))
+ "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap"))))
(arguments
(list #:import-path "github.com/go-ini/ini"))
(propagated-inputs (list go-github-com-stretchr-testify))))
@@ -9228,72 +7810,6 @@ kubernetes-sigs/yaml is a permanent fork of
@url{https://github.com/ghodss/yaml,ghodss/yaml}.")
(license (list license:expat license:bsd-3))))
-(define-public go-github-com-mitchellh-colorstring
- (package
- (name "go-github-com-mitchellh-colorstring")
- (version "0.0.0-20190213212951-d06e56a500db")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mitchellh/colorstring")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1d2mi5ziszfzdgaz8dg4b6sxa63nw1jnsvffacqxky6yz9m623kn"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/mitchellh/colorstring"))
- (home-page "https://github.com/mitchellh/colorstring")
- (synopsis "Functions to colorize strings for terminal output")
- (description
- "Colorstring provides functions for colorizing strings for terminal output.")
- (license license:expat)))
-
-(define-public go-git-sr-ht-emersion-go-scfg
- (package
- (name "go-git-sr-ht-emersion-go-scfg")
- (version "0.0.0-20211215104734-c2c7a15d6c99")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~emersion/go-scfg")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "02gn8hz8zfv8y0krysx2wv951gw8hmhdfqf1ysidwm7i293365w4"))))
- (build-system go-build-system)
- (arguments (list #:import-path "git.sr.ht/~emersion/go-scfg"))
- (propagated-inputs
- (list go-github-com-google-shlex
- go-github-com-davecgh-go-spew))
- (home-page "https://git.sr.ht/~emersion/go-scfg")
- (synopsis "Go library for simple configuration file format")
- (description "Package go-scfg parses scfg files.")
- (license license:expat)))
-
-(define-public go-git-sr-ht-emersion-gqlclient
- (package
- (name "go-git-sr-ht-emersion-gqlclient")
- (version "0.0.0-20230820050442-8873fe0204b9")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~emersion/gqlclient")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0x64kcryawdr0daq1w6fada60zqrddw75yi397835b9ij7wb5gmh"))))
- (build-system go-build-system)
- (arguments (list #:import-path "git.sr.ht/~emersion/gqlclient"))
- (home-page "https://git.sr.ht/~emersion/gqlclient")
- (synopsis "GraphQL client and code generator")
- (description
- "This package provides a GraphQL client and code generator for Go.")
- (license license:expat)))
-
(define-public go-github-com-google-go-jsonnet
(package
(name "go-github-com-google-go-jsonnet")
@@ -9323,6 +7839,9 @@ production-ready implementation, compatible with the original Jsonnet C++
implementation.")
(license license:asl2.0)))
+;; XXX: This repository has been archived by the owner on Dec 29, 2022. It is
+;; now read-only. It's only used by kiln, consider to remove it when it does
+;; no longer require it.
(define-public go-github-com-google-shlex
(package
(name "go-github-com-google-shlex")
@@ -9383,8 +7902,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")
@@ -9472,31 +7990,6 @@ result is a conceptually simple, but highly performant, disk-backed storage syst
email library.")
(license license:gpl3+)))
-(define-public go-github-com-emersion-go-message
- (package
- (name "go-github-com-emersion-go-message")
- (version "0.16.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-message")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1j5qdhsna28xcs843zsiccw700rld5hin466dl0n3a0ax1w13ay0"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/emersion/go-message"))
- (propagated-inputs (list go-golang-org-x-text
- go-github-com-emersion-go-textwrapper))
- (home-page "https://github.com/emersion/go-message")
- (synopsis "Internet messages and MIME for Go")
- (description
- "The message package implements the Internet Message Format and Multipurpose
-Internet Mail Extensions in Go.")
- (license license:expat)))
-
(define-public go-github-com-jaytaylor-html2text
(package
(name "go-github-com-jaytaylor-html2text")
@@ -9525,115 +8018,6 @@ Internet Mail Extensions in Go.")
text-only mail clients to display them.")
(license license:expat)))
-(define-public go-github-com-jhillyerd-enmime
- (package
- (name "go-github-com-jhillyerd-enmime")
- (version "0.9.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jhillyerd/enmime")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "124dqm598phbmalyx2gmxk201z9kq4ckvvdq8rc0akjlp24nxqbb"))))
- (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))
- (home-page "https://github.com/jhillyerd/enmime")
- (synopsis "MIME encoder and decoder for Go")
- (description
- "The enmime package implements a MIME encoding and decoding
-library geared towards parsing MIME encoded emails.")
- (license license:expat)))
-
-(define-public go-github-com-gatherstars-com-jwz
- (package
- (name "go-github-com-gatherstars-com-jwz")
- (version "1.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gatherstars-com/jwz")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1zxg2vmka80m1vnlb1v1gdlrwnkpakcmwi1hxpl8jjjiyd4z2j2i"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/gatherstars-com/jwz"))
- (propagated-inputs (list go-github-com-rivo-tview
- go-github-com-jhillyerd-enmime
- go-github-com-gdamore-tcell-v2))
- (home-page "https://github.com/gatherstars-com/jwz")
- (synopsis "Implementation in Go of the email threading algorithm
-originally invented for Netscape Mail")
- (description
- "The jwz package provides an implementation of the email threading
-algorithm originally designed for use in Netscape Mail 2.0 for Go.")
- (license license:asl2.0)))
-
-(define-public go-github-com-creack-pty
- (package
- (name "go-github-com-creack-pty")
- (version "1.1.18")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/creack/pty")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1qqhcgfym0napz8damj7dhfw28g2qn2f5h3lr93i0sxawq926yzc"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/creack/pty"
- #:modules '((ice-9 popen)
- (ice-9 textual-ports)
- (guix build go-build-system)
- (guix build utils))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-types
- (lambda* (#:key import-path #:allow-other-keys)
- ;; Generated files are included (ztypes_*). We need to remake
- ;; them with Cgo.
- (with-directory-excursion (string-append "src/" import-path)
- (let* ((go-arch
- #$(car (go-target
- (or (%current-target-system)
- (nix-system->gnu-triplet (%current-system))))))
- (file (string-append "ztypes_" go-arch ".go"))
- (pipe (open-input-pipe "go tool cgo -godefs types.go"))
- (text (get-string-all pipe)))
- (close-pipe pipe)
- (for-each delete-file
- (find-files (getcwd) (file-name-predicate
- "ztypes_[a-zA-Z0-9_]+.go")))
- (call-with-output-file file
- (lambda (port)
- (display text port))))))))))
- (home-page "https://github.com/creack/pty")
- (synopsis "Pseudoterminal handling in Go")
- (description
- "The pty package provides functions for working with Unix pseudoterminals.")
- (license license:expat)))
-
(define-public go-github-com-riywo-loginshell
(package
(name "go-github-com-riywo-loginshell")
@@ -9823,39 +8207,10 @@ useful during debugging, to avoid wrapping long output lines in the
terminal.")
(license license:expat)))
-(define-public go-github-com-arran4-golang-ical
- (package
- (name "go-github-com-arran4-golang-ical")
- (version "0.0.0-20220517104411-fd89fefb0182")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/arran4/golang-ical")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0bxs0b5yg26liiifc0cc41l307r0wc93hp8iygv8dgpc60yzncaw"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/arran4/golang-ical"))
- (propagated-inputs (list go-gopkg-in-yaml-v3
- go-gopkg-in-check-v1
- go-github-com-stretchr-testify
- go-github-com-niemeyer-pretty
- go-github-com-kr-text
- go-github-com-davecgh-go-spew))
- (home-page "https://github.com/arran4/golang-ical")
- (synopsis "Handle iCalenders in Go")
- (description
- "The @code{ical} package provides an ICS/iCalender parser and
-serialiser for Go.")
- (license license:asl2.0)))
-
(define-public go-github-com-lithammer-fuzzysearch
(package
(name "go-github-com-lithammer-fuzzysearch")
- (version "1.1.5")
+ (version "1.1.8")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -9864,7 +8219,7 @@ serialiser for Go.")
(file-name (git-file-name name version))
(sha256
(base32
- "1b036sm42cf64diwlqhx24vxy6g5afrmfbdfyqhpg8zrii3lpwns"))))
+ "0fp00gzbrr5fnz01lmkjqcs5z24zjrsp4r13ia0x0wslp5r13hv8"))))
(build-system go-build-system)
(propagated-inputs (list go-golang-org-x-text))
(arguments
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 09a419d7e9..a1333ab758 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -29,16 +29,20 @@
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#: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)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
+ #:use-module (gnu packages geo)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
@@ -51,12 +55,13 @@
#: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
(package
(name "gpsbabel")
- (version "1.7.0")
+ (version "1.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -67,28 +72,50 @@
(file-name (git-file-name name version))
(sha256
(base32
- "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"))
- (patches (search-patches "gpsbabel-fix-i686-test.patch"))
+ "0pyrbykf15znn63y9j1npdv148i9b8sgc947xq6dqw8gwx023ji5"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "zlib")
- (substitute* "Makefile.in"
- ((" zlib/z.*\\.h") ""))
- ;; Delete files under GPL-compatible licences but never used
- ;; on GNU systems, rather than bloating the LICENSE field.
- (delete-file "gui/serial_mac.cc") ; Apple MIT
- (delete-file "mingw/include/ddk/hidsdi.h") ; public domain
+ (delete-file-recursively "shapelib")
+ (delete-file-recursively "mac")
#t))))
- (build-system gnu-build-system)
;; TODO: "make doc" requires Docbook & co.
+ (build-system cmake-build-system)
(arguments
- `(#:configure-flags
- '("--with-zlib=system")))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-up-test-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "TZDIR" (search-input-directory inputs "share/zoneinfo"))))
+
+ (replace 'install
+ (lambda _
+ (install-file "gpsbabel" (string-append #$output "/bin")))))
+
+ #:configure-flags
+ #~(list
+ "-DGPSBABEL_MAPPREVIEW=OFF"
+ "-DGPSBABEL_WITH_LIBUSB=pkgconfig"
+ "-DGPSBABEL_WITH_SHAPELIB=pkgconfig"
+ "-DGPSBABEL_WITH_ZLIB=pkgconfig")))
(inputs
- (list expat libusb qtbase-5 zlib))
+ (list expat
+ libusb
+ libxkbcommon
+ qt5compat
+ qtbase
+ qtserialport
+ qttranslations
+ shapelib
+ zlib))
(native-inputs
- (list which qttools-5 libxml2)) ;'xmllint' needed for the KML tests
+ (list (libc-utf8-locales-for-target)
+ libxml2 ;'xmllint' needed for the KML tests
+ pkg-config
+ qttools
+ tzdata-for-tests
+ which))
(home-page "https://www.gpsbabel.org/")
(synopsis "Convert and exchange data with GPS and map programs")
(description
@@ -97,8 +124,7 @@ popular GPS receivers and mapping programs. It contains extensive data
manipulation abilities making it a convenient for server-side processing or as
the back-end for other tools. It does not convert, transfer, send, or
manipulate maps.")
- (license (list license:expat ; shapelib/*.[ch]
- license:gpl2+)))) ; everything else
+ (license (list license:gpl2+))))
(define-public gpscorrelate
(package
@@ -179,33 +205,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
@@ -229,7 +253,8 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.")
(native-inputs
(list bc pkg-config))
(inputs
- (list bluez
+ (list bash-minimal
+ bluez
dbus
gtk+
libcap
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 179ff450ab..5c985eaf5b 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -447,6 +447,15 @@ large networks.")
(list
#:phases
'(modify-phases %standard-phases
+ (add-after 'unpack 'patch-tests
+ (lambda _
+ ;; The warning message has changed in numpy.
+ (substitute* "test/test_data.py"
+ (("\"A sparse matrix was passed, but.*array.\",")
+ "\"Sparse data was passed, but dense data is required. Use '.toarray()' to convert to a dense numpy array.\",")
+ ;; anndata prints a warning that causes the test to fail.
+ (("import warnings" m)
+ (string-append m "\nwarnings.filterwarnings(\"ignore\")")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -552,7 +561,9 @@ algorithm for a number of different methods.")
(("suites.append\\(test_docstrings.*")
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
- (native-inputs (list python-coverage python-coveralls python-flake8))
+ (native-inputs
+ (list python-coverage python-coveralls python-flake8
+ python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
@@ -829,9 +840,9 @@ transformed into common image formats for display or printing.")
"1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d"))))
(build-system gnu-build-system)
(arguments
- `(#:imported-modules (,@%gnu-build-system-modules
+ `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
- #:modules (,@%gnu-build-system-modules
+ #:modules (,@%default-gnu-modules
((guix build python-build-system) #:select (site-packages)))
;; The build process peaks around 4GB/RAM per core.
#:parallel-build? #f
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index ca2d74224f..56c53211c1 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2019, 2023 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2018, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018, 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
@@ -21,7 +21,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2021 Andy Tai <atai@atai.org>
@@ -36,7 +36,7 @@
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
-;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -162,6 +162,16 @@
(sha256
(base32 "1xmcv6rwinqsbr863rgl9005h2jlmd7k2qrwsc1h4fb8r61ykpjl"))))
(build-system meson-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ ;; XXX: Meson build fails due to a misspelling of
+ ;; "description" keyword in the configuration. This phase
+ ;; fixes that.
+ (add-after 'unpack 'patch-meson-build
+ (lambda _
+ (substitute* "meson.build"
+ (("not stable, Description:")
+ "not stable, description:")))))))
(native-inputs
(list luajit pkg-config))
(inputs
@@ -169,7 +179,7 @@
(synopsis "Memory Mapped Machine")
(description "MMM is a shared memory protocol for virtualising access to
framebuffer graphics, audio output and input event.")
- (home-page "https://github.com/hodefoting/mrg")
+ (home-page "https://github.com/hodefoting/mmm")
(license license:isc)))
(define-public directfb
@@ -385,7 +395,7 @@ objects!")
(define-public autotrace
(package
(name "autotrace")
- (version "0.31.9")
+ (version "0.31.10")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -394,7 +404,7 @@ objects!")
(file-name (git-file-name name version))
(sha256
(base32
- "0fsg13pg72ac51l3fkzvyf7h9mzbvfxp9vfjfiwkyvx6hbm83apj"))))
+ "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags #~'("--disable-static")
@@ -422,7 +432,11 @@ objects!")
imagemagick
libjpeg-turbo
libpng
- pstoedit))
+ pstoedit
+ ;; pango is required because of libtool, from the imagemagick
+ ;; library files (.la), which records all its transitive
+ ;; dependencies.
+ pango))
(home-page "https://github.com/autotrace/autotrace")
(synopsis "Bitmap to vector graphics converter")
(description "AutoTrace is a utility for converting bitmap into vector
@@ -496,14 +510,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
@@ -715,7 +729,7 @@ baking tools to produce normal maps.")
(define-public openshadinglanguage
(package
(name "openshadinglanguage")
- (version "1.13.8.0")
+ (version "1.13.10.0")
(source
(origin
(method git-fetch)
@@ -724,7 +738,7 @@ baking tools to produce normal maps.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02"))))
+ (base32 "1x97w4infifw33r4ii53q3v1ia0p21lbacd7z01vsz4vq7sy0dxn"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags
@@ -775,7 +789,7 @@ materials, lights, displacement, and pattern generation.")
(define-public cgal
(package
(name "cgal")
- (version "5.2.2")
+ (version "5.6.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -783,7 +797,7 @@ materials, lights, displacement, and pattern generation.")
"/CGAL-" version ".tar.xz"))
(sha256
(base32
- "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40"))))
+ "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -883,7 +897,7 @@ exception-handling library.")
(define-public lib2geom
(package
(name "lib2geom")
- (version "1.2")
+ (version "1.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -892,52 +906,58 @@ exception-handling library.")
(file-name (git-file-name "lib2geom" version))
(sha256
(base32
- "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))
+ "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ (list
+ #:imported-modules `((guix build python-build-system)
,@%cmake-build-system-modules)
- #:configure-flags '("-D2GEOM_BUILD_SHARED=ON"
- "-D2GEOM_BOOST_PYTHON=ON"
- ;; Compiling the Cython bindings fail (see:
- ;; https://gitlab.com/inkscape/lib2geom/issues/21).
- "-D2GEOM_CYTHON_BINDINGS=OFF")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-python-lib-install-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((python-version (@ (guix build python-build-system)
- python-version))
- (python-maj-min-version (python-version
- (assoc-ref inputs "python")))
- (site-package (string-append
- (assoc-ref outputs "out")
- "/lib/python" python-maj-min-version
- "/site-packages")))
- (substitute* '("src/cython/CMakeLists.txt"
- "src/py2geom/CMakeLists.txt")
- (("PYTHON_LIB_INSTALL \"[^\"]*\"")
- (format #f "PYTHON_LIB_INSTALL ~s" site-package))))))
- ,@(if (target-x86-32?)
- `((add-after 'unpack 'skip-faulty-test
- (lambda _
- ;; This test fails on i686 when comparing floating point
- ;; values, probably due to excess precision. However,
- ;; '-fexcess-precision' is not implemented for C++ in
- ;; GCC 10 so just skip it.
- (substitute* "tests/CMakeLists.txt"
- (("bezier-test") "")))))
- '()))))
- (native-inputs `(("python" ,python-wrapper)
- ("googletest" ,googletest)
- ("pkg-config" ,pkg-config)))
- (inputs `(("cairo" ,cairo)
- ("pycairo" ,python-pycairo)
- ("double-conversion" ,double-conversion)
- ("glib" ,glib)
- ("gsl" ,gsl)))
- (propagated-inputs
- (list boost)) ;referred to in 2geom/pathvector.h.
+ #:modules '((guix build cmake-build-system)
+ (guix build utils)
+ ((guix build python-build-system) #:prefix python:))
+ #:configure-flags
+ #~(list "-D2GEOM_BUILD_SHARED=ON"
+ "-D2GEOM_BOOST_PYTHON=ON"
+ ;; Compiling the Cython bindings fail (see:
+ ;; https://gitlab.com/inkscape/lib2geom/issues/21).
+ "-D2GEOM_CYTHON_BINDINGS=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-python-lib-install-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* '("src/cython/CMakeLists.txt"
+ "src/py2geom/CMakeLists.txt")
+ (("PYTHON_LIB_INSTALL \"[^\"]*\"")
+ (format #f "PYTHON_LIB_INSTALL ~s"
+ (python:site-packages inputs outputs))))))
+ #$@(cond
+ ((target-x86-32?)
+ #~((add-after 'unpack 'skip-faulty-test
+ (lambda _
+ (substitute* "tests/CMakeLists.txt"
+ ;; This test fails on i686 when comparing floating point
+ ;; values, probably due to excess precision. However,
+ ;; '-fexcess-precision' is not implemented for C++ in
+ ;; GCC 10 so just skip it.
+ (("bezier-test") "")
+
+ ;; https://gitlab.com/inkscape/lib2geom/-/issues/68
+ (("ellipse-test") "")
+
+ ;; XXX: Additional unresolved test failures.
+ (("elliptical-arc-test") "")
+ (("self-intersections-test") ""))))))
+ ;; See https://gitlab.com/inkscape/lib2geom/-/issues/63
+ ((target-aarch64?)
+ #~((add-after 'unpack 'fix-aarch64-faulty-test
+ (lambda _
+ (substitute* "tests/CMakeLists.txt"
+ (("elliptical-arc-test") ""))))))
+ (else
+ #~())))))
+ (native-inputs (list python-wrapper googletest pkg-config))
+ (inputs (list cairo python-pycairo double-conversion glib gsl))
+ (propagated-inputs (list boost)) ;included in 2geom/pathvector.h
(home-page "https://gitlab.com/inkscape/lib2geom/")
(synopsis "C++ 2D graphics library")
(description "2geom is a C++ library of mathematics for paths, curves,
@@ -978,23 +998,38 @@ Angus Johnson}.")
(define-public pstoedit
(package
(name "pstoedit")
- (version "3.77")
+ ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C
+ ;; project (see: https://github.com/reviczky/pstoedit/issues/2).
+ (version "4.00")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pstoedit/pstoedit/"
version "/pstoedit-" version ".tar.gz"))
(sha256
(base32
- "02av76j75g5sq3bg353yl6dlllda9ihmmk4c8hvgiscix816nv4s"))))
+ "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7"))
+ (patches
+ (search-patches "pstoedit-fix-gcc12.patch"
+ "pstoedit-fix-plainC.patch"
+ "pstoedit-pkglibdir.patch"))))
(build-system gnu-build-system)
+ (arguments
+ ;; Avoid keeping extraneous references to libtool exhaustively listed
+ ;; dependencies.
+ (list #:configure-flags #~(list "LDFLAGS=-Wl,--as-needed")))
(native-inputs
(list pkg-config))
(inputs
- `(("ghostscript" ,ghostscript)
- ("imagemagick" ,imagemagick)
- ("libplot" ,plotutils)
- ("libjpeg" ,libjpeg-turbo)
- ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link
+ (list ghostscript
+ imagemagick
+ plotutils
+ libjpeg-turbo
+ libzip
+ ;; The following inputs are pulled in by libtool, from the
+ ;; imagemagick library files (.la), which records all its
+ ;; transitive dependencies.
+ glib
+ pango))
(home-page "http://www.pstoedit.net/")
(synopsis "Converter for PostScript and PDF graphics")
(description "The @code{pstoedit} utility allows translating graphics
@@ -1110,7 +1145,7 @@ distills complex, animated scenes into a set of baked geometric results.")
(inputs
(list dbus
glslang
- `(,hwdata "pci")
+ hwdata
imgui-1.86
libx11
mesa
@@ -1325,33 +1360,59 @@ 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
#:configure-flags #~(list "-DUSE_EXTERNAL_PUGIXML=1"
- "-DOIIO_BUILD_TESTS=false")))
+ "-DOIIO_BUILD_TESTS=false")
+ #:phases
+ #~(modify-phases %standard-phases
+ ; Work around a CMake Zlib-detection bug:
+ ; https://issues.guix.gnu.org/72046
+ ; https://gitlab.kitware.com/cmake/cmake/-/issues/25200
+ (add-after 'configure 'fix-zlib-version
+ (lambda _
+ (substitute* "include/imageio_pvt.h"
+ (("#define ZLIB_VERSION \"1\\.3\"")
+ ""))))
+ (add-after 'install 'fix-OpenImageIOConfig
+ (lambda _
+ (substitute* (string-append
+ #$output
+ "/lib/cmake/OpenImageIO/OpenImageIOConfig.cmake")
+ (("#define ZLIB_VERSION \"1\\.3\"")
+ "")))))))
(native-inputs
(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 +1424,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
@@ -1599,19 +1660,21 @@ realistic reflections, shading, perspective and other effects.")
(define-public ctl
(package
(name "ctl")
- (version "1.5.2")
+ (version "1.5.3")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/ampas/CTL/archive/ctl-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ampas/CTL")
+ (commit (string-append "ctl-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1gg04pyvw0m398akn0s1l07g5b1haqv5na1wpi5dii1jjd1w3ynp"))))
+ "1qhfp9b90czvxjkf66sbnqyw3wvmdvl1pkh6201fxhqg7grbfvwc"))))
(build-system cmake-build-system)
- (arguments '(#:tests? #f)) ;no 'test' target
;; Headers include OpenEXR and IlmBase headers.
(propagated-inputs (list openexr-2))
+ (inputs (list libtiff))
(home-page "https://ampasctl.sourceforge.net")
(synopsis "Color Transformation Language")
@@ -2349,8 +2412,8 @@ Automated palette selection is supported.")
(list extra-cmake-modules pkg-config))
(inputs
(list giflib
- karchive
- kdnssd
+ karchive-5
+ kdnssd-5
libmicrohttpd
libsodium
libvpx
@@ -2413,6 +2476,73 @@ and build scripts for the OpenXR loader.")
;; Dual licensed. Either license applies.
(license (list license:asl2.0 license:expat))))
+(define-public tinygltf
+ (package
+ (name "tinygltf")
+ (version "2.8.21")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/syoyo/tinygltf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14712lndwlk4y001jxf2rxhwrw0w5gbc2hyh9kpik1galdzg41ii"))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ (for-each delete-file-recursively
+ (list "examples" ".github" "tools"))
+ ;; tinygltf bundles json, stb-image and stb-image-write
+ ;; headers. Delete those, and use symlink ours instead.
+ (for-each delete-file
+ (list "json.hpp"
+ "stb_image.h"
+ "stb_image_write.h"
+ "tests/catch.hpp"))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-our-packages
+ (lambda* (#:key inputs #:allow-other-keys)
+ (symlink (search-input-file inputs "include/nlohmann/json.hpp")
+ "json.hpp")
+ (symlink (search-input-file inputs "include/stb_image.h")
+ "stb_image.h")
+ (symlink (search-input-file inputs "include/stb_image_write.h")
+ "stb_image_write.h")
+ (symlink (search-input-file inputs "include/catch.hpp")
+ "catch.hpp")))
+ (add-after 'install 'delete-static-lib
+ (lambda _
+ (delete-file (string-append #$output
+ "/lib/libtinygltf.a"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (with-directory-excursion "../source/tests"
+ (invoke "make")
+ (invoke "./tester")
+ (invoke "./tester_noexcept"))
+ (format #t "test suite not run~%")))))))
+ (inputs (list nlohmann-json stb-image stb-image-write))
+ (native-inputs (list catch-framework clang))
+ (home-page "https://github.com/syoyo/tinygltf")
+ (synopsis "Header only GL Transmission Format library")
+ (description "This package provides a header only C++11
+@url{https://github.com/KhronosGroup/glTF, glTF} (GL Transmission Format) 2.0
+library.
+
+GL Transmission Format (glTF) is a royalty-free specification for the
+efficient transmission and loading of 3D scenes and models by applications.
+glTF minimizes both the size of 3D assets, and the runtime processing needed
+to unpack and use those assets. glTF defines an extensible, common publishing
+format for 3D content tools and services that streamlines authoring workflows
+and enables interoperable use of content across the industry.")
+ (license license:expat)))
+
(define-public monado
(package
(name "monado")
@@ -2722,83 +2852,85 @@ a game.")
(license license:zlib))))
(define-public asli
- (package
- (name "asli")
- (version "0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tpms-lattice/ASLI")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "02hwdavpsy3vmivd6prp03jn004ykrl11lbkvksy5i2zm38zbknr"))
- (patches (search-patches "asli-use-system-libs.patch"))
- (modules '((guix build utils)))
- (snippet
- ;; Remove bundled libraries except (the ones missing from Guix and)
- ;; KU Leuven's mTT, which is an obscure (i.e., unfindable by searching
- ;; online for “mTT KU Leuven”), BSD-3 licensed, header-only library.
- #~(begin
- ;;(delete-file-recursively "libs/AdaptTools") ; Missing from Guix
- (delete-file-recursively "libs/CGAL")
- ;;(delete-file-recursively "libs/alglib") ; Missing from Guix
- (delete-file-recursively "libs/eigen")
- (delete-file-recursively "libs/mmg")
- ;;(delete-file-recursively "libs/tetgen") ; Missing from Guix
- (delete-file-recursively "libs/yaml")))))
- (build-system cmake-build-system)
- (inputs
- (list boost
- cgal
- eigen
- gmp
- `(,mmg "lib")
- mpfr
- tbb-2020
- yaml-cpp))
- (arguments
- (list #:tests? #f ; No tests
- #:configure-flags
- #~(list "-DCGAL_ACTIVATE_CONCURRENT_MESH_3=ON"
- (string-append "-DEIGEN3_INCLUDE_DIR="
- #$(this-package-input "eigen")
- "/include/eigen3")
- (string-append "-DMMG_INCLUDE_DIR="
- (ungexp (this-package-input "mmg") "lib")
- "/include")
- (string-append "-DMMG_LIBRARY_DIR="
- (ungexp (this-package-input "mmg") "lib")
- "/lib"))
- #:phases
- #~(modify-phases %standard-phases
- (replace 'install ; No install phase
- (lambda _
- (with-directory-excursion "../source/bin"
- (install-file "ASLI" (string-append #$output "/bin"))
- ;; The manual is included in the repository.
- ;; Building it requires -DASLI_DOC=ON, but this is marked
- ;; as unsupported (presumably for users).
- ;; Besides, some of the LaTeX packages it uses are
- ;; missing from Guix, for example emptypage, fvextra and
- ;; menukeys.
- (install-file "docs/ASLI [User Manual].pdf"
- (string-append #$output "/share/doc/"
- #$name "-" #$version))))))))
- (home-page "http://www.biomech.ulg.ac.be/ASLI/")
- (synopsis "Create lattice infills with varying unit cell type, size and feature")
- (description "ASLI (A Simple Lattice Infiller) is a command-line tool that
+ ;; Use the newer version of ASLI that allows build with CGAL v5.6.
+ (let ((commit "4f4ba142ea7db6eecfdb546538c88a38680a83c5")
+ (revision "1"))
+ (package
+ (name "asli")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tpms-lattice/ASLI")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "122xxnj3dckmg6mh07x490564b2z9gd38cd0wc5zz3p4nshcq7wy"))
+ (patches (search-patches "asli-use-system-libs.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove bundled libraries except (the ones missing from Guix and)
+ ;; KU Leuven's mTT, which is an obscure (i.e., unfindable by searching
+ ;; online for “mTT KU Leuven”), BSD-3 licensed, header-only library.
+ #~(begin
+ ;;(delete-file-recursively "libs/AdaptTools") ; Missing from Guix
+ (delete-file-recursively "libs/CGAL")
+ ;;(delete-file-recursively "libs/alglib") ; Missing from Guix
+ (delete-file-recursively "libs/eigen")
+ (delete-file-recursively "libs/mmg")
+ (delete-file-recursively "libs/yaml")))))
+ (build-system cmake-build-system)
+ (inputs
+ (list boost
+ cgal
+ eigen
+ gmp
+ `(,mmg "lib")
+ mpfr
+ tbb-2020
+ yaml-cpp))
+ (arguments
+ (list #:tests? #f ; No tests
+ #:configure-flags
+ #~(list "-DCGAL_ACTIVATE_CONCURRENT_MESH_3=ON"
+ (string-append "-DEIGEN3_INCLUDE_DIR="
+ #$(this-package-input "eigen")
+ "/include/eigen3")
+ (string-append "-DMMG_INCLUDE_DIR="
+ (ungexp (this-package-input "mmg") "lib")
+ "/include")
+ (string-append "-DMMG_LIBRARY_DIR="
+ (ungexp (this-package-input "mmg") "lib")
+ "/lib"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'install ; No install phase
+ (lambda _
+ (with-directory-excursion "../source/bin"
+ (install-file "ASLI" (string-append #$output "/bin"))
+ ;; The manual is included in the repository.
+ ;; Building it requires -DASLI_DOC=ON, but this is marked
+ ;; as unsupported (presumably for users).
+ ;; Besides, some of the LaTeX packages it uses are
+ ;; missing from Guix, for example emptypage, fvextra and
+ ;; menukeys.
+ (install-file "docs/ASLI [User Manual].pdf"
+ (string-append #$output "/share/doc/"
+ #$name "-" #$version))))))))
+ (home-page "http://www.biomech.ulg.ac.be/ASLI/")
+ (synopsis "Create lattice infills with varying unit cell type, size and feature")
+ (description "ASLI (A Simple Lattice Infiller) is a command-line tool that
allows users to fill any 3D geometry with a functionally graded lattice. The
lattice infill is constructed out of unit cells, described by implicit
functions, whose type, size and feature can be varied locally to obtain the
desired local properties.")
- (license license:agpl3+)))
+ (license license:agpl3+))))
(define-public f3d
(package
(name "f3d")
- (version "2.2.1")
+ (version "2.4.0")
(source
(origin
(method git-fetch)
@@ -2807,7 +2939,7 @@ desired local properties.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0f076754zsxb4gwk6bxj94iyjj0dfxmmc8w88f55xd6hbm3qdnwd"))
+ (base32 "1vls3jbq8r5ph937a2d1i8dv2zjhjjm9cmfgyap5424z7k5anv40"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -2884,7 +3016,7 @@ desired local properties.")
openexr
vtk
zlib))
- (home-page "https://f3d-app.github.io/f3d/")
+ (home-page "https://f3d.app/")
(synopsis "VTK-based 3D viewer")
(description "F3D (pronounced @samp{/fɛd/}) is a VTK-based 3D viewer with
simple interaction mechanisms and which is fully controllable using arguments
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 0fc5c6024e..18f4fc147d 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -314,9 +314,12 @@ Graphviz and LaTeX.")
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
+ (graphviz (assoc-ref inputs "graphviz"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/xdot")
+ `("PATH" ":" prefix
+ (,(string-append graphviz "/bin")))
`("GI_TYPELIB_PATH" ":" prefix
(,gi-typelib-path))
`("GUIX_PYTHONPATH" ":" prefix
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 94c0f23d7a..d4e1bc2127 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -34,6 +34,7 @@
#:use-module (guix build-system ruby)
#:use-module (guix gexp)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages ruby)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
@@ -199,17 +200,15 @@ is usually the formatter of \"man\" documentation pages.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "roffit" (string-append out "/bin"))
- (install-file "roffit.1" (string-append out "/share/man/man1"))
- #t)))
+ (install-file "roffit.1"
+ (string-append out "/share/man/man1")))))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/roffit")
- `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))
- #t))))))
- (native-inputs `(("html-tree" ,perl-html-tree))) ; for test
- (inputs
- (list perl))
+ `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
+ (native-inputs (list perl-html-tree)) ; for test
+ (inputs (list bash-minimal perl))
(home-page "https://daniel.haxx.se/projects/roffit/")
(synopsis "Convert nroff files to HTML")
(description
@@ -258,7 +257,7 @@ It is typically used to display man pages on a web site.")
"ruby-mustache"
"ruby-nokogiri"))))))))))
(inputs
- (list ruby-kramdown ruby-mustache ruby-nokogiri))
+ (list bash-minimal ruby-kramdown ruby-mustache ruby-nokogiri))
(synopsis
"Build manuals in HTML and Unix man page format from Markdown")
(description
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 2c8ad12982..ad08285181 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -273,29 +273,26 @@ applications that want audio visualisation and audio visualisation plugins.")
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Libvisual/libvisual")
- (commit (string-append name "-" version))))
+ (uri (git-reference
+ (url "https://github.com/Libvisual/libvisual")
+ (commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "02xwakwkqjsznc03pjlb6hcv1li1gw3r8xvyswqsm4msix5xq18a"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list
- "--disable-gstreamer-plugin"
- "--disable-corona"
- "--disable-gforce"
- (string-append "--with-plugins-base-dir=" (assoc-ref %outputs "out")
- "/lib/libvisual-0.4"))
- #:phases
- (modify-phases %standard-phases
- ;; The package is in a sub-dir of this repo.
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "libvisual-plugins")
- #t)))))
+ `(#:configure-flags (list "--disable-gstreamer-plugin"
+ "--disable-oinksie"
+ "--disable-corona"
+ "--disable-gforce"
+ (string-append "--with-plugins-base-dir="
+ (assoc-ref %outputs "out")
+ "/lib/libvisual-0.4"))
+ #:phases (modify-phases %standard-phases
+ ;; The package is in a sub-dir of this repo.
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "libvisual-plugins"))))))
(native-inputs
(list bison
flex
@@ -306,13 +303,12 @@ applications that want audio visualisation and audio visualisation plugins.")
(inputs
(list alsa-lib
esound
- librsvg
+ (librsvg-for-system)
gtk+-2
jack-2
libx11
libxext))
- (propagated-inputs
- (list libvisual))
+ (propagated-inputs (list libvisual))
(synopsis "Audio visualisation library")
(description "Libvisual is a library that acts as a middle layer between
applications that want audio visualisation and audio visualisation plugins.")
@@ -800,6 +796,10 @@ model to base your own plug-in on, here it is.")
;; The 'elements_curlhttpsrc' test sometimes times out.
((".*'elements/curlhttpsrc\\.c'.*") "")
+ ;; Unexpected critical/warning, see
+ ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
+ ((".*'elements/netsim\\.c'.*") "")
+
;; TODO: Figure out why this test fails on riscv64-linux.
#$@(if (target-riscv64?)
`((("'elements/viewfinderbin\\.c'\\].*],")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b0098e780e..b7650748af 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -34,7 +34,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
;;;
@@ -61,6 +61,7 @@
#:use-module (guix download)
#:use-module (guix bzr-download)
#:use-module (guix git-download)
+ #:use-module (guix search-paths)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
@@ -182,33 +183,45 @@ such as mate-panel and xfce4-panel.")
`(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
#:glib-or-gtk? #t
#:configure-flags
- (list "-Dtests=disabled")))
+ ,#~(list "-Dtests=disabled")
+ ,@(if (%current-target-system)
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-cross-compilation
+ (lambda _
+ ;; XXX: Let meson-build-system customize the property
+ (substitute* "meson.build"
+ (("'ipc_rmid_deferred_release', 'auto'")
+ ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
+ ;; XXX: check it on hurd.
+ "'ipc_rmid_deferred_release', 'true'"))))))
+ '())))
(native-inputs
- `(,@(if (target-hurd?)
- '()
- `(("gobject-introspection" ,gobject-introspection)))
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)))
+ (append (list pkg-config
+ python-wrapper)
+ (if (target-hurd?)
+ '()
+ (list gobject-introspection))))
(inputs
- `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap
- ,@(if (target-hurd?)
- '()
- `(("drm" ,libdrm)))
- ("ghostscript" ,ghostscript)
- ("libspectre" ,libspectre)
- ,@(if (target-hurd?)
- '()
- `(("poppler" ,poppler)))))
+ (append
+ (list bash-minimal ;for glib-or-gtk-wrap
+ ghostscript
+ libspectre)
+ (if (target-hurd?)
+ '()
+ (list libdrm
+ poppler))))
(propagated-inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("libpng" ,libpng)
- ("pixman" ,pixman)
- ("x11" ,libx11)
- ("xcb" ,libxcb)
- ("xext" ,libxext)
- ("xrender" ,libxrender)))
+ (list fontconfig
+ freetype
+ glib
+ libpng
+ pixman
+ libx11
+ libxcb
+ libxext
+ libxrender))
(synopsis "Multi-platform 2D graphics library")
(description "Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X Window System (via
@@ -640,7 +653,7 @@ printing and other features typical of a source code editor.")
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
- gobject-introspection-next
+ gobject-introspection
pkg-config
vala
;; For testing.
@@ -818,38 +831,38 @@ ever use this library.")
(arguments
(list
#:glib-or-gtk? #t ;to wrap binaries and/or compile schemas
+ #:tests? (not (or (target-ppc32?)
+ (%current-target-system)))
#:phases
#~(modify-phases %standard-phases
(delete 'check)
- ;; The CI test suite fails completely on powerpc-linux.
- ;; The name org.gnome.SessionManager was not provided by any .service
- ;; TODO: Wrap 'check phase with 'tests?'.
- #$@(if (not (or (target-ppc32?)
- (%current-target-system)))
- #~((add-after 'install 'check
- (lambda _
- ;; xfconfd requires a writable HOME
- (setenv "HOME" (getenv "TMPDIR"))
- ;; dbus-run-session may crash if XDG_DATA_DIRS has too
- ;; many entries, maybe related to
- ;; https://gitlab.freedesktop.org/dbus/dbus/-/issues/481.
- (setenv "XDG_DATA_DIRS"
- (string-append
- #$output "/share:"
- #$(this-package-native-input
- "gsettings-desktop-schemas")
- "/share"))
- ;; Don't fail on missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- (with-directory-excursion (string-append "../at-spi2-core-"
- #$version "")
- (invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
- (substitute* "ci/run-tests.sh"
- (("ps auxwww") "") ;avoid a dependency on procps
- (("meson test -C _build")
- "meson test -C ../build")) ;adjust build directory
- (invoke "dbus-run-session" "--" "ci/run-tests.sh")))))
- #~()))))
+ (add-after 'install 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; xfconfd requires a writable HOME
+ (setenv "HOME" (getenv "TMPDIR"))
+ ;; dbus-run-session may crash if XDG_DATA_DIRS has too
+ ;; many entries, maybe related to
+ ;; https://gitlab.freedesktop.org/dbus/dbus/-/issues/481.
+ (setenv "XDG_DATA_DIRS"
+ (string-append
+ #$output "/share:"
+ #$(this-package-native-input
+ "gsettings-desktop-schemas")
+ "/share"))
+ ;; Don't fail on missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (with-directory-excursion (string-append "../at-spi2-core-"
+ #$version "")
+ (invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
+ (substitute* "tests/atspi/meson.build"
+ ;; Remove a timeout that caused aarch64 build failures.
+ ((", timeout: [0-9]+") ""))
+ (substitute* "ci/run-tests.sh"
+ (("ps auxwww") "") ;avoid a dependency on procps
+ (("meson test -C _build")
+ "meson test -C ../build")) ;adjust build directory
+ (invoke "dbus-run-session" "--" "ci/run-tests.sh"))))))))
(inputs
(list bash-minimal libxml2))
(propagated-inputs
@@ -1128,7 +1141,7 @@ application suites.")
(define-public gtk
(package
(name "gtk")
- (version "4.12.3")
+ (version "4.14.5")
(source
(origin
(method url-fetch)
@@ -1136,7 +1149,7 @@ application suites.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l"))
+ (base32 "0kg286za53qhl6ngw4rrvbpm3q04g30qf2q77sck7c86y2wz4ism"))
(patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
(modules '((guix build utils)))))
@@ -1159,19 +1172,29 @@ application suites.")
'("-Dgtk_doc=false")
'("-Dgtk_doc=true"))
"-Dman-pages=true")
- #:test-options '(list "--setup=x11" ;defaults to wayland
- ;; Use the same test options as upstream uses for
- ;; their CI.
- "--suite=gtk"
- "--no-suite=failing"
- "--no-suite=flaky"
- "--no-suite=headless" ; requires mutter…
- "--no-suite=gsk-compare-broadway"
- ;; These seem to fail on aarch64, and Debian has
- ;; also disabled these, see:
- ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
- "--no-suite=wayland_failing"
- "--no-suite=wayland_gles_failing")
+ #:test-options #~(list "--setup=x11" ;defaults to wayland
+ ;; Use the same test options as upstream uses for
+ ;; their CI.
+ "--suite=gtk"
+ "--no-suite=failing"
+ "--no-suite=flaky"
+ "--no-suite=headless" ; requires mutter…
+ "--no-suite=gsk-compare-broadway"
+ ;; These seem to fail on aarch64, and Debian has
+ ;; also disabled these, see:
+ ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
+ "--no-suite=wayland_failing"
+
+ ;; The correct name of the test that fails on
+ ;; AArch64 is 'wayland_gles2_failing':
+ ;; <https://gitlab.gnome.org/GNOME/gtk/-/commit/b916c4dac1075572>.
+ ;; The second arm of the 'if' is kept to avoid a
+ ;; rebuild on other architectures. TODO: Remove
+ ;; on the next rebuild cycle.
+ #$(if (and (not (%current-target-system))
+ (string=? (%current-system) "aarch64-linux"))
+ "--no-suite=wayland_gles2_failing"
+ "--no-suite=wayland_gles_failing"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
@@ -1184,11 +1207,6 @@ application suites.")
"find_program('rst2man.py'"))))
(add-after 'unpack 'patch
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
- ;; Correct DTD resources of docbook.
- (substitute* (find-files "docs" "\\.xml$")
- (("http://www.oasis-open.org/docbook/xml/4.3/")
- (string-append #$(this-package-native-input "docbook-xml")
- "/xml/dtd/docbook/")))
;; Disable building of icon cache.
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
@@ -1208,13 +1226,35 @@ application suites.")
;; This test, 'gtk:tools / validate', started failing for
;; unknown reasons after updating mesa to 23.3.1 and xorgproto
;; to 2023.2.
- ((" 'validate',") ""))
+ ((" 'validate',") "")
+ ;; XXX: These test failures come newly from 4.14.
+ ;; Not all of them are reported upstream yet, but the text nodes
+ ;; are mentioned in
+ ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6647>.
+ (("'glyph-subpixel-position',") "")
+ (("'subpixel-positioning',") "")
+ (("'subpixel-positioning-hidpi-nogl-nocairo',") "")
+ (("'text.*\\.node',") "")
+ (("'text-mixed-color-colrv1',") ""))
(substitute* "testsuite/reftests/meson.build"
(("[ \t]*'label-wrap-justify.ui',") "")
;; The inscription-markup.ui fails due to /etc/machine-id
;; related warnings (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
- (("[ \t]*'inscription-markup.ui',") ""))))
+ (("[ \t]*'inscription-markup.ui',") ""))
+ ;; XXX: These failures appear specific to i686 – investigate them.
+ #$@(if (target-x86-32?)
+ #~((substitute* "testsuite/gsk/meson.build"
+ (("'empty-(fill|stroke)\\.node',") "")
+ (("'fill2?\\.node',") "")
+ (("'stroke\\.node',") "")
+ (("'fill-fractional-([a-z-]*)-nogl',") "")
+ (("\\[ 'path-special-cases' \\],") "")
+ (("\\[ '(path|curve)-special-cases' \\],") "")
+ (("\\[ 'path-private' \\],") ""))
+ (substitute* "testsuite/a11y/meson.build"
+ (("\\{ 'name': 'text(view)?' \\},") "")))
+ #~())))
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
@@ -1276,6 +1316,7 @@ application suites.")
python-toml
python-typogrify
sassc ;for building themes
+ shaderc
tzdata-for-tests
vala
xorg-server-for-tests))
@@ -1772,7 +1813,7 @@ text rendering library.")
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
(list
"-Dbuild-documentation=true")
@@ -1787,14 +1828,14 @@ text rendering library.")
(string-append out "/share/doc")
(string-append doc "/share/doc"))))))))
(native-inputs
- `(("dot" ,graphviz)
- ("doxygen" ,doxygen)
- ("m4" ,m4)
- ("mm-common" ,mm-common)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("xsltproc" ,libxslt)))
+ (list graphviz
+ doxygen
+ m4
+ mm-common
+ perl
+ pkg-config
+ python
+ libxslt))
(propagated-inputs
(list glibmm at-spi2-core))
(synopsis "C++ bindings for ATK")
@@ -1866,16 +1907,16 @@ text rendering library.")
(string-append out "/share/doc")
(string-append doc "/share/doc"))))))))
(native-inputs
- `(("dot" ,graphviz)
- ("doxygen" ,doxygen)
- ("glib:bin" ,glib "bin")
- ("m4" ,m4)
- ("mm-common" ,mm-common)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("xsltproc" ,libxslt)
- ("xorg-server" ,xorg-server-for-tests)))
+ (list graphviz
+ doxygen
+ `(,glib "bin")
+ m4
+ mm-common
+ perl
+ pkg-config
+ python
+ libxslt
+ xorg-server-for-tests))
(propagated-inputs
(list cairomm glibmm gtk pangomm))
(synopsis "C++ Interfaces for GTK+ and GNOME")
@@ -1897,7 +1938,7 @@ tutorial.")
(package
(inherit gtkmm)
(name "gtkmm")
- (version "3.24.8")
+ (version "3.24.9")
(source
(origin
(method url-fetch)
@@ -1906,13 +1947,13 @@ tutorial.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
+ (base32 "1kj4mla3z9kxhdby5w88nl744xkmq6xchf79m1kfa72p0kjbzm9h"))))
(propagated-inputs
- `(("atkmm-2.28" ,atkmm-2.28)
- ("cairomm-1.14" ,cairomm-1.14)
- ("glibmm" ,glibmm)
- ("gtk+" ,gtk+)
- ("pangomm-2.42" ,pangomm-2.46)))))
+ (list atkmm-2.28
+ cairomm-1.14
+ glibmm
+ gtk+
+ pangomm-2.46))))
(define-public gtkmm-2
(package
@@ -2095,15 +2136,18 @@ yet remaining very close in spirit to original API.")
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1"))))))
(native-inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gtk+:bin" ,gtk+ "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("perl-extutils-depends" ,perl-extutils-depends)
- ("perl-extutils-pkgconfig" ,perl-extutils-pkgconfig)
- ("perl-test-simple" ,perl-test-simple)
- ("xorg-server" ,xorg-server-for-tests)))
+ (list adwaita-icon-theme
+ `(,gtk+ "bin")
+ gobject-introspection
+ perl-extutils-depends
+ perl-extutils-pkgconfig
+ perl-test-simple
+ xorg-server-for-tests))
(propagated-inputs
- (list gtk+ perl-cairo-gobject perl-carp perl-exporter
+ (list gtk+
+ perl-cairo-gobject
+ perl-carp
+ perl-exporter
perl-glib-object-introspection))
(home-page "https://metacpan.org/dist/Gtk3")
(synopsis "Perl interface to the 3.x series of the gtk+ toolkit")
@@ -2218,36 +2262,22 @@ information.")
(search-patches "gtk-doc-respect-xml-catalog.patch"))))
(build-system meson-build-system)
(arguments
- `(#:parallel-tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-gtk-doc-scan
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gtk-doc.xsl"
- (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/html/chunk.xsl"))
- (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/common/en.xml")))
- #t))
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- (substitute* "tests/Makefile.am"
- (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh")
- ""))
- #t))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
(add-after 'install 'wrap-executables
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (lambda _
+ (let ((docbook-xsl-catalog
+ #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
+ (file-append docbook-xsl
+ "/xml/xsl/" (package-name docbook-xsl)
+ "-" (package-version docbook-xsl)
+ "/catalog.xml"))))
(for-each (lambda (prog)
(wrap-program prog
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))))
- (find-files (string-append out "/bin")))))))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+ `("XML_CATALOG_FILES" " " suffix (,docbook-xsl-catalog))))
+ (find-files (string-append #$output "/bin")))))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")
@@ -2257,7 +2287,8 @@ information.")
pkg-config
python-wrapper))
(inputs
- (list bc
+ (list bash-minimal
+ bc
dblatex
docbook-xml-4.3
docbook-xsl
@@ -2271,6 +2302,8 @@ information.")
python-pygments
source-highlight
yelp-tools))
+ ;; xsltproc's search paths, to avoid propagating libxslt.
+ (native-search-paths %libxslt-search-paths)
(home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc")
(synopsis "GTK+ DocBook Documentation Generator")
(description "GtkDoc is a tool used to extract API documentation from C-code
@@ -2424,6 +2457,11 @@ Parcellite and adds bugfixes and features.")
#:configure-flags
(list
"-Dinstalled_tests=false"
+ ;; Armhf with neon in graphene segfaulting is a known issue.
+ ;; https://github.com/ebassi/graphene/issues/215
+ ,@(if (target-arm32?)
+ '("-Darm_neon=false")
+ '())
,@(if (%current-target-system)
;; Introspection requires running binaries for 'host' on 'build'.
'("-Dintrospection=disabled")
@@ -2701,7 +2739,7 @@ displayed on the other side of the bus.")
(define-public gtk-layer-shell
(package
(name "gtk-layer-shell")
- (version "0.6.0")
+ (version "0.8.0")
(source
(origin
(method git-fetch)
@@ -2710,10 +2748,10 @@ displayed on the other side of the bus.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1kcp4p3s7sdh9lwniybjdarfy8z69j2j23hfrw98amhwhq39gdcc"))))
+ (base32 "0cf1fjlsplslmabpvyfdnvngkn5wfsk6jd7gbq6h74x0n9hczf37"))))
(build-system meson-build-system)
(arguments `(#:configure-flags (list "-Dtests=true")))
- (native-inputs (list pkg-config gobject-introspection))
+ (native-inputs (list pkg-config gobject-introspection vala))
(inputs (list wayland gtk+))
(home-page "https://github.com/wmww/gtk-layer-shell")
(synopsis "Library to create Wayland desktop components using the Layer
@@ -2739,12 +2777,12 @@ popovers.")
(base32 "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"))))
(build-system gnu-build-system)
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib-bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (list gettext-minimal
+ `(,glib "bin")
+ gobject-introspection
+ gtk-doc/stable
+ pkg-config
+ python))
(inputs
(list cairo glib gtk+ python-pygobject))
(arguments
@@ -2760,8 +2798,7 @@ popovers.")
(assoc-ref inputs "python-pygobject")
"\\\", \\\""
(assoc-ref outputs "out")
- "\\\"))")))
- #t)))))
+ "\\\"))"))))))))
(synopsis "Canvas widget for GTK+")
(description "GooCanvas is a canvas widget for GTK+ that uses the cairo 2D
library for drawing.")
@@ -2864,7 +2901,7 @@ user interaction (e.g. measuring distances).")
(define-public volctl
(package
(name "volctl")
- (version "0.9.3")
+ (version "0.9.4")
(source (origin
(method git-fetch)
(uri (git-reference (url "https://github.com/buzz/volctl")
@@ -2872,7 +2909,7 @@ user interaction (e.g. measuring distances).")
(file-name (git-file-name name version))
(sha256
(base32
- "0fz80w3ywq54jn4v31frfdj01s5g9lz6v9cd7hpg3kirca0zisln"))))
+ "0anrwz8rvbliskmcgpw2zabgjj5c72hpi7cf0jg05vvmlpnbsd4g"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -2930,7 +2967,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)
@@ -2939,7 +2976,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-wm.scm b/gnu/packages/guile-wm.scm
index ff885506fa..3d70a2ac61 100644
--- a/gnu/packages/guile-wm.scm
+++ b/gnu/packages/guile-wm.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages guile-wm)
#:use-module (guix licenses)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages xorg)
#:use-module (gnu packages guile)
#:use-module (gnu packages pkg-config)
@@ -174,7 +175,7 @@ dependencies.")
Type=Application~%"
,name ,synopsis %output)))))))))
(native-inputs (list guile-2.2 guile-xcb pkg-config texinfo))
- (inputs (list guile-2.2 guile-xcb))
+ (inputs (list bash-minimal guile-2.2 guile-xcb))
(home-page "https://github.com/mwitmer/guile-wm/releases")
(description
"Guile-WM is a simple window manager that's completely customizable—you
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 42d3a1825e..977d0ffea1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018–2024 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
@@ -44,7 +44,7 @@
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2022 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2023 Wojtek Kosior <koszko@koszko.org>
@@ -52,6 +52,7 @@
;;; dual-licensed under the Creative Commons Zero v1.0.
;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com>
;;; Copyright © 2024 Artyom Bologov <mail@aartaka.me>
+;;; Copyright © 2024 Felix Lechner <felix.lechner@lease-up.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -189,7 +190,7 @@
#t))))
(build-system gnu-build-system)
(inputs
- (list guile-3.0 nspr nss))
+ (list bash-minimal guile-3.0 nspr nss))
;; FIXME the bundled csv contains one more exported procedure
;; (sxml->csv-string) than guile-csv. The author is maintainer of both
;; projects.
@@ -203,9 +204,9 @@
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:make-flags
;; TODO: The documentation must be built with the `docs' target.
(let* ((out (assoc-ref %outputs "out"))
@@ -292,9 +293,9 @@ more.")
`(#:make-flags '("GUILE_AUTO_COMPILE=0")
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-guilescript
(lambda* (#:key outputs #:allow-other-keys)
@@ -561,6 +562,33 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
dictionary and suggesting spelling corrections.")
(license license:gpl3+)))
+(define-public guile-avatar
+ (let ((commit "c2860952fd09ecc878c3d4f1ee2f1678668fbb7a")
+ (revision "0"))
+ (package
+ (name "guile-avatar")
+ (version (git-version "0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/lechner/guile-avatar")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dq9zcx4q3m5s3cpixq4zvlmdrlcc626mpqb7nmmj7vnda8k717f"))))
+ (build-system guile-build-system)
+ (arguments
+ (list #:source-directory "scm"))
+ (inputs (list guile-3.0))
+ (propagated-inputs (list guile-hashing))
+ (home-page "https://codeberg.org/lechner/guile-avatar")
+ (synopsis "Get Libravatar URLs from an email address")
+ (description
+ "@code{guile-avatar} helps you to determine avatars (or profile
+pictures) for email addresses using the Libravatar specification.")
+ (license license:agpl3+))))
+
(define-public guile2.0-bash
;; This project is currently retired. It was initially announced here:
;; <https://lists.gnu.org/archive/html/guile-user/2015-02/msg00003.html>.
@@ -736,7 +764,7 @@ you send to a FIFO file.")
(define-public guile-dsv
(package
(name "guile-dsv")
- (version "0.7.1")
+ (version "0.7.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -745,7 +773,7 @@ you send to a FIFO file.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "18v8snh45ibh13mvihhajs226yflxpl6v09wqndyfj1da8cdmkzk"))))
+ "1iavc1dg1899v519hvbzcmvdc16rahcwwvj68jycqdc5px5z285i"))))
(build-system gnu-build-system)
(native-inputs (list autoconf
automake
@@ -761,9 +789,9 @@ you send to a FIFO file.")
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases
(delete 'strip)
(add-after 'install 'wrap-program
@@ -1028,27 +1056,6 @@ HTML (via SXML) or any other format for rendering.")
(home-page "https://dthompson.us/projects/guile-syntax-highlight.html")
(license license:lgpl3+)))
-;; gitile requires a more recent version than the latest release.
-(define-public guile-syntax-highlight-for-gitile
- (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a")
- (revision "0"))
- (package
- (inherit guile-syntax-highlight)
- (version (git-version "0.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.dthompson.us/guile-syntax-highlight.git")
- (commit commit)))
- (file-name (git-file-name "guile-syntax-highlight" version))
- (sha256
- (base32
- "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj"))))
- (native-inputs
- (modify-inputs (package-native-inputs guile-syntax-highlight)
- (prepend autoconf automake texinfo)))
- (properties '((hidden? . #t))))))
-
(define-public guile2.2-syntax-highlight
(package
(inherit guile-syntax-highlight)
@@ -1124,7 +1131,7 @@ for calling methods on remote servers by exchanging JSON objects.")
(define-public guile-ares-rs
(package
(name "guile-ares-rs")
- (version "0.9.4")
+ (version "0.9.5")
(source
(origin
(method git-fetch)
@@ -1134,11 +1141,11 @@ for calling methods on remote servers by exchanging JSON objects.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ksj39ka8n7cbsqf56z67hyk2jcjz6zlkgnbdrqa9kp95p47xp41"))))
+ "06fc5kbcniysqixadi54vv96hy8l4wx6hqcii134fkb1d93078lq"))))
(build-system guile-build-system)
(arguments
(list
- #:source-directory "src"))
+ #:source-directory "src/guile"))
;; Remove guile-next dependency, when guile package get custom text port
(inputs `(("guile" ,guile-next)))
(propagated-inputs (list guile-fibers))
@@ -1547,7 +1554,7 @@ messaging library.")
(add-after 'build 'chdir-back
(lambda _ (chdir "..") #t))
- (add-after 'install 'install-kernel
+ (add-after 'chdir-back 'install-kernel
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(json (assoc-ref inputs "guile-json"))
@@ -1901,9 +1908,9 @@ bindings to the @code{yaml-cpp} C++ library.")
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:configure-flags
(list (string-append
"--with-guile-site-dir=" %output "/share/guile/site/"
@@ -2134,10 +2141,10 @@ above command-line parameters.")
#:modules `(((guix build guile-build-system)
#:select
(target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(with-imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#~(modify-phases %standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs #:allow-other-keys)
@@ -2265,7 +2272,7 @@ user which package sets would they like to install from it.")
(define-public guile-wisp
(package
(name "guile-wisp")
- (version "1.0.7")
+ (version "1.0.12")
(source (origin
(method hg-fetch)
(uri (hg-reference
@@ -2274,7 +2281,7 @@ user which package sets would they like to install from it.")
(file-name (git-file-name name version))
(sha256
(base32
- "0fxngiy8dmryh3gx4g1q7nnamc4dpszjh130g6d0pmi12ycxd2y9"))))
+ "0m5ssl4ngk2jl1zk0fnsss0asyvwanjaa5rrcksldqnh2ikcr4bm"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -2283,7 +2290,7 @@ user which package sets would they like to install from it.")
(guix build emacs-utils)
(ice-9 rdelim)
(ice-9 popen))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@@ -2513,7 +2520,7 @@ capabilities.")
clutter
xorg-server-for-tests))
(propagated-inputs
- (list gobject-introspection-next))
+ (list gobject-introspection))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
@@ -2692,9 +2699,8 @@ many readers as needed).")
#:select (target-guile-effective-version))
(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")
+ ,@%default-gnu-imported-modules)
+ #:configure-flags (list "--with-gnu-filesystem-hierarchy")
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-libguile-ncurses-file-name
@@ -2740,12 +2746,14 @@ library.")
version ".tar.gz"))
(sha256
(base32
- "1nb7swbliw9vx1ivhgd2m0r0p7nlkszw6s41zcgfwb5v1kp05sb4"))))
+ "1nb7swbliw9vx1ivhgd2m0r0p7nlkszw6s41zcgfwb5v1kp05sb4"))
+ (patches (search-patches "guile-lib-fix-tests-for-guile2.2.patch"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0") ;placate guild warnings
#:phases
(modify-phases %standard-phases
+ (delete 'strip)
(add-before 'configure 'patch-module-dir
(lambda _
(substitute* "src/Makefile.in"
@@ -2939,7 +2947,7 @@ See http://minikanren.org/ for more on miniKanren generally.")
(for-each (lambda (f)
(invoke "guile" "--no-auto-compile" "-L" "." "-s" f))
(find-files "tests" "^guile-.*\\.scm"))))
- (add-after 'install 'check-installed
+ (add-after 'check 'check-installed
(lambda _
(define-values (scm go) (target-guile-scm+go #$output))
(for-each
@@ -3010,7 +3018,7 @@ inspired by the SCSH regular expression system.")
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 match) (ice-9 ftw)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:tests? #f ; test suite is non-deterministic :(
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-haunt
@@ -3046,14 +3054,13 @@ inspired by the SCSH regular expression system.")
(string-append dep "/lib/guile/"
version
"/site-ccache"))
- deps))))
- #t)))))))))
+ deps)))))))))))))
(native-inputs
(list pkg-config texinfo))
(inputs
;; Depend on the latest Guile to avoid bytecode compatibility issues when
;; using modules built against the latest version.
- (list guile-3.0-latest))
+ (list bash-minimal guile-3.0-latest))
(propagated-inputs
(list guile-reader guile-commonmark))
(synopsis "Functional static site generator")
@@ -3147,7 +3154,11 @@ key-value cache and store.")
(substitute* "configure"
(("2\\.2 2\\.0")
"3.0 2.2 2.0"))
- #t))))
+ ;; The 'en_US.utf8' locale is missing, but C.UTF-8 is
+ ;; enough.
+ (substitute* (find-files "tests/inlines" "\\.scm$")
+ (("en_US.utf8")
+ "C.UTF-8"))))))
(build-system gnu-build-system)
;; The tests throw exceptions with Guile 3.0.5, because they evaluate
;; (exit ...).
@@ -3295,7 +3306,7 @@ The picture values can directly be displayed in Geiser.")
`(#:modules
((ice-9 match)
(srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:tests? #f ; there are none
#:make-flags
(list (string-append "PICT_DIR="
@@ -3454,8 +3465,7 @@ serializing continuations or delimited continuations.")
;; TODO: It would be better to patch the Makefile.
(setenv "GUILE_LOAD_PATH"
(string-append ".:"
- (getenv "GUILE_LOAD_PATH")))
- #t))
+ (getenv "GUILE_LOAD_PATH")))))
(add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
;; Wrap the 'python' executable so it can find its
@@ -3480,10 +3490,9 @@ serializing continuations or delimited continuations.")
`("GUILE_LOAD_PATH" ":" prefix
(,load-path))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,compiled-path)))
- #t))))))
+ (,compiled-path)))))))))
(inputs
- (list guile-3.0 guile-persist guile-readline guile-stis-parser))
+ (list bash-minimal guile-3.0 guile-persist guile-readline guile-stis-parser))
(native-inputs
(list autoconf automake libtool pkg-config))
(synopsis "Python implementation in Guile")
@@ -4007,7 +4016,7 @@ or errors (Left).")
(call-with-input-file "srfi-197-syntax-case.scm"
(lambda (in-port)
(display (get-string-all in-port) port)))))))
- (add-after 'install 'check-installed
+ (add-after 'build 'check-installed
(lambda _
(define-values (scm go) (target-guile-scm+go #$output))
(invoke "guile" "-L" scm "-C" go
@@ -4115,7 +4124,8 @@ applied to surplus arguments.")
("texinfo" ,texinfo)
("texlive" ,(texlive-updmap.cfg (list texlive-epsf)))))
(inputs
- (list dbus-glib
+ (list bash-minimal
+ dbus-glib
guile-3.0
guile-lib
guile-readline
@@ -4325,7 +4335,8 @@ processing filters.")
("gettext" ,gettext-minimal)
("perl" ,perl)))
(inputs
- `(;; Guile
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ;; Guile
("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline)
@@ -4527,8 +4538,8 @@ function: raw, typed, and functional.")
(license license:lgpl3+))))
(define-public guile-gsl
- (let ((commit "22ac81c45f33f897d7cc88744d427a6959682c24")
- (revision "1"))
+ (let ((commit "d33de9219a167561132721ce79c94bcaf67724b0")
+ (revision "2"))
(package
(name "guile-gsl")
(version (git-version "0.0.1" revision commit))
@@ -4540,7 +4551,7 @@ function: raw, typed, and functional.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0gwxyd5flq107ibqdqvx7dl5z23an171jwckn7dvlqc60b7n2x64"))))
+ (base32 "02ngki3z64cs5mabs61vnx2chagcc8srmgfvccpr4zkn36fw3cx8"))))
(build-system guile-build-system)
(arguments
(list
@@ -4562,7 +4573,14 @@ function: raw, typed, and functional.")
(synopsis "Bindings for GNU Scientific library in Guile")
(description
"This package provides a Guile Scheme wrapper for @code{libgsl.so}.
-Implements vector, matrix, and BLAS operations.")
+Implements
+@itemize
+@item GSL vectors.
+@item Matrices.
+@item BLAS operations.
+@item Eigensystem solutions.
+@item One-dimensional root solvers.
+@end itemize")
(license license:gpl3+))))
(define-public guile-ffi-fftw
@@ -4694,10 +4712,10 @@ writing tests.")
(method git-fetch)
(uri (git-reference
(url "https://git.koszko.org/de-paul-records")
- (commit "7c23b2d0fcee30f15dbf27cf26ef280a6dde398e")))
+ (commit "dbb2a98e2a63a34ffe1e416835d9e6e7f137a214")))
(sha256
(base32
- "0c51lccpx9b1cxkknbf4bhihyg85rmgpynwj12j6w6842mjylswm"))))
+ "0m7pm5k21zb64lcmjjrdxn4c9ca74mss3kxivhnfpz17ilj5xky9"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake guile-3.0 pkg-config lawrence-boilerplate))
@@ -4731,10 +4749,10 @@ approach.")
(method git-fetch)
(uri (git-reference
(url "https://git.koszko.org/cantius")
- (commit "67811d35e09a6a638c6a8e92b6824beb5a631838")))
+ (commit "6995ff9efcf9c3e02a83656dc41dce3934e5cd97")))
(sha256
(base32
- "0kqawxp5l0bpzvbpwlsrk18d6wwza6zcrs192zppchmdzl4w0qh4"))))
+ "06nr93fd8m1afjbdf9h2f466mxh22dhk1wnm6k5lydb3jg6zn18z"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
@@ -4896,7 +4914,6 @@ and space linear in the size of the input text.")
(build-system guile-build-system)
(arguments
(list
- #:implicit-inputs? #f ;needs nothing but Guile
#:compile-flags #~(list "--r6rs" "-Wunbound-variable" "-Warity-mismatch")
#:phases
#~(modify-phases %standard-phases
@@ -4943,7 +4960,7 @@ and space linear in the size of the input text.")
(("#!/usr/bin/env scheme-script")
(string-append "#!" (which "guile")))))
(invoke "./run-tests.sh"))))
- (add-after 'install 'install-doc
+ (add-after 'build-doc 'install-doc
(lambda _
(install-file "docs/ac-d-bus.info"
(string-append #$output "/share/info")))))))
@@ -4999,6 +5016,50 @@ as signed sessions, multipart message support, etc.")
(propagated-inputs
(list guile2.2-irregex guile2.2-gcrypt))))
+(define-public guile-web-driver-ng
+ (package
+ (name "guile-web-driver-ng")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/artyom-poptsov/guile-web-driver-ng")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0saljgf3kj3p9b1mk5211s8np2vwkzf072xp6j2xnc10vdn891ja"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ ;; needed when cross-compiling.
+ guile-lib
+ guile-json-4
+ guile-gnutls
+ guile-3.0))
+ (propagated-inputs (list guile-json-4 guile-gnutls guile-lib guile-3.0
+ inetutils))
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'strip))))
+ (home-page "https://github.com/artyom-poptsov/guile-web-driver-ng")
+ (synopsis "Web driver (Selenium) client for Guile")
+ (description
+ "This is a web-driver, or Selenium 2, client. It's purpose is to automate
+browsers, specifically for automatic web server testing. Chrome or Firefox can be
+used as the automated browsers, or it can connect to arbitrary server providing
+webdriver interface. The client implements most of the WebDriver
+@url{https://www.w3.org/TR/webdriver2/, specification}.
+
+@code{guile-web-driver-ng} also provides a proxy implemented as a Guile module. If
+configured, the proxy can intercept and modify HTTP/HTTPS traffic (for example, add,
+delete and replace HTTP headers) which is useful for Selenium WebDriver as it does
+not provide a way to change the headers on its own.")
+ (license license:gpl3+)))
+
(define-public guile-lens
(let ((commit "14b15d07255f9d3f55d40a3b750d13c9ee3a154f")
(revision "0"))
@@ -5049,31 +5110,27 @@ over, or update a value in arbitrary data structures.")
(define-public guile-xapian
(package
(name "guile-xapian")
- (version "0.3.1")
- (home-page "https://git.systemreboot.net/guile-xapian")
+ (version "0.4.0")
(source
(origin
- (method git-fetch)
- (uri (git-reference (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append "https://guile-xapian.systemreboot.net/releases/guile-xapian-"
+ version ".tar.lz"))
(sha256
(base32
- "0axbahbi52ji0fxhykn642265v58rdp2yqliqv456nqs038wb5ja"))))
+ "1szjwha8rin65mdm0dviha4pybiij89pq1wfjmrir1js4w5mk1hr"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
(inputs
(list guile-3.0 xapian zlib))
(native-inputs
- (list autoconf
- autoconf-archive
- automake
- libtool
- pkg-config
+ (list pkg-config
+ lzip
swig))
(propagated-inputs
(list guile-lib))
+ (home-page "https://guile-xapian.systemreboot.net")
(synopsis "Guile bindings for Xapian")
(description "@code{guile-xapian} provides Guile bindings for Xapian, a
search engine library. Xapian is a highly adaptable toolkit which allows
@@ -5533,7 +5590,7 @@ Scheme.")
(define-public guile-jwt
(package
(name "guile-jwt")
- (version "0.2.0")
+ (version "0.3.0")
(source
(origin
(method git-fetch)
@@ -5543,12 +5600,12 @@ Scheme.")
(file-name (git-file-name name version))
(sha256
(base32
- "1p8sapiv5im18rjnzc8xnw6y7dr661rycf9g10z5ww0dl4rfz3z1"))))
+ "04c5aibcfb83bl194j27cw5x8bfbqvq5939brckaaapbrff6il6k"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake pkg-config))
(propagated-inputs
- (list guile-json-4))
+ (list guile-gcrypt guile-json-4))
(inputs
(list guile-3.0))
(home-page "https://github.com/aconchillo/guile-jwt")
@@ -5640,7 +5697,7 @@ using a short read-capability.")
(arguments
(list
#:phases #~(modify-phases %standard-phases
- (add-after 'install 'link-and-wrap-executable
+ (add-after 'build 'link-and-wrap-executable
(lambda _
(let* ((bin (string-append #$output "/bin"))
;; bin directory for PATH.
@@ -5728,7 +5785,7 @@ including parsing and code generation.")
(lambda _
(delete-file-recursively "docs")
#t))
- (add-after 'install 'install-info-documentation
+ (add-after 'build 'install-info-documentation
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((share (string-append (assoc-ref outputs "out") "/share"))
(doc (string-append share "/doc/" ,name "-" ,version))
@@ -5795,9 +5852,9 @@ schedulers.")
(arguments
`(#:modules (((guix build guile-build-system)
#:prefix guile:)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:tests? #false ; there are none
#:phases
(modify-phases %standard-phases
@@ -5829,8 +5886,8 @@ ffi-helper from nyacc.")
(license license:lgpl3+))))
(define-public schmutz
- (let ((commit "add24588c59552537b8f1316df99a0cdd62c221e")
- (revision "1"))
+ (let ((commit "f8043e6c258d2e29d153bc37cb17b130fee0579f")
+ (revision "2"))
(package
(name "schmutz")
(version (git-version "0" revision commit))
@@ -5842,13 +5899,13 @@ ffi-helper from nyacc.")
(file-name (git-file-name name version))
(sha256
(base32
- "1z3n61sj62lnn15mandvyrpjzli07rp9r62ypvgg3a8bvh37yc89"))))
+ "0cgk0b27f1vik3wnv1cz47ip7d8rkmqxfdlqba4avi9h5fah7xrw"))))
(build-system cmake-build-system)
(arguments `(#:tests? #f))
(native-inputs
(list pkg-config))
(inputs
- (list guile-2.2))
+ (list guile-3.0))
(home-page "https://github.com/arximboldi/schmutz")
(synopsis "Bind C++ code to Scheme")
(description "Schmutz is a header-only library to declare Scheme bindings
@@ -5882,6 +5939,41 @@ a Guile implementation of CBOR.")
(home-page "https://inqlab.net/git/guile-cbor.git")
(license license:gpl3+)))
+(define-public guile-qr-code
+ (package
+ (name "guile-qr-code")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/artyom-poptsov/guile-qr-code")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rs23xk6wpf618ln9n0aj3k6vhg4s80qpyp6z3j5gdrpfsgp7nf7"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'strip))))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ ;; needed when cross-compiling.
+ guile-3.0
+ guile-lib
+ guile-png))
+ (inputs (list bash-minimal guile-3.0 guile-lib guile-png))
+ (synopsis "Guile QR Code library")
+ (description
+ "GNU Guile QR code generator that can create QR codes from text and binary data.
+The resulting QR codes can be rendered to ASCII art strings or to PNG images (using
+@url{https://github.com/artyom-poptsov/guile-png, Guile-PNG} API.)")
+ (home-page "https://github.com/artyom-poptsov/guile-qr-code")
+ (license (list license:gpl3+ license:expat))))
+
(define-public guile-quickcheck
(package
(name "guile-quickcheck")
@@ -5982,9 +6074,9 @@ high-level API for network management that uses rtnetlink.")
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -6011,6 +6103,7 @@ high-level API for network management that uses rtnetlink.")
(native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib
guile2.2-gnutls))
+
(home-page "https://github.com/artyom-poptsov/guile-gitlab")
(synopsis "Guile interface to GitLab")
(description
@@ -6038,9 +6131,9 @@ GitLab instance.")
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(modify-phases %standard-phases
(delete 'strip)
@@ -6245,7 +6338,7 @@ in two different guises.")
(define-public guile-tap
(package
(name "guile-tap")
- (version "0.4.6")
+ (version "0.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6254,7 +6347,7 @@ in two different guises.")
(file-name (git-file-name name version))
(sha256
(base32
- "04ip5cbvsjjcicsri813f4711yh7db6fvc2px4788rl8p1iqvi6x"))))
+ "0yimi9ci5h6wh7bs3ir7p181pwbd2hxlhx7pqq53gr54mnad8qv4"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -6263,7 +6356,9 @@ in two different guises.")
(lambda _
(substitute* "Makefile"
(("PREFIX = /usr/local") (string-append "PREFIX="
- #$output)))))
+ #$output)))
+ (substitute* "bin/tap-harness"
+ ((" guile ") (string-append " " (which "guile") " ")))))
(replace 'build
(lambda _
(invoke "make")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e8705dc7d2..0106f500c8 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -42,6 +42,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
@@ -109,7 +110,19 @@
;; The usual /bin/sh...
(substitute* "ice-9/popen.scm"
- (("/bin/sh") (which "sh"))))))
+ (("/bin/sh") (which "sh")))))
+ (add-after 'install 'add-libxcrypt-reference-pkgconfig
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (define out (assoc-ref outputs "out"))
+ (define libxcrypt
+ (false-if-exception
+ (dirname (search-input-file inputs "lib/libcrypt.so.1"))))
+ (when libxcrypt
+ (substitute*
+ (find-files (string-append out "/lib/pkgconfig")
+ ".*\\.pc")
+ (("-lcrypt")
+ (string-append "-L" libxcrypt " -lcrypt")))))))
;; XXX: Several numerical tests and tests related to
;; 'inet-pton' fail on glibc 2.33/GCC 10. Disable them.
@@ -122,7 +135,7 @@
`(("self" ,this-package))
'()))
- (inputs (list gawk readline))
+ (inputs (list gawk libxcrypt readline))
;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be
;; propagated.
@@ -163,7 +176,7 @@ without requiring the source code to be rewritten.")
(list this-package)
'())))
(inputs
- (append (list libffi)
+ (append (list libffi libxcrypt)
(libiconv-if-needed)
;; We need Bash when cross-compiling because some of the scripts
@@ -238,7 +251,19 @@ without requiring the source code to be rewritten.")
'(search-input-file inputs "/bin/bash"))
(else
'(string-append bash "/bin/bash")))))
- #t))))))
+ #t)))
+ (add-after 'install 'add-libxcrypt-reference-pkgconfig
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (define out (assoc-ref outputs "out"))
+ (define libxcrypt
+ (false-if-exception
+ (dirname (search-input-file inputs "lib/libcrypt.so.1"))))
+ (when libxcrypt
+ (substitute*
+ (find-files (string-append out "/lib/pkgconfig")
+ ".*\\.pc")
+ (("-lcrypt")
+ (string-append "-L" libxcrypt " -lcrypt")))))))))
(native-search-paths
(list (search-path-specification
@@ -830,7 +855,7 @@ type system, elevating types to first-class status.")
(define-public guile-git
(package
(name "guile-git")
- (version "0.7.0")
+ (version "0.8.0")
(home-page "https://gitlab.com/guile-git/guile-git.git")
(source (origin
(method git-fetch)
@@ -840,7 +865,7 @@ type system, elevating types to first-class status.")
(file-name (git-file-name name version))
(sha256
(base32
- "1dgxzyn6ra685hp2vdhvw4z2hzx16nsjqj5k4p773x5a33jaq4pg"))))
+ "15k5gcx5clckw9r38602xw8q4bmfr8s16fzmjw16carm54dsx78i"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
@@ -869,7 +894,7 @@ type system, elevating types to first-class status.")
(native-inputs
(list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
(inputs
- (list guile-3.0 libgit2-1.7))
+ (list guile-3.0 libgit2-1.8))
(propagated-inputs
(list guile-bytestructures))
(synopsis "Guile bindings for libgit2")
@@ -882,12 +907,13 @@ manipulate repositories of the Git version control system.")
(package-for-guile-2.2 guile-git))
(define-public guile2.0-git
- (package-for-guile-2.0 guile-git))
+ ;; Guile-Git 0.8.0 no longer supports Guile 2.0.
+ (deprecated-package "guile2.0-git" guile2.2-git))
(define-public guile-zlib
(package
(name "guile-zlib")
- (version "0.1.0")
+ (version "0.2.1")
(source
(origin
;; XXX: Do not use "git-fetch" method here that would create and
@@ -899,13 +925,10 @@ manipulate repositories of the Git version control system.")
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- ;; content hash: 1ip18nzwnczqyhn9cpzxkm9vzpi5fz5sy96cgjhmp7cwhnkmv6zv
+ ;; content hash: 09zfka3js7dp39fnplxbp90x98s5nj0pc93p1l9cmgrbj8nyn2sv
(base32
- "1safz7rrbdf1d98x3lgx5v74kivpyf9n1v6pdyy22vd0f2sjdir5"))))
+ "0wqva23zrxcsj9cp3xqmqpxqyd7a4nnja3dc7v7g0i9yfixi7xd5"))))
(build-system gnu-build-system)
- (arguments
- '(#:make-flags
- '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs (list autoconf automake pkg-config guile-3.0))
(inputs (list guile-3.0 zlib))
(synopsis "Guile bindings to zlib")
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 468e2adc3b..d8530f8705 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
-;;; Copyright © 2021, 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2021, 2023, 2024 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Denis Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
@@ -1580,7 +1580,7 @@ modern instrumentation and data acquision systems using Ethernet.")
(define-public usbrelay
(package
(name "usbrelay")
- (version "1.2")
+ (version "1.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1589,19 +1589,31 @@ modern instrumentation and data acquision systems using Ethernet.")
(file-name (git-file-name name version))
(sha256
(base32
- "0fr3wglr2c6myg4k6ai2p5z38prclcnk2ngik15sq16fnp6qg750"))))
+ "1xw2fqx4drmkvv587vkz3aicp6pw1mzxr8bjz8wad9j4c0r24cgn"))))
(build-system gnu-build-system)
(arguments
(list
#:phases #~(modify-phases %standard-phases
- (delete 'configure)) ;no configure script
+ ;; No configure script.
+ (delete 'configure)
+ (add-after 'install 'install-manpage
+ (lambda _
+ (install-file "usbrelay.1"
+ (string-append #$output "/share/man/man1"))))
+ (add-after 'install-manpage 'install-udev-rules
+ (lambda _
+ (install-file "50-usbrelay.rules"
+ (string-append #$output "/lib/udev/rules.d")))))
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output)
(string-append "LDFLAGS=-Wl,-rpath="
(string-append #$output "/lib"))
"LDCONFIG=true"
- "USBMAJOR=$(USBLIBVER)")
- #:tests? #f)) ;no test suite
+ (string-append "USBMAJOR=" #$version)
+ (string-append "USBLIBVER=" #$version)
+ (string-append "VERSION=" #$version))
+ ;; No test suite.
+ #:tests? #f))
(inputs (list hidapi))
(home-page "https://github.com/darrylb123/usbrelay")
(synopsis "Control USB relay modules")
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 3fce4f803c..8b14a01569 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 David Thompson <dthompson2@worcester.edu>
+;;; Copyright © 2024 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,11 +38,13 @@
(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:)
#:use-module (guix build-system haskell)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages curl)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl)
@@ -615,12 +618,12 @@ and mIRC chat codes.")
(define-public kmonad
;; Project is active, but no new releases exist. Pick current master
- ;; HEAD as of 2023-01-08.
- (let ((commit "a0af5b8b3f085adb2c09ca52374a53566c25194c")
+ ;; HEAD as of 2024-08-18.
+ (let ((commit "07cd1cb4fddb46a8d9de3bb9d06196d08b7a8ed2")
(revision "1"))
(package
(name "kmonad")
- (version (git-version "0.4.1" revision commit))
+ (version (git-version "0.4.2" revision commit))
(source
(origin
(method git-fetch)
@@ -629,7 +632,7 @@ and mIRC chat codes.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "00qmmk1lgadhh32dqi530xm18v79ndcm7rrxvdsf827vicv2nhw1"))))
+ (base32 "08ybif2lw0jy9h2hrlvx3469a3hkvih9gsg60kp9qnklzvqjdy5i"))))
(build-system haskell-build-system)
(arguments
`(#:haddock? #f ; Haddock fails to generate docs
@@ -682,6 +685,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")
@@ -764,7 +859,8 @@ Haskell.")
"/lib"))))
#t))))))
(inputs
- (list ghc-extensible-exceptions
+ (list bash-minimal
+ ghc-extensible-exceptions
ghc-random
ghc-glut
freeglut
@@ -828,30 +924,31 @@ too slow and you'll get wound up in the scroll and crushed.")
(define-public shellcheck
(package
(name "shellcheck")
- (version "0.9.0")
+ (version "0.10.0")
(source
(origin
(method url-fetch)
(uri (hackage-uri "ShellCheck" version))
(sha256
- (base32 "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb"))
+ (base32 "08bdjcdl457xz2vh8y2w29bcwh1k7sfzyvszln3498vm5m1xn22d"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system haskell-build-system)
(arguments
- '(#:haddock? #f ; TODO: Fails to build.
- #:phases
- (modify-phases %standard-phases
- (add-after 'build 'build-man-page
- (lambda _
- (invoke "./manpage")))
- (add-after 'install 'install-man-page
- (lambda* (#:key outputs #:allow-other-keys)
- (install-file "shellcheck.1"
- (string-append (assoc-ref outputs "out")
- "/share/man/man1/"))))
- (add-after 'register 'remove-libraries
- (lambda* (#:key outputs #:allow-other-keys)
- (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))))))
+ (list #:haddock? #f ; TODO: Fails to build.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-man-page
+ (lambda _
+ (chmod "manpage" #o555)
+ (invoke "./manpage")))
+ (add-after 'install 'install-man-page
+ (lambda* (#:key outputs #:allow-other-keys)
+ (install-file "shellcheck.1"
+ (string-append #$output
+ "/share/man/man1/"))))
+ (add-after 'register 'remove-libraries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (delete-file-recursively (string-append #$output "/lib")))))))
(native-inputs
(list pandoc))
(inputs
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 5447ecec1e..6f6ac3fd08 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -190,13 +190,13 @@ framework}.")
(define-public ghc-tasty-hspec
(package
(name "ghc-tasty-hspec")
- (version "1.2.0.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "tasty-hspec" version))
- (sha256
- (base32
- "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"))))
+ (version "1.2.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "tasty-hspec" version))
+ (sha256
+ (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
(build-system haskell-build-system)
(properties '((upstream-name . "tasty-hspec")))
(inputs (list ghc-hspec
@@ -206,9 +206,6 @@ framework}.")
ghc-tasty-smallcheck
ghc-tasty-quickcheck
ghc-tagged))
- (arguments
- `(#:cabal-revision ("1"
- "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll")))
(home-page "https://github.com/mitchellwrosen/tasty-hspec")
(synopsis "Hspec support for the Tasty test framework")
(description
@@ -365,13 +362,13 @@ development.")
(define-public ghc-quickcheck-instances
(package
(name "ghc-quickcheck-instances")
- (version "0.3.28")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "quickcheck-instances" version))
- (sha256
- (base32
- "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4"))))
+ (version "0.3.29.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "quickcheck-instances" version))
+ (sha256
+ (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
(build-system haskell-build-system)
(properties '((upstream-name . "quickcheck-instances")))
(inputs (list ghc-quickcheck
@@ -392,7 +389,11 @@ development.")
ghc-unordered-containers
ghc-uuid-types
ghc-vector
+ ghc-data-array-byte
ghc-text-short))
+ (arguments
+ `(#:cabal-revision ("2"
+ "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
(home-page "https://github.com/haskellari/qc-instances")
(synopsis "Common quickcheck instances")
(description "This package provides QuickCheck instances for types
@@ -445,14 +446,13 @@ use HUnit assertions as QuickCheck properties.")
(define-public ghc-quickcheck
(package
(name "ghc-quickcheck")
- (version "2.14.2")
+ (version "2.14.3")
(source
(origin
(method url-fetch)
(uri (hackage-uri "QuickCheck" version))
(sha256
- (base32
- "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq"))))
+ (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
(build-system haskell-build-system)
(properties '((upstream-name . "QuickCheck")))
(inputs
@@ -755,18 +755,18 @@ Haskell, inspired by the Ruby library RSpec.")
(package
(name "ghc-hspec-contrib")
(version "0.5.1.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "hspec-contrib" version))
- (sha256
- (base32
- "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "hspec-contrib" version))
+ (sha256
+ (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
(build-system haskell-build-system)
(properties '((upstream-name . "hspec-contrib")))
- (inputs (list ghc-hunit ghc-hspec-core))
+ (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core))
(native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
- (arguments (list #:tests? #f)) ; Tests fail to compile.
- (home-page "http://hspec.github.io/")
+ (arguments (list #:tests? #f)) ; Fail to build.
+ (home-page "https://hspec.github.io/")
(synopsis "Contributed functionality for Hspec")
(description "This package provides contributed Hspec extensions.")
(license license:expat)))
diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm
index 7e1935ece3..7ea9cf1e12 100644
--- a/gnu/packages/haskell-crypto.scm
+++ b/gnu/packages/haskell-crypto.scm
@@ -324,17 +324,19 @@ elsewhere.")
(define-public ghc-digest
(package
(name "ghc-digest")
- (version "0.0.1.4")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "digest" version))
- (sha256
- (base32
- "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr"))))
+ (version "0.0.1.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "digest" version))
+ (sha256
+ (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
(build-system haskell-build-system)
(properties '((upstream-name . "digest")))
(arguments
- `(#:extra-directories ("zlib")))
+ `(#:extra-directories ("zlib")
+ #:cabal-revision ("1"
+ "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl")))
(inputs (list zlib))
(native-inputs (list pkg-config))
(home-page "http://hackage.haskell.org/package/digest")
@@ -610,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")
@@ -719,16 +859,53 @@ 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")
- (version "0.11.7.4")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "HsOpenSSL" version))
- (sha256
- (base32
- "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf"))))
+ (version "0.11.7.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "HsOpenSSL" version))
+ (sha256
+ (base32 "0y0l5nb0jsc8lm12w66a2n7nwcrgjxy1q2xdy8a788695az5xy71"))))
(build-system haskell-build-system)
(properties '((upstream-name . "HsOpenSSL")))
(inputs (list ghc-network openssl))
diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm
index 75b84b10a7..540b167b7a 100644
--- a/gnu/packages/haskell-web.scm
+++ b/gnu/packages/haskell-web.scm
@@ -72,28 +72,51 @@ for screen-scraping.")
(define-public ghc-cookie
(package
(name "ghc-cookie")
- (version "0.4.5")
+ (version "0.4.6")
(source
(origin
(method url-fetch)
(uri (hackage-uri "cookie" version))
(sha256
- (base32
- "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"))))
+ (base32 "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"))))
(build-system haskell-build-system)
(properties '((upstream-name . "cookie")))
- (inputs
- (list ghc-old-locale
- ghc-blaze-builder
- ghc-data-default-class
- ghc-hunit
- ghc-quickcheck
- ghc-tasty
- ghc-tasty-hunit
- ghc-tasty-quickcheck))
+ (inputs (list ghc-data-default-class))
+ (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit
+ ghc-tasty-quickcheck))
(home-page "https://github.com/snoyberg/cookie")
(synopsis "HTTP cookie parsing and rendering")
(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
@@ -363,58 +386,54 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
(define-public ghc-http-conduit
(package
- (name "ghc-http-conduit")
- (version "2.3.8")
+ (name "ghc-http-conduit")
+ (version "2.3.8.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "http-conduit" version))
(sha256
- (base32
- "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng"))))
+ (base32 "11zf4hyw8f1gpj0w1cmgc9g62xwy2v4hhzqazdsla4q49iqbzxgd"))))
(build-system haskell-build-system)
(properties '((upstream-name . "http-conduit")))
- ;; FIXME: `httpLbs TLS` in test-suite `test` fails with
- ;; ConnectionFailure getProtocolByName: does not exist (no such protocol
- ;; name: tcp)
- (arguments `(#:tests? #f))
- (inputs
- (list ghc-aeson
- ghc-resourcet
- ghc-conduit
- ghc-conduit-extra
- ghc-http-types
- ghc-lifted-base
- ghc-http-client
- ghc-http-client-tls
- ghc-monad-control
- ghc-exceptions
- ghc-unliftio))
- (native-inputs
- (list ghc-hunit
- ghc-hspec
- ghc-data-default-class
- ghc-connection
- ghc-warp-tls
- ghc-blaze-builder
- ghc-conduit
- ghc-utf8-string
- ghc-case-insensitive
- ghc-lifted-base
- ghc-network
- ghc-wai
- ghc-warp
- ghc-wai-conduit
- ghc-http-types
- ghc-cookie
- ghc-conduit-extra
- ghc-streaming-commons
- ghc-aeson
- ghc-temporary
- ghc-resourcet))
- (home-page "https://hackage.haskell.org/package/http-conduit")
+ (inputs (list ghc-attoparsec
+ ghc-resourcet
+ ghc-conduit
+ ghc-conduit-extra
+ ghc-http-types
+ ghc-http-client
+ ghc-http-client-tls
+ ghc-unliftio-core
+ ghc-aeson))
+ (native-inputs (list ghc-hunit
+ ghc-hspec
+ ghc-data-default-class
+ ghc-warp-tls
+ ghc-tls
+ ghc-blaze-builder
+ ghc-utf8-string
+ ghc-case-insensitive
+ ghc-unliftio
+ ghc-wai
+ ghc-warp
+ ghc-wai-conduit
+ ghc-cookie
+ ghc-streaming-commons
+ ghc-temporary
+ ghc-network))
+ (arguments
+ `(#:cabal-revision ("1"
+ "1wvr0v948s5fmlf47r4pqjan355x6v65rm7dz7y65ngj10xwk5f9")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'update-constraints
+ (lambda _
+ (substitute* "http-conduit.cabal"
+ ((", network") ", network\n , connection\n")))))))
+ (home-page "https://github.com/snoyberg/http-client")
(synopsis "HTTP/HTTPS client with conduit interface")
- (description "This library uses attoparsec for parsing the actual
+ (description
+ "This library uses attoparsec for parsing the actual
contents of the HTTP connection. It also provides higher-level functions
which allow you to avoid direct usage of conduits.")
(license license:bsd-3)))
@@ -781,18 +800,21 @@ See also:
(define-public ghc-xss-sanitize
(package
(name "ghc-xss-sanitize")
- (version "0.3.7.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "xss-sanitize" version))
- (sha256
- (base32
- "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h"))))
+ (version "0.3.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "xss-sanitize" version))
+ (sha256
+ (base32 "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"))))
(build-system haskell-build-system)
(properties '((upstream-name . "xss-sanitize")))
(inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup
ghc-utf8-string))
(native-inputs (list ghc-hunit ghc-hspec))
+ (arguments
+ `(#:cabal-revision ("1"
+ "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0")))
(home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme")
(synopsis "Sanitize untrusted HTML to prevent XSS attacks")
(description
@@ -822,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")
@@ -840,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")
@@ -930,7 +1043,8 @@ entity decoding bugfixes applied.")
(uri (hackage-uri "aeson" version))
(sha256
(base32
- "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"))))
+ "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"))
+ (patches (search-patches "ghc-aeson-encodeDouble.patch"))))
(build-system haskell-build-system)
(properties '((upstream-name . "aeson")))
(inputs (list ghc-base-compat-batteries
@@ -1196,13 +1310,13 @@ avoid any issues with characters.")
(define-public ghc-yesod-core
(package
(name "ghc-yesod-core")
- (version "1.6.24.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "yesod-core" version))
- (sha256
- (base32
- "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"))))
+ (version "1.6.24.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "yesod-core" version))
+ (sha256
+ (base32 "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j"))))
(build-system haskell-build-system)
(properties '((upstream-name . "yesod-core")))
(inputs (list ghc-aeson
@@ -1241,9 +1355,6 @@ avoid any issues with characters.")
ghc-hspec-expectations
ghc-network
ghc-streaming-commons))
- (arguments
- `(#:cabal-revision ("1"
- "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl")))
(home-page "http://www.yesodweb.com/")
(synopsis "Core package for the Yesod web framework")
(description
@@ -1282,13 +1393,13 @@ from Yesod.")
(define-public ghc-yesod-form
(package
(name "ghc-yesod-form")
- (version "1.7.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "yesod-form" version))
- (sha256
- (base32
- "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww"))))
+ (version "1.7.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "yesod-form" version))
+ (sha256
+ (base32 "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98"))))
(build-system haskell-build-system)
(properties '((upstream-name . "yesod-form")))
(inputs (list ghc-aeson
@@ -2156,13 +2267,13 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.")
(define-public ghc-network-run
(package
(name "ghc-network-run")
- (version "0.2.4")
+ (version "0.2.5")
(source
- (origin
- (method url-fetch)
- (uri (hackage-uri "network-run" version))
- (sha256
- (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"))))
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "network-run" version))
+ (sha256
+ (base32 "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi"))))
(build-system haskell-build-system)
(properties '((upstream-name . "network-run")))
(inputs (list ghc-network))
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index b5943f2f47..62b7268255 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -150,22 +150,19 @@ module for more details.")
(define-public ghc-active
(package
(name "ghc-active")
- (version "0.2.0.16")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "active" version))
- (sha256
- (base32
- "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i"))))
+ (version "0.2.0.18")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "active" version))
+ (sha256
+ (base32 "1fn3cyf43x18p2phs8bhacbp8zl8aifrh7ndzs0qi6n6g9sw95qn"))))
(build-system haskell-build-system)
(properties '((upstream-name . "active")))
(inputs (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens
ghc-linear))
(native-inputs (list ghc-quickcheck))
- (arguments
- `(#:cabal-revision ("1"
- "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8")))
- (home-page "http://hackage.haskell.org/package/active")
+ (home-page "https://hackage.haskell.org/package/active")
(synopsis "Abstractions for animation")
(description
"This package defines an @code{Active} abstraction for
@@ -198,7 +195,7 @@ diagrams framework}.")
ghc-transformers-compat
ghc-void))
(native-inputs (list ghc-generic-deriving ghc-hspec hspec-discover))
- (home-page "http://github.com/ekmett/adjunctions/")
+ (home-page "https://github.com/ekmett/adjunctions/")
(synopsis "Adjunctions and representable functors")
(description "This library provides adjunctions and representable functors
for Haskell.")
@@ -299,13 +296,13 @@ systems.")
(define-public ghc-alex
(package
(name "ghc-alex")
- (version "3.2.7.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "alex" version))
- (sha256
- (base32
- "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv"))))
+ (version "3.2.7.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "alex" version))
+ (sha256
+ (base32 "0vr2jmh7qba9c5lrd969p0qqdc9mi22cw5axsyikm200x80zl4wa"))))
(build-system haskell-build-system)
(properties '((upstream-name . "alex")))
(home-page "http://www.haskell.org/alex/")
@@ -453,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")
@@ -699,7 +716,7 @@ Web Services.")
(native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2))
- (home-page "http://github.com/haskell/base16-bytestring")
+ (home-page "https://github.com/haskell/base16-bytestring")
(synopsis "Fast base16 (hex) encoding and decoding for ByteStrings")
(description
"This package provides a Haskell library for working with base16-encoded
@@ -739,7 +756,7 @@ Haskell @code{ByteString}s.")
"1gah466nd6hkj716gwljfh0g270iaqy2rq2a1vw3di2s7a4dqam6"))))
(build-system haskell-build-system)
(properties '((upstream-name . "base-compat")))
- (home-page "http://hackage.haskell.org/package/base-compat")
+ (home-page "https://hackage.haskell.org/package/base-compat")
(synopsis "Haskell compiler compatibility library")
(description
"This library provides functions available in later versions
@@ -761,7 +778,7 @@ pragmas in your code.")
(properties '((upstream-name . "base-compat-batteries")))
(inputs (list ghc-base-compat))
(native-inputs (list ghc-hspec ghc-quickcheck hspec-discover))
- (home-page "http://hackage.haskell.org/package/base-compat-batteries")
+ (home-page "https://hackage.haskell.org/package/base-compat-batteries")
(synopsis "base-compat with extra batteries")
(description
"This library provides functions available in later
@@ -775,15 +792,26 @@ than @code{base-compat}, which has no dependencies.")
(define-public ghc-basement
(package
(name "ghc-basement")
- (version "0.0.15")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "basement" version))
- (sha256
- (base32
- "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn"))
- (patches (search-patches "ghc-basement-fix-32bit.patch"))))
+ (version "0.0.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "basement" version))
+ (sha256
+ (base32 "00332i4n98gh06x8ii4p8mhjpq0ch1bdan9hxmdblxpgk8j7xdvz"))))
(build-system haskell-build-system)
+ (arguments
+ (if (target-64bit?)
+ '()
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-for-32-bit-system
+ (lambda _
+ (define patch
+ #$(local-file
+ (search-patch "ghc-basement-fix-32-bit.patch")))
+
+ (invoke "patch" "-p1" "--force" "-i" patch)))))))
(properties '((upstream-name . "basement")))
(home-page "https://github.com/haskell-foundation/foundation#readme")
(synopsis "Basic primitives for Foundation starter pack")
@@ -795,13 +823,13 @@ packages.")
(define-public ghc-base-orphans
(package
(name "ghc-base-orphans")
- (version "0.8.7")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "base-orphans" version))
- (sha256
- (base32
- "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8"))))
+ (version "0.8.8.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "base-orphans" version))
+ (sha256
+ (base32 "14jhh848q3451hqi4knslc7nnvw9dn77vawnhp4qs4l4703fgjk1"))))
(build-system haskell-build-system)
(properties '((upstream-name . "base-orphans")))
(native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
@@ -940,22 +968,43 @@ storing and transmitting loosely structured data.")
(define-public ghc-bifunctors
(package
(name "ghc-bifunctors")
- (version "5.5.14")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "bifunctors" version))
- (sha256
- (base32
- "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak"))))
+ (version "5.5.15")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "bifunctors" version))
+ (sha256
+ (base32 "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"))))
(build-system haskell-build-system)
(properties '((upstream-name . "bifunctors")))
(inputs (list ghc-base-orphans ghc-comonad ghc-th-abstraction ghc-tagged))
(native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-compat hspec-discover))
- (home-page "http://github.com/ekmett/bifunctors/")
+ (home-page "https://github.com/ekmett/bifunctors/")
(synopsis "Bifunctors for Haskell")
(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")
@@ -1238,13 +1287,13 @@ Compatibility package for older packages.")
(define-public ghc-bytestring-lexing
(package
(name "ghc-bytestring-lexing")
- (version "0.5.0.9")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "bytestring-lexing" version))
- (sha256
- (base32
- "14nx7sfs75g57mlfiwgzm5sc3wm4va58zryjp27m5lmfdp30873c"))))
+ (version "0.5.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "bytestring-lexing" version))
+ (sha256
+ (base32 "0mvqiss323vwvgqx2pv8cww1mkx29hpi094ff54hx545mmvhwb16"))))
(build-system haskell-build-system)
(properties '((upstream-name . "bytestring-lexing")))
(native-inputs (list ghc-tasty ghc-tasty-smallcheck ghc-tasty-quickcheck))
@@ -1340,19 +1389,20 @@ imported with the correct Haskell types.")
(define-public ghc-cairo
(package
(name "ghc-cairo")
- (version "0.13.8.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "cairo" version))
- (sha256
- (base32
- "1sq2imy359vnbny610n7655a4z5a8fgdxanys4f5nw84246hc2yl"))))
+ (version "0.13.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "cairo" version))
+ (sha256
+ (base32 "16dwjqg8gqk2dzp3qpcvhwdgn16rxxasll8qs2fl2gf84z41h0mf"))))
(build-system haskell-build-system)
(properties '((upstream-name . "cairo")))
(inputs (list ghc-utf8-string cairo))
(native-inputs (list ghc-gtk2hs-buildtools pkg-config))
(arguments
- `(#:extra-directories ("cairo")))
+ `(#:cabal-revision ("2"
+ "1irj5yrz74j6wypni9pk9mbd7v2mzcy3ndyl7irada8szgdl3kkv")))
(home-page "https://projects.haskell.org/gtk2hs/")
(synopsis "Haskell bindings to the Cairo vector graphics library")
(description
@@ -1519,13 +1569,13 @@ provides for better error messages at the expense of some speed.")
(define-public ghc-cborg
(package
(name "ghc-cborg")
- (version "0.2.8.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "cborg" version))
- (sha256
- (base32
- "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f"))))
+ (version "0.2.9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "cborg" version))
+ (sha256
+ (base32 "1apwdb0y08l3mbxb6pb006355nnn1lag035dvm006v7h4cbqvd6w"))))
(build-system haskell-build-system)
(properties '((upstream-name . "cborg")))
(inputs (list ghc-half ghc-primitive))
@@ -1542,7 +1592,7 @@ provides for better error messages at the expense of some speed.")
ghc-vector))
(arguments
`(#:cabal-revision ("1"
- "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6")))
+ "0fissmr1a82ij6l4wmmr1bzn08myikwyak27mmn6kqgpihgl8fws")))
(home-page "https://hackage.haskell.org/package/cborg")
(synopsis "Concise Binary Object Representation")
(description
@@ -1681,7 +1731,7 @@ parser isolation, and labeled blocks for better error messages.")
(build-system haskell-build-system)
(properties '((upstream-name . "charset")))
(inputs (list ghc-unordered-containers ghc-semigroups))
- (home-page "http://github.com/ekmett/charset")
+ (home-page "https://github.com/ekmett/charset")
(synopsis "Fast unicode character sets for Haskell")
(description "This package provides fast unicode character sets for
Haskell, based on complemented PATRICIA tries.")
@@ -1756,7 +1806,7 @@ backend for the Charts library.")
(build-system haskell-build-system)
(properties '((upstream-name . "ChasingBottoms")))
(inputs (list ghc-quickcheck ghc-random ghc-syb))
- (home-page "http://hackage.haskell.org/package/ChasingBottoms")
+ (home-page "https://hackage.haskell.org/package/ChasingBottoms")
(synopsis "Testing of partial and infinite values in Haskell")
(description
"This is a library for testing code involving bottoms or infinite values.
@@ -1792,6 +1842,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")
@@ -1911,7 +1986,8 @@ classy-prelude.")
(uri (hackage-uri "clock" version))
(sha256
(base32
- "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44"))))
+ "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44"))
+ (patches (search-patches "ghc-clock-realfrag.patch"))))
(build-system haskell-build-system)
(properties '((upstream-name . "clock")))
(native-inputs (list ghc-tasty ghc-tasty-quickcheck))
@@ -1982,19 +2058,17 @@ of the C library.")
(define-public ghc-cmdargs
(package
(name "ghc-cmdargs")
- (version "0.10.21")
+ (version "0.10.22")
(source
(origin
(method url-fetch)
(uri (hackage-uri "cmdargs" version))
(sha256
- (base32
- "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"))))
+ (base32 "1vwvdszal6clkvsqd1amcap8wy3cp19x8qmhgc1i7kwmhxzjxcdq"))))
(build-system haskell-build-system)
(properties '((upstream-name . "cmdargs")))
- (outputs '("out" "doc"))
- (home-page
- "http://community.haskell.org/~ndm/cmdargs/")
+ (inputs (list ghc-semigroups))
+ (home-page "https://github.com/ndmitchell/cmdargs#readme")
(synopsis "Command line argument processing")
(description
"This library provides an easy way to define command line parsers.")
@@ -2158,17 +2232,17 @@ Python.")
(define-public ghc-concurrent-output
(package
(name "ghc-concurrent-output")
- (version "1.10.16")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "concurrent-output" version))
- (sha256
- (base32
- "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"))))
+ (version "1.10.18")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "concurrent-output" version))
+ (sha256
+ (base32 "1nxc7wl37hsyz8axzy99gy40qsa6065z6m9a9pfjkgfq4s4k7a5p"))))
(build-system haskell-build-system)
(properties '((upstream-name . "concurrent-output")))
(inputs (list ghc-async ghc-ansi-terminal ghc-terminal-size))
- (home-page "http://hackage.haskell.org/package/concurrent-output")
+ (home-page "https://hackage.haskell.org/package/concurrent-output")
(synopsis "Ungarble output from several threads or commands")
(description
"Lets multiple threads and external processes concurrently output to the
@@ -2182,30 +2256,23 @@ concurrent threads. Can be used for progress displays etc.")
(define-public ghc-conduit
(package
(name "ghc-conduit")
- (version "1.3.1.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "conduit" version))
- (sha256
- (base32
- "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4"))))
+ (version "1.3.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "conduit" version))
+ (sha256
+ (base32 "0bbq3hr0y4hyia8dbqibfpg5q5zr2ici5hngv38y6hycxvhd7c1b"))))
(build-system haskell-build-system)
(properties '((upstream-name . "conduit")))
- (outputs '("out" "doc"))
- (inputs
- (list ghc-exceptions
- ghc-lifted-base
- ghc-mono-traversable
- ghc-mmorph
- ghc-resourcet
- ghc-silently
- ghc-transformers-base
- ghc-unliftio
- ghc-unliftio-core
- ghc-vector
- ghc-void))
- (native-inputs
- (list ghc-quickcheck ghc-hspec ghc-safe ghc-split))
+ (inputs (list ghc-resourcet ghc-primitive ghc-unliftio-core
+ ghc-mono-traversable ghc-vector))
+ (native-inputs (list ghc-hspec
+ ghc-quickcheck
+ ghc-safe
+ ghc-split
+ ghc-silently
+ ghc-unliftio))
(home-page "https://github.com/snoyberg/conduit")
(synopsis "Streaming data library")
(description
@@ -2313,7 +2380,7 @@ as well as a convenient Conduit module.")
ghc-typed-process
hspec-discover))
(native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-base))
- (home-page "http://github.com/snoyberg/conduit")
+ (home-page "https://github.com/snoyberg/conduit")
(synopsis "Conduit adapters for common libraries")
(description
"The @code{conduit} package itself maintains relative small dependencies.
@@ -2511,7 +2578,7 @@ the choice of SSL/TLS, and SOCKS.")
(inputs (list ghc-hashable ghc-transformers-compat ghc-type-equality
ghc-semigroups-bootstrap))
(native-inputs (list ghc-hspec hspec-discover))
- (home-page "http://github.com/ekmett/constraints/")
+ (home-page "https://github.com/ekmett/constraints/")
(synopsis "Constraint manipulation")
(description
"GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}.
@@ -2522,19 +2589,19 @@ a vocabulary for working with them.")
(define-public ghc-constraints-extras
(package
(name "ghc-constraints-extras")
- (version "0.4.0.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "constraints-extras" version))
- (sha256
- (base32
- "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"))))
+ (version "0.3.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "constraints-extras" version))
+ (sha256
+ (base32 "0w2wwqsgxqkn8byivrgcsi6fh1kxbivqarmdnpxyh1a1cg373xfp"))))
(build-system haskell-build-system)
(properties '((upstream-name . "constraints-extras")))
(inputs (list ghc-constraints ghc-aeson))
(arguments
`(#:cabal-revision ("1"
- "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf")))
+ "1smha6ljia9bfgdy1h0lkgi9464rwa9lnw7rqfi1c23pzyiw13lh")))
(home-page "https://github.com/obsidiansystems/constraints-extras")
(synopsis "Utility package for constraints")
(description
@@ -2623,7 +2690,7 @@ Free Monads, MPC'08}
(properties '((upstream-name . "convertible")))
(inputs (list ghc-old-time))
(native-inputs (list ghc-quickcheck))
- (home-page "http://hackage.haskell.org/package/convertible")
+ (home-page "https://hackage.haskell.org/package/convertible")
(synopsis "Typeclasses and instances for converting between types")
(description
"This package provides a typeclass with a single function that is
@@ -2666,16 +2733,19 @@ lingua franca for spreadsheets, and for certain web services.")
(define-public ghc-data-accessor
(package
(name "ghc-data-accessor")
- (version "0.2.3")
+ (version "0.2.3.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "data-accessor" version))
(sha256
- (base32 "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"))))
+ (base32 "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6"))))
(build-system haskell-build-system)
(properties '((upstream-name . "data-accessor")))
- (home-page "https://wiki.haskell.org/Record_access")
+ (arguments
+ `(#:cabal-revision ("1"
+ "1v16s3d1kwlx9vzf6agacr2rfamnhyl7fgd81arznka51v3my2fs")))
+ (home-page "https://www.haskell.org/haskellwiki/Record_access")
(synopsis
"Haskell utilities for accessing and manipulating fields of records")
(description "This package provides Haskell modules for accessing and
@@ -2685,17 +2755,17 @@ manipulating fields of records.")
(define-public ghc-data-accessor-transformers
(package
(name "ghc-data-accessor-transformers")
- (version "0.2.1.7")
+ (version "0.2.1.8")
(source
(origin
(method url-fetch)
(uri (hackage-uri "data-accessor-transformers" version))
(sha256
- (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"))))
+ (base32 "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83"))))
(build-system haskell-build-system)
(properties '((upstream-name . "data-accessor-transformers")))
(inputs (list ghc-data-accessor))
- (home-page "https://wiki.haskell.org/Record_access")
+ (home-page "https://www.haskell.org/haskellwiki/Record_access")
(synopsis "Use Accessor to access state in transformers State monad")
(description "This package provides Haskell modules to allow use of
Accessor to access state in transformers State monad.")
@@ -2917,13 +2987,13 @@ It includes hashing functions for all basic Haskell98 types.")
(define-public ghc-dbus
(package
(name "ghc-dbus")
- (version "1.2.27")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "dbus" version))
- (sha256
- (base32
- "0lkk9hd78h2ilvi0bj5jqq5q5lwyxzdlknwvckhwyxnlf3y6dz8z"))))
+ (version "1.2.29")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "dbus" version))
+ (sha256
+ (base32 "0c2c2lfckhzgf9n5hf2w39ryyb2q0wxsymrxr54y4j95353wdsn2"))))
(build-system haskell-build-system)
(properties '((upstream-name . "dbus")))
(inputs (list ghc-cereal
@@ -3038,13 +3108,13 @@ related modules split from the statistics library.")
(define-public ghc-diagrams-core
(package
(name "ghc-diagrams-core")
- (version "1.5.0.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "diagrams-core" version))
- (sha256
- (base32
- "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn"))))
+ (version "1.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "diagrams-core" version))
+ (sha256
+ (base32 "08bmb2r4gf7arc0wasxla6w1qpgrgrhcs24bb7sv2qgiyb6c22j6"))))
(build-system haskell-build-system)
(properties '((upstream-name . "diagrams-core")))
(inputs (list ghc-unordered-containers
@@ -3056,9 +3126,6 @@ related modules split from the statistics library.")
ghc-adjunctions
ghc-distributive
ghc-profunctors))
- (arguments
- `(#:cabal-revision ("1"
- "1gahbyv00xyr4pcmpq4g95jyh7844fp8z0g9l2ybifv4s73vdrym")))
(home-page "https://diagrams.github.io")
(synopsis "Core libraries for diagrams embedded domain-specific language")
(description
@@ -3214,7 +3281,7 @@ members are shared.")
(properties '((upstream-name . "Diff")))
(native-inputs (list ghc-quickcheck ghc-test-framework
ghc-test-framework-quickcheck2))
- (home-page "http://hackage.haskell.org/package/Diff")
+ (home-page "https://hackage.haskell.org/package/Diff")
(synopsis "O(ND) diff algorithm in Haskell")
(description
"This package provides an implementation of the standard diff algorithm,
@@ -3407,7 +3474,7 @@ between double precision floating point and text.")
(properties '((upstream-name . "dual-tree")))
(inputs (list ghc-semigroups ghc-monoid-extras))
(native-inputs (list ghc-quickcheck ghc-testing-feat))
- (home-page "http://hackage.haskell.org/package/dual-tree")
+ (home-page "https://hackage.haskell.org/package/dual-tree")
(synopsis "Rose trees with cached and accumulating monoidal annotations")
(description
"Rose (@math{n}-ary) trees with both upwards- (i.e.
@@ -3420,18 +3487,17 @@ diagrams framework}, but potentially has other applications as well.")
(define-public ghc-easy-file
(package
(name "ghc-easy-file")
- (version "0.2.2")
+ (version "0.2.5")
(source
(origin
(method url-fetch)
(uri (hackage-uri "easy-file" version))
(sha256
- (base32
- "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj"))))
+ (base32 "1fzj9x9br57rcik3dvwxqb5mqy524g6xg2d670l6dcrv9f8s03zf"))))
(build-system haskell-build-system)
(properties '((upstream-name . "easy-file")))
- (home-page
- "https://github.com/kazu-yamamoto/easy-file")
+ (native-inputs (list ghc-tasty ghc-tasty-hunit))
+ (home-page "https://github.com/kazu-yamamoto/easy-file")
(synopsis "File handling library for Haskell")
(description "This library provides file handling utilities for Haskell.")
(license license:bsd-3)))
@@ -3557,7 +3623,7 @@ but is otherwise agnostic to:
(inputs (list ghc-bifunctors ghc-profunctors ghc-semigroupoids))
(native-inputs (list ghc-test-framework ghc-test-framework-quickcheck2
ghc-quickcheck))
- (home-page "http://github.com/ekmett/either/")
+ (home-page "https://github.com/ekmett/either/")
(synopsis "Provides an either monad transformer for Haskell")
(description "This Haskell package provides an either monad transformer.")
(license license:bsd-3)))
@@ -3707,13 +3773,13 @@ directly uses the type system, rather than out-of-band exceptions.")
(define-public ghc-esqueleto
(package
(name "ghc-esqueleto")
- (version "3.5.8.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "esqueleto" version))
- (sha256
- (base32
- "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v"))))
+ (version "3.5.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "esqueleto" version))
+ (sha256
+ (base32 "0nbb6l4q22y8rwcjsrwqri3ndjn4rslpnglj3nkh00rixdm9jhsr"))))
(build-system haskell-build-system)
(properties '((upstream-name . "esqueleto")))
(inputs (list ghc-aeson
@@ -3725,9 +3791,7 @@ directly uses the type system, rather than out-of-band exceptions.")
ghc-resourcet
ghc-tagged
ghc-unliftio
- ghc-unordered-containers
- openssl
- zlib))
+ ghc-unordered-containers))
(native-inputs (list ghc-hspec
ghc-hspec-core
ghc-mysql
@@ -3770,7 +3834,7 @@ generated SQL and optimize it for your backend.")
(arguments
`(#:cabal-revision ("1"
"1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c")))
- (home-page "http://hackage.haskell.org/package/ghc-exactprint")
+ (home-page "https://hackage.haskell.org/package/ghc-exactprint")
(synopsis "ExactPrint for GHC")
(description
"Using the API Annotations available from GHC 7.10.2, this library
@@ -3848,13 +3912,13 @@ versions of GHC (i.e., < 6.10).")
(define-public ghc-extra
(package
(name "ghc-extra")
- (version "1.7.12")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "extra" version))
- (sha256
- (base32
- "0g5h8fp0nq4k9asiknw0bhvb10zpfnsixfp0n3xz0rc83pnajwg5"))))
+ (version "1.7.13")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "extra" version))
+ (sha256
+ (base32 "0rvvbix6dh6nwg0c2vdfvnkmkgzjrrwpnbz0magn9r3c66qcbsmx"))))
(build-system haskell-build-system)
(properties '((upstream-name . "extra")))
(inputs (list ghc-clock))
@@ -3896,18 +3960,18 @@ when used with GHC versions which already provide the
(define-public ghc-fast-logger
(package
(name "ghc-fast-logger")
- (version "3.1.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "fast-logger" version))
- (sha256
- (base32
- "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"))))
+ (version "3.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "fast-logger" version))
+ (sha256
+ (base32 "1l0h4ddb17xm6qkjhn5gqyfz18szyqcq9wqq92fc24sp2zbd7rv5"))))
(build-system haskell-build-system)
(properties '((upstream-name . "fast-logger")))
(inputs (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat
- ghc-bytestring-builder hspec-discover))
- (native-inputs (list ghc-hspec))
+ ghc-bytestring-builder))
+ (native-inputs (list ghc-hspec hspec-discover))
(home-page "https://github.com/kazu-yamamoto/logger")
(synopsis "Fast logging system")
(description "This library provides a fast logging system for Haskell.")
@@ -4098,7 +4162,7 @@ file contents, and more.")
(lambda _
(substitute* "filepath-bytestring.cabal"
(("filepath >= 1\\.4\\.2 && <= 1\\.4\\.2\\.1") "filepath")))))))
- (home-page "http://hackage.haskell.org/package/filepath-bytestring")
+ (home-page "https://hackage.haskell.org/package/filepath-bytestring")
(synopsis "Library for manipulating RawFilePaths in a cross-platform way")
(description
"This package provides a drop-in replacement for the standard
@@ -4143,7 +4207,7 @@ an executable.")
(native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2))
- (home-page "http://hackage.haskell.org/package/fingertree")
+ (home-page "https://hackage.haskell.org/package/fingertree")
(synopsis "Generic finger-tree structure")
(description
"This library provides finger trees, a general sequence
@@ -4219,13 +4283,13 @@ completely unverified though.")
(define-public ghc-foldl
(package
(name "ghc-foldl")
- (version "1.4.13")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "foldl" version))
- (sha256
- (base32
- "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"))))
+ (version "1.4.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "foldl" version))
+ (sha256
+ (base32 "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"))))
(build-system haskell-build-system)
(properties '((upstream-name . "foldl")))
(inputs (list ghc-random
@@ -4239,7 +4303,10 @@ completely unverified though.")
ghc-comonad
ghc-semigroups))
(native-inputs (list ghc-doctest))
- (home-page "http://hackage.haskell.org/package/foldl")
+ (arguments
+ `(#:cabal-revision ("2"
+ "1a7g9j8ds4zrpdx9qrqzbz3clhz1caky9znb8yzfsc7xcnbbgqpn")))
+ (home-page "https://hackage.haskell.org/package/foldl")
(synopsis "Composable, streaming, and efficient left folds for Haskell")
(description
"This Haskell library provides strict left folds that stream
@@ -4251,13 +4318,13 @@ and are often as efficient as hand-written folds.")
(define-public ghc-foundation
(package
(name "ghc-foundation")
- (version "0.0.29")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "foundation" version))
- (sha256
- (base32
- "1hbkh6a3g6wsj2z48pjimd7djkm82mdxfwc24bnmmzag8amrp0rl"))))
+ (version "0.0.30")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "foundation" version))
+ (sha256
+ (base32 "11hdqd01ggdr7fjw3w00giay06bzz97qqiiq60vi1l1dzz1wrwzn"))))
(build-system haskell-build-system)
(properties '((upstream-name . "foundation")))
(inputs (list ghc-basement))
@@ -4301,7 +4368,7 @@ Foundation has the following goals:
ghc-th-abstraction
ghc-transformers-base
ghc-profunctors))
- (home-page "http://github.com/ekmett/free/")
+ (home-page "https://github.com/ekmett/free/")
(synopsis "Unrestricted monads for Haskell")
(description
"This library provides free monads, which are useful for many
@@ -4344,13 +4411,13 @@ specific Windows, Mac, and Linux file system event notification.")
(define-public ghc-generic-deriving
(package
(name "ghc-generic-deriving")
- (version "1.14.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "generic-deriving" version))
- (sha256
- (base32
- "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6"))))
+ (version "1.14.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "generic-deriving" version))
+ (sha256
+ (base32 "0p0rv3z6icjw7f05arq6aqs6bx249544l0h2hvzwxm0yr6r8farp"))))
(build-system haskell-build-system)
(properties '((upstream-name . "generic-deriving")))
(inputs (list ghc-th-abstraction))
@@ -4400,20 +4467,17 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).")
(define-public ghc-generics-sop
(package
(name "ghc-generics-sop")
- (version "0.5.1.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "generics-sop" version))
- (sha256
- (base32
- "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3"))))
+ (version "0.5.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "generics-sop" version))
+ (sha256
+ (base32 "01xgd5b4na6xz2bw117hw37k3iqfk3mabi4aadkzs527rawwg77c"))))
(build-system haskell-build-system)
(properties '((upstream-name . "generics-sop")))
(inputs (list ghc-sop-core ghc-th-abstraction))
- (arguments
- `(#:cabal-revision ("1"
- "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8")))
- (home-page "http://hackage.haskell.org/package/generics-sop")
+ (home-page "https://hackage.haskell.org/package/generics-sop")
(synopsis "Generic Programming using True Sums of Products for Haskell")
(description
"This Haskell package supports the definition of generic
@@ -4467,21 +4531,18 @@ properties for functions operating on them.")
(define-public ghc-getopt-generics
(package
(name "ghc-getopt-generics")
- (version "0.13.0.4")
+ (version "0.13.1.0")
(source
(origin
(method url-fetch)
(uri (hackage-uri "getopt-generics" version))
(sha256
- (base32
- "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr"))))
+ (base32 "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d"))))
(build-system haskell-build-system)
(properties '((upstream-name . "getopt-generics")))
- (inputs
- (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged))
- (native-inputs
- (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover))
- (home-page "https://github.com/soenkehahn/getopt-generics")
+ (inputs (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged))
+ (native-inputs (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover))
+ (home-page "https://github.com/soenkehahn/getopt-generics#readme")
(synopsis "Create command line interfaces with ease")
(description "This library provides tools to create command line
interfaces with ease.")
@@ -4666,17 +4727,20 @@ monoid with invertibility.")
(define-public ghc-gtk2hs-buildtools
(package
(name "ghc-gtk2hs-buildtools")
- (version "0.13.8.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "gtk2hs-buildtools" version))
- (sha256
- (base32
- "0fcm0v32hm9j908nyziia16ahb181y9hqppsy18clx2prvj480rv"))))
+ (version "0.13.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "gtk2hs-buildtools" version))
+ (sha256
+ (base32 "0ww53n596h39smwf1k0wfk5k0s56n8mkapa8b0q9v9d9bpllgfyw"))))
(build-system haskell-build-system)
(properties '((upstream-name . "gtk2hs-buildtools")))
(inputs (list ghc-random ghc-hashtables))
(native-inputs (list ghc-alex ghc-happy))
+ (arguments
+ `(#:cabal-revision ("1"
+ "16ckrhii6pbd64mgrm4s4x7vzd800w8g6x18rvij2cfm784yz6by")))
(home-page "https://projects.haskell.org/gtk2hs/")
(synopsis "Tools to build the Gtk2Hs suite of user interface libraries")
(description
@@ -4722,7 +4786,7 @@ tools are not needed to actually run Gtk2Hs programs.")
(synopsis "Hackage security library")
(description
"This Hackage security library provides both server and
-client utilities for securing @uref{http://hackage.haskell.org/, the
+client utilities for securing @uref{https://hackage.haskell.org/, the
Hackage package server}. It is based on
@uref{http://theupdateframework.com/, The Update Framework}, a set of
recommendations developed by security researchers at various universities
@@ -4892,52 +4956,46 @@ computation library for Haskell.")
(define-public ghc-happy
(package
(name "ghc-happy")
- (version "1.20.0")
+ (version "1.20.1.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "happy" version))
(sha256
- (base32
- "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"))))
+ (base32 "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb"))))
(build-system haskell-build-system)
(properties '((upstream-name . "happy")))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-test-issue93
- (lambda _
- ;; Tests run out of memory on a system with 2GB of available RAM,
- ;; in 'issue93.a.hs' and 'issue93.n.hs'.
- (substitute* "tests/Makefile"
- ((" issue93.y ") " "))
- #t)))))
- (home-page "https://hackage.haskell.org/package/happy")
+ (home-page "https://www.haskell.org/happy/")
(synopsis "Parser generator for Haskell")
- (description "Happy is a parser generator for Haskell. Given a grammar
+ (description
+ "Happy is a parser generator for Haskell. Given a grammar
specification in BNF, Happy generates Haskell code to parse the grammar.
Happy works in a similar way to the yacc tool for C.")
- (license license:bsd-3)))
+ (license license:bsd-2)))
(define-public ghc-hashable
(package
(name "ghc-hashable")
- (version "1.4.1.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "hashable" version))
- (sha256
- (base32
- "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1"))))
+ (version "1.4.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "hashable" version))
+ (sha256
+ (base32 "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v"))))
(build-system haskell-build-system)
(properties '((upstream-name . "hashable")))
+ (inputs (list ghc-data-array-byte))
(native-inputs (list ghc-hunit
ghc-quickcheck
ghc-random
ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2))
- (home-page "http://github.com/haskell-unordered-containers/hashable")
+ (arguments
+ `(#:cabal-revision ("1"
+ "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq")))
+ (home-page "https://github.com/haskell-unordered-containers/hashable")
(synopsis "Class for types that can be converted to a hash value")
(description
"This package defines a class, @code{Hashable}, for types that can be
@@ -4975,7 +5033,7 @@ combine hash values.")
ghc-test-framework
ghc-test-framework-quickcheck2
ghc-test-framework-hunit))
- (home-page "http://github.com/gregorycollins/hashtables")
+ (home-page "https://github.com/gregorycollins/hashtables")
(synopsis "Haskell Mutable hash tables in the ST monad")
(description
"This package provides a Haskell library including a
@@ -4987,22 +5045,22 @@ a set of wrappers to use the hash tables in the IO monad.")
(define-public ghc-haskeline
(package
(name "ghc-haskeline")
- (version "0.8.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "haskeline" version))
- (sha256
- (base32
- "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"))))
+ (version "0.8.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "haskeline" version))
+ (sha256
+ (base32 "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"))))
(build-system haskell-build-system)
(properties '((upstream-name . "haskeline")))
(native-inputs (list ghc-hunit which))
(arguments
(list
+ #:cabal-revision '("1"
+ "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny")
#:tests? #f ; Cannot run binary haskeline-examples-Test, which is just
; built, even with PATH and LD_LIBRARY_PATH set.
- #:cabal-revision
- '("3" "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-which
@@ -5054,7 +5112,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.")
(arguments
`(#:cabal-revision ("1"
"0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb")))
- (home-page "http://hackage.haskell.org/package/haskell-src")
+ (home-page "https://hackage.haskell.org/package/haskell-src")
(synopsis "Support for manipulating Haskell source code")
(description
"The @code{haskell-src} package provides support for manipulating Haskell
@@ -5116,18 +5174,18 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.")
(define-public ghc-haskell-src-meta
(package
(name "ghc-haskell-src-meta")
- (version "0.8.11")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "haskell-src-meta" version))
- (sha256
- (base32
- "1wks0xb7ah2gj9n0ffbcaskjihy45l99qkf2h9k13cyfvqkzp9rw"))))
+ (version "0.8.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "haskell-src-meta" version))
+ (sha256
+ (base32 "12dsv49rzhayp8cvkqkilammq4a6d4nrb2bd2w98ivzzrbkijy02"))))
(build-system haskell-build-system)
(properties '((upstream-name . "haskell-src-meta")))
(inputs (list ghc-haskell-src-exts ghc-syb ghc-th-orphans))
(native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit))
- (home-page "http://hackage.haskell.org/package/haskell-src-meta")
+ (home-page "https://hackage.haskell.org/package/haskell-src-meta")
(synopsis "Parse source to template-haskell abstract syntax")
(description "This package provides tools to parse Haskell sources to the
template-haskell abstract syntax.")
@@ -5486,13 +5544,13 @@ representations of current time.")
(define-public ghc-hpack
(package
(name "ghc-hpack")
- (version "0.35.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "hpack" version))
- (sha256
- (base32
- "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g"))))
+ (version "0.35.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "hpack" version))
+ (sha256
+ (base32 "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3"))))
(build-system haskell-build-system)
(properties '((upstream-name . "hpack")))
(inputs (list ghc-glob
@@ -5514,6 +5572,9 @@ representations of current time.")
ghc-mockery
ghc-temporary
hspec-discover))
+ (arguments
+ `(#:cabal-revision ("2"
+ "0vwxfg5ixlr18q8gb1x8vz3grp339cbnhm51hfp7rk6vc0bd61k5")))
(home-page "https://github.com/sol/hpack#readme")
(synopsis "Tools for an alternative Haskell package format")
(description
@@ -5653,13 +5714,13 @@ described in @url{https://www.lua.org/}.")
(define-public ghc-hslua-module-system
(package
(name "ghc-hslua-module-system")
- (version "1.0.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "hslua-module-system" version))
- (sha256
- (base32
- "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn"))))
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "hslua-module-system" version))
+ (sha256
+ (base32 "08rajlihgsg843sgvlvh7qx43s5yiqqccvnxa336hw06ppfycyf9"))))
(build-system haskell-build-system)
(properties '((upstream-name . "hslua-module-system")))
(inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling
@@ -5678,13 +5739,13 @@ already been loaded before the loader can be added.")
(define-public ghc-hslua-module-text
(package
(name "ghc-hslua-module-text")
- (version "1.0.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "hslua-module-text" version))
- (sha256
- (base32
- "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq"))))
+ (version "1.0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "hslua-module-text" version))
+ (sha256
+ (base32 "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc"))))
(build-system haskell-build-system)
(properties '((upstream-name . "hslua-module-text")))
(inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling))
@@ -5770,7 +5831,7 @@ for user-defined custom schemas).
(arguments
`(#:cabal-revision ("6"
"0q4rhz81r5v0z1mn7x9q0ldbfv1a2cp3dpw8s2j96halsq34l4zl")))
- (home-page "http://github.com/fizruk/http-api-data")
+ (home-page "https://github.com/fizruk/http-api-data")
(synopsis "Convert to/from HTTP API data like URL pieces, headers and
query parameters")
(description "This Haskell package defines typeclasses used for converting
@@ -5890,13 +5951,13 @@ read and write configuration files in the simple INI format.")
(define-public ghc-inline-c
(package
(name "ghc-inline-c")
- (version "0.9.1.6")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "inline-c" version))
- (sha256
- (base32
- "06az494fp2nh6fnibq28yw8jsrpj4jq1swyx53a328qv04cbhrym"))))
+ (version "0.9.1.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "inline-c" version))
+ (sha256
+ (base32 "1qa1rspwyac0f68g7qll17a0wc2a4qrr9fkfarpymfhm7gxzf947"))))
(build-system haskell-build-system)
(properties '((upstream-name . "inline-c")))
(inputs (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers
@@ -5907,7 +5968,7 @@ read and write configuration files in the simple INI format.")
ghc-raw-strings-qq
ghc-regex-posix
ghc-split))
- (home-page "http://hackage.haskell.org/package/inline-c")
+ (home-page "https://hackage.haskell.org/package/inline-c")
(synopsis "Write Haskell source files including C code inline")
(description
"inline-c lets you seamlessly call C libraries and embed high-performance
@@ -5930,7 +5991,7 @@ minimal overhead. No FFI required.")
(properties '((upstream-name . "inline-c-cpp")))
(inputs (list ghc-inline-c ghc-safe-exceptions))
(native-inputs (list ghc-hspec ghc-vector))
- (home-page "http://hackage.haskell.org/package/inline-c-cpp")
+ (home-page "https://hackage.haskell.org/package/inline-c-cpp")
(synopsis "Lets you embed C++ code into Haskell")
(description
"This package provides utilities to inline C++ code into Haskell using
@@ -6006,18 +6067,17 @@ Haskell.")
(define-public ghc-intervalmap
(package
(name "ghc-intervalmap")
- (version "0.6.1.2")
+ (version "0.6.2.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "IntervalMap" version))
(sha256
- (base32
- "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld"))))
+ (base32 "17v9q1vnm3pzrr5xhv8xvxqh27facwwfladrr10l57fzibp82265"))))
(build-system haskell-build-system)
(properties '((upstream-name . "IntervalMap")))
- (native-inputs
- (list ghc-quickcheck))
+ (native-inputs (list ghc-quickcheck ghc-quickcheck ghc-quickcheck
+ ghc-quickcheck))
(home-page "https://www.chr-breitkopf.de/comp/IntervalMap")
(synopsis "Containers for intervals, with efficient search")
(description
@@ -6052,13 +6112,13 @@ which represets a closed, convex set of floating point values.")
(define-public ghc-invariant
(package
(name "ghc-invariant")
- (version "0.6")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "invariant" version))
- (sha256
- (base32
- "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm"))))
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "invariant" version))
+ (sha256
+ (base32 "1w6ln343d72hx8q4i7h1ca7gfqyb79ghc3q2fxp9qkjmwsnr8wpv"))))
(build-system haskell-build-system)
(properties '((upstream-name . "invariant")))
(inputs (list ghc-bifunctors
@@ -6071,9 +6131,6 @@ which represets a closed, convex set of floating point values.")
ghc-transformers-compat
ghc-unordered-containers))
(native-inputs (list ghc-hspec ghc-quickcheck hspec-discover))
- (arguments
- `(#:cabal-revision ("1"
- "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37")))
(home-page "https://github.com/nfrisby/invariant-functors")
(synopsis "Haskell98 invariant functors")
(description
@@ -6102,7 +6159,7 @@ functors). For more information, see Edward Kmett's article
ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2))
- (home-page "http://hackage.haskell.org/package/io-streams")
+ (home-page "https://hackage.haskell.org/package/io-streams")
(synopsis "Simple and composable stream I/O")
(description "This library contains simple and easy-to-use
primitives for I/O using streams.")
@@ -6179,7 +6236,7 @@ removed. Both IPv4 and IPv6 are supported.")
(arguments
`(#:cabal-revision ("1"
"0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k")))
- (home-page "http://hackage.haskell.org/package/ipynb")
+ (home-page "https://hackage.haskell.org/package/ipynb")
(synopsis "Data structure for working with Jupyter notebooks")
(description
"This library defines a data structure for representing
@@ -6304,7 +6361,7 @@ TIFF and GIF formats.")
ghc-semigroupoids
ghc-tagged
ghc-transformers-compat))
- (home-page "http://github.com/ekmett/kan-extensions/")
+ (home-page "https://github.com/ekmett/kan-extensions/")
(synopsis "Kan extensions library")
(description
"This library provides Kan extensions, Kan lifts, various
@@ -6314,17 +6371,18 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.")
(define-public ghc-language-c
(package
(name "ghc-language-c")
- (version "0.9.1")
+ (version "0.9.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "language-c" version))
(sha256
- (base32
- "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl"))))
+ (base32 "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"))))
(build-system haskell-build-system)
(properties '((upstream-name . "language-c")))
- (inputs (list ghc-syb))
+ (arguments
+ `(#:cabal-revision ("1"
+ "03qfp9mf4yrdw3m6sab3np7wjaigg5p3xiiirxin8ihsnnx4rv5l")))
(native-inputs
(list ghc-happy ghc-alex))
(home-page "https://visq.github.io/language-c/")
@@ -6442,7 +6500,7 @@ with @code{wc} (for a web service).")
(arguments
`(#:cabal-revision ("1"
"19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6")))
- (home-page "http://github.com/ekmett/lens/")
+ (home-page "https://github.com/ekmett/lens/")
(synopsis "Lenses, Folds and Traversals")
(description
"This library provides @code{Control.Lens}. The combinators
@@ -6601,17 +6659,17 @@ Music Player Daemon.")
(define-public ghc-lib-parser
(package
(name "ghc-lib-parser")
- (version "9.2.5.20221107")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "ghc-lib-parser" version))
- (sha256
- (base32
- "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"))))
+ (version "9.2.7.20230228")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "ghc-lib-parser" version))
+ (sha256
+ (base32 "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny"))))
(build-system haskell-build-system)
(properties '((upstream-name . "ghc-lib-parser")))
- (outputs '("out" "doc")) ; documentation is 39M
- (native-inputs (list ghc-alex ghc-happy))
+ (inputs (list ghc-alex))
+ (native-inputs (list ghc-happy))
(home-page "https://github.com/digital-asset/ghc-lib")
(synopsis "The GHC API, decoupled from GHC versions")
(description
@@ -6679,13 +6737,13 @@ LibYAML C library.")
(define-public ghc-lifted-async
(package
(name "ghc-lifted-async")
- (version "0.10.2.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "lifted-async" version))
- (sha256
- (base32
- "1kq96cp9czf358gykai2vcmynnd7zivqja4pb3f8bif9ypln9vai"))))
+ (version "0.10.2.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "lifted-async" version))
+ (sha256
+ (base32 "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv"))))
(build-system haskell-build-system)
(properties '((upstream-name . "lifted-async")))
(inputs (list ghc-async ghc-lifted-base ghc-transformers-base
@@ -6697,6 +6755,9 @@ LibYAML C library.")
ghc-tasty-th
ghc-tasty-hunit
ghc-tasty-th))
+ (arguments
+ `(#:cabal-revision ("2"
+ "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky")))
(home-page "https://github.com/maoe/lifted-async")
(synopsis
"Run lifted IO operations asynchronously and wait for their results")
@@ -6762,7 +6823,7 @@ Kaseorg.")
ghc-void))
(native-inputs (list ghc-simple-reflect ghc-test-framework
ghc-test-framework-hunit ghc-hunit))
- (home-page "http://github.com/ekmett/linear/")
+ (home-page "https://github.com/ekmett/linear/")
(synopsis "Linear algebra library for Haskell")
(description
"This package provides types and combinators for linear algebra on free
@@ -6783,7 +6844,7 @@ vector spaces.")
(properties '((upstream-name . "ListLike")))
(inputs (list ghc-vector ghc-dlist ghc-fmlist ghc-utf8-string))
(native-inputs (list ghc-hunit ghc-quickcheck ghc-random))
- (home-page "http://github.com/ddssff/listlike")
+ (home-page "https://github.com/ddssff/listlike")
(synopsis "Generic support for list-like structures")
(description
"The ListLike module provides a common interface to the
@@ -6853,20 +6914,20 @@ online}.")
(define-public ghc-lucid
(package
(name "ghc-lucid")
- (version "2.11.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "lucid" version))
- (sha256
- (base32
- "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw"))))
+ (version "2.11.20230408")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "lucid" version))
+ (sha256
+ (base32 "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"))))
(build-system haskell-build-system)
(properties '((upstream-name . "lucid")))
(inputs (list ghc-blaze-builder ghc-hashable ghc-mmorph))
(native-inputs (list ghc-hunit ghc-hspec ghc-bifunctors))
(arguments
`(#:cabal-revision ("1"
- "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d")))
+ "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs")))
(home-page "https://github.com/chrisdone/lucid")
(synopsis "Haskell DSL for rendering HTML")
(description
@@ -6885,17 +6946,20 @@ Same combinator can be used for attributes and elements
(define-public ghc-lzma
(package
(name "ghc-lzma")
- (version "0.0.0.4")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "lzma" version))
- (sha256
- (base32
- "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382"))))
+ (version "0.0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "lzma" version))
+ (sha256
+ (base32 "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"))))
(build-system haskell-build-system)
(properties '((upstream-name . "lzma")))
(native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit
- ghc-tasty-quickcheck))
+ ghc-tasty-quickcheck pkg-config))
+ (arguments
+ `(#:cabal-revision ("1"
+ "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd")))
(home-page "https://github.com/hvr/lzma")
(synopsis "LZMA/XZ compression and decompression")
(description
@@ -6923,7 +6987,7 @@ monadic incremental interface is provided as well.")
ghc-test-framework-quickcheck2
ghc-hunit
ghc-quickcheck))
- (home-page "http://github.com/alphaHeavy/lzma-conduit")
+ (home-page "https://github.com/alphaHeavy/lzma-conduit")
(synopsis "Conduit interface for lzma/xz compression")
(description
"This package provides a @code{Conduit} interface for the LZMA
@@ -6954,18 +7018,15 @@ than its name.")
(define-public ghc-managed
(package
(name "ghc-managed")
- (version "1.0.9")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "managed" version))
- (sha256
- (base32
- "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd"))))
+ (version "1.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "managed" version))
+ (sha256
+ (base32 "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is"))))
(build-system haskell-build-system)
(properties '((upstream-name . "managed")))
- (arguments
- `(#:cabal-revision ("3"
- "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664")))
(home-page "https://hackage.haskell.org/package/managed")
(synopsis "Monad for managed values")
(description
@@ -7179,13 +7240,13 @@ microlens.")
(build-system haskell-build-system)
(properties '((upstream-name . "microlens-ghc")))
(inputs (list ghc-microlens))
- (home-page "http://github.com/monadfix/microlens")
+ (home-page "https://github.com/monadfix/microlens")
(synopsis "Use @code{microlens} with GHC libraries like @code{array}")
(description
"This library provides everything that @code{microlens}
provides plus instances to make @code{each}, @code{at}, and @code{ix}
usable with arrays, @code{ByteString}, and containers. This package is
-a part of the @uref{http://hackage.haskell.org/package/microlens,
+a part of the @uref{https://hackage.haskell.org/package/microlens,
microlens} family; see the readme
@uref{https://github.com/aelve/microlens#readme, on Github}.")
(license license:bsd-3)))
@@ -7203,13 +7264,13 @@ microlens} family; see the readme
(build-system haskell-build-system)
(properties '((upstream-name . "microlens-mtl")))
(inputs (list ghc-microlens ghc-transformers-compat))
- (home-page "http://github.com/monadfix/microlens")
+ (home-page "https://github.com/monadfix/microlens")
(synopsis "@code{microlens} support for Reader/Writer/State from mtl")
(description
"This package contains functions (like @code{view} or @code{+=}) which
work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the
mtl package. This package is a part of the
-@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the
+@uref{https://hackage.haskell.org/package/microlens, microlens} family; see the
readme @uref{https://github.com/aelve/microlens#readme, on Github}.")
(license license:bsd-3)))
@@ -7232,42 +7293,42 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.")
ghc-microlens-th
ghc-unordered-containers
ghc-vector))
- (home-page "http://github.com/monadfix/microlens")
+ (home-page "https://github.com/monadfix/microlens")
(synopsis "Feature-complete microlens")
(description
"This package exports a module which is the recommended starting point
-for using @uref{http://hackage.haskell.org/package/microlens, microlens} if
+for using @uref{https://hackage.haskell.org/package/microlens, microlens} if
you aren't trying to keep your dependencies minimal. By importing
@code{Lens.Micro.Platform} you get all functions and instances from
-@uref{http://hackage.haskell.org/package/microlens, microlens},
-@uref{http://hackage.haskell.org/package/microlens-th, microlens-th},
-@uref{http://hackage.haskell.org/package/microlens-mtl, microlens-mtl},
-@uref{http://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as
+@uref{https://hackage.haskell.org/package/microlens, microlens},
+@uref{https://hackage.haskell.org/package/microlens-th, microlens-th},
+@uref{https://hackage.haskell.org/package/microlens-mtl, microlens-mtl},
+@uref{https://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as
well as instances for @code{Vector}, @code{Text}, and @code{HashMap}. The
minor and major versions of @code{microlens-platform} are incremented whenever
the minor and major versions of any other @code{microlens} package are
incremented, so you can depend on the exact version of
@code{microlens-platform} without specifying the version of @code{microlens}
you need. This package is a part of the
-@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the
+@uref{https://hackage.haskell.org/package/microlens, microlens} family; see the
readme @uref{https://github.com/aelve/microlens#readme, on Github}.")
(license license:bsd-3)))
(define-public ghc-microlens-th
(package
(name "ghc-microlens-th")
- (version "0.4.3.11")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "microlens-th" version))
- (sha256
- (base32
- "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj"))))
+ (version "0.4.3.13")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "microlens-th" version))
+ (sha256
+ (base32 "1g41wb61k2l99xxy23yp2zqk0wanskgdypbjhib71ji0y1dcsfz7"))))
(build-system haskell-build-system)
(properties '((upstream-name . "microlens-th")))
(inputs (list ghc-microlens ghc-th-abstraction))
(native-inputs (list ghc-tagged))
- (home-page "http://github.com/monadfix/microlens")
+ (home-page "https://github.com/stevenfontanella/microlens")
(synopsis "Automatic generation of record lenses for
@code{ghc-microlens}")
(description
@@ -7299,7 +7360,7 @@ used both from lens and microlens).")
(arguments
`(#:cabal-revision ("2"
"11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l")))
- (home-page "http://hackage.haskell.org/package/MissingH")
+ (home-page "https://hackage.haskell.org/package/MissingH")
(synopsis "Large utility library")
(description
"MissingH is a library of all sorts of utility functions for Haskell
@@ -7344,7 +7405,7 @@ do on-demand loading.")
(arguments
`(#:cabal-revision ("3"
"1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz")))
- (home-page "http://hackage.haskell.org/package/mmorph")
+ (home-page "https://hackage.haskell.org/package/mmorph")
(synopsis "Monad morphisms")
(description
"This library provides monad morphism utilities, most commonly used for
@@ -7409,13 +7470,13 @@ a subset of @code{MonadBase} into which generic control operations such as
(define-public ghc-monad-logger
(package
(name "ghc-monad-logger")
- (version "0.3.37")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "monad-logger" version))
- (sha256
- (base32
- "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106"))))
+ (version "0.3.40")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "monad-logger" version))
+ (sha256
+ (base32 "1aff4ks9615x51841l8g906702xk2g3pn4n5x9ndxppnrxkqdvfb"))))
(build-system haskell-build-system)
(properties '((upstream-name . "monad-logger")))
(inputs (list ghc-conduit
@@ -7429,9 +7490,6 @@ a subset of @code{MonadBase} into which generic control operations such as
ghc-transformers-base
ghc-transformers-compat
ghc-unliftio-core))
- (arguments
- `(#:cabal-revision ("3"
- "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z")))
(home-page "https://github.com/snoyberg/monad-logger#readme")
(synopsis "Provides a class of monads which can log messages for Haskell")
(description
@@ -7517,6 +7575,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")
@@ -7603,7 +7683,7 @@ data structures as non-empty.")
(build-system haskell-build-system)
(properties '((upstream-name . "monoid-extras")))
(inputs (list ghc-groups ghc-semigroupoids))
- (home-page "http://hackage.haskell.org/package/monoid-extras")
+ (home-page "https://hackage.haskell.org/package/monoid-extras")
(synopsis "Various extra monoid-related definitions and utilities")
(description
"This package provides various extra monoid-related
@@ -7677,7 +7757,7 @@ the top of your file to get all of the ExceptT instances in scope.")
"145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9"))))
(build-system haskell-build-system)
(properties '((upstream-name . "murmur-hash")))
- (home-page "http://github.com/nominolo/murmur-hash")
+ (home-page "https://github.com/nominolo/murmur-hash")
(synopsis "MurmurHash2 implementation for Haskell")
(description
"This package provides an implementation of MurmurHash2, a good, fast,
@@ -7789,17 +7869,19 @@ ncurses.")
(define-public ghc-network
(package
(name "ghc-network")
- (version "3.1.2.7")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "network" version))
- (sha256
- (base32
- "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz"))))
+ (version "3.1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "network" version))
+ (sha256
+ (base32 "13hmp4va00ydpzbnwjzgf5wd5iy7373j0f7baxrj1ncmmjps4lml"))))
(build-system haskell-build-system)
(properties '((upstream-name . "network")))
- (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck
- ghc-doctest hspec-discover))
+ (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck hspec-discover))
+ (arguments
+ `(#:cabal-revision ("1"
+ "1vwxy5zj4bizgg2g0hk3dy52kjh5d7lzn33lphmvbbs36aqcslp1")))
(home-page "https://github.com/haskell/network")
(synopsis "Low-level networking interface")
(description "This package provides a low-level networking interface.")
@@ -7862,7 +7944,7 @@ byte order.")
"015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv"))))
(build-system haskell-build-system)
(properties '((upstream-name . "network-info")))
- (home-page "http://github.com/jacobstanley/network-info")
+ (home-page "https://github.com/jacobstanley/network-info")
(synopsis "Access the local computer's basic network configuration")
(description
"This Haskell library provides simple read-only access to the
@@ -7937,7 +8019,7 @@ sending UDP datagrams over multicast (class D) addresses.")
(arguments
`(#:cabal-revision ("1"
"0xgc7sxs1p3qibgwbikjdrhn47j7m4gk5x1wrv9hncks6hd6hsyf")))
- (home-page "http://github.com/sjakobi/newtype-generics")
+ (home-page "https://github.com/sjakobi/newtype-generics")
(synopsis "Typeclass and set of functions for working with newtypes")
(description
"The @code{Newtype} typeclass represents the packing and
@@ -8177,17 +8259,20 @@ found at runtime, a userError is thrown.")
(define-public ghc-operational
(package
(name "ghc-operational")
- (version "0.2.4.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "operational" version))
- (sha256
- (base32
- "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2"))))
+ (version "0.2.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "operational" version))
+ (sha256
+ (base32 "1dx6vpmg21fskxyz12ba26hffk25b2qk9sznqfczgaamn6rahzc5"))))
(build-system haskell-build-system)
(properties '((upstream-name . "operational")))
(inputs (list ghc-random))
- (home-page "http://wiki.haskell.org/Operational")
+ (arguments
+ `(#:cabal-revision ("1"
+ "0hdqwjm1jp6f8n8qglg9ylz07sbhrc7cm4kvcglymi2s4i9mdsai")))
+ (home-page "https://github.com/HeinrichApfelmus/operational")
(synopsis
"Implementation of difficult monads made easy with operational semantics")
(description
@@ -8279,17 +8364,20 @@ easily work with command-line options.")
(define-public ghc-optparse-applicative
(package
(name "ghc-optparse-applicative")
- (version "0.17.0.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "optparse-applicative" version))
- (sha256
- (base32
- "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2"))))
+ (version "0.17.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "optparse-applicative" version))
+ (sha256
+ (base32 "1vx5w03vvfr3hdk79lvl34x8bxj5xbx0xh53mmnmxi9r05scnyfi"))))
(build-system haskell-build-system)
(properties '((upstream-name . "optparse-applicative")))
(inputs (list ghc-transformers-compat ghc-ansi-wl-pprint))
(native-inputs (list ghc-quickcheck))
+ (arguments
+ `(#:cabal-revision ("1"
+ "1mhyjlmb1hylmhv77w6gq663drpyiqd09w1x1vy4d63lr46mypyb")))
(home-page "https://github.com/pcapriotti/optparse-applicative")
(synopsis "Utilities and combinators for parsing command line options")
(description "This package provides utilities and combinators for parsing
@@ -8371,13 +8459,13 @@ require aeson
(define-public ghc-text-icu
(package
(name "ghc-text-icu")
- (version "0.8.0.4")
+ (version "0.8.0.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "text-icu" version))
(sha256
- (base32 "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd"))))
+ (base32 "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d"))))
(build-system haskell-build-system)
(properties '((upstream-name . "text-icu")))
(inputs (list icu4c))
@@ -8387,6 +8475,7 @@ require aeson
ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2
+ ghc-semigroups
pkg-config))
(home-page "https://github.com/haskell/text-icu")
(synopsis "Bindings to the ICU library")
@@ -8425,7 +8514,7 @@ formatting.")
(arguments
`(#:cabal-revision ("1"
"0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb")))
- (home-page "http://hackage.haskell.org/package/text-short")
+ (home-page "https://hackage.haskell.org/package/text-short")
(synopsis "Memory-efficient representation of Unicode text strings")
(description
"This package provides the @code{ShortText} type which
@@ -8442,13 +8531,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))
@@ -8468,21 +8557,18 @@ Implementations using both of these examples are provided.")
(define-public ghc-doclayout
(package
(name "ghc-doclayout")
- (version "0.4")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "doclayout" version))
- (sha256
- (base32
- "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx"))))
+ (version "0.4.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "doclayout" version))
+ (sha256
+ (base32 "02xkf2shcrb897yrh9i6ch9qi4gm42avya4znsjxgpxb85fm3lzp"))))
(build-system haskell-build-system)
(properties '((upstream-name . "doclayout")))
(inputs (list ghc-emojis ghc-safe))
(native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-hunit
ghc-tasty-quickcheck))
- (arguments
- `(#:cabal-revision ("1"
- "0djwb7nrdablc0iy1qakrxpd4m7nn0w94vhb78il3jhjbj2ji179")))
(home-page "https://github.com/jgm/doclayout")
(synopsis "Pretty-printing library for laying out text documents")
(description
@@ -8749,7 +8835,7 @@ combinators.")
ghc-attoparsec
ghc-semigroups))
(native-inputs (list ghc-quickcheck ghc-quickcheck-instances))
- (home-page "http://github.com/ekmett/parsers/")
+ (home-page "https://github.com/ekmett/parsers/")
(synopsis "Parsing combinators")
(description
"This library provides convenient combinators for working
@@ -8779,7 +8865,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s
ghc-genvalidity-hspec
ghc-hspec
ghc-validity))
- (home-page "http://hackage.haskell.org/package/path")
+ (home-page "https://hackage.haskell.org/package/path")
(synopsis "Support for well-typed paths")
(description "This package introduces a type for paths upholding useful
invariants.")
@@ -8914,7 +9000,7 @@ syntax and semantics as Perl 5.")
(arguments
`(#:cabal-revision ("3"
"0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n")))
- (home-page "http://hackage.haskell.org/package/peano")
+ (home-page "https://hackage.haskell.org/package/peano")
(synopsis "Peano numbers")
(description "Provides an efficient Haskell implementation of Peano
numbers")
@@ -8968,13 +9054,13 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.")
(define-public ghc-persistent-sqlite
(package
(name "ghc-persistent-sqlite")
- (version "2.13.1.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "persistent-sqlite" version))
- (sha256
- (base32
- "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b"))))
+ (version "2.13.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "persistent-sqlite" version))
+ (sha256
+ (base32 "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"))))
(build-system haskell-build-system)
(properties '((upstream-name . "persistent-sqlite")))
(inputs (list ghc-persistent
@@ -8995,6 +9081,7 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.")
ghc-system-fileio
ghc-system-filepath
ghc-temporary))
+ (arguments (list #:tests? #f)) ; ghc-persistent-test is too old.
(home-page "http://www.yesodweb.com/book/persistent")
(synopsis "Backend for the persistent library using sqlite3")
(description
@@ -9451,7 +9538,7 @@ of the @code{primitive} library before @code{primitive-0.7.0.0}.")
(home-page "https://github.com/seereason/process-extras")
(synopsis "Extra tools for managing processes")
(description "This package extends
-@url{http://hackage.haskell.org/package/process}. It allows you to read
+@url{https://hackage.haskell.org/package/process}. It allows you to read
process input and output as ByteStrings or Text, or write your own
ProcessOutput instance. It also provides lazy process input and output,
and a ProcessMaker class for more flexibility in the process creation
@@ -9497,7 +9584,7 @@ API.")
"1cbccbvrx73drr1jf3yyw0rp1mcfv3jc1rvdcby5xxx4ja543fjs"))))
(build-system haskell-build-system)
(properties '((upstream-name . "indexed-profunctors")))
- (home-page "http://hackage.haskell.org/package/indexed-profunctors")
+ (home-page "https://hackage.haskell.org/package/indexed-profunctors")
(synopsis "Utilities for indexed profunctors")
(description
"This package contains basic definitions related to indexed profunctors. These
@@ -9539,17 +9626,20 @@ the ideal templating system.")
(define-public ghc-protolude
(package
(name "ghc-protolude")
- (version "0.3.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "protolude" version))
- (sha256
- (base32
- "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y"))))
+ (version "0.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "protolude" version))
+ (sha256
+ (base32 "0ihsjx48p9dgsp0i0l73h16mycnba40hyh7412jv3xz9qz9dwfbc"))))
(build-system haskell-build-system)
(properties '((upstream-name . "protolude")))
(inputs (list ghc-async ghc-hashable ghc-mtl-compat
ghc-transformers-compat))
+ (arguments
+ `(#:cabal-revision ("2"
+ "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1")))
(home-page "https://github.com/sdiehl/protolude")
(synopsis "Sensible set of defaults for writing custom Preludes")
(description
@@ -9603,7 +9693,7 @@ keys, in linear time.")
ghc-tasty-hunit
ghc-tasty-quickcheck
ghc-tagged))
- (home-page "http://hackage.haskell.org/package/psqueues")
+ (home-page "https://hackage.haskell.org/package/psqueues")
(synopsis "Pure priority search queues")
(description
"The psqueues package provides
@@ -9698,7 +9788,7 @@ usable.")
; ghc-tasty-hunit
; ghc-tasty
; ghc-tasty-inspection-testing))
- (home-page "http://hackage.haskell.org/package/random")
+ (home-page "https://hackage.haskell.org/package/random")
(synopsis "Random number library")
(description
"This package provides a basic random number generation
@@ -9839,7 +9929,7 @@ the community, with the missing features being added with pull-requests.")
(arguments
`(#:cabal-revision ("2"
"1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb")))
- (home-page "http://github.com/ekmett/reducers/")
+ (home-page "https://github.com/ekmett/reducers/")
(synopsis
"Semigroups, specialized containers and a general map/reduce framework")
(description "This library provides various semigroups, specialized
@@ -9870,23 +9960,25 @@ specify refactorings without depending on GHC.")
(define-public ghc-reflection
(package
(name "ghc-reflection")
- (version "2.1.6")
+ (version "2.1.7")
(source
(origin
(method url-fetch)
(uri (hackage-uri "reflection" version))
(sha256
- (base32
- "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz"))))
+ (base32 "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc"))))
(build-system haskell-build-system)
(properties '((upstream-name . "reflection")))
(inputs (list ghc-tagged))
- (native-inputs
- (list ghc-hspec ghc-quickcheck hspec-discover))
+ (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover))
+ (arguments
+ `(#:cabal-revision ("1"
+ "011s5ci385yccv576d1mh0n7v5k2pbmqkx1swlb5sq1sk3qb7dgj")))
(home-page "https://github.com/ekmett/reflection")
(synopsis "Reify arbitrary terms into types that can be reflected back
into terms")
- (description "This package addresses the 'configuration problem' which is
+ (description
+ "This package addresses the 'configuration problem' which is
propagating configurations that are available at run-time, allowing multiple
configurations to coexist without resorting to mutable global variables or
@code{System.IO.Unsafe.unsafePerformIO}.")
@@ -10169,17 +10261,20 @@ Haskell library @code{regex-base}.")
(define-public ghc-regex-tdfa
(package
(name "ghc-regex-tdfa")
- (version "1.3.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "regex-tdfa" version))
- (sha256
- (base32
- "1lfzhir5zbgga44zhr4qvc2xc9pa9lslv12c8lwqqw80bzfdfq16"))))
+ (version "1.3.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "regex-tdfa" version))
+ (sha256
+ (base32 "15c2gc7c0y2xv9sm586jvys2kx1dc18lzfvjzad5mm2d4yszi2sw"))))
(build-system haskell-build-system)
(properties '((upstream-name . "regex-tdfa")))
(inputs (list ghc-regex-base))
(native-inputs (list ghc-utf8-string ghc-doctest-parallel))
+ (arguments
+ `(#:cabal-revision ("1"
+ "1005mqjhq2blz8kqxmk84xajyqd85n91j9nraw6jrwfv11vxfvxa")))
(home-page "https://wiki.haskell.org/Regular_expressions")
(synopsis "POSIX extended regular expressions in Haskell")
(description
@@ -10301,7 +10396,7 @@ connections.")
(properties '((upstream-name . "resourcet")))
(inputs (list ghc-unliftio-core ghc-primitive))
(native-inputs (list ghc-hspec))
- (home-page "http://github.com/snoyberg/conduit")
+ (home-page "https://github.com/snoyberg/conduit")
(synopsis "Deterministic allocation and freeing of scarce resources")
(description "ResourceT is a monad transformer which creates a region of
code where you can safely allocate resources.")
@@ -10310,19 +10405,19 @@ code where you can safely allocate resources.")
(define-public ghc-retry
(package
(name "ghc-retry")
- (version "0.9.3.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "retry" version))
- (sha256
- (base32
- "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1"))))
+ (version "0.9.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "retry" version))
+ (sha256
+ (base32 "1mky1dfllmx6dr1gayf636n3z5xrfmam3rhs5vx7c3wj9c8kabk2"))))
(build-system haskell-build-system)
(properties '((upstream-name . "retry")))
(inputs (list ghc-random ghc-mtl-compat ghc-unliftio-core))
(native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit
ghc-tasty-hedgehog ghc-hedgehog))
- (home-page "http://github.com/Soostone/retry")
+ (home-page "https://github.com/Soostone/retry")
(synopsis "Retry combinators for monadic actions that may fail")
(description
"This package exposes combinators that can wrap
@@ -10641,22 +10736,21 @@ award winning Linux port of \"Civilization: Call To Power.\"")
(define-public ghc-sdl2
(package
(name "ghc-sdl2")
- (version "2.5.4.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "sdl2" version))
- (sha256
- (base32
- "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"))))
+ (version "2.5.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "sdl2" version))
+ (sha256
+ (base32 "1kai6mmnwz9qq7q5y8c7wmcdf9qc5m167dzy3brj11jjds4smz93"))))
(build-system haskell-build-system)
(properties '((upstream-name . "sdl2")))
(inputs (list ghc-statevar ghc-vector ghc-linear sdl2))
(native-inputs (list ghc-weigh pkg-config))
(arguments
- `(#:tests? #f ; Needs a graphics card.
- #:cabal-revision ("2"
- "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg")))
- (home-page "http://hackage.haskell.org/package/sdl2")
+ `(#:cabal-revision ("1"
+ "0r0lzn3hyjvzwqsrqprdzb2c167g7ip2cf07jvm1h5b53qc2a4cx")))
+ (home-page "https://hackage.haskell.org/package/sdl2")
(synopsis "High- and low-level bindings to the SDL library")
(description
"This package contains bindings to the SDL 2 library, in both high- and
@@ -10683,7 +10777,7 @@ programming.")
(properties '((upstream-name . "sdl2-image")))
(inputs (list ghc-sdl2 sdl2-image))
(native-inputs (list pkg-config))
- (home-page "http://hackage.haskell.org/package/sdl2-image")
+ (home-page "https://hackage.haskell.org/package/sdl2-image")
(synopsis "Bindings to SDL2_image")
(description "This package provides Haskell bindings to
@code{SDL2_image}.")
@@ -10704,7 +10798,7 @@ programming.")
(inputs (list ghc-data-default-class ghc-lifted-base ghc-monad-control
ghc-sdl2 ghc-vector sdl2-mixer))
(native-inputs (list pkg-config))
- (home-page "http://hackage.haskell.org/package/sdl2-mixer")
+ (home-page "https://hackage.haskell.org/package/sdl2-mixer")
(synopsis "Bindings to SDL2 mixer")
(description "This package provides Haskell bindings to
@code{SDL2_mixer}.")
@@ -10724,7 +10818,7 @@ programming.")
(properties '((upstream-name . "sdl2-ttf")))
(inputs (list ghc-sdl2 ghc-th-abstraction sdl2-ttf))
(native-inputs (list pkg-config))
- (home-page "http://hackage.haskell.org/package/sdl2-ttf")
+ (home-page "https://hackage.haskell.org/package/sdl2-ttf")
(synopsis "Bindings to SDL2_ttf")
(description "This package provides Haskell bindings to SDL2_ttf C++
library.")
@@ -10744,7 +10838,7 @@ library.")
(properties '((upstream-name . "sdl2-gfx")))
(inputs (list ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-gfx))
(native-inputs (list pkg-config))
- (home-page "http://hackage.haskell.org/package/sdl2-gfx")
+ (home-page "https://hackage.haskell.org/package/sdl2-gfx")
(synopsis "Haskell bindings to SDL2_gfx")
(description
"This package provides Haskell bindings to the SDL2_gfx graphics
@@ -10883,7 +10977,7 @@ class, forming lattice-like structure.")
ghc-tagged
ghc-hashable
ghc-unordered-containers))
- (home-page "http://github.com/ekmett/semigroupoids")
+ (home-page "https://github.com/ekmett/semigroupoids")
(synopsis "Semigroupoids operations for Haskell")
(description
"This library provides a wide array of (semi)groupoids and
@@ -10910,7 +11004,7 @@ just a @code{Semigroup} are added.")
(properties '((upstream-name . "semigroups")))
(inputs (list ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers
ghc-transformers-compat))
- (home-page "http://github.com/ekmett/semigroups/")
+ (home-page "https://github.com/ekmett/semigroups/")
(synopsis "Semigroup operations for Haskell")
(description
"This package provides semigroups for Haskell. In
@@ -11080,13 +11174,13 @@ interpolates variables according to the type being inserted.")
(define-public ghc-shelly
(package
(name "ghc-shelly")
- (version "1.10.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "shelly" version))
- (sha256
- (base32
- "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65"))))
+ (version "1.10.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "shelly" version))
+ (sha256
+ (base32 "0nm3yg6mhgxj670xn18v4zvzzqxqv9b1r6psdmsppgqny1szqm3x"))))
(build-system haskell-build-system)
(properties '((upstream-name . "shelly")))
(inputs (list ghc-async
@@ -11097,10 +11191,7 @@ interpolates variables according to the type being inserted.")
ghc-transformers-base
ghc-unix-compat))
(native-inputs (list ghc-hspec ghc-hspec-contrib ghc-hunit))
- (arguments
- `(#:cabal-revision ("1"
- "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp")))
- (home-page "https://github.com/yesodweb/Shelly.hs")
+ (home-page "https://github.com/gregwebs/Shelly.hs")
(synopsis "Shell-like (systems) programming in Haskell")
(description
"Shelly provides convenient systems programming in Haskell, similar in
@@ -11162,21 +11253,19 @@ them.")
(define-public ghc-simple-sendfile
(package
(name "ghc-simple-sendfile")
- (version "0.2.30")
+ (version "0.2.31")
(source
(origin
(method url-fetch)
(uri (hackage-uri "simple-sendfile" version))
(sha256
- (base32
- "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn"))))
+ (base32 "0q65dnvmwwcvpzhg3963s7yy404h4yrjgxvdbjy0grrs1qi6w1v6"))))
(build-system haskell-build-system)
(properties '((upstream-name . "simple-sendfile")))
- (inputs
- (list ghc-conduit ghc-conduit-extra ghc-network ghc-resourcet))
- (native-inputs
- (list ghc-hspec hspec-discover))
- (home-page "https://github.com/kazu-yamamoto/simple-sendfile")
+ (inputs (list ghc-network))
+ (native-inputs (list ghc-hunit ghc-conduit ghc-conduit-extra ghc-resourcet
+ ghc-hspec hspec-discover))
+ (home-page "https://hackage.haskell.org/package/simple-sendfile")
(synopsis "Cross platform library for the sendfile system call")
(description "This library tries to call minimum system calls which
are the bottleneck of web servers.")
@@ -11195,7 +11284,7 @@ are the bottleneck of web servers.")
(build-system haskell-build-system)
(properties '((upstream-name . "size-based")))
(inputs (list ghc-dictionary-sharing ghc-testing-type-modifiers))
- (home-page "http://hackage.haskell.org/package/size-based")
+ (home-page "https://hackage.haskell.org/package/size-based")
(synopsis "Sized functors for size-based enumerations")
(description "This library provides a framework for size-based
enumerations.")
@@ -11204,42 +11293,39 @@ enumerations.")
(define-public ghc-skylighting-core
(package
(name "ghc-skylighting-core")
- (version "0.13.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "skylighting-core" version))
- (sha256
- (base32
- "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585"))))
+ (version "0.13.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "skylighting-core" version))
+ (sha256
+ (base32 "1ib59w12f7mlh10nwj7404jv8x7z2r58g8a9ndr6ag8pxnf81054"))))
(build-system haskell-build-system)
(properties '((upstream-name . "skylighting-core")))
- (inputs
- (list ghc-aeson
- ghc-ansi-terminal
- ghc-attoparsec
- ghc-base64-bytestring
- ghc-blaze-html
- ghc-case-insensitive
- ghc-colour
- ghc-safe
- ghc-utf8-string
- ghc-xml-conduit))
- (native-inputs
- (list ghc-diff
- ghc-pretty-show
- ghc-quickcheck
- ghc-tasty
- ghc-tasty-golden
- ghc-tasty-hunit
- ghc-tasty-quickcheck))
+ (inputs (list ghc-aeson
+ ghc-case-insensitive
+ ghc-attoparsec
+ ghc-utf8-string
+ ghc-xml-conduit
+ ghc-safe
+ ghc-base64-bytestring
+ ghc-colour))
+ (native-inputs (list ghc-tasty
+ ghc-tasty-golden
+ ghc-tasty-hunit
+ ghc-tasty-quickcheck
+ ghc-quickcheck
+ ghc-diff
+ ghc-pretty-show))
(home-page "https://github.com/jgm/skylighting")
(synopsis "Syntax highlighting library")
- (description "Skylighting is a syntax highlighting library with support
+ (description
+ "Skylighting is a syntax highlighting library with support
for over one hundred languages. It derives its tokenizers from XML syntax
definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax
supported by that framework can be added. An optional command-line program is
provided. Skylighting is intended to be the successor to highlighting-kate.")
- (license license:gpl2)))
+ (license license:bsd-3)))
(define-public ghc-skylighting-format-blaze-html
(package
@@ -11283,13 +11369,13 @@ macros.")
(define-public ghc-skylighting-format-context
(package
(name "ghc-skylighting-format-context")
- (version "0.1.0.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "skylighting-format-context" version))
- (sha256
- (base32
- "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0"))))
+ (version "0.1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "skylighting-format-context" version))
+ (sha256
+ (base32 "1gc8pjbhd1npka22m5m7s5333jcqxskgzmqj17m95dl97phi6hh0"))))
(build-system haskell-build-system)
(properties '((upstream-name . "skylighting-format-context")))
(inputs (list ghc-skylighting-core))
@@ -11323,13 +11409,13 @@ colored text.")
(define-public ghc-skylighting
(package
(name "ghc-skylighting")
- (version "0.13.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "skylighting" version))
- (sha256
- (base32
- "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879"))))
+ (version "0.13.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "skylighting" version))
+ (sha256
+ (base32 "0lq68cavdp73praa2h8cclgnrh53fqg9x4r6q3fsvnr8lbcb4x7h"))))
(build-system haskell-build-system)
(properties '((upstream-name . "skylighting")))
(inputs (list ghc-skylighting-core
@@ -11354,22 +11440,20 @@ syntax modules based on the KDE XML definitions provided by the
(define-public ghc-smallcheck
(package
(name "ghc-smallcheck")
- (version "1.2.1")
+ (version "1.2.1.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "smallcheck" version))
(sha256
- (base32
- "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4"))))
+ (base32 "07zyb3hnq242mdwak5briqc48wakp9pjsfizl78l06070i824hz0"))))
(build-system haskell-build-system)
(properties '((upstream-name . "smallcheck")))
- (inputs
- (list ghc-logict))
- (home-page
- "https://github.com/feuerbach/smallcheck")
+ (inputs (list ghc-logict ghc-semigroups ghc-nats ghc-void))
+ (home-page "https://github.com/Bodigrim/smallcheck")
(synopsis "Property-based testing library")
- (description "SmallCheck is a testing library that verifies
+ (description
+ "SmallCheck is a testing library that verifies
properties for all test cases up to some depth. The test cases are generated
automatically by SmallCheck.")
(license license:bsd-3)))
@@ -11409,7 +11493,7 @@ automatically by SmallCheck.")
(arguments
`(#:cabal-revision ("1"
"1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz")))
- (home-page "http://hackage.haskell.org/package/sop-core")
+ (home-page "https://hackage.haskell.org/package/sop-core")
(synopsis "True Sums of Products")
(description
"This package provides an implementation of
@@ -11459,7 +11543,7 @@ used for example by QuickCheck, see quickcheck-special." )
(build-system haskell-build-system)
(properties '((upstream-name . "split")))
(native-inputs (list ghc-quickcheck))
- (home-page "http://hackage.haskell.org/package/split")
+ (home-page "https://hackage.haskell.org/package/split")
(synopsis "Combinator library for splitting lists")
(description
"This package provides a collection of Haskell functions for
@@ -11496,7 +11580,7 @@ mainstream languages.")
`(#:tests? #f ; Missing library testu01.
#:cabal-revision ("1"
"1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0")))
- (home-page "http://hackage.haskell.org/package/splitmix")
+ (home-page "https://hackage.haskell.org/package/splitmix")
(synopsis "Fast and splittable pseudorandom number generator")
(description
"This package provides a Pure Haskell implementation of the
@@ -11572,13 +11656,13 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.")
(define-public ghc-statistics
(package
(name "ghc-statistics")
- (version "0.16.1.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "statistics" version))
- (sha256
- (base32
- "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq"))))
+ (version "0.16.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "statistics" version))
+ (sha256
+ (base32 "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk"))))
(build-system haskell-build-system)
(properties '((upstream-name . "statistics")))
(inputs (list ghc-math-functions
@@ -11601,6 +11685,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.")
ghc-tasty-hunit
ghc-tasty-quickcheck
ghc-tasty-expected-failure))
+ (arguments (list #:tests? #f)) ;; Fail.
(home-page "https://github.com/haskell/statistics")
(synopsis "Haskell library of statistical types, data, and functions")
(description
@@ -11629,19 +11714,19 @@ and regression and autocorrelation analysis.
(define-public ghc-stm-chans
(package
(name "ghc-stm-chans")
- (version "3.0.0.6")
+ (version "3.0.0.9")
(source
(origin
(method url-fetch)
(uri (hackage-uri "stm-chans" version))
(sha256
- (base32
- "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa"))))
+ (base32 "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks"))))
(build-system haskell-build-system)
(properties '((upstream-name . "stm-chans")))
- (home-page "https://hackage.haskell.org/package/stm-chans")
+ (home-page "https://wrengr.org/software/hackage.html")
(synopsis "Additional types of channels for ghc-stm")
- (description "This Haskell package offers a collection of channel types,
+ (description
+ "This Haskell package offers a collection of channel types,
similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional
features.")
(license license:bsd-3)))
@@ -11684,26 +11769,46 @@ 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")
- (version "0.4.6")
+ (version "0.4.7")
(source
(origin
(method url-fetch)
(uri (hackage-uri "STMonadTrans" version))
(sha256
- (base32 "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb"))))
+ (base32 "1x83f48wbzx6rzbls6h8walfayzdv4j3j1mqbk8lfnkdqff9ri5d"))))
(build-system haskell-build-system)
(properties '((upstream-name . "STMonadTrans")))
- (arguments `(#:tests? #f)) ; TODO: Loops.
(inputs (list ghc-fail))
-; (native-inputs
-; `(("ghc-tasty" ,ghc-tasty)
-; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
-; ("ghc-tasty-hunit" ,ghc-tasty-hunit)
-; ("ghc-stmonadtrans" ,ghc-stmonadtrans)))
- (home-page "https://hackage.haskell.org/package/STMonadTrans")
+ (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit))
+ (arguments
+ `(#:cabal-revision ("1"
+ "01zfv7jdqf8wfmgxx2gdb1nik93iqvkmblrd18py5hy5mpbxp9dy")))
+ (home-page "https://github.com/josefs/STMonadTrans")
(synopsis "Monad transformer version of the ST monad")
(description
"This package provides a monad transformer version of the @code{ST} monad
@@ -11734,13 +11839,13 @@ and Fortran complex data types.")
(define-public ghc-storable-record
(package
(name "ghc-storable-record")
- (version "0.0.6")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "storable-record" version))
- (sha256
- (base32
- "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"))))
+ (version "0.0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "storable-record" version))
+ (sha256
+ (base32 "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy"))))
(build-system haskell-build-system)
(properties '((upstream-name . "storable-record")))
(inputs (list ghc-quickcheck ghc-semigroups ghc-utility-ht
@@ -11818,35 +11923,36 @@ arrays with a list interface, a chunky lazy list interface with variable
chunk size and an interface for write access via the ST monad. This is
much like bytestring and binary but can be used for every
@code{Foreign.Storable.Storable} type. See also
-@url{http://hackage.haskell.org/package/vector}, a library with a
+@url{https://hackage.haskell.org/package/vector}, a library with a
similar intention.
This library does not do advanced fusion optimization, since especially
for lazy vectors this would either be incorrect or not applicable. See
-@url{http://hackage.haskell.org/package/storablevector-streamfusion} for
+@url{https://hackage.haskell.org/package/storablevector-streamfusion} for
a library that provides fusion with lazy lists.")
(license license:bsd-3)))
(define-public ghc-streaming-commons
(package
(name "ghc-streaming-commons")
- (version "0.2.2.5")
+ (version "0.2.2.6")
(source
(origin
(method url-fetch)
(uri (hackage-uri "streaming-commons" version))
(sha256
- (base32
- "0157xjz8nhr65y9rm7rdf3pnjlrsgaqam7qfg7nqq91bvfdq2l6a"))))
+ (base32 "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"))))
(build-system haskell-build-system)
(properties '((upstream-name . "streaming-commons")))
- (inputs
- (list ghc-async ghc-blaze-builder ghc-network ghc-random ghc-zlib))
- (native-inputs
- (list ghc-quickcheck ghc-hspec hspec-discover))
- (home-page "https://hackage.haskell.org/package/streaming-commons")
+ (inputs (list ghc-async ghc-network ghc-random ghc-zlib))
+ (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover))
+ (arguments
+ `(#:cabal-revision ("1"
+ "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm")))
+ (home-page "https://github.com/fpco/streaming-commons")
(synopsis "Conduit and pipes needed by some streaming data libraries")
- (description "This package provides low-dependency functionality commonly
+ (description
+ "This package provides low-dependency functionality commonly
needed by various Haskell streaming data libraries, such as @code{conduit} and
@code{pipe}s.")
(license license:expat)))
@@ -11971,13 +12077,13 @@ building Scalable Vector Graphics (SVG).")
(define-public ghc-syb
(package
(name "ghc-syb")
- (version "0.7.2.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "syb" version))
- (sha256
- (base32
- "1qxjjndfwz2vvpz9707banmcn6jl2v6w6zp401zxaj327fccchw1"))))
+ (version "0.7.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "syb" version))
+ (sha256
+ (base32 "06nrr3x9zgk0ml7xckx04hr46lr15w3p8mrdrgcw8ix92spjvdyh"))))
(build-system haskell-build-system)
(properties '((upstream-name . "syb")))
(native-inputs (list ghc-tasty ghc-tasty-hunit))
@@ -12290,16 +12396,16 @@ This is a better maintained fork of the \"temporary\" package.")
(define-public ghc-terminal-size
(package
(name "ghc-terminal-size")
- (version "0.3.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "terminal-size" version))
- (sha256
- (base32
- "1hv0r8gr1ms258rrz602gd5kziykkxw5zlnnzz5f42r0ly7lq5wc"))))
+ (version "0.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "terminal-size" version))
+ (sha256
+ (base32 "0jbznrlf95lc6ajhh26h1qgcmbr3bj753i8jlkrsrnkcjbb71w5h"))))
(build-system haskell-build-system)
(properties '((upstream-name . "terminal-size")))
- (home-page "http://hackage.haskell.org/package/terminal-size")
+ (home-page "https://hackage.haskell.org/package/terminal-size")
(synopsis "Get terminal window height and width")
(description "Get terminal window height and width without ncurses
dependency.")
@@ -12308,18 +12414,18 @@ dependency.")
(define-public ghc-texmath
(package
(name "ghc-texmath")
- (version "0.12.5.4")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "texmath" version))
- (sha256
- (base32
- "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq"))))
+ (version "0.12.5.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "texmath" version))
+ (sha256
+ (base32 "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva"))))
(build-system haskell-build-system)
(properties '((upstream-name . "texmath")))
(inputs (list ghc-syb ghc-xml ghc-pandoc-types ghc-split))
(native-inputs (list ghc-pretty-show ghc-tasty ghc-tasty-golden ghc-tagged))
- (home-page "http://github.com/jgm/texmath")
+ (home-page "https://github.com/jgm/texmath")
(synopsis "Conversion between formats used to represent mathematics")
(description
"The texmath library provides functions to read and write TeX math,
@@ -12385,23 +12491,20 @@ upgraded. Consider yourself warned!")
(define-public ghc-text-metrics
(package
(name "ghc-text-metrics")
- (version "0.3.1")
+ (version "0.3.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "text-metrics" version))
(sha256
- (base32
- "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2"))))
+ (base32 "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"))))
(build-system haskell-build-system)
(properties '((upstream-name . "text-metrics")))
- (inputs
- (list ghc-vector))
- (native-inputs
- (list ghc-quickcheck ghc-hspec))
+ (inputs (list ghc-vector))
+ (native-inputs (list ghc-quickcheck ghc-hspec))
(arguments
- `(#:cabal-revision
- ("4" "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1")))
+ `(#:cabal-revision ("3"
+ "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q")))
(home-page "https://github.com/mrkkrp/text-metrics")
(synopsis "Calculate various string metrics efficiently")
(description "This library provides tools to calculate various
@@ -12456,16 +12559,19 @@ Template Haskell.")
(define-public ghc-th-expand-syns
(package
(name "ghc-th-expand-syns")
- (version "0.4.10.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "th-expand-syns" version))
- (sha256
- (base32
- "044h1hv4b0ihpwr9wndj55fa843cbzqp1difgj9wyy3mw925higm"))))
+ (version "0.4.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "th-expand-syns" version))
+ (sha256
+ (base32 "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"))))
(build-system haskell-build-system)
(properties '((upstream-name . "th-expand-syns")))
(inputs (list ghc-syb ghc-th-abstraction))
+ (arguments
+ `(#:cabal-revision ("4"
+ "0vjznxgzzvlr39hq0pqvachaihsbp0m2fwrii89rjzhx0mlfy4l7")))
(home-page "https://github.com/DanielSchuessler/th-expand-syns")
(synopsis "Expands type synonyms in Template Haskell ASTs")
(description
@@ -12476,21 +12582,17 @@ Template Haskell.")
(define-public ghc-th-lift
(package
(name "ghc-th-lift")
- (version "0.8.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "th-lift" version))
- (sha256
- (base32
- "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s"))))
+ (version "0.8.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "th-lift" version))
+ (sha256
+ (base32 "0xbbii04c60l6v6fnd50lldhpsg1ba03j1ff9bmyzpp7z3sppm95"))))
(build-system haskell-build-system)
(properties '((upstream-name . "th-lift")))
- (inputs
- (list ghc-th-abstraction))
- (arguments
- `(#:cabal-revision ("2"
- "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi")))
- (home-page "https://github.com/mboes/th-lift")
+ (inputs (list ghc-th-abstraction))
+ (home-page "https://github.com/RyanGlScott/th-lift")
(synopsis "Derive Template Haskell's Lift class for datatypes")
(description
"This is a Haskell library to derive Template Haskell's Lift class for
@@ -12511,7 +12613,7 @@ datatypes.")
(properties '((upstream-name . "th-lift-instances")))
(inputs (list ghc-vector ghc-th-lift))
(native-inputs (list ghc-quickcheck))
- (home-page "http://github.com/bennofs/th-lift-instances/")
+ (home-page "https://github.com/bennofs/th-lift-instances/")
(synopsis "Lift instances for template-haskell for common data types")
(description
"Most data types in the Haskell platform do not have Lift
@@ -12534,7 +12636,7 @@ instances. This package provides orphan instances for @code{containers},
(inputs (list ghc-th-compat ghc-th-lift ghc-th-reify-many
ghc-generic-deriving ghc-th-lift-instances))
(native-inputs (list ghc-hspec))
- (home-page "http://hackage.haskell.org/package/th-orphans")
+ (home-page "https://hackage.haskell.org/package/th-orphans")
(synopsis "Orphan instances for TH datatypes")
(description
"This package provides orphan instances for Template Haskell datatypes. In particular,
@@ -12753,7 +12855,7 @@ used CPU time of monadic computation with an IO base.")
(arguments
`(#:cabal-revision ("1"
"1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc")))
- (home-page "http://projects.haskell.org/time-ng/")
+ (home-page "https://projects.haskell.org/time-ng/")
(synopsis "Enhanced timezone handling for Time")
(description
"This package endows @code{Data.Time}, from the time package, with several
@@ -12774,7 +12876,7 @@ create timezone series, see the ghc-timezone-olson package.")
(build-system haskell-build-system)
(properties '((upstream-name . "timezone-olson")))
(inputs (list ghc-timezone-series ghc-extensible-exceptions))
- (home-page "http://projects.haskell.org/time-ng/")
+ (home-page "https://projects.haskell.org/time-ng/")
(synopsis "Parser and renderer for binary Olson timezone files")
(description
"A parser and renderer for binary Olson timezone files whose format
@@ -12819,17 +12921,16 @@ man pages with practical examples.")
(define-public ghc-torrent
(package
(name "ghc-torrent")
- (version "10000.1.1")
+ (version "10000.1.3")
(source
(origin
(method url-fetch)
(uri (hackage-uri "torrent" version))
(sha256
- (base32 "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290"))))
+ (base32 "1pp9qfpai7v8vlylw4zfgmnbznwjldqlbl3p6awlhzkpszvqzgny"))))
(build-system haskell-build-system)
(properties '((upstream-name . "torrent")))
- (inputs
- (list ghc-bencode ghc-syb))
+ (inputs (list ghc-bencode ghc-syb))
(home-page "https://hackage.haskell.org/package/torrent")
(synopsis "BitTorrent file parser and generator")
(description "This library provides support for parsing and generating
@@ -12911,7 +13012,7 @@ compatibility to run on old versions of the platform.")
(build-system haskell-build-system)
(properties '((upstream-name . "transformers-compat")))
(inputs (list ghc-generic-deriving))
- (home-page "http://github.com/ekmett/transformers-compat/")
+ (home-page "https://github.com/ekmett/transformers-compat/")
(synopsis "Small compatibility shim between transformers 0.3 and 0.4")
(description
"This package includes backported versions of types that were
@@ -12934,7 +13035,7 @@ but also need those types.")
(properties '((upstream-name . "exception-transformers")))
(inputs (list ghc-fail ghc-transformers-compat))
(native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
- (home-page "http://hackage.haskell.org/package/exception-transformers")
+ (home-page "https://hackage.haskell.org/package/exception-transformers")
(synopsis "Type classes and monads for unchecked extensible exceptions")
(description
"This package provides type classes, a monad and a monad transformer that support
@@ -13015,7 +13116,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using
(arguments
`(#:cabal-revision ("1"
"0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9")))
- (home-page "http://github.com/ekmett/trifecta/")
+ (home-page "https://github.com/ekmett/trifecta/")
(synopsis "Parser combinator library with convenient diagnostics")
(description "Trifecta is a modern parser combinator library for Haskell,
with slicing and Clang-style colored diagnostics.")
@@ -13097,13 +13198,13 @@ similar functionality.")
(define-public ghc-typed-process
(package
(name "ghc-typed-process")
- (version "0.2.10.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "typed-process" version))
- (sha256
- (base32
- "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4"))))
+ (version "0.2.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "typed-process" version))
+ (sha256
+ (base32 "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"))))
(build-system haskell-build-system)
(properties '((upstream-name . "typed-process")))
(inputs (list ghc-async ghc-unliftio-core))
@@ -13156,7 +13257,7 @@ function.")
(properties '((upstream-name . "unagi-chan")))
(inputs (list ghc-atomic-primops ghc-primitive))
(arguments (list #:tests? #f)) ; counter is atomic... test: Counter broken: expecting 10000000 got 9999996
- (home-page "http://hackage.haskell.org/package/unagi-chan")
+ (home-page "https://hackage.haskell.org/package/unagi-chan")
(synopsis "Fast concurrent queues with a Chan-like API, and more")
(description
"This library provides implementations of concurrent FIFO queues (for
@@ -13209,17 +13310,17 @@ handled safely, this is what you're left with.")
(define-public ghc-unicode-data
(package
(name "ghc-unicode-data")
- (version "0.4.0.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "unicode-data" version))
- (sha256
- (base32
- "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"))))
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "unicode-data" version))
+ (sha256
+ (base32 "0q2wygqg0z9b22gzi083cxm73a8iz14zqvdsjmix9i57jxa827xy"))))
(build-system haskell-build-system)
(properties '((upstream-name . "unicode-data")))
- (native-inputs (list ghc-hspec))
- (home-page "http://github.com/composewell/unicode-data")
+ (native-inputs (list ghc-hspec hspec-discover))
+ (home-page "https://github.com/composewell/unicode-data")
(synopsis "Access Unicode Character Database (UCD)")
(description
"This package provides Haskell APIs to efficiently access the
@@ -13245,7 +13346,7 @@ are generated programmatically from the UCD files.")
(arguments
`(#:cabal-revision ("2"
"1imm3svpz2shilj2kmmmcyy5yd4c1mpmz5v1gvjrr98hrab2i9x7")))
- (home-page "http://github.com/composewell/unicode-transforms")
+ (home-page "https://github.com/composewell/unicode-transforms")
(synopsis "Unicode normalization")
(description
"This library provides tools for fast Unicode 12.1.0
@@ -13298,6 +13399,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")
@@ -13313,30 +13439,51 @@ work, but is substantially simpler and faster.")
(arguments
`(#:cabal-revision ("2"
"0mik6xb1jdmb2jlxlmzf0517mxfj0c1j2i4r6h5212m4q6znqqcm")))
- (home-page "http://github.com/jacobstanley/unix-compat")
+ (home-page "https://github.com/jacobstanley/unix-compat")
+ (synopsis "Portable POSIX-compatibility layer")
+ (description
+ "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.")
+ "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
(package
(name "ghc-unix-time")
- (version "0.4.8")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "unix-time" version))
- (sha256
- (base32
- "0hz8mi08kg84hiqnch5ycscgqmjyn1mnl5ih1bsrclyb3fhvdppy"))))
+ (version "0.4.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "unix-time" version))
+ (sha256
+ (base32 "024bmjy16mwdyf4rkyy6l2s63ym5gg04vxdk5ylml1hfhva381s9"))))
(build-system haskell-build-system)
(properties '((upstream-name . "unix-time")))
(inputs (list ghc-old-time))
- (native-inputs (list ghc-doctest ghc-old-locale ghc-quickcheck ghc-hspec
- hspec-discover))
- (home-page "http://hackage.haskell.org/package/unix-time")
+ (native-inputs (list ghc-old-locale ghc-quickcheck ghc-hspec hspec-discover))
+ (home-page "https://hackage.haskell.org/package/unix-time")
(synopsis "Unix time parser/formatter and utilities")
(description "This library provides fast parsing and formatting utilities
for Unix time in Haskell.")
@@ -13345,13 +13492,13 @@ for Unix time in Haskell.")
(define-public ghc-unliftio
(package
(name "ghc-unliftio")
- (version "0.2.23.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "unliftio" version))
- (sha256
- (base32
- "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id"))))
+ (version "0.2.25.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "unliftio" version))
+ (sha256
+ (base32 "0aqiia15p5y0jddk6fsb00das035f8x5cpkzrmc9x3z7j4ia51gv"))))
(build-system haskell-build-system)
(properties '((upstream-name . "unliftio")))
(inputs (list ghc-async ghc-safe-exceptions ghc-unliftio-core ghc-nats))
@@ -13368,23 +13515,23 @@ working with it.")
(define-public ghc-unliftio-core
(package
(name "ghc-unliftio-core")
- (version "0.2.0.1")
+ (version "0.2.1.0")
(source
(origin
(method url-fetch)
(uri (hackage-uri "unliftio-core" version))
(sha256
- (base32
- "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"))))
+ (base32 "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"))))
(build-system haskell-build-system)
(properties '((upstream-name . "unliftio-core")))
(arguments
- `(#:cabal-revision
- ("2" "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr")))
+ `(#:cabal-revision ("4"
+ "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn")))
(home-page
"https://github.com/fpco/unliftio/tree/master/unliftio-core#readme")
(synopsis "The MonadUnliftIO typeclass for unlifting monads to IO")
- (description "This Haskell package provides the core @code{MonadUnliftIO}
+ (description
+ "This Haskell package provides the core @code{MonadUnliftIO}
typeclass, instances for base and transformers, and basic utility
functions.")
(license license:expat)))
@@ -13444,7 +13591,7 @@ and high speed.")
"1bmafx363gfsd9wwrf3xyrw9mnw6anmc1zdfv0p8597y4lxxach7"))))
(build-system haskell-build-system)
(properties '((upstream-name . "commutative-semigroups")))
- (home-page "http://hackage.haskell.org/package/commutative-semigroups")
+ (home-page "https://hackage.haskell.org/package/commutative-semigroups")
(synopsis "Commutative semigroups")
(description
"This package provides a commutative semigroup is a semigroup where the order of
@@ -13608,18 +13755,21 @@ UTF8 without truncation.")
(define-public ghc-utility-ht
(package
(name "ghc-utility-ht")
- (version "0.0.16")
- (home-page "https://hackage.haskell.org/package/utility-ht")
+ (version "0.0.17")
(source
(origin
(method url-fetch)
(uri (hackage-uri "utility-ht" version))
(sha256
- (base32 "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw"))))
+ (base32 "164sy6vdq5vspvfcj59hsmynn97x0wimw4xa5jyzkl4b0vp8lhb2"))))
(build-system haskell-build-system)
(properties '((upstream-name . "utility-ht")))
- (native-inputs
- (list ghc-quickcheck ghc-doctest-exitcode-stdio ghc-doctest-lib))
+ (native-inputs (list ghc-quickcheck ghc-doctest-exitcode-stdio
+ ghc-doctest-lib))
+ (arguments
+ `(#:cabal-revision ("1"
+ "11i3n06rg580c87br6ic3m75bd83p9incz1nmkkqrawpr7s2fk5f")))
+ (home-page "https://hackage.haskell.org/package/utility-ht")
(synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions")
(description "This package includes Hakell modules providing various
helper functions for Lists, Maybes, Tuples, Functions.")
@@ -13959,45 +14109,101 @@ given term should not exist.")
(define-public ghc-vty
(package
- (name "ghc-vty")
- (version "5.35.1")
- (source
- (origin
- (method url-fetch)
- (uri (hackage-uri "vty" version))
- (sha256
- (base32 "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k"))))
- (build-system haskell-build-system)
- (native-inputs
- (list ghc-hunit
- ghc-quickcheck
- ghc-quickcheck-assertions
- ghc-random
- ghc-smallcheck
- ghc-string-qq
- ghc-test-framework
- ghc-test-framework-smallcheck
- ghc-test-framework-hunit))
- (inputs
- (list ghc-ansi-terminal
- ghc-blaze-builder
- ghc-hashable
- ghc-microlens
- ghc-microlens-mtl
- ghc-microlens-th
- ghc-parallel
- ghc-utf8-string
- ghc-vector))
- (arguments
- `(#:cabal-revision ("1"
- "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5")))
- (properties '((upstream-name . "vty")))
- (home-page "https://github.com/jtdaugherty/vty")
- (synopsis "Simple terminal UI library")
- (description
- "vty is a terminal GUI library in the niche of ncurses, intended to be easy
+ (name "ghc-vty")
+ (version "5.37")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "vty" version))
+ (sha256
+ (base32 "1w6dc25npvlaflxcyzdssnymgi7x03zkwg7swyjw6cjjfdmkgqb7"))))
+ (build-system haskell-build-system)
+ (properties '((upstream-name . "vty")))
+ (inputs (list ghc-blaze-builder
+ ghc-microlens
+ ghc-microlens-mtl
+ ghc-microlens-th
+ ghc-hashable
+ ghc-parallel
+ ghc-utf8-string
+ ghc-vector
+ ghc-ansi-terminal))
+ (native-inputs (list ghc-hunit
+ ghc-quickcheck
+ ghc-quickcheck-assertions
+ ghc-random
+ ghc-smallcheck
+ ghc-string-qq
+ ghc-test-framework
+ ghc-test-framework-hunit
+ ghc-test-framework-smallcheck))
+ (home-page "https://github.com/jtdaugherty/vty")
+ (synopsis "Simple terminal UI library")
+ (description
+ "vty is a terminal GUI library in the niche of ncurses, intended to be easy
to use and to provide good support for common terminal types.")
- (license license:bsd-3)))
+ (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
@@ -14168,7 +14374,7 @@ modernized interface.")
(build-system haskell-build-system)
(properties '((upstream-name . "wl-pprint-text")))
(inputs (list ghc-base-compat))
- (home-page "http://hackage.haskell.org/package/wl-pprint-text")
+ (home-page "https://hackage.haskell.org/package/wl-pprint-text")
(synopsis "Wadler/Leijen Pretty Printer for Text values")
(description "A clone of wl-pprint for use with the text library.")
(license license:bsd-3)))
@@ -14274,7 +14480,7 @@ bindings are a direct translation of the C bindings.")
`(#:extra-directories ("libx11" "libxft" "xorgproto")))
(inputs (list ghc-x11 ghc-utf8-string libx11 libxft xorgproto))
(native-inputs (list pkg-config))
- (home-page "http://hackage.haskell.org/package/X11-xft")
+ (home-page "https://hackage.haskell.org/package/X11-xft")
(synopsis "Bindings to Xft")
(description
"Bindings to the Xft, X Free Type interface library, and some Xrender
@@ -14320,39 +14526,24 @@ parts.")
(define-public ghc-xml-conduit
(package
(name "ghc-xml-conduit")
- (version "1.9.1.1")
+ (version "1.9.1.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "xml-conduit" version))
(sha256
- (base32
- "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"))))
+ (base32 "1pa8arh2s7ql61pap9599j9ll94rb4j70c11vpgqymm01gx4d6wm"))))
(build-system haskell-build-system)
(properties '((upstream-name . "xml-conduit")))
- (inputs
- (list ghc-conduit
- ghc-conduit-extra
- ghc-resourcet
- ghc-xml-types
- ghc-attoparsec
- ghc-data-default-class
- ghc-blaze-markup
- ghc-blaze-html))
- (native-inputs (list ghc-hspec ghc-hunit ghc-doctest hspec-discover))
- (arguments
- `(#:cabal-revision ("2"
- "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6")
- #:tests? #f ; Depend on non-existent doctest API.
- #:phases
- (modify-phases %standard-phases
- ;; Tries to use non-existent doctest API.
- (add-after 'unpack 'disable-doctest
- (lambda _
- (with-output-to-file "Setup.hs"
- (lambda _
- (display
- "import Distribution.Simple\nmain = defaultMain\n"))))))))
+ (inputs (list ghc-conduit
+ ghc-conduit-extra
+ ghc-resourcet
+ ghc-xml-types
+ ghc-attoparsec
+ ghc-data-default-class
+ ghc-blaze-markup
+ ghc-blaze-html))
+ (native-inputs (list ghc-hspec ghc-hunit ghc-doctest ghc-cabal-doctest))
(home-page "https://github.com/snoyberg/xml")
(synopsis "Utilities for dealing with XML with the conduit package")
(description
@@ -14403,13 +14594,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
(define-public ghc-yaml
(package
(name "ghc-yaml")
- (version "0.11.8.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "yaml" version))
- (sha256
- (base32
- "1s0arllihjjqp65jbc8c1w5106i2infppsirvbsifpmpkf14w6pn"))))
+ (version "0.11.11.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "yaml" version))
+ (sha256
+ (base32 "0j7xa3bgznaj35x3x184c0dy6hjflxkdwp3iprfnhmz2ds2dr790"))))
(build-system haskell-build-system)
(properties '((upstream-name . "yaml")))
(inputs (list ghc-aeson
@@ -14429,8 +14620,8 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
ghc-temporary
hspec-discover))
(arguments
- `(#:cabal-revision ("2"
- "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l")))
+ `(#:cabal-revision ("1"
+ "1pqiq7x2ccjjx4ibf6l1fgvc673k2ny9cwh9061mf9pn5qhg51n5")))
(home-page "https://github.com/snoyberg/yaml#readme")
(synopsis "Parsing and rendering YAML documents")
(description
@@ -14440,13 +14631,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
(define-public ghc-zip-archive
(package
(name "ghc-zip-archive")
- (version "0.4.2.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "zip-archive" version))
- (sha256
- (base32
- "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4"))))
+ (version "0.4.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "zip-archive" version))
+ (sha256
+ (base32 "01ax0idyvggizbdbg38nynmm5dk53apsjbj2xaq8v11ry6h0y1b8"))))
(build-system haskell-build-system)
(properties '((upstream-name . "zip-archive")))
(inputs (list ghc-zlib ghc-digest))
@@ -14461,7 +14652,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
(path (getenv "PATH")))
(setenv "PATH" (string-append unzip "/bin:" which "/bin:" path))
#t))))))
- (home-page "http://github.com/jgm/zip-archive")
+ (home-page "https://github.com/jgm/zip-archive")
(synopsis "Zip archive library for Haskell")
(description
"The zip-archive library provides functions for creating,
@@ -14484,7 +14675,7 @@ modifying, and extracting files from zip archives in Haskell.")
`(#:extra-directories ("zlib")))
(inputs (list zlib))
(native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-quickcheck))
- (home-page "http://hackage.haskell.org/package/zlib")
+ (home-page "https://hackage.haskell.org/package/zlib")
(synopsis "Compression and decompression in the gzip and zlib formats")
(description
"This package provides a pure interface for compressing and decompressing
@@ -14548,20 +14739,17 @@ compression ratios.")
(define-public ghc-indexed-traversable
(package
(name "ghc-indexed-traversable")
- (version "0.1.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "indexed-traversable" version))
- (sha256
- (base32
- "13b91rkhs6wcshaz3dwx6x3xjpw5z5bm2riwp78zxccqf7p5hs2i"))))
+ (version "0.1.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "indexed-traversable" version))
+ (sha256
+ (base32 "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"))))
(build-system haskell-build-system)
(properties '((upstream-name . "indexed-traversable")))
(inputs (list ghc-generic-deriving))
- (arguments
- `(#:cabal-revision ("2"
- "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj")))
- (home-page "http://hackage.haskell.org/package/indexed-traversable")
+ (home-page "https://hackage.haskell.org/package/indexed-traversable")
(synopsis "Indexed Functor, Foldable, and Traversable typeclasses")
(description
"This Haskell package provides three useful generalizations:
@@ -14663,7 +14851,7 @@ on selective functors} for more details.")
(arguments
`(#:cabal-revision ("2"
"1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp")))
- (home-page "http://github.com/ekmett/keys/")
+ (home-page "https://github.com/ekmett/keys/")
(synopsis "Keyed functors and containers")
(description
"This package provides a bunch of ad hoc classes for accessing parts of
@@ -14693,7 +14881,7 @@ dependencies.")
ghc-transformers-compat
ghc-hashable
ghc-unordered-containers))
- (home-page "http://github.com/ekmett/pointed/")
+ (home-page "https://github.com/ekmett/pointed/")
(synopsis "Pointed and copointed data types")
(description
"This Haskell library provides pointed and copointed data types.")
@@ -14702,23 +14890,21 @@ dependencies.")
(define-public ghc-vector-instances
(package
(name "ghc-vector-instances")
- (version "3.4")
+ (version "3.4.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "vector-instances" version))
(sha256
- (base32 "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv"))))
+ (base32 "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l"))))
(build-system haskell-build-system)
(properties '((upstream-name . "vector-instances")))
- (inputs
- (list ghc-vector
- ghc-semigroupoids
- ghc-semigroups
- ghc-comonad
- ghc-pointed
- ghc-keys
- ghc-hashable))
+ (inputs (list ghc-vector
+ ghc-semigroupoids
+ ghc-comonad
+ ghc-pointed
+ ghc-keys
+ ghc-hashable))
(home-page "https://github.com/ekmett/vector-instances")
(synopsis "Orphan instances for @code{Data.Vector}")
(description
@@ -14834,13 +15020,13 @@ it.")
(define-public ghc-unicode-collation
(package
(name "ghc-unicode-collation")
- (version "0.1.3.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "unicode-collation" version))
- (sha256
- (base32
- "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl"))))
+ (version "0.1.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "unicode-collation" version))
+ (sha256
+ (base32 "0afllqpds1ak3gailsn18r7pjdp1mqycdpwwcfifvmk9nadvx3dh"))))
(build-system haskell-build-system)
(properties '((upstream-name . "unicode-collation")))
(inputs (list ghc-th-lift-instances))
@@ -14859,13 +15045,13 @@ provided.")
(define-public ghc-citeproc
(package
(name "ghc-citeproc")
- (version "0.8.0.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "citeproc" version))
- (sha256
- (base32
- "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw"))))
+ (version "0.8.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "citeproc" version))
+ (sha256
+ (base32 "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik"))))
(build-system haskell-build-system)
(properties '((upstream-name . "citeproc")))
(inputs (list ghc-safe
@@ -14883,7 +15069,7 @@ provided.")
ghc-base-compat
ghc-aeson-pretty))
(native-inputs (list ghc-timeit ghc-diff))
- (home-page "http://hackage.haskell.org/package/citeproc")
+ (home-page "https://hackage.haskell.org/package/citeproc")
(synopsis "Generate citations and bibliography from CSL styles")
(description
"@code{ghc-citeproc} parses @acronym{Citation Style Language, CSL} style files
@@ -14927,13 +15113,13 @@ varies linearly with input length.")
(define-public ghc-commonmark-extensions
(package
(name "ghc-commonmark-extensions")
- (version "0.2.3.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "commonmark-extensions" version))
- (sha256
- (base32
- "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl"))))
+ (version "0.2.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "commonmark-extensions" version))
+ (sha256
+ (base32 "0pk6ckpb01pr9i2xyx2bm1sbkzbxy5vfy8l67pca1y0i0glyz150"))))
(build-system haskell-build-system)
(properties '((upstream-name . "commonmark-extensions")))
(inputs (list ghc-network-uri ghc-commonmark ghc-emojis))
@@ -14949,13 +15135,13 @@ footnotes, math, and more.")
(define-public ghc-commonmark-pandoc
(package
(name "ghc-commonmark-pandoc")
- (version "0.2.1.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "commonmark-pandoc" version))
- (sha256
- (base32
- "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap"))))
+ (version "0.2.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "commonmark-pandoc" version))
+ (sha256
+ (base32 "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"))))
(build-system haskell-build-system)
(properties '((upstream-name . "commonmark-pandoc")))
(inputs (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types))
@@ -14966,6 +15152,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")
@@ -15044,21 +15252,25 @@ information.")
(define-public ghc-binary-orphans
(package
(name "ghc-binary-orphans")
- (version "1.0.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "binary-orphans" version))
- (sha256
- (base32
- "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2"))))
+ (version "1.0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "binary-orphans" version))
+ (sha256
+ (base32 "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"))))
(build-system haskell-build-system)
(properties '((upstream-name . "binary-orphans")))
+ (inputs (list ghc-data-array-byte))
(native-inputs (list ghc-onetuple
ghc-quickcheck
ghc-quickcheck-instances
ghc-tagged
ghc-tasty
ghc-tasty-quickcheck))
+ (arguments
+ `(#:cabal-revision ("3"
+ "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx")))
(home-page "https://hackage.haskell.org/package/binary-orphans")
(synopsis "Compatibility package for binary")
(description "This package provides instances defined in later versions of
@@ -15091,17 +15303,17 @@ of Netlink families.")
(define-public ghc-doctest-driver-gen
(package
(name "ghc-doctest-driver-gen")
- (version "0.3.0.6")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "doctest-driver-gen" version))
- (sha256
- (base32
- "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l"))))
+ (version "0.3.0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "doctest-driver-gen" version))
+ (sha256
+ (base32 "0xxfp1x92qi8p5xkhyymylm8m3s56c7ivc82mv13sw14msds8miq"))))
(build-system haskell-build-system)
(properties '((upstream-name . "doctest-driver-gen")))
(native-inputs (list ghc-doctest))
- (arguments (list #:tests? #f)) ;; XXX: doctest-driver-gen: error while loading shared libraries: libHSdoctest-driver-gen-0.3.0.6-3WJHXaMfGwJFKjjgcmC868-ghc9.2.5.so: cannot open shared object file: No such file or directory
+ (arguments (list #:tests? #f)) ; Test executable fails to run.
(home-page "https://github.com/Hexirp/doctest-driver-gen#readme")
(synopsis "Generate driver file for Doctest's Cabal integration")
(description
@@ -15112,13 +15324,13 @@ lets you automatically generate driver file for Doctest's Cabal integration.")
(define-public ghc-template-haskell-compat-v0208
(package
(name "ghc-template-haskell-compat-v0208")
- (version "0.1.9.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "template-haskell-compat-v0208" version))
- (sha256
- (base32
- "1z87rla4vcbghdrvjkay59b686f0by02102vwrcayn4vbwzn4am1"))))
+ (version "0.1.9.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "template-haskell-compat-v0208" version))
+ (sha256
+ (base32 "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0"))))
(build-system haskell-build-system)
(properties '((upstream-name . "template-haskell-compat-v0208")))
(home-page
@@ -15162,21 +15374,19 @@ built.")
(define-public ghc-blaze-textual
(package
(name "ghc-blaze-textual")
- (version "0.2.2.1")
+ (version "0.2.3.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "blaze-textual" version))
(sha256
- (base32 "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs"))))
+ (base32 "1chpaynfqiykqdk4jrmwxczj01wph8qfb411600l0gj3g34wlanx"))))
(build-system haskell-build-system)
(properties '((upstream-name . "blaze-textual")))
- (inputs
- (list ghc-blaze-builder ghc-old-locale ghc-vector))
- (native-inputs
- (list ghc-quickcheck ghc-double-conversion ghc-test-framework
- ghc-test-framework-quickcheck2))
- (home-page "https://github.com/bos/blaze-textual")
+ (inputs (list ghc-blaze-builder ghc-old-locale ghc-vector))
+ (native-inputs (list ghc-quickcheck ghc-double-conversion
+ ghc-test-framework ghc-test-framework-quickcheck2))
+ (home-page "https://github.com/swamp-agr/blaze-textual")
(synopsis "Fast rendering of common datatypes")
(description
"@code{ghc-blaze-textual} is a fast Haskell library for rendering common
@@ -15244,13 +15454,13 @@ Language} for @code{ghc-persistent}.")
(define-public ghc-persistent-mysql
(package
(name "ghc-persistent-mysql")
- (version "2.13.1.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "persistent-mysql" version))
- (sha256
- (base32
- "0fm6agqwawwraw6l6kxm8lq40pm5pnjg093f574a7sdf648q21yc"))))
+ (version "2.13.1.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "persistent-mysql" version))
+ (sha256
+ (base32 "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d"))))
(build-system haskell-build-system)
(properties '((upstream-name . "persistent-mysql")))
(inputs (list ghc-persistent
@@ -15262,8 +15472,7 @@ Language} for @code{ghc-persistent}.")
ghc-mysql-simple
ghc-resourcet
ghc-resource-pool
- ghc-unliftio-core
- openssl))
+ ghc-unliftio-core))
(native-inputs (list ghc-fast-logger
ghc-hspec
ghc-http-api-data
@@ -15273,7 +15482,7 @@ Language} for @code{ghc-persistent}.")
ghc-persistent-test
ghc-quickcheck
ghc-quickcheck-instances))
- (arguments (list #:tests? #f)) ; Fails to connect to server.
+ (arguments (list #:tests? #f)) ; Tests fail to build.
(home-page "http://www.yesodweb.com/book/persistent")
(synopsis
"Backend for the @code{ghc-persistent} library using MySQL database server")
@@ -15331,19 +15540,19 @@ string types into values of other string types.")
(define-public ghc-postgresql-libpq
(package
(name "ghc-postgresql-libpq")
- (version "0.9.4.3")
+ (version "0.9.5.0")
(source
(origin
(method url-fetch)
(uri (hackage-uri "postgresql-libpq" version))
(sha256
- (base32 "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"))))
+ (base32 "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi"))))
(build-system haskell-build-system)
(properties '((upstream-name . "postgresql-libpq")))
+ (native-inputs (list postgresql))
(arguments
- `(#:cabal-revision ("3"
- "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs")))
- (inputs (list postgresql))
+ `(#:cabal-revision ("1"
+ "02g69cm1nqvvakyjs7ps2q9nkl4vpcdcxl41s7hzpy3vjhyar036")))
(home-page "https://github.com/haskellari/postgresql-libpq")
(synopsis "Low-level bindings to @code{libpq}")
(description
@@ -15400,13 +15609,13 @@ server and to receive the results of these queries.")
(define-public ghc-persistent-postgresql
(package
(name "ghc-persistent-postgresql")
- (version "2.13.5.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "persistent-postgresql" version))
- (sha256
- (base32
- "1q9hy49nfrb3azgz5rjz235d7scy27l5axkih7crskaa04hf4k8d"))))
+ (version "2.13.5.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "persistent-postgresql" version))
+ (sha256
+ (base32 "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i"))))
(build-system haskell-build-system)
(properties '((upstream-name . "persistent-postgresql")))
(inputs (list ghc-persistent
@@ -15436,7 +15645,10 @@ server and to receive the results of these queries.")
ghc-http-api-data
ghc-unordered-containers
ghc-vector))
- (arguments (list #:tests? #f)) ; Fails to connect to server.
+ (arguments
+ `(#:cabal-revision ("1"
+ "1qbd3s0nyii6s69jvn8bw9hmxrqs41wimy9jn6j359w4rl1xslqc")
+ #:tests? #f)) ; Tests fail to build.
(home-page "http://www.yesodweb.com/book/persistent")
(synopsis "Backend for the @code{ghc-persistent library} using Postgresql")
(description
@@ -15467,18 +15679,17 @@ using the @code{ghc-postgresql-simple} package.")
(define-public ghc-filelock
(package
(name "ghc-filelock")
- (version "0.1.1.5")
+ (version "0.1.1.6")
(source
(origin
(method url-fetch)
(uri (hackage-uri "filelock" version))
(sha256
- (base32 "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh"))))
+ (base32 "122v6nv13rgi7nprdcpz8zc534i85yz6lshx0jx5mfqjam4zcx5g"))))
(build-system haskell-build-system)
(properties '((upstream-name . "filelock")))
- (native-inputs
- (list ghc-async ghc-async))
- (home-page "https://github.com/takano-akio/filelock")
+ (native-inputs (list ghc-async))
+ (home-page "https://github.com/haskell-pkg-janitors/filelock")
(synopsis "Portable interface to file locking")
(description
"This package provides an interface to file locking functionalities.")
@@ -15501,7 +15712,7 @@ using the @code{ghc-postgresql-simple} package.")
(arguments
`(#:cabal-revision ("5"
"06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14")))
- (home-page "http://hackage.haskell.org/package/HsYAML-aeson")
+ (home-page "https://hackage.haskell.org/package/HsYAML-aeson")
(synopsis "JSON to YAML adapter")
(description
"The @uref{https://yaml.org/spec/1.2/spec.html, YAML 1.2} format provides
@@ -15654,18 +15865,18 @@ pages.")
(define-public ghc-breakpoint
(package
(name "ghc-breakpoint")
- (version "0.1.2.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "breakpoint" version))
- (sha256
- (base32
- "1hk9mjijxvqjzcfqllzi53rmxiyggbxash05jbb742wrq832h2xw"))))
+ (version "0.1.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "breakpoint" version))
+ (sha256
+ (base32 "1bj3bccmrk5c7zxb29rwzz39l0ph6qk0crw1vdhhsrcybmdc96h5"))))
(build-system haskell-build-system)
(properties '((upstream-name . "breakpoint")))
(inputs (list ghc-pretty-simple ghc-ansi-terminal))
(native-inputs (list ghc-tasty ghc-tasty-hunit))
- (home-page "http://hackage.haskell.org/package/breakpoint")
+ (home-page "https://hackage.haskell.org/package/breakpoint")
(synopsis "Set breakpoints using a GHC plugin")
(description
"This package provides a plugin that allows you to set breakpoints for debugging
@@ -15673,6 +15884,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")
@@ -15715,7 +15979,7 @@ purposes. See the
(properties '((upstream-name . "git-lfs")))
(inputs (list ghc-http-client ghc-http-types ghc-aeson ghc-network-uri
ghc-case-insensitive))
- (home-page "http://hackage.haskell.org/package/git-lfs")
+ (home-page "https://hackage.haskell.org/package/git-lfs")
(synopsis "git-lfs protocol")
(description "An implementation of the git-lfs protocol.")
(license license:agpl3)))
@@ -15735,7 +15999,7 @@ purposes. See the
(inputs (list ghc-vector))
;(native-inputs (list ghc-hedgehog ghc-random ghc-tasty ghc-tasty-hedgehog))
(arguments (list #:tests? #f)) ; Fail to compile.
- (home-page "http://hackage.haskell.org/package/nothunks")
+ (home-page "https://hackage.haskell.org/package/nothunks")
(synopsis "Examine values for unexpected thunks")
(description
"Long lived application data typically should not contain any thunks. This
@@ -15797,7 +16061,7 @@ comfortably.")
(arguments
`(#:cabal-revision ("3"
"0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw")))
- (home-page "http://hackage.haskell.org/package/OneTuple")
+ (home-page "https://hackage.haskell.org/package/OneTuple")
(synopsis "Singleton Tuple")
(description
"This package is a compatibility package for a singleton data type . > data Solo
@@ -15808,21 +16072,24 @@ a = Solo a . Note: it's not a @@newtype@@ . @@Solo@@ is available in
(define-public ghc-indexed-traversable-instances
(package
(name "ghc-indexed-traversable-instances")
- (version "0.1.1.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "indexed-traversable-instances" version))
- (sha256
- (base32
- "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9"))))
+ (version "0.1.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "indexed-traversable-instances" version))
+ (sha256
+ (base32 "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"))))
(build-system haskell-build-system)
(properties '((upstream-name . "indexed-traversable-instances")))
(inputs (list ghc-indexed-traversable ghc-onetuple ghc-tagged
ghc-unordered-containers ghc-vector))
(native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty
ghc-tasty-quickcheck))
+ (arguments
+ `(#:cabal-revision ("2"
+ "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80")))
(home-page
- "http://hackage.haskell.org/package/indexed-traversable-instances")
+ "https://hackage.haskell.org/package/indexed-traversable-instances")
(synopsis
"More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex")
(description
@@ -15927,29 +16194,21 @@ Documentation is at
(define-public ghc-pcg-random
(package
(name "ghc-pcg-random")
- (version "0.1.3.7")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "pcg-random" version))
- (sha256
- (base32
- "1l6jq5nvmg1ygk7i7g50s47p6qkh74p9avl1wbcxdl5m85lc5j76"))))
+ (version "0.1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "pcg-random" version))
+ (sha256
+ (base32 "09hnckb3xzb3spn79jvqlsbg05zm9r1l3dqq44ka07ik4zbagjbf"))))
(build-system haskell-build-system)
(properties '((upstream-name . "pcg-random")))
(inputs (list ghc-primitive ghc-random ghc-entropy))
- (native-inputs (list ghc-doctest))
+ (native-inputs (list ghc-doctest ghc-cabal-doctest))
(arguments
- `(#:tests? #f ; Could not find module ‘Build_doctests’
- #:phases
- (modify-phases %standard-phases
- ;; Tries to use non-existent doctest API.
- (add-after 'unpack 'disable-doctest
- (lambda _
- (with-output-to-file "Setup.hs"
- (lambda _
- (display
- "import Distribution.Simple\nmain = defaultMain\n"))))))))
- (home-page "http://github.com/cchalmers/pcg-random")
+ `(#:cabal-revision ("1"
+ "1f8h0lv34cmqaxccg2yf6q4s8r5g2s8q8s9kql212iggd2l3vv77")))
+ (home-page "https://github.com/cchalmers/pcg-random")
(synopsis "Haskell bindings to the PCG random number generator.")
(description
"PCG is a family of simple fast space-efficient statistically good algorithms for
@@ -16040,7 +16299,7 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be
"18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"))))
(build-system haskell-build-system)
(properties '((upstream-name . "ordered-containers")))
- (home-page "http://hackage.haskell.org/package/ordered-containers")
+ (home-page "https://hackage.haskell.org/package/ordered-containers")
(synopsis
"Set- and Map-like types that remember the order elements were inserted")
(description "")
@@ -16124,13 +16383,13 @@ embeddable scripting language <https://lua.org Lua>.")
(define-public ghc-lua-arbitrary
(package
(name "ghc-lua-arbitrary")
- (version "1.0.1")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "lua-arbitrary" version))
- (sha256
- (base32
- "01g2pkvy7yhcrk8p1d9xzmqv279ldgy9z5aa6xj5msbxrpxvbpma"))))
+ (version "1.0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "lua-arbitrary" version))
+ (sha256
+ (base32 "0kbvcgi54ycl8zfdkc80ap5yhz0dml9bjdgmzx9l9m4rkhyi9xnm"))))
(build-system haskell-build-system)
(properties '((upstream-name . "lua-arbitrary")))
(inputs (list ghc-lua ghc-quickcheck))
@@ -16247,13 +16506,13 @@ as a way to specfiy column alignments.")
(define-public ghc-lpeg
(package
(name "ghc-lpeg")
- (version "1.0.3")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "lpeg" version))
- (sha256
- (base32
- "19vvsvdw8l2zjwdcypnzw12vc9ycix92mkd6g3f6kx1i364z9hg1"))))
+ (version "1.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "lpeg" version))
+ (sha256
+ (base32 "1fsl43m4p1h40npwd51qn2vafzjwyvs5yb5159l37w95l8hlf214"))))
(build-system haskell-build-system)
(properties '((upstream-name . "lpeg")))
(inputs (list ghc-lua))
@@ -16305,7 +16564,7 @@ Lua tables, but are augmented with convenience functions.")
(properties '((upstream-name . "should-not-typecheck")))
(inputs (list ghc-hunit))
(native-inputs (list ghc-hspec ghc-hspec-expectations))
- (home-page "http://github.com/CRogers/should-not-typecheck")
+ (home-page "https://github.com/CRogers/should-not-typecheck")
(synopsis
"A HUnit/hspec assertion library to verify that an expression does not typecheck")
(description
@@ -16482,19 +16741,19 @@ CHANGELOG>")
(define-public ghc-boring
(package
(name "ghc-boring")
- (version "0.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "boring" version))
- (sha256
- (base32
- "0d2cm9ra69cvaxs5x3lr2rfv7xx6xrbpb3dbcpyd8m77cqxm7b0b"))))
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "boring" version))
+ (sha256
+ (base32 "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"))))
(build-system haskell-build-system)
(properties '((upstream-name . "boring")))
(inputs (list ghc-tagged))
(arguments
- `(#:cabal-revision ("2"
- "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828")))
+ `(#:cabal-revision ("1"
+ "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy")))
(home-page "https://github.com/phadej/boring")
(synopsis "Boring and Absurd types")
(description
@@ -16631,7 +16890,7 @@ scripting language <https://lua.org Lua>.")
(properties '((upstream-name . "recv")))
(inputs (list ghc-network))
(native-inputs (list ghc-hspec hspec-discover))
- (home-page "http://github.com/yesodweb/wai")
+ (home-page "https://github.com/yesodweb/wai")
(synopsis "Efficient netowrk recv")
(description "Network recv based on buffer pools")
(license license:bsd-3)))
@@ -16639,18 +16898,21 @@ scripting language <https://lua.org Lua>.")
(define-public ghc-glib
(package
(name "ghc-glib")
- (version "0.13.8.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "glib" version))
- (sha256
- (base32
- "09qamkxkpx2paazbh8x225wvwgzgpp0g0a3s708n96q76b4bvd46"))))
+ (version "0.13.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "glib" version))
+ (sha256
+ (base32 "149y33ddv8vkvak0042ismiwh6lgc706n3n3bvnmrgw67fmi57m1"))))
(build-system haskell-build-system)
(properties '((upstream-name . "glib")))
(inputs (list ghc-utf8-string glib))
(native-inputs (list ghc-gtk2hs-buildtools pkg-config))
- (home-page "https://github.com/gtk2hs/gtk2hs")
+ (arguments
+ `(#:cabal-revision ("2"
+ "19zg675zvyi87415yyfyl1s7i65rz8hx8hw4scxwalcq50axj99s")))
+ (home-page "https://projects.haskell.org/gtk2hs/")
(synopsis "GLib bindings for for Gtk2Hs")
(description
"GLib is a collection of C data structures and utility functions for the GObject
@@ -16662,18 +16924,21 @@ support the packages that wrap libraries that are themselves based on GLib.")
(define-public ghc-pango
(package
(name "ghc-pango")
- (version "0.13.8.2")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "pango" version))
- (sha256
- (base32
- "1mndcb904vlkqpbmj5np9lxqw2qw3pzawvrgbsbxa9xjayh0ylw5"))))
+ (version "0.13.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "pango" version))
+ (sha256
+ (base32 "0qdk18vj07qivyyd0limjprni77q2xvydx748lsxsrw2ws8hb1ax"))))
(build-system haskell-build-system)
(properties '((upstream-name . "pango")))
(inputs (list ghc-glib ghc-cairo pango))
(native-inputs (list ghc-gtk2hs-buildtools pkg-config))
- (home-page "https://hackage.haskell.org/package/pango")
+ (arguments
+ `(#:cabal-revision ("2"
+ "064bpj5mmxc31snkfysb9c52v1695kxyqbj617m933mgjrw13q91")))
+ (home-page "https://projects.haskell.org/gtk2hs/")
(synopsis "Haskell bindings to the Pango text rendering engine")
(description
"This package provides a wrapper around the Pango C library that allows
@@ -16685,13 +16950,13 @@ on-screen.")
(define-public ghc-monoidal-containers
(package
(name "ghc-monoidal-containers")
- (version "0.6.3.0")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "monoidal-containers" version))
- (sha256
- (base32
- "0m41z50r3jvr8vvfry99kamb2h3knm0g7bqfwspchmhwsgqqczh4"))))
+ (version "0.6.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "monoidal-containers" version))
+ (sha256
+ (base32 "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"))))
(build-system haskell-build-system)
(properties '((upstream-name . "monoidal-containers")))
(inputs (list ghc-aeson
@@ -16702,7 +16967,10 @@ on-screen.")
ghc-witherable
ghc-semialign
ghc-these))
- (home-page "http://github.com/bgamari/monoidal-containers")
+ (arguments
+ `(#:cabal-revision ("3"
+ "0ip71g8nd07vinwlynhbq0iaxmzzwjz9gx15k1d9p7llv961rc74")))
+ (home-page "https://github.com/bgamari/monoidal-containers")
(synopsis "Containers with monoidal accumulation")
(description
"Containers with merging via monoidal accumulation. The Monoid instances
@@ -16728,7 +16996,7 @@ type's mappend'.")
(arguments
`(#:cabal-revision ("3"
"0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx")))
- (home-page "http://hackage.haskell.org/package/newtype")
+ (home-page "https://hackage.haskell.org/package/newtype")
(synopsis "Typeclass and set of functions for working with newtypes")
(description
"Per Conor McBride, the Newtype typeclass represents the packing and unpacking of
@@ -16837,7 +17105,7 @@ such as ala'.")
(build-system haskell-build-system)
(properties '((upstream-name . "random-shuffle")))
(inputs (list ghc-random ghc-monadrandom))
- (home-page "http://hackage.haskell.org/package/random-shuffle")
+ (home-page "https://hackage.haskell.org/package/random-shuffle")
(synopsis "Random shuffle implementation")
(description
"Random shuffle implementation, on immutable lists. Based on
@@ -16848,20 +17116,20 @@ implementation by Oleg Kiselyov}.")
(define-public ghc-deriving-aeson
(package
(name "ghc-deriving-aeson")
- (version "0.2.8")
- (source (origin
- (method url-fetch)
- (uri (hackage-uri "deriving-aeson" version))
- (sha256
- (base32
- "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"))))
+ (version "0.2.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "deriving-aeson" version))
+ (sha256
+ (base32 "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0"))))
(build-system haskell-build-system)
(properties '((upstream-name . "deriving-aeson")))
(inputs (list ghc-aeson))
(arguments
`(#:cabal-revision ("1"
- "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5")))
- (home-page "http://hackage.haskell.org/package/deriving-aeson")
+ "14iqkk7vs0lb0sgq159z0xw95pa87r60i1f4m17gfh2gbbddcywm")))
+ (home-page "https://hackage.haskell.org/package/deriving-aeson")
(synopsis "Type driven generic aeson instance customisation")
(description
"This package provides a newtype wrapper with FromJSON/ToJSON instances
@@ -16979,7 +17247,7 @@ provided from returning something else.")
"0isilgcbw12zyh8s2liaj5r9r5m3yg1xskyhag6f36qi60y29hx5"))))
(build-system haskell-build-system)
(properties '((upstream-name . "ref-tf")))
- (home-page "http://hackage.haskell.org/package/ref-tf")
+ (home-page "https://hackage.haskell.org/package/ref-tf")
(synopsis "Type class for monads with references using type families")
(description
"This package contains a @code{MonadRef} type class that abstracts over
@@ -16987,6 +17255,33 @@ the details of manipulating references, allowing one to write code that can
operate in either the @code{ST} monad or the @code{IO} monad.")
(license license:bsd-3)))
+(define-public ghc-data-array-byte
+ (package
+ (name "ghc-data-array-byte")
+ (version "0.1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (hackage-uri "data-array-byte" version))
+ (sha256
+ (base32 "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"))))
+ (build-system haskell-build-system)
+ (properties '((upstream-name . "data-array-byte")))
+ ;(native-inputs (list ghc-quickcheck-classes-base ghc-tasty
+ ; ghc-tasty-quickcheck))
+ (arguments
+ `(#:tests? #f ; Avoid dependency cycle.
+ #:cabal-revision ("3"
+ "136rjhg0m49d2l8z7kp46hc8q7bkipvkwnn40nv8kqkpvrgrg8d4")))
+ (home-page "https://github.com/Bodigrim/data-array-byte")
+ (synopsis "Compatibility layer for Data.Array.Byte")
+ (description
+ "Compatibility layer for
+@url{https://hackage.haskell.org/package/base/docs/Data-Array-Byte.html,Data.Array.Byte}
+providing boxed wrappers for @code{ByteArray} and
+@code{MutableByteArray} and relevant instances for GHC < 9.4.")
+ (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/haskell.scm b/gnu/packages/haskell.scm
index 6d8675d37e..10803f5afe 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1174,7 +1174,8 @@ interactive environment for the functional language Haskell.")
"https://www.haskell.org/ghc/dist/"
version "/" name "-" version "-testsuite.tar.xz"))
(patches (search-patches "ghc-testsuite-dlopen-pie.patch"
- "ghc-testsuite-grep-compat.patch"))
+ "ghc-testsuite-grep-compat.patch"
+ "ghc-testsuite-recomp015-execstack.patch"))
(sha256
(base32
"0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91"))
@@ -1256,7 +1257,8 @@ interactive environment for the functional language Haskell.")
"https://www.haskell.org/ghc/dist/"
version "/ghc-" version "-testsuite.tar.xz"))
(patches (search-patches "ghc-testsuite-dlopen-pie.patch"
- "ghc-testsuite-grep-compat.patch"))
+ "ghc-testsuite-grep-compat.patch"
+ "ghc-testsuite-recomp015-execstack.patch"))
(sha256
(base32
"0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))
@@ -1315,7 +1317,8 @@ interactive environment for the functional language Haskell.")
"https://www.haskell.org/ghc/dist/"
version "/ghc-" version "-testsuite.tar.xz"))
(patches (search-patches "ghc-testsuite-dlopen-pie.patch"
- "ghc-testsuite-grep-compat.patch"))
+ "ghc-testsuite-grep-compat.patch"
+ "ghc-testsuite-recomp015-execstack.patch"))
(sha256
(base32
"1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz"))
@@ -1398,7 +1401,8 @@ interactive environment for the functional language Haskell.")
"/ghc-" version "-src.tar.xz"))
(sha256
(base32
- "15wii8can2r3dcl6jjmd50h2jvn7rlmn05zb74d2scj6cfwl43hl"))))
+ "15wii8can2r3dcl6jjmd50h2jvn7rlmn05zb74d2scj6cfwl43hl"))
+ (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch"))))
(native-inputs
`(;; GHC 9.0.2 must be built with GHC >= 8.8
("ghc-bootstrap" ,ghc-8.10)
@@ -1411,7 +1415,8 @@ interactive environment for the functional language Haskell.")
(sha256
(base32
"1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s"))
- (patches (search-patches "ghc-9.2-grep-warnings.patch"))
+ (patches (search-patches "ghc-9.2-grep-warnings.patch"
+ "ghc-testsuite-recomp015-execstack.patch"))
(modules '((guix build utils)))
(snippet
;; collections.Iterable was moved to collections.abc in Python 3.10.
@@ -1436,15 +1441,16 @@ interactive environment for the functional language Haskell.")
(package
(inherit base)
(name "ghc")
- (version "9.2.5")
+ (version "9.2.8")
(source (origin
(method url-fetch)
(uri (string-append "https://www.haskell.org/ghc/dist/" version
"/ghc-" version "-src.tar.xz"))
(sha256
(base32
- "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6"))
- (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch"))))
+ "18b7ln4gx2vy62jpv3z5slv3zfxmxnmkgajznks15zglddwd24sz"))
+ (patches (search-patches "ghc-9.2-cabal-support-package-path.patch"
+ "ghc-9-StgCRunAsm-only-when-needed.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
@@ -1474,8 +1480,9 @@ interactive environment for the functional language Haskell.")
version "/ghc-" version "-testsuite.tar.xz"))
(sha256
(base32
- "19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l"))
- (patches (search-patches "ghc-9.2-grep-warnings.patch"))))
+ "0cmmwhcwv9fjzvmgjj85d354858qqbmqfzaz5160xqj4yl9zk225"))
+ (patches (search-patches "ghc-9.2-grep-warnings.patch"
+ "ghc-testsuite-recomp015-execstack.patch"))))
,@(filter (match-lambda
(("ghc-bootstrap" . _) #f)
(("ghc-testsuite" . _) #f)
@@ -1565,7 +1572,8 @@ interactive environment for the functional language Haskell.")
"/ghc-" version "-src.tar.xz"))
(sha256
(base32
- "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))))
+ "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))
+ (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
@@ -1583,7 +1591,8 @@ interactive environment for the functional language Haskell.")
version "/ghc-" version "-testsuite.tar.xz"))
(sha256
(base32
- "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))))
+ "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))
+ (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
,@(filter (match-lambda
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 79c14a2996..668699a28c 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -96,7 +97,7 @@ Development Environment} (IDE).")
(define-public bvi
(package
(name "bvi")
- (version "1.4.1")
+ (version "1.4.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -104,7 +105,7 @@ Development Environment} (IDE).")
"/bvi-" version ".src.tar.gz"))
(sha256
(base32
- "0a0yl0dcyff31k3dr4dpgqmlwygp8iaslnr5gmb6814ylxf2ad9h"))))
+ "1wllrvs8r8bdm11sx01095j8cj4drjmw0dlkjfdkm5lnnk11dfjb"))))
(build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no check target
(inputs
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index b0e6631389..171b0b5588 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -1,8 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2024 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
@@ -69,7 +71,7 @@
(define-public haproxy
(package
(name "haproxy")
- (version "2.9.0")
+ (version "3.0.3")
(source
(origin
(method url-fetch)
@@ -77,7 +79,7 @@
(version-major+minor version)
"/src/haproxy-" version ".tar.gz"))
(sha256
- (base32 "1aqfp1gslk4dfvrrzg51h0mn1j4n4in82z701bi7ycs63b6qm8gv"))))
+ (base32 "1pqrgndf5ciyq3l4ywrjj3q917dms59cmzxk5ihd400bg8c3r9rr"))))
(build-system gnu-build-system)
(arguments
(list
@@ -100,7 +102,7 @@
#~(modify-phases %standard-phases
(delete 'configure))))
(inputs
- (list lua openssl pcre2 zlib))
+ (list libxcrypt lua openssl pcre2 zlib))
(home-page "https://www.haproxy.org/")
(synopsis "Reliable, high performance TCP/HTTP load balancer")
(description "HAProxy offers @acronym{HA, high availability}, load
@@ -142,7 +144,7 @@ applications.")
(define-public kronosnet
(package
(name "kronosnet")
- (version "1.28")
+ (version "1.29")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -151,7 +153,7 @@ applications.")
(file-name (git-file-name name version))
(sha256
(base32
- "05kws374sj0p3yg918kf2l2jp518k0c9j5qgzb9gl327cwlbwkls"))))
+ "0dgj8wj0s8x6z7ahgp03fvrx4xv2v7lv8d0j7qbr9jw3ssj0rdc3"))))
(build-system gnu-build-system)
(arguments
;; XXX: Multiple tests failed. Tests
@@ -202,7 +204,7 @@ applications.")
(define-public nats-server
(package
(name "nats-server")
- (version "2.10.10")
+ (version "2.10.16")
(source
(origin
(method git-fetch)
@@ -211,7 +213,7 @@ applications.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1sn8a3xfs1s9jc5fphrnc0ahh83h7ma2ckg2x447gdhg1p7pf9gn"))))
+ (base32 "1l5132swcxxk1d0xdwh1aqrlkcmcss9m9y6hky2yk6b33l1w681v"))))
(build-system go-build-system)
(inputs
(list go-github-com-klauspost-compress
@@ -226,7 +228,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/hunspell.scm b/gnu/packages/hunspell.scm
index 7163358260..e228a844bf 100644
--- a/gnu/packages/hunspell.scm
+++ b/gnu/packages/hunspell.scm
@@ -266,6 +266,41 @@ spell-checking library.")
(home-page "https://magyarispell.sourceforge.net/")
(license (list license:gpl2 license:gpl3)))))
+(define-public hunspell-dict-el
+ (let ((commit "8e799911aede4e2c340d1b5a67a07f8e22ab9c8e"))
+ (package
+ (name "hunspell-dict-el")
+ (version "0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.thanosapollo.org/hunspell-dict-el")
+ (commit commit)))
+ (sha256
+ (base32 "0z9nyfy50c0bjvvm42xwd3npjpp07a9slm3gfgvxanyqm7djrmb1"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (delete 'build)
+ (delete 'configure)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (share (string-append out "/share/hunspell/")))
+ (install-file "el_GR.aff" share)
+ (install-file "el_GR.dic" share)
+ #t))))
+ #:tests? #f))
+ (native-inputs
+ (list hunspell ispell perl))
+ (synopsis "Hunspell Greek/Hellenic dictionary")
+ (description "This package provides a dictionary for the Hunspell
+spell-checking library.")
+ (home-page "https://git.thanosapollo.org/hunspell-dict-el/")
+ (license (list license:gpl2 license:gpl3)))))
+
(define* (hunspell-dictionary dict-name full-name #:key synopsis home-page license)
(package
(name (string-append
@@ -276,7 +311,7 @@ spell-checking library.")
(#\_ #\-)
(chr chr))
(string-downcase dict-name))))
- (version "7.5.4.2")
+ (version "7.6.7.2")
(source
(origin
(method git-fetch)
@@ -287,7 +322,7 @@ spell-checking library.")
(string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version))
(sha256
- (base32 "1yzhyx8zwlfdqw4swxyr1lq68im2bfi1chimyc15jmli72n32szs"))))
+ (base32 "1f54z1kmpwv9s5a9jdgf97m43nhwbmsar0i6rri3qkgf3kkgz1f7"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index f697694124..3d2a37a1e2 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2022, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
@@ -57,36 +57,38 @@
version ".tar.gz"))
(define-public gnumach-headers
- (package
- (name "gnumach-headers")
- (version "1.8+git20221224") ;; This is an upstream tag
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.savannah.gnu.org/git/hurd/gnumach.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name "gnumach" version))
- (sha256
- (base32
- "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'install
- (lambda _
- (invoke "make" "install-data")))
- (delete 'build))
- #:tests? #f))
- (native-inputs
- (list autoconf automake texinfo-4))
- (supported-systems %hurd-systems)
- (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
- (synopsis "GNU Mach kernel headers")
- (description
- "Headers of the GNU Mach kernel.")
- (license gpl2+)))
+ (let ((revision "0")
+ (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0"))
+ (package
+ (name "gnumach-headers")
+ (version (git-version "1.8" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/hurd/gnumach.git")
+ (commit commit)))
+ (file-name (git-file-name "gnumach" version))
+ (sha256
+ (base32
+ "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ (invoke "make" "install-data" "install-data-hook")))
+ (delete 'build))
+ #:tests? #f))
+ (native-inputs
+ (list autoconf automake texinfo-4))
+ (supported-systems %hurd-systems)
+ (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
+ (synopsis "GNU Mach kernel headers")
+ (description
+ "Headers of the GNU Mach kernel.")
+ (license gpl2+))))
(define-public mig
(package
@@ -130,13 +132,11 @@ communication.")
(license gpl2+)))
(define-public hurd-headers
- ;; This commit is now slightly behind 0.9.git20220818 as this one needs a
- ;; newer glibc
- (let ((revision "2")
- (commit "v0.9.git20230216"))
+ (let ((revision "3")
+ (commit "v0.9.git20231217"))
(package
(name "hurd-headers")
- (version commit)
+ (version (string-drop commit 1))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -144,7 +144,7 @@ communication.")
(commit commit)))
(sha256
(base32
- "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv"))
+ "1d138kzhil6s5gf9di8grpz1iziakyfv037wkc8s7qyd61imm31d"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
@@ -181,6 +181,7 @@ communication.")
"ac_cv_func__hurd_exec_paths=no"
"ac_cv_func__hurd_libc_proc_init=no"
"ac_cv_func_file_futimens=no"
+ "ac_cv_func_file_utimens=no"
"ac_cv_lib_acpica_acpi_init=no")
#:tests? #f))
@@ -253,30 +254,21 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(package
(inherit gnumach-headers)
(name "gnumach")
- (source (origin
- (inherit (package-source gnumach-headers))
- (patches
- (append
- (search-patches "gnumach-support-noide.patch")
- (origin-patches (package-source gnumach-headers))))))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
- ((#:make-flags flags ''())
- `(cons "CFLAGS=-fcommon" ,flags))
((#:configure-flags flags ''())
- `(cons* "--enable-kdb" ;enable kernel debugger
+ `(cons* "--enable-kdb" ;enable kernel debugger
"--disable-net-group"
"--disable-pcmcia-group"
"--disable-wireless-group"
- ,flags))
+ ,flags))
((#:phases phases '%standard-phases)
- `(modify-phases %standard-phases
- (add-after 'install 'produce-image
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (boot (string-append out "/boot")))
- (invoke "make" "gnumach.gz")
- (install-file "gnumach.gz" boot))))))))
+ #~(modify-phases %standard-phases
+ (add-after 'install 'produce-image
+ (lambda _
+ (let ((boot (string-append #$output "/boot")))
+ (invoke "make" "gnumach.gz")
+ (install-file "gnumach.gz" boot))))))))
(native-inputs
(list autoconf
automake
@@ -285,7 +277,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
mig)
perl
texinfo-4))
- (supported-systems %hurd-systems)
+ (supported-systems `("i686-linux" ,@%hurd-systems))
(synopsis "Microkernel of the GNU system")
(description
"GNU Mach is the microkernel upon which a GNU Hurd system is based.")))
@@ -303,7 +295,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(define dde-sources
;; This is the current tip of the dde branch
- (let ((commit "ce8810277fa3584eb36ecb23da58394153fabe6f"))
+ (let ((commit "066797b576ebf8364ad157f50bef2a655597deeb"))
(origin
(method git-fetch)
(uri (git-reference
@@ -311,8 +303,8 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(commit commit)))
(sha256
(base32
- "0ygk7jm4jmhpvh0zzi5bk638242z7sbcab2i57fkb4y2mmdkjjbw"))
- (file-name (git-file-name "dde" commit)))))
+ "19f2awlfnar5gyhi0w5zawla5brzck2s88iv0f20022pd1l5v9hl"))
+ (file-name (git-file-name "dde" (string-take commit 7))))))
(define %import-from-dde
(list "libmachdevdde" "libddekit" "libdde_linux26"))
@@ -325,8 +317,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(name "hurd")
(source (origin
(inherit (package-source hurd-headers))
- (patches (search-patches "hurd-fix-rumpdisk-build.patch"
- "hurd-rumpdisk-no-hd.patch"))))
+ (patches (search-patches "hurd-rumpdisk-no-hd.patch"))))
(version (package-version hurd-headers))
(arguments
`(#:tests? #f ;no "check" target
@@ -475,7 +466,8 @@ exec ${system}/rc \"$@\"
(assoc-ref (or native-inputs inputs) "bash")
"/bin/bash")
(string-append "CC="
- ,(cc-for-target)))))
+ ,(cc-for-target))
+ "ARCH=x86")))
(add-after 'install 'install-goodies
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Install additional goodies.
@@ -491,7 +483,8 @@ exec ${system}/rc \"$@\"
"/bin/bash")
(string-append "INSTALLDIR="
out
- "/share/libdde_linux26/build/include"))
+ "/share/libdde_linux26/build/include")
+ "ARCH=x86")
;; Install the fancy UTF-8 motd.
(mkdir-p (string-append out "/etc"))
(copy-file "console/motd.UTF8"
@@ -581,7 +574,8 @@ implementing them.")
(list (string-append "SHELL="
(search-input-file %build-inputs "/bin/bash"))
"PKGDIR=libdde_linux26"
- (string-append "CC=" ,(cc-for-target)))
+ (string-append "CC=" ,(cc-for-target))
+ "ARCH=x86")
#:configure-flags
,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
#:phases
@@ -658,7 +652,7 @@ in userland processes thanks to the DDE layer.")
(sha256
(base32
"0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r"))
- (file-name (git-file-name name commit))))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index c821279bd3..07f5b90f67 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -46,6 +46,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@@ -81,6 +82,7 @@
(define-public ibus-minimal
(package
(name "ibus")
+ (replacement ibus-minimal/fixed)
(version "1.5.27")
(source (origin
(method url-fetch)
@@ -180,7 +182,7 @@
(rename-file
(string-append #$output "/share/gtk-doc")
(string-append #$output:doc "/share/gtk-doc"))))
- (add-after 'wrap-program 'wrap-with-additional-paths
+ (add-after 'glib-or-gtk-wrap 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
@@ -279,6 +281,23 @@ may also simplify input method development.")
(package-native-search-paths ibus-minimal)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
+(define-public ibus-minimal/fixed
+ ;; Fixes <https://github.com/ibus/ibus/issues/2476>.
+ ;; Ungraft on gnome-team, core-updates or a dedicated ungrafing branch.
+ (package
+ (inherit ibus-minimal)
+ (version "1.5.29")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/ibus/ibus/"
+ "releases/download/"
+ version "/ibus-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa"))))
+ (inputs (modify-inputs (package-inputs ibus-minimal)
+ (prepend libdbusmenu)))))
+
(define-public ibus-libpinyin
(package
(name "ibus-libpinyin")
@@ -298,7 +317,7 @@ may also simplify input method development.")
'(list "--enable-opencc")
#:phases
#~(modify-phases %standard-phases
- (add-after 'wrap-program 'wrap-with-additional-paths
+ (add-after 'glib-or-gtk-wrap 'wrap-with-additional-paths
(lambda _
;; Make sure 'ibus-setup-libpinyin' runs with the correct
;; PYTHONPATH and GI_TYPELIB_PATH.
@@ -318,7 +337,8 @@ may also simplify input method development.")
"/share/ibus-libpinyin/setup/")
,(getenv "GI_TYPELIB_PATH")))))))))
(inputs
- (list ibus
+ (list bash-minimal
+ ibus
libpinyin
bdb
sqlite
@@ -439,7 +459,8 @@ Chinese pinyin input methods.")
util-linux ;for getopt
xorg-server-for-tests))
(inputs
- (list anthy
+ (list bash-minimal
+ anthy
gtk+
ibus
gobject-introspection
@@ -503,7 +524,7 @@ traditional Chinese output.")
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 match)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:tests? #f ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
@@ -891,7 +912,8 @@ hanja dictionary and small hangul character classification.")
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")))
(inputs
- (list ibus
+ (list bash-minimal
+ ibus
glib
python-pygobject
gtk+
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 0dfe63b20a..6f09fae65c 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -126,8 +126,9 @@ C/C++ part.")
(base32
"0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
(patches
- (cons
- (search-patch
+ (append
+ (search-patches
+ "icu4c-icu-22132-fix-vtimezone.patch"
"icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
(origin-patches (package-source icu4c))))))))
@@ -177,22 +178,6 @@ C/C++ part.")
(base32
"0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"))))))
-(define-public icu4c-68
- (package
- (inherit icu4c)
- (version "68.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/unicode-org/icu/releases/download/release-"
- (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
- "/icu4c-"
- (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
- "-src.tgz"))
- (sha256
- (base32
- "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"))))))
-
(define-public icu4c-build-root
(package
(inherit icu4c)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index ceef83f3b1..033e006d06 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -54,6 +54,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
@@ -167,7 +168,7 @@ Magnetic Resonance Imaging.")
(define-public dcmtk
(package
(name "dcmtk")
- (version "3.6.7")
+ (version "3.6.8")
(source
(origin
(method url-fetch)
@@ -176,7 +177,7 @@ Magnetic Resonance Imaging.")
"dcmtk" (string-join (string-split version #\.) "")
"/dcmtk-" version ".tar.gz"))
(sha256
- (base32 "02kix73qhndgb56cmi5327666i6imp7hi17wwqp26q4d7s72jn3w"))))
+ (base32 "03vjv2lq5kr79ghf8v0q9wskkrcr2ygi097nybmqs4q3amjpc813"))))
(build-system cmake-build-system)
(arguments
;; By default, only static archives are built.
@@ -275,7 +276,18 @@ of external libraries that provide additional functionality.")
(build-system cmake-build-system)
(arguments
;; XXX: GPU tests are failing.
- (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false")))
+ (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'fix-OpenColorIOConfig
+ (lambda _
+ ;; Work around a CMake Zlib-detection bug:
+ ;; https://gitlab.kitware.com/cmake/cmake/-/issues/25200
+ ;; make OpenColorIOConfig.cmake is a normal cmake file
+ (substitute*
+ (string-append #$output
+ "/lib/cmake/OpenColorIO/OpenColorIOConfig.cmake")
+ (("\\.#define ZLIB_VERSION \"1\\.3\"")
+ "")))))))
(native-inputs
;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail.
;; They also require OIIO, but OCIO is an optional dependency to it.
@@ -309,7 +321,7 @@ many popular formats.")
(define-public vtk
(package
(name "vtk")
- (version "9.2.2")
+ (version "9.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://vtk.org/files/release/"
@@ -317,7 +329,7 @@ many popular formats.")
"/VTK-" version ".tar.gz"))
(sha256
(base32
- "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw"))
+ "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -388,6 +400,7 @@ many popular formats.")
;; Do not retain a reference to GCC.
(substitute* (choose
+ "Common/Core/vtkBuild.h.in" ;dummy >=v9.3
"Common/Core/vtkConfigureDeprecated.h.in" ;v9.x
"Common/Core/vtkConfigure.h.in") ;v7.x
(("@CMAKE_CXX_COMPILER@") "c++")))))
@@ -475,7 +488,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(define-public opencv
(package
(name "opencv")
- (version "4.9.0")
+ (version "4.10.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -514,7 +527,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(for-each delete-file (find-files "." "\\.jar$"))))
(sha256
(base32
- "1s3d2bzf74biz18flb33533dfx3j31305ddh4gzgvg55hpr1zp55"))))
+ "0vinljqhq3r8sffy2396q688irb6iz389sv5vlg04z9y7mvddb8x"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -697,7 +710,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(file-name (git-file-name "opencv_extra" version))
(sha256
(base32
- "1x095sgc0fkl8zzpxlswpnmxkf80cvzab1ddcq792dys5qm2s1x4"))))
+ "16gykga4cc8q8iqx9sj25ggxrp6mqbppwwib734nhlk1b6s2q15j"))))
("opencv-contrib"
,(origin
(method git-fetch)
@@ -706,7 +719,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(file-name (git-file-name "opencv_contrib" version))
(sha256
(base32
- "17xrvzllbcrprxn6c0g4x25i2wa7yqa0ycv177wah3if9s30dgib"))))))
+ "07sanb0kb90rwghlp4jpgvmicr39hgrsjmsc5nifcryw3d0r0m14"))))))
(inputs
(list eigen
ffmpeg-4
@@ -812,14 +825,14 @@ due to its architecture which automatically parallelises the image workflows.")
(define-public gmic
(package
(name "gmic")
- (version "3.3.5")
+ (version "3.4.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://gmic.eu/files/source/gmic_"
version ".tar.gz"))
(sha256
- (base32 "06vcwn8c8zhr1j0jy79an1f6vvjh47ipm19a20g3qsnxv7h5c905"))))
+ (base32 "0kyr91y35l2fn4f7hx17n5j8pl63kw6ik9ap09pa2n9bdsbzrjcp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;there are no tests
@@ -1482,7 +1495,8 @@ combine the information contained in both.")
"/lib/qt5/plugins"))
'("qtbase" "qtdeclarative-5"))))))))))
(inputs
- (list curl
+ (list bash-minimal
+ curl
fftw
fftwf
glu
@@ -1555,37 +1569,30 @@ full-featured UI aimed at clinical researchers.")
(sha256
(base32 "0r7n3a6bvcxkbpda4mwmrpicii09iql5z69nkjqygkwxw7ny3309"))))
(build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; No tests.
+ #:make-flags
+ #~(list
+ (string-append "PREFIX=" #$output)
+ (format #f "MANPAGE_XSL=~a/xml/xsl/~a-~a/manpages/docbook.xsl"
+ #$(this-package-native-input "docbook-xsl")
+ #$(package-name
+ (this-package-native-input "docbook-xsl"))
+ #$(package-version
+ (this-package-native-input "docbook-xsl"))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'fix-directory-creation
+ (lambda _
+ (mkdir-p (string-append #$output "/share/man/man1")))))))
(inputs
- `(("giflib" ,giflib)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("perl" ,perl)))
+ (list giflib libjpeg-turbo libpng
+ perl))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("docbook-xml" ,docbook-xml)
- ("docbook-xsl" ,docbook-xsl)
- ("xsltproc" ,libxslt)))
- (arguments
- `(#:tests? #f ; No tests.
- #:make-flags (list
- (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "MANPAGE_XSL="
- (assoc-ref %build-inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-*/manpages/docbook.xsl"))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'install 'make-local-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "metapixel.xml"
- (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd")
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/docbookx.dtd")))
- #t))
- (add-before 'install 'fix-directory-creation
- (lambda* (#:key outputs #:allow-other-keys)
- (mkdir-p (string-append (assoc-ref outputs "out") "/share/man/man1"))
- #t)))))
+ (list docbook-xml-4.2 docbook-xsl
+ libxslt pkg-config))
(home-page "https://www.complang.tuwien.ac.at/schani/metapixel/")
(synopsis "Photomosaics generator")
(description "Metapixel is a program for generating photomosaics. It can
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index dab7d9d1f2..81ee770420 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
;;; Copyright © 2022 Cairn <cairn@pm.me>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -178,7 +179,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
(define-public feh
(package
(name "feh")
- (version "3.10")
+ (version "3.10.3")
(home-page "https://feh.finalrewind.org/")
(source (origin
(method url-fetch)
@@ -186,7 +187,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
name "-" version ".tar.bz2"))
(sha256
(base32
- "166cayf1zh84y5bfaykxmi7ypxvq36hnjsbnwbjzx7zyvkvd2w8x"))))
+ "1j79850gwrjamgc22cv1hiynia4w5lc8qbhww3qpl8bhjxwy49jl"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -650,6 +651,8 @@ imaging. It supports several HDR and LDR image formats, and it can:
(package-version (this-package-input "python")))
"/site-packages/mcomix/" subdir)))
'("images" "messages")))))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
(add-after 'wrap 'gi-wrap
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index fae45363ad..3a0d490edc 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2017, 2019, 2021-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
@@ -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>
@@ -200,7 +200,7 @@ code is Valgrind-clean and unit tested.")
(define-public libpng
(package
(name "libpng")
- (version "1.6.37") ; Remember to also update libpng-apng if possible!
+ (version "1.6.39") ; Remember to also update libpng-apng if possible!
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
@@ -213,7 +213,7 @@ code is Valgrind-clean and unit tested.")
"/libpng16/libpng-" version ".tar.xz")))
(sha256
(base32
- "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"))))
+ "0dv90dxvmqpk7mbywyjbz8lh08cv4b0ksqp1y62mzvmlf379cihz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-static")))
@@ -895,7 +895,7 @@ work.")
(outputs (list "out" "pbmtools"))
(arguments
`(#:modules ((srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@@ -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)
@@ -1446,8 +1447,7 @@ language bindings to VIGRA.")
(define-public libwebp
(package
(name "libwebp")
- (version "1.2.4")
- (replacement libwebp/fixed)
+ (version "1.3.2")
(source
(origin
;; No tarballs are provided for >0.6.1.
@@ -1458,7 +1458,7 @@ language bindings to VIGRA.")
(file-name (git-file-name name version))
(sha256
(base32
- "1jndbc99dd19a6d7h4ds51xyak7gfddkbi41nxdm8n23w7ks35r8"))))
+ "1x37795gpc63g1ma9kqw4q3dikwhrjklixqzjjsj6viqksa19z41"))))
(build-system gnu-build-system)
(inputs
(list freeglut
@@ -1486,22 +1486,6 @@ to PNG when lossy compression is acceptable for the red/green/blue color
channels.")
(license license:bsd-3)))
-(define libwebp/fixed
- (package
- (inherit libwebp)
- (name "libwebp")
- (version "1.3.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://chromium.googlesource.com/webm/libwebp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x37795gpc63g1ma9kqw4q3dikwhrjklixqzjjsj6viqksa19z41"))))))
-
(define-public libmng
(package
(name "libmng")
@@ -1974,7 +1958,7 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
(define-public mini
(package
(name "mini")
- (version "0.9.14")
+ (version "0.9.15")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1983,7 +1967,7 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
(file-name (git-file-name name version))
(sha256
(base32
- "01wn7h9rjz9h6cr11dd62jsb3315d1h6c33pdmwi2l7d8a4n3h8d"))))
+ "088rz9d639lhr8sbk9z67jy981ffd7swlc8ld0qr09v51hryhwya"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -2268,15 +2252,14 @@ identical visual appearance.")
(base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5"))))
(build-system meson-build-system)
(native-inputs (append (if (%current-target-system)
- ;; for wayland-scanner
+ ;; For wayland-scanner.
(list pkg-config-for-build wayland)
'())
(list pkg-config scdoc)))
(inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols))
- (home-page "https://sr.ht/~emersion/grim/")
+ (home-page "https://wayland.emersion.fr/grim/")
(synopsis "Create screenshots from a Wayland compositor")
(description "grim can create screenshots from a Wayland compositor.")
- ;; MIT license.
(license license:expat)))
(define-public slurp
@@ -2457,7 +2440,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 +2449,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
@@ -2714,20 +2697,19 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
(gtk+ (assoc-ref inputs "gtk+")))
(wrap-program (string-append out "/bin/mypaint")
`("GI_TYPELIB_PATH" ":" prefix
- (,(getenv "GI_TYPELIB_PATH"))))
- #t)))
+ (,(getenv "GI_TYPELIB_PATH")))))))
(add-before 'check 'pre-check
(lambda _
;; Tests need writing access
- (setenv "HOME" "/tmp")
- #t)))))
+ (setenv "HOME" "/tmp"))))))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("gobject-introspection" ,gobject-introspection)
- ("swig" ,swig)
- ("gettext" ,gettext-minimal)))
+ (list pkg-config
+ gobject-introspection
+ swig
+ gettext-minimal))
(inputs
- (list gtk+
+ (list bash-minimal
+ gtk+
(librsvg-for-system)
hicolor-icon-theme
libmypaint
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index b407af3588..e7734125ad 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2021 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
@@ -65,72 +65,65 @@
;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
- (version "6.9.11-48")
+ (version "6.9.13-5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
+ "1j1chkw33vjc37509vdwss28qywfvckvs73pvscldj8d0wnwypa8"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
-
- ;; Do not embed the build date in binaries.
- "--enable-reproducible-build")
-
- ;; FIXME: The test suite succeeded before version 6.9.6-2.
- ;; Try enabling it again with newer releases.
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (add-before
- 'build 'pre-build
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "Makefile"
- ;; Clear the `LIBRARY_PATH' setting, which otherwise
- ;; interferes with our own use.
- (("^LIBRARY_PATH[[:blank:]]*=.*$")
- "")
-
- ;; Since the Makefile overrides $docdir, modify it to
- ;; refer to what we want.
- (("^DOCUMENTATION_PATH[[:blank:]]*=.*$")
- (let ((doc (assoc-ref outputs "doc")))
- (string-append "DOCUMENTATION_PATH = "
- doc "/share/doc/"
- ,name "-"
- ,(package-version this-package) "\n"))))
- #t))
- (add-before
- 'configure 'strip-configure-xml
- (lambda _
- (substitute* "config/configure.xml.in"
- ;; Do not record 'configure' arguments in the
- ;; configure.xml file that gets installed: That would
- ;; include --docdir, and thus retain a reference to the
- ;; 'doc' output.
- (("@CONFIGURE_ARGS@")
- "not recorded"))
- #t)))))
+ (list
+ #:configure-flags
+ #~(list "--with-frozenpaths"
+ "--without-gcc-arch"
+ (string-append "--with-gs-font-dir="
+ (search-input-directory %build-inputs
+ "share/fonts/type1"))
+ ;; No documentation in the stable version.
+ "--disable-docs"
+ ;; Do not embed the build date in binaries.
+ "--enable-reproducible-build")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda _
+ (substitute* "Makefile"
+ ;; Clear the `LIBRARY_PATH' setting, which otherwise
+ ;; interferes with our own use.
+ (("^LIBRARY_PATH[[:blank:]]*=.*$") ""))))
+ (add-before 'configure 'strip-configure-xml
+ (lambda _
+ (substitute* "config/configure.xml.in"
+ ;; Do not record 'configure' arguments in the
+ ;; configure.xml file that gets installed: That would
+ ;; include --docdir, and thus retain a reference to the
+ ;; 'doc' output.
+ (("@CONFIGURE_ARGS@")
+ "not recorded")))))))
;; TODO: Add Jasper etc.
- (inputs `(("fftw" ,fftw)
- ("graphviz" ,graphviz)
- ("ghostscript" ,ghostscript)
- ("lcms" ,lcms)
- ("libx11" ,libx11)
- ("zlib" ,zlib)
- ("libxml2" ,libxml2)
- ("libtiff" ,libtiff)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)
- ("pango" ,pango)
- ("freetype" ,freetype)
- ("bzip2" ,bzip2)
- ("xz" ,xz)))
- (native-inputs (list pkg-config))
- (outputs '("out"
- "doc")) ; 26 MiB of HTML documentation
+ (inputs
+ (list bzip2
+ fftw
+ freetype
+ ghostscript
+ graphviz
+ lcms
+ libjpeg-turbo
+ libpng
+ libtiff
+ libwebp
+ libx11
+ libxml2
+ pango
+ xz
+ zlib
+ zstd))
+ (native-inputs
+ (list font-ghostscript
+ pkg-config))
(home-page "https://www.imagemagick.org/")
(synopsis "Create, edit, compose, or convert bitmap images")
(description
@@ -145,23 +138,35 @@ text, lines, polygons, ellipses and Bézier curves.")
(define-public imagemagick
(package
(inherit imagemagick/stable)
+ (outputs '("out" "doc")) ; 11 MiB of HTML documentation
(properties (alist-delete 'hidden? (package-properties imagemagick/stable)))
;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
- (version "6.9.12-4")
+ (version "6.9.13-5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b"))
- (patches
- (search-patches "imagemagick-ReadDCMImage-fix.patch"
- "imagemagick-ReadDCMPixels-fix.patch"
- "imagemagick-WriteTHUMBNAILImage-fix.patch"
- "imagemagick-CVE-2020-27829.patch"))))))
+ "1j1chkw33vjc37509vdwss28qywfvckvs73pvscldj8d0wnwypa8"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments imagemagick/stable)
+ ((#:configure-flags flags #~'())
+ #~(delete "--disable-docs" #$flags))
+ ((#:phases phases #~'%standard-phases)
+ #~(modify-phases #$phases
+ (add-before 'build 'set-doc-directory
+ (lambda _
+ (substitute* "Makefile"
+ ;; Since the Makefile overrides $docdir, modify it to
+ ;; refer to what we want.
+ (("^DOCUMENTATION_PATH[[:blank:]]*=.*$")
+ (string-append "DOCUMENTATION_PATH = "
+ #$output:doc "/share/doc/"
+ #$(package-name this-package) "-"
+ #$(package-version this-package) "\n")))))))))))
(define-public perl-image-magick
(package
diff --git a/gnu/packages/inklingreader.scm b/gnu/packages/inklingreader.scm
index 88c1c2144c..e1b21ab8f4 100644
--- a/gnu/packages/inklingreader.scm
+++ b/gnu/packages/inklingreader.scm
@@ -43,7 +43,7 @@
"0ikg95mgwfqh0bq4dzvkfmdiycacqvv27g91hl6adwk5y3gzl96g"))))
(build-system gnu-build-system)
(inputs
- (list glib cairo gtk+ librsvg libusb))
+ (list glib cairo gtk+ (librsvg-for-system) libusb))
(native-inputs
(list pkg-config))
(home-page "https://www.gnu.org/software/inklingreader/")
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index aa2c6419a0..524277fc2b 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -1,13 +1,13 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2018, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
-;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,10 +28,11 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
- #:use-module (gnu packages aspell)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages boost)
@@ -50,6 +51,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages readline)
#:use-module (gnu packages xml)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages fontutils)
@@ -58,21 +60,21 @@
#:use-module (srfi srfi-1))
;;; A variant of Inkscape intended to be bumped only on core-updates, to avoid
-;;; rebuilding 2k+ packages through dblatex.
+;;; rebuilding 2k+ packages through dblatex. It should only be used as a
+;;; native-input since it might not receive timely security updates.
(define-public inkscape/stable
(hidden-package
(package
(name "inkscape")
- (version "1.2.1")
+ (version "1.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://media.inkscape.org/dl/"
"resources/file/"
"inkscape-" version ".tar.xz"))
- (patches (search-patches "inkscape-poppler-compat.patch"))
(sha256
- (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
+ (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@@ -156,123 +158,172 @@ endif()~%~%"
((".*find_package\\(DoubleConversion.*") ""))))))
(build-system cmake-build-system)
(arguments
- `(#:test-target "check" ;otherwise some test binaries are missing
- #:imported-modules (,@%cmake-build-system-modules
+ (list
+ #:test-target "check" ;otherwise some test binaries are missing
+ #:disallowed-references (list imagemagick/stable)
+ #:imported-modules `(,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system))
- #:modules ((guix build cmake-build-system)
+ #:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
- (assoc-ref glib-or-gtk:%standard-phases
- 'generate-gdk-pixbuf-loaders-cache-file))
- (add-after 'unpack 'patch-icon-cache-generator
- (lambda _
- (substitute* "share/icons/application/CMakeLists.txt"
- (("gtk-update-icon-cache") "true"))))
- (add-after 'unpack 'disable-latex-export-tests
- ;; FIXME: For some reason the test.pdf_tex file generated by the
- ;; "--export-latex" lacks "some text" in its content when run in
- ;; the build environment. Skip the related tests.
- (lambda _
- (substitute* "testfiles/cli_tests/CMakeLists.txt"
- (("add_cli_test\\(export-latex")
- "message(TEST_DISABLED: export-latex"))))
- (add-after 'unpack 'disable-vertical-glyph-tests
- (lambda _
- ;; FIXME: These tests fail with newer Pango and Harfbuzz:
- ;; https://gitlab.com/inkscape/inkscape/-/issues/2917
- ;; https://gitlab.com/inkscape/inkscape/-/issues/3554
- ;; Simply providing older versions don't work, as we need
- ;; the full GTK stack; we could use package-input-rewriting
- ;; but then have to also downgrade pangomm and disable tests
- ;; in librsvg and GTK+. Just ignore for now.
- (substitute* "testfiles/rendering_tests/CMakeLists.txt"
- (("test-glyph-y-pos") "")
- (("text-glyphs-combining") "")
- (("text-glyphs-vertical") "")
- (("test-rtl-vertical") ""))))
- ,@(if (or (target-aarch64?)
- (target-ppc64le?)
- (target-riscv64?))
- `((add-after 'unpack 'disable-more-tests
- (lambda _
- ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035680690
- (substitute* "testfiles/CMakeLists.txt"
- (("lpe64-test") "#lpe64-test"))
- ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
- ;; According to upstream, this is a false positive.
- (substitute* "testfiles/rendering_tests/CMakeLists.txt"
- (("test-use") "#test-use"))
- ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
- ;; Allegedly a precision error in the gamma.
- (substitute* "testfiles/cli_tests/CMakeLists.txt"
- (("add_cli_test\\(export-png-color-mode-gray-8_png" all)
- (string-append "#" all))))))
- '())
- (add-after 'unpack 'set-home
- ;; Mute Inkscape warnings during tests.
- (lambda _
- (setenv "HOME" (getcwd))))
- ;; Move the check phase after the install phase, as when run in the
- ;; tests, Inkscape relies on files that are not yet installed, such
- ;; as the "share/inkscape/ui/units.xml" file.
- (delete 'check)
- (add-after 'install 'check
- (assoc-ref %standard-phases 'check))
- (add-after 'install 'glib-or-gtk-compile-schemas
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'install 'wrap-program
+ ;; Disable imagemagick support in the stable variant, to reduce the
+ ;; number of dependents of the 'imagemagick' package.
+ #:configure-flags
+ #~(list "-DWITH_IMAGE_MAGICK=OFF"
+ ;; TODO: Remove after next release, since the problematic
+ ;; libsoup/soup.h include is no longer used.
+ (string-append "-DCMAKE_CXX_FLAGS=-I"
+ (search-input-directory %build-inputs
+ "/include/libsoup-2.4")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
+ #$@(if (or (target-aarch64?)
+ (target-ppc64le?)
+ (target-riscv64?))
+ '((add-after 'unpack 'disable-more-tests
+ (lambda _
+ ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035680690
+ (substitute* "testfiles/CMakeLists.txt"
+ (("lpe64-test") "#lpe64-test")
+ ((" lpe-test") " #lpe-test")
+ (("add_subdirectory\\(lpe_tests\\)") ""))
+ ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
+ ;; According to upstream, this is a false positive.
+ (substitute* "testfiles/rendering_tests/CMakeLists.txt"
+ (("add_rendering_test\\(test-use" all)
+ (string-append "#" all)))
+ ;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
+ ;; Allegedly a precision error in the gamma.
+ (substitute* "testfiles/cli_tests/CMakeLists.txt"
+ (("add_cli_test\\(export-png-color-mode-gray-8_png" all)
+ (string-append "#" all))
+ ;; These also seem to be failing due to precision errors.
+ (("add_pdfinput_test\\(font-(spacing|style) 1 draw-all" all)
+ (string-append "#" all))))))
+ '())
+ #$@(if (target-x86-32?)
+ '((add-after 'unpack 'fix-32bit-size_t-format
+ (lambda _
+ ;; Fix an error due to format type mismatch with 32-bit size_t.
+ (substitute* "testfiles/src/visual-bounds-test.cpp"
+ (("%lu") "%u")))))
+ '())
+ (add-after 'unpack 'set-home
+ ;; Mute Inkscape warnings during tests.
+ (lambda _
+ (setenv "HOME" (getcwd))))
+ ;; Move the check phase after the install phase, as when run in the
+ ;; tests, Inkscape relies on files that are not yet installed, such
+ ;; as the "share/inkscape/ui/units.xml" file.
+ (delete 'check)
+ (add-after 'install 'check
+ ;; Use ctest directly so that we can easily exclude problematic
+ ;; tests.
+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (when tests?
+ ;; The following tests fails, perhaps due to building without
+ ;; ImageMagick (see:
+ ;; https://gitlab.com/inkscape/inbox/-/issues/10005).
+ (let ((job-count (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1"))
+ (skipped-tests
+ (list "cli_export-type-caseinsensitive_check_output"
+ "cli_export-type_xaml_check_output"
+ "cli_export-height_export-use-hints_check_output"
+ "cli_export-plain-svg_check_output"
+ "cli_export-use-hints_export-id_check_output"
+ "cli_export-extension_svg_check_output"
+ "cli_export-extension_ps_check_output"
+ "cli_export-extension_eps_check_output"
+ "cli_export-extension_pdf_check_output"
+ "cli_export-plain-extension-svg_check_output"
+ ;; These fail non-deterministically (see:
+ ;; https://gitlab.com/inkscape/inbox/-/issues/10005).
+ "cli_export-ps-level_3_check_output"
+ "cli_export-ps-level_3_content_check_output"
+ "cli_export-ps-level_2_content_check_output"
+ "cli_export-ps-level_2_check_output"
+ ;; These fail on i686 but not x86-64
+ #$@(if (target-x86-32?)
+ '("cli_pdfinput-font-spacing_check_output"
+ "cli_pdfinput-font-style_check_output"
+ "cli_pdfinput-latex_check_output"
+ "cli_pdfinput-multi-page-sample_check_output"
+ "test_lpe")
+ '()))))
+ (invoke "make" "-j" job-count "tests")
+ (invoke "ctest" "-j" job-count
+ "--output-on-error"
+ "-E" (string-append
+ "(" (string-join skipped-tests "|") ")"))))))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+ (add-after 'install 'wrap-program
;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
- ;; its own icons in pure environments.
- `("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-program (string-append #$output "/bin/inkscape")
+ `("PATH" prefix
+ (,(dirname (search-input-file inputs "bin/python"))))
+ `("GUIX_PYTHONPATH" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))
+ ;; Ensure GObject Introspection typelibs are found.
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,(getenv "GI_TYPELIB_PATH")))))))))
(inputs
- (list aspell
+ (list (librsvg-for-system) ;for the pixbuf loader
autotrace
bash-minimal
+ boost
+ freetype
gdl-minimal
- gtkmm-3
- gtk+
- gtkspell3
gsl
- poppler
+ gspell
+ gtk+
+ gtkmm-3
+ lcms
lib2geom
+ libcdr
+ libgc
libjpeg-turbo
libpng
- libxml2
- libxslt
- libgc
- (librsvg-for-system) ;for the pixbuf loader
libsoup-minimal-2
- libcdr
libvisio
libwpd
libwpg
- freetype
+ libxml2
+ libxslt
+ poppler
popt
potrace
- lcms
- boost
- python-wrapper
- python-scour
- python-pyserial
+ ;; These Python dependencies are used by the Inkscape extension
+ ;; management system. To verify that it is working, visit the
+ ;; Extensions -> Manage Extensions... menu.
+ python-appdirs
+ python-cssselect
+ python-lxml
python-numpy
- python-lxml))
+ python-pygobject
+ python-pyserial
+ python-requests
+ python-scour
+ python-wrapper
+ readline))
(native-inputs
- (list gettext-minimal
- imagemagick ;for tests
- `(,glib "bin")
+ (list `(,glib "bin")
+ bc
+ gettext-minimal
googletest
+ imagemagick/stable ;for tests
perl
pkg-config))
(home-page "https://inkscape.org/")
@@ -286,7 +337,7 @@ as the native format.")
(package
(inherit inkscape/stable)
(name "inkscape")
- (version "1.2.1")
+ (version "1.3.2")
(source
(origin
(inherit (package-source inkscape/stable))
@@ -295,23 +346,36 @@ as the native format.")
"resources/file/"
"inkscape-" version ".tar.xz"))
(sha256
- (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
+ (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv"))))
(build-system cmake-build-system)
(arguments
(substitute-keyword-arguments (package-arguments inkscape/stable)
+ ((#:configure-flags flags ''())
+ ;; Enable ImageMagick support.
+ #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags))
((#:phases phases)
- `(modify-phases ,phases
- (replace 'wrap-program
- ;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
- ;; its own icons in pure environments.
- `("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
+ #~(modify-phases #$phases
+ #$@(if (target-x86-32?)
+ #~() ;XXX: there are remaining failures on i686
+ #~((replace 'check
+ ;; Re-instate the tests disabled in inkscape/stable, now that
+ ;; their ImageMagick requirement is satisfied.
+ (assoc-ref %standard-phases 'check))))
+
+ (replace 'wrap-program
+ ;; Ensure Python is available at runtime.
+ (lambda _
+ (wrap-program (string-append #$output "/bin/inkscape")
+ `("GUIX_PYTHONPATH" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable)
- (append python-cssselect))) ;to render qrcode
+ (append imagemagick))) ;for libMagickCore and libMagickWand
+ (native-inputs
+ (modify-inputs (package-native-inputs inkscape/stable)
+ ;; Only use 1 imagemagick across the package build.
+ (replace "imagemagick" imagemagick)))
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index 9879359be7..fb8b71be79 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)
@@ -49,7 +49,7 @@
("mingw-w64" ,xlibc)))
(inputs (list zlib))
(arguments
- `(#:scons ,scons-python2
+ `(#:scons ,scons-3
#:modules ((srfi srfi-1)
(srfi srfi-26)
(guix build utils)
diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 8b1a2a1c02..f8bc2702bc 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -190,7 +190,7 @@ bindings, and the command-line tool @command{babeltrace2}.")
(native-inputs
(list python-poetry-core python-pytest))
(propagated-inputs
- (list python-jinja2 python-jsonschema python-pyyaml python-termcolor))
+ (list python-jinja2 python-jsonschema python-pyyaml python-termcolor-1))
(home-page "https://barectf.org")
(synopsis "CTF tracer generator")
(description
@@ -587,7 +587,7 @@ whole-system symbolic access, and can also handle simple tracing jobs.")
(list
#:modules
`((ice-9 match)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:make-flags
#~(list
(string-append "CC=" #$(cc-for-target)))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ac832dcd52..6f8ca02501 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,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)
@@ -35,9 +37,157 @@
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
+ #:use-module (gnu packages prometheus)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
- #:use-module (gnu packages syncthing))
+ #: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-bitfield
+ (package
+ (name "go-github-com-ipfs-go-bitfield")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-bitfield")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zhgwdg2kizhk0hb9q5p0pwrwldd2pacz8l1pnapxh6qm3fqs663"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-bitfield"))
+ (home-page "https://github.com/ipfs/go-bitfield")
+ (synopsis "Allocated up-front Bitfield for Golang")
+ (description
+ "This package implements a functionality similar to standard
+@code{big.Int} with some optimizations to use in IPFS.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public go-github-com-ipfs-go-block-format
+ (package
+ (name "go-github-com-ipfs-go-block-format")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-block-format")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0pd8ww06ss922g3w2fgi3w0q66y2mkb9b2q9x5qxabrjj65xranz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-block-format"))
+ (propagated-inputs
+ (list go-github-com-multiformats-go-multihash
+ go-github-com-multiformats-go-varint
+ go-github-com-ipfs-go-cid
+ go-github-com-ipfs-go-ipfs-util))
+ (home-page "https://github.com/ipfs/go-block-format")
+ (synopsis "Set of interfaces for CID addressable blocks of data")
+ (description
+ "Package @code{blocks} contains the lowest level of @acronym{IPLD,
+InterPlanetary Linked Data} data structures. A block is raw data accompanied
+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
@@ -55,7 +205,6 @@
(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
@@ -68,6 +217,35 @@
used in @code{go-ipfs} and related packages to refer to a typed hunk of data.")
(license license:expat)))
+(define-public go-github-com-ipfs-go-cidutil
+ (package
+ (name "go-github-com-ipfs-go-cidutil")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-cidutil")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j18wf42rfxrrh2fjdbjsjvjqxwgvg46b9wl6y5ig22fx5hvpm1n"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-cidutil"))
+ (propagated-inputs
+ (list go-github-com-ipfs-go-cid
+ go-github-com-multiformats-go-multibase
+ go-github-com-multiformats-go-multicodec
+ go-github-com-multiformats-go-multihash))
+ (home-page "https://github.com/ipfs/go-cidutil")
+ (synopsis "Utility functions and types for working with CIDs")
+ (description
+ "@code{go-cidutil} implements various utilities and helper functions for working
+with @url{https://github.com/ipld/cid, CIDs}.")
+ (license license:expat)))
+
(define-public go-github-com-ipfs-go-ipfs-cmdkit-files
(let ((commit
"386fcf8f18a185ec121676665fe2d9574496048d")
@@ -87,7 +265,9 @@ used in @code{go-ipfs} and related packages to refer to a typed hunk of data.")
"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")
@@ -97,166 +277,552 @@ that are shared between @command{go-ipfs/commands} and its rewrite
@command{go-ipfs-cmds}.")
(license license:expat))))
-(define-public go-github-com-ipfs-go-ipfs-api
- (let ((commit
- "dafc2a13a4389ac1a6c2786e34ab70a4f26d3a3f")
- (revision "0"))
- (package
- (name "go-github-com-ipfs-go-ipfs-api")
- (version (git-version "1.3.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ipfs/go-ipfs-api")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06kibnwb037sqynk99j07wm8alvxwx3bari9gdax4jv93396kycj"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/ipfs/go-ipfs-api"
- ;; TODO: Tests fail, might need network access.
- #:tests? #f))
- (native-inputs
- (list go-github-com-ipfs-go-ipfs-cmdkit-files
- go-github-com-libp2p-go-libp2p-metrics
- go-github-com-libp2p-go-flow-metrics
- go-github-com-libp2p-go-libp2p-peer
- go-github-com-libp2p-go-libp2p-protocol
- go-github-com-libp2p-go-libp2p-crypto
- go-github-com-mitchellh-go-homedir
- go-github-com-multiformats-go-multiaddr
- go-github-com-multiformats-go-multiaddr-net
- go-github-com-btcsuite-btcd-btcec
- go-github-com-gogo-protobuf
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-mr-tron-base58
- go-github-com-multiformats-go-multihash
- go-golang-org-x-crypto
- go-github-com-spaolacci-murmur3
- go-github-com-gxed-hashland-keccakpg
- go-github-com-whyrusleeping-tar-utils
- go-github-com-cheekybits-is))
- (home-page "https://github.com/ipfs/go-ipfs-api")
- (synopsis "Unofficial Go interface to IPFS's HTTP API")
- (description "An unofficial Go interface to IPFS's HTTP API")
- (license license:expat))))
+(define-public go-github-com-ipfs-go-ipfs-delay
+ (package
+ (name "go-github-com-ipfs-go-ipfs-delay")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-ipfs-delay")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0a5acj622sk1hibnh893mya4h86nsy1dan0wlh9q444c04iqpviw"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-ipfs-delay"))
+ (home-page "https://github.com/ipfs/go-ipfs-delay")
+ (synopsis "Configurable delays to other objects")
+ (description
+ "This package implements a threadsafe configurable delays to other
+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 gx
+(define-public go-github-com-ipfs-go-datastore
(package
- (name "gx")
- (version "0.14.3")
+ (name "go-github-com-ipfs-go-datastore")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/whyrusleeping/gx")
+ (url "https://github.com/ipfs/go-datastore")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1sk20kv3rfsnizgwmcmmr69jb1b2iwzqh9wwwd6wg6x0pnqm8swc"))))
+ (base32 "1xbhh3gm7bgd2d1p821w8gmbh87aix1g1ynhbl7gjaxxyhrsh68n"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/whyrusleeping/gx"))
+ (list
+ #:import-path "github.com/ipfs/go-datastore"))
(native-inputs
- (list go-github-com-blang-semver
- go-github-com-gxed-hashland-keccakpg
- go-github-com-ipfs-go-ipfs-api
- go-github-com-ipfs-go-ipfs-cmdkit-files
- go-github-com-libp2p-go-flow-metrics
- go-github-com-libp2p-go-libp2p-crypto
- go-github-com-libp2p-go-libp2p-metrics
- go-github-com-libp2p-go-libp2p-peer
- go-github-com-libp2p-go-libp2p-protocol
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-mitchellh-go-homedir
- go-github-com-mr-tron-base58
- go-github-com-multiformats-go-multiaddr
- go-github-com-multiformats-go-multiaddr-net
+ (list go-gopkg-in-check-v1))
+ (propagated-inputs
+ (list go-github-com-google-uuid
+ go-github-com-ipfs-go-detect-race
+ go-github-com-ipfs-go-ipfs-delay
+ go-github-com-jbenet-goprocess
+ go-go-uber-org-multierr
+ go-golang-org-x-xerrors))
+ (home-page "https://github.com/ipfs/go-datastore")
+ (synopsis "Key-value datastore interfaces")
+ (description
+ "Datastore is a generic layer of abstraction for data store and database access.
+It is a simple API with the aim to enable application development in a
+datastore-agnostic way, allowing datastores to be swapped seamlessly without
+changing application code. Thus, one can leverage different datastores with
+different strengths without committing the application to one datastore
+throughout its lifetime.")
+ (license license:expat)))
+
+(define-public go-github-com-ipfs-go-detect-race
+ (package
+ (name "go-github-com-ipfs-go-detect-race")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-detect-race")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rqb0q66d7z852j5mhlr025dz698c44w014g4mx587amr1rvwqna"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #: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-redirects-file
+ (package
+ (name "go-github-com-ipfs-go-ipfs-redirects-file")
+ (version "0.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-ipfs-redirects-file")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16lisd5jbniang85jzfwfigw0kmz73913fsrfj49nh92mpw50qpz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-ipfs-redirects-file"))
+ (native-inputs
+ (list go-github-com-tj-assert))
+ (propagated-inputs
+ (list go-github-com-pkg-errors
+ go-github-com-ucarion-urlpath))
+ (home-page "https://github.com/ipfs/go-ipfs-redirects-file")
+ (synopsis "IPFS Web Gateway _redirects file format parser")
+ (description
+ "Package redirects provides Netlify style _redirects file format
+parsing.")
+ (license license:expat)))
+
+(define-public go-github-com-ipfs-go-ipfs-util
+ (package
+ (name "go-github-com-ipfs-go-ipfs-util")
+ (version "0.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-ipfs-util")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x80c6a50zcv473xx0b39sz2xkwpiw3nmmjf51k5x7a4rx0rgvx4"))))
+ (build-system go-build-system)
+ (propagated-inputs (list go-github-com-mr-tron-base58
+ go-github-com-multiformats-go-multihash))
+ (arguments
+ (list
+ #: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")
+ (description
+ "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-spaolacci-murmur3
- go-github-com-whyrusleeping-tar-utils
- go-github-com-btcsuite-btcd-btcec
- go-github-com-gogo-protobuf
- go-github-com-sabhiram-go-gitignore
- go-github-com-urfave-cli
- go-github-com-whyrusleeping-json-filter
- go-github-com-whyrusleeping-progmeter
- go-github-com-whyrusleeping-stump
- go-golang-org-x-crypto))
- (home-page "https://github.com/whyrusleeping/gx")
- (synopsis "Package management tool using IPFS")
- (description "@command{gx} is a packaging tool built around the
-distributed, content addressed file system IPFS. It aims to be flexible,
-powerful and simple.")
+ 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-whyrusleeping-gx-util
+(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")
+ (version "0.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-ipld-format")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zl172ncmx9h5z2p3d0j1377xm9glw4zfyamks31p0pvvx2kyn7c"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-ipld-format"))
+ (propagated-inputs
+ (list go-github-com-multiformats-go-multihash
+ go-github-com-ipfs-go-block-format
+ go-github-com-ipfs-go-cid))
+ (home-page "https://github.com/ipfs/go-ipld-format")
+ (synopsis "IPLD Node and Resolver interfaces in Go")
+ (description
+ "@code{go-ipld-format} is a set of interfaces that a type needs to implement in
+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))))
+
+;; XXX: This repository has been archived by the owner on Jun 20, 2023. It is
+;; now read-only. We highly recommend switching to the maintained version at
+;; https://github.com/ipfs/boxo/tree/main/verifcid. It's still in use by some
+;; dependencies chain for unbundled inputs in Kubo.
+(define-public go-github-com-ipfs-go-verifcid
+ (package
+ (name "go-github-com-ipfs-go-verifcid")
+ (version "0.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-verifcid")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05i6wp2nln0mlr1pivmva7j6bwa09k7jl04acx1lw65h4d9nxsjm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-verifcid"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-ipfs-go-cid go-github-com-multiformats-go-multihash))
+ (home-page "https://github.com/ipfs/go-verifcid")
+ (synopsis "CID security code")
+ (description
+ "@code{go-verifcid} provides @url{https://github.com/ipld/cid, CID} security
+code prior to it getting merged into @code{go-cid}.")
+ ;; This library is dual-licensed under Apache 2.0 and MIT terms:
+ ;; LICENSE-MIT and LICENSE-APACHE.
+ (license (list license:expat license:asl2.0))))
+
+(define-public go-github-com-ipld-go-codec-dagpb
(package
- (inherit gx)
- (name "go-github-com-whyrusleeping-gx-util")
+ (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
- '(#:unpack-path "github.com/whyrusleeping/gx"
- #:import-path "github.com/whyrusleeping/gx/gxutil"))))
+ (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 gx-go
+(define-public go-github-com-ipld-go-ipld-prime
(package
- (name "gx-go")
- (version "1.9.0")
+ (name "go-github-com-ipld-go-ipld-prime")
+ (version "0.21.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/whyrusleeping/gx-go")
+ (url "https://github.com/ipld/go-ipld-prime")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc"))))
+ (base32 "1ycb08h0hvq3mw3sbjkjzp5sfcxmss155jxiv5gjg7myxvzk91ja"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/whyrusleeping/gx-go"))
+ (list
+ #:unpack-path "github.com/ipld/go-ipld-prime/"
+ #:import-path "github.com/ipld/go-ipld-prime/"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-ipld-specfs
+ (lambda* (#:key import-path #:allow-other-keys)
+ (copy-recursively
+ (string-append #$(this-package-native-input
+ "specification-ipld")
+ "/share/ipld/")
+ (string-append "src/" import-path "/ipld")))))))
(native-inputs
- (list go-github-com-whyrusleeping-gx-util
- go-github-com-kr-fs
- go-github-com-gxed-hashland-keccakpg
- go-github-com-ipfs-go-ipfs-api
- go-github-com-ipfs-go-ipfs-cmdkit-files
- go-github-com-libp2p-go-flow-metrics
- go-github-com-libp2p-go-libp2p-crypto
- go-github-com-libp2p-go-libp2p-metrics
- go-github-com-libp2p-go-libp2p-peer
- go-github-com-libp2p-go-libp2p-protocol
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-mitchellh-go-homedir
- go-github-com-mr-tron-base58
- go-github-com-multiformats-go-multiaddr
- go-github-com-multiformats-go-multiaddr-net
+ (list go-github-com-frankban-quicktest
+ go-github-com-warpfork-go-testmark
+ specification-ipld))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp
+ go-github-com-ipfs-go-block-format
+ go-github-com-ipfs-go-cid
+ go-github-com-multiformats-go-multicodec
go-github-com-multiformats-go-multihash
- go-github-com-spaolacci-murmur3
- go-github-com-whyrusleeping-tar-utils
- go-github-com-btcsuite-btcd-btcec
- go-github-com-gogo-protobuf
- go-github-com-sabhiram-go-gitignore
- go-github-com-urfave-cli
- go-github-com-whyrusleeping-progmeter
- go-github-com-whyrusleeping-stump
- go-golang-org-x-crypto))
- (home-page "https://github.com/whyrusleeping/gx-go")
- (synopsis "Golang subtool for the @command{gx} package manager")
- (description "A subtool for the @command{gx} package manager for packages
-written in Go.")
+ go-github-com-polydawn-refmt
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/ipld/go-ipld-prime")
+ (synopsis "Golang interfaces for the IPLD Data Model")
+ (description
+ "@code{go-ipld-prime} is an implementation of the IPLD spec interfaces, a
+batteries-included codec implementations of IPLD for CBOR and JSON, and tooling for
+basic operations on IPLD objects (traversals, etc).")
+ (license license:expat)))
+
+(define-public go-github-com-ipfs-go-log-v2
+ (package
+ (name "go-github-com-ipfs-go-log-v2")
+ (version "2.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-log")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yh3sw8knpy364h8h8rqw193whnjd6fbc13cxh6zs29z3x2a7aqa"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ (list go-github-com-mattn-go-isatty
+ go-go-uber-org-multierr
+ go-go-uber-org-zap))
+ (arguments
+ (list
+ #:import-path "github.com/ipfs/go-log/v2"))
+ (home-page "https://github.com/ipfs/go-log")
+ (synopsis "Logging library used by @code{go-ipfs}")
+ (description
+ "@code{go-log} wraps @url{https://github.com/uber-go/zap, zap} to
+provide a logging facade. @code{go-log} manages logging instances and allows for
+their levels to be controlled individually.")
+ (license license:expat)))
+
+(define-public go-github-com-ipfs-go-log
+ (package
+ (inherit go-github-com-ipfs-go-log-v2)
+ (name "go-github-com-ipfs-go-log")
+ (version "1.0.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipfs/go-log")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gj2yqrv6wgpkv6f9c1anmw5kwg59plv0jrcxb3zmjrnk8fsn1jr"))))
+ (propagated-inputs
+ (list go-github-com-gogo-protobuf
+ go-github-com-ipfs-go-log-v2
+ go-github-com-opentracing-opentracing-go
+ go-go-uber-org-zap))
+ (arguments
+ (list
+ #: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-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
+ 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)))
(define-public kubo
(package
(name "kubo")
- (version "0.28.0")
+ (version "0.29.0")
(source
(origin
(method url-fetch/tarbomb)
@@ -264,52 +830,102 @@ written in Go.")
"https://dist.ipfs.io/kubo/v" version
"/kubo-source.tar.gz"))
(sha256
- (base32 "01lk6dd2j660rykchc3ggi9cln92cngz5ijlldsaj5mxnajlvbwy"))
+ (base32 "121zm4k0wz2iqrl65c7bdg5d2bvz3hvj4pavk5178dyd1p49bl5r"))
(file-name (string-append name "-" version "-source"))
(modules '((guix build utils)))
(snippet '(for-each delete-file-recursively
;; TODO: unbundle the rest as well
- '("vendor/github.com/alecthomas"
+ '("vendor/bazil.org"
+ "vendor/github.com/alecthomas"
"vendor/github.com/benbjohnson"
- "vendor/github.com/beorn7/perks"
+ "vendor/github.com/beorn7"
"vendor/github.com/blang"
+ "vendor/github.com/cenkalti"
"vendor/github.com/cespare"
+ "vendor/github.com/cheggaaa"
+ "vendor/github.com/coreos"
"vendor/github.com/davecgh"
+ "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"
"vendor/github.com/fsnotify"
+ "vendor/github.com/gabriel-vasile"
+ "vendor/github.com/go-kit"
+ "vendor/github.com/go-logfmt"
+ "vendor/github.com/go-logr"
+ "vendor/github.com/go-task"
+ "vendor/github.com/godbus"
"vendor/github.com/gogo"
- "vendor/github.com/golang/groupcache"
- "vendor/github.com/golang/snappy"
- "vendor/github.com/google/uuid"
+ "vendor/github.com/golang"
+ "vendor/github.com/google"
"vendor/github.com/gorilla"
"vendor/github.com/hashicorp"
+ "vendor/github.com/huin"
+ "vendor/github.com/ipfs/go-bitfield"
+ "vendor/github.com/ipfs/go-block-format"
"vendor/github.com/ipfs/go-cid"
+ "vendor/github.com/ipfs/go-cidutil"
+ "vendor/github.com/ipfs/go-datastore"
+ "vendor/github.com/ipfs/go-detect-race"
+ "vendor/github.com/ipfs/go-ipfs-delay"
+ "vendor/github.com/ipfs/go-ipfs-redirects-file"
+ "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/ipfs/go-verifcid"
+ "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/koron"
+ "vendor/github.com/libp2p/go-buffer-pool"
+ "vendor/github.com/libp2p/go-cidranger"
+ "vendor/github.com/libp2p/go-doh-resolver"
+ "vendor/github.com/libp2p/go-flow-metrics"
+ "vendor/github.com/libp2p/go-libp2p-asn-util"
+ "vendor/github.com/libp2p/go-msgio"
+ "vendor/github.com/libp2p/go-nat"
+ "vendor/github.com/libp2p/go-netroute"
+ "vendor/github.com/libp2p/go-reuseport"
+ "vendor/github.com/libp2p/go-socket-activation"
+ "vendor/github.com/libp2p/go-yamux"
+ "vendor/github.com/libp2p/zeroconf"
"vendor/github.com/mattn"
"vendor/github.com/mgutz"
+ "vendor/github.com/miekg"
"vendor/github.com/minio"
"vendor/github.com/mitchellh"
"vendor/github.com/mr-tron"
"vendor/github.com/multiformats"
+ "vendor/github.com/onsi"
"vendor/github.com/opentracing"
"vendor/github.com/pbnjay"
+ "vendor/github.com/pion"
"vendor/github.com/pkg"
"vendor/github.com/pmezard"
- "vendor/github.com/prometheus/client_golang"
- "vendor/github.com/prometheus/client_model"
- "vendor/github.com/prometheus/common"
- "vendor/github.com/prometheus/procfs"
+ "vendor/github.com/polydawn"
+ "vendor/github.com/prometheus"
+ "vendor/github.com/quic-go"
+ "vendor/github.com/rs"
"vendor/github.com/spaolacci"
"vendor/github.com/stretchr"
"vendor/github.com/syndtr"
- "vendor/github.com/whyrusleeping/go-sysinfo"
+ "vendor/github.com/tidwall"
+ "vendor/github.com/ucarion"
+ "vendor/github.com/whyrusleeping"
"vendor/go.uber.org"
"vendor/golang.org"
+ "vendor/google.golang.org/protobuf"
"vendor/gopkg.in"
"vendor/lukechampine.com")))))
(build-system go-build-system)
@@ -317,9 +933,28 @@ 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
+ ;; FIXME: src/github.com/libp2p/go-libp2p-asn-util/asn.go:12:12:
+ ;; pattern sorted-network-list.bin: cannot embed irregular file
+ ;; sorted-network-list.bin
+ ;;
+ ;; 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)
+ (copy-recursively
+ (string-append
+ #$(this-package-input "go-github-com-libp2p-go-libp2p-asn-util")
+ "/src/github.com")
+ "vendor/github.com"))))
;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
(add-after 'install 'install-bashcompletion
(lambda _
@@ -338,52 +973,52 @@ written in Go.")
;; otherwise it will be sourced from provided vendor
;; directory.
;;
- ;;go-bazil-org-fuse
+ go-bazil-org-fuse
;;go-contrib-go-opencensus-io-exporter-prometheus
go-github-com-benbjohnson-clock
go-github-com-blang-semver-v4
- ;;go-github-com-cenkalti-backoff-v4
+ go-github-com-cenkalti-backoff-v4
;;go-github-com-ceramicnetwork-go-dag-jose
- ;;go-github-com-cheggaaa-pb
- ;;go-github-com-coreos-go-systemd-v22
+ go-github-com-cheggaaa-pb
+ 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-elgris-jsondiff
+ go-github-com-facebookgo-atomicfile
go-github-com-fsnotify-fsnotify
go-github-com-google-uuid
go-github-com-hashicorp-go-multierror
;;go-github-com-ipfs-boxo
- ;;go-github-com-ipfs-go-block-format
+ go-github-com-ipfs-go-block-format
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-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-format
- ;;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-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-log
+ go-github-com-ipfs-go-log-v2
+ 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-ipld-prime
+ 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
go-github-com-jbenet-goprocess
go-github-com-julienschmidt-httprouter
- ;;go-github-com-libp2p-go-doh-resolver
+ go-github-com-libp2p-go-doh-resolver
;;go-github-com-libp2p-go-libp2p
;;go-github-com-libp2p-go-libp2p-http
;;go-github-com-libp2p-go-libp2p-kad-dht
@@ -393,23 +1028,22 @@ 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-libp2p-go-socket-activation
go-github-com-mitchellh-go-homedir
- go-github-com-multiformats-go-multiaddr-0.12
+ go-github-com-multiformats-go-multiaddr
go-github-com-multiformats-go-multiaddr-dns
go-github-com-multiformats-go-multibase
go-github-com-multiformats-go-multicodec
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
- ;;go-github-com-tidwall-gjson
- ;;go-github-com-tidwall-sjson
+ 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
@@ -421,37 +1055,60 @@ 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 requiring for the vendored models.
- ;; XXX: Remove them when all of the vendored packages are available.
+ ;; A list of indirect dependencies required for the vendored
+ ;; models.
+ ;; XXX: Remove them when all of the vendored packages are
+ ;; available.
;;
- go-github-com-alecthomas-units
- go-github-com-flynn-noise
- go-github-com-francoispqt-gojay
- go-github-com-gogo-protobuf
- go-github-com-golang-groupcache
- go-github-com-gorilla-mux
- go-github-com-gorilla-websocket
- go-github-com-hashicorp-golang-lru
- go-github-com-hashicorp-golang-lru-v2
- go-github-com-jackpal-go-nat-pmp
- go-github-com-klauspost-compress
- go-github-com-mattn-go-runewidth
- go-github-com-mgutz-ansi
- go-github-com-multiformats-go-multiaddr-fmt
- go-github-com-multiformats-go-multistream
- go-golang-org-x-oauth2
- go-golang-org-x-term
- go-golang-org-x-text
- go-golang-org-x-xerrors
- go-gopkg-in-square-go-jose-v2))
+ go-github-com-alecthomas-units ; github.com/ipfs/boxo
+ go-github-com-cespare-xxhash
+ go-github-com-docker-go-units ; github.com/containerd/cgroups
+ go-github-com-felixge-httpsnoop ; go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
+ go-github-com-flynn-noise ; github.com/libp2p/go-libp2p
+ go-github-com-gabriel-vasile-mimetype ; github.com/ipfs/boxo
+ go-github-com-go-logr-stdr ; go.opentelemetry.io/otel
+ go-github-com-golang-groupcache ; go.opencensus.io/trace
+ go-github-com-google-gopacket ; github.com/libp2p/go-libp2p-kad-dht
+ go-github-com-gorilla-mux ; github.com/ipfs/boxo
+ go-github-com-gorilla-websocket ; github.com/libp2p/go-libp2p
+ go-github-com-hashicorp-golang-lru ; github.com/libp2p/go-libp2p-kad-dht
+ go-github-com-hashicorp-golang-lru-v2 ; github.com/ipfs/boxo
+ go-github-com-ipfs-go-bitfield ; github.com/ipfs/boxo
+ go-github-com-ipfs-go-ipfs-redirects-file ; github.com/ipfs/boxo
+ go-github-com-ipfs-go-verifcid ; github.com/ipfs/go-blockservice
+ go-github-com-klauspost-compress ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-go-buffer-pool ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-go-cidranger ; github.com/libp2p/go-libp2p-kbucket
+ go-github-com-libp2p-go-flow-metrics ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-go-libp2p-asn-util ; github.com/libp2p/go-libp2p-kbucket
+ go-github-com-libp2p-go-msgio ; github.com/libp2p/go-libp2p-kad-dht
+ go-github-com-libp2p-go-nat ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-go-reuseport ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-go-yamux-v4 ; github.com/libp2p/go-libp2p
+ go-github-com-libp2p-zeroconf-v2 ; github.com/libp2p/go-libp2p
+ 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-pion-webrtc-v3 ; github.com/libp2p/go-libp2p
+ go-github-com-prometheus-statsd-exporter ; contrib.go.opencensus.io/exporter/prometheus
+ go-github-com-quic-go-quic-go ; github.com/libp2p/go-libp2p
+ go-github-com-quic-go-webtransport-go ; github.com/libp2p/go-libp2p
+ go-github-com-rs-cors ; github.com/ipfs/go-ipfs-cmds
+ 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
+ go-gopkg-in-square-go-jose-v2 ; github.com/ceramicnetwork/go-dag-jose
+ ))
(native-inputs
(append (if (%current-target-system)
(list this-package)
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 39b915a518..04f6e016d0 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,6 +45,7 @@
#:use-module (guix build-system haskell)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system qt)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
@@ -69,6 +71,7 @@
#: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 gtk)
#:use-module (gnu packages guile)
@@ -76,6 +79,7 @@
#:use-module (gnu packages haskell-check)
#:use-module (gnu packages haskell-crypto)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages javascript)
#:use-module (gnu packages lua)
#:use-module (gnu packages lxqt)
#:use-module (gnu packages man)
@@ -87,6 +91,7 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages prometheus)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
@@ -118,6 +123,10 @@
(list
#:phases
#~(modify-phases %standard-phases
+ (add-before 'configure 'update-constraints
+ (lambda _
+ (substitute* "glirc.cabal"
+ (("vty\\s+>=5.35\\s+&&\\s+<5.36") "vty"))))
(add-after 'install 'install-extra-documentation
(lambda _
(install-file "glirc.1"
@@ -359,14 +368,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
(define-public weechat
(package
(name "weechat")
- (version "4.2.1")
+ (version "4.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
- "1kdxj4pkxyzd9bdgk8h8rh26n7c5a8alnafxl8qm113cdw4dyg95"))))
+ "0v4k4rrp2a5zaxl86wnwffajv3b4fb9w70rsh42samra9k8hppp5"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(native-inputs
@@ -389,7 +398,8 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
perl
python
ruby
- tcl))
+ tcl
+ cjson))
(arguments
`(#:configure-flags
(list "-DENABLE_PHP=OFF"
@@ -508,7 +518,7 @@ for the IRCv3 protocol.")
(define-public catgirl
(package
(name "catgirl")
- (version "2.2")
+ (version "2.2a")
(source
(origin
(method git-fetch)
@@ -517,7 +527,7 @@ for the IRCv3 protocol.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0r1h10qdhhgy3359ndbjh269daivm126qc0c23db7bffv0xs4bff"))))
+ (base32 "0fvjx4a523bf2m522ya8r94ikhs8d864hrd85jn6bm414sga877p"))))
(build-system gnu-build-system)
(arguments
(list
@@ -622,13 +632,13 @@ highlighted.
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; No ./configure script
+ (home-page "https://mcpcpc.github.io/kirc/")
(synopsis "IRC client written in POSIX C99")
(description "Kirc is an Internet Relay Chat (IRC) client. It includes
support for Simple Authentication and Security Layer (SASL), the
client-to-client (CTCP) protocol, simple chat history logging, synchronous
message handling, multi-channel joining at server connection, full support for
all RFC 2812 commands, and customized color scheme definitions.")
- (home-page "http://kirc.io/index.html")
(license license:expat)))
(define-public limnoria
@@ -753,6 +763,33 @@ interface for those who are accustomed to the ircII way of doing things.")
;; distribute binaries.
(license:non-copyleft "http://epicsol.org/copyright")))))
+(define-public python-irc-parser-tests
+ (package
+ (name "python-irc-parser-tests")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch) ; PyPI has a broken tests and data locations
+ (uri (git-reference
+ (url "https://github.com/ircdocs/parser-tests")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x0psq31f43d88b8jhaqwd9f1ykiqm4j13i8nxgcgkgp992cw002"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; Tests require python-girc which fails to build on Python 3.10.
+ #:tests? #f))
+ (propagated-inputs (list python-pyyaml))
+ (home-page "https://github.com/ircdocs/parser-tests")
+ (synopsis "Tests for various IRC protocol parsers")
+ (description
+ "This package provides a library of tests for various IRC protocol
+parsers")
+ (license (list license:cc0
+ license:public-domain))))
+
(define-public go-gopkg-in-irc-v3
(package
(name "go-gopkg-in-irc-v3")
@@ -768,19 +805,69 @@ interface for those who are accustomed to the ircII way of doing things.")
(base32 "0f2vv947yf9ygy8ylwqkd9yshybfdsbsp9pffjyvm7l7rnq5da60"))))
(build-system go-build-system)
(arguments
- '(;; TODO 3 tests fail because of missing files
- ;; https://paste.sr.ht/~whereiseveryone/784d068887a65c1b869caa7d7c2077d28a2b2187
- #:tests? #f
- #:import-path "gopkg.in/irc.v3" #:unpack-path "gopkg.in/irc.v3"))
+ (list
+ #:import-path "gopkg.in/irc.v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Testscases is a git submodule to
+ ;; <https://github.com/go-irc/irc-parser-tests> which is an
+ ;; unmaintained clone of <https://github.com/ircdocs/parser-tests>
+ ;; which is packed in Guix as python-irc-parser-tests. Tests data
+ ;; (YAML files) are distributed as Python package and located in
+ ;; <lib/python3.10/site-packages/parser_tests/data/>.
+ (add-before 'check 'install-testcases-data
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p "./testcases/tests")
+ (for-each
+ (lambda (file)
+ (install-file file "./testcases/tests"))
+ (find-files
+ #$(this-package-native-input "python-irc-parser-tests") "\\.yaml$"))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify python-irc-parser-tests))
(propagated-inputs
- `(("go-gopkg-in-yaml-v2" ,go-gopkg-in-yaml-v2)
- ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)))
+ (list go-gopkg-in-yaml-v2))
(home-page "https://gopkg.in/irc.v3")
(synopsis "Low-level IRC library for Go")
(description "Package irc provides a simple IRC library meant as a
building block for other projects.")
(license license:expat)))
+(define-public go-gopkg-in-irc-v4
+ (package
+ (inherit go-gopkg-in-irc-v3)
+ (name "go-gopkg-in-irc-v4")
+ (version "4.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gopkg.in/irc.v4")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yr7m1vz7fj0jbmk8njg54nyc9hx4kv24k13sjc4zj5fyqljj0p2"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "gopkg.in/irc.v4"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; testcases is renamed to _testcases in v4 for some reason.
+ (add-before 'check 'adjust-testcases-data
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p "./_testcases/tests")
+ (for-each
+ (lambda (file)
+ (install-file file "./_testcases/tests"))
+ (find-files
+ #$(this-package-native-input "python-irc-parser-tests") "\\.yaml$"))))))))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs go-gopkg-in-irc-v3)
+ (append go-golang-org-x-time)))))
+
(define-public chathistorysync
(package
(name "chathistorysync")
@@ -839,11 +926,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
@@ -966,7 +1053,7 @@ server written in C++ for Unix-like operating systems.")
(invoke guile "--no-auto-compile" test)))
#t
tests))))))
- (add-after 'install 'install-script
+ (add-after 'build 'install-script
(lambda _
(let* ((bash #$(this-package-input "bash-minimal"))
(bash (string-append bash "/bin/bash"))
@@ -1006,3 +1093,72 @@ server written in C++ for Unix-like operating systems.")
now). It has some basic functionality only, such as seen, tell, and
what.")
(license license:gpl3+)))
+
+(define-public soju
+ (package
+ (name "soju")
+ (version "0.8.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/emersion/soju")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10qc0g78yhsg6fnnb046jr0s592isw0r0mvydy6frgnx9rxac6k6"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "codeberg.org/emersion/soju"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-makefile
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "Makefile"
+ ;; Do not set dfault config path.
+ ((".*config_path.*:.*") "")
+ (("-X.*=.*config_path.*' ") "")
+ ((".*cp -f.*config_path.*") "")
+ ;; Prevent creating /var/lib/soju.
+ ((".*sharedstatedir.*") "")))))
+ (replace 'build
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (setenv "GOFLAGS" "-v -x -trimpath -tags=pam")
+ (setenv "SYSCONFDIR" (string-append #$output "/etc"))
+ (invoke "make"))))
+ (replace 'install
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (setenv "PREFIX" #$output)
+ (invoke "make" "install")))))))
+ (native-inputs
+ (list go-git-sr-ht-emersion-go-scfg
+ go-git-sr-ht-emersion-go-sqlite3-fts5
+ go-git-sr-ht-sircmpwn-go-bare
+ go-github-com-emersion-go-sasl
+ go-github-com-lib-pq
+ go-github-com-mattn-go-sqlite3
+ go-github-com-msteinert-pam-v2
+ go-github-com-pires-go-proxyproto
+ go-github-com-prometheus-client-golang
+ go-github-com-sherclockholmes-webpush-go
+ go-golang-org-x-crypto
+ go-golang-org-x-time
+ go-google-golang-org-protobuf
+ go-gopkg-in-irc-v4
+ go-nhooyr-io-websocket
+ scdoc))
+ (home-page "https://git.sr.ht/~emersion/soju")
+ (synopsis "User-friendly IRC bouncer")
+ (description
+ "Connects to upstream IRC servers on behalf of the user to provide
+extra functionality. soju supports many features
+such as multiple users, numerous @@url{https://ircv3.net/,IRCv3} extensions,
+chat history playback and detached channels. It is well-suited for both small
+and large deployments.")
+ (license license:agpl3)))
+
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 81c9a3d3c2..6f42b1ef67 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -78,8 +78,8 @@
;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up
;;; to date with those listed in
;;; <https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak>.
-(define %jami-nightly-version "20240325.0")
-(define %jami-daemon-commit "32f39e65483cb22729eb922d72434013b337f2c9")
+(define %jami-nightly-version "20240524.0")
+(define %jami-daemon-commit "fd2f2815448ce4072dcbc3995950788573d63f3b")
(define-public libjami
(package
@@ -93,14 +93,18 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0kha2v46l5hmycklhyxrs2qybm640nbrk98z1xvicjxyq6bfszh4"))
+ "1bw0laj93w4pvlxsr5abz59805ypbmg21z5393yzm82j4d35cfyr"))
(patches (search-patches
- "libjami-ac-config-files.patch"
- "jami-disable-integration-tests.patch"))))
+ "libjami-ac-config-files.patch"))))
(outputs '("out" "bin" "debug")) ;"bin' contains jamid
(build-system gnu-build-system)
(arguments
(list
+ ;; XXX: The test suites reportedly takes 2 h 30 to run by upstream's CI.
+ ;; Many tests also fail, within and without the containerized
+ ;; environment. Some issues have recently been fixed, so try again in
+ ;; the next release.
+ #:tests? #f
;; The agent links the daemon binary with libguile, which enables the
;; execution of test plans described in Scheme. It may be useful in
;; user scripts too, until more general purpose Scheme bindings are made
@@ -122,9 +126,8 @@
(find-files (string-append #$output "/lib")
"\\.a$"))))
(add-after 'install 'move-jamid
- ;; This nearly halves the size of the main output (from 1566.2 MiB
- ;; to 833.6 MiB), due to not depending on dbus-c++ and its large
- ;; dependencies.
+ ;; This reduces the size of the main output, due to not depending
+ ;; on sdbus-c++.
(lambda* (#:key outputs #:allow-other-keys)
(let ((libexec (string-append #$output:bin "/libexec"))
(share (string-append #$output:bin "/share")))
@@ -144,7 +147,7 @@
jack-1
jsoncpp
libarchive
- libgit2-1.6
+ libgit2-1.8
libnatpmp
libsecp256k1
libupnp
@@ -227,8 +230,9 @@ QSortFilterProxyModel conveniently exposed for QML.")
(file-name (git-file-name name version))
(sha256
(base32
- "08lv8azjd47n56i25d9ax248xmidixpsnwh5kc4qjxib7985bdhs"))
+ "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd"))
(patches (search-patches
+ "jami-enable-testing.patch"
"jami-libjami-headers-search.patch"
"jami-qwindowkit.patch"
"jami-skip-tests-requiring-internet.patch"
@@ -273,22 +277,28 @@ QSortFilterProxyModel conveniently exposed for QML.")
;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1504).
(setenv "XDG_SESSION_TYPE" "x11")))
(replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(when tests?
(setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "QT_QUICK_BACKEND" "software")
;; The tests require a writable HOME.
(setenv "HOME" "/tmp")
- (display "Running unit tests...\n")
- (invoke "tests/unit_tests")
+ (let ((ctest-args
+ (list "-V" "--output-on-failure"
+ "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1"))))
- ;; The qml_tests suite is not run, as it currently exits with
- ;; an unclear status of 1 (see:
- ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1605).
- ;; (display "Running functional tests...\n")
- ;; (invoke "tests/qml_tests")
- ))))))
+ (display "Running unit tests...\n")
+ (apply invoke "ctest" "-R" "Unit_Tests" ctest-args)
+
+ ;; The QML test suite is currently disabled as it segfaults
+ ;; (see:
+ ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1631).
+ ;; (display "Running functional tests...\n") (apply invoke
+ ;; "ctest" "-R" "Qml_Tests" ctest-args)
+ )))))))
(native-inputs
(list googletest
pkg-config
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a54c1d1d06..b43b57754b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
-;;; Copyright © 2018-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020, 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@@ -20,6 +20,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -579,8 +580,8 @@
;; This is necessary because the certificate directory contains
;; files with non-ASCII characters in their names.
- (setlocale LC_ALL "en_US.utf8")
- (setenv "LC_ALL" "en_US.utf8")
+ (setlocale LC_ALL "C.UTF-8")
+ (setenv "LC_ALL" "C.UTF-8")
(for-each import-cert (find-files certs-dir "\\.pem$"))
(mkdir-p (string-append (assoc-ref outputs "out")
@@ -722,7 +723,7 @@ IcedTea build harness.")
(arguments
`(#:imported-modules
((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
@@ -743,6 +744,11 @@ IcedTea build harness.")
"--enable-nss"
,(string-append "--with-parallel-jobs="
(number->string (parallel-job-count)))
+ ;; Java Flight Recorder isn't supported on some architectures.
+ ,@(if ,(target-ppc32?)
+ `("--enable-jfr=no")
+ '())
+ "--disable-docs" ; This phase can take hours on slow machines.
"--disable-downloading"
"--disable-system-pcsc"
"--disable-system-sctp"
@@ -757,6 +763,10 @@ IcedTea build harness.")
(delete 'patch-patches)
(delete 'patch-bitrot)
(delete 'use-classpath)
+ ;; Prevent passing -j (parallel-job-count) to make
+ (replace 'build
+ (lambda* (#:key (make-flags '()) #:allow-other-keys)
+ (apply invoke "make" make-flags)))
;; Prevent the keytool from recording the current time when
;; adding certificates at build time.
(add-after 'unpack 'patch-keystore
@@ -880,20 +890,27 @@ new Date();"))
(sha256
(base32
"1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0"))
- (patches (search-patches "openjdk-9-pointer-comparison.patch"
- "openjdk-9-setsignalhandler.patch"
- "openjdk-currency-time-bomb.patch"))))
+ (patches
+ (search-patches "openjdk-9-pointer-comparison.patch"
+ "openjdk-9-classlist-reproducibility.patch"
+ "openjdk-currency-time-bomb.patch"
+ "openjdk-9-jar-reproducibility.patch"
+ "openjdk-9-module-reproducibility.patch"
+ "openjdk-9-module2-reproducibility.patch"
+ "openjdk-9-module3-reproducibility.patch"
+ "openjdk-9-idlj-reproducibility.patch"
+ "openjdk-9-setsignalhandler.patch"))))
(build-system gnu-build-system)
(outputs '("out" "jdk" "doc"))
(arguments
`(#:imported-modules
((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules
((guix build utils)
(guix build gnu-build-system)
(ice-9 popen))
- #:tests? #f; require jtreg
+ #:tests? #f ; require jtreg
#:make-flags '("all")
#:disallowed-references ,(list (gexp-input icedtea-8)
(gexp-input icedtea-8 "jdk"))
@@ -982,80 +999,80 @@ new Date();"))
file))))
(find-files "."
"\\.c$|\\.h$")))))
- ;; By default OpenJDK only generates an empty keystore. In order to
- ;; be able to use certificates in Java programs we need to generate a
- ;; keystore from a set of certificates. For convenience we use the
- ;; certificates from the nss-certs package.
- (add-after 'install 'install-keystore
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (use-modules (ice-9 rdelim))
- (let* ((keystore "cacerts")
- (certs-dir (search-input-directory inputs
- "etc/ssl/certs"))
- (keytool (string-append (assoc-ref outputs "jdk")
- "/bin/keytool")))
- (define (extract-cert file target)
- (call-with-input-file file
- (lambda (in)
- (call-with-output-file target
- (lambda (out)
- (let loop ((line (read-line in 'concat))
- (copying? #f))
- (cond
- ((eof-object? line) #t)
- ((string-prefix? "-----BEGIN" line)
- (display line out)
- (loop (read-line in 'concat) #t))
- ((string-prefix? "-----END" line)
- (display line out)
- #t)
- (else
- (when copying? (display line out))
- (loop (read-line in 'concat) copying?)))))))))
- (define (import-cert cert)
- (format #t "Importing certificate ~a\n" (basename cert))
- (let ((temp "tmpcert"))
- (extract-cert cert temp)
- (let ((port (open-pipe* OPEN_WRITE keytool
- "-import"
- "-alias" (basename cert)
- "-keystore" keystore
- "-storepass" "changeit"
- "-file" temp)))
- (display "yes\n" port)
- (when (not (zero? (status:exit-val (close-pipe port))))
- (format #t "failed to import ~a\n" cert)))
- (delete-file temp)))
-
- ;; This is necessary because the certificate directory contains
- ;; files with non-ASCII characters in their names.
- (setlocale LC_ALL "en_US.utf8")
- (setenv "LC_ALL" "en_US.utf8")
-
- (copy-file (string-append (assoc-ref outputs "out")
- "/lib/security/cacerts")
- keystore)
- (chmod keystore #o644)
- (for-each import-cert (find-files certs-dir "\\.pem$"))
- (mkdir-p (string-append (assoc-ref outputs "out")
- "/lib/security"))
- (mkdir-p (string-append (assoc-ref outputs "jdk")
- "/lib/security"))
-
- ;; The cacerts files we are going to overwrite are chmod'ed as
- ;; read-only (444) in icedtea-8 (which derives from this
- ;; package). We have to change this so we can overwrite them.
- (chmod (string-append (assoc-ref outputs "out")
- "/lib/security/" keystore) #o644)
- (chmod (string-append (assoc-ref outputs "jdk")
- "/lib/security/" keystore) #o644)
-
- (install-file keystore
- (string-append (assoc-ref outputs "out")
- "/lib/security"))
- (install-file keystore
- (string-append (assoc-ref outputs "jdk")
- "/lib/security")))))
+ ;; By default OpenJDK only generates an empty keystore. In order to
+ ;; be able to use certificates in Java programs we need to generate a
+ ;; keystore from a set of certificates. For convenience we use the
+ ;; certificates from the nss-certs package.
+ (add-after 'install 'install-keystore
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (use-modules (ice-9 rdelim))
+ (let* ((keystore "cacerts")
+ (certs-dir (search-input-directory inputs
+ "etc/ssl/certs"))
+ (keytool (string-append (assoc-ref outputs "jdk")
+ "/bin/keytool")))
+ (define (extract-cert file target)
+ (call-with-input-file file
+ (lambda (in)
+ (call-with-output-file target
+ (lambda (out)
+ (let loop ((line (read-line in 'concat))
+ (copying? #f))
+ (cond
+ ((eof-object? line) #t)
+ ((string-prefix? "-----BEGIN" line)
+ (display line out)
+ (loop (read-line in 'concat) #t))
+ ((string-prefix? "-----END" line)
+ (display line out)
+ #t)
+ (else
+ (when copying? (display line out))
+ (loop (read-line in 'concat) copying?)))))))))
+ (define (import-cert cert)
+ (format #t "Importing certificate ~a\n" (basename cert))
+ (let ((temp "tmpcert"))
+ (extract-cert cert temp)
+ (let ((port (open-pipe* OPEN_WRITE keytool
+ "-import"
+ "-alias" (basename cert)
+ "-keystore" keystore
+ "-storepass" "changeit"
+ "-file" temp)))
+ (display "yes\n" port)
+ (when (not (zero? (status:exit-val (close-pipe port))))
+ (format #t "failed to import ~a\n" cert)))
+ (delete-file temp)))
+
+ ;; This is necessary because the certificate directory contains
+ ;; files with non-ASCII characters in their names.
+ (setlocale LC_ALL "C.UTF-8")
+ (setenv "LC_ALL" "C.UTF-8")
+
+ (copy-file (string-append (assoc-ref outputs "out")
+ "/lib/security/cacerts")
+ keystore)
+ (chmod keystore #o644)
+ (for-each import-cert (find-files certs-dir "\\.pem$"))
+ (mkdir-p (string-append (assoc-ref outputs "out")
+ "/lib/security"))
+ (mkdir-p (string-append (assoc-ref outputs "jdk")
+ "/lib/security"))
+
+ ;; The cacerts files we are going to overwrite are chmod'ed as
+ ;; read-only (444) in icedtea-8 (which derives from this
+ ;; package). We have to change this so we can overwrite them.
+ (chmod (string-append (assoc-ref outputs "out")
+ "/lib/security/" keystore) #o644)
+ (chmod (string-append (assoc-ref outputs "jdk")
+ "/lib/security/" keystore) #o644)
+
+ (install-file keystore
+ (string-append (assoc-ref outputs "out")
+ "/lib/security"))
+ (install-file keystore
+ (string-append (assoc-ref outputs "jdk")
+ "/lib/security")))))
;; Some of the libraries in the lib/ folder link to libjvm.so.
;; But that shared object is located in the server/ folder, so it
;; cannot be found. This phase creates a symbolic link in the
@@ -1088,48 +1105,96 @@ new Date();"))
(copy-recursively (string-append images "/images/docs") doc))))
(add-after 'install 'strip-zip-timestamps
(lambda* (#:key outputs #:allow-other-keys)
- (for-each (lambda (zip)
- (let ((dir (mkdtemp "zip-contents.XXXXXX")))
- (with-directory-excursion dir
- (invoke "unzip" zip))
- (delete-file zip)
- (for-each (lambda (file)
- (let ((s (lstat file)))
- (unless (eq? (stat:type s) 'symlink)
- (format #t "reset ~a~%" file)
- (utime file 0 0 0 0))))
- (find-files dir #:directories? #t))
- (with-directory-excursion dir
- (let ((files (find-files "." ".*" #:directories? #t)))
- (apply invoke "zip" "-0" "-X" zip files)))))
- (find-files (assoc-ref outputs "doc") ".*.zip$")))))))
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("giflib" ,giflib)
- ("lcms" ,lcms)
- ("libelf" ,libelf)
- ("libjpeg" ,libjpeg-turbo)
- ("libice" ,libice)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxcomposite" ,libxcomposite)
- ("libxi" ,libxi)
- ("libxinerama" ,libxinerama)
- ("libxrender" ,libxrender)
- ("libxt" ,libxt)
- ("libxtst" ,libxtst)))
+ (for-each
+ (lambda (zip)
+ (let ((dir (mkdtemp "zip-contents.XXXXXX")))
+ (with-directory-excursion dir
+ ;; This is an exact copy of the implementation of invoke,
+ ;; but this accepts exit code 1 as OK.
+ (let ((code (system* "unzip" "--" zip)))
+ ;; jmod files are zip files with an extra header in
+ ;; front. unzip will warn about that -- but otherwise
+ ;; work.
+ (when (> (status:exit-val code) 1) ; 1 is just a warning
+ (raise
+ (condition
+ (&invoke-error
+ (program "unzip")
+ (arguments (list "--" zip))
+ (exit-status (status:exit-val code))
+ (term-signal (status:term-sig code))
+ (stop-signal (status:stop-sig code))))))))
+ (delete-file zip)
+ (for-each (lambda (file)
+ (let ((s (lstat file)))
+ (format #t "reset ~a~%" file)
+ (utime file 1 1 0 0
+ AT_SYMLINK_NOFOLLOW)))
+ (find-files dir #:directories? #t))
+ (with-directory-excursion dir
+ (let ((files (cons "./META-INF/MANIFEST.MF"
+ (append
+ (find-files "./META-INF" ".*")
+ ;; for jmod:
+ (list "./classes/module-info.class")
+ (find-files "." ".*")))))
+ (apply invoke "zip" "--symlinks" "-0" "-X" zip files)
+ (when (string-suffix? ".jmod" zip)
+ (let ((new-zip (string-append zip "n"))
+ (contents (call-with-input-file zip
+ (@ (ice-9 binary-ports)
+ get-bytevector-all))))
+ (call-with-output-file new-zip
+ (lambda (output-port)
+ ((@ (ice-9 binary-ports) put-bytevector)
+ output-port
+ #vu8(#x4a #x4d #x01 #x00)) ; JM
+ ((@ (ice-9 binary-ports) put-bytevector)
+ output-port
+ contents)))
+ (rename-file new-zip zip)))))))
+ (append (find-files (string-append
+ (assoc-ref outputs "doc")
+ "/api")
+ "\\.zip$")
+ (find-files (assoc-ref outputs "doc") "src\\.zip$")
+ (find-files (assoc-ref outputs "jdk") "src\\.zip$")
+ (find-files (assoc-ref outputs "jdk") "\\.jmod$")
+ (find-files (assoc-ref outputs "jdk") "\\.diz$")
+ (find-files (assoc-ref outputs "out") "\\.diz$")
+
+ (list (string-append (assoc-ref outputs "jdk")
+ "/lib/jrt-fs.jar"))
+ (find-files (string-append (assoc-ref outputs "jdk")
+ "/demo")
+ "\\.jar$"))))))))
+ (inputs
+ (list alsa-lib
+ cups
+ fontconfig
+ freetype
+ giflib
+ lcms
+ libelf
+ libjpeg-turbo
+ libice
+ libpng
+ libx11
+ libxcomposite
+ libxi
+ libxinerama
+ libxrender
+ libxt
+ libxtst))
(native-inputs
- `(("icedtea-8" ,icedtea-8)
- ("icedtea-8:jdk" ,icedtea-8 "jdk")
- ;; XXX: The build system fails with newer versions of GNU Make.
- ("make@4.2" ,gnu-make-4.2)
- ("nss-certs" ,nss-certs)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
+ (list icedtea-8
+ `(,icedtea-8 "jdk")
+ ;; XXX: The build system fails with newer versions of GNU Make.
+ gnu-make-4.2
+ nss-certs
+ unzip
+ which
+ zip))
(home-page "https://openjdk.org/projects/jdk9/")
(synopsis "Java development kit")
(description
@@ -1154,7 +1219,15 @@ new Date();"))
(base32
"0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))
(patches (search-patches
+ "openjdk-10-char-reproducibility.patch"
+ "openjdk-10-classlist-reproducibility.patch"
+ "openjdk-10-corba-reproducibility.patch"
"openjdk-10-idlj-reproducibility.patch"
+ "openjdk-10-module-reproducibility.patch"
+ "openjdk-10-module3-reproducibility.patch"
+ "openjdk-10-module4-reproducibility.patch"
+ "openjdk-10-jar-reproducibility.patch"
+ "openjdk-10-jtask-reproducibility.patch"
"openjdk-10-pointer-comparison.patch"
"openjdk-10-setsignalhandler.patch"
"openjdk-currency-time-bomb2.patch"))))
@@ -1180,6 +1253,11 @@ new Date();"))
;; this exact first line.
(substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem"
(("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))))
+ (add-after 'unpack 'remove-timestamping
+ (lambda _
+ (substitute* "./src/hotspot/share/runtime/vm_version.cpp"
+ (("__DATE__") "")
+ (("__TIME__") ""))))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "bash" "./configure"
@@ -1229,8 +1307,14 @@ new Date();"))
(modules '((guix build utils)))
(snippet
'(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))
- (patches (search-patches
- "openjdk-currency-time-bomb2.patch"))))
+ (patches
+ (search-patches "openjdk-10-module3-reproducibility.patch"
+ "openjdk-10-module4-reproducibility.patch"
+ "openjdk-10-char-reproducibility.patch"
+ "openjdk-11-classlist-reproducibility.patch"
+ "openjdk-10-jar-reproducibility.patch"
+ "openjdk-10-jtask-reproducibility.patch"
+ "openjdk-currency-time-bomb2.patch"))))
(build-system gnu-build-system)
(outputs '("out" "jdk" "doc"))
(arguments
@@ -1264,6 +1348,10 @@ new Date();"))
"--with-libjpeg=system"
"--with-libpng=system"
"--with-version-pre="
+ ;; Should be set by SOURCE_DATE_EPOCH handler, but isn't being
+ ;; set; do it manually.
+ "--with-hotspot-build-time=1970-01-01T00:00:01"
+ "--enable-reproducible-build" ; to be sure
;; Allow the build system to locate the system freetype.
(string-append "--with-freetype-include="
#$(this-package-input "freetype") "/include")
@@ -1277,6 +1365,11 @@ new Date();"))
;; this exact first line.
(substitute* "make/data/blockedcertsconverter/blocked.certs.pem"
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))
+ (add-after 'unpack 'remove-timestamping
+ (lambda _
+ (substitute* "src/hotspot/share/runtime/abstract_vm_version.cpp"
+ (("__DATE__") "")
+ (("__TIME__") ""))))
(add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries.
(lambda _
@@ -1396,7 +1489,7 @@ new Date();"))
((name . dir)
dir))
outputs)))))
- (add-after 'remove-diz-file 'strip-archive-timestamps
+ (add-after 'remove-extraneous-files 'strip-archive-timestamps
(lambda _
(use-modules (ice-9 binary-ports)
(rnrs bytevectors))
@@ -1477,7 +1570,7 @@ new Date();"))
libxtst))
(native-inputs
(list autoconf
- bash ; not bash-minimal, needs ulimit
+ bash ; not bash-minimal, needs ulimit
openjdk10
`(,openjdk10 "jdk")
gnu-make-4.2
@@ -1486,7 +1579,7 @@ new Date();"))
unzip
which
zip))
- (home-page "https://openjdk.java.net/projects/jdk/11/")
+ (home-page "https://openjdk.org/projects/jdk/11/")
(synopsis "Java development kit")
(description
"This package provides the Java development kit OpenJDK.")
@@ -1563,6 +1656,11 @@ new Date();"))
(string-append "Interpreter specific version of call_VM_base\n"
" using MacroAssembler::call_VM_leaf_base;"))))))
#~())
+ (replace 'remove-timestamping
+ (lambda _
+ (substitute* "src/hotspot/share/runtime/vm_version.cpp"
+ (("__DATE__") "")
+ (("__TIME__") ""))))
(replace 'fix-java-shebangs
(lambda _
;; 'blocked' was renamed to 'blacklisted' in this version for
@@ -1575,9 +1673,20 @@ blacklisted.certs.pem"
(define-public openjdk13
(make-openjdk openjdk12 "13.0.14"
"1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755"
- (source (origin
- (inherit (package-source base))
- (patches '())))))
+ (source (origin
+ (inherit (package-source base))
+ (patches (search-patches "openjdk-13-classlist-reproducibility.patch"
+ "openjdk-10-jtask-reproducibility.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments openjdk12)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'remove-timestamping
+ (lambda _
+ (substitute*
+ "src/hotspot/share/runtime/abstract_vm_version.cpp"
+ (("__DATE__") "")
+ (("__TIME__") ""))))))))))
(define-public openjdk14
(make-openjdk
@@ -1592,7 +1701,9 @@ blacklisted.certs.pem"
(substitute* "make/autoconf/basics.m4"
(("if help") "if command -v"))
(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))))
- (patches (search-patches "openjdk-10-setsignalhandler.patch"))))))
+ (patches (search-patches "openjdk-10-setsignalhandler.patch"
+ "openjdk-10-jtask-reproducibility.patch"
+ "openjdk-13-classlist-reproducibility.patch"))))))
(define-public openjdk15
(make-openjdk
@@ -1603,7 +1714,8 @@ blacklisted.certs.pem"
(modules '())
(snippet #f)
(patches
- (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
+ (search-patches "openjdk-15-jtask-reproducibility.patch"
+ "openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(modify-inputs (package-inputs base)
(append libxcursor))) ;for our patch to work
@@ -1681,7 +1793,7 @@ blacklisted.certs.pem"
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
;;; Convenience alias to point to the latest version of OpenJDK.
-(define-public openjdk openjdk19)
+(define-public openjdk openjdk21)
;; This version of JBR is here in order to be able to build custom
@@ -3071,7 +3183,7 @@ specification.")
(origin
(method url-fetch)
(uri (string-append
- "http://download.eclipse.org/eclipse/downloads/drops4/"
+ "https://archive.eclipse.org/eclipse/downloads/drops4/"
"R-" version "-201710090410/swt-" version
"-gtk-linux-" file ".zip"))
(sha256 (base32 hash))))))
@@ -3102,6 +3214,7 @@ specification.")
;; package output.
(mkdir-p lib)
(setenv "OUTPUT_DIR" lib)
+ (setenv "CC" ,(cc-for-target))
(with-directory-excursion "src"
(invoke "bash" "build.sh")))))
(add-after 'install 'install-native
@@ -8112,7 +8225,7 @@ discards all logging messages.")
(arguments
`(#:tests? #f ; no test target
#:imported-modules ((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules (((guix build ant-build-system) #:prefix ant:)
(guix build gnu-build-system)
(guix build utils))
@@ -8709,7 +8822,7 @@ Python generated sources by ANTLR.")))
#t))
;; tests require to have a working antlr4 binary
(delete 'check)
- (add-after 'bin-install 'check
+ (add-after 'install 'check
(lambda _
(invoke "ant" "compile-tests")
(invoke "ant" "check" "-Dtest.home=runtime-testsuite/test")
@@ -11316,7 +11429,10 @@ particularly simple design.")
(arguments
`(#:jar-name "java-jctools-core.jar"
#:source-dir "jctools-core/src/main/java"
- #:test-dir "jctools-core/src/test"))
+ #:test-dir "jctools-core/src/test"
+ ;; The tests timeout on some architectures.
+ #:tests? ,(not (or (target-aarch64?)
+ (%current-target-system)))))
(native-inputs
(list java-junit java-hamcrest-all))
(home-page "https://github.com/JCTools/JCTools")
@@ -14447,7 +14563,7 @@ can be interpreted by IDEs and static analysis tools to improve code analysis.")
(display
(string-append
"#!/bin/sh\n"
- java " -cp " java-cp " " class " \"$@\""))))
+ java " -XX:+UseParallelGC " " -cp " java-cp " " class " \"$@\""))))
(chmod file #o755)))))
;; bin/wrapper . java-class
'(("pcal" . "pcal.trans")
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/jemalloc.scm b/gnu/packages/jemalloc.scm
index 5e7facfd5e..b5fdd39921 100644
--- a/gnu/packages/jemalloc.scm
+++ b/gnu/packages/jemalloc.scm
@@ -62,6 +62,8 @@
;; https://github.com/jemalloc/jemalloc/issues/937
#~'("--disable-initial-exec-tls"
#$@(match (%current-system)
+ ("aarch64-linux"
+ (list "--with-lg-page=14"))
("powerpc-linux"
(list "CPPFLAGS=-maltivec"))
(_
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index f8e3ac86cb..1743d27226 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1102,15 +1103,6 @@ color scales for graphics.")
(sha256
(base32 "0cp5wbi2bhnxp4h7wpzkx341d47744f4c9a8n0w0kn016qa16m86"))))
(build-system julia-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'skip-failing-test
- (lambda _
- (substitute* "test/conversions.jl"
- (("@test promote\\(RGB\\{N0f8")
- "@test_broken promote(RGB{N0f8")))))))
(propagated-inputs
(list julia-fixedpointnumbers))
(native-inputs
@@ -2337,35 +2329,33 @@ writing @acronym{FITS, Flexible Image Transport System} files, based on the
(license license:expat)))
(define-public julia-fixedpointnumbers
- (let ((commit "59ee94b93f2f1ee75544ef44187fc0e440cd8015")
- (revision "1"))
- (package
- (name "julia-fixedpointnumbers")
- (version (git-version "0.8.4" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/JuliaMath/FixedPointNumbers.jl")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ghriy7p2fj7mwdx11ssjg28jmwz8pi13c3j8p1grvwb4nvc0jnq"))))
- (build-system julia-build-system)
- (arguments
- (list #:tests? #f)) ; Cycle with julia-documenter
- (propagated-inputs
- (list julia-compat))
- (home-page "https://github.com/JuliaMath/FixedPointNumbers.jl")
- (synopsis "Fixed point types for Julia")
- (description "@code{FixedPointNumbers.jl} implements fixed-point number
+ (package
+ (name "julia-fixedpointnumbers")
+ (version "0.8.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JuliaMath/FixedPointNumbers.jl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1cixh2acxscrgxglgbj2mlp2bk2yvqil1kjfvnp1xi0zp6px60f6"))))
+ (build-system julia-build-system)
+ (arguments
+ (list #:tests? #f)) ; Cycle with julia-documenter
+ (propagated-inputs
+ (list julia-compat))
+ (home-page "https://github.com/JuliaMath/FixedPointNumbers.jl")
+ (synopsis "Fixed point types for Julia")
+ (description "@code{FixedPointNumbers.jl} implements fixed-point number
types for Julia. A fixed-point number represents a fractional, or
non-integral, number. In contrast with the more widely known floating-point
numbers, with fixed-point numbers the decimal point doesn't \"float\":
fixed-point numbers are effectively integers that are interpreted as being
scaled by a constant factor. Consequently, they have a fixed number of
digits (bits) after the decimal (radix) point.")
- (license license:expat))))
+ (license license:expat)))
(define-public julia-formatting
(package
@@ -4928,6 +4918,27 @@ everything from run time algorithm choice to code generation at compile time.")
human-readable format.")
(license license:expat)))
+(define-public julia-progressbars
+ (package
+ (name "julia-progressbars")
+ (version "1.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cloud-oak/ProgressBars.jl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y4i2kdir0wxr3amafidr3585w8lj4s0cqfcbl690a8jvw6rs3jw"))))
+ (build-system julia-build-system)
+ (home-page "https://github.com/cloud-oak/ProgressBars.jl")
+ (synopsis "Progress bar for Julia")
+ (description
+ "This package provides a fast, extensible progress bar for Julia.
+This can help users track the progress of long-running tasks.")
+ (license license:mpl2.0)))
+
(define-public julia-pycall
(package
(name "julia-pycall")
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 18f0d6c7d3..9668b3fd1e 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -35,6 +35,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages elf)
@@ -501,7 +502,8 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
(assoc-ref %build-inputs "libuv")
"/include"))))
(inputs
- `(("coreutils" ,coreutils) ; for bindings to "mkdir" and the like
+ `(("bash-minimal" ,bash-minimal)
+ ("coreutils" ,coreutils) ; for bindings to "mkdir" and the like
("curl" ,curl-ssh)
("gfortran" ,gfortran)
;; required for libgcc_s.so
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index ef68521b53..8c8c7b5347 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -491,6 +492,32 @@ for authoring custom addons.")
Mathjax, the JavaScript display engine for mathematics.")
(license license:bsd-3)))
+(define-public python-comm
+ (package
+ (name "python-comm")
+ (version "0.2.2")
+ (source
+ (origin
+ (method git-fetch) ; no tests data in PyPi package
+ (uri (git-reference
+ (url "https://github.com/ipython/comm")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18xsbpd8dgcfbc51xl59nlwaq7jnyzvgzjfj6psscv71894x4lg7"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-hatchling python-pytest python-setuptools-scm))
+ (propagated-inputs
+ (list python-traitlets))
+ (home-page "https://github.com/ipython/comm")
+ (synopsis "Python Comm implementation for the Jupyter kernel protocol")
+ (description
+ "This package provides a way to register a Kernel Comm implementation, as
+per the Jupyter kernel protocol. It also provides a base Comm implementation
+and a default CommManager that can be used.")
+ (license license:bsd-3)))
+
(define-public python-nbclient
(package
(name "python-nbclient")
@@ -823,6 +850,63 @@ JupyterLab.")
datasets across widgets.")
(license license:bsd-3)))
+(define-public python-papermill
+ (package
+ (name "python-papermill")
+ (version "2.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "papermill" version))
+ (sha256
+ (base32 "097ai2n7f72a7hya9qnds3f28cg70p8xdj2c3cwqymzx28cskqlz"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; Do not bother testing Azure, AWS, and Google Cloud features.
+ '(list "--ignore=papermill/tests/test_abs.py"
+ "--ignore=papermill/tests/test_adl.py"
+ "--ignore=papermill/tests/test_gcs.py"
+ "--ignore=papermill/tests/test_s3.py")))
+ (propagated-inputs (list python-aiohttp
+ python-ansicolors
+ python-click
+ python-entrypoints
+ python-nbclient
+ python-nbformat
+ python-pyyaml
+ python-requests
+ python-tenacity
+ python-tqdm))
+ (native-inputs (list python-attrs
+ python-black
+ python-boto3
+ python-botocore
+ python-bumpversion
+ python-check-manifest
+ python-codecov
+ python-coverage
+ python-ipython
+ python-ipywidgets
+ python-moto
+ python-notebook
+ python-pytest
+ python-pytest-cov
+ python-pytest-env
+ python-pytest-mock
+ python-recommonmark
+ python-requests
+ python-setuptools
+ python-tox
+ python-twine
+ python-wheel))
+ (home-page "https://github.com/nteract/papermill")
+ (synopsis "Parameterize and run Jupyter and nteract Notebooks")
+ (description "Papermill is a tool for parameterizing, executing, and
+analyzing Jupyter Notebooks.")
+ (license license:bsd-3)))
+
(define-public python-voila
(package
(name "python-voila")
diff --git a/gnu/packages/kawa.scm b/gnu/packages/kawa.scm
index 49a3ca6e16..e644965f9b 100644
--- a/gnu/packages/kawa.scm
+++ b/gnu/packages/kawa.scm
@@ -23,6 +23,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages java))
(define-public kawa
@@ -45,10 +46,9 @@
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/share/kawa/bin/kawa")
- `("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea"))))
- #t))))))
+ `("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea"))))))))))
(inputs
- (list `(,icedtea-8 "jdk")))
+ (list bash-minimal `(,icedtea-8 "jdk")))
(home-page "https://www.gnu.org/software/kawa/")
(synopsis "Java framework and implementation of Scheme, Elisp, and more")
(description
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 08329820fa..88f79615f0 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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -112,7 +113,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "030dyw4krnq8hcp0dsqb15zxb7x7r8c33lbdgmmia5xpkpqjp693"))))
+ "1ks9381yf7n9v80baydjrbri5yf0kwc0g1dnyclhd682wnhjqg4g"))))
(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.5.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"))))
+ "00lhiiyl8yv7cn06b2xjpcwgcxb5n60v1122hn32mpbg436abaf5"))))
+ (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.5.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"))))
+ "1rhhc0fxwpv5dq3j7jsys0k72sy43qb1fmj2ib2a59sjvhc0ds3c"))))
(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.5.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"))))
+ "0pm6dbn0za3pp078ri4rbfdb0xa163pnx26h103l3y8szik4f8zh"))))
(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.5.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"))))
+ "1i5h39asvjsbx4d5p3b78gvfa514yjchn394ph77b4a8z2p8yvna"))))
(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.5.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"))))
+ "18d3c2c9si71hic816gkdhayabi0sa5b874hk1wrhx0l44i2ym7j"))))
(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.5.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"))))
+ "0yaf8h2b8x9i9a3qm6bx1ksjmw0mj57ib18rds929q0dqx9h4lz5"))))
(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.5.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"))))
+ "08pm465rmy5va17kn86mw0pxskpnw9p04a7rq9acxxhmxpsrk9bd"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules perl tzdata-for-tests))
- (inputs
- (list libical qtbase-5))
+ (inputs (list libical qtbase qtdeclarative))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -573,10 +606,10 @@ and the older vCalendar.")
name "-" version ".tar.xz"))
(sha256
(base32
- "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w"))))
+ "020yz5mf2rqrk6jw460br1wz3lp50d9fh0dvrld5jf8f8zsj4v79"))))
(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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+
+ (sha256
+ (base32
+ "0axlj37ayra5ds8pfajx6pwjidj6i9fcxwld2p68qh6w6zfmafrj"))))
+ (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.5.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)
+ "04sxibd21mzc27s67yjpg0qsd1j8w6k29wdbg2wdy7a9scam73p4"))))
+ (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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "167gwmrj7vfi49bfx16vri3vvzz979ymgwadb1s4xq6lvhlis3jy"))))
+ (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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1zm8y0ganicalqq1s2apm5ikzpza6f6m0607aaad4bbsbpzzkb5g"))))
+ (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.5.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"))))
+ "1zdziswvkdycg4cr89y9fwqym812yd2w167qa8dwlvxn7562bz9p"))))
(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.5.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"))))
+ "01s8mjpazvl4j1fhb00f24zcsbin5zjz319sv9znxyl51f9zm4vi"))))
(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.5.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 "1jixchnfqpwbh5l187yj6y5zb526zsq588d3536hdaxgzy2k1844"))))
(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.5.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"))))
+ "1z57rym74w1sqsiwa7vwg0n67bky0vd7q3hhb1fp8lp4i9md6wvq"))))
(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"
+ "(kcatalogtest|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.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1xpa51v4lfc3iw7i7q4k39nappyjf9d1argi02028hmnmmp7vp5n"))))
(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.5.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")))
+ "173m6h9wr8pl5l70s6wmasm8dimkq737qgn6mlzdm18w3qb3p9s3"))))
(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.5.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"))))
+ "0xjgk9gir8kgw0cf2922sps0xr62y8j8il6gx4f9l915znrh9v1n"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1044,12 +1365,11 @@ model to observers
name "-" version ".tar.xz"))
(sha256
(base32
- "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg"))))
+ "175nrc2yirv6hpnj7d03qm795k9bp9yw96rwpjdmm6cp0n4b7wq7"))))
(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.5.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"))))
+ "0hyrh3sw6znl79xxhqw7jqgyhh1b59aq7lmhkpagl0i0sk29f5h2"))))
(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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1k96rdharvagnacmfqwxfh0n2nymsp7dw92r5g4m0sby9nyj885f"))))
+ (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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1096,27 +1471,25 @@ pixel units.")
"syntax-highlighting-" version ".tar.xz"))
(sha256
(base32
- "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63"))))
+ "0y6330pzmm5p6f6x3kdfvgk5m8cl01i3ikisrmb7w9m3a7fq661y"))))
(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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/kwayland" "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0x4psmfn993lvha8cjw6w55gp7jp3490sb44wjfp6b5ccmpc14c6"))))
+ (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.5.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"))))
+ "02gys2sr03j5m85gw6n4qs9yanmnl1hwjpb2sk3q74b11b2bqfng"))))
(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.5.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"))))
+ "1iivhw6p1g2r9bd461w7rrv7qkr2i1cfpy7x4akr2vpjdghqdbna"))))
(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.5.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"))))
+ "0yvismy20f8xv58f17gi4a9h4rp9mbz3384208v9qpawkj6b3hkn"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1350,16 +1832,16 @@ messages.")
name "-" version ".tar.xz"))
(sha256
(base32
- "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n"))))
+ "0v0v6184q5zfb919mngn5ziipy4yz44mpix4yfffi3hpr0r2npxa"))))
(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.5.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 "1fk7n07j57wgh1rqzh28xpc1fgij6mk0n4bh3vs8m63izg67vhdv"))))
(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.5.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)
+ "08ckvbrpfan1aa6qgqx659gwg01qjbypis0h1vwbg2scb9vki1l8"))))
+ (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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1496,8 +2008,37 @@ feel.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s"))))
+ "0p3af1p8137yij3m8ksxw6pmgjhpfjxn2i67byzz9ghpjrn7q8z8"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1529,16 +2063,15 @@ system.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx"))))
+ "1ap17mx4cfhmlq14y0nb9y40z2ksmydzfxga3klc6lbr5gwbd1ky"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1558,40 +2113,70 @@ ASpell and HUNSPELL.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh"))))
+ "1s5x42xpshylwl5bgna785d0plwwzf770akv7x5bz3j3dj9x0w5f"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1654,12 +2238,13 @@ with other frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir"))))
+ "156kb1in1jqdpr516k6c0wp5cldpjh447mr08kdms76s16jigx8s"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1699,12 +2307,13 @@ utilities.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc"))))
+ "1ygd9s0gmd8n6b3hfbdivzss2rqiyl5iirnxw7hrrx0ma07gi2kp"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1726,24 +2355,30 @@ 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))
+ "1i7xlmgipgd414vgaz1l39rh9f0n196xg6zr9c222n4s8scf04dp"))))
+ (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))))
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" "(kcontacts-addresstest)"
+ "--rerun-failed" "--output-on-failure"
+ "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1"))))))))
(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 +2390,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1764,22 +2399,41 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
name "-" version ".tar.xz"))
(sha256
(base32
- "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1"))))
+ "1wwv64jygx1hhiskn8xsk2v5dhnkbq94fd2rpi031k1ja7hnq347"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1788,19 +2442,68 @@ application crashes.")
name "-" version ".tar.xz"))
(sha256
(base32
- "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v"))))
+ "1p81c2m5svhdjv97097q9wf3xhz014vjqh8hcg6587pf4bi1l7kq"))))
(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 +2529,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1845,7 +2543,7 @@ from DocBook files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560"))))
+ "1x60zl20qg19d615r62vf6kavzaij451n55wqvgqkqvz7n11ji2p"))))
(build-system cmake-build-system)
(arguments
(list
@@ -1854,28 +2552,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 +2581,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 +2638,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 +2652,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 +2663,7 @@ by applications to write metadata.")
(define-public kimageformats
(package
(name "kimageformats")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1933,14 +2672,22 @@ by applications to write metadata.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w"))))
+ "08jhlxnbklq06xvv4qc10xxg3l4scazg0624rshghr3j8wvbfjn6"))))
(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 +2695,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 +2704,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1987,22 +2750,41 @@ formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8"))))
+ "1n0aj4hc3hj2n25g2a22mzz386wrjiz7cl978l6q7rhs36qxmib7"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2011,15 +2793,43 @@ asynchronous jobs.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b"))))
+ "1rpflc2xjpjd588b5w8kfc4hfifxmzp58savk6x8q4vn45ldqwrx"))))
(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 +2837,7 @@ asynchronous jobs.")
qtbase-5
qtspeech-5
qtx11extras))
+ (propagated-inputs '())
(arguments
(list #:phases #~(modify-phases %standard-phases
(replace 'check
@@ -2035,17 +2846,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2054,17 +2860,74 @@ covers feedback and persistent events.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d"))))
+ "0wxpim80hlw8ad1hlqpynjvag6z5w6r0ml1vk9zh84lif70m4d6g"))))
(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 +2965,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2122,21 +2979,20 @@ were traditional plugins.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9"))))
+ "0hajvy7vyv1hj0hyxd86phkq7sjddpa7abvg6al4ifc39ax6b4yw"))))
(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 +3004,7 @@ and communicating with them using a pty.")
(define-public kunitconversion
(package
(name "kunitconversion")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2157,13 +3013,13 @@ and communicating with them using a pty.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n"))))
+ "1r1gk4p8dlwdrsdv0wvw3jggln7zimp60bryh02x6hvl7i123mf7"))))
(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 +3031,7 @@ gallons).")
(define-public syndication
(package
(name "syndication")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2184,12 +3040,12 @@ gallons).")
name "-" version ".tar.xz"))
(sha256
(base32
- "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7"))))
+ "0kk7dk4l96n53pv7m42nijygfh6hsr8g4fynp1803c3ij8fcbbyd"))))
(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 +3063,7 @@ between feed formats.")
(define-public baloo
(package
(name "baloo")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2216,7 +3072,7 @@ between feed formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50"))))
+ "1bx68zd4pwd9iz890jvl0av7k0zcf7ff9m5f221mn7fzwyv6q16q"))))
(build-system cmake-build-system)
(propagated-inputs
(list kcoreaddons kfilemetadata))
@@ -2237,18 +3093,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 +3115,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.4")
(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
+ "11i2ynw7gvlj164iq9bwz7q1dcwi82bd3dwaa67ypzsb4dwrbczc"))))
+ (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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/plasma-activities-stats-"
+ version ".tar.xz"))
(sha256
(base32
- "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7"))))
+ "0xr0gzncb4sf6asdd5hgfs9bkfjv9z4nn215jvlmyk2r56zydylj"))))
(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 +3176,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2294,12 +3185,12 @@ by which applications, and what documents have been linked to which activity.")
name "-" version ".tar.xz"))
(sha256
(base32
- "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc"))))
+ "1v7vamf5541r28yvb6kc4jwjczcsglfhvia9gh8c3smhwpmbrnlp"))))
(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 +3198,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2335,10 +3257,58 @@ using the XBEL format.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9"))))
+ "14x9vjxfk2kxgv9053nzw9xq1ijaq4z1x5zgwrhy6876bbn7917b"))))
(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 +3334,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2396,21 +3361,22 @@ KCModules can be created with the KConfigWidgets framework.")
name "-" version ".tar.xz"))
(sha256
(base32
- "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj"))))
+ "04jn7s044n5yl04ic8kd47y3z07j9cb48121bi8gnxq4zj1ld054"))))
(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 +3390,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 +3400,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2445,29 +3452,63 @@ their settings.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g"))))
+ "10yg72mx4y6zd56nxdzcykxncnyfg1x7b20wbxj56g9fjwn1bi5k"))))
(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 +3527,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2508,7 +3541,7 @@ that offer bindings to some of the Frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3"))))
+ "1c2lk418lazlynclw3zy79bzs21v962afpl98wzl9766mi0sjb19"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -2519,7 +3552,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 +3561,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 +3618,7 @@ ini-style description files.")
(define-public kdesu
(package
(name "kdesu")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2569,14 +3627,16 @@ ini-style description files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr"))))
+ "14xkkbd7nq0hhlfk83fj363rxbcjj087pjg3xcig27ppph5qvh03"))))
(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 +3647,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 +3656,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 +3683,7 @@ emoticons coming from different providers.")
(define-public kglobalaccel
(package
(name "kglobalaccel")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2632,20 +3692,18 @@ emoticons coming from different providers.")
name "-" version ".tar.xz"))
(sha256
(base32
- "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap"))))
+ "191rlcwdyapv6m00vj99pq7w6sjlvmmkn54zmcicxf64izs1qfl8"))))
(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 +3711,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2665,20 +3750,67 @@ window does not need focus for them to be activated.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28"))))
+ "0c8kfbr0d9igxwjq1y3p4xs4qvj98cfxax54bbr8hgqbirwcbi6d"))))
(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 +3825,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 +3839,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 +3863,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 +3896,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2781,7 +3911,7 @@ consumption.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z"))
+ "04wa36ybv38v3q22ykk28n5bmj0bfzcl3lik8qnk4yjp6hszi2ww"))
(patches (search-patches "kio-search-smbd-on-PATH.patch"))))
(build-system cmake-build-system)
(propagated-inputs
@@ -2794,12 +3924,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 +3937,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 +4108,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2897,41 +4125,31 @@ KIO enabled infrastructure.")
name "-" version ".tar.xz"))
(sha256
(base32
- "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj"))))
+ "0yccff5rz5g00ja3q6gkyfv28qb32icvjs42q4gkm9drc2k8jmc1"))))
(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 +4157,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2951,7 +4209,7 @@ specification.")
name "-" version ".tar.xz"))
(sha256
(base32
- "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds"))))
+ "1505xsrcn7zfaq5jkyj2dnj07fpagf4p3j2dmdgs1rjlzfzxcapv"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules))
@@ -2972,7 +4230,7 @@ specification.")
kwidgetsaddons
kxmlgui
phonon
- qtbase-5
+ qtbase
solid))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Configuration dialog for desktop notifications")
@@ -2981,10 +4239,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2993,48 +4287,78 @@ notifications which can be embedded in your application.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v"))))
+ "07rp987bkzpvmb2735r3jm573dxmvyd92bs8hmnc2xvz4rxl3daf"))))
(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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3043,7 +4367,7 @@ widgets with a user-interface defined in terms of actions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1"))))
+ "1hm6f0rlsdnqcc0mi1ndqlja6vl2774300zcs85x3c306anxfb0h"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules))
@@ -3053,11 +4377,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 +4395,7 @@ to easily extend the contacts collection.")
(define-public krunner
(package
(name "krunner")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3079,9 +4404,52 @@ to easily extend the contacts collection.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw"))))
+ "0c300cmn04nmh0h5slr4p9vhzr54add40v5hm2m4frzy4gpsyx2n"))))
(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 +4457,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 +4494,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3147,37 +4508,43 @@ typed.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca"))))
+ "1ggq9i38p63i2imxnzalax015g3x9wvc5g5n6wn2ifczph2d5ka8"))))
(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 +4553,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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "00w435q0dyyal5hx7q9z6nbzmy5wcwwrgwf44prx119dhqd5xvsx"))))
+ (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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3198,7 +4632,7 @@ types or handled by application specific code.")
"ktexteditor-" version ".tar.xz"))
(sha256
(base32
- "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8"))))
+ "1hdqvfc5p7hlm4m3ng54w9q5bq8zz6rdmhlr75zn4swclrsqifwv"))))
(build-system cmake-build-system)
(propagated-inputs
(list kparts
@@ -3209,52 +4643,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 +4672,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3275,12 +4754,12 @@ library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v"))))
+ "04h2fxamxxb09yvdb2i5lhs8643q2farq004yw0rs7l36k3g37d9"))))
(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 +4771,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 +4780,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.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/ktexttemplate-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1ih4rdp7idjc3yz7jv26qv57p49lysrndzcn6kw1gbq8zy3kyni9"))))
+ (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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3313,16 +4848,16 @@ It supports rich text as well as plain text.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36"))))
+ "0nl1blnpbvggv3r86m09skc46py0fsxhdayvipgsy683l58fzfcy"))))
(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 +4878,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 +4887,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.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3364,16 +4936,17 @@ the passwords on KDE work spaces.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr"))))
+ "00yrbj66i7fydncbc8z2mnap2yfc5nz2xn6606zy1cz79barsm3m"))))
(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 +4956,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 +4983,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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0444dcm9dfikhmf9spadjgi5nrn50ilw5alr2w6nxs30k56k3zia"))))
+ (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 +5101,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 +5139,7 @@ setUrl, setUserAgent and call.")
qtquickcontrols2-5
qtsvg-5
qtx11extras
- solid))
+ solid-5))
(arguments
(list #:phases
#~(modify-phases %standard-phases
@@ -3522,7 +5165,7 @@ script engines.")
(define-public purpose
(package
(name "purpose")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3531,20 +5174,26 @@ script engines.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1"))))
+ "0x625b392wi5g52d1b9hpdb090jclpfapfl0k6fvgx9plw20my20"))))
(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 +5207,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 +5249,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 +5266,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 +5275,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 +5296,7 @@ applications.")
(define-public kde-frameworkintegration
(package
(name "kde-frameworkintegration")
- (version "5.114.0")
+ (version "6.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3643,12 +5305,13 @@ applications.")
"frameworkintegration-" version ".tar.xz"))
(sha256
(base32
- "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd"))))
+ "1x0d3bhp8ak7fw6db3n6cjhx6xz0izl5h880r62jqbb05rs5ayy5"))))
(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 +5321,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 +5475,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 +5484,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 +5525,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 +5534,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 +5551,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.5.0")
(source
(origin
(method url-fetch)
@@ -4002,20 +5562,23 @@ offers abstract functionality to deal with scripts.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2"))))
+ (base32 "1kzgds4w5awhg09l1yxmy58n2d070psn8vl2bv9nr51dcf5vn3wh"))))
(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 44b7344aab..520981550b 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -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.04.3")
+ (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 "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422"))))
+ (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
@@ -196,14 +195,12 @@ This package is part of the KDE multimedia module.")
;; The test suite requires a running X server, setting
;; QT_QPA_PLATFORM=offscreen does not suffice.
(system "Xvfb :1 -screen 0 640x480x24 &")
- (setenv "DISPLAY" ":1")
- #t))
+ (setenv "DISPLAY" ":1")))
(replace 'check
(lambda* (#:key tests? test-target #:allow-other-keys)
(when tests?
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
- (invoke "dbus-launch" "make" test-target))
- #t)))))
+ (invoke "dbus-launch" "make" test-target)))))))
(home-page "https://apps.kde.org/elisa/")
(synopsis "Powerful music player for Plasma 5")
(description "Elisa is a simple music player aiming to provide a nice
@@ -217,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 "
@@ -243,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))
@@ -267,6 +266,7 @@ This package is part of the KDE multimedia module.")
kio
knotifications
ktextwidgets
+ kstatusnotifieritem
kwallet
kwidgetsaddons
kwindowsystem
@@ -274,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
@@ -297,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)
@@ -306,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
@@ -340,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))
@@ -355,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
@@ -408,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
@@ -437,9 +439,8 @@ variety of formats.")
libsndfile
libvorbis
breeze-icons ; default icon set
- qtbase-5
shared-mime-info
- solid
+ solid-5
sox
taglib
zlib))
@@ -468,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
@@ -509,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
@@ -552,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
@@ -594,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
@@ -706,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
@@ -741,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))
@@ -759,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))
@@ -788,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..5e9b9688d1 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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb"))))
+ "03ql1k0fcch14899mgw50ddrdqx98x094y1jh97214dmr5ffky3h"))))
(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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz"))))
+ "1981va061mrb3r01wm38xq55d7xnqdfwp7s02npbqg5h6zgjcrr2"))))
(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.4")
(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"))))
+ "1jdf23bdigykjkf326ijg1hv46aq5q0fsx8p7xlxnpdwxpmgqnsy"))))
(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.4")
(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"))))
+ "116jarhrxxygl84k6ygwhp12fl0wnnz06pr42hk3mqgb1fckxrv4"))))
(build-system qt-build-system)
(arguments
- (list #:phases
+ (list #:qtbase qtbase
+ #:phases
#~(modify-phases %standard-phases
(add-before 'configure 'set-LDFLAGS
(lambda _
@@ -245,12 +267,18 @@ Breeze is the default theme for the KDE Plasma desktop.")
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
+ (setenv "XDG_DATA_DIRS"
+ (string-append (getcwd)
+ ":" (getenv "XDG_DATA_DIRS")))
(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 +287,7 @@ Breeze is the default theme for the KDE Plasma desktop.")
karchive
kxmlgui
kirigami
+ kirigami-addons
kuserfeedback
knewstuff
knotifications
@@ -266,11 +295,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 +316,7 @@ games, and tools.")
(define-public drkonqi
(package
(name "drkonqi")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -296,21 +324,43 @@ games, and tools.")
version ".tar.xz"))
(sha256
(base32
- "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8"))))
+ "0nrqw00ykqg0grbn54v0j0isxk94ill8ngxw815p343bn31ig5vb"))))
(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 +369,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 +391,7 @@ games, and tools.")
(define-public kactivitymanagerd
(package
(name "kactivitymanagerd")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -338,13 +399,12 @@ games, and tools.")
version ".tar.xz"))
(sha256
(base32
- "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid"))))
+ "1h3hk1552yacalbwkyn17gyayv7lhw3b6qdip4z1r0dsf71m55lq"))))
(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 +417,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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1jwiqmmwhcslj6zcjgm3jj3xkr3zkp3r8hbassykazg6bcc8xpkl"))))
+ (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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kde-gtk-config-" version ".tar.xz"))
(sha256
(base32
- "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf"))))
+ "06c0z6ihgql7dapfijfrm6qz6z1sir38ayn74fyjax9fvb4fbm5k"))))
(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 +512,20 @@ applications.")
(define-public kdecoration
(package
(name "kdecoration")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kdecoration-" version ".tar.xz"))
(sha256
(base32
- "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg"))))
+ "1wdvnzjba239agrhpsd55d6nl79xnqnv8ahram4113h7d44f1w47"))))
(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 +536,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -430,10 +544,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"))))
+ "1qhsmsnyssf47hv5nd264b620jb9c6r36wx8bk2bxdmsf7y4mn6n"))))
(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 +559,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 +570,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 +584,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi"))))
+ "04lspshznmfm75z32x4npids3wz7hdfi1bscs6iz7yf6a1z9lcwb"))))
(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 +607,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 +639,136 @@ KDE Frameworks 5 to better interact with the system.")
(define-public kgamma
(package
(name "kgamma")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
- version "/" name "5-"
+ version "/" name "-"
version ".tar.xz"))
(sha256
(base32
- "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl"))))
+ "0z4af70xl8l5pldld98yhxwp5vsamdl46hkb4036m9vncqm8h85x"))))
(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.4")
(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"))))
+ "1a5dhmh3l8i5x999lrh1vhpz1wcpk8lh4mkzx0bcjsiilfz97d3c"))))
(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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj"))))
+ "1n904nn0jrrih9qk8cz2d2sp9pghr6qn0ra5jbbg2rpz4k1gv78p"))))
(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 +784,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 +803,7 @@ computer's hardware.")
(define-public kmenuedit
(package
(name "kmenuedit")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -678,8 +811,9 @@ computer's hardware.")
".tar.xz"))
(sha256
(base32
- "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7"))))
+ "1l6z1bfcbnfk0xdymx0fv39f9mk2cgzkwqxw1bdl6a20wr2xg8n6"))))
(build-system qt-build-system)
+ (arguments (list #:qtbase qtbase))
(native-inputs (list extra-cmake-modules kdoctools))
(inputs (list ki18n
kxmlgui
@@ -698,16 +832,16 @@ computer's hardware.")
(define-public kongress
(package
(name "kongress")
- (version "23.01.0")
+ (version "24.05.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://kde/stable/plasma-mobile/" version
- "/kongress-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/kongress-" version ".tar.xz"))
(sha256
(base32
- "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"))))
+ "1bg7fsa4va59cg84r9vjiycl7g4b130m6m6sis9pc6w44jkcbjg2"))))
(build-system qt-build-system)
- (native-inputs (list extra-cmake-modules))
+ (native-inputs (list extra-cmake-modules python-minimal))
;; NOTE: Reporting bugs is linked to web browser, better not link it and let
;; it reslove through xdg-open in the run time
(inputs (list kirigami
@@ -722,11 +856,9 @@ computer's hardware.")
knotifications
kxmlgui
kiconthemes
- qtbase-5
- qtdeclarative-5
- qtquickcontrols2-5
- qtgraphicaleffects
- qtsvg-5))
+ qtdeclarative
+ qtsvg))
+ (arguments (list #:qtbase qtbase))
(home-page "https://apps.kde.org/kongress/")
(synopsis "Companion application for conferences")
(description "This application provides list of upcoming conferences with
@@ -736,25 +868,33 @@ the schedule and venue information.")
(define-public kpipewire
(package
(name "kpipewire")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32
- "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha"))))
+ "0d3i6d2lcykvlvf2brpqf78qwg9qyiy5jpsrdgd3cswazmb6s4db"))))
(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 +905,7 @@ PipeWire in Qt projects.")
(define-public kscreen
(package
(name "kscreen")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -773,12 +913,12 @@ PipeWire in Qt projects.")
".tar.xz"))
(sha256
(base32
- "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq"))))
+ "1briwfqrif7lyx0vxz191mbckdgw08nj5lrbxj2q5z4pn3nn9zlr"))))
(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 +932,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 +948,20 @@ KDE Plasma Workspaces.")
(define-public ksshaskpass
(package
(name "ksshaskpass")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/ksshaskpass-" version ".tar.xz"))
(sha256
(base32
- "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1"))))
+ "0335v6xky0s605q8178grp87dgar5yv3rgcjx1419a4sjdzk6wjv"))))
(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 +973,7 @@ call it if it is not associated to a terminal.")
(define-public ksystemstats
(package
(name "ksystemstats")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -839,10 +981,11 @@ call it if it is not associated to a terminal.")
version ".tar.xz"))
(sha256
(base32
- "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw"))))
+ "1743q0xyx1b465qhv7bg1xyblfwm515xfvifgzc3qxwhkyci64d4"))))
(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 +1056,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/layer-shell-qt-" version ".tar.xz"))
(sha256
(base32
- "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17"))))
+ "0s1jzcfq3cqg87bw40krycimxxqq58h808gc92wqclzgdgfd4fb2"))))
(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 +1082,18 @@ an elegant and intuitive experience for your tasks and plasmoids.")
(define-public kscreenlocker
(package
(name "kscreenlocker")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kscreenlocker-" version ".tar.xz"))
(sha256
(base32
- "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2"))))
+ "0wzb79dwhwizlzvnjd62a2kdbbcrc2s36nlg3z23wp9nvvl0miqx"))))
(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 +1108,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 +1141,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.4")
(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 "0yv65jsfqynhhnrj54l8hgiv8immzsxky3gwdawp0qmwxjz640kk"))))
(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 +1204,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 +1225,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.4")
(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 "1cf5ar63l81q41324g9h9712j66rl1s5n2brras83kkijnyax9yj"))))
(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 +1260,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 +1285,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1145,10 +1293,12 @@ with a ksysguardd daemon, which may also run on a remote system.")
".tar.xz"))
(sha256
(base32
- "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb"))))
+ "0dif5y7qbayb2yfgl7940978ayyir948kpjavczvgkr70czb293k"))))
(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 +1310,7 @@ you login.")
(define-public kwayland-integration
(package
(name "kwayland-integration")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1168,7 +1318,7 @@ you login.")
version ".tar.xz"))
(sha256
(base32
- "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y"))))
+ "0knfh2rr8xz1l7v54l1834qnvaryl73451lhxwfhdn11hq9jh7jw"))))
(build-system qt-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
@@ -1188,12 +1338,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 +1356,24 @@ KDE Frameworks components.")
(define-public kwin
(package
(name "kwin")
- (version "5.27.7")
+ (version "6.1.4")
(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"))))
+ "0fpbmp6rshr3irmlzxcpsjchfp65ch91pb1kmlnaj8zaim3cxzzw"))))
(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 +1391,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 +1409,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 +1419,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 +1428,41 @@ 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
+
+ hwdata
+ plasma-activities
kcmutils
kcompletion
kconfig
@@ -1314,6 +1473,7 @@ KDE Frameworks components.")
kdeclarative
kdecoration
kglobalaccel
+ kglobalacceld
ki18n
kiconthemes
kidletime
@@ -1328,6 +1488,9 @@ KDE Frameworks components.")
kwayland
kwindowsystem
kxmlgui
+ ksvg
+ kauth
+ kguiaddons
libqaccessibilityclient
lcms
libcap
@@ -1336,13 +1499,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 +1514,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 +1531,7 @@ conjunction with the KDE Plasma Desktop.")
(define-public kwrited
(package
(name "kwrited")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1375,10 +1539,11 @@ conjunction with the KDE Plasma Desktop.")
version ".tar.xz"))
(sha256
(base32
- "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n"))))
+ "0jw18m94cjjbcpn5xb3wrf6392yy52dz0rkdzvz7sjxpp6gadgng"))))
(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 +1583,7 @@ and minimalistic.")
(define-public milou
(package
(name "milou")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1426,7 +1591,7 @@ and minimalistic.")
version ".tar.xz"))
(sha256
(base32
- "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1"))))
+ "10h0f997lq2b9dp7c8symilgxg51hlnfpqcgb7j6x1574363r03j"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kcoreaddons
@@ -1434,20 +1599,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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0s2ibpavyf6yminw01z9a2v2xdxc9amazn5hcc695p7rar0vrfcg"))))
+ (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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1455,7 +1647,7 @@ on top of Baloo.")
version ".tar.xz"))
(sha256
(base32
- "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq"))))
+ "1ja1lcm5hav1iyl115v6g250hnnq3znqwvlz37n7k7719jcfjxb8"))))
(build-system cmake-build-system)
(native-inputs (list extra-cmake-modules))
(home-page "https://community.kde.org/Frameworks")
@@ -1463,10 +1655,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.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/ocean-sound-theme" "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0p3glpf2zhr9p2hs01vkxccgssz9brsjvdyywplxrc5qmk7h8052"))))
+ (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 (package-version breeze))
(source #f)
(build-system trivial-build-system)
(arguments
@@ -1474,36 +1686,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 +1744,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 +1761,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.4")
(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"))))))))
+ "1mj4vm1av582xq1ykxqacy06rkfb1dwpdqqi7l9czxwnch6xb7y9"))))
+ (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 +1895,14 @@ active window on Plasma Desktop.")
(define-public plasma-browser-integration
(package
(name "plasma-browser-integration")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y"))))
+ "0m9w9hnkxcx7sv3aipk19783c4n2s134iz0yrijhx2rwzvm9mgyn"))))
(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 +1917,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2"))))
+ "1lc74i0pqhsj6yqc2czdvnl8n7ry63r2g34hf7avip7v0bv9gf43"))))
(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 +1968,8 @@ the KDE Plasma 5 desktop.")
glib
ibus
kaccounts-integration
- kactivities
- kactivities-stats
+ plasma-activities
+ plasma-activities-stats
kauth
karchive
kcmutils
@@ -1737,14 +1980,12 @@ the KDE Plasma 5 desktop.")
kdeclarative
kded
kdesu
- kdelibs4support
kglobalaccel
kguiaddons
kholidays
ki18n
kiconthemes
kidletime
- kinit
kio
kitemmodels
knewstuff
@@ -1761,8 +2002,10 @@ the KDE Plasma 5 desktop.")
kwallet
kwayland
kwin
+ ksvg
+ plasma5support
layer-shell-qt
- libaccounts-qt
+ libaccounts-qt6
libcanberra
libkscreen
libksysguard
@@ -1778,17 +2021,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 +2045,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 +2071,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 +2086,7 @@ activities effectively, without being distracting.")
(define-public plasma-disks
(package
(name "plasma-disks")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1846,13 +2094,27 @@ activities effectively, without being distracting.")
version ".tar.xz"))
(sha256
(base32
- "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v"))))
+ "0iscvysspd9x6g44hnrm1cm6pz6nqcgi2yb4hgapks9gpbd6npvr"))))
(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 +2129,7 @@ activities effectively, without being distracting.")
(define-public plasma-firewall
(package
(name "plasma-firewall")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1875,16 +2137,18 @@ activities effectively, without being distracting.")
version ".tar.xz"))
(sha256
(base32
- "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind"))))
+ "0r5v6y5b96ajavmh6cg7y04l1gqfhr0j1j53ph59wr8cxnd1qgyb"))))
(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 +2157,7 @@ activities effectively, without being distracting.")
(define-public plasma-integration
(package
(name "plasma-integration")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1901,10 +2165,12 @@ activities effectively, without being distracting.")
version ".tar.xz"))
(sha256
(base32
- "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3"))))
+ "0x5avhrd1c6lxzb3f4jnmdf57cbfxvsx279zw82bxrvqzliji888"))))
(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 +2184,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 +2216,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
version "/plasma-nano-" version ".tar.xz"))
(sha256
(base32
- "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank"))))
+ "1hl8v2wawhxclq9jmzvvjc1pbhj29p29kflpyc6jh6bqdc57skl4"))))
(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 +2244,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -1976,10 +2252,11 @@ integration of Qt applications when running on a KDE Plasma workspace.")
".tar.xz"))
(sha256
(base32
- "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8"))))
+ "1q85ynvgrz58bgpscmz0wa8llfvzcarnzknh026gcapkih84gbql"))))
(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 +2274,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 +2383,7 @@ customizable platform for mobile devices.")
(define-public plasma-pa
(package
(name "plasma-pa")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -2112,20 +2391,29 @@ customizable platform for mobile devices.")
version ".tar.xz"))
(sha256
(base32
- "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc"))))
+ "0kbkwkrr3g3gysnabvf3n4x5rp5ikx2zc4zpxd2gzagnm1hd8jrl"))))
(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 +2424,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 +2552,59 @@ Desktop.")
(define-public plasma-vault
(package
(name "plasma-vault")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq"))))
+ "1py8gcdcnbmrn24zrpkrj492a752mrfj5c7aqiszxxlvbd6gz91l"))))
(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 +2614,35 @@ vaults.")
(define-public plasma-systemmonitor
(package
(name "plasma-systemmonitor")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l"))))
+ "0mz49d61k69prvzsqh361gn2vg18916r093wm9vbqqd0kp94hai6"))))
(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 +2653,7 @@ sensors, process information and other system resources.")
(define-public plasma-welcome
(package
(name "plasma-welcome")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
@@ -2334,7 +2662,7 @@ sensors, process information and other system resources.")
version ".tar.xz"))
(sha256
(base32
- "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x"))))
+ "0zivsp3kaaad0h6mj46x353lq6x114w339jka7fcsxcwzrwvdbd4"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules pkg-config))
@@ -2344,21 +2672,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 +2699,21 @@ sensors, process information and other system resources.")
(define-public plasma-workspace
(package
(name "plasma-workspace")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6"))))
+ "0mlddkjxq7p01wgy8pzp65fhg1sihibzd32wn3s3zcn077frj86b"))))
(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 +2721,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 +2735,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,7 +2773,9 @@ sensors, process information and other system resources.")
libqalculate
gmp
mpfr
+ eudev
libsm
+ libxcrypt
libxft
libxkbcommon
libxrender
@@ -2442,17 +2783,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 +2802,7 @@ sensors, process information and other system resources.")
xrdb
xmessage
xsetroot
- polkit-qt
+ polkit-qt6
ucd
libxcursor
@@ -2470,43 +2811,41 @@ 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 'add-span-header
+ (lambda _
+ (substitute* "xembed-sni-proxy/sniproxy.cpp"
+ (("#include \"sniproxy.h\"")
+ (string-append "#include \"sniproxy.h\"
+#include <span>")))))
(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 +2864,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 +2898,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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify"))))
+ "1i23bfdfxvr0l0sd99hwl9hnxcnszppai7inrhbk6ycdc0imrxl8"))))
(build-system cmake-build-system)
(native-inputs (list extra-cmake-modules))
(home-page "https://community.kde.org/Frameworks")
@@ -2564,18 +2914,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.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/print-manager-" version ".tar.xz"))
+ (sha256
+ (base32 "1pqfs1v3ll8plb6950jn8s0fslkfvpzl89ix20hs2jw08kspnx65"))))
+ (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.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-1-" version ".tar.xz"))
(sha256
(base32
- "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc"))))
+ "1gyvbni0zhrw3bc5f1p5whyaqim0zpx0a37gznzcvaraf55rkykq"))))
(build-system qt-build-system)
+ (arguments (list #:qtbase qtbase))
(native-inputs (list extra-cmake-modules))
(inputs (list ki18n
kwindowsystem
@@ -2584,7 +2972,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 +2985,28 @@ UI for Plasma")
(define-public powerdevil
(package
(name "powerdevil")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060"))))
+ "1r8kj118vnjy3kcv16bhrdgja44dlvgjgvwp6gihb0s9wbi6dad1"))))
(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 +3023,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 +3039,14 @@ of a Plasma shell.")
(define-public system-settings
(package
(name "system-settings")
- (version "5.27.7")
+ (version "6.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/systemsettings-" version ".tar.xz"))
(sha256
(base32
- "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw"))))
+ "18vx02nwd7fq3r3smrq3yviz6x4n17b8kidrnfkmkdycfxi2dsn0"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kauth
@@ -2666,27 +3064,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 38992150c7..2226230aab 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -11,13 +11,14 @@
;;; 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>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
+;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,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)
@@ -111,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.")
@@ -163,37 +191,38 @@ 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
(list akonadi
akonadi-contacts
akonadi-mime
+ bash-minimal
boost
breeze-icons
- gpgme
- grantlee
+ gpgme-1.23
grantleetheme
kcmutils
kcontacts
@@ -208,16 +237,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")
@@ -233,18 +263,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)
@@ -266,9 +296,10 @@ browser for easy news reading.")
(list baloo
cfitsio
exiv2
- kactivities
+ plasma-activities
kcolorpicker
kguiaddons
+ ki18n
kiconthemes
kimageannotator
kio
@@ -280,12 +311,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))
@@ -299,7 +330,7 @@ annotating features.")
(define-public kdenlive
(package
(name "kdenlive")
- (version "23.08.3")
+ (version "24.05.2")
(source
(origin
(method git-fetch)
@@ -308,13 +339,14 @@ annotating features.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0qwnz99wdlfkc08imf18wdvms9lzsph4nyjh2845145sl322yans"))))
+ (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
@@ -333,11 +365,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
@@ -358,18 +390,16 @@ 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
+ qqc2-desktop-style
+ qtbase
+ qtdeclarative
+ qtmultimedia
+ qtnetworkauth
+ qtsvg
shared-mime-info))
(home-page "https://kdenlive.org")
(synopsis "Non-linear video editor")
@@ -384,40 +414,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
@@ -425,30 +455,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
@@ -496,21 +525,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
@@ -522,10 +552,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/"
@@ -533,7 +589,7 @@ illustrate project schedules.")
version ".tar.xz"))
(sha256
(base32
- "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd"))))
+ "0h720wcgsdx9h5vlr4flxrd3djmhwvlwkrf0yzwsf4amcb9wds8r"))))
(build-system cmake-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
@@ -543,21 +599,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
@@ -569,8 +628,10 @@ illustrate project schedules.")
libtirpc
openexr
phonon
- qtbase-5
- qtsvg-5
+ qtbase
+ qt5compat
+ qcoro-qt6
+ qtsvg
samba
shared-mime-info
solid
@@ -586,27 +647,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.")
@@ -615,7 +678,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
@@ -624,12 +687,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
@@ -666,7 +731,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)
@@ -674,7 +739,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))
@@ -682,6 +747,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.")
@@ -690,14 +756,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))
@@ -709,6 +775,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
@@ -718,7 +785,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)
@@ -726,7 +793,8 @@ 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
`(#:tests? #f
@@ -747,7 +815,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
@@ -758,7 +832,8 @@ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) ")))))))
qwt
vc))
(inputs
- (list boost
+ (list bash-minimal
+ boost
exiv2
fontconfig
fftw-cmake
@@ -773,26 +848,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
@@ -835,7 +910,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)
@@ -843,8 +918,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
@@ -855,9 +930,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
@@ -870,7 +945,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
@@ -878,50 +953,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")
@@ -936,14 +1022,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))
@@ -957,10 +1043,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/"
@@ -968,7 +1062,7 @@ cards.")
version ".tar.xz"))
(sha256
(base32
- "0vp9d1x01na28p6smbd6spx14bjnzilr2bjsd380h1d17b9cm3hy"))))
+ "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c"))))
(build-system qt-build-system)
(arguments
(list #:phases
@@ -976,21 +1070,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
@@ -1000,27 +1098,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
@@ -1044,30 +1142,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
@@ -1078,21 +1178,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")
@@ -1104,7 +1204,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
@@ -1112,7 +1212,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))
@@ -1121,9 +1221,9 @@ multi-floor indoor maps.")
kcoreaddons
ki18n
kwidgetsaddons
- polkit-qt
- qtbase-5
- qca
+ polkit-qt6
+ qtbase
+ qca-qt6
`(,util-linux "lib")))
(arguments
(list
@@ -1142,7 +1242,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/"
@@ -1150,10 +1250,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")
@@ -1167,7 +1268,7 @@ multi-floor indoor maps.")
(inputs (list clipper
osmctools
protobuf
- qtdeclarative-5
+ qtdeclarative
zlib
networkmanager-qt
ki18n))
@@ -1207,7 +1308,7 @@ different notification systems.")
(define-public kdeconnect
(package
(name "kdeconnect")
- (version "23.04.3")
+ (version "24.05.2")
(source
(origin
(method url-fetch)
@@ -1216,13 +1317,25 @@ 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")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-dbus-autostart
+ (lambda _
+ ;; 'dbus-daemon' requires an absolute Exec path.
+ (substitute* "daemon/org.kde.kdeconnect.service.in"
+ (("kdeconnectd")
+ (string-append #$output "/bin/kdeconnectd"))))))
#:tests? #f)) ; tests fail hard in our build environment
(native-inputs
(list extra-cmake-modules
@@ -1230,9 +1343,11 @@ different notification systems.")
libxtst
pkg-config
python-wrapper
- wayland-protocols))
+ wayland-protocols
+ qtwayland))
(inputs
- (list kcmutils
+ (list dbus
+ kcmutils
kconfigwidgets
kdbusaddons
kguiaddons
@@ -1240,24 +1355,23 @@ 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
+ sonnet
wayland
modemmanager-qt
libxkbcommon))
@@ -1313,27 +1427,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
@@ -1357,14 +1470,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))
@@ -1377,27 +1490,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
@@ -1406,7 +1521,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.
@@ -1417,19 +1536,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.
@@ -1451,15 +1570,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
@@ -1476,7 +1596,6 @@ Python, PHP, and Perl.")
kguiaddons
ki18n
kiconthemes
- ;("kio" ,kio)
kitemviews
kjobwidgets
knewstuff
@@ -1486,9 +1605,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")
@@ -1497,7 +1615,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)
@@ -1507,7 +1625,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
@@ -1518,24 +1636,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
@@ -1554,17 +1673,18 @@ creating routes by drag and drop and more.")
(define-public okular
(package
(name "okular")
- (version "23.04.3")
+ (version "24.08.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz"))
(sha256
- (base32 "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi"))))
+ (base32 "12ri5j9jsmh5ib7fp2vk0ir3vfknlq1h8xpi1lkn6f2b54k6xq9x"))))
(build-system qt-build-system)
(arguments
(list
+ #:qtbase qtbase
#:phases
#~(modify-phases %standard-phases
(delete 'check)
@@ -1576,7 +1696,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")))
@@ -1589,46 +1710,46 @@ creating routes by drag and drop and more.")
(native-inputs
(list extra-cmake-modules kdoctools pkg-config
;; for test
- desktop-file-utils))
+ desktop-file-utils
+ python-wrapper))
(inputs
(list ebook-tools
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
@@ -1639,7 +1760,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
@@ -1647,10 +1768,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/")
@@ -1664,19 +1785,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
@@ -1686,41 +1808,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
@@ -1735,18 +1861,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
@@ -1755,9 +1881,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/kerberos.scm b/gnu/packages/kerberos.scm
index 241881ea47..5824950bf3 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -35,6 +35,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm)
#:use-module (gnu packages flex)
#:use-module (gnu packages perl)
@@ -267,6 +268,7 @@ After installation, the system administrator should generate keys using
bdb
e2fsprogs ;for libcom_err
libcap-ng
+ libxcrypt
openldap
sqlite))
(home-page "http://www.h5l.org/")
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 0b562bcde9..7a3deb0b43 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -969,7 +969,7 @@ and manipulation.")
#:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases (modify-phases %standard-phases
@@ -1151,7 +1151,7 @@ Corporation. The engine is independent of any language, dictionary or corpus.")
(native-inputs (list mecab)); for mecab-config
(home-page "https://taku910.github.io/mecab")
(synopsis "Dictionary data for MeCab")
- (description "This package contains dictionnary data derived from
+ (description "This package contains dictionary data derived from
ipadic for use with MeCab.")
(license (license:non-copyleft "mecab-ipadic/COPYING"))))
diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in
index 0d53e746af..c9bb235bca 100644
--- a/gnu/packages/ld-wrapper.in
+++ b/gnu/packages/ld-wrapper.in
@@ -1,23 +1,28 @@
#!@BASH@
# -*- mode: scheme; coding: utf-8; -*-
-# XXX: We have to go through Bash because there's no command-line switch to
-# augment %load-compiled-path, and because of the silly 127-byte limit for
-# the shebang line in Linux.
-# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our
-# .go file (see <http://bugs.gnu.org/12519>).
-# Unset 'GUILE_LOAD_COMPILED_PATH' to make sure we do not stumble upon
-# incompatible .go files. See
-# <https://lists.gnu.org/archive/html/guile-devel/2016-03/msg00000.html>.
+# XXX: We have to go through Bash because there's no Guile command-line switch to
+# ignore the various Guile load path related environment variables.
+
+# Unset 'GUILE_LOAD_PATH' to make sure we do not stumble upon
+# incompatible Guile files (see
+# <https://lists.gnu.org/archive/html/guile-devel/2016-03/msg00000.html>).
+unset GUILE_LOAD_PATH
unset GUILE_LOAD_COMPILED_PATH
+unset GUILE_SYSTEM_PATH
unset GUILE_SYSTEM_COMPILED_PATH
+
+# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our
+# .go file, or causes extraneous `stat' system calls when the "-C" "/" arguments
+# are provided.
main="(@ (gnu build-support ld-wrapper) ld-wrapper)"
-exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@"
+exec @GUILE@ -c "(load-compiled \"@SELF@.go\") ($main (command-line))" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -285,9 +290,9 @@ library outside of ~a: ~s~%"
result
(expand-arguments result)))
-(define (ld-wrapper . args)
+(define (ld-wrapper args)
;; Invoke the real `ld' with ARGS, augmented with `-rpath' switches.
- (let* ((args (expand-arguments args))
+ (let* ((args (expand-arguments (cdr args))) ;strip arg0
(path (library-search-path args))
(libs (library-files-linked args path))
(args (append args (rpath-arguments libs))))
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index 966716f5ad..b84ab3233e 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -101,7 +101,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
(define-public leocad
(package
(name "leocad")
- (version "21.06")
+ (version "23.03")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -110,7 +110,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
(file-name (git-file-name name version))
(sha256
(base32
- "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq"))))
+ "0sihx2g06mxaahqdh361xfqf7fkzzyhlr58qlzyr4c8jd2pnd3r1"))))
(build-system gnu-build-system)
(native-inputs
(list qttools-5)) ; for lrelease
diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index 8544f33db6..f7630cb5dc 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,7 +64,7 @@ text editors.")
(define-public lesspipe
(package
(name "lesspipe")
- (version "2.08")
+ (version "2.13")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -72,7 +73,7 @@ text editors.")
(file-name (git-file-name name version))
(sha256
(base32
- "00kswzbyys4j5l10y3c3cinrgf0mkzjn1ilqdvs1mkbxlzk33pwc"))))
+ "1hhxikpvmjwg90a3rpnxssq3ws6l2hv76d04h4fgvxhbsrr7imiv"))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 925a4f1001..ed8dfd432b 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -52,6 +52,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages cups)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
@@ -887,12 +888,10 @@ commonly called @code{ftoa} or @code{dtoa}.")
(sha256
(base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))
-;; When updating libreoffice, also make sure to update the
-;; hunspell dictionaries! They use the libreoffice version.
(define-public libreoffice
(package
(name "libreoffice")
- (version "7.6.3.1")
+ (version "7.6.7.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -901,7 +900,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
"https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
- (base32 "148084acq370483y0xwvcvck30kxhr78cnmibp5lks17xqp5f9q7"))))
+ (base32 "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@@ -1138,6 +1137,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
libwebp
libwpg
libwps
+ libxcrypt
libxrandr
libxrender
libxslt
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index fa83857c96..21f73f799d 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -22,6 +22,8 @@
;;; 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>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,10 +42,12 @@
(define-module (gnu packages librewolf)
+ #:use-module ((srfi srfi-1) #:hide (zip))
#:use-module (guix build-system gnu)
#:use-module (guix build-system cargo)
#:use-module (guix build-system trivial)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
@@ -62,6 +66,7 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gtk)
#:use-module (gnu packages hunspell)
#:use-module (gnu packages icu4c)
@@ -81,6 +86,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages rust)
#:use-module (gnu packages rust-apps)
#:use-module (gnu packages speech)
@@ -89,6 +95,117 @@
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
+(define (firefox-source-origin version hash)
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/firefox/releases/"
+ version "/source/" "firefox-" version
+ ".source.tar.xz"))
+ (sha256 (base32 hash))))
+
+(define (librewolf-source-origin version hash)
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/librewolf/source.git")
+ (commit version)
+ (recursive? #t)))
+ (file-name (git-file-name "librewolf-source" version))
+ (sha256 (base32 hash))))
+
+(define computed-origin-method (@@ (guix packages) computed-origin-method))
+
+(define librewolf-source
+ (let* ((ff-src (firefox-source-origin "129.0.1" "0wy0fn0pavlhlkdybr59hhbn5ng0zn56mxa7gsknf8f2whiyipwx"))
+ (version "129.0.1-1")
+ (lw-src (librewolf-source-origin version "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4")))
+
+ (origin
+ (method computed-origin-method)
+ (file-name (string-append "librewolf-" version ".source.tar.gz"))
+ (sha256 #f)
+ (uri
+ (delay
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (set-path-environment-variable
+ "PATH" '("bin")
+ (list #+python
+ #+(canonical-package bash)
+ #+(canonical-package gnu-make)
+ #+(canonical-package coreutils)
+ #+(canonical-package findutils)
+ #+(canonical-package patch)
+ #+(canonical-package xz)
+ #+(canonical-package sed)
+ #+(canonical-package grep)
+ #+(canonical-package gzip)
+ #+(canonical-package tar)))
+ (set-path-environment-variable
+ "PYTHONPATH"
+ (list #+(format #f "lib/python~a/site-packages"
+ (version-major+minor
+ (package-version python))))
+ '#+(cons python-jsonschema
+ (map second
+ (package-transitive-propagated-inputs
+ python-jsonschema))))
+
+ ;; Copy LibreWolf source into the build directory and make
+ ;; everything writable.
+ (copy-recursively #+lw-src ".")
+ (for-each make-file-writable (find-files "."))
+
+ ;; Patch Makefile to use the upstream source instead of
+ ;; downloading.
+ (substitute* '("Makefile")
+ (("^ff_source_tarball:=.*")
+ (string-append "ff_source_tarball:=" #+ff-src)))
+
+ ;; Remove encoding_rs patch, it doesn't build with Rust 1.75.
+ (substitute* '("assets/patches.txt")
+ (("patches/encoding_rs.patch\\\n$")
+ ""))
+
+ ;; Stage locales.
+ (begin
+ (format #t "Staging locales...~%")
+ (force-output)
+ (mkdir "l10n-staging")
+ (with-directory-excursion "l10n-staging"
+ (for-each
+ (lambda (locale-dir)
+ (let ((locale
+ (string-drop
+ (basename locale-dir)
+ (+ 32 ; length of hash
+ (string-length "-mozilla-locale-")))))
+ (format #t " ~a~%" locale)
+ (force-output)
+ (copy-recursively locale-dir locale
+ #:log (%make-void-port "w"))
+ (for-each make-file-writable (find-files locale))
+ (with-directory-excursion locale
+ (when (file-exists? ".hgtags")
+ (delete-file ".hgtags")))))
+ '#+all-mozilla-locales)))
+
+ ;; Patch build script to use staged locales.
+ (begin
+ (substitute* '("scripts/generate-locales.sh")
+ (("wget") "# wget")
+ (("unzip") "# unzip")
+ (("mv browser/locales/l10n/\\$1-\\*/")
+ "mv ../l10n-staging/$1/")))
+
+ ;; Run the build script
+ (invoke "make" "all")
+ (copy-file (string-append "librewolf-" #$version
+ ".source.tar.gz")
+ #$output))))))))
+
;; Define the versions of rust needed to build librewolf, trying to match
;; upstream. See the file taskcluster/ci/toolchain/rust.yml at
;; https://searchfox.org under the particular firefox release, like
@@ -98,24 +215,13 @@
;; Update this id with every update to its release date.
;; It's used for cache validation and therefore can lead to strange bugs.
;; ex: date '+%Y%m%d%H%M%S'
-(define %librewolf-build-id "20240427150329")
+(define %librewolf-build-id "20240817075827")
(define-public librewolf
(package
(name "librewolf")
- (version "125.0.2-1")
- (source
- (origin
- (method url-fetch)
-
- (uri (string-append "https://gitlab.com/api/v4/projects/32320088/"
- "packages/generic/librewolf-source/"
- version
- "/librewolf-"
- version
- ".source.tar.gz"))
- (sha256
- (base32 "09qzdaq9l01in9h4q14vyinjvvffycha2iyjqj5p4dd5jh6q5zma"))))
+ (version "129.0.1-1")
+ (source librewolf-source)
(build-system gnu-build-system)
(arguments
(list
@@ -157,7 +263,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"
@@ -177,7 +286,7 @@
(rnrs io ports)
(guix elf)
(guix build gremlin)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-preferences
(lambda* (#:key inputs #:allow-other-keys)
@@ -305,6 +414,7 @@
(setenv "CC" "clang")
(setenv "CXX" "clang++")
(setenv "MOZ_NOSPAM" "1")
+ (setenv "MOZ_APP_REMOTINGNAME" "LibreWolf")
(setenv "MOZ_APP_NAME" "librewolf")
(setenv "MOZBUILD_STATE_PATH"
@@ -518,8 +628,7 @@
(("-NewPrivateWindow")
"-new-private-window")
(("StartupNotify=true")
- "StartupNotify=true
-StartupWMClass=Navigator"))
+ "StartupNotify=true\nStartupWMClass=LibreWolf"))
(copy-file desktop-file "librewolf.desktop")
(install-file "librewolf.desktop" applications))))
(add-after 'install-desktop-entry 'install-icons
@@ -582,7 +691,7 @@ StartupWMClass=Navigator"))
mesa
mit-krb5
nspr
- nss/fixed
+ nss-rapid
pango
pciutils
pipewire
diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm
index eccd053a35..f0b071f11c 100644
--- a/gnu/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@ -35,7 +35,7 @@
(define-public libunistring
(package
(name "libunistring")
- (version "1.0")
+ (version "1.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -43,7 +43,7 @@
version ".tar.xz"))
(sha256
(base32
- "0h97qx3c4970wvh25g51sjgz54xn37lrfy95dg97xmvmkys5basv"))))
+ "164vfbh3sf0qjcimjbnz4icqr9cai30dli8p2y5p6z3frfwiwz42"))))
(propagated-inputs (libiconv-if-needed))
(outputs '("out" "static"))
(build-system gnu-build-system)
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 948d5dbccc..d5157a6eeb 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
+;;; Copyright © 2024 hapster <o.rojon@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -681,7 +682,7 @@ devices.")
(define-public hidapi
(package
(name "hidapi")
- (version "0.10.1")
+ (version "0.14.0")
(source
(origin
(method git-fetch)
@@ -690,7 +691,7 @@ devices.")
(commit (string-append "hidapi-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"))))
+ (base32 "121laqsml0104d1h4hp115gp21qiqi0r9dgcaqdi9ismmq3b6yx7"))))
(build-system gnu-build-system)
(inputs
(list libusb eudev))
diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index c562f70498..b2216615b9 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -23,6 +23,7 @@
(define-module (gnu packages license)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
@@ -150,6 +151,8 @@ statements and serializes in normalized format.")
("perl-string-escape" ,perl-string-escape)
("perl-try-tiny" ,perl-try-tiny)
("perl-module-runtime" ,perl-module-runtime)))
+ (inputs
+ `(("bash" ,bash-minimal))) ; for wrap-program
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -172,13 +175,13 @@ belonging to various licenses.")
(define-public reuse
(package
(name "reuse")
- (version "3.0.1")
+ (version "3.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "reuse" version))
(sha256
- (base32 "0vqawznn8zhh5m3hv51xjhkz0v4vbmsiz2z1smg52k4nmlly832r"))))
+ (base32 "19ijdwbr47pa0ba30s40b53qb0chyq27akj0484aj9s5p1i85svk"))))
(build-system pyproject-build-system)
(arguments
;; Change directory before running the test suite to avoid having both
diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm
index 6230963a4b..4794400e6e 100644
--- a/gnu/packages/lighting.scm
+++ b/gnu/packages/lighting.scm
@@ -39,7 +39,7 @@
(define-public ola
(package
(name "ola")
- (version "0.10.8")
+ (version "0.10.9")
(source
(origin
(method git-fetch)
@@ -47,7 +47,7 @@
(url "https://github.com/OpenLightingProject/ola")
(commit version)))
(sha256
- (base32 "17dwmjdw87hv314gv5b1rmh5jglz8a0rzw7wj26xn74xw2jvxa6l"))
+ (base32 "0mbf5dc309pqg9ckqgk2kh9p3mf9vqsjkxnwjzqw7yzzf17ij3zk"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b947997885..a3b63a6f62 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2021, 2021-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2021, 2021-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@@ -42,7 +42,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
@@ -63,7 +63,7 @@
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Ryan Sundberg <ryan@arctype.co>
-;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Rene Saavedra <nanuui@protonmail.com>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -81,6 +81,7 @@
;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -100,6 +101,7 @@
(define-module (gnu packages linux)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
+ #:use-module (gnu packages adns)
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
#:use-module (gnu packages apparmor)
@@ -114,10 +116,12 @@
#:use-module (gnu packages calendar)
#:use-module (gnu packages check)
#:use-module (gnu packages cpio)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages dbm)
@@ -166,11 +170,14 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages popt)
+ #:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages regex)
+ #:use-module (gnu packages rpc)
#:use-module (gnu packages rrdtool)
#:use-module (gnu packages rsync)
#:use-module (gnu packages samba)
@@ -178,11 +185,13 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages slang)
#:use-module (gnu packages sqlite)
+ #:use-module (gnu packages tbb)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages video)
+ #:use-module (gnu packages vim)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages web)
#:use-module (gnu packages xiph)
@@ -276,7 +285,7 @@ of 'uname -r' behind the Linux version numbers."
(arguments
(substitute-keyword-arguments
(package-arguments linux)
- ((#:imported-modules imported-modules %gnu-build-system-modules)
+ ((#:imported-modules imported-modules %default-gnu-imported-modules)
`((guix build kconfig) ,@imported-modules))
((#:modules modules)
`((guix build kconfig) ,@modules))
@@ -504,86 +513,86 @@ 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.8-version "6.8.8")
-(define-public linux-libre-6.8-gnu-revision "gnu")
-(define deblob-scripts-6.8
+(define-public linux-libre-6.10-version "6.10.7")
+(define-public linux-libre-6.10-gnu-revision "gnu")
+(define deblob-scripts-6.10
(linux-libre-deblob-scripts
- linux-libre-6.8-version
- linux-libre-6.8-gnu-revision
- (base32 "1kqwcm8baq3zx1z8jrgnvm9yps3y9jbf4pv1pbqqprpdscgl9089")
- (base32 "1x7lmy8lff4g4hm67c97797ws594xv5c6l2v5mahj4xh4pb3b8d6")))
-(define-public linux-libre-6.8-pristine-source
- (let ((version linux-libre-6.8-version)
- (hash (base32 "1fiiyvwi6frn83z730w4mng2z4nwpspvhb6vjpxx3yk0snwxqk0w")))
+ linux-libre-6.10-version
+ linux-libre-6.10-gnu-revision
+ (base32 "1j43v1z4g1f681wvna2dh9vxaz0pgni0wchbh1xhyhhfcqbm1f47")
+ (base32 "1zmgsgzrcsjzjzhgb12drc0f42ag8xak6z7zzx324f0wrf4i67zf")))
+(define-public linux-libre-6.10-pristine-source
+ (let ((version linux-libre-6.10-version)
+ (hash (base32 "1adkbn6dqbpzlr3x87a18mhnygphmvx3ffscwa67090qy1zmc3ch")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
- deblob-scripts-6.8)))
+ deblob-scripts-6.10)))
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-6.6-version "6.6.29")
+(define-public linux-libre-6.6-version "6.6.48")
(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 "1qm8f3fq4yx59f7b6yky5ryyf229ypxnry922sr8cy0s7mp62cmv")
- (base32 "0s8ys7nz4p50c766f3z9h68vxnrsrgps1i5zskk3cjwik3q60an8")))
+ (base32 "1a28pdl645bj4d8gac71dmwmll6a2kgd3k7gkpfvi94yqkzd9r2z")
+ (base32 "0kpkmdmrw9bnypdd0z489smh8bbwgg1ii301g1ynqfdkzd2ca1iq")))
(define-public linux-libre-6.6-pristine-source
(let ((version linux-libre-6.6-version)
- (hash (base32 "1l6bcz0pwiby6q79va063767d0jxkkaf8rpqvaqqcb08116gf9kz")))
+ (hash (base32 "0a90fx0r25nkcr5b16dn1j7vwyndnshaxn6ziyviccds59xxy5kb")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.6)))
-(define-public linux-libre-6.1-version "6.1.88")
+(define-public linux-libre-6.1-version "6.1.107")
(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 "0104m61mqhlmsjjprj51njwbffjcqgjln5bf1wknb6y3iiazl6ng")))
+ (base32 "11jbnj0d3262grf9vkn0668kvfxifxw98ccvn81wkaykll01k5nx")))
(define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version)
- (hash (base32 "1lgqclvcxfs5c4my6fh041gxzgzz8i64cw43cf5ichy58pyh4sb9")))
+ (hash (base32 "1s5h51r41l0d3k1h9i4mya7nz53jd6i200s06w5gl49hsz8jjcpl")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.1)))
-(define-public linux-libre-5.15-version "5.15.157")
+(define-public linux-libre-5.15-version "5.15.165")
(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 "0554qxnai66mpm3p5dln9dfsb392zr8zvwfwc9ks2sadsd8j7wmg")))
+ (hash (base32 "1zn627gid0dik3r5k61r9ff4sz7md1jnbwiixpyllqzb5kld6vd3")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))
-(define-public linux-libre-5.10-version "5.10.215")
+(define-public linux-libre-5.10-version "5.10.224")
(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 "1af6h86flx96pszg006agpak2f9dkk2jqaazfykd7aafqdcs3747")))
+ (hash (base32 "06nivms93yjbddv3gl88m7bdrr0676nm3p12iqvsdfr4fg39kc0r")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
-(define-public linux-libre-5.4-version "5.4.274")
+(define-public linux-libre-5.4-version "5.4.282")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
@@ -593,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 "1m4yyyv48mfkzhqms88dv1jf39zsfp88az5zpqynmm1wlhhv9iza")))
+ (hash (base32 "1q3xvl4c5dlql6jh0g8kn01aljgl946gmq4ljjzvffykfq4pg0jm")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
-(define-public linux-libre-4.19-version "4.19.312")
+(define-public linux-libre-4.19-version "4.19.320")
(define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
@@ -608,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 "0jppa4p73pssd7m3jpc7i6rgnj9gawjcgk4wmqyy87ijzrgzm553")))
+ (hash (base32 "18a723djyq3y2jhjazwgiwqslh1yz954wb82cg7bf083n091lrwx")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
@@ -641,8 +650,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(patches (append (origin-patches source)
patches))))
-(define-public linux-libre-6.8-source
- (source-with-patches linux-libre-6.8-pristine-source
+(define-public linux-libre-6.10-source
+ (source-with-patches linux-libre-6.10-pristine-source
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch)))
@@ -761,10 +770,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(description "Headers of the Linux-Libre kernel.")
(license license:gpl2)))
-(define-public linux-libre-headers-6.8
- (make-linux-libre-headers* linux-libre-6.8-version
- linux-libre-6.8-gnu-revision
- linux-libre-6.8-source))
+(define-public linux-libre-headers-6.10
+ (make-linux-libre-headers* linux-libre-6.10-version
+ linux-libre-6.10-gnu-revision
+ linux-libre-6.10-source))
(define-public linux-libre-headers-6.6
(make-linux-libre-headers* linux-libre-6.6-version
@@ -803,6 +812,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
"13zqdcm4664vh7g57sxbfrlpsxm7zrma72mxdfdz7d9yndy2gfv8"))
(define-public linux-libre-headers linux-libre-headers-5.15.49)
+;; linux-libre-headers-latest points to the latest headers package
+;; and should be used as a dependency for packages that depend on
+;; the headers.
+(define-public linux-libre-headers-latest linux-libre-headers-6.10)
;;;
@@ -818,10 +831,34 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
(config (search-auxiliary-file file)))
(and config (local-file config))))
-(define %default-extra-linux-options
+(define (default-extra-linux-options version)
`(;; Make the kernel config available at /proc/config.gz
("CONFIG_IKCONFIG" . #t)
("CONFIG_IKCONFIG_PROC" . #t)
+ ;; Debugging options.
+ ("CONFIG_DEBUG_INFO" . #t) ;required by BTF
+ ,@(if (version>=? version "5.1")
+ '(("CONFIG_DEBUG_INFO_BTF" . #t))
+ '())
+ ,@(if (version>=? version "5.12")
+ '(("CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT" . #t))
+ '())
+ ("CONFIG_DEBUG_INFO_REDUCED" . #f) ;incompatible with BTF
+ ;; Tracing and related options.
+ ,@(if (version>=? version "5.1")
+ '(("CONFIG_BPF_JIT" . #t)
+ ("CONFIG_BPF_JIT_ALWAYS_ON" . #t)
+ ("CONFIG_BPF_SYSCALL" . #t))
+ '())
+ ,@(if (version>=? version "5.13")
+ '(("BPF_UNPRIV_DEFAULT_OFF" . #t))
+ '())
+ ("CONFIG_NET_CLS_BPF" . m) ;classify packets based on BPF filters
+ ("CONFIG_NET_ACT_BPF" . m) ;to execute BPF code on packets
+ ;; Compress kernel modules via Zstd.
+ ,(if (version>=? version "5.13")
+ '("CONFIG_MODULE_COMPRESS_ZSTD" . #t)
+ '("CONFIG_MODULE_COMPRESS_GZIP" . #t))
;; Some very mild hardening.
("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
;; All kernels should have NAMESPACES options enabled
@@ -874,30 +911,6 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
("CONFIG_CIFS" . m)
("CONFIG_9P_FS" . m)))
-;; See https://github.com/iovisor/bcc/blob/master/INSTALL.md#kernel-configuration
-(define %bpf-extra-linux-options
- `(;; Needed for probes
- ("CONFIG_UPROBE_EVENTS" . #t)
- ("CONFIG_KPROBE_EVENTS" . #t)
- ;; kheaders module also helpful for tracing
- ("CONFIG_IKHEADERS" . #t)
- ("CONFIG_BPF" . #t)
- ("CONFIG_BPF_SYSCALL" . #t)
- ("CONFIG_BPF_JIT_ALWAYS_ON" . #t)
- ;; optional, for tc filters
- ("CONFIG_NET_CLS_BPF" . m)
- ;; optional, for tc actions
- ("CONFIG_NET_ACT_BPF" . m)
- ("CONFIG_BPF_JIT" . #t)
- ;; for Linux kernel versions 4.1 through 4.6
- ;; ("CONFIG_HAVE_BPF_JIT" . y)
- ;; for Linux kernel versions 4.7 and later
- ("CONFIG_HAVE_EBPF_JIT" . #t)
- ;; optional, for kprobes
- ("CONFIG_BPF_EVENTS" . #t)
- ;; kheaders module
- ("CONFIG_IKHEADERS" . #t)))
-
(define (config->string options)
(string-join (map (match-lambda
((option . 'm)
@@ -931,7 +944,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
;; for an example.
(configuration-file #f)
(defconfig "defconfig")
- (extra-options %default-extra-linux-options)
+ (extra-options (default-extra-linux-options version))
(patches
`(,%boot-logo-patch
,@(if (apply-infodoc-patch? version)
@@ -957,7 +970,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
;; See kernel-config for an example.
(configuration-file #f)
(defconfig "defconfig")
- (extra-options %default-extra-linux-options))
+ (extra-options (default-extra-linux-options version)))
(package
(name (if extra-version
(string-append "linux-libre-" extra-version)
@@ -989,6 +1002,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
(setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
;; Other variables useful for reproducibility.
+ (setenv "KBUILD_BUILD_VERSION" "1")
(setenv "KBUILD_BUILD_USER" "guix")
(setenv "KBUILD_BUILD_HOST" "guix")
@@ -1010,7 +1024,10 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
"EXTRAVERSION ?="))
(setenv "EXTRAVERSION"
#$(and extra-version
- (string-append "-" extra-version)))))
+ (string-append "-" extra-version)))
+ ;; Use the maximum compression available for Zstd-compressed
+ ;; modules.
+ (setenv "ZSTD_CLEVEL" "19")))
(replace 'configure
(lambda _
(let ((config
@@ -1041,9 +1058,15 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
(close-port port))
(invoke "make" "oldconfig"))))
(replace 'install
- (lambda _
+ (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(let ((moddir (string-append #$output "/lib/modules"))
- (dtbdir (string-append #$output "/lib/dtbs")))
+ (dtbdir (string-append #$output "/lib/dtbs"))
+ (make-flags
+ (append make-flags
+ (list "-j"
+ (if parallel-build?
+ (number->string (parallel-job-count))
+ "1")))))
;; Install kernel image, kernel configuration and link map.
(for-each (lambda (file) (install-file file #$output))
(find-files "." "^(\\.config|bzImage|zImage|Image\
@@ -1051,22 +1074,23 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
;; Install device tree files
(unless (null? (find-files "." "\\.dtb$"))
(mkdir-p dtbdir)
- (invoke "make" (string-append "INSTALL_DTBS_PATH=" dtbdir)
- "dtbs_install"))
+ (apply invoke "make"
+ (string-append "INSTALL_DTBS_PATH=" dtbdir)
+ "dtbs_install" make-flags))
;; Install kernel modules
(mkdir-p moddir)
- (invoke "make"
- ;; Disable depmod because the Guix system's module
- ;; directory is an union of potentially multiple
- ;; packages. It is not possible to use depmod to
- ;; usefully calculate a dependency graph while
- ;; building only one of them.
- "DEPMOD=true"
- (string-append "MODULE_DIR=" moddir)
- (string-append "INSTALL_PATH=" #$output)
- (string-append "INSTALL_MOD_PATH=" #$output)
- "INSTALL_MOD_STRIP=1"
- "modules_install")
+ (apply invoke "make"
+ ;; Disable depmod because the Guix system's module
+ ;; directory is an union of potentially multiple
+ ;; packages. It is not possible to use depmod to
+ ;; usefully calculate a dependency graph while building
+ ;; only one of them.
+ "DEPMOD=true"
+ (string-append "MODULE_DIR=" moddir)
+ (string-append "INSTALL_PATH=" #$output)
+ (string-append "INSTALL_MOD_PATH=" #$output)
+ "INSTALL_MOD_STRIP=1"
+ "modules_install" make-flags)
(let* ((versions (filter (lambda (name)
(not (string-prefix? "." name)))
(scandir moddir)))
@@ -1088,11 +1112,18 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
elfutils ;needed to enable CONFIG_STACK_VALIDATION
flex
bison
- util-linux ;needed for hexdump
+ util-linux ;needed for hexdump
;; These are needed to compile the GCC plugins.
gmp
mpfr
- mpc))
+ mpc
+ ;; These are needed when building with the CONFIG_DEBUG_INFO_BTF
+ ;; support.
+ dwarves ;for pahole
+ python-wrapper
+ zlib
+ ;; For Zstd compression of kernel modules.
+ zstd))
(home-page "https://www.gnu.org/software/linux-libre/")
(synopsis "100% free redistribution of a cleaned Linux kernel")
(description "GNU Linux-Libre is a free (as in freedom) variant of the
@@ -1105,19 +1136,19 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
;;; Generic kernel packages.
;;;
-(define-public linux-libre-6.8
- (make-linux-libre* linux-libre-6.8-version
- linux-libre-6.8-gnu-revision
- linux-libre-6.8-source
+(define-public linux-libre-6.10
+ (make-linux-libre* linux-libre-6.10-version
+ linux-libre-6.10-gnu-revision
+ linux-libre-6.10-source
'("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
#:configuration-file kernel-config))
-(define-public linux-libre-version linux-libre-6.8-version)
-(define-public linux-libre-gnu-revision linux-libre-6.8-gnu-revision)
-(define-public linux-libre-pristine-source linux-libre-6.8-pristine-source)
-(define-public linux-libre-source linux-libre-6.8-source)
-(define-public linux-libre linux-libre-6.8)
+(define-public linux-libre-version linux-libre-6.10-version)
+(define-public linux-libre-gnu-revision linux-libre-6.10-gnu-revision)
+(define-public linux-libre-pristine-source linux-libre-6.10-pristine-source)
+(define-public linux-libre-source linux-libre-6.10-source)
+(define-public linux-libre linux-libre-6.10)
(define-public linux-libre-6.6
(make-linux-libre* linux-libre-6.6-version
@@ -1193,7 +1224,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-version))))
(define-public linux-libre-arm-generic-5.10
(make-linux-libre* linux-libre-5.10-version
@@ -1206,7 +1237,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-5.10-version))))
(define-public linux-libre-arm-generic-5.4
(make-linux-libre* linux-libre-5.4-version
@@ -1219,7 +1250,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-5.4-version))))
(define-public linux-libre-arm-generic-4.19
(make-linux-libre* linux-libre-4.19-version
@@ -1271,7 +1302,35 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
("CONFIG_BATTERY_CW2015" . m)
("CONFIG_CHARGER_GPIO" . m)
("CONFIG_SND_SOC_ES8316" . m))
- %default-extra-linux-options)))
+ (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
@@ -1297,7 +1356,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
("CONFIG_BATTERY_CW2015" . m)
("CONFIG_CHARGER_GPIO" . m)
("CONFIG_SND_SOC_ES8316" . m))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-5.10-version))))
(define-public linux-libre-arm64-generic-5.4
(make-linux-libre* linux-libre-5.4-version
@@ -1310,7 +1369,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-5.4-version))))
(define-public linux-libre-riscv64-generic
(make-linux-libre* linux-libre-version
@@ -1334,7 +1393,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
("CONFIG_HW_RANDOM_VIRTIO" . m)
("CONFIG_VIRTIO_CONSOLE" . m)
("CONFIG_CRYPTO_XTS" . m))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-version))))
(define-public linux-libre-mips64el-fuloong2e
(make-linux-libre* linux-libre-version
@@ -1346,28 +1405,10 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
#:extra-options
(append
`(("CONFIG_OVERLAY_FS" . m))
- %default-extra-linux-options)))
+ (default-extra-linux-options linux-libre-version))))
(define-public linux-libre-with-bpf
- (let ((base-linux-libre
- (make-linux-libre*
- linux-libre-6.8-version
- linux-libre-6.8-gnu-revision
- linux-libre-6.8-source
- '("x86_64-linux" "i686-linux" "armhf-linux"
- "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
- #:extra-version "bpf"
- #:configuration-file kernel-config
- #:extra-options
- (append %bpf-extra-linux-options
- %default-extra-linux-options))))
- (package
- (inherit base-linux-libre)
- (inputs (modify-inputs (package-inputs base-linux-libre)
- (prepend cpio)))
- (synopsis "Linux-libre with BPF support")
- (description "This package provides GNU Linux-Libre with support
-for @acronym{BPF, the Berkeley Packet Filter}."))))
+ (deprecated-package "linux-libre-with-bpf" linux-libre))
;;;
@@ -1538,20 +1579,20 @@ and the notification, WiFi, and Bluetooth LED.")
(define-public tuxedo-keyboard
(package
(name "tuxedo-keyboard")
- (version "3.2.10")
+ (version "4.6.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tuxedocomputers/tuxedo-keyboard.git")
+ (url "https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1kbspr1vs6jpfsb3c4hbw2d8y06v2a3m4c27rhggkfksf4x82gip"))))
+ (base32 "0hbqk28qi3yxw0g3j8yarsplyigpd8kgliri7c48d3yhliiiz7l5"))))
(build-system linux-module-build-system)
(arguments
(list #:tests? #f)) ; no test suite
- (home-page "https://github.com/tuxedocomputers/tuxedo-keyboard")
+ (home-page "https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers")
(synopsis "Linux kernel modules to control keyboard on most Tuxedo computers")
(description
"This package provides the @code{tuxedo_keyboard}, @code{tuxedo_io},
@@ -1565,7 +1606,7 @@ is also needed for the @code{tuxedo-control-center} (short tcc) package.")
(define-public evdi
(package
(name "evdi")
- (version "1.14.1") ;inherited by libevdi
+ (version "1.14.4") ;inherited by libevdi
(source
(origin
(method git-fetch)
@@ -1574,7 +1615,7 @@ is also needed for the @code{tuxedo-control-center} (short tcc) package.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0vfbph6bdb206zgdp0bvpqck2zvkx1367xdxbavv41qsmgkxhvbs"))))
+ (base32 "1r9gd4ffr8sh9y3ic8fxwgp4gjls2yd6bgsgvcf0vy571s2aqggr"))))
(build-system linux-module-build-system)
(arguments
(list #:tests? #f ;no test suite
@@ -1617,6 +1658,7 @@ display settings applets in graphical environments")
(mkdir-p lib)
(install-file "libevdi.so" lib)))))))
(inputs (list libdrm))
+ (native-inputs (list pkg-config))
(synopsis
"@acronym{EVDI, Extensible Virtual Display Interface} user-space library")
(description
@@ -1737,7 +1779,7 @@ graphics card on Optimus laptops.")
(define-public ddcci-driver-linux
(package
(name "ddcci-driver-linux")
- (version "0.4.4")
+ (version "0.4.5")
(source
(origin
(method git-fetch)
@@ -1747,7 +1789,7 @@ graphics card on Optimus laptops.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472"))))
+ (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf"))))
(build-system linux-module-build-system)
(arguments
(list #:tests? #f ; no tests
@@ -1895,10 +1937,10 @@ accepted as a quirk (ie AMD Vega 10).")
"linux-pam-no-setfsuid.patch"))))
(build-system gnu-build-system)
+ (inputs (list libxcrypt))
(native-inputs
(list flex
;; TODO: optional dependencies
- ;; ("libxcrypt" ,libxcrypt)
;; ("cracklib" ,cracklib)
))
(arguments
@@ -2239,11 +2281,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
;; Change the test to refer to the right file.
(substitute* "tests/ts/misc/mcookie"
(("/etc/services")
- services))
-
- ;; The C.UTF-8 locale does not exist in our libc.
- (substitute* "tests/ts/column/invalid-multibyte"
- (("C\\.UTF-8") "en_US.utf8")))))
+ services)))))
(add-before 'check 'disable-setarch-test
(lambda _
;; The setarch tests are unreliable in QEMU's user-mode
@@ -2367,6 +2405,54 @@ by Robert Shea and Robert Anton Wilson.")
partitions. Write functionality is also provided but check the README.")
(license license:gpl2+)))
+(define-public dwarves
+ (package
+ (name "dwarves")
+ (version "1.27")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/acmel/dwarves")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qwc3772az1h3c78pyswawyvyq9spj5s1prj7ckfij9nazp3a007"))
+ (patches
+ (search-patches "dwarves-threading-reproducibility.patch"))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags #~(list "-D__LIB=lib"
+ "-DLIBBPF_EMBEDDED=OFF")
+ #:tests? #f)) ;no test suite
+ (native-inputs (list pkg-config))
+ (inputs (list libbpf))
+ (home-page "https://github.com/acmel/dwarves")
+ (synopsis "Debugging information processing library and utilities")
+ (description "Dwarves is a set of tools that use the debugging information
+inserted in ELF binaries by compilers such as GCC, used by well known
+debuggers such as GDB.
+
+Utilities in the Dwarves suite include @command{pahole}, that can be used to
+find alignment holes in structures and classes in languages such as C, C++,
+but not limited to these. These tools can also be used to encode and read the
+BTF type information format used with the kernel Linux @code{bpf} syscall.
+
+The @command{codiff} command can be used to compare the effects changes in
+source code generate on the resulting binaries.
+
+The @command{pfunct} command can be used to find all sorts of information
+about functions, inlines, decisions made by the compiler about inlining, etc.
+
+The @command{pahole} command can be used to use all this type information to
+pretty print raw data according to command line directions.
+
+Headers can have its data format described from debugging info and offsets from
+it can be used to further format a number of records.
+
+Finally, the @command{btfdiff} command can be used to compare the output of
+pahole from BTF and DWARF, to make sure they produce the same results. ")
+ (license license:gpl2+)))
+
(define-public fbset
(package
(name "fbset")
@@ -2618,7 +2704,12 @@ module.")
(chmod file #o666))
archives)))))
,@(if (system-hurd?)
- '((add-after 'unpack 'skip-tests
+ '((add-after 'unpack 'set-PATH_MAX
+ (lambda _
+ ;; Shamelessly introduce an arbitrary limit.
+ (substitute* "misc/tune2fs.c"
+ (("PATH_MAX") "4096"))))
+ (add-after 'unpack 'skip-tests
(lambda _
(with-directory-excursion "tests"
(for-each
@@ -2866,7 +2957,7 @@ intercept and print the system calls executed by the program.")
(define-public alsa-ucm-conf
(package
(name "alsa-ucm-conf")
- (version "1.2.4")
+ (version "1.2.11")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2874,7 +2965,7 @@ intercept and print the system calls executed by the program.")
version ".tar.bz2"))
(sha256
(base32
- "0h6kzi1cfdqyxp4pwpqh5wb89c8s9wrgix315bvamffwfxf56frc"))))
+ "10dfzvrmpp9swflw47nxf35an6gj3ilb4wlggdnng8g2637h2z1q"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
@@ -2914,15 +3005,15 @@ configuration files that can be used for specific audio hardware.")
(define-public alsa-lib
(package
(name "alsa-lib")
- (version "1.2.4")
+ (version "1.2.11")
(source (origin
(method url-fetch)
(uri (string-append
- "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-"
- version ".tar.bz2"))
+ "https://www.alsa-project.org/files/pub/lib/"
+ name "-" version ".tar.bz2"))
(sha256
(base32
- "1xq8d48wfy59qw4x7383j32n8j5njndw5hcgnmlg9pvclphlnmgp"))))
+ "0kdvjlknc50fwfdkxj0z12xbz21skb3gnwlh6lvsvycmp5ljygwz"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
@@ -2961,45 +3052,35 @@ MIDI functionality to the Linux-based operating system.")
(define-public alsa-utils
(package
(name "alsa-utils")
- (version "1.2.4")
+ (version "1.2.11")
(source (origin
- (method url-fetch)
- (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/"
- name "-" version ".tar.bz2"))
- (sha256
- (base32
- "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq"))))
+ (method url-fetch)
+ (uri (string-append
+ "https://www.alsa-project.org/files/pub/utils/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "19r8qi6b7sd2p1mhxfqrp18wrgjw5s6rp5ygimb1w59zi0xcmils"))))
(build-system gnu-build-system)
(arguments
- ;; XXX: Disable man page creation until we have DocBook.
- '(#:configure-flags (list "--disable-xmlto"
-
- ;; The udev rule is responsible for restoring
- ;; the volume.
- (string-append "--with-udev-rules-dir="
- (assoc-ref %outputs "out")
- "/lib/udev/rules.d"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'check 'disable-broken-test
- (lambda _
- ;; XXX: The 1.1.8 release tarball is missing a header that's
- ;; required for this test to work. Fixed in 1.1.9.
- (substitute* "axfer/test/Makefile"
- ((".*container-test.*") ""))
- #t))
- (add-before
- 'install 'pre-install
- (lambda _
- ;; Don't try to mkdir /var/lib/alsa.
- (substitute* "Makefile"
- (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*")
- "true\n"))
- #t)))))
+ (list
+ #:configure-flags
+ #~(list
+ ;; The udev rule is responsible for restoring the volume.
+ (string-append "--with-udev-rules-dir=" #$output "/lib/udev/rules.d"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'pre-install
+ (lambda _
+ ;; Don't try to mkdir /var/lib/alsa.
+ (substitute* "Makefile"
+ (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*")
+ "true\n")))))))
(native-inputs
- `(("gettext" ,gettext-minimal)))
+ (list docbook-xml-4.2 docbook-xsl xmlto
+ gettext-minimal))
(inputs
- (list libsamplerate ncurses alsa-lib xmlto))
+ (list libsamplerate ncurses alsa-lib))
(home-page "http://www.alsa-project.org/")
(synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)")
(description
@@ -3275,7 +3356,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute
(package
(name "iproute2")
- (version "6.0.0")
+ (version "6.4.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3283,7 +3364,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz"))
(sha256
(base32
- "02jq36p7py8zs8s8jj49ap82sgf5wi5yfbgsfiirkv1awzlkjcaj"))))
+ "0wm2g70vfhnf8wb6py3zmzwxp4zv1icny1pvkwaxmr67rggbhlac"))))
(build-system gnu-build-system)
(arguments
(list
@@ -3549,7 +3630,8 @@ configuration and monitoring interfaces.")
((string=? python "python2")
`(("python-2" ,python-2)))
((string=? python "python3")
- `(("python-3" ,python-3))))))
+ `(("python-3" ,python-3))))
+ ("libxcrypt" ,libxcrypt))) ;required by Python.h
(propagated-inputs (list libnl))
(outputs '("out"))
(arguments
@@ -3722,7 +3804,7 @@ processes currently causing I/O.")
(define-public iotop
(package
(name "iotop")
- (version "1.25")
+ (version "1.26")
(source
(origin
(method git-fetch)
@@ -3731,7 +3813,7 @@ processes currently causing I/O.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0h8fb7zzqszdrybk9zzzqqkiz78i8z2zr0f2nj84jja6visdd2v4"))))
+ (base32 "0raac1sp46mls6p0a4yzzc8iqxkw0da4zq54cwjdg4wcy8g43glv"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
@@ -4152,7 +4234,8 @@ NUMA performance on your system.")
(native-inputs
(list autoconf pkg-config))
(inputs
- `(("bzip2" ,bzip2)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("bzip2" ,bzip2)
("gzip" ,gzip)
("pam" ,linux-pam)
("xz" ,xz)
@@ -4248,37 +4331,27 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
"0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"))
(patches (search-patches "kmod-module-directory.patch"))))
(build-system gnu-build-system)
- (native-inputs
- (list pkg-config
- ;; For tests.
- zstd))
- (inputs
- `(("xz" ,xz)
- ("zlib" ,zlib)
- ("zstd-lib" ,zstd "lib")))
(arguments
- `(#:configure-flags '("--with-xz" "--with-zlib" "--with-zstd"
- "--disable-test-modules")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-tests
- (lambda _
- ;; XXX: These tests need '--sysconfdir=/etc' to pass.
- (substitute* "Makefile.in"
- (("testsuite/test-modprobe") "")
- (("testsuite/test-depmod") "")
- (("testsuite/test-blacklist") ""))
- #t))
- (add-after 'install 'install-modprobe&co
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (for-each (lambda (tool)
- (symlink "kmod"
- (string-append bin "/" tool)))
- '("insmod" "rmmod" "lsmod" "modprobe"
- "modinfo" "depmod"))
- #t))))))
+ (list #:configure-flags #~(list "--with-xz" "--with-zlib" "--with-zstd"
+ "--disable-test-modules")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-tests
+ (lambda _
+ ;; XXX: These tests need '--sysconfdir=/etc' to pass.
+ (substitute* "Makefile.in"
+ (("testsuite/test-modprobe") "")
+ (("testsuite/test-depmod") "")
+ (("testsuite/test-blacklist") ""))))
+ (add-after 'install 'install-modprobe&co
+ (lambda _
+ (for-each (lambda (tool)
+ (symlink "kmod"
+ (string-append #$output "/bin/" tool)))
+ '("insmod" "rmmod" "lsmod" "modprobe"
+ "modinfo" "depmod")))))))
+ (native-inputs (list pkg-config zstd)) ;zstd needed for tests
+ (inputs (list xz zlib `(,zstd "lib")))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://www.kernel.org/")
(synopsis "Kernel module tools")
@@ -4426,7 +4499,6 @@ to the in-kernel OOM killer.")
;; For documentation.
docbook-xml-4.2
docbook-xsl
- libxml2 ;for $XML_CATALOG_FILES
libxslt))
(inputs
;; When linked against libblkid, eudev can populate /dev/disk/by-label
@@ -4577,6 +4649,7 @@ one to send arbitrary keycodes when a given key is tapped or held.")
(sha256
(base32
"0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc"))
+ (patches (search-patches "lvm2-no-systemd.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -4651,13 +4724,16 @@ mapper. Kernel components are part of Linux-libre.")
;; Command-line tools are GPLv2.
(license (list license:gpl2 license:lgpl2.1))))
+(define-public (libdevmapper-propagated-inputs)
+ (list eudev))
+
(define-public lvm2-static
(package
(inherit lvm2)
(name "lvm2-static")
- ;; Propagate udev because libdevmapper.a depends on libudev.
- (propagated-inputs `(("udev:static" ,eudev "static")))
+ (inputs `(,@(package-inputs lvm2)
+ ("udev:static" ,eudev "static")))
(arguments
(substitute-keyword-arguments (package-arguments lvm2)
@@ -4671,19 +4747,28 @@ mapper. Kernel components are part of Linux-libre.")
;; it until the situation improves.
(delete "--enable-dmeventd" ,flags)))
((#:phases phases)
- `(modify-phases ,phases
- (add-before 'configure 'adjust-Makefile
- (lambda _
- ;; These fixes are related to the upstream libdm->device_mapper
- ;; migration and will hopefully be fixed upstream in due time.
- (substitute* "tools/Makefile.in"
- ;; This variable is empty in a static configuration and causes
- ;; an erroneous GCC command line.
- (("-L\\$\\(interfacebuilddir\\)") "")
- ;; Remove obsolete reference to libdevmapper.a.
- (("-ldevmapper") ""))
- #t))))))
- (synopsis "Logical volume management for Linux (statically linked)")))
+ #~(modify-phases #$phases
+ (add-before 'configure 'adjust-Makefile
+ (lambda _
+ ;; These fixes are related to the upstream libdm->device_mapper
+ ;; migration and will hopefully be fixed upstream in due time.
+ (substitute* "tools/Makefile.in"
+ ;; This variable is empty in a static configuration and causes
+ ;; an erroneous GCC command line.
+ (("-L\\$\\(interfacebuilddir\\)") "")
+ ;; Remove obsolete reference to libdevmapper.a.
+ (("-ldevmapper") ""))
+ #t))
+ (add-after 'install 'adjust-pkgconfig
+ ;; The static eudev is missing its pkg config file, and I am not
+ ;; rebuilding it at this point.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (string-append #$output "/lib/pkgconfig/devmapper.pc")
+ (("Requires.private: .*") "")
+ (("Libs.private:")
+ (format #f "Libs.private: -L~a -ludev"
+ (dirname (search-input-file inputs "lib/libudev.a")))))))))))
+ (synopsis "Logical volume management for Linux (statically linked)")))
(define-public thin-provisioning-tools
(package
@@ -5154,6 +5239,13 @@ in a digital read-out.")
(setenv "SHELL_PATH" (which "bash"))
(chdir "tools/perf")
+ ;; In Linux 6.10.6, 'Makefile.config' overrides PKG_CONFIG_PATH
+ ;; when looking for libtraceevent and thus fails to find it.
+ ;; Remove that.
+ (substitute* "Makefile.config"
+ (("PKG_CONFIG_PATH=[[:graph:]]+")
+ ""))
+
;; This file hard-codes file system layouts for specific distros
;; but not for ours; address that. With this change, one can run
;; "perf report --symfs=$HOME/.guix-profile" (without
@@ -5178,21 +5270,21 @@ in a digital read-out.")
;; There are build scripts written in these languages.
perl
python-2
- python-3))
+ python-3
+ ;; Documentation
+ docbook-xsl
+ xmlto
+ asciidoc))
(inputs
(list slang ;for the interactive TUI
+ zlib
;; newt
python-2 ;'perf' links against libpython
elfutils
libiberty ;used alongside BDF for symbol demangling
libunwind ;better stack walking
libtraceevent
- numactl ;for 'perf bench numa mem'
- ;; Documentation.
- libxml2 ;for $XML_CATALOG_FILES
- docbook-xsl
- xmlto
- asciidoc))
+ numactl)) ;for 'perf bench numa mem'
(home-page "https://perf.wiki.kernel.org/")
(synopsis "Linux profiling with performance counters")
(description
@@ -5258,7 +5350,7 @@ thanks to the use of namespaces.")
(substitute* (find-files "libexec/cli" "\\.exec$")
(("\\$SINGULARITY_libexecdir/singularity/bin/([a-z]+)-suid"
_ program)
- (string-append "/run/setuid-programs/singularity-"
+ (string-append "/run/privileged/bin/singularity-"
program "-helper")))
;; These squashfs mount options are apparently no longer
@@ -5299,7 +5391,8 @@ thanks to the use of namespaces.")
(string-append (which "env") " "
#$output "/bin/singularity")))))))))
(inputs
- (list coreutils
+ (list bash-minimal
+ coreutils
libarchive
python-wrapper
squashfs-tools
@@ -5762,7 +5855,7 @@ arrays when needed.")
(for-each delete-file-recursively directories)
(remove-store-references "sbin/mdadm")
(delete-file "sbin/mdmon")))))))
- ((#:modules modules %gnu-build-system-modules)
+ ((#:modules modules %default-gnu-modules)
`((ice-9 ftw) ,@modules))
((#:strip-flags _ '())
''("--strip-all")) ;strip a few extra KiB
@@ -5896,6 +5989,13 @@ Linux Device Mapper multipathing driver:
#:test-target "partcheck" ; need root for a full 'check'
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (with-directory-excursion "harness/cases"
+ ;; The 21.t test fails with "Expected 4096, got
+ ;; 18446744073709551605" (see:
+ ;; https://pagure.io/libaio/issue/26).
+ (rename-file "21.t" "21.t.disabled"))))
(delete 'configure) ; no configure script
#$@(if (target-riscv64?)
#~((add-after 'unpack 'patch-test
@@ -5919,12 +6019,12 @@ applications.")
(license license:lgpl2.1+)))
(define-public blktrace
- ;; Take a newer commit to get the fix for CVE-2018-10689.
- (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58")
+ ;; Take a newer commit to get the latest patches.
+ (let ((commit "b9ea6e507e8849f01d06aa48c0c59c5cee4820be")
(revision "1"))
(package
(name "blktrace")
- (version (git-version "1.2.0" revision commit))
+ (version (git-version "1.3.0" revision commit))
(home-page
"https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git")
(source (origin
@@ -5933,24 +6033,23 @@ applications.")
(url home-page)
(commit commit)))
(sha256
- (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp"))
+ (base32 "0a4830mlqckbhchar1xcn2w4f24bzb75bigdig5wpm2axl0zc8cq"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
- (list ,(string-append "CC=" (cc-for-target))
- (string-append "prefix=" %output))
- #:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'unpack 'fix-gnuplot-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gnuplot (assoc-ref inputs "gnuplot")))
- (substitute* "btt/bno_plot.py"
- (("gnuplot %s")
- (string-append gnuplot "/bin/gnuplot %s")))
- #t))))))
+ (list #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "prefix=" #$output))
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'fix-gnuplot-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gnuplot (assoc-ref inputs "gnuplot")))
+ (substitute* "btt/bno_plot.py"
+ (("gnuplot %s")
+ (string-append gnuplot "/bin/gnuplot %s")))))))))
(inputs
`(("libaio" ,libaio)
("gnuplot" ,gnuplot)
@@ -5988,7 +6087,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez
(package
(name "bluez")
- (version "5.66")
+ (version "5.72")
(source (origin
(method url-fetch)
(uri (string-append
@@ -5996,7 +6095,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
version ".tar.xz"))
(sha256
(base32
- "0x5mn9x6g626izxnw236933wvq83qagsh9qc9ac9550cb55sdzir"))))
+ "0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9"))))
(build-system gnu-build-system)
(arguments
(list
@@ -6004,6 +6103,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
#~(list "--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-library"
+ "--enable-wiimote"
"--disable-systemd"
;; TODO: is this needed? Not installed by default since 5.55.
"--enable-hid2hci"
@@ -6040,10 +6140,12 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(native-inputs
(list gettext-minimal
pkg-config
- python-docutils))
+ python
+ python-docutils
+ python-pygments))
(inputs
(list glib dbus eudev libical readline))
- (home-page "http://www.bluez.org/")
+ (home-page "https://www.bluez.org/")
(synopsis "Linux Bluetooth protocol stack")
(description
"BlueZ provides support for the core Bluetooth layers and protocols. It
@@ -7107,7 +7209,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
@@ -7119,7 +7221,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
@@ -7127,7 +7229,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
@@ -7198,6 +7302,7 @@ not as a replacement for it.")
kcoreaddons
kddockwidgets
kgraphviewer
+ ki18n
kio
kiconthemes
kitemmodels
@@ -7208,12 +7313,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"))
@@ -7244,7 +7345,7 @@ graphically visualizing a @file{perf.data} file.")
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list "--disable-pywrap")
- #:modules (,@%gnu-build-system-modules
+ #:modules (,@%default-gnu-modules
(ice-9 binary-ports)
(rnrs bytevectors)
(srfi srfi-26))
@@ -8792,7 +8893,7 @@ comparing system environments.")
(define-public libfabric
(package
(name "libfabric")
- (version "1.19.0")
+ (version "1.22.0")
(source
(origin
(method url-fetch)
@@ -8800,14 +8901,23 @@ comparing system environments.")
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
- (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i"))))
- (build-system gnu-build-system)
- (inputs `(("rdma-core" ,rdma-core)
- ,@(match (%current-system)
- ((member (package-supported-systems psm))
- `(("psm" ,psm)))
- (_ `()))
- ("libnl" ,libnl)))
+ (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
+ (build-system gnu-build-system)
+ (inputs
+ (let ((if-supported ;XXX: copied from openmpi
+ (lambda (package)
+ (if (and (not (%current-target-system))
+ (member (%current-system)
+ (package-supported-systems package)))
+ (list package)
+ '()))))
+ (append (list rdma-core libnl)
+ (if-supported psm)
+ (if-supported psm2))))
+ (arguments
+ (list #:configure-flags
+ #~(list "--enable-efa"
+ "--enable-verbs")))
(home-page "https://ofiwg.github.io/libfabric/")
(synopsis "Open Fabric Interfaces")
(description
@@ -8840,7 +8950,15 @@ libraries, which are often integrated directly into libfabric.")
"psm-arch.patch" ; uname -p returns "unknown" on Debian 9
"psm-ldflags.patch" ; build shared lib with LDFLAGS
"psm-repro.patch" ; reproducibility
- "psm-disable-memory-stats.patch"))))
+ "psm-disable-memory-stats.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; That file declares its own 'strlcat' as static. To avoid a
+ ;; conflict with the function now in glibc 2.39, give it a
+ ;; different name.
+ #~(substitute* "ptl_ips/ips_proto_dump.c"
+ (("strlcat")
+ "psm_custom_strlcat")))))
(build-system gnu-build-system)
(outputs '("out" "debug"))
(inputs `(("libuuid" ,util-linux "lib")))
@@ -9094,7 +9212,15 @@ privileges.")
(file-name (git-file-name name version))
(sha256
(base32
- "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))))
+ "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; That file declares its own 'strlcat' as static. To avoid a
+ ;; conflict with the function now in glibc 2.39, give it a
+ ;; different name.
+ #~(substitute* "ptl_ips/ips_proto_dump.c"
+ (("strlcat")
+ "psm2_custom_strlcat")))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
@@ -9198,31 +9324,45 @@ nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or
management tools in userspace.")
(license license:gpl2)))
-(define-public go-netlink
+(define-public go-github-com-vishvananda-netlink
(package
- (name "go-netlink")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vishvananda/netlink")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"))))
+ (name "go-github-com-vishvananda-netlink")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vishvananda/netlink")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vhl30p1gx636a088ls4h6a0l8jjyfvz79fr5w0qzdrg4qg9h08h"))))
(build-system go-build-system)
(arguments
- `(#:tests? #f ; Tests depend on specific kernel modules.
- #:import-path "github.com/vishvananda/netlink"))
- (native-inputs
- (list go-golang-org-x-sys go-netns))
+ (list
+ ;; The tests are unsupported on all architectures except x86_64-linux:
+ ;; cannot use 0xabcdef99 (untyped int constant 2882400153) as int value
+ ;; in struct literal (overflows)
+ #:tests? (and (not (%current-target-system)) (target-x86-64?))
+ #:import-path "github.com/vishvananda/netlink"
+ #: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$")
+ ;; Disable tests requiring root access.
+ (("TestNetNsIdByFd") "OffTestNetNsIdByFd")
+ (("TestNetNsIdByPid") "OffTestNetNsIdByPid"))))))))
+ (propagated-inputs
+ (list go-golang-org-x-sys go-github-com-vishvananda-netns))
(home-page "https://github.com/vishvananda/netlink")
(synopsis "Simple netlink library for Go")
- (description "The netlink package provides a simple netlink library for
-Go. Netlink is the interface a user-space program in Linux uses to
-communicate with the kernel. It can be used to add and remove interfaces, set
-IP addresses and routes, and configure IPsec.")
+ (description
+ "The netlink package provides a simple netlink library for Go. Netlink
+is the interface a user-space program in Linux uses to communicate with the
+kernel. It can be used to add and remove interfaces, set IP addresses and
+routes, and configure IPsec.")
(license license:asl2.0)))
(define-public libinih
@@ -9410,7 +9550,7 @@ the superuser to make device nodes.")
(define-public fakeroot
(package
(name "fakeroot")
- (version "1.31")
+ (version "1.35.1")
(source
(origin
;; There are no tags in the repository, so take this snapshot.
@@ -9419,7 +9559,7 @@ the superuser to make device nodes.")
"fakeroot/fakeroot_" version ".orig.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0br0gvvribfs2kpkhwr51lsinhl6l36334wx1cbwfmhww50nv233"))
+ (base32 "1p2zcng64sigixppmh42gd3ava771pmq9a6lwva7flp05lxya3ba"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
@@ -9537,6 +9677,91 @@ set as @code{LD_PRELOAD} to override the C library file system functions.")
(home-page "https://github.com/dex4er/fakechroot/")
(license license:lgpl2.1+))))
+(define-public falcosecurity-libs
+ (package
+ (name "falcosecurity-libs")
+ (version "0.16.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/falcosecurity/libs/")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vzymzkfipb3bnjjd9m8ykzj0l94fm8mnpcxfm8mpxz3jbd8xnv9"))
+ (patches
+ (search-patches
+ "falcosecurity-libs-pkg-config.patch"
+ "falcosecurity-libs-install-pman.patch"
+ "falcosecurity-libs-libscap-pc.patch"
+ "falcosecurity-libs-shared-library-fix.patch"
+ "falcosecurity-libs-libsinsp-pkg-config.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "-DUSE_BUNDLED_DEPS=OFF"
+ "-DBUILD_DRIVER=OFF"
+ "-DENABLE_DKMS=OFF"
+ "-DBUILD_LIBSCAP_MODERN_BPF=ON"
+ "-DSCAP_FILES_SUITE_ENABLE=OFF" ;attempts to download scap files
+ "-DBUILD_SHARED_LIBS=ON"
+ #$(string-append "-DFALCOSECURITY_LIBS_VERSION=" version))
+ ;; Only the libsinsp test suite is run, as the one for libscap requires
+ ;; elevated privileges.
+ #:test-target "run-unit-test-libsinsp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (substitute* "userspace/libsinsp/test/user.ut.cpp"
+ ;; The 'system_lookup' test assumes a root user
+ ;; exists in the build environment.
+ (("TEST_F\\(usergroup_manager_test, system_lookup)")
+ "TEST_F(usergroup_manager_test, DISABLED_system_lookup)"))))
+ (add-after 'install 'delete-src
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/src")))))))
+ (native-inputs (list bpftool
+ clang
+ googletest
+ pkg-config
+ valijson)) ;header-only library
+ (inputs
+ (list elfutils
+ libbpf
+ libelf))
+ (propagated-inputs
+ ;; The following inputs are in the 'Requires' field of libscap.pc and
+ ;; libsinp.pc.
+ (list c-ares
+ grpc
+ jsoncpp
+ openssl
+ protobuf
+ uthash ;included in libscap headers
+ zlib
+ ;; These are in the 'Requires.private' field of libscap.pc and
+ ;; libsinp.pc. They are required because the headers are installed
+ ;; to a non-standard directory, and thus need to be found via the
+ ;; 'Cflags' field, which in turn mandates that both the pkg-config
+ ;; modules listed in the 'Requires' and 'Requires.private' be
+ ;; available.
+ curl
+ re2
+ tbb))
+ (home-page "https://github.com/falcosecurity/libs/")
+ (synopsis "libscap and lisbinsp Falco security libraries")
+ (description "The Falco security libraries include @code{libsinsp} and
+@code{libscap}. @code{libscap} manages the data capture process, while
+@code{libsinsp} is a system inspection library that enriches events from
+@code{libscap} with machine state. @code{libsinsp} also performs events
+filtering with rule evaluation through its internal rule engine. These
+libraries are used by the @command{sysdig} command-line utility.")
+ (license license:asl2.0)))
+
(define-public inputattach
(package
(name "inputattach")
@@ -9645,7 +9870,7 @@ of Linux application development.")
(define-public wireplumber
(package
(name "wireplumber")
- (version "0.4.17")
+ (version "0.5.3")
(source
(origin
(method git-fetch)
@@ -9655,7 +9880,7 @@ of Linux application development.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "00jzn0pxy2ws819yg4p8xxhngqai3labd1alaxb8zwzymr7m06my"))))
+ (base32 "1jdfk02f7yc5lhy4r3k7m7dqr0711lvlc0fd1hjhmi4j7yn4i5kd"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Dsystemd=disabled"
@@ -9719,14 +9944,14 @@ platforms, it is not limited to resource-constrained systems.")
(define-public kexec-tools
(package
(name "kexec-tools")
- (version "2.0.23")
+ (version "2.0.26")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/kernel"
"/kexec/kexec-tools-" version ".tar.xz"))
(sha256
(base32
- "06r44i91g1s9f7k5b9kmvb58j9vrqvysfh32pb70cnyrgmncsqxa"))))
+ "1kbh8l67rbz0d3k6x7g5vj5ahg6f7lwvxcj1br8mrk818436mqvz"))))
(build-system gnu-build-system)
(arguments
;; There are no automated tests.
@@ -9781,7 +10006,7 @@ persistent over reboots.")
(define-public libbpf
(package
(name "libbpf")
- (version "0.8.1")
+ (version "1.4.1")
(source
(origin
(method git-fetch)
@@ -9791,38 +10016,89 @@ persistent over reboots.")
(file-name (git-file-name name version))
(sha256
(base32
- "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm"))))
+ "1d0bx4bmn80nkdh0dqjfwq6j37is3qwl49cjvx4yxb4vrxq3x05x"))))
(build-system gnu-build-system)
- (native-inputs
- (list pkg-config))
- (propagated-inputs
- ;; In Requires.private of libbpf.pc.
- (list elfutils zlib))
(arguments
- `(#:tests? #f ; no tests
- #:make-flags
- (list
- (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "LIBDIR=$(PREFIX)/lib")
- (string-append "CC=" ,(cc-for-target)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'pre-build
- (lambda _
- (chdir "src"))))))
+ (list
+ #:tests? #f ;self-tests run in QEMU
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ (string-append "LIBDIR=$(PREFIX)/lib")
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'pre-build
+ (lambda _
+ (chdir "src")))
+ (add-after 'install 'install-linux-bpf-headers
+ ;; Workaround users such as 'dwarves' requiring btf_enum64
+ ;; definition from the kernel Linux >= 6 headers (see:
+ ;; https://github.com/acmel/dwarves/issues/49).
+ ;; TODO: Remove once our 'linux-libre-headers' package is
+ ;; upgraded to a >= 6 release.
+ (lambda _
+ (let ((linux-libre-headers #$(this-package-native-input
+ "linux-libre-headers")))
+ (for-each (lambda (f)
+ (install-file (string-append linux-libre-headers
+ "/include/" f)
+ (string-append #$output "/include/"
+ (dirname f))))
+ ;; This list contains btf.h and its transitive
+ ;; dependencies.
+ (list "asm/posix_types.h"
+ "asm/types.h"
+ "asm-generic/types.h"
+ "asm-generic/int-ll64.h"
+ "linux/btf.h"
+ "linux/posix_types.h"
+ "linux/stddef.h"
+ "linux/types.h"))))))))
+ (native-inputs (list linux-libre-headers-latest pkg-config))
+ (propagated-inputs (list elfutils zlib)) ;in Requires.private of libbpf.pc
(home-page "https://github.com/libbpf/libbpf")
(synopsis "BPF CO-RE (Compile Once – Run Everywhere)")
(description
"Libbpf supports building BPF CO-RE-enabled applications, which, in
contrast to BCC, do not require the Clang/LLVM runtime or linux kernel
headers.")
- (license `(,license:lgpl2.1 ,license:bsd-2))))
+ (license (list license:lgpl2.1 license:bsd-2))))
+
+(define-public libbpf-0.8
+ (package
+ (inherit libbpf)
+ (name "libbpf")
+ (version "0.8.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libbpf/libbpf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm"))))
+ (arguments
+ (list
+ #:tests? #f ;self-tests run in QEMU
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ (string-append "LIBDIR=$(PREFIX)/lib")
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'pre-build
+ (lambda _
+ (chdir "src"))))))
+ (native-inputs (list pkg-config))
+ (propagated-inputs (list elfutils zlib)))) ;in Requires.private of libbpf.pc
(define-public bcc
(package
(name "bcc")
- (version "0.24.0")
+ (version "0.30.0")
(source
(origin
(method git-fetch)
@@ -9832,63 +10108,54 @@ headers.")
(file-name (git-file-name name version))
(sha256
(base32
- "1i6xikkxf2nasfkqa91hjzdq0a88mgyzrvia4fi2i2v1d8pbmnp4"))))
+ "0b5la0yn6x6ll73drnrm5v5yibbrzkvl86hqivkrmnpgy8cqn0cy"))))
(build-system cmake-build-system)
(native-inputs
- (list bison flex))
+ (list bison
+ flex
+ (@ (gnu packages compression) zip)))
(inputs
- `(("clang-toolchain" ,clang-toolchain-9)
- ("libbpf" ,(package-source libbpf))
- ;; LibElf required but libelf does not contain
- ;; archives, only object files.
- ;; https://github.com/iovisor/bcc/issues/504
- ("elfutils" ,elfutils)
- ("luajit" ,luajit)
- ("python-wrapper" ,python-wrapper)))
- (arguments
- `(;; Tests all require root permissions and a "standard" file hierarchy.
- #:tests? #f
- #:configure-flags
- (let ((revision ,version))
- `(,(string-append "-DREVISION=" revision)))
- #:phases
- (modify-phases %standard-phases
- ;; FIXME: Use "-DCMAKE_USE_LIBBPF_PACKAGE=ON".
- (add-after 'unpack 'copy-libbpf
- (lambda* (#:key inputs #:allow-other-keys)
- (delete-file-recursively "src/cc/libbpf")
- (copy-recursively
- (assoc-ref inputs "libbpf") "src/cc/libbpf")))
- (add-after 'copy-libbpf 'substitute-libbc
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "src/python/bcc/libbcc.py"
- (("(libbcc\\.so.*)\\b" _ libbcc)
- (string-append
- (assoc-ref outputs "out") "/lib/" libbcc)))))
- (add-after 'install 'wrap-tools
- (lambda* (#:key outputs #:allow-other-keys)
- (use-modules (ice-9 textual-ports))
- (let* ((out (assoc-ref outputs "out"))
- (lib (string-append out "/lib"))
- (tools (string-append out "/share/bcc/tools"))
- (python-executable?
- (lambda (filename _)
- (call-with-input-file filename
- (lambda (port)
- (string-contains (get-line port)
- "/bin/python"))))))
- (for-each
- (lambda (python-executable)
- (format #t "Wrapping: ~A.~%" python-executable)
- (wrap-program python-executable
- `("GUIX_PYTHONPATH" ":" prefix
- (,(string-append lib
- "/python"
- ,(version-major+minor
- (package-version python))
- "/site-packages")))))
- (find-files tools python-executable?))
- #t))))))
+ (list bash-minimal ;for wrap-program
+ clang-15
+ elfutils
+ luajit
+ libbpf
+ python-wrapper))
+ (arguments
+ (list
+ ;; Tests all require root permissions and a "standard" file hierarchy.
+ #:tests? #f
+ #:configure-flags #~(list (string-append "-DREVISION=" #$version)
+ "-DCMAKE_USE_LIBBPF_PACKAGE=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'substitute-libbc
+ (lambda _
+ (substitute* "src/python/bcc/libbcc.py"
+ (("(libbcc\\.so.*)\\b" _ libbcc)
+ (string-append #$output "/lib/" libbcc)))))
+ (add-after 'install 'wrap-tools
+ (lambda _
+ (use-modules (ice-9 textual-ports))
+ (let* ((out #$output)
+ (lib (string-append out "/lib"))
+ (tools (string-append out "/share/bcc/tools"))
+ (python-executable?
+ (lambda (filename _)
+ (call-with-input-file filename
+ (lambda (port)
+ (string-contains (get-line port)
+ "/bin/python"))))))
+ (for-each (lambda (python-executable)
+ (format #t "Wrapping: ~A.~%" python-executable)
+ (wrap-program python-executable
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(string-append lib
+ "/python"
+ #$(version-major+minor
+ (package-version python))
+ "/site-packages")))))
+ (find-files tools python-executable?))))))))
(home-page "https://github.com/iovisor/bcc")
(synopsis "Tools for BPF on Linux")
(description
@@ -9940,30 +10207,37 @@ modification of BPF objects on the system.")
(define-public bpftrace
(package
(name "bpftrace")
- (version "0.18.1")
+ (version "0.21.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/iovisor/bpftrace")
+ (url "https://github.com/bpftrace/bpftrace")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0j8ba2j98d3j8lilgx3z2n162r26ryg7zw5ldwd9m36xnjp40347"))
- (patches (search-patches "bpftrace-disable-bfd-disasm.patch"))))
+ (base32 "06yg3w80kdq0i003w2gvn0czbh8z9d3rfgmglp37dkir7g3dc6iz"))))
(build-system cmake-build-system)
- (native-inputs
- (list bison flex))
- (inputs
- (list bcc clang-toolchain-9 elfutils libbpf cereal))
- (arguments
- `(#:tests? #f ;Tests require googletest sources.
- #:configure-flags
- '("-DBUILD_TESTING=OFF"
- ;; FIXME: libbfd misses some link dependencies, when fixed, remove
- ;; the associated patch.
- "-DHAVE_BFD_DISASM=OFF")))
- (home-page "https://github.com/iovisor/bpftrace")
+ (arguments (list #:configure-flags #~(list "-DBUILD_TESTING=ON")
+ ;; Only run the unit tests suite, as the other ones
+ ;; (runtime_tests, tools-parsing-test) require to run as
+ ;; 'root'.
+ #:test-target "bpftrace_test"
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda _
+ (with-directory-excursion "tests"
+ (substitute* (find-files ".")
+ (("/bin/sh")
+ (which "sh")))
+ (substitute* '("child.cpp"
+ "runtime/call"
+ "procmon.cpp")
+ (("/bin/ls")
+ (which "ls")))))))))
+ (native-inputs (list bison dwarves flex googletest xxd))
+ (inputs (list bcc clang-15 elfutils libbpf libiberty cereal))
+ (home-page "https://github.com/bpftrace/bpftrace")
(synopsis "High-level tracing language for Linux eBPF")
(description
"bpftrace is a high-level tracing language for Linux enhanced Berkeley
@@ -10140,7 +10414,7 @@ provides user-space tools for creating EROFS file systems.")
;; line lets sysconfdir correctly pick up DESTDIR.
(substitute* "configure.ac"
(("^test .* sysconfdir=/etc\n$") ""))))
- (add-after 'wrap 'wrap-rasdaemon
+ (add-after 'install 'wrap-rasdaemon
(lambda* (#:key inputs #:allow-other-keys)
(let ((path (map dirname
(list (search-input-file inputs "/sbin/dmidecode")
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 3c9de7fc77..64ffd93e60 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
;;; Copyright © 2019-2024 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
-;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
+;;; Copyright © 2020, 2024 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021, 2022 Adam Kandur <rndd@tuta.io>
@@ -64,6 +64,8 @@
;;; Common Lisp compilers and tooling go to lisp.scm.
;;; Common Lisp applications should go to the most appropriate file,
;;; e.g. StumpWM is in wm.scm.
+;;; Common Lisp libraries related to code testing facilities go
+;;; to lisp-check.scm.
(define-module (gnu packages lisp-xyz)
#:use-module (gnu packages)
@@ -135,3157 +137,2451 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-19))
-(define-public sbcl-alexandria-plus
- (let ((commit "adafb09838a84895bedb119f8253b89b6a04a2c5")
- (revision "0"))
+(define-public sbcl-3b-bmfont
+ (let ((commit "332c2262705f161627fc18add0310451a42799af")
+ (revision "3"))
(package
- (name "sbcl-alexandria-plus")
- ;; Version is stated in the ASD file.
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-3b-bmfont")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Symbolics/alexandria-plus")
+ (url "https://github.com/3b/3b-bmfont/")
(commit commit)))
- (file-name (git-file-name "cl-alexandria-plus" version))
+ (file-name (git-file-name "cl-3b-bmfont" version))
(sha256
- (base32 "1w9r19610h599303gqlx2x5n8mmdynss2gyl7xilg5h6v8z3hkfl"))))
+ (base32 "11wnqa1wx9vji6cmxl5m5qnf12mqc6n7d5g8038r1wayq88bxia6"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-systems '("alexandria+")))
- (native-inputs
- (list sbcl-parachute))
+ `(#:asd-systems '("3b-bmfont"
+ "3b-bmfont/common"
+ "3b-bmfont/json"
+ "3b-bmfont/text"
+ "3b-bmfont/xml")))
(inputs
- (list sbcl-alexandria))
- (home-page "https://symbolics.github.io/alexandria-plus/")
- (synopsis "Conservative set of extensions to Alexandria utilities")
+ (list sbcl-alexandria
+ sbcl-cxml
+ sbcl-flexi-streams
+ sbcl-jsown
+ sbcl-parse-number
+ sbcl-split-sequence))
+ (home-page "https://github.com/3b/3b-bmfont/")
+ (synopsis "Read/write bmfont metadata files")
(description
- "@code{cl-alexandria-plus} is a conservative set of extensions to
-@code{cl-alexandria} utilities.")
- (license license:ms-pl))))
+ "This is a Common Lisp library which provides functionality to
+read/write Bit Map Font (BMF) into text, JSON and XML.")
+ (license license:expat))))
-(define-public cl-alexandria-plus
- (sbcl-package->cl-source-package sbcl-alexandria-plus))
+(define-public ecl-3b-bmfont
+ (sbcl-package->ecl-package sbcl-3b-bmfont))
-(define-public ecl-alexandria-plus
- (sbcl-package->ecl-package sbcl-alexandria-plus))
+(define-public cl-3b-bmfont
+ (sbcl-package->cl-source-package sbcl-3b-bmfont))
-(define-public sbcl-alexandria
- (let ((commit "009b7e532071d9777bdbd63b82d776555da95916")
- (revision "0"))
+(define sbcl-3b-bmfont/shinmera
+ (let ((commit "58e529d24b7799d56b4b3f9c8a953b585d42c7d2")
+ (revision "1"))
+ (package (inherit sbcl-3b-bmfont)
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/3b-bmfont/")
+ (commit commit)))
+ (file-name (git-file-name "3b-bmfont2" version))
+ (sha256
+ (base32 "17zby669b64rhxhk2szamzdgvispimh6ici05xa6x2vz4rvk71jq")))))))
+
+(define-public sbcl-3bmd
+ (let ((commit "e68b2d442f29b4534c1c8e2f2cdf7583643a2fc5")
+ (revision "4"))
(package
- (name "sbcl-alexandria")
- (version (git-version "1.4" revision commit))
+ (name "sbcl-3bmd")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/alexandria/alexandria.git")
+ (url "https://github.com/3b/3bmd")
(commit commit)))
- (file-name (git-file-name "cl-alexandria" version))
(sha256
- (base32 "0pdj779j3nwzn8f1661vf00rrjrbks1xgiq0rvwjw6qyxsfqfnl9"))))
+ (base32 "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"))
+ (file-name (git-file-name "cl-3bmd" version))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems
+ '("3bmd"
+ "3bmd-ext-definition-lists"
+ "3bmd-ext-math"
+ "3bmd-ext-tables"
+ "3bmd-ext-wiki-links"
+ "3bmd-youtube"
+ "3bmd-ext-code-blocks")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-python3-path
+ (lambda _
+ (substitute* "code-blocks.lisp"
+ (("python3") (which "python3"))))))))
(native-inputs
- (list sbcl-rt))
- (synopsis "Collection of portable utilities for Common Lisp")
+ (list sbcl-fiasco))
+ (inputs
+ (list python
+ python-pygments
+ sbcl-alexandria
+ sbcl-colorize
+ sbcl-split-sequence
+ sbcl-esrap))
+ (home-page "https://github.com/3b/3bmd")
+ (synopsis "Markdown processor in Command Lisp using esrap parser")
(description
- "Alexandria is a collection of portable utilities. It does not contain
-conceptual extensions to Common Lisp. It is conservative in scope, and
-portable between implementations.")
- (home-page "https://common-lisp.net/project/alexandria/")
- (license license:public-domain))))
-
-(define-public cl-alexandria
- (sbcl-package->cl-source-package sbcl-alexandria))
-
-(define-public ecl-alexandria
- (sbcl-package->ecl-package sbcl-alexandria))
-
-(define-public sbcl-reader
- (package
- (name "sbcl-reader")
- (version "0.10.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/digikar99/reader")
- (commit (string-append "v" version))))
- (sha256
- (base32 "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"))
- (file-name (git-file-name "cl-reader" version))))
- (build-system asdf-build-system/sbcl)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "reader.lisp"
- (("echo")
- (search-input-file inputs "/bin/echo"))))))))
- (inputs
- (list coreutils ; Needed for call to echo.
- sbcl-alexandria
- sbcl-fiveam ; Tests are written directly in the source files.
- sbcl-hash-set
- sbcl-iterate
- sbcl-split-sequence
- sbcl-trivial-types))
- (synopsis "Reader macros for common objects and data structures")
- (description "This package provides a utility library intended
-at providing configurable reader macros for common tasks such as
-accessors, hash-tables, sets, uiop:run-program, arrays and a few others.")
- (home-page "https://github.com/digikar99/reader/")
- (license license:expat)))
+ "This is a Common Lisp Markdown to HTML converter, using @command{esrap}
+for parsing, and grammar based on @command{peg-markdown}.")
+ (license license:expat))))
-(define-public cl-reader
- (sbcl-package->cl-source-package sbcl-reader))
+(define-public cl-3bmd
+ (sbcl-package->cl-source-package sbcl-3bmd))
-(define-public ecl-reader
- (package
- (inherit (sbcl-package->ecl-package sbcl-reader))
- (arguments
- ;; TODO: Tests fail on call to coreutils echo for ecl.
- `(#:tests? #f))))
+(define-public ecl-3bmd
+ (sbcl-package->ecl-package sbcl-3bmd))
-(define-public sbcl-st-json
- (let ((commit "4a0025bcc5b6921454822f1b9f38f697b4eeaf43")
- (revision "0"))
+(define-public sbcl-3bz
+ (let ((commit "569614c40408f3aefc77ba233e0e4bd66d3850ad")
+ (revision "1"))
(package
- (name "sbcl-st-json")
+ (name "sbcl-3bz")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marijnh/ST-JSON")
+ (url "https://github.com/3b/3bz")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "06qrhr5iw73k96lai2x9w52l6gnmlxy7fsr0r35gz6nz1f71x7gx"))))
+ (base32 "0kvvlvf50jhhw1s510f3clpr1a68632bq6d698yxcrx722igcrg4"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://marijnhaverbeke.nl/st-json/")
- (synopsis "JSON for Common Lisp")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cffi
+ sbcl-mmap
+ sbcl-nibbles
+ sbcl-trivial-features))
+ (home-page "https://github.com/3b/3bz")
+ (synopsis "Deflate decompression for Common Lisp")
(description
- "ST-JSON (@code{ST} because it originated at Streamtech) is a Common Lisp
- library for encoding and decoding JSON values (as specified on json.org).
-
-This library does mostly the same thing as CL-JSON, but is simpler and more
-precise about types (distinguishing boolean false, the empty array, and the
-empty object).")
- (license license:zlib))))
+ "3bz is an implementation of Deflate decompression (RFC 1951) optionally
+with zlib (RFC 1950) or gzip (RFC 1952) wrappers, with support for reading from
+foreign pointers (for use with mmap and similar, etc), and from CL octet
+vectors and streams.")
+ (license license:expat))))
-(define-public cl-st-json
- (sbcl-package->cl-source-package sbcl-st-json))
+(define-public cl-3bz
+ (sbcl-package->cl-source-package sbcl-3bz))
-(define-public ecl-st-json
- (sbcl-package->ecl-package sbcl-st-json))
+(define-public ecl-3bz
+ (sbcl-package->ecl-package sbcl-3bz))
-(define-public sbcl-stdutils
- (let ((commit "4a4e5a4036b815318282da5dee2a22825369137b")
+(define-public sbcl-3d-math
+ (let ((commit "3831b1706d225def95a7301ef48b393b563f0114")
(revision "0"))
(package
- (name "sbcl-stdutils")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-3d-math")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eslick/cl-stdutils")
+ (url "https://github.com/Shinmera/3d-math")
(commit commit)))
- (file-name (git-file-name "cl-stdutils" version))
+ (file-name (git-file-name "cl-3d-math" version))
(sha256
- (base32 "16vxxphqdq8264x0aanm36x9r6d3ci1gjf4vf46mwl59gcff4wcj"))))
+ (base32 "052vzx5j7bag9dxvl0j0wrm244js1djldyn31rwxgkq7965rmi5r"))))
(build-system asdf-build-system/sbcl)
- (arguments '(#:tests? #f)) ; There are no tests.
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-cl-fad
- sbcl-cl-ppcre))
- (home-page "https://github.com/eslick/cl-stdutils/")
- (synopsis "Grab bag of Common Lisp utility functions")
+ (list sbcl-documentation-utils
+ sbcl-type-templates))
+ (home-page "https://shinmera.github.io/3d-math/")
+ (synopsis "Linear algebra for 2D and 3D computations")
(description
- "This package provides a grab bag of miscellaneous Common Lisp
-utilities.")
- (license license:bsd-3))))
+ "The @code{3d-math} library implements types, operators, and algorithms
+commonly used in math for 2D and 3D graphics. It supersedes and combines the
+prior libraries @code{3d-vectors}, @code{3d-matrices}, @code{3d-quaternions},
+and @code{3d-transforms}. The new API is largely but not entirely backwards
+compatible, and adds new functionality.")
+ (license license:zlib))))
-(define-public cl-stdutils
- (sbcl-package->cl-source-package sbcl-stdutils))
+(define-public cl-3d-math
+ (sbcl-package->cl-source-package sbcl-3d-math))
-(define-public ecl-stdutils
- (sbcl-package->ecl-package sbcl-stdutils))
+(define-public ecl-3d-math
+ (sbcl-package->ecl-package sbcl-3d-math))
-(define-public sbcl-langutils
- (let ((commit "38beec7a82eeb35b0bfb0824a41d13ed94fc648b")
- (revision "0"))
+(define-public sbcl-3d-matrices
+ (let ((commit "b4f5a58299f8437fad2d77f0879c374e3430f4b5")
+ (revision "2"))
(package
- (name "sbcl-langutils")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-3d-matrices")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eslick/cl-langutils")
+ (url "https://github.com/Shinmera/3d-matrices")
(commit commit)))
- (file-name (git-file-name "cl-langutils" version))
+ (file-name (git-file-name "cl-3d-matrices" version))
(sha256
- (base32 "15y9x5wkg3fqndc04w2sc650fnwimxp4gjgpv9xvvdm9x4v433x6"))))
+ (base32 "1s8b4zlmqwyplghs73riz1khf0c5sk64w6b12jd599091d5nr6sr"))))
(build-system asdf-build-system/sbcl)
- (arguments '(#:tests? #f)) ; There are no tests.
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-stdutils
- sbcl-s-xml-rpc))
- (home-page "https://langutils.common-lisp.dev/")
- (synopsis "Common Lisp natural language processing toolkit")
+ (list sbcl-3d-vectors sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/3d-matrices/")
+ (synopsis "Utility library implementing 2x2, 3x3, 4x4 and NxM matrices")
(description
- "This package provides a hierarchy of major functions and auxiliary
-functions related to the structured analysis and processing of open
-text.")
- (license license:bsd-3))))
-
-(define-public cl-langutils
- (sbcl-package->cl-source-package sbcl-langutils))
-
-(define-public ecl-langutils
- (sbcl-package->ecl-package sbcl-langutils))
-
-(define-public sbcl-hash-set
- (let ((commit "6feb20de457f14e24a83815be1097aa02cca5986")
- (revision "0"))
- (package
- (name "sbcl-hash-set")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/samebchase/hash-set")
- (commit commit)))
- (file-name (git-file-name "cl-hash-set" version))
- (sha256
- (base32 "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (inputs (list sbcl-alexandria))
- (home-page "https://github.com/samebchase/hash-set/")
- (synopsis "Implementation of a hash-set")
- (description "This package provides an implementation of the
-hash-set data structure. It has constant time lookup, insertion and
-deletion.")
- (license license:unlicense))))
+ "@code{3D-MATRICES} is a library implementing common matrix operations,
+mainly intended as the counterpiece to @code{3d-vectors} and thus being aimed at
+operations in 3D space.")
+ (license license:zlib))))
-(define-public cl-hash-set
- (sbcl-package->cl-source-package sbcl-hash-set))
+(define-public cl-3d-matrices
+ (sbcl-package->cl-source-package sbcl-3d-matrices))
-(define-public ecl-hash-set
- (sbcl-package->ecl-package sbcl-hash-set))
+(define-public ecl-3d-matrices
+ (sbcl-package->ecl-package sbcl-3d-matrices))
-(define-public sbcl-duologue
- (let ((commit "ea1ada244a81da65f85b548823c9a6d7c9c145e1")
+(define-public sbcl-3d-quaternions
+ (let ((commit "b79c15cca8d9c409216a6cee8ec9e182dcdec9e2")
(revision "0"))
(package
- (name "sbcl-duologue")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-3d-quaternions")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/duologue")
+ (url "https://github.com/Shinmera/3d-quaternions")
(commit commit)))
- (file-name (git-file-name "cl-duologue" version))
+ (file-name (git-file-name "cl-3d-quaternions" version))
(sha256
- (base32 "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2"))))
+ (base32 "1mrq6yhb90mhvxdkg3fx58ci5yj5xlixbbzf1q6p76wyq40qjv76"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-stefil))
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-chronicity
- sbcl-cl-ansi-text
- sbcl-cl-fad
- sbcl-clavier
- sbcl-drakma))
- (home-page "https://github.com/mmontone/duologue/")
- (synopsis "High level user interaction library")
+ (list sbcl-3d-matrices sbcl-3d-vectors sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/3d-quaternions/")
+ (synopsis "Quaternion and dual-quaternion functionality in Common Lisp")
(description
- "Duologue is high-level interaction library for Common Lisp. It features
-coloured printing via @code{cl-ansi-text} and readline completion.")
- (license (list license:expat
- ;; https://github.com/mmontone/duologue/issues/9
- license:gpl3+)))))
-
-(define-public cl-duologue
- (sbcl-package->cl-source-package sbcl-duologue))
-
-(define-public ecl-duologue
- (sbcl-package->ecl-package sbcl-duologue))
-
-(define-public sbcl-alea
- (package
- (name "sbcl-alea")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/eXodiquas/alea")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-alea" version))
- (sha256
- (base32 "0nd9fdjli22ygfw3c8k9nh7d36c92866hics5aij6x7ly1q781gz"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (synopsis "Dice rolling library")
- (description
- "This package provides a Common Lisp library for dice rolling and working
-with dice-roll statistics.")
- (home-page "https://github.com/eXodiquas/alea")
- (license license:expat)))
+ "This is a library for quaternions. It contains most of the quaternion
+operations one would usually expect out of such a library and offers them both
+in non-modifying and modifying versions where applicable. It also tries to be
+efficient where plausible. Each quaternion is made up of @code{float}s, which
+by default are @code{single-float}s, as they do not require value boxing on
+most modern systems and compilers.")
+ (license license:zlib))))
-(define-public cl-alea
- (sbcl-package->cl-source-package sbcl-alea))
+(define-public cl-3d-quaternions
+ (sbcl-package->cl-source-package sbcl-3d-quaternions))
-(define-public ecl-alea
- (sbcl-package->ecl-package sbcl-alea))
+;; TODO: Build failure:
+;; https://github.com/Shinmera/3d-quaternions/issues/2
+;;
+;; (define-public ecl-3d-quaternions
+;; (sbcl-package->ecl-package sbcl-3d-quaternions))
-(define-public sbcl-bubble-operator-upwards
- (let ((commit "846275a318b960de81b62caecb1e31930f70aef6")
+(define-public sbcl-3d-spaces
+ (let ((commit "a93f4915affcf65617366297ad8bd2ec77bae702")
(revision "0"))
(package
- (name "sbcl-bubble-operator-upwards")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-3d-spaces")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Hexstream/bubble-operator-upwards")
+ (url "https://github.com/Shirakumo/3d-spaces")
(commit commit)))
- (file-name (git-file-name "cl-bubble-operator-upwards" version))
+ (file-name (git-file-name "cl-3d-spaces" version))
(sha256
- (base32 "0ybsy29ms3yrxgr7f2146lr6z4vm070dvdyzvwwxjh4dgm9na7bi"))))
+ (base32 "1m5cg5zy1731dcgkm1p4m53z1zsp387xligxh32pdrnrhc2lzhmf"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
- (home-page "https://www.hexstreamsoft.com/libraries/bubble-operator-upwards/")
- (synopsis "Function that bubbles an operator upwards in a form")
- (description
- "@code{bubble-operator-upwards} is a function that bubbles an operator
-upwards in a form, demultiplexing all alternative branches by way of
-cartesian product.")
- (license license:unlicense))))
-
-(define-public cl-bubble-operator-upwards
- (sbcl-package->cl-source-package sbcl-bubble-operator-upwards))
-
-(define-public ecl-bubble-operator-upwards
- (sbcl-package->ecl-package sbcl-bubble-operator-upwards))
-
-(define-public sbcl-map-bind
- (let ((commit "532d55d93540c632e22b2cd264b5daa5f9d3d900")
- (revision "0"))
- (package
- (name "sbcl-map-bind")
- (version (git-version "1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/map-bind")
- (commit commit)))
- (file-name (git-file-name "cl-map-bind" version))
- (sha256
- (base32 "0hfy65xyqc4zqfncn11pp3hjjkdz7m91cynnv91s3lgcl3kffva0"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (home-page "https://www.hexstreamsoft.com/libraries/map-bind/")
- (synopsis "Macro favouring positional references over naming")
- (description
- "@code{MAP-BIND} is a macro that allows visual grouping of variables with
-their corresponding values in calls to mapping operators when using an
-inline @code{LAMBDA}.")
- (license license:unlicense))))
-
-(define-public cl-map-bind
- (sbcl-package->cl-source-package sbcl-map-bind))
-
-(define-public ecl-cl-map-bind
- (sbcl-package->ecl-package sbcl-map-bind))
-
-(define-public sbcl-positional-lambda
- (let ((commit "a43a7bb4ef6faa277e6a7440ec9839711c4b9d28")
- (revision "0"))
- (package
- (name "sbcl-positional-lambda")
- (version (git-version "2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/positional-lambda")
- (commit commit)))
- (file-name (git-file-name "cl-positional-lambda" version))
- (sha256
- (base32 "1l27mw5ciqz7rnjq1lwslgk220i8iqcr39rs8b7hxkp1yqmah5zq"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
(inputs
- (list sbcl-map-bind))
- (home-page "https://www.hexstreamsoft.com/libraries/positional-lambda/")
- (synopsis "Macro favouring positional references over naming")
+ (list sbcl-3d-math
+ sbcl-documentation-utils
+ sbcl-for
+ sbcl-trivial-extensible-sequences))
+ (home-page "https://shirakumo.github.io/3d-spaces/")
+ (synopsis "Implementations of various spatial query structures")
(description
- "This package provides a concise, intuitive and flexible macro for
-trivial lambdas that eschews explicit naming of parameter variables in favor
-of positional references, with support for a used or ignored &rest parameter
-and automatic declaration of ignored parameters when logical @code{gaps}
-are left in the positional references. Further convenience features
-are provided.")
- (license license:unlicense))))
-
-(define-public cl-positional-lambda
- (sbcl-package->cl-source-package sbcl-positional-lambda))
-
-(define-public ecl-cl-positional-lambda
- (sbcl-package->ecl-package sbcl-positional-lambda))
-
-(define-public sbcl-bodge-utilities
- (let ((commit "6304bac4abe06d53579e2c0fc4437d14ff077d9f")
- (revision "1"))
- (package
- (name "sbcl-bodge-utilities")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/borodust/bodge-utilities")
- (commit commit)))
- (file-name (git-file-name "bodge-utilities" version))
- (sha256
- (base32 "1z1blj05q71vzh323qwyn9p3xs7v0mq2yhwfyzza5libp37wqm3c"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-claw
- sbcl-dissect
- sbcl-local-time
- sbcl-log4cl
- sbcl-split-sequence
- sbcl-static-vectors
- sbcl-trivial-gray-streams))
- (home-page "https://github.com/borodust/bodge-utilities")
- (synopsis "Common Lisp utilities library for CL-BODGE")
- (description
- "This Common Lisp library provides utilities for the @emph{Bodge} library
-collection.")
- (license license:expat))))
+ "The 3D-Spaces library implements a number of spatial query data
+structures; structures that can answer spatial range queries for optimized
+lookup, particularly suited for games.")
+ (license license:zlib))))
-(define-public ecl-bodge-utilities
- (sbcl-package->ecl-package sbcl-bodge-utilities))
+(define-public cl-3d-spaces
+ (sbcl-package->cl-source-package sbcl-3d-spaces))
-(define-public cl-bodge-utilities
- (sbcl-package->cl-source-package sbcl-bodge-utilities))
+(define-public ecl-3d-spaces
+ (sbcl-package->ecl-package sbcl-3d-spaces))
-(define-public sbcl-meta
- (let ((commit "74faea662139fbbfb9c99341aaed989f5b0e9da3")
+(define-public sbcl-3d-transforms
+ (let ((commit "1d44509387d0747cd0351e95a533eca609058632")
(revision "0"))
(package
- (name "sbcl-meta")
+ (name "sbcl-3d-transforms")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/frideau/meta")
+ (url "https://github.com/Shinmera/3d-transforms")
(commit commit)))
- (file-name (git-file-name "cl-meta" version))
+ (file-name (git-file-name "cl-3d-transforms" version))
(sha256
- (base32 "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy"))))
+ (base32 "03pmv7dh1j6kl16ch6lnvxzjrld4jbr3jx8slzkiipgzdxg74pcx"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-named-readtables))
- (home-page "https://gitlab.common-lisp.net/frideau/meta")
- (synopsis "Recursive-descent parser DSL for Common Lisp")
+ (list sbcl-3d-matrices
+ sbcl-3d-quaternions
+ sbcl-3d-vectors
+ sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/3d-transforms/")
+ (synopsis
+ "Common structure to encapsulate spatial transformations in Common Lisp")
(description
- "This package provides a recursive-descent parser DSL for Common Lisp.
-It's intended as a simpler alternative to parser generators.")
- (license license:bsd-2))))
+ "This is a library that uses the other 3d-* math libraries to present an
+encapsulation for a spatial transformation. It offers convenience functions for
+operating on such transformations and for converting between them and the
+alternative 4x4 matrix representation.")
+ (license license:zlib))))
-(define-public cl-meta
- (sbcl-package->cl-source-package sbcl-meta))
+(define-public cl-3d-transforms
+ (sbcl-package->cl-source-package sbcl-3d-transforms))
-(define-public ecl-meta
- (sbcl-package->ecl-package sbcl-meta))
+;; TODO: Build failure:
+;; https://github.com/Shinmera/3d-quaternions/issues/2
+;;
+;; (define-public ecl-3d-transforms
+;; (sbcl-package->ecl-package sbcl-3d-transforms))
-(define-public sbcl-cl-smtp
- (let ((commit "ed47d326fad867ee11323fa3a0f307b5d40e8f2b")
- (revision "0"))
+(define-public sbcl-3d-vectors
+ (let ((commit "257969402864ac3859d77b981abf0aa5373c4e78")
+ (revision "2"))
(package
- (name "sbcl-cl-smtp")
- (version (git-version "20191031.1" revision commit))
+ (name "sbcl-3d-vectors")
+ (version (git-version "3.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-smtp/cl-smtp")
+ (url "https://github.com/Shinmera/3d-vectors")
(commit commit)))
- (file-name (git-file-name "cl-smtp" version))
+ (file-name (git-file-name "cl-3d-vectors" version))
(sha256
- (base32 "0vjjfapcrdc5671jz2d24h8zvpz7skq1x6pi9fvw6ls5sgms6fr0"))))
+ (base32 "0vmf7nycc49ydcy0dfs25cgs655kwjc6jcjvpwxw61jq4gl2fh7x"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-cl+ssl
- sbcl-cl-base64
- sbcl-flexi-streams
- sbcl-trivial-gray-streams
- sbcl-usocket))
- (home-page "https://gitlab.common-lisp.net/cl-smtp/cl-smtp")
- (synopsis "Simple Common Lisp SMTP client")
- (description "This package provides a client for SMTP.")
- (license license:llgpl))))
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/3d-vectors/")
+ (synopsis "Utility library implementing 2D, 3D, and 4D vectors")
+ (description
+ "@code{3D-VECTORS} is a library for vector math in 3D space. It contains
+most of the vector operations one would usually expect out of such a library and
+offers them both in non-modifying and modifying versions where applicable.")
+ (license license:zlib))))
-(define-public cl-smtp
- (sbcl-package->cl-source-package sbcl-cl-smtp))
+(define-public cl-3d-vectors
+ (sbcl-package->cl-source-package sbcl-3d-vectors))
-(define-public ecl-cl-smtp
- (sbcl-package->ecl-package sbcl-cl-smtp))
+(define-public ecl-3d-vectors
+ (sbcl-package->ecl-package sbcl-3d-vectors))
-(define-public sbcl-clavier
- (let ((commit "9b1424eaad131e114a45b400784079124b5e2321")
- (revision "1"))
+(define-public sbcl-40ants-doc
+ (let ((commit "7725ff67a380e9ebfc6155e14d91e650f256711b")
+ (revision "0"))
(package
- (name "sbcl-clavier")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-40ants-doc")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/clavier")
+ (url "https://github.com/40ants/doc")
(commit commit)))
- (file-name (git-file-name "cl-clavier" version))
(sha256
- (base32 "1gjd0rhxs2x7gn3fw1hnxivmm4ca4f1wxlg0fqv8fdfabgzsvl5y"))))
+ (base32 "1v6gnhrk02vsixmprzk4wvvj7vh11vp5waxyih0qz2ih8d38r5pg"))
+ (file-name (git-file-name "cl-40ants-doc" version))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-stefil))
+ (arguments
+ ;; TODO: Add remaining dependencies of 40ants-doc-full and
+ ;; 40ants-doc-test missing from Guix.
+ '(#:asd-systems '("40ants-doc"
+ ;;"40ants-doc-full"
+ )
+ #:tests? #f))
+ ;;(native-inputs
+ ;; (list sbcl-rove))
(inputs
- (list sbcl-alexandria
- sbcl-chronicity
- sbcl-cl-fad
- sbcl-cl-ppcre
- sbcl-closer-mop))
- (home-page "https://github.com/mmontone/clavier/")
- (synopsis "General purpose validation library")
- (description "Clavier is a general purpose validation library for
-Common Lisp.")
- (license license:expat))))
+ (list sbcl-named-readtables
+ sbcl-pythonic-string-reader
+ ;; For 40ants-doc-full:
+ ;;sbcl-3bmd
+ ;;sbcl-alexandria
+ ;;sbcl-babel
+ ;;sbcl-cl-cookie
+ ;;sbcl-cl-fad
+ ;;sbcl-cl-ppcre
+ ;;sbcl-common-doc ; Missing from Guix
+ ;;sbcl-common-html ; Missing from Guix
+ ;;sbcl-commondoc-markdown ; Missing from Guix
+ ;;sbcl-dexador
+ ;;sbcl-docs-builder ; Missing from Guix
+ ;;sbcl-fare-utils
+ ;;sbcl-jonathan
+ ;;sbcl-lass
+ ;;sbcl-local-time
+ ;;sbcl-log4cl
+ ;;sbcl-slime-swank
+ ;;sbcl-slynk
+ ;;sbcl-spinneret
+ ;;sbcl-stem ; Missing from Guix; also, license is unconfirmed
+ ;;sbcl-str
+ ;;sbcl-tmpdir ; Missing from Guix
+ ;;sbcl-trivial-extract ; Missing from Guix
+ ;;sbcl-xml-emitter
+ ))
+ (home-page "https://40ants.com/doc/")
+ (synopsis "Exploratory programming environment and documentation generator")
+ (description
+ "@code{40ants-doc} provides a rudimentary explorable programming
+environment. The narrative primarily lives in so-called sections that mix
+Markdown docstrings with references to functions, variables, etc., all of
+which should probably have their own docstrings.
-(define-public cl-clavier
- (sbcl-package->cl-source-package sbcl-clavier))
+The primary focus is on making code easily explorable by using SLIME's
+@kbd{M-.} (@code{slime-edit-definition}). Generating documentation in
+Markdown or HTML format from sections and all the referenced items is also
+implemented.
-(define-public ecl-clavier
- (sbcl-package->ecl-package sbcl-clavier))
+With the simplistic tools provided, one may obtain results similar to literate
+programming, but documentation is generated from code, not the other way
+around, and there is no support for chunking. Code comes first, code must
+look pretty, documentation is code.
-(define-public sbcl-cl-inotify
- (let ((commit "66f29e01ec28355ebba8292411b4de90eebd76a3")
- (revision "0"))
- (package
- (name "sbcl-cl-inotify")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Ferada/cl-inotify")
- (commit commit)))
- (file-name (git-file-name "cl-inotify" version))
- (sha256
- (base32 "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (inputs
- (list libfixposix
- sbcl-binary-types
- sbcl-cffi
- sbcl-osicat
- sbcl-trivial-utf-8))
- (synopsis "Common Lisp interface to the Linux inotify API")
- (description
- "@code{cl-inotify} uses @code{cl-cffi} to provide a Common Lisp
-interface to the Linux inotify API.")
- (home-page "https://github.com/Ferada/cl-inotify/")
- (license license:bsd-2))))
+@code{40ants-doc} is a fork of MGL-PAX with fewer dependencies (only
+@code{named-readtables} and @code{pythonic-string-reader}) for the core
+system, and additional features in the full system.")
+ (license license:expat))))
-(define-public cl-inotify
- (sbcl-package->cl-source-package sbcl-cl-inotify))
+(define-public cl-40ants-doc
+ (sbcl-package->cl-source-package sbcl-40ants-doc))
-(define-public ecl-cl-inotify
- (sbcl-package->ecl-package sbcl-cl-inotify))
+(define-public ecl-40ants-doc
+ (sbcl-package->ecl-package sbcl-40ants-doc))
-(define-public sbcl-file-notify
- (let ((commit "f12dc2f2aae5fee13355cd93a8cae0c4c412b76d")
- (revision "0"))
+(define-public sbcl-abstract-classes
+ (let ((commit "7fa74f1e057f9ba7c1ffecff14f049f979e45267")
+ (revision "1"))
(package
- (name "sbcl-file-notify")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-abstract-classes")
+ (version (git-version "1.7.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/file-notify")
+ (url "https://bitbucket.org/eeeickythump/cl-abstract-classes")
(commit commit)))
- (file-name (git-file-name "cl-file-notify" version))
+ (file-name (git-file-name "cl-abstract-classes" version))
(sha256
- (base32 "0788d98rqm1krl8nbfh8qshvyf6g336i9bqrdhkx06cfvbh0wcny"))))
+ (base32 "06lby4i6xbbgs7kgb0f3fqybvyskyg6djhrf967lnysv7hn3zpg9"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cffi
- sbcl-documentation-utils
- sbcl-trivial-features))
- (home-page "https://github.com/Shinmera/file-notify")
- (synopsis "Get notifications for file accesses and changes")
+ `(("closer-mop" ,sbcl-closer-mop)))
+ (arguments
+ `(#:asd-systems '("abstract-classes" "singleton-classes")))
+ (home-page "https://bitbucket.org/eeeickythump/cl-abstract-classes")
+ (synopsis "Abstract, final, and singleton metaclasses for CLOS")
(description
- "File-Notify is a Common Lisp library for getting notifications for file
-accesses and changes.")
- (license license:zlib))))
+ "This package provides Common Lisp extension to the MOP to allow
+abstract, final and singleton classes.")
+ (license license:public-domain))))
-(define-public cl-file-notify
- (sbcl-package->cl-source-package sbcl-file-notify))
+(define-public ecl-abstract-classes
+ (sbcl-package->ecl-package sbcl-abstract-classes))
-(define-public ecl-file-notify
- (sbcl-package->ecl-package sbcl-file-notify))
+(define-public cl-abstract-classes
+ (sbcl-package->cl-source-package sbcl-abstract-classes))
-(define-public sbcl-file-select
- (let ((commit "ef25f6d7c78ed9e0b62119979af8c4b5b0f8c774")
+(define-public sbcl-access
+ (let ((commit "a4f87fc1007f5c9a0a2abfddc1c23a77e87096f8")
(revision "1"))
(package
- (name "sbcl-file-select")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-access")
+ (version (git-version "1.6.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/file-select")
+ (url "https://github.com/AccelerationNet/access")
(commit commit)))
- (file-name (git-file-name "file-select" version))
+ (file-name (git-file-name "cl-access" version))
(sha256
- (base32 "1qh32ymljw5c98zzbvjfq6jzwlzs4qxi8gh4gw8pixir6y1inxaa"))))
+ (base32 "0zdjqhb9rvnlq6nzmsp7372gi91k1rq9bz510m6hcki7g3r01iv5"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-lisp-unit2))
(inputs
- (list sbcl-cffi
- sbcl-documentation-utils
- sbcl-float-features))
- (home-page "https://shinmera.github.io/file-select/")
- (synopsis "Invoke the native file selection dialogs to open or save files")
+ (list sbcl-alexandria
+ sbcl-cl-ppcre
+ sbcl-closer-mop
+ sbcl-iterate))
+ (synopsis
+ "Common lisp library to unify access to dictionary-like structures")
(description
- "This library allows you to open native file dialogs to open and save
-files. This is useful if you have an application that's primarily text based
-and would like a more convenient file selection utility, or if you are working
-with a UI toolkit that does not offer a way to access the native file dialogs
-directly.")
- (license license:zlib))))
+ "This is a Common lisp library to unify access to the most common
+dictionary-like data structures.")
+ (home-page "https://github.com/AccelerationNet/access")
+ (license license:bsd-3))))
-(define-public cl-file-select
- (sbcl-package->cl-source-package sbcl-file-select))
+(define-public ecl-access
+ (sbcl-package->ecl-package sbcl-access))
-(define-public ecl-file-select
- (sbcl-package->ecl-package sbcl-file-select))
+(define-public cl-access
+ (sbcl-package->cl-source-package sbcl-access))
-(define-public sbcl-bodge-queue
- (let ((commit "948c9a501dcd412689952d09eb7453ec2722336a")
- (revision "0"))
+(define-public sbcl-acclimation
+ (let ((commit "4d51150902568fcd59335f4cc4cfa022df6116a5"))
(package
- (name "sbcl-bodge-queue")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-acclimation")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/borodust/bodge-queue")
+ (url "https://github.com/robert-strandh/Acclimation")
(commit commit)))
- (file-name (git-file-name "bodge-queue" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "148hjikqk8v2m30mj15xh89zni6szf9z3prav580qk9dqr8djjdr"))))
+ (base32
+ "1aw7rarjl8ai57h0jxnp9hr3dka7qrs55mmbl1p6rhd6xj8mp9wq"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/borodust/bodge-queue")
- (synopsis "Simple queue for Common Lisp")
- (description "This Common Lisp library provides a simple FIFO
-implementation with no external dependencies.")
- (license license:expat))))
+ (home-page "https://github.com/robert-strandh/Acclimation")
+ (synopsis "Internationalization library for Common Lisp")
+ (description "This project is meant to provide tools for
+internationalizing Common Lisp programs.
-(define-public cl-bodge-queue
- (sbcl-package->cl-source-package sbcl-bodge-queue))
+One important aspect of internationalization is of course the language used in
+error messages, documentation strings, etc. But with this project we provide
+tools for all other aspects of internationalization as well, including dates,
+weight, temperature, names of physical quantitites, etc.")
+ (license license:bsd-2))))
-(define-public ecl-bodge-queue
- (sbcl-package->ecl-package sbcl-bodge-queue))
+(define-public cl-acclimation
+ (sbcl-package->cl-source-package sbcl-acclimation))
-(define-public sbcl-list-named-class
- (let ((commit "2955791a7469131bcab42d800883f27993ee1d62")
- (revision "0"))
+(define-public ecl-acclimation
+ (sbcl-package->ecl-package sbcl-acclimation))
+
+(define-public sbcl-acl-compat
+ ;; There does not seem to be proper releases.
+ (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5"))
(package
- (name "sbcl-list-named-class")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-acl-compat")
+ (version (git-version "0.1.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/list-named-class")
+ (url "git://git.code.sf.net/p/portableaserve/git")
(commit commit)))
- (file-name (git-file-name "cl-list-named-class" version))
+ (file-name (git-file-name "acl-compat" version))
(sha256
- (base32 "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"))))
+ (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-1am))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'cd-acl-compat
+ (lambda _
+ (chdir "acl-compat")
+ #t)))))
(inputs
- (list sbcl-alexandria sbcl-closer-mop))
- (home-page "https://github.com/phoe/list-named-class/")
- (synopsis "Name classes after lists of symbols")
+ `(("puri" ,sbcl-puri)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("ironclad" ,sbcl-ironclad)
+ ("cl-fad" ,sbcl-cl-fad)))
+ (home-page "https://sourceforge.net/projects/portableaserve/")
+ (synopsis "AllegroServe, a web server written in Common Lisp")
(description
- "This package makes it possible to name classes by lists of symbols
-instead of symbols.")
- (license license:expat))))
-
-(define-public cl-list-named-class
- (sbcl-package->cl-source-package sbcl-list-named-class))
+ "The server part of AllegroServe can be used either as a standalone web
+server or a module loaded into an application to provide a user interface to
+the application. AllegroServe's proxy ability allows it to run on the gateway
+machine between some internal network and the Internet. AllegroServe's client
+functions allow Lisp programs to explore the web.")
+ (license license:llgpl))))
-(define-public ecl-list-named-class
- (sbcl-package->ecl-package sbcl-list-named-class))
+(define-public cl-acl-compat
+ (sbcl-package->cl-source-package sbcl-acl-compat))
-(define-public sbcl-golden-utils
- (let ((commit "e43914ad2bdb0c8e1b1f10ef591aafc3c55b89e7")
- (revision "4"))
- (package
- (name "sbcl-golden-utils")
- (version (git-version "0.0.0" revision commit))
- (home-page "https://github.com/lisp-mirror/golden-utils")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (file-name (git-file-name "cl-golden-utils" version))
- (sha256
- (base32 "09vq29wjr3x7h3fshwxg8h1psy4p73yl61cjljarpqjhsgz7lmbp"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (synopsis "Common Lisp utility library")
- (description
- "This is a Common Lisp library providing various utilities.")
- (license license:expat))))
+(define-public sbcl-adopt
+ (package
+ (name "sbcl-adopt")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sjl/adopt")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-adopt" version))
+ (sha256
+ (base32 "16kzkai96qk7vmclp8wxc9aghhnisw8gg9s7hra68300bgj86wzr"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-1am))
+ (inputs (list sbcl-bobbin sbcl-split-sequence))
+ (home-page "https://hg.stevelosh.com/adopt")
+ (synopsis "Common Lisp option parsing library")
+ (description
+ "@acronym{ADOPT, A Damn OPTion} is a simple UNIX-style option parser in
+Common Lisp, heavily influenced by Python's @code{optparse} and
+@code{argparse}.")
+ (license license:expat)))
-(define-public ecl-golden-utils
- (sbcl-package->ecl-package sbcl-golden-utils))
+(define-public cl-adopt
+ (sbcl-package->cl-source-package sbcl-adopt))
-(define-public cl-golden-utils
- (sbcl-package->cl-source-package sbcl-golden-utils))
+(define-public ecl-adopt
+ (sbcl-package->ecl-package sbcl-adopt))
-(define-public sbcl-asdf-finalizers
- (let ((commit "7f537f6c598b662ae987c6acc268dd27c25977e0")
- (revision "1"))
+(define-public sbcl-agnostic-lizard
+ (let ((commit "fe1a1d7d80c8b56163754e0e5b3653fd750ad298")
+ (revision "2"))
(package
- (name "sbcl-asdf-finalizers")
+ (name "sbcl-agnostic-lizard")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
+ (url "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-agnostic-lizard" version))
(sha256
- (base32 "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"))))
+ (base32 "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- `(("fare-utils" ,sbcl-fare-utils)
- ("hu.dwim.stefil" ,sbcl-hu.dwim.stefil)))
- (home-page "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
- (synopsis "Enforced calling of finalizers for Lisp code")
- (description "This library allows you to implement and enforce proper
-finalization of compile-time constructs while building Lisp source files.
+ (synopsis "Almost correct portable code walker for Common Lisp")
+ (description
+ "Agnostic Lizard is a portable implementation of a code walker and in
+particular of the macroexpand-all function (and macro) that makes a best
+effort to be correct while not expecting much beyond what the Common Lisp
+standard requires.
-It produces two systems: asdf-finalizers and list-of.")
- (license license:expat))))
+It aims to be implementation-agnostic and to climb the syntax trees.")
+ (home-page "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
+ (license license:gpl3+))))
-(define-public ecl-asdf-finalizers
- (sbcl-package->ecl-package sbcl-asdf-finalizers))
+(define-public cl-agnostic-lizard
+ (sbcl-package->cl-source-package sbcl-agnostic-lizard))
-(define-public cl-asdf-finalizers
- (sbcl-package->cl-source-package sbcl-asdf-finalizers))
+(define-public ecl-agnostic-lizard
+ (sbcl-package->ecl-package sbcl-agnostic-lizard))
-(define-public sbcl-asdf-system-connections
- (let ((commit "9f085240febccccff99d9d3bb687fcaafffd3f5e")
- (revision "1"))
+(define-public sbcl-agutil
+ (let ((commit "df188d754d472da9faa1601a48f1f37bb7b34d68"))
(package
- (name "sbcl-asdf-system-connections")
- (version (git-version "0.8.4" revision commit))
+ (name "sbcl-agutil")
+ (version (git-version "0.0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/gwkkwg/asdf-system-connections")
+ (url "https://github.com/alex-gutev/agutil/")
(commit commit)))
- (file-name (git-file-name "cl-asdf-system-connections" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "06kg0m8bv383qq3r34x0f8hz6p6zxcw02qn7kj960vcnrp5a5b3y"))))
+ (base32 "1xpnyzksk2xld64b6lw6rw0gn5zxlb77jwna59sd4yl7kxhxlfpf"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/gwkkwg/asdf-system-connections")
- (synopsis "Common Lisp ASDF system auto-loading extension")
- (description
- "This package provides a Common Lisp ASDF system auto-loading
-extension.")
+ (inputs
+ (list sbcl-alexandria sbcl-trivia))
+ (home-page "https://github.com/alex-gutev/agutil/")
+ (synopsis "Collection of Common Lisp utilities")
+ (description "A collection of Common Lisp utility functions and macros
+mostly not found in other utility packages.")
(license license:expat))))
-(define-public ecl-asdf-system-connections
- (sbcl-package->ecl-package sbcl-asdf-system-connections))
+(define-public cl-agutil
+ (sbcl-package->cl-source-package sbcl-agutil))
-(define-public cl-asdf-system-connections
- (sbcl-package->cl-source-package sbcl-asdf-system-connections))
+(define-public ecl-agutil
+ (sbcl-package->ecl-package sbcl-agutil))
-(define-public sbcl-net.didierverna.asdf-flv
+(define-public sbcl-alea
(package
- (name "sbcl-net.didierverna.asdf-flv")
- (version "2.1")
+ (name "sbcl-alea")
+ (version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/didierverna/asdf-flv")
- (commit (string-append "version-" version))))
- (file-name (git-file-name "asdf-flv" version))
+ (url "https://github.com/eXodiquas/alea")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-alea" version))
(sha256
- (base32 "1fi2y4baxan103jbg4idjddzihy03kwnj2mzbwrknw4d4x7xlgwj"))))
+ (base32 "0nd9fdjli22ygfw3c8k9nh7d36c92866hics5aij6x7ly1q781gz"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp ASDF extension to provide support for file-local variables")
- (description "ASDF-FLV provides support for file-local variables through
-ASDF. A file-local variable behaves like @code{*PACKAGE*} and
-@code{*READTABLE*} with respect to @code{LOAD} and @code{COMPILE-FILE}: a new
-dynamic binding is created before processing the file, so that any
-modification to the variable becomes essentially file-local.
-
-In order to make one or several variables file-local, use the macros
-@code{SET-FILE-LOCAL-VARIABLE(S)}.")
- (home-page "https://www.lrde.epita.fr/~didier/software/lisp/misc.php#asdf-flv")
- (license (license:non-copyleft
- "https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html"
- "GNU All-Permissive License"))))
-
-(define-public cl-net.didierverna.asdf-flv
- (sbcl-package->cl-source-package sbcl-net.didierverna.asdf-flv))
-
-(define-public ecl-net.didierverna.asdf-flv
- (sbcl-package->ecl-package sbcl-net.didierverna.asdf-flv))
-
-(define-public sbcl-command-line-arguments
- (let ((commit "fbac862fb01c0e368141204f3f639920462c23fe")
- (revision "1"))
- (package
- (name "sbcl-command-line-arguments")
- (version (git-version "2.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fare/command-line-arguments")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "054m1ikndzqf72mb9ajaa64136cwr3bgag4yfbi1574a9vq75mjq"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/fare/command-line-arguments")
- (synopsis "Trivial command-line argument parsing library for Common Lisp")
- (description "This is a library to abstract away the parsing of
-Unix-style command-line arguments. Use it in conjunction with asdf:program-op
-or cl-launch for portable processing of command-line arguments.")
- (license license:expat))))
+ (native-inputs (list sbcl-fiveam))
+ (synopsis "Dice rolling library")
+ (description
+ "This package provides a Common Lisp library for dice rolling and working
+with dice-roll statistics.")
+ (home-page "https://github.com/eXodiquas/alea")
+ (license license:expat)))
-(define-public ecl-command-line-arguments
- (sbcl-package->ecl-package sbcl-command-line-arguments))
+(define-public cl-alea
+ (sbcl-package->cl-source-package sbcl-alea))
-(define-public cl-command-line-arguments
- (sbcl-package->cl-source-package sbcl-command-line-arguments))
+(define-public ecl-alea
+ (sbcl-package->ecl-package sbcl-alea))
-(define-public sbcl-adopt
+(define-public sbcl-alexa
(package
- (name "sbcl-adopt")
- (version "1.2.0")
+ (name "sbcl-alexa")
+ (version "2.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sjl/adopt")
+ (url "https://github.com/quil-lang/alexa")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-adopt" version))
+ (file-name (git-file-name "cl-alexa" version))
(sha256
- (base32 "16kzkai96qk7vmclp8wxc9aghhnisw8gg9s7hra68300bgj86wzr"))))
+ (base32 "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-1am))
- (inputs (list sbcl-bobbin sbcl-split-sequence))
- (home-page "https://hg.stevelosh.com/adopt")
- (synopsis "Common Lisp option parsing library")
+ (native-inputs (list sbcl-fiasco))
+ (inputs (list sbcl-alexandria sbcl-cl-ppcre))
+ (synopsis "Lexical Analyzer Generator for Common Lisp")
(description
- "@acronym{ADOPT, A Damn OPTion} is a simple UNIX-style option parser in
-Common Lisp, heavily influenced by Python's @code{optparse} and
-@code{argparse}.")
- (license license:expat)))
+ "ALEXA is a tool similar to lex or flex for generating lexical analyzers.
+Unlike tools like lex, however, ALEXA defines a domain-specific language
+within your Lisp program, so you don't need to invoke a separate tool.")
+ (home-page "https://github.com/quil-lang/alexa")
+ (license license:bsd-3)))
-(define-public ecl-adopt
- (sbcl-package->ecl-package sbcl-adopt))
+(define-public ecl-alexa
+ (sbcl-package->ecl-package sbcl-alexa))
-(define-public cl-adopt
- (sbcl-package->cl-source-package sbcl-adopt))
+(define-public cl-alexa
+ (sbcl-package->cl-source-package sbcl-alexa))
-(define-public sbcl-clingon
- (let ((commit "379fc41e7b3977661f1454cf35acdbfae046d40d")
+(define-public sbcl-alexandria
+ (let ((commit "009b7e532071d9777bdbd63b82d776555da95916")
(revision "0"))
(package
- (name "sbcl-clingon")
- (version (git-version "0.5.0" revision commit))
+ (name "sbcl-alexandria")
+ (version (git-version "1.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dnaeon/clingon")
+ (url "https://gitlab.common-lisp.net/alexandria/alexandria.git")
(commit commit)))
- (file-name (git-file-name "cl-clingon" version))
+ (file-name (git-file-name "cl-alexandria" version))
(sha256
- (base32 "11p9lplx0fc5ghx601i150vrd46zdbvw0hfrbrrrdqplxaqpywq5"))))
+ (base32 "0pdj779j3nwzn8f1661vf00rrjrbks1xgiq0rvwjw6qyxsfqfnl9"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-rove))
- (inputs
- (list sbcl-bobbin
- sbcl-cl-reexport
- sbcl-split-sequence
- sbcl-with-user-abort))
- (home-page "https://github.com/dnaeon/clingon")
- (synopsis "Command-line option parsing library for Common Lisp")
+ (list sbcl-rt))
+ (synopsis "Collection of portable utilities for Common Lisp")
(description
- "@code{clingon} is a command-line option parsing library for Common
-Lisp. Its features include:
-@itemize
-@item Support for subcommands
-@item Support for command aliases
-@item Support for short and long options
-@item Related options may be grouped into categories
-@item Short options may be collapsed into a single argument, as in
-@option{-xyz}
-@item Long options support the notations @option{--long-opt arg} and
-@option{--long-opt=arg}
-@item Automatic generation of help/usage information for commands and
-subcommands
-@item Out-of-the-box support for @option{--version} and @option{--help}
-@item Support for various kinds of options including string, integer,
-boolean, switch, enum, list, counter, filepath, etc.
-@item Subcommands can look up global options defined in parent commands
-@item Support for required options
-@item Options can be initialized via environment variables
-@item Single interface for creating options using @code{CLINGON:MAKE-OPTION}
-@item Generate documentation for your command-line application
-@item Support for @code{pre-hook} and @code{post-hook} actions for commands,
-which allow invoking functions before and after the respective handler of the
-command is executed
-@item Support for Bash and Zsh completions
-@item Extensibility, so if you don't find something you need you can extend it
-by developing a new option kind, or even a new mechanism for initializing
-options, e.g., by looking up an external key/value store
-@end itemize")
- (license license:bsd-2))))
-
-(define-public cl-clingon
- (sbcl-package->cl-source-package sbcl-clingon))
-
-(define-public ecl-clingon
- (sbcl-package->ecl-package sbcl-clingon))
-
-(define-public sbcl-command-line-args
- (package
- (name "sbcl-command-line-args")
- (version "0.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~whereiseveryone/command-line-args")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-command-line-args" version))
- (sha256
- (base32 "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("whereiseveryone.command-line-args")))
- (inputs
- (list sbcl-alexandria
- sbcl-charje.documentation
- sbcl-cl-str
- sbcl-serapeum
- sbcl-trivia))
- (home-page "https://git.sr.ht/~whereiseveryone/command-line-args")
- (synopsis "Automatically generate command line interfaces")
- (description "Command-Line-Args provides a main macro (@code{command})
-that wraps a @code{defun} form and creates a new function that parses the
-command line arguments. It has support for command-line options, positional,
-and variadic arguments. It also generates a basic help message. The
-interface is meant to be easy and non-intrusive.")
- (license license:agpl3+)))
+ "Alexandria is a collection of portable utilities. It does not contain
+conceptual extensions to Common Lisp. It is conservative in scope, and
+portable between implementations.")
+ (home-page "https://common-lisp.net/project/alexandria/")
+ (license license:public-domain))))
-(define-public cl-command-line-args
- (sbcl-package->cl-source-package sbcl-command-line-args))
+(define-public cl-alexandria
+ (sbcl-package->cl-source-package sbcl-alexandria))
-(define-public ecl-command-line-args
- (sbcl-package->ecl-package sbcl-command-line-args))
+(define-public ecl-alexandria
+ (sbcl-package->ecl-package sbcl-alexandria))
-(define-public sbcl-cl-irc
- (let ((commit "963823537c7bfcda2edd4c44d172192da6722175")
+(define-public sbcl-alexandria-plus
+ (let ((commit "adafb09838a84895bedb119f8253b89b6a04a2c5")
(revision "0"))
(package
- (name "sbcl-cl-irc")
- (version (git-version "0.9.2" revision commit))
+ (name "sbcl-alexandria-plus")
+ ;; Version is stated in the ASD file.
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://salsa.debian.org/common-lisp-team/cl-irc.git")
+ (url "https://github.com/Symbolics/alexandria-plus")
(commit commit)))
- (file-name (git-file-name "cl-irc" version))
+ (file-name (git-file-name "cl-alexandria-plus" version))
(sha256
- (base32 "1b3nqbb4pj377lxl47rfgrs82pidadnrc65l48bk553c2f59b52w"))))
+ (base32 "1w9r19610h599303gqlx2x5n8mmdynss2gyl7xilg5h6v8z3hkfl"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("alexandria+")))
(native-inputs
- (list sbcl-rt))
+ (list sbcl-parachute))
(inputs
- `(("cl+ssl" ,sbcl-cl+ssl)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("split-sequence" ,sbcl-split-sequence)
- ("usocket" ,sbcl-usocket)))
- (arguments
- `(#:asd-test-systems '("cl-irc-test")))
- (synopsis "IRC client library for Common Lisp")
- (description "@code{cl-irc} is a Common Lisp IRC client library that
-features (partial) DCC, CTCP and all relevant commands from the IRC
-RFCs (RFC2810, RFC2811 and RFC2812).
-
-Features:
-@itemize
-@item implements all commands in the RFCs
-@item extra convenience commands such as op/deop, ban, ignore, etc.
-@item partial DCC SEND/CHAT support
-@item event driven model with hooks makes interfacing easy
-@item the user can keep multiple connections
-@item all CTCP commands
-@end itemize\n")
- (home-page "https://common-lisp.net/project/cl-irc/")
- (license license:bsd-2))))
+ (list sbcl-alexandria))
+ (home-page "https://symbolics.github.io/alexandria-plus/")
+ (synopsis "Conservative set of extensions to Alexandria utilities")
+ (description
+ "@code{cl-alexandria-plus} is a conservative set of extensions to
+@code{cl-alexandria} utilities.")
+ (license license:ms-pl))))
-(define-public cl-irc
- (sbcl-package->cl-source-package sbcl-cl-irc))
+(define-public cl-alexandria-plus
+ (sbcl-package->cl-source-package sbcl-alexandria-plus))
-(define-public ecl-cl-irc
- (sbcl-package->ecl-package sbcl-cl-irc))
+(define-public ecl-alexandria-plus
+ (sbcl-package->ecl-package sbcl-alexandria-plus))
-(define-public sbcl-coleslaw
- (let ((commit "e7e68ce6020d13b14bf212890a7d8973d7af3b40")
- (revision "0"))
+(define-public sbcl-alloy
+ (let ((commit "628974de537affb5b44ad548347f67c16efffcfc")
+ (revision "3"))
(package
- (name "sbcl-coleslaw")
- (version (git-version "0.9.7" revision commit))
+ (name "sbcl-alloy")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/coleslaw-org/coleslaw")
+ (url "https://github.com/Shirakumo/alloy")
(commit commit)))
- (file-name (git-file-name "cl-coleslaw" version))
+ (file-name (git-file-name "cl-alloy" version))
(sha256
- (base32 "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"))))
+ (base32 "0fx294qwxshgijss000pbjbnbwxqvxyw6p3mva36qljhbbkw2fxy"))))
(build-system asdf-build-system/sbcl)
- (outputs '("out" "bin"))
- (arguments
- '(#:asd-systems '("coleslaw" "coleslaw-cli")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda _
- (substitute* "plugins/publish-gh-pages.sh"
- (("^rsync\\b") (which "rsync")))
- (substitute* '("plugins/rsync.lisp"
- "src/coleslaw.lisp")
- (("\\brun-program \"rsync\\b")
- (string-append "run-program \"" (which "rsync"))))))
- (add-after 'create-asdf-configuration 'build-program
- (lambda* (#:key outputs #:allow-other-keys)
- (build-program
- (string-append (assoc-ref outputs "bin") "/bin/coleslaw")
- outputs
- #:dependencies '("coleslaw-cli")
- #:entry-program '((apply (function coleslaw-cli::main)
- arguments))
- #:compress? #t))))))
(native-inputs
- (list sbcl-prove))
+ (list sbcl-alexandria sbcl-parachute))
(inputs
- (list rsync
- sbcl-3bmd
- sbcl-alexandria
- sbcl-cl-fad
- sbcl-cl-ppcre
- sbcl-cl-unicode
- sbcl-clack
- sbcl-closer-mop
- sbcl-closure-template
- sbcl-inferior-shell
- sbcl-local-time
- sbcl-trivia))
- (home-page "https://github.com/coleslaw-org/coleslaw")
- (synopsis "Static site generator")
+ (list sbcl-array-utils sbcl-closer-mop sbcl-documentation-utils
+ sbcl-float-features sbcl-colored sbcl-stealth-mixin
+ sbcl-cl-opengl sbcl-font-discovery sbcl-uax-14 sbcl-sdf))
+ (arguments
+ ;; Dismiss alloy-svg, since it is not completed:
+ ;; https://github.com/Shirakumo/alloy/issues/24
+ '(#:asd-systems '("alloy"
+ "alloy-animation"
+ "alloy-opengl"
+ "alloy-opengl-msdf"
+ "alloy-opengl-png"
+ "alloy-simple"
+ "alloy-simple-presentations"
+ "alloy-windowing")))
+ (home-page "https://shirakumo.github.io/alloy/")
+ (synopsis
+ "Common Lisp user interface protocol and toolkit implementation")
(description
- "Coleslaw is a static site generator written in Common Lisp.")
- (license license:bsd-2))))
+ "Alloy is a user interface toolkit. It is defined through a set of
+protocols that allow for a clear interface, as well as a standardised way to
+integrate Alloy into a target backend.")
+ (license license:zlib))))
-(define-public cl-coleslaw
- (sbcl-package->cl-source-package sbcl-coleslaw))
+(define-public cl-alloy
+ (sbcl-package->cl-source-package sbcl-alloy))
-(define-public ecl-coleslaw
- (sbcl-package->ecl-package sbcl-coleslaw))
+(define-public ecl-alloy
+ (sbcl-package->ecl-package sbcl-alloy))
-(define-public sbcl-cl-all
- (let ((commit "4ce1ea9d9f33c0dd6212044e7952a0c854757ace")
+(define-public sbcl-amb
+ (let ((commit "884bef69a1ea02f3b9deae0341e1a038ff31b896")
(revision "0"))
(package
- (name "sbcl-cl-all")
- (version (git-version "1.0.0" revision commit))
- (source
+ (name "sbcl-amb")
+ (version (git-version "1.0.0" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/cl-all")
+ (url "https://github.com/phoe/amb")
(commit commit)))
- (file-name (git-file-name "cl-all" version))
+ (file-name (git-file-name "cl-amb" version))
(sha256
- (base32 "0n4sjarj373zpxn78m32rmhxnsnr8qahdslrd9vrkkwjpzar2bwp"))))
- (build-system asdf-build-system/sbcl)
- (outputs '("out" "bin"))
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'create-asdf-configuration 'build-program
- (lambda* (#:key outputs #:allow-other-keys)
- (build-program
- (string-append (assoc-ref outputs "bin") "/bin/cl-all")
- outputs
- #:entry-program '((cl-all:toplevel arguments))
- #:compress? #t))))))
- (home-page "https://github.com/Shinmera/cl-all")
- (synopsis "Evaluate Common Lisp expressions in multiple implementations")
- (description "@samp{cl-all} is a library and script for evaluating Common
-Lisp expressions in multiple implementations.")
- (license license:zlib))))
+ (base32 "1klh1aakklj1famrff0sccnwlv8238b1q446288aqnqgxxw6pf21"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria))
+ (native-inputs
+ (list sbcl-parachute))
+ (synopsis "Implementation of John McCarthy's ambiguous operator")
+ (description
+ "@code{cl-amb} provides an implementation of John McCarthy's ambiguous
+operator in portable Common Lisp.")
+ (home-page "https://github.com/phoe/amb/")
+ (license license:expat))))
-(define-public cl-all
- (sbcl-package->cl-source-package sbcl-cl-all))
+(define-public cl-amb
+ (sbcl-package->cl-source-package sbcl-amb))
-(define-public sbcl-tripod
- (let ((commit "b019a27cd7eb895870f84b0eb6c3edc5d7b05928")
+(define-public ecl-amb
+ (sbcl-package->ecl-package sbcl-amb))
+
+(define-public sbcl-anaphora
+ (package
+ (name "sbcl-anaphora")
+ (version "0.9.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tokenrove/anaphora")
+ (commit version)))
+ (sha256
+ (base32 "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b"))
+ (file-name (git-file-name "cl-anaphora" version))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-rt))
+ (synopsis "The anaphoric macro collection from Hell")
+ (description
+ "Anaphora is the anaphoric macro collection from Hell: it includes many
+new fiends in addition to old friends like @command{aif} and
+@command{awhen}.")
+ (home-page "https://github.com/tokenrove/anaphora")
+ (license license:public-domain)))
+
+(define-public cl-anaphora
+ (sbcl-package->cl-source-package sbcl-anaphora))
+
+(define-public ecl-anaphora
+ (sbcl-package->ecl-package sbcl-anaphora))
+
+;;; Split the antik package in two to work around the circular dependency
+;;; between antik/antik and antik/gsll.
+(define-public sbcl-antik-base
+ (let ((commit "e4711a69b3d6bf37b5727af05c3cfd03e8428ba3")
(revision "1"))
(package
- (name "sbcl-tripod")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-antik-base")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/aartaka/tripod")
+ (url "https://gitlab.common-lisp.net/antik/antik.git")
(commit commit)))
- (file-name (git-file-name "cl-tripod" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0y8sns6njq9x7km58vpj7gx4cia9zkcpng3d38300xk0nnk2kz8w"))))
+ (base32
+ "047ga2c38par2xbgg4qx6hwv06qhf1c1f67as8xvir6s80lip1km"))))
(build-system asdf-build-system/sbcl)
- (outputs '("out" "bin"))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'create-asdf-configuration 'build-program
- (lambda* (#:key outputs #:allow-other-keys)
- ;; FIXME: Using #$output:bin here prevents cl-tripod and
- ;; ecl-tripod from building, but using assoc-ref works.
- (build-program (string-append ;; #$output:bin
- (assoc-ref outputs "bin")
- "/bin/tripod")
- outputs
- #:entry-program '((tripod:entry-point))
- #:compress? #t))))))
(inputs
- (list sbcl-alexandria
- sbcl-cl-gopher
- sbcl-cl-markdown
- sbcl-clss
- sbcl-hunchentoot
- sbcl-local-time
- sbcl-nactivitypub
- sbcl-njson
- sbcl-phos
- sbcl-plump
- sbcl-trivial-mimes))
- (home-page "https://aartaka.me/blog/tripod")
- (synopsis "Common Lisp web server aiming to ease website hosting")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("drakma" ,sbcl-drakma)
+ ("fare-utils" ,sbcl-fare-utils)
+ ("iterate" ,sbcl-iterate)
+ ("metabang-bind" ,sbcl-metabang-bind)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("static-vectors" ,sbcl-static-vectors)
+ ("trivial-garbage" ,sbcl-trivial-garbage)
+ ("trivial-utf-8" ,sbcl-trivial-utf-8)))
+ (native-inputs
+ (list sbcl-lisp-unit))
+ (arguments
+ '(#:asd-systems '("antik-base"
+ "foreign-array")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (for-each delete-file
+ '("antik.asd"
+ "physical-dimension.asd"
+ "science-data.asd"))
+ #t)))))
+ (synopsis "Scientific and engineering computation in Common Lisp")
(description
- "Tripod is a Common Lisp web server aiming to ease plain text, HTML,
-and Gopher website hosting.")
- (license license:bsd-2))))
+ "Antik provides a foundation for scientific and engineering
+computation in Common Lisp. It is designed not only to facilitate
+numerical computations, but to permit the use of numerical computation
+libraries and the interchange of data and procedures, whether
+foreign (non-Lisp) or Lisp libraries. It is named after the
+Antikythera mechanism, one of the oldest examples of a scientific
+computer known.")
+ (home-page "https://common-lisp.net/project/antik/")
+ (license license:gpl3))))
-(define-public cl-tripod
- ;; No "bin" output for the source package.
- (let ((pkg (sbcl-package->cl-source-package sbcl-tripod)))
- (package/inherit pkg
- (outputs '("out")))))
+(define-public cl-antik-base
+ (sbcl-package->cl-source-package sbcl-antik-base))
-(define-public ecl-tripod
- ;; FIXME: Making a standalone binary doesn't work with ECL.
- (let ((pkg (sbcl-package->ecl-package sbcl-tripod)))
- (package/inherit pkg
- (outputs '("out"))
+(define-public ecl-antik-base
+ (let ((pkg (sbcl-package->ecl-package sbcl-antik-base)))
+ (package
+ (inherit pkg)
(arguments
(substitute-keyword-arguments (package-arguments pkg)
((#:phases phases)
- #~(modify-phases #$phases
- (delete 'build-program))))))))
+ `(modify-phases ,phases
+ (add-after 'unpack 'fix-readtable
+ (lambda _
+ (substitute* "input-output/readtable.lisp"
+ (("#-ccl")
+ "#-(or ccl ecl)"))
+ #t)))))))))
-(define-public sbcl-trivial-timeout
- (let ((commit "e70d9b4f7caeab83ea6ac50d724470fe49561e66")
- (revision "2"))
+(define-public sbcl-antik
+ (package
+ (inherit sbcl-antik-base)
+ (name "sbcl-antik")
+ (inputs
+ `(("antik-base" ,sbcl-antik-base)
+ ("gsll" ,sbcl-gsll)))
+ (arguments
+ '(#:asd-systems '("antik"
+ "science-data")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (for-each delete-file
+ '("antik-base.asd"
+ "foreign-array.asd"))
+ #t)))))))
+
+(define-public cl-antik
+ (sbcl-package->cl-source-package sbcl-antik))
+
+(define-public sbcl-april
+ (let ((commit "bdd74f168ec82f28fe4ab692f2c0af39441a5701")
+ (revision "3"))
(package
- (name "sbcl-trivial-timeout")
- (version (git-version "0.1.5" revision commit))
+ (name "sbcl-april")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/trivial-timeout")
+ (url "https://github.com/phantomics/april")
(commit commit)))
- (file-name (git-file-name "trivial-timeout" version))
+ (file-name (git-file-name "cl-april" version))
(sha256
- (base32 "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs"))))
+ (base32 "0hvlp2286z1ksa7jr7r661kdr0lpfv25n5chl72jrzq5zz70lidx"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled Apache-relicensed MaxPC.
+ (delete-file-recursively "maxpc-apache")
+ ;; Ensure references are to upstream MaxPC.
+ (substitute* "vex/vex.asd"
+ (("maxpc-apache") "maxpc"))))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lift))
- (home-page "https://github.com/hraban/trivial-timeout")
- (synopsis "Timeout library for Common Lisp")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-array-operations
+ sbcl-cl-ppcre
+ sbcl-cl-unicode
+ sbcl-lparallel
+ sbcl-maxpc
+ sbcl-parse-number
+ sbcl-prove
+ sbcl-random-state
+ sbcl-serapeum
+ sbcl-simple-date-time
+ sbcl-symbol-munger
+ sbcl-trivia))
+ (home-page "https://github.com/phantomics/april")
+ (synopsis "Array Programming Re-Imagined in Lisp")
(description
- "This library provides an OS and implementation independent access to
-timeouts.")
- (license license:expat))))
-
-(define-public ecl-trivial-timeout
- (sbcl-package->ecl-package sbcl-trivial-timeout))
-
-(define-public cl-trivial-timeout
- (sbcl-package->cl-source-package sbcl-trivial-timeout))
-
-(define-public sbcl-bordeaux-threads
- (package
- (name "sbcl-bordeaux-threads")
- (version "0.9.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sionescu/bordeaux-threads")
- (commit (string-append "v" version))))
- (sha256
- (base32 "0pp3w5hsph47sqagr4j2pbg3ddb29jx93zg8kvxsp2c4flp0qz0f"))
- (file-name (git-file-name "cl-bordeaux-threads" version))))
- (inputs (list sbcl-alexandria
- sbcl-global-vars
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (native-inputs (list sbcl-fiveam))
- (build-system asdf-build-system/sbcl)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'adjust-test-sleep
- (lambda _
- ;; 0.001 is too short for some slower machines.
- (substitute* '("test/tests-v1.lisp"
- "test/tests-v2.lisp")
- (("sleep 0\\.001") "sleep 0.002")))))))
- (synopsis "Portable shared-state concurrency library for Common Lisp")
- (description "BORDEAUX-THREADS is a proposed standard for a minimal
-MP/Threading interface. It is similar to the CLIM-SYS threading and lock
-support.")
- (home-page "https://common-lisp.net/project/bordeaux-threads/")
- (license license:x11)))
+ "April compiles a subset of the APL programming language into
+Common Lisp. Leveraging Lisp's powerful macros and numeric processing
+faculties, it brings APL's expressive potential to bear for Lisp developers.
+Replace hundreds of lines of number-crunching code with a single line of
+APL.")
+ (license license:asl2.0))))
-(define-public cl-bordeaux-threads
- (sbcl-package->cl-source-package sbcl-bordeaux-threads))
+(define-public cl-april
+ (sbcl-package->cl-source-package sbcl-april))
-(define-public ecl-bordeaux-threads
- (sbcl-package->ecl-package sbcl-bordeaux-threads))
+(define-public ecl-april
+ (sbcl-package->ecl-package sbcl-april))
-(define-public sbcl-trivial-gray-streams
- (let ((revision "1")
- (commit "2b3823edbc78a450db4891fd2b566ca0316a7876"))
+(define-public sbcl-archive
+ (let ((commit "631271c091ed02994bec3980cb288a2cf32c7cdc")
+ (revision "1"))
(package
- (name "sbcl-trivial-gray-streams")
- (version (git-version "2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/trivial-gray-streams/trivial-gray-streams")
- (commit commit)))
- (sha256
- (base32 "1hipqwwd5ylskybd173rvlsk7ds4w4nq1cmh9952ivm6dgh7pwzn"))
- (file-name (git-file-name "cl-trivial-gray-streams" version))))
+ (name "sbcl-archive")
+ (version (git-version "0.9" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharplispers/archive")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0pvsc9fmybx7rxd0kmzq4shi6hszdpwdc1sfy7jwyfxf8n3hnv4p"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Compatibility layer for Gray streams implementations")
- (description "Gray streams is an interface proposed for inclusion with
-ANSI CL by David N. Gray. The proposal did not make it into ANSI CL, but most
-popular CL implementations implement it. This package provides an extremely
-thin compatibility layer for gray streams.")
- (home-page "https://www.cliki.net/trivial-gray-streams")
- (license license:x11))))
+ (inputs
+ (list sbcl-cl-fad sbcl-trivial-gray-streams))
+ (synopsis "Common Lisp library for tar and cpio archives")
+ (description
+ "This is a Common Lisp library to read and write disk-based file
+archives such as those generated by the tar and cpio programs on Unix.")
+ (home-page "https://github.com/sharplispers/archive")
+ (license license:bsd-3))))
-(define-public cl-trivial-gray-streams
- (sbcl-package->cl-source-package sbcl-trivial-gray-streams))
+(define-public cl-archive
+ (sbcl-package->cl-source-package sbcl-archive))
-(define-public ecl-trivial-gray-streams
- (sbcl-package->ecl-package sbcl-trivial-gray-streams))
+(define-public ecl-archive
+ (sbcl-package->ecl-package sbcl-archive))
-(define-public sbcl-flexi-streams
- (let ((commit "74a1027311371a57258eba1bc908e050f5702277")
- (revision "0"))
+(define-public sbcl-arnesi
+ (let ((commit "1e7dc4cb2cad8599113c7492c78f4925e839522e")
+ (revision "1"))
(package
- (name "sbcl-flexi-streams")
- (version (git-version "1.0.19" revision commit))
+ (name "sbcl-arnesi")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/flexi-streams")
+ (url "https://github.com/AccelerationNet/arnesi")
(commit commit)))
- (file-name (git-file-name "cl-flexi-streams" version))
+ (file-name (git-file-name "arnesi" version))
(sha256
- (base32 "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"))))
+ (base32 "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"))))
(build-system asdf-build-system/sbcl)
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'make-git-checkout-writable
- (lambda _
- (for-each make-file-writable (find-files ".")))))))
+ ;; FIXME: (Sharlatan-20210523T190315+0100): Tests failed on
+ ;; special-lisp-var-rebount-in/cc
+ ;;
+ ;; ; processing (TEST SPECIAL-LISP-VAR-REBOUND-IN/CC ...)
+ ;; ; wrote .../sbcl/arnesi/t/call-cc-tmp5GEXGEG5.fasl
+ ;; ; compilation finished in 0:00:00.028
+ ;; Unhandled SIMPLE-ERROR in thread
+ ;; #<SB-THREAD:THREAD "main thread" RUNNING {100B768173}>:
+ ;; Sorry, No walker for the special operater DECLARE defined.
+ ;;
+ ;; Backtrace for: #<SB-THREAD:THREAD "main thread" RUNNING {100B768173}>
+ ;; 0: (SB-DEBUG::DEBUGGER-DISABLED-HOOK #<SIMPLE-ERROR "Sorry,
+ ;; No walker for the special operater ~S defined."
+ ;; {1001FAF9D3}> #<unused argument> :QUIT T)
+ ;;
+ `(#:tests? #f))
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-trivial-gray-streams))
- (synopsis "Implementation of virtual bivalent streams for Common Lisp")
- (description "Flexi-streams is an implementation of \"virtual\" bivalent
-streams that can be layered atop real binary or bivalent streams and that can
-be used to read and write character data in various single- or multi-octet
-encodings which can be changed on the fly. It also supplies in-memory binary
-streams which are similar to string streams.")
- (home-page "http://weitz.de/flexi-streams/")
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("collectors" ,sbcl-collectors)
+ ("swank" ,sbcl-slime-swank)))
+ (home-page "https://github.com/AccelerationNet/arnesi")
+ (synopsis "Common Lisp utility suite")
+ (description
+ "ARNESI is Common Lisp utilities library similar to ALEXANDRIA, ANAPHORA
+or GOLDEN-UTILS.")
(license license:bsd-3))))
-(define-public cl-flexi-streams
- (sbcl-package->cl-source-package sbcl-flexi-streams))
-
-(define-public ecl-flexi-streams
- (sbcl-package->ecl-package sbcl-flexi-streams))
-
-(define-public sbcl-cl-abnf
- ;; There are no releases
- (let ((commit "ba1fbb104dedbdaddb1ef93d2e4da711bd96cd70")
- (revision "1"))
- (package
- (name "sbcl-cl-abnf")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dimitri/cl-abnf")
- (commit commit)))
- (file-name (git-file-name "cl-abnf" version))
- (sha256
- (base32 "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("esrap" ,sbcl-esrap)))
- (arguments
- `(#:asd-systems '("abnf")))
- (home-page "https://github.com/dimitri/cl-abnf")
- (synopsis "ABNF parser generator for Common Lisp")
- (description "This Common Lisp library implements a parser generator for
-the ABNF grammar format as described in RFC2234. The generated parser is a
-regular expression scanner provided by the cl-ppcre lib, which means that we
-can't parse recursive grammar definition. One such definition is the ABNF
-definition as given by the RFC. Fortunately, as you have this lib, you most
-probably don't need to generate another parser to handle that particular ABNF
-grammar.")
- (license license:expat))))
-
-(define-public cl-abnf
- (sbcl-package->cl-source-package sbcl-cl-abnf))
+(define-public ecl-arnesi
+ (sbcl-package->ecl-package sbcl-arnesi))
-(define-public ecl-cl-abnf
- (sbcl-package->ecl-package sbcl-cl-abnf))
+(define-public cl-arnesi
+ (sbcl-package->cl-source-package sbcl-arnesi))
-(define-public sbcl-select
- (let ((commit "df7920fc451b6d15345040ce4a3ee1ea2818ab1a")
+(define-public sbcl-array-operations
+ (let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b")
(revision "0"))
(package
- (name "sbcl-select")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-array-operations")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/select")
+ (url "https://github.com/bendudson/array-operations")
(commit commit)))
- (file-name (git-file-name "cl-select" version))
+ (file-name (git-file-name "array-operations" version))
(sha256
- (base32 "0bhpvfqp7n33pia4y62qi31bx86gjl2nxjy529rfawac57c9rxv3"))))
+ (base32 "0ip49hhq32w80qsc7jmspyda5r2rsszvw0mk2r3341cld78sz9ya"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-let-plus))
(native-inputs
- (list sbcl-fiveam))
- (home-page "https://lisp-stat.github.io/select/")
- (synopsis "Library for taking slices from array-like objects")
+ (list sbcl-alexandria sbcl-clunit2))
+ (inputs
+ (list sbcl-let-plus))
+ (synopsis "Simple array operations library for Common Lisp")
(description
- "This is a library for selecting portions of sequences, arrays or
-data-frames.")
- (license license:ms-pl))))
-
-(define-public cl-select
- (sbcl-package->cl-source-package sbcl-select))
-
-(define-public ecl-select
- (sbcl-package->ecl-package sbcl-select))
-
-(define-public sbcl-cl-ppcre
- (package
- (name "sbcl-cl-ppcre")
- (version "2.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/edicl/cl-ppcre")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-ppcre" version))
- (sha256
- (base32 "0dwvr29diqzcg5n6jvbk2rnd90i05l7n828hhw99khmqd0kz7xsi"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-flexi-streams))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-ppcre-unicode
- ;; cl-ppcre and cl-ppcre-unicode are put in different packages
- ;; to work around the circular dependency between edicl/cl-ppcre
- ;; and edicl/cl-unicode.
- (lambda _
- (delete-file "cl-ppcre-unicode.asd")
- #t)))))
- (synopsis "Portable regular expression library for Common Lisp")
- (description "CL-PPCRE is a portable regular expression library for Common
-Lisp, which is compatible with perl. It is pretty fast, thread-safe, and
-compatible with ANSI-compliant Common Lisp implementations.")
- (home-page "http://weitz.de/cl-ppcre/")
- (license license:bsd-2)))
+ "This library is a collection of functions and macros for manipulating
+Common Lisp arrays and performing numerical calculations with them.")
+ (home-page "https://github.com/bendudson/array-operations")
+ (license license:expat))))
-(define-public cl-ppcre
- (sbcl-package->cl-source-package sbcl-cl-ppcre))
+(define-public cl-array-operations
+ (sbcl-package->cl-source-package sbcl-array-operations))
-(define-public ecl-cl-ppcre
- (sbcl-package->ecl-package sbcl-cl-ppcre))
+(define-public ecl-array-operations
+ (sbcl-package->ecl-package sbcl-array-operations))
-(define-public sbcl-one-more-re-nightmare
- (let ((commit "5b0b02e59f90964baf5737abd13300fa82f27667")
- (revision "1"))
+(define-public sbcl-array-utils
+ (let ((commit "29da8fccf6093fe8f8c7b2daef7de1a428ef1834")
+ (revision "0"))
(package
- (name "sbcl-one-more-re-nightmare")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-array-utils")
+ (version (git-version "1.2.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/telekons/one-more-re-nightmare")
- (commit commit)))
- (file-name (git-file-name "cl-one-more-re-nightmare" version))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/array-utils")
+ (commit commit)))
+ (file-name (git-file-name "cl-array-utils" version))
(sha256
- (base32 "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn"))))
+ (base32 "1d66s2inb9hpw27hdb20x27dychmpn1mn35v0mlsib848qdz87az"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-test-systems '("one-more-re-nightmare-tests")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "Tests/one-more-re-nightmare-tests.asd"
- ((":depends-on")
- (string-append
- ":perform (test-op (o c) (symbol-call :one-more-re-nightmare-tests '#:run-tests))"
- "\n :depends-on"))))))))
(native-inputs
- (list sbcl-lparallel sbcl-parachute))
+ (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-dynamic-mixins
- sbcl-esrap
- sbcl-stealth-mixin
- sbcl-trivia
- sbcl-trivial-indent))
- (home-page "https://github.com/telekons/one-more-re-nightmare")
- (synopsis "Regular expression compiler in Common Lisp")
- (description "@code{one-more-re-nightmare} is a regular expression engine
-that uses the technique presented in Regular-expression derivatives
-re-examined (Owens, Reppy and Turon, 2009;
-@url{doi:10.1017/S0956796808007090}) to interpret and compile regular
-expressions.")
- (license license:bsd-2))))
-
-(define-public cl-one-more-re-nightmare
- (sbcl-package->cl-source-package sbcl-one-more-re-nightmare))
-
-(define-public ecl-one-more-re-nightmare
- (sbcl-package->ecl-package sbcl-one-more-re-nightmare))
-
-(define-public sbcl-parse
- (let ((commit "2351ee78acac065fcf10b8713d3f404e2e910786")
- (revision "1"))
- (package
- (name "sbcl-parse")
- (version (git-version "1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/massung/parse")
- (commit commit)))
- (file-name (git-file-name "parse" version))
- (sha256
- (base32 "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/massung/parse")
- (synopsis "Monadic parsing for Common Lisp")
- (description
- "PARSE is a simple token parsing library for Common Lisp.")
- (license license:asl2.0))))
-
-(define-public ecl-parse
- (sbcl-package->ecl-package sbcl-parse))
-
-(define-public cl-parse
- (sbcl-package->cl-source-package sbcl-parse))
-
-(define-public sbcl-re
- (let ((commit "cfbc1f482970221e80d445080a188fd5c755cd2c")
- (revision "1"))
- (package
- (name "sbcl-re")
- (version (git-version "1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/massung/re")
- (commit commit)))
- (file-name (git-file-name "re" version))
- (sha256
- (base32 "1y2gq2sckspnq8118bix55p2j43dk9qn3p8a2rplp1ip2qxqbb1i"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-parse))
- (home-page "https://github.com/massung/re")
- (synopsis "Lua-style Pattern Matching for Common Lisp")
- (description
- "RE is a small, portable, lightweight, and quick, regular
-expression library for Common Lisp. It is a non-recursive, backtracing VM.")
- (license license:asl2.0))))
+ (list sbcl-documentation-utils))
+ (synopsis "Tiny collection of array and vector utilities for Common Lisp")
+ (description
+ "A miniature toolkit that contains some useful shifting/popping/pushing
+functions for arrays and vectors. Originally from Plump.")
+ (home-page "https://shinmera.github.io/array-utils/")
+ (license license:zlib))))
-(define-public ecl-re
- (sbcl-package->ecl-package sbcl-re))
+(define-public cl-array-utils
+ (sbcl-package->cl-source-package sbcl-array-utils))
-(define-public cl-re
- (sbcl-package->cl-source-package sbcl-re))
+(define-public ecl-array-utils
+ (sbcl-package->ecl-package sbcl-array-utils))
-(define-public sbcl-boost-json
- (let ((commit "eca166f5ff1f10bad14e00b9fd5bf9fcf3691a47")
+(define-public sbcl-arrow-macros
+ ;; The latest upstream version tag is dated (pushed in 2020), use the latest
+ ;; commit instead.
+ (let ((commit "16bdfd31298182099c7d70df4598104e5a38b05e")
(revision "0"))
(package
- (name "sbcl-boost-json")
- (version (git-version "1.1" revision commit))
+ (name "sbcl-arrow-macros")
+ (version (git-version "0.2.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cl-boost/json")
+ (url "https://github.com/hipeta/arrow-macros")
(commit commit)))
- (file-name (git-file-name "cl-boost-json" version))
+ (file-name (git-file-name "arrow-macros" version))
(sha256
- (base32 "12k0470899qsll2qixksxf2vrhjmskk3nzp1di9k04n1b29nrakd"))))
+ (base32 "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- ;; See <https://github.com/cl-boost/json/pull/2>.
- (add-after 'unpack 'fix-decode-symbol
- (lambda _
- (substitute* '("decode.lisp" "encode.lisp")
- (("formfeed") "page")))))))
- (home-page "https://github.com/cl-boost/json")
- (synopsis "JSON encoding and decoding for Common Lisp")
+ (native-inputs (list sbcl-fiveam))
+ (home-page "https://github.com/hipeta/arrow-macros/")
+ (synopsis "Clojure-like arrow macros in Common Lisp")
(description
- "BOOST-JSON is a simple JSON parsing library for Common Lisp.")
- (license license:asl2.0))))
+ "Arrow-macros provides clojure-like arrow macros (ex. ->, ->>) and diamond wands
+in swiss-arrows.")
+ (license license:expat))))
-(define-public cl-boost-json
- (sbcl-package->cl-source-package sbcl-boost-json))
+(define-public cl-arrow-macros
+ (sbcl-package->cl-source-package sbcl-arrow-macros))
-(define-public ecl-boost-json
- (sbcl-package->ecl-package sbcl-boost-json))
+(define-public ecl-arrow-macros
+ (sbcl-package->ecl-package sbcl-arrow-macros))
-(define-public sbcl-boost-parse
- (let ((commit "c8f7e536b950752f3e35003e7ee0446e0fd51b50")
+(define-public sbcl-arrows
+ (let ((commit "df7cf0067e0132d9697ac8b1a4f1b9c88d4f5382")
(revision "0"))
(package
- (name "sbcl-boost-parse")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-arrows")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cl-boost/parse")
+ (url "https://gitlab.com/Harleqin/arrows.git")
(commit commit)))
- (file-name (git-file-name "cl-boost-parse" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0djnp392n9wgpr9r2ycnwkglad5mn285yvr53jx3g7anm2p8r0vf"))))
+ (base32
+ "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/cl-boost/parse")
- (synopsis "Monadic parsing for Common Lisp")
+ (native-inputs
+ (list sbcl-hu.dwim.stefil))
+ (synopsis "Clojure-like arrow macros for Common Lisp")
(description
- "BOOST-PARSE is a simple token parsing library for Common Lisp.")
- (license license:asl2.0))))
+ "This library implements the @code{->} and @code{->>} macros from
+Clojure, as well as several expansions on the idea.")
+ (home-page "https://gitlab.com/Harleqin/arrows")
+ (license license:public-domain))))
-(define-public cl-boost-parse
- (sbcl-package->cl-source-package sbcl-boost-parse))
+(define-public cl-arrows
+ (sbcl-package->cl-source-package sbcl-arrows))
-(define-public ecl-boost-parse
- (sbcl-package->ecl-package sbcl-boost-parse))
+(define-public ecl-arrows
+ (sbcl-package->ecl-package sbcl-arrows))
-(define-public sbcl-boost-re
- (let ((commit "d279fc58abf76d0c40aa6cde42e17a0591bc2c5d")
- (revision "0"))
+(define-public sbcl-asdf-finalizers
+ (let ((commit "7f537f6c598b662ae987c6acc268dd27c25977e0")
+ (revision "1"))
(package
- (name "sbcl-boost-re")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-asdf-finalizers")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cl-boost/re")
+ (url "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
(commit commit)))
- (file-name (git-file-name "cl-boost-re" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1h9c2rdhw6m1pm67gqbj46y2vb1kc3i1c9y3l4qhgfz14dbk80a2"))))
+ (base32 "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-boost-parse))
- (home-page "https://github.com/cl-boost/re")
- (synopsis "Lua-style string pattern matching for Common Lisp")
- (description
- "BOOST-RE is a small, portable, lightweight, and quick, regular
-expression library for Common Lisp. It is a non-recursive, backtracking VM.")
- (license license:asl2.0))))
+ (native-inputs
+ `(("fare-utils" ,sbcl-fare-utils)
+ ("hu.dwim.stefil" ,sbcl-hu.dwim.stefil)))
+ (home-page "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
+ (synopsis "Enforced calling of finalizers for Lisp code")
+ (description "This library allows you to implement and enforce proper
+finalization of compile-time constructs while building Lisp source files.
-(define-public cl-boost-re
- (sbcl-package->cl-source-package sbcl-boost-re))
+It produces two systems: asdf-finalizers and list-of.")
+ (license license:expat))))
-(define-public ecl-boost-re
- (sbcl-package->ecl-package sbcl-boost-re))
+(define-public cl-asdf-finalizers
+ (sbcl-package->cl-source-package sbcl-asdf-finalizers))
-(define-public sbcl-boost-lexer
- (let ((commit "139ca9e9580f890698deec05061e495376b7735a")
+(define-public ecl-asdf-finalizers
+ (sbcl-package->ecl-package sbcl-asdf-finalizers))
+
+(define-public sbcl-asd-generator
+ (let ((commit "27f94971a7c68c4dcb51e3f6be4142743d0c44e8")
(revision "0"))
(package
- (name "sbcl-boost-lexer")
+ (name "sbcl-asd-generator")
(version (git-version "1.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cl-boost/lexer")
- (commit commit)))
- (file-name (git-file-name "cl-boost-lexer" version))
- (sha256
- (base32 "01vsczb5cn62k2hkkn39xwh5fjn2x0b507n7afia98jnhhk3d5x4"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phoe/asd-generator")
+ (commit commit)))
+ (sha256
+ (base32 "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"))
+ (file-name (git-file-name "cl-asd-generator" commit))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-boost-re))
- (home-page "https://github.com/cl-boost/lexer")
- (synopsis "String tokenizing for Common Lisp")
+ (list sbcl-cl-fad
+ sbcl-iterate
+ sbcl-alexandria
+ sbcl-trivia))
+ (home-page "https://github.com/phoe/asd-generator")
+ (synopsis "Automatic generator for .asd files")
(description
- "BOOST-LEXER is a tokenizer for Common Lisp that makes heavy use of
-BOOST-RE.")
- (license license:asl2.0))))
+ "This package provides an automatic generator for ASDF's .asd files.")
+ (license license:gpl3+))))
-(define-public cl-boost-lexer
- (sbcl-package->cl-source-package sbcl-boost-lexer))
+(define-public cl-asd-generator
+ (sbcl-package->cl-source-package sbcl-asd-generator))
-(define-public ecl-boost-lexer
- (sbcl-package->ecl-package sbcl-boost-lexer))
+(define-public ecl-asd-generator
+ (sbcl-package->ecl-package sbcl-asd-generator))
-(define-public sbcl-ubiquitous
- (let ((commit "35eb7bd9e1b3daee1705f6b41260775180cce8af")
+(define-public sbcl-asdf-system-connections
+ (let ((commit "9f085240febccccff99d9d3bb687fcaafffd3f5e")
(revision "1"))
(package
- (name "sbcl-ubiquitous")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-asdf-system-connections")
+ (version (git-version "0.8.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/ubiquitous")
+ (url "https://github.com/gwkkwg/asdf-system-connections")
(commit commit)))
- (file-name (git-file-name "ubiquitous" version))
+ (file-name (git-file-name "cl-asdf-system-connections" version))
(sha256
- (base32 "1xlkaqmjcpkiv2xl2s2pvvrv976dlc846wm16s1lj62iy1315i49"))))
+ (base32 "06kg0m8bv383qq3r34x0f8hz6p6zxcw02qn7kj960vcnrp5a5b3y"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
- (arguments
- '(#:asd-systems '("ubiquitous"
- "ubiquitous-concurrent")))
- (home-page "https://shinmera.github.io/ubiquitous/")
- (synopsis "Application configuration mechanism for Common Lisp")
+ (home-page "https://github.com/gwkkwg/asdf-system-connections")
+ (synopsis "Common Lisp ASDF system auto-loading extension")
(description
- "@code{UBIQUITOUS} is a very easy-to-use library for persistent
-configuration storage. It automatically takes care of finding a suitable place
-to save your data, and provides simple functions to access and modify the data
-within.")
- (license license:zlib))))
+ "This package provides a Common Lisp ASDF system auto-loading
+extension.")
+ (license license:expat))))
-(define-public ecl-ubiquitous
- (sbcl-package->ecl-package sbcl-ubiquitous))
+(define-public cl-asdf-system-connections
+ (sbcl-package->cl-source-package sbcl-asdf-system-connections))
-(define-public cl-ubiquitous
- (sbcl-package->cl-source-package sbcl-ubiquitous))
+(define-public ecl-asdf-system-connections
+ (sbcl-package->ecl-package sbcl-asdf-system-connections))
-(define-public sbcl-uax-14
- (let ((commit "0432162525119c401d3d705bb9bcc9580a03914f")
- (revision "1"))
+(define-public sbcl-aserve
+ ;; There does not seem to be proper releases.
+ (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5")
+ (revision "2"))
(package
- (name "sbcl-uax-14")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-aserve")
+ (version (git-version "1.2.50" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/uax-14")
+ ;; https://github.com/franzinc/aserve/ seems to be incompatible
+ ;; with SBCL, etc.
+ (url "git://git.code.sf.net/p/portableaserve/git")
(commit commit)))
- (file-name (git-file-name "uax-14" version))
+ (file-name (git-file-name "aserve" version))
(sha256
- (base32 "1sb2s58k01yjaggaq8i7kbyfsh6mzyqbiz1vm59smxn9qqwd8apm"))))
+ (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"))
+ (patches (search-patches
+ ;; Add HTML5 elements to htmlgen.
+ ;; Adapted from https://github.com/franzinc/aserve/ commits:
+ ;; * e47bd763: "rfe12668: add HTML 5 elements to htmlgen"
+ ;; * 7371ce59: "fix bugs in rfe12668 implementation"
+ "sbcl-aserve-add-HTML-5-elements.patch"
+ "sbcl-aserve-fix-rfe12668.patch"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute sbcl-cl-ppcre))
- (inputs
- (list sbcl-documentation-utils))
(arguments
- `(#:asd-systems '("uax-14")))
- (home-page "https://shinmera.github.io/uax-14/")
- (synopsis "Unicode Standard Annex #14 for standardised line breaking")
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'cd-aserve
+ (lambda _
+ (chdir "aserve")
+ #t))
+ (add-after 'cd-aserve 'fix-asd
+ (lambda _
+ (substitute* "aserve.asd"
+ ((" :force t") ""))
+ #t))
+ (add-after 'cd-aserve 'fix-tests
+ (lambda _
+ (substitute* "test/t-aserve.cl"
+ (("\\(asdf:oos 'asdf:load-op :ptester\\)") ""))
+ #t)))))
+ (inputs
+ `(("acl-compat" ,sbcl-acl-compat)))
+ (home-page
+ "https://franz.com/support/documentation/current/doc/aserve/aserve.html")
+ (synopsis "AllegroServe, a web server written in Common Lisp")
(description
- "This is an implementation of the Unicode Standards Annex
-#14 (@url{http://www.unicode.org/reports/tr14/}) line breaking algorithm. It
-provides a fast and convenient way to determine line breaking opportunities in
-text.
-
-Note that this algorithm does not support break opportunities that require
-morphological analysis. In order to handle such cases, please consult a system
-that provides this kind of capability, such as a hyphenation algorithm.
-
-Also note that this system is completely unaware of layouting decisions. Any
-kind of layouting decisions, such as which breaks to pick, how to space
-between words, how to handle bidirectionality, and what to do in emergency
-situations when there are no breaks on an overfull line are left up to the
-user.")
- (license license:zlib))))
-
-(define-public ecl-uax-14
- (sbcl-package->ecl-package sbcl-uax-14))
-
-(define-public cl-uax-14
- (sbcl-package->cl-source-package sbcl-uax-14))
-
-(define-public sbcl-uax-15
- (package
- (name "sbcl-uax-15")
- (version "0.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sabracrolleton/uax-15")
- (commit (string-append "v" version))))
- (file-name (git-file-name "uax-15" version))
- (sha256
- (base32 "0p2ckw7mzxhwa9vbwj2q2dzayz9dl94d9yqd2ynp0pc5v8i0n2fr"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems
- '("uax-15")))
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("split-sequence" ,sbcl-split-sequence)))
- (home-page "https://github.com/sabracrolleton/uax-15")
- (synopsis "Common Lisp implementation of unicode normalization functions")
- (description
- "This package provides supports for unicode normalization, RFC8264 and
-RFC7564.")
- (license license:expat)))
-
-(define-public cl-uax-15
- (sbcl-package->cl-source-package sbcl-uax-15))
-
-(define-public ecl-uax-15
- (sbcl-package->ecl-package sbcl-uax-15))
-
-(define-public sbcl-cl-unicode
- (package
- (name "sbcl-cl-unicode")
- (version "0.1.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/edicl/cl-unicode")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-flexi-streams))
- (inputs
- (list sbcl-cl-ppcre))
- (home-page "http://weitz.de/cl-unicode/")
- (synopsis "Portable Unicode library for Common Lisp")
- (description "CL-UNICODE is a portable Unicode library Common Lisp, which
-is compatible with perl. It is pretty fast, thread-safe, and compatible with
-ANSI-compliant Common Lisp implementations.")
- (license license:bsd-2)))
-
-(define-public ecl-cl-unicode
- (sbcl-package->ecl-package sbcl-cl-unicode))
-
-(define-public cl-unicode
- (sbcl-package->cl-source-package sbcl-cl-unicode))
-
-(define-public sbcl-cl-ppcre-unicode
- (package (inherit sbcl-cl-ppcre)
- (name "sbcl-cl-ppcre-unicode")
- (inputs
- (list sbcl-cl-ppcre sbcl-cl-unicode))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-ppcre
- ;; cl-ppcre and cl-ppcre-unicode are put in different packages
- ;; to work around the circular dependency between edicl/cl-ppcre
- ;; and edicl/cl-unicode.
- (lambda _
- (delete-file "cl-ppcre.asd")
- #t)))))))
-
-(define-public cl-ppcre-unicode
- (sbcl-package->cl-source-package sbcl-cl-ppcre-unicode))
-
-(define-public ecl-cl-ppcre-unicode
- (sbcl-package->ecl-package sbcl-cl-ppcre-unicode))
-
-(define-public sbcl-zpb-ttf
- (package
- (name "sbcl-zpb-ttf")
- (version "1.0.6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xach/zpb-ttf")
- (commit (string-append "release-" version))))
- (file-name (git-file-name "cl-zpb-ttf" version))
- (sha256
- (base32 "043xga76jms7dipcwnyh8lkj3gx66cvrkwhc728hjaf7axarvcmv"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/xach/zpb-ttf")
- (synopsis "TrueType font file access for Common Lisp")
- (description
- "ZPB-TTF is a TrueType font file parser that provides an interface for
-reading typographic metrics, glyph outlines, and other information from the
-file.")
- (license license:bsd-2)))
-
-(define-public ecl-zpb-ttf
- (sbcl-package->ecl-package sbcl-zpb-ttf))
+ "The server part of AllegroServe can be used either as a standalone web
+server or a module loaded into an application to provide a user interface to
+the application. AllegroServe's proxy ability allows it to run on the gateway
+machine between some internal network and the Internet. AllegroServe's client
+functions allow Lisp programs to explore the web.")
+ (license license:llgpl))))
-(define-public cl-zpb-ttf
- (sbcl-package->cl-source-package sbcl-zpb-ttf))
+(define-public cl-aserve
+ (sbcl-package->cl-source-package sbcl-aserve))
-(define-public sbcl-zip
- ;; named branch is outdated
- (let ((commit "688b1545dd7a4fe355556768bb03f8bd9b847a87")
- (revision "1"))
+(define-public sbcl-asn1
+ (let ((commit "b0388fa98878b20069ef266cc9cbd5aac13c4a69")
+ (revision "0"))
(package
- (name "sbcl-zip")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-asn1")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1.0" revision commit))
+ (home-page "https://github.com/fukamachi/asn1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bluelisp/zip")
+ (url home-page)
(commit commit)))
+ (file-name (git-file-name "cl-asn1" version))
(sha256
- (base32 "0s08a6fq182fzsbfyvihqbdllq6gxcwkvphxnrd9wwz65dhg5y66"))
- (file-name (git-file-name "cl-zip" version))))
- (build-system asdf-build-system/sbcl)
+ (base32 "16gs4xznmg19ii0cg7g2yxrk9ls5vah8ynjj80s99rv8wi3789z1"))))
+ (native-inputs (list sbcl-cl-base64 sbcl-rove))
(inputs
- (list sbcl-babel
- sbcl-cl-fad
- sbcl-salza2
- sbcl-trivial-gray-streams))
- (synopsis "Zip library written in Common Lisp")
- (description "This package provide a Common Lisp library for .zip-file
-reading and writing.")
- (home-page "https://zip.common-lisp.dev")
- (license (list license:bsd-2 license:llgpl)))))
+ (list sbcl-trivia
+ sbcl-fast-io
+ sbcl-ironclad))
+ (synopsis "ASN.1 decoder for Common Lisp")
+ (description "This package provides an ASN.1 encoder/decoder for
+Common Lisp.")
+ (license license:bsd-2))))
-(define-public ecl-zip
- (sbcl-package->ecl-package sbcl-zip))
+(define-public cl-asn1
+ (sbcl-package->cl-source-package sbcl-asn1))
-(define-public cl-zip
- (sbcl-package->cl-source-package sbcl-zip))
+(define-public ecl-asn1
+ (sbcl-package->ecl-package sbcl-asn1))
-(define-public sbcl-zippy
- (let ((commit "ed9bca591ded2ff27a9ac95d9a60827773a0e707")
+(define-public sbcl-assoc-utils
+ (let ((commit "74af16a3c0f10ad35e406167de02984744fc7854")
(revision "1"))
(package
- (name "sbcl-zippy")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-assoc-utils")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/zippy/")
+ (url "https://github.com/fukamachi/assoc-utils")
(commit commit)))
+ (file-name (git-file-name "cl-assoc-utils" version))
(sha256
- (base32 "16cvyyf2nzd9r3fcy4w6d5wh8n3x833wldmrxmnzd3k2xrkhzfl9"))
- (file-name (git-file-name "zippy" version))))
+ (base32 "1yac1v7zmdxj0p6rvwrrhyqvy7yjfhmqbchkwqhhr89gpjvvaick"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-documentation-utils
- sbcl-file-attributes
- sbcl-pathname-utils
- sbcl-alexandria
- sbcl-nibbles
- sbcl-babel
- sbcl-3bz
- sbcl-salza2))
- (synopsis "Fast zip archive library")
- (description "Zippy is a library for the PKWARE Zip archive format. It
-can read and write zip files. It features:
-
-@itemize
-@item archive inspection without extraction;
-@item Zip64 support;
-@item split archive support;
-@item PKWARE decryption;
-@item fast deflate decompression thanks to 3bz;
-@item operates on streams and vectors;
-@item can compress stream->stream;
-@item extensible for other encryption and compression mechanisms.
-@end itemize\n")
- (home-page "https://shinmera.github.io/zippy/")
- (license license:zlib))))
-
-(define-public ecl-zippy
- (sbcl-package->ecl-package sbcl-zippy))
-
-(define-public cl-zippy
- (sbcl-package->cl-source-package sbcl-zippy))
-
-(define-public sbcl-cl-vectors
- (package
- (name "sbcl-cl-vectors")
- (version "0.1.5")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://projects.tuxee.net/cl-vectors/"
- "files/cl-vectors-" version ".tar.gz"))
- (sha256
- (base32
- "04lhwi0kq8pkwhgd885pk80m1cp9sfvjjn5zj70s1dnckibhdmqh"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("zpb-ttf" ,sbcl-zpb-ttf)))
- (arguments
- '(#:asd-systems '("cl-vectors"
- "cl-paths"
- "cl-paths-ttf"
- "cl-aa"
- "cl-aa-misc")))
- (home-page "http://projects.tuxee.net/cl-vectors/")
- (synopsis "Create, transform and render anti-aliased vectorial paths")
- (description
- "This is a pure Common Lisp library to create, transform and render
-anti-aliased vectorial paths.")
- (license license:expat)))
+ (arguments
+ '(#:asd-systems '("assoc-utils-test" "assoc-utils")))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/fukamachi/assoc-utils")
+ (synopsis "Utilities for manipulating association lists in Common Lisp")
+ (description
+ "@code{assoc-utils} provides utilities for manipulating association
+lists in Common Lisp.")
+ (license license:public-domain))))
-(define-public ecl-cl-vectors
- (sbcl-package->ecl-package sbcl-cl-vectors))
+(define-public cl-assoc-utils
+ (sbcl-package->cl-source-package sbcl-assoc-utils))
-(define-public cl-vectors
- (sbcl-package->cl-source-package sbcl-cl-vectors))
+(define-public ecl-assoc-utils
+ (sbcl-package->ecl-package sbcl-assoc-utils))
-(define-public sbcl-spatial-trees
- ;; There have been no releases.
- (let ((commit "81fdad0a0bf109c80a53cc96eca2e093823400ba")
- (revision "1"))
+(define-public sbcl-atomichron
+ (let ((commit "5b3578bbad8c37ab559e56924d98c373efe11de5")
+ (revision "0"))
(package
- (name "sbcl-spatial-trees")
- (version (git-version "0" revision commit))
+ (name "sbcl-atomichron")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/spatial-trees")
+ (url "https://github.com/no-defun-allowed/atomichron")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-atomichron" version))
(sha256
- (base32
- "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"))))
+ (base32 "1fmmhb3pbv7j4d1cc02zv24bpd0kd2agfjjcj46w3gmv1bb0hva1"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; We cannot build "spatial-trees-viz" here because it depends on
- ;; mcclim which depends on spatial-trees. FIXME: Break the circle.
- '(#:asd-systems '("spatial-trees" "spatial-trees.nns")))
(inputs
- (list sbcl-alexandria sbcl-optima sbcl-iterate))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/rpav/spatial-trees")
- (synopsis "Dynamic index data structures for spatially-extended data")
+ (list sbcl-atomics sbcl-bordeaux-threads))
+ (home-page "https://github.com/no-defun-allowed/atomichron")
+ (synopsis "Atomic metering library for Common Lisp")
(description
- "Spatial-trees is a set of dynamic index data structures for
-spatially-extended data.")
- (license license:bsd-3))))
+ "@code{atomichron} is a Common Lisp library which implements a time
+meter which tracks how many times a form is evaluated, and how long evaluation
+takes. It uses atomic instructions so that meters will present correct
+results in the presence of multiple threads, while trying to minimize
+synchronization latency.")
+ (license license:bsd-2))))
-(define-public ecl-spatial-trees
- (sbcl-package->ecl-package sbcl-spatial-trees))
+(define-public cl-atomichron
+ (sbcl-package->cl-source-package sbcl-atomichron))
-(define-public cl-spatial-trees
- (sbcl-package->cl-source-package sbcl-spatial-trees))
+(define-public ecl-atomichron
+ (sbcl-package->ecl-package sbcl-atomichron))
-(define-public sbcl-flexichain
- ;; There are no releases.
- (let ((commit "9af644a6323f303a936a391b956babcbfe7b0c67")
+(define-public sbcl-atomics
+ ;; No release in years.
+ (let ((commit "b7477024894e322bff9c85e6d81e5e8d1d4eae59")
(revision "2"))
(package
- (name "sbcl-flexichain")
- (version (git-version "1.5.1" revision commit))
+ (name "sbcl-atomics")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Flexichain")
+ (url "https://github.com/Shinmera/atomics")
(commit commit)))
- (file-name (git-file-name "cl-flexichain" version))
+ (file-name (git-file-name "cl-atomics" version))
(sha256
- (base32 "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"))))
+ (base32 "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-trivial-garbage))
- (home-page "https://github.com/robert-strandh/Flexichain.git")
- (synopsis "Dynamically add elements to or remove them from sequences")
+ (list sbcl-documentation-utils))
+ (native-inputs
+ (list sbcl-parachute))
+ (home-page "https://shinmera.github.io/atomics/")
+ (synopsis "Common Lisp portability layer for atomic operations")
(description
- "This package provides an implementation of the flexichain protocol,
-allowing client code to dynamically add elements to, and delete elements from
-a sequence (or chain) of such elements.")
- (license license:lgpl2.1+))))
+ "This is a library for access to atomic operation primitives such as
+compare-and-swap. It aims to be a rather thin layer over what the
+implementations offer.")
+ (license license:zlib))))
-(define-public ecl-flexichain
- (sbcl-package->ecl-package sbcl-flexichain))
+(define-public cl-atomics
+ (sbcl-package->cl-source-package sbcl-atomics))
-(define-public cl-flexichain
- (sbcl-package->cl-source-package sbcl-flexichain))
+(define-public ecl-atomics
+ (sbcl-package->ecl-package sbcl-atomics))
-(define-public sbcl-cl-pdf
- (let ((commit "ee904a118a0f060279ad9d253a3e8e3997609213")
- (revision "3"))
+(define-public sbcl-authentic
+ (let ((commit "4e9194dda227b98f56dda1c2a2480efcc2d1f973")
+ (revision "2"))
(package
- (name "sbcl-cl-pdf")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-authentic")
+ (version (git-version "0.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mbattyani/cl-pdf")
+ (url "https://github.com/charje/cl-authentic")
(commit commit)))
- (file-name (git-file-name "cl-pdf" version))
+ (file-name (git-file-name "cl-authentic" version))
(sha256
- (base32 "0j7hbqv6yzrgx0inqinpw8h22728l53ccciw6iymzz4g92j9fzlq"))))
+ (base32 "0ncsxrybnx0pjsndv3j8w4lphlpcsld8sxg3c5b46fb3a8nd4ssf"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-iterate sbcl-zpb-ttf))
- (arguments
- `(#:asd-systems '("cl-pdf" "cl-pdf-parser")))
- (home-page "https://github.com/mbattyani/cl-pdf")
- (synopsis "Common Lisp library for generating PDF files")
- (description
- "CL-PDF is a cross-platform Common Lisp library for generating PDF
-files.")
- (license license:bsd-2))))
+ (list sbcl-clsql sbcl-ironclad))
+ (home-page "https://github.com/charje/cl-authentic")
+ (synopsis "User/password management for Common Lisp applications")
+ (description "Authentic provides a light-weight and extendible
+solution to user/password management for Common Lisp applications. It has
+features such as safe password storage in a database, password reset, user
+confirmation tokens, and user authentication.")
+ (license license:llgpl))))
-(define-public ecl-cl-pdf
- (sbcl-package->ecl-package sbcl-cl-pdf))
+(define-public ecl-authentic
+ (sbcl-package->ecl-package sbcl-authentic))
-(define-public cl-pdf
- (sbcl-package->cl-source-package sbcl-cl-pdf))
+(define-public cl-authentic
+ (sbcl-package->cl-source-package sbcl-authentic))
-(define-public sbcl-clx
- (let ((commit "38400456d66823e417d1d27d339b09885e25eb59")
- (revision "1"))
+(define-public sbcl-babel
+ ;; No release since 2014.
+ (let ((commit "627d6a60d0ffc82a3687b39ba8a99128031504d9")
+ (revision "3"))
(package
- (name "sbcl-clx")
- (version (git-version "0.7.5" revision commit))
+ (name "sbcl-babel")
+ (version (git-version "0.5.0" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/sharplispers/clx")
- (commit commit)))
+ (uri (git-reference
+ (url "https://github.com/cl-babel/babel")
+ (commit commit)))
+ (file-name (git-file-name "cl-babel" version))
(sha256
- (base32 "1c05gjqh5lil2sgma0yap4mxd9y1cjkp933hyx1iaj14950nhfnl"))
- (file-name (git-file-name "cl-clx" version))))
+ (base32 "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiasco xorg-server-for-tests))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'prepare-test-environment
- (lambda _
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1"))))))
- (home-page "https://www.cliki.net/portable-clx")
- (synopsis "X11 client library for Common Lisp")
- (description "CLX is an X11 client library for Common Lisp. The code was
-originally taken from a CMUCL distribution, was modified somewhat in order to
-make it compile and run under SBCL, then a selection of patches were added
-from other CLXes around the net.")
- (license license:x11))))
+ (list sbcl-hu.dwim.stefil))
+ (inputs
+ (list sbcl-alexandria sbcl-trivial-features))
+ (home-page "https://common-lisp.net/project/babel/")
+ (synopsis "Charset encoding and decoding library")
+ (description "Babel is a charset encoding and decoding library, not unlike
+GNU libiconv, but completely written in Common Lisp.")
+ (license (list license:bsd-2 license:expat)))))
-(define-public cl-clx
- (sbcl-package->cl-source-package sbcl-clx))
+(define-public cl-babel
+ (sbcl-package->cl-source-package sbcl-babel))
-(define-public ecl-clx
- (sbcl-package->ecl-package sbcl-clx))
+(define-public ecl-babel
+ (sbcl-package->ecl-package sbcl-babel))
-(define-public sbcl-cl-wayland
- (let ((commit "a92a5084b64102f538ab90212e99c7863e5338ae")
- (revision "0"))
+(define-public sbcl-binary-types
+ (let ((commit "9ec42042a50403961c08179a892ae3de725b1d7a"))
(package
- (name "sbcl-cl-wayland")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-binary-types")
+ (version (git-version "1.2" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sdilts/cl-wayland")
+ (url "https://github.com/frodef/binary-types/")
(commit commit)))
- (file-name (git-file-name "cl-wayland" version))
+ (file-name (git-file-name "binary-types" version))
(sha256
- (base32 "1r4fn9dc0dz2b30k8z243yacx1y5z21qk4zh2ildj7ak51qx53zf"))))
+ (base32 "0kp4xwblfxh7gmgqc38k9xzrqlcr0q1jm5167ma1pajdxd3182j8"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "wayland-server-core.lisp"
- (("libwayland-server.so")
- (search-input-file inputs
- "/lib/libwayland-server.so"))))))))
- (inputs
- (list sbcl-cffi
- sbcl-closer-mop
- wayland))
- (home-page "https://github.com/sdilts/cl-wayland")
- (synopsis "Common Lisp FFI bindings for libwayland")
+ (home-page "https://github.com/frodef/binary-types/")
+ (synopsis "Read and write binary records for Common Lisp")
(description
- "This package provides Common Lisp FFI bindings for libwayland,
-primarily for the mahogany window manager.")
+ "Binary-types is a Common Lisp package for reading and writing binary
+files. Binary-types provides macros that are used to declare the mapping
+between Lisp objects and some binary (i.e. octet-based) representation.")
(license license:bsd-3))))
-(define-public cl-wayland
- (sbcl-package->cl-source-package sbcl-cl-wayland))
+(define-public cl-binary-types
+ (sbcl-package->cl-source-package sbcl-binary-types))
-(define-public ecl-cl-wayland
- (sbcl-package->ecl-package sbcl-cl-wayland))
+(define-public ecl-binary-types
+ (sbcl-package->ecl-package sbcl-binary-types))
-(define-public sbcl-clx-truetype
- (let ((commit "c6e10a918d46632324d5863a8ed067a83fc26de8")
+(define-public sbcl-binascii
+ (let ((commit "0fb0a9e5773148fd04d50efef08c1cc10f6fc487")
(revision "1"))
(package
- (name "sbcl-clx-truetype")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-binascii")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/l04m33/clx-truetype")
+ (url "https://github.com/sharplispers/binascii")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-binascii" version))
(sha256
- (base32
- "079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37"))
+ (base32 "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"))
(modules '((guix build utils)))
(snippet
+ ;; Unbundle the RT test framework.
'(begin
- (substitute* "package.lisp"
- ((":export") ":export\n :+font-cache-filename+"))
- #t))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-clx
- sbcl-zpb-ttf
- sbcl-cl-vectors
- sbcl-cl-fad
- sbcl-cl-store
- sbcl-trivial-features))
- (home-page "https://github.com/l04m33/clx-truetype")
- (synopsis "Antialiased TrueType font rendering using CLX and XRender")
- (description "CLX-TrueType is pure common lisp solution for
-antialiased TrueType font rendering using CLX and XRender extension.")
- (license license:expat))))
-
-(define-public cl-clx-truetype
- (sbcl-package->cl-source-package sbcl-clx-truetype))
-
-(define-public ecl-clx-truetype
- (sbcl-package->ecl-package sbcl-clx-truetype))
-
-(define-public sbcl-slynk
- ;; Update together with emacs-sly.
- (let ((commit "9c43bf65b967e12cef1996f1af5f0671d8aecbf4")
- (revision "9"))
- (package
- (name "sbcl-slynk")
- (version (git-version "1.0.43" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/joaotavora/sly")
- (commit commit)))
- (sha256
- (base32 "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2"))
- (file-name (git-file-name "cl-slynk" version))))
+ (delete-file "tests/rt.lisp")
+ (substitute* "binascii.asd"
+ ((":depends-on \\(binascii\\)")
+ ":depends-on (binascii rt)")
+ (("\\(:file \"rt\"\\)")
+ "")
+ (("\\(:file \"tests\" :depends-on \\(\"rt\"\\)\\)")
+ "(:file \"tests\")"))))))
(build-system asdf-build-system/sbcl)
- (outputs '("out" "image"))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'create-asdf-configuration 'build-image
- (lambda* (#:key outputs #:allow-other-keys)
- (build-image (string-append
- (assoc-ref outputs "image")
- "/bin/slynk")
- outputs
- #:dependencies '("slynk"
- "slynk/arglists"
- "slynk/fancy-inspector"
- "slynk/package-fu"
- "slynk/mrepl"
- "slynk/trace-dialog"
- "slynk/profiler"
- "slynk/stickers"
- "slynk/indentation"
- "slynk/retro"))
- #t)))))
- (synopsis "Common Lisp IDE for Emacs")
- (description "SLY is a fork of SLIME, an IDE backend for Common Lisp.
-It also features a completely redesigned REPL based on Emacs's own
-full-featured @code{comint-mode}, live code annotations, and a consistent interactive
-button interface. Everything can be copied to the REPL. One can create
-multiple inspectors with independent history.")
- (home-page "https://github.com/joaotavora/sly")
- (license license:public-domain)
- (properties `((cl-source-variant . ,(delay cl-slynk)))))))
-
-(define-public cl-slynk
- (sbcl-package->cl-source-package sbcl-slynk))
+ (native-inputs
+ (list sbcl-rt))
+ (home-page "https://github.com/sharplispers/binascii")
+ (synopsis "Common Lisp library of ASCII encoding schemes for binary data")
+ (description
+ "@code{binascii} is a Common Lisp library for converting binary data
+to ASCII text of some kind. Such conversions are common in email protocols
+(for encoding attachments to support old non-8-bit clean transports) or
+encoding binary data in HTTP and XML applications. @code{binascii} supports
+the encodings described in RFC 4648: base64, base32, base16, and variants.
+It also supports base85, used in Adobe's PostScript and PDF document formats,
+and a variant called ascii85, used by git for binary diff files.")
+ (license license:bsd-3))))
-(define-public ecl-slynk
- (let ((pkg (sbcl-package->ecl-package sbcl-slynk)))
- (package
- (inherit pkg)
- (outputs '("out"))
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'build-image))))))))
+(define-public cl-binascii
+ (sbcl-package->cl-source-package sbcl-binascii))
-(define-public sbcl-parse-js
- (let ((commit "fbadc6029bec7039602abfc06c73bb52970998f6")
- (revision "1"))
+(define-public sbcl-binding-arrows
+ ;; Fork of sbcl-arrows that does not have a new tag.
+ (let ((commit "46bcba8bb1ff27cd5caab3bda36f000d0489a4f2")
+ (revision "2"))
(package
- (name "sbcl-parse-js")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "http://marijn.haverbeke.nl/git/parse-js")
- (commit commit)))
- (file-name (git-file-name "cl-parse-js" version))
- (sha256
- (base32
- "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://marijnhaverbeke.nl/parse-js/")
- (synopsis "Parse JavaScript")
- (description "Parse-js is a Common Lisp package for parsing
-JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.")
- (license license:zlib))))
-
-(define-public cl-parse-js
- (sbcl-package->cl-source-package sbcl-parse-js))
-
-(define-public ecl-parse-js
- (sbcl-package->ecl-package sbcl-parse-js))
-
-(define-public sbcl-parse-number
- (package
- (name "sbcl-parse-number")
- (version "1.7")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/parse-number/")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://www.cliki.net/PARSE-NUMBER")
- (synopsis "Parse numbers")
- (description "@code{parse-number} is a library of functions for parsing
-strings into one of the standard Common Lisp number types without using the
-reader. @code{parse-number} accepts an arbitrary string and attempts to parse
-the string into one of the standard Common Lisp number types, if possible, or
-else @code{parse-number} signals an error of type @code{invalid-number}.")
- (license license:bsd-3)))
-
-(define-public cl-parse-number
- (sbcl-package->cl-source-package sbcl-parse-number))
-
-(define-public ecl-parse-number
- (sbcl-package->ecl-package sbcl-parse-number))
-
-(define-public sbcl-iterate
- (package
- (name "sbcl-iterate")
- (version "1.5.3")
- (source
- (origin
+ (name "sbcl-binding-arrows")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/iterate/iterate.git")
- (commit version)))
- (file-name (git-file-name "cl-iterate" version))
+ (url "https://github.com/phoe/binding-arrows")
+ (commit commit)))
+ (file-name (git-file-name "cl-binding-arrows" version))
(sha256
- (base32 "0l6l8fpgcpwpmi00jwmamxbspbqa8fil6dv11bf9gaxxbw41f8c2"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-rt))
- (home-page "https://common-lisp.net/project/iterate/")
- (synopsis "Iteration construct for Common Lisp")
- (description "@code{iterate} is an iteration construct for Common Lisp.
-It is similar to the @code{CL:LOOP} macro, with these distinguishing marks:
+ (base32 "0kzybw5qlb49czh9v2lnxniz9jzqx306a6lnarfv59x48a7cch22"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-hu.dwim.stefil))
+ (home-page "https://github.com/phoe/binding-arrows")
+ (synopsis "Threading macros based on binding anonymous variables")
+ (description
+ "This system implements binding threading macros -- a kind of threading
+macros with different semantics than classical, Clojure core threading macros
+or their extension, swiss-arrows. Two Common Lisp implementations of those are
+@code{arrows} and @code{arrow-macros}.
-@itemize
-@item it is extensible,
-@item it helps editors like Emacs indent iterate forms by having a more
- lisp-like syntax, and
-@item it isn't part of the ANSI standard for Common Lisp.
-@end itemize\n")
- (license license:expat)))
+This system is a fork of @code{arrows} with changes in semantics that make it
+impossible to merge back upstream.")
+ (license license:expat))))
-(define-public cl-iterate
- (sbcl-package->cl-source-package sbcl-iterate))
+(define-public ecl-binding-arrows
+ (sbcl-package->ecl-package sbcl-binding-arrows))
-(define-public ecl-iterate
- (sbcl-package->ecl-package sbcl-iterate))
+(define-public cl-binding-arrows
+ (sbcl-package->cl-source-package sbcl-binding-arrows))
-(define-public sbcl-charje.loop
- (package
- (name "sbcl-charje.loop")
- (version "0.0.0")
- (source
- (origin
+(define-public sbcl-binpack
+ (let ((commit "e67f56bb697bdeac81e28e1cca4a5d117a9cf125")
+ (revision "1"))
+ (package
+ (name "sbcl-binpack")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~charje/loop")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-charje.loop" version))
+ (url "https://github.com/lispgames/binpack")
+ (commit commit)))
+ (file-name (git-file-name "binpack" version))
(sha256
- (base32
- "1x1hw5xmrx9xmfzga8y0yi6s27r7zc80rwl2z7l4d2h24ykscvd4"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-binding-arrows
- sbcl-parse-declarations))
- (home-page "https://git.sr.ht/~charje/loop")
- (synopsis "Loop abstraction for Common Lisp that is consistent for
-different kinds of data")
- (description "Loop is a joy to use and has a consistent interface unlike
-other looping abstractions and ANSI list operations. You can define your own
-iterators and aggregators that integrate tightly into other operations. All
-operations are non-consing when possible.")
- (license license:agpl3+)))
+ (base32 "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-alexandria))
+ (home-page "https://github.com/lispgames/binpack")
+ (synopsis "Common Lisp rectangle packer for sprite/texture atlases")
+ (description
+ "This library features a rectangle packer for sprite and texture atlases.")
+ (license license:expat))))
-(define-public cl-charje.loop
- (sbcl-package->cl-source-package sbcl-charje.loop))
+(define-public cl-binpack
+ (sbcl-package->cl-source-package sbcl-binpack))
-(define-public ecl-charje.loop
- (sbcl-package->ecl-package sbcl-charje.loop))
+(define-public ecl-binpack
+ (sbcl-package->ecl-package sbcl-binpack))
-(define-public sbcl-cl-uglify-js
- ;; There have been many bug fixes since the 2010 release.
- (let ((commit "429c5e1d844e2f96b44db8fccc92d6e8e28afdd5")
- (revision "1"))
+(define-public sbcl-bit-smasher
+ ;; No release.
+ (let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9"))
(package
- (name "sbcl-cl-uglify-js")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-bit-smasher")
+ (version (git-version "1.0.2" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mishoo/cl-uglify-js")
+ (url "https://github.com/thephoeron/bit-smasher/")
(commit commit)))
- (file-name (git-file-name "cl-uglify-js" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a"))))
+ (base32 "0wjmwn06fjpw0rlpaksf3ab727p8fnzj58z7jajl3m0wqd4ii74w"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-parse-js sbcl-cl-ppcre sbcl-cl-ppcre-unicode
- sbcl-parse-number sbcl-iterate))
- (home-page "https://github.com/mishoo/cl-uglify-js")
- (synopsis "JavaScript compressor library for Common Lisp")
- (description "This is a Common Lisp version of UglifyJS, a JavaScript
-compressor. It works on data produced by @code{parse-js} to generate a
-@dfn{minified} version of the code. Currently it can:
-
-@itemize
-@item reduce variable names (usually to single letters)
-@item join consecutive @code{var} statements
-@item resolve simple binary expressions
-@item group most consecutive statements using the @code{sequence} operator (comma)
-@item remove unnecessary blocks
-@item convert @code{IF} expressions in various ways that result in smaller code
-@item remove some unreachable code
-@end itemize\n")
- (license license:zlib))))
-
-(define-public cl-uglify-js
- (sbcl-package->cl-source-package sbcl-cl-uglify-js))
-
-(define-public ecl-cl-uglify-js
- (sbcl-package->ecl-package sbcl-cl-uglify-js))
-
-(define-public uglify-js
- (package
- (inherit sbcl-cl-uglify-js)
- (name "uglify-js")
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (let* ((bin (string-append (assoc-ref %outputs "out") "/bin/"))
- (script (string-append bin "uglify-js")))
- (use-modules (guix build utils))
- (mkdir-p bin)
- (with-output-to-file script
- (lambda _
- (format #t "#!~a/bin/sbcl --script
-
- (require :asdf)
- (asdf:initialize-source-registry
- #p\"~a/etc/common-lisp/source-registry.conf.d/\")
- (asdf:initialize-output-translations
- #p\"~a/etc/common-lisp/asdf-output-translations.conf.d/\")"
- (assoc-ref %build-inputs "sbcl")
- (assoc-ref %build-inputs "sbcl-cl-uglify-js")
- (assoc-ref %build-inputs "sbcl-cl-uglify-js"))
- ;; FIXME: cannot use progn here because otherwise it fails to
- ;; find cl-uglify-js.
- (for-each
- write
- '(;; Quiet, please!
- (let ((*standard-output* (make-broadcast-stream))
- (*error-output* (make-broadcast-stream)))
- (asdf:load-system :cl-uglify-js))
- (let ((file (cadr *posix-argv*)))
- (if file
- (format t "~a"
- (cl-uglify-js:ast-gen-code
- (cl-uglify-js:ast-mangle
- (cl-uglify-js:ast-squeeze
- (with-open-file (in file)
- (parse-js:parse-js in))))
- :beautify nil))
- (progn
- (format *error-output*
- "Please provide a JavaScript file.~%")
- (sb-ext:exit :code 1))))))))
- (chmod script #o755)
- #t)))
- (inputs
- (list sbcl sbcl-cl-uglify-js))
- (synopsis "JavaScript compressor")))
-
-(define-public sbcl-cl-strings
- (let ((revision "1")
- (commit "93ec4177fc51f403a9f1ef0a8933f36d917f2140"))
- (package
- (name "sbcl-cl-strings")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/diogoalexandrefranco/cl-strings")
- (commit commit)))
- (sha256
- (base32 "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"))
- (file-name (git-file-name "cl-strings" version))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Set of utilities to manipulate strings in Common Lisp")
+ `(("cl-base64" ,sbcl-cl-base64)
+ ("cl-base58" ,sbcl-cl-base58)))
+ (home-page "https://github.com/thephoeron/bit-smasher/")
+ (synopsis "Handle bit vectors, bit vector arithmetic, and type conversions")
(description
- "@command{cl-strings} is a small, portable, dependency-free set of
-utilities that make it even easier to manipulate text in Common Lisp. It has
-100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.")
- (home-page "https://github.com/diogoalexandrefranco/cl-strings")
+ "Utility library for handling bit vectors, bit vector arithmetic, and
+universal integer type conversions between bit-vectors, byte-vectors, octals,
+decimals, and hexadecimal notation.")
(license license:expat))))
-(define-public cl-strings
- (sbcl-package->cl-source-package sbcl-cl-strings))
-
-(define-public ecl-cl-strings
- (sbcl-package->ecl-package sbcl-cl-strings))
-
-(define-public sbcl-trivial-features
- (package
- (name "sbcl-trivial-features")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/trivial-features/trivial-features")
- (commit (string-append "v" version))))
- (file-name (git-file-name "trivial-features" version))
- (sha256
- (base32 "0jsqah1znzqilxnw5vannb083ayk0d7phkackqzwwqkyg5hpn6pq"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(;; FIXME: Tests disabled because of a circular dependency between
- ;; trivial-features and cffi.
- #:tests? #f))
- ;; (native-inputs
- ;; `(("cffi" ,sbcl-cffi)))
- (home-page "https://cliki.net/trivial-features")
- (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp")
- (description "Trivial-features ensures that @code{*FEATURES*} is
-consistent across multiple Common Lisp implementations.")
- (license license:expat)))
-
-(define-public cl-trivial-features
- (sbcl-package->cl-source-package sbcl-trivial-features))
+(define-public cl-bit-smasher
+ (sbcl-package->cl-source-package sbcl-bit-smasher))
-(define-public ecl-trivial-features
- (sbcl-package->ecl-package sbcl-trivial-features))
+(define-public ecl-bit-smasher
+ (sbcl-package->ecl-package sbcl-bit-smasher))
-(define-public sbcl-harmony
- (let ((commit "0b57483cc0341936c201b620f82a8542c606991f")
- (revision "0"))
+(define-public sbcl-bknr-datastore
+ (let ((commit "c98d44f47cc88d19ff91ca3eefbd9719a8ace022")
+ (revision "1"))
(package
- (name "sbcl-harmony")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-bknr-datastore")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/harmony")
+ (url "https://github.com/hanshuebner/bknr-datastore")
(commit commit)))
- (file-name (git-file-name "cl-harmony" version))
+ (file-name (git-file-name "bknr-datastore" version))
(sha256
- (base32 "0pqmfi3yi3gi7b7dyayrb621hp60rn7hasq0cl0fis3vg0fp5dja"))))
+ (base32 "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems
+ '("bknr.datastore"
+ "bknr.impex"
+ "bknr.indices"
+ "bknr.skip-list"
+ "bknr.utils"
+ "bknr.xml")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'enter-source-directory
+ (lambda _
+ (chdir "src")
+ #t)))))
+ (native-inputs
+ `(("cl-store" ,sbcl-cl-store)
+ ("fiveam" ,sbcl-fiveam)
+ ("unit-test" ,sbcl-unit-test)))
(inputs
- (list sbcl-atomics
- sbcl-bordeaux-threads
- sbcl-cl-mixed
- sbcl-stealth-mixin
- sbcl-trivial-features))
- (home-page "https://shirakumo.github.io/harmony/")
- (synopsis "Common Lisp sound server and sound processing library")
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("cl-interpol" ,sbcl-cl-interpol)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cxml" ,sbcl-cxml)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("md5" ,sbcl-md5)
+ ("trivial-utf-8" ,sbcl-trivial-utf-8)
+ ("yason" ,sbcl-yason)))
+ (home-page "https://github.com/hanshuebner/bknr-datastore")
+ (synopsis "In-memory database for Common Lisp")
(description
- "HARMONY is a library that provides you with audio processing tools as
-well as an audio server to play back music, sfx, and so forth. It is most
-suited for use in a game engine, but may feasibly also be used for more
-advanced things such as a DAW")
- (license license:zlib))))
+ "BKNR.DATASTORE is an in-memory CLOS based database with transactions
+for Common Lisp.")
+ (license license:bsd-0))))
-(define-public ecl-harmony
- (sbcl-package->ecl-package sbcl-harmony))
+(define-public cl-bknr-datastore
+ (sbcl-package->cl-source-package sbcl-bknr-datastore))
-(define-public cl-harmony
- (sbcl-package->cl-source-package sbcl-harmony))
+;; NOTE: (Sharlatan-20210429T191426+0100):
+;; There is no port for ECL in upstream yet
+;; (define-public ecl-bknr-datastore
+;; (sbcl-package->ecl-package sbcl-bknr-datastore))
-(define-public sbcl-hu.dwim.asdf
- (let ((commit "67cdf84390e530af4303cc4bc815fdf2a5e48f59"))
+(define-public sbcl-blackbird
+ (let ((commit "d361f81c1411dec07f6c2dcb11c78f7aea9aaca8")
+ (revision "1"))
(package
- (name "sbcl-hu.dwim.asdf")
- (version "20200724")
+ (name "sbcl-blackbird")
+ (version (git-version "0.5.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hu-dwim/hu.dwim.asdf")
+ (url "https://github.com/orthecreedence/blackbird")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "0p81jalilkaqw832a12s35q0z6rrarxjasm1jy6h4fvyj9pf0zkx"))))
+ "0xfds5yaya64arzr7w1x38karyz11swzbhxx1afldpradj9dh19c"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
- (synopsis "Extensions to ASDF")
- (description "Various ASDF extensions such as attached test and
-documentation system, explicit development support, etc.")
- (license license:public-domain))))
+ (inputs
+ (list sbcl-vom))
+ (native-inputs
+ (list sbcl-cl-async sbcl-fiveam))
+ (synopsis "Promise implementation for Common Lisp")
+ (description
+ "This is a standalone promise implementation for Common Lisp. It is
+the successor to the now-deprecated cl-async-future project.")
+ (home-page "https://orthecreedence.github.io/blackbird/")
+ (license license:expat))))
-(define-public cl-hu.dwim.asdf
- (sbcl-package->cl-source-package sbcl-hu.dwim.asdf))
+(define-public cl-blackbird
+ (sbcl-package->cl-source-package sbcl-blackbird))
-(define-public ecl-hu.dwim.asdf
- (sbcl-package->ecl-package sbcl-hu.dwim.asdf))
+(define-public ecl-blackbird
+ (sbcl-package->ecl-package sbcl-blackbird))
-(define-public sbcl-hu.dwim.graphviz
- (let ((commit "31522ca8b9a04d535b7cec20ef24d8bf3b26d52b")
- (revision "1"))
+(define-public sbcl-bobbin
+ (let ((commit "b454e8241b24ceab674eeeae464c8082b1b6d8ce")
+ (revision "0"))
(package
- (name "sbcl-hu.dwim.graphviz")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-bobbin")
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hu-dwim/hu.dwim.graphviz")
+ (url "https://github.com/sjl/bobbin")
(commit commit)))
- (file-name (git-file-name "cl-hu.dwim.graphviz" version))
+ (file-name (git-file-name "cl-bobbin" version))
(sha256
- (base32 "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"))))
+ (base32 "02lw7w8cbvnxw5acbz405rb5lcqsf4fx7dvj5ldr0lhgbyv1mjnm"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-graphviz-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "source/package.lisp"
- (("libgvc.so")
- (search-input-file inputs "/lib/libgvc.so"))))))))
(native-inputs
- (list sbcl-hu.dwim.common sbcl-hu.dwim.stefil))
+ (list sbcl-1am))
(inputs
- (list graphviz sbcl-cffi sbcl-metabang-bind))
- (home-page "https://github.com/hu-dwim/hu.dwim.graphviz")
- (synopsis "Graphviz layouting using CFFI bindings")
+ (list sbcl-split-sequence))
+ (home-page "https://docs.stevelosh.com/bobbin/")
+ (synopsis "Simple (word) wrapping utilities for strings")
(description
- "This package provides CFFI bindings to the Graphviz library in Common
-Lisp.")
- (license license:public-domain))))
+ "Bobbin is a simple word-wrapping library for strings in Common Lisp.
+It aims to be simple, work nicely for the majority of cases, and degrade
+gracefully for edge cases. It is not particularly concerned with speed — if
+you need very high-performance word wrapping, Bobbin is not for you.")
+ (license license:expat))))
-(define-public cl-hu.dwim.graphviz
- (sbcl-package->cl-source-package sbcl-hu.dwim.graphviz))
+(define-public cl-bobbin
+ (sbcl-package->cl-source-package sbcl-bobbin))
-(define-public ecl-hu.dwim.graphviz
- (sbcl-package->ecl-package sbcl-hu.dwim.graphviz))
+(define-public ecl-bobbin
+ (sbcl-package->ecl-package sbcl-bobbin))
-(define-public sbcl-cl-dot
- (let ((commit "73dfbb6e015a28ebed873266e4e8190e509b43de")
+(define-public sbcl-bodge-blobs-support
+ (let ((commit "c5034ca5f4fc3a44dbadeba215a09afd59a404b0")
+ (revision "1"))
+ (package
+ (name "sbcl-bodge-blobs-support")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/borodust/bodge-blobs-support")
+ (commit commit)))
+ (file-name (git-file-name "bodge-blobs-support" version))
+ (sha256
+ (base32 "02nd1x6y1akp1ymv1y4z9ympwbnpd1drwi4f86xbjszxqff6jyj8"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-trivial-features))
+ (inputs
+ (list sbcl-cffi sbcl-alexandria))
+ (home-page "https://github.com/borodust/bodge-blobs-support")
+ (synopsis "Common Lisp utilities for blob packages")
+ (description
+ "This is a Common Lisp library for simplifying packaging and loading of
+compiled foreign library collection.")
+ (license license:unlicense))))
+
+(define-public cl-bodge-blobs-support
+ (sbcl-package->cl-source-package sbcl-bodge-blobs-support))
+
+(define-public ecl-bodge-blobs-support
+ (sbcl-package->ecl-package sbcl-bodge-blobs-support))
+
+(define-public sbcl-bodge-math
+ (let ((commit "9159b7faf88d440024c07110dbef2abddb20b9af")
+ (revision "1"))
+ (package
+ (name "sbcl-bodge-math")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/borodust/bodge-math")
+ (commit commit)))
+ (file-name (git-file-name "bodge-math" version))
+ (sha256
+ (base32 "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-bodge-utilities sbcl-rtg-math))
+ (home-page "https://github.com/borodust/bodge-math")
+ (synopsis "Common Lisp core math utilities of BODGE library collection")
+ (description
+ "This Common Lisp package contains the core math utilities of the
+@emph{Bodge} library collection.")
+ (license license:expat))))
+
+(define-public ecl-bodge-math
+ (sbcl-package->ecl-package sbcl-bodge-math))
+
+(define-public cl-bodge-math
+ (sbcl-package->cl-source-package sbcl-bodge-math))
+
+(define-public sbcl-bodge-queue
+ (let ((commit "948c9a501dcd412689952d09eb7453ec2722336a")
(revision "0"))
(package
- (name "sbcl-cl-dot")
- (version (git-version "0.9.0" revision commit))
+ (name "sbcl-bodge-queue")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/michaelw/cl-dot")
+ (url "https://github.com/borodust/bodge-queue")
(commit commit)))
- (file-name (git-file-name "cl-dot" version))
+ (file-name (git-file-name "bodge-queue" version))
(sha256
- (base32 "0mcvzqfcg5rzr8rz8aa2yr2jl3ifflaksvps08zj71hbhiacqpxa"))))
+ (base32 "148hjikqk8v2m30mj15xh89zni6szf9z3prav580qk9dqr8djjdr"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/michaelw/cl-dot")
- (synopsis "Generate Graphviz dot output from arbitrary Lisp data")
- (description
- "CL-DOT is a Common Lisp library for generating Graphviz dot output from
-arbitrary Lisp data.")
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/borodust/bodge-queue")
+ (synopsis "Simple queue for Common Lisp")
+ (description "This Common Lisp library provides a simple FIFO
+implementation with no external dependencies.")
(license license:expat))))
-(define-public cl-dot
- (sbcl-package->cl-source-package sbcl-cl-dot))
+(define-public cl-bodge-queue
+ (sbcl-package->cl-source-package sbcl-bodge-queue))
-(define-public ecl-cl-dot
- (sbcl-package->ecl-package sbcl-cl-dot))
+(define-public ecl-bodge-queue
+ (sbcl-package->ecl-package sbcl-bodge-queue))
-(define-public sbcl-cl-graph
- (let ((commit "c617de35390cb02db88bc5b5febffafdb8947ae8")
- (revision "2"))
+(define-public sbcl-bodge-utilities
+ (let ((commit "6304bac4abe06d53579e2c0fc4437d14ff077d9f")
+ (revision "1"))
(package
- (name "sbcl-cl-graph")
- (version (git-version "0.10.2" revision commit))
+ (name "sbcl-bodge-utilities")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/borodust/bodge-utilities")
+ (commit commit)))
+ (file-name (git-file-name "bodge-utilities" version))
+ (sha256
+ (base32 "1z1blj05q71vzh323qwyn9p3xs7v0mq2yhwfyzza5libp37wqm3c"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cffi
+ sbcl-claw
+ sbcl-dissect
+ sbcl-local-time
+ sbcl-log4cl
+ sbcl-split-sequence
+ sbcl-static-vectors
+ sbcl-trivial-gray-streams))
+ (home-page "https://github.com/borodust/bodge-utilities")
+ (synopsis "Common Lisp utilities library for CL-BODGE")
+ (description
+ "This Common Lisp library provides utilities for the @emph{Bodge} library
+collection.")
+ (license license:expat))))
+
+(define-public cl-bodge-utilities
+ (sbcl-package->cl-source-package sbcl-bodge-utilities))
+
+(define-public ecl-bodge-utilities
+ (sbcl-package->ecl-package sbcl-bodge-utilities))
+
+(define-public sbcl-boost-json
+ (let ((commit "eca166f5ff1f10bad14e00b9fd5bf9fcf3691a47")
+ (revision "0"))
+ (package
+ (name "sbcl-boost-json")
+ (version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/cl-graph")
+ (url "https://github.com/cl-boost/json")
(commit commit)))
- (file-name (git-file-name "cl-graph" version))
+ (file-name (git-file-name "cl-boost-json" version))
(sha256
- (base32 "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf"))))
+ (base32 "12k0470899qsll2qixksxf2vrhjmskk3nzp1di9k04n1b29nrakd"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; TODO: (Sharlatan-20221118T215839+0000): Tests failed
- ;;
- ;; https://github.com/gwkkwg/cl-graph/issues/17
- ;;
- `(#:tests? #f
- #:asd-systems '("cl-graph" "cl-graph+hu.dwim.graphviz")))
- (native-inputs
- (list sbcl-lift sbcl-moptilities))
- (inputs
- (list sbcl-cl-containers
- sbcl-cl-mathstats
- sbcl-dynamic-classes
- sbcl-hu.dwim.graphviz
- sbcl-metabang-bind
- sbcl-metacopy
- sbcl-metatilities-base))
- (home-page "https://github.com/gwkkwg/cl-graph")
- (synopsis "Graph manipulation utilities for Common Lisp")
+ '(#:phases
+ (modify-phases %standard-phases
+ ;; See <https://github.com/cl-boost/json/pull/2>.
+ (add-after 'unpack 'fix-decode-symbol
+ (lambda _
+ (substitute* '("decode.lisp" "encode.lisp")
+ (("formfeed") "page")))))))
+ (home-page "https://github.com/cl-boost/json")
+ (synopsis "JSON encoding and decoding for Common Lisp")
(description
- "This package provides a Common Lisp library for manipulating graphs
-and running graph algorithms.")
- (license license:expat))))
+ "BOOST-JSON is a simple JSON parsing library for Common Lisp.")
+ (license license:asl2.0))))
-;; NOTE: (Sharlatan-20221118T214734+0000): No ECL supoort
-;;
-;; ecl-cl-graph
+(define-public cl-boost-json
+ (sbcl-package->cl-source-package sbcl-boost-json))
-(define-public cl-cl-graph
- (sbcl-package->cl-source-package sbcl-cl-graph))
+(define-public ecl-boost-json
+ (sbcl-package->ecl-package sbcl-boost-json))
-(define-public sbcl-babel
- ;; No release since 2014.
- (let ((commit "627d6a60d0ffc82a3687b39ba8a99128031504d9")
- (revision "3"))
+(define-public sbcl-boost-lexer
+ (let ((commit "139ca9e9580f890698deec05061e495376b7735a")
+ (revision "0"))
(package
- (name "sbcl-babel")
- (version (git-version "0.5.0" revision commit))
+ (name "sbcl-boost-lexer")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cl-babel/babel")
+ (url "https://github.com/cl-boost/lexer")
(commit commit)))
- (file-name (git-file-name "cl-babel" version))
+ (file-name (git-file-name "cl-boost-lexer" version))
(sha256
- (base32 "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380"))))
+ (base32 "01vsczb5cn62k2hkkn39xwh5fjn2x0b507n7afia98jnhhk3d5x4"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
(inputs
- (list sbcl-alexandria sbcl-trivial-features))
- (home-page "https://common-lisp.net/project/babel/")
- (synopsis "Charset encoding and decoding library")
- (description "Babel is a charset encoding and decoding library, not unlike
-GNU libiconv, but completely written in Common Lisp.")
- (license (list license:bsd-2 license:expat)))))
-
-(define-public cl-babel
- (sbcl-package->cl-source-package sbcl-babel))
-
-(define-public ecl-babel
- (sbcl-package->ecl-package sbcl-babel))
-
-(define-public sbcl-cl-yacc
- (package
- (name "sbcl-cl-yacc")
- (version "0.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jech/cl-yacc")
- (commit (string-append "cl-yacc-" version))))
- (sha256
- (base32
- "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib"))
- (file-name (string-append "cl-yacc-" version "-checkout"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("yacc")))
- (synopsis "LALR(1) parser generator for Common Lisp, similar in spirit to Yacc")
- (description
- "CL-Yacc is a LALR(1) parser generator for Common Lisp, similar in spirit
-to AT&T Yacc, Berkeley Yacc, GNU Bison, Zebu, lalr.cl or lalr.scm.
-
-CL-Yacc uses the algorithm due to Aho and Ullman, which is the one also used
-by AT&T Yacc, Berkeley Yacc and Zebu. It does not use the faster algorithm due
-to DeRemer and Pennello, which is used by Bison and lalr.scm (not lalr.cl).")
- (home-page "https://www.irif.fr/~jch//software/cl-yacc/")
- (license license:expat)))
+ (list sbcl-boost-re))
+ (home-page "https://github.com/cl-boost/lexer")
+ (synopsis "String tokenizing for Common Lisp")
+ (description
+ "BOOST-LEXER is a tokenizer for Common Lisp that makes heavy use of
+BOOST-RE.")
+ (license license:asl2.0))))
-(define-public cl-yacc
- (sbcl-package->cl-source-package sbcl-cl-yacc))
+(define-public cl-boost-lexer
+ (sbcl-package->cl-source-package sbcl-boost-lexer))
-(define-public ecl-cl-yacc
- (sbcl-package->ecl-package sbcl-cl-yacc))
+(define-public ecl-boost-lexer
+ (sbcl-package->ecl-package sbcl-boost-lexer))
-(define-public sbcl-eager-future2
- (let ((commit "54df8effd9d9eccac917509590286b5ac5f9cb30"))
+(define-public sbcl-boost-parse
+ (let ((commit "c8f7e536b950752f3e35003e7ee0446e0fd51b50")
+ (revision "0"))
(package
- (name "sbcl-eager-future2")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-boost-parse")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/vsedach/eager-future2.git")
+ (url "https://github.com/cl-boost/parse")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-boost-parse" version))
(sha256
- (base32
- "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"))))
+ (base32 "0djnp392n9wgpr9r2ycnwkglad5mn285yvr53jx3g7anm2p8r0vf"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-bordeaux-threads sbcl-trivial-garbage))
- (synopsis "Futures promises synchronization mechanism for Common Lisp")
+ (home-page "https://github.com/cl-boost/parse")
+ (synopsis "Monadic parsing for Common Lisp")
(description
- "Eager Future2 is a Common Lisp library that provides composable
-concurrency primitives that unify parallel and lazy evaluation, are integrated
-with the Common Lisp condition system, and have automatic resource
-management.")
- (home-page "https://gitlab.common-lisp.net/vsedach/eager-future2")
- (license license:lgpl3+))))
+ "BOOST-PARSE is a simple token parsing library for Common Lisp.")
+ (license license:asl2.0))))
-(define-public cl-eager-future2
- (sbcl-package->cl-source-package sbcl-eager-future2))
+(define-public cl-boost-parse
+ (sbcl-package->cl-source-package sbcl-boost-parse))
-(define-public ecl-eager-future2
- (sbcl-package->ecl-package sbcl-eager-future2))
+(define-public ecl-boost-parse
+ (sbcl-package->ecl-package sbcl-boost-parse))
-(define-public sbcl-easy-routes
- (let ((commit "7832f8bf3d07825b5eb967a2ef04da7c40c18248")
+(define-public sbcl-boost-re
+ (let ((commit "d279fc58abf76d0c40aa6cde42e17a0591bc2c5d")
(revision "0"))
(package
- (name "sbcl-easy-routes")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-boost-re")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/easy-routes")
+ (url "https://github.com/cl-boost/re")
(commit commit)))
- (file-name (git-file-name "cl-easy-routes" version))
+ (file-name (git-file-name "cl-boost-re" version))
(sha256
- (base32 "1banw54kz2llzb9h5sm47ckfc9l348m7qncm0npsy0w837rxkyzx"))))
+ (base32 "1h9c2rdhw6m1pm67gqbj46y2vb1kc3i1c9y3l4qhgfz14dbk80a2"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("easy-routes"
- "easy-routes+djula"
- "easy-routes+errors")))
- (native-inputs
- (list sbcl-stefil))
(inputs
- (list sbcl-djula
- sbcl-hunchentoot
- sbcl-hunchentoot-errors
- sbcl-routes))
- (home-page "https://github.com/mmontone/easy-routes/")
- (synopsis "Routes handling utility on top of Hunchentoot")
+ (list sbcl-boost-parse))
+ (home-page "https://github.com/cl-boost/re")
+ (synopsis "Lua-style string pattern matching for Common Lisp")
(description
- "EASY-ROUTES is yet another routes handling system on top of
-Hunchentoot. It's just glue code for Restas routing subsystem (CL-ROUTES).
-
-It supports:
-@itemize
-@item dispatch based on HTTP method
-@item arguments extraction from the url path
-@item decorators
-@item URL generation from route names
-@end itemize
-
-This package provides EASY-ROUTES, EASY-ROUTES+DJULA and EASY-ROUTES+ERRORS
-systems.")
- (license license:expat))))
+ "BOOST-RE is a small, portable, lightweight, and quick, regular
+expression library for Common Lisp. It is a non-recursive, backtracking VM.")
+ (license license:asl2.0))))
-(define-public cl-easy-routes
- (sbcl-package->cl-source-package sbcl-easy-routes))
+(define-public cl-boost-re
+ (sbcl-package->cl-source-package sbcl-boost-re))
-(define-public ecl-easy-routes
- (sbcl-package->ecl-package sbcl-easy-routes))
+(define-public ecl-boost-re
+ (sbcl-package->ecl-package sbcl-boost-re))
-(define-public sbcl-jpl-util
- (let ((commit "0311ed374e19a49d43318064d729fe3abd9a3b62"))
+(define-public sbcl-bordeaux-fft
+ (let ((commit "4a1f5600cae59bdabcb32de4ee2d7d73a9450d6e")
+ (revision "0"))
(package
- (name "sbcl-jpl-util")
- (version "20151005")
+ (name "sbcl-bordeaux-fft")
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- ;; Quicklisp uses this fork.
- (url "https://github.com/hawkir/cl-jpl-util")
+ (url "https://github.com/ahefner/bordeaux-fft")
(commit commit)))
- (file-name
- (git-file-name "jpl-util" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz"))))
+ (base32 "0j584w6kq2k6r8lp2i14f9605rxhp3r15s33xs08iz1pndn6iwqf"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Collection of Common Lisp utility functions and macros")
+ (home-page "http://vintage-digital.com/hefner/software/bordeaux-fft/")
+ (synopsis "Fast Fourier Transform for Common Lisp")
(description
- "@command{cl-jpl-util} is a collection of Common Lisp utility functions
-and macros, primarily for software projects written in CL by the author.")
- (home-page "https://www.thoughtcrime.us/software/cl-jpl-util/")
- (license license:isc))))
+ "The Bordeaux-FFT library provides a reasonably efficient implementation
+of the Fast Fourier Transform and its inverse for complex-valued inputs, in
+portable Common Lisp.")
+ (license license:gpl2+))))
-(define-public cl-jpl-util
- (sbcl-package->cl-source-package sbcl-jpl-util))
+(define-public cl-bordeaux-fft
+ (sbcl-package->cl-source-package sbcl-bordeaux-fft))
-(define-public ecl-jpl-util
- (sbcl-package->ecl-package sbcl-jpl-util))
+(define-public ecl-bordeaux-fft
+ (sbcl-package->ecl-package sbcl-bordeaux-fft))
-(define-public sbcl-piping
- (let ((commit "c7a4163c00dea7e72bf6ad33d6abac0d5826a656")
- (revision "1"))
+(define-public sbcl-bordeaux-threads
+ (package
+ (name "sbcl-bordeaux-threads")
+ (version "0.9.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sionescu/bordeaux-threads")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0pp3w5hsph47sqagr4j2pbg3ddb29jx93zg8kvxsp2c4flp0qz0f"))
+ (file-name (git-file-name "cl-bordeaux-threads" version))))
+ (inputs (list sbcl-alexandria
+ sbcl-global-vars
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (native-inputs (list sbcl-fiveam))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-test-sleep
+ (lambda _
+ ;; 0.001 is too short for some slower machines.
+ (substitute* '("test/tests-v1.lisp"
+ "test/tests-v2.lisp")
+ (("sleep 0\\.001") "sleep 0.002")))))))
+ (synopsis "Portable shared-state concurrency library for Common Lisp")
+ (description "BORDEAUX-THREADS is a proposed standard for a minimal
+MP/Threading interface. It is similar to the CLIM-SYS threading and lock
+support.")
+ (home-page "https://common-lisp.net/project/bordeaux-threads/")
+ (license license:x11)))
+
+(define-public cl-bordeaux-threads
+ (sbcl-package->cl-source-package sbcl-bordeaux-threads))
+
+(define-public ecl-bordeaux-threads
+ (sbcl-package->ecl-package sbcl-bordeaux-threads))
+
+(define-public sbcl-bst
+ (let ((commit "8545aed0d504df2829ad139566feeabe22305388")
+ (revision "0"))
(package
- (name "sbcl-piping")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-bst")
+ (version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/piping/")
+ (url "https://codeberg.org/glv/bst")
(commit commit)))
- (file-name (git-file-name "piping" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0in84qnfkynm36d4n4d6v87vprpi27xrydnga462wfhplji6klv5"))))
+ (base32 "18ig7rvxcra69437g0i8sxyv7c5dg26jqnx1rc2f9pxmihdprgk8"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://shinmera.github.io/piping/")
- (synopsis "Library to enable simple message pipelines")
+ (native-inputs
+ (list sbcl-alexandria sbcl-fiveam))
+ (synopsis "Binary search tree for Common Lisp")
(description
- "This is a Common Lisp library to enable simple message pipelines.")
- (license license:zlib))))
+ "BST is a Common Lisp library for working with binary search trees that
+can contain any kind of values.")
+ (home-page "https://codeberg.org/glv/bst")
+ (license license:gpl3))))
-(define-public ecl-piping
- (sbcl-package->ecl-package sbcl-piping))
+(define-public cl-bst
+ (sbcl-package->cl-source-package sbcl-bst))
-(define-public cl-piping
- (sbcl-package->cl-source-package sbcl-piping))
+(define-public ecl-bst
+ (sbcl-package->ecl-package sbcl-bst))
-(define-public sbcl-bobbin
- (let ((commit "b454e8241b24ceab674eeeae464c8082b1b6d8ce")
+(define-public sbcl-bubble-operator-upwards
+ (let ((commit "846275a318b960de81b62caecb1e31930f70aef6")
(revision "0"))
(package
- (name "sbcl-bobbin")
- (version (git-version "1.0.1" revision commit))
+ (name "sbcl-bubble-operator-upwards")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sjl/bobbin")
+ (url "https://github.com/Hexstream/bubble-operator-upwards")
(commit commit)))
- (file-name (git-file-name "cl-bobbin" version))
+ (file-name (git-file-name "cl-bubble-operator-upwards" version))
(sha256
- (base32 "02lw7w8cbvnxw5acbz405rb5lcqsf4fx7dvj5ldr0lhgbyv1mjnm"))))
+ (base32 "0ybsy29ms3yrxgr7f2146lr6z4vm070dvdyzvwwxjh4dgm9na7bi"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-1am))
- (inputs
- (list sbcl-split-sequence))
- (home-page "https://docs.stevelosh.com/bobbin/")
- (synopsis "Simple (word) wrapping utilities for strings")
+ (list sbcl-parachute))
+ (home-page "https://www.hexstreamsoft.com/libraries/bubble-operator-upwards/")
+ (synopsis "Function that bubbles an operator upwards in a form")
(description
- "Bobbin is a simple word-wrapping library for strings in Common Lisp.
-It aims to be simple, work nicely for the majority of cases, and degrade
-gracefully for edge cases. It is not particularly concerned with speed — if
-you need very high-performance word wrapping, Bobbin is not for you.")
- (license license:expat))))
+ "@code{bubble-operator-upwards} is a function that bubbles an operator
+upwards in a form, demultiplexing all alternative branches by way of
+cartesian product.")
+ (license license:unlicense))))
-(define-public cl-bobbin
- (sbcl-package->cl-source-package sbcl-bobbin))
+(define-public cl-bubble-operator-upwards
+ (sbcl-package->cl-source-package sbcl-bubble-operator-upwards))
-(define-public ecl-bobbin
- (sbcl-package->ecl-package sbcl-bobbin))
+(define-public ecl-bubble-operator-upwards
+ (sbcl-package->ecl-package sbcl-bubble-operator-upwards))
-(define-public sbcl-cl-pcg
- (let ((commit "8263d85ab0ca17fb05637a4430c2d564456bce8f")
- (revision "1"))
+(define-public sbcl-burgled-batteries3
+ (let ((commit "f65f454d13bb6c40e17e9ec62e41eb5069e09760")
+ (revision "2"))
(package
- (name "sbcl-cl-pcg")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-burgled-batteries3")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sjl/cl-pcg")
+ (url "https://github.com/snmsts/burgled-batteries3")
(commit commit)))
- (file-name (git-file-name "cl-pcg" version))
+ (file-name (git-file-name "cl-burgled-batteries3" version))
(sha256
- (base32 "0s57wvvlvshp1gcp9i9d3qcmqhswnxps3i0y7wbb0v8i1a3p46m4"))))
+ (base32
+ "1nzn7jawrfajyzwfnzrg2cmn9xxadcqh4szbpg0jggkhdkdzz4wa"))
+ (patches
+ (search-patches "sbcl-burgled-batteries3-fix-signals.patch"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #f
+ #:modules (((guix build python-build-system) #:select (python-version))
+ ,@%asdf-build-system-modules)
+ #:imported-modules ((guix build python-build-system)
+ ,@%asdf-build-system-modules)
+ #:phases
+ (modify-phases (@ (guix build asdf-build-system) %standard-phases)
+ (add-after 'unpack 'set-*cpython-include-dir*-var
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((python (assoc-ref inputs "python")))
+ (setenv "BB_PYTHON3_INCLUDE_DIR"
+ (string-append python "/include/python"
+ (python-version python)))
+ (setenv "BB_PYTHON3_DYLIB"
+ (string-append python "/lib/libpython3.so"))
+ #t)))
+ (add-after 'unpack 'adjust-for-python-3.10
+ (lambda _
+ ;; These methods are no longer part of the public API.
+ (substitute* "ffi-interface.lisp"
+ ((".*PyEval_ReInitThreads.*") "")
+ ((".*\"PyErr_Warn\".*") "")
+ ((".*\"PyFloat_ClearFreeList\".*") "")
+ ((".*\"PyParser_SimpleParseString\".*") "")
+ ((".*\"PyParser_SimpleParseStringFlags\".*") "")
+ ((".*\"PyParser_SimpleParseStringFlagsFilename\".*") "")
+ ((".*\"PyParser_SimpleParseFile\".*") "")
+ ((".*\"PyParser_SimpleParseFileFlags\".*") "")
+ ((".*\"PyLong_FromUnicode\".*") "")))))))
(native-inputs
- (list sbcl-1am))
- (home-page "https://github.com/sjl/cl-pcg")
- (synopsis "Permuted congruential generators in Common Lisp")
+ (list sbcl-cl-fad sbcl-lift sbcl-cl-quickcheck))
+ (inputs
+ (list python
+ sbcl-alexandria
+ sbcl-cffi
+ sbcl-parse-declarations
+ sbcl-trivial-garbage))
+ (synopsis "Bridge between Python and Lisp (FFI bindings, etc.)")
(description
- "This is a bare-bones Permuted Congruential Generator implementation in
-pure Common Lisp.")
+ "This package provides a shim between Python3 (specifically, the
+CPython implementation of Python) and Common Lisp.")
+ (home-page "https://github.com/snmsts/burgled-batteries3")
(license license:expat))))
-(define-public ecl-cl-pcg
- (let ((pkg (sbcl-package->ecl-package sbcl-cl-pcg)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; Tests are failing on ECL with:
- ;; PCG.TEST::TEST-REWINDAn error occurred during initialization:
- ;; 40502229875678917802724098623316930025 is not of type
- ;; (INTEGER 0 2305843009213693951)
- ((#:tests? _ #f) #f))))))
+(define-public cl-burgled-batteries3
+ (sbcl-package->cl-source-package sbcl-burgled-batteries3))
-(define-public cl-pcg
- (sbcl-package->cl-source-package sbcl-cl-pcg))
+(define-public ecl-burgled-batteries3
+ (sbcl-package->ecl-package sbcl-burgled-batteries3))
-(define-public sbcl-seedable-rng
- (let ((commit "aa1a1564b6e07e2698df37c7a98348c4f762cb15")
+(define-public sbcl-cache-while
+ (let ((commit "38e9ffbdb2c894670c366c1e5802ffcc8cfd43a7")
(revision "1"))
(package
- (name "sbcl-seedable-rng")
+ (name "sbcl-cache-while")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.mfiano.net/mfiano/seedable-rng")
+ (url "https://github.com/charje/cache-while")
(commit commit)))
- (file-name (git-file-name "seedable-rng" version))
+ (file-name (git-file-name "cache-while" version))
(sha256
- (base32 "1ldpsbp3qrfzvknclsxj3sdyms1jf9ad20dvh4w0kw3zgahn2nr5"))))
+ (base32 "1qil68rfn5irmkb0jk1f6g1zy80wgc3skl8cr4rfgh7ywgm5izx3"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-pcg sbcl-golden-utils sbcl-ironclad))
- (home-page "https://git.mfiano.net/mfiano/seedable-rng")
- (synopsis "Common Lisp random number generator")
+ (home-page "https://github.com/charje/cache-while")
+ (synopsis "Temporary / one-time caching macro for Common Lisp")
(description
- "SEEDABLE-RNG provides a convenient means of generating random numbers
-that are seedable with deterministic results across hardware and Common Lisp
-implementations.")
- (license license:expat))))
-
-(define-public ecl-seedable-rng
- (sbcl-package->ecl-package sbcl-seedable-rng))
-
-(define-public cl-seedable-rng
- (sbcl-package->cl-source-package sbcl-seedable-rng))
-
-(define-public sbcl-jpl-queues
- (package
- (name "sbcl-jpl-queues")
- (version "0.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://www.thoughtcrime.us/software/jpl-queues/jpl-queues-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("jpl-util" ,sbcl-jpl-util)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)))
- (arguments
- ;; Tests seem to be broken.
- `(#:tests? #f))
- (synopsis "Common Lisp library implementing a few different kinds of queues")
- (description
- "A Common Lisp library implementing a few different kinds of queues:
-
-@itemize
-@item Bounded and unbounded FIFO queues.
-@item Lossy bounded FIFO queues that drop elements when full.
-@item Unbounded random-order queues that use less memory than unbounded FIFO queues.
-@end itemize
-
-Additionally, a synchronization wrapper is provided to make any queue
-conforming to the @command{jpl-queues} API thread-safe for lightweight
-multithreading applications. (See Calispel for a more sophisticated CL
-multithreaded message-passing library with timeouts and alternation among
-several blockable channels.)")
- (home-page "https://www.thoughtcrime.us/software/jpl-queues/")
- (license license:isc)))
+ "This is a Common Lisp macro for defining temporary caches that
+invalidate based on expressions evaluating to different values.")
+ (license license:llgpl))))
-(define-public cl-jpl-queues
- (sbcl-package->cl-source-package sbcl-jpl-queues))
+(define-public cl-cache-while
+ (sbcl-package->cl-source-package sbcl-cache-while))
-(define-public ecl-jpl-queues
- (sbcl-package->ecl-package sbcl-jpl-queues))
+(define-public ecl-cache-while
+ (sbcl-package->ecl-package sbcl-cache-while))
(define-public sbcl-calispel
(let ((commit "e9f2f9c1af97f4d7bb4c8ac25fb2a8f3e8fada7a"))
@@ -3376,1894 +2672,1492 @@ Lisp.")
(define-public ecl-calm
(sbcl-package->ecl-package sbcl-calm))
-(define-public sbcl-esrap
- (let ((commit "d806138342a6b27327649fd5f36e0fe2e0966867")
- (revision "4"))
+(define-public sbcl-cambl
+ (let ((commit "7016d1a98215f82605d1c158e7a16504ca1f4636")
+ (revision "1"))
(package
- (name "sbcl-esrap")
- (version (git-version "0.18" revision commit))
+ (name "sbcl-cambl")
+ (version (git-version "4.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/scymtym/esrap")
+ (url "https://github.com/jwiegley/cambl")
(commit commit)))
- (file-name (git-file-name "cl-esrap" version))
+ (file-name (git-file-name "cambl" version))
(sha256
- (base32 "0gs0mfamldhaihnlk0qxg2q4bl8bamq68dif9js9fkl8apg3iykl"))))
+ (base32 "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
+ (list sbcl-xlunit))
(inputs
- (list sbcl-alexandria sbcl-trivial-with-current-source-form))
- (synopsis "Common Lisp packrat parser")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-containers" ,sbcl-cl-containers)
+ ("local-time" ,sbcl-local-time)
+ ("periods" ,sbcl-periods)))
+ (synopsis "Commoditized amounts and balances for Common Lisp")
(description
- "This is a packrat parser for Common Lisp.
-In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports:
-
-@itemize
-@item dynamic redefinition of nonterminals
-@item inline grammars
-@item semantic predicates
-@item introspective facilities (describing grammars, tracing, setting breaks)
-@item left-recursive grammars
-@item functions as terminals
-@item accurate, customizable parse error reports
-@end itemize\n")
- (home-page "https://scymtym.github.io/esrap/")
- (license license:expat))))
+ "CAMBL is a Common Lisp library providing a convenient facility for
+working with commoditized values. It does not allow compound units (and so is
+not suited for scientific operations) but does work rather nicely for the
+purpose of financial calculations.")
+ (home-page "https://github.com/jwiegley/cambl")
+ (license license:bsd-3))))
-(define-public cl-esrap
- (sbcl-package->cl-source-package sbcl-esrap))
+(define-public cl-cambl
+ (sbcl-package->cl-source-package sbcl-cambl))
-(define-public ecl-esrap
- (sbcl-package->ecl-package sbcl-esrap))
+(define-public ecl-cambl
+ (sbcl-package->ecl-package sbcl-cambl))
-(define-public sbcl-split-sequence
+(define-public sbcl-canonicalized-initargs
(package
- (name "sbcl-split-sequence")
- (version "2.0.1")
+ (name "sbcl-canonicalized-initargs")
+ (version "2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/split-sequence")
+ (url "https://github.com/Hexstream/canonicalized-initargs")
(commit (string-append "v" version))))
+ (file-name (git-file-name "cl-canonicalized-initargs" version))
(sha256
- (base32
- "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq"))
- (file-name (git-file-name "split-sequence" version))))
+ (base32 "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
- (synopsis "Member of the Common Lisp Utilities family of programs")
- (description
- "Splits sequence into a list of subsequences delimited by objects
-satisfying the test.")
- (home-page "https://cliki.net/split-sequence")
- (license license:expat)))
-
-(define-public cl-split-sequence
- (sbcl-package->cl-source-package sbcl-split-sequence))
-
-(define-public ecl-split-sequence
- (sbcl-package->ecl-package sbcl-split-sequence))
-
-(define-public sbcl-html-encode
- (package
- (name "sbcl-html-encode")
- (version "1.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-"
- version ".tgz"))
- (sha256
- (base32
- "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp library for encoding text in various web-savvy encodings")
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-cesdi
+ sbcl-closer-mop
+ sbcl-compatible-metaclasses
+ sbcl-enhanced-defclass
+ sbcl-enhanced-typep))
+ (home-page
+ "https://www.hexstreamsoft.com/libraries/canonicalized-initargs/")
+ (synopsis "Standard way to canonicalize slot values")
(description
- "A library for encoding text in various web-savvy encodings.")
- (home-page "https://quickdocs.org/html-encode/")
- (license license:expat)))
+ "This package provides a standard way to canonicalize slot values.")
+ (license license:unlicense)))
-(define-public cl-html-encode
- (sbcl-package->cl-source-package sbcl-html-encode))
+(define-public cl-canonicalized-initargs
+ (sbcl-package->cl-source-package sbcl-canonicalized-initargs))
-(define-public ecl-html-encode
- (sbcl-package->ecl-package sbcl-html-encode))
+(define-public ecl-canonicalized-initargs
+ (sbcl-package->ecl-package sbcl-canonicalized-initargs))
-(define-public sbcl-colorize
- (let ((commit "ea676b584e0899cec82f21a9e6871172fe3c0eb5"))
+(define-public sbcl-caveman
+ (let ((commit "35cd8bc6c322f9d88498405fc26168a1fb42ae1c") ; No release since 2012
+ (revision "2"))
(package
- (name "sbcl-colorize")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-caveman")
+ (version (git-version "2.4.0" revision commit))
+ (home-page "https://8arrow.org/caveman/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/kingcons/colorize")
+ (url "https://github.com/fukamachi/caveman/")
(commit commit)))
+ (file-name (git-file-name "cl-caveman" version))
(sha256
- (base32
- "1pdg4kiaczmr3ivffhirp7m3lbr1q27rn7dhaay0vwghmi31zcw9"))
- (file-name (git-file-name "colorize" version))))
+ (base32 "1wvjm9m1fnapg0r9imhhcwgnhhqkkccnj3c0iw9yg1f72d7zhm2w"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-split-sequence sbcl-html-encode))
- (synopsis "Common Lisp for syntax highlighting")
- (description
- "@command{colorize} is a Lisp library for syntax highlighting
-supporting the following languages: Common Lisp, Emacs Lisp, Scheme, Clojure,
-C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.")
- (home-page "https://github.com/kingcons/colorize")
- ;; TODO: Missing license?
- (license license:expat))))
+ `(("ningle" ,cl-ningle)
+ ("lack" ,sbcl-lack)
+ ("cl-project" ,sbcl-cl-project)
+ ("dbi" ,sbcl-dbi)
+ ("sxql" ,sbcl-sxql)
+ ("cl-syntax" ,sbcl-cl-syntax)
+ ("myway" ,sbcl-myway)
+ ("quri" ,sbcl-quri)))
+ (native-inputs
+ `(("usocket" ,sbcl-usocket)
+ ("dexador" ,sbcl-dexador)
+ ("lack" ,sbcl-lack)
+ ("trivial-types" ,sbcl-trivial-types)
+ ("prove" ,sbcl-prove)))
+ (arguments
+ `(#:asd-systems '("caveman2"
+ "caveman2-db"
+ "caveman2-test"
+ "caveman-middleware-dbimanager")
+ ;; TODO: Tests fail with:
+ ;; writing /gnu/store/...-sbcl-caveman-2.4.0-1.faa5f7e/share/common-lisp/sbcl-source/caveman2/v2/t/tmp/myapp573/tests/myapp573.lisp
+ ;; While evaluating the form starting at line 38, column 0
+ ;; of #P"/tmp/guix-build-sbcl-caveman-2.4.0-1.faa5f7e.drv-0/source/v2/t/caveman.lisp":
+ ;; Unhandled ASDF/FIND-COMPONENT:MISSING-COMPONENT in thread #<SB-THREAD:THREAD "main thread" RUNNING
+ ;; {10009F8083}>:
+ ;; Component "myapp573" not found
+ ;;
+ ;; The above myapp573 component name is randomly generated by
+ ;; gensym on each test run. `(asdf:load-system *app-name*)` tries
+ ;; to load this component and fails.
+ ;; TODO: Ask fukamachi how to go around this.
+ #:tests? #f))
+ (synopsis "Lightweight web application framework in Common Lisp")
+ (description "Caveman is intended to be a collection of common parts for
+web applications. Caveman2 has three design goals:
-(define-public cl-colorize
- (sbcl-package->cl-source-package sbcl-colorize))
+@itemize
+@item Be extensible.
+@item Be practical.
+@item Don't force anything.
+@end itemize\n")
+ (license license:llgpl))))
-(define-public ecl-colorize
- (sbcl-package->ecl-package sbcl-colorize))
+(define-public cl-caveman
+ (package
+ (inherit
+ (sbcl-package->cl-source-package sbcl-caveman))
+ (propagated-inputs
+ `(("ningle" ,cl-ningle)))))
-(define-public sbcl-3bmd
- (let ((commit "e68b2d442f29b4534c1c8e2f2cdf7583643a2fc5")
- (revision "4"))
+(define-public ecl-caveman
+ (sbcl-package->ecl-package sbcl-caveman))
+
+(define-public sbcl-cells
+ (let ((commit "e8542b17fddd6340c1e237ce482a52327c8ead8e"))
(package
- (name "sbcl-3bmd")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cells")
+ (version (git-version "3.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/3b/3bmd")
+ (url "https://github.com/kennytilton/cells")
(commit commit)))
+ (file-name (git-file-name "cl-cells" version))
(sha256
- (base32 "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"))
- (file-name (git-file-name "cl-3bmd" version))))
+ (base32 "0rkzvwq38lwb1045w54kw020pb9i63hxiawwhqkf8k1inhak3fdk"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems
- '("3bmd"
- "3bmd-ext-definition-lists"
- "3bmd-ext-math"
- "3bmd-ext-tables"
- "3bmd-ext-wiki-links"
- "3bmd-youtube"
- "3bmd-ext-code-blocks")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-python3-path
- (lambda _
- (substitute* "code-blocks.lisp"
- (("python3") (which "python3"))))))))
- (native-inputs
- (list sbcl-fiasco))
(inputs
- (list python
- python-pygments
- sbcl-alexandria
- sbcl-colorize
- sbcl-split-sequence
- sbcl-esrap))
- (home-page "https://github.com/3b/3bmd")
- (synopsis "Markdown processor in Command Lisp using esrap parser")
+ (list sbcl-utils-kt))
+ (arguments
+ ;; Tests fail with #<TYPE-ERROR expected-type: STREAM datum: NIL>.
+ '(#:tests? #f))
+ (home-page "https://github.com/kennytilton/cells")
+ (synopsis "Common Lisp implementation of the dataflow programming paradigm")
(description
- "This is a Common Lisp Markdown to HTML converter, using @command{esrap}
-for parsing, and grammar based on @command{peg-markdown}.")
- (license license:expat))))
+ "Cells is a mature, stable extension to CLOS allowing one to create
+classes whose instances can have slot values determined by instance-specific
+formulas.")
+ (license license:llgpl))))
-(define-public cl-3bmd
- (sbcl-package->cl-source-package sbcl-3bmd))
+(define-public cl-cells
+ (sbcl-package->cl-source-package sbcl-cells))
-(define-public ecl-3bmd
- (sbcl-package->ecl-package sbcl-3bmd))
+(define-public ecl-cells
+ (sbcl-package->ecl-package sbcl-cells))
-(define-public sbcl-cl-fad
- ;; No release since 2019
- (let ((commit "3f4d32d3aa1093966046d001411a852eb8f4b535")
- (revision "1"))
+(define-public sbcl-cephes
+ (let ((commit "d87146fa38c8425ffb5fe425eee5eb3e818bacd4")
+ (revision "0"))
(package
- (name "sbcl-cl-fad")
- (version (git-version "0.7.6" revision commit))
+ (name "sbcl-cephes")
+ (version (git-version "1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/cl-fad/")
+ (url "https://github.com/Lisp-Stat/cephes.cl")
(commit commit)))
+ (file-name (git-file-name "cl-cephes" version))
(sha256
- (base32 "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6"))
- (file-name (git-file-name "cl-fad" version))))
+ (base32 "09adls1lwwzwm1jmvhf11arwlsy5w0bi2rmniahas824mysv77lr"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-cl-ppcre sbcl-unit-test))
(inputs
- (list sbcl-alexandria sbcl-bordeaux-threads))
- (synopsis "Portable pathname library for Common Lisp")
+ (list sbcl-cffi))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; ECL has issues making the shared library automatically,
+ ;; so we make it explicitly.
+ (add-before 'build 'build-shared-library
+ (lambda _
+ (with-directory-excursion
+ (string-append #$output "/share/common-lisp/"
+ (%lisp-type) "/cephes/scipy-cephes")
+ (invoke "make")
+ ;; Remove temporary object files.
+ (for-each delete-file (find-files "." "\\.o$"))))))))
+ (home-page "https://lisp-stat.github.io/cephes.cl/")
+ (synopsis "Common Lisp wrapper for the Cephes Mathematical Library")
(description
- "CL-FAD (for \"Files and Directories\") is a thin layer atop Common
-Lisp's standard pathname functions. It is intended to provide some
-unification between current CL implementations on Windows, OS X, Linux, and
-Unix. Most of the code was written by Peter Seibel for his book Practical
-Common Lisp.")
- (home-page "https://edicl.github.io/cl-fad/")
- (license license:bsd-2))))
+ "This package provides a common lisp CFFI wrapper for the SciPy version
+of Cephes special functions.")
+ (license license:ms-pl))))
-(define-public cl-fad
- (sbcl-package->cl-source-package sbcl-cl-fad))
+(define-public cl-cephes
+ (sbcl-package->cl-source-package sbcl-cephes))
-(define-public ecl-cl-fad
- (sbcl-package->ecl-package sbcl-cl-fad))
+(define-public ecl-cephes
+ (sbcl-package->ecl-package sbcl-cephes))
-(define-public sbcl-fn
- (let ((commit "8d8587d03a7b5e26b306fc90018e385d9e5acc2c")
+(define-public sbcl-cepl
+ (let ((commit "d1a10b6c8f4cedc07493bf06aef3a56c7b6f8d5b")
(revision "1"))
(package
- (name "sbcl-fn")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cbaggers/fn")
- (commit commit)))
- (file-name (git-file-name "fn" version))
- (sha256
- (base32 "0yyp9z6iwx476whz0n1rpjznjyqqhlylhzwpgg5xx92lxmskl752"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-named-readtables))
- (home-page "https://github.com/cbaggers/fn")
- (synopsis "Macros for lambda brevity")
- (description
- "This is a Common Lisp library providing lambda shorthand macros aiming
-to be used in cases where the word @emph{lambda} and the arguments are longer
-than the body of the lambda.")
- (license license:public-domain))))
-
-(define-public ecl-fn
- (sbcl-package->ecl-package sbcl-fn))
-
-(define-public cl-fn
- (sbcl-package->cl-source-package sbcl-fn))
+ (name "sbcl-cepl")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cbaggers/cepl")
+ (commit commit)))
+ (file-name (git-file-name "cepl" version))
+ (sha256
+ (base32 "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cffi" ,sbcl-cffi)
+ ("cl-opengl" ,sbcl-cl-opengl)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("documentation-utils" ,sbcl-documentation-utils)
+ ("float-features" ,sbcl-float-features)
+ ("ieee-floats" ,sbcl-ieee-floats)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("varjo" ,sbcl-varjo)))
+ (propagated-inputs
+ (list sbcl-quickproject))
+ (home-page "https://github.com/cbaggers/cepl")
+ (synopsis "Development playground to work with OpenGL")
+ (description
+ "CEPL (Code Evaluate Play Loop ) is a lispy and REPL-friendly Common Lisp
+library for working with OpenGL.
-(define-public sbcl-nibbles
- ;; No tagged release since 2018.
- (let ((commit "a46a67736e07b548cdd7485cb36834f7942313f1")
- (revision "3"))
- (package
- (name "sbcl-nibbles")
- (version (git-version "0.14" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/nibbles/")
- (commit commit)))
- (file-name (git-file-name "cl-nibbles" version))
- (sha256
- (base32 "12qjich11hp31dhbvbsixyjbddmr6faaajigrivgbxy9kw6d279j"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- ;; Tests only.
- (list sbcl-rt))
- (synopsis
- "Common Lisp library for accessing octet-addressed blocks of data")
- (description
- "When dealing with network protocols and file formats, it's common to
-have to read or write 16-, 32-, or 64-bit datatypes in signed or unsigned
-flavors. Common Lisp sort of supports this by specifying :element-type for
-streams, but that facility is underspecified and there's nothing similar for
-read/write from octet vectors. What most people wind up doing is rolling their
-own small facility for their particular needs and calling it a day.
+Its definition of success is making the user feel that GPU programming has
+always been part of the languages standard.
-This library attempts to be comprehensive and centralize such
-facilities. Functions to read 16-, 32-, and 64-bit quantities from octet
-vectors in signed or unsigned flavors are provided; these functions are also
-SETFable. Since it's sometimes desirable to read/write directly from streams,
-functions for doing so are also provided. On some implementations,
-reading/writing IEEE singles/doubles (i.e. single-float and double-float) will
-also be supported.")
- (home-page "https://github.com/sharplispers/nibbles")
- (license license:bsd-3))))
+The usual approach to using CEPL is to start it at the beginning of your Lisp
+session and leave it open for the duration of your work. You can then treat the
+window it creates as just another output for your graphics, analogous to how
+@code{*standard-output*} is treated for text.")
+ (license license:bsd-2))))
-(define-public cl-nibbles
- (sbcl-package->cl-source-package sbcl-nibbles))
+(define-public cl-cepl
+ (sbcl-package->cl-source-package sbcl-cepl))
-(define-public ecl-nibbles
- (sbcl-package->ecl-package sbcl-nibbles))
+(define-public ecl-cepl
+ (sbcl-package->ecl-package sbcl-cepl))
-(define-public sbcl-ironclad
+(define-public sbcl-cesdi
(package
- (name "sbcl-ironclad")
- (version "0.60")
+ (name "sbcl-cesdi")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/ironclad/")
- (commit (string-append "v" version))))
+ (url "https://github.com/Hexstream/cesdi")
+ (commit version)))
+ (file-name (git-file-name "cl-cesdi" version))
(sha256
- (base32 "122ldxiddkscb3li5wjrppr7vyn77znyjfgs8pbflrskzyxlabdd"))
- (file-name (git-file-name "cl-ironclad" version))))
+ (base32 "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- ;; Tests only.
- (list sbcl-rt))
+ (list sbcl-parachute))
(inputs
- (list sbcl-bordeaux-threads sbcl-flexi-streams))
- (synopsis "Cryptographic toolkit written in Common Lisp")
+ (list sbcl-closer-mop))
+ (home-page "https://www.hexstreamsoft.com/libraries/cesdi/")
+ (synopsis "Ergonomic initialization of effective slot definition objects")
(description
- "Ironclad is a cryptography library written entirely in Common Lisp.
-It includes support for several popular ciphers, digests, MACs and public key
-cryptography algorithms. For several implementations that support Gray
-streams, support is included for convenient stream wrappers.")
- (home-page "https://github.com/sharplispers/ironclad")
- (license license:bsd-3)))
-
-(define-public cl-ironclad
- (sbcl-package->cl-source-package sbcl-ironclad))
-
-(define-public ecl-ironclad
- (sbcl-package->ecl-package sbcl-ironclad))
-
-(define-public sbcl-named-readtables
- (let ((commit "d5ff162ce02035ec7de1acc9721385f325e928c0")
- (revision "4"))
- (package
- (name "sbcl-named-readtables")
- (version (git-version "0.9" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/melisgl/named-readtables")
- (commit commit)))
- (sha256
- (base32 "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv"))
- (file-name (git-file-name "cl-named-readtables" version))))
- (build-system asdf-build-system/sbcl)
- ;; (native-inputs (list sbcl-try))
- ;; Tests disabled because of a circular dependency issue:
- ;; try -> named-readtables -> mgl-pax -> try
- (arguments
- (list #:tests? #f))
- (home-page "https://github.com/melisgl/named-readtables/")
- (synopsis "Library that creates a namespace for named readtables")
- (description
- "Named readtables is a library that creates a namespace for named
-readtables, which is akin to package namespacing in Common Lisp.")
- (license license:bsd-3))))
-
-(define-public cl-named-readtables
- (sbcl-package->cl-source-package sbcl-named-readtables))
-
-(define-public ecl-named-readtables
- (sbcl-package->ecl-package sbcl-named-readtables))
-
-(define-public sbcl-py-configparser
- ;; NOTE: (Sharlatan <2021-01-05 Tue> <19:52:19 UTC+0000>) Project updated last
- ;; time 8y ago, it looks like abandoned. VCS of the project:
- ;; https://svn.common-lisp.net/py-configparser/trunk
- (package
- (name "sbcl-py-configparser")
- (version "1.0.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://common-lisp.net/project/py-configparser/releases/"
- "py-configparser-" version ".tar.gz"))
- (sha256
- (base32 "0i4rqz5cv7d7c2w81x5lwy05s6fbi3zikf4k5kpi3bkx3cabwdxj"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-parse-number))
- (home-page "https://common-lisp.net/project/py-configparser/")
- (synopsis "ConfigParser Python module functionality for Common Lisp")
- (description "The py-configparser package implements the ConfigParser
-Python module functionality in Common Lisp. In short, it implements reading
-and writing of .INI-file style configuration files with sections containing
-key/value pairs of configuration options. In line with the functionalities in
-the python module, does this package implement basic interpolation of option
-values in other options.")
- (license license:expat)))
-
-(define-public cl-py-configparser
- (sbcl-package->cl-source-package sbcl-py-configparser))
-
-(define-public ecl-py-configparser
- (sbcl-package->ecl-package sbcl-py-configparser))
-
-(define-public sbcl-cl-ini
- (let ((commit "e630acb405022a7ae11969bf908669fee1191ab7")
- (revision "0"))
- (package
- (name "sbcl-cl-ini")
- (version (git-version "0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/compufox/cl-ini")
- (commit commit)))
- (file-name (git-file-name "sbcl-cl-ini" version))
- (sha256
- (base32
- "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-prove))
- (inputs (list sbcl-cl-str))
- (home-page "https://github.com/compufox/cl-ini")
- (synopsis "INI file parser for Common Lisp")
- (description
- "Parse INI formatted files into a Common Lisp list structure.")
- (license license:expat))))
+ "This package provides a @code{compute-effective-slot-definition-initargs}
+generic function that allows for more ergonomic initialization of effective slot
+definition objects.")
+ (license license:unlicense)))
-(define-public cl-ini
- (sbcl-package->cl-source-package sbcl-cl-ini))
+(define-public cl-cesdi
+ (sbcl-package->cl-source-package sbcl-cesdi))
-(define-public ecl-cl-ini
- (sbcl-package->ecl-package sbcl-cl-ini))
+(define-public ecl-cesdi
+ (sbcl-package->ecl-package sbcl-cesdi))
-(define-public sbcl-pythonic-string-reader
- (let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a"))
+(define-public sbcl-cf
+ (let ((commit "2bf64feadf63569149b7ee6e9dc25572704d8939")
+ (revision "6"))
(package
- (name "sbcl-pythonic-string-reader")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-cf")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/smithzvk/pythonic-string-reader/")
+ (url "https://codeberg.org/glv/cl-cf")
(commit commit)))
+ (file-name (git-file-name "cl-cf" version))
(sha256
- (base32 "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j"))
- (file-name (git-file-name "pythonic-string-reader" version))))
+ (base32 "0zp9699wvf2ylk6s5j9k9mcds1g1yxb2wnlm27rvnb5m6nfrxbzv"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-named-readtables))
- (home-page "https://github.com/smithzvk/pythonic-string-reader")
- (synopsis "Read table modification inspired by Python's three quote strings")
- (description "This piece of code sets up some reader macros that make it
-simpler to input string literals which contain backslashes and double quotes
-This is very useful for writing complicated docstrings and, as it turns out,
-writing code that contains string literals that contain code themselves.")
- (license license:bsd-3))))
-
-(define-public cl-pythonic-string-reader
- (sbcl-package->cl-source-package sbcl-pythonic-string-reader))
-
-(define-public ecl-pythonic-string-reader
- (sbcl-package->ecl-package sbcl-pythonic-string-reader))
-
-(define-public sbcl-slime-swank
- ;; Update together with emacs-slime.
- (package
- (name "sbcl-slime-swank")
- (version "2.29.1")
- (source
- (origin
- (file-name (git-file-name "cl-slime-swank" version))
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/slime/slime/")
- (commit (string-append "v" version))))
- (sha256
- (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki"))
- (modules '((guix build utils)))
- (snippet
- ;; The doc folder drags `gawk' into the closure. Doc is already
- ;; provided by emacs-slime.
- `(begin
- (delete-file-recursively "doc")
- #t))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("swank" "swank/exts")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'set-fasl-directory
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "swank-loader.lisp"
- (("\\(probe-file fasl\\)" all)
- ;; Do not try to delete Guix store files.
- (string-append
- all "\n"
- " (not (equal (subseq (pathname-directory fasl) 1 3)"
- " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH"))))))))
- (home-page "https://github.com/slime/slime")
- (synopsis "Common Lisp Swank server")
- (description
- "This is only useful if you want to start a Swank server in a Lisp
-processes that doesn't run under Emacs. Lisp processes created by
-@command{M-x slime} automatically start the server.")
- (license (list license:gpl2+ license:public-domain))))
+ (native-inputs (list sbcl-fiveam))
+ (synopsis "Continued fractions library")
+ (description "CF is a Common Lisp library for doing computations using
+continued fractions.")
+ (home-page "https://codeberg.org/glv/cl-cf")
+ (license license:gpl3+))))
-(define-public cl-slime-swank
- (sbcl-package->cl-source-package sbcl-slime-swank))
+(define-public cl-cf
+ (sbcl-package->cl-source-package sbcl-cf))
-(define-public ecl-slime-swank
- (sbcl-package->ecl-package sbcl-slime-swank))
+(define-public ecl-cf
+ (sbcl-package->ecl-package sbcl-cf))
-(define-public sbcl-mgl-pax
- (let ((commit "6782eb041c152721972420dfafa192692d16b7ce")
+(define-public sbcl-cffi
+ (let ((commit "33970351e71bb5f12ba56fc40270089e948ae112")
(revision "1"))
(package
- (name "sbcl-mgl-pax")
- (version (git-version "0.3.0" revision commit))
+ (name "sbcl-cffi")
+ (version (git-version "0.24.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/melisgl/mgl-pax")
+ (url "https://github.com/cffi/cffi")
(commit commit)))
+ (file-name (git-file-name "cl-cffi" version))
(sha256
- (base32 "0fjbzc2fn17m80lfsc8121sa0bk7fg42fqlwhm01sk1fj4s48pma"))
- (file-name (git-file-name "cl-mgl-pax" version))))
+ (base32 "1h7cw15f08gm6m4yz8hk7qkfwp7mwwnykjc5py6dhjakv0wh1g37"))))
(build-system asdf-build-system/sbcl)
- ;; (native-inputs
- ;; (list sbcl-try))
(inputs
- (list sbcl-3bmd
+ (list libffi
sbcl-alexandria
- sbcl-colorize
- sbcl-md5
- sbcl-named-readtables
- sbcl-pythonic-string-reader
- sbcl-slime-swank
- sbcl-trivial-utf-8))
+ sbcl-babel
+ sbcl-trivial-features))
+ (native-inputs
+ (list pkg-config
+ sbcl-bordeaux-threads
+ sbcl-rt))
(arguments
- `(#:asd-systems '("mgl-pax"
- "mgl-pax/navigate"
- "mgl-pax/document"
- "mgl-pax/transcribe")
- ;; Tests disabled because of a circular dependency
- ;; try -> mgl-pax -> try
- #:tests? #f))
- (synopsis "Exploratory programming environment and documentation generator")
- (description
- "PAX provides an extremely poor man's Explorable Programming
-environment. Narrative primarily lives in so called sections that mix markdown
-docstrings with references to functions, variables, etc, all of which should
-probably have their own docstrings.
-
-The primary focus is on making code easily explorable by using SLIME's
-@command{M-.} (@command{slime-edit-definition}). See how to enable some
-fanciness in Emacs Integration. Generating documentation from sections and all
-the referenced items in Markdown or HTML format is also implemented.
-
-With the simplistic tools provided, one may accomplish similar effects as with
-Literate Programming, but documentation is generated from code, not vice versa
-and there is no support for chunking yet. Code is first, code must look
-pretty, documentation is code.")
- (home-page "https://melisgl.github.io/mgl-pax/")
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "libffi/libffi.lisp"
+ (("libffi.so.8" all)
+ (search-input-file inputs (string-append "/lib/" all))))
+ (substitute* "toolchain/c-toolchain.lisp"
+ (("\"cc\"")
+ (format #f "~S" (which "gcc"))))))
+ (add-after 'build 'install-headers
+ (lambda _
+ (install-file "grovel/common.h"
+ (string-append #$output
+ "/include/grovel")))))
+ #:asd-systems ''("cffi"
+ "cffi-libffi"
+ "cffi-uffi-compat")))
+ (home-page "https://common-lisp.net/project/cffi/")
+ (synopsis "Common Foreign Function Interface for Common Lisp")
+ (description "The Common Foreign Function Interface (CFFI)
+purports to be a portable foreign function interface for Common Lisp.
+The CFFI library is composed of a Lisp-implementation-specific backend
+in the CFFI-SYS package, and a portable frontend in the CFFI
+package.")
(license license:expat))))
-(define-public cl-mgl-pax
- (sbcl-package->cl-source-package sbcl-mgl-pax))
+(define-public cl-cffi
+ (sbcl-package->cl-source-package sbcl-cffi))
-(define-public ecl-mgl-pax
- (sbcl-package->ecl-package sbcl-mgl-pax))
+(define-public ecl-cffi
+ (sbcl-package->ecl-package sbcl-cffi))
-(define-public sbcl-40ants-doc
- (let ((commit "7725ff67a380e9ebfc6155e14d91e650f256711b")
+
+(define-public sbcl-cffi-c-ref
+ (let ((commit "8123cbb6034c5f7921a0766107cfb8c4e8efd5ce")
(revision "0"))
(package
- (name "sbcl-40ants-doc")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-cffi-c-ref")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/40ants/doc")
+ (url "https://github.com/borodust/cffi-c-ref")
(commit commit)))
(sha256
- (base32 "1v6gnhrk02vsixmprzk4wvvj7vh11vp5waxyih0qz2ih8d38r5pg"))
- (file-name (git-file-name "cl-40ants-doc" version))))
+ (base32 "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z"))
+ (file-name (git-file-name "cffi-c-ref" version))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; TODO: Add remaining dependencies of 40ants-doc-full and
- ;; 40ants-doc-test missing from Guix.
- '(#:asd-systems '("40ants-doc"
- ;;"40ants-doc-full"
- )
- #:tests? #f))
- ;;(native-inputs
- ;; (list sbcl-rove))
(inputs
- (list sbcl-named-readtables
- sbcl-pythonic-string-reader
- ;; For 40ants-doc-full:
- ;;sbcl-3bmd
- ;;sbcl-alexandria
- ;;sbcl-babel
- ;;sbcl-cl-cookie
- ;;sbcl-cl-fad
- ;;sbcl-cl-ppcre
- ;;sbcl-common-doc ; Missing from Guix
- ;;sbcl-common-html ; Missing from Guix
- ;;sbcl-commondoc-markdown ; Missing from Guix
- ;;sbcl-dexador
- ;;sbcl-docs-builder ; Missing from Guix
- ;;sbcl-fare-utils
- ;;sbcl-jonathan
- ;;sbcl-lass
- ;;sbcl-local-time
- ;;sbcl-log4cl
- ;;sbcl-slime-swank
- ;;sbcl-slynk
- ;;sbcl-spinneret
- ;;sbcl-stem ; Missing from Guix; also, license is unconfirmed
- ;;sbcl-str
- ;;sbcl-tmpdir ; Missing from Guix
- ;;sbcl-trivial-extract ; Missing from Guix
- ;;sbcl-xml-emitter
- ))
- (home-page "https://40ants.com/doc/")
- (synopsis "Exploratory programming environment and documentation generator")
+ (list sbcl-alexandria sbcl-cffi))
+ (synopsis "Streamlined access to foreign memory")
(description
- "@code{40ants-doc} provides a rudimentary explorable programming
-environment. The narrative primarily lives in so-called sections that mix
-Markdown docstrings with references to functions, variables, etc., all of
-which should probably have their own docstrings.
-
-The primary focus is on making code easily explorable by using SLIME's
-@kbd{M-.} (@code{slime-edit-definition}). Generating documentation in
-Markdown or HTML format from sections and all the referenced items is also
-implemented.
-
-With the simplistic tools provided, one may obtain results similar to literate
-programming, but documentation is generated from code, not the other way
-around, and there is no support for chunking. Code comes first, code must
-look pretty, documentation is code.
-
-@code{40ants-doc} is a fork of MGL-PAX with fewer dependencies (only
-@code{named-readtables} and @code{pythonic-string-reader}) for the core
-system, and additional features in the full system.")
+ "This Common Lisp library provides macros to access foreign memory.")
+ (home-page "https://github.com/borodust/cffi-c-ref")
(license license:expat))))
-(define-public cl-40ants-doc
- (sbcl-package->cl-source-package sbcl-40ants-doc))
+(define-public cl-cffi-c-ref
+ (sbcl-package->cl-source-package sbcl-cffi-c-ref))
-(define-public ecl-40ants-doc
- (sbcl-package->ecl-package sbcl-40ants-doc))
+(define-public ecl-cffi-c-ref
+ (sbcl-package->ecl-package sbcl-cffi-c-ref))
-(define-public sbcl-mssql
- (let ((commit "045602a19a32254108f2b75871049293f49731eb")
+(define-public sbcl-chanl
+ (let ((commit "56e90a126c78b39bb621a01585e8d3b985238e8c")
(revision "1"))
(package
- (name "sbcl-mssql")
- (version (git-version "0.0.3" revision commit))
+ (name "sbcl-chanl")
+ (version (git-version "0.4.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/cl-mssql")
+ (url "https://github.com/zkat/chanl")
(commit commit)))
- (file-name (git-file-name "cl-mssql" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm"))))
+ (base32
+ "0b1cf6c12qx5cy1fw2z42jgh566rp3l8nv5qf0qqc569s7bgmrh4"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- `(("cffi" ,sbcl-cffi)
- ("freetds" ,freetds)
- ("garbage-pools" ,sbcl-garbage-pools)
- ("iterate" ,sbcl-iterate)
- ("parse-number" ,sbcl-parse-number)))
+ (list sbcl-bordeaux-threads))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/mssql.lisp"
- (("libsybdb" all)
- (string-append (assoc-ref inputs "freetds") "/lib/" all)))
- #t)))))
- (home-page "https://github.com/archimag/cl-mssql")
- (synopsis "Common Lisp library to interact with MS SQL Server databases")
- (description
- "@code{cl-mssql} provides an interface to connect to Microsoft SQL
-server. It uses the @code{libsybdb} foreign library provided by the FreeTDS
-project.")
- (license license:llgpl))))
+ ;; Disable flaky tests
+ (list #:tests? #f))
+ (synopsis "Portable channel-based concurrency for Common Lisp")
+ (description "Common Lisp library for channel-based concurrency. In
+a nutshell, you create various threads sequentially executing tasks you need
+done, and use channel objects to communicate and synchronize the state of these
+threads.")
+ (home-page "https://github.com/zkat/chanl")
+ (license (list license:expat license:bsd-3)))))
-(define-public ecl-mssql
- (sbcl-package->ecl-package sbcl-mssql))
+(define-public cl-chanl
+ (sbcl-package->cl-source-package sbcl-chanl))
-(define-public cl-mssql
- (sbcl-package->cl-source-package sbcl-mssql))
+(define-public ecl-chanl
+ (sbcl-package->ecl-package sbcl-chanl))
-(define-public sbcl-anaphora
+(define-public sbcl-charje.documentation
(package
- (name "sbcl-anaphora")
- (version "0.9.8")
+ (name "sbcl-charje.documentation")
+ (version "0.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tokenrove/anaphora")
- (commit version)))
+ (url "https://git.sr.ht/~charje/documentation")
+ (commit (string-append "v" version))))
(sha256
- (base32 "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b"))
- (file-name (git-file-name "cl-anaphora" version))))
+ (base32
+ "149r9qdz5dyxsamhf5miaa9njr7kn7nc0ic448k133rs3nnwagqc"))
+ (file-name (git-file-name "cl-charje.documentation" version))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-rt))
- (synopsis "The anaphoric macro collection from Hell")
- (description
- "Anaphora is the anaphoric macro collection from Hell: it includes many
-new fiends in addition to old friends like @command{aif} and
-@command{awhen}.")
- (home-page "https://github.com/tokenrove/anaphora")
- (license license:public-domain)))
-
-(define-public cl-anaphora
- (sbcl-package->cl-source-package sbcl-anaphora))
-
-(define-public ecl-anaphora
- (sbcl-package->ecl-package sbcl-anaphora))
-
-(define-public sbcl-let-plus
- (let ((commit "455e657e077235829b197f7ccafd596fcda69e30")
- (revision "2"))
- (package
- (name "sbcl-let-plus")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/let-plus")
- (commit commit)))
- (sha256
- (base32 "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb"))
- (file-name (git-file-name "cl-let-plus" version))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-anaphora))
- (native-inputs
- (list sbcl-lift))
- (synopsis "Destructuring extension of let*")
- (description
- "This library implements the let+ macro, which is a dectructuring
-extension of let*. It features:
-
-@itemize
-@item Clean, consistent syntax and small implementation (less than 300 LOC,
-not counting tests)
-@item Placeholder macros allow editor hints and syntax highlighting
-@item @command{&ign} for ignored values (in forms where that makes sense)
-@item Very easy to extend
-@end itemize\n")
- (home-page "https://github.com/sharplispers/let-plus")
- (license license:boost1.0))))
-
-(define-public cl-let-plus
- (sbcl-package->cl-source-package sbcl-let-plus))
-
-(define-public ecl-let-plus
- (sbcl-package->ecl-package sbcl-let-plus))
+ (inputs
+ (list sbcl-alexandria))
+ (home-page "https://git.sr.ht/~charje/documentation")
+ (synopsis "Docstring parsing library for Common Lisp")
+ (description "Charje.documentation can used to parse Common Lisp
+docstrings the charje way, or it can be used to create custom docstring
+parsers. Docstring parsers are composed using mixin classes and
+initialization methods.")
+ (license license:agpl3+)))
-(define-public sbcl-cl-cairo2
- (let ((commit "41ae45aac86553c46f4bb460f80e1fb620930f5b")
- (revision "1"))
- (package
- (name "sbcl-cl-cairo2")
- (version (git-version "0.6" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rpav/cl-cairo2")
- (commit commit)))
- (file-name (git-file-name "cl-cairo2" version))
- (sha256
- (base32 "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '(;; "cl-cairo2-gtk2" ; cl-gtk2 is not packed and quite old.
- ;; "cl-cairo2-quartz" ; Failing when enabled.
- ;; "cl-cairo2-xlib" ; cl-xcb-xlib is not packed yet and quite old.
- ;; "cl-cairo2-xcb"
- "cl-cairo2")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/load-libraries.lisp"
- (("libcairo.so.2")
- (search-input-file inputs "/lib/libcairo.so.2"))))))))
- (inputs
- (list cairo
- sbcl-cffi
- sbcl-cl-colors
- sbcl-cl-freetype2
- sbcl-cl-utilities
- sbcl-metabang-bind
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (home-page "https://github.com/rpav/cl-cairo2")
- (synopsis "Cairo bindings for Common Lisp")
- (description
- "This package provides CFFI bindings for Common Lisp to the Cairo
-C library.")
- (license license:boost1.0))))
+(define-public cl-charje.documentation
+ (sbcl-package->cl-source-package sbcl-charje.documentation))
-(define-public ecl-cl-cairo2
- (sbcl-package->ecl-package sbcl-cl-cairo2))
+(define-public ecl-charje.documentation
+ (sbcl-package->ecl-package sbcl-charje.documentation))
-(define-public cl-cairo2
- (sbcl-package->cl-source-package sbcl-cl-cairo2))
+(define-public sbcl-charje.loop
+ (package
+ (name "sbcl-charje.loop")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~charje/loop")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-charje.loop" version))
+ (sha256
+ (base32
+ "13353ycjm4jyczlqxh5r7f7q8g679pyfx91w4hj9p6mp7paqsn16"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-binding-arrows
+ sbcl-parse-declarations))
+ (home-page "https://git.sr.ht/~charje/loop")
+ (synopsis "Loop abstraction for Common Lisp that is consistent for
+different kinds of data")
+ (description "Loop is a joy to use and has a consistent interface unlike
+other looping abstractions and ANSI list operations. You can define your own
+iterators and aggregators that integrate tightly into other operations. All
+operations are non-consing when possible.")
+ (license license:agpl3+)))
-(define-public sbcl-cl-colors
- (let ((commit "827410584553f5c717eec6182343b7605f707f75"))
- (package
- (name "sbcl-cl-colors")
- (version (git-version "0.0.0" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tpapp/cl-colors")
- (commit commit)))
- (sha256
- (base32
- "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"))
- (file-name (git-file-name "cl-colors" version))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-let-plus))
- (synopsis "Simple color library for Common Lisp")
- (description
- "This is a very simple color library for Common Lisp, providing
+(define-public cl-charje.loop
+ (sbcl-package->cl-source-package sbcl-charje.loop))
-@itemize
-@item Types for representing colors in HSV and RGB spaces.
-@item Simple conversion functions between the above types (and also
-hexadecimal representation for RGB).
-@item Some predefined colors (currently X11 color names – of course the
-library does not depend on X11).Because color in your terminal is nice.
-@end itemize
+(define-public ecl-charje.loop
+ (sbcl-package->ecl-package sbcl-charje.loop))
-This library is no longer supported by its author.")
- (home-page "https://github.com/tpapp/cl-colors")
- (license license:boost1.0))))
+(define-public sbcl-chemboy
+ (package
+ (name "sbcl-chemboy")
+ (version "0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://common-lisp.net/project/chemboy/chemboy-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0lr134l16mjcgdj3fm2yff4chlfbihn1sji7q80y7lnr176zgs7d"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("chemical-compounds" ,sbcl-chemical-compounds)
+ ("periodic-table" ,sbcl-periodic-table)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-files
+ (lambda _
+ ;; Fix incorrect version number.
+ (substitute* "chemboy.asd"
+ ((":version \"0.2\"")
+ (string-append ":version \"" ,version "\"")))
+ ;; Remove incorrect declaration of string type.
+ (substitute* "query-parsing.lisp"
+ (("\\(declare \\(simple-base-string string\\)")
+ "(declare"))
+ ;; Fix incorrect function calls.
+ (substitute* "conversions.lisp"
+ (("\\(pprint-compound element s\\)")
+ "(pprint-compound element :stream s)")
+ (("\\(pprint-compound parsed-compound s\\)")
+ "(pprint-compound parsed-compound :stream s)")))))))
+ (home-page "https://common-lisp.net/project/chemboy/")
+ (synopsis "Common Lisp program for doing basic chemistry calculations")
+ (description
+ "Chemboy is a Common Lisp program for doing basic chemistry calculations.
+This package provides the text-based interface for Chemboy.")
+ (license license:llgpl)))
-(define-public cl-colors
- (sbcl-package->cl-source-package sbcl-cl-colors))
+(define-public cl-chemboy
+ (sbcl-package->cl-source-package sbcl-chemboy))
-(define-public ecl-cl-colors
- (sbcl-package->ecl-package sbcl-cl-colors))
+(define-public ecl-chemboy
+ (sbcl-package->ecl-package sbcl-chemboy))
-(define-public sbcl-format-colors
- (let ((commit "fecb1d8c6e7a07ff9f10a7a4eb4c3bd629d4969f")
- (revision "0"))
- (package
- (name "sbcl-format-colors")
- (version (git-version "0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vindarel/format-colors")
- (commit commit)))
- (sha256
- (base32 "084ydjhic2dq0gb7wfm6plnjq3l7485hb3yhxl03mm64a6sr3fxv"))
- (file-name (git-file-name "cl-format-colors" version))))
- (build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cl-ansi-text))
- (synopsis "Custom format functions for colorful output")
- (description "This package provides simple format directives to
- print in colors.")
- (home-page "https://github.com/vindarel/format-colors")
- (license license:llgpl))))
+(define-public sbcl-chemical-compounds
+ (package
+ (name "sbcl-chemical-compounds")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://common-lisp.net/project/chemboy/chemical-compounds-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "12fd8a6ay5qlsq4givzgh9d55mbg4ci2vvmymig6pjl2ms64v0pf"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("periodic-table" ,sbcl-periodic-table)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-files
+ (lambda _
+ ;; Fix incorrect version number.
+ (substitute* "chemical-compounds.asd"
+ ((":version \"1.0.1\"")
+ (string-append ":version \"" ,version "\"")))
+ ;; Remove incorrect declaration of string type.
+ (substitute* "parsing.lisp"
+ (("\\(declare \\(simple-base-string string\\)")
+ "(declare")))))))
+ (home-page "https://common-lisp.net/project/chemboy/")
+ (synopsis "Chemical formula parser and pretty-printer for Common Lisp")
+ (description
+ "It can sometimes be useful to be able to parse chemical compounds in a
+user-friendly syntax into easy-to-manipulate s-expressions. You also want to
+be able to go in reverse. You could probably write your own parser — or you
+could just install the chemical-compounds package.")
+ (license license:llgpl)))
-(define-public cl-format-colors
- (sbcl-package->cl-source-package sbcl-format-colors))
+(define-public cl-chemical-compounds
+ (sbcl-package->cl-source-package sbcl-chemical-compounds))
-(define-public ecl-format-colors
- (sbcl-package->ecl-package sbcl-format-colors))
+(define-public ecl-chemical-compounds
+ (sbcl-package->ecl-package sbcl-chemical-compounds))
-(define-public sbcl-cl-ansi-text
- (let ((commit "8b129d83c7511b54cdd9d4123825a2d06349b25c"))
+(define-public sbcl-chipz
+ (let ((version "0.8")
+ (commit "82a17d39c78d91f6ea63a03aca8f9aa6069a5e11")
+ (revision "2"))
(package
- (name "sbcl-cl-ansi-text")
- (version (git-version "2.0.1" "1" commit))
+ (name "sbcl-chipz")
+ (version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pnathan/cl-ansi-text")
+ (url "https://github.com/sharplispers/chipz")
(commit commit)))
+ (file-name (git-file-name "cl-chipz" version))
(sha256
- (base32
- "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"))
- (file-name (git-file-name "cl-ansi-text" version))))
+ (base32 "1n4f22i9j8iapjd6yx1z348rggcybvg9h794kx9libjgz4bs371h"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-cl-colors2))
(native-inputs
- (list sbcl-fiveam))
- (synopsis "ANSI terminal color implementation for Common Lisp")
+ (list sbcl-flexi-streams))
+ (home-page "http://method-combination.net/lisp/chipz/")
+ (synopsis
+ "Common Lisp library for decompressing deflate, zlib, gzip, and bzip2
+data")
(description
- "@command{cl-ansi-text} provides utilities which enable printing to an
-ANSI terminal with colored text. It provides the macro @command{with-color}
-which causes everything printed in the body to be displayed with the provided
-color. It further provides functions which will print the argument with the
-named color.")
- (home-page "https://github.com/pnathan/cl-ansi-text")
- (license license:llgpl))))
+ "DEFLATE data, defined in RFC1951, forms the core of popular
+compression formats such as zlib (RFC 1950) and gzip (RFC 1952). As such,
+Chipz also provides for decompressing data in those formats as well. BZIP2 is
+the format used by the popular compression tool bzip2.")
+ ;; The author describes it as "MIT-like"
+ (license license:expat))))
-(define-public cl-ansi-text
- (sbcl-package->cl-source-package sbcl-cl-ansi-text))
+(define-public cl-chipz
+ (sbcl-package->cl-source-package sbcl-chipz))
-(define-public ecl-cl-ansi-text
- (sbcl-package->ecl-package sbcl-cl-ansi-text))
+(define-public ecl-chipz
+ (sbcl-package->ecl-package sbcl-chipz))
-(define-public sbcl-proc-parse
- (let ((commit "ac3636834d561bdc2686c956dbd82494537285fd"))
+(define-public sbcl-chirp
+ (let ((commit "01c79fa41939688216d1f86d0766a687becb0654")
+ (revision "1"))
(package
- (name "sbcl-proc-parse")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-chirp")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/proc-parse")
+ (url "https://github.com/Shinmera/chirp")
(commit commit)))
+ (file-name (git-file-name "chirp" version))
(sha256
- (base32
- "06rnl0h4cx6xv2wj3jczmmcxqn2703inmmvg1s4npbghmijsybfh"))
- (file-name (git-file-name "proc-parse" version))))
+ (base32 "10xlz1vwdv3jv48kmpndpnrg6672m0r5vsjgm2pksfl8bc05j2m0"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems '("chirp-core" "chirp-dexador" "chirp-drakma" "chirp")))
(inputs
`(("alexandria" ,sbcl-alexandria)
- ("babel" ,sbcl-babel)))
- (native-inputs
- (list sbcl-prove))
- (arguments
- '(#:asd-systems '("proc-parse-test"
- "proc-parse")))
- (synopsis "Procedural vector parser")
+ ("babel" ,sbcl-babel)
+ ("cl-base64" ,sbcl-cl-base64)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("dexador" ,sbcl-dexador)
+ ("drakma" ,sbcl-drakma)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("ironclad" ,sbcl-ironclad)
+ ("local-time" ,sbcl-local-time)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("uuid" ,sbcl-uuid)
+ ("yason" ,sbcl-yason)))
+ (home-page "https://shinmera.github.io/chirp/")
+ (synopsis "Twitter client library for Common Lisp")
(description
- "This is a string/octets parser library for Common Lisp with speed and
-readability in mind. Unlike other libraries, the code is not a
-pattern-matching-like, but a char-by-char procedural parser.")
- (home-page "https://github.com/fukamachi/proc-parse")
- (license license:bsd-2))))
+ "This package provides a Common Lisp Twitter client featuring full API
+coverage.")
+ (license license:zlib))))
-(define-public cl-proc-parse
- (sbcl-package->cl-source-package sbcl-proc-parse))
+(define-public cl-chirp
+ (sbcl-package->cl-source-package sbcl-chirp))
-(define-public ecl-proc-parse
- (sbcl-package->ecl-package sbcl-proc-parse))
+(define-public ecl-chirp
+ (sbcl-package->ecl-package sbcl-chirp))
-(define-public sbcl-parse-float
- (let ((commit "3074765101e41222b6b624a66aaf1e6416379f9c")
- (revision "2"))
+(define-public sbcl-chlorophyll
+ (let ((commit "f2a50ad36d2fb11823c0e5a8da08a0de89c5c35f")
+ (revision "1"))
(package
- (name "sbcl-parse-float")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-chlorophyll")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/soemraws/parse-float")
+ (url "https://github.com/gorozhin/chlorophyll")
(commit commit)))
+ (file-name (git-file-name "cl-chlorophyll" version))
(sha256
- (base32 "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"))
- (file-name (git-file-name "proc-parse" version))))
- (build-system asdf-build-system/sbcl)
- (arguments
- ;; FIXME: https://github.com/soemraws/parse-float/issues/12
- `(#:asd-systems '("parse-float" "parse-float-tests")))
- (native-inputs
- (list sbcl-lisp-unit))
- (inputs
- `(("alexandria" ,sbcl-alexandria)))
- (home-page "https://github.com/soemraws/parse-float")
- (synopsis "Parse a floating point value from a string in Common Lisp")
- (description
- "This package exports the following function to parse floating-point
-values from a string in Common Lisp.")
- (license license:public-domain))))
-
-(define-public cl-parse-float
- (sbcl-package->cl-source-package sbcl-parse-float))
-
-(define-public ecl-parse-float
- (sbcl-package->ecl-package sbcl-parse-float))
-
-(define-public sbcl-cl-string-match
- (let ((revision "1")
- (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97"))
- (package
- (name "sbcl-cl-string-match")
- (version (git-version "0" revision changeset))
- (source
- (origin
- (method hg-fetch)
- (uri (hg-reference
- (url "https://github.com/vityok/cl-string-match")
- (changeset changeset)))
- (sha256
- (base32
- "01wn5qx562w43ssy92xlfgv79w7p0nv0wbl76mpmba131n9ziq2y"))
- (file-name (git-file-name "cl-string-match" version))))
+ (base32 "1hgl8sjsmyqx4gs77q4p94b63zgpxk1wi9w9niki8j0213dr1s3y"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("babel" ,sbcl-babel)
- ("iterate" ,sbcl-iterate)
- ("jpl-queues" ,sbcl-jpl-queues)
- ("jpl-util" ,sbcl-jpl-util)
- ("mgl-pax" ,sbcl-mgl-pax)
- ("parse-float" ,sbcl-parse-float)
- ("proc-parse" ,sbcl-proc-parse)
- ("yacc" ,sbcl-cl-yacc)))
- ;; TODO: Tests are not evaluated properly.
- (native-inputs
- ;; For testing:
- (list sbcl-lisp-unit))
- (arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-dependency
- (lambda _
- (substitute* "cl-string-match.asd"
- ((":mgl-pax")
- ":mgl-pax/document")))))))
- (synopsis "Set of utilities to manipulate strings in Common Lisp")
+ (native-inputs (list sbcl-fiveam))
+ (inputs (list sbcl-alexandria))
+ (home-page "https://github.com/gorozhin/chlorophyll")
+ (synopsis "ANSI escape code library for Common Lisp")
(description
- "@command{cl-strings} is a small, portable, dependency-free set of
-utilities that make it even easier to manipulate text in Common Lisp. It has
-100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.")
- (home-page "https://github.com/vityok/cl-string-match")
- (license license:bsd-3))))
+ "This package provides a Common Lisp system CHLOROPHYLL which
+implements an ANSI escape code functionality.")
+ (license license:expat))))
-(define-public cl-string-match
- (sbcl-package->cl-source-package sbcl-cl-string-match))
+(define-public cl-chlorophyll
+ (sbcl-package->cl-source-package sbcl-chlorophyll))
-(define-public ecl-cl-string-match
- (sbcl-package->ecl-package sbcl-cl-string-match))
+(define-public ecl-chlorophyll
+ (sbcl-package->ecl-package sbcl-chlorophyll))
-(define-public sbcl-cl-punch
+(define-public sbcl-chronicity
(package
- (name "sbcl-cl-punch")
- (version "0.2")
+ (name "sbcl-chronicity")
+ (version "0.4.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/windymelt/cl-punch")
+ (url "https://github.com/chaitanyagupta/chronicity")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-punch" version))
+ (file-name (git-file-name "chronicity" version))
(sha256
- (base32 "1vmbaz9y9lq4wvi8mfbyif8vc9yfk2i0qd3ysbzl152wx32dbzs3"))))
+ (base32 "0rzrl9is2v1aqbm0sym0qx3blnpd0bl13dkkmll6mb3983k2mkax"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-prove))
+ (list sbcl-lisp-unit))
(inputs
- (list sbcl-cl-syntax))
- (home-page "https://github.com/windymelt/cl-punch")
- (synopsis "Anonymous lambda literal in Common Lisp, respecting Scala")
+ (list sbcl-cl-interpol sbcl-cl-ppcre sbcl-local-time))
+ (home-page "https://github.com/chaitanyagupta/chronicity")
+ (synopsis "Natural language date and time parser for Common Lisp")
(description
- "CL-PUNCH is a Scala-like anonymous lambda literal.")
- (license license:expat )))
-
-(define-public cl-punch
- (sbcl-package->cl-source-package sbcl-cl-punch))
-
-(define-public ecl-cl-punch
- (sbcl-package->ecl-package sbcl-cl-punch))
-
-(define-public sbcl-puri
- (let ((commit "4bbab89d9ccbb26346899d1f496c97604fec567b")
- (revision "2"))
- (package
- (name "sbcl-puri")
- (version (git-version "1.5.7" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "http://git.kpe.io/puri.git")
- (commit commit)))
- (file-name (git-file-name "puri" version))
- (sha256
- (base32 "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd"))
- (modules '((guix build utils)))
- (snippet
- ;; The useless bundled debian folder drags `make' into the closure.
- `(begin
- (delete-file-recursively "debian")
- #t))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-ptester))
- (home-page "http://puri.kpe.io/")
- (synopsis "Portable URI Library")
- (description
- "This is a portable Universal Resource Identifier library for Common
-Lisp programs. It parses URI according to the RFC 2396 specification.")
- (license license:llgpl))))
-
-(define-public cl-puri
- (sbcl-package->cl-source-package sbcl-puri))
+ "CHRONICITY is Common Lisp natural language date and time parser inspired
+by Ruby's @code{Chronic}.")
+ (license license:bsd-3)))
-(define-public ecl-puri
- (sbcl-package->ecl-package sbcl-puri))
+(define-public ecl-chronicity
+ (sbcl-package->ecl-package sbcl-chronicity))
-(define-public sbcl-qmynd
- (let ((commit "7e56daf73f0ed5f49a931c01af75fb874bcf3445")
- (revision "1"))
- (package
- (name "sbcl-qmynd")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/qitab/qmynd")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-asdf-finalizers
- sbcl-babel
- sbcl-chipz
- sbcl-cl+ssl
- sbcl-flexi-streams
- sbcl-ironclad
- sbcl-salza2
- sbcl-trivial-gray-streams
- sbcl-usocket))
- (home-page "https://github.com/qitab/qmynd")
- (synopsis "QITAB MySQL Native Driver for Common Lisp")
- (description "QMyND, the QITAB MySQL Native Driver, is a MySQL client
-library that directly talks to a MySQL server in its native network protocol.
+(define-public cl-chronicity
+ (sbcl-package->cl-source-package sbcl-chronicity))
-It's a part of QITAB umbrella project.")
- (license license:expat))))
+(define-public sbcl-chunga
+ (package
+ (name "sbcl-chunga")
+ (version "1.1.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edicl/chunga")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jzn3nyb3f22gm983rfk99smqs3mhb9ivjmasvhq9qla5cl9pyhd"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-trivial-gray-streams))
+ (home-page "https://edicl.github.io/chunga/")
+ (synopsis "Portable chunked streams for Common Lisp")
+ (description
+ "Chunga implements streams capable of chunked encoding on demand as
+defined in RFC 2616.")
+ (license license:bsd-2)))
-(define-public ecl-qmynd
- (sbcl-package->ecl-package sbcl-qmynd))
+(define-public cl-chunga
+ (sbcl-package->cl-source-package sbcl-chunga))
-(define-public cl-qmynd
- (sbcl-package->cl-source-package sbcl-qmynd))
+(define-public ecl-chunga
+ (sbcl-package->ecl-package sbcl-chunga))
-(define-public sbcl-queues
- (let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94"))
+(define-public sbcl-ciel
+ (let ((commit "6cc1cef5e37e9f495c8163271a5de48de99f348a")
+ (revision "0"))
(package
- (name "sbcl-queues")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-ciel")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/oconnore/queues")
+ (url "https://github.com/ciel-lang/CIEL")
(commit commit)))
- (file-name (git-file-name "queues" version))
+ (file-name (git-file-name "ciel" version))
(sha256
- (base32
- "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"))))
+ (base32 "1bwafbbsppxqvijf43dii55mpzrklh6faj2m5dhajg2f2m8qckgi"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
- (arguments
- '(#:asd-systems '("queues"
- "queues.simple-queue"
- "queues.simple-cqueue"
- "queues.priority-queue"
- "queues.priority-cqueue")))
- (home-page "https://github.com/oconnore/queues")
- (synopsis "Common Lisp queue library")
+ (list sbcl-access
+ sbcl-alexandria
+ sbcl-arrow-macros
+ sbcl-bordeaux-threads
+ sbcl-cl-ansi-text
+ sbcl-cl-ansi-text
+ sbcl-cl-cron
+ sbcl-cl-csv
+ sbcl-cl-json-pointer
+ sbcl-cl-ppcre
+ sbcl-cl-punch
+ sbcl-cl-reexport
+ sbcl-cl-str
+ sbcl-clesh
+ sbcl-clingon
+ sbcl-closer-mop
+ sbcl-cmd
+ sbcl-dbi
+ sbcl-defstar
+ sbcl-deploy
+ sbcl-dexador
+ sbcl-dissect
+ sbcl-easy-routes
+ sbcl-file-notify
+ sbcl-fn
+ sbcl-for
+ sbcl-fset
+ sbcl-generic-cl
+ sbcl-hunchentoot
+ sbcl-local-time
+ sbcl-log4cl
+ sbcl-lparallel
+ sbcl-lquery
+ sbcl-metabang-bind
+ sbcl-modf
+ sbcl-named-readtables
+ sbcl-nodgui
+ sbcl-parse-float
+ sbcl-parse-number
+ sbcl-printv
+ sbcl-pythonic-string-reader
+ sbcl-quicksearch
+ sbcl-quri
+ sbcl-repl-utilities
+ sbcl-serapeum
+ sbcl-shasht
+ sbcl-shlex
+ sbcl-spinneret
+ sbcl-sxql
+ sbcl-trivia
+ sbcl-trivial-arguments
+ sbcl-trivial-do
+ sbcl-trivial-monitored-thread
+ sbcl-trivial-package-local-nicknames
+ sbcl-trivial-types
+ sbcl-vgplot
+ sbcl-which))
+ (home-page "http://ciel-lang.org/")
+ (synopsis "CIEL Is an Extended Lisp")
(description
- "This is a simple queue library for Common Lisp with features such as
-non-consing thread safe queues and fibonacci priority queues.")
+ "CIEL is a ready-to-use collection of libraries providing: a binary, to
+run CIEL scripts; a simple full-featured REPL for the terminal; a Lisp library
+and a core image .")
(license license:expat))))
-(define-public cl-queues
- (sbcl-package->cl-source-package sbcl-queues))
+(define-public cl-ciel
+ (sbcl-package->cl-source-package sbcl-ciel))
-(define-public ecl-queues
- (sbcl-package->ecl-package sbcl-queues))
+(define-public ecl-ciel
+ (sbcl-package->ecl-package sbcl-ciel))
-(define-public sbcl-glsl-packing
- (let ((commit "03628159468a8e5b7f2a1d5e78b77053e136794a")
+(define-public sbcl-circular-streams
+ (let ((commit "e770bade1919c5e8533dd2078c93c3d3bbeb38df")
(revision "1"))
(package
- (name "sbcl-glsl-packing")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/3b/glsl-packing/")
- (commit commit)))
- (file-name (git-file-name "glsl-packing" version))
- (sha256
- (base32 "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/3b/glsl-packing/")
- (synopsis "Common Lisp utilities to calculate OpenGL layouts")
- (description
- "This is a Common Lisp library to calculate std140 or std430 layouts for
-a glsl UBO/SSBO.")
- (license license:expat))))
+ (name "sbcl-circular-streams")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/circular-streams")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ ;; The tests depend on cl-test-more which is now prove. Prove
+ ;; tests aren't working for some reason.
+ `(#:tests? #f))
+ (inputs
+ (list sbcl-fast-io sbcl-trivial-gray-streams))
+ (home-page "https://github.com/fukamachi/circular-streams")
+ (synopsis "Circularly readable streams for Common Lisp")
+ (description
+ "Circular-Streams allows you to read streams circularly by wrapping real
+streams. Once you reach end-of-file of a stream, it's file position will be
+reset to 0 and you're able to read it again.")
+ (license license:llgpl))))
-(define-public ecl-glsl-packing
- (sbcl-package->ecl-package sbcl-glsl-packing))
+(define-public cl-circular-streams
+ (sbcl-package->cl-source-package sbcl-circular-streams))
-(define-public cl-glsl-packing
- (sbcl-package->cl-source-package sbcl-glsl-packing))
+(define-public ecl-circular-streams
+ (sbcl-package->ecl-package sbcl-circular-streams))
-(define-public sbcl-glsl-spec
- (let ((commit "f04476f7da89355ae6856b33283c60ba95c6555d")
+(define-public sbcl-cl-abnf
+ ;; There are no releases
+ (let ((commit "ba1fbb104dedbdaddb1ef93d2e4da711bd96cd70")
(revision "1"))
(package
- (name "sbcl-glsl-spec")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cbaggers/glsl-spec")
- (commit commit)))
- (file-name (git-file-name "glsl-spec" version))
- (sha256
- (base32 "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("glsl-spec" "glsl-symbols" "glsl-docs")))
- (home-page "https://github.com/cbaggers/glsl-spec")
- (synopsis "Common Lisp GLSL specification as a datastructure")
- (description
- "This package contains the specification of all functions and variables
-from GLSL as data.")
- (license license:unlicense))))
+ (name "sbcl-cl-abnf")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dimitri/cl-abnf")
+ (commit commit)))
+ (file-name (git-file-name "cl-abnf" version))
+ (sha256
+ (base32 "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("esrap" ,sbcl-esrap)))
+ (arguments
+ `(#:asd-systems '("abnf")))
+ (home-page "https://github.com/dimitri/cl-abnf")
+ (synopsis "ABNF parser generator for Common Lisp")
+ (description "This Common Lisp library implements a parser generator for
+the ABNF grammar format as described in RFC2234. The generated parser is a
+regular expression scanner provided by the cl-ppcre lib, which means that we
+can't parse recursive grammar definition. One such definition is the ABNF
+definition as given by the RFC. Fortunately, as you have this lib, you most
+probably don't need to generate another parser to handle that particular ABNF
+grammar.")
+ (license license:expat))))
-(define-public ecl-glsl-spec
- (sbcl-package->ecl-package sbcl-glsl-spec))
+(define-public cl-abnf
+ (sbcl-package->cl-source-package sbcl-cl-abnf))
-(define-public cl-glsl-spec
- (sbcl-package->cl-source-package sbcl-glsl-spec))
+(define-public ecl-cl-abnf
+ (sbcl-package->ecl-package sbcl-cl-abnf))
-(define-public sbcl-rtg-math
- (let ((commit "29fc5b3d0028a4a11a82355ecc8cca62662c69e0")
- (revision "1"))
+(define-public sbcl-cl-algebraic-data-type
+ (let ((commit "b2568428193a512d141d6b615772d50ceb5f9bca"))
(package
- (name "sbcl-rtg-math")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-algebraic-data-type")
+ (version (git-version "1.2.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cbaggers/rtg-math")
+ (url "https://github.com/stylewarning/cl-algebraic-data-type")
(commit commit)))
- (file-name (git-file-name "rtg-math" version))
+ (file-name (git-file-name "cl-algebraic-data-type" version))
(sha256
- (base32 "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"))))
+ (base32 "1lnqxcv8pd5z8n0g5p2l0dbljx9pqiv18hxl0vhsh7ldhkrjv2jx"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-documentation-utils sbcl-glsl-spec))
- (home-page "https://github.com/cbaggers/rtg-math")
- (synopsis "Common Lisp library of game-related math functions")
+ (list sbcl-alexandria
+ sbcl-global-vars))
+ (arguments
+ '(#:tests? #f)) ; No tests.
+ (home-page "https://github.com/stylewarning/cl-algebraic-data-type")
+ (synopsis "Common Lisp library for algebraic data types")
(description
- "RTG-MATH provides a selection of the math routines most commonly needed
-for making realtime graphics in Lisp.")
- (license license:bsd-2))))
+ "CL-ALGEBRAIC-DATA-TYPE, or ADT, is a library for defining algebraic
+data types in a similar spirit to Haskell or Standard ML, as well as for
+operating on them.")
+ (license license:bsd-3))))
-(define-public ecl-rtg-math
- (sbcl-package->ecl-package sbcl-rtg-math))
+(define-public cl-algebraic-data-type
+ (sbcl-package->cl-source-package sbcl-cl-algebraic-data-type))
-(define-public cl-rtg-math
- (sbcl-package->cl-source-package sbcl-rtg-math))
+(define-public ecl-algebraic-data-type
+ (sbcl-package->ecl-package sbcl-cl-algebraic-data-type))
-(define-public sbcl-varjo
- (let ((commit "9e77f30220053155d2ef8870ceba157f75e538d4")
- (revision "1"))
+(define-public sbcl-cl-all
+ (let ((commit "4ce1ea9d9f33c0dd6212044e7952a0c854757ace")
+ (revision "0"))
(package
- (name "sbcl-varjo")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-all")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cbaggers/varjo")
+ (url "https://github.com/Shinmera/cl-all")
(commit commit)))
- (file-name (git-file-name "varjo" version))
+ (file-name (git-file-name "cl-all" version))
(sha256
- (base32 "1p9x1wj576x5d31yvls9r1avkjkyhri7kyxbjfkg9z93a1w18j9z"))))
+ (base32 "0n4sjarj373zpxn78m32rmhxnsnr8qahdslrd9vrkkwjpzar2bwp"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria
- sbcl-cl-ppcre
- sbcl-documentation-utils
- sbcl-fn
- sbcl-glsl-spec
- sbcl-named-readtables
- sbcl-parse-float
- sbcl-vas-string-metrics))
- (home-page "https://github.com/cbaggers/varjo")
- (synopsis "Lisp to GLSL Language Translator")
- (description
- "Varjo is a Lisp to GLSL compiler. Vari is the dialect of lisp Varjo
-compiles. It aims to be as close to Common Lisp as possible, but naturally it
-is statically typed so there are differences.")
- (license license:bsd-2))))
-
-(define-public ecl-varjo
- (sbcl-package->ecl-package sbcl-varjo))
+ (outputs '("out" "bin"))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'create-asdf-configuration 'build-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (build-program
+ (string-append (assoc-ref outputs "bin") "/bin/cl-all")
+ outputs
+ #:entry-program '((cl-all:toplevel arguments))
+ #:compress? #t))))))
+ (home-page "https://github.com/Shinmera/cl-all")
+ (synopsis "Evaluate Common Lisp expressions in multiple implementations")
+ (description "@samp{cl-all} is a library and script for evaluating Common
+Lisp expressions in multiple implementations.")
+ (license license:zlib))))
-(define-public cl-varjo
- (sbcl-package->cl-source-package sbcl-varjo))
+(define-public cl-all
+ (sbcl-package->cl-source-package sbcl-cl-all))
-(define-public sbcl-cffi
- (let ((commit "33970351e71bb5f12ba56fc40270089e948ae112")
- (revision "1"))
+(define-public sbcl-cl-ana
+ (let ((commit "848185eed1ed65bab3a124870c122f761ce0d87e")
+ (revision "2"))
(package
- (name "sbcl-cffi")
- (version (git-version "0.24.1" revision commit))
+ (name "sbcl-cl-ana")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cffi/cffi")
+ (url "https://github.com/ghollisjr/cl-ana")
(commit commit)))
- (file-name (git-file-name "cl-cffi" version))
+ (file-name (git-file-name "cl-ana" version))
(sha256
- (base32 "1h7cw15f08gm6m4yz8hk7qkfwp7mwwnykjc5py6dhjakv0wh1g37"))))
+ (base32 "026agqsxq3pg2k9jmy2wysil2z0yn5rykzzhr8rqxsspdwz51z1y"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list openmpi ;; for hdf-cffi
+ pkg-config
+ sbcl-cl-fad))
(inputs
- (list libffi
+ (list gsl
+ hdf5-parallel-openmpi
+ libffi
+ sbcl-antik
+ sbcl-cffi
+ sbcl-cl-csv
+ sbcl-closer-mop
+ sbcl-external-program
+ sbcl-gsll
+ sbcl-iterate
sbcl-alexandria
- sbcl-babel
- sbcl-trivial-features))
- (native-inputs
- (list pkg-config
- sbcl-bordeaux-threads
- sbcl-rt))
+ sbcl-split-sequence))
+ (propagated-inputs
+ (list gnuplot)) ;; for gnuplot-interface
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "libffi/libffi.lisp"
- (("libffi.so.8" all)
- (search-input-file inputs (string-append "/lib/" all))))
- (substitute* "toolchain/c-toolchain.lisp"
- (("\"cc\"")
- (format #f "~S" (which "gcc"))))))
- (add-after 'build 'install-headers
+ (substitute* "hdf-cffi/src/library.lisp"
+ (("libhdf5.so")
+ (search-input-file inputs "/lib/libhdf5.so")))
+ (substitute* (list "gsl-cffi/gsl-cffi.lisp"
+ "spline/spline.lisp")
+ (("libgsl.so")
+ (search-input-file inputs "/lib/libgsl.so")))))
+ (add-after 'fix-paths 'fix-newer-hdf5-compatibility
(lambda _
- (install-file "grovel/common.h"
- (string-append #$output
- "/include/grovel")))))
- #:asd-systems ''("cffi"
- "cffi-libffi"
- "cffi-uffi-compat")))
- (home-page "https://common-lisp.net/project/cffi/")
- (synopsis "Common Foreign Function Interface for Common Lisp")
- (description "The Common Foreign Function Interface (CFFI)
-purports to be a portable foreign function interface for Common Lisp.
-The CFFI library is composed of a Lisp-implementation-specific backend
-in the CFFI-SYS package, and a portable frontend in the CFFI
-package.")
- (license license:expat))))
-
-(define-public cl-cffi
- (sbcl-package->cl-source-package sbcl-cffi))
+ (substitute* (list "hdf-cffi/src/h5-grovel.lisp"
+ "hdf-cffi/src/h5a-grovel.lisp"
+ "hdf-cffi/src/h5d-grovel.lisp"
+ "hdf-cffi/src/h5f-grovel.lisp"
+ "hdf-cffi/src/h5g-grovel.lisp"
+ "hdf-cffi/src/h5i-grovel.lisp"
+ "hdf-cffi/src/h5l-grovel.lisp"
+ "hdf-cffi/src/h5o-grovel.lisp"
+ "hdf-cffi/src/h5p-grovel.lisp"
+ "hdf-cffi/src/h5pl-grovel.lisp"
+ "hdf-cffi/src/h5r-grovel.lisp"
+ "hdf-cffi/src/h5s-grovel.lisp"
+ "hdf-cffi/src/h5t-grovel.lisp"
+ "hdf-cffi/src/h5z-grovel.lisp")
+ (("_H5private_H")
+ "H5private_H")))))))
+ (synopsis "Common Lisp data analysis library")
+ (description
+ "CL-ANA is a data analysis library in Common Lisp providing tabular and
+binned data analysis along with nonlinear least squares fitting and
+visualization.")
+ (home-page "https://github.com/ghollisjr/cl-ana")
+ (license license:gpl3))))
-(define-public ecl-cffi
- (sbcl-package->ecl-package sbcl-cffi))
+(define-public cl-ana
+ (sbcl-package->cl-source-package sbcl-cl-ana))
-(define-public sbcl-cffi-c-ref
- (let ((commit "8123cbb6034c5f7921a0766107cfb8c4e8efd5ce")
- (revision "0"))
+(define-public sbcl-cl-annot
+ (let ((commit "c99e69c15d935eabc671b483349a406e0da9518d")
+ (revision "1"))
(package
- (name "sbcl-cffi-c-ref")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-cl-annot")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/borodust/cffi-c-ref")
+ (url "https://github.com/m2ym/cl-annot")
(commit commit)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z"))
- (file-name (git-file-name "cffi-c-ref" version))))
+ (base32 "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-cffi))
- (synopsis "Streamlined access to foreign memory")
+ (list sbcl-alexandria))
+ (home-page "https://github.com/m2ym/cl-annot")
+ (synopsis "Python-like Annotation Syntax for Common Lisp")
(description
- "This Common Lisp library provides macros to access foreign memory.")
- (home-page "https://github.com/borodust/cffi-c-ref")
- (license license:expat))))
+ "@code{cl-annot} is an general annotation library for Common Lisp.")
+ (license license:llgpl))))
-(define-public cl-cffi-c-ref
- (sbcl-package->cl-source-package sbcl-cffi-c-ref))
+(define-public cl-annot
+ (sbcl-package->cl-source-package sbcl-cl-annot))
-(define-public ecl-cffi-c-ref
- (sbcl-package->ecl-package sbcl-cffi-c-ref))
+(define-public ecl-cl-annot
+ (sbcl-package->ecl-package sbcl-cl-annot))
-(define-public sbcl-ffa
- (let ((commit "b7012f51c4c37d1e759ff9cf78cea178504d8e07")
- (revision "1"))
+(define-public sbcl-cl-ansi-text
+ (let ((commit "8b129d83c7511b54cdd9d4123825a2d06349b25c"))
(package
- (name "sbcl-ffa")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-ansi-text")
+ (version (git-version "2.0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/ffa")
+ (url "https://github.com/pnathan/cl-ansi-text")
(commit commit)))
- (file-name (git-file-name "cl-ffa" version))
(sha256
- (base32 "0l7kqcjp3sn1129hpwq6zhjqc0ydx9gc53z7k13i38x3z1asap7a"))))
+ (base32
+ "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"))
+ (file-name (git-file-name "cl-ansi-text" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cffi sbcl-cl-utilities sbcl-iterate sbcl-metabang-bind))
- (synopsis "Foreign friendly arrays for Common Lisp")
+ (list sbcl-alexandria sbcl-cl-colors2))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "ANSI terminal color implementation for Common Lisp")
(description
- "This package provides a macro that allows foreign functions to access
-the contents of the array at a given pointer, using the best available method
-given the Common Lisp implementation.")
- (home-page "https://cliki.net/ffa")
+ "@command{cl-ansi-text} provides utilities which enable printing to an
+ANSI terminal with colored text. It provides the macro @command{with-color}
+which causes everything printed in the body to be displayed with the provided
+color. It further provides functions which will print the argument with the
+named color.")
+ (home-page "https://github.com/pnathan/cl-ansi-text")
(license license:llgpl))))
-(define-public cl-ffa
- (sbcl-package->cl-source-package sbcl-ffa))
-
-(define-public ecl-ffa
- (sbcl-package->ecl-package sbcl-ffa))
-
-(define-public sbcl-cl-sqlite
- (package
- (name "sbcl-cl-sqlite")
- (version "0.2.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dmitryvk/cl-sqlite")
- (commit version)))
- (file-name (git-file-name "cl-sqlite" version))
- (sha256
- (base32
- "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("iterate" ,sbcl-iterate)
- ("cffi" ,sbcl-cffi)
- ("sqlite" ,sqlite)))
- (native-inputs
- `(("fiveam" ,sbcl-fiveam)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)))
- (arguments
- `(#:asd-systems '("sqlite")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "sqlite-ffi.lisp"
- (("libsqlite3" all) (string-append
- (assoc-ref inputs "sqlite")"/lib/" all))))))))
- (home-page "https://common-lisp.net/project/cl-sqlite/")
- (synopsis "Common Lisp binding for SQLite")
- (description
- "The @command{cl-sqlite} package is an interface to the SQLite embedded
-relational database engine.")
- (license license:public-domain)))
-
-(define-public cl-sqlite
- (sbcl-package->cl-source-package sbcl-cl-sqlite))
+(define-public cl-ansi-text
+ (sbcl-package->cl-source-package sbcl-cl-ansi-text))
-(define-public ecl-cl-sqlite
- (sbcl-package->ecl-package sbcl-cl-sqlite))
+(define-public ecl-cl-ansi-text
+ (sbcl-package->ecl-package sbcl-cl-ansi-text))
-(define-public sbcl-cl-raylib
- (let ((commit "985ceebef4cb56c651cddc23bd71812f2be38c2d")
- (revision "0"))
+(define-public sbcl-cl-ascii-table
+ (let ((commit "d9f5e774a56fad1b416e4dadb8f8a5b0e84094e2")
+ (revision "1"))
(package
- (name "sbcl-cl-raylib")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-ascii-table")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/longlene/cl-raylib")
+ (url "https://github.com/telephil/cl-ascii-table")
(commit commit)))
- (file-name (git-file-name "cl-raylib" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1kighj35g6dn426mhr2ppz3gm49v1q4n42ydn619pclrqwyrnc2z"))))
+ (base32 "125fdif9sgl7k0ngjhxv0wjas2q27d075025hvj2rx1b1x948z4s"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f ; no tests https://github.com/longlene/cl-raylib/issues/40
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libraylib\\.so")
- (search-input-file inputs "/lib/libraylib.so"))))))))
- (inputs
- (list raylib
- sbcl-3d-matrices
- sbcl-3d-vectors
- sbcl-alexandria
- sbcl-cffi))
- (home-page "https://github.com/longlene/cl-raylib")
- (synopsis "Common Lisp bindings to raylib")
- (description "This package provides Common Lisp CFFI bindings to the
-Raylib game development library.")
+ (synopsis "Library to make ascii-art tables")
+ (description
+ "This is a Common Lisp library to present tabular data in ascii-art
+tables.")
+ (home-page "https://github.com/telephil/cl-ascii-table")
(license license:expat))))
-(define-public cl-raylib
- (sbcl-package->cl-source-package sbcl-cl-raylib))
+(define-public cl-ascii-table
+ (sbcl-package->cl-source-package sbcl-cl-ascii-table))
-(define-public ecl-cl-raylib
- (sbcl-package->ecl-package sbcl-cl-raylib))
+(define-public ecl-cl-ascii-table
+ (sbcl-package->ecl-package sbcl-cl-ascii-table))
-(define-public sbcl-cl-redis
- (let ((commit "7d592417421cf7cd1cffa96043b457af0490df7d")
- (revision "0"))
+(define-public sbcl-cl-async
+ (let ((commit "f6423e44404a44434d803605e0d2e17199158e28")
+ (revision "1"))
(package
- (name "sbcl-cl-redis")
- (version (git-version "2.3.8" revision commit))
+ (name "sbcl-cl-async")
+ (version (git-version "0.6.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/vseloved/cl-redis")
+ (url "https://github.com/orthecreedence/cl-async")
(commit commit)))
- (file-name (git-file-name "cl-redis" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"))))
+ (base32
+ "11xi9dxb8mjgwzrkj88i0xkgk26z9w9ddxzbv6xsvfc1d4x5cf4x"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-before 'check 'start-redis
- (lambda _
- (system "redis-server --port 6379 &"))))))
- (native-inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("redis" ,redis)
- ("should-test" ,sbcl-should-test)))
(inputs
`(("babel" ,sbcl-babel)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cffi" ,sbcl-cffi)
+ ("cl-libuv" ,sbcl-cl-libuv)
("cl-ppcre" ,sbcl-cl-ppcre)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("rutils" ,sbcl-rutils)
- ("usocket" ,sbcl-usocket)))
- (home-page "https://github.com/vseloved/cl-redis")
- (synopsis "Common Lisp client for Redis")
- (description "This is a Common Lisp wrapper for interacting with the
-Redis data structure store.")
+ ("fast-io" ,sbcl-fast-io)
+ ("openssl" ,openssl)
+ ("static-vectors" ,sbcl-static-vectors)
+ ("trivial-features" ,sbcl-trivial-features)
+ ("trivial-gray-streams" ,sbcl-trivial-gray-streams)
+ ("vom" ,sbcl-vom)))
+ (arguments
+ `(#:asd-systems '("cl-async"
+ "cl-async-repl"
+ "cl-async-ssl")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/ssl/package.lisp"
+ (("libcrypto\\.so")
+ (search-input-file inputs "/lib/libcrypto.so"))
+ (("libssl\\.so")
+ (search-input-file inputs "/lib/libssl.so"))))))))
+ (synopsis "Asynchronous operations for Common Lisp")
+ (description
+ "Cl-async is a library for general purpose, non-blocking programming in
+Common Lisp. It uses the libuv library as backend.")
+ (home-page "https://orthecreedence.github.io/cl-async/")
(license license:expat))))
-(define-public cl-redis
- (sbcl-package->cl-source-package sbcl-cl-redis))
+(define-public cl-async
+ (sbcl-package->cl-source-package sbcl-cl-async))
-(define-public ecl-cl-redis
- (let ((pkg (sbcl-package->ecl-package sbcl-cl-redis)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; Tests are failing on ECL with:
- ;; Test L-COMMANDS: An error occurred during initialization:
- ;; Protocol not found: "tcp".
- ((#:tests? _ #f) #f))))))
+(define-public ecl-cl-async
+ (sbcl-package->ecl-package sbcl-cl-async))
-(define-public sbcl-parenscript
- ;; Source archives are overwritten on every release, we use the Git repo instead.
- (let ((commit "7a1ac46353cecd144fc91915ba9f122aafcf4766"))
+(define-public sbcl-cl-async-future
+ (let ((commit "ee36c22a69a9516407458d2ed8b475f1fc473959")
+ (revision "1"))
(package
- (name "sbcl-parenscript")
- (version (git-version "2.7.1" "1" commit))
+ (name "sbcl-cl-async-future")
+ (version (git-version "0.4.4.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/parenscript/parenscript")
+ (url "https://github.com/orthecreedence/cl-async-future")
(commit commit)))
- (file-name (git-file-name "parenscript" version))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0c22lqarrpbq82dg1sb3y6mp6w2faczp34ymzhnmff88yfq1xzsf"))))
+ "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre sbcl-anaphora sbcl-named-readtables))
- (home-page "https://common-lisp.net/project/parenscript/")
- (synopsis "Translator from a subset of Common Lisp to JavaScript")
+ (list sbcl-blackbird))
+ (native-inputs
+ (list sbcl-cl-async sbcl-eos))
+ (synopsis "Futures implementation for Common Lisp")
(description
- "Parenscript is a translator from an extended subset of Common Lisp to
-JavaScript. Parenscript code can run almost identically on both the
-browser (as JavaScript) and server (as Common Lisp).
-
-Parenscript code is treated the same way as Common Lisp code, making the full
-power of Lisp macros available for JavaScript. This provides a web
-development environment that is unmatched in its ability to reduce code
-duplication and provide advanced meta-programming facilities to web
-developers.
-
-At the same time, Parenscript is different from almost all other \"language
-X\" to JavaScript translators in that it imposes almost no overhead:
-
-@itemize
-@item No run-time dependencies: Any piece of Parenscript code is runnable
-as-is. There are no JavaScript files to include.
-@item Native types: Parenscript works entirely with native JavaScript data
-types. There are no new types introduced, and object prototypes are not
-touched.
-@item Native calling convention: Any JavaScript code can be called without the
-need for bindings. Likewise, Parenscript can be used to make efficient,
-self-contained JavaScript libraries.
-@item Readable code: Parenscript generates concise, formatted, idiomatic
-JavaScript code. Identifier names are preserved. This enables seamless
-debugging in tools like Firebug.
-@item Efficiency: Parenscript introduces minimal overhead for advanced Common
-Lisp features. The generated code is almost as fast as hand-written
-JavaScript.
-@end itemize\n")
- (license license:bsd-3))))
-
-(define-public cl-parenscript
- (sbcl-package->cl-source-package sbcl-parenscript))
-
-(define-public ecl-parenscript
- (sbcl-package->ecl-package sbcl-parenscript))
-
-(define-public sbcl-cl-json
- (package
- (name "sbcl-cl-json")
- (version "0.6.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/cl-json")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-json" version))
- (sha256
- (base32 "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/sharplispers/cl-json")
- (synopsis "JSON encoder and decoder for Common-Lisp")
- (description "@command{cl-json} provides an encoder of Lisp objects
-to JSON format and a corresponding decoder of JSON data to Lisp
-objects. Both the encoder and the decoder are highly customizable; at the
-same time, the default settings ensure a very simple mode of operation,
-similar to that provided by @command{yason} or @command{st-json}.")
- (license license:expat)))
+ "This is futures implementation for Common Lisp. It plugs in nicely
+to cl-async.")
+ (home-page "https://orthecreedence.github.io/cl-async/future")
+ (license license:expat))))
-(define-public cl-json
- (sbcl-package->cl-source-package sbcl-cl-json))
+(define-public cl-async-future
+ (sbcl-package->cl-source-package sbcl-cl-async-future))
-(define-public ecl-cl-json
- (sbcl-package->ecl-package sbcl-cl-json))
+(define-public ecl-cl-async-future
+ (sbcl-package->ecl-package sbcl-cl-async-future))
-(define-public sbcl-cl-json-pointer
- (let ((commit "f6760e2a02972783f96b92a15f801e14a6828e0c")
- (revision "0"))
+(define-public sbcl-cl-autowrap
+ (let ((revision "2")
+ (commit "a5d71ebd7c21b87f449db1e16ab815750d7c0ea4"))
+ ;; no taged branches
(package
- (name "sbcl-cl-json-pointer")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-autowrap")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/y2q-actionman/cl-json-pointer")
+ (url "https://github.com/rpav/cl-autowrap")
(commit commit)))
- (file-name (git-file-name "cl-json-pointer" version))
+ (file-name (git-file-name "cl-autowrap" version))
(sha256
- (base32 "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"))))
+ (base32 "0795c817m1c41cz3ywzzg83z4pgkxdg6si553pay9mdgjvmrwmaw"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; FIXME: Component "cl-json-pointer/test" not found.
- `(#:tests? #f
- #:asd-systems '("cl-json-pointer" "cl-json-pointer/synonyms")))
+ `(#:asd-systems '("cl-plus-c" "cl-autowrap")))
(inputs
- (list sbcl-alexandria
- sbcl-boost-json
- sbcl-cl-json
- sbcl-closer-mop
- sbcl-st-json))
- (home-page "https://github.com/y2q-actionman/cl-json-pointer")
- (synopsis "JSON Pointer processor for Common Lisp")
- (description "
-This package provides a JSON
-Pointer (@url{https://tools.ietf.org/html/rfc6901,RFC6901}) implementation for
-Common Lisp. This libary aims to be independent from any JSON libraries (as much
-as possible).")
- (license license:expat))))
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("cl-json" ,sbcl-cl-json)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("defpackage-plus" ,sbcl-defpackage-plus)
+ ("trivial-features" ,sbcl-trivial-features)))
+ (home-page "https://github.com/rpav/cl-autowrap")
+ (synopsis "FFI wrapper generator for Common Lisp")
+ (description "This is a c2ffi-based wrapper generator for Common Lisp.")
+ (license license:bsd-2))))
-(define-public cl-json-pointer
- (sbcl-package->cl-source-package sbcl-cl-json-pointer))
+(define-public cl-autowrap
+ (sbcl-package->cl-source-package sbcl-cl-autowrap))
-(define-public ecl-cl-json-pointer
- (sbcl-package->ecl-package sbcl-cl-json-pointer))
+(define-public ecl-cl-autowrap
+ (sbcl-package->ecl-package sbcl-cl-autowrap))
-(define-public sbcl-unix-opts
- (let ((commit "0e61f34b2ecf62288437810d4abb31e572048b04")
+(define-public sbcl-cl-base32
+ (let ((commit "8cdee06fab397f7b0a19583b57e7f0c98405be85")
(revision "1"))
(package
- (name "sbcl-unix-opts")
- (version (git-version "0.1.7" revision commit))
+ (name "sbcl-cl-base32")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/libre-man/unix-opts")
+ (url "https://github.com/hargettp/cl-base32")
(commit commit)))
- (file-name (git-file-name "unix-opts" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq"))))
+ (base32 "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/hankhero/cl-json")
- (synopsis "Unix-style command line options parser")
+ (native-inputs
+ (list sbcl-lisp-unit))
+ (synopsis "Common Lisp library for base32 encoding and decoding")
(description
- "This is a minimalistic parser of command line options. The main
-advantage of the library is the ability to concisely define command line
-options once and then use this definition for parsing and extraction of
-command line arguments, as well as printing description of command line
-options (you get --help for free). This way you don't need to repeat
-yourself. Also, @command{unix-opts} doesn't depend on anything and
-precisely controls the behavior of the parser via Common Lisp restarts.")
+ "This package provides functions for base32 encoding and decoding as
+defined in RFC4648.")
+ (home-page "https://github.com/hargettp/cl-base32")
(license license:expat))))
-(define-public cl-unix-opts
- (sbcl-package->cl-source-package sbcl-unix-opts))
+(define-public cl-base32
+ (sbcl-package->cl-source-package sbcl-cl-base32))
-(define-public ecl-unix-opts
- (sbcl-package->ecl-package sbcl-unix-opts))
+(define-public ecl-cl-base32
+ (sbcl-package->ecl-package sbcl-cl-base32))
-(define-public sbcl-trivial-garbage
- (let ((commit "3474f6414b73d4e3aa2d5c53080f4247a34f6380")
- (revision "0"))
+(define-public sbcl-cl-base58
+ (let ((commit "f446835b4104896e0eed6a61d2ceb4ad22f589d8")
+ (revision "1"))
(package
- (name "sbcl-trivial-garbage")
- (version (git-version "0.21" revision commit))
+ (name "sbcl-cl-base58")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/trivial-garbage/trivial-garbage")
+ (url "https://github.com/eudoxia0/cl-base58/")
(commit commit)))
- (file-name (git-file-name "cl-trivial-garbage" version))
+ (file-name (git-file-name "cl-base58" version))
(sha256
- (base32 "0rfwxvwg0kpcaa0hsi035yrkfdfks4bq8d9azmrww2f0rmv9g6sd"))))
+ (base32 "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("cl-base58-test" "cl-base58")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "cl-base58-test.asd"
+ (("cl-test-more")
+ "prove"))
+ #t)))))
(native-inputs
- (list sbcl-rt))
- (home-page "https://common-lisp.net/project/trivial-garbage/")
- (synopsis "Portable GC-related APIs for Common Lisp")
- (description "@command{trivial-garbage} provides a portable API to
-finalizers, weak hash-tables and weak pointers on all major implementations of
-the Common Lisp programming language.")
- (license license:public-domain))))
-
-(define-public cl-trivial-garbage
- (sbcl-package->cl-source-package sbcl-trivial-garbage))
-
-(define-public ecl-trivial-garbage
- (sbcl-package->ecl-package sbcl-trivial-garbage))
-
-(define-public sbcl-ucons
- (let ((commit "d976810ef2b12a2caaf55bd0f258272e9b79f3be")
- (revision "0"))
- (package
- (name "sbcl-ucons")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/marcoheisig/ucons")
- (commit commit)))
- (file-name (git-file-name "cl-ucons" version))
- (sha256
- (base32 "17aj47pdjiywnf33hl46p27za2q0pq5ar3fpqxaqskggxrfxmijl"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-atomics
- sbcl-bordeaux-threads
- sbcl-named-readtables
- sbcl-trivia))
- (home-page "https://github.com/marcoheisig/ucons")
- (synopsis "Unique conses for Common Lisp")
- (description "UCONS is a Common Lisp library providing unique conses.
-Unique conses are different from regular conses in that, in addition to their
-@code{car} and @code{cdr}, they maintain a table of past users. Also, the
-@code{cdr} of each ucons is restricted to other uconses or @code{nil}.
-Uconses are meant for those situations where even reusing regular conses (to
-avoid consing) is too computationally expensive.")
+ (list sbcl-prove))
+ (home-page "https://github.com/eudoxia0/cl-base58")
+ (synopsis "Implementation of base58 for Common Lisp")
+ (description
+ "This library implements the @code{base58} encoding algorithm. It's
+basically @code{base64} but with a smaller alphabet (58, as in the name) that
+doesn't include similar looking characters, among other things. See
+@url{https://github.com/bitcoin/bitcoin/blob/master/src/base58.h} for a full
+reference.")
(license license:expat))))
-(define-public cl-ucons
- (sbcl-package->cl-source-package sbcl-ucons))
+(define-public cl-base58
+ (sbcl-package->cl-source-package sbcl-cl-base58))
-(define-public ecl-ucons
- (sbcl-package->ecl-package sbcl-ucons))
+(define-public ecl-cl-base58
+ (sbcl-package->ecl-package sbcl-cl-base58))
-(define-public sbcl-clobber
- (let ((commit "212721c24a8bb792714314ba52dfe818641f2e98")
- (revision "0"))
+(define-public sbcl-cl-base64
+ (let ((commit "577683b18fd880b82274d99fc96a18a710e3987a"))
(package
- (name "sbcl-clobber")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-base64")
+ (version (git-version "3.3.4" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Clobber")
+ (url "http://git.kpe.io/cl-base64.git/")
(commit commit)))
- (file-name (git-file-name "cl-clobber" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0pqzfn2wqbzzwlwc3l84iv3i3wa9zfgnh14mq67h9qkib8wjzx3n"))))
+ (base32 "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The useless bundled debian folder drags `make' into the closure.
+ `(begin
+ (delete-file-recursively "debian")
+ #t))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/robert-strandh/Clobber")
- (synopsis "Common Lisp Library for transaction-oriented databases")
+ (native-inputs ; For tests.
+ (list sbcl-ptester sbcl-kmrcl))
+ (home-page "http://files.kpe.io/cl-base64/")
+ (synopsis
+ "Common Lisp package to encode and decode base64 with URI support")
(description
- "CLOBBER is an alternative to so-called @emph{object prevalence}, and in
-particular to @code{cl-prevalence}. Clobber is both simpler, more flexible, and
-more robust than systems based on object prevalence.")
- (license license:bsd-2))))
+ "This package provides highly optimized base64 encoding and decoding.
+Besides conversion to and from strings, integer conversions are supported.
+Encoding with Uniform Resource Identifiers is supported by using a modified
+encoding table that uses only URI-compatible characters.")
+ (license license:bsd-3))))
-(define-public cl-clobber
- (sbcl-package->cl-source-package sbcl-clobber))
+(define-public cl-base64
+ (sbcl-package->cl-source-package sbcl-cl-base64))
-(define-public ecl-clobber
- (sbcl-package->ecl-package sbcl-clobber))
+(define-public ecl-cl-base64
+ (sbcl-package->ecl-package sbcl-cl-base64))
-(define-public sbcl-closer-mop
- (let ((commit "7b86f2add029208ebc74ec6a41c2ccfd3c382dbc")
- (revision "3"))
+(define-public sbcl-cl-cairo2
+ (let ((commit "41ae45aac86553c46f4bb460f80e1fb620930f5b")
+ (revision "1"))
(package
- (name "sbcl-closer-mop")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-cairo2")
+ (version (git-version "0.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pcostanza/closer-mop")
+ (url "https://github.com/rpav/cl-cairo2")
(commit commit)))
+ (file-name (git-file-name "cl-cairo2" version))
(sha256
- (base32 "1fzxdpq873rpagmj3h9bgv7n95h4p03pnxrklbxp06sxb26xyi16"))
- (file-name (git-file-name "cl-closer-mop" version ))))
+ (base32 "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pcostanza/closer-mop")
- (synopsis "Rectifies absent or incorrect CLOS MOP features")
- (description "Closer to MOP is a compatibility layer that rectifies many
-of the absent or incorrect CLOS MOP features across a broad range of Common
-Lisp implementations.")
- (license license:expat))))
+ (arguments
+ `(#:asd-systems '(;; "cl-cairo2-gtk2" ; cl-gtk2 is not packed and quite old.
+ ;; "cl-cairo2-quartz" ; Failing when enabled.
+ ;; "cl-cairo2-xlib" ; cl-xcb-xlib is not packed yet and quite old.
+ ;; "cl-cairo2-xcb"
+ "cl-cairo2")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/load-libraries.lisp"
+ (("libcairo.so.2")
+ (search-input-file inputs "/lib/libcairo.so.2"))))))))
+ (inputs
+ (list cairo
+ sbcl-cffi
+ sbcl-cl-colors
+ sbcl-cl-freetype2
+ sbcl-cl-utilities
+ sbcl-metabang-bind
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/rpav/cl-cairo2")
+ (synopsis "Cairo bindings for Common Lisp")
+ (description
+ "This package provides CFFI bindings for Common Lisp to the Cairo
+C library.")
+ (license license:boost1.0))))
-(define-public cl-closer-mop
- (sbcl-package->cl-source-package sbcl-closer-mop))
+(define-public cl-cairo2
+ (sbcl-package->cl-source-package sbcl-cl-cairo2))
-(define-public ecl-closer-mop
- (sbcl-package->ecl-package sbcl-closer-mop))
+(define-public ecl-cl-cairo2
+ (sbcl-package->ecl-package sbcl-cl-cairo2))
(define-public sbcl-cl-cffi-gtk
(let ((commit "1700fe672c65455c1fc33061ec92a3df84287ec7")
@@ -5345,2232 +4239,960 @@ is a library for creating graphical user interfaces.")
(define-public ecl-cl-cffi-gtk
(sbcl-package->ecl-package sbcl-cl-cffi-gtk))
-(define-public sbcl-cl-webkit
- (package
- (name "sbcl-cl-webkit")
- (version "3.5.10")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/joachifm/cl-webkit")
- (commit version)))
- (file-name (git-file-name "cl-webkit" version))
- (sha256
- (base32
- "0bn8idvbi58kg0g76lanvjzkgnkcy41yn9vbp7f80q9fa7w892rq"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
- ("webkitgtk" ,webkitgtk-for-gtk3)))
- (native-inputs
- `(;; Tests seem to need Xorg.
- ;; ("xorg-server" ,xorg-server-for-tests)
- ("calispel" ,sbcl-calispel)
- ("fiveam" ,sbcl-fiveam)
- ("float-features" ,sbcl-float-features)))
- (arguments
- `(#:asd-systems '("cl-webkit2")
- #:tests? #f ; TODO: Tests hang, why?
- #:phases
- (modify-phases %standard-phases
- ;; The following phase is needed for tests:
- ;; (add-before 'check 'start-xorg-server
- ;; (lambda* (#:key inputs #:allow-other-keys)
- ;; ;; The test suite requires a running X server.
- ;; (system (string-append (assoc-ref inputs "xorg-server")
- ;; "/bin/Xvfb :1 &"))
- ;; (setenv "DISPLAY" ":1")
- ;; #t))
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "webkit2/webkit2.init.lisp"
- (("libwebkit2gtk" all)
- (string-append
- (assoc-ref inputs "webkitgtk") "/lib/" all))))))))
- (home-page "https://github.com/joachifm/cl-webkit")
- (synopsis "Binding to WebKitGTK+ for Common Lisp")
- (description
- "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp,
-currently targeting WebKit version 2. The WebKitGTK+ library adds web
-browsing capabilities to an application, leveraging the full power of the
-WebKit browsing engine.")
- (license license:expat)))
-
-(define-public cl-webkit
- (sbcl-package->cl-source-package sbcl-cl-webkit))
-
-(define-public ecl-cl-webkit
- (sbcl-package->ecl-package sbcl-cl-webkit))
-
-(define-public sbcl-lparallel
- (let ((commit "80fc2952a074776abd343d6b5d3ab157f0e1df7a")
+(define-public sbcl-cl-change-case
+ (let ((commit "45c70b601125889689e0c1c37d7e727a3a0af022")
(revision "1"))
(package
- (name "sbcl-lparallel")
- (version (git-version "2.8.4" revision commit))
+ (name "sbcl-cl-change-case")
+ (version (git-version "0.2.0" revision commit))
+ (home-page "https://github.com/rudolfochrist/cl-change-case")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/lparallel/")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-lparallel" version))
+ (file-name (git-file-name "cl-change-case" version))
(sha256
- (base32 "0nv2dx8cl25g68icqhw95yr5mygm86lcjzmzijql51na1p60g6y9"))))
+ (base32 "0qmk341zzcsbf8sq0w9ix3r080zg4ri6vzxym63lhdjfzwz3y8if"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-trivial-garbage))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-dependency
- ;; lparallel loads a SBCL specific system in its asd file. This is
- ;; not carried over into the fasl which is generated. In order for
- ;; it to be carried over, it needs to be listed as a dependency.
- (lambda _
- (substitute* "lparallel.asd"
- ((":depends-on \\(:alexandria" all)
- (string-append all " #+sbcl :sb-cltl2"))))))))
- (home-page "https://lparallel.org/")
- (synopsis "Parallelism for Common Lisp")
- (description
- "@command{lparallel} is a library for parallel programming in Common
-Lisp, featuring:
-
-@itemize
-@item a simple model of task submission with receiving queue,
-@item constructs for expressing fine-grained parallelism,
-@item asynchronous condition handling across thread boundaries,
-@item parallel versions of map, reduce, sort, remove, and many others,
-@item promises, futures, and delayed evaluation constructs,
-@item computation trees for parallelizing interconnected tasks,
-@item bounded and unbounded FIFO queues,
-@item high and low priority tasks,
-@item task killing by category,
-@item integrated timeouts.
-@end itemize\n")
- (license license:expat))))
-
-(define-public cl-lparallel
- (sbcl-package->cl-source-package sbcl-lparallel))
-
-(define-public ecl-lparallel
- (sbcl-package->ecl-package sbcl-lparallel))
-
-(define-public sbcl-cl-markup
- (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390"))
- (package
- (name "sbcl-cl-markup")
- (version (git-version "0.1" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/arielnetworks/cl-markup/")
- (commit commit)))
- (file-name (git-file-name "cl-markup" version))
- (sha256
- (base32
- "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/arielnetworks/cl-markup/")
- (synopsis "Markup generation library for Common Lisp")
+ (list sbcl-cl-ppcre sbcl-cl-ppcre-unicode))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis
+ "Convert Common Lisp strings between camelCase, PascalCase and more")
(description
- "A modern markup generation library for Common Lisp that features:
-
-@itemize
-@item Fast (even faster through compiling the code)
-@item Safety
-@item Support for multiple document types (markup, xml, html, html5, xhtml)
-@item Output with doctype
-@item Direct output to stream
-@end itemize\n")
- (license license:lgpl3+))))
+ "@code{cl-change-case} is a library to convert strings between
+camelCase, PascalCase, snake_case, param-case, CONSTANT_CASE and more.")
+ (license license:llgpl))))
-(define-public cl-markup
- (sbcl-package->cl-source-package sbcl-cl-markup))
+(define-public cl-change-case
+ (sbcl-package->cl-source-package sbcl-cl-change-case))
-(define-public ecl-cl-markup
- (sbcl-package->ecl-package sbcl-cl-markup))
+(define-public ecl-cl-change-case
+ (sbcl-package->ecl-package sbcl-cl-change-case))
-;;; The following package is renamed from "markup" to "markup-reader" in order
-;;; not to conflict with the "cl-markup" package.
-(define-public sbcl-markup-reader
- (let ((commit "d2d4d7b073554f47c24223a9304452966608702e")
+(define-public sbcl-cl-charms
+ (let ((commit "64aba59d89f85bc5c9402e445873965338a66a02")
(revision "1"))
(package
- (name "sbcl-markup-reader")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-charms")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/moderninterpreters/markup")
+ (url "https://github.com/HiTECNOLOGYs/cl-charms")
(commit commit)))
- (file-name (git-file-name "markup-reader" version))
+ (file-name (git-file-name "cl-charms" version))
(sha256
- (base32 "0i3v938j8zpzkd6p9j8gadp5zndjcdxhswj1qgsp592v6497rpzj"))))
+ (base32 "1jczaypa9dhxr34yyhsxb6lrdnircjx8am4iqkc3shfpjn32q323"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("markup")))
- (native-inputs
- (list sbcl-fiveam))
(inputs
`(("alexandria" ,sbcl-alexandria)
- ("cl-str" ,sbcl-cl-str)
- ("named-readtables" ,sbcl-named-readtables)
- ("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
- (home-page "https://github.com/moderninterpreters/markup")
- (synopsis "Reader-macro to read HTML tags inside of Common Lisp code")
+ ("cffi" ,sbcl-cffi)
+ ("ncurses" ,ncurses)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/low-level/curses-bindings.lisp"
+ (("libncursesw.so")
+ (string-append (assoc-ref inputs "ncurses")
+ "/lib/libncursesw.so"))))))))
+ (home-page "https://github.com/HiTECNOLOGYs/cl-charms")
+ (synopsis "Interface to libcurses in Common Lisp")
(description
- "Markup allows the use of HTML syntax with in Common Lisp code.
-This has the advantage of being able to copy HTML snippets and have them
-instantly be functional, less double quotes than a s-expression approach,
-and designers will be able to understand the embedded HTML.")
- (license license:asl2.0))))
-
-(define-public ecl-markup-reader
- (sbcl-package->ecl-package sbcl-markup-reader))
-
-(define-public cl-markup-reader
- (sbcl-package->cl-source-package sbcl-markup-reader))
-
-(define-public sbcl-xml-emitter
- (package
- (name "sbcl-xml-emitter")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/VitoVan/xml-emitter")
- (commit version)))
- (file-name (git-file-name "cl-xml-emitter" version))
- (sha256
- (base32
- "1w9yx8gc4imimvjqkhq8yzpg3kjrp2y37rjix5c1lnz4s7bxvhk9"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-1am))
- (inputs (list sbcl-cl-utilities))
- (synopsis "Common lisp library for emitting XML output")
- (description
- "This package provides functions to emit XML, with some complexity for
-handling indentation. It can be used to produce all sorts of useful XML
-output; it has an RSS 2.0 emitter built in, so you can make RSS feeds
-trivially.")
- (home-page "https://www.cliki.net/xml-emitter")
- (license license:expat)))
+ "@code{cl-charms} is an interface to libcurses in Common Lisp. It
+provides both a raw, low-level interface to libcurses via CFFI, and a more
+higher-level lispier interface.")
+ (license license:expat))))
-(define-public cl-xml-emitter
- (sbcl-package->cl-source-package sbcl-xml-emitter))
+(define-public cl-charms
+ (sbcl-package->cl-source-package sbcl-cl-charms))
-(define-public ecl-xml-emitter
- (sbcl-package->ecl-package sbcl-xml-emitter))
+(define-public ecl-cl-charms
+ (sbcl-package->ecl-package sbcl-cl-charms))
-(define-public sbcl-kdlcl
- (let ((commit "dd4a48a3473c3c8fb34d4a37f87d6a1776c5875c")
+(define-public sbcl-cl-collider
+ (let ((commit "a46908896982868955b29bfb3a5337a0af489b0b")
(revision "0"))
(package
- (name "sbcl-kdlcl")
- (version (git-version "1.0" revision commit))
- (source
+ (name "sbcl-cl-collider")
+ (version (git-version "2018.7.15" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/chee/kdlcl")
+ (url "https://github.com/byulparan/cl-collider")
(commit commit)))
- (file-name (git-file-name "cl-kdlcl" version))
+ (file-name (git-file-name "cl-collider" version))
(sha256
- (base32 "0bqqxkd6s420ld2hmhvbbvpzss0m2kimmxaqhz7j1ksmq86bvvmj"))))
- (build-system asdf-build-system/sbcl)
- (arguments `(#:asd-systems '("kdl")))
- (inputs (list sbcl-esrap sbcl-parse-number))
- (home-page "https://github.com/chee/kdlcl/")
- (synopsis "KDL reader/printer for Common Lisp")
- (description "This package provides a KDL reader/writer for
- Common Lisp.")
- (license license:expat-0))))
-
-(define-public cl-kdlcl
- (sbcl-package->cl-source-package sbcl-kdlcl))
-
-(define-public ecl-kdlcl
- (sbcl-package->ecl-package sbcl-kdlcl))
-
-(define-public sbcl-cl-mustache
- (package
- (name "sbcl-cl-mustache")
- (version "0.12.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/kanru/cl-mustache")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-mustache" version))
- (sha256
- (base32 "149xbb6wxq1napliwm9cv729hwcgfnjli6y8hingfixz7f10lhks"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/kanru/cl-mustache")
- (synopsis "Common Lisp Mustache template renderer")
- (description "This is a Common Lisp implementation for the Mustache
-template system. More details on the standard are available at
-@url{https://mustache.github.io}.")
- (license license:expat)))
+ (base32 "10wvjbwvbgr0b57hpfxycg90yjmb29pirygr1sxrdaqxll328sz1"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-executables-and-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "server.lisp"
+ (("/usr/local/lib/SuperCollider/plugins")
+ (search-input-directory
+ inputs "/lib/SuperCollider/plugins"))
+ (("/usr/local/share/SuperCollider/Extensions")
+ (search-input-directory
+ inputs "/share/SuperCollider/Extensions"))
+ (("which scsynth")
+ (string-append
+ "which "
+ (search-input-file inputs "/bin/scsynth")))
+ (("jack_connect")
+ (search-input-file inputs "/bin/jack_connect"))))))))
+ (inputs
+ (list jack-1
+ supercollider
+ sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-cl-ppcre
+ sbcl-flexi-streams
+ sbcl-ieee-floats ; sc-osc dependencies.
+ sbcl-named-readtables
+ sbcl-osc
+ sbcl-pileup
+ sbcl-simple-inferiors ; For ecl.
+ sbcl-split-sequence
+ sbcl-usocket))
+ (synopsis "SuperCollider client for CommonLisp")
+ (description "This package provides a SuperCollider client for
+Common Lisp.")
+ (home-page "https://github.com/byulparan/cl-collider/")
+ (license license:public-domain))))
-(define-public cl-mustache
- (sbcl-package->cl-source-package sbcl-cl-mustache))
+(define-public cl-collider
+ (sbcl-package->cl-source-package sbcl-cl-collider))
-(define-public ecl-cl-mustache
- (sbcl-package->ecl-package sbcl-cl-mustache))
+(define-public ecl-cl-collider
+ (sbcl-package->ecl-package sbcl-cl-collider))
-(define-public sbcl-cl-css
- (let ((commit "8fe654c8f0cf95b300718101cce4feb517f78e2f"))
+(define-public sbcl-cl-colors
+ (let ((commit "827410584553f5c717eec6182343b7605f707f75"))
(package
- (name "sbcl-cl-css")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-cl-colors")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/inaimathi/cl-css/")
+ (url "https://github.com/tpapp/cl-colors")
(commit commit)))
- (file-name (git-file-name "cl-css" version))
(sha256
(base32
- "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd"))))
+ "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"))
+ (file-name (git-file-name "cl-colors" version))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/inaimathi/cl-css/")
- (synopsis "Non-validating, inline CSS generator for Common Lisp")
+ (inputs
+ (list sbcl-alexandria sbcl-let-plus))
+ (synopsis "Simple color library for Common Lisp")
(description
- "This is a dead-simple, non validating, inline CSS generator for Common
-Lisp. Its goals are axiomatic syntax, simple implementation to support
-portability, and boilerplate reduction in CSS.")
- (license license:expat))))
-
-(define-public cl-css
- (sbcl-package->cl-source-package sbcl-cl-css))
+ "This is a very simple color library for Common Lisp, providing
-(define-public ecl-cl-css
- (sbcl-package->ecl-package sbcl-cl-css))
+@itemize
+@item Types for representing colors in HSV and RGB spaces.
+@item Simple conversion functions between the above types (and also
+hexadecimal representation for RGB).
+@item Some predefined colors (currently X11 color names – of course the
+library does not depend on X11).Because color in your terminal is nice.
+@end itemize
-(define-public sbcl-portable-threads
- (let ((commit "aa26bf38338a6b068bf8bfb3375d8d8c3b0a28df"))
- (package
- (name "sbcl-portable-threads")
- (version (git-version "2.3" "2" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/binghe/portable-threads/")
- (commit commit)))
- (file-name (git-file-name "portable-threads" version))
- (sha256
- (base32 "058ksi07vfdmhrf5mdlc833s82m1rcqfja2266520m3r8bzs8bvs"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(;; Tests seem broken.
- #:tests? #f))
- (home-page "https://github.com/binghe/portable-threads")
- (synopsis "Portable threads API for Common Lisp")
- (description
- "Portable Threads (and Scheduled and Periodic Functions) API for Common
-Lisp (from GBBopen project).")
- (license license:asl2.0))))
+This library is no longer supported by its author.")
+ (home-page "https://github.com/tpapp/cl-colors")
+ (license license:boost1.0))))
-(define-public cl-portable-threads
- (sbcl-package->cl-source-package sbcl-portable-threads))
+(define-public cl-colors
+ (sbcl-package->cl-source-package sbcl-cl-colors))
-(define-public ecl-portable-threads
- (sbcl-package->ecl-package sbcl-portable-threads))
+(define-public ecl-cl-colors
+ (sbcl-package->ecl-package sbcl-cl-colors))
-(define-public sbcl-usocket
+(define-public sbcl-cl-colors2
(package
- (name "sbcl-usocket")
- (version "0.8.6")
+ (name "sbcl-cl-colors2")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/usocket/usocket/")
+ (url "https://codeberg.org/cage/cl-colors2")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-usocket" version))
+ (file-name (git-file-name "cl-colors2" version))
(sha256
- (base32 "0by8hhg6gijdbq5vjykd374rmvqyikp4synpyk0wjcl7rk3r0vgn"))))
+ (base32 "053bidgbqziv5visdq09gy8zf30cvqh1w06l23yygn1yrg7m7302"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-rt))
+ (list sbcl-clunit2))
(inputs
- (list sbcl-bordeaux-threads sbcl-split-sequence))
- (arguments
- `(#:tests? #f ; FIXME: Tests need network access?
- #:asd-systems '("usocket"
- "usocket-server")))
- (home-page "https://common-lisp.net/project/usocket/")
- (synopsis "Universal socket library for Common Lisp")
- (description
- "This library strives to provide a portable TCP/IP and UDP/IP socket
-interface for as many Common Lisp implementations as possible, while keeping
-the abstraction and portability layer as thin as possible.")
- (license license:expat)))
-
-(define-public cl-usocket
- (sbcl-package->cl-source-package sbcl-usocket))
-
-(define-public ecl-usocket
- (sbcl-package->ecl-package sbcl-usocket))
-
-(define-public sbcl-trivial-sockets
- (package
- (name "sbcl-trivial-sockets")
- (version "0.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/usocket/trivial-sockets/")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-trivial-sockets" version))
- (sha256
- (base32 "0xj9x5z3psxqap9c29qz1xswx5fiqxyzd35kmbw2g6z08cgb7nd0"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/usocket/trivial-sockets")
- (synopsis "Simple socket library for Common Lisp")
- (description
- "This library is a portable socket interface that allows CL programs to
-open connected (client) stream sockets to network services.")
- (license license:expat)))
-
-(define-public cl-trivial-sockets
- (sbcl-package->cl-source-package sbcl-trivial-sockets))
-
-(define-public sbcl-s-xml
- (package
- (name "sbcl-s-xml")
- (version "3")
- (source
- (origin
- (method url-fetch)
- (uri "https://common-lisp.net/project/s-xml/s-xml.tgz")
- (sha256
- (base32
- "061qcr0dzshsa38s5ma4ay924cwak2nq9gy59dw6v9p0qb58nzjf"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://common-lisp.net/project/s-xml/")
- (synopsis "Simple XML parser implemented in Common Lisp")
+ (list sbcl-alexandria sbcl-cl-ppcre sbcl-parse-number))
+ (synopsis "Color library for Common Lisp")
(description
- "S-XML is a simple XML parser implemented in Common Lisp. This XML
-parser implementation has the following features:
-
-@itemize
-@item It works (handling many common XML usages).
-@item It is very small (the core is about 700 lines of code, including
-comments and whitespace).
-@item It has a core API that is simple, efficient and pure functional, much
-like that from SSAX (see also http://ssax.sourceforge.net).
-@item It supports different DOM models: an XSML-based one, an LXML-based one
-and a classic xml-element struct based one.
-@item It is reasonably time and space efficient (internally avoiding garbage
-generatation as much as possible).
-@item It does support CDATA.
-@item It should support the same character sets as your Common Lisp
-implementation.
-@item It does support XML name spaces.
-@end itemize
-
-This XML parser implementation has the following limitations:
+ "This is a very simple color library for Common Lisp, providing:
@itemize
-@item It does not support any special tags (like processing instructions).
-@item It is not validating, even skips DTD's all together.
+@item Types for representing colors in HSV, HSL, and RGB spaces.
+@item Simple conversion functions between the above types.
+@item Function printing colors to HEX, RGB, RGBA, and HSL.
+@item Predefined colors from X11, SVG, and GDK.
@end itemize\n")
- (license license:lgpl3+)))
-
-(define-public cl-s-xml
- (sbcl-package->cl-source-package sbcl-s-xml))
-
-(define-public ecl-s-xml
- (sbcl-package->ecl-package sbcl-s-xml))
-
-(define-public sbcl-s-xml-rpc
- (package
- (name "sbcl-s-xml-rpc")
- (version "7")
- (source
- (origin
- (method url-fetch)
- (uri "https://common-lisp.net/project/s-xml-rpc/s-xml-rpc.tgz")
- (sha256
- (base32
- "02z7k163d51v0pzk8mn1xb6h5s6x64gjqkslhwm3a5x26k2gfs11"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-s-xml))
- (home-page "https://common-lisp.net/project/s-xml-rpc/")
- (synopsis "Implementation of XML-RPC in Common Lisp for both client and server")
- (description
- "S-XML-RPC is an implementation of XML-RPC in Common Lisp for both
-client and server.")
- (license license:lgpl3+)))
-
-(define-public cl-s-xml-rpc
- (sbcl-package->cl-source-package sbcl-s-xml-rpc))
-
-(define-public ecl-s-xml-rpc
- (sbcl-package->ecl-package sbcl-s-xml-rpc))
-
-(define-public sbcl-trivial-arguments
- (let ((commit "ecd84ed9cf9ef8f1e873d7409e6bd04979372aa7")
- (revision "1"))
- (package
- (name "sbcl-trivial-arguments")
- (version (git-version "1.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/trivial-arguments")
- (commit commit)))
- (file-name (git-file-name "trivial-arguments" version))
- (sha256
- (base32 "02vaqfavhj8jqxnr68nnzvzshm8jbgcy6m9lvyv4daa6f7ihqf88"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/Shinmera/trivial-arguments")
- (synopsis "Common Lisp library to retrieve a function's lambda-list")
- (description
- "This is a simple library to retrieve the argument list of a function.")
- (license license:zlib))))
-
-(define-public ecl-trivial-arguments
- (sbcl-package->ecl-package sbcl-trivial-arguments))
-
-(define-public cl-trivial-arguments
- (sbcl-package->cl-source-package sbcl-trivial-arguments))
-
-(define-public sbcl-trivial-clipboard
- (let ((commit "aee67d6132a46237f61d508ae4bd9ff44032566d")
- (revision "7"))
- (package
- (name "sbcl-trivial-clipboard")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/snmsts/trivial-clipboard")
- (commit commit)))
- (file-name (git-file-name "cl-trivial-clipboard" version))
- (sha256
- (base32 "029qmx523xfk54p99ndgbmdd20s5i32mzpf77xymngrn4c33v9jk"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- ;; Pick xsel instead of xclip because its closure size is slightly
- ;; smaller.
- (list wl-clipboard xsel))
- (native-inputs
- (list sbcl-fiveam))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/text.lisp"
- (("\"xsel\"")
- (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\""))
- (("\"wl-copy\"")
- (string-append "\""
- (assoc-ref inputs "wl-clipboard")
- "/bin/wl-copy\""))
- (("\"wl-paste\"")
- (string-append "\""
- (assoc-ref inputs "wl-clipboard")
- "/bin/wl-paste\""))))))))
- (home-page "https://github.com/snmsts/trivial-clipboard")
- (synopsis "Access system clipboard in Common Lisp")
- (description
- "@command{trivial-clipboard} gives access to the system clipboard.")
- (license license:expat))))
+ (home-page "https://codeberg.org/cage/cl-colors2")
+ (license license:boost1.0)))
-(define-public cl-trivial-clipboard
- (sbcl-package->cl-source-package sbcl-trivial-clipboard))
+(define-public cl-colors2
+ (sbcl-package->cl-source-package sbcl-cl-colors2))
-(define-public ecl-trivial-clipboard
- (sbcl-package->ecl-package sbcl-trivial-clipboard))
+(define-public ecl-cl-colors2
+ (sbcl-package->ecl-package sbcl-cl-colors2))
-(define-public sbcl-trivial-backtrace
- (let ((commit "7f90b4a4144775cca0728791e4b92ac2557b07a1")
+(define-public sbcl-cl-conspack
+ (let ((commit "6e529d7b3a7223ef1bb5c7b9f18384ba67b50b09")
(revision "2"))
(package
- (name "sbcl-trivial-backtrace")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-cl-conspack")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/trivial-backtrace")
+ (url "https://github.com/conspack/cl-conspack")
(commit commit)))
- (file-name (git-file-name "trivial-backtrace" version))
+ (file-name (git-file-name "cl-conspack" version))
(sha256
- (base32 "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn"))))
+ (base32 "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lift))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'check 'delete-test-results
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((test-results (string-append (assoc-ref outputs "out")
- "/share/common-lisp/"
- (%lisp-type)
- "/trivial-backtrace"
- "/test-results")))
- (when (file-exists? test-results)
- (delete-file-recursively test-results)))
- #t)))))
- (home-page "https://common-lisp.net/project/trivial-backtrace/")
- (synopsis "Portable simple API to work with backtraces in Common Lisp")
+ '(#:asd-test-systems '("cl-conspack-test")))
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-fast-io
+ sbcl-ieee-floats
+ sbcl-trivial-garbage
+ sbcl-trivial-utf-8))
+ (home-page "https://github.com/conspack/cl-conspack")
+ (synopsis "CONSPACK implementation for Common Lisp")
(description
- "One of the many things that didn't quite get into the Common Lisp
-standard was how to get a Lisp to output its call stack when something has
-gone wrong. As such, each Lisp has developed its own notion of what to
-display, how to display it, and what sort of arguments can be used to
-customize it. @code{trivial-backtrace} is a simple solution to generating a
-backtrace portably.")
- (license license:expat))))
+ "This package provides a CONSPACK implementation for Common Lisp.")
+ (license license:bsd-3))))
-(define-public cl-trivial-backtrace
- (sbcl-package->cl-source-package sbcl-trivial-backtrace))
+(define-public cl-conspack
+ (sbcl-package->cl-source-package sbcl-cl-conspack))
-(define-public ecl-trivial-backtrace
- (sbcl-package->ecl-package sbcl-trivial-backtrace))
+(define-public ecl-cl-conspack
+ (sbcl-package->ecl-package sbcl-cl-conspack))
-(define-public sbcl-rfc2388
- (let ((commit "591bcf7e77f2c222c43953a80f8c297751dc0c4e")
+(define-public sbcl-cl-cont
+ (let ((commit "fc1fa7e6eb64894fdca13e688e6015fad5290d2a")
(revision "1"))
(package
- (name "sbcl-rfc2388")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jdz/rfc2388")
- (commit commit)))
- (file-name (git-file-name "rfc2388" version))
- (sha256
- (base32 "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/jdz/rfc2388/")
- (synopsis "Implementation of RFC 2388 in Common Lisp")
- (description
- "This package contains an implementation of RFC 2388, which is used to
-process form data posted with HTTP POST method using enctype
-\"multipart/form-data\".")
- (license license:bsd-2))))
-
-(define-public cl-rfc2388
- (sbcl-package->cl-source-package sbcl-rfc2388))
-
-(define-public ecl-rfc2388
- (sbcl-package->ecl-package sbcl-rfc2388))
-
-(define-public sbcl-md5
- (package
- (name "sbcl-md5")
- (version "2.0.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pmai/md5")
- (commit (string-append "release-" version))))
- (file-name (git-file-name "md5" version))
- (sha256
- (base32 "1g20np6rhn3y08z8mlmlk721mw2207s52v2pwp4smm3lz25sx3q5"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pmai/md5")
- (synopsis
- "Common Lisp implementation of the MD5 Message-Digest Algorithm (RFC 1321)")
- (description
- "This package implements The MD5 Message-Digest Algorithm, as defined in
-RFC 1321 by R. Rivest, published April 1992.")
- (license license:public-domain)))
-
-(define-public cl-md5
- (sbcl-package->cl-source-package sbcl-md5))
-
-(define-public ecl-md5
- (package
- (inherit (sbcl-package->ecl-package sbcl-md5))
- (inputs
- (list ecl-flexi-streams))))
-
-(define-public sbcl-cl+ssl
- (let ((commit "17d5cdd65405f1d26e26f3e875e70027d0c8eedb")
- (revision "6"))
- (package
- (name "sbcl-cl+ssl")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-cont")
+ (version (git-version "0.3.8" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cl-plus-ssl/cl-plus-ssl")
+ (url "https://gitlab.common-lisp.net/cl-cont/cl-cont.git")
(commit commit)))
- (file-name (git-file-name "cl+ssl" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s"))))
+ (base32
+ "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/reload.lisp"
- (("libssl.so" all)
- (string-append
- (assoc-ref inputs "openssl") "/lib/" all))
- (("libcrypto.so" all)
- (string-append
- (assoc-ref inputs "openssl") "/lib/" all)))))
- (add-after 'fix-paths 'fix-tests
- (lambda _
- ;; Disable coverall support in tests because of a circular
- ;; dependency: cl+ssl -> cl-coverall -> dexador
- ;; -> clack -> hunchentoot -> cl+ssl
- (substitute* "cl+ssl.test.asd"
- (("\\(:feature \\(:or :sbcl :ccl\\) :cl-coveralls\\)")
- "")))))))
- (native-inputs
- (list ;sbcl-cl-coveralls
- sbcl-fiveam
- sbcl-trivial-sockets))
(inputs
- (list openssl
- sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-flexi-streams
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-usocket))
- (home-page "https://common-lisp.net/project/cl-plus-ssl/")
- (synopsis "Common Lisp bindings to OpenSSL")
+ (list sbcl-alexandria sbcl-closer-mop))
+ (native-inputs
+ (list sbcl-rt))
+ (synopsis "Delimited continuations for Common Lisp")
(description
- "This library is a fork of SSL-CMUCL. The original SSL-CMUCL source
-code was written by Eric Marsden and includes contributions by Jochen Schmidt.
-Development into CL+SSL was done by David Lichteblau.")
- (license license:expat))))
+ "This is a library that implements delimited continuations by
+transforming Common Lisp code to continuation passing style.")
+ (home-page "https://common-lisp.net/project/cl-cont/")
+ (license license:llgpl))))
-(define-public cl-cl+ssl
- (sbcl-package->cl-source-package sbcl-cl+ssl))
+(define-public cl-cont
+ (sbcl-package->cl-source-package sbcl-cl-cont))
-(define-public ecl-cl+ssl
- ;; The trivial-sockets system used for the tests doesn't support ECL, so we
- ;; remove it from native-inputs and disable the tests.
- (let ((pkg (sbcl-package->ecl-package sbcl-cl+ssl)))
- (package
- (inherit pkg)
- (native-inputs
- (modify-inputs (package-native-inputs pkg)
- (delete "sbcl-trivial-sockets")))
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ((#:tests? _ #f) #f))))))
+(define-public ecl-cl-cont
+ (sbcl-package->ecl-package sbcl-cl-cont))
-(define-public sbcl-kons-9
- (let ((commit "fe0b3228ca28c316457d35f9e7c67edc83b2a4cc")
- (revision "0"))
+(define-public sbcl-cl-containers
+ (let ((commit "781ebfe0888bae46f07c018f7d473898b1bd4f5f")
+ (revision "4"))
(package
- (name "sbcl-kons-9")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-containers")
+ (version (git-version "0.12.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/kaveh808/kons-9")
+ (url "https://github.com/hraban/cl-containers")
(commit commit)))
- (file-name (git-file-name "cl-kons-9" version))
+ (file-name (git-file-name "cl-containers" version))
(sha256
- (base32 "1kdwva4qj1s5vmbv6gbmpnk56ahaf8n2kvij5xjlfyk7nriy4bbi"))))
+ (base32
+ "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("kons-9")
- #:asd-test-systems '("kons-9/testsuite")))
(native-inputs
- (list sbcl-alexandria sbcl-confidence))
+ (list sbcl-lift))
(inputs
- (list sbcl-closer-mop
- sbcl-cffi
- sbcl-cl-glfw3
- sbcl-cl-opengl
- sbcl-cl-vectors
- sbcl-clobber
- sbcl-origin
- sbcl-trivial-backtrace
- sbcl-trivial-main-thread
- sbcl-zpb-ttf))
- (home-page "https://github.com/kaveh808/kons-9")
- (synopsis "Common Lisp 3D graphics system")
+ (list sbcl-asdf-system-connections
+ sbcl-metatilities-base
+ sbcl-moptilities))
+ (arguments
+ '(#:asd-systems '("cl-containers"
+ "cl-containers/with-moptilities"
+ "cl-containers/with-utilities")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'relax-version-checks
+ (lambda _
+ (substitute* "cl-containers.asd"
+ (("\\(:version \"metatilities-base\" \"0\\.6\\.6\"\\)")
+ "\"metatilities-base\""))
+ (substitute* "cl-containers-test.asd"
+ (("\\(:version \"lift\" \"1\\.7\\.0\"\\)")
+ "\"lift\""))
+ #t)))))
+ (synopsis "Container library for Common Lisp")
(description
- "This package provides KONS-9 which can be considered as a traditional user
-interface driven 3D application for general artists, or as a REPL-based
-development environment for technical artists and software developers. These two
-approaches can be seamlessly combined into a flexible and powerful workflow,
-where non-technical users can immediately benefit from software tools and
-extensions developed by technical users.")
- (license (list license:expat
- ;; lib/JMC-font-libs/font-master
- ;; lib/JMC-font-libs/font-zpb-ttf-master
- license:lgpl2.1)))))
+ "Common Lisp ships with a set of powerful built in data structures
+including the venerable list, full featured arrays, and hash-tables.
+CL-containers enhances and builds on these structures by adding containers
+that are not available in native Lisp (for example: binary search trees,
+red-black trees, sparse arrays and so on), and by providing a standard
+interface so that they are simpler to use and so that changing design
+decisions becomes significantly easier.")
+ (home-page "https://common-lisp.net/project/cl-containers/")
+ (license license:expat))))
-(define-public cl-kons-9
- (sbcl-package->cl-source-package sbcl-kons-9))
+(define-public cl-containers
+ (sbcl-package->cl-source-package sbcl-cl-containers))
-;; TODO: (Sharlatan-20221110T230620+0000): ECL is not supported yet.
-;; https://github.com/kaveh808/kons-9/issues/176
-;; (define-public ecl-kons-9
-;; (sbcl-package->ecl-package sbcl-kons-9))
+(define-public ecl-cl-containers
+ (sbcl-package->ecl-package sbcl-cl-containers))
-(define-public sbcl-kmrcl
- (let ((version "1.111")
- (commit "4a27407aad9deb607ffb8847630cde3d041ea25a")
+(define-public sbcl-cl-cookie
+ (let ((commit "cea55aed8b9ad25fafd13defbcb9fe8f41b29546")
(revision "1"))
(package
- (name "sbcl-kmrcl")
- (version (git-version version revision commit))
+ (name "sbcl-cl-cookie")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.9.10" revision commit))
+ (home-page "https://github.com/fukamachi/cl-cookie")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "http://git.kpe.io/kmrcl.git/")
+ (url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2"))
- (modules '((guix build utils)))
- (snippet
- ;; The useless bundled debian folder drags `make' into the closure.
- `(begin
- (delete-file-recursively "debian")
- #t))))
- (build-system asdf-build-system/sbcl)
+ (base32
+ "090g7z75h98zvc1ldx0vh4jn4086dhjm2w30jcwkq553qmyxwl8h"))))
(inputs
- (list sbcl-rt))
- (home-page "http://files.kpe.io/kmrcl/")
- (synopsis "General utilities for Common Lisp programs")
- (description
- "KMRCL is a collection of utilities used by a number of Kevin
-Rosenberg's Common Lisp packages.")
- (license license:llgpl))))
+ `(("proc-parse" ,sbcl-proc-parse)
+ ("alexandria" ,sbcl-alexandria)
+ ("quri" ,sbcl-quri)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("local-time" ,sbcl-local-time)))
+ (native-inputs
+ (list sbcl-prove))
+ (arguments
+ '(#:asd-systems '("cl-cookie-test" "cl-cookie")))
+ (synopsis "HTTP cookie manager for Common Lisp")
+ (description "cl-cookie is a Common Lisp library featuring parsing of
+cookie headers, cookie creation, cookie jar creation and more.")
+ (license license:bsd-2))))
-(define-public cl-kmrcl
- (sbcl-package->cl-source-package sbcl-kmrcl))
+(define-public cl-cookie
+ (sbcl-package->cl-source-package sbcl-cl-cookie))
-(define-public ecl-kmrcl
- (sbcl-package->ecl-package sbcl-kmrcl))
+(define-public ecl-cl-cookie
+ (sbcl-package->ecl-package sbcl-cl-cookie))
-(define-public sbcl-cl-base64
- (let ((commit "577683b18fd880b82274d99fc96a18a710e3987a"))
+(define-public sbcl-cl-coroutine
+ (let ((commit "de098f8d5debd8b14ef6864b5bdcbbf5ddbcfd72")
+ (revision "1"))
(package
- (name "sbcl-cl-base64")
- (version (git-version "3.3.4" "1" commit))
+ (name "sbcl-cl-coroutine")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "http://git.kpe.io/cl-base64.git/")
+ (url "https://github.com/takagi/cl-coroutine")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"))
- (modules '((guix build utils)))
- (snippet
- ;; The useless bundled debian folder drags `make' into the closure.
- `(begin
- (delete-file-recursively "debian")
- #t))))
+ (base32
+ "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"))))
(build-system asdf-build-system/sbcl)
- (native-inputs ; For tests.
- (list sbcl-ptester sbcl-kmrcl))
- (home-page "http://files.kpe.io/cl-base64/")
- (synopsis
- "Common Lisp package to encode and decode base64 with URI support")
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-cont" ,sbcl-cl-cont)))
+ (native-inputs
+ (list sbcl-prove))
+ (arguments
+ `(;; TODO: Fix the tests. They fail with:
+ ;; "Component CL-COROUTINE-ASD::CL-COROUTINE-TEST not found"
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "cl-coroutine-test.asd"
+ (("cl-test-more")
+ "prove"))
+ #t)))))
+ (synopsis "Coroutine library for Common Lisp")
(description
- "This package provides highly optimized base64 encoding and decoding.
-Besides conversion to and from strings, integer conversions are supported.
-Encoding with Uniform Resource Identifiers is supported by using a modified
-encoding table that uses only URI-compatible characters.")
- (license license:bsd-3))))
+ "This is a coroutine library for Common Lisp implemented using the
+continuations of the @code{cl-cont} library.")
+ (home-page "https://github.com/takagi/cl-coroutine")
+ (license license:llgpl))))
-(define-public cl-base64
- (sbcl-package->cl-source-package sbcl-cl-base64))
+(define-public cl-coroutine
+ (sbcl-package->cl-source-package sbcl-cl-coroutine))
-(define-public ecl-cl-base64
- (sbcl-package->ecl-package sbcl-cl-base64))
+(define-public ecl-cl-coroutine
+ (sbcl-package->ecl-package sbcl-cl-coroutine))
-(define-public sbcl-chunga
+(define-public sbcl-cl-cpus
(package
- (name "sbcl-chunga")
- (version "1.1.7")
+ (name "sbcl-cl-cpus")
+ (version "0.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/chunga")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (url "https://github.com/muyinliu/cl-cpus")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-cpus" version))
(sha256
- (base32 "0jzn3nyb3f22gm983rfk99smqs3mhb9ivjmasvhq9qla5cl9pyhd"))))
+ (base32 "0sdaff9hpsx7bpkkkqavmxmrrlc2d61gmqjjgn8xchncng4a0rf8"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-trivial-gray-streams))
- (home-page "https://edicl.github.io/chunga/")
- (synopsis "Portable chunked streams for Common Lisp")
+ (list sbcl-cffi))
+ (home-page "https://github.com/muyinliu/cl-cpus")
+ (synopsis "Common Lisp feature to get number of CPUs")
(description
- "Chunga implements streams capable of chunked encoding on demand as
-defined in RFC 2616.")
- (license license:bsd-2)))
+ "This package provides a Common Lisp system which has only one function to
+return the CPU count of the current system.")
+ (license license:isc)))
-(define-public cl-chunga
- (sbcl-package->cl-source-package sbcl-chunga))
+(define-public cl-cpus
+ (sbcl-package->cl-source-package sbcl-cl-cpus))
-(define-public ecl-chunga
- (sbcl-package->ecl-package sbcl-chunga))
+(define-public ecl-cl-cpus
+ (sbcl-package->ecl-package sbcl-cl-cpus))
-(define-public sbcl-cl-who
- (let ((version "1.1.4")
- (commit "07dafe9b351c32326ce20b5804e798f10d4f273d")
- (revision "3"))
+(define-public sbcl-cl-cron
+ (let ((commit "092aef5d5666fb43c04258e4043f609670a20456")
+ (revision "0"))
(package
- (name "sbcl-cl-who")
- (version (git-version version revision commit))
+ (name "sbcl-cl-cron")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/cl-who")
+ (url "https://github.com/ciel-lang/cl-cron")
(commit commit)))
- (file-name (git-file-name "cl-who" version))
+ (file-name (git-file-name "cl-cron" version))
(sha256
- (base32
- "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"))))
+ (base32 "0y4li8j2h1nbpldpqm39ld9kgs4a7biy94h49n27l59l7mn1jd0d"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-flexi-streams))
- (home-page "https://edicl.github.io/cl-who/")
- (synopsis "Yet another Lisp markup language")
+ (inputs
+ (list sbcl-bordeaux-threads))
+ (home-page "https://github.com/ciel-lang/cl-cron/")
+ (synopsis "Run cron like jobs in Common Lisp")
(description
- "There are plenty of Lisp Markup Languages out there - every Lisp
-programmer seems to write at least one during his career - and CL-WHO (where
-WHO means \"with-html-output\" for want of a better acronym) is probably just
-as good or bad as the next one.")
- (license license:bsd-2))))
+ "@code{cl-cron} is a simple tool that provides cron like facilities
+directly inside of Common Lisp.")
+ (license license:gpl3+))))
-(define-public cl-who
- (sbcl-package->cl-source-package sbcl-cl-who))
+(define-public cl-cron
+ (sbcl-package->cl-source-package sbcl-cl-cron))
-(define-public ecl-cl-who
- (sbcl-package->ecl-package sbcl-cl-who))
+(define-public ecl-cl-cron
+ (sbcl-package->ecl-package sbcl-cl-cron))
-(define-public sbcl-chipz
- (let ((version "0.8")
- (commit "82a17d39c78d91f6ea63a03aca8f9aa6069a5e11")
- (revision "2"))
+(define-public sbcl-cl-css
+ (let ((commit "8fe654c8f0cf95b300718101cce4feb517f78e2f"))
(package
- (name "sbcl-chipz")
- (version (git-version version revision commit))
+ (name "sbcl-cl-css")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/chipz")
+ (url "https://github.com/inaimathi/cl-css/")
(commit commit)))
- (file-name (git-file-name "cl-chipz" version))
+ (file-name (git-file-name "cl-css" version))
(sha256
- (base32 "1n4f22i9j8iapjd6yx1z348rggcybvg9h794kx9libjgz4bs371h"))))
+ (base32
+ "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-flexi-streams))
- (home-page "http://method-combination.net/lisp/chipz/")
- (synopsis
- "Common Lisp library for decompressing deflate, zlib, gzip, and bzip2
-data")
+ (home-page "https://github.com/inaimathi/cl-css/")
+ (synopsis "Non-validating, inline CSS generator for Common Lisp")
(description
- "DEFLATE data, defined in RFC1951, forms the core of popular
-compression formats such as zlib (RFC 1950) and gzip (RFC 1952). As such,
-Chipz also provides for decompressing data in those formats as well. BZIP2 is
-the format used by the popular compression tool bzip2.")
- ;; The author describes it as "MIT-like"
+ "This is a dead-simple, non validating, inline CSS generator for Common
+Lisp. Its goals are axiomatic syntax, simple implementation to support
+portability, and boilerplate reduction in CSS.")
(license license:expat))))
-(define-public cl-chipz
- (sbcl-package->cl-source-package sbcl-chipz))
-
-(define-public ecl-chipz
- (sbcl-package->ecl-package sbcl-chipz))
-
-(define-public sbcl-cl-tls
- (let ((commit "2ab4fc3ae7e79e451126a9bb6bc38ca2cd2cb4ba")
- (revision "0"))
- (package
- (name "sbcl-cl-tls")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/shrdlu68/cl-tls")
- (commit commit)))
- (file-name (git-file-name "cl-tls" version))
- (sha256
- (base32 "1j6gwv21ibkk6xd1xxm54wgwp09dzqg60b8z72hivpnq8gwm0ba7"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-cl-base64
- sbcl-fast-io
- sbcl-ironclad))
- (home-page "https://github.com/shrdlu68/cl-tls")
- (synopsis "Implementation of Transport Layer Security Protocols")
- (description "This package provides prototype Common Lisp
-implementations of TLS, RFC5246, ASN.1, x{501,509}, and PKCS{1,3,5,8}.")
- (license license:bsd-3))))
-
-(define-public cl-tls
- (sbcl-package->cl-source-package sbcl-cl-tls))
+(define-public cl-css
+ (sbcl-package->cl-source-package sbcl-cl-css))
-(define-public ecl-cl-tls
- (sbcl-package->ecl-package sbcl-cl-tls))
+(define-public ecl-cl-css
+ (sbcl-package->ecl-package sbcl-cl-css))
-(define-public sbcl-dns-client
- (let ((commit "9f252e9c2bb61c57a6cd367e21ad366b0d3e87e0")
- (revision "0"))
+(define-public sbcl-cl-csv
+ (let ((commit "68ecb5d816545677513d7f6308d9e5e8d2265651")
+ (revision "2"))
(package
- (name "sbcl-dns-client")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-csv")
+ (version (git-version "1.0.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/dns-client")
+ (url "https://github.com/AccelerationNet/cl-csv")
(commit commit)))
- (file-name (git-file-name "cl-dns-client" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1b6g2wvydwmv1k68favjyq4gfalfxfyl5i0hyh640wdaz2rfvi4n"))))
+ (base32
+ "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; No tests provided.
+ ;; See: https://github.com/AccelerationNet/cl-csv/pull/34
`(#:tests? #f))
(inputs
- (list sbcl-documentation-utils sbcl-usocket))
- (home-page "https://shinmera.github.io/dns-client/")
- (synopsis "DNS protocol client for Common Lisp")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-interpol" ,sbcl-cl-interpol)
+ ("iterate" ,sbcl-iterate)))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (synopsis "Common lisp library for comma-separated values")
(description
- "This package provides a pure-lisp implementation of a DNS client. It can be
-used to resolve hostnames, reverse-lookup IP addresses, and fetch other kinds of
-DNS records.")
- (license license:zlib))))
+ "This is a Common Lisp library providing functions to read/write CSV
+from/to strings, streams and files.")
+ (home-page "https://github.com/AccelerationNet/cl-csv")
+ (license license:bsd-3))))
-(define-public ecl-dns-client
- (sbcl-package->ecl-package sbcl-dns-client))
+(define-public cl-csv
+ (sbcl-package->cl-source-package sbcl-cl-csv))
-(define-public cl-dns-client
- (sbcl-package->cl-source-package sbcl-dns-client))
+(define-public ecl-cl-csv
+ (sbcl-package->ecl-package sbcl-cl-csv))
-(define-public sbcl-lisp-pay
- (let ((commit "c4de776f0a284709931ff3674160ced3b41bd000")
- (revision "0"))
+(define-public sbcl-cl-data-structures
+ (let ((commit "ffab56830f3ed777450a065890484ef22147cd44")
+ (revision "2"))
(package
- (name "sbcl-lisp-pay")
- (version (git-version "0.0.5" revision commit))
+ (name "sbcl-cl-data-structures")
+ (version (git-version "1.4.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/K1D77A/lisp-pay")
+ (url "https://github.com/sirherrbatka/cl-data-structures")
(commit commit)))
- (file-name (git-file-name "cl-lisp-pay" version))
+ (file-name (git-file-name "cl-data-structures" version))
(sha256
- (base32 "09r6qy4fipriqa0d6g9qm6dq992lr58vh24g5j0adm19i5fnjavh"))))
+ (base32 "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove))
(inputs
(list sbcl-alexandria
- sbcl-babel
- sbcl-cl-base64
- sbcl-cl-str
- sbcl-cl-tls
+ sbcl-bordeaux-threads
+ sbcl-cl-ppcre
sbcl-closer-mop
- sbcl-dexador
- sbcl-hu.dwim.defclass-star
- sbcl-hunchentoot
- sbcl-ironclad
- sbcl-jonathan
- sbcl-lack
- sbcl-ningle
- sbcl-shasht))
- (home-page "https://github.com/K1D77A/lisp-pay/")
- (synopsis "Wrappers over multiple Payment Processor APIs")
- (description "This library provides payment API wrappers over
-BTCPay, Paypal, and Stripe.")
- (license license:expat))))
+ sbcl-documentation-utils-extensions
+ sbcl-flexichain
+ sbcl-iterate
+ sbcl-lparallel
+ sbcl-metabang-bind
+ sbcl-more-conditions
+ sbcl-serapeum
+ sbcl-trivial-garbage))
+ (synopsis "Data Structures and streaming algorithms for Common Lisp")
+ (description
+ "CL-DATA-STRUCTURES is a Common Lisp library providing a portable
+collection of mutable and immutable data structures (dictionaries, sets,
+queues, sequences) and algorithms.")
+ (home-page "https://sirherrbatka.github.io/cl-data-structures/main.html")
+ (license license:bsd-2))))
-(define-public cl-lisp-pay
- (sbcl-package->cl-source-package sbcl-lisp-pay))
+(define-public cl-data-structures
+ (sbcl-package->cl-source-package sbcl-cl-data-structures))
-(define-public ecl-lisp-pay
- (sbcl-package->ecl-package sbcl-lisp-pay))
+(define-public ecl-cl-data-structures
+ (sbcl-package->ecl-package sbcl-cl-data-structures))
-(define-public sbcl-stripe
- (let ((commit "b59631d21d63e101de6eb96b56941471504ba644")
- (revision "0"))
+(define-public sbcl-cl-debug
+ (let ((commit "b334280806104ee7f7d3aec666bf7e08d2f89b31")
+ (revision "1"))
(package
- (name "sbcl-stripe")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/stripe")
- (commit commit)))
- (file-name (git-file-name "cl-stripe" version))
- (sha256
- (base32 "00sfq2f6dnpwa6pf7rgw5hazbwx4yf1g0jrkfz9h4kq5zyxwk1cy"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-dexador
- sbcl-golden-utils
- sbcl-local-time
- sbcl-yason))
- (home-page "https://github.com/atlas-engineer/stripe")
- (synopsis "Stripe payment API client for Common Lisp")
- (description "A client for the Stripe payment API.")
- (license license:expat))))
-
-(define-public cl-stripe
- (sbcl-package->cl-source-package sbcl-stripe))
-
-(define-public ecl-stripe
- (sbcl-package->ecl-package sbcl-stripe))
-
-(define-public sbcl-drakma
- (package
- (name "sbcl-drakma")
- (version "2.0.8")
- (source
- (origin
+ (name "sbcl-cl-debug")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/drakma")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-drakma" version))
+ (url "https://github.com/kmx-io/cl-debug")
+ (commit commit)))
+ (file-name (git-file-name "cl-debug" version))
(sha256
- (base32
- "1wf2zivfvhsh6zvd6wcwfd67bm8s8a1p2fismszc8xb819dqk9yl"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-puri
- sbcl-cl-base64
- sbcl-chunga
- sbcl-flexi-streams
- sbcl-cl-ppcre
- sbcl-chipz
- sbcl-usocket
- sbcl-cl+ssl))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://edicl.github.io/drakma/")
- (synopsis "HTTP client written in Common Lisp")
- (description
- "Drakma is a full-featured HTTP client implemented in Common Lisp. It
-knows how to handle HTTP/1.1 chunking, persistent connections, re-usable
-sockets, SSL, continuable uploads, file uploads, cookies, and more.")
- (license license:bsd-2)))
+ (base32 "0w5vxbjsgr3zfpivdmghmhzxskfdvm1p34c8whwps2xlhypxsa78"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/kmx-io/cl-debug")
+ (synopsis "Common Lisp cross-package debugging facility")
+ (description
+ "CL-DEBUG provides a unified way to enable or disable debug-specific code.
+Debugging code can be enabled or disabled relative to program features denoted
+by either a symbol or a keyword.")
+ (license license:isc))))
-(define-public cl-drakma
- (sbcl-package->cl-source-package sbcl-drakma))
+(define-public cl-debug
+ (sbcl-package->cl-source-package sbcl-cl-debug))
-(define-public ecl-drakma
- (sbcl-package->ecl-package sbcl-drakma))
+(define-public ecl-cl-debug
+ (sbcl-package->ecl-package sbcl-cl-debug))
-(define-public sbcl-hunchentoot
- ;; NOTE: (Sharlatan-20220520T213309+0100): The latest commit fixed tests,
- ;; switch to the version tag when release is ready.
- (let ((commit "76862391040c20255c7275e815c2175e46bfd080")
+(define-public sbcl-cl-dejavu
+ (let ((commit "9d68ced4edee6f96fead42cb4835d0ff4a158373")
(revision "1"))
(package
- (name "sbcl-hunchentoot")
- (version (git-version "1.3.0" revision commit))
+ (name "sbcl-cl-dejavu")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/hunchentoot")
+ (url "https://github.com/dkochmanski/cl-dejavu")
(commit commit)))
- (file-name (git-file-name "cl-hunchentoot" version))
+ (file-name (git-file-name "cl-dejavu" version))
(sha256
- (base32 "1h7ggmmzvgwr4p6j3ai0dqrw30q5309l13w4c03gqrapvwrb65l0"))))
+ (base32 "1lbxiq21bxj8r11c58cqskgn8gnl2p8q1ydkhdsv7i7xnhv2y7r0"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-cl-who sbcl-drakma))
- (inputs
- (list sbcl-chunga
- sbcl-cl-base64
- sbcl-cl-fad
- sbcl-cl-ppcre
- sbcl-flexi-streams
- sbcl-cl+ssl
- sbcl-md5
- sbcl-rfc2388
- sbcl-trivial-backtrace
- sbcl-usocket))
- (home-page "https://edicl.github.io/hunchentoot/")
- (synopsis "Web server written in Common Lisp")
+ (home-page "https://github.com/dkochmanski/cl-dejavu")
+ (synopsis "DejaVu fonts for Common Lisp")
(description
- "Hunchentoot is a web server written in Common Lisp and at the same
-time a toolkit for building dynamic websites. As a stand-alone web server,
-Hunchentoot is capable of HTTP/1.1 chunking (both directions), persistent
-connections (keep-alive), and SSL.")
- (license license:bsd-2))))
+ "This is a repackage of the original DejaVu Fonts with some convenience
+functions.")
+ (license (list license:cc0
+ (license:x11-style "http://dejavu-fonts.org/"))))))
-(define-public cl-hunchentoot
- (sbcl-package->cl-source-package sbcl-hunchentoot))
+(define-public cl-dejavu
+ (sbcl-package->cl-source-package sbcl-cl-dejavu))
-(define-public ecl-hunchentoot
- (package
- (inherit (sbcl-package->ecl-package sbcl-hunchentoot))
- (arguments
- ;; Tests fail on ECL with 'Socket error in "socket": EINVAL'.
- '(#:tests? #f))))
+(define-public ecl-dejavu
+ (sbcl-package->ecl-package sbcl-cl-dejavu))
-(define-public sbcl-hunchentoot-errors
- (let ((commit "69eb3bcea59ed1ccf3dd1960e6d48fb21f1dadab")
+(define-public sbcl-cl-difflib
+ (let ((commit "98eb335c693f1881584b83ca7be4a0fe05355c4e")
(revision "0"))
(package
- (name "sbcl-hunchentoot-errors")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-difflib")
+ (version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/hunchentoot-errors")
+ (url "https://github.com/wiseman/cl-difflib")
(commit commit)))
- (file-name (git-file-name "cl-hunchentoot-errors" version))
+ (file-name
+ (git-file-name name version))
(sha256
- (base32 "0fab7s8qhhs713cw014qqvzm5z61wmxm2fcbkarhg41cz3li9k1j"))))
+ (base32 "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-mimeparse
- sbcl-hunchentoot
- sbcl-parse-number
- sbcl-string-case))
- (home-page "https://github.com/mmontone/hunchentoot-errors/")
- (synopsis "Hunchentoot error pages and logs with request and session information")
+ ;; Due to the age of this library tests use some deprecated
+ ;; functionality and keep failing.
+ (arguments
+ '(#:tests? #f))
+ (home-page "https://github.com/wiseman/cl-difflib")
+ (synopsis "Compute differences between pairs of sequences")
(description
- "This package provides a functionality augmenting Hunchentoot error
-pages and logs with request and session information.")
- (license license:expat))))
-
-(define-public cl-hunchentoot-errors
- (sbcl-package->cl-source-package sbcl-hunchentoot-errors))
-
-(define-public ecl-hunchentoot-errors
- (sbcl-package->ecl-package sbcl-hunchentoot-errors))
-
-(define-public sbcl-lunamech-matrix-api
- (let ((commit "aa54a820149584c237b03d500ad83397fe25dc92")
- (revision "0"))
- (package
- (name "sbcl-lunamech-matrix-api")
- (version (git-version "0.0.2" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/K1D77A/lunamech-matrix-api")
- (commit commit)))
- (file-name (git-file-name "cl-lunamech-matrix-api" version))
- (sha256
- (base32 "0a664qq4m5gk4iv5ck63gmsl3218jhjsalawklj56wn2pw0cf8a0"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-json
- sbcl-cl-str
- sbcl-closer-mop
- sbcl-dexador
- sbcl-do-urlencode
- sbcl-drakma
- sbcl-jonathan
- sbcl-plump
- sbcl-quri
- sbcl-reader
- sbcl-shasht))
- (home-page "https://github.com/K1D77A/lunamech-matrix-api/")
- (synopsis "Implementation of the Matrix API")
- (description "This package provides an implementation of the Matrix
-API for Common Lisp.")
+ "A Common Lisp library for computing differences between
+sequences based on the Python difflib module.")
(license license:expat))))
-(define-public cl-lunamech-matrix-api
- (sbcl-package->cl-source-package sbcl-lunamech-matrix-api))
-
-(define-public ecl-lunamech-matrix-api
- (sbcl-package->ecl-package sbcl-lunamech-matrix-api))
-
-(define-public sbcl-trivial-types
- (package
- (name "sbcl-trivial-types")
- (version "0.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/m2ym/trivial-types")
- (commit "ee869f2b7504d8aa9a74403641a5b42b16f47d88")))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1s4cp9bdlbn8447q7w7f1wkgwrbvfzp20mgs307l5pxvdslin341"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/m2ym/trivial-types")
- (synopsis "Trivial type definitions for Common Lisp")
- (description
- "TRIVIAL-TYPES provides missing but important type definitions such as
-PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.")
- (license license:llgpl)))
-
-(define-public cl-trivial-types
- (sbcl-package->cl-source-package sbcl-trivial-types))
+(define-public cl-difflib
+ (sbcl-package->cl-source-package sbcl-cl-difflib))
-(define-public ecl-trivial-types
- (sbcl-package->ecl-package sbcl-trivial-types))
+(define-public ecl-cl-difflib
+ (sbcl-package->ecl-package sbcl-cl-difflib))
-(define-public sbcl-cl-annot
- (let ((commit "c99e69c15d935eabc671b483349a406e0da9518d")
+(define-public sbcl-cl-diskspace
+ (let ((commit "2dce2d0387d58221c452bd76c7b9b7a7de81ef55")
(revision "1"))
(package
- (name "sbcl-cl-annot")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-diskspace")
+ (version (git-version "0.3.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/m2ym/cl-annot")
+ (url "https://github.com/muyinliu/cl-diskspace")
(commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/m2ym/cl-annot")
- (synopsis "Python-like Annotation Syntax for Common Lisp")
- (description
- "@code{cl-annot} is an general annotation library for Common Lisp.")
- (license license:llgpl))))
-
-(define-public cl-annot
- (sbcl-package->cl-source-package sbcl-cl-annot))
-
-(define-public ecl-cl-annot
- (sbcl-package->ecl-package sbcl-cl-annot))
-
-(define-public sbcl-cl-syntax
- (package
- (name "sbcl-cl-syntax")
- (version "0.0.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/m2ym/cl-syntax")
- (commit "03f0c329bbd55b8622c37161e6278366525e2ccc")))
- (file-name (git-file-name "cl-syntax" version))
- (sha256
- (base32 "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-annot" ,sbcl-cl-annot)
- ("cl-interpol" ,sbcl-cl-interpol)
- ("named-readtables" ,sbcl-named-readtables)
- ("trivial-types" ,sbcl-trivial-types)))
- (arguments
- '(#:asd-systems '("cl-syntax"
- "cl-syntax-annot"
- "cl-syntax-interpol")))
- (home-page "https://github.com/m2ym/cl-syntax")
- (synopsis "Reader Syntax Coventions for Common Lisp and SLIME")
- (description
- "CL-SYNTAX provides Reader Syntax Coventions for Common Lisp and SLIME.")
- (license license:llgpl)))
-
-(define-public cl-syntax
- (sbcl-package->cl-source-package sbcl-cl-syntax))
-
-(define-public ecl-cl-syntax
- (sbcl-package->ecl-package sbcl-cl-syntax))
-
-(define-public sbcl-cl-utilities
- (let ((commit "dce2d2f6387091ea90357a130fa6d13a6776884b")
- (revision "1"))
- (package
- (name "sbcl-cl-utilities")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append
- "https://gitlab.common-lisp.net/cl-utilities/cl-utilities/-/"
- "archive/" commit "/cl-utilities-" commit ".tar.gz"))
+ (file-name (git-file-name "cl-diskspace" version))
(sha256
- (base32 "1r46v730yf96nk2vb24qmagv9x96xvd08abqwhf02ghgydv1a7z2"))))
+ (base32 "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "rotate-byte.lisp"
- (("in-package :cl-utilities)" all)
- "in-package :cl-utilities)\n\n#+sbcl\n(require :sb-rotate-byte)")))))))
- (home-page "https://common-lisp.net/project/cl-utilities")
- (synopsis "Collection of semi-standard utilities")
+ (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp"
+ (("grep")
+ (search-input-file inputs "/bin/grep")))
+ (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp"
+ (("/bin/df")
+ (which "df")))
+ #t)))))
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cffi" ,sbcl-cffi)
+ ("grep" ,grep)))
+ (home-page "https://github.com/muyinliu/cl-diskspace")
+ (synopsis "Disk space information library for Common Lisp")
(description
- "On Cliki.net <http://www.cliki.net/Common%20Lisp%20Utilities>, there
-is a collection of Common Lisp Utilities, things that everybody writes since
-they're not part of the official standard. There are some very useful things
-there; the only problems are that they aren't implemented as well as you'd
-like (some aren't implemented at all) and they aren't conveniently packaged
-and maintained. It takes quite a bit of work to carefully implement utilities
-for common use, commented and documented, with error checking placed
-everywhere some dumb user might make a mistake.")
- (license license:public-domain))))
+ "CL-DISKSPACE is a Common Lisp library to list disks with the command
+line tool @code{df} and get disk space information using @code{statvfs}.")
+ (license license:isc))))
-(define-public cl-utilities
- (sbcl-package->cl-source-package sbcl-cl-utilities))
+(define-public cl-diskspace
+ (sbcl-package->cl-source-package sbcl-cl-diskspace))
-(define-public ecl-cl-utilities
- (sbcl-package->ecl-package sbcl-cl-utilities))
+(define-public ecl-cl-diskspace
+ (sbcl-package->ecl-package sbcl-cl-diskspace))
-(define-public sbcl-map-set
- (let ((commit "7b4b545b68b8")
+(define-public sbcl-cl-docutils
+ (let ((commit "756b5ad42360e84d8225fa69815bdd1623ceaa40")
(revision "1"))
(package
- (name "sbcl-map-set")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-docutils")
+ (version (git-version "0.1.1" revision commit))
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://bitbucket.org/tarballs_are_good/map-set/get/"
- commit ".tar.gz"))
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/willijar/cl-docutils/")
+ (commit commit)))
+ (file-name (git-file-name "cl-docutils" version))
(sha256
- (base32 "1sx5j5qdsy5fklspfammwb16kjrhkggdavm922a9q86jm5l0b239"))))
+ (base32
+ "132bxlj0jlhiabi29mygmkcbbgyb5s1yz1xdfhm3pgrf9f8605gg"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://bitbucket.org/tarballs_are_good/map-set")
- (synopsis "Set-like data structure")
+ (arguments
+ '(#:asd-systems '("docutils")))
+ (inputs
+ (list sbcl-cl-ppcre
+ sbcl-data-format-validation
+ sbcl-trivial-gray-streams))
+ (synopsis "Document utilities and Restructured text parser")
(description
- "Implementation of a set-like data structure with constant time
-addition, removal, and random selection.")
- (license license:bsd-3))))
-
-(define-public cl-map-set
- (sbcl-package->cl-source-package sbcl-map-set))
-
-(define-public ecl-map-set
- (sbcl-package->ecl-package sbcl-map-set))
-
-(define-public sbcl-quri
- (package
- (name "sbcl-quri")
- (version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/quri")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0l1jnvvkyaxbf08lnqfdbv6lrkq02iqr3y3rwvqxm4fvnzp7mnpz"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-prove))
- (inputs (list sbcl-babel sbcl-split-sequence sbcl-cl-utilities
- sbcl-alexandria))
- (home-page "https://github.com/fukamachi/quri")
- (synopsis "Yet another URI library for Common Lisp")
- (description
- "QURI (pronounced \"Q-ree\") is yet another URI library for Common
-Lisp. It is intended to be a replacement of PURI.")
- (license license:bsd-3)))
-
-(define-public cl-quri
- (sbcl-package->cl-source-package sbcl-quri))
-
-(define-public ecl-quri
- (sbcl-package->ecl-package sbcl-quri))
-
-(define-public sbcl-myway
- (let ((commit "286230082a11f879c18b93f17ca571c5f676bfb7")
- (revision "1"))
- (package
- (name "sbcl-myway")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/myway")
- (commit commit)))
- (file-name (git-file-name "myway" version))
- (sha256
- (base32 "0briia9bk3lbr0frnx39d1qg6i38dm4j6z9w3yga3d40k6df4a90"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("myway-test" "myway")))
- (native-inputs
- (list sbcl-prove))
- (inputs
- (list sbcl-cl-ppcre sbcl-quri sbcl-map-set))
- (home-page "https://github.com/fukamachi/myway")
- (synopsis "Sinatra-compatible URL routing library for Common Lisp")
- (description "My Way is a Sinatra-compatible URL routing library.")
- (license license:llgpl))))
-
-(define-public cl-myway
- (sbcl-package->cl-source-package sbcl-myway))
-
-(define-public ecl-myway
- (sbcl-package->ecl-package sbcl-myway))
-
-(define-public sbcl-xsubseq
- (let ((commit "5ce430b3da5cda3a73b9cf5cee4df2843034422b")
- (revision "1"))
- (package
- (name "sbcl-xsubseq")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/xsubseq")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("xsubseq-test" "xsubseq")))
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/fukamachi/xsubseq")
- (synopsis "Efficient way to use \"subseq\"s in Common Lisp")
- (description
- "XSubseq provides functions to be able to handle \"subseq\"s more
-effieiently.")
- (license license:bsd-2))))
+ "@code{cl-docutils} is a Common Lisp implementation of the Docutils text
+processing system for processing plaintext into presentational formats such as
+HTML and LaTeX. It is based upon the Python Docutils reference implementation
+but uses Common Lisp idioms making it easier to extend and more flexible. As
+with the reference implementation it includes a parser for the reStructured
+text plaintext markup syntax which is suitable for marking up documentation
+and for use as user markup for collaborative web sites. It is successfully
+used to support a higher education peer-review assessment and online tutorial
+system.")
+ (home-page "http://www.jarw.org.uk/lisp/cl-docutils.html")
+ (license license:gpl3))))
-(define-public cl-xsubseq
- (sbcl-package->cl-source-package sbcl-xsubseq))
+(define-public cl-docutils
+ (sbcl-package->cl-source-package sbcl-cl-docutils))
-(define-public ecl-xsubseq
- (sbcl-package->ecl-package sbcl-xsubseq))
+(define-public ecl-cl-docutils
+ (sbcl-package->ecl-package sbcl-cl-docutils))
-(define-public sbcl-smart-buffer
- (let ((commit "09b9a9a0b3abaa37abe9a730f5aac2643dca4e62")
- (revision "1"))
+(define-public sbcl-cl-dot
+ (let ((commit "73dfbb6e015a28ebed873266e4e8190e509b43de")
+ (revision "0"))
(package
- (name "sbcl-smart-buffer")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-dot")
+ (version (git-version "0.9.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/smart-buffer")
+ (url "https://github.com/michaelw/cl-dot")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-dot" version))
(sha256
- (base32 "0qz1zzxx0wm5ff7gpgsq550a59p0qj594zfmm2rglj97dahj54l7"))))
+ (base32 "0mcvzqfcg5rzr8rz8aa2yr2jl3ifflaksvps08zj71hbhiacqpxa"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("smart-buffer-test" "smart-buffer")))
- (native-inputs
- (list sbcl-prove
- sbcl-babel))
- (inputs
- (list sbcl-xsubseq sbcl-flexi-streams))
- (home-page "https://github.com/fukamachi/smart-buffer")
- (synopsis "Smart octets buffer")
+ (home-page "https://github.com/michaelw/cl-dot")
+ (synopsis "Generate Graphviz dot output from arbitrary Lisp data")
(description
- "Smart-buffer provides an output buffer which changes the destination
-depending on content size.")
- (license license:bsd-3))))
+ "CL-DOT is a Common Lisp library for generating Graphviz dot output from
+arbitrary Lisp data.")
+ (license license:expat))))
-(define-public cl-smart-buffer
- (sbcl-package->cl-source-package sbcl-smart-buffer))
+(define-public cl-dot
+ (sbcl-package->cl-source-package sbcl-cl-dot))
-(define-public ecl-smart-buffer
- (sbcl-package->ecl-package sbcl-smart-buffer))
+(define-public ecl-cl-dot
+ (sbcl-package->ecl-package sbcl-cl-dot))
-(define-public sbcl-fast-http
- (let ((commit "502a37715dcb8544cc8528b78143a942de662c5a")
- (revision "2"))
+(define-public sbcl-cl-emb
+ (let ((commit "fd8652174d048d4525a81f38cdf42f4fa519f840")
+ (revision "1"))
(package
- (name "sbcl-fast-http")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-cl-emb")
+ (version (git-version "0.4.3" revision commit))
+ (home-page "https://common-lisp.net/project/cl-emb/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/fast-http")
+ (url "https://github.com/38a938c2/cl-emb")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0al2g7g219jjljsf7b23pbilpgacxy5as5gs2nqf76b5qni396mi"))))
+ (base32 "1xcm31n7afh5316lwz8iqbjx7kn5lw0l11arg8mhdmkx42aj4gkk"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("fast-http-test" "fast-http")))
- (native-inputs
- `(("sbcl-prove" ,sbcl-prove)
- ("cl-syntax" ,sbcl-cl-syntax)))
(inputs
- (list sbcl-alexandria sbcl-proc-parse sbcl-xsubseq
- sbcl-smart-buffer sbcl-cl-utilities))
- (home-page "https://github.com/fukamachi/fast-http")
- (synopsis "HTTP request/response parser for Common Lisp")
- (description
- "@code{fast-http} is a HTTP request/response protocol parser for Common
-Lisp.")
- ;; Author specified the MIT license
- (license license:expat))))
+ (list sbcl-cl-ppcre))
+ (synopsis "Templating system for Common Lisp")
+ (description "A mixture of features from eRuby and HTML::Template. You
+could name it \"Yet Another LSP\" (LispServer Pages) but it's a bit more than
+that and not limited to a certain server or text format.")
+ (license license:llgpl))))
-(define-public cl-fast-http
- (sbcl-package->cl-source-package sbcl-fast-http))
+(define-public cl-emb
+ (sbcl-package->cl-source-package sbcl-cl-emb))
-(define-public ecl-fast-http
- (sbcl-package->ecl-package sbcl-fast-http))
+(define-public ecl-cl-emb
+ (sbcl-package->ecl-package sbcl-cl-emb))
-(define-public sbcl-static-vectors
+(define-public sbcl-cl-environments
(package
- (name "sbcl-static-vectors")
- (version "1.8.9")
+ (name "sbcl-cl-environments")
+ (version "0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sionescu/static-vectors")
+ (url "https://github.com/alex-gutev/cl-environments")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-environments" version))
(sha256
- (base32 "079qa20lhanzsz1qf4iags91n0ziylbjgbcymm5a5qj7yryas4fw"))))
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria sbcl-cffi))
+ (base32 "10jxj043d2dw5vc0i0lz0lsa4qszn8him5is8jdhl4nsyfcazmky"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/sionescu/static-vectors")
- (synopsis "Allocate SIMPLE-ARRAYs in static memory")
+ (inputs
+ (list sbcl-alexandria sbcl-anaphora sbcl-collectors sbcl-optima))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/alex-gutev/cl-environments")
+ (synopsis "Implements the Common Lisp standard environment access API")
(description
- "With @code{static-vectors}, you can create vectors allocated in static
-memory.")
+ "This library provides a uniform API, as specified in Common Lisp the
+Language 2, for accessing information about variable and function bindings
+from implementation-defined lexical environment objects. All major Common
+Lisp implementations are supported, even those which don't support the CLTL2
+environment access API.")
(license license:expat)))
-(define-public cl-static-vectors
- (sbcl-package->cl-source-package sbcl-static-vectors))
-
-(define-public ecl-static-vectors
- (sbcl-package->ecl-package sbcl-static-vectors))
-
-(define-public sbcl-marshal
- (let ((commit "eff1b15f2b0af2f26f71ad6a4dd5c4beab9299ec")
- (revision "1"))
- (package
- (name "sbcl-marshal")
- (version (git-version "1.3.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/wlbr/cl-marshal")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08qs6fhk38xpkkjkpcj92mxx0lgy4ygrbbzrmnivdx281syr0gwh"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/wlbr/cl-marshal")
- (synopsis "Simple (de)serialization of Lisp datastructures")
- (description
- "Simple and fast marshalling of Lisp datastructures. Convert any object
-into a string representation, put it on a stream an revive it from there.
-Only minimal changes required to make your CLOS objects serializable.")
- (license license:expat))))
-
-(define-public cl-marshal
- (sbcl-package->cl-source-package sbcl-marshal))
-
-(define-public ecl-marshal
- (sbcl-package->ecl-package sbcl-marshal))
-
-(define-public sbcl-fast-io
- (let ((commit "a4c5ad600425842e8b6233b1fa22610ffcd874c3")
- (revision "3"))
- (package
- (name "sbcl-fast-io")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rpav/fast-io")
- (commit commit)))
- (file-name (git-file-name "cl-fast-io" version))
- (sha256
- (base32 "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam sbcl-checkl))
- (inputs
- (list sbcl-alexandria sbcl-trivial-gray-streams sbcl-static-vectors))
- (home-page "https://github.com/rpav/fast-io")
- (synopsis "Fast octet-vector/stream I/O for Common Lisp")
- (description
- "Fast-io is about improving performance to octet-vectors and octet
-streams (though primarily the former, while wrapping the latter).")
- ;; Author specifies this as NewBSD which is an alias
- (license license:bsd-3))))
-
-(define-public cl-fast-io
- (sbcl-package->cl-source-package sbcl-fast-io))
-
-(define-public ecl-fast-io
- (sbcl-package->ecl-package sbcl-fast-io))
-
-(define-public sbcl-legion
- (let ((commit "599cca19f0e34246814621f7fe90322221c2e263")
- (revision "1"))
- (package
- (name "sbcl-legion")
- (version (git-version "0.1.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/legion/")
- (commit commit)))
- (file-name (git-file-name "cl-legion" version))
- (sha256
- (base32 "0583pw0mf8bd4dj42w2xrlzcwfkl8q28n1bh8dpxxfg93crx4si6"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove sbcl-local-time))
- (inputs
- (list
- sbcl-bordeaux-threads
- sbcl-cl-speedy-queue
- sbcl-vom))
- (home-page "https://github.com/fukamachi/legion")
- (synopsis "Simple multithreading worker mechanism for Common Lisp")
- (description
- "This library provides a simple multithreading worker mechanism.")
- (license license:bsd-3))))
-
-(define-public cl-legion
- (sbcl-package->cl-source-package sbcl-legion))
-
-(define-public ecl-legion
- (package
- (inherit (sbcl-package->ecl-package sbcl-legion))
- (arguments
- ;; Tests get stuck forever
- (list #:tests? #f))))
-
-(define-public sbcl-jonathan
- (let ((commit "1f448b4f7ac8265e56e1c02b32ce383e65316300")
- (revision "1"))
- (package
- (name "sbcl-jonathan")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Rudolph-Miller/jonathan")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "14x4iwz3mbag5jzzzr4sb6ai0m9r4q4kyypbq32jmsk2dx1hi807"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove sbcl-legion))
- (inputs
- (list sbcl-cl-syntax sbcl-fast-io sbcl-proc-parse sbcl-cl-ppcre))
- (home-page "https://rudolph-miller.github.io/jonathan/overview.html")
- (synopsis "JSON encoder and decoder")
- (description
- "High performance JSON encoder and decoder. Currently support: SBCL,
-CCL.")
- ;; Author specifies the MIT license
- (license license:expat))))
-
-(define-public cl-jonathan
- (sbcl-package->cl-source-package sbcl-jonathan))
-
-(define-public ecl-jonathan
- (sbcl-package->ecl-package sbcl-jonathan))
-
-(define-public sbcl-http-body
- (let ((commit "3e4bedd6a9d9bc4e1dc0a45e5b55360ae30fd388")
- (revision "2"))
- (package
- (name "sbcl-http-body")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/http-body")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("http-body-test" "http-body")))
- (native-inputs
- (list sbcl-assoc-utils sbcl-prove sbcl-trivial-utf-8))
- (inputs
- (list sbcl-babel
- sbcl-cl-ppcre
- sbcl-fast-http
- sbcl-flexi-streams
- sbcl-jonathan
- sbcl-trivial-gray-streams
- sbcl-cl-utilities
- sbcl-quri))
- (home-page "https://github.com/fukamachi/http-body")
- (synopsis "HTTP POST data parser")
- (description
- "HTTP-Body parses HTTP POST data and returns POST parameters. It
-supports application/x-www-form-urlencoded, application/json, and
-multipart/form-data.")
- (license license:bsd-2))))
-
-(define-public cl-http-body
- (sbcl-package->cl-source-package sbcl-http-body))
-
-(define-public ecl-http-body
- (sbcl-package->ecl-package sbcl-http-body))
-
-(define-public sbcl-ciel
- (let ((commit "6cc1cef5e37e9f495c8163271a5de48de99f348a")
- (revision "0"))
- (package
- (name "sbcl-ciel")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ciel-lang/CIEL")
- (commit commit)))
- (file-name (git-file-name "ciel" version))
- (sha256
- (base32 "1bwafbbsppxqvijf43dii55mpzrklh6faj2m5dhajg2f2m8qckgi"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-access
- sbcl-alexandria
- sbcl-arrow-macros
- sbcl-bordeaux-threads
- sbcl-cl-ansi-text
- sbcl-cl-ansi-text
- sbcl-cl-cron
- sbcl-cl-csv
- sbcl-cl-json-pointer
- sbcl-cl-ppcre
- sbcl-cl-punch
- sbcl-cl-reexport
- sbcl-cl-str
- sbcl-clesh
- sbcl-clingon
- sbcl-closer-mop
- sbcl-cmd
- sbcl-dbi
- sbcl-defstar
- sbcl-deploy
- sbcl-dexador
- sbcl-dissect
- sbcl-easy-routes
- sbcl-file-notify
- sbcl-fn
- sbcl-for
- sbcl-fset
- sbcl-generic-cl
- sbcl-hunchentoot
- sbcl-local-time
- sbcl-log4cl
- sbcl-lparallel
- sbcl-lquery
- sbcl-metabang-bind
- sbcl-modf
- sbcl-named-readtables
- sbcl-nodgui
- sbcl-parse-float
- sbcl-parse-number
- sbcl-printv
- sbcl-pythonic-string-reader
- sbcl-quicksearch
- sbcl-quri
- sbcl-repl-utilities
- sbcl-serapeum
- sbcl-shasht
- sbcl-shlex
- sbcl-spinneret
- sbcl-sxql
- sbcl-trivia
- sbcl-trivial-arguments
- sbcl-trivial-do
- sbcl-trivial-monitored-thread
- sbcl-trivial-package-local-nicknames
- sbcl-trivial-types
- sbcl-vgplot
- sbcl-which))
- (home-page "http://ciel-lang.org/")
- (synopsis "CIEL Is an Extended Lisp")
- (description
- "CIEL is a ready-to-use collection of libraries providing: a binary, to
-run CIEL scripts; a simple full-featured REPL for the terminal; a Lisp library
-and a core image .")
- (license license:expat))))
-
-(define-public cl-ciel
- (sbcl-package->cl-source-package sbcl-ciel))
-
-(define-public ecl-ciel
- (sbcl-package->ecl-package sbcl-ciel))
-
-(define-public sbcl-circular-streams
- (let ((commit "e770bade1919c5e8533dd2078c93c3d3bbeb38df")
- (revision "1"))
- (package
- (name "sbcl-circular-streams")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/circular-streams")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- ;; The tests depend on cl-test-more which is now prove. Prove
- ;; tests aren't working for some reason.
- `(#:tests? #f))
- (inputs
- (list sbcl-fast-io sbcl-trivial-gray-streams))
- (home-page "https://github.com/fukamachi/circular-streams")
- (synopsis "Circularly readable streams for Common Lisp")
- (description
- "Circular-Streams allows you to read streams circularly by wrapping real
-streams. Once you reach end-of-file of a stream, it's file position will be
-reset to 0 and you're able to read it again.")
- (license license:llgpl))))
-
-(define-public cl-circular-streams
- (sbcl-package->cl-source-package sbcl-circular-streams))
-
-(define-public ecl-circular-streams
- (sbcl-package->ecl-package sbcl-circular-streams))
-
-(define-public sbcl-trivial-rfc-1123
- (let ((commit "9ef59c3fdec08b0e3c9ed02d39533887b6d1b8e3")
- (revision "0"))
- (package
- (name "sbcl-trivial-rfc-1123")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stacksmith/trivial-rfc-1123")
- (commit commit)))
- (file-name (git-file-name "cl-trivial-rfc-1123" version))
- (sha256
- (base32 "1w4ywpj10fnp7cya62dzlxlg8nyk4lppn2pnmfixsndwr4ib1h6x"))))
- (build-system asdf-build-system/sbcl)
- (arguments `(#:asd-systems '("trivial-rfc-1123")))
- (inputs (list sbcl-cl-ppcre))
- (home-page "https://github.com/stacksmith/trivial-rfc-1123")
- (synopsis "Parse and print RFC-1123 timestamps")
- (description
- "This package parses and prints dates in RFC-1123 format.")
- (license license:bsd-3))))
-
-(define-public cl-trivial-rfc-1123
- (sbcl-package->cl-source-package sbcl-trivial-rfc-1123))
+(define-public cl-environments
+ (sbcl-package->cl-source-package sbcl-cl-environments))
-(define-public ecl-trivial-rfc-1123
- (sbcl-package->ecl-package sbcl-trivial-rfc-1123))
+(define-public ecl-cl-environments
+ (sbcl-package->ecl-package sbcl-cl-environments))
-(define-public sbcl-lack
- (let ((commit "abff8efeb0c3a848e6bb0022f2b8b7fa3a1bc88b")
+(define-public sbcl-cl-fad
+ ;; No release since 2019
+ (let ((commit "3f4d32d3aa1093966046d001411a852eb8f4b535")
(revision "1"))
(package
- (name "sbcl-lack")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-cl-fad")
+ (version (git-version "0.7.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/lack")
+ (url "https://github.com/edicl/cl-fad/")
(commit commit)))
- (file-name (git-file-name "lack" version))
(sha256
- (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85"))))
+ (base32 "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6"))
+ (file-name (git-file-name "cl-fad" version))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-prove))
+ (list sbcl-cl-ppcre sbcl-unit-test))
(inputs
- `(("circular-streams" ,sbcl-circular-streams)
- ("http-body" ,sbcl-http-body)
- ("ironclad" ,sbcl-ironclad)
- ("local-time" ,sbcl-local-time)
- ("quri" ,sbcl-quri)
- ("trivial-mimes" ,sbcl-trivial-mimes)))
- (arguments
- '(#:asd-systems '("lack"
- "lack-request"
- "lack-response"
- "lack-component"
- "lack-util"
- "lack-middleware-backtrace"
- "lack-middleware-static")
- ;; XXX: Component :CLACK not found
- #:tests? #f))
- (home-page "https://github.com/fukamachi/lack")
- (synopsis "Lack, the core of Clack")
+ (list sbcl-alexandria sbcl-bordeaux-threads))
+ (synopsis "Portable pathname library for Common Lisp")
(description
- "Lack is a Common Lisp library which allows web applications to be
-constructed of modular components. It was originally a part of Clack, however
-it's going to be rewritten as an individual project since Clack v2 with
-performance and simplicity in mind.")
- (license license:llgpl))))
-
-(define-public cl-lack
- (sbcl-package->cl-source-package sbcl-lack))
-
-(define-public ecl-lack
- (sbcl-package->ecl-package sbcl-lack))
-
-(define-public sbcl-cl-isaac
- (let ((commit "9cd88f39733be753facbf361cb0e08b9e42ff8d5")
- (revision "0"))
- (package
- (name "sbcl-cl-isaac")
- (version (git-version "1.0.7" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/thephoeron/cl-isaac")
- (commit commit)))
- (file-name (git-file-name "cl-isaac" version))
- (sha256
- (base32 "0ig1mf8iridfr7vci9gy499194h0hda0xki5s6g0y04g85ibnpw9"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-prove))
- (home-page "https://github.com/thephoeron/cl-isaac/")
- (synopsis "Fast cryptographic random number generators")
- (description "This is an optimized Common Lisp library of Bob Jenkins'
-ISAAC-32 and ISAAC-64 algorithms, which are fast cryptographic random number
-generators: Indirection, Shift, Accumulate, Add, and Count.")
- (license license:bsd-0))))
-
-(define-public cl-isaac
- (sbcl-package->cl-source-package sbcl-cl-isaac))
-
-(define-public ecl-cl-isaac
- (sbcl-package->ecl-package sbcl-cl-isaac))
-
-(define-public sbcl-local-time
- (let ((commit "40169fe26d9639f3d9560ec0255789bf00b30036")
- (revision "4"))
- (package
- (name "sbcl-local-time")
- (version (git-version "1.0.6" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dlowe-net/local-time")
- (commit commit)))
- (file-name (git-file-name "cl-local-time" version))
- (sha256
- (base32 "1dbp33zmkqzzshmf5k76pxqgli285wvy0p0dhcz816fdikpwn2jg"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; Delete the extension provided by sbcl-cl-postgres+local-time
- (add-after 'unpack 'delete-local-time
- (lambda _
- (delete-file "cl-postgres+local-time.asd")
- (delete-file "src/integration/cl-postgres.lisp"))))))
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (home-page "https://common-lisp.net/project/local-time/")
- (synopsis "Time manipulation library for Common Lisp")
- (description
- "The LOCAL-TIME library is a Common Lisp library for the manipulation of
-dates and times. It is based almost entirely upon Erik Naggum's paper \"The
-Long Painful History of Time\".")
- (license license:expat))))
-
-(define-public cl-local-time
- (sbcl-package->cl-source-package sbcl-local-time))
-
-(define-public ecl-local-time
- (sbcl-package->ecl-package sbcl-local-time))
-
-(define-public sbcl-cl-postgres+local-time
- (package
- (inherit sbcl-local-time)
- (name "sbcl-cl-postgres+local-time")
- (inputs (list sbcl-local-time sbcl-postmodern))
- (arguments
- `(#:asd-systems '("cl-postgres+local-time")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-local-time
- (lambda _
- (delete-file "local-time.asd")
- (delete-file "src/package.lisp")
- (delete-file "src/local-time.lisp")
- (delete-file-recursively "doc")
- (delete-file-recursively "test")
- (delete-file-recursively "zoneinfo"))))))
- (synopsis "Integration between cl-postgres and local-time")
- (description
- "This package provides the LOCAL-TIME extensions for the cl-postgres
-ASDF system of postmodern.")
- (license license:expat)))
+ "CL-FAD (for \"Files and Directories\") is a thin layer atop Common
+Lisp's standard pathname functions. It is intended to provide some
+unification between current CL implementations on Windows, OS X, Linux, and
+Unix. Most of the code was written by Peter Seibel for his book Practical
+Common Lisp.")
+ (home-page "https://edicl.github.io/cl-fad/")
+ (license license:bsd-2))))
-(define-public cl-postgres+local-time
- (sbcl-package->cl-source-package sbcl-cl-postgres+local-time))
+(define-public cl-fad
+ (sbcl-package->cl-source-package sbcl-cl-fad))
-(define-public ecl-cl-postgres+local-time
- (sbcl-package->ecl-package sbcl-cl-postgres+local-time))
+(define-public ecl-cl-fad
+ (sbcl-package->ecl-package sbcl-cl-fad))
-(define-public sbcl-chronicity
+(define-public sbcl-cl-fast-ecs
(package
- (name "sbcl-chronicity")
- (version "0.4.1")
+ (name "sbcl-cl-fast-ecs")
+ (version "0.2.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/chaitanyagupta/chronicity")
- (commit (string-append "v" version))))
- (file-name (git-file-name "chronicity" version))
+ (url "https://gitlab.com/lockie/cl-fast-ecs")
+ (commit version)))
+ (file-name (git-file-name "cl-fast-ecs" version))
(sha256
- (base32 "0rzrl9is2v1aqbm0sym0qx3blnpd0bl13dkkmll6mb3983k2mkax"))))
+ (base32 "00nw5nwzcz8x1x1lycmjik8pcqzxrl896j0xjjl33rjljsmj45sx"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-lisp-unit))
+ (list sbcl-chlorophyll sbcl-cl-mock sbcl-parachute))
(inputs
- (list sbcl-cl-interpol sbcl-cl-ppcre sbcl-local-time))
- (home-page "https://github.com/chaitanyagupta/chronicity")
- (synopsis "Natural language date and time parser for Common Lisp")
+ (list sbcl-alexandria sbcl-trivial-garbage))
+ (home-page "https://lockie.gitlab.io/cl-fast-ecs/")
+ (synopsis "Blazingly fast Entity-Component-System microframework")
(description
- "CHRONICITY is Common Lisp natural language date and time parser inspired
-by Ruby's @code{Chronic}.")
- (license license:bsd-3)))
-
-(define-public ecl-chronicity
- (sbcl-package->ecl-package sbcl-chronicity))
-
-(define-public cl-chronicity
- (sbcl-package->cl-source-package sbcl-chronicity))
-
-(define-public sbcl-trivial-mimes
- (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9")
- (revision "2"))
- (package
- (name "sbcl-trivial-mimes")
- (version (git-version "1.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/trivial-mimes")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "00kcm17q5plpzdj1qwg83ldhxksilgpcdkf3m9azxcdr968xs9di"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (inputs
- (list sbcl-cl-fad))
- (home-page "https://shinmera.github.io/trivial-mimes/")
- (synopsis "Tiny Common Lisp library to detect mime types in files")
- (description
- "This is a teensy library that provides some functions to determine the
-mime-type of a file.")
- (license license:zlib))))
-
-(define-public cl-trivial-mimes
- (sbcl-package->cl-source-package sbcl-trivial-mimes))
-
-(define-public ecl-trivial-mimes
- (sbcl-package->ecl-package sbcl-trivial-mimes))
+ "CL-FAST-ECS is a Common Lisp library providing an implementation of the
+@acronym{ECS, Entity-Component-System} pattern, primarily focused on speed and
+interactive development.
-(define-public sbcl-ningle
- (let ((commit "2e85675bbb668d6ef341514fc9f22391a0f506b1")
- (revision "2"))
- (package
- (name "sbcl-ningle")
- (version (git-version "0.3.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/ningle")
- (commit commit)))
- (file-name (git-file-name "cl-ningle" version))
- (sha256
- (base32 "0s9nn8ml1j4839rycvdjcbsynkqnhxw1zmrgpjz48smscwdf1f8p"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:tests? #f)) ; TODO: pull in clack-test
- (native-inputs
- (list sbcl-prove))
- (inputs
- (list sbcl-cl-syntax sbcl-myway sbcl-lack sbcl-alexandria
- sbcl-babel))
- (home-page "https://8arrow.org/ningle/")
- (synopsis "Super micro framework for Common Lisp")
- (description
- "Ningle is a lightweight web application framework for Common Lisp.")
- (license license:llgpl))))
+ECS is an architectural data-oriented design pattern that allows for the
+effective processing of a large number of in-game objects while keeping the code
+and data separated. This provides flexibility in the way that game objects are
+built at runtime.")
+ (license license:expat)))
-(define-public cl-ningle
- (sbcl-package->cl-source-package sbcl-ningle))
+(define-public cl-fast-ecs
+ (sbcl-package->cl-source-package sbcl-cl-fast-ecs))
-(define-public ecl-ningle
- (sbcl-package->ecl-package sbcl-ningle))
+(define-public ecl-cl-fast-ecs
+ (sbcl-package->ecl-package sbcl-cl-fast-ecs))
(define-public sbcl-cl-fastcgi
(let ((commit "de8b49b26de9863996ec18db28af8ab7e8ac4e20")
@@ -7615,43 +5237,6 @@ mostly Common Lisp implementation.")
(define-public ecl-cl-fastcgi
(sbcl-package->ecl-package sbcl-cl-fastcgi))
-(define-public sbcl-cl-fast-ecs
- (package
- (name "sbcl-cl-fast-ecs")
- (version "0.2.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/lockie/cl-fast-ecs")
- (commit version)))
- (file-name (git-file-name "cl-fast-ecs" version))
- (sha256
- (base32 "00nw5nwzcz8x1x1lycmjik8pcqzxrl896j0xjjl33rjljsmj45sx"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-chlorophyll sbcl-cl-mock sbcl-parachute))
- (inputs
- (list sbcl-alexandria sbcl-trivial-garbage))
- (home-page "https://lockie.gitlab.io/cl-fast-ecs/")
- (synopsis "Blazingly fast Entity-Component-System microframework")
- (description
- "CL-FAST-ECS is a Common Lisp library providing an implementation of the
-@acronym{ECS, Entity-Component-System} pattern, primarily focused on speed and
-interactive development.
-
-ECS is an architectural data-oriented design pattern that allows for the
-effective processing of a large number of in-game objects while keeping the code
-and data separated. This provides flexibility in the way that game objects are
-built at runtime.")
- (license license:expat)))
-
-(define-public cl-fast-ecs
- (sbcl-package->cl-source-package sbcl-cl-fast-ecs))
-
-(define-public ecl-cl-fast-ecs
- (sbcl-package->ecl-package sbcl-cl-fast-ecs))
-
(define-public sbcl-cl-flac
(let ((commit "d094d33d3cc2cf263263b917798d338eded3c532")
(revision "0"))
@@ -7693,703 +5278,644 @@ built at runtime.")
audio library for Common Lisp.")
(license license:zlib))))
-(define-public ecl-cl-flac
- (sbcl-package->ecl-package sbcl-cl-flac))
-
(define-public cl-flac
(sbcl-package->cl-source-package sbcl-cl-flac))
-(define-public sbcl-clack
- (let ((commit "6fd0279424f7ba5fd4f92d69a1970846b0b11222")
- (revision "2"))
+(define-public ecl-cl-flac
+ (sbcl-package->ecl-package sbcl-cl-flac))
+
+(define-public sbcl-cl-fond
+ (let ((commit "dac975cbc73f231b400d5b8d8539b16330239a4a")
+ (revision "1"))
(package
- (name "sbcl-clack")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-cl-fond")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/clack")
+ (url "https://github.com/Shirakumo/cl-fond")
(commit commit)))
- (file-name (git-file-name "cl-clack" version))
+ (file-name (git-file-name "cl-fond" version))
(sha256
- (base32 "0sfmvqmsg9z13x0v77448rpdqgyprdq739nsbrjw9a28hv9jmkg9"))))
+ (base32 "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("clack"
- "clack-handler-fcgi"
- "clack-socket"
- "clack-handler-hunchentoot")))
(inputs
(list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cl-fastcgi
- sbcl-flexi-streams
- sbcl-hunchentoot
- sbcl-lack
- sbcl-quri
- sbcl-split-sequence
- sbcl-usocket))
- (home-page "https://github.com/fukamachi/clack")
- (synopsis "Web Application Environment for Common Lisp")
- (description
- "Clack is a web application environment for Common Lisp inspired by
-Python's WSGI and Ruby's Rack.")
- (license license:llgpl))))
+ sbcl-cffi
+ sbcl-cl-opengl
+ sbcl-documentation-utils
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (home-page "https://shirakumo.github.io/cl-fond/")
+ (synopsis "Bindings to libfond, a simple text rendering engine for OpenGL")
+ (description "This is a Common Lisp bindings library to libfond, a
+simple OpenGL text rendering engine.")
+ (license license:zlib))))
-(define-public cl-clack
- (sbcl-package->cl-source-package sbcl-clack))
+(define-public cl-fond
+ (sbcl-package->cl-source-package sbcl-cl-fond))
-(define-public ecl-clack
- (sbcl-package->ecl-package sbcl-clack))
+(define-public ecl-cl-fond
+ (sbcl-package->ecl-package sbcl-cl-fond))
-(define-public sbcl-cl-log
- (let ((commit "8f4b766d51e02245c310526cf1e4534ce634f837")
- (revision "1"))
- (package
- (name "sbcl-cl-log")
- (version "1.0.1")
- (source
- (origin
+(define-public sbcl-cl-form-types
+ (package
+ (name "sbcl-cl-form-types")
+ (version "0.3.2")
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/nicklevine/cl-log")
- (commit commit)))
+ (url "https://github.com/alex-gutev/cl-form-types")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1r3z9swy1b59swvaa5b97is9ysrfmjvjjhhw56p7p5hqg93b92ak"))
- (file-name (git-file-name "cl-log" version))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp general purpose logging utility")
- (description "CL-LOG is a general purpose logging utility, loosely modelled
-in some respects after Gary King's Log5. Its features include: logging to
-several destinations at once, via \"messengers\", each messenger is tailored to
-accept some log messages and reject others, and this tailoring can be changed
-on-the-fly, very rapid processing of messages which are rejected by all
-messengers, fully independent use of the utility by several different
-sub-systems in an application, support for messengers which cl:format text to a
-stream, support for messengers which do not invoke cl:format, timestamps in
-theory accurate to internal-time-units-per-second.")
- (home-page "https://github.com/nicklevine/cl-log")
- (license license:expat))))
-
-(define-public cl-log
- (sbcl-package->cl-source-package sbcl-cl-log))
+ (base32
+ "0k4j657vfh4zblp9a7d3z15r82yyz4fzqh8vfn2s7ljsj1dmhp2n"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-agutil
+ sbcl-anaphora
+ sbcl-arrows
+ sbcl-cl-environments
+ sbcl-introspect-environment
+ sbcl-optima))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/alex-gutev/cl-form-types")
+ (synopsis "Determine the types of Common Lisp forms")
+ (description "This library provides functions for determining the value
+types of Common Lisp forms, based on type information contained in the
+environment.
-(define-public ecl-cl-log
- (sbcl-package->ecl-package sbcl-cl-log))
+In order for this library to work the values types of variables and return
+types of functions have to be declared.
-(define-public sbcl-log4cl
- (let ((commit "fe3da517147d023029782ced7cd989ba24f1e62d")
- (revision "2"))
- (package
- (name "sbcl-log4cl")
- (version (git-version "1.1.4" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/log4cl")
- (commit commit)))
- (file-name (git-file-name "cl-log4cl" version))
- (sha256
- (base32 "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-stefil))
- (inputs
- (list sbcl-bordeaux-threads))
- (home-page "https://github.com/7max/log4cl")
- (synopsis "Common Lisp logging framework, modeled after Log4J")
- (description
- "This is a Common Lisp logging framework that can log at various levels
-and mix text with expressions.")
- (license license:asl2.0))))
+Macros and symbol-macros are fully expanded and all special forms, except
+@code{CATCH}, are supported.")
+ (license license:expat)))
-(define-public cl-log4cl
- (sbcl-package->cl-source-package sbcl-log4cl))
+(define-public cl-form-types
+ (sbcl-package->cl-source-package sbcl-cl-form-types))
-(define-public ecl-log4cl
- (sbcl-package->ecl-package sbcl-log4cl))
+(define-public ecl-cl-form-types
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl-form-types)))
+ (package
+ (inherit pkg)
+ (arguments
+ ;; FIXME: Syntax error in declaration (TYPE T (FORM &KEY STRICT
+ ;; EXPAND-COMPILER-MACROS (TEST (QUOTE FORM-TYPE=))))
+ ;; An error occurred during initialization: COMPILE-FILE-ERROR while...
+ ;; See <https://github.com/alex-gutev/cl-form-types/issues/22>.
+ '(#:tests? #f)))))
-(define-public sbcl-printv
- (let ((commit "e717a7fe076dae861a96117b2f9af29db8d2294d")
- (revision "2"))
+(define-public sbcl-cl-freetype2
+ (let ((commit "8bcb232b319a66fb700eaea88d0b308a837bce04")
+ (revision "1"))
(package
- (name "sbcl-printv")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-cl-freetype2")
+ (version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/danlentz/printv")
+ (url "https://github.com/rpav/cl-freetype2")
(commit commit)))
- (file-name (git-file-name "cl-printv" version))
+ (file-name (git-file-name "cl-freetype2" version))
(sha256
- (base32 "07agyzkwp3w2r4d2anrmr8h00yngpr5dq9mjd3m4kzhn1jcmilfb"))))
+ (base32 "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list figlet))
+ (list freetype
+ sbcl-alexandria
+ sbcl-cffi
+ sbcl-trivial-garbage))
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-figlet-executable
+ (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "printv.lisp"
- (("\"figlet")
- (string-append "\"" (search-input-file inputs
- "/bin/figlet")))))))))
- (home-page "https://github.com/danlentz/printv")
- (synopsis "Common Lisp tracing and debug-logging macro")
+ (substitute* "src/ffi/ft2-lib.lisp"
+ (("\"libfreetype\"")
+ (string-append "\"" (assoc-ref inputs "freetype")
+ "/lib/libfreetype\"")))
+ (substitute* "src/ffi/grovel/grovel-freetype2.lisp"
+ (("-I/usr/include/freetype")
+ (string-append "-I" (assoc-ref inputs "freetype")
+ "/include/freetype")))
+ #t)))))
+ (home-page "https://github.com/rpav/cl-freetype2")
+ (synopsis "Common Lisp bindings for Freetype 2")
(description
- "@code{PRINTV} is a \"batteries-included\" tracing and debug-logging
-macro for Common Lisp.")
- (license license:asl2.0))))
-
-(define-public ecl-printv
- (sbcl-package->ecl-package sbcl-printv))
-
-(define-public cl-printv
- (sbcl-package->cl-source-package sbcl-printv))
-
-(define-public sbcl-cl-debug
- (let ((commit "b334280806104ee7f7d3aec666bf7e08d2f89b31")
- (revision "1"))
- (package
- (name "sbcl-cl-debug")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/kmx-io/cl-debug")
- (commit commit)))
- (file-name (git-file-name "cl-debug" version))
- (sha256
- (base32 "0w5vxbjsgr3zfpivdmghmhzxskfdvm1p34c8whwps2xlhypxsa78"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/kmx-io/cl-debug")
- (synopsis "Common Lisp cross-package debugging facility")
- (description
- "CL-DEBUG provides a unified way to enable or disable debug-specific code.
-Debugging code can be enabled or disabled relative to program features denoted
-by either a symbol or a keyword.")
- (license license:isc))))
+ "This is a general Freetype 2 wrapper for Common Lisp using CFFI. It's
+geared toward both using Freetype directly by providing a simplified API, as
+well as providing access to the underlying C structures and functions for use
+with other libraries which may also use Freetype.")
+ (license license:bsd-3))))
-(define-public ecl-cl-debug
- (sbcl-package->ecl-package sbcl-cl-debug))
+(define-public cl-freetype2
+ (sbcl-package->cl-source-package sbcl-cl-freetype2))
-(define-public cl-debug
- (sbcl-package->cl-source-package sbcl-cl-debug))
+(define-public ecl-cl-freetype2
+ (sbcl-package->ecl-package sbcl-cl-freetype2))
-(define-public sbcl-verbose
- (let ((commit "c5b7ecd465be61b35af17ef57564697b88397174")
- (revision "1"))
+(define-public sbcl-cl-ftp
+ (let ((commit "530f1ec06427c69966d83c86638be628eacb9502")
+ (revision "0"))
(package
- (name "sbcl-verbose")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-cl-ftp")
+ (version (git-version "1.6.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/verbose/")
+ (url "https://github.com/pinterface/cl-ftp")
(commit commit)))
- (file-name (git-file-name "verbose" version))
+ (file-name (git-file-name "cl-ftp" version))
(sha256
- (base32 "0r51ydj5v7afi2jrlscbhxprv13d9vzg5316g1yzwaxc1kzsdsw6"))))
+ (base32 "0q5x9g419crvaf106q33k0xkh4xvglzjyjhibz9siymcngyc7zdh"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads sbcl-dissect sbcl-documentation-utils
- sbcl-local-time sbcl-piping))
- (home-page "https://shinmera.github.io/verbose/")
- (synopsis "Logging framework using the piping library")
+ (list sbcl-split-sequence
+ sbcl-usocket))
+ (synopsis "FTP client for Common Lisp")
(description
- "This is a Common Lisp library providing logging faciltiy similar to
-@code{CL-LOG} and @code{LOG4CL}.")
- (license license:zlib))))
+ "CL-FTP is a library which provides FTP client functionality
+to a Common Lisp program. CL-FTP uses the USOCKET package for network
+sockets and the SPLIT-SEQUENCE package for some parsing needs.")
+ (home-page "https://github.com/pinterface/cl-ftp")
+ (license license:expat))))
-(define-public ecl-verbose
- (sbcl-package->ecl-package sbcl-verbose))
+(define-public cl-ftp
+ (sbcl-package->cl-source-package sbcl-cl-ftp))
-(define-public cl-verbose
- (sbcl-package->cl-source-package sbcl-verbose))
+(define-public ecl-cl-ftp
+ (sbcl-package->ecl-package sbcl-cl-ftp))
-(define-public sbcl-vgplot
- (let ((commit "76329928a3709387c0779175af56ec49d16bcd35")
- (revision "0"))
+(define-public sbcl-cl-gamepad
+ (let ((commit "d5b99fbaa2e39294d23061699e8f1e761eda7205")
+ (revision "3"))
(package
- (name "sbcl-vgplot")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-gamepad")
+ (version (git-version "3.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/volkers/vgplot")
+ (url "https://github.com/Shirakumo/cl-gamepad")
(commit commit)))
- (file-name (git-file-name "vgplot" version))
+ (file-name (git-file-name "cl-gamepad" version))
(sha256
- (base32 "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y"))))
+ (base32 "0y6kg9wq92p07i1chm1v7j7p77iqc5c985pdvmmivcip8zmd4hm4"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lisp-unit))
+ (arguments
+ `(#:tests? #f ; No tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-evdev-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "evdev-cffi.lisp"
+ (("libevdev.so")
+ (search-input-file inputs "/lib/libevdev.so"))))))))
(inputs
- (list sbcl-cl-fad sbcl-cl-ppcre sbcl-ltk))
- (home-page "https://github.com/volkers/vgplot")
- (synopsis "Common lisp library interfacing to the gnuplot utility")
+ (list libevdev
+ sbcl-cffi
+ sbcl-documentation-utils
+ sbcl-trivial-features))
+ (home-page "https://shirakumo.github.io/cl-gamepad/")
+ (synopsis "Library for access to gamepads and joystick input devices")
(description
- "This package provides an interface to the @code{gnuplot} plotting
-utility. The intention of the API is to resemble to some of the plot commands
-of octave or matlab.")
- (license license:gpl3+))))
-
-(define-public cl-vgplot
- (sbcl-package->cl-source-package sbcl-vgplot))
-
-(define-public ecl-vgplot
- (sbcl-package->ecl-package sbcl-vgplot))
-
-(define-public sbcl-find-port
- (let ((commit "811727f88d7f000623bf92fdb0e64678a7112a28")
- (revision "2"))
- (package
- (name "sbcl-find-port")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/eudoxia0/find-port")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1fw6q7d2bxxb7fqk548ylq8mx4sz95yc0q5h0rwd0mnqjrbwbari"))))
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-usocket))
- (synopsis "Find open ports programmatically in Common Lisp")
- (description "This is a small Common Lisp library that finds an open
-port within a range.")
- (license license:expat))))
+ "This is a library to provide cross-platform access to gamepads,
+joysticks, and other such HID devices.")
+ (license license:zlib))))
-(define-public cl-find-port
- (sbcl-package->cl-source-package sbcl-find-port))
+(define-public cl-gamepad
+ (sbcl-package->cl-source-package sbcl-cl-gamepad))
-(define-public ecl-find-port
- (sbcl-package->ecl-package sbcl-find-port))
+(define-public ecl-cl-gamepad
+ (sbcl-package->ecl-package sbcl-cl-gamepad))
-(define-public sbcl-numpy-file-format
- (let ((commit "e440c7bbc0d86b9abf73acb0fa665b77b82a6c98")
- (revision "2"))
+(define-public sbcl-cl-geometry
+ (let ((commit "24eddedc47b931cec27361752736ef0b54fc9984"))
(package
- (name "sbcl-numpy-file-format")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-geometry")
+ (version (git-version "0.0.3" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/numpy-file-format")
+ (url "https://github.com/vydd/cl-geometry")
(commit commit)))
- (file-name (git-file-name "cl-numpy-file-format" version))
+ (file-name (git-file-name "cl-cl-geometry" version))
(sha256
- (base32 "1n0nixc44z1cymm20wif0l2100ydv0h69l6i6xz5bmwcb2zc4gqr"))))
+ (base32 "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-ieee-floats sbcl-trivial-features))
- (home-page "https://github.com/marcoheisig/numpy-file-format")
- (synopsis "Read and write NumPy .npy and .npz files")
+ (list sbcl-iterate
+ sbcl-trees))
+ (home-page "https://github.com/lispgames/cl-geometry/")
+ (synopsis "Simple two dimensional computational geometry in Common Lisp")
(description
- "The NUMPY-FILE-FORMAT library is a Common Lisp library for reading and
-writing NumPy @file{.npy} and @file{.npz} files.")
+ "This is a system for two dimensional computational geometry for Common Lisp.
+
+Note: the system assumes exact rational arithmetic, so no floating point
+coordinates are allowed. This is not checked when creating geometric
+objects.")
+ ;; The .asd says BSD-style but the LICENSE.txt is expat.
(license license:expat))))
-(define-public cl-numpy-file-format
- (sbcl-package->cl-source-package sbcl-numpy-file-format))
+(define-public cl-cl-geometry
+ (sbcl-package->cl-source-package sbcl-cl-geometry))
-(define-public ecl-numpy-file-format
- (sbcl-package->ecl-package sbcl-numpy-file-format))
+(define-public ecl-cl-geometry
+ (sbcl-package->ecl-package sbcl-cl-geometry))
-(define-public sbcl-py4cl
- (let ((commit "2f2a008dd6162d4446803971292fe1b323fe0dd5")
- (revision "2"))
+(define-public sbcl-cl-glfw3
+ (let ((commit "32c3f34d592d55ee7ce932ed85804c1a9c4158c6")
+ (revision "1"))
(package
- (name "sbcl-py4cl")
+ (name "sbcl-cl-glfw3")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bendudson/py4cl")
+ (url "https://github.com/AlexCharlton/cl-glfw3")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-glfw3" version))
(sha256
- (base32
- "1zx1kpfpd8mi1qaa7gr32mki6nvl6pqcs3437fvn4xa3yf7ybsha"))
- (modules '((guix build utils)))))
+ (base32 "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-clunit))
- (inputs
- (list python sbcl-trivial-garbage))
- (propagated-inputs
- (list ;; For multi-dimensional array support
- python-numpy))
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-python3-path
+ (add-after 'unpack 'patch-glfw-lib-path
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/python-process.lisp"
- (("\\*python-command\\* \"python\"")
- (string-append "*python-command* "
- "\""
- (search-input-file inputs "/bin/python3")
- "\"")))))
- (add-after 'unpack 'replace-*base-directory*-var
- (lambda* (#:key outputs #:allow-other-keys)
- ;; In the ASD, the author makes an attempt to
- ;; programatically determine the location of the
- ;; source-code so lisp can call into "py4cl.py". We can
- ;; hard-code this since we know where this file will
- ;; reside.
- (substitute* "src/python-process.lisp"
- (("py4cl/config:\\*base-directory\\*")
- (string-append
- "\""
- (assoc-ref outputs "out")
- "/share/common-lisp/"
- (%lisp-type)
- "/py4cl/"
- "\""))))))))
- (synopsis "Call python from Common Lisp")
+ (substitute* "glfw-bindings.lisp"
+ (("libglfw.so.3" _)
+ (search-input-file inputs "/lib/libglfw.so.3"))))))))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("cl-opengl" ,sbcl-cl-opengl)
+ ("glfw" ,glfw)
+ ("trivial-main-thread" ,sbcl-trivial-main-thread)))
+ (home-page "https://github.com/AlexCharlton/cl-glfw3")
+ (synopsis "Common Lisp bindings to GLFW version 3.x")
(description
- "Py4CL is a bridge between Common Lisp and Python, which enables Common
-Lisp to interact with Python code. It uses streams to communicate with a
-separate python process, the approach taken by cl4py. This is different to
-the CFFI approach used by burgled-batteries, but has the same goal.")
- (home-page "https://github.com/bendudson/py4cl")
- ;; MIT License
- (license license:expat))))
+ "This package provides a Common Lisp bindings to @code{glfw}, an OpenGL
+application development library.")
+ (license license:bsd-2))))
-(define-public cl-py4cl
- (sbcl-package->cl-source-package sbcl-py4cl))
+(define-public cl-glfw3
+ (sbcl-package->cl-source-package sbcl-cl-glfw3))
-(define-public ecl-py4cl
- (sbcl-package->ecl-package sbcl-py4cl))
+(define-public ecl-cl-glfw3
+ (sbcl-package->ecl-package sbcl-cl-glfw3))
-(define-public sbcl-schemeish
- (let ((commit "dff57bafae5d0cffa104c8fdc4146502f32d7f85")
+(define-public sbcl-cl-glib
+ (let ((commit "9e52827cce1cbb3962536b6a5e628febab593f57")
(revision "1"))
(package
- (name "sbcl-schemeish")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-glib")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/chebert/schemeish")
+ (url "https://github.com/bohonghuang/cl-glib")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-glib" version))
(sha256
- (base32 "0q9b07spmhg1b576cnnacvkf7zr3mab2rdydfylbn92y9mms9vyj"))))
+ (base32 "0dxa493zdp1p93cahhpp3yaggn3j3kkn90mdw99g4ld7scmiglp4" ))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("cl-gio" "cl-glib" "cl-gobject")))
(inputs
- (list sbcl-trivial-arguments))
- (synopsis "Scheme style syntax/macros/functions for Common Lisp")
- (description
- "Schemeish implements several useful Scheme constructs for Common Lisp.
-These include named-let, define, scheme argument lists, and a shortcut to
-FUNCALL with [] instead of ().")
- (home-page "https://github.com/chebert/schemeish")
- ;; MIT License
- (license license:expat))))
+ (list glib
+ gobject-introspection
+ sbcl-bordeaux-threads
+ sbcl-cl-gobject-introspection-wrapper))
+ (home-page "https://github.com/bohonghuang/cl-glib")
+ (synopsis "Glib, GIO and Gobject bindings for Common Lisp")
+ (description "This library provides Glib, GIO and Gobject bindings for
+Common Lisp via Gobject Introspection.")
+ (license license:lgpl3+))))
-(define-public cl-schemeish
- (sbcl-package->cl-source-package sbcl-schemeish))
+(define-public cl-glib
+ (sbcl-package->cl-source-package sbcl-cl-glib))
-(define-public ecl-schemeish
- (sbcl-package->ecl-package sbcl-schemeish))
+(define-public ecl-cl-glib
+ (sbcl-package->ecl-package sbcl-cl-glib))
-(define-public sbcl-parse-declarations
- (let ((commit "549aebbfb9403a7fe948654126b9c814f443f4f2")
+(define-public sbcl-cl-gltf
+ (let ((commit "7a3af05a7f491d8973b217f096806ef12a97474b")
(revision "1"))
(package
- (name "sbcl-parse-declarations")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-gltf")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append
- "https://gitlab.common-lisp.net/parse-declarations/"
- "parse-declarations.git"))
+ (url "https://github.com/Shirakumo/cl-gltf")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-gltf" version))
(sha256
- (base32 "03g5qks4c59nmxa48pbslxkfh77h8hn8566jddp6m9pl15dzzpxd"))))
+ (base32 "1d64fg2l2c0wns3wpp1xypd8687gnp3k70fv9fb48m1kpzg4kvrh"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:asd-systems '("parse-declarations-1.0")))
- (home-page "https://common-lisp.net/project/parse-declarations/")
- (synopsis "Parse, filter, and build declarations")
+ ;; No tests provided.
+ `(#:tests? #f))
+ (inputs
+ (list sbcl-documentation-utils
+ sbcl-cffi
+ sbcl-jzon
+ sbcl-mmap
+ sbcl-nibbles
+ sbcl-qbase64
+ sbcl-static-vectors
+ sbcl-trivial-extensible-sequences))
+ (home-page "https://shirakumo.github.io/cl-gltf/")
+ (synopsis "Common Lisp parser for glTF file format")
(description
- "Parse-Declarations is a Common Lisp library to help writing
-macros which establish bindings. To be semantically correct, such
-macros must take user declarations into account, as these may affect
-the bindings they establish. Yet the ANSI standard of Common Lisp does
-not provide any operators to work with declarations in a convenient,
-high-level way. This library provides such operators.")
- ;; MIT License
- (license license:expat))))
+ "This package provides a Common Lisp parser for glTF file format.")
+ (license license:zlib))))
-(define-public cl-parse-declarations
- (sbcl-package->cl-source-package sbcl-parse-declarations))
+(define-public cl-gltf
+ (sbcl-package->cl-source-package sbcl-cl-gltf))
-(define-public ecl-parse-declarations
- (sbcl-package->ecl-package sbcl-parse-declarations))
+;; FIXME: ECL part is failing
+;; ;;; Internal error:
+;;
+;; ** There is no package with the name SEQUENCE.An error occurred during
+;; initialization: COMPILE-FILE-ERROR while compiling #<cl-source-file
+;; "trivial-extensible-sequences" "fallback">.
+;;
+;; See <https://github.com/Shirakumo/cl-gltf/issues/3>
+;;
+;; (define-public ecl-cl-gltf
+;; (sbcl-package->ecl-package sbcl-cl-gltf))
-(define-public sbcl-burgled-batteries3
- (let ((commit "f65f454d13bb6c40e17e9ec62e41eb5069e09760")
- (revision "2"))
+(define-public sbcl-cl-gobject-introspection
+ (let ((commit "4908a84c16349929b309c50409815ff81fb9b3c4")
+ (revision "4"))
(package
- (name "sbcl-burgled-batteries3")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-gobject-introspection")
+ (version (git-version "0.3" revision commit))
+ (home-page "https://github.com/andy128k/cl-gobject-introspection")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/snmsts/burgled-batteries3")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-burgled-batteries3" version))
+ (file-name (git-file-name "cl-gobject-introspection" version))
(sha256
- (base32
- "1nzn7jawrfajyzwfnzrg2cmn9xxadcqh4szbpg0jggkhdkdzz4wa"))
- (patches
- (search-patches "sbcl-burgled-batteries3-fix-signals.patch"))))
+ (base32 "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f
- #:modules (((guix build python-build-system) #:select (python-version))
- ,@%asdf-build-system-modules)
- #:imported-modules ((guix build python-build-system)
- ,@%asdf-build-system-modules)
- #:phases
- (modify-phases (@ (guix build asdf-build-system) %standard-phases)
- (add-after 'unpack 'set-*cpython-include-dir*-var
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((python (assoc-ref inputs "python")))
- (setenv "BB_PYTHON3_INCLUDE_DIR"
- (string-append python "/include/python"
- (python-version python)))
- (setenv "BB_PYTHON3_DYLIB"
- (string-append python "/lib/libpython3.so"))
- #t)))
- (add-after 'unpack 'adjust-for-python-3.10
- (lambda _
- ;; These methods are no longer part of the public API.
- (substitute* "ffi-interface.lisp"
- ((".*PyEval_ReInitThreads.*") "")
- ((".*\"PyErr_Warn\".*") "")
- ((".*\"PyFloat_ClearFreeList\".*") "")
- ((".*\"PyParser_SimpleParseString\".*") "")
- ((".*\"PyParser_SimpleParseStringFlags\".*") "")
- ((".*\"PyParser_SimpleParseStringFlagsFilename\".*") "")
- ((".*\"PyParser_SimpleParseFile\".*") "")
- ((".*\"PyParser_SimpleParseFileFlags\".*") "")
- ((".*\"PyLong_FromUnicode\".*") "")))))))
- (native-inputs
- (list sbcl-cl-fad sbcl-lift sbcl-cl-quickcheck))
(inputs
- (list python
+ (list glib
+ gobject-introspection
sbcl-alexandria
sbcl-cffi
- sbcl-parse-declarations
+ sbcl-iterate
sbcl-trivial-garbage))
- (synopsis "Bridge between Python and Lisp (FFI bindings, etc.)")
+ (native-inputs
+ (list sbcl-fiveam))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/init.lisp"
+ (("libgobject-2\\.0\\.so")
+ (search-input-file inputs "/lib/libgobject-2.0.so"))
+ (("libgirepository-1\\.0\\.so")
+ (search-input-file inputs
+ "/lib/libgirepository-1.0.so"))))))))
+ (synopsis "Common Lisp bindings to GObject Introspection")
(description
- "This package provides a shim between Python3 (specifically, the
-CPython implementation of Python) and Common Lisp.")
- (home-page "https://github.com/snmsts/burgled-batteries3")
- (license license:expat))))
+ "This library is a bridge between Common Lisp and GObject
+Introspection, which enables Common Lisp programs to access the full interface
+of C+GObject libraries without the need of writing dedicated bindings.")
+ (license (list license:bsd-3
+ ;; Tests are under a different license.
+ license:llgpl)))))
-(define-public cl-burgled-batteries3
- (sbcl-package->cl-source-package sbcl-burgled-batteries3))
+(define-public cl-gobject-introspection
+ (sbcl-package->cl-source-package sbcl-cl-gobject-introspection))
-(define-public ecl-burgled-batteries3
- (sbcl-package->ecl-package sbcl-burgled-batteries3))
+(define-public ecl-cl-gobject-introspection
+ (sbcl-package->ecl-package sbcl-cl-gobject-introspection))
-(define-public sbcl-metabang-bind
- (let ((commit "08196426cb099db0623e6cae2aeca566e0b788b2")
- (revision "2"))
+(define-public sbcl-cl-gobject-introspection-wrapper
+ (let ((commit "2d197cba7e7d734ac8a2e181e5e709e5b218bada")
+ (revision "1"))
(package
- (name "sbcl-metabang-bind")
- (version (git-version "0.8.0" revision commit))
+ (name "sbcl-cl-gobject-introspection-wrapper")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/metabang-bind")
+ (url "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-gobject-introspection-wrapper" version))
(sha256
- (base32
- "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d"))))
+ (base32 "05np2zs5806ib6qfz7d6knyaz6llxgwvjqavl1fsz5hcga40296s"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lift))
- (synopsis "Macro that generalizes @code{multiple-value-bind} etc.")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-gobject-introspection
+ sbcl-cl-ppcre))
+ (home-page
+ "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
+ (synopsis
+ "Wrap and call GObject Introspection FFI function in Common Lisp")
(description
- "Bind extends the idea of of let and destructing to provide a uniform
-syntax for all your accessor needs. It combines @code{let},
-@code{destructuring-bind}, @code{with-slots}, @code{with-accessors}, structure
-editing, property or association-lists, and @code{multiple-value-bind} and a
-whole lot more into a single form.")
- (home-page "https://common-lisp.net/project/metabang-bind/")
- ;; MIT License
- (license license:expat))))
+ "This library converts the elements from GObject Introspection into
+Common Lisp-style definitions, based on cl-gobject-introspection.")
+ (license license:lgpl3+))))
-(define-public cl-metabang-bind
- (sbcl-package->cl-source-package sbcl-metabang-bind))
+(define-public cl-gobject-introspection-wrapper
+ (sbcl-package->cl-source-package sbcl-cl-gobject-introspection-wrapper))
-(define-public ecl-metabang-bind
- (sbcl-package->ecl-package sbcl-metabang-bind))
+(define-public ecl-cl-gobject-introspection-wrapper
+ (sbcl-package->ecl-package sbcl-cl-gobject-introspection-wrapper))
-(define-public sbcl-fare-csv
- (let ((commit "f877a238dcbf587a89359cccf2128919a94a348c")
- (revision "0"))
+(define-public sbcl-cl-gopher
+ (let ((commit "0899e7fa2134206f9d9778c7d53c49b7a59ff070")
+ (revision "3"))
(package
- (name "sbcl-fare-csv")
- (version (git-version "1.0.4" revision commit))
+ (name "sbcl-cl-gopher")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/frideau/fare-csv")
+ (url "https://github.com/knusbaum/cl-gopher")
(commit commit)))
- (file-name (git-file-name "cl-fare-csv" version))
+ (file-name (git-file-name "cl-gopher" version))
(sha256
- (base32 "0k3mf968w94m4yff1k2jh7xlnpsm016qs4448bvklacjrr72vk8x"))))
+ (base32 "1ky4s33m5d0wvdaqji12pxr93qqfl5x62zjp3m4ihbdj0ws3yw2f"))
+ (snippet
+ '(begin
+ ;; These files are mostly examples (that assume Quicklisp) which
+ ;; drag the SBCL package into the CL package.
+ (for-each delete-file
+ '("cl-gopher-network.lsh"
+ "cl-gopher-start.lsh"))
+ #t))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-hu.dwim.stefil))
- (home-page "https://gitlab.common-lisp.net/frideau/fare-csv/")
- (synopsis "Robust CSV parser and printer")
+ (inputs
+ (list sbcl-bordeaux-threads
+ sbcl-drakma
+ sbcl-flexi-streams
+ sbcl-quri
+ sbcl-split-sequence
+ sbcl-usocket))
+ (home-page "https://github.com/knusbaum/cl-gopher")
+ (synopsis "Gopher protocol library in Common Lisp")
(description
- "This package provides a robust CSV parser and printer that tries to
-follow the fine print of de facto standards. It can be configured to choose
-which standard exactly.")
- (license license:expat))))
-
-(define-public cl-fare-csv
- (sbcl-package->cl-source-package sbcl-fare-csv))
-
-(define-public ecl-fare-csv
- (sbcl-package->ecl-package sbcl-fare-csv))
+ "@code{cl-gopher} is a Common Lisp library for interacting with the
+Gopher protocol.
-(define-public sbcl-fare-utils
- (let ((commit "66e9c6f1499140bc00ccc22febf2aa528cbb5724")
- (revision "1"))
- (package
- (name "sbcl-fare-utils")
- (version (git-version "1.0.0.5" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url
- "https://gitlab.common-lisp.net/frideau/fare-utils.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "01wsr1aap3jdzhn4hrqjbhsjx6qci9dbd3gh4gayv1p49rbg8aqr"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (synopsis "Collection of utilities and data structures")
- (description
- "fare-utils is a small collection of utilities. It contains a lot of
-basic everyday functions and macros.")
- (home-page "https://gitlab.common-lisp.net/frideau/fare-utils")
- ;; MIT License
- (license license:expat))))
+It is suitable for building both clients and servers, and provides a sample
+client.")
+ (license license:bsd-2))))
-(define-public cl-fare-utils
- (sbcl-package->cl-source-package sbcl-fare-utils))
+(define-public cl-gopher
+ (sbcl-package->cl-source-package sbcl-cl-gopher))
-(define-public ecl-fare-utils
- (sbcl-package->ecl-package sbcl-fare-utils))
+(define-public ecl-cl-gopher
+ (sbcl-package->ecl-package sbcl-cl-gopher))
-(define-public sbcl-fare-mop
- (let ((commit "538aa94590a0354f382eddd9238934763434af30")
- (revision "1"))
+(define-public sbcl-cl-graph
+ (let ((commit "c617de35390cb02db88bc5b5febffafdb8947ae8")
+ (revision "2"))
(package
- (name "sbcl-fare-mop")
- (version (git-version "1.0.1" revision commit))
+ (name "sbcl-cl-graph")
+ (version (git-version "0.10.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fare/fare-mop")
+ (url "https://github.com/hraban/cl-graph")
(commit commit)))
- (file-name (git-file-name "fare-mop" version))
+ (file-name (git-file-name "cl-graph" version))
(sha256
- (base32
- "0maxs8392953fhnaa6zwnm2mdbhxjxipp4g4rvypm06ixr6pyv1c"))))
+ (base32 "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; TODO: (Sharlatan-20221118T215839+0000): Tests failed
+ ;;
+ ;; https://github.com/gwkkwg/cl-graph/issues/17
+ ;;
+ `(#:tests? #f
+ #:asd-systems '("cl-graph" "cl-graph+hu.dwim.graphviz")))
+ (native-inputs
+ (list sbcl-lift sbcl-moptilities))
(inputs
- (list sbcl-closer-mop sbcl-fare-utils))
- (home-page "https://github.com/fare/fare-mop")
- (synopsis "General purpose Common Lisp utilities using the MOP")
+ (list sbcl-cl-containers
+ sbcl-cl-mathstats
+ sbcl-dynamic-classes
+ sbcl-hu.dwim.graphviz
+ sbcl-metabang-bind
+ sbcl-metacopy
+ sbcl-metatilities-base))
+ (home-page "https://github.com/gwkkwg/cl-graph")
+ (synopsis "Graph manipulation utilities for Common Lisp")
(description
- "FARE-MOP is a small collection of utilities using the MetaObject
-Protocol. It notably contains a SIMPLE-PRINT-OBJECT method, and
-a SIMPLE-PRINT-OBJECT-MIXIN mixin that allow you to trivially define
-PRINT-OBJECT methods that print the interesting slots in your objects, which is
-great for REPL interaction and debugging.")
- (license license:unlicense))))
+ "This package provides a Common Lisp library for manipulating graphs
+and running graph algorithms.")
+ (license license:expat))))
-(define-public ecl-fare-mop
- (sbcl-package->ecl-package sbcl-fare-mop))
+(define-public cl-cl-graph
+ (sbcl-package->cl-source-package sbcl-cl-graph))
-(define-public cl-fare-mop
- (sbcl-package->cl-source-package sbcl-fare-mop))
+;; NOTE: (Sharlatan-20221118T214734+0000): No ECL support
+;;
+;; ecl-cl-graph
-(define-public sbcl-inferior-shell
- (let ((commit "15c2d04a7398db965ea1c3ba2d49efa7c851f2c2")
- (revision "1"))
+(define-public sbcl-cl-grnm
+ (let ((commit "778a312e9eb3d3de7541457b516ea3d9055a15aa")
+ (revision "0"))
(package
- (name "sbcl-inferior-shell")
- (version (git-version "2.0.5" revision commit))
+ (name "sbcl-cl-grnm")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fare/inferior-shell")
+ (url "https://github.com/quil-lang/cl-grnm")
(commit commit)))
- (file-name (git-file-name "inferior-shell" version))
+ (file-name (git-file-name "cl-grnm" version))
(sha256
- (base32 "02qx37zzk5j4xmwh77k2qa2wvnzvaj6qml5dh2q7b6b1ljvgcj4m"))))
+ (base32 "1hb5n37n3x2ylrghcqsia2g9a6f5wg24l659jiz4ncpi5bsv4m3s"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (inputs
- (list sbcl-alexandria sbcl-fare-mop sbcl-fare-quasiquote
- sbcl-fare-utils sbcl-trivia))
- (home-page "https://github.com/fare/inferior-shell")
- (synopsis "Spawn local or remote processes and shell pipes")
+ (synopsis "Common Lisp implementation of (grid restrained) Nelder-Mead")
(description
- "This package provides a Common Lisp system helping in scripting, it
-uses @code{uiop:run-program} as a backend.")
+ "These common lisp sources contain two variants of the Nelder-Mead
+algorithm. The original algorithm and a provably convergent, reliable variant
+by A. Bürmen et al, called the
+@acronym{GRNMA, Grid Restrained Nelder Mead Algorithm}.")
+ (home-page "https://github.com/quil-lang/cl-grnm")
(license license:expat))))
-(define-public ecl-inferior-shell
- (sbcl-package->ecl-package sbcl-inferior-shell))
+(define-public cl-grnm
+ (sbcl-package->cl-source-package sbcl-cl-grnm))
-(define-public cl-inferior-shell
- (sbcl-package->cl-source-package sbcl-inferior-shell))
+(define-public ecl-cl-grnm
+ (sbcl-package->ecl-package sbcl-cl-grnm))
+
+(define-public sbcl-cl-gserver
+ (package
+ (name "sbcl-cl-gserver")
+ (version "1.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mdbergmann/cl-gserver")
+
+ ;; The "1.8.0" tag must have been moved from
+ ;; c83d92a66102faa514b546029a9bd2078b95dc0f to
+ ;; 90832f02f0556463e332cd055c3c1be58f323aea, 22 commits later!
+ (commit "c83d92a66102faa514b546029a9bd2078b95dc0f")))
+ (file-name (git-file-name "cl-gserver" version))
+ (sha256
+ (base32 "1bfz7z8v417dvsp1jz76ir3ihcs8g7zis2d56xx1dpzqzjd95g7z"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-lparallel
+ sbcl-cl-speedy-queue
+ sbcl-log4cl
+ sbcl-cl-str
+ sbcl-blackbird
+ sbcl-cl-hamt
+ sbcl-binding-arrows
+ sbcl-atomics))
+ (native-inputs
+ (list sbcl-fiveam sbcl-cl-mock))
+ (home-page "https://mdbergmann.github.io/cl-gserver/index.html")
+ (synopsis "Actor framework for easy access to state and async operations")
+ (description
+ "@code{cl-gserver} is a 'message passing' library / framework with actors
+similar to Erlang or Akka. It supports creating reactive systems for parallel
+computing and event based message handling.")
+ (license license:agpl3)))
+
+(define-public cl-gserver
+ (sbcl-package->cl-source-package sbcl-cl-gserver))
+
+(define-public ecl-cl-gserver
+ (sbcl-package->ecl-package sbcl-cl-gserver))
(define-public sbcl-cl-gss
(let ((commit "60086f4fd3b82316352e7f2288edbd58f03e08c5")
@@ -8431,213 +5957,120 @@ The most common one is Kerberos, which has several implementations, the most
common of which is probably Active Directory.")
(license license:bsd-3))))
-(define-public ecl-cl-gss
- (sbcl-package->ecl-package sbcl-cl-gss))
-
(define-public cl-gss
(sbcl-package->cl-source-package sbcl-cl-gss))
-(define-public sbcl-trivial-utf-8
- (let ((commit "6ca9943588cbc61ad22a3c1ff81beb371e122394")
- (revision "2"))
+(define-public ecl-cl-gss
+ (sbcl-package->ecl-package sbcl-cl-gss))
+
+(define-public sbcl-cl-gtk4
+ (let ((commit "d116905e7b68508d03681a50b3b24d63e7b111e4")
+ (revision "1"))
(package
- (name "sbcl-trivial-utf-8")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-gtk4")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url (string-append "https://gitlab.common-lisp.net/"
- "trivial-utf-8/trivial-utf-8.git"))
- (commit commit)))
- (file-name (git-file-name "cl-trivial-utf-8" version))
+ (uri (git-reference
+ (url "https://github.com/bohonghuang/cl-gtk4")
+ (commit commit)))
+ (file-name (git-file-name "cl-gtk4" version))
(sha256
- (base32 "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss"))))
- (arguments
- ;; Guix incorrectly assumes the "8" is part of the version
- ;; number and lobs it off.
- `(#:asd-systems '("trivial-utf-8")))
+ (base32 "0mprmmvbagnflvhynn51l42nbwr08rld99ls0c48m5lpjn0ja4zc"))))
(build-system asdf-build-system/sbcl)
- (synopsis "UTF-8 input/output library")
+ (arguments
+ '(#:asd-systems '("cl-gtk4" "cl-gdk4")))
+ ;; propagate because it at least requires the typelib files at runtime
+ (propagated-inputs (list gtk))
+ (inputs
+ (list gobject-introspection
+ sbcl-cl-glib
+ sbcl-cl-gobject-introspection-wrapper))
+ (home-page "https://github.com/bohonghuang/cl-gtk4")
+ (synopsis "GTK4 bindings for Common Lisp")
(description
- "The Babel library solves a similar problem while understanding more
-encodings. Trivial UTF-8 was written before Babel existed, but for new
-projects you might be better off going with Babel. The one plus that Trivial
-UTF-8 has is that it doesn't depend on any other libraries.")
- (home-page "https://common-lisp.net/project/trivial-utf-8/")
- (license license:bsd-3))))
+ "This library provides GTK4 bindings for Common Lisp via Gobject
+Introspection, in the cl-gtk4 ASDF system.")
+ (license license:lgpl3))))
-(define-public cl-trivial-utf-8
- (sbcl-package->cl-source-package sbcl-trivial-utf-8))
+(define-public cl-gtk4
+ (sbcl-package->cl-source-package sbcl-cl-gtk4))
-(define-public ecl-trivial-utf-8
- (sbcl-package->ecl-package sbcl-trivial-utf-8))
+(define-public ecl-cl-gtk4
+ (sbcl-package->ecl-package sbcl-cl-gtk4))
-(define-public sbcl-trivial-utilities
- (let ((commit "279ff255562628196942632c543d91c357067221")
- (revision "0"))
+(define-public sbcl-cl-hamt
+ ;; No release
+ (let ((commit "7a99eaaca1f952029def9ad5a2b80a612a712208"))
(package
- (name "sbcl-trivial-utilities")
- (version (git-version "0.4.0" revision commit))
+ (name "sbcl-cl-hamt")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/ediethelm/trivial-utilities")
+ (url "https://github.com/danshapero/cl-hamt/")
(commit commit)))
- (file-name (git-file-name "trivial-utilities" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0k1xmn5f5dik7scadw0vyy67mik4ypnfqbhlv2vsg9afxzbpx2dz"))))
+ (base32 "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-iterate sbcl-closer-mop))
- (home-page "https://gitlab.com/ediethelm/trivial-utilities")
- (synopsis "Collection of useful types, functions and macros for Common Lisp")
+ (list sbcl-cl-murmurhash))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/danshapero/cl-hamt")
+ (synopsis "Dictionary & set data structure using hash array-mapped tries")
(description
- "This package provides a collection of types, functions and macros. Some
- of the functionality is implemented from Graham's On Lisp and Seibel's Practical
- Common Lisp.")
- (license license:expat))))
+ "This library provides purely functional dictionaries and sets in
+Common Lisp based on the hash array-mapped trie data structure.")
+ (license license:bsd-3))))
-(define-public cl-trivial-utilities
- (sbcl-package->cl-source-package sbcl-trivial-utilities))
+(define-public cl-hamt
+ (sbcl-package->cl-source-package sbcl-cl-hamt))
-(define-public ecl-trivial-utilities
- (sbcl-package->ecl-package sbcl-trivial-utilities))
+(define-public ecl-cl-hamt
+ (sbcl-package->ecl-package sbcl-cl-hamt))
-(define-public sbcl-idna
+(define-public sbcl-cl-heap
(package
- (name "sbcl-idna")
- (build-system asdf-build-system/sbcl)
- (version "0.2.2")
- (home-page "https://github.com/antifuchs/idna")
+ (name "sbcl-cl-heap")
+ (version "0.1.6")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append "https://common-lisp.net/project/cl-heap/releases/"
+ "cl-heap_" version ".tar.gz"))
(sha256
(base32
- "00nbr3mffxhlq14gg9d16pa6691s4qh35inyw76v906s77khm5a2"))))
- (inputs
- (list sbcl-split-sequence))
- (synopsis "IDNA string encoding and decoding routines for Common Lisp")
- (description "This Common Lisp library provides string encoding and
-decoding routines for IDNA, the International Domain Names in Applications.")
- (license license:expat)))
-
-(define-public cl-idna
- (sbcl-package->cl-source-package sbcl-idna))
-
-(define-public ecl-idna
- (sbcl-package->ecl-package sbcl-idna))
-
-(define-public sbcl-swap-bytes
- (package
- (name "sbcl-swap-bytes")
+ "163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i"))))
(build-system asdf-build-system/sbcl)
- (version "1.2")
- (home-page "https://github.com/sionescu/swap-bytes")
- (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
- "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"))))
- (inputs
- (list sbcl-trivial-features))
(native-inputs
- (list sbcl-fiveam))
- (synopsis "Efficient endianness conversion for Common Lisp")
- (description "This Common Lisp library provides optimized byte-swapping
-primitives. The library can change endianness of unsigned integers of length
-1/2/4/8. Very useful in implementing various network protocols and file
-formats.")
- (license license:expat)))
-
-(define-public cl-swap-bytes
- (sbcl-package->cl-source-package sbcl-swap-bytes))
-
-(define-public ecl-swap-bytes
- (sbcl-package->ecl-package sbcl-swap-bytes))
-
-(define-public sbcl-iolib
- (let ((commit "010b7a6bdd2e918ebf2ec85edd3853179f01cb30")
- (revision "0"))
- (package
- (name "sbcl-iolib")
- (version (git-version "0.8.4" revision commit))
- (home-page "https://github.com/sionescu/iolib")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (file-name (git-file-name "cl-iolib" version))
- (sha256
- (base32 "1qqy2yhprkmdn2vmi69akf818q3n99gv8cacv6456af0wjm5p1ga"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list pkg-config sbcl-fiveam))
- (inputs
- (list libfixposix
- sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-idna
- sbcl-split-sequence
- sbcl-swap-bytes))
- (arguments
- '(#:asd-systems '("iolib"
- "iolib/os")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/syscalls/ffi-functions-unix.lisp"
- (("\\(:default \"libfixposix\"\\)")
- (string-append
- "(:default \""
- (assoc-ref inputs "libfixposix") "/lib/libfixposix\")")))
- ;; Socket tests need Internet access, disable them.
- (substitute* "iolib.asd"
- (("\\(:file \"sockets\" :depends-on \\(\"pkgdcl\" \"defsuites\"\\)\\)")
- "")))))))
- (synopsis "Common Lisp I/O library")
- (description "IOlib is to be a better and more modern I/O library than
-the standard Common Lisp library. It contains a socket library, a DNS
-resolver, an I/O multiplexer(which supports @code{select(2)}, @code{epoll(4)}
-and @code{kqueue(2)}), a pathname library and file-system utilities.")
- (license license:expat))))
+ (list sbcl-xlunit))
+ (arguments
+ '(#:asd-test-systems '("cl-heap-tests")))
+ (synopsis "Heap and priority queue data structures for Common Lisp")
+ (description
+ "CL-HEAP provides various implementations of heap data structures (a
+binary heap and a Fibonacci heap) as well as an efficient priority queue.")
+ (home-page "https://common-lisp.net/project/cl-heap/")
+ (license license:gpl3+)))
-(define-public cl-iolib
- (let ((parent (sbcl-package->cl-source-package sbcl-iolib)))
- (package
- (inherit parent)
- (propagated-inputs
- ;; Need header to compile.
- (modify-inputs (package-propagated-inputs parent)
- (prepend libfixposix))))))
+(define-public cl-heap
+ (sbcl-package->cl-source-package sbcl-cl-heap))
-(define-public ecl-iolib
- (sbcl-package->ecl-package sbcl-iolib))
+(define-public ecl-cl-heap
+ (sbcl-package->ecl-package sbcl-cl-heap))
-(define-public sbcl-ieee-floats
- (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d")
+(define-public sbcl-cl-hooks
+ (let ((commit "5b638083f3b4f1221a52631d9c8a0a265565cac7")
(revision "1"))
(package
- (name "sbcl-ieee-floats")
+ (name "sbcl-cl-hooks")
(build-system asdf-build-system/sbcl)
- (version (git-version "20170924" revision commit))
- (home-page "https://github.com/marijnh/ieee-floats/")
+ (version (git-version "0.2.1" revision commit))
+ (home-page "https://github.com/scymtym/architecture.hooks")
(source
(origin
(method git-fetch)
@@ -8647,3890 +6080,4103 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
(file-name (git-file-name name version))
(sha256
(base32
- "1xyj49j9x3lc84cv3dhbf9ja34ywjk1c46dklx425fxw9mkwm83m"))))
+ "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y"))))
+ (inputs
+ (list sbcl-alexandria sbcl-let-plus sbcl-trivial-garbage
+ sbcl-closer-mop))
(native-inputs
(list sbcl-fiveam))
- (synopsis "IEEE 754 binary representation for floats in Common Lisp")
- (description "This is a Common Lisp library that converts
-floating point values to IEEE 754 binary representation.")
- (license license:bsd-3))))
+ (synopsis "Hooks extension point mechanism (as in Emacs) for Common Lisp")
+ (description "A hook, in the present context, is a certain kind of
+extension point in a program that allows interleaving the execution of
+arbitrary code with the execution of a the program without introducing any
+coupling between the two. Hooks are used extensively in the extensible editor
+Emacs.
-(define-public cl-ieee-floats
- (sbcl-package->cl-source-package sbcl-ieee-floats))
+In the Common LISP Object System (CLOS), a similar kind of extensibility is
+possible using the flexible multi-method dispatch mechanism. It may even seem
+that the concept of hooks does not provide any benefits over the possibilities
+of CLOS. However, there are some differences:
-(define-public ecl-ieee-floats
- (sbcl-package->ecl-package sbcl-ieee-floats))
+@itemize
-(define sbcl-closure-common
- (let ((commit "e3c5f5f454b72b01b89115e581c3c52a7e201e5c")
- (revision "1"))
+@item There can be only one method for each combination of specializers and
+qualifiers. As a result this kind of extension point cannot be used by
+multiple extensions independently.
+@item Removing code previously attached via a @code{:before}, @code{:after} or
+@code{:around} method can be cumbersome.
+@item There could be other or even multiple extension points besides @code{:before}
+and @code{:after} in a single method.
+@item Attaching codes to individual objects using eql specializers can be
+cumbersome.
+@item Introspection of code attached a particular extension point is
+cumbersome since this requires enumerating and inspecting the methods of a
+generic function.
+@end itemize
+
+This library tries to complement some of these weaknesses of method-based
+extension-points via the concept of hooks.")
+ (license license:llgpl))))
+
+(define-public cl-hooks
+ (sbcl-package->cl-source-package sbcl-cl-hooks))
+
+(define-public ecl-cl-hooks
+ (sbcl-package->ecl-package sbcl-cl-hooks))
+
+(define-public sbcl-cl-html-diff
+ (let ((commit "5a0b39d1c524278d6f60851d7786bb2585614310")
+ (revision "0"))
(package
- (name "sbcl-closure-common")
- (build-system asdf-build-system/sbcl)
- (version (git-version "20101006" revision commit))
- (home-page "https://common-lisp.net/project/cxml/")
+ (name "sbcl-cl-html-diff")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/closure-common")
+ (url "https://github.com/wiseman/cl-html-diff")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name
+ (git-file-name name version))
(sha256
- (base32
- "0k5r2qxn122pxi301ijir3nayi9sg4d7yiy276l36qmzwhp4mg5n"))))
+ (base32 "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- `(("trivial-gray-streams" ,sbcl-trivial-gray-streams)
- ("babel" ,sbcl-babel)))
- (synopsis "Support Common Lisp library for CXML")
- (description "Closure-common is an internal helper library. The name
-Closure is a reference to the web browser it was originally written for.")
- ;; TODO: License?
- (license #f))))
+ (list sbcl-cl-difflib))
+ (home-page "https://github.com/wiseman/cl-html-diff")
+ (synopsis "Generate a human-readable diff of two HTML documents")
+ (description
+ "A Common Lisp library for generating a human-readable diff of two
+HTML documents.")
+ (license license:expat))))
-(define-public sbcl-cxml
- (let ((commit "00b22bf4c4cf11c993d5866fae284f95ab18e6bf")
+(define-public cl-html-diff
+ (sbcl-package->cl-source-package sbcl-cl-html-diff))
+
+(define-public ecl-cl-html-diff
+ (sbcl-package->ecl-package sbcl-cl-html-diff))
+
+(define-public sbcl-cl-html5-parser
+ (let ((commit "74a92eb3a183a0afd089ea33350e816e6b9aeefa")
(revision "1"))
(package
- (name "sbcl-cxml")
+ (name "sbcl-cl-html5-parser")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/cxml")
+ (url "https://github.com/rotatef/cl-html5-parser")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-html5-parser" version))
(sha256
- (base32
- "13kif7rf3gqdycsk9zq0d7y0g9y81krkl0z87k0p2fkbjfgrph37"))))
+ (base32 "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-closure-common sbcl-puri sbcl-trivial-gray-streams))
- (synopsis "Common Lisp XML parser")
- (description "CXML implements a namespace-aware, validating XML 1.0
-parser as well as the DOM Level 2 Core interfaces. Two parser interfaces are
-offered, one SAX-like, the other similar to StAX.")
- (home-page "https://common-lisp.net/project/cxml/")
- (license license:llgpl))))
+ (native-inputs
+ (list sbcl-json-streams sbcl-split-sequence sbcl-stefil))
+ (inputs
+ (list sbcl-cl-ppcre sbcl-flexi-streams sbcl-string-case))
+ (synopsis "HTML5 parser for Common Lisp")
+ (description "This a Common Lisp library to parse HTML5 documents.")
+ (home-page "https://github.com/rotatef/cl-html5-parser")
+ (license license:lgpl3+))))
-(define-public cl-cxml
- (sbcl-package->cl-source-package sbcl-cxml))
+(define-public cl-html5-parser
+ (sbcl-package->cl-source-package sbcl-cl-html5-parser))
-(define-public ecl-cxml
- (sbcl-package->ecl-package sbcl-cxml))
+(define-public ecl-cl-html5-parser
+ (sbcl-package->ecl-package sbcl-cl-html5-parser))
-(define-public sbcl-cxml-rng
- (let ((commit "bdcfeb92798694b2935a8321e641d8803e814b7b")
- (revision "1"))
+(define-public sbcl-cl-https-everywhere
+ ;; No release.
+ ;; Don't forget to update the https-everywhere input.
+ (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8"))
(package
- (name "sbcl-cxml-rng")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-https-everywhere")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "http://www.lichteblau.com/git/cxml-rng.git")
+ (url "https://github.com/ruricolist/cl-https-everywhere/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "1rld038hmvm0whaffkszd5ks7mg44z1vfbgddal434df8sgspzql"))))
+ (base32 "1wcvx1icwym1ncd6wl1wxzkyyndrm796caalbklvjd4a2cbl3xxi"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cxml sbcl-cl-ppcre sbcl-cl-yacc sbcl-parse-number
- sbcl-cl-base64))
- (synopsis "Relax NG for Closure XML (CXML)")
- (description "An implementation of Relax NG schema validation written in
-Common Lisp, including support for compact syntax, DTD Compatibility, and the
-XSD type library.")
- (home-page "http://www.lichteblau.com/cxml-rng/")
- (license license:bsd-2))))
-
-(define-public cl-cxml-rng
- (sbcl-package->cl-source-package sbcl-cxml-rng))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("global-vars" ,sbcl-global-vars)
+ ("parenscript" ,sbcl-parenscript)
+ ("cl-markdown" ,sbcl-cl-markdown)
+ ("cl-tld" ,sbcl-cl-tld)
+ ("fxml" ,sbcl-fxml)
+ ("overlord" ,sbcl-overlord)
+ ("ppcre" ,sbcl-cl-ppcre)
+ ("serapeum" ,sbcl-serapeum)
+ ("trivial-gray-streams" ,sbcl-trivial-gray-streams)
+ ("vernacular" ,sbcl-vernacular)))
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)
+ ("https-everywhere"
+ ,(let ((version "2021.7.13"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/EFForg/https-everywhere")
+ (commit version)))
+ (file-name (git-file-name "https-everywhere" version))
+ (sha256
+ (base32
+ "1k5gj29imhxf47sv3d8rxyrgr6k65scp2fm040va3nfshayslzia")))))))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'link-https-everywhere-repo
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((https-everywhere (assoc-ref inputs "https-everywhere")))
+ (symlink https-everywhere "https-everywhere"))))
+ (add-after 'unpack 'fix-overlord-build
+ ;; Upstream bugs? See
+ ;; https://github.com/ruricolist/cl-https-everywhere/issues/1.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (rulesets.xml (string-append out "/share/common-lisp/" (%lisp-type)
+ "/cl-https-everywhere/rulesets.xml")))
+ (substitute* "build.lisp"
+ (("\\(depends-on https-everywhere-version\\)") "")
+ ;; Don't rebuild the rulesets just because the timestamp is epoch.
+ (("\\(vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"\\)")
+ (format #f "(if (uiop:file-exists-p ~s)
+ (compile-rulesets ~s)
+ (vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"))"
+ rulesets.xml
+ rulesets.xml))
+ (("\\(uiop:parse-unix-namestring \"https-everywhere/src/chrome/content/rules/\\*\\.xml\")")
+ "\"https-everywhere/src/chrome/content/rules/*.xml\"")
+ (("\\(out temp :external-format :utf-8\\)")
+ "(out temp :external-format :utf-8 :if-exists :supersede)")))
+ #t)))))
+ (home-page "https://github.com/ruricolist/cl-https-everywhere/")
+ (synopsis "Use HTTPS Everywhere rules from Lisp")
+ (description
+ "CL-HTTPS-EVERYWHERE parses HTTPS Everywhere rulesets and makes them
+available for use in Lisp programs.")
+ (license (list license:expat
+ ;; For the ruleset
+ license:gpl2+)))))
-;; FIXME: Fails on ECL with
-;; In function STRUCTURE-SET, the value of the first argument is
-;; #<empty 0x7fffeb0fd440>
-;; which is not of the expected type %TYPED-PATTERN.
-;; (define-public ecl-cxml-rng
-;; (sbcl-package->ecl-package sbcl-cxml-rng))
+(define-public cl-https-everywhere
+ (sbcl-package->cl-source-package sbcl-cl-https-everywhere))
-(define-public sbcl-cl-reexport
- (let ((commit "03ad7a0e7307e510b3b25a622d3c5f8a077879b4")
- (revision "2"))
+(define-public sbcl-cl-i18n
+ (let ((commit "acb162a12dac50fc46d83da8934fce85d19e31c4")
+ (revision "3"))
(package
- (name "sbcl-cl-reexport")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/takagi/cl-reexport")
+ (name "sbcl-cl-i18n")
+ (version (git-version "0.5.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/takagi/cl-reexport")
+ (url "https://codeberg.org/cage/cl-i18n")
(commit commit)))
- (file-name (git-file-name "cl-reexport" version))
+ (file-name (git-file-name "cl-i18n" version))
(sha256
- (base32
- "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"))))
+ (base32 "1y29cirmlyc406a45sdx39spvnjzbs772c977075ccicz46qaxz7"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria))
- (native-inputs
- (list sbcl-prove))
- (synopsis "Reexport external symbols in other Common Lisp packages")
+ (list sbcl-alexandria sbcl-babel sbcl-cl-ppcre-unicode))
+ (synopsis "Internationalisation framework for Common Lisp")
(description
- "Cl-reexport makes a package reexport symbols which are external
-symbols in other Common Lisp packages. This functionality is intended to be
-used with (virtual) hierarchical packages.")
+ "This is a Gettext-style internationalisation framework for Common
+Lisp.")
+ (home-page "https://codeberg.org/cage/cl-i18n")
(license license:llgpl))))
-(define-public cl-reexport
- (sbcl-package->cl-source-package sbcl-cl-reexport))
+(define-public cl-i18n
+ (sbcl-package->cl-source-package sbcl-cl-i18n))
-(define-public ecl-cl-reexport
- (sbcl-package->ecl-package sbcl-cl-reexport))
+(define-public ecl-cl-i18n
+ (sbcl-package->ecl-package sbcl-cl-i18n))
-(define-public sbcl-cl-cookie
- (let ((commit "cea55aed8b9ad25fafd13defbcb9fe8f41b29546")
- (revision "1"))
+(define-public sbcl-cl-indentify
+ (let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53"))
(package
- (name "sbcl-cl-cookie")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.9.10" revision commit))
- (home-page "https://github.com/fukamachi/cl-cookie")
+ (name "sbcl-cl-indentify")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/yitzchak/cl-indentify")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name name commit))
(sha256
- (base32
- "090g7z75h98zvc1ldx0vh4jn4086dhjm2w30jcwkq553qmyxwl8h"))))
+ (base32 "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- `(("proc-parse" ,sbcl-proc-parse)
- ("alexandria" ,sbcl-alexandria)
- ("quri" ,sbcl-quri)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("local-time" ,sbcl-local-time)))
+ (list sbcl-alexandria sbcl-command-line-arguments
+ sbcl-trivial-gray-streams))
(native-inputs
- (list sbcl-prove))
- (arguments
- '(#:asd-systems '("cl-cookie-test" "cl-cookie")))
- (synopsis "HTTP cookie manager for Common Lisp")
- (description "cl-cookie is a Common Lisp library featuring parsing of
-cookie headers, cookie creation, cookie jar creation and more.")
- (license license:bsd-2))))
+ (list sbcl-trivial-escapes sbcl-rove))
+ (home-page "https://github.com/yitzchak/cl-indentify")
+ (synopsis "Code beautifier for Common Lisp")
+ (description
+ "A library and command line utility to automatically indent Common Lisp
+source files.")
+ (license license:expat))))
-(define-public cl-cookie
- (sbcl-package->cl-source-package sbcl-cl-cookie))
+(define-public cl-indentify
+ (sbcl-package->cl-source-package sbcl-cl-indentify))
-(define-public ecl-cl-cookie
- (sbcl-package->ecl-package sbcl-cl-cookie))
+(define-public ecl-cl-indentify
+ (sbcl-package->ecl-package sbcl-cl-indentify))
-(define-public sbcl-dexador
- (let ((commit "051cbb784ea3015cef9731eb5a624f3122de84b5")
- (revision "2"))
+(define-public sbcl-cl-inflector
+ (let ((commit "f1ab16919ccce3bd82a0042677d9616dde2034fe")
+ (revision "1"))
(package
- (name "sbcl-dexador")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.9.15" revision commit))
- (home-page "https://github.com/fukamachi/dexador")
+ (name "sbcl-cl-inflector")
+ (version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/AccelerationNet/cl-inflector")
(commit commit)))
- (file-name (git-file-name "cl-dexador" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1sggpi43la8dai102fmkzysh7760hvk6q68f0pkbb9187vz8nd3y"))))
+ (base32 "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-lisp-unit2))
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-chipz
- sbcl-chunga
- sbcl-cl+ssl
- sbcl-cl-base64
- sbcl-cl-cookie
- sbcl-cl-ppcre
- sbcl-fast-http
- sbcl-fast-io
- sbcl-quri
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-trivial-mimes
- sbcl-usocket))
- ;; These native-inputs are for tests only, which are disabled.
- ;; Leave them commented since they add a lot to the closure size.
- ;; (native-inputs
- ;; (list sbcl-clack
- ;; sbcl-lack
- ;; sbcl-rove))
- (arguments
- ;; TODO: Circular dependency: tests depend on clack-test which depends on dexador.
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-permissions
- (lambda _ (make-file-writable "t/data/test.gz") #t)))))
- (synopsis "Yet another HTTP client for Common Lisp")
- (description "Dexador is yet another HTTP client for Common Lisp with
-neat APIs and connection-pooling. It is meant to supersede Drakma.")
+ (list sbcl-alexandria sbcl-cl-ppcre))
+ (home-page "https://github.com/AccelerationNet/cl-inflector")
+ (synopsis "Library to pluralize/singularize English and Portuguese words")
+ (description
+ "This is a common lisp library to easily pluralize and singularize
+English and Portuguese words. This is a port of the ruby ActiveSupport
+Inflector module.")
(license license:expat))))
-(define-public cl-dexador
- (package
- (inherit (sbcl-package->cl-source-package sbcl-dexador))
- (arguments
- `(#:phases
- ;; asdf-build-system/source has its own phases and does not inherit
- ;; from asdf-build-system/sbcl phases.
- (modify-phases %standard-phases/source
- ;; Already done in SBCL package.
- (delete 'reset-gzip-timestamps))))))
+(define-public cl-inflector
+ (sbcl-package->cl-source-package sbcl-cl-inflector))
-(define-public ecl-dexador
- (sbcl-package->ecl-package sbcl-dexador))
+(define-public ecl-cl-inflector
+ (sbcl-package->ecl-package sbcl-cl-inflector))
-(define-public sbcl-lisp-namespace
- (let ((commit "699fccb6727027343bb5fca69162a3113996edfc")
- (revision "2"))
+(define-public sbcl-cl-ini
+ (let ((commit "e630acb405022a7ae11969bf908669fee1191ab7")
+ (revision "0"))
(package
- (name "sbcl-lisp-namespace")
- (build-system asdf-build-system/sbcl)
+ (name "sbcl-cl-ini")
(version (git-version "0.1" revision commit))
- (home-page "https://github.com/guicho271828/lisp-namespace")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/compufox/cl-ini")
(commit commit)))
- (file-name (git-file-name "cl-lisp-namespace" version))
+ (file-name (git-file-name "sbcl-cl-ini" version))
(sha256
- (base32 "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"))))
- (inputs
- (list sbcl-alexandria))
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "LISP-N, or extensible namespaces in Common Lisp")
- (description "Common Lisp already has major 2 namespaces, function
-namespace and value namespace (or variable namespace), but there are actually
-more — e.g., class namespace.
-This library offers macros to deal with symbols from any namespace.")
- (license license:llgpl))))
+ (base32
+ "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-prove))
+ (inputs (list sbcl-cl-str))
+ (home-page "https://github.com/compufox/cl-ini")
+ (synopsis "INI file parser for Common Lisp")
+ (description
+ "Parse INI formatted files into a Common Lisp list structure.")
+ (license license:expat))))
-(define-public cl-lisp-namespace
- (sbcl-package->cl-source-package sbcl-lisp-namespace))
+(define-public cl-ini
+ (sbcl-package->cl-source-package sbcl-cl-ini))
-(define-public ecl-lisp-namespace
- (sbcl-package->ecl-package sbcl-lisp-namespace))
+(define-public ecl-cl-ini
+ (sbcl-package->ecl-package sbcl-cl-ini))
-(define-public sbcl-trivial-cltl2
- (let ((commit "8a3bda30dc25d2f65fcf514d0eb6e6db75252c61")
- (revision "2"))
+(define-public sbcl-cl-inotify
+ (let ((commit "66f29e01ec28355ebba8292411b4de90eebd76a3")
+ (revision "0"))
(package
- (name "sbcl-trivial-cltl2")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.1.1" revision commit))
- (home-page "https://github.com/Zulu-Inuoe/trivial-cltl2")
+ (name "sbcl-cl-inotify")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/Ferada/cl-inotify")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-inotify" version))
(sha256
- (base32
- "08cnzb9rnczn4pn2zpf0587ny4wjy1mjndy885fz9pw7xrlx37ip"))))
- (synopsis "Simple CLtL2 compatibility layer for Common Lisp")
- (description "This library is a portable compatibility layer around
-\"Common Lisp the Language, 2nd
-Edition\" (@url{https://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node102.html})
-and it exports symbols from implementation-specific packages.")
- (license license:llgpl))))
+ (base32 "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-fiveam))
+ (inputs
+ (list libfixposix
+ sbcl-binary-types
+ sbcl-cffi
+ sbcl-osicat
+ sbcl-trivial-utf-8))
+ (synopsis "Common Lisp interface to the Linux inotify API")
+ (description
+ "@code{cl-inotify} uses @code{cl-cffi} to provide a Common Lisp
+interface to the Linux inotify API.")
+ (home-page "https://github.com/Ferada/cl-inotify/")
+ (license license:bsd-2))))
-(define-public cl-trivial-cltl2
- (sbcl-package->cl-source-package sbcl-trivial-cltl2))
+(define-public cl-inotify
+ (sbcl-package->cl-source-package sbcl-cl-inotify))
-(define-public ecl-trivial-cltl2
- (sbcl-package->ecl-package sbcl-trivial-cltl2))
+(define-public ecl-cl-inotify
+ (sbcl-package->ecl-package sbcl-cl-inotify))
-(define-public sbcl-introspect-environment
- (let ((commit "8fb20a1a33d29637a22943243d1482a20c32d6ae")
- (revision "2"))
+(define-public sbcl-cl-interpol
+ (let ((commit "70a1137f41dd8889004dbab9536b1adeac2497aa")
+ (revision "1"))
(package
- (name "sbcl-introspect-environment")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/Bike/introspect-environment")
+ (name "sbcl-cl-interpol")
+ (version (git-version "0.2.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/edicl/cl-interpol")
(commit commit)))
- (file-name (git-file-name "cl-introspect-environment" version))
+ (file-name (git-file-name "cl-interpol" version))
(sha256
- (base32 "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"))))
+ (base32
+ "1kr00zf62m7la7rxa2m5w49r9cyzamc106hvjcc8ffmi7a4jw490"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cl-unicode sbcl-named-readtables))
(native-inputs
- (list sbcl-fiveam))
- (synopsis "Common Lisp environment introspection portability layer")
- (description "This library is a small interface to portable but
-nonstandard introspection of Common Lisp environments. It is intended to
-allow a bit more compile-time introspection of environments in Common Lisp.
+ (list sbcl-flexi-streams))
+ (synopsis "String interpolation for Common Lisp")
+ (description
+ "CL-INTERPOL is a library for Common Lisp which modifies the
+reader so that you can have interpolation within strings similar to
+Perl or Unix Shell scripts. It also provides various ways to insert
+arbitrary characters into literal strings even if your editor/IDE
+doesn't support them.")
+ (home-page "https://edicl.github.io/cl-interpol/")
+ (license license:bsd-3))))
-Quite a bit of information is available at the time a macro or compiler-macro
-runs; inlining info, type declarations, that sort of thing. This information
-is all standard - any Common Lisp program can @code{(declare (integer x))} and
-such.
+(define-public cl-interpol
+ (sbcl-package->cl-source-package sbcl-cl-interpol))
-This info ought to be accessible through the standard @code{&environment}
-parameters, but it is not. Several implementations keep the information for
-their own purposes but do not make it available to user programs, because
-there is no standard mechanism to do so.
+(define-public ecl-cl-interpol
+ (sbcl-package->ecl-package sbcl-cl-interpol))
-This library uses implementation-specific hooks to make information available
-to users. This is currently supported on SBCL, CCL, and CMUCL. Other
-implementations have implementations of the functions that do as much as they
-can and/or provide reasonable defaults.")
- (license license:wtfpl2))))
+(define-public sbcl-cl-ipfs-api2
+ (let ((commit "3ee52c80023bcc662f7d01276ea0a5814bd0011b")
+ (revision "0"))
+ (package
+ (name "sbcl-cl-ipfs-api2")
+ (version (git-version "0.51" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JadedCtrl/cl-ipfs-api2")
+ (commit commit)))
+ (file-name (git-file-name "cl-ipfs-api2" version))
+ (sha256
+ (base32 "1h0csxk4db1hid793mk5kz3nbjyl7z4ic1zk2wy46k1vz5lnnsph"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:tests? #f)) ; There are no tests.
+ (inputs
+ (list sbcl-arnesi
+ sbcl-drakma
+ sbcl-yason))
+ (home-page "https://github.com/JadedCtrl/cl-ipfs-api2/")
+ (synopsis "Bindings for the IPFS HTTP API")
+ (description
+ "@code{cl-sbcl-cl-ipfs-api2} is a pretty simple set of IPFS bindings
+for Common Lisp, using the HTTP API for (almost) everything, except for pubsub
+(which uses the locally installed go-ipfs program).")
+ (license license:lgpl3))))
-(define-public cl-introspect-environment
- (sbcl-package->cl-source-package sbcl-introspect-environment))
+(define-public cl-ipfs-api2
+ (sbcl-package->cl-source-package sbcl-cl-ipfs-api2))
-(define-public ecl-introspect-environment
- (sbcl-package->ecl-package sbcl-introspect-environment))
+(define-public ecl-cl-ipfs-api2
+ (sbcl-package->ecl-package sbcl-cl-ipfs-api2))
-(define-public sbcl-compiler-macro
- (let ((commit "7796bda64aec5af3ca175170ad3565167868789c")
+(define-public sbcl-cl-irc
+ (let ((commit "963823537c7bfcda2edd4c44d172192da6722175")
(revision "0"))
(package
- (name "sbcl-compiler-macro")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-cl-irc")
+ (version (git-version "0.9.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Bike/compiler-macro")
+ (url "https://salsa.debian.org/common-lisp-team/cl-irc.git")
(commit commit)))
- (file-name (git-file-name "cl-compiler-macro" version))
+ (file-name (git-file-name "cl-irc" version))
(sha256
- (base32 "13sswps7s0qy6939mvj8q57hkx0qkga6rl6xjhjr7pk7by0xdsjq"))))
+ (base32 "1b3nqbb4pj377lxl47rfgrs82pidadnrc65l48bk553c2f59b52w"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
+ (list sbcl-rt))
(inputs
- (list sbcl-introspect-environment))
- (home-page "https://github.com/Bike/compiler-macro")
- (synopsis "Common Lisp compiler macro utilities")
- (description "This library is a collection of utilities for writing
-compiler macros. It is intended to make it possible to make compiler macros
-much more useful, by granting them access to lexical type information, making
-the protocol for declining expansion more convenient, and establishing some
-information for signaling optimization advice to programmers. Some utilities
-to support this, especially for reasoning on types, are also included.")
- (license license:cc0))))
+ `(("cl+ssl" ,sbcl-cl+ssl)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("usocket" ,sbcl-usocket)))
+ (arguments
+ `(#:asd-test-systems '("cl-irc-test")))
+ (synopsis "IRC client library for Common Lisp")
+ (description "@code{cl-irc} is a Common Lisp IRC client library that
+features (partial) DCC, CTCP and all relevant commands from the IRC
+RFCs (RFC2810, RFC2811 and RFC2812).
-(define-public cl-compiler-macro
- (sbcl-package->cl-source-package sbcl-compiler-macro))
+Features:
+@itemize
+@item implements all commands in the RFCs
+@item extra convenience commands such as op/deop, ban, ignore, etc.
+@item partial DCC SEND/CHAT support
+@item event driven model with hooks makes interfacing easy
+@item the user can keep multiple connections
+@item all CTCP commands
+@end itemize\n")
+ (home-page "https://common-lisp.net/project/cl-irc/")
+ (license license:bsd-2))))
-(define-public ecl-compiler-macro
- (sbcl-package->ecl-package sbcl-compiler-macro))
+(define-public cl-irc
+ (sbcl-package->cl-source-package sbcl-cl-irc))
-(define-public sbcl-type-i
- (let ((commit "d34440ab4ebf5a46a58deccb35950b15670e3667")
- (revision "2"))
+(define-public ecl-cl-irc
+ (sbcl-package->ecl-package sbcl-cl-irc))
+
+(define-public sbcl-cl-isaac
+ (let ((commit "9cd88f39733be753facbf361cb0e08b9e42ff8d5")
+ (revision "0"))
(package
- (name "sbcl-type-i")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/guicho271828/type-i")
+ (name "sbcl-cl-isaac")
+ (version (git-version "1.0.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/thephoeron/cl-isaac")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-isaac" version))
(sha256
- (base32
- "12wsga0pwjkkr176lnjwkmmlm3ccp0n310sjj9h20lk53iyd0z69"))))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("introspect-environment" ,sbcl-introspect-environment)
- ("trivia.trivial" ,sbcl-trivia.trivial)))
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "Type inference utility on unary predicates for Common Lisp")
- (description "This library tries to provide a way to detect what kind of
-type the given predicate is trying to check. This is different from inferring
-the return type of a function.")
- (license license:llgpl))))
+ (base32 "0ig1mf8iridfr7vci9gy499194h0hda0xki5s6g0y04g85ibnpw9"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-prove))
+ (home-page "https://github.com/thephoeron/cl-isaac/")
+ (synopsis "Fast cryptographic random number generators")
+ (description "This is an optimized Common Lisp library of Bob Jenkins'
+ISAAC-32 and ISAAC-64 algorithms, which are fast cryptographic random number
+generators: Indirection, Shift, Accumulate, Add, and Count.")
+ (license license:bsd-0))))
-(define-public cl-type-i
- (sbcl-package->cl-source-package sbcl-type-i))
+(define-public cl-isaac
+ (sbcl-package->cl-source-package sbcl-cl-isaac))
-(define-public ecl-type-i
- (package
- (inherit (sbcl-package->ecl-package sbcl-type-i))
- (arguments
- ;; The tests get stuck indefinitly
- '(#:tests? #f))))
+(define-public ecl-cl-isaac
+ (sbcl-package->ecl-package sbcl-cl-isaac))
-(define-public sbcl-simplified-types
- (let ((commit "8fd0727a70a9de76289ac62c1567b8d278e7434e")
- (revision "0"))
+(define-public sbcl-cl-jpeg
+ (let ((commit "ec557038128df6895fbfb743bfe8faf8ec2534af")
+ (revision "1"))
(package
- (name "sbcl-simplified-types")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-jpeg")
+ (version (git-version "2.8" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/simplified-types")
+ (url "https://github.com/sharplispers/cl-jpeg")
(commit commit)))
- (file-name (git-file-name "cl-simplified-types" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"))))
+ (base32 "1bkkiqz8fqldlj1wbmrccjsvxcwj98h6s4b6gslr3cg2wmdv5xmy"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-introspect-environment
- sbcl-trivia))
- (home-page "https://github.com/marcoheisig/simplified-types")
- (synopsis "Simplify Common Lisp type specifiers")
+ (synopsis "JPEG image library for Common Lisp")
(description
- "Simplified-Types is a library that provides functions for simplifying
-Common Lisp type specifiers. The API consists of two functions:
+ "This is a baseline JPEG codec written in Common Lisp. It can be used
+for reading and writing JPEG image files.")
+ (home-page "https://github.com/sharplispers/cl-jpeg")
+ (license license:bsd-3))))
-@itemize
-@item @code{simplify-type} takes a type specifier and, optionally, an
-environment, and returns the corresponding simplified type.
-@item @code{simplified-type-of} takes an object and returns the simplified
-type of that object.
-@end itemize")
- (license license:expat))))
+(define-public cl-jpeg
+ (sbcl-package->cl-source-package sbcl-cl-jpeg))
-(define-public cl-simplified-types
- (sbcl-package->cl-source-package sbcl-simplified-types))
+(define-public ecl-cl-jpeg
+ (sbcl-package->ecl-package sbcl-cl-jpeg))
-(define-public ecl-simplified-types
- (sbcl-package->ecl-package sbcl-simplified-types))
+(define-public sbcl-cl-json
+ (package
+ (name "sbcl-cl-json")
+ (version "0.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharplispers/cl-json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-json" version))
+ (sha256
+ (base32 "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/sharplispers/cl-json")
+ (synopsis "JSON encoder and decoder for Common-Lisp")
+ (description "@command{cl-json} provides an encoder of Lisp objects
+to JSON format and a corresponding decoder of JSON data to Lisp
+objects. Both the encoder and the decoder are highly customizable; at the
+same time, the default settings ensure a very simple mode of operation,
+similar to that provided by @command{yason} or @command{st-json}.")
+ (license license:expat)))
-(define-public sbcl-typo
- (let ((commit "0e883490f81edf2a1be4e5b101d1caec78d7853b")
+(define-public cl-json
+ (sbcl-package->cl-source-package sbcl-cl-json))
+
+(define-public ecl-cl-json
+ (sbcl-package->ecl-package sbcl-cl-json))
+
+(define-public sbcl-cl-json-pointer
+ (let ((commit "f6760e2a02972783f96b92a15f801e14a6828e0c")
(revision "0"))
(package
- (name "sbcl-typo")
+ (name "sbcl-cl-json-pointer")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/Typo")
+ (url "https://github.com/y2q-actionman/cl-json-pointer")
(commit commit)))
- (file-name (git-file-name "cl-typo" version))
+ (file-name (git-file-name "cl-json-pointer" version))
(sha256
- (base32 "08cmkjl3f77rfhxbjyd6f3kinhzak30mdfphnpf73sh1vw4v0vym"))))
+ (base32 "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; FIXME: Component "cl-json-pointer/test" not found.
+ `(#:tests? #f
+ #:asd-systems '("cl-json-pointer" "cl-json-pointer/synonyms")))
(inputs
(list sbcl-alexandria
+ sbcl-boost-json
+ sbcl-cl-json
sbcl-closer-mop
- sbcl-introspect-environment
- sbcl-trivia
- sbcl-trivial-arguments
- sbcl-trivial-garbage))
- (home-page "https://github.com/marcoheisig/Typo")
- (synopsis "Portable type inference library for Common Lisp")
- (description
- "Typo is a portable library for Common Lisp that does approximate
-reasoning about types, but without consing.")
+ sbcl-st-json))
+ (home-page "https://github.com/y2q-actionman/cl-json-pointer")
+ (synopsis "JSON Pointer processor for Common Lisp")
+ (description "
+This package provides a JSON
+Pointer (@url{https://tools.ietf.org/html/rfc6901,RFC6901}) implementation for
+Common Lisp. This libary aims to be independent from any JSON libraries (as much
+as possible).")
(license license:expat))))
-(define-public cl-typo
- (sbcl-package->cl-source-package sbcl-typo))
+(define-public cl-json-pointer
+ (sbcl-package->cl-source-package sbcl-cl-json-pointer))
-(define-public ecl-typo
- (sbcl-package->ecl-package sbcl-typo))
+(define-public ecl-cl-json-pointer
+ (sbcl-package->ecl-package sbcl-cl-json-pointer))
-(define-public sbcl-optima
- (let ((commit "373b245b928c1a5cce91a6cb5bfe5dd77eb36195")
+(define-public sbcl-cl-ledger
+ (let ((commit "08e0be41795e804cd36142e51756ad0b1caa377b")
(revision "1"))
(package
- (name "sbcl-optima")
- (build-system asdf-build-system/sbcl)
- (version (git-version "1.0" revision commit))
- (home-page "https://github.com/m2ym/optima")
+ (name "sbcl-cl-ledger")
+ (version (git-version "4.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/ledger/cl-ledger")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"))))
+ "1via0qf6wjcyxnfbmfxjvms0ik9j8rqbifgpmnhrzvkhrq9pv8h1"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("closer-mop" ,sbcl-closer-mop)))
- (native-inputs
- (list sbcl-eos))
+ `(("cambl" ,sbcl-cambl)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("local-time" ,sbcl-local-time)
+ ("periods" ,sbcl-periods)))
(arguments
- ;; XXX: Circular dependencies: tests depend on optima.ppcre which depends on optima.
- `(#:tests? #f))
- (synopsis "Optimized pattern matching library for Common Lisp")
- (description "Optima is a fast pattern matching library which uses
-optimizing techniques widely used in the functional programming world.")
- (license license:expat))))
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-system-definition
+ (lambda _
+ (substitute* "cl-ledger.asd"
+ ((" :build-operation program-op") "")
+ ((" :build-pathname \"cl-ledger\"") "")
+ ((" :entry-point \"ledger::main\"") ""))
+ #t)))))
+ (synopsis "Common Lisp port of the Ledger accounting system")
+ (description
+ "CL-Ledger is a Common Lisp port of the Ledger double-entry accounting
+system.")
+ (home-page "https://github.com/ledger/cl-ledger")
+ (license license:bsd-3))))
-(define-public cl-optima
- (sbcl-package->cl-source-package sbcl-optima))
+(define-public cl-ledger
+ (sbcl-package->cl-source-package sbcl-cl-ledger))
-(define-public ecl-optima
- (sbcl-package->ecl-package sbcl-optima))
+(define-public ecl-cl-ledger
+ (sbcl-package->ecl-package sbcl-cl-ledger))
-(define-public sbcl-fare-quasiquote
- (let ((commit "640d39a0451094071b3e093c97667b3947f43639")
+(define-public sbcl-cl-lex
+ (let ((commit "f2dbbe25ef553005fb402d9a6203180c3fa1093b")
(revision "1"))
(package
- (name "sbcl-fare-quasiquote")
- (build-system asdf-build-system/sbcl)
- (version (git-version "1.0.1" revision commit))
- (home-page "https://gitlab.common-lisp.net/frideau/fare-quasiquote")
+ (name "sbcl-cl-lex")
+ (version (git-version "1.1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append "https://gitlab.common-lisp.net/frideau/"
- "fare-quasiquote.git"))
+ (url "https://github.com/djr7C4/cl-lex")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1g6q11l50kgija9f55lzqpcwvaq0ljiw8v1j265hnyg6nahjwjvg"))))
+ (base32 "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- `(("fare-utils" ,sbcl-fare-utils)
- ("named-readtables" ,sbcl-named-readtables)
- ("optima" ,sbcl-optima)))
- (arguments
- ;; XXX: Circular dependencies: Tests depend on subsystems,
- ;; which depend on the main systems.
- `(#:tests? #f
- #:asd-systems '("fare-quasiquote"
- "fare-quasiquote-extras")
- #:phases
- (modify-phases %standard-phases
- ;; XXX: Require 1.0.0 version of fare-utils, and we package some
- ;; commits after 1.0.0.5, but ASDF fails to read the
- ;; "-REVISION-COMMIT" part generated by Guix.
- (add-after 'unpack 'patch-requirement
- (lambda _
- (substitute* "fare-quasiquote.asd"
- (("\\(:version \"fare-utils\" \"1.0.0\"\\)")
- "\"fare-utils\""))
- (substitute* "fare-quasiquote-optima.asd"
- (("\\(:version \"optima\" \"1\\.0\"\\)")
- "\"optima\""))
- #t)))))
- (synopsis "Pattern-matching friendly implementation of quasiquote")
- (description "The main purpose of this n+2nd reimplementation of
-quasiquote is enable matching of quasiquoted patterns, using Optima or
-Trivia.")
- (license license:expat))))
+ (list sbcl-cl-ppcre))
+ (synopsis "Common Lisp macros for generating lexical analyzers")
+ (description
+ "This is a Common Lisp library providing a set of macros for generating
+lexical analyzers automatically. The lexers generated using @code{cl-lex} can
+be used with @code{cl-yacc}.")
+ (home-page "https://github.com/djr7C4/cl-lex")
+ (license license:gpl3))))
-(define-public cl-fare-quasiquote
- (sbcl-package->cl-source-package sbcl-fare-quasiquote))
+(define-public cl-lex
+ (sbcl-package->cl-source-package sbcl-cl-lex))
-(define-public ecl-fare-quasiquote
- (sbcl-package->ecl-package sbcl-fare-quasiquote))
+(define-public ecl-cl-lex
+ (sbcl-package->ecl-package sbcl-cl-lex))
-;;; Split the trivia package in two to work around the circular dependency
-;;; between guicho271828/trivia and guicho271828/type-i.
-(define-public sbcl-trivia.trivial
- (let ((commit "8b406c3f83521d290e97bb787d3f6c1eb3b716af")
- (revision "0"))
+(define-public sbcl-cl-liballegro
+ (let ((commit "49f632ce97fc4f835bf5d450588793234b980a64")
+ (revision "1"))
(package
- (name "sbcl-trivia.trivial")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-cl-liballegro")
+ (version (git-version "0.2.15" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/guicho271828/trivia")
+ (url "https://github.com/resttime/cl-liballegro")
(commit commit)))
- (file-name (git-file-name "cl-trivia" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0fnnjnba07qrsf82jm4q6dini7z72xabcssy5y2bqy082r07l8l7"))))
+ (base32 "0brbr7i342s0gadlnzd3a61w2b9ihhx60l19ararnc2asvyhmz7x"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-closer-mop
- sbcl-lisp-namespace
- sbcl-trivial-cltl2))
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (for-each delete-file
- '("trivia.balland2006.asd"
- "trivia.ppcre.asd"
- "trivia.quasiquote.asd"
- "trivia.cffi.asd"
- "trivia.fset.asd"
- "trivia.asd"
- "trivia.test.asd")))))))
- (synopsis "Pattern matching in Common Lisp")
- (description "Trivia is a pattern matching compiler that is compatible
-with Optima, another pattern matching library for Common Lisp. It is meant to
-be faster and more extensible than Optima.")
- (home-page "https://github.com/guicho271828/trivia")
- (license license:llgpl))))
-
-(define-public cl-trivia.trivial
- (sbcl-package->cl-source-package sbcl-trivia.trivial))
-
-(define-public ecl-trivia.trivial
- (sbcl-package->ecl-package sbcl-trivia.trivial))
-
-(define-public sbcl-trivia
- (package
- (inherit sbcl-trivia.trivial)
- (name "sbcl-trivia")
- (native-inputs
- (list sbcl-fiveam
- sbcl-optima))
- (inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-cl-ppcre
- sbcl-fare-quasiquote
- sbcl-fset
- sbcl-iterate
- sbcl-trivia.trivial
- sbcl-type-i))
- (arguments
- '(#:asd-systems '("trivia"
- "trivia.ppcre"
- "trivia.quasiquote"
- "trivia.cffi"
- "trivia.fset")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (for-each delete-file
- '("trivia.level0.asd"
- "trivia.level1.asd"
- "trivia.level2.asd"
- "trivia.trivial.asd")))))))))
-
-(define-public cl-trivia
- (sbcl-package->cl-source-package sbcl-trivia))
-
-(define-public ecl-trivia
- (sbcl-package->ecl-package sbcl-trivia))
-
-(define-public sbcl-mk-string-metrics
- (package
- (name "sbcl-mk-string-metrics")
- (version "0.1.2")
- (home-page "https://github.com/cbaggers/mk-string-metrics/")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit version)))
- (sha256
- (base32 "0bg0bv2mfd4k0g3x72x563hvmrx18xavaffr6xk5rh4if5j7kcf6"))
- (file-name (git-file-name name version))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Calculate various string metrics efficiently in Common Lisp")
- (description "This library implements efficient algorithms that calculate
-various string metrics in Common Lisp:
-
-@itemize
-@item Damerau-Levenshtein distance
-@item Hamming distance
-@item Jaccard similarity coefficient
-@item Jaro distance
-@item Jaro-Winkler distance
-@item Levenshtein distance
-@item Normalized Damerau-Levenshtein distance
-@item Normalized Levenshtein distance
-@item Overlap coefficient
-@end itemize\n")
- (license license:x11)))
-
-(define-public cl-mk-string-metrics
- (sbcl-package->cl-source-package sbcl-mk-string-metrics))
-
-(define-public ecl-mk-string-metrics
- (sbcl-package->ecl-package sbcl-mk-string-metrics))
-
-(define-public sbcl-cl-str
- (package
- (name "sbcl-cl-str")
- (version "0.19")
- (home-page "https://github.com/vindarel/cl-str")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit version)))
- (sha256
- (base32 "1jyza2jhn7w6fl4w87pv0m87z5ia48m6dqw12k0mdh7l3mgjq839"))
- (file-name (git-file-name name version))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
- ("cl-change-case" ,sbcl-cl-change-case)))
- (native-inputs
- (list sbcl-prove))
- (arguments
- `(#:asd-systems '("str")))
- (synopsis "Modern, consistent and terse Common Lisp string manipulation library")
- (description "A modern and consistent Common Lisp string manipulation
-library that focuses on modernity, simplicity and discoverability:
-@code{(str:trim s)} instead of @code{(string-trim '(#\\Space ...) s)}), or
-@code{str:concat strings} instead of an unusual format construct; one
-discoverable library instead of many; consistency and composability, where
-@code{s} is always the last argument, which makes it easier to feed pipes and
-arrows.")
- (license license:expat)))
+ (add-after 'unpack 'patch-allegro-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((allegro-lib-path (string-append
+ (assoc-ref inputs "allegro") "/lib/")))
+ (substitute* "src/library.lisp"
+ (("lib \".so\"" all)
+ (string-append "\"" allegro-lib-path "\"" " lib \".so\"")))))))))
+ (inputs
+ `(("allegro" ,allegro)
+ ("cffi" ,sbcl-cffi)
+ ("float-features" ,sbcl-float-features)
+ ("trivial-garbage" ,sbcl-trivial-garbage)
+ ("trivial-main-thread" ,sbcl-trivial-main-thread)))
+ (home-page "https://github.com/resttime/cl-liballegro")
+ (synopsis "Allegro 5 game programming library bindings for Common Lisp")
+ (description
+ "This package provides CFFI bindings and interface to Allegro 5 game
+developing library for Common Lisp.")
+ (license license:zlib))))
-(define-public cl-str
- (sbcl-package->cl-source-package sbcl-cl-str))
+(define-public cl-liballegro
+ (sbcl-package->cl-source-package sbcl-cl-liballegro))
-(define-public ecl-cl-str
- (sbcl-package->ecl-package sbcl-cl-str))
+(define-public ecl-cl-liballegro
+ (sbcl-package->ecl-package sbcl-cl-liballegro))
-(define-public sbcl-cl-xmlspam
- (let ((commit "ea06abcca2a73a9779bcfb09081e56665f94e22a"))
+(define-public sbcl-cl-libsvm-format
+ (let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb")
+ (revision "0"))
(package
- (name "sbcl-cl-xmlspam")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.0.0" "1" commit))
- (home-page "https://github.com/rogpeppe/cl-xmlspam")
+ (name "sbcl-cl-libsvm-format")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/masatoi/cl-libsvm-format")
(commit commit)))
- (file-name (string-append name "-" version))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0w4rqvrgdgk3fwfq3kx4r7wwdr2bv3b6n3bdqwsiriw9psqzpz2s"))))
+ "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove))
(inputs
- (list sbcl-cxml sbcl-cl-ppcre))
- (synopsis "Concise, regexp-like pattern matching on streaming XML for Common Lisp")
- (description "CXML does an excellent job at parsing XML elements, but what
-do you do when you have a XML file that's larger than you want to fit in
-memory, and you want to extract some information from it? Writing code to deal
-with SAX events, or even using Klacks, quickly becomes tedious.
-@code{cl-xmlspam} (for XML Stream PAttern Matcher) is designed to make it easy
-to write code that mirrors the structure of the XML that it's parsing. It
-also makes it easy to shift paradigms when necessary - the usual Lisp control
-constructs can be used interchangeably with pattern matching, and the full
-power of CXML is available when necessary.")
- (license license:bsd-3))))
+ (list sbcl-alexandria))
+ (synopsis "LibSVM data format reader for Common Lisp")
+ (description
+ "This Common Lisp library provides a fast reader for data in LibSVM
+format.")
+ (home-page "https://github.com/masatoi/cl-libsvm-format")
+ (license license:expat))))
-(define-public cl-xmlspam
- (sbcl-package->cl-source-package sbcl-cl-xmlspam))
+(define-public cl-libsvm-format
+ (sbcl-package->cl-source-package sbcl-cl-libsvm-format))
-(define-public ecl-cl-xmlspam
- (sbcl-package->ecl-package sbcl-cl-xmlspam))
+(define-public ecl-cl-libsvm-format
+ (sbcl-package->ecl-package sbcl-cl-libsvm-format))
-(define-public sbcl-dbus
- (let ((commit "24b452df3a45ca5dc95015500f34baad175c981a")
+(define-public sbcl-cl-libuv
+ (let ((commit "32100c023c518038d0670a103eaa4d50dd785d29")
(revision "1"))
(package
- (name "sbcl-dbus")
- (version (git-version "20190408" revision commit))
- (home-page "https://github.com/death/dbus")
+ (name "sbcl-cl-libuv")
+ (version (git-version "0.1.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/orthecreedence/cl-libuv")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "0fw2q866yddbf23nk9pxphm9gsasx35vjyss82xzvndnjmzlqfl5"))))
+ "1kwix4si8a8hza34ab2k7whrh7z0yrmx39v2wc3qblv9m244jkh1"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-trivial-garbage
- sbcl-babel
- sbcl-iolib
- sbcl-ieee-floats
- sbcl-flexi-streams
- sbcl-cl-xmlspam
- sbcl-ironclad))
- (synopsis "D-Bus client library for Common Lisp")
- (description "This is a Common Lisp library that publishes D-Bus
-objects as well as send and notify other objects connected to a bus.")
- (license license:bsd-2))))
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("libuv" ,libuv)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "lib.lisp"
+ (("/usr/lib/libuv.so")
+ (search-input-file inputs "/lib/libuv.so")))))
+ (add-after 'fix-paths 'fix-system-definition
+ (lambda _
+ (substitute* "cl-libuv.asd"
+ (("#:cffi #:alexandria")
+ "#:cffi #:cffi-grovel #:alexandria"))
+ #t)))))
+ (synopsis "Common Lisp bindings to libuv")
+ (description
+ "This library provides low-level libuv bindings for Common Lisp.")
+ (home-page "https://github.com/orthecreedence/cl-libuv")
+ (license license:expat))))
-(define-public cl-dbus
- (sbcl-package->cl-source-package sbcl-dbus))
+(define-public cl-libuv
+ (sbcl-package->cl-source-package sbcl-cl-libuv))
-(define-public ecl-dbus
- (sbcl-package->ecl-package sbcl-dbus))
+(define-public ecl-cl-libuv
+ (sbcl-package->ecl-package sbcl-cl-libuv))
-(define-public sbcl-cl-hooks
- (let ((commit "5b638083f3b4f1221a52631d9c8a0a265565cac7")
- (revision "1"))
+(define-public sbcl-cl-libxml2
+ (let ((commit "8d03110c532c1a3fe15503fdfefe82f60669e4bd"))
(package
- (name "sbcl-cl-hooks")
- (build-system asdf-build-system/sbcl)
- (version (git-version "0.2.1" revision commit))
- (home-page "https://github.com/scymtym/architecture.hooks")
+ (name "sbcl-cl-libxml2")
+ (version (git-version "0.3.4" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/archimag/cl-libxml2")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-libxml2" version))
(sha256
- (base32
- "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y"))))
+ (base32 "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-let-plus sbcl-trivial-garbage
- sbcl-closer-mop))
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("garbage-pools" ,sbcl-garbage-pools)
+ ("iterate" ,sbcl-iterate)
+ ("metabang-bind" ,sbcl-metabang-bind)
+ ("puri" ,sbcl-puri)
+ ;; Non-Lisp inputs:
+ ("libxml2" ,libxml2)
+ ("libxslt" ,libxslt)))
(native-inputs
- (list sbcl-fiveam))
- (synopsis "Hooks extension point mechanism (as in Emacs) for Common Lisp")
- (description "A hook, in the present context, is a certain kind of
-extension point in a program that allows interleaving the execution of
-arbitrary code with the execution of a the program without introducing any
-coupling between the two. Hooks are used extensively in the extensible editor
-Emacs.
-
-In the Common LISP Object System (CLOS), a similar kind of extensibility is
-possible using the flexible multi-method dispatch mechanism. It may even seem
-that the concept of hooks does not provide any benefits over the possibilities
-of CLOS. However, there are some differences:
+ (list sbcl-lift))
+ (arguments
+ `(#:tests? #f ; FIXME: Tests get stuck indefinitly
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "tree/xtree.lisp"
+ (("libxml2.so.2")
+ (string-append (assoc-ref inputs "libxml2") "/lib/libxml2.so")))
+ (let ((libxslt (assoc-ref inputs "libxslt")))
+ (substitute* "xslt/xslt.lisp"
+ (("libxslt.so.1")
+ (string-append libxslt "/lib/libxslt.so"))
+ (("libexslt.so.0")
+ (string-append libxslt "/lib/libexslt.so"))
+ (("cllibxml2.so")
+ (string-append (assoc-ref outputs "out") "/lib/cllibxml2.so"))))
+ #t))
+ (add-before 'build 'build-helper-library
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((prefix-dir (string-append (assoc-ref outputs "out"))))
+ (mkdir-p (string-append prefix-dir "/lib"))
+ (invoke "make" "-C" "foreign" "install"
+ "INSOPTS="
+ (string-append "PREFIX=" prefix-dir))
+ #t)))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* '("cl-libxml2.asd" "cl-libxslt.asd" "xfactory.asd")
+ ((" :force t") ""))
+ #t)))))
+ (home-page "https://web.archive.org/web/20160121073421/http://cl-libxml2.googlecode.com/svn/doc/index.html")
+ (synopsis "High-level wrapper around libxml2 and libxslt libraries")
+ (description
+ "cl-libxml2 is high-level Common Lisp wrapper around the @code{libxml2}
+and @code{libxslt} libraries.
@itemize
-
-@item There can be only one method for each combination of specializers and
-qualifiers. As a result this kind of extension point cannot be used by
-multiple extensions independently.
-@item Removing code previously attached via a @code{:before}, @code{:after} or
-@code{:around} method can be cumbersome.
-@item There could be other or even multiple extension points besides @code{:before}
-and @code{:after} in a single method.
-@item Attaching codes to individual objects using eql specializers can be
-cumbersome.
-@item Introspection of code attached a particular extension point is
-cumbersome since this requires enumerating and inspecting the methods of a
-generic function.
-@end itemize
-
-This library tries to complement some of these weaknesses of method-based
-extension-points via the concept of hooks.")
+@item Interfaces for tree manipulation (like @code{cxml-stp}).
+@item Interface for HTML 4.0 non-validating parsers.
+@item Specific APIs to process HTML trees, especially serialization.
+@item XPath API.
+@item XSLT API.
+@item Custom URL resolvers.
+@item XPath extension functions.
+@item XSLT extension elements.
+@item Translates @code{libxml2} and @code{libxslt} errors to Lisp conditions.
+@item Extends the Common Lisp @code{iterate} library with custom drivers for
+child nodes enumeration, etc.
+@item The @code{XFACTORY} system provides a simple and compact syntax for XML generation.
+@end itemize\n")
(license license:llgpl))))
-(define-public cl-hooks
- (sbcl-package->cl-source-package sbcl-cl-hooks))
+(define-public cl-libxml2
+ (sbcl-package->cl-source-package sbcl-cl-libxml2))
-(define-public ecl-cl-hooks
- (sbcl-package->ecl-package sbcl-cl-hooks))
+(define-public ecl-cl-libxml2
+ (sbcl-package->ecl-package sbcl-cl-libxml2))
-(define-public sbcl-cl-autowrap
- (let ((revision "2")
- (commit "a5d71ebd7c21b87f449db1e16ab815750d7c0ea4"))
- ;; no taged branches
+(define-public sbcl-cl-libyaml
+ (let ((commit "a7fe9f68bddfd00b7ca467b65b3b41b276336843")
+ (revision "1"))
(package
- (name "sbcl-cl-autowrap")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-cl-libyaml")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/cl-autowrap")
+ (url "https://github.com/eudoxia0/cl-libyaml")
(commit commit)))
- (file-name (git-file-name "cl-autowrap" version))
+ (file-name (git-file-name "cl-libyaml" version))
(sha256
- (base32 "0795c817m1c41cz3ywzzg83z4pgkxdg6si553pay9mdgjvmrwmaw"))))
+ (base32
+ "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("cl-plus-c" "cl-autowrap")))
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("cl-json" ,sbcl-cl-json)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("defpackage-plus" ,sbcl-defpackage-plus)
- ("trivial-features" ,sbcl-trivial-features)))
- (home-page "https://github.com/rpav/cl-autowrap")
- (synopsis "FFI wrapper generator for Common Lisp")
- (description "This is a c2ffi-based wrapper generator for Common Lisp.")
- (license license:bsd-2))))
+ `(("cffi" ,sbcl-cffi)
+ ("libyaml" ,libyaml)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libyaml.so")
+ (string-append (assoc-ref inputs "libyaml")
+ "/lib/libyaml.so"))))))))
+ (home-page "https://github.com/eudoxia0/cl-libyaml")
+ (synopsis "Libyaml bindings for Common Lisp")
+ (description
+ "This is a binding to the libyaml library. It's not meant as
+a full library for YAML, just a bare binding with a couple of utility macros.
+For a YAML parser and emitter using this, check out cl-yaml.")
+ (license license:expat))))
-(define-public cl-autowrap
- (sbcl-package->cl-source-package sbcl-cl-autowrap))
+(define-public cl-libyaml
+ (sbcl-package->cl-source-package sbcl-cl-libyaml))
-(define-public ecl-cl-autowrap
- (sbcl-package->ecl-package sbcl-cl-autowrap))
+(define-public ecl-cl-libyaml
+ (sbcl-package->ecl-package sbcl-cl-libyaml))
-(define-public sbcl-s-sysdeps
- ;; No release since 2013.
- (let ((commit "7f8de283b7fbd8b038fdf08493063a736db36ce7")
- (revision "3"))
+(define-public sbcl-cl-locale
+ (let ((commit "0a36cc0dcf5e0a8c8bf97869cd6199980ca25eec")
+ (revision "1"))
(package
- (name "sbcl-s-sysdeps")
- (build-system asdf-build-system/sbcl)
- (version (git-version "1" revision commit))
- (home-page "https://github.com/svenvc/s-sysdeps")
+ (name "sbcl-cl-locale")
+ (version (git-version "0.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/fukamachi/cl-locale")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-locale" version))
(sha256
- (base32
- "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n"))))
+ (base32 "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("cl-locale-test" "cl-locale")))
+ (native-inputs
+ `(("prove" ,sbcl-prove)
+ ("flexi-streams" ,sbcl-flexi-streams)))
(inputs
- (list sbcl-bordeaux-threads sbcl-usocket))
- (synopsis "Common Lisp abstraction layer over platform dependent functionality")
- (description "@code{s-sysdeps} is an abstraction layer over platform
-dependent functionality. This simple package is used as a building block in a
-number of other projects.
+ `(("anaphora" ,sbcl-anaphora)
+ ("arnesi" ,sbcl-arnesi)
+ ("cl-annot" ,sbcl-cl-annot)
+ ("cl-syntax" ,sbcl-cl-syntax)))
+ (home-page "https://github.com/fukamachi/cl-locale")
+ (synopsis "Internalization library for Common Lisp")
+ (description
+ "This package provides a Common Lisp translation library similar to
+CL-I18N and CL-L10N.")
+ (license license:llgpl))))
-@code{s-sysdeps} abstracts:
+(define-public cl-locale
+ (sbcl-package->cl-source-package sbcl-cl-locale))
-@itemize
-@item managing processes,
-@item implementing a standard TCP/IP server,
-@item opening a client TCP/IP socket stream,
-@item working with process locks.
-@end itemize\n")
- (license license:llgpl))))
+(define-public ecl-cl-locale
+ (sbcl-package->ecl-package sbcl-cl-locale))
-(define-public cl-s-sysdeps
- (sbcl-package->cl-source-package sbcl-s-sysdeps))
+(define-public sbcl-cl-log
+ (let ((commit "8f4b766d51e02245c310526cf1e4534ce634f837")
+ (revision "1"))
+ (package
+ (name "sbcl-cl-log")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nicklevine/cl-log")
+ (commit commit)))
+ (sha256
+ (base32 "1r3z9swy1b59swvaa5b97is9ysrfmjvjjhhw56p7p5hqg93b92ak"))
+ (file-name (git-file-name "cl-log" version))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp general purpose logging utility")
+ (description "CL-LOG is a general purpose logging utility, loosely modelled
+in some respects after Gary King's Log5. Its features include: logging to
+several destinations at once, via \"messengers\", each messenger is tailored to
+accept some log messages and reject others, and this tailoring can be changed
+on-the-fly, very rapid processing of messages which are rejected by all
+messengers, fully independent use of the utility by several different
+sub-systems in an application, support for messengers which cl:format text to a
+stream, support for messengers which do not invoke cl:format, timestamps in
+theory accurate to internal-time-units-per-second.")
+ (home-page "https://github.com/nicklevine/cl-log")
+ (license license:expat))))
-(define-public ecl-s-sysdeps
- (sbcl-package->ecl-package sbcl-s-sysdeps))
+(define-public cl-log
+ (sbcl-package->cl-source-package sbcl-cl-log))
-(define-public sbcl-cl-prevalence
- (let ((commit "e6b27640ce89ae5f8af38beb740e319bb6cd2368")
- (revision "6"))
+(define-public ecl-cl-log
+ (sbcl-package->ecl-package sbcl-cl-log))
+
+(define-public sbcl-cl-markdown
+ ;; The latest changes with fixes are not released yet, see
+ ;; https://github.com/hraban/cl-markdown/issues/9
+ (let ((commit "3788802199228b49d0e06c3feb80c1c22af05cfc")
+ (revision "0"))
(package
- (name "sbcl-cl-prevalence")
- (build-system asdf-build-system/sbcl)
- (version (git-version "5" revision commit))
- (home-page "https://github.com/40ants/cl-prevalence")
+ (name "sbcl-cl-markdown")
+ (version (git-version "0.10.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/hraban/cl-markdown")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-markdown" version))
(sha256
- (base32
- "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0"))))
- (inputs
- (list sbcl-moptilities sbcl-s-sysdeps sbcl-s-xml))
+ (base32 "1algqwmafipyf194cx9wfhg0pdx1ppx6s444p1pm8yaycbsyla1v"))))
+ (build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam sbcl-find-port))
- (synopsis "Implementation of object prevalence for Common Lisp")
- (description "This Common Lisp library implements object prevalence (see
-@url{https://en.wikipedia.org/wiki/System_prevalence}). It allows
-for (de)serializing to and from s-exps as well as XML. Serialization of arbitrary
-classes and cyclic data structures are supported.")
- (license license:llgpl))))
+ (list sbcl-lift sbcl-trivial-shell))
+ (inputs
+ (list sbcl-anaphora
+ sbcl-cl-containers
+ sbcl-cl-ppcre
+ sbcl-dynamic-classes
+ sbcl-metabang-bind
+ sbcl-metatilities-base))
+ (home-page "https://common-lisp.net/project/cl-markdown/")
+ (synopsis "Common Lisp rewrite of Markdown")
+ (description
+ "This is an implementation of a Markdown parser in Common Lisp.")
+ (license license:expat))))
-(define-public cl-prevalence
- (sbcl-package->cl-source-package sbcl-cl-prevalence))
+(define-public cl-markdown
+ (sbcl-package->cl-source-package sbcl-cl-markdown))
-(define-public ecl-cl-prevalence
- (sbcl-package->ecl-package sbcl-cl-prevalence))
+(define-public ecl-cl-markdown
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl-markdown)))
+ (package
+ (inherit pkg)
+ (arguments
+ ;; XXX: Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is
+ ;; undefined" on ECL.
+ ;; See https://github.com/hraban/cl-markdown/issues/11
+ '(#:tests? #f)))))
-(define-public sbcl-series
- (let ((commit "da9061b336119d1e5214aff9117171d494d5a58a")
+(define-public sbcl-cl-markless
+ (let ((commit "a0e145c03103bd3bf7e275d5ac0e19e8381eb844")
(revision "1"))
(package
- (name "sbcl-series")
- (version (git-version "2.2.11" revision commit))
+ (name "sbcl-cl-markless")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "git://git.code.sf.net/p/series/series")
+ (url "https://github.com/Shirakumo/cl-markless")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-markless" version))
(sha256
- (base32
- "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"))))
+ (base32 "154ax1yk0b1035yij29c5pgfn7ifghrxy821mk68wyljg8afgvh5"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-3bmd
+ sbcl-babel
+ sbcl-command-line-arguments
+ sbcl-documentation-utils
+ sbcl-plump
+ sbcl-trivial-gray-streams
+ sbcl-trivial-indent
+ sbcl-trivial-mimes
+ sbcl-zip))
(arguments
- ;; Disable the tests, they are apparently buggy and I didn't find
- ;; a simple way to make them run and pass.
- '(#:tests? #f))
- (synopsis "Series data structure for Common Lisp")
- (description
- "This Common Lisp library provides a series data structure much like
-a sequence, with similar kinds of operations. The difference is that in many
-situations, operations on series may be composed functionally and yet execute
-iteratively, without the need to construct intermediate series values
-explicitly. In this manner, series provide both the clarity of a functional
-programming style and the efficiency of an iterative programming style.")
- (home-page "https://series.sourceforge.net/")
- (license license:expat))))
+ '(#:asd-systems '("cl-markless"
+ "cl-markless-plump"
+ "cl-markless-epub"
+ "cl-markless-markdown"
+ "cl-markless-standalone")))
+ (home-page "https://shirakumo.github.io/cl-markless/")
+ (synopsis "Parser implementation for Markless")
+ (description "This is an implementation of the \"Markless
+standard\" (@url{https://github.com/shirakumo/markless}) at version 1.0. It
+handles the parsing of plaintext from a stream into an abstract syntax tree
+composed out of strings and component objects. From there the AST can be
+easily compiled into a target markup language like HTML.")
+ (license license:zlib))))
-(define-public cl-series
- (sbcl-package->cl-source-package sbcl-series))
+(define-public cl-markless
+ (sbcl-package->cl-source-package sbcl-cl-markless))
-(define-public ecl-series
- (sbcl-package->ecl-package sbcl-series))
+(define-public ecl-cl-markless
+ (sbcl-package->ecl-package sbcl-cl-markless))
-(define-public sbcl-periods
- (let ((commit "60383dcef88a1ac11f82804ae7a33c361dcd2949")
- (revision "2"))
+(define-public sbcl-cl-markup
+ (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390"))
(package
- (name "sbcl-periods")
- (version (git-version "0.0.2" revision commit))
+ (name "sbcl-cl-markup")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jwiegley/periods")
+ (url "https://github.com/arielnetworks/cl-markup/")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-markup" version))
(sha256
(base32
- "1ym2j4an9ig2hl210jg91gpf7xfnp6mlhkw3n9kkdnwiji3ipqlk"))))
+ "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("local-time" ,sbcl-local-time)
- ("series" ,sbcl-series)))
- (arguments
- '(#:asd-systems '("periods"
- "periods-series")))
- (synopsis "Common Lisp library for manipulating date/time objects")
+ (home-page "https://github.com/arielnetworks/cl-markup/")
+ (synopsis "Markup generation library for Common Lisp")
(description
- "Periods is a Common Lisp library providing a set of utilities for
-manipulating times, distances between times, and both contiguous and
-discontiguous ranges of time.")
- (home-page "https://github.com/jwiegley/periods")
- (license license:bsd-3))))
+ "A modern markup generation library for Common Lisp that features:
-(define-public cl-periods
- (sbcl-package->cl-source-package sbcl-periods))
+@itemize
+@item Fast (even faster through compiling the code)
+@item Safety
+@item Support for multiple document types (markup, xml, html, html5, xhtml)
+@item Output with doctype
+@item Direct output to stream
+@end itemize\n")
+ (license license:lgpl3+))))
-(define-public ecl-periods
- (sbcl-package->ecl-package sbcl-periods))
+(define-public cl-markup
+ (sbcl-package->cl-source-package sbcl-cl-markup))
-(define-public sbcl-metatilities-base
- (let ((commit "ef04337759972fd622c9b27b53149f3d594a841f")
- (revision "2"))
+(define-public ecl-cl-markup
+ (sbcl-package->ecl-package sbcl-cl-markup))
+
+(define-public sbcl-cl-mathstats
+ (let ((commit "4df38ea1b9de069cf939919253565a9ca9538eca")
+ (revision "1"))
(package
- (name "sbcl-metatilities-base")
- (version (git-version "0.6.6" revision commit))
+ (name "sbcl-cl-mathstats")
+ (version (git-version "0.8.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/metatilities-base")
+ (url "https://github.com/hraban/cl-mathstats")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-mathstats" version))
(sha256
- (base32
- "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"))))
+ (base32 "0gsjvmkmnxc4hp5z9mkm5vsllywqyg7kx8jgz88vnx47yj3va1s8"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-lift))
- (synopsis "Core of the metatilities Common Lisp library")
+ (inputs
+ (list sbcl-cl-containers sbcl-metatilities-base))
+ (home-page "https://github.com/hraban/cl-mathstats")
+ (synopsis "Common Lisp collection of mathematical routines")
(description
- "Metatilities-base is the core of the metatilities Common Lisp library
-which implements a set of utilities.")
- (home-page "https://common-lisp.net/project/metatilities-base/")
+ "This package provides Common Lisp math and statistics routines.")
(license license:expat))))
-(define-public cl-metatilities-base
- (sbcl-package->cl-source-package sbcl-metatilities-base))
+(define-public cl-mathstats
+ (sbcl-package->cl-source-package sbcl-cl-mathstats))
-(define-public ecl-metatilities-base
- (sbcl-package->ecl-package sbcl-metatilities-base))
+(define-public ecl-cl-mathstats
+ (sbcl-package->ecl-package sbcl-cl-mathstats))
-(define-public sbcl-cl-containers
- (let ((commit "781ebfe0888bae46f07c018f7d473898b1bd4f5f")
- (revision "4"))
+(define-public sbcl-cl-messagepack
+ (let ((commit "8ff2060ed20677feef8ac01558690df0aeac30b6")
+ (revision "0"))
(package
- (name "sbcl-cl-containers")
- (version (git-version "0.12.1" revision commit))
+ (name "sbcl-cl-messagepack")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/cl-containers")
+ (url "https://github.com/mbrezu/cl-messagepack")
(commit commit)))
- (file-name (git-file-name "cl-containers" version))
+ (file-name (git-file-name "cl-messagepack" version))
(sha256
- (base32
- "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l"))))
+ (base32 "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lift))
- (inputs
- (list sbcl-asdf-system-connections
- sbcl-metatilities-base
- sbcl-moptilities))
- (arguments
- '(#:asd-systems '("cl-containers"
- "cl-containers/with-moptilities"
- "cl-containers/with-utilities")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'relax-version-checks
- (lambda _
- (substitute* "cl-containers.asd"
- (("\\(:version \"metatilities-base\" \"0\\.6\\.6\"\\)")
- "\"metatilities-base\""))
- (substitute* "cl-containers-test.asd"
- (("\\(:version \"lift\" \"1\\.7\\.0\"\\)")
- "\"lift\""))
- #t)))))
- (synopsis "Container library for Common Lisp")
+ (native-inputs (list sbcl-cl-json sbcl-fiveam))
+ (inputs (list sbcl-babel sbcl-closer-mop sbcl-flexi-streams))
+ (synopsis "Common Lisp implementation of MessagePack")
(description
- "Common Lisp ships with a set of powerful built in data structures
-including the venerable list, full featured arrays, and hash-tables.
-CL-containers enhances and builds on these structures by adding containers
-that are not available in native Lisp (for example: binary search trees,
-red-black trees, sparse arrays and so on), and by providing a standard
-interface so that they are simpler to use and so that changing design
-decisions becomes significantly easier.")
- (home-page "https://common-lisp.net/project/cl-containers/")
- (license license:expat))))
+ "This is a Common Lisp implementation of the MessagePack
+(@url{http://msgpack.org/}) serialization/deserialization format,
+implemented according to
+@url{http://wiki.msgpack.org/display/MSGPACK/Format+specification}.")
+ (home-page "https://github.com/mbrezu/cl-messagepack")
+ (license license:bsd-2))))
-(define-public cl-containers
- (sbcl-package->cl-source-package sbcl-cl-containers))
+(define-public cl-messagepack
+ (sbcl-package->cl-source-package sbcl-cl-messagepack))
-(define-public ecl-cl-containers
- (sbcl-package->ecl-package sbcl-cl-containers))
+(define-public ecl-cl-messagepack
+ (sbcl-package->ecl-package sbcl-cl-messagepack))
-(define-public sbcl-cambl
- (let ((commit "7016d1a98215f82605d1c158e7a16504ca1f4636")
+(define-public sbcl-cl-mime
+ (let ((commit "d30a28e0a40393bd3af7d138daa05319ed2e9d07")
(revision "1"))
(package
- (name "sbcl-cambl")
- (version (git-version "4.0.0" revision commit))
+ (name "sbcl-cl-mime")
+ ;; One commit says "update to cl-mime-0.5.3", even though the .asd is at 0.5.1.
+ (version (git-version "0.5.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jwiegley/cambl")
+ ;; Maintained fork according to http://www.cliki.net/CL-MIME:
+ (url "https://github.com/40ants/cl-mime")
(commit commit)))
- (file-name (git-file-name "cambl" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"))))
+ (base32 "0qn8if0fj6vzc897pqqqs0m1y107gmzqngpqhqmwrcsp1ckj5k0v"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-xlunit))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-containers" ,sbcl-cl-containers)
- ("local-time" ,sbcl-local-time)
- ("periods" ,sbcl-periods)))
- (synopsis "Commoditized amounts and balances for Common Lisp")
+ (list sbcl-cl-ppcre sbcl-cl-base64 sbcl-cl-qprint))
+ (native-inputs
+ (list sbcl-rove))
+ (home-page "https://github.com/40ants/cl-mime/")
+ (synopsis "Read and print MIME content in Common Lisp")
(description
- "CAMBL is a Common Lisp library providing a convenient facility for
-working with commoditized values. It does not allow compound units (and so is
-not suited for scientific operations) but does work rather nicely for the
-purpose of financial calculations.")
- (home-page "https://github.com/jwiegley/cambl")
- (license license:bsd-3))))
+ "This is a Common Lisp library for reading and printing MIME content.
+It supports automatic conversion between 7-bit, quoted-printable and base64
+encodings.")
+ (license license:lgpl2.1))))
-(define-public cl-cambl
- (sbcl-package->cl-source-package sbcl-cambl))
+(define-public cl-mime
+ (sbcl-package->cl-source-package sbcl-cl-mime))
-(define-public ecl-cambl
- (sbcl-package->ecl-package sbcl-cambl))
+(define-public ecl-cl-mime
+ (sbcl-package->ecl-package sbcl-cl-mime))
-(define-public sbcl-cl-ledger
- (let ((commit "08e0be41795e804cd36142e51756ad0b1caa377b")
- (revision "1"))
+(define-public sbcl-cl-mimeparse
+ (let ((commit "93cbdf6f6fe8a2eb5f652f8adec453eb98ea0547")
+ (revision "0"))
(package
- (name "sbcl-cl-ledger")
- (version (git-version "4.0.0" revision commit))
+ (name "sbcl-cl-mimeparse")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ledger/cl-ledger")
+ (url "https://github.com/mmontone/cl-mimeparse")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-mimeparse" version))
(sha256
- (base32
- "1via0qf6wjcyxnfbmfxjvms0ik9j8rqbifgpmnhrzvkhrq9pv8h1"))))
+ (base32 "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("cambl" ,sbcl-cambl)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("local-time" ,sbcl-local-time)
- ("periods" ,sbcl-periods)))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-system-definition
- (lambda _
- (substitute* "cl-ledger.asd"
- ((" :build-operation program-op") "")
- ((" :build-pathname \"cl-ledger\"") "")
- ((" :entry-point \"ledger::main\"") ""))
- #t)))))
- (synopsis "Common Lisp port of the Ledger accounting system")
+ '(#:asd-test-systems '("cl-mimeparse-tests")))
+ (native-inputs
+ (list sbcl-rt))
+ (inputs
+ (list sbcl-cl-ppcre sbcl-parse-number))
+ (home-page "https://github.com/mmontone/cl-mimeparse/")
+ (synopsis "Common Lisp library for parsing MIME types")
(description
- "CL-Ledger is a Common Lisp port of the Ledger double-entry accounting
-system.")
- (home-page "https://github.com/ledger/cl-ledger")
- (license license:bsd-3))))
+ "This package provides a library for parsing MIME types, in the spirit
+of http://code.google.com/p/mimeparse/, with a Common Lisp flavor.")
+ (license license:expat))))
-(define-public cl-ledger
- (sbcl-package->cl-source-package sbcl-cl-ledger))
+(define-public cl-mimeparse
+ (sbcl-package->cl-source-package sbcl-cl-mimeparse))
-(define-public ecl-cl-ledger
- (sbcl-package->ecl-package sbcl-cl-ledger))
+(define-public ecl-cl-mimeparse
+ (sbcl-package->ecl-package sbcl-cl-mimeparse))
-(define-public sbcl-bst
- (let ((commit "8545aed0d504df2829ad139566feeabe22305388")
+(define-public sbcl-cl-mixed
+ (let ((commit "4aaff134d3902d93a2a8605c10de4bcfc62d7afa")
(revision "0"))
(package
- (name "sbcl-bst")
- (version (git-version "2.0" revision commit))
+ (name "sbcl-cl-mixed")
+ (version (git-version "2.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/bst")
+ (url "https://github.com/Shirakumo/cl-mixed")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-mixed" version))
(sha256
- (base32 "18ig7rvxcra69437g0i8sxyv7c5dg26jqnx1rc2f9pxmihdprgk8"))))
+ (base32 "1mrj95lxb1gbxxm89x8gy1ifw2ic1p5wwpapkxcd2jr8abw7zny0"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Delete bundled libraries.
+ `(begin
+ (delete-file-recursively "static")))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-alexandria sbcl-fiveam))
- (synopsis "Binary search tree for Common Lisp")
+ (arguments
+ '(#:asd-systems '("cl-mixed"
+ "cl-mixed-examples"
+ "cl-mixed-flac"
+ "cl-mixed-vorbis"
+ "cl-mixed-alsa"
+ "cl-mixed-jack"
+ "cl-mixed-mpg123"
+ "cl-mixed-mpt"
+ "cl-mixed-out123"
+ "cl-mixed-pulse"
+ "cl-mixed-sdl2"
+ "cl-mixed-wav")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "low-level.lisp"
+ (("libmixed.so.2")
+ (search-input-file inputs "/lib/libmixed.so.2"))))))))
+ (inputs
+ (list libmixed
+ sbcl-alexandria
+ sbcl-cffi
+ sbcl-cl-flac
+ sbcl-cl-mpg123
+ sbcl-cl-out123
+ sbcl-cl-vorbis
+ sbcl-documentation-utils
+ sbcl-sdl2
+ sbcl-static-vectors
+ sbcl-trivial-features))
+ (home-page "https://shirakumo.github.io/cl-mixed/")
+ (synopsis "Extended audio library for Common Lisp")
(description
- "BST is a Common Lisp library for working with binary search trees that
-can contain any kind of values.")
- (home-page "https://codeberg.org/glv/bst")
- (license license:gpl3))))
+ "This package provides CFFI binding to @code{libmixed} audio library for
+Common Lisp with support of other audio formats available on GNU/Linux systems:
-(define-public cl-bst
- (sbcl-package->cl-source-package sbcl-bst))
+@itemize
-(define-public ecl-bst
- (sbcl-package->ecl-package sbcl-bst))
+@item @acronym{Alsa, Advanced Linux Sound Architecture}
+@item @acronym{Jack, JackAudio toolkit}
+@item @acronym{Openmpt, Libopenmpt playback drain for tracker files}
+@item @acronym{PulseAudio, PulseAudio based playback drain}
+@item Flac (via CL-FLAC)
+@item Mpg123 (via CL-MPG123)
+@item Ogg/vorbis (via CL-VORBIS)
+@item Out123 (via CL-OUT123)
+@item WAV
-(define-public sbcl-trivial-octet-streams
- (let ((commit "bc5d398b18549fd42e9c2a365df28ad865f1b85d")
- (revision "0"))
+@end itemize")
+ (license license:zlib))))
+
+(define-public cl-mixed
+ (sbcl-package->cl-source-package sbcl-cl-mixed))
+
+(define-public ecl-cl-mixed
+ (sbcl-package->ecl-package sbcl-cl-mixed))
+
+(define-public sbcl-cl-modio
+ (let ((commit "2fd288af27b574f448357fa6de4b42acf44e2f11")
+ (revision "1"))
(package
- (name "sbcl-trivial-octet-streams")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-cl-modio")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/trivial-octet-streams")
+ (url "https://github.com/Shinmera/cl-modio/")
(commit commit)))
- (file-name (git-file-name "cl-trivial-octet-streams" version))
(sha256
- (base32 "0ysnsarlzynb7jf4b63b6kkxjancxc66jwmn0sb3vxyh87siiv6n"))))
+ (base32 "0hz87v81pi8kr2c7az30czpdf7v757lkzlsmdcc59p94pipca7m9"))
+ (file-name (git-file-name "cl-modio" version))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/sharplispers/trivial-octet-streams")
- (synopsis "In-memory octet streams for Common Lisp")
- (description
- "TRIVIAL-OCTET-STREAMS is a Common Lisp library implementing in-memory
-octet streams analogous to string streams.")
- (license license:bsd-3))))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-zippy
+ sbcl-jzon
+ sbcl-cl-ppcre
+ sbcl-drakma
+ sbcl-documentation-utils
+ sbcl-language-codes))
+ (synopsis "Client library for the mod.io API")
+ (description "This is a client library to interact with the
+\"mod.io\" (@url{https://mod.io}) platform to manage \"mods\" or extensions
+for games and other applications. It covers the full v1 API and includes
+convenience methods to make interacting with the API as well as syncing mods
+and so on easy.")
+ (home-page "https://shinmera.github.io/cl-modio/")
+ (license license:zlib))))
-(define-public cl-trivial-octet-streams
- (sbcl-package->cl-source-package sbcl-trivial-octet-streams))
+(define-public cl-modio
+ (sbcl-package->cl-source-package sbcl-cl-modio))
-(define-public ecl-trivial-octet-streams
- (sbcl-package->ecl-package sbcl-trivial-octet-streams))
+(define-public ecl-cl-modio
+ (sbcl-package->ecl-package sbcl-cl-modio))
-(define-public sbcl-cl-octet-streams
+(define-public sbcl-cl-morse
(package
- (name "sbcl-cl-octet-streams")
- (version "1.2")
+ (name "sbcl-cl-morse")
+ (version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/cl-octet-streams")
+ (url "https://github.com/em7/cl-morse")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-morse" version))
(sha256
- (base32 "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"))))
+ (base32 "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-trivial-gray-streams))
- (synopsis "In-memory octet streams for Common Lisp")
+ (inputs (list sbcl-cl-ppcre))
+ (native-inputs (list sbcl-fiveam))
+ (home-page "https://github.com/em7/cl-morse")
+ (synopsis "Morse code translation library for Common Lisp")
(description
- "CL-octet-streams is a library implementing in-memory octet
-streams for Common Lisp. It was inspired by the trivial-octet-streams and
-cl-plumbing libraries.")
- (home-page "https://codeberg.org/glv/cl-octet-streams")
- (license license:gpl3+)))
+ "@code{cl-morse} is a Morse code translation library for Common Lisp.")
+ (license license:bsd-3)))
-(define-public cl-octet-streams
- (sbcl-package->cl-source-package sbcl-cl-octet-streams))
+(define-public cl-morse
+ (sbcl-package->cl-source-package sbcl-cl-morse))
-(define-public ecl-cl-octet-streams
- (sbcl-package->ecl-package sbcl-cl-octet-streams))
+(define-public ecl-cl-morse
+ (sbcl-package->ecl-package sbcl-cl-morse))
-(define-public sbcl-lzlib
- (let ((commit "22767ca12d1c1bd59a7ae1f9c5ef7d2e937206bb")
- (revision "2"))
+(define-public sbcl-cl-mount-info
+ (let ((commit "2024f5037a7f63db3e3587dc9972cd7b9318f06b")
+ (revision "1"))
(package
- (name "sbcl-lzlib")
- (version (git-version "2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/glv/cl-lzlib")
- (commit commit)))
- (file-name (git-file-name "cl-lzlib" version))
- (sha256
- (base32 "1dxzlkay7aqcs65h2f7j7rl4sdjija60dshlahzyllfw174p9d3m"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list lzlib
- sbcl-cffi
- sbcl-cl-octet-streams
- sbcl-lparallel))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/lzlib.lisp"
- (("liblz\\.so")
- (search-input-file inputs "/lib/liblz.so"))))))))
- (synopsis "Common Lisp library for lzip (de)compression")
- (description
- "This Common Lisp library provides functions for lzip (LZMA)
-compression/decompression using bindings to the lzlib C library.")
- (home-page "https://codeberg.org/glv/cl-lzlib")
- (license license:gpl3+))))
+ (name "sbcl-cl-mount-info")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://notabug.org/cage/cl-mount-info.git")
+ (commit commit)))
+ (file-name (git-file-name "cl-mount-info" version))
+ (sha256
+ (base32 "0vza9gj9q42nzb5v8aj22lmn4aqx9vrddsb5a343nbwfz89hbh9x"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-cffi sbcl-cl-ppcre))
+ (home-page "https://notabug.org/cage/cl-mount-info.git")
+ (synopsis "Library to get information about mounted filesystems")
+ (description
+ "CL-MOUNT-INFO is a Common Lisp wrapper around @code{getmntent(3)} and
+related C functions to get information about the mounted file system.")
+ (license license:lgpl3))))
-(define-public cl-lzlib
- (sbcl-package->cl-source-package sbcl-lzlib))
+(define-public cl-mount-info
+ (sbcl-package->cl-source-package sbcl-cl-mount-info))
-(define-public ecl-lzlib
- (sbcl-package->ecl-package sbcl-lzlib))
+(define-public ecl-cl-mount-info
+ (sbcl-package->ecl-package sbcl-cl-mount-info))
-(define-public sbcl-chanl
- (let ((commit "56e90a126c78b39bb621a01585e8d3b985238e8c")
+(define-public sbcl-cl-mpg123
+ (let ((commit "5f042c839d2ea4a2ff2a7b60c839d8633d64161d")
(revision "1"))
(package
- (name "sbcl-chanl")
- (version (git-version "0.4.1" revision commit))
+ (name "sbcl-cl-mpg123")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/zkat/chanl")
+ (url "https://github.com/Shirakumo/cl-mpg123")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-mpg123" version))
(sha256
- (base32
- "0b1cf6c12qx5cy1fw2z42jgh566rp3l8nv5qf0qqc569s7bgmrh4"))))
+ (base32 "1hl721xaczxck008ax2y3jpkm509ry1sg3lklh2k76764m3ndrjf"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled pre-compiled libraries.
+ (delete-file-recursively "static")
+ #t))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
+ (arguments
+ `(#:asd-systems '("cl-mpg123" "cl-mpg123-example")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "low-level.lisp"
+ (("libmpg123.so" all)
+ (string-append (assoc-ref inputs "libmpg123")
+ "/lib/" all))))))))
(inputs
- (list sbcl-bordeaux-threads))
- (synopsis "Portable channel-based concurrency for Common Lisp")
- (description "Common Lisp library for channel-based concurrency. In
-a nutshell, you create various threads sequentially executing tasks you need
-done, and use channel objects to communicate and synchronize the state of these
-threads.")
- (home-page "https://github.com/zkat/chanl")
- (license (list license:expat license:bsd-3)))))
+ `(("cffi" ,sbcl-cffi)
+ ("cl-out123" ,sbcl-cl-out123)
+ ("documentation-utils" ,sbcl-documentation-utils)
+ ("libmpg123" ,mpg123)
+ ("trivial-features" ,sbcl-trivial-features)
+ ("trivial-garbage" ,sbcl-trivial-garbage)
+ ("verbose" ,sbcl-verbose)))
+ (home-page "https://shirakumo.github.io/cl-mpg123/")
+ (synopsis "Common Lisp bindings to libmpg123")
+ (description
+ "This is a bindings and wrapper library to @code{libmpg123} allowing for
+convenient, extensive, and fast decoding of MPEG1/2/3 (most prominently mp3)
+files.")
+ (license license:zlib))))
-(define-public cl-chanl
- (sbcl-package->cl-source-package sbcl-chanl))
+(define-public cl-mpg123
+ (sbcl-package->cl-source-package sbcl-cl-mpg123))
-(define-public ecl-chanl
- (sbcl-package->ecl-package sbcl-chanl))
+(define-public ecl-cl-mpg123
+ (sbcl-package->ecl-package sbcl-cl-mpg123))
-(define-public sbcl-cl-store
- (let ((commit "c787337a16ea8cf8a06227f35933a4ec774746b3")
+(define-public sbcl-cl-murmurhash
+ ;; No release.
+ (let ((commit "5433f5e95f1cce63a81259a471150834c6a59364")
(revision "1"))
(package
- (name "sbcl-cl-store")
- (version (git-version "0.8.11" revision commit))
+ (name "sbcl-cl-murmurhash")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/ruricolist/cl-murmurhash/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/skypher/cl-store")
+ (url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "194srkg8nrym19c6i7zbnkzshc1qhqa82m53qnkirz9fw928bqxr"))))
+ "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-babel))
(native-inputs
- (list sbcl-rt))
- (synopsis "Common Lisp library to serialize data")
+ (list sbcl-fiveam))
+ (synopsis "32-bit version of Murmurhash3 for Common Lisp")
(description
- "CL-STORE is a portable serialization package which should give you the
-ability to store all Common Lisp data types into streams.")
- (home-page "https://www.common-lisp.net/project/cl-store/")
+ "This Common Lisp package offers an implementation of the 32-bit
+variant of MurmurHash3 (@url{https://github.com/aappleby/smhasher}), a fast
+non-crytographic hashing algorithm.")
(license license:expat))))
-(define-public cl-store
- (sbcl-package->cl-source-package sbcl-cl-store))
-
-(define-public ecl-cl-store
- (sbcl-package->ecl-package sbcl-cl-store))
+(define-public cl-murmurhash
+ (sbcl-package->cl-source-package sbcl-cl-murmurhash))
-(define-public sbcl-specialization-store
- (let ((commit "8d39a866a6f24986aad3cc52349e9cb2653496f3")
- (revision "1"))
- (package
- (name "sbcl-specialization-store")
- (version (git-version "0.0.5" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/markcox80/specialization-store")
- (commit commit)))
- (file-name (git-file-name "specialization-store" version))
- (sha256
- (base32 "0r0bgb46q4gy72l78s7djkxq8ibb4bb3yh9brsry5lih7br8lhi0"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria sbcl-introspect-environment))
- (home-page "https://github.com/markcox80/specialization-store")
- (synopsis "Different type of generic function for Common Lisp")
- (description
- "SPECIALIZATION-STORE system provides a new kind of function, called
-a store function, whose behavior depends on the types of objects passed to the
-function.")
- (license license:bsd-2))))
+(define-public ecl-cl-murmurhash
+ (sbcl-package->ecl-package sbcl-cl-murmurhash))
-(define-public ecl-specialization-store
+(define-public sbcl-cl-mustache
(package
- (inherit (sbcl-package->ecl-package sbcl-specialization-store))
- (arguments
- ;; TODO: Find why the tests get stuck forever; disable them for now.
- `(#:tests? #f))))
+ (name "sbcl-cl-mustache")
+ (version "0.12.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kanru/cl-mustache")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-mustache" version))
+ (sha256
+ (base32 "149xbb6wxq1napliwm9cv729hwcgfnjli6y8hingfixz7f10lhks"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/kanru/cl-mustache")
+ (synopsis "Common Lisp Mustache template renderer")
+ (description "This is a Common Lisp implementation for the Mustache
+template system. More details on the standard are available at
+@url{https://mustache.github.io}.")
+ (license license:expat)))
-(define-public cl-specialization-store
- (sbcl-package->cl-source-package sbcl-specialization-store))
+(define-public cl-mustache
+ (sbcl-package->cl-source-package sbcl-cl-mustache))
-(define-public sbcl-cl-gobject-introspection
- (let ((commit "83beec4492948b52aae4d4152200de5d5c7ac3e9")
- (revision "3"))
+(define-public ecl-cl-mustache
+ (sbcl-package->ecl-package sbcl-cl-mustache))
+
+(define-public sbcl-cl-mysql
+ (let ((commit "ab56c279c1815aec6ca0bfe85164ff7e85cfb6f9")
+ (revision "1"))
(package
- (name "sbcl-cl-gobject-introspection")
- (version (git-version "0.3" revision commit))
- (home-page "https://github.com/andy128k/cl-gobject-introspection")
+ (name "sbcl-cl-mysql")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/hackinghat/cl-mysql")
(commit commit)))
- (file-name (git-file-name "cl-gobject-introspection" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0xwmj4b3whz12i474g54krp1v6h0fpvsx8lgwpk6rkli9xc71wc3"))))
+ (base32 "0dg5ynx2ww94d0qfwrdrm7plkn43h64hs4iiq9mj2s1s4ixnp3lr"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list glib
- gobject-introspection
- sbcl-alexandria
- sbcl-cffi
- sbcl-iterate
- sbcl-trivial-garbage))
(native-inputs
- (list sbcl-fiveam))
+ (list sbcl-stefil))
+ (inputs
+ `(("cffi" ,sbcl-cffi)
+ ("mariadb-lib" ,mariadb "lib")))
(arguments
- '(#:phases
+ `(#:tests? #f ; TODO: Tests require a running server
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/init.lisp"
- (("libgobject-2\\.0\\.so")
- (search-input-file inputs "/lib/libgobject-2.0.so"))
- (("libgirepository-1\\.0\\.so")
- (search-input-file inputs
- "/lib/libgirepository-1.0.so"))))))))
- (synopsis "Common Lisp bindings to GObject Introspection")
+ (substitute* "system.lisp"
+ (("libmysqlclient_r" all)
+ (string-append (assoc-ref inputs "mariadb-lib")
+ "/lib/"
+ all)))
+ #t)))))
+ (synopsis "Common Lisp wrapper for MySQL")
(description
- "This library is a bridge between Common Lisp and GObject
-Introspection, which enables Common Lisp programs to access the full interface
-of C+GObject libraries without the need of writing dedicated bindings.")
- (license (list license:bsd-3
- ;; Tests are under a different license.
- license:llgpl)))))
+ "@code{cl-mysql} is a Common Lisp implementation of a MySQL wrapper.")
+ (home-page "http://www.hackinghat.com/index.php/cl-mysql")
+ (license license:expat))))
-(define-public cl-gobject-introspection
- (sbcl-package->cl-source-package sbcl-cl-gobject-introspection))
+(define-public cl-mysql
+ (sbcl-package->cl-source-package sbcl-cl-mysql))
-(define-public ecl-cl-gobject-introspection
- (sbcl-package->ecl-package sbcl-cl-gobject-introspection))
+(define-public ecl-cl-mysql
+ (sbcl-package->ecl-package sbcl-cl-mysql))
-(define-public sbcl-cl-gobject-introspection-wrapper
- (let ((commit "2d197cba7e7d734ac8a2e181e5e709e5b218bada")
+(define-public sbcl-cl-num-utils
+ (let ((commit "97a88cd34540acf52e872a82ebfef3da0a34fa12")
(revision "1"))
(package
- (name "sbcl-cl-gobject-introspection-wrapper")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-num-utils")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
+ (url "https://github.com/tpapp/cl-num-utils")
(commit commit)))
- (file-name (git-file-name "cl-gobject-introspection-wrapper" version))
+ (file-name (git-file-name "cl-num-utils" version))
(sha256
- (base32 "05np2zs5806ib6qfz7d6knyaz6llxgwvjqavl1fsz5hcga40296s"))))
+ (base32 "15ihsxxs76xnldmqfsbxybckqjwrxwcpphgghiwzr2mnbqjpdqkh"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-cl-gobject-introspection
- sbcl-cl-ppcre))
- (home-page
- "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
- (synopsis
- "Wrap and call GObject Introspection FFI function in Common Lisp")
+ (list sbcl-anaphora sbcl-alexandria sbcl-array-operations
+ sbcl-cl-slice sbcl-let-plus))
+ (native-inputs
+ (list sbcl-clunit))
+ (home-page "https://github.com/tpapp/cl-num-utils")
+ (synopsis "Numerical utilities for Common Lisp")
(description
- "This library converts the elements from GObject Introspection into
-Common Lisp-style definitions, based on cl-gobject-introspection.")
- (license license:lgpl3+))))
+ "@code{cl-num-utils} implements simple numerical functions for Common
+Lisp, including:
+@itemize
+@item @code{num=}, a comparison operator for floats
+@item simple arithmeric functions, like @code{sum} and @code{l2norm}
+@item elementwise operations for arrays
+@item intervals
+@item special matrices and shorthand for their input
+@item sample statistics
+@item Chebyshev polynomials
+@item univariate rootfinding
+@end itemize")
+ (license license:boost1.0))))
-(define-public cl-gobject-introspection-wrapper
- (sbcl-package->cl-source-package sbcl-cl-gobject-introspection-wrapper))
+(define-public cl-num-utils
+ (sbcl-package->cl-source-package sbcl-cl-num-utils))
-(define-public ecl-cl-gobject-introspection-wrapper
- (sbcl-package->ecl-package sbcl-cl-gobject-introspection-wrapper))
+(define-public ecl-cl-num-utils
+ (sbcl-package->ecl-package sbcl-cl-num-utils))
-(define-public sbcl-cl-glib
- (let ((commit "9e52827cce1cbb3962536b6a5e628febab593f57")
+(define-public sbcl-cl-octet-streams
+ (package
+ (name "sbcl-cl-octet-streams")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/glv/cl-octet-streams")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-trivial-gray-streams))
+ (synopsis "In-memory octet streams for Common Lisp")
+ (description
+ "CL-octet-streams is a library implementing in-memory octet
+streams for Common Lisp. It was inspired by the trivial-octet-streams and
+cl-plumbing libraries.")
+ (home-page "https://codeberg.org/glv/cl-octet-streams")
+ (license license:gpl3+)))
+
+(define-public cl-octet-streams
+ (sbcl-package->cl-source-package sbcl-cl-octet-streams))
+
+(define-public ecl-cl-octet-streams
+ (sbcl-package->ecl-package sbcl-cl-octet-streams))
+
+(define-public sbcl-cl-online-learning
+ (let ((commit "87fbef8a340219e853adb3a5bf44a0470da76964")
(revision "1"))
(package
- (name "sbcl-cl-glib")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-online-learning")
+ (version (git-version "0.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bohonghuang/cl-glib")
+ (url "https://github.com/masatoi/cl-online-learning")
(commit commit)))
- (file-name (git-file-name "cl-glib" version))
+ (file-name (git-file-name "cl-online-learning" version))
(sha256
- (base32 "0dxa493zdp1p93cahhpp3yaggn3j3kkn90mdw99g4ld7scmiglp4" ))))
+ (base32
+ "1lfq04lnxivx59nq5dd02glyqsqzf3vdn4s9b8wnaln5fs8g2ph9"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("cl-gio" "cl-glib" "cl-gobject")))
+ (native-inputs
+ (list sbcl-prove))
(inputs
- (list glib
- gobject-introspection
- sbcl-bordeaux-threads
- sbcl-cl-gobject-introspection-wrapper))
- (home-page "https://github.com/bohonghuang/cl-glib")
- (synopsis "Glib, GIO and Gobject bindings for Common Lisp")
- (description "This library provides Glib, GIO and Gobject bindings for
-Common Lisp via Gobject Introspection.")
- (license license:lgpl3+))))
+ `(("cl-libsvm-format" ,sbcl-cl-libsvm-format)
+ ("cl-store" ,sbcl-cl-store)))
+ (home-page "https://github.com/masatoi/cl-online-learning")
+ (synopsis "Online Machine Learning for Common Lisp")
+ (description
+ "This library contains a collection of machine learning algorithms for
+online linear classification written in Common Lisp.")
+ (license license:expat))))
-(define-public cl-glib
- (sbcl-package->cl-source-package sbcl-cl-glib))
+(define-public cl-online-learning
+ (sbcl-package->cl-source-package sbcl-cl-online-learning))
-(define-public ecl-cl-glib
- (sbcl-package->ecl-package sbcl-cl-glib))
+(define-public ecl-cl-online-learning
+ (sbcl-package->ecl-package sbcl-cl-online-learning))
-(define-public sbcl-cl-gtk4
- (let ((commit "d116905e7b68508d03681a50b3b24d63e7b111e4")
+(define-public sbcl-cl-opengl
+ (let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59")
(revision "1"))
(package
- (name "sbcl-cl-gtk4")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-opengl")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bohonghuang/cl-gtk4")
+ (url "https://github.com/3b/cl-opengl")
(commit commit)))
- (file-name (git-file-name "cl-gtk4" version))
+ (file-name (git-file-name "cl-opengl" version))
(sha256
- (base32 "0mprmmvbagnflvhynn51l42nbwr08rld99ls0c48m5lpjn0ja4zc"))))
+ (base32 "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-systems '("cl-gtk4" "cl-gdk4")))
- ;; propagate because it at least requires the typelib files at runtime
- (propagated-inputs (list gtk))
+ `(#:asd-systems '("cl-opengl" "cl-glu" "cl-glut")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gl/library.lisp"
+ (("libGL.so" all)
+ (search-input-file inputs "/lib/libGL.so")))
+ (substitute* "glu/library.lisp"
+ (("libGLU.so" all)
+ (search-input-file inputs "/lib/libGLU.so")))
+ (substitute* "glut/library.lisp"
+ (("libglut.so" all)
+ (search-input-file inputs "/lib/libglut.so"))))))))
(inputs
- (list gobject-introspection
- sbcl-cl-glib
- sbcl-cl-gobject-introspection-wrapper))
- (home-page "https://github.com/bohonghuang/cl-gtk4")
- (synopsis "GTK4 bindings for Common Lisp")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("float-features" ,sbcl-float-features)
+ ("freeglut" ,freeglut)
+ ("glu" ,glu)
+ ("mesa" ,mesa)))
+ (home-page "https://github.com/3b/cl-opengl")
+ (synopsis "Common Lisp bindings to OpenGL, GLU and GLUT APIs")
(description
- "This library provides GTK4 bindings for Common Lisp via Gobject
-Introspection, in the cl-gtk4 ASDF system.")
- (license license:lgpl3))))
+ "This package provides a set of bindings and utilities for accessing the
+OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.")
+ (license license:bsd-3))))
-(define-public cl-gtk4
- (sbcl-package->cl-source-package sbcl-cl-gtk4))
+(define-public cl-opengl
+ (sbcl-package->cl-source-package sbcl-cl-opengl))
-(define-public ecl-cl-gtk4
- (sbcl-package->ecl-package sbcl-cl-gtk4))
+(define-public ecl-cl-opengl
+ (sbcl-package->ecl-package sbcl-cl-opengl))
-(define-public sbcl-cl-slug
- (let ((commit "ffb229d10f0d3f7f54e706791725225e200bf749")
- (revision "1"))
+(define-public sbcl-cl-out123
+ (let ((commit "41771bfd419e7349ad569f8e6fcd8a26d6f9e5b7")
+ (revision "2"))
(package
- (name "sbcl-cl-slug")
- (version (git-version "0.4.1" revision commit))
+ (name "sbcl-cl-out123")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/EuAndreh/cl-slug")
+ (url "https://github.com/Shirakumo/cl-out123")
(commit commit)))
- (file-name (git-file-name "cl-slug" version))
+ (file-name (git-file-name "cl-out123" version))
(sha256
- (base32 "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"))))
+ (base32 "0ahgc5l5lbpl3ini4pn5crh8b7dlr386pxczl0d4h6djhccxzs4w"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled pre-compiled libraries.
+ (delete-file-recursively "static")))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
+ (arguments
+ `(#:tests? #f ; No tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "low-level.lisp"
+ (("libout123.so")
+ (search-input-file inputs "/lib/libout123.so"))))))))
(inputs
- `(("ppcre" ,sbcl-cl-ppcre)))
- (home-page "https://github.com/EuAndreh/cl-slug")
- (synopsis "Multi-language slug formatter")
+ (list mpg123
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-documentation-utils
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (home-page "https://shirakumo.github.io/cl-out123/")
+ (synopsis "Common Lisp bindings to libout123")
(description
- "This is a small Common Lisp library to make slugs, mainly for URIs,
-from English and beyond.")
- (license license:llgpl))))
+ "This is a bindings library to @code{libout123} which allows easy
+cross-platform audio playback.")
+ (license license:zlib))))
-(define-public ecl-cl-slug
- (sbcl-package->ecl-package sbcl-cl-slug))
+(define-public cl-out123
+ (sbcl-package->cl-source-package sbcl-cl-out123))
-(define-public cl-slug
- (sbcl-package->cl-source-package sbcl-cl-slug))
+(define-public ecl-cl-out123
+ (sbcl-package->ecl-package sbcl-cl-out123))
-(define-public sbcl-string-case
- (let ((commit "718c761e33749e297cd2809c7ba3ade1985c49f7")
- (revision "0"))
+(define-public sbcl-cl-package-locks
+ (let ((commit "96a358ede7cef416d61d2f699e724fe1d9de602c")
+ (revision "1"))
(package
- (name "sbcl-string-case")
+ (name "sbcl-cl-package-locks")
(version (git-version "0.0.2" revision commit))
- (home-page "https://github.com/pkhuong/string-case")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/elliottjohnson/cl-package-locks")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-package-locks" version))
(sha256
- (base32
- "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md"))))
+ (base32 "0g3gfljnvpgd66ccd2sqawlkwqx4a0wsdrg5180va61w869cgxqq"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Efficient string= case in Common Lisp")
+ (home-page "https://github.com/elliottjohnson/cl-package-locks")
+ (synopsis "Compatibility layer for dealing with package locks")
(description
- "@code{string-case} is a Common Lisp macro that generates specialised decision
-trees to dispatch on string equality.")
- (license license:bsd-3))))
+ "This is a Common Lisp library providing a unified way to work with
+package locks across supported Common Lisp implementations.")
+ (license license:expat))))
-(define-public cl-string-case
- (sbcl-package->cl-source-package sbcl-string-case))
+(define-public cl-package-locks
+ (sbcl-package->cl-source-package sbcl-cl-package-locks))
-(define-public ecl-string-case
- (sbcl-package->ecl-package sbcl-string-case))
+(define-public ecl-cl-package-locks
+ (sbcl-package->ecl-package sbcl-cl-package-locks))
-(define-public sbcl-garbage-pools
- (let ((commit "9a7cb7f48b04197c0495df3b6d2e8395ad13f790")
+(define-public sbcl-cl-pass
+ (let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34")
(revision "1"))
(package
- (name "sbcl-garbage-pools")
- (version (git-version "0.1.2" revision commit))
+ (name "sbcl-cl-pass")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/garbage-pools")
+ (url "https://github.com/eudoxia0/cl-pass")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-pass" version))
(sha256
- (base32 "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"))))
+ (base32 "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/archimag/garbage-pools")
- (synopsis "Resource management pools for Common Lisp")
- (description "GARBAGE-POOLS is Common Lisp re-implementation of the APR
-Pools for resource management.")
+ (inputs
+ (list sbcl-ironclad sbcl-trivial-utf-8 sbcl-split-sequence))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/eudoxia0/cl-pass")
+ (synopsis "Password hashing and verification library")
+ (description
+ "@code{cl-pass} is a password hashing and verification library.")
(license license:expat))))
-(define-public ecl-garbage-pools
- (sbcl-package->ecl-package sbcl-garbage-pools))
+(define-public cl-pass
+ (sbcl-package->cl-source-package sbcl-cl-pass))
-(define-public cl-garbage-pools
- (sbcl-package->cl-source-package sbcl-garbage-pools))
+(define-public ecl-cl-pass
+ (sbcl-package->ecl-package sbcl-cl-pass))
-(define-public sbcl-global-vars
- (let ((commit "c749f32c9b606a1457daa47d59630708ac0c266e")
- (revision "0"))
+(define-public sbcl-cl-pcg
+ (let ((commit "8263d85ab0ca17fb05637a4430c2d564456bce8f")
+ (revision "1"))
(package
- (name "sbcl-global-vars")
+ (name "sbcl-cl-pcg")
(version (git-version "1.0.0" revision commit))
- (home-page "https://github.com/lmj/global-vars")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/sjl/cl-pcg")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-pcg" version))
(sha256
- (base32
- "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"))))
+ (base32 "0s57wvvlvshp1gcp9i9d3qcmqhswnxps3i0y7wbb0v8i1a3p46m4"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Efficient global variables in Common Lisp")
+ (native-inputs
+ (list sbcl-1am))
+ (home-page "https://github.com/sjl/cl-pcg")
+ (synopsis "Permuted congruential generators in Common Lisp")
(description
- "In Common Lisp, a special variable that is never dynamically bound
-typically serves as a stand-in for a global variable. The @code{global-vars}
-library provides true global variables that are implemented by some compilers.
-An attempt to rebind a global variable properly results in a compiler error.
-That is, a global variable cannot be dynamically bound.
-
-Global variables therefore allow us to communicate an intended usage that
-differs from special variables. Global variables are also more efficient than
-special variables, especially in the presence of threads.")
+ "This is a bare-bones Permuted Congruential Generator implementation in
+pure Common Lisp.")
(license license:expat))))
-(define-public cl-global-vars
- (sbcl-package->cl-source-package sbcl-global-vars))
+(define-public cl-pcg
+ (sbcl-package->cl-source-package sbcl-cl-pcg))
-(define-public ecl-global-vars
- (sbcl-package->ecl-package sbcl-global-vars))
+(define-public ecl-cl-pcg
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl-pcg)))
+ (package
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; Tests are failing on ECL with:
+ ;; PCG.TEST::TEST-REWINDAn error occurred during initialization:
+ ;; 40502229875678917802724098623316930025 is not of type
+ ;; (INTEGER 0 2305843009213693951)
+ ((#:tests? _ #f) #f))))))
-(define-public sbcl-trivial-file-size
- (let ((commit "1c1d672a01a446ba0391dbb4ffc40be3b0476f23")
- (revision "0"))
+(define-public sbcl-cl-pdf
+ (let ((commit "ee904a118a0f060279ad9d253a3e8e3997609213")
+ (revision "3"))
(package
- (name "sbcl-trivial-file-size")
- (version (git-version "0.0.0" revision commit))
- (home-page "https://github.com/ruricolist/trivial-file-size")
+ (name "sbcl-cl-pdf")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/mbattyani/cl-pdf")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-pdf" version))
(sha256
- (base32
- "17pp86c9zs4y7i1sh7q9gbfw9iqv6655k7fz8qbj9ly1ypgxp4qs"))))
+ (base32 "0j7hbqv6yzrgx0inqinpw8h22728l53ccciw6iymzz4g92j9fzlq"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "Size of a file in bytes in Common Lisp")
+ (inputs
+ (list sbcl-iterate sbcl-zpb-ttf))
+ (arguments
+ `(#:asd-systems '("cl-pdf" "cl-pdf-parser")))
+ (home-page "https://github.com/mbattyani/cl-pdf")
+ (synopsis "Common Lisp library for generating PDF files")
(description
- "The canonical way to determine the size of a file in bytes, using Common Lisp,
-is to open the file with an element type of (unsigned-byte 8) and then
-calculate the length of the stream. This is less than ideal. In most cases
-it is better to get the size of the file from its metadata, using a system
-call.
-
-This library exports a single function, file-size-in-octets. It returns the
-size of a file in bytes, using system calls when possible.")
- (license license:expat))))
+ "CL-PDF is a cross-platform Common Lisp library for generating PDF
+files.")
+ (license license:bsd-2))))
-(define-public cl-trivial-file-size
- (sbcl-package->cl-source-package sbcl-trivial-file-size))
+(define-public cl-pdf
+ (sbcl-package->cl-source-package sbcl-cl-pdf))
-(define-public ecl-trivial-file-size
- (sbcl-package->ecl-package sbcl-trivial-file-size))
+(define-public ecl-cl-pdf
+ (sbcl-package->ecl-package sbcl-cl-pdf))
-(define-public sbcl-trivial-macroexpand-all
- (let ((commit "933270ac7107477de1bc92c1fd641fe646a7a8a9")
+(define-public sbcl-cl-permutation
+ (let ((commit "20c10e9ca56452d2fafc3ec0984dcdf78b4f4b19")
(revision "0"))
(package
- (name "sbcl-trivial-macroexpand-all")
+ (name "sbcl-cl-permutation")
(version (git-version "0.0.0" revision commit))
- (home-page "https://github.com/cbaggers/trivial-macroexpand-all")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/stylewarning/cl-permutation")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-permutation" version))
(sha256
- (base32
- "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd"))))
+ (base32 "0i932g0k50y24hxizni6zfya4kcw77yk3b0llivm9g50s7fxj9dk"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "Portable macroexpand-all for Common Lisp")
+ (native-inputs (list sbcl-fiasco))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-fft
+ sbcl-cl-algebraic-data-type
+ sbcl-cl-cont
+ sbcl-closer-mop
+ sbcl-iterate
+ sbcl-priority-queue))
+ (synopsis "Permutations and permutation groups in Common Lisp")
(description
- "This library provides a macroexpand-all function that calls the
-implementation specific equivalent.")
- (license license:unlicense))))
+ "This is a Commin Lisp library for operating on permutations and
+permutation groups.")
+ (home-page "https://github.com/stylewarning/cl-permutation")
+ (license license:bsd-3))))
-(define-public cl-trivial-macroexpand-all
- (sbcl-package->cl-source-package sbcl-trivial-macroexpand-all))
+(define-public cl-permutation
+ (sbcl-package->cl-source-package sbcl-cl-permutation))
-(define-public ecl-trivial-macroexpand-all
- (sbcl-package->ecl-package sbcl-trivial-macroexpand-all))
+(define-public ecl-cl-permutation
+ (sbcl-package->ecl-package sbcl-cl-permutation))
-(define-public sbcl-serapeum
- (let ((commit "c08442a9757b7fa30ac345cb040e1642f97f6b78")
- (revision "12"))
+(define-public sbcl-cl-portaudio
+ (let ((commit "c50cd061c25216a736f684e45101f5c0188a384f")
+ (revision "1"))
(package
- (name "sbcl-serapeum")
- (version (git-version "0.0.0" revision commit))
- (home-page "https://github.com/ruricolist/serapeum")
+ (name "sbcl-cl-portaudio")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/filonenko-mikhail/cl-portaudio")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-portaudio" version))
(sha256
- (base32 "1sabd048agvgv7bhbw126rci9hf45fk08zhghcv6an2h6xwmc3qv"))))
+ (base32 "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-trivia
- sbcl-split-sequence
- sbcl-string-case
- sbcl-parse-number
- sbcl-trivial-garbage
- sbcl-bordeaux-threads
- sbcl-parse-declarations
- sbcl-introspect-environment
- sbcl-trivial-cltl2
- sbcl-global-vars
- sbcl-trivial-file-size
- sbcl-trivial-macroexpand-all))
- (native-inputs
- (list sbcl-atomics
- sbcl-fiveam
- sbcl-local-time))
+ (list portaudio sbcl-cffi sbcl-ffa))
(arguments
- (list #:phases
+ (list #:tests? #f ; Tests need access to sound cards
+ #:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- (substitute* "serapeum.asd"
- ;; Guix does not have Quicklisp, and probably never will.
- (("\\(:file \"quicklisp\"\\)") "")))))))
- (synopsis "Common Lisp utility library beyond Alexandria")
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/portaudio.lisp"
+ (("libportaudio\\.so")
+ (search-input-file inputs "/lib/libportaudio.so"))))))))
+ (synopsis "Common Lisp bindings to portaudio")
(description
- "Serapeum is a conservative library of Common Lisp utilities. It is a
-supplement, not a competitor, to Alexandria.")
+ "This package provides audio input and output functions to Common Lisp
+using bindings to the portaudio library.")
+ (home-page "https://github.com/filonenko-mikhail/cl-portaudio")
(license license:expat))))
-(define-public cl-serapeum
- (sbcl-package->cl-source-package sbcl-serapeum))
+(define-public cl-portaudio
+ (sbcl-package->cl-source-package sbcl-cl-portaudio))
-(define-public ecl-serapeum
- (sbcl-package->ecl-package sbcl-serapeum))
+(define-public ecl-cl-portaudio
+ (sbcl-package->ecl-package sbcl-cl-portaudio))
-(define-public sbcl-rutils
- (let ((commit "db3c3f4ae897025b5f0cd81042ca147da60ca0c5")
- (revision "0"))
+(define-public sbcl-cl-posix-mqueue
+ (let ((commit "8977370c7206d1f62bd1be80f4254af40654b83f")
+ (revision "1"))
(package
- (name "sbcl-rutils")
- (version (git-version "5.2.1" revision commit))
+ (name "sbcl-cl-posix-mqueue")
+ (version (git-version "0.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/vseloved/rutils")
+ (url "https://github.com/xFA25E/cl-posix-mqueue")
(commit commit)))
- (file-name (git-file-name "rutils" version))
+ (file-name (git-file-name "cl-posix-mqueue" version))
(sha256
- (base32 "1d2whscknh1zga2vdqvfqri8wx0gnml3sfqz62igq0ppap6q07y3"))))
+ (base32 "04519rg8vc782z097dzlb8nx0skab2fy2zd0m60r6mz2nw8xdvh6"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:asd-systems '("rutils" "rutilsx")
- ;; Tests disabled because of a circular dependency with should-test.
- #:tests? #f
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- ;; File faild to load, and we don't use it as tests are
- ;; disabled, so let's delete it.
- (delete-file "rutilsx-test.asd"))))))
+ (add-after 'unpack 'patch-librt-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/spec.lisp"
+ (("librt.so" all)
+ (string-append (assoc-ref inputs "glibc") "/lib/" all))))))))
+ (native-inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("rove" ,sbcl-rove)))
(inputs
- `(("closer-mop" ,sbcl-closer-mop)
- ("named-readtables" ,sbcl-named-readtables)))
- (home-page "https://github.com/vseloved/rutils")
- (synopsis "Radical Utilities for Common Lisp")
- (description "RUTILS is a syntactic utilities package for Common Lisp.")
- (license license:bsd-3))))
+ `(("alexandria" ,sbcl-alexandria)
+ ("babel" ,sbcl-babel)
+ ("cffi" ,sbcl-cffi)
+ ("glibc" ,glibc)
+ ("local-time" ,sbcl-local-time)))
+ (home-page "https://github.com/xFA25E/cl-posix-mqueue")
+ (synopsis "Common Lisp binding to POSIX mqueue")
+ (description
+ "This package provides Common Lisp bindings to POSIX message queue, an
+@acronym{IPC, Inter-Process Communication} method that is easy to use and quick
+to setup.")
+ (license license:gpl3))))
-(define-public cl-rutils
- (sbcl-package->cl-source-package sbcl-rutils))
+(define-public cl-posix-mqueue
+ (sbcl-package->cl-source-package sbcl-cl-posix-mqueue))
-(define-public ecl-rutils
- (sbcl-package->ecl-package sbcl-rutils))
+(define-public ecl-cl-posix-mqueue
+ (sbcl-package->ecl-package sbcl-cl-posix-mqueue))
-(define-public sbcl-arrow-macros
- ;; The latest upstream version tag is dated (pushed in 2020), use the latest
- ;; commit instead.
- (let ((commit "16bdfd31298182099c7d70df4598104e5a38b05e")
- (revision "0"))
+(define-public sbcl-cl-ppcre
+ (package
+ (name "sbcl-cl-ppcre")
+ (version "2.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edicl/cl-ppcre")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-ppcre" version))
+ (sha256
+ (base32 "0dwvr29diqzcg5n6jvbk2rnd90i05l7n828hhw99khmqd0kz7xsi"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-flexi-streams))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-ppcre-unicode
+ ;; cl-ppcre and cl-ppcre-unicode are put in different packages
+ ;; to work around the circular dependency between edicl/cl-ppcre
+ ;; and edicl/cl-unicode.
+ (lambda _
+ (delete-file "cl-ppcre-unicode.asd")
+ #t)))))
+ (synopsis "Portable regular expression library for Common Lisp")
+ (description "CL-PPCRE is a portable regular expression library for Common
+Lisp, which is compatible with perl. It is pretty fast, thread-safe, and
+compatible with ANSI-compliant Common Lisp implementations.")
+ (home-page "http://weitz.de/cl-ppcre/")
+ (license license:bsd-2)))
+
+(define-public cl-ppcre
+ (sbcl-package->cl-source-package sbcl-cl-ppcre))
+
+(define-public ecl-cl-ppcre
+ (sbcl-package->ecl-package sbcl-cl-ppcre))
+
+(define-public sbcl-cl-ppcre-unicode
+ (package (inherit sbcl-cl-ppcre)
+ (name "sbcl-cl-ppcre-unicode")
+ (inputs
+ (list sbcl-cl-ppcre sbcl-cl-unicode))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-ppcre
+ ;; cl-ppcre and cl-ppcre-unicode are put in different packages
+ ;; to work around the circular dependency between edicl/cl-ppcre
+ ;; and edicl/cl-unicode.
+ (lambda _
+ (delete-file "cl-ppcre.asd")
+ #t)))))))
+
+(define-public cl-ppcre-unicode
+ (sbcl-package->cl-source-package sbcl-cl-ppcre-unicode))
+
+(define-public ecl-cl-ppcre-unicode
+ (sbcl-package->ecl-package sbcl-cl-ppcre-unicode))
+
+(define-public sbcl-cl-prevalence
+ (let ((commit "e6b27640ce89ae5f8af38beb740e319bb6cd2368")
+ (revision "6"))
(package
- (name "sbcl-arrow-macros")
- (version (git-version "0.2.7" revision commit))
+ (name "sbcl-cl-prevalence")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "5" revision commit))
+ (home-page "https://github.com/40ants/cl-prevalence")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hipeta/arrow-macros")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "arrow-macros" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (home-page "https://github.com/hipeta/arrow-macros/")
- (synopsis "Clojure-like arrow macros in Common Lisp")
- (description
- "Arrow-macros provides clojure-like arrow macros (ex. ->, ->>) and diamond wands
-in swiss-arrows.")
- (license license:expat))))
+ (base32
+ "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0"))))
+ (inputs
+ (list sbcl-moptilities sbcl-s-sysdeps sbcl-s-xml))
+ (native-inputs
+ (list sbcl-fiveam sbcl-find-port))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-build-with-usocket-bt2
+ (lambda _
+ ;; See https://github.com/40ants/cl-prevalence/pull/27
+ (substitute* "src/master-slave.lisp"
+ (("stop-process \\(bt:thread-name server-thread\\)")
+ "stop-process (bt2:thread-name server-thread)")))))))
+ (synopsis "Implementation of object prevalence for Common Lisp")
+ (description "This Common Lisp library implements object prevalence (see
+@url{https://en.wikipedia.org/wiki/System_prevalence}). It allows
+for (de)serializing to and from s-exps as well as XML. Serialization of arbitrary
+classes and cyclic data structures are supported.")
+ (license license:llgpl))))
-(define-public cl-arrow-macros
- (sbcl-package->cl-source-package sbcl-arrow-macros))
+(define-public cl-prevalence
+ (sbcl-package->cl-source-package sbcl-cl-prevalence))
-(define-public ecl-arrow-macros
- (sbcl-package->ecl-package sbcl-arrow-macros))
+(define-public ecl-cl-prevalence
+ (sbcl-package->ecl-package sbcl-cl-prevalence))
-(define-public sbcl-arrows
- (let ((commit "df7cf0067e0132d9697ac8b1a4f1b9c88d4f5382")
- (revision "0"))
+(define-public sbcl-cl-progress-bar
+ (let ((commit "9374170858663c8fe829e9fb5a29bd2cb48d95ae"))
(package
- (name "sbcl-arrows")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-cl-progress-bar")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/Harleqin/arrows.git")
+ (url "https://github.com/sirherrbatka/cl-progress-bar/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy"))))
+ (base32 "1ldb4qhmx431n3lsq71ynwb9ybazbfqd55icjbhi06mj52ngndir"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (synopsis "Clojure-like arrow macros for Common Lisp")
+ (inputs
+ (list sbcl-bordeaux-threads sbcl-documentation-utils-extensions))
+ (home-page "https://github.com/sirherrbatka/cl-progress-bar/")
+ (synopsis "Progress bars in Common Lisp")
(description
- "This library implements the @code{->} and @code{->>} macros from
-Clojure, as well as several expansions on the idea.")
- (home-page "https://gitlab.com/Harleqin/arrows")
- (license license:public-domain))))
+ "This library provides almost the same code as used inside Quicklisp
+for drawning progress bars")
+ (license license:expat))))
-(define-public cl-arrows
- (sbcl-package->cl-source-package sbcl-arrows))
+(define-public cl-progress-bar
+ (sbcl-package->cl-source-package sbcl-cl-progress-bar))
-(define-public ecl-arrows
- (sbcl-package->ecl-package sbcl-arrows))
+(define-public ecl-cl-progress-bar
+ (sbcl-package->ecl-package sbcl-cl-progress-bar))
-(define-public sbcl-simple-parallel-tasks
- (let ((commit "ce7b60f788d8f68dfb69b24aac54c0e3b63379a6")
+(define-public sbcl-cl-project
+ (let ((commit "151107014e534fc4666222d57fec2cc8549c8814")
(revision "1"))
(package
- (name "sbcl-simple-parallel-tasks")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-cl-project")
+ (version (git-version "0.3.1" revision commit))
+ (home-page "https://github.com/fukamachi/cl-project")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/simple-parallel-tasks")
+ (url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"))))
+ (base32 "1rmh6s1ncv8s2yrr14ja9wisgg745sq6xibqwb341ikdicxdp26y"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list sbcl-chanl))
- (synopsis "Common Lisp library to evaluate some forms in parallel")
- (description "This is a simple Common Lisp library to evaluate some
-forms in parallel.")
- (home-page "https://codeberg.org/glv/simple-parallel-tasks")
- (license license:gpl3))))
+ `(("cl-emb" ,sbcl-cl-emb)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("local-time" ,sbcl-local-time)
+ ("prove" ,sbcl-prove)))
+ (arguments
+ ;; Tests depend on caveman, which in turns depends on cl-project.
+ '(#:tests? #f))
+ (synopsis "Generate a skeleton for modern Common Lisp projects")
+ (description "This library provides a modern project skeleton generator.
+In contract with other generators, CL-Project generates one package per file
+and encourages unit testing by generating a system for unit testing, so you
+can begin writing unit tests as soon as the project is generated.")
+ (license license:llgpl))))
-(define-public cl-simple-parallel-tasks
- (sbcl-package->cl-source-package sbcl-simple-parallel-tasks))
+(define-public cl-project
+ (sbcl-package->cl-source-package sbcl-cl-project))
-(define-public ecl-simple-parallel-tasks
- (sbcl-package->ecl-package sbcl-simple-parallel-tasks))
+(define-public ecl-cl-project
+ (sbcl-package->ecl-package sbcl-cl-project))
-(define-public sbcl-cl-heap
+(define-public sbcl-cl-punch
(package
- (name "sbcl-cl-heap")
- (version "0.1.6")
+ (name "sbcl-cl-punch")
+ (version "0.2")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://common-lisp.net/project/cl-heap/releases/"
- "cl-heap_" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/windymelt/cl-punch")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-punch" version))
(sha256
- (base32
- "163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i"))))
+ (base32 "1vmbaz9y9lq4wvi8mfbyif8vc9yfk2i0qd3ysbzl152wx32dbzs3"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-xlunit))
- (arguments
- '(#:asd-test-systems '("cl-heap-tests")))
- (synopsis "Heap and priority queue data structures for Common Lisp")
+ (list sbcl-prove))
+ (inputs
+ (list sbcl-cl-syntax))
+ (home-page "https://github.com/windymelt/cl-punch")
+ (synopsis "Anonymous lambda literal in Common Lisp, respecting Scala")
(description
- "CL-HEAP provides various implementations of heap data structures (a
-binary heap and a Fibonacci heap) as well as an efficient priority queue.")
- (home-page "https://common-lisp.net/project/cl-heap/")
- (license license:gpl3+)))
+ "CL-PUNCH is a Scala-like anonymous lambda literal.")
+ (license license:expat )))
-(define-public cl-heap
- (sbcl-package->cl-source-package sbcl-cl-heap))
+(define-public cl-punch
+ (sbcl-package->cl-source-package sbcl-cl-punch))
-(define-public ecl-cl-heap
- (sbcl-package->ecl-package sbcl-cl-heap))
+(define-public ecl-cl-punch
+ (sbcl-package->ecl-package sbcl-cl-punch))
-(define-public sbcl-curry-compose-reader-macros
- (let ((commit "beaa92dedf392726c042184bfd6149fa8d9e6ac2")
- (revision "0"))
+(define-public sbcl-cl-qprint
+ (let ((commit "bfe398551cbfb7ca84a9ba59a26a1116ac5c06eb")
+ (revision "1"))
(package
- (name "sbcl-curry-compose-reader-macros")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-qprint")
+ (version (git-version "0.9.0" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/eschulte/curry-compose-reader-macros")
- (commit commit)))
+ (uri (git-reference
+ (url "https://github.com/eugeneia/cl-qprint/")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "0rv9bl8xrad5wfcg5zs1dazvnpmvqz6297lbn8bywsrcfnlf7h98"))))
+ (base32 "099h0rrdzxnlmn8avi72mg2dl0kccp7w01b2p9nwyy4b8yr32cir"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-named-readtables))
- (synopsis "Reader macros for partial application and composition")
+ (list sbcl-flexi-streams))
+ (home-page "https://github.com/eugeneia/cl-qprint/")
+ (synopsis "Implementation of the quoted-printable encoding")
(description
- "This Common Lisp library provides reader macros for concise expression
-of function partial application and composition.")
- (home-page "https://eschulte.github.io/curry-compose-reader-macros/")
- (license license:public-domain))))
+ "This Common Lisp library implements the quoted-printable encoding as
+described in RFC 2045 (see @url{http://tools.ietf.org/html/rfc2045}).")
+ (license license:lgpl2.1))))
-(define-public cl-curry-compose-reader-macros
- (sbcl-package->cl-source-package sbcl-curry-compose-reader-macros))
+(define-public cl-qprint
+ (sbcl-package->cl-source-package sbcl-cl-qprint))
-(define-public ecl-curry-compose-reader-macros
- (sbcl-package->ecl-package sbcl-curry-compose-reader-macros))
+(define-public ecl-cl-qprint
+ (sbcl-package->ecl-package sbcl-cl-qprint))
-(define-public sbcl-yason
+(define-public sbcl-cl-qrencode
(package
- (name "sbcl-yason")
- (version "0.8.4")
+ (name "sbcl-cl-qrencode")
+ (version "0.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phmarek/yason")
+ (url "https://github.com/jnjcc/cl-qrencode")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-yason" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0d22sw7nf2ygqm56ilybg7bza63cv43pc4184r8rvsjz2in37n51"))))
+ (base32 "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-lisp-unit))
(inputs
- (list sbcl-alexandria sbcl-trivial-gray-streams))
- (synopsis "Common Lisp JSON parser/encoder")
+ (list sbcl-zpng))
+ (synopsis "QR code encoder for Common Lisp")
(description
- "YASON is a Common Lisp library for encoding and decoding data in the
-JSON interchange format.")
- (home-page "https://github.com/phmarek/yason")
- (license license:bsd-3)))
+ "This Common Lisp library provides function to make QR codes and to save
+them as PNG files.")
+ (home-page "https://github.com/jnjcc/cl-qrencode")
+ (license license:gpl2+)))
-(define-public cl-yason
- (sbcl-package->cl-source-package sbcl-yason))
+(define-public cl-qrencode
+ (sbcl-package->cl-source-package sbcl-cl-qrencode))
-(define-public ecl-yason
- (sbcl-package->ecl-package sbcl-yason))
+(define-public ecl-cl-qrencode
+ (sbcl-package->ecl-package sbcl-cl-qrencode))
-(define-public sbcl-graph
- (let ((commit "78bf9ec930d8eae4f0861b5be76765fb1e45e24f")
- (revision "0"))
- (package
- (name "sbcl-graph")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/eschulte/graph")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1qpij4xh8bqwc2myahpilcbh916v7vg0acz2fij14d3y0jm02h0g"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-stefil))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-heap" ,sbcl-cl-heap)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("curry-compose-reader-macros" ,sbcl-curry-compose-reader-macros)
- ("metabang-bind" ,sbcl-metabang-bind)
- ("named-readtables" ,sbcl-named-readtables)
- ("yason" ,sbcl-yason)))
- (arguments
- '(#:asd-systems '("graph"
- "graph/dot"
- "graph/json")))
- (synopsis "Graph data structure and algorithms for Common Lisp")
- (description
- "The GRAPH Common Lisp library provides a data structures to represent
-graphs, as well as some graph manipulation and analysis algorithms (shortest
-path, maximum flow, minimum spanning tree, etc.).")
- (home-page "https://eschulte.github.io/graph/")
- (license license:gpl3+))))
+(define-public sbcl-cl-randist
+ (package
+ (name "sbcl-cl-randist")
+ (version "0.4.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lvaruzza/cl-randist")
+ (commit "f088a54b540a7adefab7c04094a6103f9edda3d0")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0l8hyd6nbxb7f50vyxz3rbbm7kgr1fnadc40jywy4xj5vi5kpj5g"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Random distributions for Common Lisp")
+ (description
+ "Manual translation from C to Common Lisp of some random number
+generation functions from the GSL library.")
+ (home-page "https://github.com/lvaruzza/cl-randist")
+ (license license:bsd-2)
+ (arguments
+ `(#:tests? #f))))
-(define-public cl-graph
- (sbcl-package->cl-source-package sbcl-graph))
+(define-public cl-randist
+ (sbcl-package->cl-source-package sbcl-cl-randist))
-(define-public ecl-graph
- (sbcl-package->ecl-package sbcl-graph))
+(define-public ecl-cl-randist
+ (sbcl-package->ecl-package sbcl-cl-randist))
-(define-public sbcl-trivial-indent
- (let ((commit "f25275094b80df8aa158af46db980bbc3ce2f88b")
+(define-public sbcl-cl-random
+ (let ((commit "5bb65911037f95a4260bd29a594a09df3849f4ea")
(revision "1"))
(package
- (name "sbcl-trivial-indent")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-cl-random")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/trivial-indent")
- (commit commit)))
- (file-name (git-file-name "cl-trivial-indent" version))
+ (uri (git-reference
+ (url "https://github.com/tpapp/cl-random")
+ (commit commit)))
+ (file-name (git-file-name "cl-random" version))
(sha256
- (base32 "1zg8cyy1xqpcjrxxqz5zb5xixhwcszkv4p2vq305lb2rka6f3dyx"))))
+ (base32 "0jn80xphyvyp2v72acr6b8a2f6dw06myr5vrjfl14brsvks7wr89"))))
(build-system asdf-build-system/sbcl)
- (synopsis
- "Simple Common Lisp library to allow indentation hints for SWANK")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-array-operations
+ sbcl-cl-num-utils
+ sbcl-cl-rmath
+ sbcl-cl-slice
+ sbcl-gsll
+ sbcl-let-plus
+ sbcl-lla))
+ (native-inputs
+ (list sbcl-clunit))
+ (home-page "https://github.com/tpapp/cl-random")
+ (synopsis "Random variates for Common Lisp")
(description
- "This library allows you to define custom indentation hints for your
-macros if the one recognised by SLIME automatically produces unwanted
-results.")
- (home-page "https://shinmera.github.io/trivial-indent/")
- (license license:zlib))))
+ "@code{cl-random} is a library for generating random draws from various
+commonly used distributions, and for calculating statistical functions, such as
+density, distribution and quantiles for these distributions.")
+ (license license:expat))))
-(define-public cl-trivial-indent
- (sbcl-package->cl-source-package sbcl-trivial-indent))
+(define-public cl-random
+ (sbcl-package->cl-source-package sbcl-cl-random))
-(define-public ecl-trivial-indent
- (sbcl-package->ecl-package sbcl-trivial-indent))
+(define-public ecl-cl-random
+ (sbcl-package->ecl-package sbcl-cl-random))
-(define-public sbcl-data-format-validation
- (let ((commit "95d44766e829582598f9dcdc5c23719c462d5bfb")
+(define-public sbcl-cl-random-forest
+ (let ((commit "fedb36ce99bb6f4d7e3a7dd6d8b058f331308f91")
(revision "1"))
(package
- (name "sbcl-data-format-validation")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-cl-random-forest")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/willijar/cl-data-format-validation/")
- (commit commit)))
- (file-name (git-file-name "data-format-validation" version))
+ (uri (git-reference
+ (url "https://github.com/masatoi/cl-random-forest")
+ (commit commit)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0zmk47xmicyqvp1impn8kgh5373ysmx3gfpqcvbi9r31qsir2nqa"))))
+ "0wqh4dxy5hrvm14jgyfypwhdw35f24rsksid4blz5a6l2z16rlmq"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ `(("prove" ,sbcl-prove)
+ ("trivial-garbage" ,sbcl-trivial-garbage)))
(inputs
- (list sbcl-cl-ppcre))
- (synopsis "Validation and conversion between user and internal data")
- (description
- "@code{data-format-validation} is a library for Common Lisp providing a
-consistent regular interface for converting (and validating) external data (in
-the form of strings usually) into internal data types and for formatting
-internal data back into external presentable strings, all according to a
-conversion or type specification.")
- (home-page "http://www.jarw.org.uk/lisp/cl-data-format-validation.html")
- (license license:gpl3))))
-
-(define-public sbcl-cl-docutils
- (let ((commit "756b5ad42360e84d8225fa69815bdd1623ceaa40")
- (revision "1"))
- (package
- (name "sbcl-cl-docutils")
- (version (git-version "0.1.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/willijar/cl-docutils/")
- (commit commit)))
- (file-name (git-file-name "cl-docutils" version))
- (sha256
- (base32
- "132bxlj0jlhiabi29mygmkcbbgyb5s1yz1xdfhm3pgrf9f8605gg"))))
- (build-system asdf-build-system/sbcl)
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-libsvm-format" ,sbcl-cl-libsvm-format)
+ ("cl-online-learning" ,sbcl-cl-online-learning)
+ ("lparallel" ,sbcl-lparallel)))
(arguments
- '(#:asd-systems '("docutils")))
- (inputs
- (list sbcl-cl-ppcre
- sbcl-data-format-validation
- sbcl-trivial-gray-streams))
- (synopsis "Document utilities and Restructured text parser")
+ `(#:tests? #f)) ; The tests download data from the Internet
+ (synopsis "Random Forest and Global Refinement for Common Lisp")
(description
- "@code{cl-docutils} is a Common Lisp implementation of the Docutils text
-processing system for processing plaintext into presentational formats such as
-HTML and LaTeX. It is based upon the Python Docutils reference implementation
-but uses Common Lisp idioms making it easier to extend and more flexible. As
-with the reference implementation it includes a parser for the reStructured
-text plaintext markup syntax which is suitable for marking up documentation
-and for use as user markup for collaborative web sites. It is successfully
-used to support a higher education peer-review assessment and online tutorial
-system.")
- (home-page "http://www.jarw.org.uk/lisp/cl-docutils.html")
- (license license:gpl3))))
+ "CL-random-forest is an implementation of Random Forest for multiclass
+classification and univariate regression written in Common Lisp. It also
+includes an implementation of Global Refinement of Random Forest.")
+ (home-page "https://github.com/masatoi/cl-random-forest")
+ (license license:expat))))
-(define-public cl-docutils
- (sbcl-package->cl-source-package sbcl-cl-docutils))
+(define-public cl-random-forest
+ (sbcl-package->cl-source-package sbcl-cl-random-forest))
-(define-public ecl-cl-docutils
- (sbcl-package->ecl-package sbcl-cl-docutils))
+(define-public ecl-cl-random-forest
+ (sbcl-package->ecl-package sbcl-cl-random-forest))
-(define-public sbcl-documentation-utils
- (let ((commit "98630dd5f7e36ae057fa09da3523f42ccb5d1f55")
+(define-public sbcl-cl-raylib
+ (let ((commit "985ceebef4cb56c651cddc23bd71812f2be38c2d")
(revision "0"))
(package
- (name "sbcl-documentation-utils")
- (version (git-version "1.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/documentation-utils")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "098qhkqskmmrh4wix34mawf7p5c87yql28r51r75yjxj577k5idq"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-trivial-indent))
- (synopsis "Few simple tools to document Common Lisp libraries")
- (description
- "This is a small library to help you with managing the Common Lisp
-docstrings for your library.")
- (home-page "https://shinmera.github.io/documentation-utils/")
- (license license:zlib))))
-
-(define-public cl-documentation-utils
- (sbcl-package->cl-source-package sbcl-documentation-utils))
-
-(define-public ecl-documentation-utils
- (sbcl-package->ecl-package sbcl-documentation-utils))
-
-(define-public sbcl-documentation-utils-extensions
- (let ((commit "f67f8a05d583174662a594b79356b201c1d9d750"))
- (package
- (name "sbcl-documentation-utils-extensions")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-cl-raylib")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/sirherrbatka/documentation-utils-extensions/")
- (commit commit)))
- (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/longlene/cl-raylib")
+ (commit commit)))
+ (file-name (git-file-name "cl-raylib" version))
(sha256
- (base32
- "0pn45c9rbxlnhn5nvhqz6kyv0nlirwxpg4j27niwdq80yxzsn51f"))))
+ (base32 "1kighj35g6dn426mhr2ppz3gm49v1q4n42ydn619pclrqwyrnc2z"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #f ; no tests https://github.com/longlene/cl-raylib/issues/40
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libraylib\\.so")
+ (search-input-file inputs "/lib/libraylib.so"))))))))
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://github.com/sirherrbatka/documentation-utils-extensions")
- (synopsis "Set of extensions for documentation-utils")
- (description
- "Use @code{rich-formatter} to format documentation with sections @code{:syntax},
-@code{:arguments}, @code{:examples}, @code{:description}, @code{:returns},
-@code{:side-effects}, @code{:thread-safety}, @code{:affected-by},
-@code{:see-also} and @code{:notes}. Gather unformatted input by using
-@code{rich-aggregating-formatter} and @code{*DOCUMENTATION*} variable. Find
-gathered documentation with find-documentation function. Execute code stored
-in documentation with @code{execute-documentation}. See the examples in the
-@code{src/documentation.lisp} file. See the @code{documentation-utils} system
-for more information.")
+ (list raylib
+ sbcl-3d-matrices
+ sbcl-3d-vectors
+ sbcl-alexandria
+ sbcl-cffi))
+ (home-page "https://github.com/longlene/cl-raylib")
+ (synopsis "Common Lisp bindings to raylib")
+ (description "This package provides Common Lisp CFFI bindings to the
+Raylib game development library.")
(license license:expat))))
-(define-public cl-documentation-utils-extensions
- (sbcl-package->cl-source-package sbcl-documentation-utils-extensions))
+(define-public cl-raylib
+ (sbcl-package->cl-source-package sbcl-cl-raylib))
-(define-public ecl-documentation-utils-extensions
- (sbcl-package->ecl-package sbcl-documentation-utils-extensions))
+(define-public ecl-cl-raylib
+ (sbcl-package->ecl-package sbcl-cl-raylib))
-(define-public sbcl-charje.documentation
+(define-public sbcl-cl-rdkafka
(package
- (name "sbcl-charje.documentation")
- (version "0.0.0")
+ (name "sbcl-cl-rdkafka")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~charje/documentation")
+ (url "https://github.com/SahilKang/cl-rdkafka")
(commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "149r9qdz5dyxsamhf5miaa9njr7kn7nc0ic448k133rs3nnwagqc"))
- (file-name (git-file-name "cl-charje.documentation" version))))
+ "0z2g0k0xy8k1p9g93h8dy9wbygaq7ziwagm4yz93zk67mhc0b84v"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #f ; Attempts to connect to locally running Kafka
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/low-level/librdkafka-bindings.lisp"
+ (("librdkafka" all)
+ (string-append (assoc-ref inputs "librdkafka") "/lib/"
+ all))))))))
(inputs
- (list sbcl-alexandria))
- (home-page "https://git.sr.ht/~charje/documentation")
- (synopsis "Docstring parsing library for Common Lisp")
- (description "Charje.documentation can used to parse Common Lisp
-docstrings the charje way, or it can be used to create custom docstring
-parsers. Docstring parsers are composed using mixin classes and
-initialization methods.")
- (license license:agpl3+)))
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cffi" ,sbcl-cffi)
+ ("librdkafka" ,librdkafka)
+ ("lparallel" ,sbcl-lparallel)
+ ("trivial-garbage" ,sbcl-trivial-garbage)))
+ (home-page "https://github.com/SahilKang/cl-rdkafka")
+ (synopsis "Common Lisp client library for Apache Kafka")
+ (description "A Common Lisp client library for Apache Kafka.")
+ (license license:gpl3)))
-(define-public cl-charje.documentation
- (sbcl-package->cl-source-package sbcl-charje.documentation))
+(define-public cl-rdkafka
+ (sbcl-package->cl-source-package sbcl-cl-rdkafka))
-(define-public ecl-charje.documentation
- (sbcl-package->ecl-package sbcl-charje.documentation))
+(define-public ecl-cl-rdkafka
+ (sbcl-package->ecl-package sbcl-cl-rdkafka))
-(define-public sbcl-staple
- (let ((commit "0ee8e25fe6fe8fa83b2a6c93d4febd468c3eaa4e")
+(define-public sbcl-cl-readline
+ (let ((commit "8438c9ebd92ccc95ebab9cc9cbe6c72d44fccc58")
(revision "1"))
(package
- (name "sbcl-staple")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-cl-readline")
+ (version (git-version "0.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/staple/")
+ (url "https://github.com/vindarel/cl-readline")
(commit commit)))
+ (file-name (git-file-name "cl-readline" version))
(sha256
- (base32 "0qf0if7py3n4rszg25lcavpsqikfz6k5dvcmh5q67y8x5r12i5m7"))
- (file-name (git-file-name "staple" version))))
+ (base32 "14iskvqfw71ssaav483vmqw62lrpznysjs800gjjppxs785p1fa0"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("staple-package-recording"
- "staple-code-parser"
- "staple"
- "staple-markdown"
- "staple-markless"
- "staple-restructured-text")))
(inputs
- (list sbcl-3bmd
- sbcl-babel
- sbcl-cl-docutils
- sbcl-cl-markless
- sbcl-cl-ppcre
- sbcl-clip
- sbcl-concrete-syntax-tree
- sbcl-definitions
- sbcl-documentation-utils
- sbcl-eclector
- sbcl-language-codes
- sbcl-pathname-utils))
- (synopsis "Generate documentation about Lisp projects through an HTML template")
- (description "Staple is a documentation system. It provides you with a
-way to generate standalone documentation accumulated from various sources such
-as readmes, documentation files, and docstrings.")
- (home-page "https://Shinmera.github.io/staple/")
- (license license:zlib))))
+ `(("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("readline" ,readline)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "cl-readline.lisp"
+ (("libreadline.so")
+ (string-append (assoc-ref inputs "readline")
+ "/lib/libreadline.so"))))))))
+ (home-page "https://github.com/vindarel/cl-readline")
+ (synopsis "Common Lisp bindings to the GNU Readline library")
+ (description
+ "The Readline library provides a set of functions for use by
+applications that allow users to edit command lines as they are typed in.
+Both Emacs and vi editing modes are available. The Readline library includes
+additional functions to maintain a list of previously-entered command lines, to
+recall and perhaps reedit those lines, and perform csh-like history expansion on
+previous commands.")
+ (license license:gpl3+))))
-(define-public cl-staple
- (sbcl-package->cl-source-package sbcl-staple))
+(define-public cl-readline
+ (sbcl-package->cl-source-package sbcl-cl-readline))
-(define-public ecl-staple
- (sbcl-package->ecl-package sbcl-staple))
+(define-public ecl-cl-readline
+ (sbcl-package->ecl-package sbcl-cl-readline))
-(define-public sbcl-helambdap
- (let ((commit "5bf65f57a36ee094cadb096caca6e90eb3ba46c4")
+(define-public sbcl-cl-redis
+ (let ((commit "7d592417421cf7cd1cffa96043b457af0490df7d")
(revision "0"))
(package
- (name "sbcl-helambdap")
- (version (git-version "20220103" revision commit))
+ (name "sbcl-cl-redis")
+ (version (git-version "2.3.8" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.code.sf.net/p/helambdap/code")
+ (url "https://github.com/vseloved/cl-redis")
(commit commit)))
- (file-name (git-file-name "cl-helambdap" version))
+ (file-name (git-file-name "cl-redis" version))
(sha256
- (base32 "1kzapbf9l2bw8i9m9sxv0dfnkksrxq81d5hbn34pm25abk0i937j"))))
+ (base32 "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'start-redis
+ (lambda _
+ (system "redis-server --port 6379 &"))))))
+ (native-inputs
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("redis" ,redis)
+ ("should-test" ,sbcl-should-test)))
(inputs
- (list sbcl-cl-fad
- sbcl-clad
- sbcl-split-sequence
- sbcl-xhtmlambda))
- (synopsis "Common Lisp documentation system")
- (description "HELambdap is a Common Lisp documentation system which
-strives to be simple to use, yet easily customizable.")
- (home-page "https://helambdap.sourceforge.net")
+ `(("babel" ,sbcl-babel)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("rutils" ,sbcl-rutils)
+ ("usocket" ,sbcl-usocket)))
+ (home-page "https://github.com/vseloved/cl-redis")
+ (synopsis "Common Lisp client for Redis")
+ (description "This is a Common Lisp wrapper for interacting with the
+Redis data structure store.")
(license license:expat))))
-(define-public cl-helambdap
- (sbcl-package->cl-source-package sbcl-helambdap))
+(define-public cl-redis
+ (sbcl-package->cl-source-package sbcl-cl-redis))
-(define-public sbcl-form-fiddle
- (let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18")
- (revision "0"))
+(define-public ecl-cl-redis
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl-redis)))
(package
- (name "sbcl-form-fiddle")
- (version (git-version "1.1.0" revision commit))
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; Tests are failing on ECL with:
+ ;; Test L-COMMANDS: An error occurred during initialization:
+ ;; Protocol not found: "tcp".
+ ((#:tests? _ #f) #f))))))
+
+(define-public sbcl-cl-reexport
+ (let ((commit "03ad7a0e7307e510b3b25a622d3c5f8a077879b4")
+ (revision "2"))
+ (package
+ (name "sbcl-cl-reexport")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/takagi/cl-reexport")
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/form-fiddle")
- (commit commit)))
- (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/takagi/cl-reexport")
+ (commit commit)))
+ (file-name (git-file-name "cl-reexport" version))
(sha256
(base32
- "041iznc9mpfyrl0sv5893ys9pbb2pvbn9g3clarqi7gsfj483jln"))))
- (build-system asdf-build-system/sbcl)
+ "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"))))
(inputs
- (list sbcl-documentation-utils))
- (synopsis "Utilities to destructure Common Lisp lambda forms")
+ (list sbcl-alexandria))
+ (native-inputs
+ (list sbcl-prove))
+ (synopsis "Reexport external symbols in other Common Lisp packages")
(description
- "Often times we need to destructure a form definition in a Common Lisp
-macro. This library provides a set of simple utilities to help with that.")
- (home-page "https://shinmera.github.io/form-fiddle/")
- (license license:zlib))))
+ "Cl-reexport makes a package reexport symbols which are external
+symbols in other Common Lisp packages. This functionality is intended to be
+used with (virtual) hierarchical packages.")
+ (license license:llgpl))))
-(define-public cl-form-fiddle
- (sbcl-package->cl-source-package sbcl-form-fiddle))
+(define-public cl-reexport
+ (sbcl-package->cl-source-package sbcl-cl-reexport))
-(define-public ecl-form-fiddle
- (sbcl-package->ecl-package sbcl-form-fiddle))
+(define-public ecl-cl-reexport
+ (sbcl-package->ecl-package sbcl-cl-reexport))
-(define-public sbcl-array-utils
- (let ((commit "29da8fccf6093fe8f8c7b2daef7de1a428ef1834")
- (revision "0"))
+(define-public sbcl-cl-rmath
+ (let ((commit "f6add1edda31547691d08e36ccf6c17305161aca")
+ (revision "1"))
(package
- (name "sbcl-array-utils")
- (version (git-version "1.2.0" revision commit))
+ (name "sbcl-cl-rmath")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/array-utils")
- (commit commit)))
- (file-name (git-file-name "cl-array-utils" version))
+ (uri (git-reference
+ (url "https://github.com/tpapp/cl-rmath")
+ (commit commit)))
+ (file-name (git-file-name "cl-rmath" version))
(sha256
- (base32 "1d66s2inb9hpw27hdb20x27dychmpn1mn35v0mlsib848qdz87az"))))
+ (base32 "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "cl-rmath.lisp"
+ (("\\(cffi:define-foreign-library librmath" all)
+ (string-append all "\n"
+ " (:unix \""
+ (assoc-ref inputs "librmath")
+ "/lib/libRmath.so\")"))))))))
(inputs
- (list sbcl-documentation-utils))
- (synopsis "Tiny collection of array and vector utilities for Common Lisp")
+ `(("cffi" ,sbcl-cffi)
+ ("librmath" ,rmath-standalone)))
+ (home-page "https://github.com/tpapp/cl-rmath")
+ (synopsis "Common Lisp wrapper for libRmath")
(description
- "A miniature toolkit that contains some useful shifting/popping/pushing
-functions for arrays and vectors. Originally from Plump.")
- (home-page "https://shinmera.github.io/array-utils/")
- (license license:zlib))))
+ "@code{cl-rmath} is a simple, autogenerated foreign interface for the
+standalone R API @code{libRmath}. There has been no effort to provide a
+high-level interface for the original library, instead, this library is meant
+to serve as a building block for such an interface.")
+ (license license:boost1.0))))
-(define-public cl-array-utils
- (sbcl-package->cl-source-package sbcl-array-utils))
+(define-public cl-rmath
+ (sbcl-package->cl-source-package sbcl-cl-rmath))
-(define-public ecl-array-utils
- (sbcl-package->ecl-package sbcl-array-utils))
+(define-public ecl-cl-rmath
+ (sbcl-package->ecl-package sbcl-cl-rmath))
-(define-public sbcl-lass
- (let ((commit "1f2418dbf2d8d6f5892171057616b2ca9d6e5008")
+(define-public sbcl-cl-slice
+ (let ((commit "c531683f287216aebbb0affbe090611fa1b5d697")
(revision "1"))
(package
- (name "sbcl-lass")
- (version (git-version "0.6.0" revision commit))
+ (name "sbcl-cl-slice")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/LASS")
- (commit commit)))
- (file-name (git-file-name "cl-lass" version))
+ (uri (git-reference
+ (url "https://github.com/tpapp/cl-slice")
+ (commit commit)))
+ (file-name (git-file-name "cl-slice" version))
(sha256
- (base32 "1wax2kykc9ff0sk2linp9v8fcsm5ay6idpq365vivady9fh504r5"))))
+ (base32 "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-clunit))
(inputs
- (list sbcl-cl-base64 sbcl-trivial-indent sbcl-trivial-mimes))
- (synopsis "LASS (Lisp Augmented Style Sheets) compiles Lisp to CSS")
+ (list sbcl-alexandria sbcl-anaphora sbcl-let-plus))
+ (home-page "https://github.com/tpapp/cl-slice")
+ (synopsis "Array slices for Common Lisp")
(description
- "With lispy syntax, shortcuts, and improvements, LASS aims to help you
-out in writing CSS quick and easy. LASS was largely inspired by SASS. LASS
-supports two modes, one being directly in your lisp code, the other in pure
-LASS files.")
- (home-page "https://shinmera.github.io/LASS/")
- (license license:zlib))))
+ "This package provides a DSL for array slices in Common Lisp.")
+ (license license:expat))))
-(define-public cl-lass
- (sbcl-package->cl-source-package sbcl-lass))
+(define-public cl-slice
+ (sbcl-package->cl-source-package sbcl-cl-slice))
-(define-public ecl-lass
- (sbcl-package->ecl-package sbcl-lass))
+(define-public ecl-cl-slice
+ (sbcl-package->ecl-package sbcl-cl-slice))
-(define-public sbcl-xhtmlambda
- (let ((commit "c86376bccebf77ca428e8033df2ba7d8450ea1e8")
- (revision "0"))
+(define-public sbcl-cl-slug
+ (let ((commit "ffb229d10f0d3f7f54e706791725225e200bf749")
+ (revision "1"))
(package
- (name "sbcl-xhtmlambda")
- (version
- ;; The source repository doesn't provide any version nor revision, but
- ;; a timestamp
- (git-version "2022-01-21" revision commit))
+ (name "sbcl-cl-slug")
+ (version (git-version "0.4.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/xhtmlambda/XHTMLambda")
+ (url "https://github.com/EuAndreh/cl-slug")
(commit commit)))
- (file-name (git-file-name "cl-xhtmlambda" version))
+ (file-name (git-file-name "cl-slug" version))
(sha256
- (base32 "0narbzz06ry1wn048avm1fwihvnjvvc4wfcv5hmdazkilpvnqz2y"))))
+ (base32 "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"))))
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cl-unicode))
- (synopsis "(X)HTML library for Common Lisp")
+ (native-inputs
+ (list sbcl-prove))
+ (inputs
+ `(("ppcre" ,sbcl-cl-ppcre)))
+ (home-page "https://github.com/EuAndreh/cl-slug")
+ (synopsis "Multi-language slug formatter")
(description
- "(X)HTMLambda is yet another (X)HTML library which
-emphasizes programmability and user-friendliness. Each (X)HTML element is a
-structured object and pretty-printing of (X)HTML trees is well defined to
-provide properly indented human-readable output even for complex recursive
-arrangements.")
- (home-page "https://xhtmlambda.common-lisp.dev/")
- (license license:expat))))
+ "This is a small Common Lisp library to make slugs, mainly for URIs,
+from English and beyond.")
+ (license license:llgpl))))
-(define-public cl-xhtmlambda
- (sbcl-package->cl-source-package sbcl-xhtmlambda))
+(define-public cl-slug
+ (sbcl-package->cl-source-package sbcl-cl-slug))
-(define-public sbcl-clad
- (let ((commit "1ff6f417d4ee3836d1edd96923d4b03f3cafa849")
+(define-public ecl-cl-slug
+ (sbcl-package->ecl-package sbcl-cl-slug))
+
+(define-public sbcl-cl-smtp
+ (let ((commit "ed47d326fad867ee11323fa3a0f307b5d40e8f2b")
(revision "0"))
(package
- (name "sbcl-clad")
- (version
- ;; There's no version, but there's a timestamp
- (git-version "2023-01-21" revision commit))
+ (name "sbcl-cl-smtp")
+ (version (git-version "20191031.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/mantoniotti/CLAD")
+ (url "https://gitlab.common-lisp.net/cl-smtp/cl-smtp")
(commit commit)))
- (file-name (git-file-name "cl-clad" version))
+ (file-name (git-file-name "cl-smtp" version))
(sha256
- (base32 "184mhdq7pxd6hd4rzv8z4lfbwnkyhgm5bdn3xsqaav2j0d1dqm6i"))
- (modules '((guix build utils)))
- (snippet
- ;; Delete compiled ABCL files.
- '(begin
- (delete-file "clad-package.abcl")
- (delete-file "clad.abcl")))))
+ (base32 "0vjjfapcrdc5671jz2d24h8zvpz7skq1x6pi9fvw6ls5sgms6fr0"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Library providing standard locations on the file system")
- (description
- "The Common Lisp Application Directories (CLAD) library is
-a simple API collection that provides access to a set of @emph{standard}
-Common Lisp folders on a per-application or per-library basis.")
- (home-page "https://gitlab.common-lisp.net/mantoniotti/CLAD")
- (license license:expat)))) ;the mit-modern-variant is used
+ (inputs
+ (list sbcl-cl+ssl
+ sbcl-cl-base64
+ sbcl-flexi-streams
+ sbcl-trivial-gray-streams
+ sbcl-usocket))
+ (home-page "https://gitlab.common-lisp.net/cl-smtp/cl-smtp")
+ (synopsis "Simple Common Lisp SMTP client")
+ (description "This package provides a client for SMTP.")
+ (license license:llgpl))))
-(define-public cl-clad
- (sbcl-package->cl-source-package sbcl-clad))
+(define-public cl-smtp
+ (sbcl-package->cl-source-package sbcl-cl-smtp))
-(define-public sbcl-plump
- (let ((commit "0c3e0b57b43b6e0c5794b6a902f1cf5bee2a2927")
- (revision "3"))
+(define-public ecl-cl-smtp
+ (sbcl-package->ecl-package sbcl-cl-smtp))
+
+(define-public sbcl-cl-spark
+ (let ((commit "4e34bcebdcf8e45265986eb43ad4ad03bb41a581")
+ (revision "1"))
(package
- (name "sbcl-plump")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-cl-spark")
+ (version (git-version "0.1.13" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/plump")
- (commit commit)))
- (file-name (git-file-name "cl-plump" version))
+ (uri (git-reference
+ (url "https://github.com/tkych/cl-spark")
+ (commit commit)))
+ (file-name (git-file-name "cl-spark" version))
(sha256
- (base32 "1fyb66pqvr1iy31ah9638ihs8cax17zkxk0zq14jy7x5l9rq1qlf"))))
+ (base32 "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-array-utils sbcl-documentation-utils))
- (synopsis "Lenient XML / XHTML / HTML parser for Common Lisp")
- (description
- "Plump is a parser for HTML/XML-like documents, focusing on being
-lenient towards invalid markup. It can handle things like invalid attributes,
-bad closing tag order, unencoded entities, inexistent tag types, self-closing
-tags and so on. It parses documents to a class representation and offers a
-small set of DOM functions to manipulate it. It can be extended to parse to
-your own classes.")
- (home-page "https://shinmera.github.io/plump/")
- (license license:zlib))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Common Lisp library to make histograms")
+ (description "This is a Common Lisp library to make histograms using
+UTF-8 block characters.")
+ (home-page "https://github.com/tkych/cl-spark")
+ (license license:expat))))
-(define-public cl-plump
- (sbcl-package->cl-source-package sbcl-plump))
+(define-public cl-spark
+ (sbcl-package->cl-source-package sbcl-cl-spark))
-(define-public ecl-plump
- (sbcl-package->ecl-package sbcl-plump))
+(define-public ecl-cl-spark
+ (sbcl-package->ecl-package sbcl-cl-spark))
-(define-public sbcl-plump-sexp
- (let ((commit "bbcf75e9ecda8fe7603098ab8c15828407bb4f08")
- (revision "0"))
+(define-public sbcl-cl-speedy-queue
+ (let ((commit "0425c7c62ad3b898a5ec58cd1b3e74f7d91eec4b")
+ (revision "1"))
(package
- (name "sbcl-plump-sexp")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-cl-speedy-queue")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/plump-sexp")
- (commit commit)))
- (file-name (git-file-name "cl-plump-sexp" version))
+ (uri (git-reference
+ (url "https://github.com/zkat/cl-speedy-queue")
+ (commit commit)))
+ (file-name (git-file-name "cl-speedy-queue" version))
(sha256
- (base32
- "0zm9h0assjb8766z2v6l1k1s60y90y6f8smrl1dczwqlvc8xyln5"))))
+ (base32 "0czhnvxn9lvbjz9h1lb7y18nqrsq3drq5icd3lqdaa07362alriq"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-plump))
- (synopsis "Convert S-expressions into a Plump DOM and back")
+ (home-page "https://github.com/zkat/cl-speedy-queue")
+ (synopsis "Lightweight optimized queue for Common Lisp")
(description
- "The Plump-SEXP library is a backend for Plump which can convert
-between S-expressions and the Plump DOM.")
- (home-page "https://github.com/Shinmera/plump-sexp")
- (license license:zlib))))
+ "This is a lightweight, non-consing, optimized queue implementation for
+Common Lisp.")
+ (license license:expat))))
-(define-public cl-plump-sexp
- (sbcl-package->cl-source-package sbcl-plump-sexp))
+(define-public cl-speedy-queue
+ (sbcl-package->cl-source-package sbcl-cl-speedy-queue))
-(define-public ecl-plump-sexp
- (sbcl-package->ecl-package sbcl-plump-sexp))
+(define-public ecl-cl-speedy-queue
+ (sbcl-package->ecl-package sbcl-cl-speedy-queue))
-;;; Split the antik package in two to work around the circular dependency
-;;; between antik/antik and antik/gsll.
-(define-public sbcl-antik-base
- (let ((commit "e4711a69b3d6bf37b5727af05c3cfd03e8428ba3")
- (revision "1"))
+(define-public sbcl-cl-sqlite
+ (package
+ (name "sbcl-cl-sqlite")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dmitryvk/cl-sqlite")
+ (commit version)))
+ (file-name (git-file-name "cl-sqlite" version))
+ (sha256
+ (base32
+ "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("iterate" ,sbcl-iterate)
+ ("cffi" ,sbcl-cffi)
+ ("sqlite" ,sqlite)))
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (arguments
+ `(#:asd-systems '("sqlite")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "sqlite-ffi.lisp"
+ (("libsqlite3" all) (string-append
+ (assoc-ref inputs "sqlite")"/lib/" all))))))))
+ (home-page "https://common-lisp.net/project/cl-sqlite/")
+ (synopsis "Common Lisp binding for SQLite")
+ (description
+ "The @command{cl-sqlite} package is an interface to the SQLite embedded
+relational database engine.")
+ (license license:public-domain)))
+
+(define-public cl-sqlite
+ (sbcl-package->cl-source-package sbcl-cl-sqlite))
+
+(define-public ecl-cl-sqlite
+ (sbcl-package->ecl-package sbcl-cl-sqlite))
+
+(define-public sbcl-cl+ssl
+ (let ((commit "17d5cdd65405f1d26e26f3e875e70027d0c8eedb")
+ (revision "6"))
(package
- (name "sbcl-antik-base")
+ (name "sbcl-cl+ssl")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/antik/antik.git")
+ (url "https://github.com/cl-plus-ssl/cl-plus-ssl")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl+ssl" version))
(sha256
- (base32
- "047ga2c38par2xbgg4qx6hwv06qhf1c1f67as8xvir6s80lip1km"))))
+ (base32 "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("drakma" ,sbcl-drakma)
- ("fare-utils" ,sbcl-fare-utils)
- ("iterate" ,sbcl-iterate)
- ("metabang-bind" ,sbcl-metabang-bind)
- ("named-readtables" ,sbcl-named-readtables)
- ("split-sequence" ,sbcl-split-sequence)
- ("static-vectors" ,sbcl-static-vectors)
- ("trivial-garbage" ,sbcl-trivial-garbage)
- ("trivial-utf-8" ,sbcl-trivial-utf-8)))
- (native-inputs
- (list sbcl-lisp-unit))
(arguments
- '(#:asd-systems '("antik-base"
- "foreign-array")
- #:phases
+ '(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-build
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/reload.lisp"
+ (("libssl.so" all)
+ (string-append
+ (assoc-ref inputs "openssl") "/lib/" all))
+ (("libcrypto.so" all)
+ (string-append
+ (assoc-ref inputs "openssl") "/lib/" all)))))
+ (add-after 'fix-paths 'fix-tests
(lambda _
- (for-each delete-file
- '("antik.asd"
- "physical-dimension.asd"
- "science-data.asd"))
- #t)))))
- (synopsis "Scientific and engineering computation in Common Lisp")
+ ;; Disable coverall support in tests because of a circular
+ ;; dependency: cl+ssl -> cl-coverall -> dexador
+ ;; -> clack -> hunchentoot -> cl+ssl
+ (substitute* "cl+ssl.test.asd"
+ (("\\(:feature \\(:or :sbcl :ccl\\) :cl-coveralls\\)")
+ "")))))))
+ (native-inputs
+ (list ;sbcl-cl-coveralls
+ sbcl-fiveam
+ sbcl-trivial-sockets))
+ (inputs
+ (list openssl
+ sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-flexi-streams
+ sbcl-trivial-features
+ sbcl-trivial-garbage
+ sbcl-trivial-gray-streams
+ sbcl-usocket))
+ (home-page "https://common-lisp.net/project/cl-plus-ssl/")
+ (synopsis "Common Lisp bindings to OpenSSL")
(description
- "Antik provides a foundation for scientific and engineering
-computation in Common Lisp. It is designed not only to facilitate
-numerical computations, but to permit the use of numerical computation
-libraries and the interchange of data and procedures, whether
-foreign (non-Lisp) or Lisp libraries. It is named after the
-Antikythera mechanism, one of the oldest examples of a scientific
-computer known.")
- (home-page "https://common-lisp.net/project/antik/")
- (license license:gpl3))))
+ "This library is a fork of SSL-CMUCL. The original SSL-CMUCL source
+code was written by Eric Marsden and includes contributions by Jochen Schmidt.
+Development into CL+SSL was done by David Lichteblau.")
+ (license license:expat))))
-(define-public cl-antik-base
- (sbcl-package->cl-source-package sbcl-antik-base))
+(define-public cl-cl+ssl
+ (sbcl-package->cl-source-package sbcl-cl+ssl))
-(define-public ecl-antik-base
- (let ((pkg (sbcl-package->ecl-package sbcl-antik-base)))
+(define-public ecl-cl+ssl
+ ;; The trivial-sockets system used for the tests doesn't support ECL, so we
+ ;; remove it from native-inputs and disable the tests.
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl+ssl)))
(package
(inherit pkg)
+ (native-inputs
+ (modify-inputs (package-native-inputs pkg)
+ (delete "sbcl-trivial-sockets")))
(arguments
(substitute-keyword-arguments (package-arguments pkg)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'fix-readtable
- (lambda _
- (substitute* "input-output/readtable.lisp"
- (("#-ccl")
- "#-(or ccl ecl)"))
- #t)))))))))
+ ((#:tests? _ #f) #f))))))
-(define-public sbcl-gsll
- (let ((commit "1a8ada22f9cf5ed7372d352b2317f4ccdb6ab308")
+(define-public sbcl-cl-steamworks
+ (let ((commit "9d6a4de653a8cc256ae35e0298912b518aa92ba3")
(revision "1"))
(package
- (name "sbcl-gsll")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-steamworks")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/antik/gsll.git")
+ (url "https://github.com/Shinmera/cl-steamworks/")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
- (base32
- "0z5nypfk26hxihb08p085644afawicrgb4xvadh3lmrn46qbjfn4"))))
+ (base32 "1fzj3rlqw1kwdlmh0ga0y71p2n1adflcamzx4yp9kga552c1db5j"))
+ (file-name (git-file-name "cl-steamworks" version))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lisp-unit))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("antik-base" ,sbcl-antik-base)
- ("cffi" ,sbcl-cffi)
- ("gsl" ,gsl)
- ("metabang-bind" ,sbcl-metabang-bind)
- ("trivial-features" ,sbcl-trivial-features)
- ("trivial-garbage" ,sbcl-trivial-garbage)))
- (arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-cffi-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gsll.asd"
- ((":depends-on \\(#:foreign-array")
- ":depends-on (#:foreign-array #:cffi-libffi"))
- (substitute* "init/init.lisp"
- (("libgslcblas.so" all)
- (string-append
- (assoc-ref inputs "gsl") "/lib/" all)))
- (substitute* "init/init.lisp"
- (("libgsl.so" all)
- (string-append
- (assoc-ref inputs "gsl") "/lib/" all))))))))
- (synopsis "GNU Scientific Library for Lisp")
- (description
- "The GNU Scientific Library for Lisp (GSLL) allows the use of the
-GNU Scientific Library (GSL) from Common Lisp. This library provides a
-full range of common mathematical operations useful to scientific and
-engineering applications. The design of the GSLL interface is such
-that access to most of the GSL library is possible in a Lisp-natural
-way; the intent is that the user not be hampered by the restrictions
-of the C language in which GSL has been written. GSLL thus provides
-interactive use of GSL for getting quick answers, even for someone not
-intending to program in Lisp.")
- (home-page "https://common-lisp.net/project/gsll/")
- (license license:gpl3))))
-
-(define-public cl-gsll
- (sbcl-package->cl-source-package sbcl-gsll))
-
-(define-public ecl-gsll
- (sbcl-package->ecl-package sbcl-gsll))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cffi
+ sbcl-documentation-utils
+ sbcl-float-features
+ sbcl-trivial-features
+ sbcl-trivial-garbage
+ sbcl-trivial-gray-streams))
+ (synopsis "Wrapper for the Valve SteamWorks API")
+ (description "This is a wrapper library to allow you to interface with
+the Valve SteamWorks API.")
+ (home-page "https://shinmera.github.io/cl-steamworks/")
+ (license license:zlib))))
-(define-public sbcl-antik
- (package
- (inherit sbcl-antik-base)
- (name "sbcl-antik")
- (inputs
- `(("antik-base" ,sbcl-antik-base)
- ("gsll" ,sbcl-gsll)))
- (arguments
- '(#:asd-systems '("antik"
- "science-data")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (for-each delete-file
- '("antik-base.asd"
- "foreign-array.asd"))
- #t)))))))
+(define-public cl-steamworks
+ (sbcl-package->cl-source-package sbcl-cl-steamworks))
-(define-public cl-antik
- (sbcl-package->cl-source-package sbcl-antik))
+(define-public ecl-cl-steamworks
+ (sbcl-package->ecl-package sbcl-cl-steamworks))
-(define-public sbcl-cl-interpol
- (let ((commit "70a1137f41dd8889004dbab9536b1adeac2497aa")
+(define-public sbcl-cl-store
+ (let ((commit "c787337a16ea8cf8a06227f35933a4ec774746b3")
(revision "1"))
(package
- (name "sbcl-cl-interpol")
- (version (git-version "0.2.7" revision commit))
+ (name "sbcl-cl-store")
+ (version (git-version "0.8.11" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/cl-interpol")
+ (url "https://github.com/skypher/cl-store")
(commit commit)))
- (file-name (git-file-name "cl-interpol" version))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1kr00zf62m7la7rxa2m5w49r9cyzamc106hvjcc8ffmi7a4jw490"))))
+ "194srkg8nrym19c6i7zbnkzshc1qhqa82m53qnkirz9fw928bqxr"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-unicode sbcl-named-readtables))
(native-inputs
- (list sbcl-flexi-streams))
- (synopsis "String interpolation for Common Lisp")
+ (list sbcl-rt))
+ (synopsis "Common Lisp library to serialize data")
(description
- "CL-INTERPOL is a library for Common Lisp which modifies the
-reader so that you can have interpolation within strings similar to
-Perl or Unix Shell scripts. It also provides various ways to insert
-arbitrary characters into literal strings even if your editor/IDE
-doesn't support them.")
- (home-page "https://edicl.github.io/cl-interpol/")
- (license license:bsd-3))))
+ "CL-STORE is a portable serialization package which should give you the
+ability to store all Common Lisp data types into streams.")
+ (home-page "https://www.common-lisp.net/project/cl-store/")
+ (license license:expat))))
-(define-public cl-interpol
- (sbcl-package->cl-source-package sbcl-cl-interpol))
+(define-public cl-store
+ (sbcl-package->cl-source-package sbcl-cl-store))
-(define-public ecl-cl-interpol
- (sbcl-package->ecl-package sbcl-cl-interpol))
+(define-public ecl-cl-store
+ (sbcl-package->ecl-package sbcl-cl-store))
-(define-public sbcl-symbol-munger
- (let ((commit "e96558e8315b8eef3822be713354787b2348b25e")
- (revision "2"))
+(define-public sbcl-cl-str
+ (package
+ (name "sbcl-cl-str")
+ (version "0.19")
+ (home-page "https://github.com/vindarel/cl-str")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (sha256
+ (base32 "1jyza2jhn7w6fl4w87pv0m87z5ia48m6dqw12k0mdh7l3mgjq839"))
+ (file-name (git-file-name name version))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
+ ("cl-change-case" ,sbcl-cl-change-case)))
+ (native-inputs
+ (list sbcl-prove))
+ (arguments
+ `(#:asd-systems '("str")))
+ (synopsis "Modern, consistent and terse Common Lisp string manipulation library")
+ (description "A modern and consistent Common Lisp string manipulation
+library that focuses on modernity, simplicity and discoverability:
+@code{(str:trim s)} instead of @code{(string-trim '(#\\Space ...) s)}), or
+@code{str:concat strings} instead of an unusual format construct; one
+discoverable library instead of many; consistency and composability, where
+@code{s} is always the last argument, which makes it easier to feed pipes and
+arrows.")
+ (license license:expat)))
+
+(define-public cl-str
+ (sbcl-package->cl-source-package sbcl-cl-str))
+
+(define-public ecl-cl-str
+ (sbcl-package->ecl-package sbcl-cl-str))
+
+(define-public sbcl-cl-strftime
+ ;; No release.
+ (let ((commit "21cb57f2595faa26d687893963f24ec41822b63c"))
(package
- (name "sbcl-symbol-munger")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-cl-strftime")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/AccelerationNet/symbol-munger")
+ (url "https://github.com/ruricolist/cl-strftime/")
(commit commit)))
- (file-name (git-file-name "cl-symbol-munger" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz"))))
+ (base32 "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("iterate" ,sbcl-iterate)))
- (arguments
- ;; There is a cyclical dependency between symbol-munger and lisp-unit2.
- ;; See https://github.com/AccelerationNet/symbol-munger/issues/4
- '(#:tests? #f))
- (synopsis
- "Capitalization and spacing conversion functions for Common Lisp")
+ (list sbcl-alexandria sbcl-local-time sbcl-cl-ppcre sbcl-serapeum))
+ (native-inputs
+ (list sbcl-fiveam sbcl-cffi))
+ (home-page "https://github.com/ruricolist/cl-strftime")
+ (synopsis "Common Lisp compiler for the strftime language")
(description
- "This is a Common Lisp library to change the capitalization and spacing
-of a string or a symbol. It can convert to and from Lisp, english, underscore
-and camel-case rules.")
- (home-page "https://github.com/AccelerationNet/symbol-munger")
- ;; The package declares a BSD license, but all of the license
- ;; text is MIT.
- ;; See https://github.com/AccelerationNet/symbol-munger/issues/5
+ "CL-STRFTIME is a Common Lisp compiler for the strftime “language.”")
(license license:expat))))
-(define-public cl-symbol-munger
- (sbcl-package->cl-source-package sbcl-symbol-munger))
+(define-public cl-strftime
+ (sbcl-package->cl-source-package sbcl-cl-strftime))
-(define-public ecl-symbol-munger
- (sbcl-package->ecl-package sbcl-symbol-munger))
+(define-public ecl-cl-strftime
+ (sbcl-package->ecl-package sbcl-cl-strftime))
-(define-public sbcl-cl-csv
- (let ((commit "68ecb5d816545677513d7f6308d9e5e8d2265651")
- (revision "2"))
+(define-public sbcl-cl-string-match
+ (let ((revision "1")
+ (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97"))
(package
- (name "sbcl-cl-csv")
- (version (git-version "1.0.6" revision commit))
+ (name "sbcl-cl-string-match")
+ (version (git-version "0" revision changeset))
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/AccelerationNet/cl-csv")
- (commit commit)))
- (file-name (git-file-name name version))
+ (method hg-fetch)
+ (uri (hg-reference
+ (url "https://github.com/vityok/cl-string-match")
+ (changeset changeset)))
(sha256
(base32
- "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"))))
+ "01wn5qx562w43ssy92xlfgv79w7p0nv0wbl76mpmba131n9ziq2y"))
+ (file-name (git-file-name "cl-string-match" version))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; See: https://github.com/AccelerationNet/cl-csv/pull/34
- `(#:tests? #f))
(inputs
`(("alexandria" ,sbcl-alexandria)
- ("cl-interpol" ,sbcl-cl-interpol)
- ("iterate" ,sbcl-iterate)))
+ ("babel" ,sbcl-babel)
+ ("iterate" ,sbcl-iterate)
+ ("jpl-queues" ,sbcl-jpl-queues)
+ ("jpl-util" ,sbcl-jpl-util)
+ ("mgl-pax" ,sbcl-mgl-pax)
+ ("parse-float" ,sbcl-parse-float)
+ ("proc-parse" ,sbcl-proc-parse)
+ ("yacc" ,sbcl-cl-yacc)))
+ ;; TODO: Tests are not evaluated properly.
(native-inputs
- (list sbcl-lisp-unit2))
- (synopsis "Common lisp library for comma-separated values")
+ ;; For testing:
+ (list sbcl-lisp-unit))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-dependency
+ (lambda _
+ (substitute* "cl-string-match.asd"
+ ((":mgl-pax")
+ ":mgl-pax/document")))))))
+ (synopsis "Set of utilities to manipulate strings in Common Lisp")
(description
- "This is a Common Lisp library providing functions to read/write CSV
-from/to strings, streams and files.")
- (home-page "https://github.com/AccelerationNet/cl-csv")
+ "@command{cl-strings} is a small, portable, dependency-free set of
+utilities that make it even easier to manipulate text in Common Lisp. It has
+100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.")
+ (home-page "https://github.com/vityok/cl-string-match")
(license license:bsd-3))))
-(define-public cl-csv
- (sbcl-package->cl-source-package sbcl-cl-csv))
+(define-public cl-string-match
+ (sbcl-package->cl-source-package sbcl-cl-string-match))
-(define-public ecl-cl-csv
- (sbcl-package->ecl-package sbcl-cl-csv))
+(define-public ecl-cl-string-match
+ (sbcl-package->ecl-package sbcl-cl-string-match))
-(define-public sbcl-external-program
- (let ((commit "5888b8f1fd3953feeeacecbba4384ddda584a749")
- (revision "1"))
+(define-public sbcl-cl-strings
+ (let ((revision "1")
+ (commit "93ec4177fc51f403a9f1ef0a8933f36d917f2140"))
(package
- (name "sbcl-external-program")
- (version (git-version "0.0.6" revision commit))
+ (name "sbcl-cl-strings")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sellout/external-program")
+ (url "https://github.com/diogoalexandrefranco/cl-strings")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
- (base32
- "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"))))
+ (base32 "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"))
+ (file-name (git-file-name "cl-strings" version))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-trivial-features))
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "Common Lisp library for running external programs")
+ (synopsis "Set of utilities to manipulate strings in Common Lisp")
(description
- "EXTERNAL-PROGRAM enables running programs outside the Lisp
-process. It is an attempt to make the RUN-PROGRAM functionality in
-implementations like SBCL and CCL as portable as possible without
-sacrificing much in the way of power.")
- (home-page "https://github.com/sellout/external-program")
- (license license:llgpl))))
+ "@command{cl-strings} is a small, portable, dependency-free set of
+utilities that make it even easier to manipulate text in Common Lisp. It has
+100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.")
+ (home-page "https://github.com/diogoalexandrefranco/cl-strings")
+ (license license:expat))))
-(define-public cl-external-program
- (sbcl-package->cl-source-package sbcl-external-program))
+(define-public cl-strings
+ (sbcl-package->cl-source-package sbcl-cl-strings))
-(define-public ecl-external-program
- (sbcl-package->ecl-package sbcl-external-program))
+(define-public ecl-cl-strings
+ (sbcl-package->ecl-package sbcl-cl-strings))
-(define-public sbcl-cl-ana
- (let ((commit "848185eed1ed65bab3a124870c122f761ce0d87e")
- (revision "2"))
+(define-public sbcl-cl-svg
+ (let ((commit "1e988ebd2d6e2ee7be4744208828ef1b59e5dcdc")
+ (revision "1"))
(package
- (name "sbcl-cl-ana")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-svg")
+ (version (git-version "0.0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ghollisjr/cl-ana")
+ (url "https://github.com/wmannis/cl-svg")
(commit commit)))
- (file-name (git-file-name "cl-ana" version))
+ (file-name (git-file-name "cl-svg" version))
(sha256
- (base32 "026agqsxq3pg2k9jmy2wysil2z0yn5rykzzhr8rqxsspdwz51z1y"))))
+ (base32 "11rmzimy6j7ln7q5y1h2kw1225rsfb6fpn89qjcq7h5lc8fay0wz"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list openmpi ;; for hdf-cffi
- pkg-config
- sbcl-cl-fad))
- (inputs
- (list gsl
- hdf5-parallel-openmpi
- libffi
- sbcl-antik
- sbcl-cffi
- sbcl-cl-csv
- sbcl-closer-mop
- sbcl-external-program
- sbcl-gsll
- sbcl-iterate
- sbcl-alexandria
- sbcl-split-sequence))
- (propagated-inputs
- (list gnuplot)) ;; for gnuplot-interface
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "hdf-cffi/src/library.lisp"
- (("libhdf5.so")
- (search-input-file inputs "/lib/libhdf5.so")))
- (substitute* (list "gsl-cffi/gsl-cffi.lisp"
- "spline/spline.lisp")
- (("libgsl.so")
- (search-input-file inputs "/lib/libgsl.so")))))
- (add-after 'fix-paths 'fix-newer-hdf5-compatibility
- (lambda _
- (substitute* (list "hdf-cffi/src/h5-grovel.lisp"
- "hdf-cffi/src/h5a-grovel.lisp"
- "hdf-cffi/src/h5d-grovel.lisp"
- "hdf-cffi/src/h5f-grovel.lisp"
- "hdf-cffi/src/h5g-grovel.lisp"
- "hdf-cffi/src/h5i-grovel.lisp"
- "hdf-cffi/src/h5l-grovel.lisp"
- "hdf-cffi/src/h5o-grovel.lisp"
- "hdf-cffi/src/h5p-grovel.lisp"
- "hdf-cffi/src/h5pl-grovel.lisp"
- "hdf-cffi/src/h5r-grovel.lisp"
- "hdf-cffi/src/h5s-grovel.lisp"
- "hdf-cffi/src/h5t-grovel.lisp"
- "hdf-cffi/src/h5z-grovel.lisp")
- (("_H5private_H")
- "H5private_H")))))))
- (synopsis "Common Lisp data analysis library")
+ (home-page "https://github.com/wmannis/cl-svg")
+ (synopsis "Write SVG file format")
(description
- "CL-ANA is a data analysis library in Common Lisp providing tabular and
-binned data analysis along with nonlinear least squares fitting and
-visualization.")
- (home-page "https://github.com/ghollisjr/cl-ana")
- (license license:gpl3))))
+ "This package provides the @code{CL-SVG} Common Lisp system to produce
+Scalable Vector Graphics files.")
+ (license license:expat))))
-(define-public cl-ana
- (sbcl-package->cl-source-package sbcl-cl-ana))
+(define-public cl-svg
+ (sbcl-package->cl-source-package sbcl-cl-svg))
-(define-public sbcl-eazy-gnuplot
- (let ((commit "2eb900fe2557e6c066a9851c166e572c25bc0996")
- (revision "0"))
+(define-public ecl-cl-svg
+ (sbcl-package->ecl-package sbcl-cl-svg))
+
+(define-public sbcl-cl-sxml
+ (let ((commit "e5542b1d9bd6cee03ae27547d00660ccfbb60109")
+ (revision "1"))
(package
- (name "sbcl-eazy-gnuplot")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-cl-sxml")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/guicho271828/eazy-gnuplot")
+ (url "https://github.com/eadmund/cl-sxml")
(commit commit)))
- (file-name (git-file-name "cl-eazy-gnuplot" version))
+ (file-name (git-file-name "cl-sxml" version))
(sha256
- (base32 "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"))
- (patches (search-patches "sbcl-eazy-gnuplot-skip-path-check.patch"))))
+ (base32 "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"))))
(build-system asdf-build-system/sbcl)
+ (inputs (list sbcl-cxml))
(native-inputs
- (list sbcl-fiveam))
- (inputs
- (list gnuplot
- sbcl-alexandria
- sbcl-iterate
- sbcl-trivia))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda _
- (substitute* "src/package.lisp"
- (("\"gnuplot\"")
- (string-append "\"" (which "gnuplot") "\""))))))))
- (home-page "https://github.com/guicho271828/eazy-gnuplot")
- (synopsis "Common Lisp interface to gnuplot")
+ (list sbcl-fiveam
+ sbcl-flexi-streams))
+ (home-page "https://github.com/eadmund/cl-sxml")
+ (synopsis "SXML parsing for Common Lisp")
(description
- "Eazy-Gnuplot is a Common Lisp interface to gnuplot which eschews CFFI,
-CLOS and structures. It communicates with @command{gnuplot} via
-@code{*standard-output*}, and users can plot data by printing to that
-stream.")
- (license license:llgpl))))
+ "@code{CL-SXML} implements Oleg Kiselyov’s SXML, an S-expression-based
+rendering of the XML Infoset.")
+ (license license:gpl3+))))
-(define-public cl-eazy-gnuplot
- (sbcl-package->cl-source-package sbcl-eazy-gnuplot))
+(define-public cl-sxml
+ (sbcl-package->cl-source-package sbcl-cl-sxml))
-(define-public ecl-eazy-gnuplot
- (sbcl-package->ecl-package sbcl-eazy-gnuplot))
+(define-public ecl-cl-sxml
+ (sbcl-package->ecl-package sbcl-cl-sxml))
-(define-public sbcl-archive
- (let ((commit "631271c091ed02994bec3980cb288a2cf32c7cdc")
- (revision "1"))
- (package
- (name "sbcl-archive")
- (version (git-version "0.9" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/archive")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0pvsc9fmybx7rxd0kmzq4shi6hszdpwdc1sfy7jwyfxf8n3hnv4p"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-fad sbcl-trivial-gray-streams))
- (synopsis "Common Lisp library for tar and cpio archives")
- (description
- "This is a Common Lisp library to read and write disk-based file
-archives such as those generated by the tar and cpio programs on Unix.")
- (home-page "https://github.com/sharplispers/archive")
- (license license:bsd-3))))
+(define-public sbcl-cl-syntax
+ (package
+ (name "sbcl-cl-syntax")
+ (version "0.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/m2ym/cl-syntax")
+ (commit "03f0c329bbd55b8622c37161e6278366525e2ccc")))
+ (file-name (git-file-name "cl-syntax" version))
+ (sha256
+ (base32 "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-annot" ,sbcl-cl-annot)
+ ("cl-interpol" ,sbcl-cl-interpol)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("trivial-types" ,sbcl-trivial-types)))
+ (arguments
+ '(#:asd-systems '("cl-syntax"
+ "cl-syntax-annot"
+ "cl-syntax-interpol")))
+ (home-page "https://github.com/m2ym/cl-syntax")
+ (synopsis "Reader Syntax Coventions for Common Lisp and SLIME")
+ (description
+ "CL-SYNTAX provides Reader Syntax Coventions for Common Lisp and SLIME.")
+ (license license:llgpl)))
-(define-public cl-archive
- (sbcl-package->cl-source-package sbcl-archive))
+(define-public cl-syntax
+ (sbcl-package->cl-source-package sbcl-cl-syntax))
-(define-public ecl-archive
- (sbcl-package->ecl-package sbcl-archive))
+(define-public ecl-cl-syntax
+ (sbcl-package->ecl-package sbcl-cl-syntax))
-(define-public sbcl-tar-file
- (let ((commit "0c10bc82f14702c97a26dc25ce075b5d3a2347d1")
+(define-public sbcl-cl-syslog
+ (let ((commit "d5d46f777f0735938e6f650cf17d814b88b70305")
(revision "0"))
(package
- (name "sbcl-tar-file")
- (version (git-version "0.2.1" revision commit))
+ (name "sbcl-cl-syslog")
+ (version (git-version "0.2.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
+ (url "https://github.com/mmaul/cl-syslog")
(commit commit)))
- (file-name (git-file-name "cl-tar-file" version))
+ (file-name (git-file-name "cl-syslog" version))
(sha256
- (base32 "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"))))
+ (base32 "1qcz55jiqwk91b01hsahxnha884f6zf2883j2m51sqph0mvj69mh"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
(inputs
- (list sbcl-40ants-doc
- sbcl-alexandria
+ (list sbcl-alexandria
sbcl-babel
- sbcl-chipz
- sbcl-flexi-streams
- sbcl-salza2
- sbcl-trivial-gray-streams))
- (home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
- (synopsis "Read and write physical entries to and from tar files")
- (description
- "@code{cl-tar-file} is a Common Lisp library that allows reading from
-and writing to various tar archive formats. Currently supported are the POSIX
-ustar, PAX (ustar with a few new entry types), GNU, and v7 (very old) formats.
-
-This library is rather low level and is focused exclusively on reading and
-writing physical tar file entries using streams. Therefore, it contains no
-functionality for automatically building archives from a set of files on the
-filesystem or writing the contents of a file to the filesystem. Additionally,
-there are no smarts that read multiple physical entries and combine them into
-a single logical entry (e.g., with PAX extended headers or GNU long link/path
-name support). For a higher-level library that reads and writes logical
-entries, and also includes filesystem integration, see @code{cl-tar}.")
+ sbcl-cffi
+ sbcl-global-vars
+ sbcl-local-time
+ sbcl-split-sequence
+ sbcl-usocket))
+ (arguments
+ (list #:tests? #f))
+ (synopsis "Common Lisp interface to local and remote Syslog facilities")
+ (description "@code{cl-syslog} is a Common Lisp library that provides
+access to the syslog logging facility.")
+ (home-page "https://cl-syslog.common-lisp.dev/")
(license license:bsd-3))))
-(define-public cl-tar-file
- (sbcl-package->cl-source-package sbcl-tar-file))
+(define-public cl-syslog
+ (sbcl-package->cl-source-package sbcl-cl-syslog))
-(define-public ecl-tar-file
- (sbcl-package->ecl-package sbcl-tar-file))
+(define-public ecl-cl-syslog
+ (sbcl-package->ecl-package sbcl-cl-syslog))
-(define-public sbcl-tar
- (let ((commit "7c6e07a10c93d9e311f087b5f6328cddd481669a")
+(define-public sbcl-cl-template
+ (let ((commit "46193a9a389bb950530e579eae7e6e5a18184832")
(revision "0"))
(package
- (name "sbcl-tar")
- (version (git-version "0.2.3" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-tar/cl-tar")
- (commit commit)))
- (file-name (git-file-name "cl-tar" version))
- (sha256
- (base32 "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"))))
- (build-system asdf-build-system/sbcl)
- ;; TODO: Build the tar program with 'build-program' when the
- ;; 'asdf-release-ops' library is added to Guix.
- (arguments
- '(#:asd-systems '("tar"
- "tar/common-extract"
- "tar/create"
- "tar/docs"
- "tar/extract"
- "tar/simple-extract")))
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-40ants-doc
- sbcl-alexandria
- sbcl-babel
- sbcl-local-time
- sbcl-osicat
- sbcl-split-sequence
- sbcl-tar-file))
- (home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar")
- (synopsis "High-level interface for tar files")
- (description
- "@code{cl-tar} is a Common Lisp library providing a high-level interface
-for interacting with tar archives.")
- (license license:expat))))
+ (name "sbcl-cl-template")
+ (version (git-version "0.0.1" revision commit))
+ (home-page "https://github.com/alpha123/cl-template")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alpha123/cl-template")
+ (commit commit)))
+ (file-name (git-file-name "cl-template" version))
+ (sha256
+ (base32 "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Template engine for Common Lisp")
+ (description "@code{cl-template} is a template engine for Common Lisp,
+taking inspiration from Ruby's ERb module.")
+ (license license:expat))))
-(define-public cl-tar
- (sbcl-package->cl-source-package sbcl-tar))
+(define-public cl-template
+ (sbcl-package->cl-source-package sbcl-cl-template))
-(define-public ecl-tar
- (sbcl-package->ecl-package sbcl-tar))
+(define-public ecl-cl-template
+ (sbcl-package->ecl-package sbcl-cl-template))
-(define-public sbcl-misc-extensions
- (let ((commit "101c05112bf2f1e1bbf527396822d2f50ca6327a")
- (revision "1"))
+(define-public sbcl-cl-tga
+ (let ((commit "4dc2f7b8a259b9360862306640a07a23d4afaacc")
+ (revision "0"))
(package
- (name "sbcl-misc-extensions")
- (version (git-version "3.3" revision commit))
+ (name "sbcl-cl-tga")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/misc-extensions/devel.git")
+ (url "https://github.com/fisxoj/cl-tga")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "0gz5f4p70qzilnxsnf5lih2n9m4wjcw8hlw4w8mpn9jyhyppyyv0"))))
+ (base32 "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Collection of small macros and extensions for Common Lisp")
+ (home-page "https://github.com/fisxoj/cl-tga")
+ (synopsis "TGA file loader for Common Lisp")
(description
- "This project is intended as a catchall for small, general-purpose
-extensions to Common Lisp. It contains:
-
-@itemize
-@item @code{new-let}, a macro that combines and generalizes @code{let},
-@code{let*} and @code{multiple-value-bind},
-@item @code{gmap}, an iteration macro that generalizes @code{map}.
-@end itemize\n")
- (home-page "https://common-lisp.net/project/misc-extensions/")
- (license license:public-domain))))
-
-(define-public cl-misc-extensions
- (sbcl-package->cl-source-package sbcl-misc-extensions))
-
-(define-public ecl-misc-extensions
- (sbcl-package->ecl-package sbcl-misc-extensions))
-
-(define-public sbcl-mt19937
- (package
- (name "sbcl-mt19937")
- (version "1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://common-lisp.net/project/asdf-packaging/"
- "mt19937-latest.tar.gz"))
- (sha256
- (base32
- "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Mersenne Twister pseudo-random number generator")
- (description
- "MT19937 is a portable Mersenne Twister pseudo-random number generator
-for Common Lisp.")
- (home-page "https://www.cliki.net/mt19937")
- (license license:public-domain)))
+ "Cl-tga was written to facilitate loading @emph{.tga} files into OpenGL
+programs. It's a very simple library, and, at the moment, only supports
+non-RLE encoded forms of the files.")
+ (license license:expat))))
-(define-public cl-mt19937
- (sbcl-package->cl-source-package sbcl-mt19937))
+(define-public cl-tga
+ (sbcl-package->cl-source-package sbcl-cl-tga))
-(define-public ecl-mt19937
- (sbcl-package->ecl-package sbcl-mt19937))
+(define-public ecl-cl-tga
+ (sbcl-package->ecl-package sbcl-cl-tga))
-(define-public sbcl-fset
- (let ((commit "6d2f9ded8934d2b42f2571a0ba5bda091037d852")
- (revision "1"))
+(define-public sbcl-cl-tld
+ ;; No release.
+ (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75"))
(package
- (name "sbcl-fset")
- (version (git-version "1.3.2" revision commit))
+ (name "sbcl-cl-tld")
+ (version (git-version "0.1" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/slburson/fset")
+ (url "https://github.com/lu4nx/cl-tld")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "127acblwrbqicx47h6sgvknz1cqyfn8p4xkhkn1m7hxh8w5gk1zy"))
- (snippet '(begin
- ;; Remove obsolete copy of system definition.
- (delete-file "Code/fset.asd")
- #t))))
+ (base32 "0sxnn35gzdby1ixil6zbjg72vli9fcspwzsqimqk455310syx9iv"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-misc-extensions sbcl-mt19937 sbcl-named-readtables))
- (synopsis "Functional set-theoretic collections library")
+ (home-page "https://github.com/lu4nx/cl-tld/")
+ (synopsis "Extract the Top Level Domain from domains, in Common Lisp")
(description
- "FSet is a functional set-theoretic collections library for Common Lisp.
-Functional means that all update operations return a new collection rather than
-modifying an existing one in place. Set-theoretic means that collections may
-be nested arbitrarily with no additional programmer effort; for instance, sets
-may contain sets, maps may be keyed by sets, etc.")
- (home-page "https://common-lisp.net/project/fset/Site/index.html")
- (license license:llgpl))))
+ "This library extracts the TLD (Top Level Domain) from domains. The
+information is taken from @url{https://publicsuffix.org}.")
+ (license license:public-domain))))
-(define-public cl-fset
- (sbcl-package->cl-source-package sbcl-fset))
+(define-public cl-tld
+ (sbcl-package->cl-source-package sbcl-cl-tld))
-(define-public ecl-fset
- (package
- (inherit (sbcl-package->ecl-package sbcl-fset))
- (arguments
- ;; Tests fails on ECL with "The function FSET::MAKE-CHAR is undefined".
- '(#:tests? #f))))
+(define-public ecl-cl-tld
+ (sbcl-package->ecl-package sbcl-cl-tld))
-(define-public sbcl-modf
- (let ((commit "dea93fe62c6bf7f66f32f52ac0c555aedbf7abad")
+(define-public sbcl-cl-tls
+ (let ((commit "2ab4fc3ae7e79e451126a9bb6bc38ca2cd2cb4ba")
(revision "0"))
(package
- (name "sbcl-modf")
- (version (git-version "0" revision commit))
+ (name "sbcl-cl-tls")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/smithzvk/modf")
+ (url "https://github.com/shrdlu68/cl-tls")
(commit commit)))
- (file-name (git-file-name "cl-modf" version))
+ (file-name (git-file-name "cl-tls" version))
(sha256
- (base32
- "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"))))
+ (base32 "1j6gwv21ibkk6xd1xxm54wgwp09dzqg60b8z72hivpnq8gwm0ba7"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
- sbcl-closer-mop
- sbcl-iterate))
- (native-inputs
- (list sbcl-stefil))
- (home-page "https://github.com/smithzvk/modf")
- (synopsis "SETF like macro for functional programming in Common Lisp")
- (description "This library simplifies functional programming in Common
-Lisp by making it easier to make new data structures with specified changes in
-place.")
+ sbcl-babel
+ sbcl-cl-base64
+ sbcl-fast-io
+ sbcl-ironclad))
+ (home-page "https://github.com/shrdlu68/cl-tls")
+ (synopsis "Implementation of Transport Layer Security Protocols")
+ (description "This package provides prototype Common Lisp
+implementations of TLS, RFC5246, ASN.1, x{501,509}, and PKCS{1,3,5,8}.")
(license license:bsd-3))))
-(define-public cl-modf
- (sbcl-package->cl-source-package sbcl-modf))
+(define-public cl-tls
+ (sbcl-package->cl-source-package sbcl-cl-tls))
-(define-public ecl-modf
- (sbcl-package->ecl-package sbcl-modf))
+(define-public ecl-cl-tls
+ (sbcl-package->ecl-package sbcl-cl-tls))
-(define-public sbcl-cl-cont
- (let ((commit "fc1fa7e6eb64894fdca13e688e6015fad5290d2a")
+(define-public sbcl-cl-typesetting
+ (let ((commit "86eba981fc4254addebecf765578ec350d6e3b75")
(revision "1"))
(package
- (name "sbcl-cl-cont")
- (version (git-version "0.3.8" revision commit))
+ (name "sbcl-cl-typesetting")
+ (version (git-version "0.8.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-cont/cl-cont.git")
+ (url "https://github.com/mbattyani/cl-typesetting")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-typesetting" version))
(sha256
- (base32
- "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"))))
+ (base32 "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; NOTE: (Sharlatan-20210515T213014+0100): Circular dependencies with
+ ;; cl-typegraph
+ `(#:tests? #f))
(inputs
- (list sbcl-alexandria sbcl-closer-mop))
- (native-inputs
- (list sbcl-rt))
- (synopsis "Delimited continuations for Common Lisp")
+ `(("cl-pdf" ,sbcl-cl-pdf)
+ ("xmls" ,sbcl-xmls)))
+ (home-page "https://github.com/mbattyani/cl-typesetting")
+ (synopsis "Stand-alone Common Lisp typesetting system")
(description
- "This is a library that implements delimited continuations by
-transforming Common Lisp code to continuation passing style.")
- (home-page "https://common-lisp.net/project/cl-cont/")
- (license license:llgpl))))
+ "CL-TYPESETTING is a cross-platform Common Lisp typesetting library for
+all kind of typesetting applications.")
+ (license license:bsd-2))))
-(define-public cl-cont
- (sbcl-package->cl-source-package sbcl-cl-cont))
+(define-public cl-typesetting
+ (sbcl-package->cl-source-package sbcl-cl-typesetting))
-(define-public ecl-cl-cont
- (sbcl-package->ecl-package sbcl-cl-cont))
+(define-public ecl-cl-typesetting
+ (sbcl-package->ecl-package sbcl-cl-typesetting))
-(define-public sbcl-cl-coroutine
- (let ((commit "de098f8d5debd8b14ef6864b5bdcbbf5ddbcfd72")
+(define-public sbcl-cl-uglify-js
+ ;; There have been many bug fixes since the 2010 release.
+ (let ((commit "429c5e1d844e2f96b44db8fccc92d6e8e28afdd5")
(revision "1"))
(package
- (name "sbcl-cl-coroutine")
+ (name "sbcl-cl-uglify-js")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/takagi/cl-coroutine")
+ (url "https://github.com/mishoo/cl-uglify-js")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-uglify-js" version))
(sha256
(base32
- "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"))))
+ "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-cont" ,sbcl-cl-cont)))
- (native-inputs
- (list sbcl-prove))
- (arguments
- `(;; TODO: Fix the tests. They fail with:
- ;; "Component CL-COROUTINE-ASD::CL-COROUTINE-TEST not found"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "cl-coroutine-test.asd"
- (("cl-test-more")
- "prove"))
- #t)))))
- (synopsis "Coroutine library for Common Lisp")
- (description
- "This is a coroutine library for Common Lisp implemented using the
-continuations of the @code{cl-cont} library.")
- (home-page "https://github.com/takagi/cl-coroutine")
- (license license:llgpl))))
+ (list sbcl-parse-js sbcl-cl-ppcre sbcl-cl-ppcre-unicode
+ sbcl-parse-number sbcl-iterate))
+ (home-page "https://github.com/mishoo/cl-uglify-js")
+ (synopsis "JavaScript compressor library for Common Lisp")
+ (description "This is a Common Lisp version of UglifyJS, a JavaScript
+compressor. It works on data produced by @code{parse-js} to generate a
+@dfn{minified} version of the code. Currently it can:
-(define-public cl-coroutine
- (sbcl-package->cl-source-package sbcl-cl-coroutine))
+@itemize
+@item reduce variable names (usually to single letters)
+@item join consecutive @code{var} statements
+@item resolve simple binary expressions
+@item group most consecutive statements using the @code{sequence} operator (comma)
+@item remove unnecessary blocks
+@item convert @code{IF} expressions in various ways that result in smaller code
+@item remove some unreachable code
+@end itemize\n")
+ (license license:zlib))))
-(define-public ecl-cl-coroutine
- (sbcl-package->ecl-package sbcl-cl-coroutine))
+(define-public cl-uglify-js
+ (sbcl-package->cl-source-package sbcl-cl-uglify-js))
-(define-public sbcl-vas-string-metrics
- (let ((commit "f2e4500b180316123fbd549bd51c751ee2d6ba0f")
- (revision "1"))
- (package
- (name "sbcl-vas-string-metrics")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vsedach/vas-string-metrics")
- (commit commit)))
- (file-name (git-file-name "vas-string-metrics" version))
- (sha256
- (base32 "11fcnd03ybzz37rkg3z0wsb727yqgcd9gn70sccfb34l89ia279k"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-test-systems '("test.vas-string-metrics")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-test-asd
- (lambda _
- (substitute* "test.vas-string-metrics.asd"
- ((":depends-on")
- (string-append
- ":perform (test-op (op c) (symbol-call :vas-string-metrics :run-tests))"
- "\n"
- " :depends-on"))))))))
- (home-page "https://github.com/vsedach/vas-string-metrics")
- (synopsis "String distance algorithms for Common Lisp")
- (description
- "VAS-STRING-METRICS provides the Jaro, Jaro-Winkler, Soerensen-Dice,
-Levenshtein, and normalized Levenshtein string distance/similarity metrics
-algorithms.")
- (license license:lgpl3+))))
+(define-public ecl-cl-uglify-js
+ (sbcl-package->ecl-package sbcl-cl-uglify-js))
-(define-public ecl-vas-string-metrics
- (sbcl-package->ecl-package sbcl-vas-string-metrics))
+(define-public uglify-js
+ (package
+ (inherit sbcl-cl-uglify-js)
+ (name "uglify-js")
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (let* ((bin (string-append (assoc-ref %outputs "out") "/bin/"))
+ (script (string-append bin "uglify-js")))
+ (use-modules (guix build utils))
+ (mkdir-p bin)
+ (with-output-to-file script
+ (lambda _
+ (format #t "#!~a/bin/sbcl --script
-(define-public cl-vas-string-metrics
- (sbcl-package->cl-source-package sbcl-vas-string-metrics))
+ (require :asdf)
+ (asdf:initialize-source-registry
+ #p\"~a/etc/common-lisp/source-registry.conf.d/\")
+ (asdf:initialize-output-translations
+ #p\"~a/etc/common-lisp/asdf-output-translations.conf.d/\")"
+ (assoc-ref %build-inputs "sbcl")
+ (assoc-ref %build-inputs "sbcl-cl-uglify-js")
+ (assoc-ref %build-inputs "sbcl-cl-uglify-js"))
+ ;; FIXME: cannot use progn here because otherwise it fails to
+ ;; find cl-uglify-js.
+ (for-each
+ write
+ '(;; Quiet, please!
+ (let ((*standard-output* (make-broadcast-stream))
+ (*error-output* (make-broadcast-stream)))
+ (asdf:load-system :cl-uglify-js))
+ (let ((file (cadr *posix-argv*)))
+ (if file
+ (format t "~a"
+ (cl-uglify-js:ast-gen-code
+ (cl-uglify-js:ast-mangle
+ (cl-uglify-js:ast-squeeze
+ (with-open-file (in file)
+ (parse-js:parse-js in))))
+ :beautify nil))
+ (progn
+ (format *error-output*
+ "Please provide a JavaScript file.~%")
+ (sb-ext:exit :code 1))))))))
+ (chmod script #o755)
+ #t)))
+ (inputs
+ (list sbcl sbcl-cl-uglify-js))
+ (synopsis "JavaScript compressor")))
-(define-public sbcl-vom
- (let ((commit "1aeafeb5b74c53741b79497e0ef4acf85c92ff24")
+(define-public sbcl-cl-unicode
+ (package
+ (name "sbcl-cl-unicode")
+ (version "0.1.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edicl/cl-unicode")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-flexi-streams))
+ (inputs
+ (list sbcl-cl-ppcre))
+ (home-page "http://weitz.de/cl-unicode/")
+ (synopsis "Portable Unicode library for Common Lisp")
+ (description "CL-UNICODE is a portable Unicode library Common Lisp, which
+is compatible with perl. It is pretty fast, thread-safe, and compatible with
+ANSI-compliant Common Lisp implementations.")
+ (license license:bsd-2)))
+
+(define-public cl-unicode
+ (sbcl-package->cl-source-package sbcl-cl-unicode))
+
+(define-public ecl-cl-unicode
+ (sbcl-package->ecl-package sbcl-cl-unicode))
+
+(define-public sbcl-cl-unification
+ (let ((commit "01079f34d197495880aa49ab727d63774d83035c")
(revision "1"))
(package
- (name "sbcl-vom")
- (version (git-version "0.1.4" revision commit))
+ (name "sbcl-cl-unification")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/orthecreedence/vom")
+ (url "https://gitlab.common-lisp.net/cl-unification/cl-unification")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-unification" version))
(sha256
- (base32
- "0536kppj76ax4lrxhv42npkfjsmx45km2g439vf9jmw3apinz9cy"))))
+ (base32 "0nhqamn3qgg38i6aw2pshffdwr2hzslycg8ficmn333gw0h9rf4g"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Tiny logging utility for Common Lisp")
+ (native-inputs
+ (list sbcl-ptester))
+ (inputs
+ (list sbcl-cl-ppcre))
+ (home-page "https://common-lisp.net/project/cl-unification/")
+ (synopsis "Unification framework for Common Lisp")
(description
- "Vom is a logging library for Common Lisp. It's goal is to be useful
-and small. It does not provide a lot of features as other loggers do, but
-has a small codebase that's easy to understand and use.")
- (home-page "https://github.com/orthecreedence/vom")
- (license license:expat))))
+ "This package provides a framework to unify arbitrary
+Common Lisp objects while constructing bindings for placeholders
+(unification variables) in a template sublanguage.")
+ (license license:bsd-0))))
-(define-public cl-vom
- (sbcl-package->cl-source-package sbcl-vom))
+(define-public cl-unification
+ (sbcl-package->cl-source-package sbcl-cl-unification))
-(define-public ecl-vom
- (sbcl-package->ecl-package sbcl-vom))
+(define-public ecl-cl-unification
+ (let ((pkg (sbcl-package->ecl-package sbcl-cl-unification)))
+ (package
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; The tests fail on ECL with:
+ ;; "In MAKE-ARRAY: the elements in :INITIAL-CONTENTS do not match
+ ;; the array dimensions."
+ ((#:tests? _ #f) #f))))))
-(define-public sbcl-cl-libuv
- (let ((commit "32100c023c518038d0670a103eaa4d50dd785d29")
+(define-public sbcl-cl-utilities
+ (let ((commit "dce2d2f6387091ea90357a130fa6d13a6776884b")
(revision "1"))
(package
- (name "sbcl-cl-libuv")
- (version (git-version "0.1.6" revision commit))
+ (name "sbcl-cl-utilities")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/orthecreedence/cl-libuv")
- (commit commit)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://gitlab.common-lisp.net/cl-utilities/cl-utilities/-/"
+ "archive/" commit "/cl-utilities-" commit ".tar.gz"))
(sha256
- (base32
- "1kwix4si8a8hza34ab2k7whrh7z0yrmx39v2wc3qblv9m244jkh1"))))
+ (base32 "1r46v730yf96nk2vb24qmagv9x96xvd08abqwhf02ghgydv1a7z2"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("libuv" ,libuv)))
(arguments
- `(#:phases
+ '(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "lib.lisp"
- (("/usr/lib/libuv.so")
- (search-input-file inputs "/lib/libuv.so")))))
- (add-after 'fix-paths 'fix-system-definition
- (lambda _
- (substitute* "cl-libuv.asd"
- (("#:cffi #:alexandria")
- "#:cffi #:cffi-grovel #:alexandria"))
- #t)))))
- (synopsis "Common Lisp bindings to libuv")
+ (substitute* "rotate-byte.lisp"
+ (("in-package :cl-utilities)" all)
+ "in-package :cl-utilities)\n\n#+sbcl\n(require :sb-rotate-byte)")))))))
+ (home-page "https://common-lisp.net/project/cl-utilities")
+ (synopsis "Collection of semi-standard utilities")
(description
- "This library provides low-level libuv bindings for Common Lisp.")
- (home-page "https://github.com/orthecreedence/cl-libuv")
- (license license:expat))))
+ "On Cliki.net <http://www.cliki.net/Common%20Lisp%20Utilities>, there
+is a collection of Common Lisp Utilities, things that everybody writes since
+they're not part of the official standard. There are some very useful things
+there; the only problems are that they aren't implemented as well as you'd
+like (some aren't implemented at all) and they aren't conveniently packaged
+and maintained. It takes quite a bit of work to carefully implement utilities
+for common use, commented and documented, with error checking placed
+everywhere some dumb user might make a mistake.")
+ (license license:public-domain))))
-(define-public cl-libuv
- (sbcl-package->cl-source-package sbcl-cl-libuv))
+(define-public cl-utilities
+ (sbcl-package->cl-source-package sbcl-cl-utilities))
-(define-public ecl-cl-libuv
- (sbcl-package->ecl-package sbcl-cl-libuv))
+(define-public ecl-cl-utilities
+ (sbcl-package->ecl-package sbcl-cl-utilities))
-(define-public sbcl-cl-async
- (let ((commit "f6423e44404a44434d803605e0d2e17199158e28")
- (revision "1"))
+(define-public sbcl-cl-variates
+ (let ((commit "4e7548754d8a8731a42487fae31174db4bf36d47")
+ (revision "0"))
(package
- (name "sbcl-cl-async")
- (version (git-version "0.6.1" revision commit))
+ (name "sbcl-cl-variates")
+ (version "0.9.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/orthecreedence/cl-async")
+ (url "https://gitlab.common-lisp.net/cl-variates/cl-variates")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-variates" version))
(sha256
- (base32
- "11xi9dxb8mjgwzrkj88i0xkgk26z9w9ddxzbv6xsvfc1d4x5cf4x"))))
+ (base32 "03wnvfi3yfflpvi0mr732r834msij4vrwdbgf6csh0b8kqxl47zn"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("babel" ,sbcl-babel)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cffi" ,sbcl-cffi)
- ("cl-libuv" ,sbcl-cl-libuv)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("fast-io" ,sbcl-fast-io)
- ("openssl" ,openssl)
- ("static-vectors" ,sbcl-static-vectors)
- ("trivial-features" ,sbcl-trivial-features)
- ("trivial-gray-streams" ,sbcl-trivial-gray-streams)
- ("vom" ,sbcl-vom)))
- (arguments
- `(#:asd-systems '("cl-async"
- "cl-async-repl"
- "cl-async-ssl")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/ssl/package.lisp"
- (("libcrypto\\.so")
- (search-input-file inputs "/lib/libcrypto.so"))
- (("libssl\\.so")
- (search-input-file inputs "/lib/libssl.so"))))))))
- (synopsis "Asynchronous operations for Common Lisp")
- (description
- "Cl-async is a library for general purpose, non-blocking programming in
-Common Lisp. It uses the libuv library as backend.")
- (home-page "https://orthecreedence.github.io/cl-async/")
+ ;; USE-PACKAGE #<PACKAGE "CL-VARIATES"> causes name-conflicts in
+ ;; #<PACKAGE "CL-VARIATES-TEST"> between the following symbols:
+ ;; CL-VARIATES:RANDOM-ELEMENT, LIFT:RANDOM-ELEMENT
+ (arguments (list #:tests? #f))
+ (native-inputs (list sbcl-lift))
+ (home-page "https://gitlab.common-lisp.net/cl-variates/cl-variates")
+ (synopsis "Portable Common Lisp Random Number Generation")
+ (description "The variates package provides portable random number
+generation as well as numerous distributions.")
(license license:expat))))
-(define-public cl-async
- (sbcl-package->cl-source-package sbcl-cl-async))
+(define-public cl-variates
+ (sbcl-package->cl-source-package sbcl-cl-variates))
-(define-public ecl-cl-async
- (sbcl-package->ecl-package sbcl-cl-async))
+(define-public ecl-cl-variates
+ (sbcl-package->ecl-package sbcl-cl-variates))
-(define-public sbcl-classimp
- (let ((commit "d82a14c59bc733f89a1ea0b3447ebedddce5756e")
+(define-public sbcl-cl-vectors
+ (package
+ (name "sbcl-cl-vectors")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://projects.tuxee.net/cl-vectors/"
+ "files/cl-vectors-" version ".tar.gz"))
+ (sha256
+ (base32
+ "04lhwi0kq8pkwhgd885pk80m1cp9sfvjjn5zj70s1dnckibhdmqh"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("zpb-ttf" ,sbcl-zpb-ttf)))
+ (arguments
+ '(#:asd-systems '("cl-vectors"
+ "cl-paths"
+ "cl-paths-ttf"
+ "cl-aa"
+ "cl-aa-misc")))
+ (home-page "http://projects.tuxee.net/cl-vectors/")
+ (synopsis "Create, transform and render anti-aliased vectorial paths")
+ (description
+ "This is a pure Common Lisp library to create, transform and render
+anti-aliased vectorial paths.")
+ (license license:expat)))
+
+(define-public cl-vectors
+ (sbcl-package->cl-source-package sbcl-cl-vectors))
+
+(define-public ecl-cl-vectors
+ (sbcl-package->ecl-package sbcl-cl-vectors))
+
+(define-public sbcl-cl-vorbis
+ (let ((commit "c5835cd7091aea9e2e389ad359d244542d637758")
(revision "0"))
(package
- (name "sbcl-classimp")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-cl-vorbis")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/3b/classimp")
+ (url "https://github.com/Shirakumo/cl-vorbis")
(commit commit)))
- (file-name (git-file-name "cl-classimp" version))
+ (file-name (git-file-name "cl-vorbis" version))
(sha256
- (base32 "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha"))))
+ (base32 "0713pl5c2khfpf8m3h1l2y0ilack7akf580h70jq6qcrnq3h4b40"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Delete bundled libraries, GlibC and Vorbis sources.
+ `(begin
+ (delete-file-recursively "static")
+ (for-each delete-file '("glibc-2.13.h"
+ "stb_vorbis.c"
+ "stb_vorbis_patch.c"))))))
(build-system asdf-build-system/sbcl)
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-assimp-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "library.lisp"
- (("libassimp.so.5" _)
- (search-input-file inputs "/lib/libassimp.so.5.0.0"))))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "low-level.lisp"
+ (("libvorbis-lin-amd64.so")
+ (search-input-file inputs "/lib/libvorbis.so"))))))))
(inputs
- (list assimp-5.0
+ (list libvorbis
sbcl-cffi
- sbcl-split-sequence))
- (home-page "https://github.com/3b/classimp")
- (synopsis "Common Lisp CFFI bindings for Open Asset Import Library")
- (description
- "This package provides CFFI bindings to the @acronym{ASSIMP, Asset
-Import} library for Common Lisp.")
- (license license:expat))))
+ sbcl-documentation-utils
+ sbcl-static-vectors
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (home-page "https://shirakumo.github.io/cl-vorbis/")
+ (synopsis "OGG/Vorbis decoding using stb_vorbis for Common Lisp")
+ (description "This package provides CFFI bindings for the
+@code{stb_vorbis} audio library to Common Lisp.")
+ (license license:zlib))))
-;; FIXME: The cl and ecl packages get the latest version of assimp as
-;; dependency instead of the one specified in the sbcl package. Specifying
-;; the dependencies explicitly works around the issue.
-(define-public cl-classimp
- (let ((pkg (sbcl-package->cl-source-package sbcl-classimp)))
- (package
- (inherit pkg)
- (inputs
- (list assimp-5.0
- cl-cffi
- cl-split-sequence)))))
+(define-public cl-vorbis
+ (sbcl-package->cl-source-package sbcl-cl-vorbis))
-(define-public ecl-classimp
- (let ((pkg (sbcl-package->ecl-package sbcl-classimp)))
- (package
- (inherit pkg)
- (inputs
- (list assimp-5.0
- ecl-cffi
- ecl-split-sequence)))))
+(define-public ecl-cl-vorbis
+ (sbcl-package->ecl-package sbcl-cl-vorbis))
-(define-public sbcl-blackbird
- (let ((commit "d361f81c1411dec07f6c2dcb11c78f7aea9aaca8")
- (revision "1"))
+(define-public sbcl-cl-wayland
+ (let ((commit "a92a5084b64102f538ab90212e99c7863e5338ae")
+ (revision "0"))
(package
- (name "sbcl-blackbird")
- (version (git-version "0.5.2" revision commit))
+ (name "sbcl-cl-wayland")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/orthecreedence/blackbird")
+ (url "https://github.com/sdilts/cl-wayland")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-wayland" version))
(sha256
- (base32
- "0xfds5yaya64arzr7w1x38karyz11swzbhxx1afldpradj9dh19c"))))
+ (base32 "1r4fn9dc0dz2b30k8z243yacx1y5z21qk4zh2ildj7ak51qx53zf"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "wayland-server-core.lisp"
+ (("libwayland-server.so")
+ (search-input-file inputs
+ "/lib/libwayland-server.so"))))))))
(inputs
- (list sbcl-vom))
- (native-inputs
- (list sbcl-cl-async sbcl-fiveam))
- (synopsis "Promise implementation for Common Lisp")
+ (list sbcl-cffi
+ sbcl-closer-mop
+ wayland))
+ (home-page "https://github.com/sdilts/cl-wayland")
+ (synopsis "Common Lisp FFI bindings for libwayland")
(description
- "This is a standalone promise implementation for Common Lisp. It is
-the successor to the now-deprecated cl-async-future project.")
- (home-page "https://orthecreedence.github.io/blackbird/")
- (license license:expat))))
+ "This package provides Common Lisp FFI bindings for libwayland,
+primarily for the mahogany window manager.")
+ (license license:bsd-3))))
-(define-public cl-blackbird
- (sbcl-package->cl-source-package sbcl-blackbird))
+(define-public cl-wayland
+ (sbcl-package->cl-source-package sbcl-cl-wayland))
-(define-public ecl-blackbird
- (sbcl-package->ecl-package sbcl-blackbird))
+(define-public ecl-cl-wayland
+ (sbcl-package->ecl-package sbcl-cl-wayland))
-(define-public sbcl-cl-async-future
- (let ((commit "ee36c22a69a9516407458d2ed8b475f1fc473959")
- (revision "1"))
+(define-public sbcl-cl-webkit
+ (package
+ (name "sbcl-cl-webkit")
+ (version "3.5.10")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/joachifm/cl-webkit")
+ (commit version)))
+ (file-name (git-file-name "cl-webkit" version))
+ (sha256
+ (base32
+ "0bn8idvbi58kg0g76lanvjzkgnkcy41yn9vbp7f80q9fa7w892rq"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cffi" ,sbcl-cffi)
+ ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
+ ("webkitgtk" ,webkitgtk-for-gtk3)))
+ (native-inputs
+ `(;; Tests seem to need Xorg.
+ ;; ("xorg-server" ,xorg-server-for-tests)
+ ("calispel" ,sbcl-calispel)
+ ("fiveam" ,sbcl-fiveam)
+ ("float-features" ,sbcl-float-features)))
+ (arguments
+ `(#:asd-systems '("cl-webkit2")
+ #:tests? #f ; TODO: Tests hang, why?
+ #:phases
+ (modify-phases %standard-phases
+ ;; The following phase is needed for tests:
+ ;; (add-before 'check 'start-xorg-server
+ ;; (lambda* (#:key inputs #:allow-other-keys)
+ ;; ;; The test suite requires a running X server.
+ ;; (system (string-append (assoc-ref inputs "xorg-server")
+ ;; "/bin/Xvfb :1 &"))
+ ;; (setenv "DISPLAY" ":1")
+ ;; #t))
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "webkit2/webkit2.init.lisp"
+ (("libwebkit2gtk" all)
+ (string-append
+ (assoc-ref inputs "webkitgtk") "/lib/" all))))))))
+ (home-page "https://github.com/joachifm/cl-webkit")
+ (synopsis "Binding to WebKitGTK+ for Common Lisp")
+ (description
+ "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp,
+currently targeting WebKit version 2. The WebKitGTK+ library adds web
+browsing capabilities to an application, leveraging the full power of the
+WebKit browsing engine.")
+ (license license:expat)))
+
+(define-public cl-webkit
+ (sbcl-package->cl-source-package sbcl-cl-webkit))
+
+(define-public ecl-cl-webkit
+ (sbcl-package->ecl-package sbcl-cl-webkit))
+
+(define-public sbcl-cl-who
+ (let ((version "1.1.4")
+ (commit "07dafe9b351c32326ce20b5804e798f10d4f273d")
+ (revision "3"))
(package
- (name "sbcl-cl-async-future")
- (version (git-version "0.4.4.1" revision commit))
+ (name "sbcl-cl-who")
+ (version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/orthecreedence/cl-async-future")
+ (url "https://github.com/edicl/cl-who")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-who" version))
(sha256
(base32
- "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh"))))
+ "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-blackbird))
(native-inputs
- (list sbcl-cl-async sbcl-eos))
- (synopsis "Futures implementation for Common Lisp")
+ (list sbcl-flexi-streams))
+ (home-page "https://edicl.github.io/cl-who/")
+ (synopsis "Yet another Lisp markup language")
(description
- "This is futures implementation for Common Lisp. It plugs in nicely
-to cl-async.")
- (home-page "https://orthecreedence.github.io/cl-async/future")
- (license license:expat))))
+ "There are plenty of Lisp Markup Languages out there - every Lisp
+programmer seems to write at least one during his career - and CL-WHO (where
+WHO means \"with-html-output\" for want of a better acronym) is probably just
+as good or bad as the next one.")
+ (license license:bsd-2))))
-(define-public cl-async-future
- (sbcl-package->cl-source-package sbcl-cl-async-future))
+(define-public cl-who
+ (sbcl-package->cl-source-package sbcl-cl-who))
-(define-public ecl-cl-async-future
- (sbcl-package->ecl-package sbcl-cl-async-future))
+(define-public ecl-cl-who
+ (sbcl-package->ecl-package sbcl-cl-who))
-(define-public sbcl-green-threads
- (let ((commit "fff5ebecb441a37e5c511773716aafd84a3c5840")
- (revision "1"))
+(define-public sbcl-cl-xmlspam
+ (let ((commit "ea06abcca2a73a9779bcfb09081e56665f94e22a"))
(package
- (name "sbcl-green-threads")
- (version (git-version "0.3" revision commit))
+ (name "sbcl-cl-xmlspam")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.0.0" "1" commit))
+ (home-page "https://github.com/rogpeppe/cl-xmlspam")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/thezerobit/green-threads")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (string-append name "-" version))
(sha256
(base32
- "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz"))))
- (build-system asdf-build-system/sbcl)
+ "0w4rqvrgdgk3fwfq3kx4r7wwdr2bv3b6n3bdqwsiriw9psqzpz2s"))))
(inputs
- `(("cl-async-future" ,sbcl-cl-async-future)
- ("cl-cont" ,sbcl-cl-cont)))
- (native-inputs
- (list sbcl-prove))
- (arguments
- `(;; TODO: Fix the tests. They fail with:
- ;; "The function BLACKBIRD::PROMISE-VALUES is undefined"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "green-threads-test.asd"
- (("cl-test-more")
- "prove"))
- #t)))))
- (synopsis "Cooperative multitasking library for Common Lisp")
- (description
- "This library allows for cooperative multitasking with help of cl-cont
-for continuations. It tries to mimic the API of bordeaux-threads as much as
-possible.")
- (home-page "https://github.com/thezerobit/green-threads")
+ (list sbcl-cxml sbcl-cl-ppcre))
+ (synopsis "Concise, regexp-like pattern matching on streaming XML for Common Lisp")
+ (description "CXML does an excellent job at parsing XML elements, but what
+do you do when you have a XML file that's larger than you want to fit in
+memory, and you want to extract some information from it? Writing code to deal
+with SAX events, or even using Klacks, quickly becomes tedious.
+@code{cl-xmlspam} (for XML Stream PAttern Matcher) is designed to make it easy
+to write code that mirrors the structure of the XML that it's parsing. It
+also makes it easy to shift paradigms when necessary - the usual Lisp control
+constructs can be used interchangeably with pattern matching, and the full
+power of CXML is available when necessary.")
(license license:bsd-3))))
-(define-public cl-green-threads
- (sbcl-package->cl-source-package sbcl-green-threads))
+(define-public cl-xmlspam
+ (sbcl-package->cl-source-package sbcl-cl-xmlspam))
-(define-public ecl-green-threads
- (sbcl-package->ecl-package sbcl-green-threads))
+(define-public ecl-cl-xmlspam
+ (sbcl-package->ecl-package sbcl-cl-xmlspam))
-(define-public sbcl-cl-base32
- (let ((commit "8cdee06fab397f7b0a19583b57e7f0c98405be85")
+(define-public sbcl-cl-yacc
+ (package
+ (name "sbcl-cl-yacc")
+ (version "0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jech/cl-yacc")
+ (commit (string-append "cl-yacc-" version))))
+ (sha256
+ (base32
+ "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib"))
+ (file-name (string-append "cl-yacc-" version "-checkout"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems '("yacc")))
+ (synopsis "LALR(1) parser generator for Common Lisp, similar in spirit to Yacc")
+ (description
+ "CL-Yacc is a LALR(1) parser generator for Common Lisp, similar in spirit
+to AT&T Yacc, Berkeley Yacc, GNU Bison, Zebu, lalr.cl or lalr.scm.
+
+CL-Yacc uses the algorithm due to Aho and Ullman, which is the one also used
+by AT&T Yacc, Berkeley Yacc and Zebu. It does not use the faster algorithm due
+to DeRemer and Pennello, which is used by Bison and lalr.scm (not lalr.cl).")
+ (home-page "https://www.irif.fr/~jch//software/cl-yacc/")
+ (license license:expat)))
+
+(define-public cl-yacc
+ (sbcl-package->cl-source-package sbcl-cl-yacc))
+
+(define-public ecl-cl-yacc
+ (sbcl-package->ecl-package sbcl-cl-yacc))
+
+(define-public sbcl-cl-yaml
+ (let ((commit "c3202be9a753c51f3bc79538a5a498a8865192aa")
(revision "1"))
(package
- (name "sbcl-cl-base32")
+ (name "sbcl-cl-yaml")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hargettp/cl-base32")
+ (url "https://github.com/eudoxia0/cl-yaml")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-yaml" version))
(sha256
- (base32 "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"))))
+ (base32 "1izjg0v6rf7dh069bbnnr67l30lsqj86wdk7y9ggbgiwh6v9j185"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-cl-libyaml sbcl-cl-ppcre
+ sbcl-parse-number))
(native-inputs
- (list sbcl-lisp-unit))
- (synopsis "Common Lisp library for base32 encoding and decoding")
+ (list sbcl-cl-fad sbcl-fiveam sbcl-generic-comparability
+ sbcl-trivial-benchmark sbcl-yason))
+ (home-page "https://github.com/eudoxia0/cl-yaml")
+ (synopsis "YAML parser for Common Lisp")
(description
- "This package provides functions for base32 encoding and decoding as
-defined in RFC4648.")
- (home-page "https://github.com/hargettp/cl-base32")
+ "This is a YAML parser and emitter for Common Lisp built on top of
+libyaml.")
(license license:expat))))
-(define-public cl-base32
- (sbcl-package->cl-source-package sbcl-cl-base32))
+(define-public cl-yaml
+ (sbcl-package->cl-source-package sbcl-cl-yaml))
-(define-public ecl-cl-base32
- (sbcl-package->ecl-package sbcl-cl-base32))
+(define-public ecl-cl-yaml
+ (sbcl-package->ecl-package sbcl-cl-yaml))
(define-public sbcl-cl-z85
(let ((commit "85b3951a9cfa2603acb6aee15567684f9a108098")
@@ -12564,1553 +10210,875 @@ ZeroMQ.")
(define-public ecl-cl-z85
(sbcl-package->ecl-package sbcl-cl-z85))
-(define-public sbcl-ltk
- (let ((commit "ff14a781d211c19c35e65a7ecaece67dda0b3ebb")
- (revision "0"))
+(define-public sbcl-clache
+ (let ((commit "112976729565e1035532389ca25090ae99badd07"))
(package
- (name "sbcl-ltk")
- (version (git-version "0.992" revision commit))
+ (name "sbcl-clache")
+ (version (git-version "0.2.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/herth/ltk")
+ (url "https://github.com/html/clache/")
(commit commit)))
- (file-name (git-file-name "cl-ltk" version))
+ (file-name (git-file-name "cl-clache" version))
(sha256
- (base32 "0f1xgsj2j7bq21cq2pa9rw3ybxd9vyknisl6z307lxx7lvhm3xac"))))
+ (base32 "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list imagemagick tk))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cl-annot
+ sbcl-cl-fad
+ sbcl-cl-store
+ sbcl-cl-syntax
+ sbcl-ironclad
+ sbcl-trivial-garbage))
+ (native-inputs
+ (list sbcl-prove))
(arguments
- `(#:asd-systems '("ltk"
- "ltk-mw"
- "ltk-remote")
- #:tests? #f
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "ltk/ltk.lisp"
- (("#-freebsd \"wish\"")
- (string-append "#-freebsd \""
- (assoc-ref inputs "tk")
- "/bin/wish\""))
- (("do-execute \"convert\"")
- (string-append "do-execute \""
- (assoc-ref inputs "imagemagick")
- "/bin/convert\"")))
- #t))
- (add-after 'unpack 'fix-build
+ (add-after 'unpack 'fix-tests
(lambda _
- (substitute* "ltk/ltk-remote.lisp"
- (("\\(:export")
- "(:shadow #:raise) (:export"))
+ (substitute* "clache-test.asd"
+ (("cl-test-more") "prove"))
#t)))))
- (synopsis "Common Lisp bindings for the Tk GUI toolkit")
+ (home-page "https://github.com/html/clache/")
+ (synopsis "General caching facility for Common Lisp")
(description
- "LTK is a Common Lisp binding for the Tk graphics toolkit. It is
-written in pure Common Lisp and does not require any Tk knowledge for its
-usage.")
- (home-page "http://www.peter-herth.de/ltk/")
+ "CLACHE provides a general caching facility for Common Lisp. The API is
+similar to the standard hash-table interface.")
(license license:llgpl))))
-(define-public cl-ltk
- (sbcl-package->cl-source-package sbcl-ltk))
+(define-public cl-clache
+ (sbcl-package->cl-source-package sbcl-clache))
-(define-public ecl-ltk
- (sbcl-package->ecl-package sbcl-ltk))
+(define-public ecl-clache
+ (sbcl-package->ecl-package sbcl-clache))
-(define-public sbcl-cl-lex
- (let ((commit "f2dbbe25ef553005fb402d9a6203180c3fa1093b")
- (revision "1"))
+(define-public sbcl-clack
+ (let ((commit "6fd0279424f7ba5fd4f92d69a1970846b0b11222")
+ (revision "2"))
(package
- (name "sbcl-cl-lex")
- (version (git-version "1.1.3" revision commit))
+ (name "sbcl-clack")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/djr7C4/cl-lex")
+ (url "https://github.com/fukamachi/clack")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-clack" version))
(sha256
- (base32 "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y"))))
+ (base32 "0sfmvqmsg9z13x0v77448rpdqgyprdq739nsbrjw9a28hv9jmkg9"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("clack"
+ "clack-handler-fcgi"
+ "clack-socket"
+ "clack-handler-hunchentoot")))
(inputs
- (list sbcl-cl-ppcre))
- (synopsis "Common Lisp macros for generating lexical analyzers")
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cl-fastcgi
+ sbcl-flexi-streams
+ sbcl-hunchentoot
+ sbcl-lack
+ sbcl-quri
+ sbcl-split-sequence
+ sbcl-usocket))
+ (home-page "https://github.com/fukamachi/clack")
+ (synopsis "Web Application Environment for Common Lisp")
(description
- "This is a Common Lisp library providing a set of macros for generating
-lexical analyzers automatically. The lexers generated using @code{cl-lex} can
-be used with @code{cl-yacc}.")
- (home-page "https://github.com/djr7C4/cl-lex")
- (license license:gpl3))))
-
-(define-public cl-lex
- (sbcl-package->cl-source-package sbcl-cl-lex))
-
-(define-public ecl-cl-lex
- (sbcl-package->ecl-package sbcl-cl-lex))
-
-(define-public sbcl-cl-colors2
- (package
- (name "sbcl-cl-colors2")
- (version "0.6.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/cage/cl-colors2")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-colors2" version))
- (sha256
- (base32 "0vnvlq9xixs04768q7hapsi16cjp3ych6mypvs6chihd5dal4cnd"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-clunit2))
- (inputs
- (list sbcl-alexandria sbcl-cl-ppcre sbcl-parse-number))
- (synopsis "Color library for Common Lisp")
- (description
- "This is a very simple color library for Common Lisp, providing:
-
-@itemize
-@item Types for representing colors in HSV, HSL, and RGB spaces.
-@item Simple conversion functions between the above types.
-@item Function printing colors to HEX, RGB, RGBA, and HSL.
-@item Predefined colors from X11, SVG, and GDK.
-@end itemize\n")
- (home-page "https://codeberg.org/cage/cl-colors2")
- (license license:boost1.0)))
+ "Clack is a web application environment for Common Lisp inspired by
+Python's WSGI and Ruby's Rack.")
+ (license license:llgpl))))
-(define-public cl-colors2
- (sbcl-package->cl-source-package sbcl-cl-colors2))
+(define-public cl-clack
+ (sbcl-package->cl-source-package sbcl-clack))
-(define-public ecl-cl-colors2
- (sbcl-package->ecl-package sbcl-cl-colors2))
+(define-public ecl-clack
+ (sbcl-package->ecl-package sbcl-clack))
-(define-public sbcl-colored
- (let ((commit "bee87efb0b047da0f071f5cf1457997ab5f93feb")
- (revision "1"))
+(define-public sbcl-clad
+ (let ((commit "1ff6f417d4ee3836d1edd96923d4b03f3cafa849")
+ (revision "0"))
(package
- (name "sbcl-colored")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-clad")
+ (version
+ ;; There's no version, but there's a timestamp
+ (git-version "2023-01-21" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/colored/")
+ (url "https://gitlab.common-lisp.net/mantoniotti/CLAD")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-clad" version))
(sha256
- (base32 "0mpg91r6yfb9xqccd4r8z3hl2qzjhdj6daswb1cinrm8ffxrvy5k"))))
+ (base32 "184mhdq7pxd6hd4rzv8z4lfbwnkyhgm5bdn3xsqaav2j0d1dqm6i"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Delete compiled ABCL files.
+ '(begin
+ (delete-file "clad-package.abcl")
+ (delete-file "clad.abcl")))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-documentation-utils))
- (synopsis "Colour representation, conversion, and operation for Common Lisp")
+ (synopsis "Library providing standard locations on the file system")
(description
- "This is a library for representing and mapping colours between their
-various spaces.")
- (home-page "https://shinmera.github.io/colored/")
- (license license:zlib))))
-
-(define-public cl-colored
- (sbcl-package->cl-source-package sbcl-colored))
+ "The Common Lisp Application Directories (CLAD) library is
+a simple API collection that provides access to a set of @emph{standard}
+Common Lisp folders on a per-application or per-library basis.")
+ (home-page "https://gitlab.common-lisp.net/mantoniotti/CLAD")
+ (license license:expat)))) ;the mit-modern-variant is used
-(define-public ecl-colored
- (sbcl-package->ecl-package sbcl-colored))
+(define-public cl-clad
+ (sbcl-package->cl-source-package sbcl-clad))
-(define-public sbcl-cl-jpeg
- (let ((commit "ec557038128df6895fbfb743bfe8faf8ec2534af")
- (revision "1"))
+(define-public sbcl-clamp
+ (let ((commit "02b8f3953e5753cc61a719807c82f3795cd28fe1"))
(package
- (name "sbcl-cl-jpeg")
- (version (git-version "2.8" revision commit))
+ (name "sbcl-clamp")
+ (version (git-version "0.3" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/cl-jpeg")
+ (url "https://github.com/arclanguage/Clamp")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bkkiqz8fqldlj1wbmrccjsvxcwj98h6s4b6gslr3cg2wmdv5xmy"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "JPEG image library for Common Lisp")
- (description
- "This is a baseline JPEG codec written in Common Lisp. It can be used
-for reading and writing JPEG image files.")
- (home-page "https://github.com/sharplispers/cl-jpeg")
- (license license:bsd-3))))
-
-(define-public cl-jpeg
- (sbcl-package->cl-source-package sbcl-cl-jpeg))
-
-(define-public ecl-cl-jpeg
- (sbcl-package->ecl-package sbcl-cl-jpeg))
-
-(define-public sbcl-jpeg-turbo
- (let ((commit "f79c646cc266c107bdace53572a31664754c6e0c")
- (revision "1"))
- (package
- (name "sbcl-jpeg-turbo")
- (version (git-version "1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/shamazmazum/jpeg-turbo/")
- (commit commit)))
- (file-name (git-file-name "cl-jpeg-turbo" version))
- (sha256
- (base32 "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"))))
+ (base32 "0fdr9nqfmmpxm6hvjdxi1jkclya9xlnrw1yc3cn1m4ww3f50p31m"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-lib-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/jpeg-turbo.lisp"
- (("\"libturbojpeg\\.so\\.0\"")
- (string-append "\""
- (search-input-file inputs
- "/lib/libturbojpeg.so")
- "\""))))))))
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list libjpeg-turbo sbcl-cffi))
- (synopsis "Common Lisp wrapper for libjpeg-turbo")
- (description
- "This is a Common Lisp wrapper for libjpeg-turbo library which provides
-TurboJPEG API for compressing and decompressing JPEG images.")
- (home-page "https://github.com/shamazmazum/jpeg-turbo/")
- (license license:bsd-2))))
-
-(define-public cl-jpeg-turbo
- (sbcl-package->cl-source-package sbcl-jpeg-turbo))
-
-(define-public ecl-cl-jpeg-turbo
- (sbcl-package->ecl-package sbcl-jpeg-turbo))
-
-(define-public sbcl-png
- (let ((commit "11b965fe378fd0561abe3616b18ff03af5179648")
- (revision "1"))
- (package
- (name "sbcl-png")
- (version (git-version "0.6" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ljosa/cl-png")
- (commit commit)))
- (file-name (git-file-name "cl-png" version))
- (sha256
- (base32 "173hqwpd0rwqf95mfx1h9l9c3i8bb0gvnpspzmmz3g5x3440czy4"))
- ;; Patch to fix compiling with SBCL >= 2.1.6.
- (patches (search-patches "sbcl-png-fix-sbcl-compatibility.patch"))))
- (build-system asdf-build-system/sbcl)
+ `(("iterate" ,sbcl-iterate)
+ ("cl-syntax" ,sbcl-cl-syntax)))
+ (native-inputs
+ `(("cl-unit" ,sbcl-clunit)
+ ("check-it" ,sbcl-check-it)))
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-lib-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "libpng.lisp"
- (("\"libpng\"")
- (string-append "\""
- (assoc-ref inputs "libpng")
- "/lib/libpng\""))))))))
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("libpng" ,libpng)))
- (home-page "https://github.com/ljosa/cl-png")
- (synopsis "Read and write PNG file format")
- (description
- "This package provides a @code{PNG} Common Lisp system to operate with
-Portable Network Graphics file format.")
- (license license:lgpl2.1))))
-
-(define-public ecl-png
- (sbcl-package->ecl-package sbcl-png))
-
-(define-public cl-png
- (sbcl-package->cl-source-package sbcl-png))
-
-(define-public sbcl-cl-svg
- (let ((commit "1e988ebd2d6e2ee7be4744208828ef1b59e5dcdc")
- (revision "1"))
- (package
- (name "sbcl-cl-svg")
- (version (git-version "0.0.3" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/wmannis/cl-svg")
- (commit commit)))
- (file-name (git-file-name "cl-svg" version))
- (sha256
- (base32 "11rmzimy6j7ln7q5y1h2kw1225rsfb6fpn89qjcq7h5lc8fay0wz"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/wmannis/cl-svg")
- (synopsis "Write SVG file format")
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (substitute* "clamp.asd"
+ (("\\(:file \"read\" :depends-on \\(\"aliases\"\\)\\)")
+ "(:file \"read\" :depends-on (\"aliases\" \"base\"))"))
+ #t)))))
+ (home-page "https://github.com/arclanguage/Clamp")
+ (synopsis "Common Lisp with Arc macros and procedures")
(description
- "This package provides the @code{CL-SVG} Common Lisp system to produce
-Scalable Vector Graphics files.")
- (license license:expat))))
-
-(define-public ecl-cl-svg
- (sbcl-package->ecl-package sbcl-cl-svg))
-
-(define-public cl-svg
- (sbcl-package->cl-source-package sbcl-cl-svg))
+ "Clamp is an attempt to bring the powerful, but verbose, language of
+Common Lisp up to the terseness of Arc.
-(define-public sbcl-nodgui
- (let ((commit "35fd379e11162995ed48c2f8ebe6a5bf0a6f48cb")
- (revision "1"))
- (package
- (name "sbcl-nodgui")
- (version (git-version "0.6.0.2" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/cage/nodgui.git")
- (commit commit)))
- (file-name (git-file-name "cl-nodgui" version))
- (sha256
- (base32 "01l1hyzf8ryc35ydrjhqjn4az8asdwn46knl5gx8v02z2jcv7j24"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cl-colors2
- sbcl-cl-ppcre-unicode
- sbcl-cl-unicode
- sbcl-clunit2
- sbcl-esrap
- sbcl-jpeg-turbo
- sbcl-named-readtables
- sbcl-cl-opengl
- sbcl-parse-number
- sbcl-pngload
- sbcl-sdl2
- sbcl-zpng
- tk
- tklib))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/wish-communication.lisp"
- (("#-freebsd \"wish\"")
- (string-append "#-freebsd \""
- (search-input-file inputs "/bin/wish")
- "\""))))))))
- (synopsis "Common Lisp bindings for the Tk GUI toolkit")
- (description
- "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI
-toolkit. It also provides a few additional widgets more than the standard Tk
-ones.")
- (home-page "https://www.autistici.org/interzona/nodgui.html")
- (license license:llgpl))))
+There are two parts to Clamp. There is the core of Clamp, which implements
+the utilities of Arc that are easily converted from Arc to Common Lisp. The
+other part is the \"experimental\" part. It contains features of Arc that are
+not so easy to copy (ssyntax, argument destructuring, etc.).")
+ (license license:artistic2.0))))
-(define-public cl-nodgui
- (sbcl-package->cl-source-package sbcl-nodgui))
+(define-public cl-clamp
+ (sbcl-package->cl-source-package sbcl-clamp))
-(define-public ecl-nodgui
- (sbcl-package->ecl-package sbcl-nodgui))
+(define-public ecl-clamp
+ (sbcl-package->ecl-package sbcl-clamp))
-(define-public sbcl-salza2
+(define-public sbcl-class-options
(package
- (name "sbcl-salza2")
- (version "2.1")
+ (name "sbcl-class-options")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xach/salza2")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
+ (url "https://github.com/Hexstream/class-options")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-class-options" version))
(sha256
- (base32 "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10"))))
+ (base32 "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-chipz sbcl-flexi-streams sbcl-parachute))
+ (list sbcl-enhanced-boolean sbcl-parachute))
(inputs
- (list sbcl-trivial-gray-streams))
- (synopsis "Common Lisp library for zlib, deflate and gzip compression")
+ (list sbcl-closer-mop sbcl-enhanced-find-class))
+ (home-page "https://www.hexstreamsoft.com/libraries/class-options/")
+ (synopsis "Accessing defining class and its options during modification")
(description
- "Salza2 is a Common Lisp library for creating compressed data in the zlib,
-deflate, or gzip data formats, described in RFC 1950, RFC 1951, and RFC 1952,
-respectively.")
- (home-page "https://www.xach.com/lisp/salza2/")
- (license license:bsd-2)))
+ "This package provides easy access to the defining class and its options
+during initialization or reinitialization of its subcomponents.")
+ (license license:unlicense)))
-(define-public cl-salza2
- (sbcl-package->cl-source-package sbcl-salza2))
+(define-public cl-class-options
+ (sbcl-package->cl-source-package sbcl-class-options))
-(define-public ecl-salza2
- (sbcl-package->ecl-package sbcl-salza2))
+(define-public ecl-class-options
+ (sbcl-package->ecl-package sbcl-class-options))
-(define-public sbcl-origin
- (let ((commit "d646134302456408d6d43580bb05299f1695ab8e")
- (revision "1"))
+(define-public sbcl-classimp
+ (let ((commit "d82a14c59bc733f89a1ea0b3447ebedddce5756e")
+ (revision "0"))
(package
- (name "sbcl-origin")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-classimp")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.mfiano.net/mfiano/origin")
+ (url "https://github.com/3b/classimp")
(commit commit)))
- (file-name (git-file-name "origin" version))
+ (file-name (git-file-name "cl-classimp" version))
(sha256
- (base32 "1n9aszaif3yh8prs5r8v51fbj4r5jd1a048mivd5yij3hplkm82b"))))
+ (base32 "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-assimp-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "library.lisp"
+ (("libassimp.so.5" _)
+ (search-input-file inputs "/lib/libassimp.so.5.0.0"))))))))
(inputs
- (list sbcl-golden-utils sbcl-specialization-store))
- (home-page "https://git.mfiano.net/mfiano/origin")
- (synopsis "Common Lisp graphics math library")
+ (list assimp-5.0
+ sbcl-cffi
+ sbcl-split-sequence))
+ (home-page "https://github.com/3b/classimp")
+ (synopsis "Common Lisp CFFI bindings for Open Asset Import Library")
(description
- "This is a native Common Lisp graphics math library with an emphasis on
-performance and correctness.")
+ "This package provides CFFI bindings to the @acronym{ASSIMP, Asset
+Import} library for Common Lisp.")
(license license:expat))))
-(define-public ecl-origin
- (sbcl-package->ecl-package sbcl-origin))
-
-(define-public cl-origin
- (sbcl-package->cl-source-package sbcl-origin))
-
-(define-public sbcl-png-read
- (let ((commit "ec29f38a689972b9f1373f13bbbcd6b05deada88")
- (revision "1"))
+;; FIXME: The cl and ecl packages get the latest version of assimp as
+;; dependency instead of the one specified in the sbcl package. Specifying
+;; the dependencies explicitly works around the issue.
+(define-public cl-classimp
+ (let ((pkg (sbcl-package->cl-source-package sbcl-classimp)))
(package
- (name "sbcl-png-read")
- (version (git-version "0.3.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Ramarren/png-read")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0vyczbcwskrygrf1hgrsnk0jil8skmvf1kiaalw5jps4fjrfdkw0"))))
- (build-system asdf-build-system/sbcl)
+ (inherit pkg)
(inputs
- (list sbcl-babel sbcl-chipz sbcl-iterate))
- (synopsis "PNG decoder for Common Lisp")
- (description "This is a Common Lisp library for reading PNG images.")
- (home-page "https://github.com/Ramarren/png-read")
- (license license:bsd-3))))
-
-(define-public cl-png-read
- (sbcl-package->cl-source-package sbcl-png-read))
+ (list assimp-5.0
+ cl-cffi
+ cl-split-sequence)))))
-(define-public ecl-png-read
- (sbcl-package->ecl-package sbcl-png-read))
+(define-public ecl-classimp
+ (let ((pkg (sbcl-package->ecl-package sbcl-classimp)))
+ (package
+ (inherit pkg)
+ (inputs
+ (list assimp-5.0
+ ecl-cffi
+ ecl-split-sequence)))))
-(define-public sbcl-3b-bmfont
- (let ((commit "332c2262705f161627fc18add0310451a42799af")
- (revision "3"))
+(define-public sbcl-clavier
+ (let ((commit "9b1424eaad131e114a45b400784079124b5e2321")
+ (revision "1"))
(package
- (name "sbcl-3b-bmfont")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-clavier")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/3b/3b-bmfont/")
+ (url "https://github.com/mmontone/clavier")
(commit commit)))
- (file-name (git-file-name "cl-3b-bmfont" version))
+ (file-name (git-file-name "cl-clavier" version))
(sha256
- (base32 "11wnqa1wx9vji6cmxl5m5qnf12mqc6n7d5g8038r1wayq88bxia6"))))
+ (base32 "1gjd0rhxs2x7gn3fw1hnxivmm4ca4f1wxlg0fqv8fdfabgzsvl5y"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("3b-bmfont"
- "3b-bmfont/common"
- "3b-bmfont/json"
- "3b-bmfont/text"
- "3b-bmfont/xml")))
+ (native-inputs (list sbcl-stefil))
(inputs
(list sbcl-alexandria
- sbcl-cxml
- sbcl-flexi-streams
- sbcl-jsown
- sbcl-parse-number
- sbcl-split-sequence))
- (home-page "https://github.com/3b/3b-bmfont/")
- (synopsis "Read/write bmfont metadata files")
- (description
- "This is a Common Lisp library which provides functionality to
-read/write Bit Map Font (BMF) into text, JSON and XML.")
+ sbcl-chronicity
+ sbcl-cl-fad
+ sbcl-cl-ppcre
+ sbcl-closer-mop))
+ (home-page "https://github.com/mmontone/clavier/")
+ (synopsis "General purpose validation library")
+ (description "Clavier is a general purpose validation library for
+Common Lisp.")
(license license:expat))))
-(define-public ecl-3b-bmfont
- (sbcl-package->ecl-package sbcl-3b-bmfont))
-
-(define-public cl-3b-bmfont
- (sbcl-package->cl-source-package sbcl-3b-bmfont))
+(define-public cl-clavier
+ (sbcl-package->cl-source-package sbcl-clavier))
-(define sbcl-3b-bmfont/shinmera
- (let ((commit "58e529d24b7799d56b4b3f9c8a953b585d42c7d2")
- (revision "1"))
- (package (inherit sbcl-3b-bmfont)
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/3b-bmfont/")
- (commit commit)))
- (file-name (git-file-name "3b-bmfont2" version))
- (sha256
- (base32 "17zby669b64rhxhk2szamzdgvispimh6ici05xa6x2vz4rvk71jq")))))))
+(define-public ecl-clavier
+ (sbcl-package->ecl-package sbcl-clavier))
-(define-public sbcl-sdf
- ;; Shinmera's fork required for Alloy.
- (let ((commit "e1ab3ac4ea52c0e0119b832f428c71f580b4d83b")
- (revision "1"))
+(define-public sbcl-claw
+ (let ((revision "0")
+ (commit "3cd4a96fca95eb9e8d5d069426694669f81b2250"))
(package
- (name "sbcl-sdf")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-claw")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/sdf")
+ (url "https://github.com/borodust/claw")
(commit commit)))
- (file-name (git-file-name "sdf" version))
+ (file-name (git-file-name "claw" version))
(sha256
- (base32 "1cyq4hkgiw9mnb87ah6xw19cybfs9hfbjvg1ch2mf4cr0ism0nvn"))))
+ (base32 "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-zpb-ttf
- sbcl-cl-vectors
- sbcl-opticl
- sbcl-binpack
- sbcl-3b-bmfont/shinmera
- sbcl-pathname-utils))
- (arguments
- `(#:asd-systems '("sdf" "sdf/bmfont")))
- (home-page "https://github.com/Shinmera/sdf")
- (synopsis "Signed distance font atlas generator")
+ (list sbcl-alexandria
+ sbcl-cffi
+ sbcl-cl-json
+ sbcl-cl-ppcre
+ sbcl-claw-support
+ sbcl-local-time
+ sbcl-trivial-features))
+ (home-page "https://github.com/borodust/claw")
+ (synopsis "Autowrapper for Common Lisp")
(description
- "This library generates
-sdf (@url{https://steamcdn-a.akamaihd.net/apps/valve/2007/SIGGRAPH2007_AlphaTestedMagnification.pdf}),
-psdf and
-msdf (@url{https://github.com/Chlumsky/msdfgen/files/3050967/thesis.pdf})
-atlases.")
- (license license:expat))))
-
-(define-public ecl-sdf
- (sbcl-package->ecl-package sbcl-sdf))
-
-(define-public cl-sdf
- (sbcl-package->cl-source-package sbcl-sdf))
-
-(define-public sbcl-zpng
- (package
- (name "sbcl-zpng")
- (version "1.2.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xach/zpng")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0b3ag3jhl3z7kdls3ahdsdxsfhhw5qrizk769984f4wkxhb69rcm"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-salza2))
- (synopsis "PNG encoder for Common Lisp")
- (description "This is a Common Lisp library for creating PNG images.")
- (home-page "https://www.xach.com/lisp/zpng/")
- (license license:bsd-2)))
+ "This is a Common Lisp autowrapping facility for quickly creating clean
+and lean bindings to C libraries.")
+ (license license:bsd-2))))
-(define-public cl-zpng
- (sbcl-package->cl-source-package sbcl-zpng))
+(define-public cl-claw
+ (sbcl-package->cl-source-package sbcl-claw))
-(define-public ecl-zpng
- (sbcl-package->ecl-package sbcl-zpng))
+(define-public ecl-claw
+ (sbcl-package->ecl-package sbcl-claw))
-(define-public sbcl-cl-qrencode
+(define-public sbcl-claw-support
(package
- (name "sbcl-cl-qrencode")
- (version "0.1.2")
+ (name "sbcl-claw-support")
+ (version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jnjcc/cl-qrencode")
- (commit (string-append "v" version))))
+ (url "https://github.com/borodust/claw-support")
+ (commit "9a15c8bed04585f45e6a461bcda1b475144dbd0b")))
(file-name (git-file-name name version))
(sha256
- (base32 "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"))))
+ (base32 "1my2ka7h72ipx5n3b465g6kjkasrhsvhqlijwcg6dhlzs5yygl23"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lisp-unit))
- (inputs
- (list sbcl-zpng))
- (synopsis "QR code encoder for Common Lisp")
+ (home-page "https://github.com/borodust/claw-support")
+ (synopsis "Support routines for claw")
(description
- "This Common Lisp library provides function to make QR codes and to save
-them as PNG files.")
- (home-page "https://github.com/jnjcc/cl-qrencode")
- (license license:gpl2+)))
+ "This package provides support routines for the @code{claw} Common Lisp
+package.")
+ (license license:expat)))
-(define-public cl-qrencode
- (sbcl-package->cl-source-package sbcl-cl-qrencode))
+(define-public cl-claw-support
+ (sbcl-package->cl-source-package sbcl-claw-support))
-(define-public ecl-cl-qrencode
- (sbcl-package->ecl-package sbcl-cl-qrencode))
+(define-public ecl-claw-support
+ (sbcl-package->ecl-package sbcl-claw-support))
-(define-public sbcl-hdf5-cffi
- (let ((commit "5b5c88f191e470e4fe96b462334e3ce0806eed5c")
- (revision "1"))
+(define-public sbcl-claw-utils
+ (let ((revision "0")
+ (commit "efe25016501973dc369f067a64c7d225802bc56f"))
(package
- (name "sbcl-hdf5-cffi")
- (version (git-version "1.8.18" revision commit))
+ (name "sbcl-claw-utils")
+ ;; version is not specified
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hdfgroup/hdf5-cffi")
+ (url "https://github.com/borodust/claw-utils")
(commit commit)))
- (file-name (git-file-name "cl-hdf5-cffi" version))
+ (file-name (git-file-name "claw-utils" version))
(sha256
- (base32 "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"))))
+ (base32 "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp bindings for the HDF5 library")
- (description
- "@code{hdf5-cffi} is a CFFI wrapper for the HDF5 library.")
- (home-page "https://github.com/hdfgroup/hdf5-cffi")
- (license (license:non-copyleft
- (string-append "https://github.com/HDFGroup/hdf5-cffi/raw/"
- commit
- "/LICENSE")))
(inputs
- (list hdf5-1.10 sbcl-cffi))
- (native-inputs
- (list sbcl-fiveam))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libhdf5.so")
- (search-input-file inputs "/lib/libhdf5.so")))))
- (add-after 'fix-paths 'fix-newer-hdf5-compatibility
- (lambda _
- (substitute* (list "src/h5-grovel.lisp"
- "src/h5a-grovel.lisp"
- "src/h5d-grovel.lisp"
- "src/h5f-grovel.lisp"
- "src/h5g-grovel.lisp"
- "src/h5i-grovel.lisp"
- "src/h5l-grovel.lisp"
- "src/h5o-grovel.lisp"
- "src/h5p-grovel.lisp"
- "src/h5pl-grovel.lisp"
- "src/h5r-grovel.lisp"
- "src/h5s-grovel.lisp"
- "src/h5t-grovel.lisp"
- "src/h5z-grovel.lisp")
- (("_H5private_H")
- "H5private_H"))))
- (add-after 'unpack 'fix-dependencies
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "hdf5-cffi.asd"
- ((":depends-on \\(:cffi\\)")
- ":depends-on (:cffi :cffi-grovel)"))
- (substitute* "hdf5-cffi.test.asd"
- ((":depends-on \\(:cffi :hdf5-cffi")
- ":depends-on (:cffi :cffi-grovel :hdf5-cffi"))))))))))
-
-(define-public cl-hdf5-cffi
- (sbcl-package->cl-source-package sbcl-hdf5-cffi))
-
-(define-public ecl-hdf5-cffi
- (sbcl-package->ecl-package sbcl-hdf5-cffi))
-
-(define-public sbcl-history-tree
- (package
- (name "sbcl-history-tree")
- (version "0.1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/history-tree")
- (commit version)))
- (file-name (git-file-name "cl-history-tree" version))
- (sha256
- (base32 "1n3q6aqh0wm24pksj8371j5iinxpzy2kcnz97kmpndm1yhv4x5f2"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list
- sbcl-alexandria
- sbcl-custom-hash-table
- sbcl-local-time
- sbcl-nclasses
- sbcl-trivial-package-local-nicknames))
- (native-inputs (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/history-tree")
- (synopsis "Store the history of a browser's visited paths")
- (description
- "This data structure can be used to store the history of visited paths or
-URLs with a file or web browser, in a way that no “forward” element is ever
-forgotten.
-
-The history tree is “global” in the sense that multiple owners (e.g. tabs) can
-have overlapping histories. On top of that, an owner can spawn another one,
-starting from one of its nodes (typically when you open a URL in a new tab).")
- (license license:bsd-3)))
-
-(define-public cl-history-tree
- (sbcl-package->cl-source-package sbcl-history-tree))
-
-(define-public ecl-history-tree
- (sbcl-package->ecl-package sbcl-history-tree))
-
-(define-public sbcl-cl-randist
- (package
- (name "sbcl-cl-randist")
- (version "0.4.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/lvaruzza/cl-randist")
- (commit "f088a54b540a7adefab7c04094a6103f9edda3d0")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0l8hyd6nbxb7f50vyxz3rbbm7kgr1fnadc40jywy4xj5vi5kpj5g"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Random distributions for Common Lisp")
- (description
- "Manual translation from C to Common Lisp of some random number
-generation functions from the GSL library.")
- (home-page "https://github.com/lvaruzza/cl-randist")
- (license license:bsd-2)
- (arguments
- `(#:tests? #f))))
+ (list sbcl-alexandria sbcl-cffi sbcl-claw))
+ (home-page "https://github.com/borodust/claw-utils")
+ (synopsis "Utilities for easier autowrapping")
+ (description
+ "This Common Lisp library contains various handy utilities to help
+autowrapping with @code{claw}.")
+ (license license:expat))))
-(define-public cl-randist
- (sbcl-package->cl-source-package sbcl-cl-randist))
+(define-public cl-claw-utils
+ (sbcl-package->cl-source-package sbcl-claw-utils))
-(define-public ecl-cl-randist
- (sbcl-package->ecl-package sbcl-cl-randist))
+(define-public ecl-claw-utils
+ (sbcl-package->ecl-package sbcl-claw-utils))
-(define-public sbcl-float-features
- (let ((commit "c1f86aea91cfaa3aa59799162be23ef8a12b199d")
- (revision "2"))
+(define-public sbcl-clawk
+ (let ((commit "3a91634df686417114044a98c063cbe76bfac7b6"))
(package
- (name "sbcl-float-features")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-clawk")
+ (version (git-version "4" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/float-features")
+ (url "https://github.com/sharplispers/clawk")
(commit commit)))
- (file-name (git-file-name "float-features" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0vqm9xhn2i4vbjrxnp4hr1l3lydjflhjykdz6cmqg2j48c5kh3g3"))))
+ (base32 "1ph3xjqilvinvgr9q3w47zxqyz1sqnq030nlx7kgkkv8j3bnqk7a"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp IEEE float portability library")
- (description
- "Portability library for IEEE float features that are not
-covered by the Common Lisp standard.")
- (home-page "https://github.com/Shinmera/float-features")
- (license license:zlib)
(inputs
- `(("documentation-utils" ,sbcl-documentation-utils)))
- (arguments
- `(#:tests? #f)))))
-
-(define-public cl-float-features
- (sbcl-package->cl-source-package sbcl-float-features))
-
-(define-public ecl-float-features
- (sbcl-package->ecl-package sbcl-float-features))
-
-(define-public sbcl-function-cache
- (package
- (name "sbcl-function-cache")
- (version "1.0.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/AccelerationNet/function-cache")
- (commit "6a5ada401e57da2c8abf046f582029926e61fce8")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Function caching / memoization library for Common Lisp")
- (description
- "A common lisp library that provides extensible function result
-caching based on arguments (an expanded form of memoization).")
- (home-page "https://github.com/AccelerationNet/function-cache")
- (license
- (license:non-copyleft
- "https://github.com/AccelerationNet/function-cache/blob/master/README.md"))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-interpol" ,sbcl-cl-interpol)
- ("iterate" ,sbcl-iterate)
- ("symbol-munger" ,sbcl-symbol-munger)
- ("closer-mop" ,sbcl-closer-mop)))
- (arguments
- `(#:tests? #f))))
+ (list sbcl-regex))
+ (home-page "https://github.com/sharplispers/clawk")
+ (synopsis "Common Lisp AWK")
+ (description
+ "CLAWK is an AWK implementation embedded into Common Lisp.")
+ (license license:bsd-2))))
-(define-public cl-function-cache
- (sbcl-package->cl-source-package sbcl-function-cache))
+(define-public cl-clawk
+ (sbcl-package->cl-source-package sbcl-clawk))
-(define-public ecl-function-cache
- (sbcl-package->ecl-package sbcl-function-cache))
+(define-public ecl-clawk
+ (sbcl-package->ecl-package sbcl-clawk))
-(define-public sbcl-cache-while
- (let ((commit "38e9ffbdb2c894670c366c1e5802ffcc8cfd43a7")
- (revision "1"))
+(define-public sbcl-clesh
+ (let ((commit "44e96e04a72e5bc006dc4eb02ce8962348dd4a11"))
(package
- (name "sbcl-cache-while")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-clesh")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charje/cache-while")
+ (url "https://github.com/Neronus/Clesh")
(commit commit)))
- (file-name (git-file-name "cache-while" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1qil68rfn5irmkb0jk1f6g1zy80wgc3skl8cr4rfgh7ywgm5izx3"))))
+ (base32 "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/charje/cache-while")
- (synopsis "Temporary / one-time caching macro for Common Lisp")
+ (inputs
+ (list sbcl-trivial-shell sbcl-named-readtables))
+ (home-page "https://github.com/Neronus/Clesh")
+ (synopsis "Embed shell code in Common Lisp")
(description
- "This is a Common Lisp macro for defining temporary caches that
-invalidate based on expressions evaluating to different values.")
- (license license:llgpl))))
+ "This is a very short and simple program, written in Common Lisp, that
+extends Common Lisp to embed shell code in a manner similar to Perl's
+backtick. It has been forked from SHELISP.")
+ (license license:bsd-2))))
-(define-public cl-cache-while
- (sbcl-package->cl-source-package sbcl-cache-while))
+(define-public cl-clesh
+ (sbcl-package->cl-source-package sbcl-clesh))
-(define-public ecl-cache-while
- (sbcl-package->ecl-package sbcl-cache-while))
+(define-public ecl-clesh
+ (sbcl-package->ecl-package sbcl-clesh))
-(define-public sbcl-type-r
- (let ((commit "83c89e38f2f7a7b16f1012777ecaf878cfa6a267")
+(define-public sbcl-clinenoise
+ (let ((commit "46e21f99d06a55d93eaa382cf652d55d457032ef")
(revision "1"))
(package
- (name "sbcl-type-r")
+ (name "sbcl-clinenoise")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/guicho271828/type-r")
+ (url "https://github.com/jasom/clinenoise")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "clinenoise" version))
(sha256
- (base32
- "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"))))
+ (base32 "0ydlirfk4dbpqqjwwph99v5swcrhd8v9g8q24fvs35wn2vm08lh1"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Parser interface for Common Lisp built-in compound types")
- (description
- "Collections of accessor functions and patterns to access
-the elements in compound type specifier, e.g. @code{dimensions} in
-@code{(array element-type dimensions)}")
- (home-page "https://github.com/guicho271828/type-r")
- (license license:lgpl3+)
(inputs
- `(("trivia" ,sbcl-trivia)
- ("alexandria" ,sbcl-alexandria)))
- (native-inputs
- (list sbcl-fiveam)))))
+ (list sbcl-alexandria sbcl-cffi sbcl-split-sequence))
+ (home-page "https://github.com/jasom/clinenoise")
+ (synopsis "Port of linenoise to Common Lisp")
+ (description
+ "This package provides a trivial line-input library for VT-like
+terminals.")
+ (license license:bsd-2))))
-(define-public cl-type-r
- (sbcl-package->cl-source-package sbcl-type-r))
+(define-public cl-clinenoise
+ (sbcl-package->cl-source-package sbcl-clinenoise))
-(define-public ecl-type-r
- (sbcl-package->ecl-package sbcl-type-r))
+(define-public ecl-clinenoise
+ (sbcl-package->ecl-package sbcl-clinenoise))
-(define-public sbcl-trivialib-type-unify
- (let ((commit "62492ebf04db567dcf435ae84c50b7b8202ecf99")
- (revision "1"))
+(define-public sbcl-clingon
+ (let ((commit "379fc41e7b3977661f1454cf35acdbfae046d40d")
+ (revision "0"))
(package
- (name "sbcl-trivialib-type-unify")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-clingon")
+ (version (git-version "0.5.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/guicho271828/trivialib.type-unify")
+ (url "https://github.com/dnaeon/clingon")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-clingon" version))
(sha256
- (base32
- "1bkyfzbwv75p50zp8n1n9rh2r29pw3vgz91gmn2gzzkyq3khj1vh"))))
+ (base32 "11p9lplx0fc5ghx601i150vrd46zdbvw0hfrbrrrdqplxaqpywq5"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp type unification")
- (description
- "Unifies a parametrized type specifier against an actual type specifier.
-Importantly, it handles complicated array-subtypes and number-related types
-correctly.")
- (home-page "https://github.com/guicho271828/trivialib.type-unify")
- (license license:lgpl3+)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("trivia" ,sbcl-trivia)
- ("introspect-environment" ,sbcl-introspect-environment)
- ("type-r" ,sbcl-type-r)))
(native-inputs
- (list sbcl-fiveam))
- (arguments
- `(#:asd-systems '("trivialib.type-unify"))))))
+ (list sbcl-rove))
+ (inputs
+ (list sbcl-bobbin
+ sbcl-cl-reexport
+ sbcl-split-sequence
+ sbcl-with-user-abort))
+ (home-page "https://github.com/dnaeon/clingon")
+ (synopsis "Command-line option parsing library for Common Lisp")
+ (description
+ "@code{clingon} is a command-line option parsing library for Common
+Lisp. Its features include:
+@itemize
+@item Support for subcommands
+@item Support for command aliases
+@item Support for short and long options
+@item Related options may be grouped into categories
+@item Short options may be collapsed into a single argument, as in
+@option{-xyz}
+@item Long options support the notations @option{--long-opt arg} and
+@option{--long-opt=arg}
+@item Automatic generation of help/usage information for commands and
+subcommands
+@item Out-of-the-box support for @option{--version} and @option{--help}
+@item Support for various kinds of options including string, integer,
+boolean, switch, enum, list, counter, filepath, etc.
+@item Subcommands can look up global options defined in parent commands
+@item Support for required options
+@item Options can be initialized via environment variables
+@item Single interface for creating options using @code{CLINGON:MAKE-OPTION}
+@item Generate documentation for your command-line application
+@item Support for @code{pre-hook} and @code{post-hook} actions for commands,
+which allow invoking functions before and after the respective handler of the
+command is executed
+@item Support for Bash and Zsh completions
+@item Extensibility, so if you don't find something you need you can extend it
+by developing a new option kind, or even a new mechanism for initializing
+options, e.g., by looking up an external key/value store
+@end itemize")
+ (license license:bsd-2))))
-(define-public cl-trivialib-type-unify
- (sbcl-package->cl-source-package sbcl-trivialib-type-unify))
+(define-public cl-clingon
+ (sbcl-package->cl-source-package sbcl-clingon))
-(define-public ecl-trivialib-type-unify
- (sbcl-package->ecl-package sbcl-trivialib-type-unify))
+(define-public ecl-clingon
+ (sbcl-package->ecl-package sbcl-clingon))
-(define-public sbcl-cl-unification
- (let ((commit "01079f34d197495880aa49ab727d63774d83035c")
+(define-public sbcl-clip
+ (let ((commit "7afa68702fbb99c47ed115ea0faccd97a29d9b2e")
(revision "1"))
(package
- (name "sbcl-cl-unification")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-clip")
+ (version (git-version "0.7.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-unification/cl-unification")
+ (url "https://github.com/shinmera/clip")
(commit commit)))
- (file-name (git-file-name "cl-unification" version))
+ (file-name (git-file-name "clip" version))
(sha256
- (base32 "0nhqamn3qgg38i6aw2pshffdwr2hzslycg8ficmn333gw0h9rf4g"))))
+ (base32 "13kkajkva2shm19fvn4yashsw18l6imv2rmy3hmpcky7g5ay7bv3"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-ptester))
(inputs
- (list sbcl-cl-ppcre))
- (home-page "https://common-lisp.net/project/cl-unification/")
- (synopsis "Unification framework for Common Lisp")
+ (list sbcl-array-utils sbcl-lquery))
+ (home-page "https://shinmera.github.io/clip/")
+ (synopsis "Common Lisp HTML templating engine")
(description
- "This package provides a framework to unify arbitrary
-Common Lisp objects while constructing bindings for placeholders
-(unification variables) in a template sublanguage.")
- (license license:bsd-0))))
+ "Clip is an attempt at a templating library that allows you to write
+templates in a way that is both accessible to direct webdesign and
+flexible. The main idea is to incorporate transformation commands into an HTML
+file through tags and attributes. Clip is heavily dependent on Plump and
+lQuery.")
+ (license license:zlib))))
-(define-public ecl-cl-unification
- (let ((pkg (sbcl-package->ecl-package sbcl-cl-unification)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; The tests fail on ECL with:
- ;; "In MAKE-ARRAY: the elements in :INITIAL-CONTENTS do not match
- ;; the array dimensions."
- ((#:tests? _ #f) #f))))))
+(define-public cl-clip
+ (sbcl-package->cl-source-package sbcl-clip))
-(define-public cl-unification
- (sbcl-package->cl-source-package sbcl-cl-unification))
+(define-public ecl-clip
+ (sbcl-package->ecl-package sbcl-clip))
-(define-public sbcl-specialized-function
- (let ((commit "5e2b04432bdf728496e6ff7227f210f845af7247")
- (revision "3"))
+(define-public sbcl-clml
+ (let ((commit "95505b54c8c7b4b27f500c3be97fa5732f4b51a8")
+ (revision "0"))
(package
- (name "sbcl-specialized-function")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-clml")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/numcl/specialized-function")
+ (url "https://github.com/mmaul/clml")
(commit commit)))
- (file-name (git-file-name "specialized-function" version))
+ (file-name (git-file-name "clml" version))
(sha256
- (base32 "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"))))
+ (base32 "006pii59nmpc61n7p7h8ha5vjg6x0dya327i58z0rnvxs249h345"))
+ ;; TODO: Remove this when the patch has been merged upstream.
+ (patches (search-patches "sbcl-clml-fix-types.patch"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Julia-like dispatch for Common Lisp")
- (description
- "This library is part of NUMCL. It provides a macro
-@code{SPECIALIZED} that performs a Julia-like dispatch on the arguments,
-lazily compiling a type-specific version of the function from the same
-code. The main target of this macro is speed.")
- (home-page "https://github.com/numcl/specialized-function")
- (license license:lgpl3+)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("iterate" ,sbcl-iterate)
- ("lisp-namespace" ,sbcl-lisp-namespace)
- ("trivia" ,sbcl-trivia)
- ("trivial-cltl2" ,sbcl-trivial-cltl2)
- ("type-r" ,sbcl-type-r)))
- (native-inputs
- (list sbcl-fiveam)))))
-
-(define-public cl-specialized-function
- (sbcl-package->cl-source-package sbcl-specialized-function))
-
-(define-public ecl-specialized-function
- (sbcl-package->ecl-package sbcl-specialized-function))
-
-(define-public sbcl-conduit-packages
- (package
- (name "sbcl-conduit-packages")
- (version "2.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tfeb/conduit-packages")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-conduit-packages" version))
- (sha256
- (base32 "1n783in84mrk9lnc3nshwsgxhb8y0dk6ys9z6jlxkv0jpjxhpjjc"))))
- (build-system asdf-build-system/sbcl)
- (arguments '(#:asd-systems '("org.tfeb.conduit-packages")))
- (synopsis "Conduit packages for Common Lisp")
- (description "This library defines a way of treating Common Lisp
-packages as conduits which can sit between one or more implementation
-packages and users of those packages.")
- (home-page "https://github.com/tfeb/conduit-packages/")
- (license license:expat)))
-
-(define-public cl-conduit-packages
- (sbcl-package->cl-source-package sbcl-conduit-packages))
+ (list sbcl-alexandria
+ sbcl-array-operations
+ sbcl-cl-fad
+ sbcl-cl-ppcre
+ sbcl-drakma
+ sbcl-introspect-environment
+ sbcl-iterate
+ sbcl-lparallel
+ sbcl-parse-number
+ sbcl-split-sequence
+ sbcl-trivial-garbage))
+ (synopsis "Common Lisp machine learning library")
+ (description
+ "CLML (Common Lisp Machine Learning) is a high performance and large
+scale statistical machine learning package")
+ (home-page "https://mmaul.github.io/clml/")
+ (license license:llgpl))))
-(define-public ecl-conduit-packages
- (sbcl-package->ecl-package sbcl-conduit-packages))
+(define-public cl-clml
+ (sbcl-package->cl-source-package sbcl-clml))
-(define-public sbcl-constantfold
- (let ((commit "0ff1d97a3fbcb89264f6a2af6ce62b73e7b421f4")
- (revision "1"))
+(define-public sbcl-clobber
+ (let ((commit "212721c24a8bb792714314ba52dfe818641f2e98")
+ (revision "0"))
(package
- (name "sbcl-constantfold")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-clobber")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/numcl/constantfold")
+ (url "https://github.com/robert-strandh/Clobber")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-clobber" version))
(sha256
- (base32
- "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"))))
+ (base32 "0pqzfn2wqbzzwlwc3l84iv3i3wa9zfgnh14mq67h9qkib8wjzx3n"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Support library for numcl")
+ (home-page "https://github.com/robert-strandh/Clobber")
+ (synopsis "Common Lisp Library for transaction-oriented databases")
(description
- "Support library for numcl. Registers a function as an
-additional form that is considered as a candidate for a constant.")
- (home-page "https://github.com/numcl/constantfold")
- (license license:lgpl3+)
- (inputs
- `(("trivia" ,sbcl-trivia)
- ("alexandria" ,sbcl-alexandria)
- ("iterate" ,sbcl-iterate)
- ("lisp-namespace" ,sbcl-lisp-namespace)))
- (native-inputs
- (list sbcl-fiveam)))))
+ "CLOBBER is an alternative to so-called @emph{object prevalence}, and in
+particular to @code{cl-prevalence}. Clobber is both simpler, more flexible, and
+more robust than systems based on object prevalence.")
+ (license license:bsd-2))))
-(define-public cl-constantfold
- (sbcl-package->cl-source-package sbcl-constantfold))
+(define-public cl-clobber
+ (sbcl-package->cl-source-package sbcl-clobber))
-(define-public ecl-constantfold
- (sbcl-package->ecl-package sbcl-constantfold))
+(define-public ecl-clobber
+ (sbcl-package->ecl-package sbcl-clobber))
-(define-public sbcl-gtype
- (let ((commit "2442e32485635525af278ebd8fa69a27d5b8cf18")
- (revision "2"))
- (package
- (name "sbcl-gtype")
- (version (git-version "0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/numcl/gtype")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "C++/Julia-like parametric types in Common Lisp")
- (description
- "Support library for numcl that provides Julia-like runtime parametric
-type correctness in Common Lisp. It is based on CLtL2 extensions.")
- (home-page "https://github.com/numcl/gtype")
- (license license:lgpl3+)
- (inputs
- `(("trivialib.type-unify" ,sbcl-trivialib-type-unify)
- ("trivial-cltl2" ,sbcl-trivial-cltl2)
- ("trivia" ,sbcl-trivia)
- ("alexandria" ,sbcl-alexandria)
- ("iterate" ,sbcl-iterate)
- ("type-r" ,sbcl-type-r)))
- (native-inputs
- (list sbcl-fiveam)))))
+(define-public sbcl-clog
+ (package
+ (name "sbcl-clog")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rabbibotton/clog")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-clog" version))
+ (sha256
+ (base32 "0f4i6571nm0j704zgnh60sc9slifs11byb2gs8gamqjcfh931dap"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-3bmd
+ sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cl-ppcre
+ sbcl-cl-sqlite
+ sbcl-cl-template
+ sbcl-clack
+ sbcl-closer-mop
+ sbcl-colorize
+ sbcl-dbi
+ sbcl-hunchentoot
+ sbcl-lack
+ sbcl-mgl-pax
+ sbcl-parse-float
+ sbcl-quri
+ sbcl-trivial-open-browser
+ sbcl-websocket-driver))
+ (arguments
+ '(#:asd-systems '("clog" "clog/docs" "clog/tools")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'fix-symbol-name
+ (lambda _
+ (substitute* "source/clog-docs.lisp"
+ (("clog:@CLOG-MANUAL")
+ "clog::@CLOG_MANUAL")))))))
+ (home-page "https://github.com/rabbibotton/clog")
+ (synopsis "Common Lisp Omnificent GUI")
+ (description
+ "This package provides a Common Lisp web framework for building GUI
+applications. CLOG can take the place, or work along side, most cross platform
+GUI frameworks and website frameworks. The CLOG package starts up the
+connectivity to the browser or other websocket client (often a browser embedded
+in a native template application).")
+ (license license:bsd-3)))
-(define-public cl-gtype
- (sbcl-package->cl-source-package sbcl-gtype))
+(define-public cl-clog
+ (sbcl-package->cl-source-package sbcl-clog))
-(define-public ecl-gtype
- (let ((pkg (sbcl-package->ecl-package sbcl-gtype)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; The tests fail on ECL with a COMPILE-FILE-ERROR for t/package.lisp.
- ((#:tests? _ #f) #f))))))
+(define-public ecl-clog
+ (sbcl-package->ecl-package sbcl-clog))
-(define-public sbcl-numcl
- (let ((commit "a28f612d072e5f93137584de5155a42243b3bd6b")
- (revision "3"))
+(define-public sbcl-clop
+ (let ((commit "c0c3fe7efa5ac95ba1644febfb2c2acab757fcda")
+ (revision "0"))
(package
- (name "sbcl-numcl")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-clop")
+ ;; ASD file indicates 0.1.0, but changelog 1.0.1.
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/numcl/numcl")
+ (url "https://github.com/sheepduke/clop")
(commit commit)))
- (file-name (git-file-name "numcl" version))
+ (file-name (git-file-name "cl-clop" version))
(sha256
- (base32 "15m4spbgayawnw5jjz04zfp0jnk9g6hgq5fmr648hzjzj50j1d78"))))
+ (base32 "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(;; Tests often fail because they require a dynamic-space-size much
- ;; bigger than the default one. Disable them for now.
- #:tests? #f))
(native-inputs
(list sbcl-fiveam))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-randist" ,sbcl-cl-randist)
- ("constantfold" ,sbcl-constantfold)
- ("float-features" ,sbcl-float-features)
- ("function-cache" ,sbcl-function-cache)
- ("gtype" ,sbcl-gtype)
- ("iterate" ,sbcl-iterate)
- ("lisp-namespace" ,sbcl-lisp-namespace)
- ("specialized-function" ,sbcl-specialized-function)
- ("trivia" ,sbcl-trivia)
- ("type-r" ,sbcl-type-r)))
- (home-page "https://numcl.github.io/numcl/")
- (synopsis "Numpy clone in Common Lisp")
+ (list sbcl-alexandria
+ sbcl-cl-str
+ sbcl-esrap
+ sbcl-local-time
+ sbcl-parse-number))
+ (home-page "https://github.com/sheepduke/clop")
+ (synopsis "TOML parser for Common Lisp")
(description
- "This package is a Python Numpy clone implemented in pure Common Lisp.")
- (license license:lgpl3+))))
+ "Clop is a Common Lisp library for parsing strings in the TOML
+configuration file format.")
+ (license license:expat))))
-(define-public cl-numcl
- (sbcl-package->cl-source-package sbcl-numcl))
+(define-public cl-clop
+ (sbcl-package->cl-source-package sbcl-clop))
-(define-public ecl-numcl
- (sbcl-package->ecl-package sbcl-numcl))
+(define-public ecl-clop
+ (sbcl-package->ecl-package sbcl-clop))
-(define-public sbcl-pzmq
- (let ((commit "6f7b2ca02c23ea53510a9b0e0f181d5364ce9d32")
- (revision "2"))
+(define-public sbcl-closer-mop
+ (let ((commit "7b86f2add029208ebc74ec6a41c2ccfd3c382dbc")
+ (revision "3"))
(package
- (name "sbcl-pzmq")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-closer-mop")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/orivej/pzmq")
+ (url "https://github.com/pcostanza/closer-mop")
(commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("fiveam" ,sbcl-fiveam)
- ("let-plus" ,sbcl-let-plus)))
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("zeromq" ,zeromq)))
- (arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "c-api.lisp"
- (("\"libzmq")
- (string-append "\""
- (assoc-ref inputs "zeromq")
- "/lib/libzmq")))
- #t)))))
- (synopsis "Common Lisp bindings for the ZeroMQ library")
- (description "This Common Lisp library provides bindings for the ZeroMQ
-lightweight messaging kernel.")
- (home-page "https://github.com/orivej/pzmq")
- (license license:unlicense))))
-
-(define-public cl-pzmq
- (sbcl-package->cl-source-package sbcl-pzmq))
-
-(define-public ecl-pzmq
- (sbcl-package->ecl-package sbcl-pzmq))
-
-(define-public sbcl-clss
- (let ((revision "2")
- (commit "f62b849189c5d1be378f0bd3d403cda8d4fe310b"))
- (package
- (name "sbcl-clss")
- (version (git-version "0.3.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/clss")
- (commit commit)))
- (sha256
- (base32 "1033dchpanhcgxl5qfhr80aw9adbp9bvllhzvvy5p9mrfnidd1fv"))
- (file-name (git-file-name name version))))
- (inputs
- (list sbcl-array-utils sbcl-plump))
- (build-system asdf-build-system/sbcl)
- (synopsis "DOM tree searching engine based on CSS selectors")
- (description "CLSS is a DOM traversal engine based on CSS
-selectors. It makes use of the Plump-DOM and is used by lQuery.")
- (home-page "https://github.com/Shinmera/clss")
- (license license:zlib))))
-
-(define-public cl-clss
- (sbcl-package->cl-source-package sbcl-clss))
-
-(define-public ecl-clss
- (sbcl-package->ecl-package sbcl-clss))
-
-(define-public sbcl-lquery
- (let ((revision "1")
- (commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d"))
- (package
- (name "sbcl-lquery")
- (version (git-version "3.2.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/Shinmera/lquery")
- (commit commit)))
(sha256
- (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w"))
- (file-name (git-file-name name version))))
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-array-utils sbcl-form-fiddle sbcl-plump sbcl-clss))
+ (base32 "1fzxdpq873rpagmj3h9bgv7n95h4p03pnxrklbxp06sxb26xyi16"))
+ (file-name (git-file-name "cl-closer-mop" version ))))
(build-system asdf-build-system/sbcl)
- (synopsis "Library to allow jQuery-like HTML/DOM manipulation")
- (description "@code{lQuery} is a DOM manipulation library written in
-Common Lisp, inspired by and based on the jQuery syntax and
-functions. It uses Plump and CLSS as DOM and selector engines. The
-main idea behind lQuery is to provide a simple interface for crawling
-and modifying HTML sites, as well as to allow for an alternative
-approach to templating.")
- (home-page "https://github.com/Shinmera/lquery")
- (license license:zlib))))
+ (home-page "https://github.com/pcostanza/closer-mop")
+ (synopsis "Rectifies absent or incorrect CLOS MOP features")
+ (description "Closer to MOP is a compatibility layer that rectifies many
+of the absent or incorrect CLOS MOP features across a broad range of Common
+Lisp implementations.")
+ (license license:expat))))
-(define-public cl-lquery
- (sbcl-package->cl-source-package sbcl-lquery))
+(define-public cl-closer-mop
+ (sbcl-package->cl-source-package sbcl-closer-mop))
-(define-public ecl-lquery
- (sbcl-package->ecl-package sbcl-lquery))
+(define-public ecl-closer-mop
+ (sbcl-package->ecl-package sbcl-closer-mop))
-(define-public sbcl-cl-mysql
- (let ((commit "ab56c279c1815aec6ca0bfe85164ff7e85cfb6f9")
- (revision "1"))
+(define-public sbcl-clostrum
+ (let ((commit "c85d38bde9d093f1f132574e9b98b8d64683cd51")
+ (revision "0"))
(package
- (name "sbcl-cl-mysql")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-clostrum")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hackinghat/cl-mysql")
+ (url "https://github.com/s-expressionists/Clostrum")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-clostrum" commit))
(sha256
- (base32 "0dg5ynx2ww94d0qfwrdrm7plkn43h64hs4iiq9mj2s1s4ixnp3lr"))))
+ (base32 "10alsdnpzbgic75xghwjp414sqwg4npvp69zn0r4l8ms0ki9zr1x"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-stefil))
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("mariadb-lib" ,mariadb "lib")))
- (arguments
- `(#:tests? #f ; TODO: Tests require a running server
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "system.lisp"
- (("libmysqlclient_r" all)
- (string-append (assoc-ref inputs "mariadb-lib")
- "/lib/"
- all)))
- #t)))))
- (synopsis "Common Lisp wrapper for MySQL")
+ (native-inputs (list sbcl-fiveam))
+ (home-page "https://github.com/s-expressionists/Clostrum")
+ (synopsis "First Class Global Environments")
(description
- "@code{cl-mysql} is a Common Lisp implementation of a MySQL wrapper.")
- (home-page "http://www.hackinghat.com/index.php/cl-mysql")
- (license license:expat))))
-
-(define-public cl-mysql
- (sbcl-package->cl-source-package sbcl-cl-mysql))
-
-(define-public ecl-cl-mysql
- (sbcl-package->ecl-package sbcl-cl-mysql))
-
-(define-public sbcl-postmodern
- (package
- (name "sbcl-postmodern")
- (version "1.32.9")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/marijnh/Postmodern")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "137jci4hn4vlxf48y39k0di27kc89kvxy3brmn3vl9xq56sy6mhz"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cl-base64" ,sbcl-cl-base64)
- ("cl-unicode" ,sbcl-cl-unicode)
- ("closer-mop" ,sbcl-closer-mop)
- ("global-vars" ,sbcl-global-vars)
- ("ironclad" ,sbcl-ironclad)
- ("local-time" ,sbcl-local-time)
- ("md5" ,sbcl-md5)
- ("split-sequence" ,sbcl-split-sequence)
- ("uax-15" ,sbcl-uax-15)
- ("usocket" ,sbcl-usocket)))
- (arguments
- ;; TODO: (Sharlatan-20210114T171037+0000) tests still failing but on other
- ;; step, some functionality in `local-time' prevents passing tests.
- ;; Error:
- ;;
- ;; Can't create directory
- ;; /gnu/store
- ;; /4f47agf1kyiz057ppy6x5p98i7mcbfsv-sbcl-local-time-1.0.6-2.a177eb9
- ;; /lib/common-lisp/sbcl/local-time/src/integration/
- ;;
- ;; NOTE: (Sharlatan-20210124T191940+0000): When set env HOME to /tmp above
- ;; issue is resolved but it required live test database to connect to now.
- ;; Keep tests switched off.
- `(#:tests? #f
- #:asd-systems '("cl-postgres"
- "s-sql"
- "postmodern"
- "simple-date"
- "simple-date/postgres-glue")))
- (synopsis "Common Lisp library for interacting with PostgreSQL")
- (description
- "@code{postmodern} is a Common Lisp library for interacting with
-PostgreSQL databases. It provides the following features:
-
-@itemize
-@item Efficient communication with the database server without need for
-foreign libraries.
-@item Support for UTF-8 on Unicode-aware Lisp implementations.
-@item A syntax for mixing SQL and Lisp code.
-@item Convenient support for prepared statements and stored procedures.
-@item A metaclass for simple database-access objects.
-@end itemize\n
-
-This package produces 4 systems: postmodern, cl-postgres, s-sql, simple-date
-
-@code{SIMPLE-DATE} is a very basic implementation of date and time objects, used
-to support storing and retrieving time-related SQL types. It is not loaded by
-default and you can use local-time (which has support for timezones) instead.
-
-@code{S-SQL} is used to compile s-expressions to strings of SQL code, escaping
-any Lisp values inside, and doing as much as possible of the work at compile
-time.
-
-@code{CL-POSTGRES} is the low-level library used for interfacing with a PostgreSQL
-server over a socket.
-
-@code{POSTMODERN} itself is a wrapper around these packages and provides higher
-level functions, a very simple data access object that can be mapped directly to
-database tables and some convient utilities. It then tries to put all these
-things together into a convenient programming interface")
- (home-page "https://marijnhaverbeke.nl/postmodern/")
- (license license:zlib)))
+ "This package provides first-class global environments for
+Common Lisp.")
+ (license license:bsd-2))))
-(define-public cl-postmodern
- (sbcl-package->cl-source-package sbcl-postmodern))
+(define-public cl-clostrum
+ (sbcl-package->cl-source-package sbcl-clostrum))
-(define-public ecl-postmodern
- (package
- (inherit (sbcl-package->ecl-package sbcl-postmodern))
- (arguments
- `(#:tests? #f
- #:asd-systems '("cl-postgres"
- "s-sql"
- "postmodern"
- "simple-date"
- "simple-date/postgres-glue")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (substitute* "cl-postgres.asd"
- ((":or :sbcl :allegro :ccl :clisp" all)
- (string-append all " :ecl")))
- #t)))))))
+(define-public ecl-clostrum
+ (sbcl-package->ecl-package sbcl-clostrum))
-(define-public sbcl-db3
- (let ((commit "38e5ad35f025769fb7f8dcdc6e56df3e8efd8e6d")
+(define sbcl-closure-common
+ (let ((commit "e3c5f5f454b72b01b89115e581c3c52a7e201e5c")
(revision "1"))
(package
- (name "sbcl-db3")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-closure-common")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "20101006" revision commit))
+ (home-page "https://common-lisp.net/project/cxml/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dimitri/cl-db3")
+ (url "https://github.com/sharplispers/closure-common")
(commit commit)))
- (file-name (git-file-name "cl-db3" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/dimitri/cl-db3")
- (synopsis "Common Lisp library to read dBase III database files")
- (description
- "This is a Common Lisp library for processing data found in dBase III
-database files (dbf and db3 files).")
- (license license:public-domain))))
-
-(define-public ecl-db3
- (sbcl-package->ecl-package sbcl-db3))
-
-(define-public cl-db3
- (sbcl-package->cl-source-package sbcl-db3))
+ (base32
+ "0k5r2qxn122pxi301ijir3nayi9sg4d7yiy276l36qmzwhp4mg5n"))))
+ (inputs
+ `(("trivial-gray-streams" ,sbcl-trivial-gray-streams)
+ ("babel" ,sbcl-babel)))
+ (synopsis "Support Common Lisp library for CXML")
+ (description "Closure-common is an internal helper library. The name
+Closure is a reference to the web browser it was originally written for.")
+ ;; TODO: License?
+ (license #f))))
-(define-public sbcl-dbi
- (let ((commit "738a74dd69adb2a7c21fa67e140d89c7df25b227")
- (revision "2"))
+(define-public sbcl-closure-template
+ ;; There are no releases since 2015.
+ (let ((commit "f1983aa525045691e128027d2a2d74831c873d6e")
+ (revision "0"))
(package
- (name "sbcl-dbi")
- (version (git-version "0.9.5" revision commit))
+ (name "sbcl-closure-template")
+ (version (git-version "0.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/cl-dbi")
+ (url "https://github.com/archimag/cl-closure-template")
(commit commit)))
- (file-name (git-file-name "cl-dbi" version))
+ (file-name (git-file-name "cl-closure-template" version))
(sha256
- (base32 "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"))))
+ (base32 "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- `(("alexandria" ,sbcl-alexandria)
- ("rove" ,sbcl-rove)
- ("trivial-types" ,sbcl-trivial-types)))
+ (native-inputs (list sbcl-lift))
(inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cl-mysql" ,sbcl-cl-mysql)
- ("cl-sqlite" ,sbcl-cl-sqlite)
- ("closer-mop" ,sbcl-closer-mop)
- ("postmodern" ,sbcl-postmodern)
- ("split-sequence" ,sbcl-split-sequence)
- ("trivial-garbage" ,sbcl-trivial-garbage)))
- (arguments
- `(#:asd-systems '("dbi"
- "dbd-mysql"
- "dbd-postgres"
- "dbd-sqlite3")))
- (synopsis "Database independent interface for Common Lisp")
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-closer-mop
+ sbcl-esrap
+ sbcl-iterate
+ sbcl-parse-number
+ sbcl-split-sequence))
+ (synopsis "Lisp implementation of Google Closure Templates")
(description
- "@code{dbi} is a Common Lisp library providing a database independent
-interface for MySQL, PostgreSQL and SQLite.")
- (home-page "https://github.com/fukamachi/cl-dbi")
+ "This package provides a Common Lisp implementation of Google
+Closure Templates.")
+ (home-page "https://github.com/archimag/cl-closure-template/")
(license license:llgpl))))
-(define-public cl-dbi
- (sbcl-package->cl-source-package sbcl-dbi))
-
-(define-public ecl-dbi
- (sbcl-package->ecl-package sbcl-dbi))
-
-(define-public sbcl-uffi
- (package
- (name "sbcl-uffi")
- (version "2.1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "http://git.kpe.io/uffi.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry"))
- (modules '((guix build utils)))
- (snippet
- ;; The useless bundled debian folder drags `make' into the closure.
- `(begin
- (delete-file-recursively "debian")
- #t))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f ; TODO: Fix use of deprecated ASDF functions
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-permissions
- (lambda _
- (make-file-writable "doc/html.tar.gz")
- #t)))))
- (synopsis "Universal foreign function library for Common Lisp")
- (description
- "UFFI provides a universal foreign function interface (FFI)
- for Common Lisp.")
- (home-page "https://quickdocs.org/uffi/")
- (license license:llgpl)))
+(define-public cl-closure-template
+ (sbcl-package->cl-source-package sbcl-closure-template))
-(define-public cl-uffi
- (package
- (inherit (sbcl-package->cl-source-package sbcl-uffi))
- (arguments
- `(#:phases
- ;; asdf-build-system/source has its own phases and does not inherit
- ;; from asdf-build-system/sbcl phases.
- (modify-phases %standard-phases/source
- ;; Already done in SBCL package.
- (delete 'reset-gzip-timestamps))))))
+(define-public ecl-closure-template
+ (sbcl-package->ecl-package sbcl-closure-template))
(define-public sbcl-clsql
(package
@@ -14271,375 +11239,238 @@ interfaces as well as a functional and an object oriented interface.")
((#:asd-systems asd-systems '())
`(cons "clsql-cffi" ,asd-systems)))))))
-(define-public sbcl-sycamore
- (let ((commit "fd2820fec165ad514493426dea209728f64e6d18"))
+(define-public sbcl-clss
+ (let ((revision "2")
+ (commit "f62b849189c5d1be378f0bd3d403cda8d4fe310b"))
(package
- (name "sbcl-sycamore")
- (version "0.0.20120604")
+ (name "sbcl-clss")
+ (version (git-version "0.3.1" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/ndantam/sycamore/")
- (commit commit)))
- (file-name (git-file-name name version))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/clss")
+ (commit commit)))
(sha256
- (base32 "00bv1aj89q5vldmq92zp2364jq312zjq2mbd3iyz1s2b4widzhl7"))))
- (build-system asdf-build-system/sbcl)
+ (base32 "1033dchpanhcgxl5qfhr80aw9adbp9bvllhzvvy5p9mrfnidd1fv"))
+ (file-name (git-file-name name version))))
(inputs
- (list sbcl-alexandria sbcl-cl-ppcre))
- (synopsis "Purely functional data structure library in Common Lisp")
- (description
- "Sycamore is a fast, purely functional data structure library in Common Lisp.
-If features:
-
-@itemize
-@item Fast, purely functional weight-balanced binary trees.
-@item Leaf nodes are simple-vectors, greatly reducing tree height.
-@item Interfaces for tree Sets and Maps (dictionaries).
-@item Ropes.
-@item Purely functional pairing heaps.
-@item Purely functional amortized queue.
-@end itemize\n")
- (home-page "https://ndantam.github.io/sycamore/")
- (license license:bsd-3))))
-
-(define-public cl-sycamore
- (sbcl-package->cl-source-package sbcl-sycamore))
-
-(define-public ecl-sycamore
- (sbcl-package->ecl-package sbcl-sycamore))
-
-(define-public sbcl-funds
- (let ((commit "39d425818876b898c20780a678803df506df8424")
- (revision "2"))
- (package
- (name "sbcl-funds")
- (version (git-version "1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/charJe/funds")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "13y1jhvnpzrs9daz6f3z67w6h2y21ggb10j3j4vnc5p3m8i7ps4p"))))
+ (list sbcl-array-utils sbcl-plump))
(build-system asdf-build-system/sbcl)
- (synopsis "Purely functional data structure library in Common Lisp")
- (description
- "Funds provides portable, purely functional data structures in Common
-Lisp. It includes tree based implementations for Array, Hash, Queue, Stack, and
-Heap.")
- (home-page "https://common-lisp.net/project/funds/")
- (license license:asl2.0))))
-
-(define-public cl-funds
- (sbcl-package->cl-source-package sbcl-funds))
-
-(define-public ecl-funds
- (sbcl-package->ecl-package sbcl-funds))
-
-(define-public sbcl-trivial-package-local-nicknames
- (package
- (name "sbcl-trivial-package-local-nicknames")
- (version "0.2")
- (home-page "https://github.com/phoe/trivial-package-local-nicknames")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit "16b7ad4c2b120f50da65154191f468ea5598460e")))
- (file-name (git-file-name name version))
- (sha256
- (base32 "18qc27xkjzdcqrilpk3pm7djldwq5rm3ggd5h9cr8hqcd54i2fqg"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp compatibility library for package local nicknames")
- (description
- "This library is a portable compatibility layer around package local nicknames (PLN).
-This was done so there is a portability library for the PLN API not included
-in DEFPACKAGE.")
- (license license:unlicense)))
+ (synopsis "DOM tree searching engine based on CSS selectors")
+ (description "CLSS is a DOM traversal engine based on CSS
+selectors. It makes use of the Plump-DOM and is used by lQuery.")
+ (home-page "https://github.com/Shinmera/clss")
+ (license license:zlib))))
-(define-public cl-trivial-package-local-nicknames
- (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames))
+(define-public cl-clss
+ (sbcl-package->cl-source-package sbcl-clss))
-(define-public ecl-trivial-package-local-nicknames
- (sbcl-package->ecl-package sbcl-trivial-package-local-nicknames))
+(define-public ecl-clss
+ (sbcl-package->ecl-package sbcl-clss))
-(define-public sbcl-enchant
- (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa"))
+(define-public sbcl-cluffer
+ (let ((commit "4aad29c276a58a593064e79972ee4d77cae0af4a"))
(package
- (name "sbcl-enchant")
+ (name "sbcl-cluffer")
(version (git-version "0.0.0" "1" commit))
- (home-page "https://github.com/tlikonen/cl-enchant")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/robert-strandh/cluffer")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "19yh5ihirzi1d8xqy1cjqipzd6ly3245cfxa5s9xx496rryz0s01"))))
+ (base32
+ "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("enchant" ,enchant)
- ("cffi" ,sbcl-cffi)))
+ (list sbcl-acclimation sbcl-clump))
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "load-enchant.lisp"
- (("libenchant")
- (string-append
- (assoc-ref inputs "enchant") "/lib/libenchant-2"))))))))
- (synopsis "Common Lisp interface for the Enchant spell-checker library")
- (description
- "Enchant is a Common Lisp interface for the Enchant spell-checker
-library. The Enchant library is a generic spell-checker library which uses
-other spell-checkers transparently as back-end. The library supports the
-multiple checkers, including Aspell and Hunspell.")
- (license license:public-domain))))
-
-(define-public cl-enchant
- (sbcl-package->cl-source-package sbcl-enchant))
-
-(define-public ecl-enchant
- (sbcl-package->ecl-package sbcl-enchant))
-
-(define-public sbcl-cl-change-case
- (let ((commit "45c70b601125889689e0c1c37d7e727a3a0af022")
- (revision "1"))
- (package
- (name "sbcl-cl-change-case")
- (version (git-version "0.2.0" revision commit))
- (home-page "https://github.com/rudolfochrist/cl-change-case")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (file-name (git-file-name "cl-change-case" version))
- (sha256
- (base32 "0qmk341zzcsbf8sq0w9ix3r080zg4ri6vzxym63lhdjfzwz3y8if"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-ppcre sbcl-cl-ppcre-unicode))
- (native-inputs
- (list sbcl-fiveam))
- (synopsis
- "Convert Common Lisp strings between camelCase, PascalCase and more")
- (description
- "@code{cl-change-case} is a library to convert strings between
-camelCase, PascalCase, snake_case, param-case, CONSTANT_CASE and more.")
- (license license:llgpl))))
+ (add-after 'strip 'unpatch-shebangs
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The documentation Makefile rely on shell scripts.
+ ;; TODO: Build it!
+ ;; In the mean time, remove the shabang as it adds bash to the
+ ;; closure.
+ (let* ((out (assoc-ref outputs "out"))
+ (build-aux (string-append
+ out "/share/")))
+ (substitute* (find-files build-aux)
+ (("^#!.*/bin/sh") "#!/bin/sh")
+ (("^#!.*/bin/bash") "#!/bin/bash"))))))))
+ (home-page "https://github.com/robert-strandh/cluffer")
+ (synopsis "Common Lisp library providing a protocol for text-editor buffers")
+ (description "Cluffer is a library for representing the buffer of a text
+editor. As such, it defines a set of CLOS protocols for client code to
+interact with the buffer contents in various ways, and it supplies different
+implementations of those protocols for different purposes.")
+ (license license:bsd-2))))
-(define-public cl-change-case
- (sbcl-package->cl-source-package sbcl-cl-change-case))
+(define-public cl-cluffer
+ (sbcl-package->cl-source-package sbcl-cluffer))
-(define-public ecl-cl-change-case
- (sbcl-package->ecl-package sbcl-cl-change-case))
+(define-public ecl-cluffer
+ (sbcl-package->ecl-package sbcl-cluffer))
-(define-public sbcl-modularize
- (let ((commit "86c5d9a11fbd2df9f0f03ac10b5d71837c8934ba")
- (revision "1"))
+(define-public sbcl-clump
+ (let ((commit "1ea4dbac1cb86713acff9ae58727dd187d21048a"))
(package
- (name "sbcl-modularize")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-clump")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/modularize")
+ (url "https://github.com/robert-strandh/Clump")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d"))))
- (build-system asdf-build-system/sbcl)
+ (base32
+ "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"))))
(inputs
- `(("documentation-utils" ,sbcl-documentation-utils)
- ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames)))
- (home-page "https://shinmera.github.io/modularize/")
- (synopsis "Common Lisp modularization framework")
- (description
- "@code{MODULARIZE} is an attempt at providing a common interface to
-segregate major application components. This is achieved by adding special
-treatment to packages. Each module is a package that is specially registered,
-which allows it to interact and co-exist with other modules in better ways. For
-instance, by adding module definition options you can introduce mechanisms to
-tie modules together in functionality, hook into each other and so on.")
- (license license:zlib))))
-
-(define-public ecl-modularize
- (sbcl-package->ecl-package sbcl-modularize))
+ (list sbcl-acclimation))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/robert-strandh/Clump")
+ (synopsis "Collection of tree implementations for Common Lisp")
+ (description "The purpose of this library is to provide a collection of
+implementations of trees.
-(define-public cl-modularize
- (sbcl-package->cl-source-package sbcl-modularize))
+In contrast to existing libraries such as cl-containers, it does not impose a
+particular use for the trees. Instead, it aims for a stratified design,
+allowing client code to choose between different levels of abstraction.
-(define-public sbcl-modularize-hooks
- (let ((commit "e0348ed3ffd59a9ec31ca4ab28289e748bfbf96a")
- (revision "1"))
- (package
- (name "sbcl-modularize-hooks")
- (version (git-version "1.0.2" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/modularize-hooks")
- (commit commit)))
- (file-name (git-file-name "modularize-hooks" version))
- (sha256
- (base32 "12kjvin8hxidwkzfb7inqv5b6g5qzcssnj9wc497v2ixc56fqdz7"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-closer-mop sbcl-lambda-fiddle sbcl-modularize
- sbcl-trivial-arguments))
- (home-page "https://shinmera.github.io/modularize-hooks/")
- (synopsis "Generic hooks and triggers extension for Modularize")
- (description
- "This is a simple extension to @code{MODULARIZE} that allows modules to
-define and trigger hooks, which other modules can hook on to.")
- (license license:zlib))))
+As a consequence of this policy, low-level interfaces are provided where
+the concrete representation is exposed, but also high level interfaces
+where the trees can be used as search trees or as trees that represent
+sequences of objects.")
+ (license license:bsd-2))))
-(define-public ecl-modularize-hooks
- (sbcl-package->ecl-package sbcl-modularize-hooks))
+(define-public cl-clump
+ (sbcl-package->cl-source-package sbcl-clump))
-(define-public cl-modularize-hooks
- (sbcl-package->cl-source-package sbcl-modularize-hooks))
+(define-public ecl-clump
+ (sbcl-package->ecl-package sbcl-clump))
-(define-public sbcl-modularize-interfaces
- (let ((commit "96353657afb8c7aeba7ef5b51eb04c5ed3bcb6ef")
- (revision "1"))
+(define-public sbcl-cluster
+ (let ((commit "b040e97578f3027d7d8c7652c74917726574c43e")
+ (revision "0"))
(package
- (name "sbcl-modularize-interfaces")
- (version (git-version "0.9.3" revision commit))
+ (name "sbcl-cluster")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/modularize-interfaces")
+ (url "https://github.com/robert-strandh/Cluster")
(commit commit)))
- (file-name (git-file-name "modularize-interfaces" version))
+ (file-name (git-file-name "cl-cluster" commit))
(sha256
- (base32 "0bjf4wy39cwf75m7vh0r7mmcchs09yz2lrbyap98hnq8blq70fhc"))))
+ (base32 "0ixbr3wm7d3m8mgzasd95rxvs9kip6ngr5s1zk7j3604mcfssqyi"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-lambda-fiddle sbcl-modularize sbcl-trivial-arguments
- sbcl-trivial-indent))
- (home-page "https://shinmera.github.io/modularize-interfaces/")
- (synopsis "Programmatical interfaces extension for Modularize")
+ (list sbcl-acclimation
+ sbcl-split-sequence))
+ (home-page "https://github.com/robert-strandh/Cluster")
+ (synopsis "Assembler with input in the form of standard instances")
(description
- "This is an extension to @code{MODULARIZE} that allows your application
-to define interfaces in-code that serve both as a primary documentation and as
-compliance control.")
- (license license:zlib))))
+ "Cluster is an assembler (initially for x86 and x86-64) with a difference.
+To avoid the issue of defining a syntax, the input to Cluster is a list
+of standard objects (i.e., instances of the class STANDARD-OBJECT),
+as opposed to a character file or S-expressions.")
+ (license license:bsd-2))))
-(define-public ecl-modularize-interfaces
- (sbcl-package->ecl-package sbcl-modularize-interfaces))
+(define-public cl-cluster
+ (sbcl-package->cl-source-package sbcl-cluster))
-(define-public cl-modularize-interfaces
- (sbcl-package->cl-source-package sbcl-modularize-interfaces))
+(define-public ecl-cluster
+ (sbcl-package->ecl-package sbcl-cluster))
-(define-public sbcl-moptilities
- (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41"))
+(define-public sbcl-clx
+ (let ((commit "69f2ebb761d1ff3400deb10c3edce3725846d739")
+ (revision "1"))
(package
- (name "sbcl-moptilities")
- (version (git-version "0.3.13" "1" commit))
- (home-page "https://github.com/gwkkwg/moptilities/")
+ (name "sbcl-clx")
+ (version (git-version "0.7.6" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (file-name (git-file-name name version))
+ (uri
+ (git-reference
+ (url "https://github.com/sharplispers/clx")
+ (commit commit)))
(sha256
- (base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"))))
+ (base32 "0hcyjj7z1xmjfh4f8zljyinnf2d4ap6gazfxkmiz7vvb8ks6i5y3"))
+ (file-name (git-file-name "cl-clx" version))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("closer-mop" ,sbcl-closer-mop)))
(native-inputs
- (list sbcl-lift))
+ (list sbcl-fiasco xorg-server-for-tests))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "lift-standard.config"
- ((":relative-to lift-test")
- ":relative-to moptilities-test"))
- #t))
- (add-after 'install 'remove-test-results
- ;; Otherwise the drag the SBCL package into the closure of the CL
- ;; package.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (source-path (string-append out "/share/common-lisp/"
- (%lisp-type) "/moptilities/")))
- (delete-file-recursively
- (string-append source-path "/test-results")))
- #t)))))
- (synopsis "Compatibility layer for Common Lisp MOP implementation differences")
- (description
- "MOP utilities provide a common interface between Lisps and make the
-MOP easier to use.")
- (license license:expat))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'prepare-test-environment
+ (lambda _
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
+ (home-page "https://www.cliki.net/portable-clx")
+ (synopsis "X11 client library for Common Lisp")
+ (description "CLX is an X11 client library for Common Lisp. The code was
+originally taken from a CMUCL distribution, was modified somewhat in order to
+make it compile and run under SBCL, then a selection of patches were added
+from other CLXes around the net.")
+ (license license:x11))))
-(define-public cl-moptilities
- (sbcl-package->cl-source-package sbcl-moptilities))
+(define-public cl-clx
+ (sbcl-package->cl-source-package sbcl-clx))
-(define-public ecl-moptilities
- (let ((pkg (sbcl-package->ecl-package sbcl-moptilities)))
- (package
- (inherit pkg)
- (arguments
- ;; Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is
- ;; undefined" on ECL.
- '(#:tests? #f)))))
+(define-public ecl-clx
+ (sbcl-package->ecl-package sbcl-clx))
-(define-public sbcl-osicat
- (let ((commit "982327905b8980ff3173344ca87282e046565732")
- (revision "4"))
+(define-public sbcl-clx-truetype
+ (let ((commit "c6e10a918d46632324d5863a8ed067a83fc26de8")
+ (revision "1"))
(package
- (name "sbcl-osicat")
- (version (git-version "0.7.0" revision commit))
- (home-page "https://www.common-lisp.net/project/osicat/")
+ (name "sbcl-clx-truetype")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/osicat/osicat")
+ (url "https://github.com/l04m33/clx-truetype")
(commit commit)))
- (file-name (git-file-name "cl-osicat" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "10q1dfkhrvp5ia860q10y4wdm11fmxf7xv8zl4viz2np9xzf5v22"))
+ (base32
+ "079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37"))
+ (modules '((guix build utils)))
(snippet
'(begin
- ;; The useless release.sh drags `bash' into the closure.
- (delete-file "scripts/release.sh")
+ (substitute* "package.lisp"
+ ((":export") ":export\n :+font-cache-filename+"))
#t))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-cffi sbcl-trivial-features))
- (native-inputs
- (list sbcl-rt))
- (synopsis "Operating system interface for Common Lisp")
- (description
- "Osicat is a lightweight operating system interface for Common Lisp on
-Unix-platforms. It is not a POSIX-style API, but rather a simple lispy
-accompaniment to the standard ANSI facilities.")
+ (list sbcl-clx
+ sbcl-zpb-ttf
+ sbcl-cl-vectors
+ sbcl-cl-fad
+ sbcl-cl-store
+ sbcl-trivial-features))
+ (home-page "https://github.com/l04m33/clx-truetype")
+ (synopsis "Antialiased TrueType font rendering using CLX and XRender")
+ (description "CLX-TrueType is pure common lisp solution for
+antialiased TrueType font rendering using CLX and XRender extension.")
(license license:expat))))
-(define-public cl-osicat
- (sbcl-package->cl-source-package sbcl-osicat))
+(define-public cl-clx-truetype
+ (sbcl-package->cl-source-package sbcl-clx-truetype))
-(define-public ecl-osicat
- (sbcl-package->ecl-package sbcl-osicat))
+(define-public ecl-clx-truetype
+ (sbcl-package->ecl-package sbcl-clx-truetype))
(define-public sbcl-clx-xembed
(let ((commit "a5c4b844d31ee68ffa58c933cc1cdddde6990743")
@@ -14673,1889 +11504,2022 @@ accompaniment to the standard ANSI facilities.")
(define-public ecl-clx-xembed
(sbcl-package->ecl-package sbcl-clx-xembed))
-(define-public sbcl-mw-equiv
- (let ((commit "3ae871458685b1ef7cd6a996ee22c8c5e738a03d")
- (revision "1"))
+(define-public sbcl-cmd
+ (let ((commit "0164d574ba236e2001ee1d9dba3f4774c7512a8c")
+ (revision "8"))
(package
- (name "sbcl-mw-equiv")
- (version (git-version "0.1.2" revision commit))
- (home-page "https://github.com/sharplispers/mw-equiv/")
+ (name "sbcl-cmd")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/mw-equiv/")
+ (url "https://github.com/ruricolist/cmd/")
(commit commit)))
- (file-name (git-file-name "cl-mw-equiv" version))
+ (file-name (git-file-name "cl-cmd" version))
(sha256
- (base32 "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad"))))
+ (base32 "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Extensible object equivalence protocol for Common Lisp")
- (description "Common Lisp comes with quite some functions to compare
-objects for equality, yet none is applicable in every situation and in general
-this is hard, as equality of objects depends on the semantics of operations on
-them. As consequence, users find themselves regularly in a situation where
-they have to roll their own specialized equality test.
-
-This module provides one of many possible equivalence relations between
-standard Common Lisp objects. However, it can be extended for new objects
-through a simple CLOS protocol. The rules when two objects are considered
-equivalent distinguish between @emph{mutating} and @emph{frozen objects}. A
-frozen object is promised not to be mutated in the future in a way that
-operations on it can notice the difference.
-
-We have chosen to compare mutating objects only for identity (pointer
-equality), to avoid various problems. Equivalence for frozen objects on the
-other hand is established by recursing on the objects' constituent parts and
-checking their equivalence. Hence, two objects are equivalent under the
-@code{OBJECT=} relation, if they are either identical, or if they are frozen
-and structurally equivalent, i.e. their constituents are point-wise
-equivalent.
-
-Since many objects are potentially mutable, but are not necessarily mutated
-from a certain point in their life time on, it is possible to promise to the
-equivalence relation that they remain frozen for the rest of their life time,
-thus enabling coarser equivalence than the often too fine-grained pointer
-equality.")
- (license license:bsd-2))))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref inputs "coreutils")
+ "/bin"))
+ (ps-bin (string-append (assoc-ref inputs "procps")
+ "/bin")))
+ (substitute* "cmd.lisp"
+ (("\\(def \\+env\\+ \"env\"\\)")
+ (format #f "(def +env+ \"~a/env\")" bin))
+ (("\\(def \\+kill\\+ \"kill\"\\)")
+ (format #f "(def +kill+ \"~a/kill\")" bin))
+ (("\\(def \\+ps\\+ \"ps\"\\)")
+ (format #f "(def +ps+ \"~a/ps\")" ps-bin))
+ (("\\(def \\+pwd\\+ \"pwd\"\\)")
+ (format #f "(def +pwd+ \"~a/pwd\")" bin))
+ (("\\(def \\+sh\\+ \"/bin/sh\"\\)")
+ (format #f "(def +sh+ \"~a\")" (which "sh")))
+ (("\\(def \\+tr\\+ \"tr\"\\)")
+ (format #f "(def +tr+ \"~a/tr\")" bin)))))))))
+ (inputs
+ (list coreutils
+ procps
+ sbcl-alexandria
+ sbcl-serapeum
+ sbcl-shlex
+ sbcl-trivia))
+ (home-page "https://github.com/ruricolist/cmd")
+ (synopsis "Conveniently run external programs from Common Lisp")
+ (description
+ "A utility for running external programs, built on UIOP.
+Cmd is designed to be natural to use, protect against shell interpolation and
+be usable from multi-threaded programs.")
+ (license license:expat))))
-(define-public cl-mw-equiv
- (sbcl-package->cl-source-package sbcl-mw-equiv))
+(define-public cl-cmd
+ (sbcl-package->cl-source-package sbcl-cmd))
-(define-public ecl-mw-equiv
- (sbcl-package->ecl-package sbcl-mw-equiv))
+(define-public ecl-cmd
+ (sbcl-package->ecl-package sbcl-cmd))
-(define-public sbcl-quantile-estimator
+(define-public sbcl-cmn
(package
- (name "sbcl-quantile-estimator")
- (version "0.0.1")
+ (name "sbcl-cmn")
+ (version "2021.11.22")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/deadtrickster/quantile-estimator.cl")
- (commit "84d0ea405d793f5e808c68c4ddaf25417b0ff8e5")))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri "https://ccrma.stanford.edu/software/cmn/cmn.tar.gz")
+ (file-name (string-append "cmn-" version ".tar.gz"))
(sha256
- (base32
- "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9"))))
+ (base32 "04j1l57cdyfi2zzxqwmvmf1hl899ffgs3bl4r42ba47zsw45kq14"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-test-systems '("quantile-estimator.test")))
- (inputs
- (list sbcl-alexandria))
- (native-inputs
- (list sbcl-mw-equiv sbcl-prove sbcl-log4cl))
- (home-page "https://github.com/deadtrickster/quantile-estimator.cl")
- (synopsis
- "Effective computation of biased quantiles over data streams")
+ (home-page "https://ccrma.stanford.edu/software/cmn/")
+ (synopsis "Western music notation package written in Common Lisp")
(description
- "Common Lisp implementation of Graham Cormode and S.
-Muthukrishnan's Effective Computation of Biased Quantiles over Data
-Streams in ICDE’05.")
+ "CMN provides a package of functions to hierarchically describe a musical
+score. When evaluated, the musical score is rendered to an image.")
(license license:expat)))
-(define-public cl-quantile-estimator
- (sbcl-package->cl-source-package sbcl-quantile-estimator))
+(define-public cl-cmn
+ (sbcl-package->cl-source-package sbcl-cmn))
-(define-public ecl-quantile-estimator
- (sbcl-package->ecl-package sbcl-quantile-estimator))
+(define-public ecl-cmn
+ (sbcl-package->ecl-package sbcl-cmn))
-(define-public sbcl-prometheus
- (package
- (name "sbcl-prometheus")
- (version "0.4.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/deadtrickster/prometheus.cl")
- (commit "7352b92296996ff383503e19bdd3bcea30409a15")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0fzczls2kfgdx18pja4lqxjrz72i583185d8nq0pb3s331hhzh0z"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cffi" ,sbcl-cffi)
- ("cl-fad" ,sbcl-cl-fad)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("drakma" ,sbcl-drakma)
- ("hunchentoot" ,sbcl-hunchentoot)
- ("local-time" ,sbcl-local-time)
- ("quantile-estimator" ,sbcl-quantile-estimator)
- ("salza2" ,sbcl-salza2)
- ("split-sequence" ,sbcl-split-sequence)
- ("trivial-utf-8" ,sbcl-trivial-utf-8)))
- (arguments
- '(#:asd-systems '("prometheus"
- "prometheus.collectors.sbcl"
- "prometheus.collectors.process"
- "prometheus.formats.text"
- "prometheus.exposers.hunchentoot"
- "prometheus.pushgateway")))
- (home-page "https://github.com/deadtrickster/prometheus.cl")
- (synopsis "Prometheus.io Common Lisp client")
- (description "Prometheus.io Common Lisp client.")
- (license license:expat)))
+(define-public sbcl-coalton
+ (let ((commit "939342495f55991812c2c2767322c5e51e755216")
+ (revision "4"))
+ (package
+ (name "sbcl-coalton")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coalton-lang/coalton")
+ (commit commit)))
+ (file-name (git-file-name "cl-coalton" version))
+ (sha256
+ (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiasco))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-concrete-syntax-tree
+ sbcl-eclector
+ sbcl-float-features
+ sbcl-fset
+ sbcl-named-readtables
+ sbcl-trivial-garbage))
+ (home-page "https://coalton-lang.github.io")
+ (synopsis "Dialect of ML in Common Lisp")
+ (description
+ "Coalton is a dialect of ML embedded in Common Lisp. It emphasizes
+practicality and interoperability with Lisp, and is intended to be a DSL that
+allows one to gradually make their programs safer.")
+ (license license:expat))))
-(define-public cl-prometheus
- (sbcl-package->cl-source-package sbcl-prometheus))
+(define-public cl-coalton
+ (sbcl-package->cl-source-package sbcl-coalton))
-(define-public ecl-prometheus
- (sbcl-package->ecl-package sbcl-prometheus))
+(define-public ecl-coalton
+ (sbcl-package->ecl-package sbcl-coalton))
-(define-public sbcl-promise
- (let ((commit "801db8f853da7935ae2e487fd7f8763acbc5ad2a")
+(define-public sbcl-coleslaw
+ (let ((commit "e7e68ce6020d13b14bf212890a7d8973d7af3b40")
(revision "0"))
(package
- (name "sbcl-promise")
+ (name "sbcl-coleslaw")
+ (version (git-version "0.9.7" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coleslaw-org/coleslaw")
+ (commit commit)))
+ (file-name (git-file-name "cl-coleslaw" version))
+ (sha256
+ (base32 "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"))))
+ (build-system asdf-build-system/sbcl)
+ (outputs '("out" "bin"))
+ (arguments
+ '(#:asd-systems '("coleslaw" "coleslaw-cli")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "plugins/publish-gh-pages.sh"
+ (("^rsync\\b") (which "rsync")))
+ (substitute* '("plugins/rsync.lisp"
+ "src/coleslaw.lisp")
+ (("\\brun-program \"rsync\\b")
+ (string-append "run-program \"" (which "rsync"))))))
+ (add-after 'create-asdf-configuration 'build-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (build-program
+ (string-append (assoc-ref outputs "bin") "/bin/coleslaw")
+ outputs
+ #:dependencies '("coleslaw-cli")
+ #:entry-program '((apply (function coleslaw-cli::main)
+ arguments))
+ #:compress? #t))))))
+ (native-inputs
+ (list sbcl-prove))
+ (inputs
+ (list rsync
+ sbcl-3bmd
+ sbcl-alexandria
+ sbcl-cl-fad
+ sbcl-cl-ppcre
+ sbcl-cl-unicode
+ sbcl-clack
+ sbcl-closer-mop
+ sbcl-closure-template
+ sbcl-inferior-shell
+ sbcl-local-time
+ sbcl-trivia))
+ (home-page "https://github.com/coleslaw-org/coleslaw")
+ (synopsis "Static site generator")
+ (description
+ "Coleslaw is a static site generator written in Common Lisp.")
+ (license license:bsd-2))))
+
+(define-public cl-coleslaw
+ (sbcl-package->cl-source-package sbcl-coleslaw))
+
+(define-public ecl-coleslaw
+ (sbcl-package->ecl-package sbcl-coleslaw))
+
+(define-public sbcl-collectors
+ (let ((commit "4c5e70cf399381de8fb485d4ed5a5c8fd7555146")
+ (revision "2"))
+ (package
+ (name "sbcl-collectors")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AccelerationNet/collectors")
+ (commit commit)))
+ (file-name (git-file-name "cl-collectors" version))
+ (sha256
+ (base32 "1kc9q05wyp8yjz5wqc73nar7l49vcnfhj4924li81v76hlb03665"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-closer-mop sbcl-symbol-munger))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/AccelerationNet/collectors/")
+ (synopsis "Common lisp library providing collector macros")
+ (description "A small collection of common lisp macros to make
+collecting values easier.")
+ (license license:bsd-3))))
+
+(define-public cl-collectors
+ (sbcl-package->cl-source-package sbcl-collectors))
+
+(define-public ecl-collectors
+ (sbcl-package->ecl-package sbcl-collectors))
+
+(define-public sbcl-colored
+ (let ((commit "bee87efb0b047da0f071f5cf1457997ab5f93feb")
+ (revision "1"))
+ (package
+ (name "sbcl-colored")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/promise")
+ (url "https://github.com/Shinmera/colored/")
(commit commit)))
- (file-name (git-file-name "cl-promise" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "07cvz6vb5y1d9vndcwq7q1cp54aqvyqzv6wk8vmymbz3lawq2wsn"))))
+ (base32 "0mpg91r6yfb9xqccd4r8z3hl2qzjhdj6daswb1cinrm8ffxrvy5k"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
(inputs
(list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/promise/")
- (synopsis "Promise mechanism for asynchronous operations")
+ (synopsis "Colour representation, conversion, and operation for Common Lisp")
(description
- "This library implements a basic promise datastructure, which is useful
-for dealing with asynchronous behaviours. Importantly, this library does not
-use any other libraries or frameworks, and instead leaves the execution and
-state transition of promise objects in your control, making it easy to
-integrate.")
+ "This is a library for representing and mapping colours between their
+various spaces.")
+ (home-page "https://shinmera.github.io/colored/")
(license license:zlib))))
-(define-public ecl-promise
- (sbcl-package->ecl-package sbcl-promise))
+(define-public cl-colored
+ (sbcl-package->cl-source-package sbcl-colored))
-(define-public cl-promise
- (sbcl-package->cl-source-package sbcl-promise))
+(define-public ecl-colored
+ (sbcl-package->ecl-package sbcl-colored))
-(define-public sbcl-uuid
- (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8"))
+(define-public sbcl-colorize
+ (let ((commit "ea676b584e0899cec82f21a9e6871172fe3c0eb5"))
(package
- (name "sbcl-uuid")
- (version (git-version "2012.12.26" "1" commit))
+ (name "sbcl-colorize")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dardoria/uuid")
+ (url "https://github.com/kingcons/colorize")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
(base32
- "0jnyp2kibcf5cwi60l6grjrj8wws9chasjvsw7xzwyym2lyid46f"))))
+ "1pdg4kiaczmr3ivffhirp7m3lbr1q27rn7dhaay0vwghmi31zcw9"))
+ (file-name (git-file-name "colorize" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-ironclad sbcl-trivial-utf-8))
- (home-page "https://github.com/dardoria/uuid")
- (synopsis
- "Common Lisp implementation of UUIDs according to RFC4122")
+ (list sbcl-alexandria sbcl-split-sequence sbcl-html-encode))
+ (synopsis "Common Lisp for syntax highlighting")
(description
- "Common Lisp implementation of UUIDs according to RFC4122.")
- (license license:llgpl))))
+ "@command{colorize} is a Lisp library for syntax highlighting
+supporting the following languages: Common Lisp, Emacs Lisp, Scheme, Clojure,
+C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.")
+ (home-page "https://github.com/kingcons/colorize")
+ ;; TODO: Missing license?
+ (license license:expat))))
-(define-public cl-uuid
- (sbcl-package->cl-source-package sbcl-uuid))
+(define-public cl-colorize
+ (sbcl-package->cl-source-package sbcl-colorize))
-(define-public ecl-uuid
- (sbcl-package->ecl-package sbcl-uuid))
+(define-public ecl-colorize
+ (sbcl-package->ecl-package sbcl-colorize))
-(define-public sbcl-dissect
- (let ((commit "cffd38479f0e64e805f167bbdb240b783ecc8d45"))
+(define-public sbcl-com.gigamonkeys.binary-data
+ (let ((commit "22e908976d7f3e2318b7168909f911b4a00963ee")
+ (revision "0"))
(package
- (name "sbcl-dissect")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-com.gigamonkeys.binary-data")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/dissect")
+ (url "https://github.com/gigamonkey/monkeylib-binary-data")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "0rmsjkgjl90gl6ssvgd60hb0d5diyhsiyypvw9hbc0ripvbmk5r5"))))
+ (base32 "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre))
- (home-page "https://shinmera.github.io/dissect/")
- (synopsis
- "Introspection library for the call stack and restarts")
+ (list sbcl-alexandria))
+ (home-page "https://github.com/gigamonkey/monkeylib-binary-data")
+ (synopsis "Common Lisp library for reading and writing binary data")
(description
- "Dissect is a small Common Lisp library for introspecting the call stack
-and active restarts.")
- (license license:zlib))))
+ "This a Common Lisp library for reading and writing binary data. It is
+based on code from chapter 24 of the book @emph{Practical Common Lisp}.")
+ (license license:bsd-3))))
-(define-public cl-dissect
- (sbcl-package->cl-source-package sbcl-dissect))
+(define-public cl-com.gigamonkeys.binary-data
+ (sbcl-package->cl-source-package sbcl-com.gigamonkeys.binary-data))
-(define-public ecl-dissect
- (sbcl-package->ecl-package sbcl-dissect))
+(define-public ecl-com.gigamonkeys.binary-data
+ (sbcl-package->ecl-package sbcl-com.gigamonkeys.binary-data))
-(define-public sbcl-exponential-backoff
- (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f"))
+(define-public sbcl-command-line-args
+ (package
+ (name "sbcl-command-line-args")
+ (version "0.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~whereiseveryone/command-line-args")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-command-line-args" version))
+ (sha256
+ (base32 "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("whereiseveryone.command-line-args")))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-charje.documentation
+ sbcl-cl-str
+ sbcl-serapeum
+ sbcl-trivia))
+ (home-page "https://git.sr.ht/~whereiseveryone/command-line-args")
+ (synopsis "Automatically generate command line interfaces")
+ (description "Command-Line-Args provides a main macro (@code{command})
+that wraps a @code{defun} form and creates a new function that parses the
+command line arguments. It has support for command-line options, positional,
+and variadic arguments. It also generates a basic help message. The
+interface is meant to be easy and non-intrusive.")
+ (license license:agpl3+)))
+
+(define-public cl-command-line-args
+ (sbcl-package->cl-source-package sbcl-command-line-args))
+
+(define-public ecl-command-line-args
+ (sbcl-package->ecl-package sbcl-command-line-args))
+
+(define-public sbcl-command-line-arguments
+ (let ((commit "fbac862fb01c0e368141204f3f639920462c23fe")
+ (revision "1"))
(package
- (name "sbcl-exponential-backoff")
- (version (git-version "0" "1" commit))
+ (name "sbcl-command-line-arguments")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/death/exponential-backoff")
+ (url "https://github.com/fare/command-line-arguments")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv"))))
+ (base32 "054m1ikndzqf72mb9ajaa64136cwr3bgag4yfbi1574a9vq75mjq"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/death/exponential-backoff")
- (synopsis "Exponential backoff algorithm in Common Lisp")
- (description
- "An implementation of the exponential backoff algorithm in Common Lisp.
-Inspired by the implementation found in Chromium. Read the header file to
-learn about each of the parameters.")
+ (home-page "https://github.com/fare/command-line-arguments")
+ (synopsis "Trivial command-line argument parsing library for Common Lisp")
+ (description "This is a library to abstract away the parsing of
+Unix-style command-line arguments. Use it in conjunction with asdf:program-op
+or cl-launch for portable processing of command-line arguments.")
(license license:expat))))
-(define-public cl-exponential-backoff
- (sbcl-package->cl-source-package sbcl-exponential-backoff))
+(define-public cl-command-line-arguments
+ (sbcl-package->cl-source-package sbcl-command-line-arguments))
-(define-public ecl-exponential-backoff
- (sbcl-package->ecl-package sbcl-exponential-backoff))
+(define-public ecl-command-line-arguments
+ (sbcl-package->ecl-package sbcl-command-line-arguments))
-(define-public sbcl-sxql
- (let ((commit "cc3478cacb0557475a59cf619dad66c5dc8080ba")
+(define-public sbcl-common-lisp-jupyter
+ (let ((commit "ba9f0e746b9200d6fd6db647d7274448119ed01b")
(revision "3"))
(package
- (name "sbcl-sxql")
+ (name "sbcl-common-lisp-jupyter")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/sxql")
+ (url "https://github.com/yitzchak/common-lisp-jupyter")
(commit commit)))
- (file-name (git-file-name "cl-sqxl" version))
+ (file-name (git-file-name "common-lisp-jupyter" commit))
(sha256
- (base32 "011an993amy8q3gl4hyqrgnc93cgny3cv9gbp679rrmyyp8zmywr"))))
+ (base32 "0si69xfzi769dprwfy7gp1x3bl7lxz6d4n98sa26w9r41wvay5ja"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
- sbcl-cl-package-locks
- sbcl-cl-syntax
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cl-base64
+ sbcl-cl-indentify
+ sbcl-closer-mop
+ sbcl-dissect
+ sbcl-eclector
+ sbcl-ironclad
sbcl-iterate
- sbcl-optima
- sbcl-split-sequence
- sbcl-trivia
- sbcl-trivial-types))
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/fukamachi/sxql")
- (synopsis "SQL generator for Common Lisp")
- (description "SQL generator for Common Lisp.")
- (license license:bsd-3))))
+ sbcl-multilang-documentation
+ sbcl-puri
+ sbcl-pzmq
+ sbcl-shasht
+ sbcl-static-vectors
+ sbcl-trivial-do
+ sbcl-trivial-garbage
+ sbcl-trivial-gray-streams
+ sbcl-trivial-mimes))
+ (home-page "https://yitzchak.github.io/common-lisp-jupyter/")
+ (synopsis "Common Lisp kernel for Jupyter")
+ (description
+ "This is a Common Lisp kernel for Jupyter along with a library for
+building Jupyter kernels, based on Maxima-Jupyter which was based on
+@code{cl-jupyter}.")
+ (license license:expat))))
-(define-public cl-sxql
- (sbcl-package->cl-source-package sbcl-sxql))
+(define-public cl-common-lisp-jupyter
+ (sbcl-package->cl-source-package sbcl-common-lisp-jupyter))
-(define-public ecl-sxql
- (sbcl-package->ecl-package sbcl-sxql))
+(define-public ecl-common-lisp-jupyter
+ (sbcl-package->ecl-package sbcl-common-lisp-jupyter))
-(define-public sbcl-cl-ascii-table
- (let ((commit "d9f5e774a56fad1b416e4dadb8f8a5b0e84094e2")
- (revision "1"))
+(define-public sbcl-compatible-metaclasses
+ (package
+ (name "sbcl-compatible-metaclasses")
+ (version "1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/compatible-metaclasses")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-compatible-metaclasses" version))
+ (sha256
+ (base32 "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-class-options
+ sbcl-closer-mop
+ sbcl-enhanced-find-class))
+ (home-page "https://www.hexstreamsoft.com/libraries/compatible-metaclasses/")
+ (synopsis "Simplifies class mixins by validating superclasses")
+ (description
+ "This library validates superclasses according to a simple substitution
+model, thereby greatly simplifying the definition of class mixins.")
+ (license license:unlicense)))
+
+(define-public cl-compatible-metaclasses
+ (sbcl-package->cl-source-package sbcl-compatible-metaclasses))
+
+(define-public ecl-compatible-metaclasses
+ (sbcl-package->ecl-package sbcl-compatible-metaclasses))
+
+(define-public sbcl-compiler-macro
+ (let ((commit "7796bda64aec5af3ca175170ad3565167868789c")
+ (revision "0"))
(package
- (name "sbcl-cl-ascii-table")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-compiler-macro")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/telephil/cl-ascii-table")
+ (url "https://github.com/Bike/compiler-macro")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-compiler-macro" version))
(sha256
- (base32 "125fdif9sgl7k0ngjhxv0wjas2q27d075025hvj2rx1b1x948z4s"))))
+ (base32 "13sswps7s0qy6939mvj8q57hkx0qkga6rl6xjhjr7pk7by0xdsjq"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Library to make ascii-art tables")
- (description
- "This is a Common Lisp library to present tabular data in ascii-art
-tables.")
- (home-page "https://github.com/telephil/cl-ascii-table")
- (license license:expat))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-introspect-environment))
+ (home-page "https://github.com/Bike/compiler-macro")
+ (synopsis "Common Lisp compiler macro utilities")
+ (description "This library is a collection of utilities for writing
+compiler macros. It is intended to make it possible to make compiler macros
+much more useful, by granting them access to lexical type information, making
+the protocol for declining expansion more convenient, and establishing some
+information for signaling optimization advice to programmers. Some utilities
+to support this, especially for reasoning on types, are also included.")
+ (license license:cc0))))
-(define-public cl-ascii-table
- (sbcl-package->cl-source-package sbcl-cl-ascii-table))
+(define-public cl-compiler-macro
+ (sbcl-package->cl-source-package sbcl-compiler-macro))
-(define-public ecl-cl-ascii-table
- (sbcl-package->ecl-package sbcl-cl-ascii-table))
+(define-public ecl-compiler-macro
+ (sbcl-package->ecl-package sbcl-compiler-macro))
-(define-public sbcl-cl-rdkafka
+(define-public sbcl-compiler-macro-notes
(package
- (name "sbcl-cl-rdkafka")
- (version "1.1.0")
+ (name "sbcl-compiler-macro-notes")
+ (version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/SahilKang/cl-rdkafka")
+ (url "https://github.com/digikar99/compiler-macro-notes")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-compiler-macro-notes" version))
(sha256
- (base32
- "0z2g0k0xy8k1p9g93h8dy9wbygaq7ziwagm4yz93zk67mhc0b84v"))))
+ (base32 "1jv8snj2wvim3k9qhl1vsx82n56nzdmwa3ms9c4ml2d58fwpfjzs"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f ; Attempts to connect to locally running Kafka
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/low-level/librdkafka-bindings.lisp"
- (("librdkafka" all)
- (string-append (assoc-ref inputs "librdkafka") "/lib/"
- all))))))))
(inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cffi" ,sbcl-cffi)
- ("librdkafka" ,librdkafka)
- ("lparallel" ,sbcl-lparallel)
- ("trivial-garbage" ,sbcl-trivial-garbage)))
- (home-page "https://github.com/SahilKang/cl-rdkafka")
- (synopsis "Common Lisp client library for Apache Kafka")
- (description "A Common Lisp client library for Apache Kafka.")
- (license license:gpl3)))
+ (list sbcl-alexandria
+ sbcl-cl-environments))
+ (home-page "https://github.com/digikar99/compiler-macro-notes")
+ (synopsis "Macros and conditions for use within macros and compiler-macros")
+ (description
+ "Alternative to the @code{compiler-macro} library:
-(define-public cl-rdkafka
- (sbcl-package->cl-source-package sbcl-cl-rdkafka))
+@itemize
+@item Here, we do not treat compiler notes as warnings, but instead these are
+a separate class of conditions. These are also not errors.
+@item Two main condition classes are provided: compiler-macro-notes:note and
+compiler-macro-notes:optimization-failure-note. While the latter is a subclass
+of the former, the latter notes are printed in a slightly different manner to
+the former.
+@item To be able to correctly print the expansion path that led to the
+condition, user code is expected to avoid performing a nonlocal exit to a
+place outside with-notes.
+@end itemize\n")
+ (license license:expat)))
-(define-public ecl-cl-rdkafka
- (sbcl-package->ecl-package sbcl-cl-rdkafka))
+(define-public cl-compiler-macro-notes
+ (sbcl-package->cl-source-package sbcl-compiler-macro-notes))
-(define-public sbcl-acclimation
- (let ((commit "4d51150902568fcd59335f4cc4cfa022df6116a5"))
+(define-public ecl-compiler-macro-notes
+ (sbcl-package->ecl-package sbcl-compiler-macro-notes))
+
+(define-public sbcl-computable-reals
+ (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39"))
(package
- (name "sbcl-acclimation")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-computable-reals")
+ (version (git-version "1.1.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Acclimation")
+ (url "https://github.com/stylewarning/computable-reals")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "1aw7rarjl8ai57h0jxnp9hr3dka7qrs55mmbl1p6rhd6xj8mp9wq"))))
+ (base32 "0f12axi53x14l12dgf4a1lfq3p1fx7fh7sjfc0db3lk88ph9qfwl"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/robert-strandh/Acclimation")
- (synopsis "Internationalization library for Common Lisp")
- (description "This project is meant to provide tools for
-internationalizing Common Lisp programs.
-
-One important aspect of internationalization is of course the language used in
-error messages, documentation strings, etc. But with this project we provide
-tools for all other aspects of internationalization as well, including dates,
-weight, temperature, names of physical quantitites, etc.")
- (license license:bsd-2))))
+ (home-page "https://github.com/stylewarning/computable-reals")
+ (synopsis "Arbitrary-precision, re-computing real-numbers in Common Lisp")
+ (description
+ "This library provides arbitrary precision (floating point) real
+numbers in Common Lisp.")
+ (license license:bsd-3))))
-(define-public cl-acclimation
- (sbcl-package->cl-source-package sbcl-acclimation))
+(define-public cl-computable-reals
+ (sbcl-package->cl-source-package sbcl-computable-reals))
-(define-public ecl-acclimation
- (sbcl-package->ecl-package sbcl-acclimation))
+(define-public ecl-computable-reals
+ (sbcl-package->ecl-package sbcl-computable-reals))
-(define-public sbcl-clump
- (let ((commit "1ea4dbac1cb86713acff9ae58727dd187d21048a"))
+(define-public sbcl-concrete-syntax-tree
+ (let ((commit "37291727196a3bc88a7be67c1427c52078d4b82c")
+ (revision "0"))
(package
- (name "sbcl-clump")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-concrete-syntax-tree")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Clump")
+ (url "https://github.com/s-expressionists/Concrete-Syntax-Tree")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-concrete-syntax-tree" commit))
(sha256
- (base32
- "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"))))
+ (base32 "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"))))
+ (build-system asdf-build-system/sbcl)
(inputs
(list sbcl-acclimation))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/robert-strandh/Clump")
- (synopsis "Collection of tree implementations for Common Lisp")
- (description "The purpose of this library is to provide a collection of
-implementations of trees.
+ (arguments
+ '(#:asd-systems '("concrete-syntax-tree"
+ "concrete-syntax-tree-destructuring"
+ "concrete-syntax-tree-source-info")))
+ (home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree")
+ (synopsis "Parse Common Lisp code into a concrete syntax tree")
+ (description
+ "This library is intended to solve the problem of source tracking for
+Common Lisp code.
-In contrast to existing libraries such as cl-containers, it does not impose a
-particular use for the trees. Instead, it aims for a stratified design,
-allowing client code to choose between different levels of abstraction.
+By \"source tracking\", it is meant that code elements that have a known
+origin in the form of a position in a file or in an editor buffer are
+associated with some kind of information about this origin.
-As a consequence of this policy, low-level interfaces are provided where
-the concrete representation is exposed, but also high level interfaces
-where the trees can be used as search trees or as trees that represent
-sequences of objects.")
+Since the exact nature of such origin information depends on the Common Lisp
+implementation and the purpose of wanting to track that origin, the library
+does not impose a particular structure of this information. Instead, it
+provides utilities for manipulating source code in the form of what is called
+concrete syntax trees (CSTs for short) that preserve this information about
+the origin.")
(license license:bsd-2))))
-(define-public cl-clump
- (sbcl-package->cl-source-package sbcl-clump))
+(define-public cl-concrete-syntax-tree
+ (sbcl-package->cl-source-package sbcl-concrete-syntax-tree))
-(define-public ecl-clump
- (sbcl-package->ecl-package sbcl-clump))
+(define-public ecl-concrete-syntax-tree
+ (sbcl-package->ecl-package sbcl-concrete-syntax-tree))
-(define-public sbcl-cluffer
- (let ((commit "4aad29c276a58a593064e79972ee4d77cae0af4a"))
+(define-public sbcl-concurrent-hash-tables
+ (let ((commit "6ad539b8970ff94b1e1369b59065ed7d0660904c")
+ (revision "1"))
(package
- (name "sbcl-cluffer")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-concurrent-hash-tables")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/cluffer")
+ (url "https://github.com/no-defun-allowed/concurrent-hash-tables")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-concurrent-hash-tables" version))
(sha256
- (base32
- "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj"))))
+ (base32 "0wgbv3wl33rlfbywmjag0gk7igzfksmib30r8cbnd5n47ic09iip"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-acclimation sbcl-clump))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'unpatch-shebangs
- (lambda* (#:key outputs #:allow-other-keys)
- ;; The documentation Makefile rely on shell scripts.
- ;; TODO: Build it!
- ;; In the mean time, remove the shabang as it adds bash to the
- ;; closure.
- (let* ((out (assoc-ref outputs "out"))
- (build-aux (string-append
- out "/share/")))
- (substitute* (find-files build-aux)
- (("^#!.*/bin/sh") "#!/bin/sh")
- (("^#!.*/bin/bash") "#!/bin/bash"))))))))
- (home-page "https://github.com/robert-strandh/cluffer")
- (synopsis "Common Lisp library providing a protocol for text-editor buffers")
- (description "Cluffer is a library for representing the buffer of a text
-editor. As such, it defines a set of CLOS protocols for client code to
-interact with the buffer contents in various ways, and it supplies different
-implementations of those protocols for different purposes.")
+ (list sbcl-atomics sbcl-bordeaux-threads))
+ (home-page "https://github.com/no-defun-allowed/concurrent-hash-tables")
+ (synopsis "Portability library for concurrent hash tables in Common Lisp")
+ (description "@code{concurrent-hash-tables} is a Common Lisp portability
+library wrapping some implementations of concurrent hash tables which do not
+have to be entirely locked in their operation, including
+@code{42nd-at-threadmill}, @code{luckless}, and a fallback, segmented hash
+table.")
(license license:bsd-2))))
-(define-public cl-cluffer
- (sbcl-package->cl-source-package sbcl-cluffer))
+(define-public cl-concurrent-hash-tables
+ (sbcl-package->cl-source-package sbcl-concurrent-hash-tables))
-(define-public ecl-cluffer
- (sbcl-package->ecl-package sbcl-cluffer))
+(define-public ecl-concurrent-hash-tables
+ (sbcl-package->ecl-package sbcl-concurrent-hash-tables))
-(define-public sbcl-cl-libsvm-format
- (let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb")
- (revision "0"))
+(define-public sbcl-conduit-packages
+ (package
+ (name "sbcl-conduit-packages")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tfeb/conduit-packages")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-conduit-packages" version))
+ (sha256
+ (base32 "1n783in84mrk9lnc3nshwsgxhb8y0dk6ys9z6jlxkv0jpjxhpjjc"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments '(#:asd-systems '("org.tfeb.conduit-packages")))
+ (synopsis "Conduit packages for Common Lisp")
+ (description "This library defines a way of treating Common Lisp
+packages as conduits which can sit between one or more implementation
+packages and users of those packages.")
+ (home-page "https://github.com/tfeb/conduit-packages/")
+ (license license:expat)))
+
+(define-public cl-conduit-packages
+ (sbcl-package->cl-source-package sbcl-conduit-packages))
+
+(define-public ecl-conduit-packages
+ (sbcl-package->ecl-package sbcl-conduit-packages))
+
+(define-public sbcl-conium
+ (let ((commit "089adfd8759ec7973bb6f67b98d7a246e67aeb05")
+ (revision "1"))
(package
- (name "sbcl-cl-libsvm-format")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-conium")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/masatoi/cl-libsvm-format")
+ (url "https://github.com/sharplispers/conium")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "conium" version))
(sha256
- (base32
- "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"))))
+ (base32 "0y31za8xr8734p2pf8mrw1jd1fksh2d4y1p12wwjyn8hxxsvsx1w"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
(inputs
- (list sbcl-alexandria))
- (synopsis "LibSVM data format reader for Common Lisp")
+ (list sbcl-closer-mop))
+ (home-page "https://github.com/sharplispers/conium")
+ (synopsis "Portability library for debugger- and compiler-related tasks")
(description
- "This Common Lisp library provides a fast reader for data in LibSVM
-format.")
- (home-page "https://github.com/masatoi/cl-libsvm-format")
- (license license:expat))))
+ "Conium is a portability library for debugger- and compiler-related
+tasks in Common Lisp. It is fork of SWANK-BACKEND.")
+ (license license:public-domain))))
-(define-public cl-libsvm-format
- (sbcl-package->cl-source-package sbcl-cl-libsvm-format))
+(define-public cl-conium
+ (sbcl-package->cl-source-package sbcl-conium))
-(define-public ecl-cl-libsvm-format
- (sbcl-package->ecl-package sbcl-cl-libsvm-format))
+(define-public ecl-conium
+ (sbcl-package->ecl-package sbcl-conium))
-(define-public sbcl-cl-online-learning
- (let ((commit "87fbef8a340219e853adb3a5bf44a0470da76964")
+(define-public sbcl-constantfold
+ (let ((commit "0ff1d97a3fbcb89264f6a2af6ce62b73e7b421f4")
(revision "1"))
(package
- (name "sbcl-cl-online-learning")
- (version (git-version "0.5" revision commit))
+ (name "sbcl-constantfold")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/masatoi/cl-online-learning")
+ (url "https://github.com/numcl/constantfold")
(commit commit)))
- (file-name (git-file-name "cl-online-learning" version))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1lfq04lnxivx59nq5dd02glyqsqzf3vdn4s9b8wnaln5fs8g2ph9"))))
+ "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
- (inputs
- `(("cl-libsvm-format" ,sbcl-cl-libsvm-format)
- ("cl-store" ,sbcl-cl-store)))
- (home-page "https://github.com/masatoi/cl-online-learning")
- (synopsis "Online Machine Learning for Common Lisp")
+ (synopsis "Support library for numcl")
(description
- "This library contains a collection of machine learning algorithms for
-online linear classification written in Common Lisp.")
- (license license:expat))))
+ "Support library for numcl. Registers a function as an
+additional form that is considered as a candidate for a constant.")
+ (home-page "https://github.com/numcl/constantfold")
+ (license license:lgpl3+)
+ (inputs
+ `(("trivia" ,sbcl-trivia)
+ ("alexandria" ,sbcl-alexandria)
+ ("iterate" ,sbcl-iterate)
+ ("lisp-namespace" ,sbcl-lisp-namespace)))
+ (native-inputs
+ (list sbcl-fiveam)))))
-(define-public cl-online-learning
- (sbcl-package->cl-source-package sbcl-cl-online-learning))
+(define-public cl-constantfold
+ (sbcl-package->cl-source-package sbcl-constantfold))
-(define-public ecl-cl-online-learning
- (sbcl-package->ecl-package sbcl-cl-online-learning))
+(define-public ecl-constantfold
+ (sbcl-package->ecl-package sbcl-constantfold))
-(define-public sbcl-cl-mpg123
- (let ((commit "5f042c839d2ea4a2ff2a7b60c839d8633d64161d")
- (revision "1"))
+(define-public sbcl-contextl
+ ;; No release since 2013.
+ (let ((commit "f4fb3f59b0844788613fc4d1cc0d2b08df9488bb")
+ (revision "2"))
(package
- (name "sbcl-cl-mpg123")
+ (name "sbcl-contextl")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-mpg123")
+ (url "https://github.com/pcostanza/contextl/")
(commit commit)))
- (file-name (git-file-name "cl-mpg123" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1hl721xaczxck008ax2y3jpkm509ry1sg3lklh2k76764m3ndrjf"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove bundled pre-compiled libraries.
- (delete-file-recursively "static")
- #t))))
+ (base32 "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("cl-mpg123" "cl-mpg123-example")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "low-level.lisp"
- (("libmpg123.so" all)
- (string-append (assoc-ref inputs "libmpg123")
- "/lib/" all))))))))
(inputs
- `(("cffi" ,sbcl-cffi)
- ("cl-out123" ,sbcl-cl-out123)
- ("documentation-utils" ,sbcl-documentation-utils)
- ("libmpg123" ,mpg123)
- ("trivial-features" ,sbcl-trivial-features)
- ("trivial-garbage" ,sbcl-trivial-garbage)
- ("verbose" ,sbcl-verbose)))
- (home-page "https://shirakumo.github.io/cl-mpg123/")
- (synopsis "Common Lisp bindings to libmpg123")
- (description
- "This is a bindings and wrapper library to @code{libmpg123} allowing for
-convenient, extensive, and fast decoding of MPEG1/2/3 (most prominently mp3)
-files.")
- (license license:zlib))))
+ (list sbcl-closer-mop sbcl-lw-compat))
+ (home-page "https://github.com/pcostanza/contextl")
+ (synopsis "Context-oriented programming for Common Lisp")
+ (description "ContextL is a CLOS extension for Context-Oriented
+Programming (COP).
-(define-public ecl-cl-mpg123
- (sbcl-package->ecl-package sbcl-cl-mpg123))
+Find overview of ContextL's features in an overview paper:
+@url{http://www.p-cos.net/documents/contextl-soa.pdf}. See also this general
+overview article about COP which also contains some ContextL examples:
+@url{http://www.jot.fm/issues/issue_2008_03/article4/}.")
+ (license license:expat))))
-(define-public cl-mpg123
- (sbcl-package->cl-source-package sbcl-cl-mpg123))
+(define-public cl-contextl
+ (sbcl-package->cl-source-package sbcl-contextl))
-(define-public sbcl-cl-out123
- (let ((commit "41771bfd419e7349ad569f8e6fcd8a26d6f9e5b7")
- (revision "2"))
+(define-public ecl-contextl
+ (sbcl-package->ecl-package sbcl-contextl))
+
+(define-public sbcl-core-gp
+ (let ((commit "90ec1c4599a19c5a911be1f703f78d5108aee160")
+ (revision "1"))
(package
- (name "sbcl-cl-out123")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-core-gp")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-out123")
+ (url "https://github.com/jorgetavares/core-gp")
(commit commit)))
- (file-name (git-file-name "cl-out123" version))
+ (file-name (git-file-name "cl-core-gp" version))
(sha256
- (base32 "0ahgc5l5lbpl3ini4pn5crh8b7dlr386pxczl0d4h6djhccxzs4w"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove bundled pre-compiled libraries.
- (delete-file-recursively "static")))))
+ (base32 "0nzlb2gwqisa1amlpl4zc5xxph2g3qwhfyaxchci67d31rzws6l3"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f ; No tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "low-level.lisp"
- (("libout123.so")
- (search-input-file inputs "/lib/libout123.so"))))))))
- (inputs
- (list mpg123
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-documentation-utils
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (home-page "https://shirakumo.github.io/cl-out123/")
- (synopsis "Common Lisp bindings to libout123")
+ (home-page "https://github.com/jorgetavares/core-gp")
+ (synopsis "Common Lisp library for genetic programming")
(description
- "This is a bindings library to @code{libout123} which allows easy
-cross-platform audio playback.")
- (license license:zlib))))
+ "@code{core-gp} is a Common Lisp library for genetic programming (GP)
+algorithms. It allows standard GP, strongly-typed GP, grammatical evolution as
+well as standard genetic algorithms.")
+ (license license:expat))))
-(define-public ecl-cl-out123
- (sbcl-package->ecl-package sbcl-cl-out123))
+(define-public cl-core-gp
+ (sbcl-package->cl-source-package sbcl-core-gp))
-(define-public cl-out123
- (sbcl-package->cl-source-package sbcl-cl-out123))
+(define-public ecl-core-gp
+ (sbcl-package->ecl-package sbcl-core-gp))
-(define-public sbcl-cl-portaudio
- (let ((commit "c50cd061c25216a736f684e45101f5c0188a384f")
+(define-public sbcl-croatoan
+ (let ((commit "0157da69edf1459db43fcd30bc6941ef0b26c02d")
(revision "1"))
(package
- (name "sbcl-cl-portaudio")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-croatoan")
+ (version (git-version "0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/filonenko-mikhail/cl-portaudio")
+ (url "https://github.com/McParen/croatoan")
(commit commit)))
- (file-name (git-file-name "cl-portaudio" version))
+ (file-name (git-file-name "cl-croatoan" version))
(sha256
- (base32 "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"))))
+ (base32 "1pd3ivh2hcrbj7xfrfma10chlpzcgh0g36sjy5b23pm2zga4dqvs"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list portaudio sbcl-cffi sbcl-ffa))
(arguments
- (list #:tests? #f ; Tests need access to sound cards
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/portaudio.lisp"
- (("libportaudio\\.so")
- (search-input-file inputs "/lib/libportaudio.so"))))))))
- (synopsis "Common Lisp bindings to portaudio")
- (description
- "This package provides audio input and output functions to Common Lisp
-using bindings to the portaudio library.")
- (home-page "https://github.com/filonenko-mikhail/cl-portaudio")
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "ncurses/ncurses.lisp"
+ (("libncursesw.so")
+ (search-input-file inputs "/lib/libncursesw.so"))))))))
+ (inputs
+ (list ncurses
+ sbcl-cffi
+ sbcl-trivial-gray-streams
+ sbcl-bordeaux-threads))
+ (synopsis "Common Lisp bindings for the ncurses terminal library")
+ (description "Croatoan provides high-level Common Lisp CLOS bindings for
+the ncurses terminal library.")
+ (home-page "https://github.com/McParen/croatoan")
(license license:expat))))
-(define-public cl-portaudio
- (sbcl-package->cl-source-package sbcl-cl-portaudio))
+(define-public cl-croatoan
+ (sbcl-package->cl-source-package sbcl-croatoan))
-(define-public ecl-cl-portaudio
- (sbcl-package->ecl-package sbcl-cl-portaudio))
+(define-public ecl-croatoan
+ (sbcl-package->ecl-package sbcl-croatoan))
-(define-public sbcl-cl-random-forest
- (let ((commit "fedb36ce99bb6f4d7e3a7dd6d8b058f331308f91")
+(define-public sbcl-crypto-shortcuts
+ (let ((commit "7efd22d80e867cd8c9f8f363d4fe7b51ee2dadc0")
(revision "1"))
(package
- (name "sbcl-cl-random-forest")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-crypto-shortcuts")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/masatoi/cl-random-forest")
+ (url "https://github.com/Shinmera/crypto-shortcuts")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "crypto-shortcuts" version))
(sha256
- (base32
- "0wqh4dxy5hrvm14jgyfypwhdw35f24rsksid4blz5a6l2z16rlmq"))))
+ (base32 "0c0m0ar04jn7qf2v8c4sivamlzki03r13rnxy8b3n27rh9r6hgin"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- `(("prove" ,sbcl-prove)
- ("trivial-garbage" ,sbcl-trivial-garbage)))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-libsvm-format" ,sbcl-cl-libsvm-format)
- ("cl-online-learning" ,sbcl-cl-online-learning)
- ("lparallel" ,sbcl-lparallel)))
- (arguments
- `(#:tests? #f)) ; The tests download data from the Internet
- (synopsis "Random Forest and Global Refinement for Common Lisp")
+ (list sbcl-cl-base64 sbcl-flexi-streams sbcl-ironclad))
+ (synopsis "Collection of common cryptography functions")
(description
- "CL-random-forest is an implementation of Random Forest for multiclass
-classification and univariate regression written in Common Lisp. It also
-includes an implementation of Global Refinement of Random Forest.")
- (home-page "https://github.com/masatoi/cl-random-forest")
- (license license:expat))))
+ "This is a collection of common cryptography functions for Common
+Lisp.")
+ (home-page "https://shinmera.github.io/crypto-shortcuts/")
+ (license license:zlib))))
-(define-public cl-random-forest
- (sbcl-package->cl-source-package sbcl-cl-random-forest))
+(define-public cl-crypto-shortcuts
+ (sbcl-package->cl-source-package sbcl-crypto-shortcuts))
-(define-public ecl-cl-random-forest
- (sbcl-package->ecl-package sbcl-cl-random-forest))
+(define-public ecl-crypto-shortcuts
+ (sbcl-package->ecl-package sbcl-crypto-shortcuts))
-(define-public sbcl-bordeaux-fft
- (let ((commit "4a1f5600cae59bdabcb32de4ee2d7d73a9450d6e")
+(define-public sbcl-css-lite
+ (let ((commit "6ee4e6212ed56943d665df163d2a834b122e6273")
(revision "0"))
(package
- (name "sbcl-bordeaux-fft")
- (version (git-version "1.0.1" revision commit))
+ (name "sbcl-css-lite")
+ (version "0.01")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/paddymul/css-lite")
+ (commit commit)))
+ (sha256
+ (base32 "1lyvw7hcy09k5qs6icky23s13psqxncyc73hdyiimb66p0jx6k0d"))
+ (file-name (git-file-name "cl-css-lite" commit))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/paddymul/css-lite")
+ (synopsis "CSS grammar for Lisp")
+ (description
+ "@code{cl-css-lite} is a library for generating CSS from an s-exp based
+syntax. When compiled with Parenscript loaded in the Lisp image, it
+also provides the same CSS generation facilities in Parenscript-generated
+JavaScript code.")
+ (license license:bsd-3))))
+
+(define-public cl-css-lite
+ (sbcl-package->cl-source-package sbcl-css-lite))
+
+(define-public ecl-css-lite
+ (sbcl-package->ecl-package sbcl-css-lite))
+
+(define-public sbcl-ctype
+ (let ((commit "c514623a0cd5c4340ab4ab13d90509f15f09c47a"))
+ (package
+ (name "sbcl-ctype")
+ (version (git-version "0.0.0" "3" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ahefner/bordeaux-fft")
+ (url "https://github.com/s-expressionists/ctype")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-ctype" version))
(sha256
- (base32 "0j584w6kq2k6r8lp2i14f9605rxhp3r15s33xs08iz1pndn6iwqf"))))
+ (base32 "0qnssrjssb7258i3a1s1bv3z6plx4pzrkg65i8an25bvwrjwpvqv"))))
(build-system asdf-build-system/sbcl)
- (home-page "http://vintage-digital.com/hefner/software/bordeaux-fft/")
- (synopsis "Fast Fourier Transform for Common Lisp")
+ (inputs
+ (list sbcl-alexandria))
+ (arguments
+ '(#:asd-systems '("ctype" "ctype/tfun" "ctype/ext")))
+ (home-page "https://github.com/s-expressionists/ctype")
+ (synopsis "Common Lisp type system implementation")
(description
- "The Bordeaux-FFT library provides a reasonably efficient implementation
-of the Fast Fourier Transform and its inverse for complex-valued inputs, in
-portable Common Lisp.")
- (license license:gpl2+))))
+ "This system is an implementation of the Common Lisp type system;
+particularly @code{cl:typep} and @code{cl:subtypep}.")
+ (license license:bsd-2))))
-(define-public cl-bordeaux-fft
- (sbcl-package->cl-source-package sbcl-bordeaux-fft))
+(define-public cl-ctype
+ (sbcl-package->cl-source-package sbcl-ctype))
-(define-public ecl-bordeaux-fft
- (sbcl-package->ecl-package sbcl-bordeaux-fft))
+(define-public ecl-ctype
+ (sbcl-package->ecl-package sbcl-ctype))
-(define-public sbcl-napa-fft3
- (let ((commit "f2d9614c7167da327c9ceebefb04ff6eae2d2236")
+(define-public sbcl-curry-compose-reader-macros
+ (let ((commit "beaa92dedf392726c042184bfd6149fa8d9e6ac2")
(revision "0"))
(package
- (name "sbcl-napa-fft3")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-curry-compose-reader-macros")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/pkhuong/Napa-FFT3")
- (commit commit)))
+ (uri
+ (git-reference
+ (url "https://github.com/eschulte/curry-compose-reader-macros")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp"))))
+ (base32
+ "0rv9bl8xrad5wfcg5zs1dazvnpmvqz6297lbn8bywsrcfnlf7h98"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pkhuong/Napa-FFT3")
- (synopsis "Fast Fourier Transform routines in Common Lisp")
+ (inputs
+ (list sbcl-alexandria sbcl-named-readtables))
+ (synopsis "Reader macros for partial application and composition")
(description
- "Napa-FFT3 provides Discrete Fourier Transform (DFT) routines, but also
-buildings blocks to express common operations that involve DFTs: filtering,
-convolutions, etc.")
- (license license:bsd-3))))
+ "This Common Lisp library provides reader macros for concise expression
+of function partial application and composition.")
+ (home-page "https://eschulte.github.io/curry-compose-reader-macros/")
+ (license license:public-domain))))
-(define-public cl-napa-fft3
- (sbcl-package->cl-source-package sbcl-napa-fft3))
+(define-public cl-curry-compose-reader-macros
+ (sbcl-package->cl-source-package sbcl-curry-compose-reader-macros))
-(define-public sbcl-cl-tga
- (let ((commit "4dc2f7b8a259b9360862306640a07a23d4afaacc")
- (revision "0"))
+(define-public ecl-curry-compose-reader-macros
+ (sbcl-package->ecl-package sbcl-curry-compose-reader-macros))
+
+(define-public sbcl-custom-hash-table
+ (let ((commit "f26983133940f5edf826ebbc8077acc04816ddfa"))
(package
- (name "sbcl-cl-tga")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-custom-hash-table")
+ (version (git-version "0.3" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fisxoj/cl-tga")
+ (url "https://github.com/metawilm/cl-custom-hash-table")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br"))))
+ (base32 "1k4mvrpbqqds2fwjxp1bxmrfmr8ch4dkwhnkbw559knbqshvrlj5"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/fisxoj/cl-tga")
- (synopsis "TGA file loader for Common Lisp")
- (description
- "Cl-tga was written to facilitate loading @emph{.tga} files into OpenGL
-programs. It's a very simple library, and, at the moment, only supports
-non-RLE encoded forms of the files.")
+ (arguments
+ '(#:asd-systems '("cl-custom-hash-table")))
+ (home-page "https://github.com/metawilm/cl-custom-hash-table")
+ (synopsis "Custom hash tables for Common Lisp")
+ (description "This library allows creation of hash tables with arbitrary
+@code{test}/@code{hash} functions, in addition to the @code{test} functions
+allowed by the standard (@code{EQ}, @code{EQL}, @code{EQUAL} and
+@code{EQUALP}), even in implementations that don't support this functionality
+directly.")
(license license:expat))))
-(define-public cl-tga
- (sbcl-package->cl-source-package sbcl-cl-tga))
+(define-public cl-custom-hash-table
+ (sbcl-package->cl-source-package sbcl-custom-hash-table))
-(define-public ecl-cl-tga
- (sbcl-package->ecl-package sbcl-cl-tga))
+(define-public ecl-custom-hash-table
+ (sbcl-package->ecl-package sbcl-custom-hash-table))
-(define-public sbcl-com.gigamonkeys.binary-data
- (let ((commit "22e908976d7f3e2318b7168909f911b4a00963ee")
- (revision "0"))
+(define-public sbcl-cxml
+ (let ((commit "00b22bf4c4cf11c993d5866fae284f95ab18e6bf")
+ (revision "1"))
(package
- (name "sbcl-com.gigamonkeys.binary-data")
+ (name "sbcl-cxml")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/gigamonkey/monkeylib-binary-data")
+ (url "https://github.com/sharplispers/cxml")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw"))))
+ (base32
+ "13kif7rf3gqdycsk9zq0d7y0g9y81krkl0z87k0p2fkbjfgrph37"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/gigamonkey/monkeylib-binary-data")
- (synopsis "Common Lisp library for reading and writing binary data")
- (description
- "This a Common Lisp library for reading and writing binary data. It is
-based on code from chapter 24 of the book @emph{Practical Common Lisp}.")
- (license license:bsd-3))))
-
-(define-public cl-com.gigamonkeys.binary-data
- (sbcl-package->cl-source-package sbcl-com.gigamonkeys.binary-data))
-
-(define-public ecl-com.gigamonkeys.binary-data
- (sbcl-package->ecl-package sbcl-com.gigamonkeys.binary-data))
-
-(define-public sbcl-deflate
- (package
- (name "sbcl-deflate")
- (version "1.0.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pmai/Deflate")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1jpdjnxh6cw2d8hk70r2sxn92is52s9b855irvwkdd777fdciids"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pmai/Deflate")
- (synopsis "Native deflate decompression for Common Lisp")
- (description
- "This library is an implementation of Deflate (RFC 1951) decompression,
-with optional support for ZLIB-style (RFC 1950) and gzip-style (RFC 1952)
-wrappers of deflate streams. It currently does not handle compression.")
- (license license:expat)))
+ (inputs
+ (list sbcl-closure-common sbcl-puri sbcl-trivial-gray-streams))
+ (synopsis "Common Lisp XML parser")
+ (description "CXML implements a namespace-aware, validating XML 1.0
+parser as well as the DOM Level 2 Core interfaces. Two parser interfaces are
+offered, one SAX-like, the other similar to StAX.")
+ (home-page "https://common-lisp.net/project/cxml/")
+ (license license:llgpl))))
-(define-public cl-deflate
- (sbcl-package->cl-source-package sbcl-deflate))
+(define-public cl-cxml
+ (sbcl-package->cl-source-package sbcl-cxml))
-(define-public ecl-deflate
- (sbcl-package->ecl-package sbcl-deflate))
+(define-public ecl-cxml
+ (sbcl-package->ecl-package sbcl-cxml))
-(define-public sbcl-skippy
- (let ((commit "e456210202ca702c792292c5060a264d45e47090")
- (revision "0"))
+(define-public sbcl-cxml-rng
+ (let ((commit "bdcfeb92798694b2935a8321e641d8803e814b7b")
+ (revision "1"))
(package
- (name "sbcl-skippy")
- (version (git-version "1.3.12" revision commit))
+ (name "sbcl-cxml-rng")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xach/skippy")
+ (url "http://www.lichteblau.com/git/cxml-rng.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1sxbn5nh24qpx9w64x8mhp259cxcl1x8p126wk3b91ijjsj7l5vj"))))
+ (base32
+ "1rld038hmvm0whaffkszd5ks7mg44z1vfbgddal434df8sgspzql"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://xach.com/lisp/skippy/")
- (synopsis "Common Lisp library for GIF images")
- (description
- "Skippy is a Common Lisp library to read and write GIF image files.")
- (license license:bsd-2))))
+ (inputs
+ (list sbcl-cxml sbcl-cl-ppcre sbcl-cl-yacc sbcl-parse-number
+ sbcl-cl-base64))
+ (synopsis "Relax NG for Closure XML (CXML)")
+ (description "An implementation of Relax NG schema validation written in
+Common Lisp, including support for compact syntax, DTD Compatibility, and the
+XSD type library.")
+ (home-page "http://www.lichteblau.com/cxml-rng/")
+ (license license:bsd-2))))
-(define-public cl-skippy
- (sbcl-package->cl-source-package sbcl-skippy))
+(define-public cl-cxml-rng
+ (sbcl-package->cl-source-package sbcl-cxml-rng))
-(define-public ecl-skippy
- (sbcl-package->ecl-package sbcl-skippy))
+;; FIXME: Fails on ECL with
+;; In function STRUCTURE-SET, the value of the first argument is
+;; #<empty 0x7fffeb0fd440>
+;; which is not of the expected type %TYPED-PATTERN.
+;; (define-public ecl-cxml-rng
+;; (sbcl-package->ecl-package sbcl-cxml-rng))
-(define-public sbcl-cl-freetype2
- (let ((commit "8bcb232b319a66fb700eaea88d0b308a837bce04")
+(define-public sbcl-daemon
+ (let ((commit "d5652f4332c3cee21e9bf83b9237129605004597")
(revision "1"))
(package
- (name "sbcl-cl-freetype2")
- (version (git-version "1.1" revision commit))
+ (name "sbcl-daemon")
+ (version (git-version "0.0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/cl-freetype2")
+ (url "https://github.com/snmsts/daemon")
(commit commit)))
- (file-name (git-file-name "cl-freetype2" version))
+ (file-name (git-file-name "daemon" version))
(sha256
- (base32 "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"))))
+ (base32 "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list freetype
- sbcl-alexandria
- sbcl-cffi
- sbcl-trivial-garbage))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/ffi/ft2-lib.lisp"
- (("\"libfreetype\"")
- (string-append "\"" (assoc-ref inputs "freetype")
- "/lib/libfreetype\"")))
- (substitute* "src/ffi/grovel/grovel-freetype2.lisp"
- (("-I/usr/include/freetype")
- (string-append "-I" (assoc-ref inputs "freetype")
- "/include/freetype")))
- #t)))))
- (home-page "https://github.com/rpav/cl-freetype2")
- (synopsis "Common Lisp bindings for Freetype 2")
+ (list sbcl-trivial-features))
+ (home-page "https://github.com/snmsts/daemon")
+ (synopsis "Daemonize Common Lisp processes")
(description
- "This is a general Freetype 2 wrapper for Common Lisp using CFFI. It's
-geared toward both using Freetype directly by providing a simplified API, as
-well as providing access to the underlying C structures and functions for use
-with other libraries which may also use Freetype.")
- (license license:bsd-3))))
+ "DAEMON provides the functionality of daemonizing Common Lisp processes
+on UNIX like platforms.")
+ (license license:expat))))
-(define-public cl-freetype2
- (sbcl-package->cl-source-package sbcl-cl-freetype2))
+(define-public cl-daemon
+ (sbcl-package->cl-source-package sbcl-daemon))
-(define-public ecl-cl-freetype2
- (sbcl-package->ecl-package sbcl-cl-freetype2))
+(define-public ecl-daemon
+ (sbcl-package->ecl-package sbcl-daemon))
-(define-public sbcl-opticl-core
- (let ((commit "b7cd13d26df6b824b216fbc360dc27bfadf04999")
- (revision "0"))
+(define-public sbcl-data-format-validation
+ (let ((commit "95d44766e829582598f9dcdc5c23719c462d5bfb")
+ (revision "1"))
(package
- (name "sbcl-opticl-core")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-data-format-validation")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/slyrus/opticl-core")
- (commit commit)))
- (file-name (git-file-name name version))
+ (uri
+ (git-reference
+ (url "https://github.com/willijar/cl-data-format-validation/")
+ (commit commit)))
+ (file-name (git-file-name "data-format-validation" version))
(sha256
- (base32 "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95"))))
+ (base32
+ "0zmk47xmicyqvp1impn8kgh5373ysmx3gfpqcvbi9r31qsir2nqa"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/slyrus/opticl-core")
- (synopsis "Core classes and pixel access macros for Opticl")
+ (list sbcl-cl-ppcre))
+ (synopsis "Validation and conversion between user and internal data")
(description
- "This Common Lisp library contains the core classes and pixel access
-macros for the Opticl image processing library.")
- (license license:bsd-2))))
-
-(define-public cl-opticl-core
- (sbcl-package->cl-source-package sbcl-opticl-core))
-
-(define-public ecl-opticl-core
- (sbcl-package->ecl-package sbcl-opticl-core))
+ "@code{data-format-validation} is a library for Common Lisp providing a
+consistent regular interface for converting (and validating) external data (in
+the form of strings usually) into internal data types and for formatting
+internal data back into external presentable strings, all according to a
+conversion or type specification.")
+ (home-page "http://www.jarw.org.uk/lisp/cl-data-format-validation.html")
+ (license license:gpl3))))
-(define-public sbcl-retrospectiff
- (let ((commit "2fbf8c687799487654d988c7036d19d75a7fc67d")
- (revision "1"))
+(define-public sbcl-data-frame
+ (let ((commit "6f02e58312654ddf19d686f234dcf699fc4cd0f5")
+ (revision "0"))
(package
- (name "sbcl-retrospectiff")
- (version (git-version "0.2" revision commit))
+ (name "sbcl-data-frame")
+ (version (git-version "1.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/slyrus/retrospectiff")
+ (url "https://github.com/Lisp-Stat/data-frame")
(commit commit)))
- (file-name (git-file-name "cl-retrospectiff" version))
+ (file-name (git-file-name "cl-data-frame" version))
(sha256
- (base32 "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz"))))
+ (base32 "0bs1jh66bml25bj1lxdzz8cjhj3g060yyd5ggqsnsr4l2j0zyszv"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
+ (native-inputs (list sbcl-clunit2))
(inputs
- (list sbcl-cl-jpeg
- sbcl-com.gigamonkeys.binary-data
- sbcl-deflate
- sbcl-flexi-streams
- sbcl-ieee-floats
- sbcl-opticl-core))
- (home-page "https://github.com/slyrus/retrospectiff")
- (synopsis "Common Lisp library for TIFF images")
- (description
- "Retrospectiff is a common lisp library for reading and writing images
-in the TIFF (Tagged Image File Format) format.")
- (license license:bsd-2))))
+ (list sbcl-alexandria
+ sbcl-alexandria-plus
+ sbcl-anaphora
+ sbcl-array-operations
+ sbcl-duologue
+ sbcl-let-plus
+ sbcl-numerical-utilities
+ sbcl-select
+ sbcl-serapeum
+ sbcl-statistics))
+ (home-page "https://lisp-stat.dev/docs/manuals/data-frame/")
+ (synopsis "Data frames for Common Lisp")
+ (description "This package provides data frames for Common Lisp, a
+two-dimensional array-like structure in which each column contains values
+of one variable and each row contains one set of values from each column.")
+ (license license:ms-pl))))
-(define-public cl-retrospectif
- (sbcl-package->cl-source-package sbcl-retrospectiff))
+(define-public cl-data-frame
+ (sbcl-package->cl-source-package sbcl-data-frame))
-(define-public ecl-retrospectiff
- (sbcl-package->ecl-package sbcl-retrospectiff))
+;; The data-frame system depends on the sb-cltl2 system, which is only
+;; available with SBCL.
+;; (define-public ecl-data-frame
+;; (sbcl-package->ecl-package sbcl-data-frame))
-(define-public sbcl-mmap
- (let ((commit "ba2e98c67e25f0fb8ff838238561120a23903ce7")
+(define-public sbcl-data-lens
+ (let ((commit "801bc1e0331f19fdc38be314c86ccac9362fde78")
(revision "0"))
(package
- (name "sbcl-mmap")
- (version (git-version "1.0.0" revision commit))
- (source
+ (name "sbcl-data-lens")
+ (version (git-version "0.0.0" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/mmap")
+ (url "https://github.com/fiddlerwoaroof/data-lens")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-data-lens" version))
(sha256
- (base32 "0qd0xp20i1pcfn12kkapv9pirb6hd4ns7kz4zf1mmjwykpsln96q"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-alexandria sbcl-cffi sbcl-parachute
- sbcl-trivial-features))
- (inputs
- (list sbcl-cffi sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/mmap/")
- (synopsis "File memory mapping for Common Lisp")
- (description
- "This is a utility library providing access to the @emph{mmap} family of
-functions in a portable way. It allows you to directly map a file into the
-address space of your process without having to manually read it into memory
-sequentially. Typically this is much more efficient for files that are larger
-than a few Kb.")
- (license license:zlib))))
+ (base32 "1w4rvhcnss037q0bb1j70kdlhfh9085hy95d9q56sk519alhzhrp"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-cl-ppcre
+ sbcl-alexandria
+ sbcl-serapeum))
+ (synopsis "Functional utilities for Common Lisp")
+ (description
+ "The @code{cl-data-lens} library provides a language for expressing data
+manipulations as the composition of more primitive operations.")
+ (home-page "https://fiddlerwoaroof.github.io/data-lens/")
+ (license license:asl2.0))))
-(define-public cl-mmap
- (sbcl-package->cl-source-package sbcl-mmap))
+(define-public cl-data-lens
+ (sbcl-package->cl-source-package sbcl-data-lens))
-(define-public ecl-mmap
- (sbcl-package->ecl-package sbcl-mmap))
+(define-public ecl-data-lens
+ (sbcl-package->ecl-package sbcl-data-lens))
-(define-public sbcl-marray
- (let ((commit "0352f316b6830f0b119088ba9be836e4726bd7d8")
- (revision "0"))
+(define-public sbcl-data-sift
+ (let ((commit "fd617d8200cdcc1b87ecf45ab59bb38e8b16ef7e")
+ (revision "1"))
(package
- (name "sbcl-marray")
+ (name "sbcl-data-sift")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/death/marray")
+ (url "https://github.com/archimag/data-sift")
(commit commit)))
- (file-name (git-file-name "cl-marray" version))
+ (file-name (git-file-name "cl-data-sift" version))
(sha256
- (base32 "0l4kvzpiw14vqhlsaflp3c7y51vznjjgbdi0q3axqk1wxvzy1zlx"))))
+ (base32 "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-dependencies
- (lambda _
- (substitute* "marray.asd"
- ((":components")
- ":depends-on (#+sbcl \"sb-posix\")\n :components")))))))
- (home-page "https://github.com/death/marray")
- (synopsis "Memory-mapped files as Common Lisp arrays")
+ ;; All test cases test a function that has been removed.
+ `(#:tests? #f))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("parse-number" ,sbcl-parse-number)
+ ("puri" ,sbcl-puri)))
+ (native-inputs
+ (list sbcl-lift))
+ (home-page "https://github.com/archimag/data-sift")
+ (synopsis
+ "Common Lisp library for validation and transformation of string data")
(description
- "MARRAY is a library which provides access to memory-mapped files
-through Common Lisp arrays.")
- (license license:expat))))
+ "@code{DATA-SIFT} is a Common Lisp data validation and transformation
+library inspired by @code{cl-data-format-validation} and WTForms validators.")
+ (license license:llgpl))))
-(define-public cl-marray
- (sbcl-package->cl-source-package sbcl-marray))
+(define-public cl-data-sift
+ (sbcl-package->cl-source-package sbcl-data-sift))
-;; ECL support not implemented yet.
-;; (define-public ecl-marray
-;; (sbcl-package->ecl-package sbcl-marray))
+(define-public ecl-data-sift
+ (sbcl-package->ecl-package sbcl-data-sift))
-(define-public sbcl-3bz
- (let ((commit "569614c40408f3aefc77ba233e0e4bd66d3850ad")
+(define-public sbcl-datafly
+ (let ((commit "adece27fcbc4b5ea39ad1a105048b6b7166e3b0d")
(revision "1"))
(package
- (name "sbcl-3bz")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-datafly")
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/fukamachi/datafly")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/3b/3bz")
+ (url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0kvvlvf50jhhw1s510f3clpr1a68632bq6d698yxcrx722igcrg4"))))
+ (base32 "16b78kzmglp2a4nxlxxl7rpf5zaibsgagn0p3c56fsxvx0c4hszv"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-cffi
- sbcl-mmap
- sbcl-nibbles
- sbcl-trivial-features))
- (home-page "https://github.com/3b/3bz")
- (synopsis "Deflate decompression for Common Lisp")
- (description
- "3bz is an implementation of Deflate decompression (RFC 1951) optionally
-with zlib (RFC 1950) or gzip (RFC 1952) wrappers, with support for reading from
-foreign pointers (for use with mmap and similar, etc), and from CL octet
-vectors and streams.")
- (license license:expat))))
-
-(define-public cl-3bz
- (sbcl-package->cl-source-package sbcl-3bz))
-
-(define-public ecl-3bz
- (sbcl-package->ecl-package sbcl-3bz))
-
-(define-public sbcl-zpb-exif
- (package
- (name "sbcl-zpb-exif")
- (version "1.2.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xach/zpb-exif")
- (commit (string-append "release-" version))))
- (file-name (git-file-name "cl-zpb-exif" version))
- (sha256
- (base32 "0h1n36lfl8xn8rfyl5jxz9m8zlg0if2avmryas79f684yczrvdnd"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://xach.com/lisp/zpb-exif/")
- (synopsis "EXIF information extractor for Common Lisp")
- (description
- "This is a Common Lisp library to extract EXIF information from image
-files.")
- (license license:bsd-2)))
+ `(("alexandria" ,sbcl-alexandria)
+ ("iterate" ,sbcl-iterate)
+ ("optima" ,sbcl-optima)
+ ("trivial-types" ,sbcl-trivial-types)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("cl-syntax" ,sbcl-cl-syntax)
+ ("sxql" ,sbcl-sxql)
+ ("dbi" ,sbcl-dbi)
+ ("babel" ,sbcl-babel)
+ ("local-time" ,sbcl-local-time)
+ ("function-cache" ,sbcl-function-cache)
+ ("jonathan" ,sbcl-jonathan)
+ ("kebab" ,sbcl-kebab)
+ ("log4cl" ,sbcl-log4cl)))
+ (native-inputs
+ (list sbcl-prove))
+ (arguments
+ ;; TODO: Tests fail with
+ ;; While evaluating the form starting at line 22, column 0
+ ;; of #P"/tmp/guix-build-sbcl-datafly-0.1-1.adece27.drv-0/source/t/datafly.lisp":
+ ;; Unhandled SQLITE:SQLITE-ERROR in thread #<SB-THREAD:THREAD "main thread" RUNNING
+ ;; {10009F8083}>:
+ ;; Error when binding parameter 1 to value NIL.
+ ;; Code RANGE: column index out of range.
+ `(#:tests? #f))
+ (synopsis "Lightweight database library for Common Lisp")
+ (description "Datafly is a lightweight database library for Common Lisp.")
+ (license license:bsd-3))))
-(define-public cl-zpb-exif
- (sbcl-package->cl-source-package sbcl-zpb-exif))
+(define-public cl-datafly
+ (sbcl-package->cl-source-package sbcl-datafly))
-(define-public ecl-zpb-exif
- (sbcl-package->ecl-package sbcl-zpb-exif))
+(define-public ecl-datafly
+ (sbcl-package->ecl-package sbcl-datafly))
-(define-public sbcl-pngload
- (let ((commit "91f1d703c65bb6a94d6fee06ddbbbbbc5778b71f")
- (revision "2"))
+(define-public sbcl-db3
+ (let ((commit "38e5ad35f025769fb7f8dcdc6e56df3e8efd8e6d")
+ (revision "1"))
(package
- (name "sbcl-pngload")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-db3")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.mfiano.net/mfiano/pngload.git")
+ (url "https://github.com/dimitri/cl-db3")
(commit commit)))
- (file-name (git-file-name "pngload" version))
+ (file-name (git-file-name "cl-db3" version))
(sha256
- (base32 "0s94fdbrbqj12qvgyn2g4lfwvz7qhhzbclrpz5ni7adwxgrmvxl1"))))
+ (base32 "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("3bz" ,sbcl-3bz)
- ("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("mmap" ,sbcl-mmap)
- ("parse-float" ,sbcl-parse-float)
- ("static-vectors" ,sbcl-static-vectors)
- ("swap-bytes" ,sbcl-swap-bytes)
- ("zpb-exif" ,sbcl-zpb-exif)))
- (arguments
- ;; Test suite disabled because of a dependency cycle.
- ;; pngload tests depend on opticl which depends on pngload.
- '(#:tests? #f))
- (home-page "https://git.mfiano.net/mfiano/pngload.git")
- (synopsis "PNG image decoder for Common Lisp")
+ (home-page "https://github.com/dimitri/cl-db3")
+ (synopsis "Common Lisp library to read dBase III database files")
(description
- "This is a Common Lisp library to load images in the PNG image format,
-both from files on disk, or streams in memory.")
- (license license:expat))))
+ "This is a Common Lisp library for processing data found in dBase III
+database files (dbf and db3 files).")
+ (license license:public-domain))))
-(define-public cl-pngload
- (sbcl-package->cl-source-package sbcl-pngload))
+(define-public cl-db3
+ (sbcl-package->cl-source-package sbcl-db3))
-(define-public ecl-pngload
- (sbcl-package->ecl-package sbcl-pngload))
+(define-public ecl-db3
+ (sbcl-package->ecl-package sbcl-db3))
-(define-public sbcl-opticl
- (let ((commit "f6fc4dc5fa61ae3f2527b77e4bda99001ba37dcb")
- (revision "1"))
+(define-public sbcl-dbi
+ (let ((commit "738a74dd69adb2a7c21fa67e140d89c7df25b227")
+ (revision "2"))
(package
- (name "sbcl-opticl")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-dbi")
+ (version (git-version "0.9.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/slyrus/opticl")
+ (url "https://github.com/fukamachi/cl-dbi")
(commit commit)))
- (file-name (git-file-name "cl-opticl" version))
+ (file-name (git-file-name "cl-dbi" version))
(sha256
- (base32 "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"))))
+ (base32 "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
+ `(("alexandria" ,sbcl-alexandria)
+ ("rove" ,sbcl-rove)
+ ("trivial-types" ,sbcl-trivial-types)))
(inputs
- (list sbcl-alexandria
- sbcl-cl-jpeg
- sbcl-cl-tga
- sbcl-opticl-core
- sbcl-png-read
- sbcl-pngload
- sbcl-retrospectiff
- sbcl-skippy
- sbcl-zpng))
- (home-page "https://github.com/slyrus/opticl")
- (synopsis "Image processing library for Common Lisp")
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cl-mysql" ,sbcl-cl-mysql)
+ ("cl-sqlite" ,sbcl-cl-sqlite)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("postmodern" ,sbcl-postmodern)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("trivial-garbage" ,sbcl-trivial-garbage)))
+ (arguments
+ `(#:asd-systems '("dbi"
+ "dbd-mysql"
+ "dbd-postgres"
+ "dbd-sqlite3")))
+ (synopsis "Database independent interface for Common Lisp")
(description
- "Opticl is a Common Lisp library for representing, processing, loading,
-and saving 2-dimensional pixel-based images.")
- (license license:bsd-2))))
+ "@code{dbi} is a Common Lisp library providing a database independent
+interface for MySQL, PostgreSQL and SQLite.")
+ (home-page "https://github.com/fukamachi/cl-dbi")
+ (license license:llgpl))))
-(define-public cl-opticl
- (sbcl-package->cl-source-package sbcl-opticl))
+(define-public cl-dbi
+ (sbcl-package->cl-source-package sbcl-dbi))
-(define-public ecl-opticl
- (sbcl-package->ecl-package sbcl-opticl))
+(define-public ecl-dbi
+ (sbcl-package->ecl-package sbcl-dbi))
-(define-public sbcl-cl-dejavu
- (let ((commit "9d68ced4edee6f96fead42cb4835d0ff4a158373")
+(define-public sbcl-dbus
+ (let ((commit "24b452df3a45ca5dc95015500f34baad175c981a")
(revision "1"))
(package
- (name "sbcl-cl-dejavu")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-dbus")
+ (version (git-version "20190408" revision commit))
+ (home-page "https://github.com/death/dbus")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dkochmanski/cl-dejavu")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-dejavu" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1lbxiq21bxj8r11c58cqskgn8gnl2p8q1ydkhdsv7i7xnhv2y7r0"))))
+ (base32
+ "0fw2q866yddbf23nk9pxphm9gsasx35vjyss82xzvndnjmzlqfl5"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/dkochmanski/cl-dejavu")
- (synopsis "DejaVu fonts for Common Lisp")
- (description
- "This is a repackage of the original DejaVu Fonts with some convenience
-functions.")
- (license (list license:cc0
- (license:x11-style "http://dejavu-fonts.org/"))))))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-trivial-garbage
+ sbcl-babel
+ sbcl-iolib
+ sbcl-ieee-floats
+ sbcl-flexi-streams
+ sbcl-cl-xmlspam
+ sbcl-ironclad))
+ (synopsis "D-Bus client library for Common Lisp")
+ (description "This is a Common Lisp library that publishes D-Bus
+objects as well as send and notify other objects connected to a bus.")
+ (license license:bsd-2))))
-(define-public cl-dejavu
- (sbcl-package->cl-source-package sbcl-cl-dejavu))
+(define-public cl-dbus
+ (sbcl-package->cl-source-package sbcl-dbus))
-(define-public ecl-dejavu
- (sbcl-package->ecl-package sbcl-cl-dejavu))
+(define-public ecl-dbus
+ (sbcl-package->ecl-package sbcl-dbus))
-(define-public sbcl-mcclim
+(define-public sbcl-decimals
(package
- (name "sbcl-mcclim")
- (version "0.9.8")
+ (name "sbcl-decimals")
+ (version "2021")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/McCLIM/McCLIM")
- (commit (string-append version "-yule"))))
- (file-name (git-file-name "cl-mcclim" version))
+ (url "https://github.com/tlikonen/cl-decimals")
+ (commit version)))
+ (file-name (git-file-name "cl-decimals" version))
(sha256
- (base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"))))
+ (base32 "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam pkg-config))
- (inputs
- (list fontconfig
- freetype
- harfbuzz
- sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-base64
- sbcl-cl-dejavu
- sbcl-cl-freetype2
- sbcl-cl-pdf
- sbcl-cl-unicode
- sbcl-cl-vectors
- sbcl-cl-who
- sbcl-closer-mop
- sbcl-cluffer
- sbcl-clx
- sbcl-flexi-streams
- sbcl-flexichain
- sbcl-log4cl
- sbcl-lorem-ipsum
- sbcl-opticl
- sbcl-slime-swank
- sbcl-spatial-trees
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-zpb-ttf))
- (arguments
- '(#:asd-systems '("mcclim"
- "clim-examples"
- ;; clim-debugger is required by cleavir.
- "clim-debugger")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "Extensions/fontconfig/src/functions.lisp"
- (("libfontconfig\\.so")
- (search-input-file inputs "/lib/libfontconfig.so")))
- (substitute* "Extensions/harfbuzz/src/functions.lisp"
- (("libharfbuzz\\.so")
- (search-input-file inputs "/lib/libharfbuzz.so"))))))))
- (home-page "https://mcclim.common-lisp.dev/")
- (synopsis "Common Lisp GUI toolkit")
- (description
- "McCLIM is an implementation of the @emph{Common Lisp Interface Manager
-specification}, a toolkit for writing GUIs in Common Lisp.")
- (license license:lgpl2.1+)))
+ (home-page "https://github.com/tlikonen/cl-decimals")
+ (synopsis "Decimal number parser and formatting package for Common Lisp")
+ (description "This Common Lisp package offers functions for parsing and
+formatting decimal numbers. The package's main interface are the functions
+@code{parse-decimal-number} and @code{format-decimal-number}. The former is
+for parsing strings for decimal numbers and the latter for pretty-printing
+them as strings.")
+ (license license:cc0)))
-(define-public cl-mcclim
- (sbcl-package->cl-source-package sbcl-mcclim))
+(define-public cl-decimals
+ (sbcl-package->cl-source-package sbcl-decimals))
-(define-public ecl-mcclim
- (let ((pkg (sbcl-package->ecl-package sbcl-mcclim)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; Tests fail with "FUNCTION: Not a valid argument (R1
- ;; (GENERATE-REGION))." on ECL.
- ((#:tests? _ #f) #f))))))
+(define-public ecl-decimals
+ (sbcl-package->ecl-package sbcl-decimals))
-(define-public sbcl-cl-inflector
- (let ((commit "f1ab16919ccce3bd82a0042677d9616dde2034fe")
- (revision "1"))
+(define-public sbcl-deeds
+ ;; taged branch is outdated
+ (let ((revision "1")
+ (commit "f5df54eac79b58a34030e0eb8acf3952c788410d"))
(package
- (name "sbcl-cl-inflector")
- (version (git-version "0.2" revision commit))
+ (name "sbcl-deeds")
+ (version (git-version "1.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/AccelerationNet/cl-inflector")
+ (url "https://github.com/Shinmera/deeds")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"))))
+ (base32 "062cnb2dwli6pw3zvv46jfxyxdzcbzwsck5pa6nw03qf1j1hyg3k"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lisp-unit2))
(inputs
- (list sbcl-alexandria sbcl-cl-ppcre))
- (home-page "https://github.com/AccelerationNet/cl-inflector")
- (synopsis "Library to pluralize/singularize English and Portuguese words")
+ (list sbcl-bordeaux-threads sbcl-closer-mop sbcl-form-fiddle
+ sbcl-lambda-fiddle))
+ (home-page "https://github.com/Shinmera/deeds")
+ (synopsis "Extensible Event Delivery System")
(description
- "This is a common lisp library to easily pluralize and singularize
-English and Portuguese words. This is a port of the ruby ActiveSupport
-Inflector module.")
- (license license:expat))))
+ "@code{deeds} allows for efficient event delivery to multiple handlers
+with a complex event filtering system.")
+ (license license:zlib))))
-(define-public cl-inflector
- (sbcl-package->cl-source-package sbcl-cl-inflector))
+(define-public cl-deeds
+ (sbcl-package->cl-source-package sbcl-deeds))
-(define-public ecl-cl-inflector
- (sbcl-package->ecl-package sbcl-cl-inflector))
+(define-public ecl-deeds
+ (sbcl-package->ecl-package sbcl-deeds))
-(define-public sbcl-ixf
- (let ((commit "ed26f87e4127e4a9e3aac4ff1e60d1f39cca5183")
- (revision "1"))
+(define-public sbcl-definitions
+ (let ((commit "1f4bd7a634a2299aea19cefb5da8041bbb27f2ec"))
(package
- (name "sbcl-ixf")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-definitions")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dimitri/cl-ixf")
+ (url "https://github.com/Shinmera/definitions/")
(commit commit)))
- (file-name (git-file-name "cl-ixf" version))
+ (file-name (git-file-name "cl-definitions" version))
(sha256
- (base32 "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa"))))
+ (base32 "16dh9iy3v344xj4qllsp47007px3yx26fxxh9gh2cvs8dqgk3kch"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-cl-ppcre
- sbcl-ieee-floats
- sbcl-local-time
- sbcl-md5
- sbcl-split-sequence))
- (home-page "https://github.com/dimitri/cl-ixf")
- (synopsis "Parse IBM IXF file format")
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/definitions")
+ (synopsis "General definitions reflection library")
(description
- "This is a Common Lisp library to handle the IBM PC version of the IXF
-(Integration Exchange Format) file format.")
- (license license:public-domain))))
+ "This system implements a general definitions introspection library.
+It gives you the ability to retrieve definitions or bindings associated with
+designators such as symbols, packages, and names in general. For instance, it
+allows you to retrieve all function, type, variable, method, etc. definitions
+of a symbol.")
+ (license license:zlib))))
-(define-public ecl-ixf
- (sbcl-package->ecl-package sbcl-ixf))
+(define-public cl-definitions
+ (sbcl-package->cl-source-package sbcl-definitions))
-(define-public cl-ixf
- (sbcl-package->cl-source-package sbcl-ixf))
+(define-public ecl-definitions
+ (sbcl-package->ecl-package sbcl-definitions))
-(define-public sbcl-qbase64
+(define-public sbcl-definitions-systems
(package
- (name "sbcl-qbase64")
- (version "0.3.0")
+ (name "sbcl-definitions-systems")
+ (version "2.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/chaitanyagupta/qbase64")
- (commit version)))
- (file-name (git-file-name name version))
+ (url "https://github.com/Hexstream/definitions-systems")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-definitions-systems" version))
(sha256
- (base32 "1dir0s70ca3hagxv9x15zq4p4ajgl7jrcgqsza2n2y7iqbxh0dwi"))))
+ (base32 "009392mj0qdq4jy0dw5r41schnygwj286759yvyg7xja30a0psfq"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-metabang-bind sbcl-trivial-gray-streams))
(native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/chaitanyagupta/qbase64")
- (synopsis "Base64 encoder and decoder for Common Lisp")
- (description "@code{qbase64} provides a fast and flexible base64 encoder
-and decoder for Common Lisp.")
- (license license:bsd-3)))
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-canonicalized-initargs
+ sbcl-enhanced-defclass
+ sbcl-enhanced-find-class
+ sbcl-shared-preferences))
+ (home-page "https://www.hexstreamsoft.com/libraries/definitions-systems/")
+ (synopsis "Unified extensible way of processing named definitions")
+ (description
+ "@code{definitions-systems} provides a simple unified extensible way of
+processing named definitions.")
+ (license license:unlicense)))
-(define-public cl-qbase64
- (sbcl-package->cl-source-package sbcl-qbase64))
+(define-public cl-definitions-systems
+ (sbcl-package->cl-source-package sbcl-definitions-systems))
-(define-public ecl-qbase64
- (sbcl-package->ecl-package sbcl-qbase64))
+(define-public ecl-definitions-systems
+ (sbcl-package->ecl-package sbcl-definitions-systems))
-(define-public sbcl-lw-compat
- ;; No release since 2013.
- (let ((commit "aabfe28c6c1a4949f9d7b3cb30319367c9fd1c0d"))
+(define-public sbcl-deflate
+ (package
+ (name "sbcl-deflate")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pmai/Deflate")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1jpdjnxh6cw2d8hk70r2sxn92is52s9b855irvwkdd777fdciids"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/pmai/Deflate")
+ (synopsis "Native deflate decompression for Common Lisp")
+ (description
+ "This library is an implementation of Deflate (RFC 1951) decompression,
+with optional support for ZLIB-style (RFC 1950) and gzip-style (RFC 1952)
+wrappers of deflate streams. It currently does not handle compression.")
+ (license license:expat)))
+
+(define-public cl-deflate
+ (sbcl-package->cl-source-package sbcl-deflate))
+
+(define-public ecl-deflate
+ (sbcl-package->ecl-package sbcl-deflate))
+
+(define-public sbcl-defpackage-plus
+ (let ((revision "0")
+ (commit "5492e27e0bdb7b75fa5177ea4388519dc7a75f11"))
(package
- (name "sbcl-lw-compat")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-defpackage-plus")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pcostanza/lw-compat/")
+ (url "https://github.com/rpav/defpackage-plus")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "131rq5k2mlv9bfhmafiv6nfsivl4cxx13d9wr06v5jrqnckh4aav"))))
+ (base32 "0lzljvf343xb6mlh6lni2i27hpm5qd376522mk6hr2pa20vd6rdq"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pcostanza/lw-compat/")
- (synopsis "LispWorks utilities ported to other Common Lisp implementations")
- (description "This package contains a few utility functions from the
-LispWorks library that are used in software such as ContextL.")
- (license license:expat))))
+ (inputs
+ (list sbcl-alexandria))
+ (home-page "https://github.com/rpav/defpackage-plus")
+ (synopsis "Extensible @code{DEFPACKAGE} variant with version support")
+ (description
+ "@code{DEFPACKAGE-PLUS} is an extensible @code{DEFPACKAGE} variant with
+predictable cross-platform behavior and some utilities useful for versioning.")
+ (license license:bsd-2))))
-(define-public cl-lw-compat
- (sbcl-package->cl-source-package sbcl-lw-compat))
+(define-public cl-defpackage-plus
+ (sbcl-package->cl-source-package sbcl-defpackage-plus))
-(define-public ecl-lw-compat
- (sbcl-package->ecl-package sbcl-lw-compat))
+(define-public ecl-defpackage-plus
+ (sbcl-package->ecl-package sbcl-defpackage-plus))
-(define-public sbcl-contextl
- ;; No release since 2013.
- (let ((commit "f4fb3f59b0844788613fc4d1cc0d2b08df9488bb")
+(define-public sbcl-defstar
+ (let ((commit "132829dac9f84fa7202a0c5793aa6accb8d2662a"))
+ (package
+ (name "sbcl-defstar")
+ (version (git-version "1.0.0" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "http://bitbucket.org/eeeickythump/defstar/")
+ (commit commit)))
+ (file-name (git-file-name "cl-defstar" version))
+ (sha256
+ (base32 "0n6m3aqvdfnsrhlhqjcy72d1i55lbkjg13ij5c7vw003p1n78wxi"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "http://bitbucket.org/eeeickythump/defstar/")
+ (synopsis "Easy inline (return) type declarations for functions")
+ (description
+ "Defstar is a collection of Common Lisp macros that can be used in
+place of @code{defun}, @code{defmethod}, @code{defgeneric}, @code{defvar},
+@code{defparameter}, @code{flet}, @code{labels}, @code{let*} and
+@code{lambda}. Each macro has the same name as the form it replaces, with a
+star added at the end, e.g. @code{defun}. (the exception is the @code{let*}
+replacement, which is called @code{*let}).")
+ (license license:gpl3))))
+
+(define-public cl-defstar
+ (sbcl-package->cl-source-package sbcl-defstar))
+
+(define-public ecl-defstar
+ (sbcl-package->ecl-package sbcl-defstar))
+
+(define-public sbcl-deploy
+ (let ((commit "9b20e64fe924b9e31832304d87a3a72c383dc6d8")
(revision "2"))
(package
- (name "sbcl-contextl")
+ (name "sbcl-deploy")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pcostanza/contextl/")
+ (url "https://github.com/Shinmera/deploy")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "deploy" version))
(sha256
- (base32 "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"))))
+ (base32 "07pfkibaridihg8lbq2czwa4iqifqk24n6rx7bfnv7i49p1ppja1"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-cl-mpg123 sbcl-cl-out123))
(inputs
- (list sbcl-closer-mop sbcl-lw-compat))
- (home-page "https://github.com/pcostanza/contextl")
- (synopsis "Context-oriented programming for Common Lisp")
- (description "ContextL is a CLOS extension for Context-Oriented
-Programming (COP).
-
-Find overview of ContextL's features in an overview paper:
-@url{http://www.p-cos.net/documents/contextl-soa.pdf}. See also this general
-overview article about COP which also contains some ContextL examples:
-@url{http://www.jot.fm/issues/issue_2008_03/article4/}.")
- (license license:expat))))
+ (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-features))
+ (home-page "https://shinmera.github.io/deploy/")
+ (synopsis "Deployment tools for standalone Common Lisp application")
+ (description
+ "This is a system to help you easily and quickly deploy standalone
+common lisp applications as binaries. Specifically it is geared towards
+applications with foreign library dependencies that run some kind of GUI.")
+ (license license:artistic2.0))))
-(define-public cl-contextl
- (sbcl-package->cl-source-package sbcl-contextl))
+(define-public cl-deploy
+ (sbcl-package->cl-source-package sbcl-deploy))
-(define-public ecl-contextl
- (sbcl-package->ecl-package sbcl-contextl))
+(define-public ecl-deploy
+ (sbcl-package->ecl-package sbcl-deploy))
-(define-public sbcl-hu.dwim.common-lisp
- (let ((commit "90558195773383142a57a16687d5e7f4adea6418"))
+(define-public sbcl-depot
+ (let ((commit "73822d9f480cbad00971b45ee80117297a67fb53")
+ (revision "1"))
(package
- (name "sbcl-hu.dwim.common-lisp")
- (version "2021-01-27")
+ (name "sbcl-depot")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hu-dwim/hu.dwim.common-lisp/")
+ (url "https://github.com/Shinmera/depot/")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
- (base32 "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"))))
+ (base32 "1v42pirdwbxy8l8i9a2jmbpri8a62vh0r4vm25xwaak0y4gr71va"))
+ (file-name (git-file-name "depot" version))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.asdf))
- (home-page "http://dwim.hu/project/hu.dwim.common-lisp")
- (synopsis "Redefine some standard Common Lisp names")
- (description "This library is a redefinition of the standard Common Lisp
-package that includes a number of renames and shadows.")
- (license license:public-domain))))
+ (inputs
+ (list sbcl-atomics
+ sbcl-babel
+ sbcl-documentation-utils
+ sbcl-trivial-features
+ sbcl-trivial-gray-streams
+ sbcl-zippy))
+ ;; TODO: Some 6 tests fail, why? See https://github.com/Shinmera/depot/issues/2.
+ (arguments
+ '(#:asd-systems '("depot"
+ "depot-in-memory"
+ "depot-virtual"
+ "depot-zip")))
+ (synopsis "Protocol for transparent collections of files")
+ (description "This is a system presenting a protocol for \"file
+systems\": things that present a collection of \"files,\" which are things
+that have several attributes, and a central data payload. Most notably this
+includes the OS filesystem, but can also be used to address other
+filesystem-like things like archives, object stores, etc. in the same
+manner.")
+ (home-page "https://shinmera.github.io/depot/")
+ (license license:zlib))))
-(define-public cl-hu.dwim.common-lisp
- (sbcl-package->cl-source-package sbcl-hu.dwim.common-lisp))
+(define-public cl-depot
+ (sbcl-package->cl-source-package sbcl-depot))
-(define-public ecl-hu.dwim.common-lisp
- (sbcl-package->ecl-package sbcl-hu.dwim.common-lisp))
+(define-public ecl-depot
+ (sbcl-package->ecl-package sbcl-depot))
-(define-public sbcl-hu.dwim.common
- (package
- (name "sbcl-hu.dwim.common")
- (version "2015-07-09")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://beta.quicklisp.org/archive/hu.dwim.common/"
- version "/hu.dwim.common-"
- (string-replace-substring version "-" "")
- "-darcs.tgz"))
- (sha256
- (base32 "12l1rr6w9m99w0b5gc6hv58ainjfhbc588kz6vwshn4gqsxyzbhp"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.asdf))
- (inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-closer-mop
- sbcl-hu.dwim.common-lisp
- sbcl-iterate
- sbcl-metabang-bind))
- (home-page "https://dwim.hu/")
- (synopsis "Common Lisp library shared by other hu.dwim systems")
- (description "This package contains a support library for other
-hu.dwim systems.")
- (license license:public-domain)))
+(define-public sbcl-dexador
+ (let ((commit "051cbb784ea3015cef9731eb5a624f3122de84b5")
+ (revision "2"))
+ (package
+ (name "sbcl-dexador")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.9.15" revision commit))
+ (home-page "https://github.com/fukamachi/dexador")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name "cl-dexador" version))
+ (sha256
+ (base32 "1sggpi43la8dai102fmkzysh7760hvk6q68f0pkbb9187vz8nd3y"))))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-chipz
+ sbcl-chunga
+ sbcl-cl+ssl
+ sbcl-cl-base64
+ sbcl-cl-cookie
+ sbcl-cl-ppcre
+ sbcl-fast-http
+ sbcl-fast-io
+ sbcl-quri
+ sbcl-trivial-garbage
+ sbcl-trivial-gray-streams
+ sbcl-trivial-mimes
+ sbcl-usocket))
+ ;; These native-inputs are for tests only, which are disabled.
+ ;; Leave them commented since they add a lot to the closure size.
+ ;; (native-inputs
+ ;; (list sbcl-clack
+ ;; sbcl-lack
+ ;; sbcl-rove))
+ (arguments
+ ;; TODO: Circular dependency: tests depend on clack-test which depends on dexador.
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-permissions
+ (lambda _ (make-file-writable "t/data/test.gz") #t)))))
+ (synopsis "Yet another HTTP client for Common Lisp")
+ (description "Dexador is yet another HTTP client for Common Lisp with
+neat APIs and connection-pooling. It is meant to supersede Drakma.")
+ (license license:expat))))
-(define-public cl-hu.dwim.common
- (sbcl-package->cl-source-package sbcl-hu.dwim.common))
+(define-public cl-dexador
+ (package
+ (inherit (sbcl-package->cl-source-package sbcl-dexador))
+ (arguments
+ `(#:phases
+ ;; asdf-build-system/source has its own phases and does not inherit
+ ;; from asdf-build-system/sbcl phases.
+ (modify-phases %standard-phases/source
+ ;; Already done in SBCL package.
+ (delete 'reset-gzip-timestamps))))))
-(define-public ecl-hu.dwim.common
- (sbcl-package->ecl-package sbcl-hu.dwim.common))
+(define-public ecl-dexador
+ (sbcl-package->ecl-package sbcl-dexador))
-(define-public sbcl-hu.dwim.defclass-star
- (let ((commit "3086878a485074f9b2913c58267a9b764cd632fd"))
+(define-public sbcl-dfio
+ (let ((commit "5caf473acb9bc464839e87395724cbd941167915")
+ (revision "0"))
(package
- (name "sbcl-hu.dwim.defclass-star")
- ;; We used to set version from the date when it was a darcs repo, so we
- ;; keep the year so that package gets updated on previous installs.
- (version (git-version "2021" "2" commit))
+ (name "sbcl-dfio")
+ (version (git-version "1.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hu-dwim/hu.dwim.defclass-star")
+ (url "https://github.com/Lisp-Stat/dfio")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-dfio" version))
(sha256
- (base32 "19ipds9r71qymfdp4izg0l7zmvinp06adr8rdalhaq7v7mzpg83z"))))
+ (base32 "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-data-frame
+ sbcl-dexador
+ sbcl-fare-csv
+ sbcl-let-plus
+ sbcl-yason))
(native-inputs
- (list ;; These 2 inputs are only needed tests which are disabled, see below.
- ;; ("hu.dwim.common" ,sbcl-hu.dwim.common)
- ;; Need cl- package for the :hu.dwim.stefil+hu.dwim.def+swank system.
- ;; ("hu.dwim.stefil" ,cl-hu.dwim.stefil)
- sbcl-hu.dwim.asdf))
- (arguments
- `(;; Tests require a circular dependency: hu.dwim.stefil -> hu.dwim.def
- ;; -> hu.dwim.util -> hu.dwim.defclass-star.
- #:tests? #f))
- (home-page "https://github.com/hu-dwim/hu.dwim.defclass-star")
- (synopsis "Simplify definitions with defclass* and friends in Common Lisp")
- (description "@code{defclass-star} provides defclass* and defcondition* to
-simplify class and condition declarations. Features include:
-
-@itemize
-@item Automatically export all or select slots at compile time.
-@item Define the @code{:initarg} and @code{:accessor} automatically.
-@item Specify a name transformer for both the @code{:initarg} and
-@code{:accessor}, etc.
-@item Specify the @code{:initform} as second slot value.
-@end itemize
-
-See
-@url{https://common-lisp.net/project/defclass-star/configuration.lisp.html}
-for an example.")
- (license license:public-domain))))
+ (list sbcl-clunit2))
+ (home-page "https://lisp-stat.dev/docs/manuals/data-frame/")
+ (synopsis "Read data to and from data frames")
+ (description "This package provides tools for manipulating data
+in files using data frames.")
+ (license license:ms-pl))))
-(define-public cl-hu.dwim.defclass-star
- (sbcl-package->cl-source-package sbcl-hu.dwim.defclass-star))
+(define-public cl-dfio
+ (sbcl-package->cl-source-package sbcl-dfio))
-(define-public ecl-hu.dwim.defclass-star
- (sbcl-package->ecl-package sbcl-hu.dwim.defclass-star))
+;; This depends on ecl-data-frame, which doesn't work yet.
+;; (define-public ecl-dfio
+;; (sbcl-package->ecl-package sbcl-dfio))
-(define-public sbcl-livesupport
- (let ((commit "71e6e412df9f3759ad8378fabb203913d82e228a")
- (revision "1"))
+(define-public sbcl-diff
+ (let ((commit "9c84befa598d4e07c3d223242b5b3f83cd94f301")
+ (revision "1"))
(package
- (name "sbcl-livesupport")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-diff")
+ (version (git-version "0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cbaggers/livesupport")
+ (url "https://github.com/froydnj/diff")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-diff" version))
(sha256
- (base32 "1rvnl0mncylbx63608pz5llss7y92j7z3ydambk9mcnjg2mjaapg"))))
+ (base32 "1giafck8qfvb688kx5bn9g32rfc12jjywg8vdav36aqbd6lxf5z5"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/cbaggers/livesupport")
- (synopsis "Some helpers that make livecoding a little easier")
- (description "This package provides a macro commonly used in livecoding to
-enable continuing when errors are raised. Simply wrap around a chunk of code
-and it provides a restart called @code{continue} which ignores the error and
-carrys on from the end of the body.")
- (license license:bsd-2))))
+ (inputs
+ (list sbcl-cl-ppcre sbcl-trivial-gray-streams))
+ (home-page "https://github.com/froydnj/diff")
+ (synopsis "Common Lisp library for computing differences between files")
+ (description
+ "DIFF is a package for computing various forms of differences between
+blobs of data and then doing neat things with those differences. Currently diff
+knows how to compute three common forms of differences: \"unified\" format
+diffs, \"context\" format diffs, and \"vdelta\" format binary diffs.")
+ (license license:bsd-3))))
-(define-public cl-livesupport
- (sbcl-package->cl-source-package sbcl-livesupport))
+(define-public cl-diff
+ (sbcl-package->cl-source-package sbcl-diff))
-(define-public ecl-livesupport
- (sbcl-package->ecl-package sbcl-livesupport))
+(define-public ecl-diff
+ (sbcl-package->ecl-package sbcl-diff))
-(define-public sbcl-envy
- (let ((commit "26a7faadc981f2a047daa36f715a44faec5dd00c")
- (revision "2"))
+(define-public sbcl-dissect
+ (let ((commit "a70cabcd748cf7c041196efd711e2dcca2bbbb2c"))
(package
- (name "sbcl-envy")
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/fukamachi/envy")
+ (name "sbcl-dissect")
+ (version (git-version "1.0.0" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/envy")
+ (url "https://github.com/Shinmera/dissect")
(commit commit)))
- (file-name (git-file-name "cl-envy" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"))))
+ (base32
+ "1ym1zggwrj15l7y2mcz5l2gfk68prqxhdswffd9s5014pa6zyysr"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-osicat sbcl-prove))
- (arguments
- `(#:asd-systems '("envy-test" "envy")
- ;; FIXME: Tests fail with
- ;; Component ENVY-ASD::ENVY-TEST not found, required by #<SYSTEM "envy">
- ;; https://github.com/fukamachi/envy/issues/10
- #:tests? #f))
- (synopsis "Common Lisp configuration switcher inspired by Perl's Config::ENV")
- (description "Envy is a configuration manager for various applications.
-Envy uses an environment variable to determine a configuration to use. This
-can separate configuration system from an implementation.")
- (license license:bsd-2))))
+ (inputs
+ (list sbcl-cl-ppcre))
+ (home-page "https://shinmera.github.io/dissect/")
+ (synopsis
+ "Introspection library for the call stack and restarts")
+ (description
+ "Dissect is a small Common Lisp library for introspecting the call stack
+and active restarts.")
+ (license license:zlib))))
-(define-public cl-envy
- (sbcl-package->cl-source-package sbcl-envy))
+(define-public cl-dissect
+ (sbcl-package->cl-source-package sbcl-dissect))
-(define-public ecl-envy
- (sbcl-package->ecl-package sbcl-envy))
+(define-public ecl-dissect
+ (sbcl-package->ecl-package sbcl-dissect))
-(define-public sbcl-mito
- (let ((commit "47ba4865ca4bb2894b53703a49a299e973f8eb86")
- (revision "3"))
+(define-public sbcl-distributions
+ (let ((commit "ea72622073ee7e005dfdc621ce1e5a83b22bb39e")
+ (revision "0"))
(package
- (name "sbcl-mito")
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/fukamachi/mito")
+ (name "sbcl-distributions")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/Lisp-Stat/distributions")
(commit commit)))
- (file-name (git-file-name "mito" version))
+ (file-name (git-file-name "cl-distributions" version))
(sha256
- (base32 "0313nxlj1zqw6zyc23xpf85v0jk32sg0543ql8363jki0pmg7yhs"))))
+ (base32 "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
+ ;; https://github.com/Lisp-Stat/distributions/issues/1
+ (arguments (list #:tests? #f))
+ (native-inputs (list sbcl-fiveam))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-package-locks" ,sbcl-cl-package-locks)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("cl-reexport" ,sbcl-cl-reexport)
- ("closer-mop" ,sbcl-closer-mop)
- ("dbi" ,sbcl-dbi)
- ("dissect" ,sbcl-dissect)
- ("esrap" ,sbcl-esrap)
- ("local-time" ,sbcl-local-time)
- ("sxql" ,sbcl-sxql)
- ("trivia" ,sbcl-trivia)
- ("uuid" ,sbcl-uuid)))
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-non-functional-tests
- (lambda _
- (substitute* "mito-test.asd"
- (("\\(:test-file \"db/mysql\"\\)") "")
- (("\\(:test-file \"db/postgres\"\\)") "")
- (("\\(:test-file \"dao\"\\)") "")
- ;; TODO: migration/sqlite3 should work, re-enable once
- ;; upstream has fixed it:
- ;; https://github.com/fukamachi/mito/issues/70
- (("\\(:test-file \"migration/sqlite3\"\\)") "")
- (("\\(:test-file \"migration/mysql\"\\)") "")
- (("\\(:test-file \"migration/postgres\"\\)") "")
- (("\\(:test-file \"postgres-types\"\\)") "")
- (("\\(:test-file \"mixin\"\\)") ""))
- #t)))
- #:asd-systems '("mito-test" "mito")))
- (synopsis "ORM for Common Lisp with migrations and relationships support")
- (description "Mito is yet another object relational mapper, and it aims
-to be a successor of Integral.
-
-@itemize
-@item Support MySQL, PostgreSQL and SQLite3.
-@item Add id (serial/uuid primary key), created_at and updated_at by default
-like Ruby's ActiveRecord.
-@item Migrations.
-@item Database schema versioning.
-@end itemize\n")
- (license license:llgpl))))
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-array-operations
+ sbcl-cephes
+ sbcl-float-features
+ sbcl-let-plus
+ sbcl-numerical-utilities
+ sbcl-special-functions))
+ (home-page "https://lisp-stat.dev/docs/manuals/distributions/")
+ (synopsis "Statistical distributions for Common Lisp")
+ (description "The Distributions package provides a collection of
+probabilistic distributions and related functions")
+ (license license:ms-pl))))
-(define-public cl-mito
- (sbcl-package->cl-source-package sbcl-mito))
+(define-public cl-distributions
+ (sbcl-package->cl-source-package sbcl-distributions))
-(define-public ecl-mito
- (sbcl-package->ecl-package sbcl-mito))
+(define-public ecl-distributions
+ (sbcl-package->ecl-package sbcl-distributions))
-(define-public sbcl-kebab
- (let ((commit "e7f77644c4e46131e7b8039d191d35fe6211f31b")
- (revision "1"))
+(define-public sbcl-djula
+ (let ((commit "6f142594e0372437e64f610b796350ad89ba0be1")
+ (revision "2"))
(package
- (name "sbcl-kebab")
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/pocket7878/kebab")
+ (name "sbcl-djula")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/mmontone/djula")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-djula" version))
(sha256
- (base32 "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"))))
+ (base32 "0yyg61hrql1vrwllyd23vidiff28ridh0avxyvnqb89v060d1j83"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("alexandria" ,sbcl-alexandria)
- ("cl-interpol" ,sbcl-cl-interpol)
- ("split-sequence" ,sbcl-split-sequence)))
(native-inputs
- (list sbcl-prove))
- (arguments
- ;; Tests passes but the phase fails with
- ;; Component KEBAB-ASD::KEBAB-TEST not found, required by #<SYSTEM "kebab">.
- `(#:tests? #f))
- (synopsis "Common Lisp case converter")
- (description "This Common Lisp library converts strings, symbols and
-keywords between any of the following typographical cases: PascalCase,
-camelCase, snake_case, kebab-case (lisp-case).")
- (license license:llgpl))))
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-access
+ sbcl-alexandria
+ sbcl-anaphora
+ sbcl-babel
+ sbcl-cl-locale
+ sbcl-cl-ppcre
+ sbcl-cl-slice
+ sbcl-closer-mop
+ sbcl-gettext
+ sbcl-iterate
+ sbcl-local-time
+ sbcl-parser-combinators
+ sbcl-split-sequence
+ sbcl-trivial-backtrace))
+ (home-page "https://mmontone.github.io/djula/djula/")
+ (synopsis "Common Lisp port of the Django templating language")
+ (description
+ "This package provides a Common Lisp templating system based on Python
+Django with a syntax similar to Python Jinja2.")
+ (license license:expat))))
-(define-public cl-kebab
- (sbcl-package->cl-source-package sbcl-kebab))
+(define-public cl-djula
+ (sbcl-package->cl-source-package sbcl-djula))
-(define-public ecl-kebab
- (sbcl-package->ecl-package sbcl-kebab))
+(define-public ecl-djula
+ (sbcl-package->ecl-package sbcl-djula))
-(define-public sbcl-datafly
- (let ((commit "adece27fcbc4b5ea39ad1a105048b6b7166e3b0d")
- (revision "1"))
+(define-public sbcl-dns-client
+ (let ((commit "9f252e9c2bb61c57a6cd367e21ad366b0d3e87e0")
+ (revision "0"))
(package
- (name "sbcl-datafly")
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/fukamachi/datafly")
+ (name "sbcl-dns-client")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/Shinmera/dns-client")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-dns-client" version))
(sha256
- (base32 "16b78kzmglp2a4nxlxxl7rpf5zaibsgagn0p3c56fsxvx0c4hszv"))))
+ (base32 "1b6g2wvydwmv1k68favjyq4gfalfxfyl5i0hyh640wdaz2rfvi4n"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("iterate" ,sbcl-iterate)
- ("optima" ,sbcl-optima)
- ("trivial-types" ,sbcl-trivial-types)
- ("closer-mop" ,sbcl-closer-mop)
- ("cl-syntax" ,sbcl-cl-syntax)
- ("sxql" ,sbcl-sxql)
- ("dbi" ,sbcl-dbi)
- ("babel" ,sbcl-babel)
- ("local-time" ,sbcl-local-time)
- ("function-cache" ,sbcl-function-cache)
- ("jonathan" ,sbcl-jonathan)
- ("kebab" ,sbcl-kebab)
- ("log4cl" ,sbcl-log4cl)))
- (native-inputs
- (list sbcl-prove))
(arguments
- ;; TODO: Tests fail with
- ;; While evaluating the form starting at line 22, column 0
- ;; of #P"/tmp/guix-build-sbcl-datafly-0.1-1.adece27.drv-0/source/t/datafly.lisp":
- ;; Unhandled SQLITE:SQLITE-ERROR in thread #<SB-THREAD:THREAD "main thread" RUNNING
- ;; {10009F8083}>:
- ;; Error when binding parameter 1 to value NIL.
- ;; Code RANGE: column index out of range.
+ ;; No tests provided.
`(#:tests? #f))
- (synopsis "Lightweight database library for Common Lisp")
- (description "Datafly is a lightweight database library for Common Lisp.")
- (license license:bsd-3))))
+ (inputs
+ (list sbcl-documentation-utils sbcl-usocket))
+ (home-page "https://shinmera.github.io/dns-client/")
+ (synopsis "DNS protocol client for Common Lisp")
+ (description
+ "This package provides a pure-lisp implementation of a DNS client. It can be
+used to resolve hostnames, reverse-lookup IP addresses, and fetch other kinds of
+DNS records.")
+ (license license:zlib))))
-(define-public cl-datafly
- (sbcl-package->cl-source-package sbcl-datafly))
+(define-public cl-dns-client
+ (sbcl-package->cl-source-package sbcl-dns-client))
-(define-public ecl-datafly
- (sbcl-package->ecl-package sbcl-datafly))
+(define-public ecl-dns-client
+ (sbcl-package->ecl-package sbcl-dns-client))
(define-public sbcl-do-urlencode
(let ((commit "199846441dad5dfac5478b8dee4b4e20d107af6a")
@@ -16587,709 +13551,875 @@ decoding functions for URLs.")
(define-public ecl-do-urlencode
(sbcl-package->ecl-package sbcl-do-urlencode))
-(define-public sbcl-cl-emb
- (let ((commit "fd8652174d048d4525a81f38cdf42f4fa519f840")
- (revision "1"))
+(define-public sbcl-documentation-utils
+ (let ((commit "98630dd5f7e36ae057fa09da3523f42ccb5d1f55")
+ (revision "0"))
(package
- (name "sbcl-cl-emb")
- (version (git-version "0.4.3" revision commit))
- (home-page "https://common-lisp.net/project/cl-emb/")
+ (name "sbcl-documentation-utils")
+ (version (git-version "1.2.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/38a938c2/cl-emb")
- (commit commit)))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/documentation-utils")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1xcm31n7afh5316lwz8iqbjx7kn5lw0l11arg8mhdmkx42aj4gkk"))))
+ (base32
+ "098qhkqskmmrh4wix34mawf7p5c87yql28r51r75yjxj577k5idq"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre))
- (synopsis "Templating system for Common Lisp")
- (description "A mixture of features from eRuby and HTML::Template. You
-could name it \"Yet Another LSP\" (LispServer Pages) but it's a bit more than
-that and not limited to a certain server or text format.")
- (license license:llgpl))))
+ (list sbcl-trivial-indent))
+ (synopsis "Few simple tools to document Common Lisp libraries")
+ (description
+ "This is a small library to help you with managing the Common Lisp
+docstrings for your library.")
+ (home-page "https://shinmera.github.io/documentation-utils/")
+ (license license:zlib))))
-(define-public cl-emb
- (sbcl-package->cl-source-package sbcl-cl-emb))
+(define-public cl-documentation-utils
+ (sbcl-package->cl-source-package sbcl-documentation-utils))
-(define-public ecl-cl-emb
- (sbcl-package->ecl-package sbcl-cl-emb))
+(define-public ecl-documentation-utils
+ (sbcl-package->ecl-package sbcl-documentation-utils))
-(define-public sbcl-cl-project
- (let ((commit "151107014e534fc4666222d57fec2cc8549c8814")
- (revision "1"))
+(define-public sbcl-documentation-utils-extensions
+ (let ((commit "f67f8a05d583174662a594b79356b201c1d9d750"))
(package
- (name "sbcl-cl-project")
- (version (git-version "0.3.1" revision commit))
- (home-page "https://github.com/fukamachi/cl-project")
+ (name "sbcl-documentation-utils-extensions")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
+ (uri
+ (git-reference
+ (url "https://github.com/sirherrbatka/documentation-utils-extensions/")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1rmh6s1ncv8s2yrr14ja9wisgg745sq6xibqwb341ikdicxdp26y"))))
+ (base32
+ "0pn45c9rbxlnhn5nvhqz6kyv0nlirwxpg4j27niwdq80yxzsn51f"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("cl-emb" ,sbcl-cl-emb)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("local-time" ,sbcl-local-time)
- ("prove" ,sbcl-prove)))
- (arguments
- ;; Tests depend on caveman, which in turns depends on cl-project.
- '(#:tests? #f))
- (synopsis "Generate a skeleton for modern Common Lisp projects")
- (description "This library provides a modern project skeleton generator.
-In contract with other generators, CL-Project generates one package per file
-and encourages unit testing by generating a system for unit testing, so you
-can begin writing unit tests as soon as the project is generated.")
- (license license:llgpl))))
+ (list sbcl-documentation-utils))
+ (home-page "https://github.com/sirherrbatka/documentation-utils-extensions")
+ (synopsis "Set of extensions for documentation-utils")
+ (description
+ "Use @code{rich-formatter} to format documentation with sections @code{:syntax},
+@code{:arguments}, @code{:examples}, @code{:description}, @code{:returns},
+@code{:side-effects}, @code{:thread-safety}, @code{:affected-by},
+@code{:see-also} and @code{:notes}. Gather unformatted input by using
+@code{rich-aggregating-formatter} and @code{*DOCUMENTATION*} variable. Find
+gathered documentation with find-documentation function. Execute code stored
+in documentation with @code{execute-documentation}. See the examples in the
+@code{src/documentation.lisp} file. See the @code{documentation-utils} system
+for more information.")
+ (license license:expat))))
-(define-public cl-project
- (sbcl-package->cl-source-package sbcl-cl-project))
+(define-public cl-documentation-utils-extensions
+ (sbcl-package->cl-source-package sbcl-documentation-utils-extensions))
-(define-public ecl-cl-project
- (sbcl-package->ecl-package sbcl-cl-project))
+(define-public ecl-documentation-utils-extensions
+ (sbcl-package->ecl-package sbcl-documentation-utils-extensions))
-(define-public sbcl-caveman
- (let ((commit "35cd8bc6c322f9d88498405fc26168a1fb42ae1c") ; No release since 2012
- (revision "2"))
- (package
- (name "sbcl-caveman")
- (version (git-version "2.4.0" revision commit))
- (home-page "https://8arrow.org/caveman/")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/caveman/")
- (commit commit)))
- (file-name (git-file-name "cl-caveman" version))
- (sha256
- (base32 "1wvjm9m1fnapg0r9imhhcwgnhhqkkccnj3c0iw9yg1f72d7zhm2w"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("ningle" ,cl-ningle)
- ("lack" ,sbcl-lack)
- ("cl-project" ,sbcl-cl-project)
- ("dbi" ,sbcl-dbi)
- ("sxql" ,sbcl-sxql)
- ("cl-syntax" ,sbcl-cl-syntax)
- ("myway" ,sbcl-myway)
- ("quri" ,sbcl-quri)))
- (native-inputs
- `(("usocket" ,sbcl-usocket)
- ("dexador" ,sbcl-dexador)
- ("lack" ,sbcl-lack)
- ("trivial-types" ,sbcl-trivial-types)
- ("prove" ,sbcl-prove)))
- (arguments
- `(#:asd-systems '("caveman2"
- "caveman2-db"
- "caveman2-test"
- "caveman-middleware-dbimanager")
- ;; TODO: Tests fail with:
- ;; writing /gnu/store/...-sbcl-caveman-2.4.0-1.faa5f7e/share/common-lisp/sbcl-source/caveman2/v2/t/tmp/myapp573/tests/myapp573.lisp
- ;; While evaluating the form starting at line 38, column 0
- ;; of #P"/tmp/guix-build-sbcl-caveman-2.4.0-1.faa5f7e.drv-0/source/v2/t/caveman.lisp":
- ;; Unhandled ASDF/FIND-COMPONENT:MISSING-COMPONENT in thread #<SB-THREAD:THREAD "main thread" RUNNING
- ;; {10009F8083}>:
- ;; Component "myapp573" not found
- ;;
- ;; The above myapp573 component name is randomly generated by
- ;; gensym on each test run. `(asdf:load-system *app-name*)` tries
- ;; to load this component and fails.
- ;; TODO: Ask fukamachi how to go around this.
- #:tests? #f))
- (synopsis "Lightweight web application framework in Common Lisp")
- (description "Caveman is intended to be a collection of common parts for
-web applications. Caveman2 has three design goals:
+(define-public sbcl-doplus
+ (package
+ (name "sbcl-doplus")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alessiostalla/doplus")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-doplus" version))
+ (sha256
+ (base32 "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-parse-declarations sbcl-fset))
+ (arguments
+ '(#:asd-systems '("doplus" "doplus-fset")))
+ (synopsis "Iteration macro for Common Lisp")
+ (description "@code{doplus} is an iteration macro for Common Lisp.")
+ (home-page "https://github.com/alessiostalla/doplus")
+ (license license:gpl3+)))
-@itemize
-@item Be extensible.
-@item Be practical.
-@item Don't force anything.
-@end itemize\n")
- (license license:llgpl))))
+(define-public cl-doplus
+ (sbcl-package->cl-source-package sbcl-doplus))
-(define-public cl-caveman
+(define-public ecl-doplus
+ (sbcl-package->ecl-package sbcl-doplus))
+
+(define-public sbcl-drakma
(package
- (inherit
- (sbcl-package->cl-source-package sbcl-caveman))
- (propagated-inputs
- `(("ningle" ,cl-ningle)))))
+ (name "sbcl-drakma")
+ (version "2.0.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edicl/drakma")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-drakma" version))
+ (sha256
+ (base32
+ "1wf2zivfvhsh6zvd6wcwfd67bm8s8a1p2fismszc8xb819dqk9yl"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-puri
+ sbcl-cl-base64
+ sbcl-chunga
+ sbcl-flexi-streams
+ sbcl-cl-ppcre
+ sbcl-chipz
+ sbcl-usocket
+ sbcl-cl+ssl))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://edicl.github.io/drakma/")
+ (synopsis "HTTP client written in Common Lisp")
+ (description
+ "Drakma is a full-featured HTTP client implemented in Common Lisp. It
+knows how to handle HTTP/1.1 chunking, persistent connections, re-usable
+sockets, SSL, continuable uploads, file uploads, cookies, and more.")
+ (license license:bsd-2)))
-(define-public ecl-caveman
- (sbcl-package->ecl-package sbcl-caveman))
+(define-public cl-drakma
+ (sbcl-package->cl-source-package sbcl-drakma))
-(define-public sbcl-lambda-fiddle
- (let ((commit "d16bba55acf6065b412f64ab8fdff679a4a32b1e") ;; no tagged branch
- (revision "1"))
+(define-public ecl-drakma
+ (sbcl-package->ecl-package sbcl-drakma))
+
+(define-public sbcl-draw-cons-tree
+ (let ((commit "04334f5885a85cd7127db8dda3f6d6686a0438b1")
+ (revision "0"))
(package
- (name "sbcl-lambda-fiddle")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-draw-cons-tree")
+ (version (git-version "1.0" revision commit))
+ ;; https://github.com/quicklisp/quicklisp-projects/issues/2149
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/lambda-fiddle")
+ (url "https://github.com/phoe/draw-cons-tree")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-draw-cons-tree" version))
(sha256
- (base32 "1zarj1pqjqmk95kdx1axkgpwy2wq3canczk7f9z5hvaw5an6gand"))))
+ (base32 "1523bdkq8a5qn0qp9q7r16w47y6jb0hkfj7hbjfj6mg3xv001s3x"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/Shinmera/lambda-fiddle")
- (synopsis "Collection of utilities to process lambda-lists")
- (description "This collection of utilities is useful in contexts where
-you want a macro that uses lambda-lists in some fashion but need more precise
-processing.")
- (license license:zlib))))
+ (native-inputs
+ (list sbcl-fiveam sbcl-split-sequence))
+ (inputs
+ (list sbcl-alexandria))
+ (synopsis "Draw an ascii picture of a cons tree")
+ (description
+ "@code{cl-draw-cons-tree} draws a cons tree in ASCII-art style.")
+ (home-page "https://github.com/phoe/draw-cons-tree/")
+ (license license:unlicense))))
-(define-public cl-lambda-fiddle
- (sbcl-package->cl-source-package sbcl-lambda-fiddle))
+(define-public cl-draw-cons-tree
+ (sbcl-package->cl-source-package sbcl-draw-cons-tree))
-(define-public ecl-lambda-fiddle
- (sbcl-package->ecl-package sbcl-lambda-fiddle))
+(define-public ecl-draw-cons-tree
+ (sbcl-package->ecl-package sbcl-draw-cons-tree))
-(define-public sbcl-xmls
+(define-public sbcl-dufy
(package
- (name "sbcl-xmls")
- (version "3.2.0")
+ (name "sbcl-dufy")
+ (version "0.4.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpgoldman/xmls")
- (commit version)))
- (file-name (git-file-name "cl-xmls" version))
+ (url "https://github.com/privet-kitty/dufy")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "10406sgap9kdaip7blxldnv6kabiczd6890jgic4pacsrfx6jypk"))))
- (native-inputs
- (list sbcl-fiveam))
+ (base32 "15vrp1kayhjb5c1vc9x8wlm8rimk73vpa7yc101cf0gsg1fjazl6"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/rpgoldman/xmls")
- (synopsis "Non-validating XML parser for Common Lisp")
- (description "Xmls is a self-contained, easily embedded parser that
-recognizes a useful subset of the XML spec. It provides a simple mapping from
-XML to Lisp structures or s-expressions and back.")
- (license license:bsd-2)))
+ (inputs
+ (list sbcl-alexandria sbcl-cl-ppcre))
+ (native-inputs
+ (list sbcl-fiveam sbcl-cl-csv sbcl-parse-float sbcl-lispbuilder-sdl
+ sbcl-lparallel))
+ (home-page "https://github.com/privet-kitty/dufy")
+ (synopsis "Color library for Common Lisp")
+ (description
+ "Dufy is a library for exact color manipulation and conversion in various
+color spaces, which supports many color models.")
+ (license license:expat)))
-(define-public cl-xmls
- (sbcl-package->cl-source-package sbcl-xmls))
+(define-public cl-dufy
+ (sbcl-package->cl-source-package sbcl-dufy))
-(define-public ecl-xmls
- (sbcl-package->ecl-package sbcl-xmls))
+(define-public ecl-dufy
+ (sbcl-package->ecl-package sbcl-dufy))
-(define-public sbcl-geco
- (let ((commit "db13c9384491092975f46f6a837ccdc04681a93a")
- (revision "1"))
+(define-public sbcl-duologue
+ (let ((commit "ea1ada244a81da65f85b548823c9a6d7c9c145e1")
+ (revision "0"))
(package
- (name "sbcl-geco")
- (version (git-version "2.1.2" revision commit))
+ (name "sbcl-duologue")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/gpwwjr/GECO")
+ (url "https://github.com/mmontone/duologue")
(commit commit)))
- (file-name (git-file-name "cl-geco" version))
+ (file-name (git-file-name "cl-duologue" version))
(sha256
- (base32 "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17"))))
+ (base32 "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/gpwwjr/GECO")
- (synopsis "Genetic algorithm toolkit for Common Lisp")
+ (native-inputs (list sbcl-stefil))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-chronicity
+ sbcl-cl-ansi-text
+ sbcl-cl-fad
+ sbcl-clavier
+ sbcl-drakma))
+ (home-page "https://github.com/mmontone/duologue/")
+ (synopsis "High level user interaction library")
(description
- "GECO (Genetic Evolution through Combination of Objects) is an
-extensible, object-oriented framework for prototyping genetic algorithms in
-Common Lisp.")
- (license license:lgpl2.0+))))
+ "Duologue is high-level interaction library for Common Lisp. It features
+coloured printing via @code{cl-ansi-text} and readline completion.")
+ (license (list license:expat
+ ;; https://github.com/mmontone/duologue/issues/9
+ license:gpl3+)))))
-(define-public cl-geco
- (sbcl-package->cl-source-package sbcl-geco))
+(define-public cl-duologue
+ (sbcl-package->cl-source-package sbcl-duologue))
-(define-public ecl-geco
- (sbcl-package->ecl-package sbcl-geco))
+(define-public ecl-duologue
+ (sbcl-package->ecl-package sbcl-duologue))
-(define-public sbcl-html-entities
- (let ((commit "4af018048e891f41d77e7d680ed3aeb639e1eedb"))
+(define-public sbcl-dynamic-classes
+ (let ((commit "ebd7405603f67b16e8f2bc08ce8e2bcfcf439501")
+ (revision "0"))
(package
- (name "sbcl-html-entities")
- (version (git-version "0.02" "1" commit))
+ (name "sbcl-dynamic-classes")
+ (version (git-version "1.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/BnMcGn/html-entities/")
+ (url "https://github.com/hraban/dynamic-classes")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "dynamic-classes" version))
(sha256
- (base32 "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"))))
+ (base32 "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/BnMcGn/html-entities/")
- (synopsis "Encode and decode entities in HTML with Common Lisp")
- (description "Html-entities is a Common Lisp library that lets you
-encode and decode entities in HTML.")
+ `(("metatilities-base" ,sbcl-metatilities-base)))
+ (arguments
+ ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing
+ ;; test suites. lift-standard.config contains referances to deprecated
+ ;; functionality.
+ ;; See https://github.com/hraban/dynamic-classes/issues/2
+ `(#:tests? #f))
+ (home-page "https://common-lisp.net/project/dynamic-classes/")
+ (synopsis "Dynamic class definition for Common Lisp")
+ (description "Dynamic-Classes helps to ease the prototyping process by
+bringing dynamism to class definition.")
(license license:expat))))
-(define-public cl-html-entities
- (sbcl-package->cl-source-package sbcl-html-entities))
+(define-public cl-dynamic-classes
+ (sbcl-package->cl-source-package sbcl-dynamic-classes))
-(define-public ecl-html-entities
- (sbcl-package->ecl-package sbcl-html-entities))
+(define-public ecl-dynamic-classes
+ (sbcl-package->ecl-package sbcl-dynamic-classes))
-(define-public sbcl-quicksearch
- (let ((commit "fb02ecf7c876ec580ab18c7d2c8c7814c06af599"))
+(define-public sbcl-dynamic-mixins
+ (let ((commit "7cc09bee7d68527f37406671fabe910e8235b746"))
(package
- (name "sbcl-quicksearch")
- (version (git-version "0.01.04" "1" commit))
+ (name "sbcl-dynamic-mixins")
+ (version (git-version "0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tkych/quicksearch/")
+ (url "https://github.com/rpav/dynamic-mixins")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-dynamic-mixins" version))
(sha256
- (base32 "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps"))))
+ (base32 "00g3s509ysh2jp1qwsgb5bwl6qvhzcljwjz3z4mspbcak51484zj"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads
- sbcl-iterate
- sbcl-alexandria
- sbcl-anaphora
- sbcl-cl-ppcre
- sbcl-drakma
- sbcl-html-entities
- sbcl-yason
- sbcl-flexi-streams
- sbcl-do-urlencode))
- (home-page "https://github.com/tkych/quicksearch/")
- (synopsis "Search Engine Interface for Common Lisp packages")
- (description "Quicksearch is a search-engine-interface for Common Lisp.
-The goal of Quicksearch is to find the Common Lisp library quickly. For
-example, if you will find the library about json, just type @code{(qs:?
-'json)} at REPL.
-
-The function @code{quicksearch} searches for Common Lisp projects in
-Quicklisp, Cliki, GitHub and BitBucket, then outputs results in REPL. The
-function @code{?} is abbreviation wrapper for @code{quicksearch}.")
- (license license:expat))))
+ (list sbcl-alexandria
+ sbcl-closer-mop))
+ (home-page "https://github.com/rpav/dynamic-mixins")
+ (synopsis "Simple, dynamic class combination for CLOS")
+ (description
+ "Dynamic-mixins is for simple, dynamic class combination; it allows
+objects to be mixed and updated without manually defining many permutations.")
+ (license license:bsd-2))))
-(define-public cl-quicksearch
- (sbcl-package->cl-source-package sbcl-quicksearch))
+(define-public cl-dynamic-mixins
+ (sbcl-package->cl-source-package sbcl-dynamic-mixins))
-(define-public ecl-quicksearch
- (sbcl-package->ecl-package sbcl-quicksearch))
+(define-public ecl-dynamic-mixins
+ (sbcl-package->ecl-package sbcl-dynamic-mixins))
-(define-public sbcl-agutil
- (let ((commit "df188d754d472da9faa1601a48f1f37bb7b34d68"))
+(define-public sbcl-eager-future2
+ (let ((commit "54df8effd9d9eccac917509590286b5ac5f9cb30"))
(package
- (name "sbcl-agutil")
- (version (git-version "0.0.1" "1" commit))
+ (name "sbcl-eager-future2")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alex-gutev/agutil/")
+ (url "https://gitlab.common-lisp.net/vsedach/eager-future2.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1xpnyzksk2xld64b6lw6rw0gn5zxlb77jwna59sd4yl7kxhxlfpf"))))
+ (base32
+ "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-trivia))
- (home-page "https://github.com/alex-gutev/agutil/")
- (synopsis "Collection of Common Lisp utilities")
- (description "A collection of Common Lisp utility functions and macros
-mostly not found in other utility packages.")
- (license license:expat))))
+ (list sbcl-bordeaux-threads sbcl-trivial-garbage))
+ (synopsis "Futures promises synchronization mechanism for Common Lisp")
+ (description
+ "Eager Future2 is a Common Lisp library that provides composable
+concurrency primitives that unify parallel and lazy evaluation, are integrated
+with the Common Lisp condition system, and have automatic resource
+management.")
+ (home-page "https://gitlab.common-lisp.net/vsedach/eager-future2")
+ (license license:lgpl3+))))
-(define-public cl-agutil
- (sbcl-package->cl-source-package sbcl-agutil))
+(define-public cl-eager-future2
+ (sbcl-package->cl-source-package sbcl-eager-future2))
-(define-public ecl-agutil
- (sbcl-package->ecl-package sbcl-agutil))
+(define-public ecl-eager-future2
+ (sbcl-package->ecl-package sbcl-eager-future2))
-(define-public sbcl-custom-hash-table
- (let ((commit "f26983133940f5edf826ebbc8077acc04816ddfa"))
+(define-public sbcl-easy-routes
+ (let ((commit "7832f8bf3d07825b5eb967a2ef04da7c40c18248")
+ (revision "0"))
(package
- (name "sbcl-custom-hash-table")
- (version (git-version "0.3" "1" commit))
+ (name "sbcl-easy-routes")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/metawilm/cl-custom-hash-table")
+ (url "https://github.com/mmontone/easy-routes")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-easy-routes" version))
(sha256
- (base32 "1k4mvrpbqqds2fwjxp1bxmrfmr8ch4dkwhnkbw559knbqshvrlj5"))))
+ (base32 "1banw54kz2llzb9h5sm47ckfc9l348m7qncm0npsy0w837rxkyzx"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-systems '("cl-custom-hash-table")))
- (home-page "https://github.com/metawilm/cl-custom-hash-table")
- (synopsis "Custom hash tables for Common Lisp")
- (description "This library allows creation of hash tables with arbitrary
-@code{test}/@code{hash} functions, in addition to the @code{test} functions
-allowed by the standard (@code{EQ}, @code{EQL}, @code{EQUAL} and
-@code{EQUALP}), even in implementations that don't support this functionality
-directly.")
+ '(#:asd-systems '("easy-routes"
+ "easy-routes+djula"
+ "easy-routes+errors")))
+ (native-inputs
+ (list sbcl-stefil))
+ (inputs
+ (list sbcl-djula
+ sbcl-hunchentoot
+ sbcl-hunchentoot-errors
+ sbcl-routes))
+ (home-page "https://github.com/mmontone/easy-routes/")
+ (synopsis "Routes handling utility on top of Hunchentoot")
+ (description
+ "EASY-ROUTES is yet another routes handling system on top of
+Hunchentoot. It's just glue code for Restas routing subsystem (CL-ROUTES).
+
+It supports:
+@itemize
+@item dispatch based on HTTP method
+@item arguments extraction from the url path
+@item decorators
+@item URL generation from route names
+@end itemize
+
+This package provides EASY-ROUTES, EASY-ROUTES+DJULA and EASY-ROUTES+ERRORS
+systems.")
(license license:expat))))
-(define-public cl-custom-hash-table
- (sbcl-package->cl-source-package sbcl-custom-hash-table))
+(define-public cl-easy-routes
+ (sbcl-package->cl-source-package sbcl-easy-routes))
-(define-public ecl-custom-hash-table
- (sbcl-package->ecl-package sbcl-custom-hash-table))
+(define-public ecl-easy-routes
+ (sbcl-package->ecl-package sbcl-easy-routes))
-(define-public sbcl-concurrent-hash-tables
- (let ((commit "6ad539b8970ff94b1e1369b59065ed7d0660904c")
- (revision "1"))
+(define-public sbcl-eazy-gnuplot
+ (let ((commit "2eb900fe2557e6c066a9851c166e572c25bc0996")
+ (revision "0"))
(package
- (name "sbcl-concurrent-hash-tables")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-eazy-gnuplot")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/no-defun-allowed/concurrent-hash-tables")
+ (url "https://github.com/guicho271828/eazy-gnuplot")
(commit commit)))
- (file-name (git-file-name "cl-concurrent-hash-tables" version))
+ (file-name (git-file-name "cl-eazy-gnuplot" version))
(sha256
- (base32 "0wgbv3wl33rlfbywmjag0gk7igzfksmib30r8cbnd5n47ic09iip"))))
+ (base32 "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"))
+ (patches (search-patches "sbcl-eazy-gnuplot-skip-path-check.patch"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-atomics sbcl-bordeaux-threads))
- (home-page "https://github.com/no-defun-allowed/concurrent-hash-tables")
- (synopsis "Portability library for concurrent hash tables in Common Lisp")
- (description "@code{concurrent-hash-tables} is a Common Lisp portability
-library wrapping some implementations of concurrent hash tables which do not
-have to be entirely locked in their operation, including
-@code{42nd-at-threadmill}, @code{luckless}, and a fallback, segmented hash
-table.")
+ (list gnuplot
+ sbcl-alexandria
+ sbcl-iterate
+ sbcl-trivia))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "src/package.lisp"
+ (("\"gnuplot\"")
+ (string-append "\"" (which "gnuplot") "\""))))))))
+ (home-page "https://github.com/guicho271828/eazy-gnuplot")
+ (synopsis "Common Lisp interface to gnuplot")
+ (description
+ "Eazy-Gnuplot is a Common Lisp interface to gnuplot which eschews CFFI,
+CLOS and structures. It communicates with @command{gnuplot} via
+@code{*standard-output*}, and users can plot data by printing to that
+stream.")
+ (license license:llgpl))))
+
+(define-public cl-eazy-gnuplot
+ (sbcl-package->cl-source-package sbcl-eazy-gnuplot))
+
+(define-public ecl-eazy-gnuplot
+ (sbcl-package->ecl-package sbcl-eazy-gnuplot))
+
+(define-public sbcl-eclector
+ (let ((commit "d499b09142c7e39b4ef52e821fa767d5a8d606a0")
+ (revision "0"))
+ (package
+ (name "sbcl-eclector")
+ (version (git-version "0.9.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/s-expressionists/Eclector")
+ (commit commit)))
+ (file-name (git-file-name "cl-eclector" version))
+ (sha256
+ (base32 "1sg8wmdpm8pcjwk394way5vs2ya3r995lddmi51q9zfn9hmzb7gn"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-acclimation
+ sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-concrete-syntax-tree))
+ (arguments
+ '(#:asd-systems '("eclector"
+ "eclector-concrete-syntax-tree")))
+ (home-page "https://s-expressionists.github.io/Eclector/")
+ (synopsis "Highly customizable, portable Common Lisp reader")
+ (description
+ "Eclector is a portable Common Lisp reader that is highly customizable,
+can recover from errors and can return concrete syntax trees.
+
+In contrast to many other reader implementations, eclector can recover from
+most errors in the input supplied to it and continue reading. This capability
+is realized as a restart.
+
+It can also produce instances of the concrete syntax tree classes provided by
+the concrete syntax tree library.")
(license license:bsd-2))))
-(define-public cl-concurrent-hash-tables
- (sbcl-package->cl-source-package sbcl-concurrent-hash-tables))
+(define-public cl-eclector
+ (sbcl-package->cl-source-package sbcl-eclector))
-(define-public ecl-concurrent-hash-tables
- (sbcl-package->ecl-package sbcl-concurrent-hash-tables))
+(define-public ecl-eclector
+ (sbcl-package->ecl-package sbcl-eclector))
-(define-public sbcl-collectors
- (let ((commit "748f0a1613ce161edccad4cc815eccd7fc55aaf3")
- (revision "1"))
+(define-public sbcl-enchant
+ (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa"))
(package
- (name "sbcl-collectors")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-enchant")
+ (version (git-version "0.0.0" "1" commit))
+ (home-page "https://github.com/tlikonen/cl-enchant")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/AccelerationNet/collectors")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-collectors" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1mxcq7wq2jwbjd39afihpd46qkaidq76prgjbzpkv5749wf2spib"))))
+ (base32 "19yh5ihirzi1d8xqy1cjqipzd6ly3245cfxa5s9xx496rryz0s01"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-closer-mop sbcl-symbol-munger))
- (native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/AccelerationNet/collectors/")
- (synopsis "Common lisp library providing collector macros")
- (description "A small collection of common lisp macros to make
-collecting values easier.")
- (license license:bsd-3))))
+ `(("enchant" ,enchant)
+ ("cffi" ,sbcl-cffi)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "load-enchant.lisp"
+ (("libenchant")
+ (string-append
+ (assoc-ref inputs "enchant") "/lib/libenchant-2"))))))))
+ (synopsis "Common Lisp interface for the Enchant spell-checker library")
+ (description
+ "Enchant is a Common Lisp interface for the Enchant spell-checker
+library. The Enchant library is a generic spell-checker library which uses
+other spell-checkers transparently as back-end. The library supports the
+multiple checkers, including Aspell and Hunspell.")
+ (license license:public-domain))))
-(define-public cl-collectors
- (sbcl-package->cl-source-package sbcl-collectors))
+(define-public cl-enchant
+ (sbcl-package->cl-source-package sbcl-enchant))
-(define-public ecl-collectors
- (sbcl-package->ecl-package sbcl-collectors))
+(define-public ecl-enchant
+ (sbcl-package->ecl-package sbcl-enchant))
-(define-public sbcl-cl-environments
+(define-public sbcl-enhanced-boolean
(package
- (name "sbcl-cl-environments")
- (version "0.4")
+ (name "sbcl-enhanced-boolean")
+ (version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alex-gutev/cl-environments")
+ (url "https://github.com/Hexstream/enhanced-boolean")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-environments" version))
+ (file-name (git-file-name "cl-enhanced-boolean" version))
(sha256
- (base32 "10jxj043d2dw5vc0i0lz0lsa4qszn8him5is8jdhl4nsyfcazmky"))))
+ (base32 "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-anaphora sbcl-collectors sbcl-optima))
(native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/alex-gutev/cl-environments")
- (synopsis "Implements the Common Lisp standard environment access API")
+ (list sbcl-parachute))
+ (home-page "https://www.hexstreamsoft.com/libraries/enhanced-boolean/")
+ (synopsis "Convert generalized booleans to booleans")
(description
- "This library provides a uniform API, as specified in Common Lisp the
-Language 2, for accessing information about variable and function bindings
-from implementation-defined lexical environment objects. All major Common
-Lisp implementations are supported, even those which don't support the CLTL2
-environment access API.")
- (license license:expat)))
+ "This package provides a canonical way of converting generalized booleans
+to booleans.")
+ (license license:unlicense)))
-(define-public cl-environments
- (sbcl-package->cl-source-package sbcl-cl-environments))
+(define-public cl-enhanced-boolean
+ (sbcl-package->cl-source-package sbcl-enhanced-boolean))
-(define-public ecl-cl-environments
- (sbcl-package->ecl-package sbcl-cl-environments))
+(define-public ecl-enhanced-boolean
+ (sbcl-package->ecl-package sbcl-enhanced-boolean))
-(define-public sbcl-static-dispatch
+(define-public sbcl-enhanced-defclass
(package
- (name "sbcl-static-dispatch")
- (version "0.5.1")
+ (name "sbcl-enhanced-defclass")
+ (version "2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alex-gutev/static-dispatch")
+ (url "https://github.com/Hexstream/enhanced-defclass")
(commit (string-append "v" version))))
- (file-name (git-file-name "static-dispatch" version))
+ (file-name (git-file-name "cl-enhanced-defclass" version))
(sha256
- (base32 "1602vx6ybp0n8mbrrp6q8397fkkyvhrqpahc302pjdb57qildajz"))))
+ (base32 "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
+ (list sbcl-parachute))
(inputs
- (list sbcl-agutil
- sbcl-alexandria
- sbcl-anaphora
- sbcl-arrows
- sbcl-cl-environments
+ (list sbcl-cesdi
sbcl-closer-mop
- sbcl-iterate
- sbcl-optima))
- (home-page "https://github.com/alex-gutev/static-dispatch")
- (synopsis "Static generic function dispatch for Common Lisp")
- (description "Static dispatch is a Common Lisp library, inspired by
-@code{inlined-generic-function}, which allows standard Common Lisp generic
-function dispatch to be performed statically (at compile time) rather than
-dynamically (runtime). This is similar to what is known as \"overloading\" in
-languages such as C++ and Java.
+ sbcl-compatible-metaclasses
+ sbcl-enhanced-eval-when
+ sbcl-object-class
+ sbcl-shared-preferences
+ sbcl-simple-guess))
+ (home-page "https://www.hexstreamsoft.com/libraries/enhanced-defclass/")
+ (synopsis "Extensible implementation of defclass")
+ (description
+ "This package provides an extensible implementation of defclass that can
+accurately control the expansion according to the metaclass and automatically
+detect the suitable metaclass by analyzing the @code{defclass} form.")
+ (license license:unlicense)))
-The purpose of static dispatch is to provide an optimization in cases where
-the usual dynamic dispatch is too slow, and the dynamic features of generic
-functions, such as adding/removing methods at runtime are not required. An
-example of such a case is a generic equality comparison function. Currently
-generic functions are considered far too slow to implement generic arithmetic
-and comparison operations when used heavily in numeric code.")
- (license license:expat)))
+(define-public cl-enhanced-defclass
+ (sbcl-package->cl-source-package sbcl-enhanced-defclass))
-(define-public cl-static-dispatch
- (sbcl-package->cl-source-package sbcl-static-dispatch))
+(define-public ecl-enhanced-defclass
+ (sbcl-package->ecl-package sbcl-enhanced-defclass))
-(define-public ecl-static-dispatch
- (sbcl-package->ecl-package sbcl-static-dispatch))
+(define-public sbcl-enhanced-eval-when
+ (package
+ (name "sbcl-enhanced-eval-when")
+ (version "1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/enhanced-eval-when")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-enhanced-eval-when" version))
+ (sha256
+ (base32 "1ws1v297plcbqmcvckg7vqzzgnrwfyx5kd7281r1wrhc26998rx2"))))
+ (build-system asdf-build-system/sbcl)
+ ;; https://github.com/Hexstream/enhanced-eval-when/issues/1
+ (arguments
+ (list #:tests? #f)) ; There are no tests in version 1.0.
+ (home-page "https://www.hexstreamsoft.com/libraries/enhanced-eval-when/")
+ (synopsis "Shortcuts for EVAL-WHEN")
+ (description
+ "This package provides an enhanced @code{EVAL-WHEN} macro that supports a
+shorthand for @code{(eval-when (:compile-toplevel :load-toplevel :execute) ...)},
+addressing concerns about verbosity.")
+ (license license:unlicense)))
-(define-public sbcl-cl-form-types
+(define-public cl-enhanced-eval-when
+ (sbcl-package->cl-source-package sbcl-enhanced-eval-when))
+
+(define-public ecl-enhanced-eval-when
+ (sbcl-package->ecl-package sbcl-enhanced-eval-when))
+
+(define-public sbcl-enhanced-find-class
(package
- (name "sbcl-cl-form-types")
- (version "0.3.2")
+ (name "sbcl-enhanced-find-class")
+ (version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alex-gutev/cl-form-types")
+ (url "https://github.com/Hexstream/enhanced-find-class")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-enhanced-find-class" version))
(sha256
- (base32
- "0k4j657vfh4zblp9a7d3z15r82yyz4fzqh8vfn2s7ljsj1dmhp2n"))))
+ (base32 "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-agutil
- sbcl-anaphora
- sbcl-arrows
- sbcl-cl-environments
- sbcl-introspect-environment
- sbcl-optima))
(native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/alex-gutev/cl-form-types")
- (synopsis "Determine the types of Common Lisp forms")
- (description "This library provides functions for determining the value
-types of Common Lisp forms, based on type information contained in the
-environment.
-
-In order for this library to work the values types of variables and return
-types of functions have to be declared.
-
-Macros and symbol-macros are fully expanded and all special forms, except
-@code{CATCH}, are supported.")
- (license license:expat)))
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-closer-mop))
+ (home-page "https://www.hexstreamsoft.com/libraries/enhanced-find-class/")
+ (synopsis "Canonical way of converting class designators to classes")
+ (description
+ "This package provides a canonical way of converting class designators
+to classes.")
+ (license license:unlicense)))
-(define-public cl-form-types
- (sbcl-package->cl-source-package sbcl-cl-form-types))
+(define-public cl-enhanced-find-class
+ (sbcl-package->cl-source-package sbcl-enhanced-find-class))
-(define-public ecl-cl-form-types
- (let ((pkg (sbcl-package->ecl-package sbcl-cl-form-types)))
- (package
- (inherit pkg)
- (arguments
- ;; FIXME: Syntax error in declaration (TYPE T (FORM &KEY STRICT
- ;; EXPAND-COMPILER-MACROS (TEST (QUOTE FORM-TYPE=))))
- ;; An error occurred during initialization: COMPILE-FILE-ERROR while...
- ;; See <https://github.com/alex-gutev/cl-form-types/issues/22>.
- '(#:tests? #f)))))
+(define-public ecl-enhanced-find-class
+ (sbcl-package->ecl-package sbcl-enhanced-find-class))
-(define-public sbcl-generic-cl
+(define-public sbcl-enhanced-typep
(package
- (name "sbcl-generic-cl")
- (version "0.9")
+ (name "sbcl-enhanced-typep")
+ (version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alex-gutev/generic-cl")
+ (url "https://github.com/Hexstream/enhanced-typep")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-enhanced-typep" version))
(sha256
- (base32
- "1c40vqb49g0adfv17jxgk0ds1n6a2dph30cibq01sicmqdgrrbi8"))))
+ (base32 "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; Tests fail because SBCL head size is not high enough.
- ;; https://github.com/alex-gutev/generic-cl/issues/6
- `(#:tests? #f))
- (inputs
- (list sbcl-agutil
- sbcl-alexandria
- sbcl-anaphora
- sbcl-arrows
- sbcl-cl-form-types
- sbcl-custom-hash-table
- sbcl-static-dispatch
- sbcl-trivia))
(native-inputs
- (list sbcl-prove))
- (home-page "https://alex-gutev.github.io/generic-cl/")
- (synopsis "Generic function interface to standard Common Lisp functions")
- (description "@code{generic-cl} provides a generic function wrapper over
-various functions in the Common Lisp standard, such as equality predicates and
-sequence operations. The goal of this wrapper is to provide a standard
-interface to common operations, such as testing for the equality of two
-objects, which is extensible to user-defined types.")
- (license license:expat)))
+ (list sbcl-enhanced-boolean sbcl-parachute))
+ (home-page "https://www.hexstreamsoft.com/libraries/enhanced-typep/")
+ (synopsis "Enhanced version of typep")
+ (description
+ "This package provides an enhanced version of @code{typep} that is exactly
+like the one in the Lisp spec, except it can also accept a single type argument,
+in which case it returns the appropriate closure.")
+ (license license:unlicense)))
-(define-public cl-generic-cl
- (sbcl-package->cl-source-package sbcl-generic-cl))
+(define-public cl-enhanced-typep
+ (sbcl-package->cl-source-package sbcl-enhanced-typep))
-(define-public ecl-generic-cl
- (sbcl-package->ecl-package sbcl-generic-cl))
+(define-public ecl-enhanced-typep
+ (sbcl-package->ecl-package sbcl-enhanced-typep))
-(define-public sbcl-defpackage-plus
- (let ((revision "0")
- (commit "5492e27e0bdb7b75fa5177ea4388519dc7a75f11"))
+(define-public sbcl-envy
+ (let ((commit "26a7faadc981f2a047daa36f715a44faec5dd00c")
+ (revision "2"))
(package
- (name "sbcl-defpackage-plus")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-envy")
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/fukamachi/envy")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/defpackage-plus")
+ (url "https://github.com/fukamachi/envy")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-envy" version))
(sha256
- (base32 "0lzljvf343xb6mlh6lni2i27hpm5qd376522mk6hr2pa20vd6rdq"))))
+ (base32 "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/rpav/defpackage-plus")
- (synopsis "Extensible @code{DEFPACKAGE} variant with version support")
- (description
- "@code{DEFPACKAGE-PLUS} is an extensible @code{DEFPACKAGE} variant with
-predictable cross-platform behavior and some utilities useful for versioning.")
+ (native-inputs
+ (list sbcl-osicat sbcl-prove))
+ (arguments
+ `(#:asd-systems '("envy-test" "envy")
+ ;; FIXME: Tests fail with
+ ;; Component ENVY-ASD::ENVY-TEST not found, required by #<SYSTEM "envy">
+ ;; https://github.com/fukamachi/envy/issues/10
+ #:tests? #f))
+ (synopsis "Common Lisp configuration switcher inspired by Perl's Config::ENV")
+ (description "Envy is a configuration manager for various applications.
+Envy uses an environment variable to determine a configuration to use. This
+can separate configuration system from an implementation.")
(license license:bsd-2))))
-(define-public cl-defpackage-plus
- (sbcl-package->cl-source-package sbcl-defpackage-plus))
+(define-public cl-envy
+ (sbcl-package->cl-source-package sbcl-envy))
-(define-public ecl-defpackage-plus
- (sbcl-package->ecl-package sbcl-defpackage-plus))
+(define-public ecl-envy
+ (sbcl-package->ecl-package sbcl-envy))
-(define-public sbcl-deploy
- (let ((commit "9b20e64fe924b9e31832304d87a3a72c383dc6d8")
- (revision "2"))
+(define-public sbcl-eris
+ (package
+ (name "sbcl-eris")
+ (version "0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.ykonai.net/eris-cl")
+ (commit version)))
+ (file-name (git-file-name "cl-eris" version))
+ (sha256
+ (base32 "0qm74ld70aic39giamvix88500flv86047a82rx9gkjwaisf58rc"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-fiveam))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-function-cache
+ sbcl-ironclad
+ sbcl-mmap
+ sbcl-osicat
+ sbcl-serapeum
+ sbcl-trivial-gray-streams))
+ (home-page "https://git.ykonai.net/eris-cl/")
+ (synopsis "ERIS implementation for Common Lisp")
+ (description
+ "This is a Common Lisp implementation of the Encoding for Robust Immutable
+Storage specification (ERIS).")
+ (license license:lgpl3+)))
+
+(define-public cl-eris
+ (sbcl-package->cl-source-package sbcl-eris))
+
+(define-public sbcl-esrap
+ (let ((commit "d806138342a6b27327649fd5f36e0fe2e0966867")
+ (revision "4"))
(package
- (name "sbcl-deploy")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-esrap")
+ (version (git-version "0.18" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/deploy")
+ (url "https://github.com/scymtym/esrap")
(commit commit)))
- (file-name (git-file-name "deploy" version))
+ (file-name (git-file-name "cl-esrap" version))
(sha256
- (base32 "07pfkibaridihg8lbq2czwa4iqifqk24n6rx7bfnv7i49p1ppja1"))))
+ (base32 "0gs0mfamldhaihnlk0qxg2q4bl8bamq68dif9js9fkl8apg3iykl"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-cl-mpg123 sbcl-cl-out123))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-features))
- (home-page "https://shinmera.github.io/deploy/")
- (synopsis "Deployment tools for standalone Common Lisp application")
+ (list sbcl-alexandria sbcl-trivial-with-current-source-form))
+ (synopsis "Common Lisp packrat parser")
(description
- "This is a system to help you easily and quickly deploy standalone
-common lisp applications as binaries. Specifically it is geared towards
-applications with foreign library dependencies that run some kind of GUI.")
- (license license:artistic2.0))))
+ "This is a packrat parser for Common Lisp.
+In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports:
-(define-public cl-deploy
- (sbcl-package->cl-source-package sbcl-deploy))
+@itemize
+@item dynamic redefinition of nonterminals
+@item inline grammars
+@item semantic predicates
+@item introspective facilities (describing grammars, tracing, setting breaks)
+@item left-recursive grammars
+@item functions as terminals
+@item accurate, customizable parse error reports
+@end itemize\n")
+ (home-page "https://scymtym.github.io/esrap/")
+ (license license:expat))))
-(define-public ecl-deploy
- (sbcl-package->ecl-package sbcl-deploy))
+(define-public cl-esrap
+ (sbcl-package->cl-source-package sbcl-esrap))
-(define-public sbcl-deeds
- ;; taged branch is outdated
- (let ((revision "1")
- (commit "f5df54eac79b58a34030e0eb8acf3952c788410d"))
+(define-public ecl-esrap
+ (sbcl-package->ecl-package sbcl-esrap))
+
+(define-public sbcl-evaled-when
+ (let ((commit "c59f8ab20b846cac81d4be80d056a3d65676e8eb")
+ (revision "0"))
(package
- (name "sbcl-deeds")
- (version (git-version "1.1.1" revision commit))
+ (name "sbcl-evaled-when")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/deeds")
+ (url "https://github.com/Hexstream/evaled-when")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-evaled-when" version))
(sha256
- (base32 "062cnb2dwli6pw3zvv46jfxyxdzcbzwsck5pa6nw03qf1j1hyg3k"))))
+ (base32 "07g1a50aairvsj57issb18si5a9r3skpbk05nlixmlj0mva3gkl3"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-enhanced-boolean sbcl-parachute))
(inputs
- (list sbcl-bordeaux-threads sbcl-closer-mop sbcl-form-fiddle
- sbcl-lambda-fiddle))
- (home-page "https://github.com/Shinmera/deeds")
- (synopsis "Extensible Event Delivery System")
+ (list sbcl-trivial-cltl2))
+ (home-page "https://www.hexstreamsoft.com/libraries/evaled-when/")
+ (synopsis "Extract and replicate the compile-time side-effects of forms")
(description
- "@code{deeds} allows for efficient event delivery to multiple handlers
-with a complex event filtering system.")
- (license license:zlib))))
+ "This package provides a way of extracting and replicating the
+compile-time side-effects of forms.")
+ (license license:unlicense))))
-(define-public cl-deeds
- (sbcl-package->cl-source-package sbcl-deeds))
+(define-public cl-evaled-when
+ (sbcl-package->cl-source-package sbcl-evaled-when))
-(define-public ecl-deeds
- (sbcl-package->ecl-package sbcl-deeds))
+(define-public ecl-evaled-when
+ (sbcl-package->ecl-package sbcl-evaled-when))
+
+(define-public sbcl-event-emitter
+ (let ((commit "cb0e15f9de4c617cef3f5d5a22a41e28f9613d0b")
+ (revision "0"))
+ (package
+ (name "sbcl-event-emitter")
+ (version (git-version "0.0.1" revision commit))
+ (home-page "https://github.com/fukamachi/event-emitter")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/event-emitter")
+ (commit commit)))
+ (file-name (git-file-name "cl-event-emitter" version))
+ (sha256
+ (base32 "1i18xzfr6334db9dzj0lsl7wxw1r1l0ixvn883mjbyqw0czp21h6"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove))
+ (synopsis "Event mechanism for Common Lisp objects")
+ (description "Event Emitter provides an event mechanism like Node.js for
+Common Lisp objects. It is mostly ported from Node.js @code{events} module.")
+ (license license:bsd-2))))
+
+(define-public cl-event-emitter
+ (sbcl-package->cl-source-package sbcl-event-emitter))
+
+(define-public ecl-event-emitter
+ (sbcl-package->ecl-package sbcl-event-emitter))
(define-public sbcl-eventbus
(let ((commit "92c1fa3846ba0e3cc9e6d7605d765379c8658d84")
@@ -17313,733 +14443,751 @@ with a complex event filtering system.")
(description "This package provides a Common Lisp system implementing event bus.")
(license license:gpl3))))
-(define-public ecl-eventbus
- (sbcl-package->ecl-package sbcl-eventbus))
-
(define-public cl-eventbus
(sbcl-package->cl-source-package sbcl-eventbus))
-(define-public sbcl-make-hash
- ;; no tagged branch
- (let ((revision "1")
- (commit "ae0909cd8e697520a1085fac6f54ac2b448ebd21"))
+(define-public ecl-eventbus
+ (sbcl-package->ecl-package sbcl-eventbus))
+
+(define-public sbcl-exit-hooks
+ ;; No release.
+ (let ((commit "78050f4f55c138fcea86a9d720928782021b6012"))
(package
- (name "sbcl-make-hash")
- (version (git-version "1.0.2" revision commit))
+ (name "sbcl-exit-hooks")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/genovese/make-hash")
+ (url "https://github.com/ailisp/exit-hooks/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"))))
+ (base32 "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/genovese/make-hash")
- (synopsis "Common Lisp package for flexible hash table creation")
+ (home-page "https://github.com/ailisp/exit-hooks")
+ (synopsis "Call functions automatically when Common Lisp exits")
(description
- "This is a Common Lisp package for hash table creation with flexible,
-extensible initializers.")
- (license license:bsd-3))))
-
-(define-public cl-make-hash
- (sbcl-package->cl-source-package sbcl-make-hash))
-
-(define-public ecl-make-hash
- (sbcl-package->ecl-package sbcl-make-hash))
-
-(define-public sbcl-claw-support
- (package
- (name "sbcl-claw-support")
- (version "1.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/borodust/claw-support")
- (commit "9a15c8bed04585f45e6a461bcda1b475144dbd0b")))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1my2ka7h72ipx5n3b465g6kjkasrhsvhqlijwcg6dhlzs5yygl23"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/borodust/claw-support")
- (synopsis "Support routines for claw")
- (description
- "This package provides support routines for the @code{claw} Common Lisp
-package.")
- (license license:expat)))
+ "@code{exit-hooks} provides a portable way to automatically call some
+user-defined function when exiting Common Lisp (both @code{quit} from the REPL
+or a kill in a shell). Like @code{atexit} in C and Python or Java’s
+@code{Runtime.addShutdownHook()}. It currently supports SBCL, CCL, ECL, ABCL,
+Allegro CL, clisp and CMUCL. Before exit-hooks, there was no portable way of
+doing so and no staightforward way to use an exit hook on ABCL. It can be used
+for tasks like parmenantly save something when exiting Lisp.")
+ (license license:bsd-2))))
-(define-public cl-claw-support
- (sbcl-package->cl-source-package sbcl-claw-support))
+(define-public cl-exit-hooks
+ (sbcl-package->cl-source-package sbcl-exit-hooks))
-(define-public ecl-claw-support
- (sbcl-package->ecl-package sbcl-claw-support))
+(define-public ecl-exit-hooks
+ (sbcl-package->ecl-package sbcl-exit-hooks))
-(define-public sbcl-claw
- (let ((revision "0")
- (commit "3cd4a96fca95eb9e8d5d069426694669f81b2250"))
+(define-public sbcl-exponential-backoff
+ (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f"))
(package
- (name "sbcl-claw")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-exponential-backoff")
+ (version (git-version "0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/borodust/claw")
+ (url "https://github.com/death/exponential-backoff")
(commit commit)))
- (file-name (git-file-name "claw" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"))))
+ (base32
+ "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-cl-json
- sbcl-cl-ppcre
- sbcl-claw-support
- sbcl-local-time
- sbcl-trivial-features))
- (home-page "https://github.com/borodust/claw")
- (synopsis "Autowrapper for Common Lisp")
+ (home-page "https://github.com/death/exponential-backoff")
+ (synopsis "Exponential backoff algorithm in Common Lisp")
(description
- "This is a Common Lisp autowrapping facility for quickly creating clean
-and lean bindings to C libraries.")
- (license license:bsd-2))))
+ "An implementation of the exponential backoff algorithm in Common Lisp.
+Inspired by the implementation found in Chromium. Read the header file to
+learn about each of the parameters.")
+ (license license:expat))))
-(define-public cl-claw
- (sbcl-package->cl-source-package sbcl-claw))
+(define-public cl-exponential-backoff
+ (sbcl-package->cl-source-package sbcl-exponential-backoff))
-(define-public ecl-claw
- (sbcl-package->ecl-package sbcl-claw))
+(define-public ecl-exponential-backoff
+ (sbcl-package->ecl-package sbcl-exponential-backoff))
-(define-public sbcl-claw-utils
- (let ((revision "0")
- (commit "efe25016501973dc369f067a64c7d225802bc56f"))
+(define-public sbcl-external-program
+ (let ((commit "5888b8f1fd3953feeeacecbba4384ddda584a749")
+ (revision "1"))
(package
- (name "sbcl-claw-utils")
- ;; version is not specified
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-external-program")
+ (version (git-version "0.0.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/borodust/claw-utils")
+ (url "https://github.com/sellout/external-program")
(commit commit)))
- (file-name (git-file-name "claw-utils" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5"))))
+ (base32
+ "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-cffi sbcl-claw))
- (home-page "https://github.com/borodust/claw-utils")
- (synopsis "Utilities for easier autowrapping")
+ (list sbcl-trivial-features))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Common Lisp library for running external programs")
(description
- "This Common Lisp library contains various handy utilities to help
-autowrapping with @code{claw}.")
- (license license:expat))))
+ "EXTERNAL-PROGRAM enables running programs outside the Lisp
+process. It is an attempt to make the RUN-PROGRAM functionality in
+implementations like SBCL and CCL as portable as possible without
+sacrificing much in the way of power.")
+ (home-page "https://github.com/sellout/external-program")
+ (license license:llgpl))))
-(define-public cl-claw-utils
- (sbcl-package->cl-source-package sbcl-claw-utils))
+(define-public cl-external-program
+ (sbcl-package->cl-source-package sbcl-external-program))
-(define-public ecl-claw-utils
- (sbcl-package->ecl-package sbcl-claw-utils))
+(define-public ecl-external-program
+ (sbcl-package->ecl-package sbcl-external-program))
-(define-public sbcl-array-operations
- (let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b")
+(define-public sbcl-fakenil
+ (package
+ (name "sbcl-fakenil")
+ (version "1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/fakenil")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-fakenil" version))
+ (sha256
+ (base32 "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (home-page "https://www.hexstreamsoft.com/libraries/fakenil/")
+ (synopsis "Provides a canonical stand-in for NIL")
+ (description
+ "This package provides a canonical stand-in for NIL for contexts where
+NIL means no value.")
+ (license license:unlicense)))
+
+(define-public cl-fakenil
+ (sbcl-package->cl-source-package sbcl-fakenil))
+
+(define-public ecl-fakenil
+ (sbcl-package->ecl-package sbcl-fakenil))
+
+(define-public sbcl-fare-csv
+ (let ((commit "f877a238dcbf587a89359cccf2128919a94a348c")
(revision "0"))
(package
- (name "sbcl-array-operations")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-fare-csv")
+ (version (git-version "1.0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bendudson/array-operations")
+ (url "https://gitlab.common-lisp.net/frideau/fare-csv")
(commit commit)))
- (file-name (git-file-name "array-operations" version))
+ (file-name (git-file-name "cl-fare-csv" version))
(sha256
- (base32 "0ip49hhq32w80qsc7jmspyda5r2rsszvw0mk2r3341cld78sz9ya"))))
+ (base32 "0k3mf968w94m4yff1k2jh7xlnpsm016qs4448bvklacjrr72vk8x"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-alexandria sbcl-clunit2))
- (inputs
- (list sbcl-let-plus))
- (synopsis "Simple array operations library for Common Lisp")
+ (native-inputs (list sbcl-hu.dwim.stefil))
+ (home-page "https://gitlab.common-lisp.net/frideau/fare-csv/")
+ (synopsis "Robust CSV parser and printer")
(description
- "This library is a collection of functions and macros for manipulating
-Common Lisp arrays and performing numerical calculations with them.")
- (home-page "https://github.com/bendudson/array-operations")
+ "This package provides a robust CSV parser and printer that tries to
+follow the fine print of de facto standards. It can be configured to choose
+which standard exactly.")
(license license:expat))))
-(define-public cl-array-operations
- (sbcl-package->cl-source-package sbcl-array-operations))
+(define-public cl-fare-csv
+ (sbcl-package->cl-source-package sbcl-fare-csv))
-(define-public ecl-array-operations
- (sbcl-package->ecl-package sbcl-array-operations))
+(define-public ecl-fare-csv
+ (sbcl-package->ecl-package sbcl-fare-csv))
-(define-public sbcl-clml
- (let ((commit "95505b54c8c7b4b27f500c3be97fa5732f4b51a8")
- (revision "0"))
+(define-public sbcl-fare-mop
+ (let ((commit "538aa94590a0354f382eddd9238934763434af30")
+ (revision "1"))
(package
- (name "sbcl-clml")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-fare-mop")
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmaul/clml")
+ (url "https://github.com/fare/fare-mop")
(commit commit)))
- (file-name (git-file-name "clml" version))
+ (file-name (git-file-name "fare-mop" version))
(sha256
- (base32 "006pii59nmpc61n7p7h8ha5vjg6x0dya327i58z0rnvxs249h345"))
- ;; TODO: Remove this when the patch has been merged upstream.
- (patches (search-patches "sbcl-clml-fix-types.patch"))))
+ (base32
+ "0maxs8392953fhnaa6zwnm2mdbhxjxipp4g4rvypm06ixr6pyv1c"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-array-operations
- sbcl-cl-fad
- sbcl-cl-ppcre
- sbcl-drakma
- sbcl-introspect-environment
- sbcl-iterate
- sbcl-lparallel
- sbcl-parse-number
- sbcl-split-sequence
- sbcl-trivial-garbage))
- (synopsis "Common Lisp machine learning library")
+ (list sbcl-closer-mop sbcl-fare-utils))
+ (home-page "https://github.com/fare/fare-mop")
+ (synopsis "General purpose Common Lisp utilities using the MOP")
(description
- "CLML (Common Lisp Machine Learning) is a high performance and large
-scale statistical machine learning package")
- (home-page "https://mmaul.github.io/clml/")
- (license license:llgpl))))
+ "FARE-MOP is a small collection of utilities using the MetaObject
+Protocol. It notably contains a SIMPLE-PRINT-OBJECT method, and
+a SIMPLE-PRINT-OBJECT-MIXIN mixin that allow you to trivially define
+PRINT-OBJECT methods that print the interesting slots in your objects, which is
+great for REPL interaction and debugging.")
+ (license license:unlicense))))
-(define-public cl-clml
- (sbcl-package->cl-source-package sbcl-clml))
+(define-public ecl-fare-mop
+ (sbcl-package->ecl-package sbcl-fare-mop))
-(define-public sbcl-utm-ups
- (let ((commit "f1e6fd469871051470dfaabdf199afb75f2fa302")
- (revision "0"))
+(define-public cl-fare-mop
+ (sbcl-package->cl-source-package sbcl-fare-mop))
+
+(define-public sbcl-fare-quasiquote
+ (let ((commit "640d39a0451094071b3e093c97667b3947f43639")
+ (revision "1"))
(package
- (name "sbcl-utm-ups")
- (version (git-version "1.2" revision commit))
+ (name "sbcl-fare-quasiquote")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "1.0.1" revision commit))
+ (home-page "https://gitlab.common-lisp.net/frideau/fare-quasiquote")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/utm-ups")
+ (url (string-append "https://gitlab.common-lisp.net/frideau/"
+ "fare-quasiquote.git"))
(commit commit)))
- (file-name (git-file-name "cl-utm-ups" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "19nnnqagfg1c1vzwlqpp8mq2d0hrk8r6r07a46nvdyzmwbnmbwyr"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (synopsis
- "Convert coordinates between latitude/longitude and UTM or UPS")
- (description
- "This a Common Lisp library to convert geographic coordinates between
-latitude/longitude and UTM (Universal Transverse Mercator) or UPS (Universal
-Polar Stereographic).")
- (home-page "https://codeberg.org/glv/utm-ups")
- (license license:gpl3+))))
+ (base32 "1g6q11l50kgija9f55lzqpcwvaq0ljiw8v1j265hnyg6nahjwjvg"))))
+ (inputs
+ `(("fare-utils" ,sbcl-fare-utils)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("optima" ,sbcl-optima)))
+ (arguments
+ ;; XXX: Circular dependencies: Tests depend on subsystems,
+ ;; which depend on the main systems.
+ `(#:tests? #f
+ #:asd-systems '("fare-quasiquote"
+ "fare-quasiquote-extras")
+ #:phases
+ (modify-phases %standard-phases
+ ;; XXX: Require 1.0.0 version of fare-utils, and we package some
+ ;; commits after 1.0.0.5, but ASDF fails to read the
+ ;; "-REVISION-COMMIT" part generated by Guix.
+ (add-after 'unpack 'patch-requirement
+ (lambda _
+ (substitute* "fare-quasiquote.asd"
+ (("\\(:version \"fare-utils\" \"1.0.0\"\\)")
+ "\"fare-utils\""))
+ (substitute* "fare-quasiquote-optima.asd"
+ (("\\(:version \"optima\" \"1\\.0\"\\)")
+ "\"optima\""))
+ #t)))))
+ (synopsis "Pattern-matching friendly implementation of quasiquote")
+ (description "The main purpose of this n+2nd reimplementation of
+quasiquote is enable matching of quasiquoted patterns, using Optima or
+Trivia.")
+ (license license:expat))))
-(define-public cl-utm-ups
- (sbcl-package->cl-source-package sbcl-utm-ups))
+(define-public cl-fare-quasiquote
+ (sbcl-package->cl-source-package sbcl-fare-quasiquote))
-(define-public ecl-utm-ups
- (sbcl-package->ecl-package sbcl-utm-ups))
+(define-public ecl-fare-quasiquote
+ (sbcl-package->ecl-package sbcl-fare-quasiquote))
-(define-public sbcl-mgrs
- (let ((commit "c06f268f9ccb00dfc94c8a07771ce1ca82df26a2")
+(define-public sbcl-fare-utils
+ (let ((commit "66e9c6f1499140bc00ccc22febf2aa528cbb5724")
(revision "1"))
(package
- (name "sbcl-mgrs")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-fare-utils")
+ (version (git-version "1.0.0.5" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/glv/mgrs")
- (commit commit)))
- (file-name (git-file-name "cl-mgrs" version))
+ (uri
+ (git-reference
+ (url
+ "https://gitlab.common-lisp.net/frideau/fare-utils.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn"))))
+ (base32
+ "01wsr1aap3jdzhn4hrqjbhsjx6qci9dbd3gh4gayv1p49rbg8aqr"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-utm-ups))
- (synopsis
- "Convert coordinates between latitude/longitude and MGRS")
+ (list sbcl-hu.dwim.stefil))
+ (synopsis "Collection of utilities and data structures")
(description
- "This a Common Lisp library to convert geographic coordinates between
-latitude/longitude and MGRS.")
- (home-page "https://codeberg.org/glv/mgrs")
- (license license:gpl3+))))
+ "fare-utils is a small collection of utilities. It contains a lot of
+basic everyday functions and macros.")
+ (home-page "https://gitlab.common-lisp.net/frideau/fare-utils")
+ ;; MIT License
+ (license license:expat))))
-(define-public cl-mgrs
- (sbcl-package->cl-source-package sbcl-mgrs))
+(define-public cl-fare-utils
+ (sbcl-package->cl-source-package sbcl-fare-utils))
-(define-public ecl-mgrs
- (sbcl-package->ecl-package sbcl-mgrs))
+(define-public ecl-fare-utils
+ (sbcl-package->ecl-package sbcl-fare-utils))
-(define-public sbcl-maidenhead
- (let ((commit "4b9c38e4845dda56ae7fb0355c5260c9ade0ac12")
- (revision "1"))
+(define-public sbcl-fast-generic-functions
+ (let ((commit "9c307cd28af6453e45038ac3510de3123ff23743"))
(package
- (name "sbcl-maidenhead")
- (version (git-version "1.1" revision commit))
+ (name "sbcl-fast-generic-functions")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/maidenhead")
+ (url "https://github.com/marcoheisig/fast-generic-functions/")
(commit commit)))
- (file-name (git-file-name "cl-maidenhead" version))
+ (file-name (git-file-name "cl-fast-generic-functions" version))
(sha256
- (base32 "10pcx2ngyj6lkfbg1b58lzcm02xl1a3smnad5lvvw30pbalwcq46"))))
+ (base32 "16hf9bi2p5s77p3m3aqsihcd9iicqjhhxxpsarjv93c41qs54yad"))
+ (patches
+ (search-patches "sbcl-fast-generic-functions-fix-sbcl-2.4.patch"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (synopsis
- "Convert coordinates between latitude/longitude and Maidenhead")
+ (inputs
+ (list sbcl-closer-mop
+ sbcl-sealable-metaobjects
+ sbcl-trivial-macroexpand-all))
+ (arguments
+ ;; Tests fail: https://github.com/marcoheisig/fast-generic-functions/issues/10
+ '(#:tests? #f))
+ (home-page "https://github.com/marcoheisig/fast-generic-functions/")
+ (synopsis "Seal generic functions to boost performance")
(description
- "This a Common Lisp library to convert geographic coordinates between
-latitude/longitude and Maidenhead locator system.")
- (home-page "https://codeberg.org/glv/maidenhead")
- (license license:gpl3+))))
+ "This library introduces @emph{fast generic functions}, i.e. functions
+that behave just like regular generic functions, except that the can be sealed
+on certain domains. If the compiler can then statically detect that the
+arguments to a fast generic function fall within such a domain, it will
+perform a variety of optimizations.")
+ (license license:expat))))
-(define-public cl-maidenhead
- (sbcl-package->cl-source-package sbcl-maidenhead))
+(define-public cl-fast-generic-functions
+ (sbcl-package->cl-source-package sbcl-fast-generic-functions))
-(define-public ecl-maidenhead
- (sbcl-package->ecl-package sbcl-maidenhead))
+(define-public ecl-fast-generic-functions
+ (sbcl-package->ecl-package sbcl-fast-generic-functions))
-(define-public sbcl-olc
- (let ((commit "0269ed747477d967f7d9331964906b6a0f18a9c4")
- (revision "1"))
+(define-public sbcl-fast-http
+ (let ((commit "502a37715dcb8544cc8528b78143a942de662c5a")
+ (revision "2"))
(package
- (name "sbcl-olc")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-fast-http")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/olc")
+ (url "https://github.com/fukamachi/fast-http")
(commit commit)))
- (file-name (git-file-name "cl-olc" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz"))))
+ (base32 "0al2g7g219jjljsf7b23pbilpgacxy5as5gs2nqf76b5qni396mi"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("fast-http-test" "fast-http")))
(native-inputs
- (list sbcl-fiveam))
- (synopsis
- "Convert coordinates between latitude/longitude and Open Location Code")
+ `(("sbcl-prove" ,sbcl-prove)
+ ("cl-syntax" ,sbcl-cl-syntax)))
+ (inputs
+ (list sbcl-alexandria sbcl-proc-parse sbcl-xsubseq
+ sbcl-smart-buffer sbcl-cl-utilities))
+ (home-page "https://github.com/fukamachi/fast-http")
+ (synopsis "HTTP request/response parser for Common Lisp")
(description
- "This a Common Lisp library to convert geographic coordinates between
-latitude/longitude and Open Location Code.")
- (home-page "https://codeberg.org/glv/olc")
- (license license:gpl3+))))
+ "@code{fast-http} is a HTTP request/response protocol parser for Common
+Lisp.")
+ ;; Author specified the MIT license
+ (license license:expat))))
-(define-public cl-olc
- (sbcl-package->cl-source-package sbcl-olc))
+(define-public cl-fast-http
+ (sbcl-package->cl-source-package sbcl-fast-http))
-(define-public ecl-olc
- (sbcl-package->ecl-package sbcl-olc))
+(define-public ecl-fast-http
+ (sbcl-package->ecl-package sbcl-fast-http))
-(define-public sbcl-regex
- (let ((commit "fbc9a9f313b9edc1788f33d4b23a29151635ae22"))
+(define-public sbcl-fast-io
+ (let ((commit "a4c5ad600425842e8b6233b1fa22610ffcd874c3")
+ (revision "3"))
(package
- (name "sbcl-regex")
- (version (git-version "1" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/michaelw/regex/")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0wq5wlafrxv13wg28hg5b10sc48b88swsvznpy2zg7x37m4nmm6a"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/michaelw/regex/")
- (synopsis "Regular expression engine for Common Lisp")
- (description
- "This Common Lisp package provides a regular expression engine.")
- (license license:bsd-2))))
+ (name "sbcl-fast-io")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rpav/fast-io")
+ (commit commit)))
+ (file-name (git-file-name "cl-fast-io" version))
+ (sha256
+ (base32 "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam sbcl-checkl))
+ (inputs
+ (list sbcl-alexandria sbcl-trivial-gray-streams sbcl-static-vectors))
+ (home-page "https://github.com/rpav/fast-io")
+ (synopsis "Fast octet-vector/stream I/O for Common Lisp")
+ (description
+ "Fast-io is about improving performance to octet-vectors and octet
+streams (though primarily the former, while wrapping the latter).")
+ ;; Author specifies this as NewBSD which is an alias
+ (license license:bsd-3))))
-(define-public cl-regex
- (sbcl-package->cl-source-package sbcl-regex))
+(define-public cl-fast-io
+ (sbcl-package->cl-source-package sbcl-fast-io))
-(define-public ecl-regex
- (sbcl-package->ecl-package sbcl-regex))
+(define-public ecl-fast-io
+ (sbcl-package->ecl-package sbcl-fast-io))
-(define-public sbcl-clawk
- (let ((commit "3a91634df686417114044a98c063cbe76bfac7b6"))
+(define-public sbcl-fast-websocket
+ (let ((commit "baeeaddf1447015863d708f840ef9dfc5ff5b7a2")
+ (revision "1"))
(package
- (name "sbcl-clawk")
- (version (git-version "4" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sharplispers/clawk")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ph3xjqilvinvgr9q3w47zxqyz1sqnq030nlx7kgkkv8j3bnqk7a"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-regex))
- (home-page "https://github.com/sharplispers/clawk")
- (synopsis "Common Lisp AWK")
- (description
- "CLAWK is an AWK implementation embedded into Common Lisp.")
- (license license:bsd-2))))
+ (name "sbcl-fast-websocket")
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/fukamachi/fast-websocket")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/fast-websocket")
+ (commit commit)))
+ (file-name (git-file-name "cl-fast-websoclet" version))
+ (sha256
+ (base32 "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ ;; Test system must be loaded before, otherwise tests fail with:
+ ;; Component FAST-WEBSOCKET-ASD::FAST-WEBSOCKET-TEST not found,
+ ;; required by #<SYSTEM "fast-websocket">.
+ '(#:asd-systems '("fast-websocket-test"
+ "fast-websocket")))
+ (inputs
+ (list sbcl-fast-io
+ sbcl-babel
+ sbcl-alexandria))
+ (native-inputs
+ (list sbcl-prove
+ sbcl-trivial-utf-8))
+ (synopsis "WebSocket protocol parser for Common Lisp")
+ (description
+ "@code{fast-websocket} is an optimized low-level WebSocket protocol
+parser/composer.")
+ (license license:bsd-2))))
-(define-public cl-clawk
- (sbcl-package->cl-source-package sbcl-clawk))
+(define-public cl-fast-websocket
+ (sbcl-package->cl-source-package sbcl-fast-websocket))
-(define-public ecl-clawk
- (sbcl-package->ecl-package sbcl-clawk))
+(define-public ecl-fast-websocket
+ (sbcl-package->ecl-package sbcl-fast-websocket))
-(define-public sbcl-clamp
- (let ((commit "02b8f3953e5753cc61a719807c82f3795cd28fe1"))
+(define-public sbcl-feeder
+ ;; No release.
+ (let ((commit "b05f517d7729564575cc809e086c262646a94d34")
+ (revision "1"))
(package
- (name "sbcl-clamp")
- (version (git-version "0.3" "1" commit))
+ (name "sbcl-feeder")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/arclanguage/Clamp")
+ (url "https://github.com/Shinmera/feeder")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "feeder" version))
(sha256
- (base32 "0fdr9nqfmmpxm6hvjdxi1jkclya9xlnrw1yc3cn1m4ww3f50p31m"))))
+ (base32 "1dpbzhycg50snl3j01c8dh8gdvhfhz0hnfl54xy55a3wbr3m6rp7"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("iterate" ,sbcl-iterate)
- ("cl-syntax" ,sbcl-cl-syntax)))
- (native-inputs
- `(("cl-unit" ,sbcl-clunit)
- ("check-it" ,sbcl-check-it)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (substitute* "clamp.asd"
- (("\\(:file \"read\" :depends-on \\(\"aliases\"\\)\\)")
- "(:file \"read\" :depends-on (\"aliases\" \"base\"))"))
- #t)))))
- (home-page "https://github.com/arclanguage/Clamp")
- (synopsis "Common Lisp with Arc macros and procedures")
+ (list sbcl-documentation-utils sbcl-local-time sbcl-plump))
+ (home-page "https://shinmera.github.io/feeder/")
+ (synopsis "RSS, Atom and general feed parsing and generating")
(description
- "Clamp is an attempt to bring the powerful, but verbose, language of
-Common Lisp up to the terseness of Arc.
-
-There are two parts to Clamp. There is the core of Clamp, which implements
-the utilities of Arc that are easily converted from Arc to Common Lisp. The
-other part is the \"experimental\" part. It contains features of Arc that are
-not so easy to copy (ssyntax, argument destructuring, etc.).")
- (license license:artistic2.0))))
+ "Feeder is a syndication feed library. It presents a general protocol
+for representation of feed items, as well as a framework to translate these
+objects from and to external formats. It also implements the RSS 2.0 and Atom
+formats within this framework.")
+ (license license:zlib))))
-(define-public cl-clamp
- (sbcl-package->cl-source-package sbcl-clamp))
+(define-public cl-feeder
+ (sbcl-package->cl-source-package sbcl-feeder))
-(define-public ecl-clamp
- (sbcl-package->ecl-package sbcl-clamp))
+(define-public ecl-feeder
+ (sbcl-package->ecl-package sbcl-feeder))
-(define-public sbcl-trivial-shell
- (let ((commit "e02ec191b34b52deca5d1c4ee99d4fa13b8772e0"))
+(define-public sbcl-ffa
+ (let ((commit "b7012f51c4c37d1e759ff9cf78cea178504d8e07")
+ (revision "1"))
(package
- (name "sbcl-trivial-shell")
- (version (git-version "0.2.0" "1" commit))
+ (name "sbcl-ffa")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/trivial-shell")
+ (url "https://github.com/tpapp/ffa")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-ffa" version))
(sha256
- (base32 "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85"))))
+ (base32 "0l7kqcjp3sn1129hpwq6zhjqc0ydx9gc53z7k13i38x3z1asap7a"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda _
- (substitute* "dev/definitions.lisp"
- (("/bin/sh")
- (which "sh"))))))))
- (native-inputs
- (list sbcl-lift))
- (home-page "https://common-lisp.net/project/trivial-shell/")
- (synopsis "Common Lisp access to the shell")
+ (inputs
+ (list sbcl-cffi sbcl-cl-utilities sbcl-iterate sbcl-metabang-bind))
+ (synopsis "Foreign friendly arrays for Common Lisp")
(description
- "A simple Common-Lisp interface to the underlying operating system.
-It's independent of the implementation and operating system.")
- (license license:expat))))
+ "This package provides a macro that allows foreign functions to access
+the contents of the array at a given pointer, using the best available method
+given the Common Lisp implementation.")
+ (home-page "https://cliki.net/ffa")
+ (license license:llgpl))))
-(define-public cl-trivial-shell
- (sbcl-package->cl-source-package sbcl-trivial-shell))
+(define-public cl-ffa
+ (sbcl-package->cl-source-package sbcl-ffa))
-(define-public ecl-trivial-shell
- (sbcl-package->ecl-package sbcl-trivial-shell))
+(define-public ecl-ffa
+ (sbcl-package->ecl-package sbcl-ffa))
-(define-public sbcl-clesh
- (let ((commit "44e96e04a72e5bc006dc4eb02ce8962348dd4a11"))
+(define-public sbcl-file-attributes
+ (let ((commit "bbde396438f37d676de9775239115410bec4da2d"))
(package
- (name "sbcl-clesh")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-file-attributes")
+ (version (git-version "1.0.0" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Neronus/Clesh")
+ (url "https://github.com/Shinmera/file-attributes/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"))))
+ (base32 "0n8q818ry2shggjfhp8gjby8v5mla9pg97c5g19pcglpnwim7a74"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-trivial-shell sbcl-named-readtables))
- (home-page "https://github.com/Neronus/Clesh")
- (synopsis "Embed shell code in Common Lisp")
+ (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-features))
+ (home-page "https://shinmera.github.io/file-attributes/")
+ (synopsis "Access to common file attributes in Common Lisp")
(description
- "This is a very short and simple program, written in Common Lisp, that
-extends Common Lisp to embed shell code in a manner similar to Perl's
-backtick. It has been forked from SHELISP.")
- (license license:bsd-2))))
+ "This is a small OS portability library to retrieve and set file
+attributes not supported by the Common Lisp standard functions.")
+ (license license:zlib))))
-(define-public cl-clesh
- (sbcl-package->cl-source-package sbcl-clesh))
+(define-public ecl-file-attributes
+ (sbcl-package->ecl-package sbcl-file-attributes))
-(define-public ecl-clesh
- (sbcl-package->ecl-package sbcl-clesh))
+(define-public cl-file-attributes
+ (sbcl-package->cl-source-package sbcl-file-attributes))
-(define-public sbcl-trivial-channels
- (let ((commit "e2370118d8983ba69c0360a7695f8f2e2fd6a8a6")
- (revision "1"))
+(define-public sbcl-file-finder
+ (let ((commit "ec392d775eee33dbdea0d6532d20952438991f99")
+ (revision "0"))
(package
- (name "sbcl-trivial-channels")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-file-finder")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/trivial-channels")
+ (url "https://github.com/lisp-maintainers/file-finder")
(commit commit)))
- (file-name (git-file-name "trivial-channels" version))
+ (file-name (git-file-name "cl-file-finder" version))
(sha256
- (base32 "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj"))))
+ (base32 "1mpasi7n0ysggx0inxdbzlwavh08m0jxvv220ammvcyn3xybbchj"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads sbcl-trivial-timeout))
- (home-page "https://github.com/rpav/trivial-channels")
- (synopsis "Common Lisp simple thread-safe channels with timeout")
+ (list sbcl-alexandria
+ sbcl-cl-str
+ sbcl-file-attributes
+ sbcl-local-time
+ sbcl-named-readtables
+ sbcl-serapeum))
+ (synopsis "Enable rapid file search, inspection and manipulation")
(description
- "It's very basic implementation of channels and queue for Common Lisp.")
- (license license:bsd-2))))
+ "This library provides modern file handling for Common Lisp, which
+avoids many of the pitfalls of pathnames.")
+ (home-page "https://github.com/lisp-maintainers/file-finder")
+ (license license:gpl3+))))
-(define-public ecl-trivial-channels
- (sbcl-package->ecl-package sbcl-trivial-channels))
+(define-public ecl-file-finder
+ (sbcl-package->ecl-package sbcl-file-finder))
-(define-public cl-trivial-channels
- (sbcl-package->cl-source-package sbcl-trivial-channels))
+(define-public cl-file-finder
+ (sbcl-package->cl-source-package sbcl-file-finder))
-(define-public sbcl-trivial-download
- (let ((commit "d2472061d86b1cf3d32f388daacd4e32a13af699"))
+(define-public sbcl-file-notify
+ (let ((commit "f12dc2f2aae5fee13355cd93a8cae0c4c412b76d")
+ (revision "0"))
(package
- (name "sbcl-trivial-download")
- (version (git-version "0.3" "1" commit))
+ (name "sbcl-file-notify")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/trivial-download/")
+ (url "https://github.com/Shinmera/file-notify")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-file-notify" version))
(sha256
- (base32 "06f46zr3gp3wlm2kgxna24qd2gpr1v89x9fynh1x5vrw6c6hqjcv"))))
+ (base32 "0788d98rqm1krl8nbfh8qshvyf6g336i9bqrdhkx06cfvbh0wcny"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-drakma))
- (home-page "https://github.com/eudoxia0/trivial-download/")
- (synopsis "Download files from Common Lisp")
+ (list sbcl-cffi
+ sbcl-documentation-utils
+ sbcl-trivial-features))
+ (home-page "https://github.com/Shinmera/file-notify")
+ (synopsis "Get notifications for file accesses and changes")
(description
- "@code{trivial-download} allows you to download files from the Internet
-from Common Lisp. It provides a progress bar.")
- (license license:bsd-2))))
+ "File-Notify is a Common Lisp library for getting notifications for file
+accesses and changes.")
+ (license license:zlib))))
-(define-public cl-trivial-download
- (sbcl-package->cl-source-package sbcl-trivial-download))
+(define-public cl-file-notify
+ (sbcl-package->cl-source-package sbcl-file-notify))
-(define-public ecl-trivial-download
- (sbcl-package->ecl-package sbcl-trivial-download))
+(define-public ecl-file-notify
+ (sbcl-package->ecl-package sbcl-file-notify))
-(define-public sbcl-transmission
- (let ((commit "4bbf1d2761bfa5dfa79b7bc12c3238089b994d95"))
+(define-public sbcl-file-select
+ (let ((commit "ef25f6d7c78ed9e0b62119979af8c4b5b0f8c774")
+ (revision "1"))
(package
- (name "sbcl-transmission")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-file-select")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/libre-man/cl-transmission/")
+ (url "https://github.com/Shinmera/file-select")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "file-select" version))
(sha256
- (base32 "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"))))
+ (base32 "1qh32ymljw5c98zzbvjfq6jzwlzs4qxi8gh4gw8pixir6y1inxaa"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("cl-transmission")))
(inputs
- (list sbcl-cl-ppcre sbcl-jonathan sbcl-named-readtables sbcl-rutils
- sbcl-drakma))
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/libre-man/cl-transmission/")
- (synopsis "Common Lisp interface with Transmission using its RPC")
+ (list sbcl-cffi
+ sbcl-documentation-utils
+ sbcl-float-features))
+ (home-page "https://shinmera.github.io/file-select/")
+ (synopsis "Invoke the native file selection dialogs to open or save files")
(description
- "@code{cl-transmission} is a library to interface with the Transmission
-torrent client using its RPC (remote procedure call).")
- (license license:expat))))
-
-(define-public cl-transmission
- (sbcl-package->cl-source-package sbcl-transmission))
-
-(define-public ecl-transmission
- (sbcl-package->ecl-package sbcl-transmission))
-
-(define-public sbcl-gtwiwtg
- (package
- (name "sbcl-gtwiwtg")
- (version "0.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cbeo/gtwiwtg/")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0lkraw0dwh4is4x5sp5rjrw6f93m0gr9849abrbi12s25ws7jbw4"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-osicat sbcl-prove))
- (home-page "https://github.com/cbeo/gtwiwtg/")
- (synopsis "Naive generators for Common Lisp")
- (description
- "The GTWIWTG library (Generators The Way I Want Them Generated --
-technically not generators, but iterators) is meant to be small, explorable,
-and understandable.")
- (license license:gpl3)))
+ "This library allows you to open native file dialogs to open and save
+files. This is useful if you have an application that's primarily text based
+and would like a more convenient file selection utility, or if you are working
+with a UI toolkit that does not offer a way to access the native file dialogs
+directly.")
+ (license license:zlib))))
-(define-public cl-gtwiwtg
- (sbcl-package->cl-source-package sbcl-gtwiwtg))
+(define-public cl-file-select
+ (sbcl-package->cl-source-package sbcl-file-select))
-(define-public ecl-gtwiwtg
- (sbcl-package->ecl-package sbcl-gtwiwtg))
+(define-public ecl-file-select
+ (sbcl-package->ecl-package sbcl-file-select))
-(define-public sbcl-cl-progress-bar
- (let ((commit "9374170858663c8fe829e9fb5a29bd2cb48d95ae"))
+(define-public sbcl-filesystem-utils
+ (let ((commit "a07e8b61b89d4b46408fb9294d9b8130e8c8a02e")
+ (revision "2"))
(package
- (name "sbcl-cl-progress-bar")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-filesystem-utils")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sirherrbatka/cl-progress-bar/")
+ (url "https://github.com/Shinmera/filesystem-utils/")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-filesystem-utils" version))
(sha256
- (base32 "1ldb4qhmx431n3lsq71ynwb9ybazbfqd55icjbhi06mj52ngndir"))))
+ (base32 "1zv2i2gndnbs7hz3bgkkq1qfx604wbndpc7qqlqvg23fssn9w59f"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads sbcl-documentation-utils-extensions))
- (home-page "https://github.com/sirherrbatka/cl-progress-bar/")
- (synopsis "Progress bars in Common Lisp")
+ (list sbcl-documentation-utils
+ sbcl-pathname-utils
+ sbcl-trivial-features))
+ (home-page "https://shinmera.github.io/filesystem-utils/")
+ (synopsis "Collection of utilities for filesystem interaction")
(description
- "This library provides almost the same code as used inside Quicklisp
-for drawning progress bars")
- (license license:expat))))
+ "This is an extension library to @code{pathname-utils}, to allow
+dealing with common problems with filesystems, such as listing files, probing
+file types, determining default directories, etc.")
+ (license license:zlib))))
-(define-public cl-progress-bar
- (sbcl-package->cl-source-package sbcl-cl-progress-bar))
+(define-public cl-filesystem-utils
+ (sbcl-package->cl-source-package sbcl-filesystem-utils))
-(define-public ecl-cl-progress-bar
- (sbcl-package->ecl-package sbcl-cl-progress-bar))
+(define-public ecl-filesystem-utils
+ (sbcl-package->ecl-package sbcl-filesystem-utils))
-(define-public sbcl-repl-utilities
- (let ((commit "7e300df663177ea4581f4e7e9c601377881dd986"))
+(define-public sbcl-filtered-functions
+ (let ((commit "130f69e7b9e1051bf569ef63364b09a3873f0ced"))
(package
- (name "sbcl-repl-utilities")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-filtered-functions")
+ (version (git-version "0.2.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/m-n/repl-utilities/")
+ (url "https://github.com/pcostanza/filtered-functions")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-filtered-functions" version))
(sha256
- (base32 "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3"))))
+ (base32 "0m13k8pl0gfll8ss83c0z3gax7zrrw2i4s26451jfbka1xr4fgy9"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/m-n/repl-utilities")
- (synopsis "Ease common tasks at the Common Lisp REPL")
+ (inputs
+ (list sbcl-closer-mop))
+ (home-page "https://github.com/pcostanza/filtered-functions")
+ (synopsis "Extension of CLOS generic function invocation")
(description
- "@code{repl-utilities} is a set of utilities which ease life at the
-REPL. It includes three sorts of features: introspective procedures,
-miscellaneous utility functions, and, pulling them together, methods to
-conveniently keep these symbols and optionally additional symbols available in
-whichever package you switch to.")
- (license license:bsd-2))))
+ "Filtered functions provide an extension of CLOS generic function
+invocation that add a simple preprocessing step before the actual method
+dispatch is performed and thus enable the use of arbitrary predicates for
+selecting and applying methods. See
+@url{http://www.p-cos.net/documents/filtered-dispatch.pdf} for a paper that
+introduces and explains filtered functions in detail.")
+ (license license:expat))))
-(define-public cl-repl-utilities
- (sbcl-package->cl-source-package sbcl-repl-utilities))
+(define-public cl-filtered-functions
+ (sbcl-package->cl-source-package sbcl-filtered-functions))
-(define-public ecl-repl-utilities
- (sbcl-package->ecl-package sbcl-repl-utilities))
+(define-public ecl-filtered-functions
+ (sbcl-package->ecl-package sbcl-filtered-functions))
-(define-public sbcl-supertrace
- (let ((commit "66d22c3ff131ecd1c8048dfced1d62ed6024ecb0"))
+(define-public sbcl-find-port
+ (let ((commit "811727f88d7f000623bf92fdb0e64678a7112a28")
+ (revision "2"))
(package
- (name "sbcl-supertrace")
- (version (git-version "0.1.0" "1" commit))
+ (name "sbcl-find-port")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/eudoxia0/find-port")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/supertrace")
+ (url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0n369n6b7y1m49biccnnr7svymjdsk8sksrkqrn3mj21vgv7s7bg"))))
- (build-system asdf-build-system/sbcl)
+ (base32
+ "1fw6q7d2bxxb7fqk548ylq8mx4sz95yc0q5h0rwd0mnqjrbwbari"))))
(native-inputs
- (list sbcl-cffi sbcl-rove sbcl-cl-ppcre sbcl-bordeaux-threads))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cffi))
- (home-page "https://github.com/fukamachi/supertrace")
- (synopsis "Improved Common Lisp tracing for debugging and profiling")
- (description
- "Supertrace provides a superior Common Lisp @code{trace} functionality
-for debugging and profiling real world applications.")
- (license license:bsd-2))))
+ (list sbcl-usocket))
+ (synopsis "Find open ports programmatically in Common Lisp")
+ (description "This is a small Common Lisp library that finds an open
+port within a range.")
+ (license license:expat))))
-(define-public cl-supertrace
- (sbcl-package->cl-source-package sbcl-supertrace))
+(define-public cl-find-port
+ (sbcl-package->cl-source-package sbcl-find-port))
-(define-public ecl-supertrace
- (sbcl-package->ecl-package sbcl-supertrace))
+(define-public ecl-find-port
+ (sbcl-package->ecl-package sbcl-find-port))
(define-public sbcl-flamegraph
(let ((commit "1ed7a718eae88bd35e1649a1c716d46c59dc0a24")
@@ -18072,2791 +15220,3721 @@ the @command{flamegraph.pl} script, which is available in the Guix package
(define-public cl-flamegraph
(sbcl-package->cl-source-package sbcl-flamegraph))
-(define-public sbcl-trivial-benchmark
- (let ((commit "1fbc8d15f09ed8aa426bc73956b8b7c9b2668802")
- (revision "2"))
+(define-public sbcl-flare
+ (let ((commit "4f9f17a4fc5b368c2a1988b9a20288695b8d8c48")
+ (revision "1"))
(package
- (name "sbcl-trivial-benchmark")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-flare")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/trivial-benchmark/")
+ (url "https://github.com/Shinmera/flare")
(commit commit)))
- (file-name (git-file-name "cl-trivial-benchmark" version))
+ (file-name (git-file-name "flare" version))
(sha256
- (base32 "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88"))))
+ (base32 "00nm3sjngbflj2gd5q0xs2m136w4kix6krww23nk64pkkyq2fs86"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria))
- (home-page "https://shinmera.github.io/trivial-benchmark/")
- (synopsis "Easy to use benchmarking system for Common Lisp")
+ (list sbcl-3d-vectors
+ sbcl-array-utils
+ sbcl-documentation-utils
+ sbcl-for
+ sbcl-lambda-fiddle
+ sbcl-trivial-garbage))
+ (home-page "https://shinmera.github.io/flare/")
+ (synopsis "Easy particle systems with fine grained control")
(description
- "Trivial-Benchmark runs a block of code many times and outputs some
-statistical data for it. On SBCL this includes the data from @code{time}, for
-all other implementations just the @code{real-time} and @code{run-time} data.
-However, you can extend the system by adding your own @code{metrics} to it, or
-even by adding additional statistical @code{compute}ations.")
+ "FLARE is a library designed to allow quick and precise particle effect
+creations. It does not concern itself with displaying and only with the
+management and movement of particles. As such, it can easily be integrated into
+any existing or future application.")
(license license:zlib))))
-(define-public cl-trivial-benchmark
- (sbcl-package->cl-source-package sbcl-trivial-benchmark))
+(define-public cl-flare
+ (sbcl-package->cl-source-package sbcl-flare))
-(define-public ecl-trivial-benchmark
- (sbcl-package->ecl-package sbcl-trivial-benchmark))
+(define-public ecl-flare
+ (sbcl-package->ecl-package sbcl-flare))
-(define-public sbcl-the-cost-of-nothing
- (let ((commit "f364029fbbf37ae5786f2f9ddf6185dd204a7185")
+(define-public sbcl-flexi-streams
+ (let ((commit "74a1027311371a57258eba1bc908e050f5702277")
(revision "0"))
(package
- (name "sbcl-the-cost-of-nothing")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-flexi-streams")
+ (version (git-version "1.0.19" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/the-cost-of-nothing")
+ (url "https://github.com/edicl/flexi-streams")
(commit commit)))
- (file-name (git-file-name "cl-the-cost-of-nothing" version))
+ (file-name (git-file-name "cl-flexi-streams" version))
(sha256
- (base32 "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8"))))
+ (base32 "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; The test operation benchmarks the Common Lisp implementation; it
- ;; doesn't test the package.
- (list #:tests? #f))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files ".")))))))
(inputs
- (list sbcl-alexandria
- sbcl-closer-mop
- sbcl-local-time
- sbcl-trivial-garbage))
- (home-page "https://github.com/marcoheisig/the-cost-of-nothing")
- (synopsis "Measure the run time of Common Lisp code")
- (description
- "THE-COST-OF-NOTHING is a library for measuring the run time of Common
-Lisp code. It provides macros and functions for accurate benchmarking and
-lightweight monitoring. Furthermore, it provides predefined benchmarks to
-determine the cost of certain actions on a given platform and implementation.")
- (license license:expat))))
+ (list sbcl-trivial-gray-streams))
+ (synopsis "Implementation of virtual bivalent streams for Common Lisp")
+ (description "Flexi-streams is an implementation of \"virtual\" bivalent
+streams that can be layered atop real binary or bivalent streams and that can
+be used to read and write character data in various single- or multi-octet
+encodings which can be changed on the fly. It also supplies in-memory binary
+streams which are similar to string streams.")
+ (home-page "http://weitz.de/flexi-streams/")
+ (license license:bsd-3))))
-(define-public cl-the-cost-of-nothing
- (sbcl-package->cl-source-package sbcl-the-cost-of-nothing))
+(define-public cl-flexi-streams
+ (sbcl-package->cl-source-package sbcl-flexi-streams))
-(define-public ecl-the-cost-of-nothing
- (sbcl-package->ecl-package sbcl-the-cost-of-nothing))
+(define-public ecl-flexi-streams
+ (sbcl-package->ecl-package sbcl-flexi-streams))
-(define-public sbcl-atomichron
- (let ((commit "5b3578bbad8c37ab559e56924d98c373efe11de5")
- (revision "0"))
+(define-public sbcl-flexichain
+ ;; There are no releases.
+ (let ((commit "9af644a6323f303a936a391b956babcbfe7b0c67")
+ (revision "2"))
(package
- (name "sbcl-atomichron")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-flexichain")
+ (version (git-version "1.5.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/no-defun-allowed/atomichron")
+ (url "https://github.com/robert-strandh/Flexichain")
(commit commit)))
- (file-name (git-file-name "cl-atomichron" version))
+ (file-name (git-file-name "cl-flexichain" version))
(sha256
- (base32 "1fmmhb3pbv7j4d1cc02zv24bpd0kd2agfjjcj46w3gmv1bb0hva1"))))
+ (base32 "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-atomics sbcl-bordeaux-threads))
- (home-page "https://github.com/no-defun-allowed/atomichron")
- (synopsis "Atomic metering library for Common Lisp")
+ (list sbcl-trivial-garbage))
+ (home-page "https://github.com/robert-strandh/Flexichain.git")
+ (synopsis "Dynamically add elements to or remove them from sequences")
(description
- "@code{atomichron} is a Common Lisp library which implements a time
-meter which tracks how many times a form is evaluated, and how long evaluation
-takes. It uses atomic instructions so that meters will present correct
-results in the presence of multiple threads, while trying to minimize
-synchronization latency.")
- (license license:bsd-2))))
+ "This package provides an implementation of the flexichain protocol,
+allowing client code to dynamically add elements to, and delete elements from
+a sequence (or chain) of such elements.")
+ (license license:lgpl2.1+))))
-(define-public cl-atomichron
- (sbcl-package->cl-source-package sbcl-atomichron))
+(define-public ecl-flexichain
+ (sbcl-package->ecl-package sbcl-flexichain))
-(define-public ecl-atomichron
- (sbcl-package->ecl-package sbcl-atomichron))
+(define-public cl-flexichain
+ (sbcl-package->cl-source-package sbcl-flexichain))
-(define-public sbcl-glyphs
- (let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373"))
+(define-public sbcl-float-features
+ (let ((commit "c1f86aea91cfaa3aa59799162be23ef8a12b199d")
+ (revision "2"))
(package
- (name "sbcl-glyphs")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-float-features")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ahungry/glyphs/")
+ (url "https://github.com/Shinmera/float-features")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "float-features" version))
(sha256
- (base32 "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"))))
+ (base32 "0vqm9xhn2i4vbjrxnp4hr1l3lydjflhjykdz6cmqg2j48c5kh3g3"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-ppcre sbcl-parenscript sbcl-named-readtables))
- (home-page "https://github.com/ahungry/glyphs/")
- (synopsis "Reduce Common Lisp verbosity")
+ (synopsis "Common Lisp IEEE float portability library")
(description
- "This library is a little experiment in reducing verbosity in Common
-Lisp, inspired by BODOL (@url{https://github.com/bodil/BODOL}).")
- (license license:gpl3))))
-
-(define-public cl-glyphs
- (sbcl-package->cl-source-package sbcl-glyphs))
-
-(define-public ecl-glyphs
- (sbcl-package->ecl-package sbcl-glyphs))
+ "Portability library for IEEE float features that are not
+covered by the Common Lisp standard.")
+ (home-page "https://github.com/Shinmera/float-features")
+ (license license:zlib)
+ (inputs
+ `(("documentation-utils" ,sbcl-documentation-utils)))
+ (arguments
+ `(#:tests? #f)))))
-(define-public sbcl-zs3
- (package
- (name "sbcl-zs3")
- (version "1.3.3")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/xach/zs3")
- (commit (string-append "release-" version))))
- (file-name (git-file-name "zs3" version))
- (sha256
- (base32 "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-drakma
- sbcl-alexandria
- sbcl-cxml
- sbcl-ironclad
- sbcl-puri
- sbcl-cl-base64))
- (synopsis "Work with Amazon S3 and Amazon CloudFront from Common Lisp")
- (description "This is ZS3, a library for working with Amazon's Simple Storage
-Service (S3) and CloudFront service from Common Lisp.")
- (home-page "https://github.com/xach/zs3")
- (license license:bsd-2)))
+(define-public cl-float-features
+ (sbcl-package->cl-source-package sbcl-float-features))
-(define-public cl-zs3
- (sbcl-package->cl-source-package sbcl-zs3))
+(define-public ecl-float-features
+ (sbcl-package->ecl-package sbcl-float-features))
-(define-public ecl-zs3
- (sbcl-package->ecl-package sbcl-zs3))
+(define-public sbcl-flow
+ (let ((commit "6d925af009cdfe033650d7048197a5e6ee937d15")
+ (revision "1"))
+ (package
+ (name "sbcl-flow")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/flow")
+ (commit commit)))
+ (file-name (git-file-name "flow" version))
+ (sha256
+ (base32 "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp"))))
+ (build-system asdf-build-system/sbcl)
+ ;; FIXME: (Sharlatan-20210527T203118+0100): FLOW-VISUALIZER requires
+ ;; COMMONQT which is not packed yet and required tweaks with QT. Remove
+ ;; this when it's ready.
+ (inputs
+ `(("closer-mop" ,sbcl-closer-mop)
+ ("documentation-utils" ,sbcl-documentation-utils)))
+ (home-page "https://shinmera.github.io/flow/")
+ (synopsis "Tools for the representation of graphs and flowcharts")
+ (description
+ "FLOW is a flowchart graph library. Unlike other graphing libraries,
+this one focuses on nodes in a graph having distinct @code{ports} through which
+connections to other nodes are formed. This helps in many concrete scenarios
+where it is important to distinguish not only which nodes are connected, but
+also how they are connected to each other.
-(define-public sbcl-simple-neural-network
- (package
- (name "sbcl-simple-neural-network")
- (version "3.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/glv/simple-neural-network")
- (commit (string-append "v" version))))
- (file-name (git-file-name "simple-neural-network" version))
- (sha256
- (base32 "1jj1c90fr5clwka0jv32hv6xp1bkdlpa6x5jh19an13rhx8ll4zr"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- `(("chipz" ,sbcl-chipz)
- ("fiveam" ,sbcl-fiveam)))
- (inputs
- `(("cl-store" ,sbcl-cl-store)
- ("lparallel" ,sbcl-lparallel)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'check 'remove-test-data
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each delete-file (find-files out "\\.gz$"))))))))
- (synopsis "Simple neural network in Common Lisp")
- (description
- "@code{simple-neural-network} is a Common Lisp library for creating,
-training and using basic neural networks. The networks created by this
-library are feedforward neural networks trained using backpropagation.")
- (home-page "https://codeberg.org/glv/simple-neural-network")
- (license license:gpl3+)))
+Particularly, a lot of data flow and exchange problems can be reduced to such
+a @code{flowchart}. For example, an audio processing library may present its
+pipeline as a flowchart of segments that communicate with each other through
+audio sample buffers. Flow gives a convenient view onto this kind of problem,
+and even allows the generic visualisation of graphs in this format.")
+ (license license:zlib))))
-(define-public cl-simple-neural-network
- (sbcl-package->cl-source-package sbcl-simple-neural-network))
+(define-public cl-flow
+ (sbcl-package->cl-source-package sbcl-flow))
-(define-public ecl-simple-neural-network
- (sbcl-package->ecl-package sbcl-simple-neural-network))
+(define-public ecl-flow
+ (sbcl-package->ecl-package sbcl-flow))
-(define-public sbcl-zstd
- (let ((commit "134f058eee11512cf772a8d5b64364acf56a10b8")
+(define-public sbcl-flute
+ (let ((commit "90ebcd6e82f637f49b6de7d625ccc51ec4c92900")
(revision "1"))
(package
- (name "sbcl-zstd")
- (version (git-version "2.0" revision commit))
+ (name "sbcl-flute")
+ (version (git-version "0.2-dev" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/glv/cl-zstd")
+ (url "https://github.com/ailisp/flute")
(commit commit)))
- (file-name (git-file-name "cl-zstd" version))
+ (file-name (git-file-name "cl-flute" version))
(sha256
- (base32 "1iqpi5v6fdm6xxc9l8zhk6kcgl8hgxiwk1ki2yx2j3j4kfvqv8j9"))))
+ (base32 "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-assoc-utils sbcl-let-over-lambda))
(native-inputs
(list sbcl-fiveam))
- (inputs
- (list sbcl-cffi
- sbcl-cl-octet-streams
- (list zstd "lib")))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/libzstd.lisp"
- (("libzstd\\.so")
- (search-input-file inputs "/lib/libzstd.so"))))))))
- (synopsis "Common Lisp library for Zstandard (de)compression")
+ (home-page "https://github.com/ailisp/flute")
+ (synopsis "HTML5 generation library in Common Lisp")
(description
- "This Common Lisp library provides functions for Zstandard
-compression/decompression using bindings to the libzstd C library.")
- (home-page "https://codeberg.org/glv/cl-zstd")
- (license license:gpl3+))))
+ "Flute is an easily composable HTML5 generation library in Common
+Lisp.")
+ (license license:expat))))
-(define-public cl-zstd
- (sbcl-package->cl-source-package sbcl-zstd))
+(define-public cl-flute
+ (sbcl-package->cl-source-package sbcl-flute))
-(define-public ecl-zstd
- (sbcl-package->ecl-package sbcl-zstd))
+(define-public ecl-flute
+ (sbcl-package->ecl-package sbcl-flute))
-(define-public sbcl-agnostic-lizard
- (let ((commit "fe1a1d7d80c8b56163754e0e5b3653fd750ad298")
- (revision "2"))
+(define-public sbcl-fn
+ (let ((commit "8d8587d03a7b5e26b306fc90018e385d9e5acc2c")
+ (revision "1"))
(package
- (name "sbcl-agnostic-lizard")
+ (name "sbcl-fn")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
+ (url "https://github.com/cbaggers/fn")
(commit commit)))
- (file-name (git-file-name "cl-agnostic-lizard" version))
+ (file-name (git-file-name "fn" version))
(sha256
- (base32 "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"))))
+ (base32 "0yyp9z6iwx476whz0n1rpjznjyqqhlylhzwpgg5xx92lxmskl752"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Almost correct portable code walker for Common Lisp")
+ (inputs
+ (list sbcl-named-readtables))
+ (home-page "https://github.com/cbaggers/fn")
+ (synopsis "Macros for lambda brevity")
(description
- "Agnostic Lizard is a portable implementation of a code walker and in
-particular of the macroexpand-all function (and macro) that makes a best
-effort to be correct while not expecting much beyond what the Common Lisp
-standard requires.
-
-It aims to be implementation-agnostic and to climb the syntax trees.")
- (home-page "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
- (license license:gpl3+))))
+ "This is a Common Lisp library providing lambda shorthand macros aiming
+to be used in cases where the word @emph{lambda} and the arguments are longer
+than the body of the lambda.")
+ (license license:public-domain))))
-(define-public cl-agnostic-lizard
- (sbcl-package->cl-source-package sbcl-agnostic-lizard))
+(define-public cl-fn
+ (sbcl-package->cl-source-package sbcl-fn))
-(define-public ecl-agnostic-lizard
- (sbcl-package->ecl-package sbcl-agnostic-lizard))
+(define-public ecl-fn
+ (sbcl-package->ecl-package sbcl-fn))
-(define-public sbcl-dynamic-classes
- (let ((commit "ebd7405603f67b16e8f2bc08ce8e2bcfcf439501")
- (revision "0"))
+(define-public sbcl-fof
+ (let ((commit "522879e7da110ecf2e841998b197b34062c54b29")
+ (revision "1"))
(package
- (name "sbcl-dynamic-classes")
- (version (git-version "1.0.2" revision commit))
+ (name "sbcl-fof")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/dynamic-classes")
+ (url "https://gitlab.com/ambrevar/fof")
(commit commit)))
- (file-name (git-file-name "dynamic-classes" version))
+ (file-name (git-file-name "cl-fof" version))
(sha256
- (base32 "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a"))))
+ (base32 "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("metatilities-base" ,sbcl-metatilities-base)))
(arguments
- ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing
- ;; test suites. lift-standard.config contains referances to deprecated
- ;; functionality.
- ;; See https://github.com/hraban/dynamic-classes/issues/2
- `(#:tests? #f))
- (home-page "https://common-lisp.net/project/dynamic-classes/")
- (synopsis "Dynamic class definition for Common Lisp")
- (description "Dynamic-Classes helps to ease the prototyping process by
-bringing dynamism to class definition.")
- (license license:expat))))
+ `(#:asd-systems '("fof" "fof/mf")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "ffprobe.lisp"
+ (("\\(defvar \\*ffprobe-command\\* \"ffprobe\"\\)")
+ (format #f "(defvar *ffprobe-command* \"~a/bin/ffprobe\")"
+ (assoc-ref inputs "ffmpeg")))))))))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-json
+ sbcl-cl-str
+ sbcl-hu.dwim.defclass-star
+ sbcl-local-time
+ sbcl-magicffi
+ sbcl-named-readtables
+ sbcl-osicat
+ sbcl-serapeum
+ sbcl-trivia
+ sbcl-trivial-package-local-nicknames
+ ;; Non-CL deps:
+ ffmpeg))
+ (home-page "https://gitlab.com/ambrevar/fof")
+ (synopsis "File object finder library for Common Lisp")
+ (description
+ "This library enable rapid file search, inspection and manipulation
+straight from the REPL.
+It aims at replacing Unix tools such as @code{find} or @code{du}.
+It also offers a replacement to the @code{pathname} Common Lisp API.
+Slot writers which commit changes to disk, e.g. permissions, modification
+time, etc.")
+ (license license:gpl3+))))
-(define-public ecl-dynamic-classes
- (sbcl-package->ecl-package sbcl-dynamic-classes))
+(define-public cl-fof
+ (sbcl-package->cl-source-package sbcl-fof))
-(define-public cl-dynamic-classes
- (sbcl-package->cl-source-package sbcl-dynamic-classes))
+(define-public ecl-fof
+ (sbcl-package->ecl-package sbcl-fof))
-(define-public sbcl-cl-markdown
- ;; The latest changes with fixes are not released yet, see
- ;; https://github.com/hraban/cl-markdown/issues/9
- (let ((commit "3788802199228b49d0e06c3feb80c1c22af05cfc")
- (revision "0"))
+(define-public sbcl-font-discovery
+ (let ((commit "5101ca79151055f3ec9839aae73b8af42b884528")
+ (revision "1"))
(package
- (name "sbcl-cl-markdown")
- (version (git-version "0.10.6" revision commit))
+ (name "sbcl-font-discovery")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/cl-markdown")
+ (url "https://github.com/Shinmera/font-discovery")
(commit commit)))
- (file-name (git-file-name "cl-markdown" version))
+ (file-name (git-file-name "font-discovery" version))
(sha256
- (base32 "1algqwmafipyf194cx9wfhg0pdx1ppx6s444p1pm8yaycbsyla1v"))))
+ (base32 "1p9wkwc23rnif8vcjaj5ih1fmr5g57sidqjlz08qw6k0z4f6bia1"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-lift sbcl-trivial-shell))
(inputs
- (list sbcl-anaphora
- sbcl-cl-containers
- sbcl-cl-ppcre
- sbcl-dynamic-classes
- sbcl-metabang-bind
- sbcl-metatilities-base))
- (home-page "https://common-lisp.net/project/cl-markdown/")
- (synopsis "Common Lisp rewrite of Markdown")
+ (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-indent))
+ (home-page "https://shinmera.github.io/font-discovery/")
+ (synopsis "Find system font files matching a font spec")
(description
- "This is an implementation of a Markdown parser in Common Lisp.")
- (license license:expat))))
+ "This is a library to find system font files. It works on systems with
+FontConfig on Linux, BSD. It does not have any foreign dependencies that
+aren't already directly available on the system.")
+ (license license:zlib))))
-(define-public ecl-cl-markdown
- (let ((pkg (sbcl-package->ecl-package sbcl-cl-markdown)))
- (package
- (inherit pkg)
- (arguments
- ;; XXX: Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is
- ;; undefined" on ECL.
- ;; See https://github.com/hraban/cl-markdown/issues/11
- '(#:tests? #f)))))
+(define-public cl-font-discovery
+ (sbcl-package->cl-source-package sbcl-font-discovery))
-(define-public cl-markdown
- (sbcl-package->cl-source-package sbcl-cl-markdown))
+(define-public ecl-font-discovery
+ (sbcl-package->ecl-package sbcl-font-discovery))
-(define-public sbcl-cl-markless
- (let ((commit "a0e145c03103bd3bf7e275d5ac0e19e8381eb844")
+(define-public sbcl-for
+ (let ((commit "a39782991292e44ee3b5e2e25cddaa8115f6d363")
(revision "1"))
(package
- (name "sbcl-cl-markless")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-for")
+ (version (git-version "1.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-markless")
+ (url "https://github.com/Shinmera/for")
(commit commit)))
- (file-name (git-file-name "cl-markless" version))
+ (file-name (git-file-name "cl-for" version))
(sha256
- (base32 "154ax1yk0b1035yij29c5pgfn7ifghrxy821mk68wyljg8afgvh5"))))
+ (base32 "07jdwqkyb3qd65mng60cs723z7p0bv2769hhalz4c0mfzn8qrn99"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
(inputs
- (list sbcl-3bmd
- sbcl-babel
- sbcl-command-line-arguments
- sbcl-documentation-utils
- sbcl-plump
- sbcl-trivial-gray-streams
- sbcl-trivial-indent
- sbcl-trivial-mimes
- sbcl-zip))
- (arguments
- '(#:asd-systems '("cl-markless"
- "cl-markless-plump"
- "cl-markless-epub"
- "cl-markless-markdown"
- "cl-markless-standalone")))
- (home-page "https://shirakumo.github.io/cl-markless/")
- (synopsis "Parser implementation for Markless")
- (description "This is an implementation of the \"Markless
-standard\" (@url{https://github.com/shirakumo/markless}) at version 1.0. It
-handles the parsing of plaintext from a stream into an abstract syntax tree
-composed out of strings and component objects. From there the AST can be
-easily compiled into a target markup language like HTML.")
+ (list sbcl-documentation-utils sbcl-form-fiddle sbcl-lambda-fiddle))
+ (home-page "https://shinmera.github.io/for/")
+ (synopsis "Extensible iteration macro library")
+ (description
+ "For is a library for an extensible iteration macro. It allows you to write
+concise looping constructs similar to @code{loop} and @code{iterate}. Unlike
+loop however it is extensible and sensible, and unlike iterate it does not
+require code-walking and is easier to extend.")
(license license:zlib))))
-(define-public ecl-cl-markless
- (sbcl-package->ecl-package sbcl-cl-markless))
+(define-public cl-for
+ (sbcl-package->cl-source-package sbcl-for))
-(define-public cl-markless
- (sbcl-package->cl-source-package sbcl-cl-markless))
+(define-public ecl-for
+ (sbcl-package->ecl-package sbcl-for))
-(define-public sbcl-magicffi
- (let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2"))
+(define-public sbcl-forge
+ (let ((commit "012324e251d91436f4a610e2fe2eb50674c3c3ce")
+ (revision "1"))
(package
- (name "sbcl-magicffi")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-forge")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dochang/magicffi/")
+ (url "https://github.com/Shinmera/forge/")
(commit commit)))
+ (sha256
+ (base32 "006vi2ihrn28pzrwa8b7axmv98bdaxzx7lacnh9pbacbjg3b7hb0"))
+ (file-name (git-file-name "forge" version))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("forge-support"
+ "forge-communication"
+ "forge")))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-cl-ppcre
+ sbcl-closer-mop
+ sbcl-documentation-utils
+ sbcl-ironclad
+ sbcl-pathname-utils
+ sbcl-promise
+ sbcl-usocket
+ sbcl-verbose))
+ (synopsis "General, modular build system")
+ (description "Forge is a generic build system. Refer to documentation
+for the specific kind of project you're building to get the full picture.")
+ (home-page "https://github.com/shinmera/forge")
+ (license license:zlib))))
+
+(define-public cl-forge
+ (sbcl-package->cl-source-package sbcl-forge))
+
+(define-public sbcl-form-fiddle
+ (let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18")
+ (revision "0"))
+ (package
+ (name "sbcl-form-fiddle")
+ (version (git-version "1.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/form-fiddle")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0p6ysa92fk34bhxpw7bycbfgw150fv11z9x8jr9xb4lh8cm2hvp6"))))
+ (base32
+ "041iznc9mpfyrl0sv5893ys9pbb2pvbn9g3clarqi7gsfj483jln"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-alexandria))
(inputs
- `(("cffi" ,sbcl-cffi)
- ("ppcre" ,sbcl-cl-ppcre)
- ("libmagic" ,file)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((magic (assoc-ref inputs "libmagic")))
- (substitute* "grovel.lisp"
- (("/usr/include/magic.h")
- (string-append magic "/include/magic.h")))
- (substitute* "api.lisp"
- ((":default \"libmagic\"" all)
- (string-append ":default \"" magic "/lib/libmagic\"")))))))))
- (home-page "https://common-lisp.net/project/magicffi/")
- (synopsis "Common Lisp interface to libmagic based on CFFI")
+ (list sbcl-documentation-utils))
+ (synopsis "Utilities to destructure Common Lisp lambda forms")
(description
- "MAGICFFI is a Common Lisp CFFI interface to libmagic(3), the file type
-determination library using @emph{magic} numbers.")
- (license license:bsd-2))))
+ "Often times we need to destructure a form definition in a Common Lisp
+macro. This library provides a set of simple utilities to help with that.")
+ (home-page "https://shinmera.github.io/form-fiddle/")
+ (license license:zlib))))
-(define-public ecl-magicffi
- (sbcl-package->ecl-package sbcl-magicffi))
+(define-public cl-form-fiddle
+ (sbcl-package->cl-source-package sbcl-form-fiddle))
-(define-public cl-magicffi
- (sbcl-package->cl-source-package sbcl-magicffi))
+(define-public ecl-form-fiddle
+ (sbcl-package->ecl-package sbcl-form-fiddle))
-(define-public sbcl-shlex
- (let ((commit "3dee1cb7c0140fa7660ca7a3b2ac5e75d1218e5c")
- (revision "2"))
+(define-public sbcl-format-colors
+ (let ((commit "fecb1d8c6e7a07ff9f10a7a4eb4c3bd629d4969f")
+ (revision "0"))
(package
- (name "sbcl-shlex")
+ (name "sbcl-format-colors")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vindarel/format-colors")
+ (commit commit)))
+ (sha256
+ (base32 "084ydjhic2dq0gb7wfm6plnjq3l7485hb3yhxl03mm64a6sr3fxv"))
+ (file-name (git-file-name "cl-format-colors" version))))
+ (build-system asdf-build-system/sbcl)
+ (inputs (list sbcl-cl-ansi-text))
+ (synopsis "Custom format functions for colorful output")
+ (description "This package provides simple format directives to
+ print in colors.")
+ (home-page "https://github.com/vindarel/format-colors")
+ (license license:llgpl))))
+
+(define-public cl-format-colors
+ (sbcl-package->cl-source-package sbcl-format-colors))
+
+(define-public ecl-format-colors
+ (sbcl-package->ecl-package sbcl-format-colors))
+
+(define-public sbcl-formgrep
+ (let ((commit "91238cdbdd0ad815ff5d574d032b4a502febd190")
+ (revision "0"))
+ (package
+ (name "sbcl-formgrep")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/cl-shlex")
+ (url "https://github.com/death/formgrep")
(commit commit)))
- (file-name (git-file-name "cl-shlex" version))
+ (file-name (git-file-name "cl-formgrep" version))
(sha256
- (base32 "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8"))))
+ (base32 "1rqzkmz6nddg5ywvs3v0k8cvxdwas38mfwgbr3rs4fdsbps90k9r"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-serapeum sbcl-cl-ppcre sbcl-cl-unicode))
- (home-page "https://github.com/ruricolist/cl-shlex")
- (synopsis "Common Lisp lexical analyzer for shell-like syntaxes")
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cl-fad
+ sbcl-cl-ppcre
+ sbcl-eclector))
+ (home-page "https://github.com/death/formgrep")
+ (synopsis "Find top-level Lisp forms matching an operator pattern")
(description
- "This library contains a lexer for syntaxes that use shell-like rules
-for quoting and commenting. It is a port of the @code{shlex} module from Python’s
-standard library.")
+ "This library provides the @code{FORMGREP} function and related
+utilities which find top-level Lisp forms matching the regular expression
+corresponding to an operator name, returning the matched forms and the names
+of the files and the line numbers where they were found.")
(license license:expat))))
-(define-public ecl-shlex
- (sbcl-package->ecl-package sbcl-shlex))
+(define-public cl-formgrep
+ (sbcl-package->cl-source-package sbcl-formgrep))
-(define-public cl-shlex
- (sbcl-package->cl-source-package sbcl-shlex))
+(define-public ecl-formgrep
+ (sbcl-package->ecl-package sbcl-formgrep))
-(define-public sbcl-cmd
- (let ((commit "0164d574ba236e2001ee1d9dba3f4774c7512a8c")
- (revision "8"))
+(define-public sbcl-fset
+ (package
+ (name "sbcl-fset")
+ (version "1.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/slburson/fset")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-fset" version))
+ (sha256
+ (base32 "16a3g9av8rvhvnhv5vfq2shim7b7i062wzyz6xwjk9sp9q9bqlva"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-misc-extensions sbcl-mt19937 sbcl-named-readtables))
+ (synopsis "Functional set-theoretic collections library")
+ (description
+ "FSet is a functional set-theoretic collections library for Common Lisp.
+Functional means that all update operations return a new collection rather than
+modifying an existing one in place. Set-theoretic means that collections may
+be nested arbitrarily with no additional programmer effort; for instance, sets
+may contain sets, maps may be keyed by sets, etc.")
+ (home-page "https://common-lisp.net/project/fset/Site/index.html")
+ (license license:llgpl)))
+
+(define-public cl-fset
+ (sbcl-package->cl-source-package sbcl-fset))
+
+(define-public ecl-fset
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-fset))
+ (arguments
+ ;; Tests fails on ECL with "The function FSET::MAKE-CHAR is undefined".
+ '(#:tests? #f))))
+
+(define-public sbcl-function-cache
+ (package
+ (name "sbcl-function-cache")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AccelerationNet/function-cache")
+ (commit "6a5ada401e57da2c8abf046f582029926e61fce8")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Function caching / memoization library for Common Lisp")
+ (description
+ "A common lisp library that provides extensible function result
+caching based on arguments (an expanded form of memoization).")
+ (home-page "https://github.com/AccelerationNet/function-cache")
+ (license
+ (license:non-copyleft
+ "https://github.com/AccelerationNet/function-cache/blob/master/README.md"))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-interpol" ,sbcl-cl-interpol)
+ ("iterate" ,sbcl-iterate)
+ ("symbol-munger" ,sbcl-symbol-munger)
+ ("closer-mop" ,sbcl-closer-mop)))
+ (arguments
+ `(#:tests? #f))))
+
+(define-public cl-function-cache
+ (sbcl-package->cl-source-package sbcl-function-cache))
+
+(define-public ecl-function-cache
+ (sbcl-package->ecl-package sbcl-function-cache))
+
+(define-public sbcl-funds
+ (let ((commit "39d425818876b898c20780a678803df506df8424")
+ (revision "2"))
(package
- (name "sbcl-cmd")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-funds")
+ (version (git-version "1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/cmd/")
+ (url "https://github.com/charJe/funds")
(commit commit)))
- (file-name (git-file-name "cl-cmd" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m"))))
+ (base32 "13y1jhvnpzrs9daz6f3z67w6h2y21ggb10j3j4vnc5p3m8i7ps4p"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref inputs "coreutils")
- "/bin"))
- (ps-bin (string-append (assoc-ref inputs "procps")
- "/bin")))
- (substitute* "cmd.lisp"
- (("\\(def \\+env\\+ \"env\"\\)")
- (format #f "(def +env+ \"~a/env\")" bin))
- (("\\(def \\+kill\\+ \"kill\"\\)")
- (format #f "(def +kill+ \"~a/kill\")" bin))
- (("\\(def \\+ps\\+ \"ps\"\\)")
- (format #f "(def +ps+ \"~a/ps\")" ps-bin))
- (("\\(def \\+pwd\\+ \"pwd\"\\)")
- (format #f "(def +pwd+ \"~a/pwd\")" bin))
- (("\\(def \\+sh\\+ \"/bin/sh\"\\)")
- (format #f "(def +sh+ \"~a\")" (which "sh")))
- (("\\(def \\+tr\\+ \"tr\"\\)")
- (format #f "(def +tr+ \"~a/tr\")" bin)))))))))
- (inputs
- (list coreutils
- procps
- sbcl-alexandria
- sbcl-serapeum
- sbcl-shlex
- sbcl-trivia))
- (home-page "https://github.com/ruricolist/cmd")
- (synopsis "Conveniently run external programs from Common Lisp")
+ (synopsis "Purely functional data structure library in Common Lisp")
(description
- "A utility for running external programs, built on UIOP.
-Cmd is designed to be natural to use, protect against shell interpolation and
-be usable from multi-threaded programs.")
- (license license:expat))))
+ "Funds provides portable, purely functional data structures in Common
+Lisp. It includes tree based implementations for Array, Hash, Queue, Stack, and
+Heap.")
+ (home-page "https://common-lisp.net/project/funds/")
+ (license license:asl2.0))))
-(define-public ecl-cmd
- (sbcl-package->ecl-package sbcl-cmd))
+(define-public cl-funds
+ (sbcl-package->cl-source-package sbcl-funds))
-(define-public cl-cmd
- (sbcl-package->cl-source-package sbcl-cmd))
+(define-public ecl-funds
+ (sbcl-package->ecl-package sbcl-funds))
-(define-public sbcl-ppath
- (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce"))
+(define-public sbcl-fxml
+ ;; No release.
+ (let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1"))
(package
- (name "sbcl-ppath")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-fxml")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fourier/ppath/")
+ (url "https://github.com/ruricolist/fxml/")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb"))))
+ (base32 "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-osicat
- sbcl-cl-ppcre
+ (list sbcl-babel
+ sbcl-named-readtables
+ sbcl-serapeum
+ sbcl-quri
+ sbcl-flexi-streams
sbcl-split-sequence
- sbcl-trivial-features))
+ sbcl-alexandria
+ sbcl-trivial-gray-streams))
(native-inputs
- (list sbcl-cl-fad sbcl-prove))
- (home-page "https://github.com/fourier/ppath")
- (synopsis "Common Lisp's implementation of the Python's os.path module")
+ (list sbcl-fiveam sbcl-cxml sbcl-cxml-rng sbcl-xpath))
+ (home-page "https://github.com/ruricolist/fxml")
+ (synopsis "XML parser and serializer in Common Lisp")
(description
- "This library is a path strings manipulation library inspired by
-Python's @code{os.path}. All functionality from @code{os.path} is supported on
-major operation systems.
+ "FXML is a secure-by-default, error-recovering XML parser and serializer.
+It is a fork of CXML.
-The philosophy behind is to use simple strings and \"dumb\" string
-manipulation functions to handle paths and filenames. Where possible the
-corresponding OS system functions are called.")
- (license license:bsd-2))))
+You should use FXML instead of CXML if:
+@itemize
+@item You are parsing potentially ill-formed XML.
+@item You are parsing potentially malicious XML.
+@item You need to use Klacks with namespaces.
+@end itemize
-(define-public ecl-ppath
- (sbcl-package->ecl-package sbcl-ppath))
+FXML’s API is very close to CXML's, and for the most part you can refer to the
+CXML documentation for usage.")
+ (license license:llgpl))))
-(define-public cl-ppath
- (sbcl-package->cl-source-package sbcl-ppath))
+(define-public cl-fxml
+ (sbcl-package->cl-source-package sbcl-fxml))
-(define-public sbcl-trivial-escapes
- (let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1"))
+(define-public sbcl-garbage-pools
+ (let ((commit "9a7cb7f48b04197c0495df3b6d2e8395ad13f790")
+ (revision "1"))
(package
- (name "sbcl-trivial-escapes")
- (version (git-version "1.2.0" "1" commit))
+ (name "sbcl-garbage-pools")
+ (version (git-version "0.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/williamyaoh/trivial-escapes")
+ (url "https://github.com/archimag/garbage-pools")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"))))
+ (base32 "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-named-readtables))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/williamyaoh/trivial-escapes")
- (synopsis "C-style escape directives for Common Lisp")
- (description
- "This Common Lisp library interprets escape characters the same way that
-most other programming language do.
-It provides four readtables. The default one lets you write strings like this:
-@code{#\"This string has\na newline in it!\"}.")
- (license license:public-domain))))
+ (home-page "https://github.com/archimag/garbage-pools")
+ (synopsis "Resource management pools for Common Lisp")
+ (description "GARBAGE-POOLS is Common Lisp re-implementation of the APR
+Pools for resource management.")
+ (license license:expat))))
-(define-public ecl-trivial-escapes
- (sbcl-package->ecl-package sbcl-trivial-escapes))
+(define-public cl-garbage-pools
+ (sbcl-package->cl-source-package sbcl-garbage-pools))
-(define-public cl-trivial-escapes
- (sbcl-package->cl-source-package sbcl-trivial-escapes))
+(define-public ecl-garbage-pools
+ (sbcl-package->ecl-package sbcl-garbage-pools))
-(define-public sbcl-trivial-extensible-sequences
- (let ((commit "d40b2da23716601578b1f645727047f80baeb49a")
- (revision "0"))
+(define-public sbcl-geco
+ (let ((commit "db13c9384491092975f46f6a837ccdc04681a93a")
+ (revision "1"))
(package
- (name "sbcl-trivial-extensible-sequences")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-geco")
+ (version (git-version "2.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/trivial-extensible-sequences")
+ (url "https://github.com/gpwwjr/GECO")
(commit commit)))
- (file-name (git-file-name "cl-trivial-extensible-sequences" version))
+ (file-name (git-file-name "cl-geco" version))
(sha256
- (base32 "0352psdd8j0phjycr6ldckwspyal4jcf0f2fizi6fwdp7nvadng7"))))
+ (base32 "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://shinmera.github.io/trivial-extensible-sequences/")
- (synopsis "Portability library for the extensible sequences protocol")
+ (home-page "https://github.com/gpwwjr/GECO")
+ (synopsis "Genetic algorithm toolkit for Common Lisp")
(description
- "This package provides a portability layer for the extensible sequences
-standard extension to Common Lisp. Extensible sequences allow you to create
-your own sequence types that integrate with the rest of the functions and
-operations that interact with sequences.")
- (license license:zlib))))
+ "GECO (Genetic Evolution through Combination of Objects) is an
+extensible, object-oriented framework for prototyping genetic algorithms in
+Common Lisp.")
+ (license license:lgpl2.0+))))
-;; NOTE: (Sharlatan-20230312T215058+0000): ECL is not supported
-;; (define-public ecl-trivial-extensible-sequences
-;; (sbcl-package->ecl-package sbcl-trivial-extensible-sequences))
+(define-public cl-geco
+ (sbcl-package->cl-source-package sbcl-geco))
-(define-public cl-trivial-extensible-sequences
- (sbcl-package->cl-source-package sbcl-trivial-extensible-sequences))
+(define-public ecl-geco
+ (sbcl-package->ecl-package sbcl-geco))
-(define-public sbcl-cl-indentify
- (let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53"))
+(define-public sbcl-generic-cl
+ (package
+ (name "sbcl-generic-cl")
+ (version "0.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alex-gutev/generic-cl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1c40vqb49g0adfv17jxgk0ds1n6a2dph30cibq01sicmqdgrrbi8"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ ;; Tests fail because SBCL head size is not high enough.
+ ;; https://github.com/alex-gutev/generic-cl/issues/6
+ `(#:tests? #f))
+ (inputs
+ (list sbcl-agutil
+ sbcl-alexandria
+ sbcl-anaphora
+ sbcl-arrows
+ sbcl-cl-form-types
+ sbcl-custom-hash-table
+ sbcl-static-dispatch
+ sbcl-trivia))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://alex-gutev.github.io/generic-cl/")
+ (synopsis "Generic function interface to standard Common Lisp functions")
+ (description "@code{generic-cl} provides a generic function wrapper over
+various functions in the Common Lisp standard, such as equality predicates and
+sequence operations. The goal of this wrapper is to provide a standard
+interface to common operations, such as testing for the equality of two
+objects, which is extensible to user-defined types.")
+ (license license:expat)))
+
+(define-public cl-generic-cl
+ (sbcl-package->cl-source-package sbcl-generic-cl))
+
+(define-public ecl-generic-cl
+ (sbcl-package->ecl-package sbcl-generic-cl))
+
+(define-public sbcl-generic-comparability
+ (let ((commit "53fc2846319a6eb46b36581e203e1f1542a8acff")
+ (revision "1"))
(package
- (name "sbcl-cl-indentify")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-generic-comparability")
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/yitzchak/cl-indentify")
+ (url "https://github.com/pnathan/generic-comparability")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name "generic-comparability" version))
(sha256
- (base32 "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"))))
+ (base32 "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-command-line-arguments
- sbcl-trivial-gray-streams))
+ (list sbcl-alexandria))
(native-inputs
- (list sbcl-trivial-escapes sbcl-rove))
- (home-page "https://github.com/yitzchak/cl-indentify")
- (synopsis "Code beautifier for Common Lisp")
+ (list sbcl-fiveam))
+ (home-page "https://github.com/pnathan/generic-comparability")
+ (synopsis "Implementation of cdr-8")
(description
- "A library and command line utility to automatically indent Common Lisp
-source files.")
- (license license:expat))))
+ "GENERIC-COMPARABILITY is an implementation of CDR-8 (Generic Equality
+and Comparison for Common Lisp). CDR-8 provides an interface for the EQUALS
+function, which is defined as a general equality predicate, as well as a set of
+ordering (COMPARE) functions for comparison. The semantics are described in
+the CDR-8 standard.")
+ (license license:llgpl))))
-(define-public ecl-cl-indentify
- (sbcl-package->ecl-package sbcl-cl-indentify))
+(define-public cl-generic-comparability
+ (sbcl-package->cl-source-package sbcl-generic-comparability))
-(define-public cl-indentify
- (sbcl-package->cl-source-package sbcl-cl-indentify))
+(define-public ecl-generic-comparability
+ (sbcl-package->ecl-package sbcl-generic-comparability))
-(define-public sbcl-concrete-syntax-tree
- (let ((commit "37291727196a3bc88a7be67c1427c52078d4b82c")
- (revision "0"))
+(define-public sbcl-genhash
+ (let ((commit "220ae1af8361dbd2005177f2ee11072b6a33934f")
+ (revision "1"))
(package
- (name "sbcl-concrete-syntax-tree")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-genhash")
+ (version (git-version "1.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/Concrete-Syntax-Tree")
+ (url "https://github.com/pnathan/genhash")
(commit commit)))
- (file-name (git-file-name "cl-concrete-syntax-tree" commit))
+ (file-name (git-file-name "cl-genhash" version))
(sha256
- (base32 "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"))))
+ (base32 "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-acclimation))
- (arguments
- '(#:asd-systems '("concrete-syntax-tree"
- "concrete-syntax-tree-destructuring"
- "concrete-syntax-tree-source-info")))
- (home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree")
- (synopsis "Parse Common Lisp code into a concrete syntax tree")
+ (home-page "https://github.com/pnathan/genhash")
+ (synopsis "Generic hash tables for Common Lisp")
(description
- "This library is intended to solve the problem of source tracking for
-Common Lisp code.
-
-By \"source tracking\", it is meant that code elements that have a known
-origin in the form of a position in a file or in an editor buffer are
-associated with some kind of information about this origin.
-
-Since the exact nature of such origin information depends on the Common Lisp
-implementation and the purpose of wanting to track that origin, the library
-does not impose a particular structure of this information. Instead, it
-provides utilities for manipulating source code in the form of what is called
-concrete syntax trees (CSTs for short) that preserve this information about
-the origin.")
- (license license:bsd-2))))
+ "This an implementation of CDR 2: generic hash tables for Common Lisp")
+ (license license:public-domain))))
-(define-public ecl-concrete-syntax-tree
- (sbcl-package->ecl-package sbcl-concrete-syntax-tree))
+(define-public cl-genhash
+ (sbcl-package->cl-source-package sbcl-genhash))
-(define-public cl-concrete-syntax-tree
- (sbcl-package->cl-source-package sbcl-concrete-syntax-tree))
+(define-public ecl-genhash
+ (sbcl-package->ecl-package sbcl-genhash))
-(define-public sbcl-eclector
- (let ((commit "d499b09142c7e39b4ef52e821fa767d5a8d606a0")
+(define-public sbcl-germinal
+ (let ((commit "5bfb371ea57dae8985c0e1c6f184f0338487d684")
(revision "0"))
(package
- (name "sbcl-eclector")
- (version (git-version "0.9.0" revision commit))
+ (name "sbcl-germinal")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/Eclector")
+ (url "https://git.carcosa.net/jmcbray/germinal")
(commit commit)))
- (file-name (git-file-name "cl-eclector" version))
+ (file-name (git-file-name "cl-germinal" version))
(sha256
- (base32 "1sg8wmdpm8pcjwk394way5vs2ya3r995lddmi51q9zfn9hmzb7gn"))))
+ (base32 "12jypa8m10825lp5yxfcm1fyk3r4ziwcri7ndxa0m5dz0y7hggck"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list sbcl-acclimation
- sbcl-alexandria
- sbcl-closer-mop
- sbcl-concrete-syntax-tree))
- (arguments
- '(#:asd-systems '("eclector"
- "eclector-concrete-syntax-tree")))
- (home-page "https://s-expressionists.github.io/Eclector/")
- (synopsis "Highly customizable, portable Common Lisp reader")
- (description
- "Eclector is a portable Common Lisp reader that is highly customizable,
-can recover from errors and can return concrete syntax trees.
-
-In contrast to many other reader implementations, eclector can recover from
-most errors in the input supplied to it and continue reading. This capability
-is realized as a restart.
-
-It can also produce instances of the concrete syntax tree classes provided by
-the concrete syntax tree library.")
- (license license:bsd-2))))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cl+ssl
+ sbcl-cl-fad
+ sbcl-cl-interpol
+ sbcl-cl-ppcre
+ sbcl-cl-str
+ sbcl-local-time
+ sbcl-osicat
+ sbcl-ppath
+ sbcl-quri
+ sbcl-trivial-mimes
+ sbcl-uax-15
+ sbcl-usocket))
+ (home-page "https://git.carcosa.net/jmcbray/germinal")
+ (synopsis "Gemini protocol server")
+ (description "Germinal is a server for the Gemini protocol, written in
+Common Lisp.")
+ (license license:agpl3))))
-(define-public ecl-eclector
- (sbcl-package->ecl-package sbcl-eclector))
+(define-public cl-germinal
+ (sbcl-package->cl-source-package sbcl-germinal))
-(define-public cl-eclector
- (sbcl-package->cl-source-package sbcl-eclector))
+(define-public ecl-germinal
+ (sbcl-package->ecl-package sbcl-germinal))
-(define-public sbcl-trucler
- (let ((commit "d40ff965520cbccf4980b7e7e3122912a11f24ad")
+(define-public sbcl-gettext
+ (let ((commit "a432020cbad99fc22cbe6bb9aa8a83a35000d7aa")
(revision "1"))
(package
- (name "sbcl-trucler")
+ (name "sbcl-gettext")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/Trucler")
+ (url "https://github.com/rotatef/gettext")
(commit commit)))
- (file-name (git-file-name "cl-trucler" commit))
+ (file-name (git-file-name "gettext" version))
(sha256
- (base32 "0a0zi7q88j31n0b17yfxb66xjvvridgqr4vr6z3pgnm9wha990a6"))))
+ (base32 "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-stefil))
(inputs
- (list sbcl-acclimation))
- (arguments
- '(#:asd-systems '("trucler"
- "trucler-base"
- "trucler-native"
- "trucler-reference")))
- (home-page "https://github.com/s-expressionists/Trucler")
- (synopsis "Environment protocol for Common Lisp compilers")
+ (list sbcl-flexi-streams sbcl-split-sequence sbcl-cl-yacc))
+ (home-page "https://github.com/rotatef/gettext")
+ (synopsis "Common Lisp implementation of Gettext")
(description
- "Trucler defines a CLOS-based protocol to be used by Common Lisp
-compilers for environment query and update. In addition, library authors can
-use the @code{trucler-native} interface to inspect native environments.
-Trucler supports introspection for variables, functions, tags, blocks and
-optimization policies.")
- (license license:bsd-2))))
+ "This package provides GNU @code{gettext} completely implemented in
+Common Lisp without any C library bindings.")
+ (license license:lgpl3+))))
-(define-public cl-trucler
- (sbcl-package->cl-source-package sbcl-trucler))
+(define-public cl-gettext
+ (sbcl-package->cl-source-package sbcl-gettext))
-(define-public ecl-trucler
- (sbcl-package->ecl-package sbcl-trucler))
+(define-public ecl-gettext
+ (sbcl-package->ecl-package sbcl-gettext))
-(define-public sbcl-incless
- (let ((commit "395accf484ffdff70f20b941f322e8329c585ca7")
- (revision "0"))
+(define-public sbcl-glkit
+ (let ((commit "0d8e7c5fed4231f2177afcf0f3ff66f196ed6a46"))
(package
- (name "sbcl-incless")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-glkit")
+ (version (git-version "0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/Incless")
+ (url "https://github.com/lispgames/glkit/")
(commit commit)))
- (file-name (git-file-name "cl-incless" commit))
+ (file-name (git-file-name "cl-glkit" version))
(sha256
- (base32 "14bkb5zx8xq6wv6dsqi041dwq9scvw3kdjlnkfs2ndazj0rb2a1k"))))
+ (base32 "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"))))
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-alexandria))
- ;; See https://github.com/s-expressionists/Incless/issues/6
- (arguments '(#:asd-systems '("incless")))
- (home-page "https://github.com/s-expressionists/incless")
- (synopsis "Implements print-object methods for many standard classes")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-opengl
+ sbcl-defpackage-plus
+ sbcl-mathkit
+ sbcl-sb-cga
+ sbcl-sdl2
+ sbcl-static-vectors))
+ (home-page "https://github.com/lispgames/glkit/")
+ (synopsis "OpenGL utilities for math, shaders, and more")
(description
- "@code{cl-incless} implements print-object methods for many standard
-classes.")
- (license license:bsd-2))))
+ "This is a utility kit for functionality related to OpenGL. It provides the following:
-(define-public ecl-incless
- (sbcl-package->ecl-package sbcl-incless))
+@itemize
+@item @code{kit.glm}: This re-exports @code{sb-cga} and @code{mathkit} for
+convenience.
+@item @code{kit.gl.shader}: This provides shader dictionary and compilation
+functionality similar to what was originally found in @code{sdl2kit}.
+@item @code{kit.gl.vao}: This provides an interface for Vertex Array Objects.
+@end itemize\n")
+ (license license:expat))))
-(define-public cl-incless
- (sbcl-package->cl-source-package sbcl-incless))
+(define-public cl-glkit
+ (sbcl-package->cl-source-package sbcl-glkit))
-(define-public sbcl-jsown
- (let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977"))
+(define-public ecl-glkit
+ (sbcl-package->ecl-package sbcl-glkit))
+
+(define-public sbcl-global-vars
+ (let ((commit "c749f32c9b606a1457daa47d59630708ac0c266e")
+ (revision "0"))
(package
- (name "sbcl-jsown")
- (version (git-version "1.0.1" "1" commit))
+ (name "sbcl-global-vars")
+ (version (git-version "1.0.0" revision commit))
+ (home-page "https://github.com/lmj/global-vars")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/madnificent/jsown")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"))))
+ (base32
+ "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/madnificent/jsown")
- (synopsis "Fast JSON reader / writer library for Common Lisp")
+ (synopsis "Efficient global variables in Common Lisp")
(description
- "@code{jsown} is a high performance Common Lisp JSON parser. Its aim
-is to allow for the fast parsing of JSON objects in Common Lisp. Recently,
-functions and macros have been added to ease the burden of writing and editing
-@code{jsown} objects.
+ "In Common Lisp, a special variable that is never dynamically bound
+typically serves as a stand-in for a global variable. The @code{global-vars}
+library provides true global variables that are implemented by some compilers.
+An attempt to rebind a global variable properly results in a compiler error.
+That is, a global variable cannot be dynamically bound.
-@code{jsown} allows you to parse JSON objects quickly to a modifiable Lisp
-list and write them back. If you only need partial retrieval of objects,
-@code{jsown} allows you to select the keys which you would like to see parsed.
-@code{jsown} also has a JSON writer and some helper methods to alter the JSON
-objects themselves.")
+Global variables therefore allow us to communicate an intended usage that
+differs from special variables. Global variables are also more efficient than
+special variables, especially in the presence of threads.")
(license license:expat))))
-(define-public ecl-jsown
- (sbcl-package->ecl-package sbcl-jsown))
+(define-public cl-global-vars
+ (sbcl-package->cl-source-package sbcl-global-vars))
-(define-public cl-jsown
- (sbcl-package->cl-source-package sbcl-jsown))
+(define-public ecl-global-vars
+ (sbcl-package->ecl-package sbcl-global-vars))
-(define-public sbcl-clostrum
- (let ((commit "c85d38bde9d093f1f132574e9b98b8d64683cd51")
- (revision "0"))
+(define-public sbcl-glop
+ (let ((commit "45e722ab4a0cd2944d550bf790206b3326041e38")
+ (revision "1"))
(package
- (name "sbcl-clostrum")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-glop")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/Clostrum")
+ (url "https://github.com/lispgames/glop")
(commit commit)))
- (file-name (git-file-name "cl-clostrum" commit))
+ (file-name (git-file-name "glop" version))
(sha256
- (base32 "10alsdnpzbgic75xghwjp414sqwg4npvp69zn0r4l8ms0ki9zr1x"))))
+ (base32 "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (home-page "https://github.com/s-expressionists/Clostrum")
- (synopsis "First Class Global Environments")
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-lib-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/x11/xcomposite.lisp"
+ (("libXcomposite.so")
+ (search-input-file inputs "/lib/libXcomposite.so")))
+ (substitute* "src/x11/xlib.lisp"
+ (("libX11")
+ (string-drop-right
+ (search-input-file inputs "/lib/libX11.so") 3)))
+ (substitute* "src/utils.lisp"
+ (("libX11")
+ (string-drop-right
+ (search-input-file inputs "/lib/libX11.so") 3)))
+ (substitute* "src/utils.lisp"
+ (("libGL.so")
+ (search-input-file inputs "/lib/libGL.so.1")))
+ (substitute* "src/x11/glx.lisp"
+ (("libGL.so")
+ (search-input-file inputs "/lib/libGL.so")))
+ (substitute* "src/x11/display-ctrl.lisp"
+ (("libXrandr")
+ (string-drop-right
+ (search-input-file inputs "/lib/libXrandr.so") 3))))))))
+ (native-inputs
+ (list sbcl-cl-opengl))
+ (inputs
+ (list libx11
+ libxcomposite
+ libxrandr
+ mesa
+ sbcl-cffi
+ sbcl-split-sequence
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/lispgames/glop")
+ (synopsis "Direct FFI bindings for OpenGL window and context management")
(description
- "This package provides first-class global environments for
-Common Lisp.")
- (license license:bsd-2))))
+ "This package provides Common Lisp bindings to create OpenGL window and
+context manipulation code as well as system input handling. Direct FFI
+bindings to system functions are used so no third party C lib is required
+except system libraries.")
+ (license license:expat))))
-(define-public ecl-clostrum
- (sbcl-package->ecl-package sbcl-clostrum))
+(define-public cl-glop
+ (sbcl-package->cl-source-package sbcl-glop))
-(define-public cl-clostrum
- (sbcl-package->cl-source-package sbcl-clostrum))
+(define-public ecl-glop
+ (sbcl-package->ecl-package sbcl-glop))
-(define-public sbcl-system-locale
- (let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17"))
+(define-public sbcl-glsl-packing
+ (let ((commit "03628159468a8e5b7f2a1d5e78b77053e136794a")
+ (revision "1"))
(package
- (name "sbcl-system-locale")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-glsl-packing")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/system-locale/")
+ (url "https://github.com/3b/glsl-packing/")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name "glsl-packing" version))
(sha256
- (base32 "00p5c053kmgq4ks6l9mxsqz6g3bjcybvkvj0bh3r90qgpkaawm1p"))))
+ (base32 "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/system-locale/")
- (synopsis "Get the system's locale and language settings in Common Lisp")
+ (list sbcl-alexandria))
+ (home-page "https://github.com/3b/glsl-packing/")
+ (synopsis "Common Lisp utilities to calculate OpenGL layouts")
(description
- "This library retrieves locale information configured on the
-system. This is helpful if you want to write applications and libraries that
-display messages in the user's native language.")
- (license license:zlib))))
+ "This is a Common Lisp library to calculate std140 or std430 layouts for
+a glsl UBO/SSBO.")
+ (license license:expat))))
-(define-public ecl-system-locale
- (sbcl-package->ecl-package sbcl-system-locale))
+(define-public cl-glsl-packing
+ (sbcl-package->cl-source-package sbcl-glsl-packing))
-(define-public cl-system-locale
- (sbcl-package->cl-source-package sbcl-system-locale))
+(define-public ecl-glsl-packing
+ (sbcl-package->ecl-package sbcl-glsl-packing))
-(define-public sbcl-cluster
- (let ((commit "b040e97578f3027d7d8c7652c74917726574c43e")
- (revision "0"))
+(define-public sbcl-glsl-spec
+ (let ((commit "f04476f7da89355ae6856b33283c60ba95c6555d")
+ (revision "1"))
(package
- (name "sbcl-cluster")
+ (name "sbcl-glsl-spec")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Cluster")
+ (url "https://github.com/cbaggers/glsl-spec")
(commit commit)))
- (file-name (git-file-name "cl-cluster" commit))
+ (file-name (git-file-name "glsl-spec" version))
(sha256
- (base32 "0ixbr3wm7d3m8mgzasd95rxvs9kip6ngr5s1zk7j3604mcfssqyi"))))
+ (base32 "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-acclimation
- sbcl-split-sequence))
- (home-page "https://github.com/robert-strandh/Cluster")
- (synopsis "Assembler with input in the form of standard instances")
+ (arguments
+ `(#:asd-systems '("glsl-spec" "glsl-symbols" "glsl-docs")))
+ (home-page "https://github.com/cbaggers/glsl-spec")
+ (synopsis "Common Lisp GLSL specification as a datastructure")
(description
- "Cluster is an assembler (initially for x86 and x86-64) with a difference.
-To avoid the issue of defining a syntax, the input to Cluster is a list
-of standard objects (i.e., instances of the class STANDARD-OBJECT),
-as opposed to a character file or S-expressions.")
- (license license:bsd-2))))
+ "This package contains the specification of all functions and variables
+from GLSL as data.")
+ (license license:unlicense))))
-(define-public ecl-cluster
- (sbcl-package->ecl-package sbcl-cluster))
+(define-public cl-glsl-spec
+ (sbcl-package->cl-source-package sbcl-glsl-spec))
-(define-public cl-cluster
- (sbcl-package->cl-source-package sbcl-cluster))
+(define-public ecl-glsl-spec
+ (sbcl-package->ecl-package sbcl-glsl-spec))
-(define-public sbcl-language-codes
- (let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e"))
+(define-public sbcl-glsl-toolkit
+ (let ((commit "4c4889e75c635772c4df70b11d6f14e7a596da43")
+ (revision "2"))
(package
- (name "sbcl-language-codes")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-glsl-toolkit")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/language-codes")
+ (url "https://github.com/Shirakumo/glsl-toolkit")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name "cl-glsl-toolkit" version))
(sha256
- (base32 "0py176ibmsc01n5r0q1bs1ykqf5jwdbh8kx0j1a814l9y51241v0"))))
+ (base32 "0vrk8nqijqdi1rwf85rhd93yj7q8qkxnigxn3bw0cbrzvzrks9rl"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/language-codes/")
- (synopsis "Map ISO language codes to language names in Common Lisp")
+ (list sbcl-cl-ppcre sbcl-documentation-utils sbcl-parse-float
+ sbcl-trivial-indent))
+ (home-page "https://shirakumo.github.io/glsl-toolkit/")
+ (synopsis "Parser for OpenGL Shader Language source files")
(description
- "This is a small library providing the ISO-639 language code to
-language name mapping.")
+ "This package provides Common Lisp system collecting tools written to
+wrangle OpenGL Shader Language (GLSL) source files.")
(license license:zlib))))
-(define-public ecl-language-codes
- (sbcl-package->ecl-package sbcl-language-codes))
+(define-public cl-glsl-toolkit
+ (sbcl-package->cl-source-package sbcl-glsl-toolkit))
-(define-public cl-language-codes
- (sbcl-package->cl-source-package sbcl-language-codes))
+(define-public ecl-glsl-toolkit
+ (sbcl-package->ecl-package sbcl-glsl-toolkit))
-(define-public sbcl-multilang-documentation
- (let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0"))
+(define-public sbcl-glyphs
+ (let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373"))
(package
- (name "sbcl-multilang-documentation")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-glyphs")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/multilang-documentation")
+ (url "https://github.com/ahungry/glyphs/")
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name name version))
(sha256
- (base32 "13y5jskx8n2b7kimpfarr8v777w3b7zj5swg1b99nj3hk0843ixw"))))
+ (base32 "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils sbcl-language-codes
- sbcl-system-locale))
- (home-page "https://shinmera.github.io/multilang-documentation/")
- (synopsis "Add multiple languages support to Common Lisp documentation")
+ (list sbcl-cl-ppcre sbcl-parenscript sbcl-named-readtables))
+ (home-page "https://github.com/ahungry/glyphs/")
+ (synopsis "Reduce Common Lisp verbosity")
(description
- "This library provides a drop-in replacement function for
-cl:documentation that supports multiple docstrings per-language, allowing you
-to write documentation that can be internationalised.")
- (license license:zlib))))
+ "This library is a little experiment in reducing verbosity in Common
+Lisp, inspired by BODOL (@url{https://github.com/bodil/BODOL}).")
+ (license license:gpl3))))
-(define-public ecl-multilang-documentation
- (sbcl-package->ecl-package sbcl-multilang-documentation))
+(define-public cl-glyphs
+ (sbcl-package->cl-source-package sbcl-glyphs))
-(define-public cl-multilang-documentation
- (sbcl-package->cl-source-package sbcl-multilang-documentation))
+(define-public ecl-glyphs
+ (sbcl-package->ecl-package sbcl-glyphs))
-(define-public sbcl-trivial-do
- (let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163"))
+(define-public sbcl-golden-utils
+ (let ((commit "e43914ad2bdb0c8e1b1f10ef591aafc3c55b89e7")
+ (revision "4"))
(package
- (name "sbcl-trivial-do")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-golden-utils")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/lisp-mirror/golden-utils")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/yitzchak/trivial-do")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name name commit))
+ (file-name (git-file-name "cl-golden-utils" version))
(sha256
- (base32 "1ffva79nkicc7wc8c2ic5nayis3b2rk5sxzj74yjkymkjgbpcrgd"))))
+ (base32 "09vq29wjr3x7h3fshwxg8h1psy4p73yl61cjljarpqjhsgz7lmbp"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/yitzchak/trivial-do")
- (synopsis "Additional dolist style macros for Common Lisp")
+ (inputs
+ (list sbcl-alexandria))
+ (synopsis "Common Lisp utility library")
(description
- "Additional dolist style macros for Common Lisp, such as
-@code{doalist}, @code{dohash}, @code{dolist*}, @code{doplist}, @code{doseq}
-and @code{doseq*}.")
- (license license:zlib))))
+ "This is a Common Lisp library providing various utilities.")
+ (license license:expat))))
-(define-public ecl-trivial-do
- (sbcl-package->ecl-package sbcl-trivial-do))
+(define-public cl-golden-utils
+ (sbcl-package->cl-source-package sbcl-golden-utils))
-(define-public cl-trivial-do
- (sbcl-package->cl-source-package sbcl-trivial-do))
+(define-public ecl-golden-utils
+ (sbcl-package->ecl-package sbcl-golden-utils))
-(define-public sbcl-common-lisp-jupyter
- (let ((commit "ba9f0e746b9200d6fd6db647d7274448119ed01b")
- (revision "3"))
+(define-public sbcl-graph
+ (let ((commit "78bf9ec930d8eae4f0861b5be76765fb1e45e24f")
+ (revision "0"))
(package
- (name "sbcl-common-lisp-jupyter")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-graph")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/yitzchak/common-lisp-jupyter")
- (commit commit)))
- (file-name (git-file-name "common-lisp-jupyter" commit))
+ (uri
+ (git-reference
+ (url "https://github.com/eschulte/graph")
+ (commit commit)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0si69xfzi769dprwfy7gp1x3bl7lxz6d4n98sa26w9r41wvay5ja"))))
+ (base32
+ "1qpij4xh8bqwc2myahpilcbh916v7vg0acz2fij14d3y0jm02h0g"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-stefil))
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cl-base64
- sbcl-cl-indentify
- sbcl-closer-mop
- sbcl-dissect
- sbcl-eclector
- sbcl-ironclad
- sbcl-iterate
- sbcl-multilang-documentation
- sbcl-puri
- sbcl-pzmq
- sbcl-shasht
- sbcl-static-vectors
- sbcl-trivial-do
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-trivial-mimes))
- (home-page "https://yitzchak.github.io/common-lisp-jupyter/")
- (synopsis "Common Lisp kernel for Jupyter")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-heap" ,sbcl-cl-heap)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("curry-compose-reader-macros" ,sbcl-curry-compose-reader-macros)
+ ("metabang-bind" ,sbcl-metabang-bind)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("yason" ,sbcl-yason)))
+ (arguments
+ '(#:asd-systems '("graph"
+ "graph/dot"
+ "graph/json")))
+ (synopsis "Graph data structure and algorithms for Common Lisp")
(description
- "This is a Common Lisp kernel for Jupyter along with a library for
-building Jupyter kernels, based on Maxima-Jupyter which was based on
-@code{cl-jupyter}.")
- (license license:expat))))
+ "The GRAPH Common Lisp library provides a data structures to represent
+graphs, as well as some graph manipulation and analysis algorithms (shortest
+path, maximum flow, minimum spanning tree, etc.).")
+ (home-page "https://eschulte.github.io/graph/")
+ (license license:gpl3+))))
-(define-public ecl-common-lisp-jupyter
- (sbcl-package->ecl-package sbcl-common-lisp-jupyter))
+(define-public cl-graph
+ (sbcl-package->cl-source-package sbcl-graph))
-(define-public cl-common-lisp-jupyter
- (sbcl-package->cl-source-package sbcl-common-lisp-jupyter))
+(define-public ecl-graph
+ (sbcl-package->ecl-package sbcl-graph))
-(define-public sbcl-radiance
- (let ((commit "8d826c7fe1935338565580931db43f46181e0e85")
- (revision "3"))
+(define-public sbcl-green-threads
+ (let ((commit "fff5ebecb441a37e5c511773716aafd84a3c5840")
+ (revision "1"))
(package
- (name "sbcl-radiance")
- (version (git-version "2.1.2" revision commit))
+ (name "sbcl-green-threads")
+ (version (git-version "0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/radiance")
+ (url "https://github.com/thezerobit/green-threads")
(commit commit)))
- (file-name (git-file-name "radiance" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1j823dgp87www0sjbcbv9j025bfxlkwhjd7kz6635mrqwmmlki4l"))))
+ (base32
+ "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-async-future" ,sbcl-cl-async-future)
+ ("cl-cont" ,sbcl-cl-cont)))
+ (native-inputs
+ (list sbcl-prove))
(arguments
- `(#:tests? #f ; TODO: The tests require some configuration.
+ `(;; TODO: Fix the tests. They fail with:
+ ;; "The function BLACKBIRD::PROMISE-VALUES is undefined"
+ #:tests? #f
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'disable-quicklisp
+ (add-after 'unpack 'fix-tests
(lambda _
- ;; Disable the automatic installation of systems by Quicklisp.
- ;; (Maybe there would be a way to package Quicklisp and make it
- ;; install things in the user's directory instead of
- ;; /gnu/store/...).
- (substitute* "interfaces.lisp"
- (("\\(unless \\(asdf:find-system configured-implementation NIL\\)"
- all)
- (string-append "#+quicklisp " all))))))))
- (native-inputs
- (list sbcl-alexandria
- sbcl-dexador
- sbcl-parachute
- sbcl-verbose))
- (inputs
- (list sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cl-ppcre
- sbcl-closer-mop
- sbcl-documentation-utils
- sbcl-deploy
- sbcl-form-fiddle
- sbcl-lambda-fiddle
- sbcl-local-time
- sbcl-modularize-hooks
- sbcl-modularize-interfaces
- sbcl-puri
- sbcl-trivial-indent
- sbcl-trivial-mimes
- sbcl-ubiquitous))
- (home-page "https://shirakumo.github.io/radiance/")
- (synopsis "Common Lisp web application environment")
+ (substitute* "green-threads-test.asd"
+ (("cl-test-more")
+ "prove"))
+ #t)))))
+ (synopsis "Cooperative multitasking library for Common Lisp")
(description
- "Radiance is a web application environment, which is sort of like a web
-framework, but more general, more flexible. It should let you write personal
-websites and generally deployable applications easily and in such a way that
-they can be used on practically any setup without having to undergo special
-adaptations.")
- (license license:zlib))))
+ "This library allows for cooperative multitasking with help of cl-cont
+for continuations. It tries to mimic the API of bordeaux-threads as much as
+possible.")
+ (home-page "https://github.com/thezerobit/green-threads")
+ (license license:bsd-3))))
-(define-public ecl-radiance
- (sbcl-package->ecl-package sbcl-radiance))
+(define-public cl-green-threads
+ (sbcl-package->cl-source-package sbcl-green-threads))
-(define-public cl-radiance
- (sbcl-package->cl-source-package sbcl-radiance))
+(define-public ecl-green-threads
+ (sbcl-package->ecl-package sbcl-green-threads))
-(define-public sbcl-radiance-contribs
- (let ((commit "710b3e1f9971e48368d52eea0b407f2e8f510981")
+(define-public sbcl-gsll
+ (let ((commit "1a8ada22f9cf5ed7372d352b2317f4ccdb6ab308")
(revision "1"))
(package
- (name "sbcl-radiance-contribs")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-gsll")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/radiance-contribs")
+ (url "https://gitlab.common-lisp.net/antik/gsll.git")
(commit commit)))
- (file-name (git-file-name "radiance-contribs" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "08ivnd7a6vfciqna680qpx6zj6vw9xcbrzq29iz3x7x9sp1pqgq3"))))
+ (base32
+ "0z5nypfk26hxihb08p085644afawicrgb4xvadh3lmrn46qbjfn4"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; TODO: Include more contribs.
- `(#:asd-systems '("r-clip"
- "i-log4cl"
- "i-sqlite"
- "r-data-model"
- "r-simple-rate"
- "r-welcome")))
+ (native-inputs
+ (list sbcl-lisp-unit))
(inputs
- (list sbcl-radiance
- sbcl-cffi
- sbcl-clip
- sbcl-cl-sqlite
- sbcl-log4cl))
- (home-page "https://shirakumo.github.io/radiance/")
- (synopsis "Standard implementations and drivers for the radiance interfaces")
+ `(("alexandria" ,sbcl-alexandria)
+ ("antik-base" ,sbcl-antik-base)
+ ("cffi" ,sbcl-cffi)
+ ("gsl" ,gsl)
+ ("metabang-bind" ,sbcl-metabang-bind)
+ ("trivial-features" ,sbcl-trivial-features)
+ ("trivial-garbage" ,sbcl-trivial-garbage)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-cffi-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gsll.asd"
+ ((":depends-on \\(#:foreign-array")
+ ":depends-on (#:foreign-array #:cffi-libffi"))
+ (substitute* "init/init.lisp"
+ (("libgslcblas.so" all)
+ (string-append
+ (assoc-ref inputs "gsl") "/lib/" all)))
+ (substitute* "init/init.lisp"
+ (("libgsl.so" all)
+ (string-append
+ (assoc-ref inputs "gsl") "/lib/" all))))))))
+ (synopsis "GNU Scientific Library for Lisp")
(description
- "This is a collection of useful helper modules and standard
-implementations for Radiance interfaces.")
- (license license:zlib))))
+ "The GNU Scientific Library for Lisp (GSLL) allows the use of the
+GNU Scientific Library (GSL) from Common Lisp. This library provides a
+full range of common mathematical operations useful to scientific and
+engineering applications. The design of the GSLL interface is such
+that access to most of the GSL library is possible in a Lisp-natural
+way; the intent is that the user not be hampered by the restrictions
+of the C language in which GSL has been written. GSLL thus provides
+interactive use of GSL for getting quick answers, even for someone not
+intending to program in Lisp.")
+ (home-page "https://common-lisp.net/project/gsll/")
+ (license license:gpl3))))
-(define-public ecl-radiance-contribs
- (sbcl-package->ecl-package sbcl-radiance-contribs))
+(define-public cl-gsll
+ (sbcl-package->cl-source-package sbcl-gsll))
-(define-public cl-radiance-contribs
- (sbcl-package->cl-source-package sbcl-radiance-contribs))
+(define-public ecl-gsll
+ (sbcl-package->ecl-package sbcl-gsll))
-(define-public sbcl-daemon
- (let ((commit "d5652f4332c3cee21e9bf83b9237129605004597")
- (revision "1"))
+(define-public sbcl-gtwiwtg
+ (package
+ (name "sbcl-gtwiwtg")
+ (version "0.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cbeo/gtwiwtg/")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0lkraw0dwh4is4x5sp5rjrw6f93m0gr9849abrbi12s25ws7jbw4"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-osicat sbcl-prove))
+ (home-page "https://github.com/cbeo/gtwiwtg/")
+ (synopsis "Naive generators for Common Lisp")
+ (description
+ "The GTWIWTG library (Generators The Way I Want Them Generated --
+technically not generators, but iterators) is meant to be small, explorable,
+and understandable.")
+ (license license:gpl3)))
+
+(define-public cl-gtwiwtg
+ (sbcl-package->cl-source-package sbcl-gtwiwtg))
+
+(define-public ecl-gtwiwtg
+ (sbcl-package->ecl-package sbcl-gtwiwtg))
+
+(define-public sbcl-gtype
+ (let ((commit "2442e32485635525af278ebd8fa69a27d5b8cf18")
+ (revision "2"))
(package
- (name "sbcl-daemon")
- (version (git-version "0.0.4" revision commit))
+ (name "sbcl-gtype")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/snmsts/daemon")
+ (url "https://github.com/numcl/gtype")
(commit commit)))
- (file-name (git-file-name "daemon" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4"))))
+ (base32 "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-trivial-features))
- (home-page "https://github.com/snmsts/daemon")
- (synopsis "Daemonize Common Lisp processes")
+ (synopsis "C++/Julia-like parametric types in Common Lisp")
(description
- "DAEMON provides the functionality of daemonizing Common Lisp processes
-on UNIX like platforms.")
- (license license:expat))))
+ "Support library for numcl that provides Julia-like runtime parametric
+type correctness in Common Lisp. It is based on CLtL2 extensions.")
+ (home-page "https://github.com/numcl/gtype")
+ (license license:lgpl3+)
+ (inputs
+ `(("trivialib.type-unify" ,sbcl-trivialib-type-unify)
+ ("trivial-cltl2" ,sbcl-trivial-cltl2)
+ ("trivia" ,sbcl-trivia)
+ ("alexandria" ,sbcl-alexandria)
+ ("iterate" ,sbcl-iterate)
+ ("type-r" ,sbcl-type-r)))
+ (native-inputs
+ (list sbcl-fiveam)))))
-(define-public ecl-daemon
- (sbcl-package->ecl-package sbcl-daemon))
+(define-public cl-gtype
+ (sbcl-package->cl-source-package sbcl-gtype))
-(define-public cl-daemon
- (sbcl-package->cl-source-package sbcl-daemon))
+(define-public ecl-gtype
+ (let ((pkg (sbcl-package->ecl-package sbcl-gtype)))
+ (package
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; The tests fail on ECL with a COMPILE-FILE-ERROR for t/package.lisp.
+ ((#:tests? _ #f) #f))))))
-(define-public sbcl-file-attributes
- (let ((commit "bbde396438f37d676de9775239115410bec4da2d"))
+(define-public sbcl-harmony
+ (let ((commit "0b57483cc0341936c201b620f82a8542c606991f")
+ (revision "0"))
(package
- (name "sbcl-file-attributes")
- (version (git-version "1.0.0" "2" commit))
+ (name "sbcl-harmony")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/file-attributes/")
+ (url "https://github.com/Shirakumo/harmony")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-harmony" version))
(sha256
- (base32 "0n8q818ry2shggjfhp8gjby8v5mla9pg97c5g19pcglpnwim7a74"))))
+ (base32 "0pqmfi3yi3gi7b7dyayrb621hp60rn7hasq0cl0fis3vg0fp5dja"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-features))
- (home-page "https://shinmera.github.io/file-attributes/")
- (synopsis "Access to common file attributes in Common Lisp")
+ (list sbcl-atomics
+ sbcl-bordeaux-threads
+ sbcl-cl-mixed
+ sbcl-stealth-mixin
+ sbcl-trivial-features))
+ (home-page "https://shirakumo.github.io/harmony/")
+ (synopsis "Common Lisp sound server and sound processing library")
(description
- "This is a small OS portability library to retrieve and set file
-attributes not supported by the Common Lisp standard functions.")
+ "HARMONY is a library that provides you with audio processing tools as
+well as an audio server to play back music, sfx, and so forth. It is most
+suited for use in a game engine, but may feasibly also be used for more
+advanced things such as a DAW")
(license license:zlib))))
-(define-public ecl-file-attributes
- (sbcl-package->ecl-package sbcl-file-attributes))
+(define-public cl-harmony
+ (sbcl-package->cl-source-package sbcl-harmony))
-(define-public cl-file-attributes
- (sbcl-package->cl-source-package sbcl-file-attributes))
+(define-public ecl-harmony
+ (sbcl-package->ecl-package sbcl-harmony))
-(define-public sbcl-filesystem-utils
- (let ((commit "a07e8b61b89d4b46408fb9294d9b8130e8c8a02e")
- (revision "2"))
+(define-public sbcl-hash-set
+ (let ((commit "6feb20de457f14e24a83815be1097aa02cca5986")
+ (revision "0"))
(package
- (name "sbcl-filesystem-utils")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-hash-set")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/filesystem-utils/")
+ (url "https://github.com/samebchase/hash-set")
(commit commit)))
- (file-name (git-file-name "cl-filesystem-utils" version))
+ (file-name (git-file-name "cl-hash-set" version))
(sha256
- (base32 "1zv2i2gndnbs7hz3bgkkq1qfx604wbndpc7qqlqvg23fssn9w59f"))))
+ (base32 "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-documentation-utils
- sbcl-pathname-utils
- sbcl-trivial-features))
- (home-page "https://shinmera.github.io/filesystem-utils/")
- (synopsis "Collection of utilities for filesystem interaction")
- (description
- "This is an extension library to @code{pathname-utils}, to allow
-dealing with common problems with filesystems, such as listing files, probing
-file types, determining default directories, etc.")
- (license license:zlib))))
+ (native-inputs (list sbcl-fiveam))
+ (inputs (list sbcl-alexandria))
+ (home-page "https://github.com/samebchase/hash-set/")
+ (synopsis "Implementation of a hash-set")
+ (description "This package provides an implementation of the
+hash-set data structure. It has constant time lookup, insertion and
+deletion.")
+ (license license:unlicense))))
-(define-public ecl-filesystem-utils
- (sbcl-package->ecl-package sbcl-filesystem-utils))
+(define-public cl-hash-set
+ (sbcl-package->cl-source-package sbcl-hash-set))
-(define-public cl-filesystem-utils
- (sbcl-package->cl-source-package sbcl-filesystem-utils))
+(define-public ecl-hash-set
+ (sbcl-package->ecl-package sbcl-hash-set))
-(define-public sbcl-depot
- (let ((commit "73822d9f480cbad00971b45ee80117297a67fb53")
+(define-public sbcl-hdf5-cffi
+ (let ((commit "5b5c88f191e470e4fe96b462334e3ce0806eed5c")
(revision "1"))
(package
- (name "sbcl-depot")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-hdf5-cffi")
+ (version (git-version "1.8.18" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/depot/")
+ (url "https://github.com/hdfgroup/hdf5-cffi")
(commit commit)))
+ (file-name (git-file-name "cl-hdf5-cffi" version))
(sha256
- (base32 "1v42pirdwbxy8l8i9a2jmbpri8a62vh0r4vm25xwaak0y4gr71va"))
- (file-name (git-file-name "depot" version))))
+ (base32 "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"))))
(build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp bindings for the HDF5 library")
+ (description
+ "@code{hdf5-cffi} is a CFFI wrapper for the HDF5 library.")
+ (home-page "https://github.com/hdfgroup/hdf5-cffi")
+ (license (license:non-copyleft
+ (string-append "https://github.com/HDFGroup/hdf5-cffi/raw/"
+ commit
+ "/LICENSE")))
(inputs
- (list sbcl-atomics
- sbcl-babel
- sbcl-documentation-utils
- sbcl-trivial-features
- sbcl-trivial-gray-streams
- sbcl-zippy))
- ;; TODO: Some 6 tests fail, why? See https://github.com/Shinmera/depot/issues/2.
+ (list hdf5-1.10 sbcl-cffi))
+ (native-inputs
+ (list sbcl-fiveam))
(arguments
- '(#:asd-systems '("depot"
- "depot-in-memory"
- "depot-virtual"
- "depot-zip")))
- (synopsis "Protocol for transparent collections of files")
- (description "This is a system presenting a protocol for \"file
-systems\": things that present a collection of \"files,\" which are things
-that have several attributes, and a central data payload. Most notably this
-includes the OS filesystem, but can also be used to address other
-filesystem-like things like archives, object stores, etc. in the same
-manner.")
- (home-page "https://shinmera.github.io/depot/")
- (license license:zlib))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libhdf5.so")
+ (search-input-file inputs "/lib/libhdf5.so")))))
+ (add-after 'fix-paths 'fix-newer-hdf5-compatibility
+ (lambda _
+ (substitute* (list "src/h5-grovel.lisp"
+ "src/h5a-grovel.lisp"
+ "src/h5d-grovel.lisp"
+ "src/h5f-grovel.lisp"
+ "src/h5g-grovel.lisp"
+ "src/h5i-grovel.lisp"
+ "src/h5l-grovel.lisp"
+ "src/h5o-grovel.lisp"
+ "src/h5p-grovel.lisp"
+ "src/h5pl-grovel.lisp"
+ "src/h5r-grovel.lisp"
+ "src/h5s-grovel.lisp"
+ "src/h5t-grovel.lisp"
+ "src/h5z-grovel.lisp")
+ (("_H5private_H")
+ "H5private_H"))))
+ (add-after 'unpack 'fix-dependencies
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "hdf5-cffi.asd"
+ ((":depends-on \\(:cffi\\)")
+ ":depends-on (:cffi :cffi-grovel)"))
+ (substitute* "hdf5-cffi.test.asd"
+ ((":depends-on \\(:cffi :hdf5-cffi")
+ ":depends-on (:cffi :cffi-grovel :hdf5-cffi"))))))))))
-(define-public ecl-depot
- (sbcl-package->ecl-package sbcl-depot))
+(define-public cl-hdf5-cffi
+ (sbcl-package->cl-source-package sbcl-hdf5-cffi))
-(define-public cl-depot
- (sbcl-package->cl-source-package sbcl-depot))
+(define-public ecl-hdf5-cffi
+ (sbcl-package->ecl-package sbcl-hdf5-cffi))
-(define-public sbcl-cl-difflib
- (let ((commit "98eb335c693f1881584b83ca7be4a0fe05355c4e")
+(define-public sbcl-helambdap
+ (let ((commit "5bf65f57a36ee094cadb096caca6e90eb3ba46c4")
(revision "0"))
(package
- (name "sbcl-cl-difflib")
- (version (git-version "0.2" revision commit))
+ (name "sbcl-helambdap")
+ (version (git-version "20220103" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/wiseman/cl-difflib")
+ (url "https://git.code.sf.net/p/helambdap/code")
(commit commit)))
- (file-name
- (git-file-name name version))
+ (file-name (git-file-name "cl-helambdap" version))
(sha256
- (base32 "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"))))
+ (base32 "1kzapbf9l2bw8i9m9sxv0dfnkksrxq81d5hbn34pm25abk0i937j"))))
(build-system asdf-build-system/sbcl)
- ;; Due to the age of this library tests use some deprecated
- ;; functionality and keep failing.
- (arguments
- '(#:tests? #f))
- (home-page "https://github.com/wiseman/cl-difflib")
- (synopsis "Compute differences between pairs of sequences")
- (description
- "A Common Lisp library for computing differences between
-sequences based on the Python difflib module.")
+ (inputs
+ (list sbcl-cl-fad
+ sbcl-clad
+ sbcl-split-sequence
+ sbcl-xhtmlambda))
+ (synopsis "Common Lisp documentation system")
+ (description "HELambdap is a Common Lisp documentation system which
+strives to be simple to use, yet easily customizable.")
+ (home-page "https://helambdap.sourceforge.net")
(license license:expat))))
-(define-public ecl-cl-difflib
- (sbcl-package->ecl-package sbcl-cl-difflib))
+(define-public cl-helambdap
+ (sbcl-package->cl-source-package sbcl-helambdap))
-(define-public cl-difflib
- (sbcl-package->cl-source-package sbcl-cl-difflib))
+(define-public sbcl-history-tree
+ (package
+ (name "sbcl-history-tree")
+ (version "0.1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/history-tree")
+ (commit version)))
+ (file-name (git-file-name "cl-history-tree" version))
+ (sha256
+ (base32 "1n3q6aqh0wm24pksj8371j5iinxpzy2kcnz97kmpndm1yhv4x5f2"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list
+ sbcl-alexandria
+ sbcl-custom-hash-table
+ sbcl-local-time
+ sbcl-nclasses
+ sbcl-trivial-package-local-nicknames))
+ (native-inputs (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/history-tree")
+ (synopsis "Store the history of a browser's visited paths")
+ (description
+ "This data structure can be used to store the history of visited paths or
+URLs with a file or web browser, in a way that no “forward” element is ever
+forgotten.
-(define-public sbcl-cl-html-diff
- (let ((commit "5a0b39d1c524278d6f60851d7786bb2585614310")
- (revision "0"))
+The history tree is “global” in the sense that multiple owners (e.g. tabs) can
+have overlapping histories. On top of that, an owner can spawn another one,
+starting from one of its nodes (typically when you open a URL in a new tab).")
+ (license license:bsd-3)))
+
+(define-public cl-history-tree
+ (sbcl-package->cl-source-package sbcl-history-tree))
+
+(define-public ecl-history-tree
+ (sbcl-package->ecl-package sbcl-history-tree))
+
+(define-public sbcl-html-encode
+ (package
+ (name "sbcl-html-encode")
+ (version "1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-"
+ version ".tgz"))
+ (sha256
+ (base32
+ "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp library for encoding text in various web-savvy encodings")
+ (description
+ "A library for encoding text in various web-savvy encodings.")
+ (home-page "https://quickdocs.org/html-encode/")
+ (license license:expat)))
+
+(define-public cl-html-encode
+ (sbcl-package->cl-source-package sbcl-html-encode))
+
+(define-public ecl-html-encode
+ (sbcl-package->ecl-package sbcl-html-encode))
+
+(define-public sbcl-html-entities
+ (let ((commit "4af018048e891f41d77e7d680ed3aeb639e1eedb"))
(package
- (name "sbcl-cl-html-diff")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-html-entities")
+ (version (git-version "0.02" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/wiseman/cl-html-diff")
+ (url "https://github.com/BnMcGn/html-entities/")
(commit commit)))
- (file-name
- (git-file-name name version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb"))))
+ (base32 "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-difflib))
- (home-page "https://github.com/wiseman/cl-html-diff")
- (synopsis "Generate a human-readable diff of two HTML documents")
- (description
- "A Common Lisp library for generating a human-readable diff of two
-HTML documents.")
+ (list sbcl-cl-ppcre))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/BnMcGn/html-entities/")
+ (synopsis "Encode and decode entities in HTML with Common Lisp")
+ (description "Html-entities is a Common Lisp library that lets you
+encode and decode entities in HTML.")
(license license:expat))))
-(define-public ecl-cl-html-diff
- (sbcl-package->ecl-package sbcl-cl-html-diff))
+(define-public cl-html-entities
+ (sbcl-package->cl-source-package sbcl-html-entities))
-(define-public cl-html-diff
- (sbcl-package->cl-source-package sbcl-cl-html-diff))
+(define-public ecl-html-entities
+ (sbcl-package->ecl-package sbcl-html-entities))
-(define-public sbcl-tooter
- (let ((commit "2dcc2facddcacd79d0cce545a8c4b73c35826fc1")
- (revision "4"))
+(define-public sbcl-html-template
+ (package
+ (name "sbcl-html-template")
+ (version "0.9.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/edicl/html-template")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0wz3czvjsn4x971dsiia9f9nvvcmbkablcl75zsvxndkimc93wxb"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://edicl.github.io/html-template/")
+ (synopsis "HTML templates from Common Lisp")
+ (description
+ "HTML-TEMPLATE is a Common Lisp library which can be used to fill
+templates with arbitrary (string) values at runtime. The result does not have
+to be HTML.
+
+It is loosely modeled after the Perl module @code{HTML::Template} and
+partially compatible with a its syntax, though both libraries contain some
+extensions that the other does not support.
+
+HTML-TEMPLATE translates templates into efficient closures which can be
+re-used as often as needed. It uses a cache mechanism so you can update
+templates while your program is running and have the changes take effect
+immediately.")
+ (license license:bsd-2)))
+
+(define-public cl-html-template
+ (sbcl-package->cl-source-package sbcl-html-template))
+
+(define-public ecl-html-template
+ (sbcl-package->ecl-package sbcl-html-template))
+
+(define-public sbcl-http-body
+ (let ((commit "3e4bedd6a9d9bc4e1dc0a45e5b55360ae30fd388")
+ (revision "2"))
(package
- (name "sbcl-tooter")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-http-body")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/http-body")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("http-body-test" "http-body")))
+ (native-inputs
+ (list sbcl-assoc-utils sbcl-prove sbcl-trivial-utf-8))
+ (inputs
+ (list sbcl-babel
+ sbcl-cl-ppcre
+ sbcl-fast-http
+ sbcl-flexi-streams
+ sbcl-jonathan
+ sbcl-trivial-gray-streams
+ sbcl-cl-utilities
+ sbcl-quri))
+ (home-page "https://github.com/fukamachi/http-body")
+ (synopsis "HTTP POST data parser")
+ (description
+ "HTTP-Body parses HTTP POST data and returns POST parameters. It
+supports application/x-www-form-urlencoded, application/json, and
+multipart/form-data.")
+ (license license:bsd-2))))
+
+(define-public cl-http-body
+ (sbcl-package->cl-source-package sbcl-http-body))
+
+(define-public ecl-http-body
+ (sbcl-package->ecl-package sbcl-http-body))
+
+(define-public sbcl-hu.dwim.asdf
+ (let ((commit "67cdf84390e530af4303cc4bc815fdf2a5e48f59"))
+ (package
+ (name "sbcl-hu.dwim.asdf")
+ (version "20200724")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/tooter")
+ (url "https://github.com/hu-dwim/hu.dwim.asdf")
(commit commit)))
- (file-name (git-file-name "cl-tooter" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1zisrmslj4rnibm02vxh7hbas2cfsjh6iizs2nfdg3a3pn7bhf6h"))))
+ (base32
+ "0p81jalilkaqw832a12s35q0z6rrarxjasm1jy6h4fvyj9pf0zkx"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cl-ppcre
- sbcl-documentation-utils
- sbcl-drakma
- sbcl-yason))
- (synopsis "Common Lisp client library for Mastodon instances")
- (description
- "This is a Common Lisp library implementing the full v1 REST API
-protocol for Mastodon.")
- (home-page "https://shinmera.github.io/tooter/")
- (license license:zlib))))
+ (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
+ (synopsis "Extensions to ASDF")
+ (description "Various ASDF extensions such as attached test and
+documentation system, explicit development support, etc.")
+ (license license:public-domain))))
-(define-public ecl-tooter
- (sbcl-package->ecl-package sbcl-tooter))
+(define-public cl-hu.dwim.asdf
+ (sbcl-package->cl-source-package sbcl-hu.dwim.asdf))
-(define-public cl-tooter
- (sbcl-package->cl-source-package sbcl-tooter))
+(define-public ecl-hu.dwim.asdf
+ (sbcl-package->ecl-package sbcl-hu.dwim.asdf))
-(define-public sbcl-croatoan
- (let ((commit "282145ff9e9005fddc4241bc6827b3ab09c5bd25")
- (revision "1"))
+(define-public sbcl-hu.dwim.common
+ (package
+ (name "sbcl-hu.dwim.common")
+ (version "2015-07-09")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://beta.quicklisp.org/archive/hu.dwim.common/"
+ version "/hu.dwim.common-"
+ (string-replace-substring version "-" "")
+ "-darcs.tgz"))
+ (sha256
+ (base32 "12l1rr6w9m99w0b5gc6hv58ainjfhbc588kz6vwshn4gqsxyzbhp"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-hu.dwim.asdf))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-closer-mop
+ sbcl-hu.dwim.common-lisp
+ sbcl-iterate
+ sbcl-metabang-bind))
+ (home-page "https://dwim.hu/")
+ (synopsis "Common Lisp library shared by other hu.dwim systems")
+ (description "This package contains a support library for other
+hu.dwim systems.")
+ (license license:public-domain)))
+
+(define-public cl-hu.dwim.common
+ (sbcl-package->cl-source-package sbcl-hu.dwim.common))
+
+(define-public ecl-hu.dwim.common
+ (sbcl-package->ecl-package sbcl-hu.dwim.common))
+
+(define-public sbcl-hu.dwim.common-lisp
+ (let ((commit "90558195773383142a57a16687d5e7f4adea6418"))
(package
- (name "sbcl-croatoan")
- (version (git-version "2.0" revision commit))
+ (name "sbcl-hu.dwim.common-lisp")
+ (version "2021-01-27")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/McParen/croatoan")
+ (url "https://github.com/hu-dwim/hu.dwim.common-lisp/")
(commit commit)))
- (file-name (git-file-name "cl-croatoan" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "021h2f2yj4j9gynr3k7qi36x94jm5b95p3vaddbaih96wyzgbmq5"))))
+ (base32 "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "ncurses/ncurses.lisp"
- (("libncursesw.so")
- (search-input-file inputs "/lib/libncursesw.so"))))))))
- (inputs
- (list ncurses
- sbcl-cffi
- sbcl-trivial-gray-streams
- sbcl-bordeaux-threads))
- (synopsis "Common Lisp bindings for the ncurses terminal library")
- (description "Croatoan provides high-level Common Lisp CLOS bindings for
-the ncurses terminal library.")
- (home-page "https://github.com/McParen/croatoan")
- (license license:expat))))
+ (native-inputs
+ (list sbcl-hu.dwim.asdf))
+ (home-page "http://dwim.hu/project/hu.dwim.common-lisp")
+ (synopsis "Redefine some standard Common Lisp names")
+ (description "This library is a redefinition of the standard Common Lisp
+package that includes a number of renames and shadows.")
+ (license license:public-domain))))
-(define-public ecl-croatoan
- (sbcl-package->ecl-package sbcl-croatoan))
+(define-public cl-hu.dwim.common-lisp
+ (sbcl-package->cl-source-package sbcl-hu.dwim.common-lisp))
-(define-public cl-croatoan
- (sbcl-package->cl-source-package sbcl-croatoan))
+(define-public ecl-hu.dwim.common-lisp
+ (sbcl-package->ecl-package sbcl-hu.dwim.common-lisp))
-(define-public sbcl-cl-spark
- (let ((commit "4e34bcebdcf8e45265986eb43ad4ad03bb41a581")
- (revision "1"))
+(define-public sbcl-hu.dwim.defclass-star
+ (let ((commit "3086878a485074f9b2913c58267a9b764cd632fd"))
(package
- (name "sbcl-cl-spark")
- (version (git-version "0.1.13" revision commit))
+ (name "sbcl-hu.dwim.defclass-star")
+ ;; We used to set version from the date when it was a darcs repo, so we
+ ;; keep the year so that package gets updated on previous installs.
+ (version (git-version "2021" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tkych/cl-spark")
+ (url "https://github.com/hu-dwim/hu.dwim.defclass-star")
(commit commit)))
- (file-name (git-file-name "cl-spark" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"))))
+ (base32 "19ipds9r71qymfdp4izg0l7zmvinp06adr8rdalhaq7v7mzpg83z"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
- (synopsis "Common Lisp library to make histograms")
- (description "This is a Common Lisp library to make histograms using
-UTF-8 block characters.")
- (home-page "https://github.com/tkych/cl-spark")
- (license license:expat))))
+ (list ;; These 2 inputs are only needed tests which are disabled, see below.
+ ;; ("hu.dwim.common" ,sbcl-hu.dwim.common)
+ ;; Need cl- package for the :hu.dwim.stefil+hu.dwim.def+swank system.
+ ;; ("hu.dwim.stefil" ,cl-hu.dwim.stefil)
+ sbcl-hu.dwim.asdf))
+ (arguments
+ `(;; Tests require a circular dependency: hu.dwim.stefil -> hu.dwim.def
+ ;; -> hu.dwim.util -> hu.dwim.defclass-star.
+ #:tests? #f))
+ (home-page "https://github.com/hu-dwim/hu.dwim.defclass-star")
+ (synopsis "Simplify definitions with defclass* and friends in Common Lisp")
+ (description "@code{defclass-star} provides defclass* and defcondition* to
+simplify class and condition declarations. Features include:
-(define-public ecl-cl-spark
- (sbcl-package->ecl-package sbcl-cl-spark))
+@itemize
+@item Automatically export all or select slots at compile time.
+@item Define the @code{:initarg} and @code{:accessor} automatically.
+@item Specify a name transformer for both the @code{:initarg} and
+@code{:accessor}, etc.
+@item Specify the @code{:initform} as second slot value.
+@end itemize
-(define-public cl-spark
- (sbcl-package->cl-source-package sbcl-cl-spark))
+See
+@url{https://common-lisp.net/project/defclass-star/configuration.lisp.html}
+for an example.")
+ (license license:public-domain))))
-(define-public sbcl-access
- (let ((commit "1b26db3760018cdc4624f880f0a1e0155d8f6c50")
+(define-public cl-hu.dwim.defclass-star
+ (sbcl-package->cl-source-package sbcl-hu.dwim.defclass-star))
+
+(define-public ecl-hu.dwim.defclass-star
+ (sbcl-package->ecl-package sbcl-hu.dwim.defclass-star))
+
+(define-public sbcl-hu.dwim.graphviz
+ (let ((commit "31522ca8b9a04d535b7cec20ef24d8bf3b26d52b")
(revision "1"))
(package
- (name "sbcl-access")
- (version (git-version "1.5.0" revision commit))
+ (name "sbcl-hu.dwim.graphviz")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/access")
+ (url "https://github.com/hu-dwim/hu.dwim.graphviz")
(commit commit)))
- (file-name (git-file-name "access" version))
+ (file-name (git-file-name "cl-hu.dwim.graphviz" version))
(sha256
- (base32 "1knd3n4mpzkc97i1znbas32pscd30416isvmx2pjmgvar6k93pl5"))))
+ (base32 "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-graphviz-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "source/package.lisp"
+ (("libgvc.so")
+ (search-input-file inputs "/lib/libgvc.so"))))))))
(native-inputs
- (list sbcl-lisp-unit2))
+ (list sbcl-hu.dwim.common sbcl-hu.dwim.stefil))
(inputs
- (list sbcl-alexandria sbcl-anaphora sbcl-closer-mop
- sbcl-cl-interpol sbcl-iterate))
- (synopsis
- "Common lisp library to unify access to dictionary-like structures")
+ (list graphviz sbcl-cffi sbcl-metabang-bind))
+ (home-page "https://github.com/hu-dwim/hu.dwim.graphviz")
+ (synopsis "Graphviz layouting using CFFI bindings")
(description
- "This is a Common lisp library to unify access to the most common
-dictionary-like data structures.")
- (home-page "https://github.com/sharplispers/access")
- (license license:bsd-3))))
+ "This package provides CFFI bindings to the Graphviz library in Common
+Lisp.")
+ (license license:public-domain))))
-(define-public ecl-access
- (sbcl-package->ecl-package sbcl-access))
+(define-public cl-hu.dwim.graphviz
+ (sbcl-package->cl-source-package sbcl-hu.dwim.graphviz))
-(define-public cl-access
- (sbcl-package->cl-source-package sbcl-access))
+(define-public ecl-hu.dwim.graphviz
+ (sbcl-package->ecl-package sbcl-hu.dwim.graphviz))
-(define-public sbcl-sxql-composer
- (let ((commit "2b2230cb01ae1b68e28921d99e4814046867fb75")
+(define-public sbcl-hunchenissr
+ (let ((commit "7df702f2e110999a2f31c7ebad81bfc39ac06670")
(revision "1"))
(package
- (name "sbcl-sxql-composer")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-hunchenissr")
+ (version (git-version "1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/sxql-composer")
+ (url "https://github.com/interactive-ssr/hunchenissr")
(commit commit)))
- (file-name (git-file-name "sxql-composer" version))
+ (file-name (git-file-name "hunchenissr" version))
(sha256
- (base32 "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r"))))
+ (base32 "0826qrvk64pjspdklns29dv3zhzfhd6k42fq030xajv8a7hkcxda"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-sxql))
- (synopsis "Build and compose SXQL queries dynamically")
+ (list sbcl-cl-base64
+ sbcl-cl-str
+ sbcl-hunchentoot
+ sbcl-issr-core
+ sbcl-jonathan
+ sbcl-plump
+ sbcl-portal))
+ (home-page "https://github.com/interactive-ssr/hunchenissr")
+ (synopsis "Interactive Server Side Rendering backend for Hunchentoot")
(description
- "This is a Common Lisp library to build and compose SXQL queries
-dynamically.")
- (home-page "https://github.com/mmontone/sxql-composer")
- (license license:expat))))
+ "Hunchenissr works together with issr.js for the development of
+interactive (changing without page refreshes) websites making use of websocket
+and Common Lisp server HTML generation instead of mountains of convoluted
+Javascript.")
+ (license license:llgpl))))
-(define-public ecl-sxql-composer
- (sbcl-package->ecl-package sbcl-sxql-composer))
+(define-public cl-hunchenissr
+ (sbcl-package->cl-source-package sbcl-hunchenissr))
-(define-public cl-sxql-composer
- (sbcl-package->cl-source-package sbcl-sxql-composer))
+(define-public ecl-hunchenissr
+ (sbcl-package->ecl-package sbcl-hunchenissr))
-(define-public sbcl-cl-i18n
- (let ((commit "acb162a12dac50fc46d83da8934fce85d19e31c4")
- (revision "3"))
+(define-public sbcl-hunchenissr-routes
+ (let ((commit "2e831975dc2a6c030f1b518747cf429be8484b31")
+ (revision "1"))
(package
- (name "sbcl-cl-i18n")
- (version (git-version "0.5.5" revision commit))
+ (name "sbcl-hunchenissr-routes")
+ (version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://codeberg.org/cage/cl-i18n")
+ (url "https://github.com/interactive-ssr/hunchenissr-routes")
(commit commit)))
- (file-name (git-file-name "cl-i18n" version))
+ (file-name (git-file-name "hunchenissr-routes" version))
(sha256
- (base32 "1y29cirmlyc406a45sdx39spvnjzbs772c977075ccicz46qaxz7"))))
+ (base32 "1xyqacihxwk4vnffqlg93czmalscglp6sh3bwy3qwb7hdxv6yxz6"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-babel sbcl-cl-ppcre-unicode))
- (synopsis "Internationalisation framework for Common Lisp")
+ (list sbcl-alexandria sbcl-cl-ppcre sbcl-cl-unification
+ sbcl-hunchenissr))
+ (home-page "https://github.com/interactive-ssr/hunchenissr-routes")
+ (synopsis "Enable path variables when using Hunchenissr")
(description
- "This is a Gettext-style internationalisation framework for Common
-Lisp.")
- (home-page "https://codeberg.org/cage/cl-i18n")
+ "This library enables path variables in networking routes when using
+Hunchenissr for Common Lisp. If a part of the path (between two slashes)
+starts with a question mark (?), that symbol (without question mark) will be
+bound to whatever value was in the same place in the URL (as a string).")
(license license:llgpl))))
-(define-public ecl-cl-i18n
- (sbcl-package->ecl-package sbcl-cl-i18n))
+(define-public cl-hunchenissr-routes
+ (sbcl-package->cl-source-package sbcl-hunchenissr-routes))
-(define-public cl-i18n
- (sbcl-package->cl-source-package sbcl-cl-i18n))
+(define-public ecl-hunchenissr-routes
+ (sbcl-package->ecl-package sbcl-hunchenissr-routes))
-(define-public sbcl-crypto-shortcuts
- (let ((commit "7efd22d80e867cd8c9f8f363d4fe7b51ee2dadc0")
+(define-public sbcl-hunchentoot
+ ;; NOTE: (Sharlatan-20220520T213309+0100): The latest commit fixed tests,
+ ;; switch to the version tag when release is ready.
+ (let ((commit "76862391040c20255c7275e815c2175e46bfd080")
(revision "1"))
(package
- (name "sbcl-crypto-shortcuts")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-hunchentoot")
+ (version (git-version "1.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/crypto-shortcuts")
+ (url "https://github.com/edicl/hunchentoot")
(commit commit)))
- (file-name (git-file-name "crypto-shortcuts" version))
+ (file-name (git-file-name "cl-hunchentoot" version))
(sha256
- (base32 "0c0m0ar04jn7qf2v8c4sivamlzki03r13rnxy8b3n27rh9r6hgin"))))
+ (base32 "1h7ggmmzvgwr4p6j3ai0dqrw30q5309l13w4c03gqrapvwrb65l0"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-cl-who sbcl-drakma))
(inputs
- (list sbcl-cl-base64 sbcl-flexi-streams sbcl-ironclad))
- (synopsis "Collection of common cryptography functions")
+ (list sbcl-chunga
+ sbcl-cl-base64
+ sbcl-cl-fad
+ sbcl-cl-ppcre
+ sbcl-flexi-streams
+ sbcl-cl+ssl
+ sbcl-md5
+ sbcl-rfc2388
+ sbcl-trivial-backtrace
+ sbcl-usocket))
+ (home-page "https://edicl.github.io/hunchentoot/")
+ (synopsis "Web server written in Common Lisp")
(description
- "This is a collection of common cryptography functions for Common
-Lisp.")
- (home-page "https://shinmera.github.io/crypto-shortcuts/")
- (license license:zlib))))
+ "Hunchentoot is a web server written in Common Lisp and at the same
+time a toolkit for building dynamic websites. As a stand-alone web server,
+Hunchentoot is capable of HTTP/1.1 chunking (both directions), persistent
+connections (keep-alive), and SSL.")
+ (license license:bsd-2))))
-(define-public ecl-crypto-shortcuts
- (sbcl-package->ecl-package sbcl-crypto-shortcuts))
+(define-public cl-hunchentoot
+ (sbcl-package->cl-source-package sbcl-hunchentoot))
-(define-public cl-crypto-shortcuts
- (sbcl-package->cl-source-package sbcl-crypto-shortcuts))
+(define-public ecl-hunchentoot
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-hunchentoot))
+ (arguments
+ ;; Tests fail on ECL with 'Socket error in "socket": EINVAL'.
+ '(#:tests? #f))))
-(define-public sbcl-cl-html5-parser
- (let ((commit "74a92eb3a183a0afd089ea33350e816e6b9aeefa")
- (revision "1"))
+(define-public sbcl-hunchentoot-errors
+ (let ((commit "69eb3bcea59ed1ccf3dd1960e6d48fb21f1dadab")
+ (revision "0"))
(package
- (name "sbcl-cl-html5-parser")
+ (name "sbcl-hunchentoot-errors")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mmontone/hunchentoot-errors")
+ (commit commit)))
+ (file-name (git-file-name "cl-hunchentoot-errors" version))
+ (sha256
+ (base32 "0fab7s8qhhs713cw014qqvzm5z61wmxm2fcbkarhg41cz3li9k1j"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cl-mimeparse
+ sbcl-hunchentoot
+ sbcl-parse-number
+ sbcl-string-case))
+ (home-page "https://github.com/mmontone/hunchentoot-errors/")
+ (synopsis "Hunchentoot error pages and logs with request and session information")
+ (description
+ "This package provides a functionality augmenting Hunchentoot error
+pages and logs with request and session information.")
+ (license license:expat))))
+
+(define-public cl-hunchentoot-errors
+ (sbcl-package->cl-source-package sbcl-hunchentoot-errors))
+
+(define-public ecl-hunchentoot-errors
+ (sbcl-package->ecl-package sbcl-hunchentoot-errors))
+
+(define-public sbcl-hypergeometrica
+ (let ((commit "db723ceb343d89a1c8d7f9174cf3a76fa91522b5")
+ (revision "0"))
+ (package
+ (name "sbcl-hypergeometrica")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rotatef/cl-html5-parser")
+ (url "https://github.com/stylewarning/hypergeometrica")
(commit commit)))
- (file-name (git-file-name "cl-html5-parser" version))
+ (file-name (git-file-name "cl-hypergeometrica" version))
(sha256
- (base32 "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"))))
+ (base32 "1dfd6w9djgfh7f4z79d8qsyggrwkjlqhs9rxpzpzv092nlwg3l35"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-json-streams sbcl-split-sequence sbcl-stefil))
+ (list sbcl-fiasco))
(inputs
- (list sbcl-cl-ppcre sbcl-flexi-streams sbcl-string-case))
- (synopsis "HTML5 parser for Common Lisp")
- (description "This a Common Lisp library to parse HTML5 documents.")
- (home-page "https://github.com/rotatef/cl-html5-parser")
- (license license:lgpl3+))))
+ (list sbcl-alexandria
+ sbcl-cffi
+ sbcl-global-vars
+ sbcl-lparallel
+ sbcl-mmap
+ sbcl-napa-fft3
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/stylewarning/hypergeometrica")
+ (synopsis "High-precision arithmetic")
+ (description
+ "Hypergeometrica is a Common Lisp library for performing high-precision
+arithmetic, with a focus on performance. At the heart of it all are routines
+for multiplication. Hypergeometrica aims to support:
-(define-public ecl-cl-html5-parser
- (sbcl-package->ecl-package sbcl-cl-html5-parser))
+@itemize
+@item In-core multiplication using various algorithms, from schoolbook to
+floating-point FFTs.
+@item In-core multiplication for large numbers using exact convolutions via
+number-theoretic transforms, which is enabled by 64-bit modular arithmetic.
+@item Out-of-core multiplication using derivatives of the original
+Cooley–Tukey algorithm.
+@end itemize
-(define-public cl-html5-parser
- (sbcl-package->cl-source-package sbcl-cl-html5-parser))
+On top of multiplication, one can build checkpointed algorithms for computing
+various classical constants, like @math{\\pi}.")
+ (license license:bsd-3))))
-(define-public sbcl-percent-encoding
- (let ((commit "c1224e22bc8048fbd3ebbc9329715a0c1b673170")
+(define-public cl-hypergeometrica
+ (sbcl-package->cl-source-package sbcl-hypergeometrica))
+
+(define-public sbcl-idna
+ (package
+ (name "sbcl-idna")
+ (build-system asdf-build-system/sbcl)
+ (version "0.2.2")
+ (home-page "https://github.com/antifuchs/idna")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00nbr3mffxhlq14gg9d16pa6691s4qh35inyw76v906s77khm5a2"))))
+ (inputs
+ (list sbcl-split-sequence))
+ (synopsis "IDNA string encoding and decoding routines for Common Lisp")
+ (description "This Common Lisp library provides string encoding and
+decoding routines for IDNA, the International Domain Names in Applications.")
+ (license license:expat)))
+
+(define-public cl-idna
+ (sbcl-package->cl-source-package sbcl-idna))
+
+(define-public ecl-idna
+ (sbcl-package->ecl-package sbcl-idna))
+
+(define-public sbcl-ieee-floats
+ (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d")
(revision "1"))
(package
- (name "sbcl-percent-encoding")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-ieee-floats")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "20170924" revision commit))
+ (home-page "https://github.com/marijnh/ieee-floats/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/llibra/percent-encoding")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "percent-encoding" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"))))
+ (base32
+ "1xyj49j9x3lc84cv3dhbf9ja34ywjk1c46dklx425fxw9mkwm83m"))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "IEEE 754 binary representation for floats in Common Lisp")
+ (description "This is a Common Lisp library that converts
+floating point values to IEEE 754 binary representation.")
+ (license license:bsd-3))))
+
+(define-public cl-ieee-floats
+ (sbcl-package->cl-source-package sbcl-ieee-floats))
+
+(define-public ecl-ieee-floats
+ (sbcl-package->ecl-package sbcl-ieee-floats))
+
+(define-public sbcl-in-memory-streams
+ (let ((commit "bb4ce9c8c08479c9904f5d29f2b6187f264dc620")
+ (revision "1"))
+ (package
+ (name "sbcl-in-memory-streams")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/glv/cl-in-memory-streams")
+ (commit commit)))
+ (file-name (git-file-name "cl-in-memory-streams" version))
+ (sha256
+ (base32 "1fls1jnkf86wimip6f95y496sc4rxpsh2y65lgqsqpi0yda5xl2f"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-fiveam))
(inputs
- (list sbcl-anaphora sbcl-babel))
- (synopsis "RFC 3986 percent-encoding library")
+ (list sbcl-trivial-gray-streams))
+ (synopsis "In-memory streams for any element type")
(description
- "This is a Common Lisp library providing RFC 3986 percent-encoding.")
- (home-page "https://github.com/llibra/percent-encoding")
- (license license:expat))))
+ "This Common Lisp library provides an implementation of in-memory input
+streams, output streams and io streams for any type of elements.")
+ (home-page "https://codeberg.org/glv/cl-in-memory-streams")
+ (license license:gpl3+))))
-(define-public ecl-percent-encoding
- (sbcl-package->ecl-package sbcl-percent-encoding))
+(define-public cl-in-memory-streams
+ (sbcl-package->cl-source-package sbcl-in-memory-streams))
-(define-public cl-percent-encoding
- (sbcl-package->cl-source-package sbcl-percent-encoding))
+(define-public ecl-in-memory-streams
+ (sbcl-package->ecl-package sbcl-in-memory-streams))
-(define-public sbcl-machine-state
- (let ((commit "3d258eea63942e7d2fd7212f1ad8bbcf505634a2")
- (revision "2"))
+(define-public sbcl-incless
+ (let ((commit "395accf484ffdff70f20b941f322e8329c585ca7")
+ (revision "0"))
(package
- (name "sbcl-machine-state")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-incless")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/machine-state")
+ (url "https://github.com/s-expressionists/Incless")
(commit commit)))
- (file-name (git-file-name "cl-machine-state" version))
+ (file-name (git-file-name "cl-incless" commit))
(sha256
- (base32 "1fjf2v8agx75qnna1n8fn54lvb01w1rk1vddi3p45a2xw1kwhzml"))))
+ (base32 "14bkb5zx8xq6wv6dsqi041dwq9scvw3kdjlnkfs2ndazj0rb2a1k"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-opengl
- sbcl-documentation-utils))
- (arguments
- '(#:tests? #f ; No tests.
- #:asd-systems '("machine-state" "machine-state/opengl")))
- (home-page "https://shinmera.github.io/machine-state/")
- (synopsis "Retrieve machine state information about CPU time, memory usage and more")
+ (inputs (list sbcl-alexandria))
+ ;; See https://github.com/s-expressionists/Incless/issues/6
+ (arguments '(#:asd-systems '("incless")))
+ (home-page "https://github.com/s-expressionists/incless")
+ (synopsis "Implements print-object methods for many standard classes")
(description
- "This library implements various functions to access status information
-about the machine, process, etc.")
- (license license:zlib))))
+ "@code{cl-incless} implements print-object methods for many standard
+classes.")
+ (license license:bsd-2))))
-(define-public ecl-machine-state
- (sbcl-package->ecl-package sbcl-machine-state))
+(define-public cl-incless
+ (sbcl-package->cl-source-package sbcl-incless))
-(define-public cl-machine-state
- (sbcl-package->cl-source-package sbcl-machine-state))
+(define-public ecl-incless
+ (sbcl-package->ecl-package sbcl-incless))
-(define-public sbcl-cl-mount-info
- (let ((commit "2024f5037a7f63db3e3587dc9972cd7b9318f06b")
+(define-public sbcl-inferior-shell
+ (let ((commit "15c2d04a7398db965ea1c3ba2d49efa7c851f2c2")
(revision "1"))
(package
- (name "sbcl-cl-mount-info")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://notabug.org/cage/cl-mount-info.git")
- (commit commit)))
- (file-name (git-file-name "cl-mount-info" version))
- (sha256
- (base32 "0vza9gj9q42nzb5v8aj22lmn4aqx9vrddsb5a343nbwfz89hbh9x"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-cffi sbcl-cl-ppcre))
- (home-page "https://notabug.org/cage/cl-mount-info.git")
- (synopsis "Library to get information about mounted filesystems")
- (description
- "CL-MOUNT-INFO is a Common Lisp wrapper around @code{getmntent(3)} and
-related C functions to get information about the mounted file system.")
- (license license:lgpl3))))
+ (name "sbcl-inferior-shell")
+ (version (git-version "2.0.5" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fare/inferior-shell")
+ (commit commit)))
+ (file-name (git-file-name "inferior-shell" version))
+ (sha256
+ (base32 "02qx37zzk5j4xmwh77k2qa2wvnzvaj6qml5dh2q7b6b1ljvgcj4m"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-hu.dwim.stefil))
+ (inputs
+ (list sbcl-alexandria sbcl-fare-mop sbcl-fare-quasiquote
+ sbcl-fare-utils sbcl-trivia))
+ (home-page "https://github.com/fare/inferior-shell")
+ (synopsis "Spawn local or remote processes and shell pipes")
+ (description
+ "This package provides a Common Lisp system helping in scripting, it
+uses @code{uiop:run-program} as a backend.")
+ (license license:expat))))
-(define-public ecl-cl-mount-info
- (sbcl-package->ecl-package sbcl-cl-mount-info))
+(define-public cl-inferior-shell
+ (sbcl-package->cl-source-package sbcl-inferior-shell))
-(define-public cl-mount-info
- (sbcl-package->cl-source-package sbcl-cl-mount-info))
+(define-public ecl-inferior-shell
+ (sbcl-package->ecl-package sbcl-inferior-shell))
-(define-public sbcl-cl-diskspace
- (let ((commit "2dce2d0387d58221c452bd76c7b9b7a7de81ef55")
- (revision "1"))
+(define-public sbcl-infix-math
+ (let ((commit "f5155ae9709e518061ace79887d78f8e79c61cac")
+ (revision "0"))
(package
- (name "sbcl-cl-diskspace")
- (version (git-version "0.3.1" revision commit))
+ (name "sbcl-infix-math")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/muyinliu/cl-diskspace")
+ (url "https://github.com/ruricolist/infix-math")
(commit commit)))
- (file-name (git-file-name "cl-diskspace" version))
+ (file-name (git-file-name "cl-infix-math" version))
(sha256
- (base32 "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7"))))
+ (base32 "1h6p254xl793wfq3qla5y95k6zimy477f8brblx6ran3rg3bydbg"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp"
- (("grep")
- (search-input-file inputs "/bin/grep")))
- (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp"
- (("/bin/df")
- (which "df")))
- #t)))))
(inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("cffi" ,sbcl-cffi)
- ("grep" ,grep)))
- (home-page "https://github.com/muyinliu/cl-diskspace")
- (synopsis "Disk space information library for Common Lisp")
+ (list sbcl-alexandria sbcl-parse-number sbcl-serapeum sbcl-wu-decimal))
+ (home-page "https://github.com/ruricolist/infix-math")
+ (synopsis "Extensible infix syntax for math in Common Lisp")
(description
- "CL-DISKSPACE is a Common Lisp library to list disks with the command
-line tool @code{df} and get disk space information using @code{statvfs}.")
- (license license:isc))))
+ "Infix-Math is a library that provides a special-purpose syntax for
+transcribing mathematical formulas into Lisp.")
+ (license license:expat))))
-(define-public ecl-cl-diskspace
- (sbcl-package->ecl-package sbcl-cl-diskspace))
+(define-public cl-infix-math
+ (sbcl-package->cl-source-package sbcl-infix-math))
-(define-public cl-diskspace
- (sbcl-package->cl-source-package sbcl-cl-diskspace))
+(define-public ecl-infix-math
+ (sbcl-package->ecl-package sbcl-infix-math))
-(define-public sbcl-cl-cpus
+(define-public sbcl-inheriting-readers
(package
- (name "sbcl-cl-cpus")
- (version "0.0.3")
+ (name "sbcl-inheriting-readers")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/muyinliu/cl-cpus")
+ (url "https://github.com/Hexstream/inheriting-readers")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-cpus" version))
+ (file-name (git-file-name "cl-inheriting-readers" version))
(sha256
- (base32 "0sdaff9hpsx7bpkkkqavmxmrrlc2d61gmqjjgn8xchncng4a0rf8"))))
+ (base32 "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-cffi))
- (home-page "https://github.com/muyinliu/cl-cpus")
- (synopsis "Common Lisp feature to get number of CPUs")
+ (list sbcl-class-options
+ sbcl-closer-mop
+ sbcl-compatible-metaclasses))
+ (home-page "https://www.hexstreamsoft.com/libraries/inheriting-readers/")
+ (synopsis "Simple yet powerful value inheritance scheme")
(description
- "This package provides a Common Lisp system which has only one function to
-return the CPU count of the current system.")
- (license license:isc)))
+ "This package provides a simple yet powerful value inheritance scheme.")
+ (license license:unlicense)))
-(define-public ecl-cl-cpus
- (sbcl-package->ecl-package sbcl-cl-cpus))
+(define-public cl-inheriting-readers
+ (sbcl-package->cl-source-package sbcl-inheriting-readers))
-(define-public cl-cpus
- (sbcl-package->cl-source-package sbcl-cl-cpus))
+(define-public ecl-inheriting-readers
+ (sbcl-package->ecl-package sbcl-inheriting-readers))
-(define-public sbcl-system-load
- (let ((commit "3ff1a40be55866cc5316ac7a530d872b12510294")
+(define-public sbcl-interface
+ (let ((commit "6d8bd74214053debcbc0b174d65ea73c271c1563")
(revision "0"))
(package
- (name "sbcl-system-load")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-interface")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/system-load")
+ (url "https://github.com/stylewarning/interface")
(commit commit)))
- (file-name (git-file-name "cl-system-load" version))
+ (file-name (git-file-name "cl-interface" version))
(sha256
- (base32 "08d8kr8j5l2m8p69f47iklxhna394vx9mrys0sgplf5f2bqb7xcv"))))
+ (base32 "0h1bckhyig2znl6nrd3agjzz7knrm2kyh2vfyk7j60kzki9rpzxy"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/Shinmera/system-load")
- (synopsis "Access system's CPU and memory usage from Common Lisp")
+ (inputs (list sbcl-alexandria sbcl-global-vars))
+ (synopsis "System for defining interfaces")
(description
- "System-Load is a Common Lisp library for accessing the system's CPU and
-memory usage.")
- (license license:zlib))))
+ "This library contains an implementation of interfaces and
+implementations. They're sometimes called protocols in other
+languages. Broadly speaking, an @emph{interface} is some collection of
+function @emph{prototypes} that a valid implementation must implement.")
+ (home-page "https://github.com/stylewarning/interface")
+ (license license:bsd-3))))
-(define-public cl-system-load
- (sbcl-package->cl-source-package sbcl-system-load))
+(define-public cl-interface
+ (sbcl-package->cl-source-package sbcl-interface))
-(define-public ecl-system-load
- (sbcl-package->ecl-package sbcl-system-load))
+(define-public ecl-interface
+ (sbcl-package->ecl-package sbcl-interface))
-(define-public sbcl-fof
- (let ((commit "522879e7da110ecf2e841998b197b34062c54b29")
- (revision "1"))
+(define-public sbcl-introspect-environment
+ (let ((commit "8fb20a1a33d29637a22943243d1482a20c32d6ae")
+ (revision "2"))
(package
- (name "sbcl-fof")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-introspect-environment")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/Bike/introspect-environment")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/ambrevar/fof")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-fof" version))
+ (file-name (git-file-name "cl-introspect-environment" version))
(sha256
- (base32 "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("fof" "fof/mf")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "ffprobe.lisp"
- (("\\(defvar \\*ffprobe-command\\* \"ffprobe\"\\)")
- (format #f "(defvar *ffprobe-command* \"~a/bin/ffprobe\")"
- (assoc-ref inputs "ffmpeg")))))))))
- (inputs
- (list sbcl-alexandria
- sbcl-cl-json
- sbcl-cl-str
- sbcl-hu.dwim.defclass-star
- sbcl-local-time
- sbcl-magicffi
- sbcl-named-readtables
- sbcl-osicat
- sbcl-serapeum
- sbcl-trivia
- sbcl-trivial-package-local-nicknames
- ;; Non-CL deps:
- ffmpeg))
- (home-page "https://gitlab.com/ambrevar/fof")
- (synopsis "File object finder library for Common Lisp")
- (description
- "This library enable rapid file search, inspection and manipulation
-straight from the REPL.
-It aims at replacing Unix tools such as @code{find} or @code{du}.
-It also offers a replacement to the @code{pathname} Common Lisp API.
-Slot writers which commit changes to disk, e.g. permissions, modification
-time, etc.")
- (license license:gpl3+))))
+ (base32 "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Common Lisp environment introspection portability layer")
+ (description "This library is a small interface to portable but
+nonstandard introspection of Common Lisp environments. It is intended to
+allow a bit more compile-time introspection of environments in Common Lisp.
-(define-public ecl-fof
- (sbcl-package->ecl-package sbcl-fof))
+Quite a bit of information is available at the time a macro or compiler-macro
+runs; inlining info, type declarations, that sort of thing. This information
+is all standard - any Common Lisp program can @code{(declare (integer x))} and
+such.
-(define-public cl-fof
- (sbcl-package->cl-source-package sbcl-fof))
+This info ought to be accessible through the standard @code{&environment}
+parameters, but it is not. Several implementations keep the information for
+their own purposes but do not make it available to user programs, because
+there is no standard mechanism to do so.
-(define-public sbcl-computable-reals
- (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39"))
- (package
- (name "sbcl-computable-reals")
- (version (git-version "1.1.0" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stylewarning/computable-reals")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0f12axi53x14l12dgf4a1lfq3p1fx7fh7sjfc0db3lk88ph9qfwl"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/stylewarning/computable-reals")
- (synopsis "Arbitrary-precision, re-computing real-numbers in Common Lisp")
- (description
- "This library provides arbitrary precision (floating point) real
-numbers in Common Lisp.")
- (license license:bsd-3))))
+This library uses implementation-specific hooks to make information available
+to users. This is currently supported on SBCL, CCL, and CMUCL. Other
+implementations have implementations of the functions that do as much as they
+can and/or provide reasonable defaults.")
+ (license license:wtfpl2))))
-(define-public ecl-computable-reals
- (sbcl-package->ecl-package sbcl-computable-reals))
+(define-public cl-introspect-environment
+ (sbcl-package->cl-source-package sbcl-introspect-environment))
-(define-public cl-computable-reals
- (sbcl-package->cl-source-package sbcl-computable-reals))
+(define-public ecl-introspect-environment
+ (sbcl-package->ecl-package sbcl-introspect-environment))
-(define-public sbcl-policy-cond
- (let ((commit "eedb625520175bfdf44d385ff3b21039b7f75706")
+(define-public sbcl-iolib
+ (let ((commit "010b7a6bdd2e918ebf2ec85edd3853179f01cb30")
(revision "0"))
(package
- (name "sbcl-policy-cond")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-iolib")
+ (version (git-version "0.8.4" revision commit))
+ (home-page "https://github.com/sionescu/iolib")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stylewarning/policy-cond")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-policy-cond" version))
+ (file-name (git-file-name "cl-iolib" version))
(sha256
- (base32 "0xj2a6lcg7i7g4038sc4f641din6m8vdiha8c5afz9fik80bshxk"))))
+ (base32 "1qqy2yhprkmdn2vmi69akf818q3n99gv8cacv6456af0wjm5p1ga"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/stylewarning/policy-cond")
- (synopsis "Insert code based on compiler policy")
- (description "POLICY-COND provides tools to insert and execute code
-based on a compiler's OPTIMIZE policy. It also contains a contract-like notion
-of expectations, which allow dynamic checking or inclusion of various things
-that should happen depending on compiler policy.")
- (license license:bsd-3))))
+ (native-inputs
+ (list pkg-config sbcl-fiveam))
+ (inputs
+ (list libfixposix
+ sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-idna
+ sbcl-split-sequence
+ sbcl-swap-bytes))
+ (arguments
+ '(#:asd-systems '("iolib"
+ "iolib/os")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/syscalls/ffi-functions-unix.lisp"
+ (("\\(:default \"libfixposix\"\\)")
+ (string-append
+ "(:default \""
+ (assoc-ref inputs "libfixposix") "/lib/libfixposix\")")))
+ ;; Socket tests need Internet access, disable them.
+ (substitute* "iolib.asd"
+ (("\\(:file \"sockets\" :depends-on \\(\"pkgdcl\" \"defsuites\"\\)\\)")
+ "")))))))
+ (synopsis "Common Lisp I/O library")
+ (description "IOlib is to be a better and more modern I/O library than
+the standard Common Lisp library. It contains a socket library, a DNS
+resolver, an I/O multiplexer(which supports @code{select(2)}, @code{epoll(4)}
+and @code{kqueue(2)}), a pathname library and file-system utilities.")
+ (license license:expat))))
-(define-public cl-policy-cond
- (sbcl-package->cl-source-package sbcl-policy-cond))
+(define-public cl-iolib
+ (let ((parent (sbcl-package->cl-source-package sbcl-iolib)))
+ (package
+ (inherit parent)
+ (propagated-inputs
+ ;; Need header to compile.
+ (modify-inputs (package-propagated-inputs parent)
+ (prepend libfixposix))))))
-(define-public ecl-policy-cond
- (sbcl-package->ecl-package sbcl-policy-cond))
+(define-public ecl-iolib
+ (sbcl-package->ecl-package sbcl-iolib))
-(define-public sbcl-html-template
+(define-public sbcl-ironclad
(package
- (name "sbcl-html-template")
- (version "0.9.2")
+ (name "sbcl-ironclad")
+ (version "0.61")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/edicl/html-template")
+ (url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
(sha256
- (base32 "0wz3czvjsn4x971dsiia9f9nvvcmbkablcl75zsvxndkimc93wxb"))))
+ (base32 "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk"))
+ (file-name (git-file-name "cl-ironclad" version))))
(build-system asdf-build-system/sbcl)
- (home-page "https://edicl.github.io/html-template/")
- (synopsis "HTML templates from Common Lisp")
+ (native-inputs
+ ;; Tests only.
+ (list sbcl-rt))
+ (inputs
+ (list sbcl-bordeaux-threads sbcl-flexi-streams))
+ (synopsis "Cryptographic toolkit written in Common Lisp")
(description
- "HTML-TEMPLATE is a Common Lisp library which can be used to fill
-templates with arbitrary (string) values at runtime. The result does not have
-to be HTML.
+ "Ironclad is a cryptography library written entirely in Common Lisp.
+It includes support for several popular ciphers, digests, MACs and public key
+cryptography algorithms. For several implementations that support Gray
+streams, support is included for convenient stream wrappers.")
+ (home-page "https://github.com/sharplispers/ironclad")
+ (license license:bsd-3)))
-It is loosely modeled after the Perl module @code{HTML::Template} and
-partially compatible with a its syntax, though both libraries contain some
-extensions that the other does not support.
+(define-public cl-ironclad
+ (sbcl-package->cl-source-package sbcl-ironclad))
-HTML-TEMPLATE translates templates into efficient closures which can be
-re-used as often as needed. It uses a cache mechanism so you can update
-templates while your program is running and have the changes take effect
-immediately.")
- (license license:bsd-2)))
+(define-public ecl-ironclad
+ (sbcl-package->ecl-package sbcl-ironclad))
-(define-public ecl-html-template
- (sbcl-package->ecl-package sbcl-html-template))
+(define-public sbcl-issr-core
+ (let ((commit "64e3b07a63a7ca3ad70ba42474f98ac4513580aa")
+ (revision "1"))
+ (package
+ (name "sbcl-issr-core")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/interactive-ssr/core")
+ (commit commit)))
+ (file-name (git-file-name "issr-core" version))
+ (sha256
+ (base32 "1bajb09crzadkirdpd6jrpcc55irjd4sxzavygr25l85pafyhniw"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cl-str sbcl-global-vars sbcl-plump sbcl-tailrec))
+ (home-page
+ "https://github.com/interactive-ssr/client/blob/master/main.org")
+ (synopsis "The core functionality for ISSR server modules")
+ (description
+ "ISSR core provides functions and variables for ISSR server modules so
+that different servers can behave similarly. The most important features are
+Document Object Model differencing to generate instructions to update a DOM,
+and DOM cleaning, to ensure that all remote DOMs are the same.")
+ (license license:llgpl))))
-(define-public cl-html-template
- (sbcl-package->cl-source-package sbcl-html-template))
+(define-public cl-issr-core
+ (sbcl-package->cl-source-package sbcl-issr-core))
-(define-public sbcl-quickproject
+(define-public ecl-issr-core
+ (sbcl-package->ecl-package sbcl-issr-core))
+
+(define-public sbcl-iterate
(package
- (name "sbcl-quickproject")
- (version "1.4.1")
+ (name "sbcl-iterate")
+ (version "1.5.3")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xach/quickproject")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
+ (url "https://gitlab.common-lisp.net/iterate/iterate.git")
+ (commit version)))
+ (file-name (git-file-name "cl-iterate" version))
(sha256
- (base32 "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6"))))
+ (base32 "0l6l8fpgcpwpmi00jwmamxbspbqa8fil6dv11bf9gaxxbw41f8c2"))))
(build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-fad" ,sbcl-cl-fad)
- ("html-template" ,sbcl-html-template)))
- (home-page "https://xach.com/lisp/quickproject/")
- (synopsis "Create Common Lisp project skeletons")
- (description
- "Quickproject provides a quick way to make a Common Lisp project. After
-creating a project, it extends the ASDF registry so the project may be
-immediately loaded.")
+ (native-inputs
+ (list sbcl-rt))
+ (home-page "https://common-lisp.net/project/iterate/")
+ (synopsis "Iteration construct for Common Lisp")
+ (description "@code{iterate} is an iteration construct for Common Lisp.
+It is similar to the @code{CL:LOOP} macro, with these distinguishing marks:
+
+@itemize
+@item it is extensible,
+@item it helps editors like Emacs indent iterate forms by having a more
+ lisp-like syntax, and
+@item it isn't part of the ANSI standard for Common Lisp.
+@end itemize\n")
(license license:expat)))
-(define-public ecl-quickproject
- (sbcl-package->ecl-package sbcl-quickproject))
+(define-public cl-iterate
+ (sbcl-package->cl-source-package sbcl-iterate))
-(define-public cl-quickproject
- (sbcl-package->cl-source-package sbcl-quickproject))
+(define-public ecl-iterate
+ (sbcl-package->ecl-package sbcl-iterate))
-(define-public sbcl-bodge-math
- (let ((commit "9159b7faf88d440024c07110dbef2abddb20b9af")
+(define-public sbcl-ixf
+ (let ((commit "ed26f87e4127e4a9e3aac4ff1e60d1f39cca5183")
(revision "1"))
(package
- (name "sbcl-bodge-math")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-ixf")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dimitri/cl-ixf")
+ (commit commit)))
+ (file-name (git-file-name "cl-ixf" version))
+ (sha256
+ (base32 "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cl-ppcre
+ sbcl-ieee-floats
+ sbcl-local-time
+ sbcl-md5
+ sbcl-split-sequence))
+ (home-page "https://github.com/dimitri/cl-ixf")
+ (synopsis "Parse IBM IXF file format")
+ (description
+ "This is a Common Lisp library to handle the IBM PC version of the IXF
+(Integration Exchange Format) file format.")
+ (license license:public-domain))))
+
+(define-public cl-ixf
+ (sbcl-package->cl-source-package sbcl-ixf))
+
+(define-public ecl-ixf
+ (sbcl-package->ecl-package sbcl-ixf))
+
+(define-public sbcl-jonathan
+ (let ((commit "1f448b4f7ac8265e56e1c02b32ce383e65316300")
+ (revision "1"))
+ (package
+ (name "sbcl-jonathan")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/borodust/bodge-math")
+ (url "https://github.com/Rudolph-Miller/jonathan")
(commit commit)))
- (file-name (git-file-name "bodge-math" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v"))))
+ (base32 "14x4iwz3mbag5jzzzr4sb6ai0m9r4q4kyypbq32jmsk2dx1hi807"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove sbcl-legion))
(inputs
- (list sbcl-bodge-utilities sbcl-rtg-math))
- (home-page "https://github.com/borodust/bodge-math")
- (synopsis "Common Lisp core math utilities of BODGE library collection")
+ (list sbcl-cl-syntax sbcl-fast-io sbcl-proc-parse sbcl-cl-ppcre))
+ (home-page "https://rudolph-miller.github.io/jonathan/overview.html")
+ (synopsis "JSON encoder and decoder")
(description
- "This Common Lisp package contains the core math utilities of the
-@emph{Bodge} library collection.")
+ "High performance JSON encoder and decoder. Currently support: SBCL,
+CCL.")
+ ;; Author specifies the MIT license
(license license:expat))))
-(define-public ecl-bodge-math
- (sbcl-package->ecl-package sbcl-bodge-math))
+(define-public cl-jonathan
+ (sbcl-package->cl-source-package sbcl-jonathan))
-(define-public cl-bodge-math
- (sbcl-package->cl-source-package sbcl-bodge-math))
+(define-public ecl-jonathan
+ (sbcl-package->ecl-package sbcl-jonathan))
-(define-public sbcl-cl-mathstats
- (let ((commit "4df38ea1b9de069cf939919253565a9ca9538eca")
+(define-public sbcl-jose
+ (let ((commit "5b9f42dd4144138e41d75ec67ca46e6e91728f2c")
+ (revision "0"))
+ (package
+ (name "sbcl-jose")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1.0" revision commit))
+ (home-page "https://github.com/fukamachi/jose")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name "cl-jose" version))
+ (sha256
+ (base32 "1z7xjy4ihxa8ay5vznhnxkjflfx6xmfpgwxdakk9wmkw30p2yn4h"))))
+ (native-inputs (list sbcl-pem sbcl-rove))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-assoc-utils
+ sbcl-cl-base64
+ sbcl-ironclad
+ sbcl-jonathan
+ sbcl-split-sequence
+ sbcl-trivial-utf-8))
+ (synopsis "JOSE implementation for Common Lisp")
+ (description "A JSON Object Signing and Encryption (JOSE)
+implementation for Common Lisp.")
+ (license license:bsd-2))))
+
+(define-public cl-jose
+ (sbcl-package->cl-source-package sbcl-jose))
+
+(define-public ecl-jose
+ (sbcl-package->ecl-package sbcl-jose))
+
+(define-public sbcl-jpeg-turbo
+ (let ((commit "f79c646cc266c107bdace53572a31664754c6e0c")
(revision "1"))
(package
- (name "sbcl-cl-mathstats")
- (version (git-version "0.8.2" revision commit))
+ (name "sbcl-jpeg-turbo")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hraban/cl-mathstats")
+ (url "https://github.com/shamazmazum/jpeg-turbo/")
(commit commit)))
- (file-name (git-file-name "cl-mathstats" version))
+ (file-name (git-file-name "cl-jpeg-turbo" version))
(sha256
- (base32 "0gsjvmkmnxc4hp5z9mkm5vsllywqyg7kx8jgz88vnx47yj3va1s8"))))
+ (base32 "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-lib-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/jpeg-turbo.lisp"
+ (("\"libturbojpeg\\.so\\.0\"")
+ (string-append "\""
+ (search-input-file inputs
+ "/lib/libturbojpeg.so")
+ "\""))))))))
(native-inputs
- (list sbcl-lift))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cl-containers sbcl-metatilities-base))
- (home-page "https://github.com/hraban/cl-mathstats")
- (synopsis "Common Lisp collection of mathematical routines")
+ (list libjpeg-turbo sbcl-cffi))
+ (synopsis "Common Lisp wrapper for libjpeg-turbo")
(description
- "This package provides Common Lisp math and statistics routines.")
- (license license:expat))))
+ "This is a Common Lisp wrapper for libjpeg-turbo library which provides
+TurboJPEG API for compressing and decompressing JPEG images.")
+ (home-page "https://github.com/shamazmazum/jpeg-turbo/")
+ (license license:bsd-2))))
-(define-public ecl-cl-mathstats
- (sbcl-package->ecl-package sbcl-cl-mathstats))
+(define-public cl-jpeg-turbo
+ (sbcl-package->cl-source-package sbcl-jpeg-turbo))
-(define-public cl-mathstats
- (sbcl-package->cl-source-package sbcl-cl-mathstats))
+(define-public ecl-jpeg-turbo
+ (sbcl-package->ecl-package sbcl-jpeg-turbo))
-(define-public sbcl-bodge-blobs-support
- (let ((commit "c5034ca5f4fc3a44dbadeba215a09afd59a404b0")
+(define-public sbcl-jpl-queues
+ (package
+ (name "sbcl-jpl-queues")
+ (version "0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.thoughtcrime.us/software/jpl-queues/jpl-queues-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("jpl-util" ,sbcl-jpl-util)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (arguments
+ ;; Tests seem to be broken.
+ `(#:tests? #f))
+ (synopsis "Common Lisp library implementing a few different kinds of queues")
+ (description
+ "A Common Lisp library implementing a few different kinds of queues:
+
+@itemize
+@item Bounded and unbounded FIFO queues.
+@item Lossy bounded FIFO queues that drop elements when full.
+@item Unbounded random-order queues that use less memory than unbounded FIFO queues.
+@end itemize
+
+Additionally, a synchronization wrapper is provided to make any queue
+conforming to the @command{jpl-queues} API thread-safe for lightweight
+multithreading applications. (See Calispel for a more sophisticated CL
+multithreaded message-passing library with timeouts and alternation among
+several blockable channels.)")
+ (home-page "https://www.thoughtcrime.us/software/jpl-queues/")
+ (license license:isc)))
+
+(define-public cl-jpl-queues
+ (sbcl-package->cl-source-package sbcl-jpl-queues))
+
+(define-public ecl-jpl-queues
+ (sbcl-package->ecl-package sbcl-jpl-queues))
+
+(define-public sbcl-jpl-util
+ (let ((commit "0311ed374e19a49d43318064d729fe3abd9a3b62"))
+ (package
+ (name "sbcl-jpl-util")
+ (version "20151005")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ ;; Quicklisp uses this fork.
+ (url "https://github.com/hawkir/cl-jpl-util")
+ (commit commit)))
+ (file-name
+ (git-file-name "jpl-util" version))
+ (sha256
+ (base32
+ "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Collection of Common Lisp utility functions and macros")
+ (description
+ "@command{cl-jpl-util} is a collection of Common Lisp utility functions
+and macros, primarily for software projects written in CL by the author.")
+ (home-page "https://www.thoughtcrime.us/software/cl-jpl-util/")
+ (license license:isc))))
+
+(define-public cl-jpl-util
+ (sbcl-package->cl-source-package sbcl-jpl-util))
+
+(define-public ecl-jpl-util
+ (sbcl-package->ecl-package sbcl-jpl-util))
+
+(define-public sbcl-json-streams
+ (let ((commit "5da012e8133affbf75024e7500feb37394690752")
(revision "1"))
(package
- (name "sbcl-bodge-blobs-support")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/borodust/bodge-blobs-support")
- (commit commit)))
- (file-name (git-file-name "bodge-blobs-support" version))
- (sha256
- (base32 "02nd1x6y1akp1ymv1y4z9ympwbnpd1drwi4f86xbjszxqff6jyj8"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-trivial-features))
- (inputs
- (list sbcl-cffi sbcl-alexandria))
- (home-page "https://github.com/borodust/bodge-blobs-support")
- (synopsis "Common Lisp utilities for blob packages")
- (description
- "This is a Common Lisp library for simplifying packaging and loading of
-compiled foreign library collection.")
- (license license:unlicense))))
+ (name "sbcl-json-streams")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rotatef/json-streams")
+ (commit commit)))
+ (file-name (git-file-name "json-streams" version))
+ (sha256
+ (base32 "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-cl-quickcheck sbcl-flexi-streams))
+ (home-page "https://github.com/rotatef/json-streams")
+ (synopsis "Common Lisp library for reading and writing JSON")
+ (description
+ "This package provides a stream based JSON parser/writer, well suited as
+building block for higher level libraries.")
+ (license license:gpl3+))))
-(define-public cl-bodge-blobs-support
- (sbcl-package->cl-source-package sbcl-bodge-blobs-support))
+(define-public cl-json-streams
+ (sbcl-package->cl-source-package sbcl-json-streams))
-(define-public ecl-bodge-blobs-support
- (sbcl-package->ecl-package sbcl-bodge-blobs-support))
+(define-public ecl-json-streams
+ (sbcl-package->ecl-package sbcl-json-streams))
-(define-public sbcl-cl-conspack
- (let ((commit "6e529d7b3a7223ef1bb5c7b9f18384ba67b50b09")
- (revision "2"))
+(define-public sbcl-jsown
+ (let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977"))
(package
- (name "sbcl-cl-conspack")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
+ (name "sbcl-jsown")
+ (version (git-version "1.0.1" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/madnificent/jsown")
+ (commit commit)))
+ (file-name (git-file-name name commit))
+ (sha256
+ (base32 "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/madnificent/jsown")
+ (synopsis "Fast JSON reader / writer library for Common Lisp")
+ (description
+ "@code{jsown} is a high performance Common Lisp JSON parser. Its aim
+is to allow for the fast parsing of JSON objects in Common Lisp. Recently,
+functions and macros have been added to ease the burden of writing and editing
+@code{jsown} objects.
+
+@code{jsown} allows you to parse JSON objects quickly to a modifiable Lisp
+list and write them back. If you only need partial retrieval of objects,
+@code{jsown} allows you to select the keys which you would like to see parsed.
+@code{jsown} also has a JSON writer and some helper methods to alter the JSON
+objects themselves.")
+ (license license:expat))))
+
+(define-public cl-jsown
+ (sbcl-package->cl-source-package sbcl-jsown))
+
+(define-public ecl-jsown
+ (sbcl-package->ecl-package sbcl-jsown))
+
+(define-public sbcl-just-getopt-parser
+ (package
+ (name "sbcl-just-getopt-parser")
+ (version "2021.11")
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/conspack/cl-conspack")
- (commit commit)))
- (file-name (git-file-name "cl-conspack" version))
+ (url "https://github.com/tlikonen/cl-just-getopt-parser")
+ (commit version)))
(sha256
- (base32 "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-test-systems '("cl-conspack-test")))
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria
- sbcl-closer-mop
- sbcl-fast-io
- sbcl-ieee-floats
- sbcl-trivial-garbage
- sbcl-trivial-utf-8))
- (home-page "https://github.com/conspack/cl-conspack")
- (synopsis "CONSPACK implementation for Common Lisp")
- (description
- "This package provides a CONSPACK implementation for Common Lisp.")
- (license license:bsd-3))))
+ (base32 "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s"))
+ (file-name (git-file-name "cl-just-getopt-parser" version))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Getopt-like command-line parser for Common Lisp")
+ (description
+ "This package provides the @code{getopt} function to parse command-line
+options. The options are organized in valid options, other arguments and
+unknown arguments. Optional Lisp conditions for error situations are also
+defined.")
+ (home-page "https://github.com/tlikonen/cl-just-getopt-parser")
+ (license license:cc0)))
-(define-public ecl-cl-conspack
- (sbcl-package->ecl-package sbcl-cl-conspack))
+(define-public cl-just-getopt-parser
+ (sbcl-package->cl-source-package sbcl-just-getopt-parser))
-(define-public cl-conspack
- (sbcl-package->cl-source-package sbcl-cl-conspack))
+(define-public ecl-just-getopt-parser
+ (sbcl-package->ecl-package sbcl-just-getopt-parser))
-(define-public sbcl-binpack
- (let ((commit "e67f56bb697bdeac81e28e1cca4a5d117a9cf125")
- (revision "1"))
- (package
- (name "sbcl-binpack")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
+(define-public sbcl-jzon
+ (package
+ (name "sbcl-jzon")
+ (version "1.1.0")
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/binpack")
- (commit commit)))
- (file-name (git-file-name "binpack" version))
+ (url "https://github.com/Zulu-Inuoe/jzon")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-jzon" version))
(sha256
- (base32 "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/lispgames/binpack")
- (synopsis "Common Lisp rectangle packer for sprite/texture atlases")
- (description
- "This library features a rectangle packer for sprite and texture atlases.")
- (license license:expat))))
+ (base32 "0rbardn1dfizpyyy1c127zzk1fnq4pslz75xa7ldpfjsi5jc5fmr"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("com.inuoe.jzon")
+ #:asd-test-systems '("com.inuoe.jzon-tests")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-test-asd
+ (lambda _
+ (substitute* "test/com.inuoe.jzon-tests.asd"
+ ((":depends-on")
+ (string-append
+ ":perform (test-op (op c) (symbol-call :fiveam :run!"
+ " (find-symbol \"JZON\" :com.inuoe.jzon-tests)))"
+ "\n"
+ " :depends-on"))))))))
+ (native-inputs
+ (list sbcl-alexandria
+ sbcl-fiveam))
+ (inputs
+ (list sbcl-closer-mop
+ sbcl-flexi-streams
+ sbcl-float-features
+ sbcl-trivial-gray-streams))
+ (home-page "https://github.com/Zulu-Inuoe/jzon/")
+ (synopsis "Correct and safe JSON parser")
+ (description
+ "@code{jzon} is a correct and safe JSON RFC 8259 parser for Common Lisp.")
+ (license license:expat)))
-(define-public ecl-binpack
- (sbcl-package->ecl-package sbcl-binpack))
+(define-public cl-jzon
+ (sbcl-package->cl-source-package sbcl-jzon))
-(define-public cl-binpack
- (sbcl-package->cl-source-package sbcl-binpack))
+(define-public ecl-jzon
+ (sbcl-package->ecl-package sbcl-jzon))
-(define-public sbcl-cl-opengl
- (let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59")
+(define-public sbcl-kdlcl
+ (let ((commit "dd4a48a3473c3c8fb34d4a37f87d6a1776c5875c")
+ (revision "0"))
+ (package
+ (name "sbcl-kdlcl")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chee/kdlcl")
+ (commit commit)))
+ (file-name (git-file-name "cl-kdlcl" version))
+ (sha256
+ (base32 "0bqqxkd6s420ld2hmhvbbvpzss0m2kimmxaqhz7j1ksmq86bvvmj"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments `(#:asd-systems '("kdl")))
+ (inputs (list sbcl-esrap sbcl-parse-number))
+ (home-page "https://github.com/chee/kdlcl/")
+ (synopsis "KDL reader/printer for Common Lisp")
+ (description "This package provides a KDL reader/writer for
+ Common Lisp.")
+ (license license:expat-0))))
+
+(define-public cl-kdlcl
+ (sbcl-package->cl-source-package sbcl-kdlcl))
+
+(define-public ecl-kdlcl
+ (sbcl-package->ecl-package sbcl-kdlcl))
+
+(define-public sbcl-kebab
+ (let ((commit "e7f77644c4e46131e7b8039d191d35fe6211f31b")
(revision "1"))
(package
- (name "sbcl-cl-opengl")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-kebab")
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/pocket7878/kebab")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/3b/cl-opengl")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-opengl" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"))))
+ (base32 "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("cl-opengl" "cl-glu" "cl-glut")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gl/library.lisp"
- (("libGL.so" all)
- (search-input-file inputs "/lib/libGL.so")))
- (substitute* "glu/library.lisp"
- (("libGLU.so" all)
- (search-input-file inputs "/lib/libGLU.so")))
- (substitute* "glut/library.lisp"
- (("libglut.so" all)
- (search-input-file inputs "/lib/libglut.so"))))))))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("float-features" ,sbcl-float-features)
- ("freeglut" ,freeglut)
- ("glu" ,glu)
- ("mesa" ,mesa)))
- (home-page "https://github.com/3b/cl-opengl")
- (synopsis "Common Lisp bindings to OpenGL, GLU and GLUT APIs")
- (description
- "This package provides a set of bindings and utilities for accessing the
-OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.")
- (license license:bsd-3))))
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("alexandria" ,sbcl-alexandria)
+ ("cl-interpol" ,sbcl-cl-interpol)
+ ("split-sequence" ,sbcl-split-sequence)))
+ (native-inputs
+ (list sbcl-prove))
+ (arguments
+ ;; Tests passes but the phase fails with
+ ;; Component KEBAB-ASD::KEBAB-TEST not found, required by #<SYSTEM "kebab">.
+ `(#:tests? #f))
+ (synopsis "Common Lisp case converter")
+ (description "This Common Lisp library converts strings, symbols and
+keywords between any of the following typographical cases: PascalCase,
+camelCase, snake_case, kebab-case (lisp-case).")
+ (license license:llgpl))))
-(define-public ecl-cl-opengl
- (sbcl-package->ecl-package sbcl-cl-opengl))
+(define-public cl-kebab
+ (sbcl-package->cl-source-package sbcl-kebab))
-(define-public cl-opengl
- (sbcl-package->cl-source-package sbcl-cl-opengl))
+(define-public ecl-kebab
+ (sbcl-package->ecl-package sbcl-kebab))
-(define-public sbcl-shadow
- (let ((commit "b2031adbfba3579b48c9d39ad997e19b79b6852f")
+(define-public sbcl-kmrcl
+ (let ((version "1.111")
+ (commit "4a27407aad9deb607ffb8847630cde3d041ea25a")
(revision "1"))
(package
- (name "sbcl-shadow")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-kmrcl")
+ (version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.mfiano.net/mfiano/shadow")
+ (url "http://git.kpe.io/kmrcl.git/")
(commit commit)))
- (file-name (git-file-name "shadow" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0w1i734gkdkziin74ql2nhx7jdjxx02ylssaa6qdrvnj4br1124a"))))
+ (base32 "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The useless bundled debian folder drags `make' into the closure.
+ `(begin
+ (delete-file-recursively "debian")
+ #t))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cffi
- sbcl-cl-opengl
- sbcl-glsl-packing
- sbcl-golden-utils
- sbcl-static-vectors
- sbcl-varjo))
- (home-page "https://git.mfiano.net/mfiano/shadow")
- (synopsis "Management system for OpenGL shader programs")
+ (list sbcl-rt))
+ (home-page "http://files.kpe.io/kmrcl/")
+ (synopsis "General utilities for Common Lisp programs")
(description
- "This package provides a Common Lisp library for defining OpenGL shader
-programs. There are also functions for referencing shader programs by name,
-querying for basic information about them, modifying uniform variables
-throughout the lifecycle of an OpenGL application, and managing certain OpenGL
-buffer object types (UBO, SSBO currently).")
- (license license:expat))))
+ "KMRCL is a collection of utilities used by a number of Kevin
+Rosenberg's Common Lisp packages.")
+ (license license:llgpl))))
-(define-public ecl-shadow
- (sbcl-package->ecl-package sbcl-shadow))
+(define-public cl-kmrcl
+ (sbcl-package->cl-source-package sbcl-kmrcl))
-(define-public cl-shadow
- (sbcl-package->cl-source-package sbcl-shadow))
+(define-public ecl-kmrcl
+ (sbcl-package->ecl-package sbcl-kmrcl))
-(define-public sbcl-umbra
- (let ((commit "d6ef2f6cbfa26180929061129eaf325bf17f73d8")
- (revision "1"))
+(define-public sbcl-kons-9
+ (let ((commit "fe0b3228ca28c316457d35f9e7c67edc83b2a4cc")
+ (revision "0"))
(package
- (name "sbcl-umbra")
+ (name "sbcl-kons-9")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.mfiano.net/mfiano/umbra")
+ (url "https://github.com/kaveh808/kons-9")
(commit commit)))
- (file-name (git-file-name "umbra" version))
+ (file-name (git-file-name "cl-kons-9" version))
(sha256
- (base32 "04vyh2j00zdpb8ryxr8g81wjcmqlz9wrn55r3cypcj4qg970r5wi"))))
+ (base32 "1kdwva4qj1s5vmbv6gbmpnk56ahaf8n2kvij5xjlfyk7nriy4bbi"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems '("kons-9")
+ #:asd-test-systems '("kons-9/testsuite")))
+ (native-inputs
+ (list sbcl-alexandria sbcl-confidence))
(inputs
- (list sbcl-golden-utils sbcl-shadow sbcl-varjo))
- (home-page "https://git.mfiano.net/mfiano/umbra")
- (synopsis "Common Lisp library of reusable GPU shader functions")
+ (list sbcl-closer-mop
+ sbcl-cffi
+ sbcl-cl-glfw3
+ sbcl-cl-opengl
+ sbcl-cl-vectors
+ sbcl-clobber
+ sbcl-origin
+ sbcl-trivial-backtrace
+ sbcl-trivial-main-thread
+ sbcl-zpb-ttf))
+ (home-page "https://github.com/kaveh808/kons-9")
+ (synopsis "Common Lisp 3D graphics system")
(description
- "This is a Common Lisp library consisting of a collection of useful GPU
-shader functions, written with @code{Shadow}.")
- (license license:expat))))
+ "This package provides KONS-9 which can be considered as a traditional user
+interface driven 3D application for general artists, or as a REPL-based
+development environment for technical artists and software developers. These two
+approaches can be seamlessly combined into a flexible and powerful workflow,
+where non-technical users can immediately benefit from software tools and
+extensions developed by technical users.")
+ (license (list license:expat
+ ;; lib/JMC-font-libs/font-master
+ ;; lib/JMC-font-libs/font-zpb-ttf-master
+ license:lgpl2.1)))))
-(define-public ecl-umbra
- (sbcl-package->ecl-package sbcl-umbra))
+(define-public cl-kons-9
+ (sbcl-package->cl-source-package sbcl-kons-9))
-(define-public cl-umbra
- (sbcl-package->cl-source-package sbcl-umbra))
+;; TODO: (Sharlatan-20221110T230620+0000): ECL is not supported yet.
+;; https://github.com/kaveh808/kons-9/issues/176
+;; (define-public ecl-kons-9
+;; (sbcl-package->ecl-package sbcl-kons-9))
-(define-public sbcl-abstract-classes
- (let ((commit "7fa74f1e057f9ba7c1ffecff14f049f979e45267")
+(define-public sbcl-lack
+ (let ((commit "abff8efeb0c3a848e6bb0022f2b8b7fa3a1bc88b")
(revision "1"))
(package
- (name "sbcl-abstract-classes")
- (version (git-version "1.7.0" revision commit))
+ (name "sbcl-lack")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://bitbucket.org/eeeickythump/cl-abstract-classes")
+ (url "https://github.com/fukamachi/lack")
(commit commit)))
- (file-name (git-file-name "cl-abstract-classes" version))
+ (file-name (git-file-name "lack" version))
(sha256
- (base32 "06lby4i6xbbgs7kgb0f3fqybvyskyg6djhrf967lnysv7hn3zpg9"))))
+ (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove))
(inputs
- `(("closer-mop" ,sbcl-closer-mop)))
+ `(("circular-streams" ,sbcl-circular-streams)
+ ("http-body" ,sbcl-http-body)
+ ("ironclad" ,sbcl-ironclad)
+ ("local-time" ,sbcl-local-time)
+ ("quri" ,sbcl-quri)
+ ("trivial-mimes" ,sbcl-trivial-mimes)))
(arguments
- `(#:asd-systems '("abstract-classes" "singleton-classes")))
- (home-page "https://bitbucket.org/eeeickythump/cl-abstract-classes")
- (synopsis "Abstract, final, and singleton metaclasses for CLOS")
+ '(#:asd-systems '("lack"
+ "lack-request"
+ "lack-response"
+ "lack-component"
+ "lack-util"
+ "lack-middleware-backtrace"
+ "lack-middleware-static")
+ ;; XXX: Component :CLACK not found
+ #:tests? #f))
+ (home-page "https://github.com/fukamachi/lack")
+ (synopsis "Lack, the core of Clack")
(description
- "This package provides Common Lisp extension to the MOP to allow
-abstract, final and singleton classes.")
- (license license:public-domain))))
+ "Lack is a Common Lisp library which allows web applications to be
+constructed of modular components. It was originally a part of Clack, however
+it's going to be rewritten as an individual project since Clack v2 with
+performance and simplicity in mind.")
+ (license license:llgpl))))
-(define-public ecl-abstract-classes
- (sbcl-package->ecl-package sbcl-abstract-classes))
+(define-public cl-lack
+ (sbcl-package->cl-source-package sbcl-lack))
-(define-public cl-abstract-classes
- (sbcl-package->cl-source-package sbcl-abstract-classes))
+(define-public ecl-lack
+ (sbcl-package->ecl-package sbcl-lack))
-(define-public sbcl-coalton
- (let ((commit "939342495f55991812c2c2767322c5e51e755216")
- (revision "4"))
+(define-public sbcl-lambda-fiddle
+ (let ((commit "d16bba55acf6065b412f64ab8fdff679a4a32b1e") ;; no tagged branch
+ (revision "1"))
(package
- (name "sbcl-coalton")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-lambda-fiddle")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/coalton-lang/coalton")
+ (url "https://github.com/Shinmera/lambda-fiddle")
(commit commit)))
- (file-name (git-file-name "cl-coalton" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
+ (base32 "1zarj1pqjqmk95kdx1axkgpwy2wq3canczk7f9z5hvaw5an6gand"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiasco))
- (inputs
- (list sbcl-alexandria
- sbcl-concrete-syntax-tree
- sbcl-eclector
- sbcl-float-features
- sbcl-fset
- sbcl-named-readtables
- sbcl-trivial-garbage))
- (home-page "https://coalton-lang.github.io")
- (synopsis "Dialect of ML in Common Lisp")
- (description
- "Coalton is a dialect of ML embedded in Common Lisp. It emphasizes
-practicality and interoperability with Lisp, and is intended to be a DSL that
-allows one to gradually make their programs safer.")
- (license license:expat))))
+ (home-page "https://github.com/Shinmera/lambda-fiddle")
+ (synopsis "Collection of utilities to process lambda-lists")
+ (description "This collection of utilities is useful in contexts where
+you want a macro that uses lambda-lists in some fashion but need more precise
+processing.")
+ (license license:zlib))))
-(define-public ecl-coalton
- (sbcl-package->ecl-package sbcl-coalton))
+(define-public cl-lambda-fiddle
+ (sbcl-package->cl-source-package sbcl-lambda-fiddle))
-(define-public cl-coalton
- (sbcl-package->cl-source-package sbcl-coalton))
+(define-public ecl-lambda-fiddle
+ (sbcl-package->ecl-package sbcl-lambda-fiddle))
-(define-public sbcl-clip
- (let ((commit "7afa68702fbb99c47ed115ea0faccd97a29d9b2e")
- (revision "1"))
+(define-public sbcl-language-codes
+ (let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e"))
(package
- (name "sbcl-clip")
- (version (git-version "0.7.0" revision commit))
+ (name "sbcl-language-codes")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/shinmera/clip")
+ (url "https://github.com/Shinmera/language-codes")
(commit commit)))
- (file-name (git-file-name "clip" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "13kkajkva2shm19fvn4yashsw18l6imv2rmy3hmpcky7g5ay7bv3"))))
+ (base32 "0py176ibmsc01n5r0q1bs1ykqf5jwdbh8kx0j1a814l9y51241v0"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-array-utils sbcl-lquery))
- (home-page "https://shinmera.github.io/clip/")
- (synopsis "Common Lisp HTML templating engine")
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/language-codes/")
+ (synopsis "Map ISO language codes to language names in Common Lisp")
(description
- "Clip is an attempt at a templating library that allows you to write
-templates in a way that is both accessible to direct webdesign and
-flexible. The main idea is to incorporate transformation commands into an HTML
-file through tags and attributes. Clip is heavily dependent on Plump and
-lQuery.")
+ "This is a small library providing the ISO-639 language code to
+language name mapping.")
(license license:zlib))))
-(define-public ecl-clip
- (sbcl-package->ecl-package sbcl-clip))
+(define-public cl-language-codes
+ (sbcl-package->cl-source-package sbcl-language-codes))
-(define-public cl-clip
- (sbcl-package->cl-source-package sbcl-clip))
+(define-public ecl-language-codes
+ (sbcl-package->ecl-package sbcl-language-codes))
-(define-public sbcl-pathname-utils
- (let ((commit "f28068a79825f37002e96d13dfd739172382bf94")
- (revision "3"))
+(define-public sbcl-langutils
+ (let ((commit "38beec7a82eeb35b0bfb0824a41d13ed94fc648b")
+ (revision "0"))
(package
- (name "sbcl-pathname-utils")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-langutils")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/pathname-utils")
+ (url "https://github.com/eslick/cl-langutils")
(commit commit)))
- (file-name (git-file-name "cl-pathname-utils" version))
+ (file-name (git-file-name "cl-langutils" version))
(sha256
- (base32 "10xs0wnnkbdiirr1cb7q7hzi2zmksfsrj0p7yws0j1l215vz8qs8"))))
+ (base32 "15y9x5wkg3fqndc04w2sc650fnwimxp4gjgpv9xvvdm9x4v433x6"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
+ (arguments '(#:tests? #f)) ; There are no tests.
(inputs
- (list sbcl-trivial-features))
- (home-page "https://shinmera.github.io/pathname-utils/")
- (synopsis "Collection of utilities to help with pathname operations")
+ (list sbcl-stdutils
+ sbcl-s-xml-rpc))
+ (home-page "https://langutils.common-lisp.dev/")
+ (synopsis "Common Lisp natural language processing toolkit")
(description
- "This package provides a Common Lisp system a with collection of common
-tests and operations to help handling pathnames. It does not actually deal in
-handling the accessing of files on the underlying system however.")
+ "This package provides a hierarchy of major functions and auxiliary
+functions related to the structured analysis and processing of open
+text.")
+ (license license:bsd-3))))
+
+(define-public cl-langutils
+ (sbcl-package->cl-source-package sbcl-langutils))
+
+(define-public ecl-langutils
+ (sbcl-package->ecl-package sbcl-langutils))
+
+(define-public sbcl-lass
+ (let ((commit "1f2418dbf2d8d6f5892171057616b2ca9d6e5008")
+ (revision "1"))
+ (package
+ (name "sbcl-lass")
+ (version (git-version "0.6.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/LASS")
+ (commit commit)))
+ (file-name (git-file-name "cl-lass" version))
+ (sha256
+ (base32 "1wax2kykc9ff0sk2linp9v8fcsm5ay6idpq365vivady9fh504r5"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cl-base64 sbcl-trivial-indent sbcl-trivial-mimes))
+ (synopsis "LASS (Lisp Augmented Style Sheets) compiles Lisp to CSS")
+ (description
+ "With lispy syntax, shortcuts, and improvements, LASS aims to help you
+out in writing CSS quick and easy. LASS was largely inspired by SASS. LASS
+supports two modes, one being directly in your lisp code, the other in pure
+LASS files.")
+ (home-page "https://shinmera.github.io/LASS/")
(license license:zlib))))
-(define-public ecl-pathname-utils
- (package
- (inherit (sbcl-package->ecl-package sbcl-pathname-utils))
- (arguments
- `(;; FIXME: It might be an issue in implementation of UIOP for ECL:
- ;;
- ;; Condition of type: TYPE-ERROR
- ;; :HOME is not of type SEQUENCE.
- ;; Available restarts:
- ;; 1. (RESTART-TOPLEVEL) Go back to Top-Level REPL.
- ;; Broken at SI:BYTECODES. [Evaluation of: (MAKE-PATHNAME :DIRECTORY
- ;; '(:ABSOLUTE :HOME))] In: #<process TOP-LEVEL 0x7faa2f991f80>.
- ;;
- #:tests? #f))))
+(define-public cl-lass
+ (sbcl-package->cl-source-package sbcl-lass))
-(define-public cl-pathname-utils
- (sbcl-package->cl-source-package sbcl-pathname-utils))
+(define-public ecl-lass
+ (sbcl-package->ecl-package sbcl-lass))
-(define-public sbcl-terrable
- (let ((commit "e4fe23ffa08e8d53a8168105b413861da59cc786")
+(define-public sbcl-legion
+ (let ((commit "599cca19f0e34246814621f7fe90322221c2e263")
(revision "1"))
(package
- (name "sbcl-terrable")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-legion")
+ (version (git-version "0.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/terrable")
+ (url "https://github.com/fukamachi/legion/")
(commit commit)))
- (file-name (git-file-name "terrable" version))
+ (file-name (git-file-name "cl-legion" version))
(sha256
- (base32 "0pnqflgz410zydc1ivwnd8hcl24bgr7x12yjzr7g4lq3ibc8y97b"))))
+ (base32 "0583pw0mf8bd4dj42w2xrlzcwfkl8q28n1bh8dpxxfg93crx4si6"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-prove sbcl-local-time))
(inputs
- (list sbcl-documentation-utils sbcl-fast-io sbcl-ieee-floats
- sbcl-static-vectors sbcl-trivial-garbage))
- (home-page "https://shirakumo.github.io/terrable/")
- (synopsis "Parser library for Terragen TER terrain files")
+ (list
+ sbcl-bordeaux-threads
+ sbcl-cl-speedy-queue
+ sbcl-vom))
+ (home-page "https://github.com/fukamachi/legion")
+ (synopsis "Simple multithreading worker mechanism for Common Lisp")
(description
- "This package provides Common Lisp support for reading the Terragen
-@code{.TER} format. The format specification can be found at
-@url{https://planetside.co.uk/wiki/index.php?title=Terragen_.TER_Format}")
- (license license:zlib))))
+ "This library provides a simple multithreading worker mechanism.")
+ (license license:bsd-3))))
-(define-public ecl-terrable
- (sbcl-package->ecl-package sbcl-terrable))
+(define-public cl-legion
+ (sbcl-package->cl-source-package sbcl-legion))
-(define-public cl-terrable
- (sbcl-package->cl-source-package sbcl-terrable))
+(define-public ecl-legion
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-legion))
+ (arguments
+ ;; Tests get stuck forever
+ (list #:tests? #f))))
-(define-public sbcl-simple-rgb
- (let ((commit "ba9b0689362c28aa6a91c0636796c6c372657293")
- (revision "1"))
+(define-public sbcl-legit
+ (let ((commit "9c677b9b798803d37ab6f5e0e0705441872f7230")
+ (revision "3"))
(package
- (name "sbcl-simple-rgb")
- (version (git-version "0.01" revision commit))
+ (name "sbcl-legit")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/wmannis/simple-rgb/")
+ (url "https://github.com/Shinmera/legit")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-legit" version))
(sha256
- (base32 "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1"))))
+ (base32 "0jy021ywrbnkgbgb63ip6j7kr40m4wz2pz1v5ybn6xkkn6dyprsz"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/wmannis/simple-rgb")
- (synopsis "Manipulate colors in RGB format")
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-git-executable
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "process.lisp"
+ (("\"git")
+ (string-append "\"" (search-input-file inputs
+ "/bin/git")))))))))
+ (inputs
+ (list git
+ sbcl-cl-ppcre
+ sbcl-documentation-utils
+ sbcl-lambda-fiddle
+ sbcl-simple-inferiors))
+ (home-page "https://shinmera.github.io/legit/")
+ (synopsis "Interface to the git binary")
(description
- "This Common Lisp library focuses on the small set of basic color
-manipulations (lightening, compliments, etc.) you might use to generate a
-color palette for a GUI or web page.")
- (license license:bsd-2))))
+ "This is an interface to the @code{git} binary to make controlling it
+from within Common Lisp much easier. It might not ever reach full coverage of
+all features given git's immense size, but features will be added as they are
+needed. The low-level command API is fully mapped however.")
+ (license license:zlib))))
-(define-public ecl-simple-rgb
- (sbcl-package->ecl-package sbcl-simple-rgb))
+(define-public cl-legit
+ (sbcl-package->cl-source-package sbcl-legit))
-(define-public cl-simple-rgb
- (sbcl-package->cl-source-package sbcl-simple-rgb))
+(define-public ecl-legit
+ (sbcl-package->ecl-package sbcl-legit))
-(define-public sbcl-cl-qprint
- (let ((commit "bfe398551cbfb7ca84a9ba59a26a1116ac5c06eb")
+(define-public sbcl-let-over-lambda
+ (let ((commit "481b2e3ab4646186451dfdd2062113203287d520")
(revision "1"))
(package
- (name "sbcl-cl-qprint")
- (version (git-version "0.9.0" revision commit))
+ (name "sbcl-let-over-lambda")
+ (version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eugeneia/cl-qprint/")
+ (url "https://github.com/thephoeron/let-over-lambda")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-let-over-lambda" version))
(sha256
- (base32 "099h0rrdzxnlmn8avi72mg2dl0kccp7w01b2p9nwyy4b8yr32cir"))))
+ (base32 "114p781lwi9lrbzg27dnkymz9m4cvm1k430j7qsykwd0b58d8qbk"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; All test cases pass, but tests successfully fail at the end:
+ ;;
+ ;; Summary:
+ ;; All 1 file passed.
+ ;; Unhandled ASDF/FIND-COMPONENT:MISSING-DEPENDENCY in thread
+ ;; #<SB-THREAD:THREAD "main thread" RUNNING {1001860103}>:
+ ;; Component LET-OVER-LAMBDA-ASD::LET-OVER-LAMBDA-TEST not found,
+ ;; required by #<SYSTEM "let-over-lambda">
+ `(#:tests? #f))
(inputs
- (list sbcl-flexi-streams))
- (home-page "https://github.com/eugeneia/cl-qprint/")
- (synopsis "Implementation of the quoted-printable encoding")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("named-readtables" ,sbcl-named-readtables)))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/thephoeron/let-over-lambda")
+ (synopsis "Macros from Let Over Lambda")
(description
- "This Common Lisp library implements the quoted-printable encoding as
-described in RFC 2045 (see @url{http://tools.ietf.org/html/rfc2045}).")
- (license license:lgpl2.1))))
+ "This package provides Doug Hoyte's \"Production\" version of macros
+from the Let Over Lambda book, including community updates.")
+ (license license:bsd-3))))
-(define-public ecl-cl-qprint
- (sbcl-package->ecl-package sbcl-cl-qprint))
+(define-public cl-let-over-lambda
+ (sbcl-package->cl-source-package sbcl-let-over-lambda))
-(define-public cl-qprint
- (sbcl-package->cl-source-package sbcl-cl-qprint))
+(define-public ecl-let-over-lambda
+ (sbcl-package->ecl-package sbcl-let-over-lambda))
-(define-public sbcl-cl-mime
- (let ((commit "d30a28e0a40393bd3af7d138daa05319ed2e9d07")
- (revision "1"))
+(define-public sbcl-let-plus
+ (let ((commit "455e657e077235829b197f7ccafd596fcda69e30")
+ (revision "2"))
(package
- (name "sbcl-cl-mime")
- ;; One commit says "update to cl-mime-0.5.3", even though the .asd is at 0.5.1.
- (version (git-version "0.5.3" revision commit))
+ (name "sbcl-let-plus")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- ;; Maintained fork according to http://www.cliki.net/CL-MIME:
- (url "https://github.com/40ants/cl-mime")
+ (url "https://github.com/sharplispers/let-plus")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
- (base32 "0qn8if0fj6vzc897pqqqs0m1y107gmzqngpqhqmwrcsp1ckj5k0v"))))
+ (base32 "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb"))
+ (file-name (git-file-name "cl-let-plus" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre sbcl-cl-base64 sbcl-cl-qprint))
+ (list sbcl-alexandria sbcl-anaphora))
(native-inputs
- (list sbcl-rove))
- (home-page "https://github.com/40ants/cl-mime/")
- (synopsis "Read and print MIME content in Common Lisp")
+ (list sbcl-lift))
+ (synopsis "Destructuring extension of let*")
(description
- "This is a Common Lisp library for reading and printing MIME content.
-It supports automatic conversion between 7-bit, quoted-printable and base64
-encodings.")
- (license license:lgpl2.1))))
+ "This library implements the let+ macro, which is a dectructuring
+extension of let*. It features:
-(define-public ecl-cl-mime
- (sbcl-package->ecl-package sbcl-cl-mime))
+@itemize
+@item Clean, consistent syntax and small implementation (less than 300 LOC,
+not counting tests)
+@item Placeholder macros allow editor hints and syntax highlighting
+@item @command{&ign} for ignored values (in forms where that makes sense)
+@item Very easy to extend
+@end itemize\n")
+ (home-page "https://github.com/sharplispers/let-plus")
+ (license license:boost1.0))))
-(define-public cl-mime
- (sbcl-package->cl-source-package sbcl-cl-mime))
+(define-public cl-let-plus
+ (sbcl-package->cl-source-package sbcl-let-plus))
-(define-public sbcl-cl-mimeparse
- (let ((commit "93cbdf6f6fe8a2eb5f652f8adec453eb98ea0547")
- (revision "0"))
+(define-public ecl-let-plus
+ (sbcl-package->ecl-package sbcl-let-plus))
+
+(define-public sbcl-lev
+ (let ((commit "7d03c68dad44f1cc4ac2aeeab2d24eb525ad941a")
+ (revision "1"))
(package
- (name "sbcl-cl-mimeparse")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-lev")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/cl-mimeparse")
+ (url "https://github.com/fukamachi/lev")
(commit commit)))
- (file-name (git-file-name "cl-mimeparse" version))
+ (file-name (git-file-name "lev" version))
(sha256
- (base32 "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"))))
+ (base32 "14lfnrvfyg2nnvlwck896p6vgarzc6g4kijmvhi2d8wra7gxzifh"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-test-systems '("cl-mimeparse-tests")))
- (native-inputs
- (list sbcl-rt))
+ ;; NOTE: (Sharlatan-20210520T163300+0100): No tests in upstream
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-libev-lib-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/lev.lisp"
+ (("libev.so" _)
+ (search-input-file inputs "/lib/libev.so"))))))))
(inputs
- (list sbcl-cl-ppcre sbcl-parse-number))
- (home-page "https://github.com/mmontone/cl-mimeparse/")
- (synopsis "Common Lisp library for parsing MIME types")
+ `(("cffi" ,sbcl-cffi)
+ ("libev" ,libev)))
+ (home-page "https://github.com/fukamachi/lev")
+ (synopsis "Common Lisp bindings for libev")
+ (description "This package provides Common Lisp bindings for libev.")
+ (license license:bsd-2))))
+
+(define-public cl-lev
+ (sbcl-package->cl-source-package sbcl-lev))
+
+(define-public ecl-lev
+ (sbcl-package->ecl-package sbcl-lev))
+
+(define-public sbcl-linedit
+ (let ((commit "0561c97dfca2f5854fcc66558a567a9875ddcb8f")
+ (revision "1"))
+ (package
+ (name "sbcl-linedit")
+ (version (git-version "0.17.6" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharplispers/linedit")
+ (commit commit)))
+ (file-name (git-file-name "cl-linedit" version))
+ (sha256
+ (base32 "0hhh7xn6q12rviayfihg1ym6x6csa0pdjgb88ykqbrz2rs3pgpz5"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-cffi sbcl-osicat sbcl-terminfo))
+ (home-page "https://github.com/sharplispers/linedit")
+ (synopsis "Readline-style line-editor for Common Lisp")
(description
- "This package provides a library for parsing MIME types, in the spirit
-of http://code.google.com/p/mimeparse/, with a Common Lisp flavor.")
+ "Linedit is a readline-style library written in Common Lisp that
+provides customizable line-editing for Common Lisp programs.")
(license license:expat))))
-(define-public cl-mimeparse
- (sbcl-package->cl-source-package sbcl-cl-mimeparse))
+(define-public cl-linedit
+ (sbcl-package->cl-source-package sbcl-linedit))
-(define-public ecl-cl-mimeparse
- (sbcl-package->ecl-package sbcl-cl-mimeparse))
+(define-public ecl-linedit
+ (sbcl-package->ecl-package sbcl-linedit))
-(define-public sbcl-cl-mixed
- (let ((commit "4aaff134d3902d93a2a8605c10de4bcfc62d7afa")
+(define-public sbcl-lisp-namespace
+ (let ((commit "699fccb6727027343bb5fca69162a3113996edfc")
+ (revision "2"))
+ (package
+ (name "sbcl-lisp-namespace")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/guicho271828/lisp-namespace")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name "cl-lisp-namespace" version))
+ (sha256
+ (base32 "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"))))
+ (inputs
+ (list sbcl-alexandria))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "LISP-N, or extensible namespaces in Common Lisp")
+ (description "Common Lisp already has major 2 namespaces, function
+namespace and value namespace (or variable namespace), but there are actually
+more — e.g., class namespace.
+This library offers macros to deal with symbols from any namespace.")
+ (license license:llgpl))))
+
+(define-public cl-lisp-namespace
+ (sbcl-package->cl-source-package sbcl-lisp-namespace))
+
+(define-public ecl-lisp-namespace
+ (sbcl-package->ecl-package sbcl-lisp-namespace))
+
+(define-public sbcl-lisp-pay
+ (let ((commit "c4de776f0a284709931ff3674160ced3b41bd000")
(revision "0"))
(package
- (name "sbcl-cl-mixed")
- (version (git-version "2.1.0" revision commit))
+ (name "sbcl-lisp-pay")
+ (version (git-version "0.0.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-mixed")
+ (url "https://github.com/K1D77A/lisp-pay")
(commit commit)))
- (file-name (git-file-name "cl-mixed" version))
+ (file-name (git-file-name "cl-lisp-pay" version))
(sha256
- (base32 "1mrj95lxb1gbxxm89x8gy1ifw2ic1p5wwpapkxcd2jr8abw7zny0"))
- (modules '((guix build utils)))
- (snippet
- ;; Delete bundled libraries.
- `(begin
- (delete-file-recursively "static")))))
+ (base32 "09r6qy4fipriqa0d6g9qm6dq992lr58vh24g5j0adm19i5fnjavh"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("cl-mixed"
- "cl-mixed-examples"
- "cl-mixed-flac"
- "cl-mixed-vorbis"
- "cl-mixed-alsa"
- "cl-mixed-jack"
- "cl-mixed-mpg123"
- "cl-mixed-mpt"
- "cl-mixed-out123"
- "cl-mixed-pulse"
- "cl-mixed-sdl2"
- "cl-mixed-wav")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "low-level.lisp"
- (("libmixed.so.2")
- (search-input-file inputs "/lib/libmixed.so.2"))))))))
(inputs
- (list libmixed
- sbcl-alexandria
- sbcl-cffi
- sbcl-cl-flac
- sbcl-cl-mpg123
- sbcl-cl-out123
- sbcl-cl-vorbis
- sbcl-documentation-utils
- sbcl-sdl2
- sbcl-static-vectors
- sbcl-trivial-features))
- (home-page "https://shirakumo.github.io/cl-mixed/")
- (synopsis "Extended audio library for Common Lisp")
- (description
- "This package provides CFFI binding to @code{libmixed} audio library for
-Common Lisp with support of other audio formats available on GNU/Linux systems:
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-cl-base64
+ sbcl-cl-str
+ sbcl-cl-tls
+ sbcl-closer-mop
+ sbcl-dexador
+ sbcl-hu.dwim.defclass-star
+ sbcl-hunchentoot
+ sbcl-ironclad
+ sbcl-jonathan
+ sbcl-lack
+ sbcl-ningle
+ sbcl-shasht))
+ (home-page "https://github.com/K1D77A/lisp-pay/")
+ (synopsis "Wrappers over multiple Payment Processor APIs")
+ (description "This library provides payment API wrappers over
+BTCPay, Paypal, and Stripe.")
+ (license license:expat))))
-@itemize
+(define-public cl-lisp-pay
+ (sbcl-package->cl-source-package sbcl-lisp-pay))
-@item @acronym{Alsa, Advanced Linux Sound Architecture}
-@item @acronym{Jack, JackAudio toolkit}
-@item @acronym{Openmpt, Libopenmpt playback drain for tracker files}
-@item @acronym{PulseAudio, PulseAudio based playback drain}
-@item Flac (via CL-FLAC)
-@item Mpg123 (via CL-MPG123)
-@item Ogg/vorbis (via CL-VORBIS)
-@item Out123 (via CL-OUT123)
-@item WAV
+(define-public ecl-lisp-pay
+ (sbcl-package->ecl-package sbcl-lisp-pay))
-@end itemize")
- (license license:zlib))))
+(define-public sbcl-lisp-stat
+ (let ((commit "357a0d2b5f68a5ff925776235c2b7455e12b78ba")
+ (revision "0"))
+ (package
+ (name "sbcl-lisp-stat")
+ (version (git-version "1.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Lisp-Stat/lisp-stat")
+ (commit commit)))
+ (file-name (git-file-name "cl-lisp-stat" version))
+ (sha256
+ (base32 "0qwlxrbwj884mr67sf6aj0zwrndv33aiiid4bqrkji41kjhqfcz5"))))
+ (build-system asdf-build-system/sbcl)
+ ;; https://github.com/Lisp-Stat/lisp-stat/issues/22
+ (arguments (list #:tests? #f))
+ (native-inputs (list sbcl-parachute))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-alexandria-plus
+ sbcl-array-operations
+ sbcl-conduit-packages
+ sbcl-data-frame
+ sbcl-dexador
+ sbcl-dfio
+ sbcl-distributions
+ sbcl-numerical-utilities
+ sbcl-select
+ sbcl-statistics))
+ (home-page "https://lisp-stat.github.io/lisp-stat/")
+ (synopsis "Statistical Computing in Common Lisp")
+ (description "This package provides a statistical computing
+environment for Common Lisp.")
+ (license license:ms-pl))))
-(define-public ecl-cl-mixed
- (sbcl-package->ecl-package sbcl-cl-mixed))
+(define-public cl-lisp-stat
+ (sbcl-package->cl-source-package sbcl-lisp-stat))
-(define-public cl-mixed
- (sbcl-package->cl-source-package sbcl-cl-mixed))
+;; This depends on ecl-data-frame and ecl-dfio, which don't work yet.
+;; (define-public ecl-lisp-stat
+;; (sbcl-package->ecl-package sbcl-lisp-stat))
(define-public sbcl-lispbuilder-sdl
(let ((commit "589b3c6d552bbec4b520f61388117d6c7b3de5ab"))
@@ -20898,506 +18976,713 @@ provides cross-platform packages for building large, interactive applications
in Common Lisp.")
(license license:expat))))
+(define-public cl-lispbuilder-sdl
+ (sbcl-package->cl-source-package sbcl-lispbuilder-sdl))
+
(define-public ecl-lispbuilder-sdl
(sbcl-package->ecl-package sbcl-lispbuilder-sdl))
-(define-public cl-lispbuilder-sdl
- (sbcl-package->cl-source-package sbcl-lispbuilder-sdl))
+(define-public sbcl-list-named-class
+ (let ((commit "2955791a7469131bcab42d800883f27993ee1d62")
+ (revision "0"))
+ (package
+ (name "sbcl-list-named-class")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phoe/list-named-class")
+ (commit commit)))
+ (file-name (git-file-name "cl-list-named-class" version))
+ (sha256
+ (base32 "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-1am))
+ (inputs
+ (list sbcl-alexandria sbcl-closer-mop))
+ (home-page "https://github.com/phoe/list-named-class/")
+ (synopsis "Name classes after lists of symbols")
+ (description
+ "This package makes it possible to name classes by lists of symbols
+instead of symbols.")
+ (license license:expat))))
-(define-public sbcl-dufy
+(define-public cl-list-named-class
+ (sbcl-package->cl-source-package sbcl-list-named-class))
+
+(define-public ecl-list-named-class
+ (sbcl-package->ecl-package sbcl-list-named-class))
+
+(define-public sbcl-listopia
(package
- (name "sbcl-dufy")
- (version "0.4.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/privet-kitty/dufy")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "15vrp1kayhjb5c1vc9x8wlm8rimk73vpa7yc101cf0gsg1fjazl6"))))
+ (name "sbcl-listopia")
+ (version "0.12.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Dimercel/listopia")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07xa2s2s60h9f40az3zdacybl5pk1x8bhvga9phsra0czbv44lx2"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-cl-ppcre))
(native-inputs
- (list sbcl-fiveam sbcl-cl-csv sbcl-parse-float sbcl-lispbuilder-sdl
- sbcl-lparallel))
- (home-page "https://github.com/privet-kitty/dufy")
- (synopsis "Color library for Common Lisp")
- (description
- "Dufy is a library for exact color manipulation and conversion in various
-color spaces, which supports many color models.")
- (license license:expat)))
+ (list sbcl-prove))
+ (home-page "https://github.com/Dimercel/listopia")
+ (synopsis "List manipulation library for Common Lisp")
+ (description "This package is a list manipulation library for Common Lisp
+inspired by Haskell package @code{Data.List}.")
+ (license license:llgpl)))
-(define-public ecl-dufy
- (sbcl-package->ecl-package sbcl-dufy))
+(define-public cl-listopia
+ (sbcl-package->cl-source-package sbcl-listopia))
-(define-public cl-dufy
- (sbcl-package->cl-source-package sbcl-dufy))
+(define-public ecl-listopia
+ (sbcl-package->ecl-package sbcl-listopia))
-(define-public sbcl-bknr-datastore
- (let ((commit "c98d44f47cc88d19ff91ca3eefbd9719a8ace022")
- (revision "1"))
+(define-public sbcl-livesupport
+ (let ((commit "71e6e412df9f3759ad8378fabb203913d82e228a")
+ (revision "1"))
(package
- (name "sbcl-bknr-datastore")
+ (name "sbcl-livesupport")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hanshuebner/bknr-datastore")
+ (url "https://github.com/cbaggers/livesupport")
(commit commit)))
- (file-name (git-file-name "bknr-datastore" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"))))
+ (base32 "1rvnl0mncylbx63608pz5llss7y92j7z3ydambk9mcnjg2mjaapg"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems
- '("bknr.datastore"
- "bknr.impex"
- "bknr.indices"
- "bknr.skip-list"
- "bknr.utils"
- "bknr.xml")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'enter-source-directory
- (lambda _
- (chdir "src")
- #t)))))
- (native-inputs
- `(("cl-store" ,sbcl-cl-store)
- ("fiveam" ,sbcl-fiveam)
- ("unit-test" ,sbcl-unit-test)))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("closer-mop" ,sbcl-closer-mop)
- ("cl-interpol" ,sbcl-cl-interpol)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("cxml" ,sbcl-cxml)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("md5" ,sbcl-md5)
- ("trivial-utf-8" ,sbcl-trivial-utf-8)
- ("yason" ,sbcl-yason)))
- (home-page "https://github.com/hanshuebner/bknr-datastore")
- (synopsis "In-memory database for Common Lisp")
- (description
- "BKNR.DATASTORE is an in-memory CLOS based database with transactions
-for Common Lisp.")
- (license license:bsd-0))))
+ (home-page "https://github.com/cbaggers/livesupport")
+ (synopsis "Some helpers that make livecoding a little easier")
+ (description "This package provides a macro commonly used in livecoding to
+enable continuing when errors are raised. Simply wrap around a chunk of code
+and it provides a restart called @code{continue} which ignores the error and
+carrys on from the end of the body.")
+ (license license:bsd-2))))
-;; NOTE: (Sharlatan-20210429T191426+0100):
-;; There is no port for ECL in upstream yet
-;; (define-public ecl-bknr-datastore
-;; (sbcl-package->ecl-package sbcl-bknr-datastore))
+(define-public cl-livesupport
+ (sbcl-package->cl-source-package sbcl-livesupport))
-(define-public cl-bknr-datastore
- (sbcl-package->cl-source-package sbcl-bknr-datastore))
+(define-public ecl-livesupport
+ (sbcl-package->ecl-package sbcl-livesupport))
-(define-public sbcl-authentic
- (let ((commit "4e9194dda227b98f56dda1c2a2480efcc2d1f973")
- (revision "2"))
+(define-public sbcl-lla
+ (let ((commit "ded805d1e9b1493e17b601116ba9bd8a3de3024f")
+ (revision "1"))
(package
- (name "sbcl-authentic")
- (version (git-version "0.1.2" revision commit))
+ (name "sbcl-lla")
+ (version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charje/cl-authentic")
+ (url "https://github.com/tpapp/lla")
(commit commit)))
- (file-name (git-file-name "cl-authentic" version))
+ (file-name (git-file-name "cl-lla" version))
(sha256
- (base32 "0ncsxrybnx0pjsndv3j8w4lphlpcsld8sxg3c5b46fb3a8nd4ssf"))))
+ (base32 "0n9vc7dnyjbbsv1n7rd8sylwda5fsdf8f890g4nachanyx0xps9k"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/configuration.lisp"
+ (("\"libblas.so.3gf\"")
+ (string-append "\"" (assoc-ref inputs "lapack")
+ "/lib/libopenblas.so\""))
+ (("\"liblapack.so.3gf\"")
+ (string-append "\"" (assoc-ref inputs "lapack")
+ "/lib/libopenblas.so\""))))))))
(inputs
- (list sbcl-clsql sbcl-ironclad))
- (home-page "https://github.com/charje/cl-authentic")
- (synopsis "User/password management for Common Lisp applications")
- (description "Authentic provides a light-weight and extendible
-solution to user/password management for Common Lisp applications. It has
-features such as safe password storage in a database, password reset, user
-confirmation tokens, and user authentication.")
- (license license:llgpl))))
+ `(("anaphora" ,sbcl-anaphora)
+ ("alexandria" ,sbcl-alexandria)
+ ("cffi" ,sbcl-cffi)
+ ("cl-num-utils" ,sbcl-cl-num-utils)
+ ("cl-slice" ,sbcl-cl-slice)
+ ("lapack" ,openblas)
+ ("let-plus" ,sbcl-let-plus)))
+ (native-inputs
+ (list sbcl-clunit))
+ (home-page "https://github.com/tpapp/lla")
+ (synopsis "Linear algebra library for Common Lisp")
+ (description
+ "LLA is a high-level Common Lisp library built on BLAS and LAPACK, but
+providing a much more abstract interface with the purpose of freeing the user
+from low-level concerns and reducing the number of bugs in numerical code.")
+ (license license:boost1.0))))
-(define-public ecl-authentic
- (sbcl-package->ecl-package sbcl-authentic))
+(define-public cl-lla
+ (sbcl-package->cl-source-package sbcl-lla))
-(define-public cl-authentic
- (sbcl-package->cl-source-package sbcl-authentic))
+(define-public ecl-lla
+ (sbcl-package->ecl-package sbcl-lla))
-(define-public sbcl-3d-vectors
- (let ((commit "257969402864ac3859d77b981abf0aa5373c4e78")
- (revision "2"))
+(define-public sbcl-lmdb
+ (let ((commit "f439b707939a52769dc9747838ff4a616fab14a3")
+ (revision "0"))
(package
- (name "sbcl-3d-vectors")
- (version (git-version "3.1.0" revision commit))
+ (name "sbcl-lmdb")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/3d-vectors")
+ (url "https://github.com/antimer/lmdb")
(commit commit)))
- (file-name (git-file-name "cl-3d-vectors" version))
+ (file-name (git-file-name "cl-lmdb" version))
(sha256
- (base32 "0vmf7nycc49ydcy0dfs25cgs655kwjc6jcjvpwxw61jq4gl2fh7x"))))
+ (base32 "0akvimmvd4kcx6gh1j1dzvcclhc0jc4hc9vkh3ldgzb8wyf4vl8q"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/lmdb.lisp"
+ (("\"liblmdb.so\"")
+ (string-append
+ "\"" (search-input-file inputs "/lib/liblmdb.so") "\""))))))))
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/3d-vectors/")
- (synopsis "Utility library implementing 2D, 3D, and 4D vectors")
+ (list lmdb
+ sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cl-reexport
+ sbcl-mgl-pax
+ sbcl-osicat
+ sbcl-trivial-features
+ sbcl-trivial-garbage
+ sbcl-trivial-utf-8))
+ (native-inputs
+ (list sbcl-try))
+ (home-page "https://github.com/antimer/lmdb")
+ (synopsis "LMDB bindings for Common Lisp")
(description
- "@code{3D-VECTORS} is a library for vector math in 3D space. It contains
-most of the vector operations one would usually expect out of such a library and
-offers them both in non-modifying and modifying versions where applicable.")
- (license license:zlib))))
+ "LMDB, the Lightning Memory-mapped Database, is an ACID key-value
+database with multiversion concurrency control. This package is a Common Lisp
+wrapper around the C LMDB library. It covers most of C LMDB's functionality,
+has a simplified API, much needed safety checks, and comprehensive
+documentation.")
+ (license license:expat))))
-(define-public ecl-3d-vectors
- (sbcl-package->ecl-package sbcl-3d-vectors))
+(define-public cl-lmdb
+ (sbcl-package->cl-source-package sbcl-lmdb))
-(define-public cl-3d-vectors
- (sbcl-package->cl-source-package sbcl-3d-vectors))
+(define-public sbcl-local-time
+ (let ((commit "40169fe26d9639f3d9560ec0255789bf00b30036")
+ (revision "4"))
+ (package
+ (name "sbcl-local-time")
+ (version (git-version "1.0.6" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dlowe-net/local-time")
+ (commit commit)))
+ (file-name (git-file-name "cl-local-time" version))
+ (sha256
+ (base32 "1dbp33zmkqzzshmf5k76pxqgli285wvy0p0dhcz816fdikpwn2jg"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; Delete the extension provided by sbcl-cl-postgres+local-time
+ (add-after 'unpack 'delete-local-time
+ (lambda _
+ (delete-file "cl-postgres+local-time.asd")
+ (delete-file "src/integration/cl-postgres.lisp"))))))
+ (native-inputs
+ (list sbcl-hu.dwim.stefil))
+ (home-page "https://common-lisp.net/project/local-time/")
+ (synopsis "Time manipulation library for Common Lisp")
+ (description
+ "The LOCAL-TIME library is a Common Lisp library for the manipulation of
+dates and times. It is based almost entirely upon Erik Naggum's paper \"The
+Long Painful History of Time\".")
+ (license license:expat))))
-(define-public sbcl-3d-matrices
- (let ((commit "b4f5a58299f8437fad2d77f0879c374e3430f4b5")
+(define-public cl-local-time
+ (sbcl-package->cl-source-package sbcl-local-time))
+
+(define-public ecl-local-time
+ (sbcl-package->ecl-package sbcl-local-time))
+
+(define-public sbcl-cl-postgres+local-time
+ (package
+ (inherit sbcl-local-time)
+ (name "sbcl-cl-postgres+local-time")
+ (inputs (list sbcl-local-time sbcl-postmodern))
+ (arguments
+ `(#:asd-systems '("cl-postgres+local-time")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-local-time
+ (lambda _
+ (delete-file "local-time.asd")
+ (delete-file "src/package.lisp")
+ (delete-file "src/local-time.lisp")
+ (delete-file-recursively "doc")
+ (delete-file-recursively "test")
+ (delete-file-recursively "zoneinfo"))))))
+ (synopsis "Integration between cl-postgres and local-time")
+ (description
+ "This package provides the LOCAL-TIME extensions for the cl-postgres
+ASDF system of postmodern.")
+ (license license:expat)))
+
+(define-public cl-postgres+local-time
+ (sbcl-package->cl-source-package sbcl-cl-postgres+local-time))
+
+(define-public ecl-cl-postgres+local-time
+ (sbcl-package->ecl-package sbcl-cl-postgres+local-time))
+
+(define-public sbcl-log4cl
+ (let ((commit "fe3da517147d023029782ced7cd989ba24f1e62d")
(revision "2"))
(package
- (name "sbcl-3d-matrices")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-log4cl")
+ (version (git-version "1.1.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/3d-matrices")
+ (url "https://github.com/sharplispers/log4cl")
(commit commit)))
- (file-name (git-file-name "cl-3d-matrices" version))
+ (file-name (git-file-name "cl-log4cl" version))
(sha256
- (base32 "1s8b4zlmqwyplghs73riz1khf0c5sk64w6b12jd599091d5nr6sr"))))
+ (base32 "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-parachute))
+ (list sbcl-stefil))
(inputs
- (list sbcl-3d-vectors sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/3d-matrices/")
- (synopsis "Utility library implementing 2x2, 3x3, 4x4 and NxM matrices")
+ (list sbcl-bordeaux-threads))
+ (home-page "https://github.com/7max/log4cl")
+ (synopsis "Common Lisp logging framework, modeled after Log4J")
(description
- "@code{3D-MATRICES} is a library implementing common matrix operations,
-mainly intended as the counterpiece to @code{3d-vectors} and thus being aimed at
-operations in 3D space.")
- (license license:zlib))))
+ "This is a Common Lisp logging framework that can log at various levels
+and mix text with expressions.")
+ (license license:asl2.0))))
-(define-public ecl-3d-matrices
- (sbcl-package->ecl-package sbcl-3d-matrices))
+(define-public cl-log4cl
+ (sbcl-package->cl-source-package sbcl-log4cl))
-(define-public cl-3d-matrices
- (sbcl-package->cl-source-package sbcl-3d-matrices))
+(define-public ecl-log4cl
+ (sbcl-package->ecl-package sbcl-log4cl))
-(define-public sbcl-3d-quaternions
- (let ((commit "b79c15cca8d9c409216a6cee8ec9e182dcdec9e2")
+(define-public sbcl-lorem-ipsum
+ (let ((commit "04a1839a03b53c954e799b9cf570ac915b032ce8")
(revision "0"))
(package
- (name "sbcl-3d-quaternions")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-lorem-ipsum")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phoe/lorem-ipsum")
+ (commit commit)))
+ (sha256
+ (base32 "1530qq0bk3xr25m77q96pbi1idnxdkax8cwmvq4ch03rfjy34j7n"))
+ (file-name (git-file-name "cl-lorem-ipsum" commit))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/phoe/lorem-ipsum")
+ (synopsis "Lorem ipsum generator in portable Common Lisp")
+ (description
+ "This package provides functions for generating lorem ipsum text.")
+ (license license:expat))))
+
+(define-public cl-lorem-ipsum
+ (sbcl-package->cl-source-package sbcl-lorem-ipsum))
+
+(define-public ecl-lorem-ipsum
+ (sbcl-package->ecl-package sbcl-lorem-ipsum))
+
+(define-public sbcl-lparallel
+ (let ((commit "80fc2952a074776abd343d6b5d3ab157f0e1df7a")
+ (revision "1"))
+ (package
+ (name "sbcl-lparallel")
+ (version (git-version "2.8.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/3d-quaternions")
+ (url "https://github.com/sharplispers/lparallel/")
(commit commit)))
- (file-name (git-file-name "cl-3d-quaternions" version))
+ (file-name (git-file-name "cl-lparallel" version))
(sha256
- (base32 "1mrq6yhb90mhvxdkg3fx58ci5yj5xlixbbzf1q6p76wyq40qjv76"))))
+ (base32 "0nv2dx8cl25g68icqhw95yr5mygm86lcjzmzijql51na1p60g6y9"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
(inputs
- (list sbcl-3d-matrices sbcl-3d-vectors sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/3d-quaternions/")
- (synopsis "Quaternion and dual-quaternion functionality in Common Lisp")
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-trivial-garbage))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-dependency
+ ;; lparallel loads a SBCL specific system in its asd file. This is
+ ;; not carried over into the fasl which is generated. In order for
+ ;; it to be carried over, it needs to be listed as a dependency.
+ (lambda _
+ (substitute* "lparallel.asd"
+ ((":depends-on \\(:alexandria" all)
+ (string-append all " #+sbcl :sb-cltl2"))))))))
+ (home-page "https://lparallel.org/")
+ (synopsis "Parallelism for Common Lisp")
(description
- "This is a library for quaternions. It contains most of the quaternion
-operations one would usually expect out of such a library and offers them both
-in non-modifying and modifying versions where applicable. It also tries to be
-efficient where plausible. Each quaternion is made up of @code{float}s, which
-by default are @code{single-float}s, as they do not require value boxing on
-most modern systems and compilers.")
+ "@command{lparallel} is a library for parallel programming in Common
+Lisp, featuring:
+
+@itemize
+@item a simple model of task submission with receiving queue,
+@item constructs for expressing fine-grained parallelism,
+@item asynchronous condition handling across thread boundaries,
+@item parallel versions of map, reduce, sort, remove, and many others,
+@item promises, futures, and delayed evaluation constructs,
+@item computation trees for parallelizing interconnected tasks,
+@item bounded and unbounded FIFO queues,
+@item high and low priority tasks,
+@item task killing by category,
+@item integrated timeouts.
+@end itemize\n")
+ (license license:expat))))
+
+(define-public cl-lparallel
+ (sbcl-package->cl-source-package sbcl-lparallel))
+
+(define-public ecl-lparallel
+ (sbcl-package->ecl-package sbcl-lparallel))
+
+(define-public sbcl-lquery
+ (let ((revision "1")
+ (commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d"))
+ (package
+ (name "sbcl-lquery")
+ (version (git-version "3.2.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/lquery")
+ (commit commit)))
+ (sha256
+ (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w"))
+ (file-name (git-file-name name version))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-array-utils sbcl-form-fiddle sbcl-plump sbcl-clss))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Library to allow jQuery-like HTML/DOM manipulation")
+ (description "@code{lQuery} is a DOM manipulation library written in
+Common Lisp, inspired by and based on the jQuery syntax and
+functions. It uses Plump and CLSS as DOM and selector engines. The
+main idea behind lQuery is to provide a simple interface for crawling
+and modifying HTML sites, as well as to allow for an alternative
+approach to templating.")
+ (home-page "https://github.com/Shinmera/lquery")
(license license:zlib))))
-;; TODO: Build failure:
-;; https://github.com/Shinmera/3d-quaternions/issues/2
-;;
-;; (define-public ecl-3d-quaternions
-;; (sbcl-package->ecl-package sbcl-3d-quaternions))
+(define-public cl-lquery
+ (sbcl-package->cl-source-package sbcl-lquery))
-(define-public cl-3d-quaternions
- (sbcl-package->cl-source-package sbcl-3d-quaternions))
+(define-public ecl-lquery
+ (sbcl-package->ecl-package sbcl-lquery))
-(define-public sbcl-interface
- (let ((commit "6d8bd74214053debcbc0b174d65ea73c271c1563")
+(define-public sbcl-ltk
+ (let ((commit "ff14a781d211c19c35e65a7ecaece67dda0b3ebb")
(revision "0"))
(package
- (name "sbcl-interface")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-ltk")
+ (version (git-version "0.992" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stylewarning/interface")
+ (url "https://github.com/herth/ltk")
(commit commit)))
- (file-name (git-file-name "cl-interface" version))
+ (file-name (git-file-name "cl-ltk" version))
(sha256
- (base32 "0h1bckhyig2znl6nrd3agjzz7knrm2kyh2vfyk7j60kzki9rpzxy"))))
+ (base32 "0f1xgsj2j7bq21cq2pa9rw3ybxd9vyknisl6z307lxx7lvhm3xac"))))
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-alexandria sbcl-global-vars))
- (synopsis "System for defining interfaces")
+ (inputs
+ (list imagemagick tk))
+ (arguments
+ `(#:asd-systems '("ltk"
+ "ltk-mw"
+ "ltk-remote")
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "ltk/ltk.lisp"
+ (("#-freebsd \"wish\"")
+ (string-append "#-freebsd \""
+ (assoc-ref inputs "tk")
+ "/bin/wish\""))
+ (("do-execute \"convert\"")
+ (string-append "do-execute \""
+ (assoc-ref inputs "imagemagick")
+ "/bin/convert\"")))
+ #t))
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (substitute* "ltk/ltk-remote.lisp"
+ (("\\(:export")
+ "(:shadow #:raise) (:export"))
+ #t)))))
+ (synopsis "Common Lisp bindings for the Tk GUI toolkit")
(description
- "This library contains an implementation of interfaces and
-implementations. They're sometimes called protocols in other
-languages. Broadly speaking, an @emph{interface} is some collection of
-function @emph{prototypes} that a valid implementation must implement.")
- (home-page "https://github.com/stylewarning/interface")
- (license license:bsd-3))))
+ "LTK is a Common Lisp binding for the Tk graphics toolkit. It is
+written in pure Common Lisp and does not require any Tk knowledge for its
+usage.")
+ (home-page "http://www.peter-herth.de/ltk/")
+ (license license:llgpl))))
-(define-public ecl-interface
- (sbcl-package->ecl-package sbcl-interface))
+(define-public cl-ltk
+ (sbcl-package->cl-source-package sbcl-ltk))
-(define-public cl-interface
- (sbcl-package->cl-source-package sbcl-interface))
+(define-public ecl-ltk
+ (sbcl-package->ecl-package sbcl-ltk))
-(define-public sbcl-cl-syslog
- (let ((commit "d5d46f777f0735938e6f650cf17d814b88b70305")
+(define-public sbcl-lunamech-matrix-api
+ (let ((commit "aa54a820149584c237b03d500ad83397fe25dc92")
(revision "0"))
(package
- (name "sbcl-cl-syslog")
- (version (git-version "0.2.4" revision commit))
+ (name "sbcl-lunamech-matrix-api")
+ (version (git-version "0.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmaul/cl-syslog")
+ (url "https://github.com/K1D77A/lunamech-matrix-api")
(commit commit)))
- (file-name (git-file-name "cl-syslog" version))
+ (file-name (git-file-name "cl-lunamech-matrix-api" version))
(sha256
- (base32 "1qcz55jiqwk91b01hsahxnha884f6zf2883j2m51sqph0mvj69mh"))))
+ (base32 "0a664qq4m5gk4iv5ck63gmsl3218jhjsalawklj56wn2pw0cf8a0"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-cffi
- sbcl-global-vars
- sbcl-local-time
- sbcl-split-sequence
- sbcl-usocket))
- (arguments
- (list #:tests? #f))
- (synopsis "Common Lisp interface to local and remote Syslog facilities")
- (description "@code{cl-syslog} is a Common Lisp library that provides
-access to the syslog logging facility.")
- (home-page "https://cl-syslog.common-lisp.dev/")
- (license license:bsd-3))))
-
-(define-public ecl-cl-syslog
- (sbcl-package->ecl-package sbcl-cl-syslog))
-
-(define-public cl-syslog
- (sbcl-package->cl-source-package sbcl-cl-syslog))
-
-(define-public sbcl-alexa
- (package
- (name "sbcl-alexa")
- (version "2.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/quil-lang/alexa")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-alexa" version))
- (sha256
- (base32 "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiasco))
- (inputs (list sbcl-alexandria sbcl-cl-ppcre))
- (synopsis "Lexical Analyzer Generator for Common Lisp")
- (description
- "ALEXA is a tool similar to lex or flex for generating lexical analyzers.
-Unlike tools like lex, however, ALEXA defines a domain-specific language
-within your Lisp program, so you don't need to invoke a separate tool.")
- (home-page "https://github.com/quil-lang/alexa")
- (license license:bsd-3)))
+ (list sbcl-cl-json
+ sbcl-cl-str
+ sbcl-closer-mop
+ sbcl-dexador
+ sbcl-do-urlencode
+ sbcl-drakma
+ sbcl-jonathan
+ sbcl-plump
+ sbcl-quri
+ sbcl-reader
+ sbcl-shasht))
+ (home-page "https://github.com/K1D77A/lunamech-matrix-api/")
+ (synopsis "Implementation of the Matrix API")
+ (description "This package provides an implementation of the Matrix
+API for Common Lisp.")
+ (license license:expat))))
-(define-public ecl-alexa
- (sbcl-package->ecl-package sbcl-alexa))
+(define-public cl-lunamech-matrix-api
+ (sbcl-package->cl-source-package sbcl-lunamech-matrix-api))
-(define-public cl-alexa
- (sbcl-package->cl-source-package sbcl-alexa))
+(define-public ecl-lunamech-matrix-api
+ (sbcl-package->ecl-package sbcl-lunamech-matrix-api))
-(define-public sbcl-metering
- (let ((commit "62dbaa5e8d29d2f213b881d740114941c2c3d1be")
- (revision "0"))
+(define-public sbcl-lw-compat
+ ;; No release since 2013.
+ (let ((commit "aabfe28c6c1a4949f9d7b3cb30319367c9fd1c0d"))
(package
- (name "sbcl-metering")
- (version (git-version "3.2" revision commit))
+ (name "sbcl-lw-compat")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/dkochmanski/metering")
+ (url "https://github.com/pcostanza/lw-compat/")
(commit commit)))
- (file-name (git-file-name "cl-metering" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1"))))
+ (base32 "131rq5k2mlv9bfhmafiv6nfsivl4cxx13d9wr06v5jrqnckh4aav"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (synopsis "Common Lisp code profiling tool")
- (description
- "The Metering System is a portable Common Lisp code profiling tool.
-It gathers timing and consing statistics for specified functions while
-a program is running.")
- (home-page "https://gitlab.common-lisp.net/dkochmanski/metering")
- (license license:public-domain))))
+ (home-page "https://github.com/pcostanza/lw-compat/")
+ (synopsis "LispWorks utilities ported to other Common Lisp implementations")
+ (description "This package contains a few utility functions from the
+LispWorks library that are used in software such as ContextL.")
+ (license license:expat))))
-(define-public ecl-metering
- (sbcl-package->ecl-package sbcl-metering))
+(define-public cl-lw-compat
+ (sbcl-package->cl-source-package sbcl-lw-compat))
-(define-public cl-metering
- (sbcl-package->cl-source-package sbcl-metering))
+(define-public ecl-lw-compat
+ (sbcl-package->ecl-package sbcl-lw-compat))
-(define-public sbcl-cl-grnm
- (let ((commit "778a312e9eb3d3de7541457b516ea3d9055a15aa")
- (revision "0"))
+(define-public sbcl-lzlib
+ (let ((commit "22767ca12d1c1bd59a7ae1f9c5ef7d2e937206bb")
+ (revision "2"))
(package
- (name "sbcl-cl-grnm")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-lzlib")
+ (version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/quil-lang/cl-grnm")
+ (url "https://codeberg.org/glv/cl-lzlib")
(commit commit)))
- (file-name (git-file-name "cl-grnm" version))
+ (file-name (git-file-name "cl-lzlib" version))
(sha256
- (base32 "1hb5n37n3x2ylrghcqsia2g9a6f5wg24l659jiz4ncpi5bsv4m3s"))))
+ (base32 "1dxzlkay7aqcs65h2f7j7rl4sdjija60dshlahzyllfw174p9d3m"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Common Lisp implementation of (grid restrained) Nelder-Mead")
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list lzlib
+ sbcl-cffi
+ sbcl-cl-octet-streams
+ sbcl-lparallel))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/lzlib.lisp"
+ (("liblz\\.so")
+ (search-input-file inputs "/lib/liblz.so"))))))))
+ (synopsis "Common Lisp library for lzip (de)compression")
(description
- "These common lisp sources contain two variants of the Nelder-Mead
-algorithm. The original algorithm and a provably convergent, reliable variant
-by A. Bürmen et al, called the
-@acronym{GRNMA, Grid Restrained Nelder Mead Algorithm}.")
- (home-page "https://github.com/quil-lang/cl-grnm")
- (license license:expat))))
+ "This Common Lisp library provides functions for lzip (LZMA)
+compression/decompression using bindings to the lzlib C library.")
+ (home-page "https://codeberg.org/glv/cl-lzlib")
+ (license license:gpl3+))))
-(define-public ecl-cl-grnm
- (sbcl-package->ecl-package sbcl-cl-grnm))
+(define-public cl-lzlib
+ (sbcl-package->cl-source-package sbcl-lzlib))
-(define-public cl-grnm
- (sbcl-package->cl-source-package sbcl-cl-grnm))
+(define-public ecl-lzlib
+ (sbcl-package->ecl-package sbcl-lzlib))
-(define-public sbcl-priority-queue
- (let ((commit "011b8d52ef7ba7f8e6bc26608eedef222b38aaa8")
- (revision "0"))
+(define-public sbcl-machine-state
+ (let ((commit "3d258eea63942e7d2fd7212f1ad8bbcf505634a2")
+ (revision "2"))
(package
- (name "sbcl-priority-queue")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-machine-state")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dsorokin/priority-queue")
+ (url "https://github.com/Shinmera/machine-state")
(commit commit)))
- (file-name (git-file-name "cl-priority-queue" version))
+ (file-name (git-file-name "cl-machine-state" version))
(sha256
- (base32 "0y5a1fid8xzzl58hfdj64n8mrzq0kr06a0lnmdjpgi0czc3x0jcy"))))
+ (base32 "1fjf2v8agx75qnna1n8fn54lvb01w1rk1vddi3p45a2xw1kwhzml"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Priority queue for Common Lisp")
- (description "This package provides a priority queue implemented with
-an array-based heap.")
- (home-page "https://github.com/dsorokin/priority-queue")
- (license license:expat))))
+ (inputs
+ (list sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-cl-opengl
+ sbcl-documentation-utils))
+ (arguments
+ '(#:tests? #f ; No tests.
+ #:asd-systems '("machine-state" "machine-state/opengl")))
+ (home-page "https://shinmera.github.io/machine-state/")
+ (synopsis "Retrieve machine state information about CPU time, memory usage and more")
+ (description
+ "This library implements various functions to access status information
+about the machine, process, etc.")
+ (license license:zlib))))
-(define-public ecl-priority-queue
- (sbcl-package->ecl-package sbcl-priority-queue))
+(define-public cl-machine-state
+ (sbcl-package->cl-source-package sbcl-machine-state))
-(define-public cl-priority-queue
- (sbcl-package->cl-source-package sbcl-priority-queue))
+(define-public ecl-machine-state
+ (sbcl-package->ecl-package sbcl-machine-state))
-(define-public sbcl-cl-messagepack
- (let ((commit "8ff2060ed20677feef8ac01558690df0aeac30b6")
- (revision "0"))
+(define-public sbcl-magic-ed
+ (let ((commit "30bb27832d4e3e362578e7320934638f9889a8c4")
+ (revision "1"))
(package
- (name "sbcl-cl-messagepack")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-magic-ed")
+ (version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mbrezu/cl-messagepack")
+ (url "https://github.com/sanel/magic-ed")
(commit commit)))
- (file-name (git-file-name "cl-messagepack" version))
+ (file-name (git-file-name "cl-magic-ed" version))
(sha256
- (base32 "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc"))))
+ (base32 "1j6il4lif0dy6hqiz6n91yl8dvii9pk1i9vz0faq5mnr42mr7i5f"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-cl-json sbcl-fiveam))
- (inputs (list sbcl-babel sbcl-closer-mop sbcl-flexi-streams))
- (synopsis "Common Lisp implementation of MessagePack")
+ (home-page "https://github.com/sanel/magic-ed")
+ (synopsis "Editing facility for Common Lisp REPL")
(description
- "This is a Common Lisp implementation of the MessagePack
-(@url{http://msgpack.org/}) serialization/deserialization format,
-implemented according to
-@url{http://wiki.msgpack.org/display/MSGPACK/Format+specification}.")
- (home-page "https://github.com/mbrezu/cl-messagepack")
- (license license:bsd-2))))
+ "Magic (ed) is a tiny editing facility for Common Lisp, where you can
+directly load, edit, manipulate and evaluate file or file content from REPL.
+This package also can be a starting point for people who are not accustomed to
+Emacs or SLIME and would like to continue using their default terminal/console
+editor with Common Lisp.")
+ (license license:expat))))
-(define-public ecl-cl-messagepack
- (sbcl-package->ecl-package sbcl-cl-messagepack))
+(define-public cl-magic-ed
+ (sbcl-package->cl-source-package sbcl-magic-ed))
-(define-public cl-messagepack
- (sbcl-package->cl-source-package sbcl-cl-messagepack))
+(define-public ecl-magic-ed
+ (sbcl-package->ecl-package sbcl-magic-ed))
-(define-public sbcl-cl-permutation
- (let ((commit "20c10e9ca56452d2fafc3ec0984dcdf78b4f4b19")
- (revision "0"))
+(define-public sbcl-magicffi
+ (let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2"))
(package
- (name "sbcl-cl-permutation")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-magicffi")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stylewarning/cl-permutation")
+ (url "https://github.com/dochang/magicffi/")
(commit commit)))
- (file-name (git-file-name "cl-permutation" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0i932g0k50y24hxizni6zfya4kcw77yk3b0llivm9g50s7fxj9dk"))))
+ (base32 "0p6ysa92fk34bhxpw7bycbfgw150fv11z9x8jr9xb4lh8cm2hvp6"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiasco))
+ (native-inputs
+ (list sbcl-alexandria))
(inputs
- (list sbcl-alexandria
- sbcl-bordeaux-fft
- sbcl-cl-algebraic-data-type
- sbcl-cl-cont
- sbcl-closer-mop
- sbcl-iterate
- sbcl-priority-queue))
- (synopsis "Permutations and permutation groups in Common Lisp")
+ `(("cffi" ,sbcl-cffi)
+ ("ppcre" ,sbcl-cl-ppcre)
+ ("libmagic" ,file)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((magic (assoc-ref inputs "libmagic")))
+ (substitute* "grovel.lisp"
+ (("/usr/include/magic.h")
+ (string-append magic "/include/magic.h")))
+ (substitute* "api.lisp"
+ ((":default \"libmagic\"" all)
+ (string-append ":default \"" magic "/lib/libmagic\"")))))))))
+ (home-page "https://common-lisp.net/project/magicffi/")
+ (synopsis "Common Lisp interface to libmagic based on CFFI")
(description
- "This is a Commin Lisp library for operating on permutations and
-permutation groups.")
- (home-page "https://github.com/stylewarning/cl-permutation")
- (license license:bsd-3))))
+ "MAGICFFI is a Common Lisp CFFI interface to libmagic(3), the file type
+determination library using @emph{magic} numbers.")
+ (license license:bsd-2))))
-(define-public ecl-cl-permutation
- (sbcl-package->ecl-package sbcl-cl-permutation))
+(define-public ecl-magicffi
+ (sbcl-package->ecl-package sbcl-magicffi))
-(define-public cl-permutation
- (sbcl-package->cl-source-package sbcl-cl-permutation))
+(define-public cl-magicffi
+ (sbcl-package->cl-source-package sbcl-magicffi))
(define-public sbcl-magicl
(package
@@ -21444,2328 +19729,2601 @@ permutation groups.")
(define-public cl-magicl
(sbcl-package->cl-source-package sbcl-magicl))
-(define-public sbcl-messagebox
- (let ((commit "ea3688d9a9954bee7079c0173bc7b3f327021e9f")
+(define-public sbcl-maiden
+ (let ((commit "164e8df1b513fcbf097315b51242d337c183a5ef")
(revision "1"))
(package
- (name "sbcl-messagebox")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-maiden")
+ (version (git-version "3.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/messagebox")
+ (url "https://github.com/Shirakumo/maiden/")
(commit commit)))
- (file-name (git-file-name "messagebox" version))
(sha256
- (base32 "0jkbzlca0wvspgsfj0b0hjwlyyy8jlywsldsbkp79q48fc3aa8jd"))))
+ (base32 "1m16qi019cmfpfs6538hc4qsplpb8nl9ly1qlckgfxgjag0z3wdr"))
+ (file-name (git-file-name "maiden" version))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-zenity-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "zenity.lisp"
- (("\"zenity\"")
- (string-append "\"" (assoc-ref inputs "zenity")
- "/bin/zenity\""))))))))
+ '(#:asd-systems '("maiden"
+ "maiden-commands"
+ "maiden-networking"
+ "maiden-client-entities"
+ "maiden-irc"
+ "maiden-silly")))
(inputs
- `(("documentation-utils" ,sbcl-documentation-utils)
- ("trivial-features" ,sbcl-trivial-features)
- ("zenity" ,zenity)))
- (home-page "https://shinmera.github.io/messagebox/")
- (synopsis "Display a native GUI message box")
- (description
- "This is a small library to display a native GUI message box. This can be
-useful to show error messages and other informational pieces should the
-application fail and be unable to do so using its standard UI.")
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cl-base64
+ sbcl-cl+ssl
+ sbcl-closer-mop
+ sbcl-deeds
+ sbcl-documentation-utils
+ sbcl-drakma
+ sbcl-form-fiddle
+ sbcl-jsown
+ sbcl-lambda-fiddle
+ sbcl-lquery
+ sbcl-pathname-utils
+ sbcl-trivial-garbage
+ sbcl-trivial-indent
+ sbcl-ubiquitous
+ sbcl-usocket
+ sbcl-uuid
+ sbcl-verbose))
+ (synopsis "Modern and extensible chat bot framework")
+ (description "Maiden is a collection of systems to help you build
+applications and libraries that interact with chat servers. It can help you
+build a chat bot, or a general chat client. It also offers a variety of parts
+that should make it much easier to write a client for a new chat protocol.")
+ (home-page "http://shirakumo.github.io/maiden/")
(license license:zlib))))
-(define-public ecl-messagebox
- (sbcl-package->ecl-package sbcl-messagebox))
-
-(define-public cl-messagebox
- (sbcl-package->cl-source-package sbcl-messagebox))
+(define-public maiden
+ (sbcl-package->cl-source-package sbcl-maiden))
-(define-public sbcl-3d-transforms
- (let ((commit "1d44509387d0747cd0351e95a533eca609058632")
- (revision "0"))
+(define-public sbcl-maidenhead
+ (let ((commit "4b9c38e4845dda56ae7fb0355c5260c9ade0ac12")
+ (revision "1"))
(package
- (name "sbcl-3d-transforms")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-maidenhead")
+ (version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/3d-transforms")
+ (url "https://codeberg.org/glv/maidenhead")
(commit commit)))
- (file-name (git-file-name "cl-3d-transforms" version))
+ (file-name (git-file-name "cl-maidenhead" version))
(sha256
- (base32 "03pmv7dh1j6kl16ch6lnvxzjrld4jbr3jx8slzkiipgzdxg74pcx"))))
+ (base32 "10pcx2ngyj6lkfbg1b58lzcm02xl1a3smnad5lvvw30pbalwcq46"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-3d-matrices
- sbcl-3d-quaternions
- sbcl-3d-vectors
- sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/3d-transforms/")
+ (list sbcl-fiveam))
(synopsis
- "Common structure to encapsulate spatial transformations in Common Lisp")
+ "Convert coordinates between latitude/longitude and Maidenhead")
(description
- "This is a library that uses the other 3d-* math libraries to present an
-encapsulation for a spatial transformation. It offers convenience functions for
-operating on such transformations and for converting between them and the
-alternative 4x4 matrix representation.")
- (license license:zlib))))
+ "This a Common Lisp library to convert geographic coordinates between
+latitude/longitude and Maidenhead locator system.")
+ (home-page "https://codeberg.org/glv/maidenhead")
+ (license license:gpl3+))))
-;; TODO: Build failure:
-;; https://github.com/Shinmera/3d-quaternions/issues/2
-;;
-;; (define-public ecl-3d-transforms
-;; (sbcl-package->ecl-package sbcl-3d-transforms))
+(define-public cl-maidenhead
+ (sbcl-package->cl-source-package sbcl-maidenhead))
-(define-public cl-3d-transforms
- (sbcl-package->cl-source-package sbcl-3d-transforms))
+(define-public ecl-maidenhead
+ (sbcl-package->ecl-package sbcl-maidenhead))
-(define-public sbcl-type-templates
- (let ((commit "5b389ebcff61b81585a64d0b899b69fa12aa5f96")
- (revision "0"))
+(define-public sbcl-make-hash
+ ;; no tagged branch
+ (let ((revision "1")
+ (commit "ae0909cd8e697520a1085fac6f54ac2b448ebd21"))
(package
- (name "sbcl-type-templates")
- (version (git-version "4.0.0" revision commit))
+ (name "sbcl-make-hash")
+ (version (git-version "1.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/type-templates")
+ (url "https://github.com/genovese/make-hash")
(commit commit)))
- (file-name (git-file-name "cl-type-templates" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj"))))
+ (base32 "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; No tests
- (list #:tests? #f))
- (inputs
- (list sbcl-alexandria
- sbcl-documentation-utils
- sbcl-form-fiddle))
- (home-page "https://shinmera.github.io/type-templates/")
- (synopsis "Library for defining and expanding templated functions")
+ (home-page "https://github.com/genovese/make-hash")
+ (synopsis "Common Lisp package for flexible hash table creation")
(description
- "The Type-Templates library allows you to define types and “template
-functions” that can be expanded into various type-specialized versions to
-eliminate runtime dispatch overhead. It was specifically designed to
-implement low-level numerical data types and functionality.")
- (license license:zlib))))
+ "This is a Common Lisp package for hash table creation with flexible,
+extensible initializers.")
+ (license license:bsd-3))))
-(define-public cl-type-templates
- (sbcl-package->cl-source-package sbcl-type-templates))
+(define-public cl-make-hash
+ (sbcl-package->cl-source-package sbcl-make-hash))
-(define-public ecl-type-templates
- (sbcl-package->ecl-package sbcl-type-templates))
+(define-public ecl-make-hash
+ (sbcl-package->ecl-package sbcl-make-hash))
-(define-public sbcl-3d-math
- (let ((commit "3831b1706d225def95a7301ef48b393b563f0114")
+(define-public sbcl-map-bind
+ (let ((commit "532d55d93540c632e22b2cd264b5daa5f9d3d900")
(revision "0"))
(package
- (name "sbcl-3d-math")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-map-bind")
+ (version (git-version "1.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/3d-math")
- (commit commit)))
- (file-name (git-file-name "cl-3d-math" version))
- (sha256
- (base32 "052vzx5j7bag9dxvl0j0wrm244js1djldyn31rwxgkq7965rmi5r"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/map-bind")
+ (commit commit)))
+ (file-name (git-file-name "cl-map-bind" version))
+ (sha256
+ (base32 "0hfy65xyqc4zqfncn11pp3hjjkdz7m91cynnv91s3lgcl3kffva0"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-documentation-utils
- sbcl-type-templates))
- (home-page "https://shinmera.github.io/3d-math/")
- (synopsis "Linear algebra for 2D and 3D computations")
+ (list sbcl-parachute))
+ (home-page "https://www.hexstreamsoft.com/libraries/map-bind/")
+ (synopsis "Macro favouring positional references over naming")
(description
- "The @code{3d-math} library implements types, operators, and algorithms
-commonly used in math for 2D and 3D graphics. It supersedes and combines the
-prior libraries @code{3d-vectors}, @code{3d-matrices}, @code{3d-quaternions},
-and @code{3d-transforms}. The new API is largely but not entirely backwards
-compatible, and adds new functionality.")
- (license license:zlib))))
+ "@code{MAP-BIND} is a macro that allows visual grouping of variables with
+their corresponding values in calls to mapping operators when using an
+inline @code{LAMBDA}.")
+ (license license:unlicense))))
-(define-public cl-3d-math
- (sbcl-package->cl-source-package sbcl-3d-math))
+(define-public cl-map-bind
+ (sbcl-package->cl-source-package sbcl-map-bind))
-(define-public ecl-3d-math
- (sbcl-package->ecl-package sbcl-3d-math))
+(define-public ecl-cl-map-bind
+ (sbcl-package->ecl-package sbcl-map-bind))
-(define-public sbcl-3d-spaces
- (let ((commit "a93f4915affcf65617366297ad8bd2ec77bae702")
- (revision "0"))
+(define-public sbcl-map-set
+ (let ((commit "7b4b545b68b8")
+ (revision "1"))
(package
- (name "sbcl-3d-spaces")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-map-set")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shirakumo/3d-spaces")
- (commit commit)))
- (file-name (git-file-name "cl-3d-spaces" version))
+ (method url-fetch)
+ (uri (string-append
+ "https://bitbucket.org/tarballs_are_good/map-set/get/"
+ commit ".tar.gz"))
(sha256
- (base32 "1m5cg5zy1731dcgkm1p4m53z1zsp387xligxh32pdrnrhc2lzhmf"))))
+ (base32 "1sx5j5qdsy5fklspfammwb16kjrhkggdavm922a9q86jm5l0b239"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-3d-math
- sbcl-documentation-utils
- sbcl-for
- sbcl-trivial-extensible-sequences))
- (home-page "https://shirakumo.github.io/3d-spaces/")
- (synopsis "Implementations of various spatial query structures")
+ (home-page "https://bitbucket.org/tarballs_are_good/map-set")
+ (synopsis "Set-like data structure")
(description
- "The 3D-Spaces library implements a number of spatial query data
-structures; structures that can answer spatial range queries for optimized
-lookup, particularly suited for games.")
- (license license:zlib))))
+ "Implementation of a set-like data structure with constant time
+addition, removal, and random selection.")
+ (license license:bsd-3))))
-(define-public cl-3d-spaces
- (sbcl-package->cl-source-package sbcl-3d-spaces))
+(define-public cl-map-set
+ (sbcl-package->cl-source-package sbcl-map-set))
-(define-public ecl-3d-spaces
- (sbcl-package->ecl-package sbcl-3d-spaces))
+(define-public ecl-map-set
+ (sbcl-package->ecl-package sbcl-map-set))
-(define-public sbcl-glsl-toolkit
- (let ((commit "4c4889e75c635772c4df70b11d6f14e7a596da43")
- (revision "2"))
+;;; The following package is renamed from "markup" to "markup-reader" in order
+;;; not to conflict with the "cl-markup" package.
+(define-public sbcl-markup-reader
+ (let ((commit "d2d4d7b073554f47c24223a9304452966608702e")
+ (revision "1"))
(package
- (name "sbcl-glsl-toolkit")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-markup-reader")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/glsl-toolkit")
+ (url "https://github.com/moderninterpreters/markup")
(commit commit)))
- (file-name (git-file-name "cl-glsl-toolkit" version))
+ (file-name (git-file-name "markup-reader" version))
(sha256
- (base32 "0vrk8nqijqdi1rwf85rhd93yj7q8qkxnigxn3bw0cbrzvzrks9rl"))))
+ (base32 "0i3v938j8zpzkd6p9j8gadp5zndjcdxhswj1qgsp592v6497rpzj"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("markup")))
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cl-ppcre sbcl-documentation-utils sbcl-parse-float
- sbcl-trivial-indent))
- (home-page "https://shirakumo.github.io/glsl-toolkit/")
- (synopsis "Parser for OpenGL Shader Language source files")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-str" ,sbcl-cl-str)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
+ (home-page "https://github.com/moderninterpreters/markup")
+ (synopsis "Reader-macro to read HTML tags inside of Common Lisp code")
(description
- "This package provides Common Lisp system collecting tools written to
-wrangle OpenGL Shader Language (GLSL) source files.")
- (license license:zlib))))
+ "Markup allows the use of HTML syntax with in Common Lisp code.
+This has the advantage of being able to copy HTML snippets and have them
+instantly be functional, less double quotes than a s-expression approach,
+and designers will be able to understand the embedded HTML.")
+ (license license:asl2.0))))
-(define-public ecl-glsl-toolkit
- (sbcl-package->ecl-package sbcl-glsl-toolkit))
+(define-public cl-markup-reader
+ (sbcl-package->cl-source-package sbcl-markup-reader))
-(define-public cl-glsl-toolkit
- (sbcl-package->cl-source-package sbcl-glsl-toolkit))
+(define-public ecl-markup-reader
+ (sbcl-package->ecl-package sbcl-markup-reader))
-(define-public sbcl-simple-tasks
- (let ((commit "745d4b54eac9bf5d6909792e63ecd2ef8d303cf2")
- (revision "1"))
+(define-public sbcl-marray
+ (let ((commit "0352f316b6830f0b119088ba9be836e4726bd7d8")
+ (revision "0"))
(package
- (name "sbcl-simple-tasks")
- (version (git-version "1.3.0" revision commit))
+ (name "sbcl-marray")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/simple-tasks")
+ (url "https://github.com/death/marray")
(commit commit)))
- (file-name (git-file-name "simple-tasks" version))
+ (file-name (git-file-name "cl-marray" version))
(sha256
- (base32 "1ls1pij7dvb65g4nam7nvik1218jvfk5iplr48vy290fw3lq7v98"))))
+ (base32 "0l4kvzpiw14vqhlsaflp3c7y51vznjjgbdi0q3axqk1wxvzy1zlx"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-array-utils sbcl-bordeaux-threads sbcl-dissect))
- (home-page "https://shinmera.github.io/simple-tasks/")
- (synopsis "Simple task scheduling framework")
- (description "This is a task scheduling framework for Common Lisp.")
- (license license:zlib))))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-dependencies
+ (lambda _
+ (substitute* "marray.asd"
+ ((":components")
+ ":depends-on (#+sbcl \"sb-posix\")\n :components")))))))
+ (home-page "https://github.com/death/marray")
+ (synopsis "Memory-mapped files as Common Lisp arrays")
+ (description
+ "MARRAY is a library which provides access to memory-mapped files
+through Common Lisp arrays.")
+ (license license:expat))))
-(define-public ecl-simple-tasks
- (sbcl-package->ecl-package sbcl-simple-tasks))
+(define-public cl-marray
+ (sbcl-package->cl-source-package sbcl-marray))
-(define-public cl-simple-tasks
- (sbcl-package->cl-source-package sbcl-simple-tasks))
+;; ECL support not implemented yet.
+;; (define-public ecl-marray
+;; (sbcl-package->ecl-package sbcl-marray))
-(define-public sbcl-trivial-main-thread
- (let ((commit "25f114973bb69eb63e01d0bbfead31f8e682846a")
+(define-public sbcl-marshal
+ (let ((commit "eff1b15f2b0af2f26f71ad6a4dd5c4beab9299ec")
(revision "1"))
(package
- (name "sbcl-trivial-main-thread")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/trivial-main-thread")
- (commit commit)))
- (file-name (git-file-name "trivial-main-thread" version))
- (sha256
- (base32 "0bw1887i7396lqg75qvmgjfzz4xbiq9w5dp8wxdgrcsm0qwlraw7"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-bordeaux-threads sbcl-simple-tasks sbcl-trivial-features))
- (home-page "https://shinmera.github.io/trivial-main-thread/")
- (synopsis "Compatibility library to run things in the main thread")
- (description
- "This package provides a Common Lisp system which wraps the
-BORDEAUX-THREADS system to be able to run things in the main thread of the
-implementation, for example drawing calls of GUI applications.")
- (license license:zlib))))
+ (name "sbcl-marshal")
+ (version (git-version "1.3.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wlbr/cl-marshal")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08qs6fhk38xpkkjkpcj92mxx0lgy4ygrbbzrmnivdx281syr0gwh"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/wlbr/cl-marshal")
+ (synopsis "Simple (de)serialization of Lisp datastructures")
+ (description
+ "Simple and fast marshalling of Lisp datastructures. Convert any object
+into a string representation, put it on a stream an revive it from there.
+Only minimal changes required to make your CLOS objects serializable.")
+ (license license:expat))))
-(define-public ecl-trivial-main-thread
- (sbcl-package->ecl-package sbcl-trivial-main-thread))
+(define-public cl-marshal
+ (sbcl-package->cl-source-package sbcl-marshal))
-(define-public cl-trivial-main-thread
- (sbcl-package->cl-source-package sbcl-trivial-main-thread))
+(define-public ecl-marshal
+ (sbcl-package->ecl-package sbcl-marshal))
-(define-public sbcl-trivial-monitored-thread
- (let ((commit "b0bab23f9a9bd06f0f33809635c7ba4e6a3d5a21")
- (revision "0"))
+(define-public sbcl-mathkit
+ (let ((commit "fd884f94b36ef5e9bc19459ad0b3cda6303d2a2a"))
(package
- (name "sbcl-trivial-monitored-thread")
- (version (git-version "0.3.11" revision commit))
+ (name "sbcl-mathkit")
+ (version (git-version "0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/ediethelm/trivial-monitored-thread")
+ (url "https://github.com/lispgames/mathkit/")
(commit commit)))
- (file-name (git-file-name "trivial-monitored-thread" version))
+ (file-name (git-file-name "cl-mathkit" version))
(sha256
- (base32 "1ipnp2l944hc587bifxsnmiymw468imar0v8bqvgxv8pc5sym4ib"))))
+ (base32 "174y6ndmf52h8sml87qjfl48llmynvdizzk2h0mr85zbaysx73i3"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list sbcl-iterate sbcl-log4cl sbcl-trivial-utilities))
- (home-page "https://gitlab.com/ediethelm/trivial-monitored-thread")
- (synopsis "Thread monitoring library for Common Lisp")
+ (list sbcl-alexandria
+ sbcl-sb-cga))
+ (home-page "https://github.com/lispgames/mathkit/")
+ (synopsis "Pure math functions useful for games, 3D, and GL in general")
(description
- "Trivial Monitored Thread offers a very simple (aka trivial) way of
-spawning threads and being informed when one any of them crash and die.")
+ "This is a purely math-related utility kit, providing functions which
+can be useful for games, 3D, and GL in general.")
(license license:expat))))
-(define-public cl-trivial-monitored-thread
- (sbcl-package->cl-source-package sbcl-trivial-monitored-thread))
+(define-public cl-mathkit
+ (sbcl-package->cl-source-package sbcl-mathkit))
-(define-public ecl-trivial-monitored-thread
- (sbcl-package->ecl-package sbcl-trivial-monitored-thread))
+(define-public ecl-mathkit
+ (sbcl-package->ecl-package sbcl-mathkit))
-(define-public sbcl-moira
- (let ((commit "21f1cfd5942fcaea2ed2e4f6055b2a5a39ac4c6e")
- (revision "0"))
+(define-public sbcl-maxpc
+ (let ((commit "e5e58d053039517d30fd59ab2d128256b87790d5")
+ (revision "1"))
(package
- (name "sbcl-moira")
+ (name "sbcl-maxpc")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/moira")
+ (url "https://github.com/eugeneia/maxpc")
(commit commit)))
- (file-name (git-file-name "cl-moira" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0r6hvq8j04y1i85f8jwhhafylgfrkg8c1z5746nsbv0v0348sf5h"))))
+ (base32 "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-osicat
- sbcl-serapeum
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (home-page "https://github.com/ruricolist/moira")
- (synopsis "Monitor and restart background threads")
+ (arguments
+ ;; FIXME: A test fails with:
+ ;; The assertion
+ ;; (EQUAL (MULTIPLE-VALUE-LIST (MAXPC:GET-INPUT-POSITION))
+ ;; '(7 2 2))
+ ;; failed with
+ ;; (MULTIPLE-VALUE-LIST (MAXPC:GET-INPUT-POSITION)) = (7).
+ (list #:tests? #f))
+ (home-page "https://mr.gy/software/maxpc/api.html")
+ (synopsis
+ "Library for writing parsers and lexers based on combinatory parsing")
(description
- "Moira is a library for monitoring and, if necessary, restarting
-long-running threads. In principle, it is like an in-Lisp process supervisor.")
- (license license:expat))))
+ "@emph{Max’s Parser Combinators} is a simple and pragmatic library for
+writing parsers and lexers based on combinatory parsing. MaxPC is capable of
+parsing deterministic, context-free languages, provides powerful tools for
+parse tree transformation and error handling, and can operate on
+@dfn{sequences} and @dfn{streams}. It supports unlimited backtracking, but
+does not implement @url{http://pdos.csail.mit.edu/~baford/packrat/thesis/,
+Packrat Parsing}. Instead, MaxPC achieves good performance through its
+optimized primitives, and explicit separation of matching and capturing input.
+In practice, MaxPC parsers perform better on typical computer languages—when
+compared to Packrat parsers—at the expense of not producing linear-time
+parsers.")
+ (license license:agpl3))))
-(define-public cl-moira
- (sbcl-package->cl-source-package sbcl-moira))
+(define-public cl-maxpc
+ (sbcl-package->cl-source-package sbcl-maxpc))
-(define-public ecl-moira
- (sbcl-package->ecl-package sbcl-moira))
+(define-public ecl-maxpc
+ (sbcl-package->ecl-package sbcl-maxpc))
-(define-public sbcl-with-user-abort
- (let ((commit "60693b4a1354faf17107ad6003b0b870cca37081")
- (revision "0"))
+(define-public sbcl-mcclim
+ (package
+ (name "sbcl-mcclim")
+ (version "0.9.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/McCLIM/McCLIM")
+ (commit (string-append version "-yule"))))
+ (file-name (git-file-name "cl-mcclim" version))
+ (sha256
+ (base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam pkg-config))
+ (inputs
+ (list fontconfig
+ freetype
+ harfbuzz
+ sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-cl-base64
+ sbcl-cl-dejavu
+ sbcl-cl-freetype2
+ sbcl-cl-pdf
+ sbcl-cl-unicode
+ sbcl-cl-vectors
+ sbcl-cl-who
+ sbcl-closer-mop
+ sbcl-cluffer
+ sbcl-clx
+ sbcl-flexi-streams
+ sbcl-flexichain
+ sbcl-log4cl
+ sbcl-lorem-ipsum
+ sbcl-opticl
+ sbcl-slime-swank
+ sbcl-spatial-trees
+ sbcl-trivial-features
+ sbcl-trivial-garbage
+ sbcl-trivial-gray-streams
+ sbcl-zpb-ttf))
+ (arguments
+ '(#:asd-systems '("mcclim"
+ "clim-examples"
+ ;; clim-debugger is required by cleavir.
+ "clim-debugger")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Extensions/fontconfig/src/functions.lisp"
+ (("libfontconfig\\.so")
+ (search-input-file inputs "/lib/libfontconfig.so")))
+ (substitute* "Extensions/harfbuzz/src/functions.lisp"
+ (("libharfbuzz\\.so")
+ (search-input-file inputs "/lib/libharfbuzz.so"))))))))
+ (home-page "https://mcclim.common-lisp.dev/")
+ (synopsis "Common Lisp GUI toolkit")
+ (description
+ "McCLIM is an implementation of the @emph{Common Lisp Interface Manager
+specification}, a toolkit for writing GUIs in Common Lisp.")
+ (license license:lgpl2.1+)))
+
+(define-public cl-mcclim
+ (sbcl-package->cl-source-package sbcl-mcclim))
+
+(define-public ecl-mcclim
+ (let ((pkg (sbcl-package->ecl-package sbcl-mcclim)))
(package
- (name "sbcl-with-user-abort")
- (version (git-version "0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/compufox/with-user-abort")
- (commit commit)))
- (file-name (git-file-name "cl-with-user-abort" version))
- (sha256
- (base32 "0k1xxfvncdw4fx8nncis1ma128bqq05zky1mrzak5rjbivzjm8j1"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/compufox/with-user-abort")
- (synopsis "Portability library for catching SIGINT from Common Lisp")
- (description
- "@code{with-user-abort} is a Common Lisp portability library providing a
-like-named macro that catches the SIGINT signal.")
- (license license:bsd-3))))
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; Tests fail with "FUNCTION: Not a valid argument (R1
+ ;; (GENERATE-REGION))." on ECL.
+ ((#:tests? _ #f) #f))))))
-(define-public cl-with-user-abort
- (sbcl-package->cl-source-package sbcl-with-user-abort))
+(define-public sbcl-md5
+ (package
+ (name "sbcl-md5")
+ (version "2.0.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pmai/md5")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name "md5" version))
+ (sha256
+ (base32 "1g20np6rhn3y08z8mlmlk721mw2207s52v2pwp4smm3lz25sx3q5"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/pmai/md5")
+ (synopsis
+ "Common Lisp implementation of the MD5 Message-Digest Algorithm (RFC 1321)")
+ (description
+ "This package implements The MD5 Message-Digest Algorithm, as defined in
+RFC 1321 by R. Rivest, published April 1992.")
+ (license license:public-domain)))
-(define-public ecl-with-user-abort
- (sbcl-package->ecl-package sbcl-with-user-abort))
+(define-public cl-md5
+ (sbcl-package->cl-source-package sbcl-md5))
-(define-public sbcl-cl-package-locks
- (let ((commit "96a358ede7cef416d61d2f699e724fe1d9de602c")
+(define-public ecl-md5
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-md5))
+ (inputs
+ (list ecl-flexi-streams))))
+
+(define-public sbcl-messagebox
+ (let ((commit "ea3688d9a9954bee7079c0173bc7b3f327021e9f")
(revision "1"))
(package
- (name "sbcl-cl-package-locks")
- (version (git-version "0.0.2" revision commit))
+ (name "sbcl-messagebox")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/elliottjohnson/cl-package-locks")
+ (url "https://github.com/Shinmera/messagebox")
(commit commit)))
- (file-name (git-file-name "cl-package-locks" version))
+ (file-name (git-file-name "messagebox" version))
(sha256
- (base32 "0g3gfljnvpgd66ccd2sqawlkwqx4a0wsdrg5180va61w869cgxqq"))))
+ (base32 "0jkbzlca0wvspgsfj0b0hjwlyyy8jlywsldsbkp79q48fc3aa8jd"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/elliottjohnson/cl-package-locks")
- (synopsis "Compatibility layer for dealing with package locks")
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-zenity-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "zenity.lisp"
+ (("\"zenity\"")
+ (string-append "\"" (assoc-ref inputs "zenity")
+ "/bin/zenity\""))))))))
+ (inputs
+ `(("documentation-utils" ,sbcl-documentation-utils)
+ ("trivial-features" ,sbcl-trivial-features)
+ ("zenity" ,zenity)))
+ (home-page "https://shinmera.github.io/messagebox/")
+ (synopsis "Display a native GUI message box")
(description
- "This is a Common Lisp library providing a unified way to work with
-package locks across supported Common Lisp implementations.")
- (license license:expat))))
+ "This is a small library to display a native GUI message box. This can be
+useful to show error messages and other informational pieces should the
+application fail and be unable to do so using its standard UI.")
+ (license license:zlib))))
-(define-public ecl-cl-package-locks
- (sbcl-package->ecl-package sbcl-cl-package-locks))
+(define-public cl-messagebox
+ (sbcl-package->cl-source-package sbcl-messagebox))
-(define-public cl-package-locks
- (sbcl-package->cl-source-package sbcl-cl-package-locks))
+(define-public ecl-messagebox
+ (sbcl-package->ecl-package sbcl-messagebox))
-(define-public sbcl-cl-typesetting
- (let ((commit "86eba981fc4254addebecf765578ec350d6e3b75")
- (revision "1"))
+(define-public sbcl-meta
+ (let ((commit "74faea662139fbbfb9c99341aaed989f5b0e9da3")
+ (revision "0"))
(package
- (name "sbcl-cl-typesetting")
- (version (git-version "0.8.0" revision commit))
+ (name "sbcl-meta")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mbattyani/cl-typesetting")
+ (url "https://gitlab.common-lisp.net/frideau/meta")
(commit commit)))
- (file-name (git-file-name "cl-typesetting" version))
+ (file-name (git-file-name "cl-meta" version))
(sha256
- (base32 "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"))))
+ (base32 "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; NOTE: (Sharlatan-20210515T213014+0100): Circular dependencies with
- ;; cl-typegraph
- `(#:tests? #f))
(inputs
- `(("cl-pdf" ,sbcl-cl-pdf)
- ("xmls" ,sbcl-xmls)))
- (home-page "https://github.com/mbattyani/cl-typesetting")
- (synopsis "Stand-alone Common Lisp typesetting system")
+ (list sbcl-named-readtables))
+ (home-page "https://gitlab.common-lisp.net/frideau/meta")
+ (synopsis "Recursive-descent parser DSL for Common Lisp")
(description
- "CL-TYPESETTING is a cross-platform Common Lisp typesetting library for
-all kind of typesetting applications.")
+ "This package provides a recursive-descent parser DSL for Common Lisp.
+It's intended as a simpler alternative to parser generators.")
(license license:bsd-2))))
-(define-public ecl-cl-typesetting
- (sbcl-package->ecl-package sbcl-cl-typesetting))
+(define-public cl-meta
+ (sbcl-package->cl-source-package sbcl-meta))
-(define-public cl-typesetting
- (sbcl-package->cl-source-package sbcl-cl-typesetting))
+(define-public ecl-meta
+ (sbcl-package->ecl-package sbcl-meta))
-(define-public sbcl-shasht
- (let ((commit "27ba0a8842e103f2d575b3c8bbcfc19bd172d9ea")
+(define-public sbcl-metabang-bind
+ (let ((commit "08196426cb099db0623e6cae2aeca566e0b788b2")
(revision "2"))
(package
- (name "sbcl-shasht")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-metabang-bind")
+ (version (git-version "0.8.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/yitzchak/shasht")
+ (url "https://github.com/hraban/metabang-bind")
(commit commit)))
- (file-name (git-file-name "cl-shasht" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1y7qh8kdhk06243vkmxzdk0y9rax4g8pv28bd01j48ix777mpcdc"))))
+ (base32
+ "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-alexandria sbcl-parachute))
- (inputs
- (list sbcl-closer-mop sbcl-trivial-do))
- (home-page "https://yitzchak.github.io/shasht/")
- (synopsis "Common Lisp JSON reading and writing library")
+ (list sbcl-lift))
+ (synopsis "Macro that generalizes @code{multiple-value-bind} etc.")
(description
- "This package provides a Common Lisp library to work with the JSON file
-format.")
+ "Bind extends the idea of of let and destructing to provide a uniform
+syntax for all your accessor needs. It combines @code{let},
+@code{destructuring-bind}, @code{with-slots}, @code{with-accessors}, structure
+editing, property or association-lists, and @code{multiple-value-bind} and a
+whole lot more into a single form.")
+ (home-page "https://common-lisp.net/project/metabang-bind/")
+ ;; MIT License
(license license:expat))))
-(define-public ecl-shasht
- (sbcl-package->ecl-package sbcl-shasht))
+(define-public cl-metabang-bind
+ (sbcl-package->cl-source-package sbcl-metabang-bind))
-(define-public cl-shasht
- (sbcl-package->cl-source-package sbcl-shasht))
+(define-public ecl-metabang-bind
+ (sbcl-package->ecl-package sbcl-metabang-bind))
-(define-public sbcl-cl-speedy-queue
- (let ((commit "0425c7c62ad3b898a5ec58cd1b3e74f7d91eec4b")
- (revision "1"))
+(define-public sbcl-metacopy
+ (let ((commit "df7856f2a43fa91124fe780ef22f792040bc130c")
+ (revision "2"))
(package
- (name "sbcl-cl-speedy-queue")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-metacopy")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/zkat/cl-speedy-queue")
+ ;; Upstream changed the maintaner.
+ ;; legacy https://github.com/gwkkwg/metacopy
+ (url "https://github.com/hraban/metacopy")
(commit commit)))
- (file-name (git-file-name "cl-speedy-queue" version))
+ (file-name (git-file-name "cl-metacopy" version))
(sha256
- (base32 "0czhnvxn9lvbjz9h1lb7y18nqrsq3drq5icd3lqdaa07362alriq"))))
+ (base32 "0l5ryg8pvqz9sn9s8bsvd0plvcnm7crsx86iqk5wxblkialaizip"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/zkat/cl-speedy-queue")
- (synopsis "Lightweight optimized queue for Common Lisp")
+ (native-inputs
+ (list sbcl-asdf-system-connections sbcl-lift))
+ (inputs
+ (list sbcl-contextl sbcl-moptilities))
+ (home-page "https://github.com/hraban/metacopy")
+ (synopsis "Flexible Common Lisp shallow/deep copy mechanism")
(description
- "This is a lightweight, non-consing, optimized queue implementation for
+ "This package provides a flexible shallow/deep copy mechanism for
Common Lisp.")
(license license:expat))))
-(define-public cl-speedy-queue
- (sbcl-package->cl-source-package sbcl-cl-speedy-queue))
+(define-public cl-metacopy
+ (sbcl-package->cl-source-package sbcl-metacopy))
-(define-public ecl-cl-speedy-queue
- (sbcl-package->ecl-package sbcl-cl-speedy-queue))
+(define-public ecl-metacopy
+ (sbcl-package->ecl-package sbcl-metacopy))
-(define-public sbcl-lev
- (let ((commit "7d03c68dad44f1cc4ac2aeeab2d24eb525ad941a")
- (revision "1"))
+(define-public sbcl-metatilities-base
+ (let ((commit "ef04337759972fd622c9b27b53149f3d594a841f")
+ (revision "2"))
(package
- (name "sbcl-lev")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-metatilities-base")
+ (version (git-version "0.6.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/lev")
+ (url "https://github.com/hraban/metatilities-base")
(commit commit)))
- (file-name (git-file-name "lev" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "14lfnrvfyg2nnvlwck896p6vgarzc6g4kijmvhi2d8wra7gxzifh"))))
+ (base32
+ "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; NOTE: (Sharlatan-20210520T163300+0100): No tests in upstream
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-libev-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/lev.lisp"
- (("libev.so" _)
- (search-input-file inputs "/lib/libev.so"))))))))
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("libev" ,libev)))
- (home-page "https://github.com/fukamachi/lev")
- (synopsis "Common Lisp bindings for libev")
- (description "This package provides Common Lisp bindings for libev.")
- (license license:bsd-2))))
+ (native-inputs
+ (list sbcl-lift))
+ (synopsis "Core of the metatilities Common Lisp library")
+ (description
+ "Metatilities-base is the core of the metatilities Common Lisp library
+which implements a set of utilities.")
+ (home-page "https://common-lisp.net/project/metatilities-base/")
+ (license license:expat))))
-(define-public cl-lev
- (sbcl-package->cl-source-package sbcl-lev))
+(define-public cl-metatilities-base
+ (sbcl-package->cl-source-package sbcl-metatilities-base))
-(define-public ecl-lev
- (sbcl-package->ecl-package sbcl-lev))
+(define-public ecl-metatilities-base
+ (sbcl-package->ecl-package sbcl-metatilities-base))
-(define-public sbcl-woo
- (let ((commit "fba3567be95ed6e782d98a4c1477d3a74b8ad124")
- (revision "1"))
+(define-public sbcl-metering
+ (let ((commit "62dbaa5e8d29d2f213b881d740114941c2c3d1be")
+ (revision "0"))
(package
- (name "sbcl-woo")
- (version (git-version "0.12.0" revision commit))
+ (name "sbcl-metering")
+ (version (git-version "3.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/woo")
+ (url "https://gitlab.common-lisp.net/dkochmanski/metering")
(commit commit)))
- (file-name (git-file-name "woo" version))
+ (file-name (git-file-name "cl-metering" version))
(sha256
- (base32 "06f95x8s8v523gxmrkn9wwgw2pvc3bc66znbgrzhqb30y4aar5v5"))))
+ (base32 "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; FIXME: Tests fail because they try to compile clack-test:
- ;;
- ;; Error opening #P"/gnu/store/...-sbcl-clack-2.0.0-1.e3e0328/
- ;; lib/common-lisp/sbcl/clack/src/test-tmpGHU3ALSV.fasl":
- ;;
- ;; Permission denied
- ;;
- ;; clack-test should be compiled when building the sbcl-clack package,
- ;; but it isn't right now because of the circular dependency between
- ;; clack-test and dexador.
- `(#:tests? #f))
- (native-inputs
- (list sbcl-clack sbcl-rove))
- (inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-speedy-queue ;; Required for ecl build
- sbcl-clack
- sbcl-fast-http
- sbcl-fast-io
- sbcl-lev
- sbcl-quri
- sbcl-rove
- sbcl-smart-buffer
- sbcl-static-vectors
- sbcl-swap-bytes
- sbcl-trivial-utf-8
- sbcl-vom))
- (home-page "https://github.com/fukamachi/woo")
- (synopsis "Non-blocking HTTP server based on libev")
+ (native-inputs (list sbcl-fiveam))
+ (synopsis "Common Lisp code profiling tool")
(description
- "This package provides the Common Lisp HTTP server @code{WOO}, which
-is built on top of the @code{libev} event library.")
- (license license:expat))))
+ "The Metering System is a portable Common Lisp code profiling tool.
+It gathers timing and consing statistics for specified functions while
+a program is running.")
+ (home-page "https://gitlab.common-lisp.net/dkochmanski/metering")
+ (license license:public-domain))))
-(define-public cl-woo
- (sbcl-package->cl-source-package sbcl-woo))
+(define-public cl-metering
+ (sbcl-package->cl-source-package sbcl-metering))
-(define-public ecl-woo
- (sbcl-package->ecl-package sbcl-woo))
+(define-public ecl-metering
+ (sbcl-package->ecl-package sbcl-metering))
-(define-public sbcl-json-streams
- (let ((commit "5da012e8133affbf75024e7500feb37394690752")
+(define-public sbcl-mgl-gpr
+ (let ((commit "cb6ce51e2f87bf1d589f3703c13eea6e25780afe")
(revision "1"))
(package
- (name "sbcl-json-streams")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-mgl-gpr")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rotatef/json-streams")
+ (url "https://github.com/melisgl/mgl-gpr")
(commit commit)))
- (file-name (git-file-name "json-streams" version))
+ (file-name (git-file-name "cl-mgl-gpr" version))
(sha256
- (base32 "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"))))
+ (base32 "0w51dqixh277k6sl8bqvvp1400y6kd1l5h3d9q2f40l9bpxy8gjx"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-cl-quickcheck sbcl-flexi-streams))
- (home-page "https://github.com/rotatef/json-streams")
- (synopsis "Common Lisp library for reading and writing JSON")
+ (inputs
+ (list sbcl-cl-random sbcl-mgl-pax))
+ (home-page "https://melisgl.github.io/mgl-gpr/")
+ (synopsis "Common Lisp library of evolutionary algorithms")
(description
- "This package provides a stream based JSON parser/writer, well suited as
-building block for higher level libraries.")
- (license license:gpl3+))))
+ "@code{MGL-GPR} is a library of evolutionary algorithms such as
+Genetic Programming (evolving typed expressions from a set of operators and
+constants) and Differential Evolution.")
+ (license license:expat))))
-(define-public cl-json-streams
- (sbcl-package->cl-source-package sbcl-json-streams))
+(define-public cl-mgl-gpr
+ (sbcl-package->cl-source-package sbcl-mgl-gpr))
-(define-public ecl-json-streams
- (sbcl-package->ecl-package sbcl-json-streams))
+(define-public ecl-mgl-gpr
+ (sbcl-package->ecl-package sbcl-mgl-gpr))
-(define-public sbcl-arnesi
- (let ((commit "1e7dc4cb2cad8599113c7492c78f4925e839522e")
+(define-public sbcl-mgl-pax
+ (let ((commit "6782eb041c152721972420dfafa192692d16b7ce")
(revision "1"))
(package
- (name "sbcl-arnesi")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-mgl-pax")
+ (version (git-version "0.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/AccelerationNet/arnesi")
+ (url "https://github.com/melisgl/mgl-pax")
(commit commit)))
- (file-name (git-file-name "arnesi" version))
(sha256
- (base32 "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"))))
+ (base32 "0fjbzc2fn17m80lfsc8121sa0bk7fg42fqlwhm01sk1fj4s48pma"))
+ (file-name (git-file-name "cl-mgl-pax" version))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; FIXME: (Sharlatan-20210523T190315+0100): Tests failed on
- ;; special-lisp-var-rebount-in/cc
- ;;
- ;; ; processing (TEST SPECIAL-LISP-VAR-REBOUND-IN/CC ...)
- ;; ; wrote .../sbcl/arnesi/t/call-cc-tmp5GEXGEG5.fasl
- ;; ; compilation finished in 0:00:00.028
- ;; Unhandled SIMPLE-ERROR in thread
- ;; #<SB-THREAD:THREAD "main thread" RUNNING {100B768173}>:
- ;; Sorry, No walker for the special operater DECLARE defined.
- ;;
- ;; Backtrace for: #<SB-THREAD:THREAD "main thread" RUNNING {100B768173}>
- ;; 0: (SB-DEBUG::DEBUGGER-DISABLED-HOOK #<SIMPLE-ERROR "Sorry,
- ;; No walker for the special operater ~S defined."
- ;; {1001FAF9D3}> #<unused argument> :QUIT T)
- ;;
- `(#:tests? #f))
- (native-inputs
- (list sbcl-fiveam))
+ ;; (native-inputs
+ ;; (list sbcl-try))
(inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("collectors" ,sbcl-collectors)
- ("swank" ,sbcl-slime-swank)))
- (home-page "https://github.com/AccelerationNet/arnesi")
- (synopsis "Common Lisp utility suite")
+ (list sbcl-3bmd
+ sbcl-alexandria
+ sbcl-colorize
+ sbcl-md5
+ sbcl-named-readtables
+ sbcl-pythonic-string-reader
+ sbcl-slime-swank
+ sbcl-trivial-utf-8))
+ (arguments
+ `(#:asd-systems '("mgl-pax"
+ "mgl-pax/navigate"
+ "mgl-pax/document"
+ "mgl-pax/transcribe")
+ ;; Tests disabled because of a circular dependency
+ ;; try -> mgl-pax -> try
+ #:tests? #f))
+ (synopsis "Exploratory programming environment and documentation generator")
(description
- "ARNESI is Common Lisp utilities library similar to ALEXANDRIA, ANAPHORA
-or GOLDEN-UTILS.")
- (license license:bsd-3))))
+ "PAX provides an extremely poor man's Explorable Programming
+environment. Narrative primarily lives in so called sections that mix markdown
+docstrings with references to functions, variables, etc, all of which should
+probably have their own docstrings.
-(define-public ecl-arnesi
- (sbcl-package->ecl-package sbcl-arnesi))
+The primary focus is on making code easily explorable by using SLIME's
+@command{M-.} (@command{slime-edit-definition}). See how to enable some
+fanciness in Emacs Integration. Generating documentation from sections and all
+the referenced items in Markdown or HTML format is also implemented.
-(define-public cl-arnesi
- (sbcl-package->cl-source-package sbcl-arnesi))
+With the simplistic tools provided, one may accomplish similar effects as with
+Literate Programming, but documentation is generated from code, not vice versa
+and there is no support for chunking yet. Code is first, code must look
+pretty, documentation is code.")
+ (home-page "https://melisgl.github.io/mgl-pax/")
+ (license license:expat))))
-(define-public sbcl-gettext
- (let ((commit "a432020cbad99fc22cbe6bb9aa8a83a35000d7aa")
+(define-public cl-mgl-pax
+ (sbcl-package->cl-source-package sbcl-mgl-pax))
+
+(define-public ecl-mgl-pax
+ (sbcl-package->ecl-package sbcl-mgl-pax))
+
+(define-public sbcl-mgrs
+ (let ((commit "c06f268f9ccb00dfc94c8a07771ce1ca82df26a2")
(revision "1"))
(package
- (name "sbcl-gettext")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-mgrs")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rotatef/gettext")
+ (url "https://codeberg.org/glv/mgrs")
(commit commit)))
- (file-name (git-file-name "gettext" version))
+ (file-name (git-file-name "cl-mgrs" version))
(sha256
- (base32 "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"))))
+ (base32 "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-stefil))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-flexi-streams sbcl-split-sequence sbcl-cl-yacc))
- (home-page "https://github.com/rotatef/gettext")
- (synopsis "Common Lisp implementation of Gettext")
+ (list sbcl-utm-ups))
+ (synopsis
+ "Convert coordinates between latitude/longitude and MGRS")
(description
- "This package provides GNU @code{gettext} completely implemented in
-Common Lisp without any C library bindings.")
- (license license:lgpl3+))))
+ "This a Common Lisp library to convert geographic coordinates between
+latitude/longitude and MGRS.")
+ (home-page "https://codeberg.org/glv/mgrs")
+ (license license:gpl3+))))
-(define-public ecl-gettext
- (sbcl-package->ecl-package sbcl-gettext))
+(define-public cl-mgrs
+ (sbcl-package->cl-source-package sbcl-mgrs))
-(define-public cl-gettext
- (sbcl-package->cl-source-package sbcl-gettext))
+(define-public ecl-mgrs
+ (sbcl-package->ecl-package sbcl-mgrs))
-(define-public sbcl-parser-combinators
- (let ((commit "9c7569a4f6af5e60c0d3a51d9c15c16d1714c845")
- (revision "1"))
+(define-public sbcl-misc-extensions
+ (package
+ (name "sbcl-misc-extensions")
+ (version "4.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.common-lisp.net/misc-extensions/misc-extensions.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-misc-extensions" version))
+ (sha256
+ (base32
+ "02hw5k7zfzs736dhpcii8ncvx3ia4l5byw5ngzmhydqscbi4hcvc"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Collection of small macros and extensions for Common Lisp")
+ (description
+ "This project is intended as a catchall for small, general-purpose
+extensions to Common Lisp. It contains:
+
+@itemize
+@item @code{new-let}, a macro that combines and generalizes @code{let},
+@code{let*} and @code{multiple-value-bind},
+@item @code{gmap}, an iteration macro that generalizes @code{map}.
+@end itemize\n")
+ (home-page "https://common-lisp.net/project/misc-extensions/")
+ (license license:public-domain)))
+
+(define-public cl-misc-extensions
+ (sbcl-package->cl-source-package sbcl-misc-extensions))
+
+(define-public ecl-misc-extensions
+ (sbcl-package->ecl-package sbcl-misc-extensions))
+
+(define-public sbcl-mito
+ (let ((commit "47ba4865ca4bb2894b53703a49a299e973f8eb86")
+ (revision "3"))
(package
- (name "sbcl-parser-combinators")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-mito")
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/fukamachi/mito")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Ramarren/cl-parser-combinators")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "parser-combinators" version))
+ (file-name (git-file-name "mito" version))
(sha256
- (base32 "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"))))
+ (base32 "0313nxlj1zqw6zyc23xpf85v0jk32sg0543ql8363jki0pmg7yhs"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; FIXME: (Sharlatan-20210523T184237+0100): Tests require `femlisp', which
- ;; is quite chunky not packaged system yet, enable them when it's packed.
- `(#:tests? #f))
- ;; (native-inputs
- ;; `(("hu.dwim.stefil" ,sbcl-hu.dwim.stefil)
- ;; ("infix" ,sbcl-femlisp)))
+ (native-inputs
+ (list sbcl-prove))
(inputs
`(("alexandria" ,sbcl-alexandria)
- ("cl-containers" ,sbcl-cl-containers)
+ ("cl-package-locks" ,sbcl-cl-package-locks)
("cl-ppcre" ,sbcl-cl-ppcre)
- ("iterate" ,sbcl-iterate)))
- (home-page "https://github.com/Ramarren/cl-parser-combinators")
- (synopsis "Parser combinators in Common Lisp")
- (description
- "PARSER-COMBINATORS is a library implementing monadic parser
-combinators in Common Lisp, similar in concept to Haskell Parsec system.")
- (license license:bsd-3))))
+ ("cl-reexport" ,sbcl-cl-reexport)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("dbi" ,sbcl-dbi)
+ ("dissect" ,sbcl-dissect)
+ ("esrap" ,sbcl-esrap)
+ ("local-time" ,sbcl-local-time)
+ ("sxql" ,sbcl-sxql)
+ ("trivia" ,sbcl-trivia)
+ ("uuid" ,sbcl-uuid)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'remove-non-functional-tests
+ (lambda _
+ (substitute* "mito-test.asd"
+ (("\\(:test-file \"db/mysql\"\\)") "")
+ (("\\(:test-file \"db/postgres\"\\)") "")
+ (("\\(:test-file \"dao\"\\)") "")
+ ;; TODO: migration/sqlite3 should work, re-enable once
+ ;; upstream has fixed it:
+ ;; https://github.com/fukamachi/mito/issues/70
+ (("\\(:test-file \"migration/sqlite3\"\\)") "")
+ (("\\(:test-file \"migration/mysql\"\\)") "")
+ (("\\(:test-file \"migration/postgres\"\\)") "")
+ (("\\(:test-file \"postgres-types\"\\)") "")
+ (("\\(:test-file \"mixin\"\\)") ""))
+ #t)))
+ #:asd-systems '("mito-test" "mito")))
+ (synopsis "ORM for Common Lisp with migrations and relationships support")
+ (description "Mito is yet another object relational mapper, and it aims
+to be a successor of Integral.
-(define-public ecl-parser-combinators
- (sbcl-package->ecl-package sbcl-parser-combinators))
+@itemize
+@item Support MySQL, PostgreSQL and SQLite3.
+@item Add id (serial/uuid primary key), created_at and updated_at by default
+like Ruby's ActiveRecord.
+@item Migrations.
+@item Database schema versioning.
+@end itemize\n")
+ (license license:llgpl))))
-(define-public cl-parser-combinators
- (sbcl-package->cl-source-package sbcl-parser-combinators))
+(define-public cl-mito
+ (sbcl-package->cl-source-package sbcl-mito))
-(define-public sbcl-cl-locale
- (let ((commit "0a36cc0dcf5e0a8c8bf97869cd6199980ca25eec")
- (revision "1"))
+(define-public ecl-mito
+ (let ((pkg (sbcl-package->ecl-package sbcl-mito)))
(package
- (name "sbcl-cl-locale")
- (version (git-version "0.1.1" revision commit))
+ (inherit pkg)
+ (arguments
+ ;; FIXME: Tests never end.
+ '(#:tests? #f)))))
+
+(define-public sbcl-mk-string-metrics
+ (package
+ (name "sbcl-mk-string-metrics")
+ (version "0.1.2")
+ (home-page "https://github.com/cbaggers/mk-string-metrics/")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (sha256
+ (base32 "0bg0bv2mfd4k0g3x72x563hvmrx18xavaffr6xk5rh4if5j7kcf6"))
+ (file-name (git-file-name name version))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Calculate various string metrics efficiently in Common Lisp")
+ (description "This library implements efficient algorithms that calculate
+various string metrics in Common Lisp:
+
+@itemize
+@item Damerau-Levenshtein distance
+@item Hamming distance
+@item Jaccard similarity coefficient
+@item Jaro distance
+@item Jaro-Winkler distance
+@item Levenshtein distance
+@item Normalized Damerau-Levenshtein distance
+@item Normalized Levenshtein distance
+@item Overlap coefficient
+@end itemize\n")
+ (license license:x11)))
+
+(define-public cl-mk-string-metrics
+ (sbcl-package->cl-source-package sbcl-mk-string-metrics))
+
+(define-public ecl-mk-string-metrics
+ (sbcl-package->ecl-package sbcl-mk-string-metrics))
+
+(define-public sbcl-mmap
+ (let ((commit "ba2e98c67e25f0fb8ff838238561120a23903ce7")
+ (revision "0"))
+ (package
+ (name "sbcl-mmap")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fukamachi/cl-locale")
+ (url "https://github.com/Shinmera/mmap")
(commit commit)))
- (file-name (git-file-name "cl-locale" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"))))
+ (base32 "0qd0xp20i1pcfn12kkapv9pirb6hd4ns7kz4zf1mmjwykpsln96q"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("cl-locale-test" "cl-locale")))
(native-inputs
- `(("prove" ,sbcl-prove)
- ("flexi-streams" ,sbcl-flexi-streams)))
+ (list sbcl-alexandria sbcl-cffi sbcl-parachute
+ sbcl-trivial-features))
(inputs
- `(("anaphora" ,sbcl-anaphora)
- ("arnesi" ,sbcl-arnesi)
- ("cl-annot" ,sbcl-cl-annot)
- ("cl-syntax" ,sbcl-cl-syntax)))
- (home-page "https://github.com/fukamachi/cl-locale")
- (synopsis "Internalization library for Common Lisp")
+ (list sbcl-cffi sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/mmap/")
+ (synopsis "File memory mapping for Common Lisp")
(description
- "This package provides a Common Lisp translation library similar to
-CL-I18N and CL-L10N.")
- (license license:llgpl))))
+ "This is a utility library providing access to the @emph{mmap} family of
+functions in a portable way. It allows you to directly map a file into the
+address space of your process without having to manually read it into memory
+sequentially. Typically this is much more efficient for files that are larger
+than a few Kb.")
+ (license license:zlib))))
-(define-public ecl-cl-locale
- (sbcl-package->ecl-package sbcl-cl-locale))
+(define-public cl-mmap
+ (sbcl-package->cl-source-package sbcl-mmap))
-(define-public cl-locale
- (sbcl-package->cl-source-package sbcl-cl-locale))
+(define-public ecl-mmap
+ (sbcl-package->ecl-package sbcl-mmap))
-(define-public sbcl-cl-slice
- (let ((commit "c531683f287216aebbb0affbe090611fa1b5d697")
- (revision "1"))
+(define-public sbcl-modf
+ (let ((commit "dea93fe62c6bf7f66f32f52ac0c555aedbf7abad")
+ (revision "0"))
(package
- (name "sbcl-cl-slice")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-modf")
+ (version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/cl-slice")
+ (url "https://github.com/smithzvk/modf")
(commit commit)))
- (file-name (git-file-name "cl-slice" version))
+ (file-name (git-file-name "cl-modf" version))
(sha256
- (base32 "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"))))
+ (base32
+ "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-clunit))
(inputs
- (list sbcl-alexandria sbcl-anaphora sbcl-let-plus))
- (home-page "https://github.com/tpapp/cl-slice")
- (synopsis "Array slices for Common Lisp")
- (description
- "This package provides a DSL for array slices in Common Lisp.")
- (license license:expat))))
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-iterate))
+ (native-inputs
+ (list sbcl-stefil))
+ (home-page "https://github.com/smithzvk/modf")
+ (synopsis "SETF like macro for functional programming in Common Lisp")
+ (description "This library simplifies functional programming in Common
+Lisp by making it easier to make new data structures with specified changes in
+place.")
+ (license license:bsd-3))))
-(define-public ecl-cl-slice
- (sbcl-package->ecl-package sbcl-cl-slice))
+(define-public cl-modf
+ (sbcl-package->cl-source-package sbcl-modf))
-(define-public cl-slice
- (sbcl-package->cl-source-package sbcl-cl-slice))
+(define-public ecl-modf
+ (sbcl-package->ecl-package sbcl-modf))
-(define-public sbcl-djula
- (let ((commit "6f142594e0372437e64f610b796350ad89ba0be1")
- (revision "2"))
+(define-public sbcl-modularize
+ (let ((commit "86c5d9a11fbd2df9f0f03ac10b5d71837c8934ba")
+ (revision "1"))
(package
- (name "sbcl-djula")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-modularize")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mmontone/djula")
+ (url "https://github.com/Shinmera/modularize")
(commit commit)))
- (file-name (git-file-name "cl-djula" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0yyg61hrql1vrwllyd23vidiff28ridh0avxyvnqb89v060d1j83"))))
+ (base32 "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
- (list sbcl-access
- sbcl-alexandria
- sbcl-anaphora
- sbcl-babel
- sbcl-cl-locale
- sbcl-cl-ppcre
- sbcl-cl-slice
- sbcl-closer-mop
- sbcl-gettext
- sbcl-iterate
- sbcl-local-time
- sbcl-parser-combinators
- sbcl-split-sequence
- sbcl-trivial-backtrace))
- (home-page "https://mmontone.github.io/djula/djula/")
- (synopsis "Common Lisp port of the Django templating language")
+ `(("documentation-utils" ,sbcl-documentation-utils)
+ ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames)))
+ (home-page "https://shinmera.github.io/modularize/")
+ (synopsis "Common Lisp modularization framework")
(description
- "This package provides a Common Lisp templating system based on Python
-Django with a syntax similar to Python Jinja2.")
- (license license:expat))))
+ "@code{MODULARIZE} is an attempt at providing a common interface to
+segregate major application components. This is achieved by adding special
+treatment to packages. Each module is a package that is specially registered,
+which allows it to interact and co-exist with other modules in better ways. For
+instance, by adding module definition options you can introduce mechanisms to
+tie modules together in functionality, hook into each other and so on.")
+ (license license:zlib))))
-(define-public ecl-djula
- (sbcl-package->ecl-package sbcl-djula))
+(define-public ecl-modularize
+ (sbcl-package->ecl-package sbcl-modularize))
-(define-public cl-djula
- (sbcl-package->cl-source-package sbcl-djula))
+(define-public cl-modularize
+ (sbcl-package->cl-source-package sbcl-modularize))
-(define-public sbcl-for
- (let ((commit "2e4fcfa0f9c1d2f4559c58cef20ccefa50ba180d")
+(define-public sbcl-modularize-hooks
+ (let ((commit "e0348ed3ffd59a9ec31ca4ab28289e748bfbf96a")
(revision "1"))
(package
- (name "sbcl-for")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-modularize-hooks")
+ (version (git-version "1.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/for")
+ (url "https://github.com/Shinmera/modularize-hooks")
(commit commit)))
- (file-name (git-file-name "for" version))
+ (file-name (git-file-name "modularize-hooks" version))
(sha256
- (base32 "1akz9ggh33x2cq3h0f1cd0p632v1mbagv3dzsb0r10bwg9lh3nmv"))))
+ (base32 "12kjvin8hxidwkzfb7inqv5b6g5qzcssnj9wc497v2ixc56fqdz7"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils sbcl-form-fiddle sbcl-lambda-fiddle))
- (home-page "https://shinmera.github.io/for/")
- (synopsis "Extensible iteration macro library")
+ (list sbcl-closer-mop sbcl-lambda-fiddle sbcl-modularize
+ sbcl-trivial-arguments))
+ (home-page "https://shinmera.github.io/modularize-hooks/")
+ (synopsis "Generic hooks and triggers extension for Modularize")
(description
- "For is a library for an extensible iteration macro. It allows you to write
-concise looping constructs similar to @code{loop} and @code{iterate}. Unlike
-loop however it is extensible and sensible, and unlike iterate it does not
-require code-walking and is easier to extend.")
+ "This is a simple extension to @code{MODULARIZE} that allows modules to
+define and trigger hooks, which other modules can hook on to.")
(license license:zlib))))
-(define-public ecl-for
- (sbcl-package->ecl-package sbcl-for))
+(define-public ecl-modularize-hooks
+ (sbcl-package->ecl-package sbcl-modularize-hooks))
-(define-public cl-for
- (sbcl-package->cl-source-package sbcl-for))
+(define-public cl-modularize-hooks
+ (sbcl-package->cl-source-package sbcl-modularize-hooks))
-(define-public sbcl-flare
- (let ((commit "4f9f17a4fc5b368c2a1988b9a20288695b8d8c48")
+(define-public sbcl-modularize-interfaces
+ (let ((commit "96353657afb8c7aeba7ef5b51eb04c5ed3bcb6ef")
(revision "1"))
(package
- (name "sbcl-flare")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-modularize-interfaces")
+ (version (git-version "0.9.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/flare")
+ (url "https://github.com/Shinmera/modularize-interfaces")
(commit commit)))
- (file-name (git-file-name "flare" version))
+ (file-name (git-file-name "modularize-interfaces" version))
(sha256
- (base32 "00nm3sjngbflj2gd5q0xs2m136w4kix6krww23nk64pkkyq2fs86"))))
+ (base32 "0bjf4wy39cwf75m7vh0r7mmcchs09yz2lrbyap98hnq8blq70fhc"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-3d-vectors
- sbcl-array-utils
- sbcl-documentation-utils
- sbcl-for
- sbcl-lambda-fiddle
- sbcl-trivial-garbage))
- (home-page "https://shinmera.github.io/flare/")
- (synopsis "Easy particle systems with fine grained control")
+ (list sbcl-lambda-fiddle sbcl-modularize sbcl-trivial-arguments
+ sbcl-trivial-indent))
+ (home-page "https://shinmera.github.io/modularize-interfaces/")
+ (synopsis "Programmatical interfaces extension for Modularize")
(description
- "FLARE is a library designed to allow quick and precise particle effect
-creations. It does not concern itself with displaying and only with the
-management and movement of particles. As such, it can easily be integrated into
-any existing or future application.")
+ "This is an extension to @code{MODULARIZE} that allows your application
+to define interfaces in-code that serve both as a primary documentation and as
+compliance control.")
(license license:zlib))))
-(define-public ecl-flare
- (sbcl-package->ecl-package sbcl-flare))
+(define-public ecl-modularize-interfaces
+ (sbcl-package->ecl-package sbcl-modularize-interfaces))
-(define-public cl-flare
- (sbcl-package->cl-source-package sbcl-flare))
+(define-public cl-modularize-interfaces
+ (sbcl-package->cl-source-package sbcl-modularize-interfaces))
-(define-public sbcl-simple-inferiors
- (let ((commit "deac886354e03f8a9502ce96f12a0459ce3be671"))
+(define-public sbcl-moira
+ (let ((commit "448d8e77b95f5de7b41d2897a2167c4b1fb85a76")
+ (revision "1"))
(package
- (name "sbcl-simple-inferiors")
- (version (git-version "1.1.0" "1" commit))
+ (name "sbcl-moira")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/simple-inferiors")
+ (url "https://github.com/ruricolist/moira")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-moira" version))
(sha256
- (base32 "08vsvqv3768bwb2y8mwxbw5wyqzzwqr7rd004r6gafdgf9p9mcx3"))))
+ (base32 "01wxjg122flla4pgys57hya3fwrkyjkpp26j5ypl5885zz1ip5b7"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/simple-inferiors/")
- (synopsis "Common Lisp library to use inferior processes")
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-osicat
+ sbcl-serapeum
+ sbcl-trivial-features
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/ruricolist/moira")
+ (synopsis "Monitor and restart background threads")
(description
- "This is a library to allow easy handling of external processes, and
-primarily to get their output. It handles proper copying of the standard and
-error outputs of the process simultaneously, both in a sequential and parallel
-fashion. It also features a lazy directory switching mechanism, to avoid
-running into parallelism problems when having to change directory.")
- (license license:zlib))))
+ "Moira is a library for monitoring and, if necessary, restarting
+long-running threads. In principle, it is like an in-Lisp process supervisor.")
+ (license license:expat))))
-(define-public ecl-simple-inferiors
- (sbcl-package->ecl-package sbcl-simple-inferiors))
+(define-public cl-moira
+ (sbcl-package->cl-source-package sbcl-moira))
-(define-public cl-simple-inferiors
- (sbcl-package->cl-source-package sbcl-simple-inferiors))
+(define-public ecl-moira
+ (sbcl-package->ecl-package sbcl-moira))
-(define-public sbcl-metacopy
- (let ((commit "df7856f2a43fa91124fe780ef22f792040bc130c")
- (revision "2"))
+(define-public sbcl-more-conditions
+ (let ((commit "b4859fb119b3b88719c3c4d5f6d7a620052fefc2")
+ (revision "1"))
(package
- (name "sbcl-metacopy")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-more-conditions")
+ (version (git-version "0.4.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- ;; Upstream changed the maintaner.
- ;; legacy https://github.com/gwkkwg/metacopy
- (url "https://github.com/hraban/metacopy")
+ (url "https://github.com/scymtym/more-conditions")
(commit commit)))
- (file-name (git-file-name "cl-metacopy" version))
+ (file-name (git-file-name "cl-more-conditions" version))
(sha256
- (base32 "0l5ryg8pvqz9sn9s8bsvd0plvcnm7crsx86iqk5wxblkialaizip"))))
+ (base32 "1n0xbz0yiqn9dxf0ycm57wqvsr4gh2q4hs5fskjbv87c47d7l7zr"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-asdf-system-connections sbcl-lift))
+ (list sbcl-fiveam sbcl-let-plus))
(inputs
- (list sbcl-contextl sbcl-moptilities))
- (home-page "https://github.com/hraban/metacopy")
- (synopsis "Flexible Common Lisp shallow/deep copy mechanism")
+ (list sbcl-alexandria sbcl-closer-mop))
+ (synopsis "General condition classes and signalling helpers")
(description
- "This package provides a flexible shallow/deep copy mechanism for
-Common Lisp.")
- (license license:expat))))
+ "This package provides some condition classes, functions and macros
+which may be useful when building slightly complex systems.")
+ (home-page "https://github.com/scymtym/more-conditions")
+ (license license:llgpl))))
-(define-public ecl-metacopy
- (sbcl-package->ecl-package sbcl-metacopy))
+(define-public cl-more-conditions
+ (sbcl-package->cl-source-package sbcl-more-conditions))
-(define-public cl-metacopy
- (sbcl-package->cl-source-package sbcl-metacopy))
+(define-public ecl-more-conditions
+ (sbcl-package->ecl-package sbcl-more-conditions))
-(define-public sbcl-legit
- (let ((commit "9c677b9b798803d37ab6f5e0e0705441872f7230")
- (revision "3"))
+(define-public sbcl-montezuma
+ (let ((commit "ee2129eece7065760de4ebbaeffaadcb27644738")
+ (revision "1"))
(package
- (name "sbcl-legit")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-montezuma")
+ (version (git-version "0.1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/legit")
+ (url "https://github.com/sharplispers/montezuma")
(commit commit)))
- (file-name (git-file-name "cl-legit" version))
+ (file-name (git-file-name "cl-montezuma" version))
(sha256
- (base32 "0jy021ywrbnkgbgb63ip6j7kr40m4wz2pz1v5ybn6xkkn6dyprsz"))))
+ (base32 "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-git-executable
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "process.lisp"
- (("\"git")
- (string-append "\"" (search-input-file inputs
- "/bin/git")))))))))
+ ;; The _darcs directory contains a second copy of
+ ;; montezuma-indexfiles.asd. Remove the directory to
+ ;; prevent build failure caused by .asd files that have
+ ;; the same filename.
+ (add-after 'unpack 'remove-darcs-directory
+ (lambda _
+ (delete-file-recursively
+ "contrib/montezuma-indexfiles/_darcs")))
+ ;; Tests fail with: :FORCE and :FORCE-NOT arguments not
+ ;; allowed in a nested call to ASDF/OPERATE:OPERATE unless
+ ;; identically to toplevel.
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "montezuma.asd"
+ ((":force t") "")))))))
(inputs
- (list git
- sbcl-cl-ppcre
- sbcl-documentation-utils
- sbcl-lambda-fiddle
- sbcl-simple-inferiors))
- (home-page "https://shinmera.github.io/legit/")
- (synopsis "Interface to the git binary")
+ `(("babel" ,sbcl-babel)
+ ("cl-fad" ,sbcl-cl-fad)
+ ("cl-ppcre" ,sbcl-cl-ppcre)))
+ (native-inputs
+ (list sbcl-trivial-timeout))
+ (home-page "https://github.com/sharplispers/montezuma")
+ (synopsis "Full-text indexing and search for Common Lisp")
(description
- "This is an interface to the @code{git} binary to make controlling it
-from within Common Lisp much easier. It might not ever reach full coverage of
-all features given git's immense size, but features will be added as they are
-needed. The low-level command API is fully mapped however.")
- (license license:zlib))))
+ "Montezuma is a text search engine library for Lisp based on the Ferret
+library for Ruby, which is itself based on the Lucene library for Java.")
+ (license (list license:expat ; montezuma
+ license:gpl3+))))) ; contrib/montezuma-indexfiles
-(define-public ecl-legit
- (sbcl-package->ecl-package sbcl-legit))
+(define-public cl-montezuma
+ (sbcl-package->cl-source-package sbcl-montezuma))
-(define-public cl-legit
- (sbcl-package->cl-source-package sbcl-legit))
+(define-public ecl-montezuma
+ (let ((pkg (sbcl-package->ecl-package sbcl-montezuma)))
+ (package
+ (inherit pkg)
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ;; Tests fail with "Pathname without a physical namestring" error
+ ;; on ECL.
+ ((#:tests? _ #f) #f))))))
-(define-public sbcl-flow
- (let ((commit "6d925af009cdfe033650d7048197a5e6ee937d15")
- (revision "1"))
+(define-public sbcl-moptilities
+ (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41"))
(package
- (name "sbcl-flow")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-moptilities")
+ (version (git-version "0.3.13" "1" commit))
+ (home-page "https://github.com/gwkkwg/moptilities/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/flow")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "flow" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp"))))
+ (base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"))))
(build-system asdf-build-system/sbcl)
- ;; FIXME: (Sharlatan-20210527T203118+0100): FLOW-VISUALIZER requires
- ;; COMMONQT which is not packed yet and required tweaks with QT. Remove
- ;; this when it's ready.
(inputs
- `(("closer-mop" ,sbcl-closer-mop)
- ("documentation-utils" ,sbcl-documentation-utils)))
- (home-page "https://shinmera.github.io/flow/")
- (synopsis "Tools for the representation of graphs and flowcharts")
+ `(("closer-mop" ,sbcl-closer-mop)))
+ (native-inputs
+ (list sbcl-lift))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "lift-standard.config"
+ ((":relative-to lift-test")
+ ":relative-to moptilities-test"))
+ #t))
+ (add-after 'check 'remove-test-results
+ ;; Otherwise the drag the SBCL package into the closure of the CL
+ ;; package.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (source-path (string-append out "/share/common-lisp/"
+ (%lisp-type) "/moptilities/")))
+ (delete-file-recursively
+ (string-append source-path "/test-results")))
+ #t)))))
+ (synopsis "Compatibility layer for Common Lisp MOP implementation differences")
(description
- "FLOW is a flowchart graph library. Unlike other graphing libraries,
-this one focuses on nodes in a graph having distinct @code{ports} through which
-connections to other nodes are formed. This helps in many concrete scenarios
-where it is important to distinguish not only which nodes are connected, but
-also how they are connected to each other.
-
-Particularly, a lot of data flow and exchange problems can be reduced to such
-a @code{flowchart}. For example, an audio processing library may present its
-pipeline as a flowchart of segments that communicate with each other through
-audio sample buffers. Flow gives a convenient view onto this kind of problem,
-and even allows the generic visualisation of graphs in this format.")
- (license license:zlib))))
+ "MOP utilities provide a common interface between Lisps and make the
+MOP easier to use.")
+ (license license:expat))))
-(define-public ecl-flow
- (sbcl-package->ecl-package sbcl-flow))
+(define-public cl-moptilities
+ (sbcl-package->cl-source-package sbcl-moptilities))
-(define-public cl-flow
- (sbcl-package->cl-source-package sbcl-flow))
+(define-public ecl-moptilities
+ (let ((pkg (sbcl-package->ecl-package sbcl-moptilities)))
+ (package
+ (inherit pkg)
+ (arguments
+ ;; Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is
+ ;; undefined" on ECL.
+ '(#:tests? #f)))))
-(define-public sbcl-cl-glfw3
- (let ((commit "32c3f34d592d55ee7ce932ed85804c1a9c4158c6")
+(define-public sbcl-mssql
+ (let ((commit "045602a19a32254108f2b75871049293f49731eb")
(revision "1"))
(package
- (name "sbcl-cl-glfw3")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-mssql")
+ (version (git-version "0.0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/AlexCharlton/cl-glfw3")
+ (url "https://github.com/archimag/cl-mssql")
(commit commit)))
- (file-name (git-file-name "cl-glfw3" version))
+ (file-name (git-file-name "cl-mssql" version))
(sha256
- (base32 "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"))))
+ (base32 "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm"))))
(build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cffi" ,sbcl-cffi)
+ ("freetds" ,freetds)
+ ("garbage-pools" ,sbcl-garbage-pools)
+ ("iterate" ,sbcl-iterate)
+ ("parse-number" ,sbcl-parse-number)))
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-glfw-lib-path
+ (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "glfw-bindings.lisp"
- (("libglfw.so.3" _)
- (search-input-file inputs "/lib/libglfw.so.3"))))))))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("cl-opengl" ,sbcl-cl-opengl)
- ("glfw" ,glfw)
- ("trivial-main-thread" ,sbcl-trivial-main-thread)))
- (home-page "https://github.com/AlexCharlton/cl-glfw3")
- (synopsis "Common Lisp bindings to GLFW version 3.x")
+ (substitute* "src/mssql.lisp"
+ (("libsybdb" all)
+ (string-append (assoc-ref inputs "freetds") "/lib/" all)))
+ #t)))))
+ (home-page "https://github.com/archimag/cl-mssql")
+ (synopsis "Common Lisp library to interact with MS SQL Server databases")
(description
- "This package provides a Common Lisp bindings to @code{glfw}, an OpenGL
-application development library.")
- (license license:bsd-2))))
+ "@code{cl-mssql} provides an interface to connect to Microsoft SQL
+server. It uses the @code{libsybdb} foreign library provided by the FreeTDS
+project.")
+ (license license:llgpl))))
-(define-public ecl-cl-glfw3
- (sbcl-package->ecl-package sbcl-cl-glfw3))
+(define-public cl-mssql
+ (sbcl-package->cl-source-package sbcl-mssql))
-(define-public cl-glfw3
- (sbcl-package->cl-source-package sbcl-cl-glfw3))
+(define-public ecl-mssql
+ (sbcl-package->ecl-package sbcl-mssql))
-(define-public sbcl-cl-gltf
- (let ((commit "7a3af05a7f491d8973b217f096806ef12a97474b")
- (revision "1"))
+(define-public sbcl-mt19937
+ (package
+ (name "sbcl-mt19937")
+ (version "1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://common-lisp.net/project/asdf-packaging/"
+ "mt19937-latest.tar.gz"))
+ (sha256
+ (base32
+ "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Mersenne Twister pseudo-random number generator")
+ (description
+ "MT19937 is a portable Mersenne Twister pseudo-random number generator
+for Common Lisp.")
+ (home-page "https://www.cliki.net/mt19937")
+ (license license:public-domain)))
+
+(define-public cl-mt19937
+ (sbcl-package->cl-source-package sbcl-mt19937))
+
+(define-public ecl-mt19937
+ (sbcl-package->ecl-package sbcl-mt19937))
+
+(define-public sbcl-multilang-documentation
+ (let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0"))
(package
- (name "sbcl-cl-gltf")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-multilang-documentation")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-gltf")
+ (url "https://github.com/Shinmera/multilang-documentation")
(commit commit)))
- (file-name (git-file-name "cl-gltf" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "1d64fg2l2c0wns3wpp1xypd8687gnp3k70fv9fb48m1kpzg4kvrh"))))
+ (base32 "13y5jskx8n2b7kimpfarr8v777w3b7zj5swg1b99nj3hk0843ixw"))))
(build-system asdf-build-system/sbcl)
- (arguments
- ;; No tests provided.
- `(#:tests? #f))
(inputs
- (list sbcl-documentation-utils
- sbcl-cffi
- sbcl-jzon
- sbcl-mmap
- sbcl-nibbles
- sbcl-qbase64
- sbcl-static-vectors
- sbcl-trivial-extensible-sequences))
- (home-page "https://shirakumo.github.io/cl-gltf/")
- (synopsis "Common Lisp parser for glTF file format")
+ (list sbcl-documentation-utils sbcl-language-codes
+ sbcl-system-locale))
+ (home-page "https://shinmera.github.io/multilang-documentation/")
+ (synopsis "Add multiple languages support to Common Lisp documentation")
(description
- "This package provides a Common Lisp parser for glTF file format.")
+ "This library provides a drop-in replacement function for
+cl:documentation that supports multiple docstrings per-language, allowing you
+to write documentation that can be internationalised.")
(license license:zlib))))
-;; FIXME: ECL part is failing
-;; ;;; Internal error:
-;;
-;; ** There is no package with the name SEQUENCE.An error occurred during
-;; initialization: COMPILE-FILE-ERROR while compiling #<cl-source-file
-;; "trivial-extensible-sequences" "fallback">.
-;;
-;; See <https://github.com/Shirakumo/cl-gltf/issues/3>
-;;
-;; (define-public ecl-cl-gltf
-;; (sbcl-package->ecl-package sbcl-cl-gltf))
+(define-public cl-multilang-documentation
+ (sbcl-package->cl-source-package sbcl-multilang-documentation))
-(define-public cl-gltf
- (sbcl-package->cl-source-package sbcl-cl-gltf))
+(define-public ecl-multilang-documentation
+ (sbcl-package->ecl-package sbcl-multilang-documentation))
-(define-public sbcl-chirp
- (let ((commit "01c79fa41939688216d1f86d0766a687becb0654")
- (revision "1"))
+(define-public sbcl-music-spelling
+ (let ((commit "a2d492af440ad30a21042140cf8ffce4b73fbd42")
+ (revision "0"))
(package
- (name "sbcl-chirp")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-music-spelling")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/chirp")
+ (url "https://github.com/ntrocado/music-spelling")
(commit commit)))
- (file-name (git-file-name "chirp" version))
+ (file-name (git-file-name "cl-music-spelling" version))
(sha256
- (base32 "10xlz1vwdv3jv48kmpndpnrg6672m0r5vsjgm2pksfl8bc05j2m0"))))
+ (base32 "0fgahb0jjr4sp2739d55gylmx8alsghnx3spyaqfqci4cxfrys52"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("chirp-core" "chirp-dexador" "chirp-drakma" "chirp")))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("babel" ,sbcl-babel)
- ("cl-base64" ,sbcl-cl-base64)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("dexador" ,sbcl-dexador)
- ("drakma" ,sbcl-drakma)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("ironclad" ,sbcl-ironclad)
- ("local-time" ,sbcl-local-time)
- ("split-sequence" ,sbcl-split-sequence)
- ("uuid" ,sbcl-uuid)
- ("yason" ,sbcl-yason)))
- (home-page "https://shinmera.github.io/chirp/")
- (synopsis "Twitter client library for Common Lisp")
- (description
- "This package provides a Common Lisp Twitter client featuring full API
-coverage.")
- (license license:zlib))))
+ (inputs (list sbcl-alexandria))
+ (home-page "https://github.com/ntrocado/music-spelling/")
+ (synopsis "Automatically spell musical pitches and rhythms")
+ (description "This package implements an algorithm for the spelling
+of enharmonics and dealing with ties and dots in rhythm notation.")
+ (license license:asl2.0))))
-(define-public ecl-chirp
- (sbcl-package->ecl-package sbcl-chirp))
+(define-public cl-music-spelling
+ (sbcl-package->cl-source-package sbcl-music-spelling))
-(define-public cl-chirp
- (sbcl-package->cl-source-package sbcl-chirp))
+(define-public ecl-music-spelling
+ (sbcl-package->ecl-package sbcl-music-spelling))
-(define-public sbcl-cepl
- (let ((commit "d1a10b6c8f4cedc07493bf06aef3a56c7b6f8d5b")
+(define-public sbcl-mw-equiv
+ (let ((commit "3ae871458685b1ef7cd6a996ee22c8c5e738a03d")
(revision "1"))
(package
- (name "sbcl-cepl")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cbaggers/cepl")
- (commit commit)))
- (file-name (git-file-name "cepl" version))
- (sha256
- (base32 "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cffi" ,sbcl-cffi)
- ("cl-opengl" ,sbcl-cl-opengl)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("documentation-utils" ,sbcl-documentation-utils)
- ("float-features" ,sbcl-float-features)
- ("ieee-floats" ,sbcl-ieee-floats)
- ("split-sequence" ,sbcl-split-sequence)
- ("varjo" ,sbcl-varjo)))
- (propagated-inputs
- (list sbcl-quickproject))
- (home-page "https://github.com/cbaggers/cepl")
- (synopsis "Development playground to work with OpenGL")
- (description
- "CEPL (Code Evaluate Play Loop ) is a lispy and REPL-friendly Common Lisp
-library for working with OpenGL.
+ (name "sbcl-mw-equiv")
+ (version (git-version "0.1.2" revision commit))
+ (home-page "https://github.com/sharplispers/mw-equiv/")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharplispers/mw-equiv/")
+ (commit commit)))
+ (file-name (git-file-name "cl-mw-equiv" version))
+ (sha256
+ (base32 "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Extensible object equivalence protocol for Common Lisp")
+ (description "Common Lisp comes with quite some functions to compare
+objects for equality, yet none is applicable in every situation and in general
+this is hard, as equality of objects depends on the semantics of operations on
+them. As consequence, users find themselves regularly in a situation where
+they have to roll their own specialized equality test.
-Its definition of success is making the user feel that GPU programming has
-always been part of the languages standard.
+This module provides one of many possible equivalence relations between
+standard Common Lisp objects. However, it can be extended for new objects
+through a simple CLOS protocol. The rules when two objects are considered
+equivalent distinguish between @emph{mutating} and @emph{frozen objects}. A
+frozen object is promised not to be mutated in the future in a way that
+operations on it can notice the difference.
-The usual approach to using CEPL is to start it at the beginning of your Lisp
-session and leave it open for the duration of your work. You can then treat the
-window it creates as just another output for your graphics, analogous to how
-@code{*standard-output*} is treated for text.")
- (license license:bsd-2))))
+We have chosen to compare mutating objects only for identity (pointer
+equality), to avoid various problems. Equivalence for frozen objects on the
+other hand is established by recursing on the objects' constituent parts and
+checking their equivalence. Hence, two objects are equivalent under the
+@code{OBJECT=} relation, if they are either identical, or if they are frozen
+and structurally equivalent, i.e. their constituents are point-wise
+equivalent.
-(define-public ecl-cepl
- (sbcl-package->ecl-package sbcl-cepl))
+Since many objects are potentially mutable, but are not necessarily mutated
+from a certain point in their life time on, it is possible to promise to the
+equivalence relation that they remain frozen for the rest of their life time,
+thus enabling coarser equivalence than the often too fine-grained pointer
+equality.")
+ (license license:bsd-2))))
-(define-public cl-cepl
- (sbcl-package->cl-source-package sbcl-cepl))
+(define-public cl-mw-equiv
+ (sbcl-package->cl-source-package sbcl-mw-equiv))
-(define-public sbcl-stmx
- ;; No release for years and recent commits contain fixes for recent SBCL
- ;; versions.
- (let ((commit "f71e742a50b85e3abc0af9bb5f02802f218a1705")
- (revision "2"))
+(define-public ecl-mw-equiv
+ (sbcl-package->ecl-package sbcl-mw-equiv))
+
+(define-public sbcl-myway
+ (let ((commit "286230082a11f879c18b93f17ca571c5f676bfb7")
+ (revision "1"))
(package
- (name "sbcl-stmx")
- (version (git-version "2.0.5" revision commit))
+ (name "sbcl-myway")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cosmos72/stmx/")
+ (url "https://github.com/fukamachi/myway")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "myway" version))
(sha256
- (base32 "0q739mlw3s3z5kclzccz4r64ag38ks11fmd38109qwjv5knn69jv"))))
+ (base32 "0briia9bk3lbr0frnx39d1qg6i38dm4j6z9w3yga3d40k6df4a90"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-bordeaux-threads sbcl-log4cl
- sbcl-closer-mop sbcl-trivial-garbage))
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- (lambda _
- (substitute* "asm/transaction.lisp"
- (("\\(ftype \\(function \\(\\) fixnum\\) transaction-begin\\)")
- "(ftype (function () (unsigned-byte 32)) transaction-begin)")
- (("\\(values fixnum &optional\\)")
- "(unsigned-byte 32)")))))))
- (home-page "https://stmx.org/")
- (synopsis "High performance Transactional Memory for Common Lisp")
- (description
- "STMX is a high-performance implementation of composable Transactional
-Memory, which is a concurrency control mechanism aimed at making concurrent
-programming easier to write and understand. Instead of traditional lock-based
-programming, one programs with atomic memory transactions, which can be
-composed together to make larger atomic memory transactions.
+ '(#:asd-systems '("myway-test" "myway")))
+ (native-inputs
+ (list sbcl-prove))
+ (inputs
+ (list sbcl-cl-ppcre sbcl-quri sbcl-map-set))
+ (home-page "https://github.com/fukamachi/myway")
+ (synopsis "Sinatra-compatible URL routing library for Common Lisp")
+ (description "My Way is a Sinatra-compatible URL routing library.")
+ (license license:llgpl))))
-A memory transaction gets committed if it returns normally, while it gets
-rolled back if it signals an error (and the error is propagated to the
-caller).
+(define-public cl-myway
+ (sbcl-package->cl-source-package sbcl-myway))
-Finally, memory transactions can safely run in parallel in different threads,
-are re-executed from the beginning in case of conflicts or if consistent reads
-cannot be guaranteed, and their effects are not visible from other threads
-until they commit.
+(define-public ecl-myway
+ (sbcl-package->ecl-package sbcl-myway))
-Memory transactions give freedom from deadlocks, are immune to thread-safety
-bugs and race conditions, provide automatic roll-back on failure, and aim at
-resolving the tension between granularity and concurrency.")
- (license license:llgpl))))
+(define-public sbcl-nactivitypub
+ (package
+ (name "sbcl-nactivitypub")
+ (version "0.0.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/nactivitypub")
+ (commit version)))
+ (file-name (git-file-name "cl-nactivitypub" version))
+ (sha256
+ (base32
+ "0m2vwi11zp0bpvr0hglq1svdxlp3cc70yvix30yksfzp6kk3amyn"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs (list sbcl-cl-str
+ sbcl-dexador
+ sbcl-local-time
+ sbcl-lparallel
+ sbcl-njson
+ sbcl-quri
+ sbcl-serapeum))
+ (home-page "https://github.com/atlas-engineer/nactivitypub")
+ (synopsis
+ "Common Lisp implementation of ActivityPub and ActivityStreams standards")
+ (description
+ "This package provides a Common Lisp implementation of ActivityPub and
+ActivityStreams standards for social networking.
-(define-public ecl-stmx
- (sbcl-package->ecl-package sbcl-stmx))
+Features:
+@itemize
-(define-public cl-stmx
- (sbcl-package->cl-source-package sbcl-stmx))
+@item Parsing and un-parsing ActivityStreams JSON-LD objects to/from CLOS
+objects with convenient accessors on those.
-(define-public sbcl-binding-arrows
- ;; Fork of sbcl-arrows that does not have a new tag.
- (let ((commit "46bcba8bb1ff27cd5caab3bda36f000d0489a4f2")
- (revision "2"))
- (package
- (name "sbcl-binding-arrows")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/phoe/binding-arrows")
- (commit commit)))
- (file-name (git-file-name "cl-binding-arrows" version))
- (sha256
- (base32 "0kzybw5qlb49czh9v2lnxniz9jzqx306a6lnarfv59x48a7cch22"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-hu.dwim.stefil))
- (home-page "https://github.com/phoe/binding-arrows")
- (synopsis "Threading macros based on binding anonymous variables")
- (description
- "This system implements binding threading macros -- a kind of threading
-macros with different semantics than classical, Clojure core threading macros
-or their extension, swiss-arrows. Two Common Lisp implementations of those are
-@code{arrows} and @code{arrow-macros}.
+@item Sending and fetching ActivityStreams objects to/from the
+ActivityStreams-enabled HTTP(S) URLs.
-This system is a fork of @code{arrows} with changes in semantics that make it
-impossible to merge back upstream.")
- (license license:expat))))
+@item Semantic info extraction with methods like @code{name*}, @code{url*},
+@code{author*}, and @code{published*}.
-(define-public ecl-binding-arrows
- (sbcl-package->ecl-package sbcl-binding-arrows))
+@item No reliance on JSON parser. @code{njson} is used for parser-independent
+JSON handling. Load the parser backend you prefer!
-(define-public cl-binding-arrows
- (sbcl-package->cl-source-package sbcl-binding-arrows))
+@end itemize")
+ (license license:bsd-3)))
-(define-public sbcl-atomics
- ;; No release in years.
- (let ((commit "b7477024894e322bff9c85e6d81e5e8d1d4eae59")
- (revision "2"))
+(define-public cl-nactivitypub
+ (sbcl-package->cl-source-package sbcl-nactivitypub))
+
+(define-public ecl-nactivitypub
+ (sbcl-package->ecl-package sbcl-nactivitypub))
+
+(define-public sbcl-named-readtables
+ (let ((commit "d5ff162ce02035ec7de1acc9721385f325e928c0")
+ (revision "4"))
(package
- (name "sbcl-atomics")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-named-readtables")
+ (version (git-version "0.9" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/atomics")
+ (url "https://github.com/melisgl/named-readtables")
(commit commit)))
- (file-name (git-file-name "cl-atomics" version))
(sha256
- (base32 "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"))))
+ (base32 "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv"))
+ (file-name (git-file-name "cl-named-readtables" version))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-documentation-utils))
- (native-inputs
- (list sbcl-parachute))
- (home-page "https://shinmera.github.io/atomics/")
- (synopsis "Common Lisp portability layer for atomic operations")
+ ;; (native-inputs (list sbcl-try))
+ ;; Tests disabled because of a circular dependency issue:
+ ;; try -> named-readtables -> mgl-pax -> try
+ (arguments
+ (list #:tests? #f))
+ (home-page "https://github.com/melisgl/named-readtables/")
+ (synopsis "Library that creates a namespace for named readtables")
(description
- "This is a library for access to atomic operation primitives such as
-compare-and-swap. It aims to be a rather thin layer over what the
-implementations offer.")
- (license license:zlib))))
+ "Named readtables is a library that creates a namespace for named
+readtables, which is akin to package namespacing in Common Lisp.")
+ (license license:bsd-3))))
-(define-public ecl-atomics
- (sbcl-package->ecl-package sbcl-atomics))
+(define-public cl-named-readtables
+ (sbcl-package->cl-source-package sbcl-named-readtables))
-(define-public cl-atomics
- (sbcl-package->cl-source-package sbcl-atomics))
+(define-public ecl-named-readtables
+ (sbcl-package->ecl-package sbcl-named-readtables))
-(define-public sbcl-cl-murmurhash
- ;; No release.
- (let ((commit "5433f5e95f1cce63a81259a471150834c6a59364")
- (revision "1"))
+(define-public sbcl-napa-fft3
+ (let ((commit "f2d9614c7167da327c9ceebefb04ff6eae2d2236")
+ (revision "0"))
(package
- (name "sbcl-cl-murmurhash")
- (version (git-version "0.0.0" revision commit))
- (home-page "https://github.com/ruricolist/cl-murmurhash/")
+ (name "sbcl-napa-fft3")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url home-page)
+ (url "https://github.com/pkhuong/Napa-FFT3")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32
- "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws"))))
+ (base32 "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-babel))
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "32-bit version of Murmurhash3 for Common Lisp")
+ (home-page "https://github.com/pkhuong/Napa-FFT3")
+ (synopsis "Fast Fourier Transform routines in Common Lisp")
(description
- "This Common Lisp package offers an implementation of the 32-bit
-variant of MurmurHash3 (@url{https://github.com/aappleby/smhasher}), a fast
-non-crytographic hashing algorithm.")
- (license license:expat))))
-
-(define-public ecl-cl-murmurhash
- (sbcl-package->ecl-package sbcl-cl-murmurhash))
+ "Napa-FFT3 provides Discrete Fourier Transform (DFT) routines, but also
+buildings blocks to express common operations that involve DFTs: filtering,
+convolutions, etc.")
+ (license license:bsd-3))))
-(define-public cl-murmurhash
- (sbcl-package->cl-source-package sbcl-cl-murmurhash))
+(define-public cl-napa-fft3
+ (sbcl-package->cl-source-package sbcl-napa-fft3))
-(define-public sbcl-cl-hamt
- ;; No release
- (let ((commit "7a99eaaca1f952029def9ad5a2b80a612a712208"))
+(define-public sbcl-nasdf
+ (let ((commit "ab7a018f3a67a999c72710644b10b4545130c139"))
(package
- (name "sbcl-cl-hamt")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-nasdf")
+ (version "0.1.8")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/danshapero/cl-hamt/")
+ (url "https://github.com/atlas-engineer/ntemplate")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-ntemplate" version))
(sha256
- (base32 "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"))))
+ (base32 "15j7kqxvn0blr0i2xgk0il0ia91p28clfqxdh00vlp423v9a2wbx"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-murmurhash))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/danshapero/cl-hamt")
- (synopsis "Dictionary & set data structure using hash array-mapped tries")
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'cd-sdl
+ (lambda _
+ (chdir "nasdf"))))))
+ (home-page "https://github.com/atlas-engineer/ntemplate")
+ (synopsis "ASDF helpers for system setup, testing and installation")
(description
- "This library provides purely functional dictionaries and sets in
-Common Lisp based on the hash array-mapped trie data structure.")
+ "NASDF is an ASDF extension providing utilities to ease system setup,
+testing and installation.
+
+@itemize
+@item Simple way to fetch Git submodules and “do the right thing” for
+setup. This may effectively supersede Quicklisp. A benefit of using Git
+submodules over the default Quicklisp distribution is improved
+reproducibility.
+@item Test helpers, like distinction between offline and online tests, or
+continuous integration options, and warning reports.
+@item Installation helpers, for instance to install libraries, icons and
+desktop files to the right directories.
+@end itemize\n")
(license license:bsd-3))))
-(define-public ecl-cl-hamt
- (sbcl-package->ecl-package sbcl-cl-hamt))
+(define-public cl-nasdf
+ (sbcl-package->cl-source-package sbcl-nasdf))
-(define-public cl-hamt
- (sbcl-package->cl-source-package sbcl-cl-hamt))
+(define-public ecl-nasdf
+ (sbcl-package->ecl-package sbcl-nasdf))
-(define-public sbcl-cl-gserver
+(define-public sbcl-nclasses
(package
- (name "sbcl-cl-gserver")
- (version "1.8.0")
+ (name "sbcl-nclasses")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mdbergmann/cl-gserver")
+ (url "https://github.com/atlas-engineer/nclasses")
+ (commit version)))
+ (file-name (git-file-name "cl-nclasses" version))
+ (sha256
+ (base32
+ "00is7fg1jsj9r3jawphbk5gh8kmiixl7g60xg1ic2q2cpilfd1by"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-moptilities))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/nclasses")
+ (synopsis "Simplify class, condition, and generic function definitions.")
+ (description
+ "NClasses provides helper macros to help write classes, conditions,
+generic functions, and CLOS code in general with less boilerplate.
- ;; The "1.8.0" tag must have been moved from
- ;; c83d92a66102faa514b546029a9bd2078b95dc0f to
- ;; 90832f02f0556463e332cd055c3c1be58f323aea, 22 commits later!
- (commit "c83d92a66102faa514b546029a9bd2078b95dc0f")))
- (file-name (git-file-name "cl-gserver" version))
+It's a fork of @code{hu.dwim.defclass-star}. It includes some bug fixes and
+extra features like type inference.")
+ (license license:public-domain)))
+
+(define-public cl-nclasses
+ (sbcl-package->cl-source-package sbcl-nclasses))
+
+(define-public ecl-nclasses
+ (sbcl-package->ecl-package sbcl-nclasses))
+
+(define-public sbcl-ndebug
+ (package
+ (name "sbcl-ndebug")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/ndebug")
+ (commit version)))
+ (file-name (git-file-name "cl-ndebug" version))
(sha256
- (base32 "1bfz7z8v417dvsp1jz76ir3ihcs8g7zis2d56xx1dpzqzjd95g7z"))))
+ (base32 "1sndg4qclkdr53xkxrfjskx8gcqx0bn4r0vslzfx1kgznl4hbf1d"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
+ (list sbcl-dissect
+ sbcl-trivial-custom-debugger
sbcl-bordeaux-threads
- sbcl-lparallel
- sbcl-cl-speedy-queue
- sbcl-log4cl
- sbcl-cl-str
- sbcl-blackbird
- sbcl-cl-hamt
- sbcl-binding-arrows
- sbcl-atomics))
+ sbcl-trivial-gray-streams))
(native-inputs
- (list sbcl-fiveam sbcl-cl-mock))
- (home-page "https://mdbergmann.github.io/cl-gserver/index.html")
- (synopsis "Actor framework for easy access to state and async operations")
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/ndebug/")
+ (synopsis "Toolkit to build UI-aware Common Lisp debugger hooks")
(description
- "@code{cl-gserver} is a 'message passing' library / framework with actors
-similar to Erlang or Akka. It supports creating reactive systems for parallel
-computing and event based message handling.")
- (license license:agpl3)))
+ "NDebug provides a small set of utilities to make graphical (or, rather
+non-REPL-resident) Common Lisp applications easier to integrate with the
+standard Lisp debugger (@code{*debugger-hook*}, namely) and
+implementation-specific debugger hooks (via @code{trivial-custom-debugger}),
+especially in a multi-threaded context.")
+ (license license:bsd-3)))
-(define-public ecl-cl-gserver
- (sbcl-package->ecl-package sbcl-cl-gserver))
+(define-public cl-ndebug
+ (sbcl-package->cl-source-package sbcl-ndebug))
-(define-public cl-gserver
- (sbcl-package->cl-source-package sbcl-cl-gserver))
+(define-public ecl-ndebug
+ (sbcl-package->ecl-package sbcl-ndebug))
-(define-public sbcl-assoc-utils
- (let ((commit "74af16a3c0f10ad35e406167de02984744fc7854")
- (revision "1"))
- (package
- (name "sbcl-assoc-utils")
- (version (git-version "0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/assoc-utils")
- (commit commit)))
- (file-name (git-file-name "cl-assoc-utils" version))
- (sha256
- (base32 "1yac1v7zmdxj0p6rvwrrhyqvy7yjfhmqbchkwqhhr89gpjvvaick"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("assoc-utils-test" "assoc-utils")))
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/fukamachi/assoc-utils")
- (synopsis "Utilities for manipulating association lists in Common Lisp")
- (description
- "@code{assoc-utils} provides utilities for manipulating association
-lists in Common Lisp.")
- (license license:public-domain))))
+(define-public sbcl-net.didierverna.asdf-flv
+ (package
+ (name "sbcl-net.didierverna.asdf-flv")
+ (version "2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/didierverna/asdf-flv")
+ (commit (string-append "version-" version))))
+ (file-name (git-file-name "asdf-flv" version))
+ (sha256
+ (base32 "1fi2y4baxan103jbg4idjddzihy03kwnj2mzbwrknw4d4x7xlgwj"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp ASDF extension to provide support for file-local variables")
+ (description "ASDF-FLV provides support for file-local variables through
+ASDF. A file-local variable behaves like @code{*PACKAGE*} and
+@code{*READTABLE*} with respect to @code{LOAD} and @code{COMPILE-FILE}: a new
+dynamic binding is created before processing the file, so that any
+modification to the variable becomes essentially file-local.
-(define-public cl-assoc-utils
- (sbcl-package->cl-source-package sbcl-assoc-utils))
+In order to make one or several variables file-local, use the macros
+@code{SET-FILE-LOCAL-VARIABLE(S)}.")
+ (home-page "https://www.lrde.epita.fr/~didier/software/lisp/misc.php#asdf-flv")
+ (license (license:non-copyleft
+ "https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html"
+ "GNU All-Permissive License"))))
-(define-public ecl-assoc-utils
- (sbcl-package->ecl-package sbcl-assoc-utils))
+(define-public cl-net.didierverna.asdf-flv
+ (sbcl-package->cl-source-package sbcl-net.didierverna.asdf-flv))
-(define-public sbcl-let-over-lambda
- (let ((commit "481b2e3ab4646186451dfdd2062113203287d520")
- (revision "1"))
+(define-public ecl-net.didierverna.asdf-flv
+ (sbcl-package->ecl-package sbcl-net.didierverna.asdf-flv))
+
+(define-public sbcl-nfiles
+ (package
+ (name "sbcl-nfiles")
+ (version "1.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/nfiles")
+ (commit version)))
+ (file-name (git-file-name "cl-nfiles" version))
+ (sha256
+ (base32
+ "1a8zsphbbl9r4sdm95kgm4ljd9b148c9fnwlq7f930fh9826kf72"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list gnupg
+ sbcl-alexandria
+ sbcl-nclasses
+ sbcl-quri
+ sbcl-serapeum
+ sbcl-trivial-garbage
+ sbcl-trivial-package-local-nicknames
+ sbcl-trivial-types))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gpg.lisp"
+ (("\"gpg\"")
+ (string-append "\"" (assoc-ref inputs "gnupg") "/bin/gpg\""))))))))
+ (home-page "https://github.com/atlas-engineer/nfiles")
+ (synopsis "Manage file persistence and loading in Common Lisp")
+ (description
+ "NFiles is a Common Lisp library to help manage file persistence and
+loading, in particular user-centric files like configuration files. It boasts
+the following features:
+
+@itemize
+@item Dynamic and customizable path expansion.
+
+@item Extensible serialization and deserialization.
+
+@item Cached reads and writes. When a file object expands to the same path as
+another one, a read or write on it won’t do anything in case there was no
+change since last write.
+
+@item (Experimental!) On-the-fly PGP encryption.
+
+@item Profile support.
+
+@item On read error, existing files are backed up.
+
+@item On write error, no file is written to disk, the existing file is preserved.
+@end itemize\n")
+ (license license:bsd-3)))
+
+(define-public cl-nfiles
+ (package
+ (inherit (sbcl-package->cl-source-package sbcl-nfiles))
+ (inputs
+ (cons (list "iolib" cl-iolib)
+ (package-inputs sbcl-nfiles)))))
+
+(define-public ecl-nfiles
+ (let ((pkg (sbcl-package->ecl-package sbcl-nfiles)))
(package
- (name "sbcl-let-over-lambda")
- (version (git-version "1.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/thephoeron/let-over-lambda")
- (commit commit)))
- (file-name (git-file-name "cl-let-over-lambda" version))
- (sha256
- (base32 "114p781lwi9lrbzg27dnkymz9m4cvm1k430j7qsykwd0b58d8qbk"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- ;; All test cases pass, but tests successfully fail at the end:
- ;;
- ;; Summary:
- ;; All 1 file passed.
- ;; Unhandled ASDF/FIND-COMPONENT:MISSING-DEPENDENCY in thread
- ;; #<SB-THREAD:THREAD "main thread" RUNNING {1001860103}>:
- ;; Component LET-OVER-LAMBDA-ASD::LET-OVER-LAMBDA-TEST not found,
- ;; required by #<SYSTEM "let-over-lambda">
- `(#:tests? #f))
+ (inherit pkg)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("named-readtables" ,sbcl-named-readtables)))
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/thephoeron/let-over-lambda")
- (synopsis "Macros from Let Over Lambda")
- (description
- "This package provides Doug Hoyte's \"Production\" version of macros
-from the Let Over Lambda book, including community updates.")
- (license license:bsd-3))))
+ (cons (list "iolib" ecl-iolib)
+ (package-inputs pkg))))))
-(define-public cl-let-over-lambda
- (sbcl-package->cl-source-package sbcl-let-over-lambda))
+(define-public sbcl-nhooks
+ (package
+ (name "sbcl-nhooks")
+ (version "1.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/nhooks")
+ (commit version)))
+ (file-name (git-file-name "cl-nhooks" version))
+ (sha256
+ (base32
+ "1m9dfp7wjm8k16x45qnw258ca8gnic3k2ik79sdn5gxcx6qxy3g8"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-serapeum))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/nhooks")
+ (synopsis "Hook facility for Common Lisp")
+ (description "This package holds an enhanced implementation of
+hooks (extension points). It works similarly to Emacs hooks with crucial
+improvements:
-(define-public ecl-let-over-lambda
- (sbcl-package->ecl-package sbcl-let-over-lambda))
+@itemize
-(define-public sbcl-flute
- (let ((commit "90ebcd6e82f637f49b6de7d625ccc51ec4c92900")
- (revision "1"))
+@item If the compiler allows it (such as SBCL), type-checking is performed at
+compile-time and at run-time when adding handlers to a hook.
+
+@item On failure, multiple restarts are offered, such as disabling the
+offending handler or simply continuing to the next function.
+
+@item The hook handler execution order and combination can be customized.
+
+@item Anonymous functions (lambdas) can be added to hooks as handler objects.
+When inspecting hooks, readable names are thus exposed instead of lambda
+blackboxes. Handlers are compared through their names (through the mandatory
+name slot). A hook can not contain multiple handlers with the same name.
+
+@item A special provision is taken for “setters”, handlers that are meant to
+set a given place to a given values. Such handler objects can be compared and
+identified uniquely.
+
+@end itemize\n")
+ (license license:expat)))
+
+(define-public cl-nhooks
+ (sbcl-package->cl-source-package sbcl-nhooks))
+
+(define-public ecl-nhooks
+ (sbcl-package->ecl-package sbcl-nhooks))
+
+(define-public sbcl-nibbles
+ ;; No tagged release since 2018.
+ (let ((commit "a46a67736e07b548cdd7485cb36834f7942313f1")
+ (revision "3"))
(package
- (name "sbcl-flute")
- (version (git-version "0.2-dev" revision commit))
+ (name "sbcl-nibbles")
+ (version (git-version "0.14" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ailisp/flute")
+ (url "https://github.com/sharplispers/nibbles/")
(commit commit)))
- (file-name (git-file-name "cl-flute" version))
+ (file-name (git-file-name "cl-nibbles" version))
(sha256
- (base32 "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"))))
+ (base32 "12qjich11hp31dhbvbsixyjbddmr6faaajigrivgbxy9kw6d279j"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-assoc-utils sbcl-let-over-lambda))
(native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/ailisp/flute")
- (synopsis "HTML5 generation library in Common Lisp")
+ ;; Tests only.
+ (list sbcl-rt))
+ (synopsis
+ "Common Lisp library for accessing octet-addressed blocks of data")
(description
- "Flute is an easily composable HTML5 generation library in Common
-Lisp.")
- (license license:expat))))
+ "When dealing with network protocols and file formats, it's common to
+have to read or write 16-, 32-, or 64-bit datatypes in signed or unsigned
+flavors. Common Lisp sort of supports this by specifying :element-type for
+streams, but that facility is underspecified and there's nothing similar for
+read/write from octet vectors. What most people wind up doing is rolling their
+own small facility for their particular needs and calling it a day.
-(define-public cl-flute
- (sbcl-package->cl-source-package sbcl-flute))
+This library attempts to be comprehensive and centralize such
+facilities. Functions to read 16-, 32-, and 64-bit quantities from octet
+vectors in signed or unsigned flavors are provided; these functions are also
+SETFable. Since it's sometimes desirable to read/write directly from streams,
+functions for doing so are also provided. On some implementations,
+reading/writing IEEE singles/doubles (i.e. single-float and double-float) will
+also be supported.")
+ (home-page "https://github.com/sharplispers/nibbles")
+ (license license:bsd-3))))
-(define-public ecl-flute
- (sbcl-package->ecl-package sbcl-flute))
+(define-public cl-nibbles
+ (sbcl-package->cl-source-package sbcl-nibbles))
-(define-public sbcl-cl-posix-mqueue
- (let ((commit "8977370c7206d1f62bd1be80f4254af40654b83f")
- (revision "1"))
+(define-public ecl-nibbles
+ (sbcl-package->ecl-package sbcl-nibbles))
+
+(define-public sbcl-ningle
+ (let ((commit "2e85675bbb668d6ef341514fc9f22391a0f506b1")
+ (revision "2"))
(package
- (name "sbcl-cl-posix-mqueue")
- (version (git-version "0.1.2" revision commit))
+ (name "sbcl-ningle")
+ (version (git-version "0.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xFA25E/cl-posix-mqueue")
+ (url "https://github.com/fukamachi/ningle")
(commit commit)))
- (file-name (git-file-name "cl-posix-mqueue" version))
+ (file-name (git-file-name "cl-ningle" version))
(sha256
- (base32 "04519rg8vc782z097dzlb8nx0skab2fy2zd0m60r6mz2nw8xdvh6"))))
+ (base32 "0s9nn8ml1j4839rycvdjcbsynkqnhxw1zmrgpjz48smscwdf1f8p"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-librt-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/spec.lisp"
- (("librt.so" all)
- (string-append (assoc-ref inputs "glibc") "/lib/" all))))))))
+ '(#:tests? #f)) ; TODO: pull in clack-test
(native-inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("rove" ,sbcl-rove)))
+ (list sbcl-prove))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("babel" ,sbcl-babel)
- ("cffi" ,sbcl-cffi)
- ("glibc" ,glibc)
- ("local-time" ,sbcl-local-time)))
- (home-page "https://github.com/xFA25E/cl-posix-mqueue")
- (synopsis "Common Lisp binding to POSIX mqueue")
+ (list sbcl-cl-syntax sbcl-myway sbcl-lack sbcl-alexandria
+ sbcl-babel))
+ (home-page "https://8arrow.org/ningle/")
+ (synopsis "Super micro framework for Common Lisp")
(description
- "This package provides Common Lisp bindings to POSIX message queue, an
-@acronym{IPC, Inter-Process Communication} method that is easy to use and quick
-to setup.")
- (license license:gpl3))))
+ "Ningle is a lightweight web application framework for Common Lisp.")
+ (license license:llgpl))))
-(define-public ecl-cl-posix-mqueue
- (sbcl-package->ecl-package sbcl-cl-posix-mqueue))
+(define-public cl-ningle
+ (sbcl-package->cl-source-package sbcl-ningle))
-(define-public cl-posix-mqueue
- (sbcl-package->cl-source-package sbcl-cl-posix-mqueue))
+(define-public ecl-ningle
+ (sbcl-package->ecl-package sbcl-ningle))
-(define-public sbcl-glop
- (let ((commit "45e722ab4a0cd2944d550bf790206b3326041e38")
+(define-public sbcl-njson
+ (package
+ (name "sbcl-njson")
+ (version "1.2.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/njson")
+ (commit version)))
+ (file-name (git-file-name "cl-njson" version))
+ (sha256
+ (base32
+ "05v5bk3l47mds4ihxs8jlqm19gqq7hb4q0161bgg99w9847l63lk"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs (list sbcl-cl-json sbcl-jzon))
+ (native-inputs (list sbcl-lisp-unit2))
+ (arguments
+ '(#:asd-systems '("njson" "njson/cl-json" "njson/jzon")))
+ (home-page "https://github.com/atlas-engineer/njson")
+ (synopsis "JSON handling framework for Common Lisp")
+ (description
+ "NJSON aims to make it convenient for one to decode, encode,
+and process JSON data, in the minimum keystrokes/minutes possible.
+
+NJSON is parser-independent, with existing Common Lisp JSON parsers being
+loadable as additional system. @code{jzon} is included by default, though.
+Conveniences that NJSON provides are:
+
+@itemize
+@item @code{encode} and @code{decode} as single entry points for JSON reading
+and writing, be it from streams/string/files, or from those.
+
+@item @code{jget}, @code{jcopy}, @code{jkeys}, and their aliases to
+manipulate the decoded objects' properties without the need to worry
+about the low-level details of how these values are decoded.
+
+@item @code{jif}, @code{jwhen}, @code{jor}, @code{jand}, and other macros
+mimicking Lisp ones, while using truth values of JSON-decoded data.
+
+@item @code{jbind} and @code{jmatch} macros to destructure and
+validate parsed JSON.
+
+@item @code{njson/aliases} package to nickname to @code{j} for all the
+forms conveniently accessible as @code{j:get}, @code{j:copy},
+@code{j:if} etc.
+
+@end itemize\n")
+ (license license:bsd-3)))
+
+(define-public cl-njson
+ (sbcl-package->cl-source-package sbcl-njson))
+
+(define-public ecl-njson
+ (sbcl-package->ecl-package sbcl-njson))
+
+(define-public sbcl-nkeymaps
+ (package
+ (name "sbcl-nkeymaps")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/nkeymaps")
+ (commit version)))
+ (file-name (git-file-name "cl-nkeymaps" version))
+ (sha256
+ (base32 "179hrnkn3pkwkp4ap6ax0zgp7xcr9cq7icff42r79gh43ri3kpzy"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-fset
+ sbcl-cl-str
+ sbcl-trivial-package-local-nicknames))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/nkeymaps")
+ (synopsis "Keymap facility for Common Lisp")
+ (description
+ "This is a keymap facility for Common Lisp inspired by Emacsy
+(keymap.scm) which is inspired by Emacs.
+@itemize
+
+@item Support prefix keys to other keymaps. For instance, if you prefix
+my-mode-map with C-c, then all bindings for my-mode will be accessible after
+pressing C-c.
+
+@item List all bindings matching a given prefix. (Also known as which-key in
+Emacs.)
+
+@item List the bindings associated to a command.
+
+@item Support multiple inheritance.
+
+@item Support keycode.
+
+@item Validate keyspec at compile time.
+
+@item define-key can set multiple bindings in a single call.
+
+@item Support multiple scheme to make it easy to switch between, say,
+Emacs-style and VI-style bindings. This orthogonality to keymaps composes
+better than having multiple keymaps: changing scheme applies to the entire
+program, which is easier than looping through all keymaps to change them.
+
+@item Translate keyspecs as a fallback. For instance if shift-a is not bound,
+check A.
+
+@item Behaviour can be customized with global parameters such as
+*print-shortcut*.
+
+@item The compose function can merge multiple keymaps together.
+
+@item Support multiple arguments when that makes sense (e.g. multiple keymaps
+for lookup-key).
+
+@item Key remapping à-la Emacs.
+
+@item Typed keymaps, i.e. keymaps where bound values can only be of a given
+type. This is convenient to catch typos, for instance when binding 'FOO
+instead of #'FOO.
+@end itemize")
+ (license license:bsd-3)))
+
+(define-public cl-nkeymaps
+ (sbcl-package->cl-source-package sbcl-nkeymaps))
+
+(define-public ecl-nkeymaps
+ (sbcl-package->ecl-package sbcl-nkeymaps))
+
+(define-public sbcl-nodgui
+ (let ((commit "dc3efed8f93d4955e59347824f8f6d018e1a22e0")
(revision "1"))
(package
- (name "sbcl-glop")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-nodgui")
+ (version (git-version "0.7.0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/glop")
+ (url "https://codeberg.org/cage/nodgui.git")
(commit commit)))
- (file-name (git-file-name "glop" version))
+ (file-name (git-file-name "cl-nodgui" version))
(sha256
- (base32 "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"))))
+ (base32 "1kjbimzl9q74dz1fhl03n49607li55q6h0kdygfyr0n8cnf5638j"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-clunit2))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cl-colors2
+ sbcl-cl-ppcre-unicode
+ sbcl-cl-unicode
+ sbcl-esrap
+ sbcl-flexi-streams
+ sbcl-jpeg-turbo
+ sbcl-named-readtables
+ sbcl-cl-opengl
+ sbcl-parse-number
+ sbcl-pngload
+ sbcl-sdl2
+ sbcl-sdl2-ttf
+ sbcl-static-vectors
+ sbcl-trivial-garbage
+ sbcl-zpng
+ tk
+ tklib))
(arguments
(list #:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'patch-lib-paths
+ (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/x11/xcomposite.lisp"
- (("libXcomposite.so")
- (search-input-file inputs "/lib/libXcomposite.so")))
- (substitute* "src/x11/xlib.lisp"
- (("libX11")
- (string-drop-right
- (search-input-file inputs "/lib/libX11.so") 3)))
- (substitute* "src/utils.lisp"
- (("libX11")
- (string-drop-right
- (search-input-file inputs "/lib/libX11.so") 3)))
- (substitute* "src/utils.lisp"
- (("libGL.so")
- (search-input-file inputs "/lib/libGL.so.1")))
- (substitute* "src/x11/glx.lisp"
- (("libGL.so")
- (search-input-file inputs "/lib/libGL.so")))
- (substitute* "src/x11/display-ctrl.lisp"
- (("libXrandr")
- (string-drop-right
- (search-input-file inputs "/lib/libXrandr.so") 3))))))))
- (native-inputs
- (list sbcl-cl-opengl))
- (inputs
- (list libx11
- libxcomposite
- libxrandr
- mesa
- sbcl-cffi
- sbcl-split-sequence
- sbcl-trivial-garbage))
- (home-page "https://github.com/lispgames/glop")
- (synopsis "Direct FFI bindings for OpenGL window and context management")
+ (substitute* "src/wish-communication.lisp"
+ (("#-freebsd \"wish\"")
+ (string-append "#-freebsd \""
+ (search-input-file inputs "/bin/wish")
+ "\""))))))))
+ (synopsis "Common Lisp bindings for the Tk GUI toolkit")
(description
- "This package provides Common Lisp bindings to create OpenGL window and
-context manipulation code as well as system input handling. Direct FFI
-bindings to system functions are used so no third party C lib is required
-except system libraries.")
- (license license:expat))))
+ "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI
+toolkit. It also provides a few additional widgets more than the standard Tk
+ones.")
+ (home-page "https://www.autistici.org/interzona/nodgui.html")
+ (license license:llgpl))))
-(define-public ecl-glop
- (sbcl-package->ecl-package sbcl-glop))
+(define-public cl-nodgui
+ (sbcl-package->cl-source-package sbcl-nodgui))
-(define-public cl-glop
- (sbcl-package->cl-source-package sbcl-glop))
+(define-public ecl-nodgui
+ (sbcl-package->ecl-package sbcl-nodgui))
-(define-public sbcl-sdl2
- (let ((commit "80410b514570ca06894675d4a2a5fc93287ea7b6")
- (revision "2"))
+(define-public sbcl-nsymbols
+ (package
+ (name "sbcl-nsymbols")
+ (version "0.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/nsymbols")
+ (commit version)))
+ (file-name (git-file-name "cl-nsymbols" version))
+ (sha256
+ (base32 "1awh793s4fwhddllfcjz4sbkxwinh5w54s3glxh7rv00c7skdjd6"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-lisp-unit2))
+ (inputs (list cl-closer-mop))
+ (arguments
+ '(#:asd-systems '("nsymbols" "nsymbols/star")))
+ (synopsis
+ "Functions to search, filter, and group symbols in chosen packages")
+ (home-page "https://github.com/atlas-engineer/nsymbols")
+ (description "Nsymbols extends the regular package API of ANSI CL with more
+operations, allowing one to list:
+
+@itemize
+@item @code{package-symbols}.
+@item @code{package-variables}.
+@item @code{package-functions}.
+@item @code{package-generic-functions}.
+@item @code{package-macros}.
+@item @code{package-classes}.
+@item @code{package-structures}.
+@item And other symbol types, given @code{define-symbol-type} for those.
+@end itemize
+
+Nsymbols can also find symbols by their name/matching symbol with
+@code{resolve-symbol}. All these operations are aware of symbol
+visibility in the given packages, due to a @code{symbol-visibility}
+function.
+
+An additional @code{nsymbols/star} system has a set of functions
+mirroring the regular Nsymbols ones, but using @code{closer-mop} to
+provide better results and returning structured data instead of
+symbols.")
+ (license license:bsd-3)))
+
+(define-public cl-nsymbols
+ (sbcl-package->cl-source-package sbcl-nsymbols))
+
+(define-public ecl-nsymbols
+ (sbcl-package->ecl-package sbcl-nsymbols))
+
+(define-public sbcl-numcl
+ (let ((commit "a28f612d072e5f93137584de5155a42243b3bd6b")
+ (revision "3"))
(package
- (name "sbcl-sdl2")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-numcl")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/cl-sdl2")
+ (url "https://github.com/numcl/numcl")
(commit commit)))
- (file-name (git-file-name "cl-sdl2" version))
+ (file-name (git-file-name "numcl" version))
(sha256
- (base32 "0sjy4k04k0hdhwpr57ns16ag3za0kz4laclbk17i91ql7qdjw9z2"))))
+ (base32 "15m4spbgayawnw5jjz04zfp0jnk9g6hgq5fmr648hzjzj50j1d78"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:asd-systems '("sdl2" "sdl2/examples")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libSDL2-2.0.so.0")
- (search-input-file inputs "/lib/libSDL2-2.0.so.0"))))))))
+ `(;; Tests often fail because they require a dynamic-space-size much
+ ;; bigger than the default one. Disable them for now.
+ #:tests? #f))
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-alexandria
- sbcl-cl-autowrap
- sbcl-cl-opengl
- sbcl-cl-ppcre
- sbcl-trivial-channels
- sbcl-trivial-features
- sdl2))
- (home-page "https://github.com/lispgames/cl-sdl2")
- (synopsis "Common Lisp bindings for SDL2 using C2FFI")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-randist" ,sbcl-cl-randist)
+ ("constantfold" ,sbcl-constantfold)
+ ("float-features" ,sbcl-float-features)
+ ("function-cache" ,sbcl-function-cache)
+ ("gtype" ,sbcl-gtype)
+ ("iterate" ,sbcl-iterate)
+ ("lisp-namespace" ,sbcl-lisp-namespace)
+ ("specialized-function" ,sbcl-specialized-function)
+ ("trivia" ,sbcl-trivia)
+ ("type-r" ,sbcl-type-r)))
+ (home-page "https://numcl.github.io/numcl/")
+ (synopsis "Numpy clone in Common Lisp")
(description
- "This package provides a Common Lisp wrapper system for the SDL 2.0
-C Library.")
- (license license:expat))))
+ "This package is a Python Numpy clone implemented in pure Common Lisp.")
+ (license license:lgpl3+))))
-(define-public ecl-sdl2
- (sbcl-package->ecl-package sbcl-sdl2))
+(define-public cl-numcl
+ (sbcl-package->cl-source-package sbcl-numcl))
-(define-public cl-sdl2
- (sbcl-package->cl-source-package sbcl-sdl2))
+(define-public ecl-numcl
+ (sbcl-package->ecl-package sbcl-numcl))
-(define-public sbcl-sdl2-image
- (let ((commit "9c05c806286b66a5d9861ef829cfe68c4f3da077")
- (revision "1"))
+(define-public sbcl-numerical-utilities
+ (let ((commit "44f45ba952b35675640630e40cf90df6f8279746")
+ (revision "0"))
(package
- (name "sbcl-sdl2-image")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-numerical-utilities")
+ (version (git-version "1.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/cl-sdl2-image")
+ (url "https://github.com/Lisp-Stat/numerical-utilities")
(commit commit)))
- (file-name (git-file-name "cl-sdl2-image" version))
+ (file-name (git-file-name "cl-numerical-utilities" version))
(sha256
- (base32 "1nr7mdl125q32m15m8rdlza5kwi7m0birh1cq846pyy6zl1sjms7"))))
+ (base32 "1dwz8zxhqzi31qp863zj1cn1lgljny14snycb9nk871qs121kmsd"))))
(build-system asdf-build-system/sbcl)
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libSDL2_image-2.0.so.0")
- (search-input-file inputs "/lib/libSDL2_image-2.0.so.0"))))))))
+ '(#:asd-systems '("num-utils" "num-utils/tests")))
(inputs
- (list sdl2-image
- sbcl-alexandria
- sbcl-cl-autowrap
- sbcl-defpackage-plus
- sbcl-sdl2))
- (home-page "https://github.com/lispgames/cl-sdl2-image")
- (synopsis "SDL2_image wrapper for Common Lisp")
+ (list sbcl-alexandria
+ sbcl-alexandria-plus
+ sbcl-anaphora
+ sbcl-array-operations
+ sbcl-let-plus
+ sbcl-select))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://lisp-stat.github.io/numerical-utilities")
+ (synopsis "Utilities for numerical programming")
(description
- "This is a (currently) brief but usable wrap for SDL2_image.")
- (license license:expat))))
+ "@code{cl-numerical-utilities} is a collection of packages useful in
+numerical applications, each big enough to be its own package, but too small
+to split out into a separate ASDF system.")
+ (license license:ms-pl))))
-(define-public ecl-sdl2-image
- (sbcl-package->ecl-package sbcl-sdl2-image))
+(define-public cl-numerical-utilities
+ (sbcl-package->cl-source-package sbcl-numerical-utilities))
-(define-public cl-sdl2-image
- (sbcl-package->cl-source-package sbcl-sdl2-image))
+(define-public ecl-numerical-utilities
+ (sbcl-package->ecl-package sbcl-numerical-utilities))
-(define-public sbcl-sdl2-mixer
- (let ((commit "fdcc7ee7935dd01fd338e22690451db2cf126156")
- (revision "1"))
+(define-public sbcl-numpy-file-format
+ (let ((commit "e440c7bbc0d86b9abf73acb0fa665b77b82a6c98")
+ (revision "2"))
(package
- (name "sbcl-sdl2-mixer")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-numpy-file-format")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/cl-sdl2-mixer")
+ (url "https://github.com/marcoheisig/numpy-file-format")
(commit commit)))
- (file-name (git-file-name "cl-sdl2-mixer" version))
+ (file-name (git-file-name "cl-numpy-file-format" version))
(sha256
- (base32 "0g6ywb3gqr0rif4z6kkz6m8vyv8nrr5wr1w9sc6d3zypbbnqgbp6"))))
+ (base32 "1n0nixc44z1cymm20wif0l2100ydv0h69l6i6xz5bmwcb2zc4gqr"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libSDL2_mixer-2.0.so.0")
- (search-input-file inputs "/lib/libSDL2_mixer-2.0.so.0"))))))))
(inputs
- (list sbcl-alexandria
- sbcl-cl-autowrap
- sbcl-sdl2
- sbcl-trivial-garbage
- sdl2-mixer))
- (home-page "https://github.com/lispgames/cl-sdl2-mixer")
- (synopsis "Bindings for sdl2_mixer using autowrap for Common Lisp")
+ (list sbcl-ieee-floats sbcl-trivial-features))
+ (home-page "https://github.com/marcoheisig/numpy-file-format")
+ (synopsis "Read and write NumPy .npy and .npz files")
(description
- "This package provides a Common Lisp wrapper system for the SDL 2.0 Mixer C
-Library.")
+ "The NUMPY-FILE-FORMAT library is a Common Lisp library for reading and
+writing NumPy @file{.npy} and @file{.npz} files.")
(license license:expat))))
-(define-public ecl-sdl2-mixer
- (sbcl-package->ecl-package sbcl-sdl2-mixer))
+(define-public cl-numpy-file-format
+ (sbcl-package->cl-source-package sbcl-numpy-file-format))
-(define-public cl-sdl2-mixer
- (sbcl-package->cl-source-package sbcl-sdl2-mixer))
+(define-public ecl-numpy-file-format
+ (sbcl-package->ecl-package sbcl-numpy-file-format))
-(define-public sbcl-sdl2-ttf
- (let ((commit "6dd2df2fb3a79ec4f835e3bc882e60e8da039878")
+(define-public sbcl-object-class
+ (package
+ (name "sbcl-object-class")
+ (version "1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/object-class")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-object-class" version))
+ (sha256
+ (base32 "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-closer-mop
+ sbcl-compatible-metaclasses
+ sbcl-enhanced-find-class))
+ (home-page "https://www.hexstreamsoft.com/libraries/object-class/")
+ (synopsis "Cluster special subclasses of the standard-object")
+ (description
+ "This package ensures that special subclasses of standard-object cluster
+right in front of standard-object in the class precedence list.")
+ (license license:unlicense)))
+
+(define-public cl-object-class
+ (sbcl-package->cl-source-package sbcl-object-class))
+
+(define-public ecl-object-class
+ (sbcl-package->ecl-package sbcl-object-class))
+
+(define-public sbcl-olc
+ (let ((commit "0269ed747477d967f7d9331964906b6a0f18a9c4")
(revision "1"))
(package
- (name "sbcl-sdl2-ttf")
+ (name "sbcl-olc")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/cl-sdl2-ttf")
+ (url "https://codeberg.org/glv/olc")
(commit commit)))
- (file-name (git-file-name "cl-sdl2-ttf" version))
+ (file-name (git-file-name "cl-olc" version))
(sha256
- (base32 "07c1bl66dix6ccnyl9mqd6lbk10f9s25985zmv6lss95491ng7my"))))
+ (base32 "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libSDL2_ttf-2.0.so.0")
- (search-input-file inputs "/lib/libSDL2_ttf-2.0.so.0")))))
- (add-after 'unpack 'fix-critical-warning
- (lambda _
- (substitute* "src/helpers.lisp"
- (("nreverse") "reverse")))))))
- (inputs
- (list sdl2-ttf
- sbcl-alexandria
- sbcl-cffi
- sbcl-cl-autowrap
- sbcl-defpackage-plus
- sbcl-sdl2
- sbcl-trivial-garbage))
- (home-page "https://github.com/lispgames/cl-sdl2-ttf")
- (synopsis "SDL2_ttf wrapper for Common Lisp")
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis
+ "Convert coordinates between latitude/longitude and Open Location Code")
(description
- "This is a wrapper for the SDL2_TTF library used for loading fonts and
-creating text assets. The library, in it's current state, can load TTF and
-OTF fonts and render fonts with the three different rendering modes provided
-by the C library (solid, shaded, and blended). While Latin text, UTF8,
-UNICODE, and Glyph text rendering is available only Latin text has been
-tested (as shown in the examples).")
- (license license:expat))))
+ "This a Common Lisp library to convert geographic coordinates between
+latitude/longitude and Open Location Code.")
+ (home-page "https://codeberg.org/glv/olc")
+ (license license:gpl3+))))
-(define-public ecl-sdl2-ttf
- (sbcl-package->ecl-package sbcl-sdl2-ttf))
+(define-public cl-olc
+ (sbcl-package->cl-source-package sbcl-olc))
-(define-public cl-sdl2-ttf
- (sbcl-package->cl-source-package sbcl-sdl2-ttf))
+(define-public ecl-olc
+ (sbcl-package->ecl-package sbcl-olc))
-(define-public sbcl-cl-gamepad
- (let ((commit "d5b99fbaa2e39294d23061699e8f1e761eda7205")
- (revision "3"))
+(define-public sbcl-one-more-re-nightmare
+ (let ((commit "5b0b02e59f90964baf5737abd13300fa82f27667")
+ (revision "1"))
(package
- (name "sbcl-cl-gamepad")
- (version (git-version "3.0.0" revision commit))
+ (name "sbcl-one-more-re-nightmare")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-gamepad")
+ (url "https://github.com/telekons/one-more-re-nightmare")
(commit commit)))
- (file-name (git-file-name "cl-gamepad" version))
+ (file-name (git-file-name "cl-one-more-re-nightmare" version))
(sha256
- (base32 "0y6kg9wq92p07i1chm1v7j7p77iqc5c985pdvmmivcip8zmd4hm4"))))
+ (base32 "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:tests? #f ; No tests
+ '(#:asd-test-systems '("one-more-re-nightmare-tests")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-evdev-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "evdev-cffi.lisp"
- (("libevdev.so")
- (search-input-file inputs "/lib/libevdev.so"))))))))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "Tests/one-more-re-nightmare-tests.asd"
+ ((":depends-on")
+ (string-append
+ ":perform (test-op (o c) (symbol-call :one-more-re-nightmare-tests '#:run-tests))"
+ "\n :depends-on"))))))))
+ (native-inputs
+ (list sbcl-lparallel sbcl-parachute))
(inputs
- (list libevdev
- sbcl-cffi
- sbcl-documentation-utils
- sbcl-trivial-features))
- (home-page "https://shirakumo.github.io/cl-gamepad/")
- (synopsis "Library for access to gamepads and joystick input devices")
- (description
- "This is a library to provide cross-platform access to gamepads,
-joysticks, and other such HID devices.")
- (license license:zlib))))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-dynamic-mixins
+ sbcl-esrap
+ sbcl-stealth-mixin
+ sbcl-trivia
+ sbcl-trivial-indent))
+ (home-page "https://github.com/telekons/one-more-re-nightmare")
+ (synopsis "Regular expression compiler in Common Lisp")
+ (description "@code{one-more-re-nightmare} is a regular expression engine
+that uses the technique presented in Regular-expression derivatives
+re-examined (Owens, Reppy and Turon, 2009;
+@url{doi:10.1017/S0956796808007090}) to interpret and compile regular
+expressions.")
+ (license license:bsd-2))))
-(define-public ecl-cl-gamepad
- (sbcl-package->ecl-package sbcl-cl-gamepad))
+(define-public cl-one-more-re-nightmare
+ (sbcl-package->cl-source-package sbcl-one-more-re-nightmare))
-(define-public cl-gamepad
- (sbcl-package->cl-source-package sbcl-cl-gamepad))
+(define-public ecl-one-more-re-nightmare
+ (sbcl-package->ecl-package sbcl-one-more-re-nightmare))
-(define-public sbcl-trial
- (let ((commit "db4e98ede16640238bd51bf5d63cda57c75a51ae")
- (revision "2"))
+(define-public sbcl-opticl
+ (let ((commit "f6fc4dc5fa61ae3f2527b77e4bda99001ba37dcb")
+ (revision "1"))
(package
- (name "sbcl-trial")
- (version (git-version "1.2.0" revision commit))
+ (name "sbcl-opticl")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/trial")
+ (url "https://github.com/slyrus/opticl")
(commit commit)))
- (file-name (git-file-name "cl-trial" version))
+ (file-name (git-file-name "cl-opticl" version))
(sha256
- (base32 "0haslkzcgivz42k23n90w1dzw8zdgdrqcndadl33pqqlf0d20ilw"))))
+ (base32 "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("trial"
- "trial-alloy"
- "trial-animation"
- "trial-assimp"
- ;; TODO: It requires a long packaging journey.
- ;; "trial-feedback"
- "trial-gif"
- "trial-glfw"
- ;; FIXME: Check why this system is failing:
- ;; WARNING: Invalid qualifiers for APPEND method
- ;; combination in method
- ;; ...
- ;; "trial-glop"
- "trial-gltf"
- "trial-harmony"
- "trial-jpeg"
- "trial-notify"
- "trial-png"
- ;; TODO: I'm not sure which QOI system to use here. There are two:
- ;; - https://github.com/bpanthi977/qoi
- ;; - https://github.com/mfiano/qoi
- ;; "trial-qoi"
- ;; TODO: It requires a long packaging journey.
- ;; "trial-qt"
- "trial-sdl2"
- "trial-terragen"
- "trial-tga"
- "trial-tiff"
- "trial-workbench")))
(native-inputs
- (list sbcl-trivial-features))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-3d-matrices
- sbcl-3d-quaternions
- sbcl-3d-transforms
- sbcl-3d-vectors
- sbcl-alexandria
- sbcl-alloy
- sbcl-atomics
- sbcl-bordeaux-threads
- sbcl-cl-gamepad
- sbcl-cl-glfw3
- sbcl-cl-gltf
+ (list sbcl-alexandria
sbcl-cl-jpeg
- sbcl-cl-opengl
- sbcl-cl-ppcre
sbcl-cl-tga
- sbcl-classimp
- sbcl-closer-mop
- sbcl-deploy
- sbcl-dns-client
- sbcl-fast-io
- sbcl-file-notify
- sbcl-flare
- sbcl-float-features
- sbcl-flow
- sbcl-for
- sbcl-form-fiddle
- sbcl-glop
- sbcl-glsl-toolkit
- sbcl-harmony
- sbcl-ieee-floats
- sbcl-jzon
- sbcl-lambda-fiddle
- sbcl-language-codes
- sbcl-lquery
- sbcl-messagebox
- sbcl-mmap
- sbcl-pathname-utils
+ sbcl-opticl-core
+ sbcl-png-read
sbcl-pngload
- sbcl-promise
sbcl-retrospectiff
- sbcl-sdl2
- sbcl-simple-tasks
- sbcl-static-vectors
- sbcl-system-locale
- sbcl-terrable
- sbcl-trivial-extensible-sequences
- sbcl-trivial-garbage
- sbcl-trivial-indent
- sbcl-trivial-main-thread
- sbcl-verbose
+ sbcl-skippy
sbcl-zpng))
- (home-page "https://github.com/Shirakumo/trial")
- (synopsis "Common Lisp game engine")
- (description
- "Trial is a game engine written in Common Lisp. Unlike many other
-engines, it is meant to be more of a loose connection of components that can be
-fit together as required by any particular game.")
- (license license:zlib))))
-
-;; TODO: Enable with new ECL when this issue is fixed:
-;; https://github.com/Shinmera/3d-quaternions/issues/2
-;; (define-public ecl-trial
-;; (sbcl-package->ecl-package sbcl-trial))
-
-(define-public cl-trial
- (sbcl-package->cl-source-package sbcl-trial))
-
-(define-public sbcl-virality
- (let ((commit "cdc19cca9b028f0c30d14ed8b3e51359dd46069a")
- (revision "1"))
- (package
- (name "sbcl-virality")
- (version (git-version "0.3.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bufferswap/ViralityEngine")
- (commit commit)))
- (file-name (git-file-name "cl-virality" version))
- (sha256
- (base32 "1s25aapkqcr8fxi0i9wjw0n4jax7r4a9d9wflpr3sqz2vgrg2lz6"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:asd-systems '("virality"
- "vorigin"
- "vorigin.test"
- "vshadow"
- "vumbra"
- "vutils")
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'delete-examples
- (lambda _
- ;; Don't install the big "examples" directory.
- (delete-file-recursively "examples")
- ;; Remove example asd files that cause issues during
- ;; the 'copy-source' phase because they have the same
- ;; names.
- (for-each
- delete-file
- (find-files "."
- "^xXx-SYSTEM-NAME-xXx\\.asd$")))))))
- (inputs
- (list sbcl-3b-bmfont
- sbcl-babel
- sbcl-cl-cpus
- sbcl-cl-graph
- sbcl-cl-opengl
- sbcl-cl-ppcre
- sbcl-cl-slug
- sbcl-closer-mop
- sbcl-fast-io
- sbcl-global-vars
- sbcl-glsl-packing
- sbcl-jsown
- sbcl-lparallel
- sbcl-pngload
- sbcl-printv
- sbcl-queues
- sbcl-sdl2
- sbcl-serapeum
- sbcl-split-sequence
- sbcl-static-vectors
- sbcl-trivial-features
- sbcl-varjo))
- (home-page "https://github.com/bufferswap/ViralityEngine")
- (synopsis "Component-based game engine written in Common Lisp")
+ (home-page "https://github.com/slyrus/opticl")
+ (synopsis "Image processing library for Common Lisp")
(description
- "Virality Engine provides a system and workflow that helps describe the
-elements needed to write 2D or 3D games. It was designed with several domain
-specific languages that make it easier to describe, manipulate, and use assets
-commonly found in game making. Such assets include (but are not limited to)
-textures, materials, shader programs, and scene trees of actors that are
-available for instantiation. Virality Engine also knows how to accept input
-from keyboards and most joysticks and gamepads.
+ "Opticl is a Common Lisp library for representing, processing, loading,
+and saving 2-dimensional pixel-based images.")
+ (license license:bsd-2))))
-The component system is a hybrid model between an ECS and an object model. The
-components are defined similar to CLOS defclass, and regular generic methods
-can be used with them. Components are added to Actors which represent game
-concepts like players, scenery, effects, etc. We define a component protocol
-invoked by Virality Engine to move your components to the next state and
-render them each frame.")
- (license license:expat))))
+(define-public cl-opticl
+ (sbcl-package->cl-source-package sbcl-opticl))
-(define-public cl-virality
- (sbcl-package->cl-source-package sbcl-virality))
+(define-public ecl-opticl
+ (sbcl-package->ecl-package sbcl-opticl))
-(define-public sbcl-cl-liballegro
- (let ((commit "49f632ce97fc4f835bf5d450588793234b980a64")
- (revision "1"))
+(define-public sbcl-opticl-core
+ (let ((commit "b7cd13d26df6b824b216fbc360dc27bfadf04999")
+ (revision "0"))
(package
- (name "sbcl-cl-liballegro")
- (version (git-version "0.2.15" revision commit))
+ (name "sbcl-opticl-core")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/resttime/cl-liballegro")
+ (url "https://github.com/slyrus/opticl-core")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0brbr7i342s0gadlnzd3a61w2b9ihhx60l19ararnc2asvyhmz7x"))))
+ (base32 "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-allegro-lib-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((allegro-lib-path (string-append
- (assoc-ref inputs "allegro") "/lib/")))
- (substitute* "src/library.lisp"
- (("lib \".so\"" all)
- (string-append "\"" allegro-lib-path "\"" " lib \".so\"")))))))))
(inputs
- `(("allegro" ,allegro)
- ("cffi" ,sbcl-cffi)
- ("float-features" ,sbcl-float-features)
- ("trivial-garbage" ,sbcl-trivial-garbage)
- ("trivial-main-thread" ,sbcl-trivial-main-thread)))
- (home-page "https://github.com/resttime/cl-liballegro")
- (synopsis "Allegro 5 game programming library bindings for Common Lisp")
+ (list sbcl-alexandria))
+ (home-page "https://github.com/slyrus/opticl-core")
+ (synopsis "Core classes and pixel access macros for Opticl")
(description
- "This package provides CFFI bindings and interface to Allegro 5 game
-developing library for Common Lisp.")
- (license license:zlib))))
+ "This Common Lisp library contains the core classes and pixel access
+macros for the Opticl image processing library.")
+ (license license:bsd-2))))
-(define-public ecl-cl-liballegro
- (sbcl-package->ecl-package sbcl-cl-liballegro))
+(define-public cl-opticl-core
+ (sbcl-package->cl-source-package sbcl-opticl-core))
-(define-public cl-liballegro
- (sbcl-package->cl-source-package sbcl-cl-liballegro))
+(define-public ecl-opticl-core
+ (sbcl-package->ecl-package sbcl-opticl-core))
-(define-public sbcl-font-discovery
- (let ((commit "5101ca79151055f3ec9839aae73b8af42b884528")
+(define-public sbcl-optima
+ (let ((commit "373b245b928c1a5cce91a6cb5bfe5dd77eb36195")
(revision "1"))
(package
- (name "sbcl-font-discovery")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Shinmera/font-discovery")
- (commit commit)))
- (file-name (git-file-name "font-discovery" version))
- (sha256
- (base32 "1p9wkwc23rnif8vcjaj5ih1fmr5g57sidqjlz08qw6k0z4f6bia1"))))
+ (name "sbcl-optima")
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cffi sbcl-documentation-utils sbcl-trivial-indent))
- (home-page "https://shinmera.github.io/font-discovery/")
- (synopsis "Find system font files matching a font spec")
- (description
- "This is a library to find system font files. It works on systems with
-FontConfig on Linux, BSD. It does not have any foreign dependencies that
-aren't already directly available on the system.")
- (license license:zlib))))
-
-(define-public ecl-font-discovery
- (sbcl-package->ecl-package sbcl-font-discovery))
-
-(define-public cl-font-discovery
- (sbcl-package->cl-source-package sbcl-font-discovery))
-
-(define-public sbcl-alloy
- (let ((commit "628974de537affb5b44ad548347f67c16efffcfc")
- (revision "3"))
- (package
- (name "sbcl-alloy")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "1.0" revision commit))
+ (home-page "https://github.com/m2ym/optima")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/alloy")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-alloy" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0fx294qwxshgijss000pbjbnbwxqvxyw6p3mva36qljhbbkw2fxy"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-alexandria sbcl-parachute))
+ (base32
+ "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"))))
(inputs
- (list sbcl-array-utils sbcl-closer-mop sbcl-documentation-utils
- sbcl-float-features sbcl-colored sbcl-stealth-mixin
- sbcl-cl-opengl sbcl-font-discovery sbcl-uax-14 sbcl-sdf))
+ `(("alexandria" ,sbcl-alexandria)
+ ("closer-mop" ,sbcl-closer-mop)))
+ (native-inputs
+ (list sbcl-eos))
(arguments
- ;; Dismiss alloy-svg, since it is not completed:
- ;; https://github.com/Shirakumo/alloy/issues/24
- '(#:asd-systems '("alloy"
- "alloy-animation"
- "alloy-opengl"
- "alloy-opengl-msdf"
- "alloy-opengl-png"
- "alloy-simple"
- "alloy-simple-presentations"
- "alloy-windowing")))
- (home-page "https://shirakumo.github.io/alloy/")
- (synopsis
- "Common Lisp user interface protocol and toolkit implementation")
- (description
- "Alloy is a user interface toolkit. It is defined through a set of
-protocols that allow for a clear interface, as well as a standardised way to
-integrate Alloy into a target backend.")
- (license license:zlib))))
+ ;; XXX: Circular dependencies: tests depend on optima.ppcre which depends on optima.
+ `(#:tests? #f))
+ (synopsis "Optimized pattern matching library for Common Lisp")
+ (description "Optima is a fast pattern matching library which uses
+optimizing techniques widely used in the functional programming world.")
+ (license license:expat))))
-(define-public ecl-alloy
- (sbcl-package->ecl-package sbcl-alloy))
+(define-public cl-optima
+ (sbcl-package->cl-source-package sbcl-optima))
-(define-public cl-alloy
- (sbcl-package->cl-source-package sbcl-alloy))
+(define-public ecl-optima
+ (sbcl-package->ecl-package sbcl-optima))
(define-public sbcl-org-sampler
(let ((commit "ee135a417750e5b1d810bb9574eb85223cb3038a")
@@ -23792,694 +22350,824 @@ integrate Alloy into a target backend.")
text for inclusion into a larger document.")
(license license:llgpl))))
-(define-public ecl-org-sampler
- (sbcl-package->ecl-package sbcl-org-sampler))
-
(define-public cl-org-sampler
(sbcl-package->cl-source-package sbcl-org-sampler))
-(define-public sbcl-acl-compat
- ;; There does not seem to be proper releases.
- (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5"))
+(define-public ecl-org-sampler
+ (sbcl-package->ecl-package sbcl-org-sampler))
+
+(define-public sbcl-origin
+ (let ((commit "d646134302456408d6d43580bb05299f1695ab8e")
+ (revision "1"))
(package
- (name "sbcl-acl-compat")
- (version (git-version "0.1.1" "1" commit))
+ (name "sbcl-origin")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "git://git.code.sf.net/p/portableaserve/git")
+ (url "https://git.mfiano.net/mfiano/origin")
(commit commit)))
- (file-name (git-file-name "acl-compat" version))
+ (file-name (git-file-name "origin" version))
(sha256
- (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"))))
+ (base32 "1n9aszaif3yh8prs5r8v51fbj4r5jd1a048mivd5yij3hplkm82b"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'cd-acl-compat
- (lambda _
- (chdir "acl-compat")
- #t)))))
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- `(("puri" ,sbcl-puri)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("ironclad" ,sbcl-ironclad)
- ("cl-fad" ,sbcl-cl-fad)))
- (home-page "https://sourceforge.net/projects/portableaserve/")
- (synopsis "AllegroServe, a web server written in Common Lisp")
+ (list sbcl-golden-utils sbcl-specialization-store))
+ (home-page "https://git.mfiano.net/mfiano/origin")
+ (synopsis "Common Lisp graphics math library")
(description
- "The server part of AllegroServe can be used either as a standalone web
-server or a module loaded into an application to provide a user interface to
-the application. AllegroServe's proxy ability allows it to run on the gateway
-machine between some internal network and the Internet. AllegroServe's client
-functions allow Lisp programs to explore the web.")
- (license license:llgpl))))
+ "This is a native Common Lisp graphics math library with an emphasis on
+performance and correctness.")
+ (license license:expat))))
-(define-public cl-acl-compat
- (sbcl-package->cl-source-package sbcl-acl-compat))
+(define-public ecl-origin
+ (sbcl-package->ecl-package sbcl-origin))
-(define-public sbcl-aserve
- ;; There does not seem to be proper releases.
- (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5")
- (revision "2"))
+(define-public cl-origin
+ (sbcl-package->cl-source-package sbcl-origin))
+
+(define-public sbcl-osc
+ (let ((commit "f647738ccc22925ed740a8ca9132fda76a05baeb")
+ (revision "0"))
(package
- (name "sbcl-aserve")
- (version (git-version "1.2.50" revision commit))
- (source
+ (name "sbcl-osc")
+ (version (git-version "0.9" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- ;; https://github.com/franzinc/aserve/ seems to be incompatible
- ;; with SBCL, etc.
- (url "git://git.code.sf.net/p/portableaserve/git")
+ (url "https://github.com/zzkt/osc")
(commit commit)))
- (file-name (git-file-name "aserve" version))
+ (file-name (git-file-name "cl-osc" version))
(sha256
- (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"))
- (patches (search-patches
- ;; Add HTML5 elements to htmlgen.
- ;; Adapted from https://github.com/franzinc/aserve/ commits:
- ;; * e47bd763: "rfe12668: add HTML 5 elements to htmlgen"
- ;; * 7371ce59: "fix bugs in rfe12668 implementation"
- "sbcl-aserve-add-HTML-5-elements.patch"
- "sbcl-aserve-fix-rfe12668.patch"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'cd-aserve
- (lambda _
- (chdir "aserve")
- #t))
- (add-after 'cd-aserve 'fix-asd
- (lambda _
- (substitute* "aserve.asd"
- ((" :force t") ""))
- #t))
- (add-after 'cd-aserve 'fix-tests
- (lambda _
- (substitute* "test/t-aserve.cl"
- (("\\(asdf:oos 'asdf:load-op :ptester\\)") ""))
- #t)))))
- (inputs
- `(("acl-compat" ,sbcl-acl-compat)))
- (home-page
- "https://franz.com/support/documentation/current/doc/aserve/aserve.html")
- (synopsis "AllegroServe, a web server written in Common Lisp")
- (description
- "The server part of AllegroServe can be used either as a standalone web
-server or a module loaded into an application to provide a user interface to
-the application. AllegroServe's proxy ability allows it to run on the gateway
-machine between some internal network and the Internet. AllegroServe's client
-functions allow Lisp programs to explore the web.")
- (license license:llgpl))))
+ (base32 "1x4cavspaxcr604g0hwak1ncy4m9cqq03ji4v56g2h1443n7h48a"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-fiveam))
+ (inputs (list sbcl-ieee-floats))
+ (synopsis "Implementation of the Open Sound Control protocol")
+ (description "This is a lisp implementation of the Open Sound Control
+protocol (or more accurately “data transport specification” or
+“encoding”). The code should be close to ANSI standard common lisp and
+provides self contained code for encoding and decoding of OSC data, messages,
+and bundles.")
+ (home-page "https://github.com/zzkt/osc/")
+ (license license:gpl3+))))
-(define-public cl-aserve
- (sbcl-package->cl-source-package sbcl-aserve))
+(define-public cl-osc
+ (sbcl-package->cl-source-package sbcl-osc))
-(define-public sbcl-yxorp
- (let ((commit "c306898a467995e123a22316c9b79fcac442415b")
+(define-public ecl-osc
+ (sbcl-package->ecl-package sbcl-osc))
+
+(define-public sbcl-osicat
+ (let ((commit "982327905b8980ff3173344ca87282e046565732")
(revision "4"))
(package
- (name "sbcl-yxorp")
- (version (git-version "0.4" revision commit))
+ (name "sbcl-osicat")
+ (version (git-version "0.7.0" revision commit))
+ (home-page "https://www.common-lisp.net/project/osicat/")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charJe/cl-yxorp")
+ (url "https://github.com/osicat/osicat")
(commit commit)))
- (file-name (git-file-name "cl-yxorp" version))
+ (file-name (git-file-name "cl-osicat" version))
(sha256
- (base32 "0ll1s9w29yhhgqssgiw58fcapw4n040gkvpz4sxwv3q2v60rbidj"))))
+ (base32 "10q1dfkhrvp5ia860q10y4wdm11fmxf7xv8zl4viz2np9xzf5v22"))
+ (snippet
+ '(begin
+ ;; The useless release.sh drags `bash' into the closure.
+ (delete-file "scripts/release.sh")
+ #t))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-chipz
- sbcl-chunga
- sbcl-cl+ssl
- sbcl-binding-arrows
- sbcl-cl-str
- sbcl-usocket
- sbcl-flexi-streams
- sbcl-rutils
- sbcl-salza2
- sbcl-trivial-garbage))
- (home-page "https://github.com/charje/cl-yxorp")
- (synopsis
- "Reverse proxy server written in and configurable in Common Lisp")
+ (list sbcl-alexandria sbcl-cffi sbcl-trivial-features))
+ (native-inputs
+ (list sbcl-rt))
+ (synopsis "Operating system interface for Common Lisp")
(description
- "This is a reverse proxy server written in and configurable in
-Common Lisp. It supports WebSocket, HTTP, HTTPS, HTTP to HTTPS
-redirecting, port and host forwarding configuration using a real programming
-language, HTTP header and body manipulation (also using a real programming
-language).")
- (license license:agpl3))))
+ "Osicat is a lightweight operating system interface for Common Lisp on
+Unix-platforms. It is not a POSIX-style API, but rather a simple lispy
+accompaniment to the standard ANSI facilities.")
+ (license license:expat))))
-(define-public ecl-yxorp
- ;; Note that due to a bug in ECL this package does not build.
- ;; The bug has already been fixed on the development branch,
- ;; so this package will work work in the version after 21.2.1.
- (sbcl-package->ecl-package sbcl-yxorp))
+(define-public cl-osicat
+ (sbcl-package->cl-source-package sbcl-osicat))
-(define-public cl-yxorp
- (sbcl-package->cl-source-package sbcl-yxorp))
+(define-public ecl-osicat
+ (sbcl-package->ecl-package sbcl-osicat))
-(define-public cl-yxorp-cli
+(define-public sbcl-ospm
(package
- (inherit sbcl-yxorp)
- (name "cl-yxorp-cli")
- (build-system gnu-build-system)
- (arguments
- '(#:tests? #f
- #:strip-binaries? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'set-home
- (lambda _
- (setenv "HOME" "/tmp")))
- (replace 'build
- (lambda _
- (invoke
- "sbcl" "--noinform"
- "--non-interactive"
- "--no-userinit"
- "--eval" "(require :asdf)"
- "--eval" "(pushnew (uiop:getcwd) asdf:*central-registry*)"
- "--load" "build.lisp")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
- (mkdir-p bin)
- (install-file "cl-yxorp" bin)))))))
- (inputs (cons (list "sbcl" sbcl) (package-inputs sbcl-yxorp)))))
+ (name "sbcl-ospm")
+ (version "0.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/ospm")
+ (commit version)))
+ (file-name (git-file-name "cl-ospm" version))
+ (sha256
+ (base32 "1z2wz2xg7rn7p1lladdhj789iz2f3wfjgpi2hjr08vkf1pkp15xf"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-calispel
+ sbcl-hu.dwim.defclass-star
+ sbcl-local-time
+ sbcl-moptilities
+ sbcl-named-readtables
+ sbcl-serapeum
+ sbcl-trivia))
+ (native-inputs
+ ;; FIXME: Tests have execution errors because of Guix being run in a container.
+ (list sbcl-lisp-unit2 guix))
+ (home-page "https://github.com/atlas-engineer/ospm")
+ (synopsis "System package manager in Common Lisp")
+ (description
+ "This library is a universal interface to the operating system package manager.
+It has extensive support for Guix, among others:
-(define-public sbcl-rss
+@itemize
+@item package listing and searching;
+@item package installation and uninstallation;
+@item package file listing;
+@item profile listing;
+@item manifest listing and installation;
+@item generation listing, switching and deletion.
+@end itemize\n")
+ (license license:bsd-3)))
+
+(define-public cl-ospm
+ (let ((pkg (sbcl-package->cl-source-package sbcl-ospm)))
+ (package
+ (inherit pkg)
+ (inputs
+ (cons (list "osicat" cl-osicat)
+ (package-inputs pkg))))))
+
+(define-public sbcl-overlord
;; No release.
- (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58"))
+ (let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763"))
(package
- (name "sbcl-rss")
- (version (git-version "0.9.1.1" "2" commit))
+ (name "sbcl-overlord")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "http://git.kpe.io/cl-rss.git")
+ (url "https://github.com/ruricolist/overlord/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0wv3j13fj73gigriw5r9vi920hz05ld7zllsvbxdxvmyfy9k1kly"))
- (modules '((guix build utils)))
- (snippet
- ;; The useless bundled debian folder drags `make' into the closure.
- `(begin
- (delete-file-recursively "debian")
- #t))))
+ (base32 "1maqm53yhlhaa3cka8xcc4sq24ifrr4y3y0s5dyyn682xsh14hb4"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-aserve sbcl-kmrcl sbcl-xmls))
- (home-page "https://github.com/nsrahmad/cl-rss")
- (synopsis "Common Lisp RSS processor")
+ `(("babel" ,sbcl-babel)
+ ("bit-smasher" ,sbcl-bit-smasher)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cl-strftime" ,sbcl-cl-strftime)
+ ("cmd" ,sbcl-cmd)
+ ("drakma" ,sbcl-drakma)
+ ("exit-hooks" ,sbcl-exit-hooks)
+ ("fset" ,sbcl-fset)
+ ("local-time" ,sbcl-local-time)
+ ("lparallel" ,sbcl-lparallel)
+ ("md5" ,sbcl-md5)
+ ("murmurhash" ,sbcl-cl-murmurhash)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("ppcre" ,sbcl-cl-ppcre)
+ ("serapeum" ,sbcl-serapeum)
+ ("trivia" ,sbcl-trivia)
+ ("trivial-file-size" ,sbcl-trivial-file-size)))
+ (propagated-inputs
+ `(("quickproject" ,sbcl-quickproject)))
+ (native-inputs
+ (list sbcl-fiveam))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'include-overlord/net
+ (lambda _
+ (substitute* "all.lisp"
+ (("\\(:import-from :overlord/kernel :nproc\\)")
+ (string-append
+ "(:import-from :overlord/kernel :nproc)"
+ "\n"
+ "(:import-from :overlord/net)")))
+ #t)))))
+ (home-page "https://github.com/ruricolist/overlord")
+ (synopsis "Build system in Common Lisp")
(description
- "This package provides a Common Lisp library for fetching and parsing
-RSS feeds data via HTTP. Currently, it supports RSS versions 0.90,
-0.91, and 0.92 as well as RSS version 2.")
- (license license:bsd-3))))
+ "Overlord is a build system in Common Lisp. It is a real build system,
+with all the modern features: rules with multiple outputs, parallel builds,
+immunity to clock issues, and dynamic dependencies.
-(define-public cl-rss
- (sbcl-package->cl-source-package sbcl-rss))
+But Overlord is more than another build system. Overlord is a uniform
+approach to dependencies inside or outside of a Lisp image. Overlord is to
+Make what Lisp macros are to C macros.
-(define-public sbcl-binascii
- (let ((commit "0fb0a9e5773148fd04d50efef08c1cc10f6fc487")
- (revision "1"))
+Overlord is designed to be used from the Lisp REPL. A command line interface
+is available in a separate repository. See
+@url{https://github.com/ruricolist/overlord-cli}.")
+ (license license:expat))))
+
+(define-public cl-overlord
+ (sbcl-package->cl-source-package sbcl-overlord))
+
+;; FIXME: Broken on ECL? https://github.com/ruricolist/overlord/issues/25
+;; (define-public ecl-overlord
+;; (sbcl-package->ecl-package sbcl-overlord))
+
+(define-public sbcl-parenscript
+ ;; Source archives are overwritten on every release, we use the Git repo instead.
+ (let ((commit "7a1ac46353cecd144fc91915ba9f122aafcf4766"))
(package
- (name "sbcl-binascii")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-parenscript")
+ (version (git-version "2.7.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/binascii")
+ (url "https://gitlab.common-lisp.net/parenscript/parenscript")
(commit commit)))
- (file-name (git-file-name "cl-binascii" version))
+ (file-name (git-file-name "parenscript" version))
(sha256
- (base32 "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"))
- (modules '((guix build utils)))
- (snippet
- ;; Unbundle the RT test framework.
- '(begin
- (delete-file "tests/rt.lisp")
- (substitute* "binascii.asd"
- ((":depends-on \\(binascii\\)")
- ":depends-on (binascii rt)")
- (("\\(:file \"rt\"\\)")
- "")
- (("\\(:file \"tests\" :depends-on \\(\"rt\"\\)\\)")
- "(:file \"tests\")"))))))
+ (base32
+ "0c22lqarrpbq82dg1sb3y6mp6w2faczp34ymzhnmff88yfq1xzsf"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-rt))
- (home-page "https://github.com/sharplispers/binascii")
- (synopsis "Common Lisp library of ASCII encoding schemes for binary data")
+ (inputs
+ (list sbcl-cl-ppcre sbcl-anaphora sbcl-named-readtables))
+ (home-page "https://common-lisp.net/project/parenscript/")
+ (synopsis "Translator from a subset of Common Lisp to JavaScript")
(description
- "@code{binascii} is a Common Lisp library for converting binary data
-to ASCII text of some kind. Such conversions are common in email protocols
-(for encoding attachments to support old non-8-bit clean transports) or
-encoding binary data in HTTP and XML applications. @code{binascii} supports
-the encodings described in RFC 4648: base64, base32, base16, and variants.
-It also supports base85, used in Adobe's PostScript and PDF document formats,
-and a variant called ascii85, used by git for binary diff files.")
+ "Parenscript is a translator from an extended subset of Common Lisp to
+JavaScript. Parenscript code can run almost identically on both the
+browser (as JavaScript) and server (as Common Lisp).
+
+Parenscript code is treated the same way as Common Lisp code, making the full
+power of Lisp macros available for JavaScript. This provides a web
+development environment that is unmatched in its ability to reduce code
+duplication and provide advanced meta-programming facilities to web
+developers.
+
+At the same time, Parenscript is different from almost all other \"language
+X\" to JavaScript translators in that it imposes almost no overhead:
+
+@itemize
+@item No run-time dependencies: Any piece of Parenscript code is runnable
+as-is. There are no JavaScript files to include.
+@item Native types: Parenscript works entirely with native JavaScript data
+types. There are no new types introduced, and object prototypes are not
+touched.
+@item Native calling convention: Any JavaScript code can be called without the
+need for bindings. Likewise, Parenscript can be used to make efficient,
+self-contained JavaScript libraries.
+@item Readable code: Parenscript generates concise, formatted, idiomatic
+JavaScript code. Identifier names are preserved. This enables seamless
+debugging in tools like Firebug.
+@item Efficiency: Parenscript introduces minimal overhead for advanced Common
+Lisp features. The generated code is almost as fast as hand-written
+JavaScript.
+@end itemize\n")
(license license:bsd-3))))
-(define-public cl-binascii
- (sbcl-package->cl-source-package sbcl-binascii))
+(define-public cl-parenscript
+ (sbcl-package->cl-source-package sbcl-parenscript))
-(define-public sbcl-trivial-with-current-source-form
- (let ((commit "9e343e043a77a5478c1f77bb626db22335fbbfb8")
+(define-public ecl-parenscript
+ (sbcl-package->ecl-package sbcl-parenscript))
+
+(define-public sbcl-parse
+ (let ((commit "2351ee78acac065fcf10b8713d3f404e2e910786")
(revision "1"))
(package
- (name "sbcl-trivial-with-current-source-form")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-parse")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/massung/parse")
+ (commit commit)))
+ (file-name (git-file-name "parse" version))
+ (sha256
+ (base32 "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/massung/parse")
+ (synopsis "Monadic parsing for Common Lisp")
+ (description
+ "PARSE is a simple token parsing library for Common Lisp.")
+ (license license:asl2.0))))
+
+(define-public cl-parse
+ (sbcl-package->cl-source-package sbcl-parse))
+
+(define-public ecl-parse
+ (sbcl-package->ecl-package sbcl-parse))
+
+(define-public sbcl-parse-declarations
+ (let ((commit "549aebbfb9403a7fe948654126b9c814f443f4f2")
+ (revision "1"))
+ (package
+ (name "sbcl-parse-declarations")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url
- "https://github.com/scymtym/trivial-with-current-source-form")
+ (url (string-append
+ "https://gitlab.common-lisp.net/parse-declarations/"
+ "parse-declarations.git"))
(commit commit)))
- (file-name (git-file-name "trivial-with-current-source-form" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "15zs7mc422ycp1cvcxmirif1dq15mlmv8vzd6l6nzn4qgmph9wz0"))))
+ (base32 "03g5qks4c59nmxa48pbslxkfh77h8hn8566jddp6m9pl15dzzpxd"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/scymtym/trivial-with-current-source-form")
- (synopsis "Help producing better errors for macro users")
+ (arguments
+ `(#:asd-systems '("parse-declarations-1.0")))
+ (home-page "https://common-lisp.net/project/parse-declarations/")
+ (synopsis "Parse, filter, and build declarations")
(description
- "This library allows macro writers to provide better feedback to macro
-users when errors are signaled during macroexpansion. It uses the compiler's
-concept of a source-form to report where the error or warning is located.")
- (license license:lgpl3))))
+ "Parse-Declarations is a Common Lisp library to help writing
+macros which establish bindings. To be semantically correct, such
+macros must take user declarations into account, as these may affect
+the bindings they establish. Yet the ANSI standard of Common Lisp does
+not provide any operators to work with declarations in a convenient,
+high-level way. This library provides such operators.")
+ ;; MIT License
+ (license license:expat))))
-(define-public ecl-trivial-with-current-source-form
- ;; Trivial-with-current-source-form does not give any benefits on ECL.
- ;; This package is so packages dependent on trivial-with-current-source-form
- ;; can be loaded on ECL.
- (sbcl-package->ecl-package sbcl-trivial-with-current-source-form))
+(define-public cl-parse-declarations
+ (sbcl-package->cl-source-package sbcl-parse-declarations))
-(define-public cl-trivial-with-current-source-form
- (sbcl-package->cl-source-package sbcl-trivial-with-current-source-form))
+(define-public ecl-parse-declarations
+ (sbcl-package->ecl-package sbcl-parse-declarations))
-(define-public sbcl-tailrec
- (let ((commit "6f882846d8f5bca9138df26510862e64bb15d92f")
+(define-public sbcl-parse-float
+ (let ((commit "3074765101e41222b6b624a66aaf1e6416379f9c")
(revision "2"))
(package
- (name "sbcl-tailrec")
- (version (git-version "0" revision commit))
+ (name "sbcl-parse-float")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charje/tailrec")
+ (url "https://github.com/soemraws/parse-float")
(commit commit)))
- (file-name (git-file-name name version))
(sha256
- (base32 "1h8m2npdzd2cpnl75pvv4yvvfwxa7kl6qvalc9s0y4yws0kaih3i"))))
+ (base32 "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"))
+ (file-name (git-file-name "proc-parse" version))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; FIXME: https://github.com/soemraws/parse-float/issues/12
+ `(#:asd-systems '("parse-float" "parse-float-tests")))
+ (native-inputs
+ (list sbcl-lisp-unit))
(inputs
- (list sbcl-alexandria sbcl-trivial-macroexpand-all
- sbcl-trivial-with-current-source-form))
- (home-page "https://github.com/charje/tailrec")
- (synopsis "Macro to optimize a Common Lisp function for tail recursion")
- (description "Just wrap your Common Lisp function in this macro call and
-it will be optimized for tail recursion. You will be warned if the function
-is not tail recursive.")
- (license license:llgpl))))
+ `(("alexandria" ,sbcl-alexandria)))
+ (home-page "https://github.com/soemraws/parse-float")
+ (synopsis "Parse a floating point value from a string in Common Lisp")
+ (description
+ "This package exports the following function to parse floating-point
+values from a string in Common Lisp.")
+ (license license:public-domain))))
-(define-public ecl-tailrec
- (sbcl-package->ecl-package sbcl-tailrec))
+(define-public cl-parse-float
+ (sbcl-package->cl-source-package sbcl-parse-float))
-(define-public cl-tailrec
- (sbcl-package->cl-source-package sbcl-tailrec))
+(define-public ecl-parse-float
+ (sbcl-package->ecl-package sbcl-parse-float))
-(define-public sbcl-issr-core
- (let ((commit "64e3b07a63a7ca3ad70ba42474f98ac4513580aa")
+(define-public sbcl-parse-js
+ (let ((commit "fbadc6029bec7039602abfc06c73bb52970998f6")
(revision "1"))
(package
- (name "sbcl-issr-core")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-parse-js")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/interactive-ssr/core")
+ (url "http://marijn.haverbeke.nl/git/parse-js")
(commit commit)))
- (file-name (git-file-name "issr-core" version))
+ (file-name (git-file-name "cl-parse-js" version))
(sha256
- (base32 "1bajb09crzadkirdpd6jrpcc55irjd4sxzavygr25l85pafyhniw"))))
+ (base32
+ "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-str sbcl-global-vars sbcl-plump sbcl-tailrec))
- (home-page
- "https://github.com/interactive-ssr/client/blob/master/main.org")
- (synopsis "The core functionality for ISSR server modules")
- (description
- "ISSR core provides functions and variables for ISSR server modules so
-that different servers can behave similarly. The most important features are
-Document Object Model differencing to generate instructions to update a DOM,
-and DOM cleaning, to ensure that all remote DOMs are the same.")
- (license license:llgpl))))
+ (home-page "https://marijnhaverbeke.nl/parse-js/")
+ (synopsis "Parse JavaScript")
+ (description "Parse-js is a Common Lisp package for parsing
+JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.")
+ (license license:zlib))))
-(define-public ecl-issr-core
- (sbcl-package->ecl-package sbcl-issr-core))
+(define-public cl-parse-js
+ (sbcl-package->cl-source-package sbcl-parse-js))
-(define-public cl-issr-core
- (sbcl-package->cl-source-package sbcl-issr-core))
+(define-public ecl-parse-js
+ (sbcl-package->ecl-package sbcl-parse-js))
-(define-public sbcl-portal
- (let ((commit "416589fa04cb239971422a1272acba236c8333be")
- (revision "2"))
+(define-public sbcl-parse-number
+ (package
+ (name "sbcl-parse-number")
+ (version "1.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharplispers/parse-number/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://www.cliki.net/PARSE-NUMBER")
+ (synopsis "Parse numbers")
+ (description "@code{parse-number} is a library of functions for parsing
+strings into one of the standard Common Lisp number types without using the
+reader. @code{parse-number} accepts an arbitrary string and attempts to parse
+the string into one of the standard Common Lisp number types, if possible, or
+else @code{parse-number} signals an error of type @code{invalid-number}.")
+ (license license:bsd-3)))
+
+(define-public cl-parse-number
+ (sbcl-package->cl-source-package sbcl-parse-number))
+
+(define-public ecl-parse-number
+ (sbcl-package->ecl-package sbcl-parse-number))
+
+(define-public sbcl-parseq
+ (package
+ (name "sbcl-parseq")
+ (version "0.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mrossini-ethz/parseq")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-parseq" version))
+ (sha256
+ (base32 "0b4lnhwqdlaqccanyssdj2v0am2ygw6qr4543b49kz2rwirykw0w"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/mrossini-ethz/parseq")
+ (synopsis "Parsing expression grammars for sequences")
+ (description
+ "Parseq (pronounced parsec) is a parsing library for common lisp. It can
+be used for parsing lisp's sequences types: strings, vectors (e.g. binary
+data) and lists. Furthermore, parseq is able to parse nested structures such
+as trees (e.g. lists of lists, lists of vectors, vectors of strings).
+
+Parseq uses parsing expression grammars (PEG) that can be defined through a
+simple interface. Extensions to the standard parsing expressions are
+available. Parsing expressions can be parameterised and made context
+aware. Additionally, the definition of each parsing expression allows the
+arbitrary transformation of the parsing tree.
+
+The library is inspired by Esrap and uses a very similar interface. No code
+is shared between the two projects, however. The features of Esrap are are
+mostly included in parseq and complemented with additional, orthogonal
+features. Any resemblance to esrap-liquid is merely coincidental.")
+ (license license:gpl2)))
+
+(define-public cl-parseq
+ (sbcl-package->cl-source-package sbcl-parseq))
+
+(define-public ecl-parseq
+ (sbcl-package->ecl-package sbcl-parseq))
+
+(define-public sbcl-parser-combinators
+ (let ((commit "9c7569a4f6af5e60c0d3a51d9c15c16d1714c845")
+ (revision "1"))
(package
- (name "sbcl-portal")
- (version (git-version "1.2" revision commit))
+ (name "sbcl-parser-combinators")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charJe/portal")
+ (url "https://github.com/Ramarren/cl-parser-combinators")
(commit commit)))
- (file-name (git-file-name "portal" version))
+ (file-name (git-file-name "parser-combinators" version))
(sha256
- (base32 "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280"))))
+ (base32 "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; FIXME: (Sharlatan-20210523T184237+0100): Tests require `femlisp', which
+ ;; is quite chunky not packaged system yet, enable them when it's packed.
+ `(#:tests? #f))
+ ;; (native-inputs
+ ;; `(("hu.dwim.stefil" ,sbcl-hu.dwim.stefil)
+ ;; ("infix" ,sbcl-femlisp)))
(inputs
- (list sbcl-alexandria
- sbcl-arrows
- sbcl-cl-base64
- sbcl-cl-str
- sbcl-flexi-streams
- sbcl-global-vars
- sbcl-ironclad
- sbcl-parse-float
- sbcl-usocket))
- (home-page "https://github.com/charJe/portal")
- (synopsis "Portable Websocket Server for Common Lisp")
+ `(("alexandria" ,sbcl-alexandria)
+ ("cl-containers" ,sbcl-cl-containers)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("iterate" ,sbcl-iterate)))
+ (home-page "https://github.com/Ramarren/cl-parser-combinators")
+ (synopsis "Parser combinators in Common Lisp")
(description
- "This is a websocket server for Common Lisp using usockets to be
-portable between implementations and operating systems. It has a programming
-interface that allows for multiple websocket apps per server using Common Lisp
-keywords for different websocket events. It has useful restarts and
-customizable errors.")
- (license license:llgpl))))
+ "PARSER-COMBINATORS is a library implementing monadic parser
+combinators in Common Lisp, similar in concept to Haskell Parsec system.")
+ (license license:bsd-3))))
-(define-public ecl-portal
- (sbcl-package->ecl-package sbcl-portal))
+(define-public cl-parser-combinators
+ (sbcl-package->cl-source-package sbcl-parser-combinators))
-(define-public cl-portal
- (sbcl-package->cl-source-package sbcl-portal))
+(define-public ecl-parser-combinators
+ (sbcl-package->ecl-package sbcl-parser-combinators))
-(define-public sbcl-hunchenissr
- (let ((commit "7df702f2e110999a2f31c7ebad81bfc39ac06670")
+(define-public sbcl-path-parse
+ (let ((commit "86183f3752374435f8933394b4c5d8e75a37a113")
(revision "1"))
(package
- (name "sbcl-hunchenissr")
- (version (git-version "1" revision commit))
+ (name "sbcl-path-parse")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/interactive-ssr/hunchenissr")
+ (url "https://github.com/eudoxia0/path-parse")
(commit commit)))
- (file-name (git-file-name "hunchenissr" version))
+ (file-name (git-file-name "cl-path-parse" version))
(sha256
- (base32 "0826qrvk64pjspdklns29dv3zhzfhd6k42fq030xajv8a7hkcxda"))))
+ (base32 "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-base64
- sbcl-cl-str
- sbcl-hunchentoot
- sbcl-issr-core
- sbcl-jonathan
- sbcl-plump
- sbcl-portal))
- (home-page "https://github.com/interactive-ssr/hunchenissr")
- (synopsis "Interactive Server Side Rendering backend for Hunchentoot")
+ (list sbcl-split-sequence))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/eudoxia0/path-parse")
+ (synopsis "Parse the PATH environment variable in Common Lisp")
(description
- "Hunchenissr works together with issr.js for the development of
-interactive (changing without page refreshes) websites making use of websocket
-and Common Lisp server HTML generation instead of mountains of convoluted
-Javascript.")
- (license license:llgpl))))
+ "This package provides a function to parse the @code{PATH} environment
+variable portably in Common Lisp.")
+ (license license:expat))))
-(define-public ecl-hunchenissr
- (sbcl-package->ecl-package sbcl-hunchenissr))
+(define-public cl-path-parse
+ (sbcl-package->cl-source-package sbcl-path-parse))
-(define-public cl-hunchenissr
- (sbcl-package->cl-source-package sbcl-hunchenissr))
+(define-public ecl-path-parse
+ (sbcl-package->ecl-package sbcl-path-parse))
-(define-public sbcl-hunchenissr-routes
- (let ((commit "2e831975dc2a6c030f1b518747cf429be8484b31")
- (revision "1"))
+(define-public sbcl-pathname-utils
+ (let ((commit "f28068a79825f37002e96d13dfd739172382bf94")
+ (revision "3"))
(package
- (name "sbcl-hunchenissr-routes")
- (version (git-version "0" revision commit))
+ (name "sbcl-pathname-utils")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/interactive-ssr/hunchenissr-routes")
+ (url "https://github.com/Shinmera/pathname-utils")
(commit commit)))
- (file-name (git-file-name "hunchenissr-routes" version))
+ (file-name (git-file-name "cl-pathname-utils" version))
(sha256
- (base32 "1xyqacihxwk4vnffqlg93czmalscglp6sh3bwy3qwb7hdxv6yxz6"))))
+ (base32 "10xs0wnnkbdiirr1cb7q7hzi2zmksfsrj0p7yws0j1l215vz8qs8"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-alexandria sbcl-cl-ppcre sbcl-cl-unification
- sbcl-hunchenissr))
- (home-page "https://github.com/interactive-ssr/hunchenissr-routes")
- (synopsis "Enable path variables when using Hunchenissr")
+ (list sbcl-trivial-features))
+ (home-page "https://shinmera.github.io/pathname-utils/")
+ (synopsis "Collection of utilities to help with pathname operations")
(description
- "This library enables path variables in networking routes when using
-Hunchenissr for Common Lisp. If a part of the path (between two slashes)
-starts with a question mark (?), that symbol (without question mark) will be
-bound to whatever value was in the same place in the URL (as a string).")
- (license license:llgpl))))
+ "This package provides a Common Lisp system a with collection of common
+tests and operations to help handling pathnames. It does not actually deal in
+handling the accessing of files on the underlying system however.")
+ (license license:zlib))))
-(define-public ecl-hunchenissr-routes
- (sbcl-package->ecl-package sbcl-hunchenissr-routes))
+(define-public cl-pathname-utils
+ (sbcl-package->cl-source-package sbcl-pathname-utils))
-(define-public cl-hunchenissr-routes
- (sbcl-package->cl-source-package sbcl-hunchenissr-routes))
+(define-public ecl-pathname-utils
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-pathname-utils))
+ (arguments
+ `(;; FIXME: It might be an issue in implementation of UIOP for ECL:
+ ;;
+ ;; Condition of type: TYPE-ERROR
+ ;; :HOME is not of type SEQUENCE.
+ ;; Available restarts:
+ ;; 1. (RESTART-TOPLEVEL) Go back to Top-Level REPL.
+ ;; Broken at SI:BYTECODES. [Evaluation of: (MAKE-PATHNAME :DIRECTORY
+ ;; '(:ABSOLUTE :HOME))] In: #<process TOP-LEVEL 0x7faa2f991f80>.
+ ;;
+ #:tests? #f))))
-(define-public sbcl-genhash
- (let ((commit "220ae1af8361dbd2005177f2ee11072b6a33934f")
- (revision "1"))
+(define-public sbcl-pem
+ (let ((commit "1ffb17efaa786574928b5cf5089695d37e4ec550")
+ (revision "0"))
(package
- (name "sbcl-genhash")
- (version (git-version "1.7" revision commit))
+ (name "sbcl-pem")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1.0" revision commit))
+ (home-page "https://github.com/fukamachi/pem")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pnathan/genhash")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-genhash" version))
+ (file-name (git-file-name "cl-pem" version))
(sha256
- (base32 "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/pnathan/genhash")
- (synopsis "Generic hash tables for Common Lisp")
- (description
- "This an implementation of CDR 2: generic hash tables for Common Lisp")
- (license license:public-domain))))
+ (base32 "1mi34anznbz12wzng4lma8vcskb20ph5ap6lpsbg0h3pc40kxrzv"))))
+ (native-inputs (list sbcl-rove))
+ (inputs
+ (list sbcl-asn1
+ sbcl-cl-ppcre
+ sbcl-trivia
+ sbcl-ironclad
+ sbcl-cl-base64))
+ (synopsis "PEM parser for Common Lisp")
+ (description "This package provides a PEM (Privacy-Enhanced Mail)
+parser for Common Lisp.")
+ (license license:bsd-2))))
-(define-public cl-genhash
- (sbcl-package->cl-source-package sbcl-genhash))
+(define-public cl-pem
+ (sbcl-package->cl-source-package sbcl-pem))
-(define-public ecl-genhash
- (sbcl-package->ecl-package sbcl-genhash))
+(define-public ecl-pem
+ (sbcl-package->ecl-package sbcl-pem))
-(define-public sbcl-spinneret
- ;; No release since 2019, no tags.
- (let ((commit "d4398b5a344b5c59e497c9ee78fdbae7cc434f74"))
+(define-public sbcl-percent-encoding
+ (let ((commit "c1224e22bc8048fbd3ebbc9329715a0c1b673170")
+ (revision "1"))
(package
- (name "sbcl-spinneret")
- (version (git-version "3.0" "6" commit))
+ (name "sbcl-percent-encoding")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/spinneret/")
+ (url "https://github.com/llibra/percent-encoding")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "percent-encoding" version))
(sha256
- (base32 "1mdd92gfxfdsd81fcd8fgz8z7dwsb0kcv7zyzdgnw8lavkib5zly"))))
+ (base32 "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-global-vars
- sbcl-parenscript
- sbcl-cl-markdown
- sbcl-cl-ppcre
- sbcl-serapeum
- sbcl-trivial-gray-streams))
(native-inputs
(list sbcl-fiveam))
- (home-page "https://github.com/ruricolist/spinneret")
- (synopsis "Common Lisp HTML5 generator")
+ (inputs
+ (list sbcl-anaphora sbcl-babel))
+ (synopsis "RFC 3986 percent-encoding library")
(description
- "In the crowded space of Common Lisp HTML generators, Spinneret
-occupies the following coordinates:
-
-@itemize
-
-@item Modern. Targets HTML5. Does not treat XML and HTML as the same
-problem. Assumes you will be serving your documents as UTF-8.
-
-@item Composable. Makes it easy to refactor HTML generation into separate
-functions and macros.
-
-@item Pretty. Treats HTML as a document format, not a serialization. Output
-is idiomatic and readable, following the coding style of the HTML5
-specification.
+ "This is a Common Lisp library providing RFC 3986 percent-encoding.")
+ (home-page "https://github.com/llibra/percent-encoding")
+ (license license:expat))))
-@item Aggressive. If something can be interpreted as HTML, then it will be,
-meaning that some Lisp forms can't be mixed with HTML syntax. In the
-trade-off between 90% convenience and 10% correctness Spinneret is on the side
-of convenience.
+(define-public ecl-percent-encoding
+ (sbcl-package->ecl-package sbcl-percent-encoding))
-@item Bilingual. Spinneret (after loading @code{spinneret/ps}) has the same
-semantics in Lisp and Parenscript.
+(define-public cl-percent-encoding
+ (sbcl-package->cl-source-package sbcl-percent-encoding))
-@end itemize\n")
- (license license:expat))))
+(define-public sbcl-periodic-table
+ (package
+ (name "sbcl-periodic-table")
+ (version "1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://common-lisp.net/project/chemboy/periodic-table-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "1ircvqm3q93ma4rxbxprb1i9rcax10ld6xmdzdhfnigr27sh5jvg"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://common-lisp.net/project/chemboy/")
+ (synopsis "Periodic table for Common Lisp")
+ (description
+ "This package defines a Common Lisp package, @code{:elements}, with an
+@code{ELEMENT} structure and a number of functions to search the periodic
+table.")
+ (license license:llgpl)))
-(define-public ecl-spinneret
- (sbcl-package->ecl-package sbcl-spinneret))
+(define-public cl-periodic-table
+ (sbcl-package->cl-source-package sbcl-periodic-table))
-(define-public cl-spinneret
- (sbcl-package->cl-source-package sbcl-spinneret))
+(define-public ecl-periodic-table
+ (sbcl-package->ecl-package sbcl-periodic-table))
-(define-public sbcl-path-parse
- (let ((commit "86183f3752374435f8933394b4c5d8e75a37a113")
- (revision "1"))
+(define-public sbcl-periods
+ (let ((commit "60383dcef88a1ac11f82804ae7a33c361dcd2949")
+ (revision "2"))
(package
- (name "sbcl-path-parse")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-periods")
+ (version (git-version "0.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/path-parse")
+ (url "https://github.com/jwiegley/periods")
(commit commit)))
- (file-name (git-file-name "cl-path-parse" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"))))
+ (base32
+ "1ym2j4an9ig2hl210jg91gpf7xfnp6mlhkw3n9kkdnwiji3ipqlk"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-split-sequence))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/eudoxia0/path-parse")
- (synopsis "Parse the PATH environment variable in Common Lisp")
+ `(("local-time" ,sbcl-local-time)
+ ("series" ,sbcl-series)))
+ (arguments
+ '(#:asd-systems '("periods"
+ "periods-series")))
+ (synopsis "Common Lisp library for manipulating date/time objects")
(description
- "This package provides a function to parse the @code{PATH} environment
-variable portably in Common Lisp.")
- (license license:expat))))
+ "Periods is a Common Lisp library providing a set of utilities for
+manipulating times, distances between times, and both contiguous and
+discontiguous ranges of time.")
+ (home-page "https://github.com/jwiegley/periods")
+ (license license:bsd-3))))
-(define-public cl-path-parse
- (sbcl-package->cl-source-package sbcl-path-parse))
+(define-public cl-periods
+ (sbcl-package->cl-source-package sbcl-periods))
-(define-public ecl-path-parse
- (sbcl-package->ecl-package sbcl-path-parse))
+(define-public ecl-periods
+ (sbcl-package->ecl-package sbcl-periods))
-(define-public sbcl-cl-libxml2
- (let ((commit "8d03110c532c1a3fe15503fdfefe82f60669e4bd"))
+(define-public sbcl-phos
+ (let ((commit "6620b82b091cdfed655e1093ef045dbe518d5474"))
(package
- (name "sbcl-cl-libxml2")
- (version (git-version "0.3.4" "1" commit))
+ (name "sbcl-phos")
+ (version (git-version "0.0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/cl-libxml2")
+ (url "https://github.com/omar-polo/phos")
(commit commit)))
- (file-name (git-file-name "cl-libxml2" version))
+ (file-name (git-file-name "phos" version))
(sha256
- (base32 "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"))))
+ (base32
+ "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("flexi-streams" ,sbcl-flexi-streams)
- ("garbage-pools" ,sbcl-garbage-pools)
- ("iterate" ,sbcl-iterate)
- ("metabang-bind" ,sbcl-metabang-bind)
- ("puri" ,sbcl-puri)
- ;; Non-Lisp inputs:
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)))
+ (list sbcl-quri sbcl-cl-ppcre sbcl-trivia sbcl-usocket sbcl-cl+ssl
+ ;; For the experimental GUI:
+ sbcl-nodgui))
(native-inputs
- (list sbcl-lift))
- (arguments
- `(#:tests? #f ; FIXME: Tests get stuck indefinitly
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "tree/xtree.lisp"
- (("libxml2.so.2")
- (string-append (assoc-ref inputs "libxml2") "/lib/libxml2.so")))
- (let ((libxslt (assoc-ref inputs "libxslt")))
- (substitute* "xslt/xslt.lisp"
- (("libxslt.so.1")
- (string-append libxslt "/lib/libxslt.so"))
- (("libexslt.so.0")
- (string-append libxslt "/lib/libexslt.so"))
- (("cllibxml2.so")
- (string-append (assoc-ref outputs "out") "/lib/cllibxml2.so"))))
- #t))
- (add-before 'build 'build-helper-library
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((prefix-dir (string-append (assoc-ref outputs "out"))))
- (mkdir-p (string-append prefix-dir "/lib"))
- (invoke "make" "-C" "foreign" "install"
- "INSOPTS="
- (string-append "PREFIX=" prefix-dir))
- #t)))
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* '("cl-libxml2.asd" "cl-libxslt.asd" "xfactory.asd")
- ((" :force t") ""))
- #t)))))
- (home-page "https://web.archive.org/web/20160121073421/http://cl-libxml2.googlecode.com/svn/doc/index.html")
- (synopsis "High-level wrapper around libxml2 and libxslt libraries")
- (description
- "cl-libxml2 is high-level Common Lisp wrapper around the @code{libxml2}
-and @code{libxslt} libraries.
+ (list sbcl-clunit2))
+ (home-page "https://github.com/omar-polo/phos")
+ (synopsis "Gemini client library and experimental GUI")
+ (description "This package contains a Gemini client library for Common
+Lisp. A subsystem offers an experimental GUI Gemini client.")
+ (license license:isc))))
+
+(define-public cl-phos
+ (sbcl-package->cl-source-package sbcl-phos))
+
+(define-public ecl-phos
+ (sbcl-package->ecl-package sbcl-phos))
+
+(define-public sbcl-physical-quantities
+ (package
+ (name "sbcl-physical-quantities")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mrossini-ethz/physical-quantities")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-physical-quantities" version))
+ (sha256
+ (base32 "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-parseq))
+ (home-page "https://github.com/mrossini-ethz/physical-quantities")
+ (synopsis "Numeric type with optional unit and/or uncertainty for physics")
+ (description
+ "This lisp library handles physical quantities which consist of
@itemize
-@item Interfaces for tree manipulation (like @code{cxml-stp}).
-@item Interface for HTML 4.0 non-validating parsers.
-@item Specific APIs to process HTML trees, especially serialization.
-@item XPath API.
-@item XSLT API.
-@item Custom URL resolvers.
-@item XPath extension functions.
-@item XSLT extension elements.
-@item Translates @code{libxml2} and @code{libxslt} errors to Lisp conditions.
-@item Extends the Common Lisp @code{iterate} library with custom drivers for
-child nodes enumeration, etc.
-@item The @code{XFACTORY} system provides a simple and compact syntax for XML generation.
-@end itemize\n")
- (license license:llgpl))))
+@item value / magnitude
+@item uncertainty / error
+@item unit
+@end itemize
-(define-public ecl-cl-libxml2
- (sbcl-package->ecl-package sbcl-cl-libxml2))
+where the type of the value can be any subtype of real. For the uncertainty,
+both absolute and relative values are possible. Combinations of lisp symbols
+or strings are used to describe units. User defined units including
+abbreviations and prefixes are supported. Error propagation and unit checking
+is performed for all defined operations.")
+ (license license:gpl2)))
-(define-public cl-libxml2
- (sbcl-package->cl-source-package sbcl-cl-libxml2))
+(define-public cl-physical-quantities
+ (sbcl-package->cl-source-package sbcl-physical-quantities))
+
+(define-public ecl-physical-quantities
+ (sbcl-package->ecl-package sbcl-physical-quantities))
(define-public sbcl-pileup
(let ((commit "f269473a570a8e55881082545ee63cfe5c7d3e72")
@@ -24514,378 +23202,544 @@ for Common Lisp.")
(define-public ecl-pileup
(sbcl-package->ecl-package sbcl-pileup))
-(define-public sbcl-feeder
- ;; No release.
- (let ((commit "b05f517d7729564575cc809e086c262646a94d34")
+(define-public sbcl-piping
+ (let ((commit "c7a4163c00dea7e72bf6ad33d6abac0d5826a656")
(revision "1"))
(package
- (name "sbcl-feeder")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-piping")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/feeder")
+ (url "https://github.com/Shinmera/piping/")
(commit commit)))
- (file-name (git-file-name "feeder" version))
+ (file-name (git-file-name "piping" version))
(sha256
- (base32 "1dpbzhycg50snl3j01c8dh8gdvhfhz0hnfl54xy55a3wbr3m6rp7"))))
+ (base32 "0in84qnfkynm36d4n4d6v87vprpi27xrydnga462wfhplji6klv5"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-documentation-utils sbcl-local-time sbcl-plump))
- (home-page "https://shinmera.github.io/feeder/")
- (synopsis "RSS, Atom and general feed parsing and generating")
+ (home-page "https://shinmera.github.io/piping/")
+ (synopsis "Library to enable simple message pipelines")
(description
- "Feeder is a syndication feed library. It presents a general protocol
-for representation of feed items, as well as a framework to translate these
-objects from and to external formats. It also implements the RSS 2.0 and Atom
-formats within this framework.")
+ "This is a Common Lisp library to enable simple message pipelines.")
(license license:zlib))))
-(define-public ecl-feeder
- (sbcl-package->ecl-package sbcl-feeder))
+(define-public cl-piping
+ (sbcl-package->cl-source-package sbcl-piping))
-(define-public cl-feeder
- (sbcl-package->cl-source-package sbcl-feeder))
+(define-public ecl-piping
+ (sbcl-package->ecl-package sbcl-piping))
-(define-public sbcl-routes
- (let ((commit "1b79e85aa653e1ec87e21ca745abe51547866fa9")
- (revision "1"))
+(define-public sbcl-plump
+ (let ((commit "0c3e0b57b43b6e0c5794b6a902f1cf5bee2a2927")
+ (revision "3"))
(package
- (name "sbcl-routes")
- (version (git-version "0.2.5" revision commit))
+ (name "sbcl-plump")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/archimag/cl-routes")
- (commit commit)))
- (file-name (git-file-name "cl-routes" version))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/plump")
+ (commit commit)))
+ (file-name (git-file-name "cl-plump" version))
(sha256
- (base32 "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"))))
+ (base32 "1fyb66pqvr1iy31ah9638ihs8cax17zkxk0zq14jy7x5l9rq1qlf"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Fix: :FORCE and :FORCE-NOT arguments not allowed in
- ;; a nested call to ASDF/OPERATE:OPERATE unless
- ;; identically to toplevel
- (substitute* "routes.asd"
- ((" :force t") "")))))))
(inputs
- `(("iterate" ,sbcl-iterate)
- ("puri" ,sbcl-puri)
- ("split-sequence" ,sbcl-split-sequence)))
- (native-inputs
- (list sbcl-lift))
- (home-page "https://github.com/archimag/cl-routes")
- (synopsis "Rails routes system for Common Lisp")
+ (list sbcl-array-utils sbcl-documentation-utils))
+ (synopsis "Lenient XML / XHTML / HTML parser for Common Lisp")
(description
- "This is a a Common Lisp re-implementation of the Rails routes system
-for mapping URLs.")
- (license license:llgpl))))
+ "Plump is a parser for HTML/XML-like documents, focusing on being
+lenient towards invalid markup. It can handle things like invalid attributes,
+bad closing tag order, unencoded entities, inexistent tag types, self-closing
+tags and so on. It parses documents to a class representation and offers a
+small set of DOM functions to manipulate it. It can be extended to parse to
+your own classes.")
+ (home-page "https://shinmera.github.io/plump/")
+ (license license:zlib))))
-(define-public cl-routes
- (sbcl-package->cl-source-package sbcl-routes))
+(define-public cl-plump
+ (sbcl-package->cl-source-package sbcl-plump))
-(define-public ecl-routes
- (sbcl-package->ecl-package sbcl-routes))
+(define-public ecl-plump
+ (sbcl-package->ecl-package sbcl-plump))
-(define-public sbcl-terminfo
- (let ((commit "b8b2e3ed786bfcf9f1aa4a264cee2e93135080f5")
- (revision "1"))
+(define-public sbcl-plump-sexp
+ (let ((commit "bbcf75e9ecda8fe7603098ab8c15828407bb4f08")
+ (revision "0"))
(package
- (name "sbcl-terminfo")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-plump-sexp")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/npatrick04/terminfo")
- (commit commit)))
- (file-name (git-file-name "terminfo" version))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/plump-sexp")
+ (commit commit)))
+ (file-name (git-file-name "cl-plump-sexp" version))
(sha256
- (base32 "1nmin9rr6f75xdhxysba66xa1dh62fh27w9ad1cvmj0062armf6b"))))
+ (base32
+ "0zm9h0assjb8766z2v6l1k1s60y90y6f8smrl1dczwqlvc8xyln5"))))
(build-system asdf-build-system/sbcl)
- (synopsis "Terminfo database front end in Common Lisp")
- (home-page "https://github.com/npatrick04/terminfo")
+ (inputs
+ (list sbcl-plump))
+ (synopsis "Convert S-expressions into a Plump DOM and back")
(description
- "This is a terminfo database front end in Common Lisp. The package
-provides a method for determining which capabilities a terminal
-(e.g. \"xterm\") has and methods to compile or put commands to a stream.")
- (license license:expat))))
+ "The Plump-SEXP library is a backend for Plump which can convert
+between S-expressions and the Plump DOM.")
+ (home-page "https://github.com/Shinmera/plump-sexp")
+ (license license:zlib))))
-(define-public cl-terminfo
- (sbcl-package->cl-source-package sbcl-terminfo))
+(define-public cl-plump-sexp
+ (sbcl-package->cl-source-package sbcl-plump-sexp))
-(define-public ecl-terminfo
- (sbcl-package->ecl-package sbcl-terminfo))
+(define-public ecl-plump-sexp
+ (sbcl-package->ecl-package sbcl-plump-sexp))
-(define-public sbcl-conium
- (let ((commit "089adfd8759ec7973bb6f67b98d7a246e67aeb05")
+(define-public sbcl-png
+ (let ((commit "11b965fe378fd0561abe3616b18ff03af5179648")
(revision "1"))
(package
- (name "sbcl-conium")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-png")
+ (version (git-version "0.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/conium")
+ (url "https://github.com/ljosa/cl-png")
(commit commit)))
- (file-name (git-file-name "conium" version))
+ (file-name (git-file-name "cl-png" version))
(sha256
- (base32 "0y31za8xr8734p2pf8mrw1jd1fksh2d4y1p12wwjyn8hxxsvsx1w"))))
+ (base32 "173hqwpd0rwqf95mfx1h9l9c3i8bb0gvnpspzmmz3g5x3440czy4"))
+ ;; Patch to fix compiling with SBCL >= 2.1.6.
+ (patches (search-patches "sbcl-png-fix-sbcl-compatibility.patch"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-lib-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "libpng.lisp"
+ (("\"libpng\"")
+ (string-append "\""
+ (assoc-ref inputs "libpng")
+ "/lib/libpng\""))))))))
(inputs
- (list sbcl-closer-mop))
- (home-page "https://github.com/sharplispers/conium")
- (synopsis "Portability library for debugger- and compiler-related tasks")
+ `(("cffi" ,sbcl-cffi)
+ ("libpng" ,libpng)))
+ (home-page "https://github.com/ljosa/cl-png")
+ (synopsis "Read and write PNG file format")
(description
- "Conium is a portability library for debugger- and compiler-related
-tasks in Common Lisp. It is fork of SWANK-BACKEND.")
- (license license:public-domain))))
+ "This package provides a @code{PNG} Common Lisp system to operate with
+Portable Network Graphics file format.")
+ (license license:lgpl2.1))))
-(define-public cl-conium
- (sbcl-package->cl-source-package sbcl-conium))
+(define-public ecl-png
+ (sbcl-package->ecl-package sbcl-png))
-(define-public ecl-conium
- (sbcl-package->ecl-package sbcl-conium))
+(define-public cl-png
+ (sbcl-package->cl-source-package sbcl-png))
-(define-public sbcl-terminal-size
- (let ((commit "e0b3d56a9dd3366baf2a05d84381da5747a2ef4a")
+(define-public sbcl-png-read
+ (let ((commit "ec29f38a689972b9f1373f13bbbcd6b05deada88")
(revision "1"))
(package
- (name "sbcl-terminal-size")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-png-read")
+ (version (git-version "0.3.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/terminal-size")
+ (url "https://github.com/Ramarren/png-read")
(commit commit)))
- (file-name (git-file-name "cl-terminal-size" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1212wbadms9jzrqgarpj3d9xh9w4dab8jhx4k2aryqgf116zs42h"))))
+ (base32 "0vyczbcwskrygrf1hgrsnk0jil8skmvf1kiaalw5jps4fjrfdkw0"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cffi sbcl-osicat))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/eudoxia0/terminal-size")
- (synopsis "Get the size of the terminal from Common Lisp")
- (description
- "This package provides the @code{terminal-size:size} function to get the
-size of the terminal from Common Lisp.")
- (license license:expat))))
+ (list sbcl-babel sbcl-chipz sbcl-iterate))
+ (synopsis "PNG decoder for Common Lisp")
+ (description "This is a Common Lisp library for reading PNG images.")
+ (home-page "https://github.com/Ramarren/png-read")
+ (license license:bsd-3))))
-(define-public cl-terminal-size
- (sbcl-package->cl-source-package sbcl-terminal-size))
+(define-public cl-png-read
+ (sbcl-package->cl-source-package sbcl-png-read))
-(define-public ecl-terminal-size
- (sbcl-package->ecl-package sbcl-terminal-size))
+(define-public ecl-png-read
+ (sbcl-package->ecl-package sbcl-png-read))
-(define-public sbcl-cl-readline
- (let ((commit "8438c9ebd92ccc95ebab9cc9cbe6c72d44fccc58")
- (revision "1"))
+(define-public sbcl-pngload
+ (let ((commit "91f1d703c65bb6a94d6fee06ddbbbbbc5778b71f")
+ (revision "2"))
(package
- (name "sbcl-cl-readline")
- (version (git-version "0.1.2" revision commit))
+ (name "sbcl-pngload")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/vindarel/cl-readline")
+ (url "https://git.mfiano.net/mfiano/pngload.git")
(commit commit)))
- (file-name (git-file-name "cl-readline" version))
+ (file-name (git-file-name "pngload" version))
(sha256
- (base32 "14iskvqfw71ssaav483vmqw62lrpznysjs800gjjppxs785p1fa0"))))
+ (base32 "0s94fdbrbqj12qvgyn2g4lfwvz7qhhzbclrpz5ni7adwxgrmvxl1"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
+ `(("3bz" ,sbcl-3bz)
+ ("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
- ("readline" ,readline)))
+ ("mmap" ,sbcl-mmap)
+ ("parse-float" ,sbcl-parse-float)
+ ("static-vectors" ,sbcl-static-vectors)
+ ("swap-bytes" ,sbcl-swap-bytes)
+ ("zpb-exif" ,sbcl-zpb-exif)))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cl-readline.lisp"
- (("libreadline.so")
- (string-append (assoc-ref inputs "readline")
- "/lib/libreadline.so"))))))))
- (home-page "https://github.com/vindarel/cl-readline")
- (synopsis "Common Lisp bindings to the GNU Readline library")
+ ;; Test suite disabled because of a dependency cycle.
+ ;; pngload tests depend on opticl which depends on pngload.
+ '(#:tests? #f))
+ (home-page "https://git.mfiano.net/mfiano/pngload.git")
+ (synopsis "PNG image decoder for Common Lisp")
(description
- "The Readline library provides a set of functions for use by
-applications that allow users to edit command lines as they are typed in.
-Both Emacs and vi editing modes are available. The Readline library includes
-additional functions to maintain a list of previously-entered command lines, to
-recall and perhaps reedit those lines, and perform csh-like history expansion on
-previous commands.")
- (license license:gpl3+))))
+ "This is a Common Lisp library to load images in the PNG image format,
+both from files on disk, or streams in memory.")
+ (license license:expat))))
-(define-public cl-readline
- (sbcl-package->cl-source-package sbcl-cl-readline))
+(define-public cl-pngload
+ (sbcl-package->cl-source-package sbcl-pngload))
-(define-public ecl-cl-readline
- (sbcl-package->ecl-package sbcl-cl-readline))
+(define-public ecl-pngload
+ (sbcl-package->ecl-package sbcl-pngload))
-(define-public sbcl-generic-comparability
- (let ((commit "53fc2846319a6eb46b36581e203e1f1542a8acff")
- (revision "1"))
+(define-public sbcl-policy-cond
+ (let ((commit "eedb625520175bfdf44d385ff3b21039b7f75706")
+ (revision "0"))
(package
- (name "sbcl-generic-comparability")
- (version (git-version "1.0.1" revision commit))
+ (name "sbcl-policy-cond")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pnathan/generic-comparability")
+ (url "https://github.com/stylewarning/policy-cond")
(commit commit)))
- (file-name (git-file-name "generic-comparability" version))
+ (file-name (git-file-name "cl-policy-cond" version))
(sha256
- (base32 "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"))))
+ (base32 "0xj2a6lcg7i7g4038sc4f641din6m8vdiha8c5afz9fik80bshxk"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/pnathan/generic-comparability")
- (synopsis "Implementation of cdr-8")
- (description
- "GENERIC-COMPARABILITY is an implementation of CDR-8 (Generic Equality
-and Comparison for Common Lisp). CDR-8 provides an interface for the EQUALS
-function, which is defined as a general equality predicate, as well as a set of
-ordering (COMPARE) functions for comparison. The semantics are described in
-the CDR-8 standard.")
- (license license:llgpl))))
+ (home-page "https://github.com/stylewarning/policy-cond")
+ (synopsis "Insert code based on compiler policy")
+ (description "POLICY-COND provides tools to insert and execute code
+based on a compiler's OPTIMIZE policy. It also contains a contract-like notion
+of expectations, which allow dynamic checking or inclusion of various things
+that should happen depending on compiler policy.")
+ (license license:bsd-3))))
-(define-public cl-generic-comparability
- (sbcl-package->cl-source-package sbcl-generic-comparability))
+(define-public cl-policy-cond
+ (sbcl-package->cl-source-package sbcl-policy-cond))
-(define-public ecl-generic-comparability
- (sbcl-package->ecl-package sbcl-generic-comparability))
+(define-public ecl-policy-cond
+ (sbcl-package->ecl-package sbcl-policy-cond))
-(define-public sbcl-cl-libyaml
- (let ((commit "a7fe9f68bddfd00b7ca467b65b3b41b276336843")
- (revision "1"))
+(define-public sbcl-polymorphic-functions
+ (package
+ (name "sbcl-polymorphic-functions")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/digikar99/polymorphic-functions/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-polymorphic-functions" version))
+ (sha256
+ (base32 "161ylp3avmkylgfddp7i1kscv3bqx734jk1i97xhsbl7x83nin0h"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-compiler-macro-notes
+ sbcl-ctype
+ sbcl-fiveam
+ sbcl-cl-form-types
+ sbcl-introspect-environment
+ sbcl-slime-swank))
+ (arguments
+ ;; Tests fail: https://github.com/digikar99/polymorphic-functions/issues/8
+ '(#:tests? #f))
+ (home-page "https://github.com/digikar99/polymorphic-functions/")
+ (synopsis "Function type to dispatch on types instead of classes")
+ (description
+ "This library provides all of
+
+@itemize
+@item ad hoc polymorphism and
+@item subtype polymorphism
+@item parametric polymorphism (in a very limited sense)
+@end itemize
+
+to dispatch on the basis of types rather than classes.")
+ (license license:expat)))
+
+(define-public cl-polymorphic-functions
+ (sbcl-package->cl-source-package sbcl-polymorphic-functions))
+
+(define-public ecl-polymorphic-functions
+ (sbcl-package->ecl-package sbcl-polymorphic-functions))
+
+(define-public sbcl-portable-condition-system
+ (let ((commit "1307ec146d227a9d8ea42312c1ba2a5206a9eb3c")
+ (revision "0"))
(package
- (name "sbcl-cl-libyaml")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-portable-condition-system")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/cl-libyaml")
+ (url "https://github.com/phoe/portable-condition-system")
(commit commit)))
- (file-name (git-file-name "cl-libyaml" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"))))
+ (base32 "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("portable-condition-system")))
(native-inputs
- (list sbcl-fiveam))
+ (list sbcl-1am))
(inputs
- `(("cffi" ,sbcl-cffi)
- ("libyaml" ,libyaml)))
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/library.lisp"
- (("libyaml.so")
- (string-append (assoc-ref inputs "libyaml")
- "/lib/libyaml.so"))))))))
- (home-page "https://github.com/eudoxia0/cl-libyaml")
- (synopsis "Libyaml bindings for Common Lisp")
+ (list sbcl-alexandria
+ sbcl-split-sequence))
+ (home-page "https://github.com/phoe/portable-condition-system")
+ (synopsis "Portable condition system for Common Lisp")
(description
- "This is a binding to the libyaml library. It's not meant as
-a full library for YAML, just a bare binding with a couple of utility macros.
-For a YAML parser and emitter using this, check out cl-yaml.")
- (license license:expat))))
+ "This package provides an example implementation of the Common Lisp
+condition system and library, based on the original condition system
+implementation by Kent M. Pitman.")
+ (license license:cc0))))
-(define-public cl-libyaml
- (sbcl-package->cl-source-package sbcl-cl-libyaml))
+(define-public cl-portable-condition-system
+ (sbcl-package->cl-source-package sbcl-portable-condition-system))
-(define-public ecl-cl-libyaml
- (sbcl-package->ecl-package sbcl-cl-libyaml))
+(define-public ecl-portable-condition-system
+ (sbcl-package->ecl-package sbcl-portable-condition-system))
-(define-public sbcl-cl-yaml
- (let ((commit "c3202be9a753c51f3bc79538a5a498a8865192aa")
- (revision "1"))
+(define-public sbcl-portable-threads
+ (let ((commit "aa26bf38338a6b068bf8bfb3375d8d8c3b0a28df"))
(package
- (name "sbcl-cl-yaml")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-portable-threads")
+ (version (git-version "2.3" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/cl-yaml")
+ (url "https://github.com/binghe/portable-threads/")
(commit commit)))
- (file-name (git-file-name "cl-yaml" version))
+ (file-name (git-file-name "portable-threads" version))
(sha256
- (base32 "1izjg0v6rf7dh069bbnnr67l30lsqj86wdk7y9ggbgiwh6v9j185"))))
+ (base32 "058ksi07vfdmhrf5mdlc833s82m1rcqfja2266520m3r8bzs8bvs"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria sbcl-cl-libyaml sbcl-cl-ppcre
- sbcl-parse-number))
- (native-inputs
- (list sbcl-cl-fad sbcl-fiveam sbcl-generic-comparability
- sbcl-trivial-benchmark sbcl-yason))
- (home-page "https://github.com/eudoxia0/cl-yaml")
- (synopsis "YAML parser for Common Lisp")
+ (arguments
+ `(;; Tests seem broken.
+ #:tests? #f))
+ (home-page "https://github.com/binghe/portable-threads")
+ (synopsis "Portable threads API for Common Lisp")
(description
- "This is a YAML parser and emitter for Common Lisp built on top of
-libyaml.")
- (license license:expat))))
+ "Portable Threads (and Scheduled and Periodic Functions) API for Common
+Lisp (from GBBopen project).")
+ (license license:asl2.0))))
-(define-public cl-yaml
- (sbcl-package->cl-source-package sbcl-cl-yaml))
+(define-public cl-portable-threads
+ (sbcl-package->cl-source-package sbcl-portable-threads))
-(define-public ecl-cl-yaml
- (sbcl-package->ecl-package sbcl-cl-yaml))
+(define-public ecl-portable-threads
+ (sbcl-package->ecl-package sbcl-portable-threads))
-(define-public sbcl-clop
- (let ((commit "c0c3fe7efa5ac95ba1644febfb2c2acab757fcda")
- (revision "0"))
+(define-public sbcl-portal
+ (let ((commit "416589fa04cb239971422a1272acba236c8333be")
+ (revision "2"))
(package
- (name "sbcl-clop")
- ;; ASD file indicates 0.1.0, but changelog 1.0.1.
- (version (git-version "1.0.1" revision commit))
+ (name "sbcl-portal")
+ (version (git-version "1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sheepduke/clop")
+ (url "https://github.com/charJe/portal")
(commit commit)))
- (file-name (git-file-name "cl-clop" version))
+ (file-name (git-file-name "portal" version))
(sha256
- (base32 "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"))))
+ (base32 "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
(inputs
(list sbcl-alexandria
+ sbcl-arrows
+ sbcl-cl-base64
sbcl-cl-str
- sbcl-esrap
- sbcl-local-time
- sbcl-parse-number))
- (home-page "https://github.com/sheepduke/clop")
- (synopsis "TOML parser for Common Lisp")
+ sbcl-flexi-streams
+ sbcl-global-vars
+ sbcl-ironclad
+ sbcl-parse-float
+ sbcl-usocket))
+ (home-page "https://github.com/charJe/portal")
+ (synopsis "Portable Websocket Server for Common Lisp")
(description
- "Clop is a Common Lisp library for parsing strings in the TOML
-configuration file format.")
- (license license:expat))))
+ "This is a websocket server for Common Lisp using usockets to be
+portable between implementations and operating systems. It has a programming
+interface that allows for multiple websocket apps per server using Common Lisp
+keywords for different websocket events. It has useful restarts and
+customizable errors.")
+ (license license:llgpl))))
-(define-public cl-clop
- (sbcl-package->cl-source-package sbcl-clop))
+(define-public cl-portal
+ (sbcl-package->cl-source-package sbcl-portal))
-(define-public ecl-clop
- (sbcl-package->ecl-package sbcl-clop))
+(define-public ecl-portal
+ (sbcl-package->ecl-package sbcl-portal))
+
+(define-public sbcl-positional-lambda
+ (let ((commit "a43a7bb4ef6faa277e6a7440ec9839711c4b9d28")
+ (revision "0"))
+ (package
+ (name "sbcl-positional-lambda")
+ (version (git-version "2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/positional-lambda")
+ (commit commit)))
+ (file-name (git-file-name "cl-positional-lambda" version))
+ (sha256
+ (base32 "1l27mw5ciqz7rnjq1lwslgk220i8iqcr39rs8b7hxkp1yqmah5zq"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-map-bind))
+ (home-page "https://www.hexstreamsoft.com/libraries/positional-lambda/")
+ (synopsis "Macro favouring positional references over naming")
+ (description
+ "This package provides a concise, intuitive and flexible macro for
+trivial lambdas that eschews explicit naming of parameter variables in favor
+of positional references, with support for a used or ignored &rest parameter
+and automatic declaration of ignored parameters when logical @code{gaps}
+are left in the positional references. Further convenience features
+are provided.")
+ (license license:unlicense))))
+
+(define-public cl-positional-lambda
+ (sbcl-package->cl-source-package sbcl-positional-lambda))
+
+(define-public ecl-cl-positional-lambda
+ (sbcl-package->ecl-package sbcl-positional-lambda))
+
+(define-public sbcl-postmodern
+ (package
+ (name "sbcl-postmodern")
+ (version "1.32.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/marijnh/Postmodern")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "137jci4hn4vlxf48y39k0di27kc89kvxy3brmn3vl9xq56sy6mhz"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cl-base64" ,sbcl-cl-base64)
+ ("cl-unicode" ,sbcl-cl-unicode)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("global-vars" ,sbcl-global-vars)
+ ("ironclad" ,sbcl-ironclad)
+ ("local-time" ,sbcl-local-time)
+ ("md5" ,sbcl-md5)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("uax-15" ,sbcl-uax-15)
+ ("usocket" ,sbcl-usocket)))
+ (arguments
+ ;; TODO: (Sharlatan-20210114T171037+0000) tests still failing but on other
+ ;; step, some functionality in `local-time' prevents passing tests.
+ ;; Error:
+ ;;
+ ;; Can't create directory
+ ;; /gnu/store
+ ;; /4f47agf1kyiz057ppy6x5p98i7mcbfsv-sbcl-local-time-1.0.6-2.a177eb9
+ ;; /lib/common-lisp/sbcl/local-time/src/integration/
+ ;;
+ ;; NOTE: (Sharlatan-20210124T191940+0000): When set env HOME to /tmp above
+ ;; issue is resolved but it required live test database to connect to now.
+ ;; Keep tests switched off.
+ `(#:tests? #f
+ #:asd-systems '("cl-postgres"
+ "s-sql"
+ "postmodern"
+ "simple-date"
+ "simple-date/postgres-glue")))
+ (synopsis "Common Lisp library for interacting with PostgreSQL")
+ (description
+ "@code{postmodern} is a Common Lisp library for interacting with
+PostgreSQL databases. It provides the following features:
+
+@itemize
+@item Efficient communication with the database server without need for
+foreign libraries.
+@item Support for UTF-8 on Unicode-aware Lisp implementations.
+@item A syntax for mixing SQL and Lisp code.
+@item Convenient support for prepared statements and stored procedures.
+@item A metaclass for simple database-access objects.
+@end itemize\n
+
+This package produces 4 systems: postmodern, cl-postgres, s-sql, simple-date
+
+@code{SIMPLE-DATE} is a very basic implementation of date and time objects, used
+to support storing and retrieving time-related SQL types. It is not loaded by
+default and you can use local-time (which has support for timezones) instead.
+
+@code{S-SQL} is used to compile s-expressions to strings of SQL code, escaping
+any Lisp values inside, and doing as much as possible of the work at compile
+time.
+
+@code{CL-POSTGRES} is the low-level library used for interfacing with a PostgreSQL
+server over a socket.
+
+@code{POSTMODERN} itself is a wrapper around these packages and provides higher
+level functions, a very simple data access object that can be mapped directly to
+database tables and some convient utilities. It then tries to put all these
+things together into a convenient programming interface")
+ (home-page "https://marijnhaverbeke.nl/postmodern/")
+ (license license:zlib)))
+
+(define-public cl-postmodern
+ (sbcl-package->cl-source-package sbcl-postmodern))
+
+(define-public ecl-postmodern
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-postmodern))
+ (arguments
+ `(#:tests? #f
+ #:asd-systems '("cl-postgres"
+ "s-sql"
+ "postmodern"
+ "simple-date"
+ "simple-date/postgres-glue")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (substitute* "cl-postgres.asd"
+ ((":or :sbcl :allegro :ccl :clisp" all)
+ (string-append all " :ecl")))
+ #t)))))))
(define-public sbcl-pp-toml
(let ((commit "54f7d08c939d18b24363342c98c19b6812d7afb9")
@@ -24927,775 +23781,958 @@ TOML.")
(define-public ecl-pp-toml
(sbcl-package->ecl-package sbcl-pp-toml))
-(define-public sbcl-linedit
- (let ((commit "0561c97dfca2f5854fcc66558a567a9875ddcb8f")
- (revision "1"))
+(define-public sbcl-ppath
+ (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce"))
(package
- (name "sbcl-linedit")
- (version (git-version "0.17.6" revision commit))
+ (name "sbcl-ppath")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/linedit")
+ (url "https://github.com/fourier/ppath/")
(commit commit)))
- (file-name (git-file-name "cl-linedit" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "0hhh7xn6q12rviayfihg1ym6x6csa0pdjgb88ykqbrz2rs3pgpz5"))))
+ (base32 "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-cffi sbcl-osicat sbcl-terminfo))
- (home-page "https://github.com/sharplispers/linedit")
- (synopsis "Readline-style line-editor for Common Lisp")
+ (list sbcl-alexandria
+ sbcl-cffi
+ sbcl-osicat
+ sbcl-cl-ppcre
+ sbcl-split-sequence
+ sbcl-trivial-features))
+ (native-inputs
+ (list sbcl-cl-fad sbcl-prove))
+ (home-page "https://github.com/fourier/ppath")
+ (synopsis "Common Lisp's implementation of the Python's os.path module")
(description
- "Linedit is a readline-style library written in Common Lisp that
-provides customizable line-editing for Common Lisp programs.")
- (license license:expat))))
+ "This library is a path strings manipulation library inspired by
+Python's @code{os.path}. All functionality from @code{os.path} is supported on
+major operation systems.
-(define-public cl-linedit
- (sbcl-package->cl-source-package sbcl-linedit))
+The philosophy behind is to use simple strings and \"dumb\" string
+manipulation functions to handle paths and filenames. Where possible the
+corresponding OS system functions are called.")
+ (license license:bsd-2))))
-(define-public ecl-linedit
- (sbcl-package->ecl-package sbcl-linedit))
+(define-public ecl-ppath
+ (sbcl-package->ecl-package sbcl-ppath))
-(define-public sbcl-diff
- (let ((commit "9c84befa598d4e07c3d223242b5b3f83cd94f301")
- (revision "1"))
+(define-public cl-ppath
+ (sbcl-package->cl-source-package sbcl-ppath))
+
+(define-public sbcl-printv
+ (let ((commit "e717a7fe076dae861a96117b2f9af29db8d2294d")
+ (revision "2"))
(package
- (name "sbcl-diff")
- (version (git-version "0.4" revision commit))
+ (name "sbcl-printv")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/froydnj/diff")
+ (url "https://github.com/danlentz/printv")
(commit commit)))
- (file-name (git-file-name "cl-diff" version))
+ (file-name (git-file-name "cl-printv" version))
(sha256
- (base32 "1giafck8qfvb688kx5bn9g32rfc12jjywg8vdav36aqbd6lxf5z5"))))
+ (base32 "07agyzkwp3w2r4d2anrmr8h00yngpr5dq9mjd3m4kzhn1jcmilfb"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-ppcre sbcl-trivial-gray-streams))
- (home-page "https://github.com/froydnj/diff")
- (synopsis "Common Lisp library for computing differences between files")
+ (list figlet))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-figlet-executable
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "printv.lisp"
+ (("\"figlet")
+ (string-append "\"" (search-input-file inputs
+ "/bin/figlet")))))))))
+ (home-page "https://github.com/danlentz/printv")
+ (synopsis "Common Lisp tracing and debug-logging macro")
(description
- "DIFF is a package for computing various forms of differences between
-blobs of data and then doing neat things with those differences. Currently diff
-knows how to compute three common forms of differences: \"unified\" format
-diffs, \"context\" format diffs, and \"vdelta\" format binary diffs.")
- (license license:bsd-3))))
+ "@code{PRINTV} is a \"batteries-included\" tracing and debug-logging
+macro for Common Lisp.")
+ (license license:asl2.0))))
-(define-public cl-diff
- (sbcl-package->cl-source-package sbcl-diff))
+(define-public ecl-printv
+ (sbcl-package->ecl-package sbcl-printv))
-(define-public ecl-diff
- (sbcl-package->ecl-package sbcl-diff))
+(define-public cl-printv
+ (sbcl-package->cl-source-package sbcl-printv))
-(define-public sbcl-montezuma
- (let ((commit "ee2129eece7065760de4ebbaeffaadcb27644738")
- (revision "1"))
+(define-public sbcl-priority-queue
+ (let ((commit "011b8d52ef7ba7f8e6bc26608eedef222b38aaa8")
+ (revision "0"))
(package
- (name "sbcl-montezuma")
- (version (git-version "0.1.3" revision commit))
+ (name "sbcl-priority-queue")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/montezuma")
+ (url "https://github.com/dsorokin/priority-queue")
(commit commit)))
- (file-name (git-file-name "cl-montezuma" version))
+ (file-name (git-file-name "cl-priority-queue" version))
(sha256
- (base32 "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"))))
+ (base32 "0y5a1fid8xzzl58hfdj64n8mrzq0kr06a0lnmdjpgi0czc3x0jcy"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; The _darcs directory contains a second copy of
- ;; montezuma-indexfiles.asd. Remove the directory to
- ;; prevent build failure caused by .asd files that have
- ;; the same filename.
- (add-after 'unpack 'remove-darcs-directory
- (lambda _
- (delete-file-recursively
- "contrib/montezuma-indexfiles/_darcs")))
- ;; Tests fail with: :FORCE and :FORCE-NOT arguments not
- ;; allowed in a nested call to ASDF/OPERATE:OPERATE unless
- ;; identically to toplevel.
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "montezuma.asd"
- ((":force t") "")))))))
- (inputs
- `(("babel" ,sbcl-babel)
- ("cl-fad" ,sbcl-cl-fad)
- ("cl-ppcre" ,sbcl-cl-ppcre)))
- (native-inputs
- (list sbcl-trivial-timeout))
- (home-page "https://github.com/sharplispers/montezuma")
- (synopsis "Full-text indexing and search for Common Lisp")
- (description
- "Montezuma is a text search engine library for Lisp based on the Ferret
-library for Ruby, which is itself based on the Lucene library for Java.")
- (license (list license:expat ; montezuma
- license:gpl3+))))) ; contrib/montezuma-indexfiles
+ (synopsis "Priority queue for Common Lisp")
+ (description "This package provides a priority queue implemented with
+an array-based heap.")
+ (home-page "https://github.com/dsorokin/priority-queue")
+ (license license:expat))))
-(define-public cl-montezuma
- (sbcl-package->cl-source-package sbcl-montezuma))
+(define-public cl-priority-queue
+ (sbcl-package->cl-source-package sbcl-priority-queue))
-(define-public ecl-montezuma
- (let ((pkg (sbcl-package->ecl-package sbcl-montezuma)))
- (package
- (inherit pkg)
- (arguments
- (substitute-keyword-arguments (package-arguments pkg)
- ;; Tests fail with "Pathname without a physical namestring" error
- ;; on ECL.
- ((#:tests? _ #f) #f))))))
+(define-public ecl-priority-queue
+ (sbcl-package->ecl-package sbcl-priority-queue))
-(define-public sbcl-cl-charms
- (let ((commit "64aba59d89f85bc5c9402e445873965338a66a02")
- (revision "1"))
+(define-public sbcl-proc-parse
+ (let ((commit "ac3636834d561bdc2686c956dbd82494537285fd"))
(package
- (name "sbcl-cl-charms")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-proc-parse")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/HiTECNOLOGYs/cl-charms")
+ (url "https://github.com/fukamachi/proc-parse")
(commit commit)))
- (file-name (git-file-name "cl-charms" version))
(sha256
- (base32 "1jczaypa9dhxr34yyhsxb6lrdnircjx8am4iqkc3shfpjn32q323"))))
+ (base32
+ "06rnl0h4cx6xv2wj3jczmmcxqn2703inmmvg1s4npbghmijsybfh"))
+ (file-name (git-file-name "proc-parse" version))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("ncurses" ,ncurses)))
+ ("babel" ,sbcl-babel)))
+ (native-inputs
+ (list sbcl-prove))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/low-level/curses-bindings.lisp"
- (("libncursesw.so")
- (string-append (assoc-ref inputs "ncurses")
- "/lib/libncursesw.so"))))))))
- (home-page "https://github.com/HiTECNOLOGYs/cl-charms")
- (synopsis "Interface to libcurses in Common Lisp")
+ '(#:asd-systems '("proc-parse-test"
+ "proc-parse")))
+ (synopsis "Procedural vector parser")
(description
- "@code{cl-charms} is an interface to libcurses in Common Lisp. It
-provides both a raw, low-level interface to libcurses via CFFI, and a more
-higher-level lispier interface.")
- (license license:expat))))
+ "This is a string/octets parser library for Common Lisp with speed and
+readability in mind. Unlike other libraries, the code is not a
+pattern-matching-like, but a char-by-char procedural parser.")
+ (home-page "https://github.com/fukamachi/proc-parse")
+ (license license:bsd-2))))
-(define-public cl-charms
- (sbcl-package->cl-source-package sbcl-cl-charms))
+(define-public cl-proc-parse
+ (sbcl-package->cl-source-package sbcl-proc-parse))
-(define-public ecl-cl-charms
- (sbcl-package->ecl-package sbcl-cl-charms))
+(define-public ecl-proc-parse
+ (sbcl-package->ecl-package sbcl-proc-parse))
-(define-public sbcl-trivial-open-browser
- (let ((commit "7ab4743dea9d592639f15c565bfa0756e828c427")
- (revision "1"))
+(define-public sbcl-progressons
+ (let ((commit "69a8092e43876d66943aef709ab641818d52f2da")
+ (revision "0"))
(package
- (name "sbcl-trivial-open-browser")
+ (name "sbcl-progressons")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/trivial-open-browser")
+ (url "https://github.com/vindarel/progressons")
(commit commit)))
- (file-name (git-file-name "cl-trivial-open-browser" version))
+ (file-name (git-file-name "cl-progressons" version))
(sha256
- (base32 "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb"))))
+ (base32 "1i93khd0l1aphzh6qb4yy9cpi2nmqac08b90yx95p4zymap03nly"))))
(build-system asdf-build-system/sbcl)
- (inputs (list xdg-utils))
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/trivial-open-browser.lisp"
- (("xdg-open")
- (search-input-file inputs "/bin/xdg-open"))))))))
- (home-page "https://github.com/eudoxia0/trivial-open-browser")
- (synopsis "Open a browser window from Common Lisp")
+ (inputs
+ (list sbcl-cl-ansi-text
+ sbcl-cl-str))
+ (synopsis "Display a progress bar on one line")
(description
- "This package provides a library to open a web browser to a URL.")
+ "This library can be used to display a progress bar on one line.")
+ (home-page "https://github.com/vindarel/progressons")
(license license:expat))))
-(define-public cl-trivial-open-browser
- (sbcl-package->cl-source-package sbcl-trivial-open-browser))
+(define-public cl-progressons
+ (sbcl-package->cl-source-package sbcl-progressons))
-(define-public ecl-trivial-open-browser
- (sbcl-package->ecl-package sbcl-trivial-open-browser))
+(define-public ecl-progressons
+ (sbcl-package->ecl-package sbcl-progressons))
-(define-public sbcl-clinenoise
- (let ((commit "46e21f99d06a55d93eaa382cf652d55d457032ef")
- (revision "1"))
+(define-public sbcl-prometheus
+ (package
+ (name "sbcl-prometheus")
+ (version "0.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/deadtrickster/prometheus.cl")
+ (commit "7352b92296996ff383503e19bdd3bcea30409a15")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fzczls2kfgdx18pja4lqxjrz72i583185d8nq0pb3s331hhzh0z"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cffi" ,sbcl-cffi)
+ ("cl-fad" ,sbcl-cl-fad)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("drakma" ,sbcl-drakma)
+ ("hunchentoot" ,sbcl-hunchentoot)
+ ("local-time" ,sbcl-local-time)
+ ("quantile-estimator" ,sbcl-quantile-estimator)
+ ("salza2" ,sbcl-salza2)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("trivial-utf-8" ,sbcl-trivial-utf-8)))
+ (arguments
+ '(#:asd-systems '("prometheus"
+ "prometheus.collectors.sbcl"
+ "prometheus.collectors.process"
+ "prometheus.formats.text"
+ "prometheus.exposers.hunchentoot"
+ "prometheus.pushgateway")))
+ (home-page "https://github.com/deadtrickster/prometheus.cl")
+ (synopsis "Prometheus.io Common Lisp client")
+ (description "Prometheus.io Common Lisp client.")
+ (license license:expat)))
+
+(define-public cl-prometheus
+ (sbcl-package->cl-source-package sbcl-prometheus))
+
+(define-public ecl-prometheus
+ (sbcl-package->ecl-package sbcl-prometheus))
+
+(define-public sbcl-promise
+ (let ((commit "801db8f853da7935ae2e487fd7f8763acbc5ad2a")
+ (revision "0"))
(package
- (name "sbcl-clinenoise")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-promise")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jasom/clinenoise")
+ (url "https://github.com/Shinmera/promise")
(commit commit)))
- (file-name (git-file-name "clinenoise" version))
+ (file-name (git-file-name "cl-promise" version))
(sha256
- (base32 "0ydlirfk4dbpqqjwwph99v5swcrhd8v9g8q24fvs35wn2vm08lh1"))))
+ (base32 "07cvz6vb5y1d9vndcwq7q1cp54aqvyqzv6wk8vmymbz3lawq2wsn"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-alexandria sbcl-cffi sbcl-split-sequence))
- (home-page "https://github.com/jasom/clinenoise")
- (synopsis "Port of linenoise to Common Lisp")
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/promise/")
+ (synopsis "Promise mechanism for asynchronous operations")
(description
- "This package provides a trivial line-input library for VT-like
-terminals.")
- (license license:bsd-2))))
+ "This library implements a basic promise datastructure, which is useful
+for dealing with asynchronous behaviours. Importantly, this library does not
+use any other libraries or frameworks, and instead leaves the execution and
+state transition of promise objects in your control, making it easy to
+integrate.")
+ (license license:zlib))))
-(define-public cl-clinenoise
- (sbcl-package->cl-source-package sbcl-clinenoise))
+(define-public cl-promise
+ (sbcl-package->cl-source-package sbcl-promise))
-(define-public ecl-clinenoise
- (sbcl-package->ecl-package sbcl-clinenoise))
+(define-public ecl-promise
+ (sbcl-package->ecl-package sbcl-promise))
-(define-public sbcl-trivial-raw-io
- (let ((commit "b1a3c876305baa0dead419841de7b3e433a75867")
- (revision "1"))
+(define-public sbcl-prompter
+ (let ((commit "7890ed5d02e70aba01ceb964c6ee4f40776e7dc0")
+ (revision "0"))
(package
- (name "sbcl-trivial-raw-io")
- (version (git-version "0.0.2" revision commit))
+ (name "sbcl-prompter")
+ (version (git-version "0.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/kingcons/trivial-raw-io")
+ (url "https://github.com/atlas-engineer/prompter")
(commit commit)))
- (file-name (git-file-name "trivial-raw-io" version))
+ (file-name (git-file-name "cl-prompter" version))
(sha256
- (base32 "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1"))))
+ (base32
+ "0r15a6cagyp5x8aqx92ln2anni737h73bdshkvpzrac04ajss4md"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/kingcons/trivial-raw-io")
- (synopsis "Trivial portability for raw *nix IO in Common Lisp")
+ (list
+ sbcl-alexandria
+ sbcl-calispel
+ sbcl-cl-containers
+ sbcl-cl-str
+ sbcl-closer-mop
+ sbcl-lparallel
+ sbcl-moptilities
+ sbcl-nclasses
+ sbcl-serapeum
+ sbcl-trivial-package-local-nicknames))
+ (native-inputs
+ (list sbcl-lisp-unit2))
+ (home-page "https://github.com/atlas-engineer/prompter")
+ (synopsis "Live-narrowing, fuzzy-matching, extensible prompt framework")
(description
- "This library exports three symbols: @code{with-raw-io},
-@code{read-char}, and @code{read-line}, to provide raw POSIX I/O in Common
-Lisp.")
- (license license:bsd-2))))
+ "This prompter library is heavily inspired by Emacs' minibuffer and
+Helm (@url{https://emacs-helm.github.io/helm/}). It only deals with the
+backend side of things, it does not handle any display. Features include
+asynchronous suggestion computation, multiple sources, actions and resumable
+prompters.")
+ (license license:bsd-3))))
-(define-public cl-trivial-raw-io
- (sbcl-package->cl-source-package sbcl-trivial-raw-io))
+(define-public cl-prompter
+ (sbcl-package->cl-source-package sbcl-prompter))
-(define-public ecl-trivial-raw-io
- (sbcl-package->ecl-package sbcl-trivial-raw-io))
+(define-public ecl-prompter
+ (sbcl-package->ecl-package sbcl-prompter))
-(define-public sbcl-terminal-keypress
- (let ((commit "2ef48c045aa627229764b2aa393a83d392d93d08")
+(define-public sbcl-purgatory
+ (let ((commit "3afd8f6bb4093ffb2f39ffdedf11278b3617fff9")
(revision "1"))
(package
- (name "sbcl-terminal-keypress")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-purgatory")
+ (version (git-version "0.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/terminal-keypress")
+ (url "https://notabug.org/cage/purgatory")
(commit commit)))
- (file-name (git-file-name "cl-terminal-keypress" version))
+ (file-name (git-file-name "cl-purgatory" version))
(sha256
- (base32 "11c4krpq5x55qkchx6ykcnb455ssb4r3jjywx3c3irfrkj733ybp"))))
+ (base32 "0iy2jdgrwqrq9cph7bwf79d8l4zdsgcd9sfcn0lclzai2v0yizp9"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-trivial-raw-io))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/eudoxia0/terminal-keypress")
- (synopsis "Read keyboard events in the terminal from Common Lisp")
- (description
- "This is a library for reading semi-raw user input from terminals.
-Semi-raw as in, we can't detect if the user pressed the @code{Control} key
-alone, and the function keys are a mystery. What is supported, however, is:
-
-@itemize
-@item Regular characters
-@item Control+[key]
-@item Alt+[key]
-@item Control+Alt+[key]
-@end itemize")
- (license license:expat))))
-
-(define-public cl-terminal-keypress
- (sbcl-package->cl-source-package sbcl-terminal-keypress))
-
-(define-public ecl-terminal-keypress
- (sbcl-package->ecl-package sbcl-terminal-keypress))
-
-(define-public sbcl-periodic-table
- (package
- (name "sbcl-periodic-table")
- (version "1.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://common-lisp.net/project/chemboy/periodic-table-"
- version ".tar.gz"))
- (sha256
- (base32 "1ircvqm3q93ma4rxbxprb1i9rcax10ld6xmdzdhfnigr27sh5jvg"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://common-lisp.net/project/chemboy/")
- (synopsis "Periodic table for Common Lisp")
- (description
- "This package defines a Common Lisp package, @code{:elements}, with an
-@code{ELEMENT} structure and a number of functions to search the periodic
-table.")
- (license license:llgpl)))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cl-ppcre-unicode
+ sbcl-usocket))
+ (synopsis "Common Lisp implementation of the 9p protocol")
+ (description "This is a Common Lisp library that implements
+the 9p network filesystem protocol.")
+ (home-page "https://notabug.org/cage/purgatory/")
+ (license license:llgpl))))
-(define-public cl-periodic-table
- (sbcl-package->cl-source-package sbcl-periodic-table))
+(define-public cl-purgatory
+ (sbcl-package->cl-source-package sbcl-purgatory))
-(define-public ecl-periodic-table
- (sbcl-package->ecl-package sbcl-periodic-table))
+(define-public ecl-purgatory
+ (sbcl-package->ecl-package sbcl-purgatory))
-(define-public sbcl-chemical-compounds
- (package
- (name "sbcl-chemical-compounds")
- (version "1.0.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://common-lisp.net/project/chemboy/chemical-compounds-"
- version ".tar.gz"))
- (sha256
- (base32 "12fd8a6ay5qlsq4givzgh9d55mbg4ci2vvmymig6pjl2ms64v0pf"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("periodic-table" ,sbcl-periodic-table)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-files
- (lambda _
- ;; Fix incorrect version number.
- (substitute* "chemical-compounds.asd"
- ((":version \"1.0.1\"")
- (string-append ":version \"" ,version "\"")))
- ;; Remove incorrect declaration of string type.
- (substitute* "parsing.lisp"
- (("\\(declare \\(simple-base-string string\\)")
- "(declare")))))))
- (home-page "https://common-lisp.net/project/chemboy/")
- (synopsis "Chemical formula parser and pretty-printer for Common Lisp")
- (description
- "It can sometimes be useful to be able to parse chemical compounds in a
-user-friendly syntax into easy-to-manipulate s-expressions. You also want to
-be able to go in reverse. You could probably write your own parser — or you
-could just install the chemical-compounds package.")
- (license license:llgpl)))
+(define-public sbcl-puri
+ (let ((commit "4bbab89d9ccbb26346899d1f496c97604fec567b")
+ (revision "2"))
+ (package
+ (name "sbcl-puri")
+ (version (git-version "1.5.7" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "http://git.kpe.io/puri.git")
+ (commit commit)))
+ (file-name (git-file-name "puri" version))
+ (sha256
+ (base32 "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The useless bundled debian folder drags `make' into the closure.
+ `(begin
+ (delete-file-recursively "debian")
+ #t))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-ptester))
+ (home-page "http://puri.kpe.io/")
+ (synopsis "Portable URI Library")
+ (description
+ "This is a portable Universal Resource Identifier library for Common
+Lisp programs. It parses URI according to the RFC 2396 specification.")
+ (license license:llgpl))))
-(define-public cl-chemical-compounds
- (sbcl-package->cl-source-package sbcl-chemical-compounds))
+(define-public cl-puri
+ (sbcl-package->cl-source-package sbcl-puri))
-(define-public ecl-chemical-compounds
- (sbcl-package->ecl-package sbcl-chemical-compounds))
+(define-public ecl-puri
+ (sbcl-package->ecl-package sbcl-puri))
-(define-public sbcl-chemboy
+(define-public sbcl-py-configparser
+ ;; NOTE: (Sharlatan <2021-01-05 Tue> <19:52:19 UTC+0000>) Project updated last
+ ;; time 8y ago, it looks like abandoned. VCS of the project:
+ ;; https://svn.common-lisp.net/py-configparser/trunk
(package
- (name "sbcl-chemboy")
- (version "0.3")
+ (name "sbcl-py-configparser")
+ (version "1.0.3")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://common-lisp.net/project/chemboy/chemboy-"
- version ".tar.gz"))
+ "https://common-lisp.net/project/py-configparser/releases/"
+ "py-configparser-" version ".tar.gz"))
(sha256
- (base32 "0lr134l16mjcgdj3fm2yff4chlfbihn1sji7q80y7lnr176zgs7d"))))
+ (base32 "0i4rqz5cv7d7c2w81x5lwy05s6fbi3zikf4k5kpi3bkx3cabwdxj"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("chemical-compounds" ,sbcl-chemical-compounds)
- ("periodic-table" ,sbcl-periodic-table)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-files
- (lambda _
- ;; Fix incorrect version number.
- (substitute* "chemboy.asd"
- ((":version \"0.2\"")
- (string-append ":version \"" ,version "\"")))
- ;; Remove incorrect declaration of string type.
- (substitute* "query-parsing.lisp"
- (("\\(declare \\(simple-base-string string\\)")
- "(declare"))
- ;; Fix incorrect function calls.
- (substitute* "conversions.lisp"
- (("\\(pprint-compound element s\\)")
- "(pprint-compound element :stream s)")
- (("\\(pprint-compound parsed-compound s\\)")
- "(pprint-compound parsed-compound :stream s)")))))))
- (home-page "https://common-lisp.net/project/chemboy/")
- (synopsis "Common Lisp program for doing basic chemistry calculations")
- (description
- "Chemboy is a Common Lisp program for doing basic chemistry calculations.
-This package provides the text-based interface for Chemboy.")
- (license license:llgpl)))
+ (list sbcl-parse-number))
+ (home-page "https://common-lisp.net/project/py-configparser/")
+ (synopsis "ConfigParser Python module functionality for Common Lisp")
+ (description "The py-configparser package implements the ConfigParser
+Python module functionality in Common Lisp. In short, it implements reading
+and writing of .INI-file style configuration files with sections containing
+key/value pairs of configuration options. In line with the functionalities in
+the python module, does this package implement basic interpolation of option
+values in other options.")
+ (license license:expat)))
-(define-public cl-chemboy
- (sbcl-package->cl-source-package sbcl-chemboy))
+(define-public cl-py-configparser
+ (sbcl-package->cl-source-package sbcl-py-configparser))
-(define-public ecl-chemboy
- (sbcl-package->ecl-package sbcl-chemboy))
+(define-public ecl-py-configparser
+ (sbcl-package->ecl-package sbcl-py-configparser))
-(define-public sbcl-chlorophyll
- (let ((commit "f2a50ad36d2fb11823c0e5a8da08a0de89c5c35f")
- (revision "1"))
+(define-public sbcl-py4cl
+ (let ((commit "2f2a008dd6162d4446803971292fe1b323fe0dd5")
+ (revision "2"))
(package
- (name "sbcl-chlorophyll")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-py4cl")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/gorozhin/chlorophyll")
+ (url "https://github.com/bendudson/py4cl")
(commit commit)))
- (file-name (git-file-name "cl-chlorophyll" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1hgl8sjsmyqx4gs77q4p94b63zgpxk1wi9w9niki8j0213dr1s3y"))))
+ (base32
+ "1zx1kpfpd8mi1qaa7gr32mki6nvl6pqcs3437fvn4xa3yf7ybsha"))
+ (modules '((guix build utils)))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (inputs (list sbcl-alexandria))
- (home-page "https://github.com/gorozhin/chlorophyll")
- (synopsis "ANSI escape code library for Common Lisp")
+ (native-inputs
+ (list sbcl-clunit))
+ (inputs
+ (list python sbcl-trivial-garbage))
+ (propagated-inputs
+ (list ;; For multi-dimensional array support
+ python-numpy))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-python3-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/python-process.lisp"
+ (("\\*python-command\\* \"python\"")
+ (string-append "*python-command* "
+ "\""
+ (search-input-file inputs "/bin/python3")
+ "\"")))))
+ (add-after 'unpack 'replace-*base-directory*-var
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; In the ASD, the author makes an attempt to
+ ;; programatically determine the location of the
+ ;; source-code so lisp can call into "py4cl.py". We can
+ ;; hard-code this since we know where this file will
+ ;; reside.
+ (substitute* "src/python-process.lisp"
+ (("py4cl/config:\\*base-directory\\*")
+ (string-append
+ "\""
+ (assoc-ref outputs "out")
+ "/share/common-lisp/"
+ (%lisp-type)
+ "/py4cl/"
+ "\""))))))))
+ (synopsis "Call python from Common Lisp")
(description
- "This package provides a Common Lisp system CHLOROPHYLL which
-implements an ANSI escape code functionality.")
+ "Py4CL is a bridge between Common Lisp and Python, which enables Common
+Lisp to interact with Python code. It uses streams to communicate with a
+separate python process, the approach taken by cl4py. This is different to
+the CFFI approach used by burgled-batteries, but has the same goal.")
+ (home-page "https://github.com/bendudson/py4cl")
+ ;; MIT License
(license license:expat))))
-(define-public cl-chlorophyll
- (sbcl-package->cl-source-package sbcl-chlorophyll))
+(define-public cl-py4cl
+ (sbcl-package->cl-source-package sbcl-py4cl))
-(define-public ecl-chlorophyll
- (sbcl-package->ecl-package sbcl-chlorophyll))
+(define-public ecl-py4cl
+ (sbcl-package->ecl-package sbcl-py4cl))
-(define-public sbcl-cl-pass
- (let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34")
- (revision "1"))
+(define-public sbcl-pythonic-string-reader
+ (let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a"))
(package
- (name "sbcl-cl-pass")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-pythonic-string-reader")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/cl-pass")
+ (url "https://github.com/smithzvk/pythonic-string-reader/")
(commit commit)))
- (file-name (git-file-name "cl-pass" version))
(sha256
- (base32 "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"))))
+ (base32 "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j"))
+ (file-name (git-file-name "pythonic-string-reader" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-ironclad sbcl-trivial-utf-8 sbcl-split-sequence))
+ (list sbcl-named-readtables))
+ (home-page "https://github.com/smithzvk/pythonic-string-reader")
+ (synopsis "Read table modification inspired by Python's three quote strings")
+ (description "This piece of code sets up some reader macros that make it
+simpler to input string literals which contain backslashes and double quotes
+This is very useful for writing complicated docstrings and, as it turns out,
+writing code that contains string literals that contain code themselves.")
+ (license license:bsd-3))))
+
+(define-public cl-pythonic-string-reader
+ (sbcl-package->cl-source-package sbcl-pythonic-string-reader))
+
+(define-public ecl-pythonic-string-reader
+ (sbcl-package->ecl-package sbcl-pythonic-string-reader))
+
+(define-public sbcl-pzmq
+ (let ((commit "6f7b2ca02c23ea53510a9b0e0f181d5364ce9d32")
+ (revision "2"))
+ (package
+ (name "sbcl-pzmq")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/orivej/pzmq")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"))))
+ (build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/eudoxia0/cl-pass")
- (synopsis "Password hashing and verification library")
- (description
- "@code{cl-pass} is a password hashing and verification library.")
- (license license:expat))))
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("fiveam" ,sbcl-fiveam)
+ ("let-plus" ,sbcl-let-plus)))
+ (inputs
+ `(("cffi" ,sbcl-cffi)
+ ("zeromq" ,zeromq)))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "c-api.lisp"
+ (("\"libzmq")
+ (string-append "\""
+ (assoc-ref inputs "zeromq")
+ "/lib/libzmq")))
+ #t)))))
+ (synopsis "Common Lisp bindings for the ZeroMQ library")
+ (description "This Common Lisp library provides bindings for the ZeroMQ
+lightweight messaging kernel.")
+ (home-page "https://github.com/orivej/pzmq")
+ (license license:unlicense))))
-(define-public cl-pass
- (sbcl-package->cl-source-package sbcl-cl-pass))
+(define-public cl-pzmq
+ (sbcl-package->cl-source-package sbcl-pzmq))
-(define-public ecl-cl-pass
- (sbcl-package->ecl-package sbcl-cl-pass))
+(define-public ecl-pzmq
+ (sbcl-package->ecl-package sbcl-pzmq))
-(define-public sbcl-which
- (let ((commit "b2333e4fcacab6e5d85eecd28b5ef4944bda1448")
+(define-public sbcl-qbase64
+ (package
+ (name "sbcl-qbase64")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chaitanyagupta/qbase64")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dir0s70ca3hagxv9x15zq4p4ajgl7jrcgqsza2n2y7iqbxh0dwi"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-metabang-bind sbcl-trivial-gray-streams))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/chaitanyagupta/qbase64")
+ (synopsis "Base64 encoder and decoder for Common Lisp")
+ (description "@code{qbase64} provides a fast and flexible base64 encoder
+and decoder for Common Lisp.")
+ (license license:bsd-3)))
+
+(define-public cl-qbase64
+ (sbcl-package->cl-source-package sbcl-qbase64))
+
+(define-public ecl-qbase64
+ (sbcl-package->ecl-package sbcl-qbase64))
+
+(define-public sbcl-qmynd
+ (let ((commit "7e56daf73f0ed5f49a931c01af75fb874bcf3445")
(revision "1"))
(package
- (name "sbcl-which")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-qmynd")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/which")
+ (url "https://github.com/qitab/qmynd")
(commit commit)))
- (file-name (git-file-name "cl-which" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"))))
+ (base32
+ "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-fad sbcl-path-parse))
- (native-inputs
- (list sbcl-fiveam))
- (home-page "https://github.com/eudoxia0/which")
- (synopsis "The which command in Common Lisp")
- (description
- "This package provides an implementation of the @code{which} UNIX
-command in Common Lisp.")
+ (list sbcl-asdf-finalizers
+ sbcl-babel
+ sbcl-chipz
+ sbcl-cl+ssl
+ sbcl-flexi-streams
+ sbcl-ironclad
+ sbcl-salza2
+ sbcl-trivial-gray-streams
+ sbcl-usocket))
+ (home-page "https://github.com/qitab/qmynd")
+ (synopsis "QITAB MySQL Native Driver for Common Lisp")
+ (description "QMyND, the QITAB MySQL Native Driver, is a MySQL client
+library that directly talks to a MySQL server in its native network protocol.
+
+It's a part of QITAB umbrella project.")
(license license:expat))))
-(define-public cl-which
- (sbcl-package->cl-source-package sbcl-which))
+(define-public cl-qmynd
+ (sbcl-package->cl-source-package sbcl-qmynd))
-(define-public ecl-which
- (sbcl-package->ecl-package sbcl-which))
+(define-public ecl-qmynd
+ (sbcl-package->ecl-package sbcl-qmynd))
-(define-public sbcl-wu-decimal
- (let ((commit "5b348bdb32a0f83e80e17aa68cd51787ae8c8a45")
- (revision "0"))
+(define-public sbcl-quantile-estimator
+ (package
+ (name "sbcl-quantile-estimator")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/deadtrickster/quantile-estimator.cl")
+ (commit "84d0ea405d793f5e808c68c4ddaf25417b0ff8e5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-test-systems '("quantile-estimator.test")))
+ (inputs
+ (list sbcl-alexandria))
+ (native-inputs
+ (list sbcl-mw-equiv sbcl-prove sbcl-log4cl))
+ (home-page "https://github.com/deadtrickster/quantile-estimator.cl")
+ (synopsis
+ "Effective computation of biased quantiles over data streams")
+ (description
+ "Common Lisp implementation of Graham Cormode and S.
+Muthukrishnan's Effective Computation of Biased Quantiles over Data
+Streams in ICDE’05.")
+ (license license:expat)))
+
+(define-public cl-quantile-estimator
+ (sbcl-package->cl-source-package sbcl-quantile-estimator))
+
+(define-public ecl-quantile-estimator
+ (sbcl-package->ecl-package sbcl-quantile-estimator))
+
+(define-public sbcl-queues
+ (let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94"))
(package
- (name "sbcl-wu-decimal")
- (version (git-version "2.0.0" revision commit))
+ (name "sbcl-queues")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Wukix/wu-decimal")
+ (url "https://github.com/oconnore/queues")
(commit commit)))
- (file-name (git-file-name "cl-wu-decimal" version))
+ (file-name (git-file-name "queues" version))
(sha256
- (base32 "1p7na4hic7297amwm4idfwkyx664ny8cdssncyra37pmv4wzp8dm"))))
+ (base32
+ "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/Wukix/wu-decimal")
- (synopsis "Arbitrary-precision decimal arithmetic")
+ (inputs
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (arguments
+ '(#:asd-systems '("queues"
+ "queues.simple-queue"
+ "queues.simple-cqueue"
+ "queues.priority-queue"
+ "queues.priority-cqueue")))
+ (home-page "https://github.com/oconnore/queues")
+ (synopsis "Common Lisp queue library")
(description
- "Wu-Decimal enables convenient, arbitrary-precision decimal arithmetic
-through a reader macro, @code{#$}, and an update to the @code{pprint} dispatch
-table. Wu-Decimal uses the CL rational type to store decimals, which enables
-numeric functions such as @code{+}, @code{-}, etc., to operate on decimal
-numbers in a natural way.")
- (license license:bsd-2))))
+ "This is a simple queue library for Common Lisp with features such as
+non-consing thread safe queues and fibonacci priority queues.")
+ (license license:expat))))
-(define-public cl-wu-decimal
- (sbcl-package->cl-source-package sbcl-wu-decimal))
+(define-public cl-queues
+ (sbcl-package->cl-source-package sbcl-queues))
-(define-public ecl-wu-decimal
- (sbcl-package->ecl-package sbcl-wu-decimal))
+(define-public ecl-queues
+ (sbcl-package->ecl-package sbcl-queues))
-(define-public sbcl-infix-math
- (let ((commit "f5155ae9709e518061ace79887d78f8e79c61cac")
+(define-public sbcl-quicklisp-stats
+ (let ((commit "953b45c2212ae513d48a611d3dd09c846a6102cd")
(revision "0"))
(package
- (name "sbcl-infix-math")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-quicklisp-stats")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/infix-math")
+ (url "https://github.com/phoe/quicklisp-stats")
(commit commit)))
- (file-name (git-file-name "cl-infix-math" version))
+ (file-name (git-file-name "cl-quicklisp-stats" version))
(sha256
- (base32 "1h6p254xl793wfq3qla5y95k6zimy477f8brblx6ran3rg3bydbg"))))
+ (base32 "0v8dgmlgd283n1g486q4sj2mghgdvgywg2nqp43nnrfc04mkvgc0"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria sbcl-parse-number sbcl-serapeum sbcl-wu-decimal))
- (home-page "https://github.com/ruricolist/infix-math")
- (synopsis "Extensible infix syntax for math in Common Lisp")
+ (list sbcl-alexandria
+ sbcl-drakma
+ sbcl-split-sequence))
+ (arguments
+ `(#:tests? #f)) ; There are no tests.
+ (synopsis "Fetches and operates on Quicklisp download statistics")
(description
- "Infix-Math is a library that provides a special-purpose syntax for
-transcribing mathematical formulas into Lisp.")
+ "@code{cl-quicklisp-stats} is a system that fetches and performs basic
+operations on the Quicklisp download statistics.")
+ (home-page "https://github.com/phoe/quicklisp-stats/")
(license license:expat))))
-(define-public cl-infix-math
- (sbcl-package->cl-source-package sbcl-infix-math))
+(define-public cl-quicklisp-stats
+ (sbcl-package->cl-source-package sbcl-quicklisp-stats))
-(define-public ecl-infix-math
- (sbcl-package->ecl-package sbcl-infix-math))
+(define-public ecl-quicklisp-stats
+ (sbcl-package->ecl-package sbcl-quicklisp-stats))
-(define-public sbcl-cl-num-utils
- (let ((commit "97a88cd34540acf52e872a82ebfef3da0a34fa12")
- (revision "1"))
+(define-public sbcl-quickproject
+ (package
+ (name "sbcl-quickproject")
+ (version "1.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/quickproject")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-fad" ,sbcl-cl-fad)
+ ("html-template" ,sbcl-html-template)))
+ (home-page "https://xach.com/lisp/quickproject/")
+ (synopsis "Create Common Lisp project skeletons")
+ (description
+ "Quickproject provides a quick way to make a Common Lisp project. After
+creating a project, it extends the ASDF registry so the project may be
+immediately loaded.")
+ (license license:expat)))
+
+(define-public cl-quickproject
+ (sbcl-package->cl-source-package sbcl-quickproject))
+
+(define-public ecl-quickproject
+ (sbcl-package->ecl-package sbcl-quickproject))
+
+(define-public sbcl-quicksearch
+ (let ((commit "fb02ecf7c876ec580ab18c7d2c8c7814c06af599"))
(package
- (name "sbcl-cl-num-utils")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-quicksearch")
+ (version (git-version "0.01.04" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/cl-num-utils")
+ (url "https://github.com/tkych/quicksearch/")
(commit commit)))
- (file-name (git-file-name "cl-num-utils" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "15ihsxxs76xnldmqfsbxybckqjwrxwcpphgghiwzr2mnbqjpdqkh"))))
+ (base32 "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-anaphora sbcl-alexandria sbcl-array-operations
- sbcl-cl-slice sbcl-let-plus))
- (native-inputs
- (list sbcl-clunit))
- (home-page "https://github.com/tpapp/cl-num-utils")
- (synopsis "Numerical utilities for Common Lisp")
- (description
- "@code{cl-num-utils} implements simple numerical functions for Common
-Lisp, including:
-@itemize
-@item @code{num=}, a comparison operator for floats
-@item simple arithmeric functions, like @code{sum} and @code{l2norm}
-@item elementwise operations for arrays
-@item intervals
-@item special matrices and shorthand for their input
-@item sample statistics
-@item Chebyshev polynomials
-@item univariate rootfinding
-@end itemize")
- (license license:boost1.0))))
+ (list sbcl-bordeaux-threads
+ sbcl-iterate
+ sbcl-alexandria
+ sbcl-anaphora
+ sbcl-cl-ppcre
+ sbcl-drakma
+ sbcl-html-entities
+ sbcl-yason
+ sbcl-flexi-streams
+ sbcl-do-urlencode))
+ (home-page "https://github.com/tkych/quicksearch/")
+ (synopsis "Search Engine Interface for Common Lisp packages")
+ (description "Quicksearch is a search-engine-interface for Common Lisp.
+The goal of Quicksearch is to find the Common Lisp library quickly. For
+example, if you will find the library about json, just type @code{(qs:?
+'json)} at REPL.
-(define-public cl-num-utils
- (sbcl-package->cl-source-package sbcl-cl-num-utils))
+The function @code{quicksearch} searches for Common Lisp projects in
+Quicklisp, Cliki, GitHub and BitBucket, then outputs results in REPL. The
+function @code{?} is abbreviation wrapper for @code{quicksearch}.")
+ (license license:expat))))
-(define-public ecl-cl-num-utils
- (sbcl-package->ecl-package sbcl-cl-num-utils))
+(define-public cl-quicksearch
+ (sbcl-package->cl-source-package sbcl-quicksearch))
-(define-public sbcl-lla
- (let ((commit "ded805d1e9b1493e17b601116ba9bd8a3de3024f")
- (revision "1"))
+(define-public ecl-quicksearch
+ (sbcl-package->ecl-package sbcl-quicksearch))
+
+(define-public sbcl-quri
+ (let ((commit "03ecaf3771561d713e58a9c5c22b4d95a7592527")
+ (revision "0"))
(package
- (name "sbcl-lla")
- (version (git-version "0.2" revision commit))
+ (name "sbcl-quri")
+ (version (git-version "0.7.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/lla")
+ (url "https://github.com/fukamachi/quri")
(commit commit)))
- (file-name (git-file-name "cl-lla" version))
+ (file-name (git-file-name "cl-quri" version))
(sha256
- (base32 "0n9vc7dnyjbbsv1n7rd8sylwda5fsdf8f890g4nachanyx0xps9k"))))
+ (base32 "1dd96mvgwbs799qzh7amc7kgwy84qhi1gw1yj08n83wmy5k4b9k2"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/configuration.lisp"
- (("\"libblas.so.3gf\"")
- (string-append "\"" (assoc-ref inputs "lapack")
- "/lib/libopenblas.so\""))
- (("\"liblapack.so.3gf\"")
- (string-append "\"" (assoc-ref inputs "lapack")
- "/lib/libopenblas.so\""))))))))
- (inputs
- `(("anaphora" ,sbcl-anaphora)
- ("alexandria" ,sbcl-alexandria)
- ("cffi" ,sbcl-cffi)
- ("cl-num-utils" ,sbcl-cl-num-utils)
- ("cl-slice" ,sbcl-cl-slice)
- ("lapack" ,openblas)
- ("let-plus" ,sbcl-let-plus)))
- (native-inputs
- (list sbcl-clunit))
- (home-page "https://github.com/tpapp/lla")
- (synopsis "Linear algebra library for Common Lisp")
+ (native-inputs (list sbcl-prove))
+ (inputs (list sbcl-babel sbcl-split-sequence sbcl-cl-utilities
+ sbcl-alexandria))
+ (home-page "https://github.com/fukamachi/quri")
+ (synopsis "Yet another URI library for Common Lisp")
(description
- "LLA is a high-level Common Lisp library built on BLAS and LAPACK, but
-providing a much more abstract interface with the purpose of freeing the user
-from low-level concerns and reducing the number of bugs in numerical code.")
- (license license:boost1.0))))
+ "QURI (pronounced \"Q-ree\") is yet another URI library for Common
+Lisp. It is intended to be a replacement of PURI.")
+ (license license:bsd-3))))
-(define-public cl-lla
- (sbcl-package->cl-source-package sbcl-lla))
+(define-public cl-quri
+ (sbcl-package->cl-source-package sbcl-quri))
-(define-public ecl-lla
- (sbcl-package->ecl-package sbcl-lla))
+(define-public ecl-quri
+ (sbcl-package->ecl-package sbcl-quri))
-(define-public sbcl-cl-rmath
- (let ((commit "f6add1edda31547691d08e36ccf6c17305161aca")
- (revision "1"))
+(define-public sbcl-radiance
+ (let ((commit "8d826c7fe1935338565580931db43f46181e0e85")
+ (revision "3"))
(package
- (name "sbcl-cl-rmath")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-radiance")
+ (version (git-version "2.1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/cl-rmath")
+ (url "https://github.com/Shirakumo/radiance")
(commit commit)))
- (file-name (git-file-name "cl-rmath" version))
+ (file-name (git-file-name "radiance" version))
(sha256
- (base32 "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4"))))
+ (base32 "1j823dgp87www0sjbcbv9j025bfxlkwhjd7kz6635mrqwmmlki4l"))))
(build-system asdf-build-system/sbcl)
(arguments
- `(#:phases
+ `(#:tests? #f ; TODO: The tests require some configuration.
+ #:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cl-rmath.lisp"
- (("\\(cffi:define-foreign-library librmath" all)
- (string-append all "\n"
- " (:unix \""
- (assoc-ref inputs "librmath")
- "/lib/libRmath.so\")"))))))))
+ (add-after 'unpack 'disable-quicklisp
+ (lambda _
+ ;; Disable the automatic installation of systems by Quicklisp.
+ ;; (Maybe there would be a way to package Quicklisp and make it
+ ;; install things in the user's directory instead of
+ ;; /gnu/store/...).
+ (substitute* "interfaces.lisp"
+ (("\\(unless \\(asdf:find-system configured-implementation NIL\\)"
+ all)
+ (string-append "#+quicklisp " all))))))))
+ (native-inputs
+ (list sbcl-alexandria
+ sbcl-dexador
+ sbcl-parachute
+ sbcl-verbose))
(inputs
- `(("cffi" ,sbcl-cffi)
- ("librmath" ,rmath-standalone)))
- (home-page "https://github.com/tpapp/cl-rmath")
- (synopsis "Common Lisp wrapper for libRmath")
+ (list sbcl-babel
+ sbcl-bordeaux-threads
+ sbcl-cl-ppcre
+ sbcl-closer-mop
+ sbcl-documentation-utils
+ sbcl-deploy
+ sbcl-form-fiddle
+ sbcl-lambda-fiddle
+ sbcl-local-time
+ sbcl-modularize-hooks
+ sbcl-modularize-interfaces
+ sbcl-puri
+ sbcl-trivial-indent
+ sbcl-trivial-mimes
+ sbcl-ubiquitous))
+ (home-page "https://shirakumo.github.io/radiance/")
+ (synopsis "Common Lisp web application environment")
(description
- "@code{cl-rmath} is a simple, autogenerated foreign interface for the
-standalone R API @code{libRmath}. There has been no effort to provide a
-high-level interface for the original library, instead, this library is meant
-to serve as a building block for such an interface.")
- (license license:boost1.0))))
+ "Radiance is a web application environment, which is sort of like a web
+framework, but more general, more flexible. It should let you write personal
+websites and generally deployable applications easily and in such a way that
+they can be used on practically any setup without having to undergo special
+adaptations.")
+ (license license:zlib))))
-(define-public cl-rmath
- (sbcl-package->cl-source-package sbcl-cl-rmath))
+(define-public cl-radiance
+ (sbcl-package->cl-source-package sbcl-radiance))
-(define-public ecl-cl-rmath
- (sbcl-package->ecl-package sbcl-cl-rmath))
+(define-public ecl-radiance
+ (sbcl-package->ecl-package sbcl-radiance))
-(define-public sbcl-cl-random
- (let ((commit "5bb65911037f95a4260bd29a594a09df3849f4ea")
+(define-public sbcl-radiance-contribs
+ (let ((commit "710b3e1f9971e48368d52eea0b407f2e8f510981")
(revision "1"))
(package
- (name "sbcl-cl-random")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-radiance-contribs")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tpapp/cl-random")
+ (url "https://github.com/Shirakumo/radiance-contribs")
(commit commit)))
- (file-name (git-file-name "cl-random" version))
+ (file-name (git-file-name "radiance-contribs" version))
(sha256
- (base32 "0jn80xphyvyp2v72acr6b8a2f6dw06myr5vrjfl14brsvks7wr89"))))
+ (base32 "08ivnd7a6vfciqna680qpx6zj6vw9xcbrzq29iz3x7x9sp1pqgq3"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; TODO: Include more contribs.
+ `(#:asd-systems '("r-clip"
+ "i-log4cl"
+ "i-sqlite"
+ "r-data-model"
+ "r-simple-rate"
+ "r-welcome")))
(inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-array-operations
- sbcl-cl-num-utils
- sbcl-cl-rmath
- sbcl-cl-slice
- sbcl-gsll
- sbcl-let-plus
- sbcl-lla))
- (native-inputs
- (list sbcl-clunit))
- (home-page "https://github.com/tpapp/cl-random")
- (synopsis "Random variates for Common Lisp")
+ (list sbcl-radiance
+ sbcl-cffi
+ sbcl-clip
+ sbcl-cl-sqlite
+ sbcl-log4cl))
+ (home-page "https://shirakumo.github.io/radiance/")
+ (synopsis "Standard implementations and drivers for the radiance interfaces")
(description
- "@code{cl-random} is a library for generating random draws from various
-commonly used distributions, and for calculating statistical functions, such as
-density, distribution and quantiles for these distributions.")
- (license license:expat))))
+ "This is a collection of useful helper modules and standard
+implementations for Radiance interfaces.")
+ (license license:zlib))))
-(define-public cl-random
- (sbcl-package->cl-source-package sbcl-cl-random))
+(define-public cl-radiance-contribs
+ (sbcl-package->cl-source-package sbcl-radiance-contribs))
-(define-public ecl-cl-random
- (sbcl-package->ecl-package sbcl-cl-random))
+(define-public ecl-radiance-contribs
+ (sbcl-package->ecl-package sbcl-radiance-contribs))
(define-public sbcl-random-sample
(let ((commit "46b70374ed796b84ea003e83c1db97b0caf97e22")
@@ -25733,991 +24770,1415 @@ sequence.")
(define-public ecl-random-sample
(sbcl-package->ecl-package sbcl-random-sample))
-(define-public sbcl-hypergeometrica
- (let ((commit "db723ceb343d89a1c8d7f9174cf3a76fa91522b5")
- (revision "0"))
+(define-public sbcl-random-state
+ (let ((commit "c270d4f15e0b66ba9680ca8734a5de56959cb118")
+ (revision "1"))
(package
- (name "sbcl-hypergeometrica")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-random-state")
+ (version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stylewarning/hypergeometrica")
+ (url "https://github.com/Shinmera/random-state")
(commit commit)))
- (file-name (git-file-name "cl-hypergeometrica" version))
+ (file-name (git-file-name "cl-random-state" version))
(sha256
- (base32 "1dfd6w9djgfh7f4z79d8qsyggrwkjlqhs9rxpzpzv092nlwg3l35"))))
+ (base32 "0r3bk6hqpr0qmpza93pknl8wpsd6y0yy9qg7vz751a7gzzww9vj6"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiasco))
(inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-global-vars
- sbcl-lparallel
- sbcl-mmap
- sbcl-napa-fft3
- sbcl-trivial-garbage))
- (home-page "https://github.com/stylewarning/hypergeometrica")
- (synopsis "High-precision arithmetic")
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/random-state/")
+ (synopsis "Portable random number generation")
(description
- "Hypergeometrica is a Common Lisp library for performing high-precision
-arithmetic, with a focus on performance. At the heart of it all are routines
-for multiplication. Hypergeometrica aims to support:
+ "This library is a collection of @dfn{pseudo random number generators}.
-@itemize
-@item In-core multiplication using various algorithms, from schoolbook to
-floating-point FFTs.
-@item In-core multiplication for large numbers using exact convolutions via
-number-theoretic transforms, which is enabled by 64-bit modular arithmetic.
-@item Out-of-core multiplication using derivatives of the original
-Cooley–Tukey algorithm.
-@end itemize
+While Common Lisp does provide a @code{RANDOM} function, it does not allow the
+user to pass an explicit @code{SEED}, nor to portably exchange the random
+state between implementations. This can be a headache in cases like games,
+where a controlled seeding process can be very useful.
-On top of multiplication, one can build checkpointed algorithms for computing
-various classical constants, like @math{\\pi}.")
- (license license:bsd-3))))
+For both curiosity and convenience, this library offers multiple algorithms to
+generate random numbers, as well as a bunch of generally useful methods to
+produce desired ranges.")
+ (license license:zlib))))
-(define-public cl-hypergeometrica
- (sbcl-package->cl-source-package sbcl-hypergeometrica))
+(define-public cl-random-state
+ (sbcl-package->cl-source-package sbcl-random-state))
-(define-public sbcl-mgl-gpr
- (let ((commit "cb6ce51e2f87bf1d589f3703c13eea6e25780afe")
+(define-public ecl-random-state
+ (sbcl-package->ecl-package sbcl-random-state))
+
+(define-public sbcl-re
+ (let ((commit "cfbc1f482970221e80d445080a188fd5c755cd2c")
(revision "1"))
(package
- (name "sbcl-mgl-gpr")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-re")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/massung/re")
+ (commit commit)))
+ (file-name (git-file-name "re" version))
+ (sha256
+ (base32 "1y2gq2sckspnq8118bix55p2j43dk9qn3p8a2rplp1ip2qxqbb1i"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-parse))
+ (home-page "https://github.com/massung/re")
+ (synopsis "Lua-style Pattern Matching for Common Lisp")
+ (description
+ "RE is a small, portable, lightweight, and quick, regular
+expression library for Common Lisp. It is a non-recursive, backtracing VM.")
+ (license license:asl2.0))))
+
+(define-public cl-re
+ (sbcl-package->cl-source-package sbcl-re))
+
+(define-public ecl-re
+ (sbcl-package->ecl-package sbcl-re))
+
+(define-public sbcl-reader
+ (package
+ (name "sbcl-reader")
+ (version "0.10.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/digikar99/reader")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"))
+ (file-name (git-file-name "cl-reader" version))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "reader.lisp"
+ (("echo")
+ (search-input-file inputs "/bin/echo"))))))))
+ (inputs
+ (list coreutils ; Needed for call to echo.
+ sbcl-alexandria
+ sbcl-fiveam ; Tests are written directly in the source files.
+ sbcl-hash-set
+ sbcl-iterate
+ sbcl-split-sequence
+ sbcl-trivial-types))
+ (synopsis "Reader macros for common objects and data structures")
+ (description "This package provides a utility library intended
+at providing configurable reader macros for common tasks such as
+accessors, hash-tables, sets, uiop:run-program, arrays and a few others.")
+ (home-page "https://github.com/digikar99/reader/")
+ (license license:expat)))
+
+(define-public cl-reader
+ (sbcl-package->cl-source-package sbcl-reader))
+
+(define-public ecl-reader
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-reader))
+ (arguments
+ ;; TODO: Tests fail on call to coreutils echo for ecl.
+ `(#:tests? #f))))
+
+(define-public sbcl-regex
+ (let ((commit "fbc9a9f313b9edc1788f33d4b23a29151635ae22"))
+ (package
+ (name "sbcl-regex")
+ (version (git-version "1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/melisgl/mgl-gpr")
+ (url "https://github.com/michaelw/regex/")
(commit commit)))
- (file-name (git-file-name "cl-mgl-gpr" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0w51dqixh277k6sl8bqvvp1400y6kd1l5h3d9q2f40l9bpxy8gjx"))))
+ (base32 "0wq5wlafrxv13wg28hg5b10sc48b88swsvznpy2zg7x37m4nmm6a"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cl-random sbcl-mgl-pax))
- (home-page "https://melisgl.github.io/mgl-gpr/")
- (synopsis "Common Lisp library of evolutionary algorithms")
+ (home-page "https://github.com/michaelw/regex/")
+ (synopsis "Regular expression engine for Common Lisp")
(description
- "@code{MGL-GPR} is a library of evolutionary algorithms such as
-Genetic Programming (evolving typed expressions from a set of operators and
-constants) and Differential Evolution.")
- (license license:expat))))
+ "This Common Lisp package provides a regular expression engine.")
+ (license license:bsd-2))))
-(define-public cl-mgl-gpr
- (sbcl-package->cl-source-package sbcl-mgl-gpr))
+(define-public cl-regex
+ (sbcl-package->cl-source-package sbcl-regex))
-(define-public ecl-mgl-gpr
- (sbcl-package->ecl-package sbcl-mgl-gpr))
+(define-public ecl-regex
+ (sbcl-package->ecl-package sbcl-regex))
-(define-public sbcl-cl-tld
- ;; No release.
- (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75"))
+(define-public sbcl-repl-utilities
+ (let ((commit "7e300df663177ea4581f4e7e9c601377881dd986"))
(package
- (name "sbcl-cl-tld")
- (version (git-version "0.1" "2" commit))
+ (name "sbcl-repl-utilities")
+ (version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lu4nx/cl-tld")
+ (url "https://github.com/m-n/repl-utilities/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0sxnn35gzdby1ixil6zbjg72vli9fcspwzsqimqk455310syx9iv"))))
+ (base32 "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/lu4nx/cl-tld/")
- (synopsis "Extract the Top Level Domain from domains, in Common Lisp")
+ (home-page "https://github.com/m-n/repl-utilities")
+ (synopsis "Ease common tasks at the Common Lisp REPL")
(description
- "This library extracts the TLD (Top Level Domain) from domains. The
-information is taken from @url{https://publicsuffix.org}.")
- (license license:public-domain))))
+ "@code{repl-utilities} is a set of utilities which ease life at the
+REPL. It includes three sorts of features: introspective procedures,
+miscellaneous utility functions, and, pulling them together, methods to
+conveniently keep these symbols and optionally additional symbols available in
+whichever package you switch to.")
+ (license license:bsd-2))))
-(define-public cl-tld
- (sbcl-package->cl-source-package sbcl-cl-tld))
+(define-public cl-repl-utilities
+ (sbcl-package->cl-source-package sbcl-repl-utilities))
-(define-public ecl-cl-tld
- (sbcl-package->ecl-package sbcl-cl-tld))
+(define-public ecl-repl-utilities
+ (sbcl-package->ecl-package sbcl-repl-utilities))
-(define-public sbcl-cl-strftime
- ;; No release.
- (let ((commit "21cb57f2595faa26d687893963f24ec41822b63c"))
+(define-public sbcl-restas
+ (let ((commit "81bbbab6b36f81f846f78e71232e9d3d15f6d952")
+ (revision "1"))
(package
- (name "sbcl-cl-strftime")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-restas")
+ (version (git-version "0.1.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/cl-strftime/")
+ (url "https://github.com/archimag/restas")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-restas" version))
(sha256
- (base32 "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"))))
+ (base32 "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "contrib/restas-daemon.lisp"
+ (("/lib64/") "")
+ (("/lib/") "")
+ (("libcap.so")
+ (string-append (assoc-ref inputs "libcap")
+ "/lib/libcap.so"))))))))
(inputs
- (list sbcl-alexandria sbcl-local-time sbcl-cl-ppcre sbcl-serapeum))
- (native-inputs
- (list sbcl-fiveam sbcl-cffi))
- (home-page "https://github.com/ruricolist/cl-strftime")
- (synopsis "Common Lisp compiler for the strftime language")
- (description
- "CL-STRFTIME is a Common Lisp compiler for the strftime “language.”")
- (license license:expat))))
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cffi" ,sbcl-cffi)
+ ("data-sift" ,sbcl-data-sift)
+ ("hunchentoot" ,sbcl-hunchentoot)
+ ("libcap" ,libcap)
+ ("routes" ,sbcl-routes)))
+ (home-page "https://github.com/archimag/restas")
+ (synopsis "Common Lisp web framework")
+ (description "@code{RESTAS} is a Common Lisp web application framework.")
+ (license license:llgpl))))
-(define-public cl-strftime
- (sbcl-package->cl-source-package sbcl-cl-strftime))
+(define-public cl-restas
+ (sbcl-package->cl-source-package sbcl-restas))
-(define-public ecl-cl-strftime
- (sbcl-package->ecl-package sbcl-cl-strftime))
+(define-public ecl-restas
+ (sbcl-package->ecl-package sbcl-restas))
-(define-public sbcl-exit-hooks
- ;; No release.
- (let ((commit "78050f4f55c138fcea86a9d720928782021b6012"))
+(define-public sbcl-retrospectiff
+ (let ((commit "2fbf8c687799487654d988c7036d19d75a7fc67d")
+ (revision "1"))
(package
- (name "sbcl-exit-hooks")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-retrospectiff")
+ (version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ailisp/exit-hooks/")
+ (url "https://github.com/slyrus/retrospectiff")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-retrospectiff" version))
(sha256
- (base32 "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47"))))
+ (base32 "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/ailisp/exit-hooks")
- (synopsis "Call functions automatically when Common Lisp exits")
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-cl-jpeg
+ sbcl-com.gigamonkeys.binary-data
+ sbcl-deflate
+ sbcl-flexi-streams
+ sbcl-ieee-floats
+ sbcl-opticl-core))
+ (home-page "https://github.com/slyrus/retrospectiff")
+ (synopsis "Common Lisp library for TIFF images")
(description
- "@code{exit-hooks} provides a portable way to automatically call some
-user-defined function when exiting Common Lisp (both @code{quit} from the REPL
-or a kill in a shell). Like @code{atexit} in C and Python or Java’s
-@code{Runtime.addShutdownHook()}. It currently supports SBCL, CCL, ECL, ABCL,
-Allegro CL, clisp and CMUCL. Before exit-hooks, there was no portable way of
-doing so and no staightforward way to use an exit hook on ABCL. It can be used
-for tasks like parmenantly save something when exiting Lisp.")
+ "Retrospectiff is a common lisp library for reading and writing images
+in the TIFF (Tagged Image File Format) format.")
(license license:bsd-2))))
-(define-public cl-exit-hooks
- (sbcl-package->cl-source-package sbcl-exit-hooks))
+(define-public cl-retrospectif
+ (sbcl-package->cl-source-package sbcl-retrospectiff))
-(define-public ecl-exit-hooks
- (sbcl-package->ecl-package sbcl-exit-hooks))
+(define-public ecl-retrospectiff
+ (sbcl-package->ecl-package sbcl-retrospectiff))
-(define-public sbcl-cl-base58
- (let ((commit "f446835b4104896e0eed6a61d2ceb4ad22f589d8")
+(define-public sbcl-rfc2388
+ (let ((commit "591bcf7e77f2c222c43953a80f8c297751dc0c4e")
(revision "1"))
(package
- (name "sbcl-cl-base58")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-rfc2388")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jdz/rfc2388")
+ (commit commit)))
+ (file-name (git-file-name "rfc2388" version))
+ (sha256
+ (base32 "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/jdz/rfc2388/")
+ (synopsis "Implementation of RFC 2388 in Common Lisp")
+ (description
+ "This package contains an implementation of RFC 2388, which is used to
+process form data posted with HTTP POST method using enctype
+\"multipart/form-data\".")
+ (license license:bsd-2))))
+
+(define-public cl-rfc2388
+ (sbcl-package->cl-source-package sbcl-rfc2388))
+
+(define-public ecl-rfc2388
+ (sbcl-package->ecl-package sbcl-rfc2388))
+
+(define-public sbcl-routes
+ (let ((commit "1b79e85aa653e1ec87e21ca745abe51547866fa9")
+ (revision "1"))
+ (package
+ (name "sbcl-routes")
+ (version (git-version "0.2.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eudoxia0/cl-base58/")
+ (url "https://github.com/archimag/cl-routes")
(commit commit)))
- (file-name (git-file-name "cl-base58" version))
+ (file-name (git-file-name "cl-routes" version))
(sha256
- (base32 "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"))))
+ (base32 "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-systems '("cl-base58-test" "cl-base58")
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "cl-base58-test.asd"
- (("cl-test-more")
- "prove"))
- #t)))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Fix: :FORCE and :FORCE-NOT arguments not allowed in
+ ;; a nested call to ASDF/OPERATE:OPERATE unless
+ ;; identically to toplevel
+ (substitute* "routes.asd"
+ ((" :force t") "")))))))
+ (inputs
+ `(("iterate" ,sbcl-iterate)
+ ("puri" ,sbcl-puri)
+ ("split-sequence" ,sbcl-split-sequence)))
(native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/eudoxia0/cl-base58")
- (synopsis "Implementation of base58 for Common Lisp")
+ (list sbcl-lift))
+ (home-page "https://github.com/archimag/cl-routes")
+ (synopsis "Rails routes system for Common Lisp")
(description
- "This library implements the @code{base58} encoding algorithm. It's
-basically @code{base64} but with a smaller alphabet (58, as in the name) that
-doesn't include similar looking characters, among other things. See
-@url{https://github.com/bitcoin/bitcoin/blob/master/src/base58.h} for a full
-reference.")
- (license license:expat))))
+ "This is a a Common Lisp re-implementation of the Rails routes system
+for mapping URLs.")
+ (license license:llgpl))))
-(define-public cl-base58
- (sbcl-package->cl-source-package sbcl-cl-base58))
+(define-public cl-routes
+ (sbcl-package->cl-source-package sbcl-routes))
-(define-public ecl-cl-base58
- (sbcl-package->ecl-package sbcl-cl-base58))
+(define-public ecl-routes
+ (sbcl-package->ecl-package sbcl-routes))
-(define-public sbcl-bit-smasher
+(define-public sbcl-rss
;; No release.
- (let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9"))
+ (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58"))
(package
- (name "sbcl-bit-smasher")
- (version (git-version "1.0.2" "1" commit))
+ (name "sbcl-rss")
+ (version (git-version "0.9.1.1" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/thephoeron/bit-smasher/")
+ (url "http://git.kpe.io/cl-rss.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0wjmwn06fjpw0rlpaksf3ab727p8fnzj58z7jajl3m0wqd4ii74w"))))
+ (base32 "0wv3j13fj73gigriw5r9vi920hz05ld7zllsvbxdxvmyfy9k1kly"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The useless bundled debian folder drags `make' into the closure.
+ `(begin
+ (delete-file-recursively "debian")
+ #t))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("cl-base64" ,sbcl-cl-base64)
- ("cl-base58" ,sbcl-cl-base58)))
- (home-page "https://github.com/thephoeron/bit-smasher/")
- (synopsis "Handle bit vectors, bit vector arithmetic, and type conversions")
+ (list sbcl-aserve sbcl-kmrcl sbcl-xmls))
+ (home-page "https://github.com/nsrahmad/cl-rss")
+ (synopsis "Common Lisp RSS processor")
(description
- "Utility library for handling bit vectors, bit vector arithmetic, and
-universal integer type conversions between bit-vectors, byte-vectors, octals,
-decimals, and hexadecimal notation.")
- (license license:expat))))
-
-(define-public cl-bit-smasher
- (sbcl-package->cl-source-package sbcl-bit-smasher))
+ "This package provides a Common Lisp library for fetching and parsing
+RSS feeds data via HTTP. Currently, it supports RSS versions 0.90,
+0.91, and 0.92 as well as RSS version 2.")
+ (license license:bsd-3))))
-(define-public ecl-bit-smasher
- (sbcl-package->ecl-package sbcl-bit-smasher))
+(define-public cl-rss
+ (sbcl-package->cl-source-package sbcl-rss))
-(define-public sbcl-overlord
- ;; No release.
- (let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763"))
+(define-public sbcl-rtg-math
+ (let ((commit "29fc5b3d0028a4a11a82355ecc8cca62662c69e0")
+ (revision "1"))
(package
- (name "sbcl-overlord")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-rtg-math")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/overlord/")
+ (url "https://github.com/cbaggers/rtg-math")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "rtg-math" version))
(sha256
- (base32 "1maqm53yhlhaa3cka8xcc4sq24ifrr4y3y0s5dyyn682xsh14hb4"))))
+ (base32 "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("babel" ,sbcl-babel)
- ("bit-smasher" ,sbcl-bit-smasher)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cl-strftime" ,sbcl-cl-strftime)
- ("cmd" ,sbcl-cmd)
- ("drakma" ,sbcl-drakma)
- ("exit-hooks" ,sbcl-exit-hooks)
- ("fset" ,sbcl-fset)
- ("local-time" ,sbcl-local-time)
- ("lparallel" ,sbcl-lparallel)
- ("md5" ,sbcl-md5)
- ("murmurhash" ,sbcl-cl-murmurhash)
- ("named-readtables" ,sbcl-named-readtables)
- ("ppcre" ,sbcl-cl-ppcre)
- ("serapeum" ,sbcl-serapeum)
- ("trivia" ,sbcl-trivia)
- ("trivial-file-size" ,sbcl-trivial-file-size)))
- (propagated-inputs
- `(("quickproject" ,sbcl-quickproject)))
- (native-inputs
- (list sbcl-fiveam))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'include-overlord/net
- (lambda _
- (substitute* "all.lisp"
- (("\\(:import-from :overlord/kernel :nproc\\)")
- (string-append
- "(:import-from :overlord/kernel :nproc)"
- "\n"
- "(:import-from :overlord/net)")))
- #t)))))
- (home-page "https://github.com/ruricolist/overlord")
- (synopsis "Build system in Common Lisp")
+ (list sbcl-alexandria sbcl-documentation-utils sbcl-glsl-spec))
+ (home-page "https://github.com/cbaggers/rtg-math")
+ (synopsis "Common Lisp library of game-related math functions")
(description
- "Overlord is a build system in Common Lisp. It is a real build system,
-with all the modern features: rules with multiple outputs, parallel builds,
-immunity to clock issues, and dynamic dependencies.
+ "RTG-MATH provides a selection of the math routines most commonly needed
+for making realtime graphics in Lisp.")
+ (license license:bsd-2))))
-But Overlord is more than another build system. Overlord is a uniform
-approach to dependencies inside or outside of a Lisp image. Overlord is to
-Make what Lisp macros are to C macros.
+(define-public cl-rtg-math
+ (sbcl-package->cl-source-package sbcl-rtg-math))
-Overlord is designed to be used from the Lisp REPL. A command line interface
-is available in a separate repository. See
-@url{https://github.com/ruricolist/overlord-cli}.")
- (license license:expat))))
+(define-public ecl-rtg-math
+ (sbcl-package->ecl-package sbcl-rtg-math))
-(define-public cl-overlord
- (sbcl-package->cl-source-package sbcl-overlord))
+(define-public sbcl-rucksack
+ (let ((commit "89278f88513ef328d290aa8b2baa06d63b44a9b1")
+ (revision "0"))
+ (package
+ (name "sbcl-rucksack")
+ (version (git-version "0.1.20" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/arieltan/rucksack")
+ (commit commit)))
+ (file-name (git-file-name "cl-rucksack" version))
+ (sha256
+ (base32 "0acpsxaxpp90km7gdbn9sysilycp3yg1g040fg1vqakpj2yb8vad"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Flexible, light weight, persistence library")
+ (description
+ "@code{cl-rucksack} is a persistence library based on Arthur Lemmens'
+Rucksack with some enhancements.")
+ (home-page "https://github.com/arieltan/rucksack/")
+ (license license:expat))))
-;; FIXME: Broken on ECL? https://github.com/ruricolist/overlord/issues/25
-;; (define-public ecl-overlord
-;; (sbcl-package->ecl-package sbcl-overlord))
+(define-public cl-rucksack
+ (sbcl-package->cl-source-package sbcl-rucksack))
-(define-public sbcl-xpath
- ;; No release.
- (let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3"))
+(define-public sbcl-rutils
+ (let ((commit "db3c3f4ae897025b5f0cd81042ca147da60ca0c5")
+ (revision "0"))
(package
- (name "sbcl-xpath")
- (version (git-version "0.1" "1" commit))
+ (name "sbcl-rutils")
+ (version (git-version "5.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sharplispers/xpath/")
+ (url "https://github.com/vseloved/rutils")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "rutils" version))
(sha256
- (base32 "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"))))
+ (base32 "1d2whscknh1zga2vdqvfqri8wx0gnml3sfqz62igq0ppap6q07y3"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems '("rutils" "rutilsx")
+ ;; Tests disabled because of a circular dependency with should-test.
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ ;; File faild to load, and we don't use it as tests are
+ ;; disabled, so let's delete it.
+ (delete-file "rutilsx-test.asd"))))))
(inputs
- (list sbcl-cxml sbcl-parse-number sbcl-cl-ppcre sbcl-cl-yacc))
- (home-page "https://github.com/sharplispers/xpath/")
- (synopsis "Implementation of the XML Path Language (XPath) Version 1.0")
- (description
- "This library is an implementation of the XML Path Language (XPath)
-Version 1.0.")
- (license license:bsd-2))))
+ `(("closer-mop" ,sbcl-closer-mop)
+ ("named-readtables" ,sbcl-named-readtables)))
+ (home-page "https://github.com/vseloved/rutils")
+ (synopsis "Radical Utilities for Common Lisp")
+ (description "RUTILS is a syntactic utilities package for Common Lisp.")
+ (license license:bsd-3))))
-;; According to
-;; https://github.com/sharplispers/xpath/blob/master/doc/index.xml ECL is not
-;; supported.
-(define-public cl-xpath
- (sbcl-package->cl-source-package sbcl-xpath))
+(define-public cl-rutils
+ (sbcl-package->cl-source-package sbcl-rutils))
-(define-public sbcl-fxml
- ;; No release.
- (let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1"))
+(define-public ecl-rutils
+ (sbcl-package->ecl-package sbcl-rutils))
+
+(define-public sbcl-s-sysdeps
+ ;; No release since 2013.
+ (let ((commit "7f8de283b7fbd8b038fdf08493063a736db36ce7")
+ (revision "3"))
(package
- (name "sbcl-fxml")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-s-sysdeps")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "1" revision commit))
+ (home-page "https://github.com/svenvc/s-sysdeps")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/fxml/")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-s-sysdeps" version))
(sha256
- (base32 "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"))))
- (build-system asdf-build-system/sbcl)
+ (base32
+ "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n"))
+ (patches
+ (search-patches "sbcl-s-sysdeps-bt2.patch"))))
(inputs
- (list sbcl-babel
- sbcl-named-readtables
- sbcl-serapeum
- sbcl-quri
- sbcl-flexi-streams
- sbcl-split-sequence
- sbcl-alexandria
- sbcl-trivial-gray-streams))
- (native-inputs
- (list sbcl-fiveam sbcl-cxml sbcl-cxml-rng sbcl-xpath))
- (home-page "https://github.com/ruricolist/fxml")
- (synopsis "XML parser and serializer in Common Lisp")
- (description
- "FXML is a secure-by-default, error-recovering XML parser and serializer.
-It is a fork of CXML.
+ (list sbcl-bordeaux-threads sbcl-usocket))
+ (synopsis "Common Lisp abstraction layer over platform dependent functionality")
+ (description "@code{s-sysdeps} is an abstraction layer over platform
+dependent functionality. This simple package is used as a building block in a
+number of other projects.
+
+@code{s-sysdeps} abstracts:
-You should use FXML instead of CXML if:
@itemize
-@item You are parsing potentially ill-formed XML.
-@item You are parsing potentially malicious XML.
-@item You need to use Klacks with namespaces.
+@item managing processes,
+@item implementing a standard TCP/IP server,
+@item opening a client TCP/IP socket stream,
+@item working with process locks.
+@end itemize\n")
+ (license license:llgpl))))
+
+(define-public cl-s-sysdeps
+ (sbcl-package->cl-source-package sbcl-s-sysdeps))
+
+(define-public ecl-s-sysdeps
+ (sbcl-package->ecl-package sbcl-s-sysdeps))
+
+(define-public sbcl-s-xml
+ (package
+ (name "sbcl-s-xml")
+ (version "3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://common-lisp.net/project/s-xml/s-xml.tgz")
+ (sha256
+ (base32
+ "061qcr0dzshsa38s5ma4ay924cwak2nq9gy59dw6v9p0qb58nzjf"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://common-lisp.net/project/s-xml/")
+ (synopsis "Simple XML parser implemented in Common Lisp")
+ (description
+ "S-XML is a simple XML parser implemented in Common Lisp. This XML
+parser implementation has the following features:
+
+@itemize
+@item It works (handling many common XML usages).
+@item It is very small (the core is about 700 lines of code, including
+comments and whitespace).
+@item It has a core API that is simple, efficient and pure functional, much
+like that from SSAX (see also http://ssax.sourceforge.net).
+@item It supports different DOM models: an XSML-based one, an LXML-based one
+and a classic xml-element struct based one.
+@item It is reasonably time and space efficient (internally avoiding garbage
+generatation as much as possible).
+@item It does support CDATA.
+@item It should support the same character sets as your Common Lisp
+implementation.
+@item It does support XML name spaces.
@end itemize
-FXML’s API is very close to CXML's, and for the most part you can refer to the
-CXML documentation for usage.")
- (license license:llgpl))))
+This XML parser implementation has the following limitations:
-(define-public cl-fxml
- (sbcl-package->cl-source-package sbcl-fxml))
+@itemize
+@item It does not support any special tags (like processing instructions).
+@item It is not validating, even skips DTD's all together.
+@end itemize\n")
+ (license license:lgpl3+)))
-(define-public sbcl-vernacular
- ;; No release.
- (let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f"))
+(define-public cl-s-xml
+ (sbcl-package->cl-source-package sbcl-s-xml))
+
+(define-public ecl-s-xml
+ (sbcl-package->ecl-package sbcl-s-xml))
+
+(define-public sbcl-s-xml-rpc
+ (package
+ (name "sbcl-s-xml-rpc")
+ (version "7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://common-lisp.net/project/s-xml-rpc/s-xml-rpc.tgz")
+ (sha256
+ (base32
+ "02z7k163d51v0pzk8mn1xb6h5s6x64gjqkslhwm3a5x26k2gfs11"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-s-xml))
+ (home-page "https://common-lisp.net/project/s-xml-rpc/")
+ (synopsis "Implementation of XML-RPC in Common Lisp for both client and server")
+ (description
+ "S-XML-RPC is an implementation of XML-RPC in Common Lisp for both
+client and server.")
+ (license license:lgpl3+)))
+
+(define-public cl-s-xml-rpc
+ (sbcl-package->cl-source-package sbcl-s-xml-rpc))
+
+(define-public ecl-s-xml-rpc
+ (sbcl-package->ecl-package sbcl-s-xml-rpc))
+
+(define-public sbcl-safe-read
+ (let ((commit "d25f08597b34d7aaeb86b045d57f7b020a5bb5f0")
+ (revision "0"))
(package
- (name "sbcl-vernacular")
- (version (git-version "0.8.0" "1" commit))
+ (name "sbcl-safe-read")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/vernacular/")
+ (url "https://github.com/phoe/safe-read")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-safe-read" version))
(sha256
- (base32 "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; The demo depends on cl-js, which we don't have at this point.
- (delete-file-recursively "demo")
- #t))))
+ (base32 "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("overlord" ,sbcl-overlord)
- ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all)
- ("local-time" ,sbcl-local-time)
- ("parse-js" ,sbcl-parse-js)
- ("trivia" ,sbcl-trivia)
- ("trivial-garbage" ,sbcl-trivial-garbage)
- ("named-readtables" ,sbcl-named-readtables)
- ("alexandria" ,sbcl-alexandria)
- ("serapeum" ,sbcl-serapeum)
- ("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
- (arguments
- ;; Circular dependency: Tests depend on core-lisp
- ;; (http://github.com/ruricolist/core-lisp) which depends on
- ;; Vernacular.
- '(#:tests? #f))
- (home-page "https://github.com/ruricolist/vernacular")
- (synopsis "Module system for languages that compile to Common Lisp")
+ (list sbcl-local-time sbcl-trivial-garbage))
+ (home-page "https://github.com/phoe/safe-read/")
+ (synopsis "Safer variant of READ")
(description
- "Vernacular is a build and module system for languages that compile to
-Common Lisp. It allows languages to compile to Lisp while remaining part of
-the Common Lisp ecosystem. Vernacular languages interoperate with Common Lisp
-and one another.
+ "This package provides a safer variant of @code{READ} secure against
+internbombing, excessive input and macro characters.")
+ (license license:bsd-2))))
-Vernacular handles locating files, compiling files into FASLs, tracking
-dependencies and rebuilding, and export and import between your new language,
-Lisp, and any other language Vernacular supports.
+(define-public cl-safe-read
+ (sbcl-package->cl-source-package sbcl-safe-read))
-Vernacular builds on Overlord and is inspired by Racket.")
+(define-public ecl-safe-read
+ (sbcl-package->ecl-package sbcl-safe-read))
+
+(define-public sbcl-salza2
+ (package
+ (name "sbcl-salza2")
+ (version "2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/salza2")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-chipz sbcl-flexi-streams sbcl-parachute))
+ (inputs
+ (list sbcl-trivial-gray-streams))
+ (synopsis "Common Lisp library for zlib, deflate and gzip compression")
+ (description
+ "Salza2 is a Common Lisp library for creating compressed data in the zlib,
+deflate, or gzip data formats, described in RFC 1950, RFC 1951, and RFC 1952,
+respectively.")
+ (home-page "https://www.xach.com/lisp/salza2/")
+ (license license:bsd-2)))
+
+(define-public cl-salza2
+ (sbcl-package->cl-source-package sbcl-salza2))
+
+(define-public ecl-salza2
+ (sbcl-package->ecl-package sbcl-salza2))
+
+(define-public sbcl-sb-cga
+ (let ((commit "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094"))
+ (package
+ (name "sbcl-sb-cga")
+ (version (git-version "1.0.1" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nikodemus/sb-cga/")
+ (commit commit)))
+ (file-name (git-file-name "cl-sb-cga" version))
+ (sha256
+ (base32 "1y54qlwfrhch9aghk7nsbdx7x2qsvgsws1g2k631l9dsgdakw4w8"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria))
+ (home-page "https://github.com/nikodemus/sb-cga/")
+ (synopsis "Computer graphic algebra for Common Lisp")
+ (description
+ "SB-CGA is a computer graphics algebra library for Common Lisp.
+
+Despite the prefix it is actually portable - but optimizations that make it
+fast (using SIMD instructions) are currently implemented for SBCL/x86-64
+only.")
(license license:expat))))
-(define-public cl-vernacular
- (sbcl-package->cl-source-package sbcl-vernacular))
+(define-public cl-sb-cga
+ (sbcl-package->cl-source-package sbcl-sb-cga))
-(define-public sbcl-cl-collider
- (let ((commit "a46908896982868955b29bfb3a5337a0af489b0b")
- (revision "0"))
+(define-public ecl-sb-cga
+ (sbcl-package->ecl-package sbcl-sb-cga))
+
+(define-public sbcl-schemeish
+ (let ((commit "872ea3dc3f2ea8438388b5e7660acd9446c49948")
+ (revision "2"))
(package
- (name "sbcl-cl-collider")
- (version (git-version "2018.7.15" revision commit))
- (source
+ (name "sbcl-schemeish")
+ (version (git-version "0.0.1" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/byulparan/cl-collider")
+ (url "https://github.com/chebert/schemeish")
(commit commit)))
- (file-name (git-file-name "cl-collider" version))
+ (file-name (git-file-name "cl-schemeish" version))
(sha256
- (base32 "10wvjbwvbgr0b57hpfxycg90yjmb29pirygr1sxrdaqxll328sz1"))))
- (build-system asdf-build-system/sbcl)
- (arguments
+ (base32 "08lbrmsamfpva83l1ap33gp8ff99v0l2dyyidjgwdchmbdgq3gqf"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-trivial-arguments sbcl-trivial-cltl2))
+ (arguments
(list #:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'patch-executables-and-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "server.lisp"
- (("/usr/local/lib/SuperCollider/plugins")
- (search-input-directory
- inputs "/lib/SuperCollider/plugins"))
- (("/usr/local/share/SuperCollider/Extensions")
- (search-input-directory
- inputs "/share/SuperCollider/Extensions"))
- (("which scsynth")
- (string-append
- "which "
- (search-input-file inputs "/bin/scsynth")))
- (("jack_connect")
- (search-input-file inputs "/bin/jack_connect"))))))))
- (inputs
- (list jack-1
- supercollider
- sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-ppcre
- sbcl-flexi-streams
- sbcl-ieee-floats ; sc-osc dependencies.
- sbcl-named-readtables
- sbcl-osc
- sbcl-pileup
- sbcl-simple-inferiors ; For ecl.
- sbcl-split-sequence
- sbcl-usocket))
- (synopsis "SuperCollider client for CommonLisp")
- (description "This package provides a SuperCollider client for
-Common Lisp.")
- (home-page "https://github.com/byulparan/cl-collider/")
- (license license:public-domain))))
+ (add-after 'unpack 'fix-build
+ (lambda _
+ ;; To fix the warning:
+ ;; Argument of type (INTEGER 1 1) cannot be used as a keyword.
+ (substitute* "src/arities.lisp"
+ (("1 2 3 4 5 6 7 8")
+ ":a1 :a2 :a3 :a4 :a5 :a6 :a7 :a8")))))))
+ (synopsis "Scheme style syntax/macros/functions for Common Lisp")
+ (description
+ "Schemeish implements several useful Scheme constructs for Common Lisp.
+These include named-let, define, scheme argument lists, and a shortcut to
+FUNCALL with [] instead of ().")
+ (home-page "https://github.com/chebert/schemeish")
+ ;; MIT License
+ (license license:expat))))
-(define-public cl-collider
- (sbcl-package->cl-source-package sbcl-cl-collider))
+(define-public cl-schemeish
+ (sbcl-package->cl-source-package sbcl-schemeish))
-(define-public ecl-cl-collider
- (sbcl-package->ecl-package sbcl-cl-collider))
+(define-public ecl-schemeish
+ (sbcl-package->ecl-package sbcl-schemeish))
-(define-public sbcl-osc
- (let ((commit "f647738ccc22925ed740a8ca9132fda76a05baeb")
- (revision "0"))
+(define-public sbcl-screamer
+ (let ((commit "ce50614024de090b376107668da5e53232540ec7"))
(package
- (name "sbcl-osc")
- (version (git-version "0.9" revision commit))
- (source
+ (name "sbcl-screamer")
+ (version (git-version "0.0.1" "1" commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/zzkt/osc")
+ (url "https://github.com/nikodemus/screamer/")
(commit commit)))
- (file-name (git-file-name "cl-osc" version))
+ (file-name (git-file-name "cl-screamer" version))
(sha256
- (base32 "1x4cavspaxcr604g0hwak1ncy4m9cqq03ji4v56g2h1443n7h48a"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (inputs (list sbcl-ieee-floats))
- (synopsis "Implementation of the Open Sound Control protocol")
- (description "This is a lisp implementation of the Open Sound Control
-protocol (or more accurately “data transport specification” or
-“encoding”). The code should be close to ANSI standard common lisp and
-provides self contained code for encoding and decoding of OSC data, messages,
-and bundles.")
- (home-page "https://github.com/zzkt/osc/")
- (license license:gpl3+))))
+ (base32 "1jl42pl6kwkiq71d0naf3r1mn1qy89ndimfgiz58c4g66xbjb7kx"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-iterate
+ sbcl-hu.dwim.stefil))
+ (home-page "https://nikodemus.github.io/screamer/")
+ (synopsis "Nondeterministic programming and constraint propagation")
+ (description
+ "Screamer is an extension of Common Lisp that adds support for
+nondeterministic programming. Screamer consists of two levels. The basic
+nondeterministic level adds support for backtracking and undoable side
+effects. On top of this nondeterministic substrate, Screamer provides a
+comprehensive constraint programming language in which one can formulate and
+solve mixed systems of numeric and symbolic constraints. Together, these two
+levels augment Common Lisp with practically all of the functionality of both
+Prolog and constraint logic programming languages such as CHiP and CLP(R).
+Furthermore, Screamer is fully integrated with Common Lisp. Screamer programs
+can coexist and interoperate with other extensions to as CLIM and Iterate.")
+ (license license:expat))))
-(define-public cl-osc
- (sbcl-package->cl-source-package sbcl-osc))
+(define-public cl-screamer
+ (sbcl-package->cl-source-package sbcl-screamer))
-(define-public ecl-osc
- (sbcl-package->ecl-package sbcl-osc))
+(define-public ecl-screamer
+ (sbcl-package->ecl-package sbcl-screamer))
-(define-public sbcl-cmn
- (package
- (name "sbcl-cmn")
- (version "2021.11.22")
- (source
- (origin
- (method url-fetch)
- (uri "https://ccrma.stanford.edu/software/cmn/cmn.tar.gz")
- (file-name (string-append "cmn-" version ".tar.gz"))
- (sha256
- (base32 "04j1l57cdyfi2zzxqwmvmf1hl899ffgs3bl4r42ba47zsw45kq14"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://ccrma.stanford.edu/software/cmn/")
- (synopsis "Western music notation package written in Common Lisp")
- (description
- "CMN provides a package of functions to hierarchically describe a musical
-score. When evaluated, the musical score is rendered to an image.")
- (license license:expat)))
+(define-public sbcl-sdf
+ ;; Shinmera's fork required for Alloy.
+ (let ((commit "e1ab3ac4ea52c0e0119b832f428c71f580b4d83b")
+ (revision "1"))
+ (package
+ (name "sbcl-sdf")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/sdf")
+ (commit commit)))
+ (file-name (git-file-name "sdf" version))
+ (sha256
+ (base32 "1cyq4hkgiw9mnb87ah6xw19cybfs9hfbjvg1ch2mf4cr0ism0nvn"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-zpb-ttf
+ sbcl-cl-vectors
+ sbcl-opticl
+ sbcl-binpack
+ sbcl-3b-bmfont/shinmera
+ sbcl-pathname-utils))
+ (arguments
+ `(#:asd-systems '("sdf" "sdf/bmfont")))
+ (home-page "https://github.com/Shinmera/sdf")
+ (synopsis "Signed distance font atlas generator")
+ (description
+ "This library generates
+sdf (@url{https://steamcdn-a.akamaihd.net/apps/valve/2007/SIGGRAPH2007_AlphaTestedMagnification.pdf}),
+psdf and
+msdf (@url{https://github.com/Chlumsky/msdfgen/files/3050967/thesis.pdf})
+atlases.")
+ (license license:expat))))
-(define-public cl-cmn
- (sbcl-package->cl-source-package sbcl-cmn))
+(define-public cl-sdf
+ (sbcl-package->cl-source-package sbcl-sdf))
-(define-public ecl-cmn
- (sbcl-package->ecl-package sbcl-cmn))
+(define-public ecl-sdf
+ (sbcl-package->ecl-package sbcl-sdf))
-(define-public sbcl-core-gp
- (let ((commit "90ec1c4599a19c5a911be1f703f78d5108aee160")
- (revision "1"))
+(define-public sbcl-sdl2
+ (let ((commit "80410b514570ca06894675d4a2a5fc93287ea7b6")
+ (revision "2"))
(package
- (name "sbcl-core-gp")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-sdl2")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jorgetavares/core-gp")
+ (url "https://github.com/lispgames/cl-sdl2")
(commit commit)))
- (file-name (git-file-name "cl-core-gp" version))
+ (file-name (git-file-name "cl-sdl2" version))
(sha256
- (base32 "0nzlb2gwqisa1amlpl4zc5xxph2g3qwhfyaxchci67d31rzws6l3"))))
+ (base32 "0sjy4k04k0hdhwpr57ns16ag3za0kz4laclbk17i91ql7qdjw9z2"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/jorgetavares/core-gp")
- (synopsis "Common Lisp library for genetic programming")
+ (arguments
+ `(#:asd-systems '("sdl2" "sdl2/examples")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libSDL2-2.0.so.0")
+ (search-input-file inputs "/lib/libSDL2-2.0.so.0"))))))))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-autowrap
+ sbcl-cl-opengl
+ sbcl-cl-ppcre
+ sbcl-trivial-channels
+ sbcl-trivial-features
+ sdl2))
+ (home-page "https://github.com/lispgames/cl-sdl2")
+ (synopsis "Common Lisp bindings for SDL2 using C2FFI")
(description
- "@code{core-gp} is a Common Lisp library for genetic programming (GP)
-algorithms. It allows standard GP, strongly-typed GP, grammatical evolution as
-well as standard genetic algorithms.")
+ "This package provides a Common Lisp wrapper system for the SDL 2.0
+C Library.")
(license license:expat))))
-(define-public cl-core-gp
- (sbcl-package->cl-source-package sbcl-core-gp))
+(define-public cl-sdl2
+ (sbcl-package->cl-source-package sbcl-sdl2))
-(define-public ecl-core-gp
- (sbcl-package->ecl-package sbcl-core-gp))
+(define-public ecl-sdl2
+ (sbcl-package->ecl-package sbcl-sdl2))
-(define-public sbcl-data-sift
- (let ((commit "fd617d8200cdcc1b87ecf45ab59bb38e8b16ef7e")
+(define-public sbcl-sdl2-image
+ (let ((commit "9c05c806286b66a5d9861ef829cfe68c4f3da077")
(revision "1"))
(package
- (name "sbcl-data-sift")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-sdl2-image")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/data-sift")
+ (url "https://github.com/lispgames/cl-sdl2-image")
(commit commit)))
- (file-name (git-file-name "cl-data-sift" version))
+ (file-name (git-file-name "cl-sdl2-image" version))
(sha256
- (base32 "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"))))
+ (base32 "1nr7mdl125q32m15m8rdlza5kwi7m0birh1cq846pyy6zl1sjms7"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; All test cases test a function that has been removed.
- `(#:tests? #f))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libSDL2_image-2.0.so.0")
+ (search-input-file inputs "/lib/libSDL2_image-2.0.so.0"))))))))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("parse-number" ,sbcl-parse-number)
- ("puri" ,sbcl-puri)))
- (native-inputs
- (list sbcl-lift))
- (home-page "https://github.com/archimag/data-sift")
- (synopsis
- "Common Lisp library for validation and transformation of string data")
+ (list sdl2-image
+ sbcl-alexandria
+ sbcl-cl-autowrap
+ sbcl-defpackage-plus
+ sbcl-sdl2))
+ (home-page "https://github.com/lispgames/cl-sdl2-image")
+ (synopsis "SDL2_image wrapper for Common Lisp")
(description
- "@code{DATA-SIFT} is a Common Lisp data validation and transformation
-library inspired by @code{cl-data-format-validation} and WTForms validators.")
- (license license:llgpl))))
+ "This is a (currently) brief but usable wrap for SDL2_image.")
+ (license license:expat))))
-(define-public cl-data-sift
- (sbcl-package->cl-source-package sbcl-data-sift))
+(define-public cl-sdl2-image
+ (sbcl-package->cl-source-package sbcl-sdl2-image))
-(define-public ecl-data-sift
- (sbcl-package->ecl-package sbcl-data-sift))
+(define-public ecl-sdl2-image
+ (sbcl-package->ecl-package sbcl-sdl2-image))
-(define-public sbcl-restas
- (let ((commit "81bbbab6b36f81f846f78e71232e9d3d15f6d952")
+(define-public sbcl-sdl2kit
+ (let ((commit "aae663224a10ece2b0c374aa5942a3f0bc1b3c2f"))
+ (package
+ (name "sbcl-sdl2kit")
+ (version (git-version "0.0.0" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lispgames/sdl2kit/")
+ (commit commit)))
+ (file-name (git-file-name "cl-sdl2kit" version))
+ (sha256
+ (base32 "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-opengl
+ sbcl-defpackage-plus
+ sbcl-sdl2))
+ (home-page "https://github.com/lispgames/sdl2kit/")
+ (synopsis "Utility kit for CL-SDL2")
+ (description
+ "This is a utility kit for @code{cl-sdl2} that provides something similar to
+GLUT. However, it's also geared at being useful for \"real\" applications or
+games.")
+ (license license:expat))))
+
+(define-public cl-sdl2kit
+ (sbcl-package->cl-source-package sbcl-sdl2kit))
+
+(define-public ecl-sdl2kit
+ (sbcl-package->ecl-package sbcl-sdl2kit))
+
+(define-public sbcl-sdl2-mixer
+ (let ((commit "fdcc7ee7935dd01fd338e22690451db2cf126156")
(revision "1"))
(package
- (name "sbcl-restas")
- (version (git-version "0.1.4" revision commit))
+ (name "sbcl-sdl2-mixer")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/restas")
+ (url "https://github.com/lispgames/cl-sdl2-mixer")
(commit commit)))
- (file-name (git-file-name "cl-restas" version))
+ (file-name (git-file-name "cl-sdl2-mixer" version))
(sha256
- (base32 "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"))))
+ (base32 "0g6ywb3gqr0rif4z6kkz6m8vyv8nrr5wr1w9sc6d3zypbbnqgbp6"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "contrib/restas-daemon.lisp"
- (("/lib64/") "")
- (("/lib/") "")
- (("libcap.so")
- (string-append (assoc-ref inputs "libcap")
- "/lib/libcap.so"))))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libSDL2_mixer-2.0.so.0")
+ (search-input-file inputs "/lib/libSDL2_mixer-2.0.so.0"))))))))
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cffi" ,sbcl-cffi)
- ("data-sift" ,sbcl-data-sift)
- ("hunchentoot" ,sbcl-hunchentoot)
- ("libcap" ,libcap)
- ("routes" ,sbcl-routes)))
- (home-page "https://github.com/archimag/restas")
- (synopsis "Common Lisp web framework")
- (description "@code{RESTAS} is a Common Lisp web application framework.")
- (license license:llgpl))))
+ (list sbcl-alexandria
+ sbcl-cl-autowrap
+ sbcl-sdl2
+ sbcl-trivial-garbage
+ sdl2-mixer))
+ (home-page "https://github.com/lispgames/cl-sdl2-mixer")
+ (synopsis "Bindings for sdl2_mixer using autowrap for Common Lisp")
+ (description
+ "This package provides a Common Lisp wrapper system for the SDL 2.0 Mixer C
+Library.")
+ (license license:expat))))
-(define-public cl-restas
- (sbcl-package->cl-source-package sbcl-restas))
+(define-public cl-sdl2-mixer
+ (sbcl-package->cl-source-package sbcl-sdl2-mixer))
-(define-public ecl-restas
- (sbcl-package->ecl-package sbcl-restas))
+(define-public ecl-sdl2-mixer
+ (sbcl-package->ecl-package sbcl-sdl2-mixer))
-(define-public sbcl-zsort
- (let ((commit "f6724a6fff7662a942195cedb0d7f00da59c74ed")
+(define-public sbcl-sdl2-ttf
+ (let ((commit "6dd2df2fb3a79ec4f835e3bc882e60e8da039878")
(revision "1"))
(package
- (name "sbcl-zsort")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-sdl2-ttf")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jorgetavares/zsort")
+ (url "https://github.com/lispgames/cl-sdl2-ttf")
(commit commit)))
- (file-name (git-file-name "cl-zsort" version))
+ (file-name (git-file-name "cl-sdl2-ttf" version))
(sha256
- (base32 "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49"))))
+ (base32 "07c1bl66dix6ccnyl9mqd6lbk10f9s25985zmv6lss95491ng7my"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/library.lisp"
+ (("libSDL2_ttf-2.0.so.0")
+ (search-input-file inputs "/lib/libSDL2_ttf-2.0.so.0")))))
+ (add-after 'unpack 'fix-critical-warning
+ (lambda _
+ (substitute* "src/helpers.lisp"
+ (("nreverse") "reverse")))))))
(inputs
- (list sbcl-alexandria))
- (home-page "https://github.com/jorgetavares/zsort")
- (synopsis "Collection of portable sorting algorithms in Common Lisp")
+ (list sdl2-ttf
+ sbcl-alexandria
+ sbcl-cffi
+ sbcl-cl-autowrap
+ sbcl-defpackage-plus
+ sbcl-sdl2
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/lispgames/cl-sdl2-ttf")
+ (synopsis "SDL2_ttf wrapper for Common Lisp")
(description
- "@code{zsort} is a collection of portable sorting algorithms. Common
-Lisp provides the @code{sort} and @code{stable-sort} functions but these can
-have different algorithms implemented according to each implementation. Also,
-the standard sorting functions might not be the best for a certain situations.
-This library aims to provide developers with more options.")
+ "This is a wrapper for the SDL2_TTF library used for loading fonts and
+creating text assets. The library, in it's current state, can load TTF and
+OTF fonts and render fonts with the three different rendering modes provided
+by the C library (solid, shaded, and blended). While Latin text, UTF8,
+UNICODE, and Glyph text rendering is available only Latin text has been
+tested (as shown in the examples).")
(license license:expat))))
-(define-public cl-zsort
- (sbcl-package->cl-source-package sbcl-zsort))
+(define-public cl-sdl2-ttf
+ (sbcl-package->cl-source-package sbcl-sdl2-ttf))
-(define-public ecl-zsort
- (sbcl-package->ecl-package sbcl-zsort))
+(define-public ecl-sdl2-ttf
+ (sbcl-package->ecl-package sbcl-sdl2-ttf))
-(define-public sbcl-cl-https-everywhere
- ;; No release.
- ;; Don't forget to update the https-everywhere input.
- (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8"))
+(define-public sbcl-sealable-metaobjects
+ (let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee"))
(package
- (name "sbcl-cl-https-everywhere")
+ (name "sbcl-sealable-metaobjects")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ruricolist/cl-https-everywhere/")
+ (url "https://github.com/marcoheisig/sealable-metaobjects/")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "cl-sealable-metaobjects" version))
(sha256
- (base32 "1wcvx1icwym1ncd6wl1wxzkyyndrm796caalbklvjd4a2cbl3xxi"))))
+ (base32 "0hz1ivlpfhnk1w2cw4q2i000j2dc7maay06ndzziyywg7li6zf2p"))))
(build-system asdf-build-system/sbcl)
(inputs
- `(("alexandria" ,sbcl-alexandria)
- ("global-vars" ,sbcl-global-vars)
- ("parenscript" ,sbcl-parenscript)
- ("cl-markdown" ,sbcl-cl-markdown)
- ("cl-tld" ,sbcl-cl-tld)
- ("fxml" ,sbcl-fxml)
- ("overlord" ,sbcl-overlord)
- ("ppcre" ,sbcl-cl-ppcre)
- ("serapeum" ,sbcl-serapeum)
- ("trivial-gray-streams" ,sbcl-trivial-gray-streams)
- ("vernacular" ,sbcl-vernacular)))
- (native-inputs
- `(("fiveam" ,sbcl-fiveam)
- ("https-everywhere"
- ,(let ((version "2021.7.13"))
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/EFForg/https-everywhere")
- (commit version)))
- (file-name (git-file-name "https-everywhere" version))
- (sha256
- (base32
- "1k5gj29imhxf47sv3d8rxyrgr6k65scp2fm040va3nfshayslzia")))))))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'link-https-everywhere-repo
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((https-everywhere (assoc-ref inputs "https-everywhere")))
- (symlink https-everywhere "https-everywhere"))))
- (add-after 'unpack 'fix-overlord-build
- ;; Upstream bugs? See
- ;; https://github.com/ruricolist/cl-https-everywhere/issues/1.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (rulesets.xml (string-append out "/share/common-lisp/" (%lisp-type)
- "/cl-https-everywhere/rulesets.xml")))
- (substitute* "build.lisp"
- (("\\(depends-on https-everywhere-version\\)") "")
- ;; Don't rebuild the rulesets just because the timestamp is epoch.
- (("\\(vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"\\)")
- (format #f "(if (uiop:file-exists-p ~s)
- (compile-rulesets ~s)
- (vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"))"
- rulesets.xml
- rulesets.xml))
- (("\\(uiop:parse-unix-namestring \"https-everywhere/src/chrome/content/rules/\\*\\.xml\")")
- "\"https-everywhere/src/chrome/content/rules/*.xml\"")
- (("\\(out temp :external-format :utf-8\\)")
- "(out temp :external-format :utf-8 :if-exists :supersede)")))
- #t)))))
- (home-page "https://github.com/ruricolist/cl-https-everywhere/")
- (synopsis "Use HTTPS Everywhere rules from Lisp")
+ (list sbcl-closer-mop))
+ (home-page "https://github.com/marcoheisig/sealable-metaobjects/")
+ (synopsis "CLOSsy way to trade genericity for performance")
(description
- "CL-HTTPS-EVERYWHERE parses HTTPS Everywhere rulesets and makes them
-available for use in Lisp programs.")
- (license (list license:expat
- ;; For the ruleset
- license:gpl2+)))))
+ "This library is an extension of the Common Lisp Object System (CLOS)
+that allows a compiler to inline a generic function under certain
+conditions.")
+ (license license:expat))))
-(define-public cl-https-everywhere
- (sbcl-package->cl-source-package sbcl-cl-https-everywhere))
+(define-public cl-sealable-metaobjects
+ (sbcl-package->cl-source-package sbcl-sealable-metaobjects))
-(define-public sbcl-magic-ed
- (let ((commit "30bb27832d4e3e362578e7320934638f9889a8c4")
- (revision "1"))
+(define-public ecl-sealable-metaobjects
+ (sbcl-package->ecl-package sbcl-sealable-metaobjects))
+
+(define-public sbcl-secret-values
+ (let ((commit "72996c0551eea338afa355ee90e20171ac74ebd4")
+ (revision "0"))
(package
- (name "sbcl-magic-ed")
- (version (git-version "0.2" revision commit))
+ (name "sbcl-secret-values")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sanel/magic-ed")
+ (url "https://github.com/rotatef/secret-values")
(commit commit)))
- (file-name (git-file-name "cl-magic-ed" version))
+ (file-name (git-file-name "cl-secret-values" version))
(sha256
- (base32 "1j6il4lif0dy6hqiz6n91yl8dvii9pk1i9vz0faq5mnr42mr7i5f"))))
+ (base32 "07ph49s27gvjzx60yy094bb9ddwiys34r8cx5l837i34nm2fn3nh"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/sanel/magic-ed")
- (synopsis "Editing facility for Common Lisp REPL")
+ (synopsis "Hide passwords and similar secret inputs")
(description
- "Magic (ed) is a tiny editing facility for Common Lisp, where you can
-directly load, edit, manipulate and evaluate file or file content from REPL.
-This package also can be a starting point for people who are not accustomed to
-Emacs or SLIME and would like to continue using their default terminal/console
-editor with Common Lisp.")
+ "This library provides a wrapper type for secret values, to reduce the
+risk of accidentally revealing them.")
+ (home-page "https://github.com/rotatef/secret-values")
(license license:expat))))
-(define-public cl-magic-ed
- (sbcl-package->cl-source-package sbcl-magic-ed))
+(define-public cl-secret-values
+ (sbcl-package->cl-source-package sbcl-secret-values))
-(define-public ecl-magic-ed
- (sbcl-package->ecl-package sbcl-magic-ed))
+(define-public ecl-secret-values
+ (sbcl-package->ecl-package sbcl-secret-values))
-(define-public sbcl-maxpc
- (let ((commit "e5e58d053039517d30fd59ab2d128256b87790d5")
+(define-public sbcl-seedable-rng
+ (let ((commit "aa1a1564b6e07e2698df37c7a98348c4f762cb15")
(revision "1"))
(package
- (name "sbcl-maxpc")
+ (name "sbcl-seedable-rng")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eugeneia/maxpc")
+ (url "https://git.mfiano.net/mfiano/seedable-rng")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "seedable-rng" version))
(sha256
- (base32 "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"))))
+ (base32 "1ldpsbp3qrfzvknclsxj3sdyms1jf9ad20dvh4w0kw3zgahn2nr5"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://mr.gy/software/maxpc/api.html")
- (synopsis
- "Library for writing parsers and lexers based on combinatory parsing")
+ (inputs
+ (list sbcl-cl-pcg sbcl-golden-utils sbcl-ironclad))
+ (home-page "https://git.mfiano.net/mfiano/seedable-rng")
+ (synopsis "Common Lisp random number generator")
(description
- "@emph{Max’s Parser Combinators} is a simple and pragmatic library for
-writing parsers and lexers based on combinatory parsing. MaxPC is capable of
-parsing deterministic, context-free languages, provides powerful tools for
-parse tree transformation and error handling, and can operate on
-@dfn{sequences} and @dfn{streams}. It supports unlimited backtracking, but
-does not implement @url{http://pdos.csail.mit.edu/~baford/packrat/thesis/,
-Packrat Parsing}. Instead, MaxPC achieves good performance through its
-optimized primitives, and explicit separation of matching and capturing input.
-In practice, MaxPC parsers perform better on typical computer languages—when
-compared to Packrat parsers—at the expense of not producing linear-time
-parsers.")
- (license license:agpl3))))
+ "SEEDABLE-RNG provides a convenient means of generating random numbers
+that are seedable with deterministic results across hardware and Common Lisp
+implementations.")
+ (license license:expat))))
-(define-public cl-maxpc
- (sbcl-package->cl-source-package sbcl-maxpc))
+(define-public cl-seedable-rng
+ (sbcl-package->cl-source-package sbcl-seedable-rng))
-(define-public ecl-maxpc
- (sbcl-package->ecl-package sbcl-maxpc))
+(define-public ecl-seedable-rng
+ (sbcl-package->ecl-package sbcl-seedable-rng))
-(define-public sbcl-snakes
- (let ((commit "8c7eae579bb24539dbd584a81a1049f3d3ff8bf8")
+(define-public sbcl-select
+ (let ((commit "df7920fc451b6d15345040ce4a3ee1ea2818ab1a")
(revision "0"))
(package
- (name "sbcl-snakes")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-select")
+ (version (git-version "1.0.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/BnMcGn/snakes")
- (commit commit)))
- (sha256
- (base32 "1ibp919qcpm6kg67b507kpjzdlhpdjr7vkh9vabln3a75k8lnlsg"))
- (file-name (git-file-name "cl-snakes" commit))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Lisp-Stat/select")
+ (commit commit)))
+ (file-name (git-file-name "cl-select" version))
+ (sha256
+ (base32 "0bhpvfqp7n33pia4y62qi31bx86gjl2nxjy529rfawac57c9rxv3"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
- sbcl-cl-cont
- sbcl-cl-utilities
- sbcl-closer-mop
- sbcl-fiveam
- sbcl-iterate))
- (home-page "https://github.com/BnMcGn/snakes")
- (synopsis "Python-like generators for Common Lisp")
+ sbcl-anaphora
+ sbcl-let-plus))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://lisp-stat.github.io/select/")
+ (synopsis "Library for taking slices from array-like objects")
(description
- "This package provides Python style generators for Common Lisp.
-It also includes a port of itertools.")
- (license license:asl2.0))))
+ "This is a library for selecting portions of sequences, arrays or
+data-frames.")
+ (license license:ms-pl))))
-(define-public cl-snakes
- (sbcl-package->cl-source-package sbcl-snakes))
+(define-public cl-select
+ (sbcl-package->cl-source-package sbcl-select))
-(define-public ecl-snakes
- (sbcl-package->ecl-package sbcl-snakes))
+(define-public ecl-select
+ (sbcl-package->ecl-package sbcl-select))
-(define-public sbcl-random-state
- (let ((commit "c270d4f15e0b66ba9680ca8734a5de56959cb118")
- (revision "1"))
+(define-public sbcl-serapeum
+ (let ((commit "c08442a9757b7fa30ac345cb040e1642f97f6b78")
+ (revision "12"))
(package
- (name "sbcl-random-state")
- (version (git-version "0.1.0" revision commit))
+ (name "sbcl-serapeum")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/ruricolist/serapeum")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/random-state")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-random-state" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0r3bk6hqpr0qmpza93pknl8wpsd6y0yy9qg7vz751a7gzzww9vj6"))))
+ (base32 "1sabd048agvgv7bhbw126rci9hf45fk08zhghcv6an2h6xwmc3qv"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/random-state/")
- (synopsis "Portable random number generation")
+ (list sbcl-alexandria
+ sbcl-trivia
+ sbcl-split-sequence
+ sbcl-string-case
+ sbcl-parse-number
+ sbcl-trivial-garbage
+ sbcl-bordeaux-threads
+ sbcl-parse-declarations
+ sbcl-introspect-environment
+ sbcl-trivial-cltl2
+ sbcl-global-vars
+ sbcl-trivial-file-size
+ sbcl-trivial-macroexpand-all))
+ (native-inputs
+ (list sbcl-atomics
+ sbcl-fiveam
+ sbcl-local-time))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "serapeum.asd"
+ ;; Guix does not have Quicklisp, and probably never will.
+ (("\\(:file \"quicklisp\"\\)") "")))))))
+ (synopsis "Common Lisp utility library beyond Alexandria")
(description
- "This library is a collection of @dfn{pseudo random number generators}.
+ "Serapeum is a conservative library of Common Lisp utilities. It is a
+supplement, not a competitor, to Alexandria.")
+ (license license:expat))))
-While Common Lisp does provide a @code{RANDOM} function, it does not allow the
-user to pass an explicit @code{SEED}, nor to portably exchange the random
-state between implementations. This can be a headache in cases like games,
-where a controlled seeding process can be very useful.
+(define-public cl-serapeum
+ (sbcl-package->cl-source-package sbcl-serapeum))
-For both curiosity and convenience, this library offers multiple algorithms to
-generate random numbers, as well as a bunch of generally useful methods to
-produce desired ranges.")
- (license license:zlib))))
+(define-public ecl-serapeum
+ (sbcl-package->ecl-package sbcl-serapeum))
-(define-public cl-random-state
- (sbcl-package->cl-source-package sbcl-random-state))
+(define-public sbcl-series
+ (let ((commit "da9061b336119d1e5214aff9117171d494d5a58a")
+ (revision "1"))
+ (package
+ (name "sbcl-series")
+ (version (git-version "2.2.11" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.code.sf.net/p/series/series")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ ;; Disable the tests, they are apparently buggy and I didn't find
+ ;; a simple way to make them run and pass.
+ '(#:tests? #f))
+ (synopsis "Series data structure for Common Lisp")
+ (description
+ "This Common Lisp library provides a series data structure much like
+a sequence, with similar kinds of operations. The difference is that in many
+situations, operations on series may be composed functionally and yet execute
+iteratively, without the need to construct intermediate series values
+explicitly. In this manner, series provide both the clarity of a functional
+programming style and the efficiency of an iterative programming style.")
+ (home-page "https://series.sourceforge.net/")
+ (license license:expat))))
-(define-public ecl-random-state
- (sbcl-package->ecl-package sbcl-random-state))
+(define-public cl-series
+ (sbcl-package->cl-source-package sbcl-series))
-(define-public sbcl-decimals
+(define-public ecl-series
+ (sbcl-package->ecl-package sbcl-series))
+
+(define-public sbcl-sha1
+ (let ((commit "be8b1b155c3a6ad3eb9b200212af6ff52f5611de")
+ (revision "0"))
+ (package
+ (name "sbcl-sha1")
+ (version (git-version "1.0" revision commit))
+ (home-page "https://github.com/massung/sha1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/massung/sha1")
+ (commit commit)))
+ (file-name (git-file-name "cl-sha1" version))
+ (sha256
+ (base32 "1cfn0j5yfwqkwr2dm73wr9hz8dmws3ngxlbk9886ahxkg544qx4z"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "SHA1 Digest and HMAC for Common Lisp")
+ (description
+ "This is a very simple implementation of SHA1 and HMAC-SHA1 for
+Common Lisp. The code is intended to be easy to follow and is therefore a
+little slower than it could be.")
+ (license license:asl2.0))))
+
+(define-public cl-sha1
+ (sbcl-package->cl-source-package sbcl-sha1))
+
+(define-public ecl-sha1
+ (sbcl-package->ecl-package sbcl-sha1))
+
+(define-public sbcl-shadow
+ (let ((commit "b2031adbfba3579b48c9d39ad997e19b79b6852f")
+ (revision "1"))
+ (package
+ (name "sbcl-shadow")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.mfiano.net/mfiano/shadow")
+ (commit commit)))
+ (file-name (git-file-name "shadow" version))
+ (sha256
+ (base32 "0w1i734gkdkziin74ql2nhx7jdjxx02ylssaa6qdrvnj4br1124a"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cffi
+ sbcl-cl-opengl
+ sbcl-glsl-packing
+ sbcl-golden-utils
+ sbcl-static-vectors
+ sbcl-varjo))
+ (home-page "https://git.mfiano.net/mfiano/shadow")
+ (synopsis "Management system for OpenGL shader programs")
+ (description
+ "This package provides a Common Lisp library for defining OpenGL shader
+programs. There are also functions for referencing shader programs by name,
+querying for basic information about them, modifying uniform variables
+throughout the lifecycle of an OpenGL application, and managing certain OpenGL
+buffer object types (UBO, SSBO currently).")
+ (license license:expat))))
+
+(define-public cl-shadow
+ (sbcl-package->cl-source-package sbcl-shadow))
+
+(define-public ecl-shadow
+ (sbcl-package->ecl-package sbcl-shadow))
+
+(define-public sbcl-shared-preferences
(package
- (name "sbcl-decimals")
- (version "2021")
+ (name "sbcl-shared-preferences")
+ (version "1.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tlikonen/cl-decimals")
- (commit version)))
- (file-name (git-file-name "cl-decimals" version))
+ (url "https://github.com/Hexstream/shared-preferences")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-shared-preferences" version))
(sha256
- (base32 "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6"))))
+ (base32 "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/tlikonen/cl-decimals")
- (synopsis "Decimal number parser and formatting package for Common Lisp")
- (description "This Common Lisp package offers functions for parsing and
-formatting decimal numbers. The package's main interface are the functions
-@code{parse-decimal-number} and @code{format-decimal-number}. The former is
-for parsing strings for decimal numbers and the latter for pretty-printing
-them as strings.")
- (license license:cc0)))
+ (native-inputs
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-inheriting-readers
+ sbcl-trivial-garbage))
+ (home-page "https://www.hexstreamsoft.com/libraries/shared-preferences/")
+ (synopsis "Flexible specification of package-local preferences")
+ (description
+ "This package allows flexible specification of package-local preferences.")
+ (license license:unlicense)))
-(define-public cl-decimals
- (sbcl-package->cl-source-package sbcl-decimals))
+(define-public cl-shared-preferences
+ (sbcl-package->cl-source-package sbcl-shared-preferences))
-(define-public ecl-decimals
- (sbcl-package->ecl-package sbcl-decimals))
+(define-public ecl-shared-preferences
+ (sbcl-package->ecl-package sbcl-shared-preferences))
+
+(define-public sbcl-shasht
+ (let ((commit "27ba0a8842e103f2d575b3c8bbcfc19bd172d9ea")
+ (revision "2"))
+ (package
+ (name "sbcl-shasht")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/yitzchak/shasht")
+ (commit commit)))
+ (file-name (git-file-name "cl-shasht" version))
+ (sha256
+ (base32 "1y7qh8kdhk06243vkmxzdk0y9rax4g8pv28bd01j48ix777mpcdc"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-alexandria sbcl-parachute))
+ (inputs
+ (list sbcl-closer-mop sbcl-trivial-do))
+ (home-page "https://yitzchak.github.io/shasht/")
+ (synopsis "Common Lisp JSON reading and writing library")
+ (description
+ "This package provides a Common Lisp library to work with the JSON file
+format.")
+ (license license:expat))))
+
+(define-public cl-shasht
+ (sbcl-package->cl-source-package sbcl-shasht))
+
+(define-public ecl-shasht
+ (sbcl-package->ecl-package sbcl-shasht))
+
+(define-public sbcl-shlex
+ (let ((commit "3dee1cb7c0140fa7660ca7a3b2ac5e75d1218e5c")
+ (revision "2"))
+ (package
+ (name "sbcl-shlex")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ruricolist/cl-shlex")
+ (commit commit)))
+ (file-name (git-file-name "cl-shlex" version))
+ (sha256
+ (base32 "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-serapeum sbcl-cl-ppcre sbcl-cl-unicode))
+ (home-page "https://github.com/ruricolist/cl-shlex")
+ (synopsis "Common Lisp lexical analyzer for shell-like syntaxes")
+ (description
+ "This library contains a lexer for syntaxes that use shell-like rules
+for quoting and commenting. It is a port of the @code{shlex} module from Python’s
+standard library.")
+ (license license:expat))))
+
+(define-public ecl-shlex
+ (sbcl-package->ecl-package sbcl-shlex))
+
+(define-public cl-shlex
+ (sbcl-package->cl-source-package sbcl-shlex))
(define-public sbcl-simple-date-time
(let ((commit "d6992afddedf67a8172a0120a1deac32afcaa2e8")
@@ -26748,4315 +26209,5284 @@ them as strings.")
(define-public ecl-simple-date-time
(sbcl-package->ecl-package sbcl-simple-date-time))
-(define-public sbcl-april
- (let ((commit "bdd74f168ec82f28fe4ab692f2c0af39441a5701")
- (revision "3"))
+(define-public sbcl-simple-guess
+ (let ((commit "34744e3200a96e6aba285d70f91cdbd6c25508a6")
+ (revision "0"))
(package
- (name "sbcl-april")
+ (name "sbcl-simple-guess")
(version (git-version "1.0" revision commit))
(source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Hexstream/simple-guess")
+ (commit commit)))
+ (file-name (git-file-name "cl-simple-guess" version))
+ (sha256
+ (base32 "0404vj7ln97x7rn9ypbw4rshs56nnpyjnh1z9k03s039s5q3kpv0"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fakenil sbcl-parachute))
+ (inputs
+ (list sbcl-cesdi
+ sbcl-closer-mop
+ sbcl-compatible-metaclasses
+ sbcl-evaled-when))
+ (home-page "https://www.hexstreamsoft.com/libraries/simple-guess/")
+ (synopsis "Extensible protocol for computing a guess using advisors")
+ (description
+ "This package defines a simple extensible protocol for computing a guess
+using advisors.")
+ (license license:unlicense))))
+
+(define-public cl-simple-guess
+ (sbcl-package->cl-source-package sbcl-simple-guess))
+
+(define-public ecl-simple-guess
+ (sbcl-package->ecl-package sbcl-simple-guess))
+
+(define-public sbcl-simple-inferiors
+ (let ((commit "deac886354e03f8a9502ce96f12a0459ce3be671"))
+ (package
+ (name "sbcl-simple-inferiors")
+ (version (git-version "1.1.0" "1" commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phantomics/april")
+ (url "https://github.com/Shinmera/simple-inferiors")
(commit commit)))
- (file-name (git-file-name "cl-april" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0hvlp2286z1ksa7jr7r661kdr0lpfv25n5chl72jrzq5zz70lidx"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Remove bundled Apache-relicensed MaxPC.
- (delete-file-recursively "maxpc-apache")
- ;; Ensure references are to upstream MaxPC.
- (substitute* "vex/vex.asd"
- (("maxpc-apache") "maxpc"))))))
+ (base32 "08vsvqv3768bwb2y8mwxbw5wyqzzwqr7rd004r6gafdgf9p9mcx3"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-array-operations
- sbcl-cl-ppcre
- sbcl-cl-unicode
- sbcl-lparallel
- sbcl-maxpc
- sbcl-parse-number
- sbcl-prove
- sbcl-random-state
- sbcl-serapeum
- sbcl-simple-date-time
- sbcl-symbol-munger
- sbcl-trivia))
- (home-page "https://github.com/phantomics/april")
- (synopsis "Array Programming Re-Imagined in Lisp")
+ (list sbcl-bordeaux-threads sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/simple-inferiors/")
+ (synopsis "Common Lisp library to use inferior processes")
(description
- "April compiles a subset of the APL programming language into
-Common Lisp. Leveraging Lisp's powerful macros and numeric processing
-faculties, it brings APL's expressive potential to bear for Lisp developers.
-Replace hundreds of lines of number-crunching code with a single line of
-APL.")
- (license license:asl2.0))))
+ "This is a library to allow easy handling of external processes, and
+primarily to get their output. It handles proper copying of the standard and
+error outputs of the process simultaneously, both in a sequential and parallel
+fashion. It also features a lazy directory switching mechanism, to avoid
+running into parallelism problems when having to change directory.")
+ (license license:zlib))))
-(define-public cl-april
- (sbcl-package->cl-source-package sbcl-april))
+(define-public cl-simple-inferiors
+ (sbcl-package->cl-source-package sbcl-simple-inferiors))
-(define-public ecl-april
- (sbcl-package->ecl-package sbcl-april))
+(define-public ecl-simple-inferiors
+ (sbcl-package->ecl-package sbcl-simple-inferiors))
-(define-public sbcl-cl-sxml
- (let ((commit "e5542b1d9bd6cee03ae27547d00660ccfbb60109")
+(define-public sbcl-simple-neural-network
+ (package
+ (name "sbcl-simple-neural-network")
+ (version "3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/glv/simple-neural-network")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "simple-neural-network" version))
+ (sha256
+ (base32 "1jj1c90fr5clwka0jv32hv6xp1bkdlpa6x5jh19an13rhx8ll4zr"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ `(("chipz" ,sbcl-chipz)
+ ("fiveam" ,sbcl-fiveam)))
+ (inputs
+ `(("cl-store" ,sbcl-cl-store)
+ ("lparallel" ,sbcl-lparallel)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'check 'remove-test-data
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each delete-file (find-files out "\\.gz$"))))))))
+ (synopsis "Simple neural network in Common Lisp")
+ (description
+ "@code{simple-neural-network} is a Common Lisp library for creating,
+training and using basic neural networks. The networks created by this
+library are feedforward neural networks trained using backpropagation.")
+ (home-page "https://codeberg.org/glv/simple-neural-network")
+ (license license:gpl3+)))
+
+(define-public cl-simple-neural-network
+ (sbcl-package->cl-source-package sbcl-simple-neural-network))
+
+(define-public ecl-simple-neural-network
+ (sbcl-package->ecl-package sbcl-simple-neural-network))
+
+(define-public sbcl-simple-parallel-tasks
+ (let ((commit "ce7b60f788d8f68dfb69b24aac54c0e3b63379a6")
(revision "1"))
(package
- (name "sbcl-cl-sxml")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-simple-parallel-tasks")
+ (version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/eadmund/cl-sxml")
+ (url "https://codeberg.org/glv/simple-parallel-tasks")
(commit commit)))
- (file-name (git-file-name "cl-sxml" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"))))
+ (base32 "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"))))
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cxml))
(native-inputs
- (list sbcl-fiveam
- sbcl-flexi-streams))
- (home-page "https://github.com/eadmund/cl-sxml")
- (synopsis "SXML parsing for Common Lisp")
- (description
- "@code{CL-SXML} implements Oleg Kiselyov’s SXML, an S-expression-based
-rendering of the XML Infoset.")
- (license license:gpl3+))))
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-chanl))
+ (synopsis "Common Lisp library to evaluate some forms in parallel")
+ (description "This is a simple Common Lisp library to evaluate some
+forms in parallel.")
+ (home-page "https://codeberg.org/glv/simple-parallel-tasks")
+ (license license:gpl3))))
-(define-public cl-sxml
- (sbcl-package->cl-source-package sbcl-cl-sxml))
+(define-public cl-simple-parallel-tasks
+ (sbcl-package->cl-source-package sbcl-simple-parallel-tasks))
-(define-public ecl-cl-sxml
- (sbcl-package->ecl-package sbcl-cl-sxml))
+(define-public ecl-simple-parallel-tasks
+ (sbcl-package->ecl-package sbcl-simple-parallel-tasks))
-(define-public sbcl-lorem-ipsum
- (let ((commit "04a1839a03b53c954e799b9cf570ac915b032ce8")
- (revision "0"))
+(define-public sbcl-simple-rgb
+ (let ((commit "ba9b0689362c28aa6a91c0636796c6c372657293")
+ (revision "1"))
(package
- (name "sbcl-lorem-ipsum")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-simple-rgb")
+ (version (git-version "0.01" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/phoe/lorem-ipsum")
- (commit commit)))
- (sha256
- (base32 "1530qq0bk3xr25m77q96pbi1idnxdkax8cwmvq4ch03rfjy34j7n"))
- (file-name (git-file-name "cl-lorem-ipsum" commit))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wmannis/simple-rgb/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/phoe/lorem-ipsum")
- (synopsis "Lorem ipsum generator in portable Common Lisp")
+ (home-page "https://github.com/wmannis/simple-rgb")
+ (synopsis "Manipulate colors in RGB format")
(description
- "This package provides functions for generating lorem ipsum text.")
- (license license:expat))))
+ "This Common Lisp library focuses on the small set of basic color
+manipulations (lightening, compliments, etc.) you might use to generate a
+color palette for a GUI or web page.")
+ (license license:bsd-2))))
-(define-public cl-lorem-ipsum
- (sbcl-package->cl-source-package sbcl-lorem-ipsum))
+(define-public ecl-simple-rgb
+ (sbcl-package->ecl-package sbcl-simple-rgb))
-(define-public ecl-lorem-ipsum
- (sbcl-package->ecl-package sbcl-lorem-ipsum))
+(define-public cl-simple-rgb
+ (sbcl-package->cl-source-package sbcl-simple-rgb))
-(define-public sbcl-asd-generator
- (let ((commit "27f94971a7c68c4dcb51e3f6be4142743d0c44e8")
- (revision "0"))
+(define-public sbcl-simple-routes
+ (let ((commit "6f88c38945a4de73e85786d3499c39cacb400598")
+ (revision "1"))
(package
- (name "sbcl-asd-generator")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-simple-routes")
+ (version (git-version "0.3" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/phoe/asd-generator")
- (commit commit)))
- (sha256
- (base32 "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"))
- (file-name (git-file-name "cl-asd-generator" commit))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/vancan1ty/simple-routes")
+ (commit commit)))
+ (file-name (git-file-name "cl-simple-routes" version))
+ (sha256
+ (base32 "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-fad
- sbcl-iterate
- sbcl-alexandria
- sbcl-trivia))
- (home-page "https://github.com/phoe/asd-generator")
- (synopsis "Automatic generator for .asd files")
+ (list sbcl-cl-ppcre
+ sbcl-hunchentoot))
+ (home-page "https://gitlab.com/vancan1ty/simple-routes")
+ (synopsis "URL routing library for Hunchentoot")
(description
- "This package provides an automatic generator for ASDF's .asd files.")
- (license license:gpl3+))))
+ "@code{simple-routes} is a simple Common Lisp RESTful routing facility
+on top of Hunchentoot.")
+ (license license:bsd-2))))
-(define-public cl-asd-generator
- (sbcl-package->cl-source-package sbcl-asd-generator))
+(define-public cl-simple-routes
+ (sbcl-package->cl-source-package sbcl-simple-routes))
-(define-public ecl-asd-generator
- (sbcl-package->ecl-package sbcl-asd-generator))
+(define-public ecl-simple-routes
+ (sbcl-package->ecl-package sbcl-simple-routes))
-(define-public sbcl-cl-gopher
- (let ((commit "0899e7fa2134206f9d9778c7d53c49b7a59ff070")
- (revision "3"))
+(define-public sbcl-simple-tasks
+ (let ((commit "745d4b54eac9bf5d6909792e63ecd2ef8d303cf2")
+ (revision "1"))
(package
- (name "sbcl-cl-gopher")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-simple-tasks")
+ (version (git-version "1.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/knusbaum/cl-gopher")
+ (url "https://github.com/Shinmera/simple-tasks")
(commit commit)))
- (file-name (git-file-name "cl-gopher" version))
+ (file-name (git-file-name "simple-tasks" version))
(sha256
- (base32 "1ky4s33m5d0wvdaqji12pxr93qqfl5x62zjp3m4ihbdj0ws3yw2f"))
- (snippet
- '(begin
- ;; These files are mostly examples (that assume Quicklisp) which
- ;; drag the SBCL package into the CL package.
- (for-each delete-file
- '("cl-gopher-network.lsh"
- "cl-gopher-start.lsh"))
- #t))))
+ (base32 "1ls1pij7dvb65g4nam7nvik1218jvfk5iplr48vy290fw3lq7v98"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-bordeaux-threads
- sbcl-drakma
- sbcl-flexi-streams
- sbcl-quri
- sbcl-split-sequence
- sbcl-usocket))
- (home-page "https://github.com/knusbaum/cl-gopher")
- (synopsis "Gopher protocol library in Common Lisp")
- (description
- "@code{cl-gopher} is a Common Lisp library for interacting with the
-Gopher protocol.
-
-It is suitable for building both clients and servers, and provides a sample
-client.")
- (license license:bsd-2))))
+ (list sbcl-array-utils sbcl-bordeaux-threads sbcl-dissect))
+ (home-page "https://shinmera.github.io/simple-tasks/")
+ (synopsis "Simple task scheduling framework")
+ (description "This is a task scheduling framework for Common Lisp.")
+ (license license:zlib))))
-(define-public cl-gopher
- (sbcl-package->cl-source-package sbcl-cl-gopher))
+(define-public cl-simple-tasks
+ (sbcl-package->cl-source-package sbcl-simple-tasks))
-(define-public ecl-cl-gopher
- (sbcl-package->ecl-package sbcl-cl-gopher))
+(define-public ecl-simple-tasks
+ (sbcl-package->ecl-package sbcl-simple-tasks))
-(define-public sbcl-phos
- (let ((commit "6620b82b091cdfed655e1093ef045dbe518d5474"))
+(define-public sbcl-simplified-types
+ (let ((commit "8fd0727a70a9de76289ac62c1567b8d278e7434e")
+ (revision "0"))
(package
- (name "sbcl-phos")
- (version (git-version "0.0.1" "1" commit))
+ (name "sbcl-simplified-types")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/omar-polo/phos")
+ (url "https://github.com/marcoheisig/simplified-types")
(commit commit)))
- (file-name (git-file-name "phos" version))
+ (file-name (git-file-name "cl-simplified-types" version))
(sha256
- (base32
- "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"))))
+ (base32 "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-quri sbcl-cl-ppcre sbcl-trivia sbcl-usocket sbcl-cl+ssl
- ;; For the experimental GUI:
- sbcl-nodgui))
- (native-inputs
- (list sbcl-clunit2))
- (home-page "https://github.com/omar-polo/phos")
- (synopsis "Gemini client library and experimental GUI")
- (description "This package contains a Gemini client library for Common
-Lisp. A subsystem offers an experimental GUI Gemini client.")
- (license license:isc))))
+ (list sbcl-alexandria
+ sbcl-introspect-environment
+ sbcl-trivia))
+ (home-page "https://github.com/marcoheisig/simplified-types")
+ (synopsis "Simplify Common Lisp type specifiers")
+ (description
+ "Simplified-Types is a library that provides functions for simplifying
+Common Lisp type specifiers. The API consists of two functions:
-(define-public cl-phos
- (sbcl-package->cl-source-package sbcl-phos))
+@itemize
+@item @code{simplify-type} takes a type specifier and, optionally, an
+environment, and returns the corresponding simplified type.
+@item @code{simplified-type-of} takes an object and returns the simplified
+type of that object.
+@end itemize")
+ (license license:expat))))
-(define-public ecl-phos
- (sbcl-package->ecl-package sbcl-phos))
+(define-public cl-simplified-types
+ (sbcl-package->cl-source-package sbcl-simplified-types))
-(define-public sbcl-germinal
- (let ((commit "5bfb371ea57dae8985c0e1c6f184f0338487d684")
- (revision "0"))
+(define-public ecl-simplified-types
+ (sbcl-package->ecl-package sbcl-simplified-types))
+
+(define-public sbcl-sketch
+ ;; No release in years.
+ (let ((commit "4cc00b08e202c7adda41391463096cf9df1705c3"))
(package
- (name "sbcl-germinal")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-sketch")
+ (version (git-version "2017-11" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.carcosa.net/jmcbray/germinal")
+ (url "https://github.com/vydd/sketch")
(commit commit)))
- (file-name (git-file-name "cl-germinal" version))
+ (file-name (git-file-name "cl-sketch" version))
(sha256
- (base32 "12jypa8m10825lp5yxfcm1fyk3r4ziwcri7ndxa0m5dz0y7hggck"))))
+ (base32 "1qrnma8yvmxps9rz3pvlzsir37namppsldijdlr4110pcwi9j9h6"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cl+ssl
- sbcl-cl-fad
- sbcl-cl-interpol
- sbcl-cl-ppcre
- sbcl-cl-str
- sbcl-local-time
- sbcl-osicat
- sbcl-ppath
- sbcl-quri
- sbcl-trivial-mimes
- sbcl-uax-15
- sbcl-usocket))
- (home-page "https://git.carcosa.net/jmcbray/germinal")
- (synopsis "Gemini protocol server")
- (description "Germinal is a server for the Gemini protocol, written in
-Common Lisp.")
- (license license:agpl3))))
+ sbcl-cl-geometry
+ sbcl-glkit
+ sbcl-mathkit
+ sbcl-md5
+ sbcl-sdl2
+ sbcl-sdl2-image
+ sbcl-sdl2-ttf
+ sbcl-sdl2kit
+ sbcl-split-sequence
+ sbcl-static-vectors))
+ (arguments
+ '(#:asd-systems '("sketch" "sketch-examples")))
+ (home-page "https://github.com/vydd/sketch")
+ (synopsis "Creative framework for electronic art, visual design and more")
+ (description
+ "Sketch is a Common Lisp environment for the creation of electronic
+art, visual design, game prototyping, game making, computer graphics,
+exploration of human-computer interaction and more. It is inspired by
+the Processing language and shares some of the API.")
+ (license license:expat))))
-(define-public cl-germinal
- (sbcl-package->cl-source-package sbcl-germinal))
+(define-public cl-sketch
+ (sbcl-package->cl-source-package sbcl-sketch))
-(define-public ecl-germinal
- (sbcl-package->ecl-package sbcl-germinal))
+(define-public ecl-sketch
+ (sbcl-package->ecl-package sbcl-sketch))
-(define-public sbcl-css-lite
- (let ((commit "6ee4e6212ed56943d665df163d2a834b122e6273")
+(define-public sbcl-skippy
+ (let ((commit "e456210202ca702c792292c5060a264d45e47090")
(revision "0"))
(package
- (name "sbcl-css-lite")
- (version "0.01")
+ (name "sbcl-skippy")
+ (version (git-version "1.3.12" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/paddymul/css-lite")
- (commit commit)))
- (sha256
- (base32 "1lyvw7hcy09k5qs6icky23s13psqxncyc73hdyiimb66p0jx6k0d"))
- (file-name (git-file-name "cl-css-lite" commit))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/skippy")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sxbn5nh24qpx9w64x8mhp259cxcl1x8p126wk3b91ijjsj7l5vj"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/paddymul/css-lite")
- (synopsis "CSS grammar for Lisp")
+ (home-page "https://xach.com/lisp/skippy/")
+ (synopsis "Common Lisp library for GIF images")
(description
- "@code{cl-css-lite} is a library for generating CSS from an s-exp based
-syntax. When compiled with Parenscript loaded in the Lisp image, it
-also provides the same CSS generation facilities in Parenscript-generated
-JavaScript code.")
- (license license:bsd-3))))
+ "Skippy is a Common Lisp library to read and write GIF image files.")
+ (license license:bsd-2))))
-(define-public cl-css-lite
- (sbcl-package->cl-source-package sbcl-css-lite))
+(define-public cl-skippy
+ (sbcl-package->cl-source-package sbcl-skippy))
-(define-public ecl-css-lite
- (sbcl-package->ecl-package sbcl-css-lite))
+(define-public ecl-skippy
+ (sbcl-package->ecl-package sbcl-skippy))
-(define-public sbcl-nhooks
+(define-public sbcl-slime-swank
+ ;; Update together with emacs-slime.
(package
- (name "sbcl-nhooks")
- (version "1.2.2")
+ (name "sbcl-slime-swank")
+ (version "2.30")
(source
(origin
+ (file-name (git-file-name "cl-slime-swank" version))
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/nhooks")
- (commit version)))
- (file-name (git-file-name "cl-nhooks" version))
+ (url "https://github.com/slime/slime/")
+ (commit (string-append "v" version))))
(sha256
- (base32
- "1m9dfp7wjm8k16x45qnw258ca8gnic3k2ik79sdn5gxcx6qxy3g8"))))
+ (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The doc folder drags `gawk' into the closure. Doc is already
+ ;; provided by emacs-slime.
+ `(begin
+ (delete-file-recursively "doc")
+ #t))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-serapeum))
- (native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/nhooks")
- (synopsis "Hook facility for Common Lisp")
- (description "This package holds an enhanced implementation of
-hooks (extension points). It works similarly to Emacs hooks with crucial
-improvements:
-
-@itemize
-
-@item If the compiler allows it (such as SBCL), type-checking is performed at
-compile-time and at run-time when adding handlers to a hook.
-
-@item On failure, multiple restarts are offered, such as disabling the
-offending handler or simply continuing to the next function.
-
-@item The hook handler execution order and combination can be customized.
-
-@item Anonymous functions (lambdas) can be added to hooks as handler objects.
-When inspecting hooks, readable names are thus exposed instead of lambda
-blackboxes. Handlers are compared through their names (through the mandatory
-name slot). A hook can not contain multiple handlers with the same name.
-
-@item A special provision is taken for “setters”, handlers that are meant to
-set a given place to a given values. Such handler objects can be compared and
-identified uniquely.
-
-@end itemize\n")
- (license license:expat)))
+ (arguments
+ '(#:asd-systems '("swank" "swank/exts")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'set-fasl-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "swank-loader.lisp"
+ (("\\(probe-file fasl\\)" all)
+ ;; Do not try to delete Guix store files.
+ (string-append
+ all "\n"
+ " (not (equal (subseq (pathname-directory fasl) 1 3)"
+ " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH"))))))))
+ (home-page "https://github.com/slime/slime")
+ (synopsis "Common Lisp Swank server")
+ (description
+ "This is only useful if you want to start a Swank server in a Lisp
+processes that doesn't run under Emacs. Lisp processes created by
+@command{M-x slime} automatically start the server.")
+ (license (list license:gpl2+ license:public-domain))))
-(define-public cl-nhooks
- (sbcl-package->cl-source-package sbcl-nhooks))
+(define-public cl-slime-swank
+ (sbcl-package->cl-source-package sbcl-slime-swank))
-(define-public ecl-nhooks
- (sbcl-package->ecl-package sbcl-nhooks))
+(define-public ecl-slime-swank
+ (sbcl-package->ecl-package sbcl-slime-swank))
-(define-public sbcl-wordnet
- (let ((commit "8cd0db8f5e84e7a930fa74e590ecddf75cd8e5d6")
+(define-public sbcl-slite
+ (let ((commit "942a95330592d30be5ac02fb1b697fb14ccbf1af")
(revision "0"))
(package
- (name "sbcl-wordnet")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-slite")
+ (version (git-version "1.0.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/phoe/wordnet")
- (commit commit)))
- (sha256
- (base32 "07p60k295fsfcp0gmkqhrxd68hb38aqva8f4k8xk8bqqxxf42vkq"))
- (file-name (git-file-name "cl-wordnet" commit))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdrhq/slite/")
+ (commit commit)))
+ (file-name (git-file-name "slite" version))
+ (sha256
+ (base32 "0b4c4vs1zlhcvr9flv8bx76v9hrwc9qmazmp60407q7cghn0k8zk"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f)) ; There are no tests.
(inputs
- (list sbcl-split-sequence))
- (home-page "https://github.com/phoe/wordnet")
- (synopsis "Common Lisp interface to WordNet")
+ (list sbcl-cl-str
+ sbcl-fiveam
+ sbcl-parachute
+ sbcl-lisp-unit2))
+ (home-page "https://github.com/tdrhq/slite")
+ (synopsis "Common Lisp system for Slite ")
(description
- "This software provides an interface by which Common Lisp programs can
-access lexicographic data from WordNet.")
- (license license:expat))))
+ "This package provides the Common Lisp part of the emacs-slite test runner.")
+ (license license:asl2.0))))
-(define-public cl-wordnet
- (sbcl-package->cl-source-package sbcl-wordnet))
+(define-public cl-slite
+ (sbcl-package->cl-source-package sbcl-slite))
-(define-public ecl-wordnet
- (sbcl-package->ecl-package sbcl-wordnet))
+(define-public ecl-slite
+ (sbcl-package->ecl-package sbcl-slite))
-(define-public sbcl-nfiles
+(define-public emacs-slite
(package
- (name "sbcl-nfiles")
- (version "1.1.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/nfiles")
- (commit version)))
- (file-name (git-file-name "cl-nfiles" version))
- (sha256
- (base32
- "1a8zsphbbl9r4sdm95kgm4ljd9b148c9fnwlq7f930fh9826kf72"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list gnupg
- sbcl-alexandria
- sbcl-nclasses
- sbcl-quri
- sbcl-serapeum
- sbcl-trivial-garbage
- sbcl-trivial-package-local-nicknames
- sbcl-trivial-types))
- (native-inputs
- (list sbcl-lisp-unit2))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gpg.lisp"
- (("\"gpg\"")
- (string-append "\"" (assoc-ref inputs "gnupg") "/bin/gpg\""))))))))
- (home-page "https://github.com/atlas-engineer/nfiles")
- (synopsis "Manage file persistence and loading in Common Lisp")
- (description
- "NFiles is a Common Lisp library to help manage file persistence and
-loading, in particular user-centric files like configuration files. It boasts
-the following features:
-
-@itemize
-@item Dynamic and customizable path expansion.
-
-@item Extensible serialization and deserialization.
-
-@item Cached reads and writes. When a file object expands to the same path as
-another one, a read or write on it won’t do anything in case there was no
-change since last write.
-
-@item (Experimental!) On-the-fly PGP encryption.
-
-@item Profile support.
-
-@item On read error, existing files are backed up.
-
-@item On write error, no file is written to disk, the existing file is preserved.
-@end itemize\n")
- (license license:bsd-3)))
+ (inherit sbcl-slite)
+ (name "emacs-slite")
+ (build-system emacs-build-system)
+ (synopsis "SLIme-based TEst runner for FiveAM and Parachute Tests")
+ (description
+ "Slite interactively runs your Common Lisp tests (currently only FiveAM
+and Parachute are supported). It allows you to see the summary of test
+failures, jump to test definitions, rerun tests with debugger all from inside
+Emacs.
-(define-public ecl-nfiles
- (let ((pkg (sbcl-package->ecl-package sbcl-nfiles)))
- (package
- (inherit pkg)
- (inputs
- (cons (list "iolib" ecl-iolib)
- (package-inputs pkg))))))
+In order to work, this also requires the slite Common Lisp system to be
+present. See the code@{*cl-slite packages}.")))
-(define-public cl-nfiles
- (package
- (inherit (sbcl-package->cl-source-package sbcl-nfiles))
- (inputs
- (cons (list "iolib" cl-iolib)
- (package-inputs sbcl-nfiles)))))
-(define-public sbcl-nasdf
- (let ((commit "ab7a018f3a67a999c72710644b10b4545130c139"))
+(define-public sbcl-slot-extra-options
+ (let ((commit "29517d980325cd63744f1acf4cfe5c8ccec2b318"))
(package
- (name "sbcl-nasdf")
- (version "0.1.8")
+ (name "sbcl-slot-extra-options")
+ (version (git-version "1.1.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/ntemplate")
+ (url "https://github.com/some-mthfka/slot-extra-options/")
(commit commit)))
- (file-name (git-file-name "cl-ntemplate" version))
+ (file-name (git-file-name "cl-slot-extra-options" version))
(sha256
- (base32 "15j7kqxvn0blr0i2xgk0il0ia91p28clfqxdh00vlp423v9a2wbx"))))
+ (base32 "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'cd-sdl
- (lambda _
- (chdir "nasdf"))))))
- (home-page "https://github.com/atlas-engineer/ntemplate")
- (synopsis "ASDF helpers for system setup, testing and installation")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-serapeum
+ sbcl-iterate))
+ (native-inputs
+ (list sbcl-parachute))
+ (home-page "https://github.com/some-mthfka/slot-extra-options/")
+ (synopsis "Extra options for slots using MOP")
(description
- "NASDF is an ASDF extension providing utilities to ease system setup,
-testing and installation.
-
-@itemize
-@item Simple way to fetch Git submodules and “do the right thing” for
-setup. This may effectively supersede Quicklisp. A benefit of using Git
-submodules over the default Quicklisp distribution is improved
-reproducibility.
-@item Test helpers, like distinction between offline and online tests, or
-continuous integration options, and warning reports.
-@item Installation helpers, for instance to install libraries, icons and
-desktop files to the right directories.
-@end itemize\n")
- (license license:bsd-3))))
+ "This library lets you build a metaclass which in turn lets you specify
+extra slot options in its classes. Options may be easily inspected and custom
+inheritance may be set up. The Meta-Object Protocol (MOP) is used for the
+implementation - through @code{closer-mop}. Some convenience function for
+processing slot options are also available.
-(define-public ecl-nasdf
- (sbcl-package->ecl-package sbcl-nasdf))
+Possible use case: you want to automatically set up some definitions based on
+some slots, but you want to have control over it right in the class
+definition.")
+ (license license:lgpl3+))))
-(define-public cl-nasdf
- (sbcl-package->cl-source-package sbcl-nasdf))
+(define-public cl-slot-extra-options
+ (sbcl-package->cl-source-package sbcl-slot-extra-options))
-(define-public sbcl-nclasses
- (package
- (name "sbcl-nclasses")
- (version "0.6.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/nclasses")
- (commit version)))
- (file-name (git-file-name "cl-nclasses" version))
- (sha256
- (base32
- "00is7fg1jsj9r3jawphbk5gh8kmiixl7g60xg1ic2q2cpilfd1by"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-moptilities))
- (native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/nclasses")
- (synopsis "Simplify class, condition, and generic function definitions.")
- (description
- "NClasses provides helper macros to help write classes, conditions,
-generic functions, and CLOS code in general with less boilerplate.
+(define-public ecl-slot-extra-options
+ (sbcl-package->ecl-package sbcl-slot-extra-options))
-It's a fork of @code{hu.dwim.defclass-star}. It includes some bug fixes and
-extra features like type inference.")
- (license license:public-domain)))
+(define-public sbcl-slynk
+ ;; Update together with emacs-sly.
+ (let ((commit "9c43bf65b967e12cef1996f1af5f0671d8aecbf4")
+ (revision "9"))
+ (package
+ (name "sbcl-slynk")
+ (version (git-version "1.0.43" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/joaotavora/sly")
+ (commit commit)))
+ (sha256
+ (base32 "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2"))
+ (file-name (git-file-name "cl-slynk" version))))
+ (build-system asdf-build-system/sbcl)
+ (outputs '("out" "image"))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'create-asdf-configuration 'build-image
+ (lambda* (#:key outputs #:allow-other-keys)
+ (build-image (string-append
+ (assoc-ref outputs "image")
+ "/bin/slynk")
+ outputs
+ #:dependencies '("slynk"
+ "slynk/arglists"
+ "slynk/fancy-inspector"
+ "slynk/package-fu"
+ "slynk/mrepl"
+ "slynk/trace-dialog"
+ "slynk/profiler"
+ "slynk/stickers"
+ "slynk/indentation"
+ "slynk/retro"))
+ #t)))))
+ (synopsis "Common Lisp IDE for Emacs")
+ (description "SLY is a fork of SLIME, an IDE backend for Common Lisp.
+It also features a completely redesigned REPL based on Emacs's own
+full-featured @code{comint-mode}, live code annotations, and a consistent interactive
+button interface. Everything can be copied to the REPL. One can create
+multiple inspectors with independent history.")
+ (home-page "https://github.com/joaotavora/sly")
+ (license license:public-domain)
+ (properties `((cl-source-variant . ,(delay cl-slynk)))))))
-(define-public ecl-nclasses
- (sbcl-package->ecl-package sbcl-nclasses))
+(define-public cl-slynk
+ (sbcl-package->cl-source-package sbcl-slynk))
-(define-public cl-nclasses
- (sbcl-package->cl-source-package sbcl-nclasses))
+(define-public ecl-slynk
+ (let ((pkg (sbcl-package->ecl-package sbcl-slynk)))
+ (package
+ (inherit pkg)
+ (outputs '("out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'build-image))))))))
-(define-public sbcl-prompter
- (let ((commit "7890ed5d02e70aba01ceb964c6ee4f40776e7dc0")
- (revision "0"))
+(define-public sbcl-smart-buffer
+ (let ((commit "09b9a9a0b3abaa37abe9a730f5aac2643dca4e62")
+ (revision "1"))
(package
- (name "sbcl-prompter")
- (version (git-version "0.1.1" revision commit))
+ (name "sbcl-smart-buffer")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/prompter")
+ (url "https://github.com/fukamachi/smart-buffer")
(commit commit)))
- (file-name (git-file-name "cl-prompter" version))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0r15a6cagyp5x8aqx92ln2anni737h73bdshkvpzrac04ajss4md"))))
+ (base32 "0qz1zzxx0wm5ff7gpgsq550a59p0qj594zfmm2rglj97dahj54l7"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list
- sbcl-alexandria
- sbcl-calispel
- sbcl-cl-containers
- sbcl-cl-str
- sbcl-closer-mop
- sbcl-lparallel
- sbcl-moptilities
- sbcl-nclasses
- sbcl-serapeum
- sbcl-trivial-package-local-nicknames))
+ (arguments
+ '(#:asd-systems '("smart-buffer-test" "smart-buffer")))
(native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/prompter")
- (synopsis "Live-narrowing, fuzzy-matching, extensible prompt framework")
+ (list sbcl-prove
+ sbcl-babel))
+ (inputs
+ (list sbcl-xsubseq sbcl-flexi-streams))
+ (home-page "https://github.com/fukamachi/smart-buffer")
+ (synopsis "Smart octets buffer")
(description
- "This prompter library is heavily inspired by Emacs' minibuffer and
-Helm (@url{https://emacs-helm.github.io/helm/}). It only deals with the
-backend side of things, it does not handle any display. Features include
-asynchronous suggestion computation, multiple sources, actions and resumable
-prompters.")
+ "Smart-buffer provides an output buffer which changes the destination
+depending on content size.")
(license license:bsd-3))))
-(define-public cl-prompter
- (sbcl-package->cl-source-package sbcl-prompter))
+(define-public cl-smart-buffer
+ (sbcl-package->cl-source-package sbcl-smart-buffer))
-(define-public ecl-prompter
- (sbcl-package->ecl-package sbcl-prompter))
+(define-public ecl-smart-buffer
+ (sbcl-package->ecl-package sbcl-smart-buffer))
-(define-public sbcl-cl-template
- (let ((commit "46193a9a389bb950530e579eae7e6e5a18184832")
+(define-public sbcl-smug
+ (let ((commit "647a2428df297e1dd183ba7c19574bdb1320ae79")
(revision "0"))
(package
- (name "sbcl-cl-template")
- (version (git-version "0.0.1" revision commit))
- (home-page "https://github.com/alpha123/cl-template")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/alpha123/cl-template")
- (commit commit)))
- (file-name (git-file-name "cl-template" version))
- (sha256
- (base32 "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (synopsis "Template engine for Common Lisp")
- (description "@code{cl-template} is a template engine for Common Lisp,
-taking inspiration from Ruby's ERb module.")
- (license license:expat))))
-
-(define-public cl-template
- (sbcl-package->cl-source-package sbcl-cl-template))
-
-(define-public ecl-cl-template
- (sbcl-package->ecl-package sbcl-cl-template))
-
-(define-public sbcl-fast-websocket
- (let ((commit "baeeaddf1447015863d708f840ef9dfc5ff5b7a2")
- (revision "1"))
- (package
- (name "sbcl-fast-websocket")
- (version (git-version "0.1" revision commit))
- (home-page "https://github.com/fukamachi/fast-websocket")
+ (name "sbcl-smug")
+ (version (git-version "0.0.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/fast-websocket")
- (commit commit)))
- (file-name (git-file-name "cl-fast-websoclet" version))
- (sha256
- (base32 "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/drewc/smug")
+ (commit commit)))
+ (file-name (git-file-name "cl-smug" version))
+ (sha256
+ (base32 "13gzkj9skya2ziwclk041v7sif392ydbvhvikhg2raa3qjcxb3rq"))))
(build-system asdf-build-system/sbcl)
(arguments
- ;; Test system must be loaded before, otherwise tests fail with:
- ;; Component FAST-WEBSOCKET-ASD::FAST-WEBSOCKET-TEST not found,
- ;; required by #<SYSTEM "fast-websocket">.
- '(#:asd-systems '("fast-websocket-test"
- "fast-websocket")))
- (inputs
- (list sbcl-fast-io
- sbcl-babel
- sbcl-alexandria))
- (native-inputs
- (list sbcl-prove
- sbcl-trivial-utf-8))
- (synopsis "WebSocket protocol parser for Common Lisp")
+ `(#:tests? #f)) ; There are no tests.
+ (synopsis "Parser combinators for Common Lisp")
(description
- "@code{fast-websocket} is an optimized low-level WebSocket protocol
-parser/composer.")
- (license license:bsd-2))))
+ "@code{cl-smug} is a library for parsing text, based on monadic parser
+combinators. Using a simple technique from the functional programming
+camp, @code{cl-smug} makes it simple to create quick extensible recursive
+descent parsers without funky syntax or impenetrable macrology.")
+ (home-page "https://smug.drewc.ca/")
+ (license license:expat))))
-(define-public cl-fast-websocket
- (sbcl-package->cl-source-package sbcl-fast-websocket))
+(define-public cl-smug
+ (sbcl-package->cl-source-package sbcl-smug))
-(define-public ecl-fast-websocket
- (sbcl-package->ecl-package sbcl-fast-websocket))
+(define-public ecl-smug
+ (sbcl-package->ecl-package sbcl-smug))
-(define-public sbcl-event-emitter
- (let ((commit "cb0e15f9de4c617cef3f5d5a22a41e28f9613d0b")
+(define-public sbcl-snakes
+ (let ((commit "8c7eae579bb24539dbd584a81a1049f3d3ff8bf8")
(revision "0"))
(package
- (name "sbcl-event-emitter")
- (version (git-version "0.0.1" revision commit))
- (home-page "https://github.com/fukamachi/event-emitter")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/event-emitter")
- (commit commit)))
- (file-name (git-file-name "cl-event-emitter" version))
- (sha256
- (base32 "1i18xzfr6334db9dzj0lsl7wxw1r1l0ixvn883mjbyqw0czp21h6"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
- (synopsis "Event mechanism for Common Lisp objects")
- (description "Event Emitter provides an event mechanism like Node.js for
-Common Lisp objects. It is mostly ported from Node.js @code{events} module.")
- (license license:bsd-2))))
+ (name "sbcl-snakes")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/BnMcGn/snakes")
+ (commit commit)))
+ (sha256
+ (base32 "1ibp919qcpm6kg67b507kpjzdlhpdjr7vkh9vabln3a75k8lnlsg"))
+ (file-name (git-file-name "cl-snakes" commit))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-cont
+ sbcl-cl-utilities
+ sbcl-closer-mop
+ sbcl-fiveam
+ sbcl-iterate))
+ (home-page "https://github.com/BnMcGn/snakes")
+ (synopsis "Python-like generators for Common Lisp")
+ (description
+ "This package provides Python style generators for Common Lisp.
+It also includes a port of itertools.")
+ (license license:asl2.0))))
-(define-public cl-event-emitter
- (sbcl-package->cl-source-package sbcl-event-emitter))
+(define-public cl-snakes
+ (sbcl-package->cl-source-package sbcl-snakes))
-(define-public ecl-event-emitter
- (sbcl-package->ecl-package sbcl-event-emitter))
+(define-public ecl-snakes
+ (sbcl-package->ecl-package sbcl-snakes))
-(define-public sbcl-sha1
- (let ((commit "be8b1b155c3a6ad3eb9b200212af6ff52f5611de")
- (revision "0"))
+(define-public sbcl-spatial-trees
+ ;; There have been no releases.
+ (let ((commit "81fdad0a0bf109c80a53cc96eca2e093823400ba")
+ (revision "1"))
(package
- (name "sbcl-sha1")
- (version (git-version "1.0" revision commit))
- (home-page "https://github.com/massung/sha1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/massung/sha1")
- (commit commit)))
- (file-name (git-file-name "cl-sha1" version))
- (sha256
- (base32 "1cfn0j5yfwqkwr2dm73wr9hz8dmws3ngxlbk9886ahxkg544qx4z"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "SHA1 Digest and HMAC for Common Lisp")
- (description
- "This is a very simple implementation of SHA1 and HMAC-SHA1 for
-Common Lisp. The code is intended to be easy to follow and is therefore a
-little slower than it could be.")
- (license license:asl2.0))))
+ (name "sbcl-spatial-trees")
+ (version (git-version "0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rpav/spatial-trees")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ ;; We cannot build "spatial-trees-viz" here because it depends on
+ ;; mcclim which depends on spatial-trees. FIXME: Break the circle.
+ '(#:asd-systems '("spatial-trees" "spatial-trees.nns")))
+ (inputs
+ (list sbcl-alexandria sbcl-optima sbcl-iterate))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/rpav/spatial-trees")
+ (synopsis "Dynamic index data structures for spatially-extended data")
+ (description
+ "Spatial-trees is a set of dynamic index data structures for
+spatially-extended data.")
+ (license license:bsd-3))))
-(define-public cl-sha1
- (sbcl-package->cl-source-package sbcl-sha1))
+(define-public cl-spatial-trees
+ (sbcl-package->cl-source-package sbcl-spatial-trees))
-(define-public ecl-sha1
- (sbcl-package->ecl-package sbcl-sha1))
+(define-public ecl-spatial-trees
+ (sbcl-package->ecl-package sbcl-spatial-trees))
-(define-public sbcl-websocket-driver
- (let ((commit "df94496ecb525d086eeada4f5875975515b7212e")
+(define-public sbcl-special-functions
+ (let ((commit "f3ca2792ff3f8351839c366413da6b1bb2965a58")
(revision "0"))
(package
- (name "sbcl-websocket-driver")
- (version (git-version "0.2.0" revision commit))
- (home-page "https://github.com/fukamachi/websocket-driver")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/websocket-driver")
- (commit commit)))
- (file-name (git-file-name "cl-websocket-driver" version))
- (sha256
- (base32 "0y852sqdnxfma6kw833by4wkgbgbv4ppzawjk8pk3y1pmh6is83y"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-babel
- sbcl-clack
- sbcl-fast-http
- sbcl-fast-io
- sbcl-fast-websocket
- sbcl-event-emitter
- sbcl-sha1
- sbcl-cl-base64
- sbcl-split-sequence
- sbcl-bordeaux-threads
- sbcl-quri))
- (synopsis "WebSocket server/client for Common Lisp")
- (description "This library provides a WebSocket server and client
-implementation for Common Lisp.")
- (license license:bsd-2))))
-
-(define-public cl-websocket-driver
- (sbcl-package->cl-source-package sbcl-websocket-driver))
+ (name "sbcl-special-functions")
+ (version (git-version "1.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Lisp-Stat/special-functions")
+ (commit commit)))
+ (file-name (git-file-name "cl-special-functions" version))
+ (sha256
+ (base32 "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam
+ sbcl-select
+ sbcl-cl-variates))
+ (inputs
+ (list sbcl-alexandria-plus
+ sbcl-float-features
+ sbcl-let-plus
+ sbcl-numerical-utilities))
+ (home-page "https://lisp-stat.dev/docs/resources/special-functions/")
+ (synopsis "Special functions in Common Lisp")
+ (description "This library implements
+@url{http://specialfunctionswiki.org/index.php/Main_Page, special
+functions} and has a focus on high accuracy double-float calculations
+using the latest algorithms.")
+ (license license:ms-pl))))
-(define-public ecl-websocket-driver
- (sbcl-package->ecl-package sbcl-websocket-driver))
+(define-public cl-special-functions
+ (sbcl-package->cl-source-package sbcl-special-functions))
-(define-public sbcl-jzon
+(define-public ecl-special-functions
(package
- (name "sbcl-jzon")
- (version "1.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Zulu-Inuoe/jzon")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-jzon" version))
- (sha256
- (base32 "0rbardn1dfizpyyy1c127zzk1fnq4pslz75xa7ldpfjsi5jc5fmr"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("com.inuoe.jzon")
- #:asd-test-systems '("com.inuoe.jzon-tests")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-test-asd
- (lambda _
- (substitute* "test/com.inuoe.jzon-tests.asd"
- ((":depends-on")
- (string-append
- ":perform (test-op (op c) (symbol-call :fiveam :run!"
- " (find-symbol \"JZON\" :com.inuoe.jzon-tests)))"
- "\n"
- " :depends-on"))))))))
- (native-inputs
- (list sbcl-alexandria
- sbcl-fiveam))
- (inputs
- (list sbcl-closer-mop
- sbcl-flexi-streams
- sbcl-float-features
- sbcl-trivial-gray-streams))
- (home-page "https://github.com/Zulu-Inuoe/jzon/")
- (synopsis "Correct and safe JSON parser")
- (description
- "@code{jzon} is a correct and safe JSON RFC 8259 parser for Common Lisp.")
- (license license:expat)))
-
-(define-public cl-jzon
- (sbcl-package->cl-source-package sbcl-jzon))
-
-(define-public ecl-jzon
- (sbcl-package->ecl-package sbcl-jzon))
+ (inherit (sbcl-package->ecl-package sbcl-special-functions))
+ ;; https://github.com/Lisp-Stat/special-functions/issues/4
+ (arguments (list #:tests? #f))))
-(define-public sbcl-simple-routes
- (let ((commit "6f88c38945a4de73e85786d3499c39cacb400598")
+(define-public sbcl-specialization-store
+ (let ((commit "8d39a866a6f24986aad3cc52349e9cb2653496f3")
(revision "1"))
(package
- (name "sbcl-simple-routes")
- (version (git-version "0.3" revision commit))
+ (name "sbcl-specialization-store")
+ (version (git-version "0.0.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/vancan1ty/simple-routes")
+ (url "https://github.com/markcox80/specialization-store")
(commit commit)))
- (file-name (git-file-name "cl-simple-routes" version))
+ (file-name (git-file-name "specialization-store" version))
(sha256
- (base32 "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"))))
+ (base32 "0r0bgb46q4gy72l78s7djkxq8ibb4bb3yh9brsry5lih7br8lhi0"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cl-ppcre
- sbcl-hunchentoot))
- (home-page "https://gitlab.com/vancan1ty/simple-routes")
- (synopsis "URL routing library for Hunchentoot")
+ (list sbcl-alexandria sbcl-introspect-environment))
+ (arguments
+ ;; FIXME: Tests fail with:
+ ;; Unable to compile test syntax-layer-test define-specialization/name.
+ (list #:tests? #f))
+ (home-page "https://github.com/markcox80/specialization-store")
+ (synopsis "Different type of generic function for Common Lisp")
(description
- "@code{simple-routes} is a simple Common Lisp RESTful routing facility
-on top of Hunchentoot.")
+ "SPECIALIZATION-STORE system provides a new kind of function, called
+a store function, whose behavior depends on the types of objects passed to the
+function.")
(license license:bsd-2))))
-(define-public cl-simple-routes
- (sbcl-package->cl-source-package sbcl-simple-routes))
+(define-public cl-specialization-store
+ (sbcl-package->cl-source-package sbcl-specialization-store))
-(define-public ecl-simple-routes
- (sbcl-package->ecl-package sbcl-simple-routes))
+(define-public ecl-specialization-store
+ (sbcl-package->ecl-package sbcl-specialization-store))
-(define-public sbcl-eris
- (package
- (name "sbcl-eris")
- (version "0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.ykonai.net/eris-cl")
- (commit version)))
- (file-name (git-file-name "cl-eris" version))
- (sha256
- (base32 "0qm74ld70aic39giamvix88500flv86047a82rx9gkjwaisf58rc"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-function-cache
- sbcl-ironclad
- sbcl-mmap
- sbcl-osicat
- sbcl-serapeum
- sbcl-trivial-gray-streams))
- (home-page "https://git.ykonai.net/eris-cl/")
- (synopsis "ERIS implementation for Common Lisp")
- (description
- "This is a Common Lisp implementation of the Encoding for Robust Immutable
-Storage specification (ERIS).")
- (license license:lgpl3+)))
+(define-public sbcl-specialized-function
+ (let ((commit "5e2b04432bdf728496e6ff7227f210f845af7247")
+ (revision "3"))
+ (package
+ (name "sbcl-specialized-function")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/numcl/specialized-function")
+ (commit commit)))
+ (file-name (git-file-name "specialized-function" version))
+ (sha256
+ (base32 "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Julia-like dispatch for Common Lisp")
+ (description
+ "This library is part of NUMCL. It provides a macro
+@code{SPECIALIZED} that performs a Julia-like dispatch on the arguments,
+lazily compiling a type-specific version of the function from the same
+code. The main target of this macro is speed.")
+ (home-page "https://github.com/numcl/specialized-function")
+ (license license:lgpl3+)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("iterate" ,sbcl-iterate)
+ ("lisp-namespace" ,sbcl-lisp-namespace)
+ ("trivia" ,sbcl-trivia)
+ ("trivial-cltl2" ,sbcl-trivial-cltl2)
+ ("type-r" ,sbcl-type-r)))
+ (native-inputs
+ (list sbcl-fiveam)))))
-(define-public cl-eris
- (sbcl-package->cl-source-package sbcl-eris))
+(define-public cl-specialized-function
+ (sbcl-package->cl-source-package sbcl-specialized-function))
-(define-public sbcl-cl-ipfs-api2
- (let ((commit "3ee52c80023bcc662f7d01276ea0a5814bd0011b")
- (revision "0"))
+(define-public ecl-specialized-function
+ (sbcl-package->ecl-package sbcl-specialized-function))
+
+(define-public sbcl-speechless
+ (let ((commit "50e9b03bdfc8a3bc0836a650d92de47b51c39834")
+ (revision "1"))
(package
- (name "sbcl-cl-ipfs-api2")
- (version (git-version "0.51" revision commit))
+ (name "sbcl-speechless")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/JadedCtrl/cl-ipfs-api2")
+ (url "https://github.com/Shirakumo/speechless/")
(commit commit)))
- (file-name (git-file-name "cl-ipfs-api2" version))
(sha256
- (base32 "1h0csxk4db1hid793mk5kz3nbjyl7z4ic1zk2wy46k1vz5lnnsph"))))
+ (base32 "1k0kc2l98jyv04l48xnj38qwpddan80c7m41srjld64jkna0fhas"))
+ (file-name (git-file-name "speechless" version))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:tests? #f)) ; There are no tests.
(inputs
- (list sbcl-arnesi
- sbcl-drakma
- sbcl-yason))
- (home-page "https://github.com/JadedCtrl/cl-ipfs-api2/")
- (synopsis "Bindings for the IPFS HTTP API")
- (description
- "@code{cl-sbcl-cl-ipfs-api2} is a pretty simple set of IPFS bindings
-for Common Lisp, using the HTTP API for (almost) everything, except for pubsub
-(which uses the locally installed go-ipfs program).")
- (license license:lgpl3))))
+ (list sbcl-cl-markless
+ sbcl-documentation-utils))
+ (synopsis "Dialogue system language implementation")
+ (description "This is a system implementing an advanced dialogue system
+that is capable of complex dialogue flow including choice trees and
+conditional branching. Speechless was first developed for the
+\"Kandria\" (@url{https://kandria.com}) game, and has since been separated and
+made public in the hopes that it may find use elsewhere or inspire other
+developers to build similar systems.
-(define-public cl-ipfs-api2
- (sbcl-package->cl-source-package sbcl-cl-ipfs-api2))
+Speechless is based on the
+\"Markless\" (@url{https://shirakumo.github.io/markless}) document standard
+for its syntax and makes use of Markless' ability to be extended to add
+additional constructs useful for dialogue systems.
-(define-public ecl-cl-ipfs-api2
- (sbcl-package->ecl-package sbcl-cl-ipfs-api2))
+Speechless can compile dialogue from its base textual form into an efficient
+instruction set, which is then executed when the game is run. Execution of the
+dialogue is completely engine-agnostic, and only requires some simple
+integration with a client protocol to run.
-(define-public sbcl-purgatory
- (let ((commit "3afd8f6bb4093ffb2f39ffdedf11278b3617fff9")
- (revision "1"))
+Thanks to Markless' extensibility, Speechless can also be further extended to
+include additional syntax and constructs that may be useful for your
+particular game.")
+ (home-page "http://shirakumo.github.io/speechless/")
+ (license license:zlib))))
+
+(define-public speechless
+ (sbcl-package->cl-source-package sbcl-speechless))
+
+(define-public ecl-speechless
+ (sbcl-package->ecl-package sbcl-speechless))
+
+(define-public sbcl-spinneret
+ ;; No release since 2019, no tags.
+ (let ((commit "d4398b5a344b5c59e497c9ee78fdbae7cc434f74"))
(package
- (name "sbcl-purgatory")
- (version (git-version "0.1.2" revision commit))
+ (name "sbcl-spinneret")
+ (version (git-version "3.0" "6" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://notabug.org/cage/purgatory")
+ (url "https://github.com/ruricolist/spinneret/")
(commit commit)))
- (file-name (git-file-name "cl-purgatory" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0iy2jdgrwqrq9cph7bwf79d8l4zdsgcd9sfcn0lclzai2v0yizp9"))))
+ (base32 "1mdd92gfxfdsd81fcd8fgz8z7dwsb0kcv7zyzdgnw8lavkib5zly"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cl-ppcre-unicode
- sbcl-usocket))
- (synopsis "Common Lisp implementation of the 9p protocol")
- (description "This is a Common Lisp library that implements
-the 9p network filesystem protocol.")
- (home-page "https://notabug.org/cage/purgatory/")
- (license license:llgpl))))
+ sbcl-global-vars
+ sbcl-parenscript
+ sbcl-cl-markdown
+ sbcl-cl-ppcre
+ sbcl-serapeum
+ sbcl-trivial-gray-streams))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/ruricolist/spinneret")
+ (synopsis "Common Lisp HTML5 generator")
+ (description
+ "In the crowded space of Common Lisp HTML generators, Spinneret
+occupies the following coordinates:
-(define-public ecl-purgatory
- (sbcl-package->ecl-package sbcl-purgatory))
+@itemize
-(define-public cl-purgatory
- (sbcl-package->cl-source-package sbcl-purgatory))
+@item Modern. Targets HTML5. Does not treat XML and HTML as the same
+problem. Assumes you will be serving your documents as UTF-8.
-(define-public sbcl-just-getopt-parser
+@item Composable. Makes it easy to refactor HTML generation into separate
+functions and macros.
+
+@item Pretty. Treats HTML as a document format, not a serialization. Output
+is idiomatic and readable, following the coding style of the HTML5
+specification.
+
+@item Aggressive. If something can be interpreted as HTML, then it will be,
+meaning that some Lisp forms can't be mixed with HTML syntax. In the
+trade-off between 90% convenience and 10% correctness Spinneret is on the side
+of convenience.
+
+@item Bilingual. Spinneret (after loading @code{spinneret/ps}) has the same
+semantics in Lisp and Parenscript.
+
+@end itemize\n")
+ (license license:expat))))
+
+(define-public cl-spinneret
+ (sbcl-package->cl-source-package sbcl-spinneret))
+
+(define-public ecl-spinneret
+ (sbcl-package->ecl-package sbcl-spinneret))
+
+(define-public sbcl-split-sequence
(package
- (name "sbcl-just-getopt-parser")
- (version "2021.11")
+ (name "sbcl-split-sequence")
+ (version "2.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tlikonen/cl-just-getopt-parser")
- (commit version)))
+ (url "https://github.com/sharplispers/split-sequence")
+ (commit (string-append "v" version))))
(sha256
- (base32 "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s"))
- (file-name (git-file-name "cl-just-getopt-parser" version))))
+ (base32
+ "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq"))
+ (file-name (git-file-name "split-sequence" version))))
(build-system asdf-build-system/sbcl)
- (synopsis "Getopt-like command-line parser for Common Lisp")
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Member of the Common Lisp Utilities family of programs")
(description
- "This package provides the @code{getopt} function to parse command-line
-options. The options are organized in valid options, other arguments and
-unknown arguments. Optional Lisp conditions for error situations are also
-defined.")
- (home-page "https://github.com/tlikonen/cl-just-getopt-parser")
- (license license:cc0)))
+ "Splits sequence into a list of subsequences delimited by objects
+satisfying the test.")
+ (home-page "https://cliki.net/split-sequence")
+ (license license:expat)))
-(define-public ecl-just-getopt-parser
- (sbcl-package->ecl-package sbcl-just-getopt-parser))
+(define-public cl-split-sequence
+ (sbcl-package->cl-source-package sbcl-split-sequence))
-(define-public cl-just-getopt-parser
- (sbcl-package->cl-source-package sbcl-just-getopt-parser))
+(define-public ecl-split-sequence
+ (sbcl-package->ecl-package sbcl-split-sequence))
-(define-public sbcl-formgrep
- (let ((commit "91238cdbdd0ad815ff5d574d032b4a502febd190")
+(define-public sbcl-st-json
+ (let ((commit "4a0025bcc5b6921454822f1b9f38f697b4eeaf43")
(revision "0"))
(package
- (name "sbcl-formgrep")
+ (name "sbcl-st-json")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/death/formgrep")
+ (url "https://github.com/marijnh/ST-JSON")
(commit commit)))
- (file-name (git-file-name "cl-formgrep" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1rqzkmz6nddg5ywvs3v0k8cvxdwas38mfwgbr3rs4fdsbps90k9r"))))
+ (base32 "06qrhr5iw73k96lai2x9w52l6gnmlxy7fsr0r35gz6nz1f71x7gx"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-cl-fad
- sbcl-cl-ppcre
- sbcl-eclector))
- (home-page "https://github.com/death/formgrep")
- (synopsis "Find top-level Lisp forms matching an operator pattern")
+ (home-page "https://marijnhaverbeke.nl/st-json/")
+ (synopsis "JSON for Common Lisp")
(description
- "This library provides the @code{FORMGREP} function and related
-utilities which find top-level Lisp forms matching the regular expression
-corresponding to an operator name, returning the matched forms and the names
-of the files and the line numbers where they were found.")
- (license license:expat))))
+ "ST-JSON (@code{ST} because it originated at Streamtech) is a Common Lisp
+ library for encoding and decoding JSON values (as specified on json.org).
-(define-public cl-formgrep
- (sbcl-package->cl-source-package sbcl-formgrep))
+This library does mostly the same thing as CL-JSON, but is simpler and more
+precise about types (distinguishing boolean false, the empty array, and the
+empty object).")
+ (license license:zlib))))
-(define-public ecl-formgrep
- (sbcl-package->ecl-package sbcl-formgrep))
+(define-public cl-st-json
+ (sbcl-package->cl-source-package sbcl-st-json))
-(define-public sbcl-lmdb
- (let ((commit "f439b707939a52769dc9747838ff4a616fab14a3")
- (revision "0"))
+(define-public ecl-st-json
+ (sbcl-package->ecl-package sbcl-st-json))
+
+(define-public sbcl-staple
+ (let ((commit "0ee8e25fe6fe8fa83b2a6c93d4febd468c3eaa4e")
+ (revision "1"))
(package
- (name "sbcl-lmdb")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-staple")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/antimer/lmdb")
+ (url "https://github.com/Shinmera/staple/")
(commit commit)))
- (file-name (git-file-name "cl-lmdb" version))
(sha256
- (base32 "0akvimmvd4kcx6gh1j1dzvcclhc0jc4hc9vkh3ldgzb8wyf4vl8q"))))
+ (base32 "0qf0if7py3n4rszg25lcavpsqikfz6k5dvcmh5q67y8x5r12i5m7"))
+ (file-name (git-file-name "staple" version))))
(build-system asdf-build-system/sbcl)
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/lmdb.lisp"
- (("\"liblmdb.so\"")
- (string-append
- "\"" (search-input-file inputs "/lib/liblmdb.so") "\""))))))))
+ '(#:asd-systems '("staple-package-recording"
+ "staple-code-parser"
+ "staple"
+ "staple-markdown"
+ "staple-markless"
+ "staple-restructured-text")))
(inputs
- (list lmdb
- sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cl-reexport
- sbcl-mgl-pax
- sbcl-osicat
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-utf-8))
- (native-inputs
- (list sbcl-try))
- (home-page "https://github.com/antimer/lmdb")
- (synopsis "LMDB bindings for Common Lisp")
- (description
- "LMDB, the Lightning Memory-mapped Database, is an ACID key-value
-database with multiversion concurrency control. This package is a Common Lisp
-wrapper around the C LMDB library. It covers most of C LMDB's functionality,
-has a simplified API, much needed safety checks, and comprehensive
-documentation.")
- (license license:expat))))
-
-(define-public cl-lmdb
- (sbcl-package->cl-source-package sbcl-lmdb))
-
-(define-public sbcl-listopia
- (package
- (name "sbcl-listopia")
- (version "0.12.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Dimercel/listopia")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "07xa2s2s60h9f40az3zdacybl5pk1x8bhvga9phsra0czbv44lx2"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-prove))
- (home-page "https://github.com/Dimercel/listopia")
- (synopsis "List manipulation library for Common Lisp")
- (description "This package is a list manipulation library for Common Lisp
-inspired by Haskell package @code{Data.List}.")
- (license license:llgpl)))
+ (list sbcl-3bmd
+ sbcl-babel
+ sbcl-cl-docutils
+ sbcl-cl-markless
+ sbcl-cl-ppcre
+ sbcl-clip
+ sbcl-concrete-syntax-tree
+ sbcl-definitions
+ sbcl-documentation-utils
+ sbcl-eclector
+ sbcl-language-codes
+ sbcl-pathname-utils))
+ (synopsis "Generate documentation about Lisp projects through an HTML template")
+ (description "Staple is a documentation system. It provides you with a
+way to generate standalone documentation accumulated from various sources such
+as readmes, documentation files, and docstrings.")
+ (home-page "https://Shinmera.github.io/staple/")
+ (license license:zlib))))
-(define-public cl-listopia
- (sbcl-package->cl-source-package sbcl-listopia))
+(define-public cl-staple
+ (sbcl-package->cl-source-package sbcl-staple))
-(define-public ecl-listopia
- (sbcl-package->ecl-package sbcl-listopia))
+(define-public ecl-staple
+ (sbcl-package->ecl-package sbcl-staple))
-(define-public sbcl-clog
+(define-public sbcl-static-dispatch
(package
- (name "sbcl-clog")
- (version "1.2")
+ (name "sbcl-static-dispatch")
+ (version "0.5.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rabbibotton/clog")
+ (url "https://github.com/alex-gutev/static-dispatch")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-clog" version))
+ (file-name (git-file-name "static-dispatch" version))
(sha256
- (base32 "0f4i6571nm0j704zgnh60sc9slifs11byb2gs8gamqjcfh931dap"))))
+ (base32 "1602vx6ybp0n8mbrrp6q8397fkkyvhrqpahc302pjdb57qildajz"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-3bmd
+ (list sbcl-agutil
sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cl-ppcre
- sbcl-cl-sqlite
- sbcl-cl-template
- sbcl-clack
+ sbcl-anaphora
+ sbcl-arrows
+ sbcl-cl-environments
sbcl-closer-mop
- sbcl-colorize
- sbcl-dbi
- sbcl-hunchentoot
- sbcl-lack
- sbcl-mgl-pax
- sbcl-parse-float
- sbcl-quri
- sbcl-trivial-open-browser
- sbcl-websocket-driver))
- (arguments
- '(#:asd-systems '("clog" "clog/docs" "clog/tools")
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-symbol-name
- (lambda _
- (substitute* "source/clog-docs.lisp"
- (("clog:@CLOG-MANUAL")
- "clog::@CLOG_MANUAL")))))))
- (home-page "https://github.com/rabbibotton/clog")
- (synopsis "Common Lisp Omnificent GUI")
- (description
- "This package provides a Common Lisp web framework for building GUI
-applications. CLOG can take the place, or work along side, most cross platform
-GUI frameworks and website frameworks. The CLOG package starts up the
-connectivity to the browser or other websocket client (often a browser embedded
-in a native template application).")
- (license license:bsd-3)))
+ sbcl-iterate
+ sbcl-optima))
+ (home-page "https://github.com/alex-gutev/static-dispatch")
+ (synopsis "Static generic function dispatch for Common Lisp")
+ (description "Static dispatch is a Common Lisp library, inspired by
+@code{inlined-generic-function}, which allows standard Common Lisp generic
+function dispatch to be performed statically (at compile time) rather than
+dynamically (runtime). This is similar to what is known as \"overloading\" in
+languages such as C++ and Java.
-(define-public cl-clog
- (sbcl-package->cl-source-package sbcl-clog))
+The purpose of static dispatch is to provide an optimization in cases where
+the usual dynamic dispatch is too slow, and the dynamic features of generic
+functions, such as adding/removing methods at runtime are not required. An
+example of such a case is a generic equality comparison function. Currently
+generic functions are considered far too slow to implement generic arithmetic
+and comparison operations when used heavily in numeric code.")
+ (license license:expat)))
-(define-public ecl-clog
- (sbcl-package->ecl-package sbcl-clog))
+(define-public cl-static-dispatch
+ (sbcl-package->cl-source-package sbcl-static-dispatch))
-(define-public sbcl-nkeymaps
+(define-public ecl-static-dispatch
+ (sbcl-package->ecl-package sbcl-static-dispatch))
+
+(define-public sbcl-static-vectors
(package
- (name "sbcl-nkeymaps")
- (version "1.1.1")
+ (name "sbcl-static-vectors")
+ (version "1.8.9")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/nkeymaps")
- (commit version)))
- (file-name (git-file-name "cl-nkeymaps" version))
+ (url "https://github.com/sionescu/static-vectors")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "179hrnkn3pkwkp4ap6ax0zgp7xcr9cq7icff42r79gh43ri3kpzy"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-fset
- sbcl-cl-str
- sbcl-trivial-package-local-nicknames))
+ (base32 "079qa20lhanzsz1qf4iags91n0ziylbjgbcymm5a5qj7yryas4fw"))))
(native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/nkeymaps")
- (synopsis "Keymap facility for Common Lisp")
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-alexandria sbcl-cffi))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/sionescu/static-vectors")
+ (synopsis "Allocate SIMPLE-ARRAYs in static memory")
(description
- "This is a keymap facility for Common Lisp inspired by Emacsy
-(keymap.scm) which is inspired by Emacs.
-@itemize
+ "With @code{static-vectors}, you can create vectors allocated in static
+memory.")
+ (license license:expat)))
-@item Support prefix keys to other keymaps. For instance, if you prefix
-my-mode-map with C-c, then all bindings for my-mode will be accessible after
-pressing C-c.
+(define-public cl-static-vectors
+ (sbcl-package->cl-source-package sbcl-static-vectors))
-@item List all bindings matching a given prefix. (Also known as which-key in
-Emacs.)
+(define-public ecl-static-vectors
+ (sbcl-package->ecl-package sbcl-static-vectors))
-@item List the bindings associated to a command.
+(define-public sbcl-statistics
+ (let ((commit "94fc87a2bf81355a40ce3730b4ed77710ecfabaf")
+ (revision "0"))
+ (package
+ (name "sbcl-statistics")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Lisp-Stat/statistics")
+ (commit commit)))
+ (file-name (git-file-name "cl-statistics" version))
+ (sha256
+ (base32 "0is69w6iwh4hyzc5ndgb3i2331f677sa7kw5wy8pmx6hawbkgyir"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-clunit2))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-anaphora
+ sbcl-conduit-packages
+ sbcl-distributions
+ sbcl-let-plus
+ sbcl-numerical-utilities))
+ (home-page "https://lisp-stat.dev/docs/")
+ (synopsis "Statistical functions in Common Lisp")
+ (description "This package provides a consolidation of Common Lisp
+statistics libraries.")
+ (license (list license:expat license:ms-pl)))))
-@item Support multiple inheritance.
+(define-public cl-statistics
+ (sbcl-package->cl-source-package sbcl-statistics))
-@item Support keycode.
+(define-public ecl-statistics
+ (sbcl-package->ecl-package sbcl-statistics))
-@item Validate keyspec at compile time.
+(define-public sbcl-stdutils
+ (let ((commit "4a4e5a4036b815318282da5dee2a22825369137b")
+ (revision "0"))
+ (package
+ (name "sbcl-stdutils")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/eslick/cl-stdutils")
+ (commit commit)))
+ (file-name (git-file-name "cl-stdutils" version))
+ (sha256
+ (base32 "16vxxphqdq8264x0aanm36x9r6d3ci1gjf4vf46mwl59gcff4wcj"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments '(#:tests? #f)) ; There are no tests.
+ (inputs
+ (list sbcl-cl-fad
+ sbcl-cl-ppcre))
+ (home-page "https://github.com/eslick/cl-stdutils/")
+ (synopsis "Grab bag of Common Lisp utility functions")
+ (description
+ "This package provides a grab bag of miscellaneous Common Lisp
+utilities.")
+ (license license:bsd-3))))
-@item define-key can set multiple bindings in a single call.
+(define-public cl-stdutils
+ (sbcl-package->cl-source-package sbcl-stdutils))
-@item Support multiple scheme to make it easy to switch between, say,
-Emacs-style and VI-style bindings. This orthogonality to keymaps composes
-better than having multiple keymaps: changing scheme applies to the entire
-program, which is easier than looping through all keymaps to change them.
+(define-public ecl-stdutils
+ (sbcl-package->ecl-package sbcl-stdutils))
-@item Translate keyspecs as a fallback. For instance if shift-a is not bound,
-check A.
+(define-public sbcl-stealth-mixin
+ (let ((commit "2f853fcead554221d4be3b10522b502ea729e944")
+ (revision "0"))
+ (package
+ (name "sbcl-stealth-mixin")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/robert-strandh/Stealth-mixin")
+ (commit commit)))
+ (file-name (git-file-name "cl-stealth-mixin" version))
+ (sha256
+ (base32 "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-closer-mop))
+ (home-page "https://github.com/robert-strandh/Stealth-mixin")
+ (synopsis "Create stealth mixin classes")
+ (description
+ "Stealth-mixin is a Common Lisp library for creating stealth mixin
+classes. These are classes that are dynamically mixed into other classes
+without the latter being aware of it.")
+ (license license:bsd-2))))
-@item Behaviour can be customized with global parameters such as
-*print-shortcut*.
+(define-public cl-stealth-mixin
+ (sbcl-package->cl-source-package sbcl-stealth-mixin))
-@item The compose function can merge multiple keymaps together.
+(define-public ecl-stealth-mixin
+ (sbcl-package->ecl-package sbcl-stealth-mixin))
-@item Support multiple arguments when that makes sense (e.g. multiple keymaps
-for lookup-key).
+(define-public sbcl-stmx
+ ;; No release for years and recent commits contain fixes for recent SBCL
+ ;; versions.
+ (let ((commit "95f7dea8e1e58dee59e14a1deb148908d920839f")
+ (revision "3"))
+ (package
+ (name "sbcl-stmx")
+ (version (git-version "2.0.5" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cosmos72/stmx/")
+ (commit commit)))
+ (file-name (git-file-name "cl-stmx" version))
+ (sha256
+ (base32 "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-bordeaux-threads sbcl-log4cl
+ sbcl-closer-mop sbcl-trivial-garbage))
+ (home-page "https://stmx.org/")
+ (synopsis "High performance Transactional Memory for Common Lisp")
+ (description
+ "STMX is a high-performance implementation of composable Transactional
+Memory, which is a concurrency control mechanism aimed at making concurrent
+programming easier to write and understand. Instead of traditional lock-based
+programming, one programs with atomic memory transactions, which can be
+composed together to make larger atomic memory transactions.
-@item Key remapping à-la Emacs.
+A memory transaction gets committed if it returns normally, while it gets
+rolled back if it signals an error (and the error is propagated to the
+caller).
-@item Typed keymaps, i.e. keymaps where bound values can only be of a given
-type. This is convenient to catch typos, for instance when binding 'FOO
-instead of #'FOO.
-@end itemize")
- (license license:bsd-3)))
+Finally, memory transactions can safely run in parallel in different threads,
+are re-executed from the beginning in case of conflicts or if consistent reads
+cannot be guaranteed, and their effects are not visible from other threads
+until they commit.
-(define-public cl-nkeymaps
- (sbcl-package->cl-source-package sbcl-nkeymaps))
+Memory transactions give freedom from deadlocks, are immune to thread-safety
+bugs and race conditions, provide automatic roll-back on failure, and aim at
+resolving the tension between granularity and concurrency.")
+ (license license:llgpl))))
-(define-public ecl-nkeymaps
- (sbcl-package->ecl-package sbcl-nkeymaps))
+(define-public cl-stmx
+ (sbcl-package->cl-source-package sbcl-stmx))
-(define-public sbcl-xkbcommon
- (let ((commit "aa9513d93f42d7816f88dd1bd8bd21375e7d7512")
+(define-public ecl-stmx
+ (sbcl-package->ecl-package sbcl-stmx))
+
+(define-public sbcl-string-case
+ (let ((commit "718c761e33749e297cd2809c7ba3ade1985c49f7")
(revision "0"))
(package
- (name "sbcl-xkbcommon")
- (version (git-version "0.0.0" revision commit))
+ (name "sbcl-string-case")
+ (version (git-version "0.0.2" revision commit))
+ (home-page "https://github.com/pkhuong/string-case")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sdilts/cl-xkbcommon")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-xkbcommon" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "02zdbkh7yliw9vg8i8wx2xgcpfni0fr4z0w19kkxvaib8xm9rx1q"))))
+ (base32
+ "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md"))))
(build-system asdf-build-system/sbcl)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "xkbcommon.lisp"
- (("libxkbcommon.so.0")
- (search-input-file inputs "/lib/libxkbcommon.so"))))))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list libxkbcommon
- sbcl-cffi))
- (home-page "https://github.com/sdilts/cl-xkbcommon")
- (synopsis "Common Lisp FFI bindings for xkbcommon")
+ (synopsis "Efficient string= case in Common Lisp")
(description
- "This package provides Common Lisp FFI bindings for xkbcommon
-(libxkbcommon) using cffi-grovel.")
- (license license:expat))))
-
-(define-public cl-xkbcommon
- (sbcl-package->cl-source-package sbcl-xkbcommon))
+ "@code{string-case} is a Common Lisp macro that generates specialised decision
+trees to dispatch on string equality.")
+ (license license:bsd-3))))
-(define-public ecl-xkbcommon
- (sbcl-package->ecl-package sbcl-xkbcommon))
+(define-public cl-string-case
+ (sbcl-package->cl-source-package sbcl-string-case))
-(define-public sbcl-njson
- (package
- (name "sbcl-njson")
- (version "1.2.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/njson")
- (commit version)))
- (file-name (git-file-name "cl-njson" version))
- (sha256
- (base32
- "05v5bk3l47mds4ihxs8jlqm19gqq7hb4q0161bgg99w9847l63lk"))))
- (build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cl-json sbcl-jzon))
- (native-inputs (list sbcl-lisp-unit2))
- (arguments
- '(#:asd-systems '("njson" "njson/cl-json" "njson/jzon")))
- (home-page "https://github.com/atlas-engineer/njson")
- (synopsis "JSON handling framework for Common Lisp")
- (description
- "NJSON aims to make it convenient for one to decode, encode,
-and process JSON data, in the minimum keystrokes/minutes possible.
+(define-public ecl-string-case
+ (sbcl-package->ecl-package sbcl-string-case))
-NJSON is parser-independent, with existing Common Lisp JSON parsers being
-loadable as additional system. @code{jzon} is included by default, though.
-Conveniences that NJSON provides are:
+(define-public sbcl-string-pokemonize
+ (let ((commit "2dc01643defb497e4d1eb833def71dfc1e8d5da6")
+ (revision "0"))
+ (package
+ (name "sbcl-string-pokemonize")
+ (version (git-version "20210503" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phoe/string-pokemonize")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zk5klc94pxv7mhx6qrp93rk4ypwd6wfijap7gf9l0wpphg90r9x"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #f ; There are no tests.
+ #:asd-systems '("string-pokemonize")))
+ (synopsis "Alternate upper- and lowercase")
+ (description
+ "@code{string-pokemonize} provides a function that alternates uppercase
+and lowercase characters for a given string.")
+ (home-page "https://github.com/phoe/string-pokemonize")
+ (license license:expat))))
-@itemize
-@item @code{encode} and @code{decode} as single entry points for JSON reading
-and writing, be it from streams/string/files, or from those.
+(define-public cl-string-pokemonize
+ (sbcl-package->cl-source-package sbcl-string-pokemonize))
-@item @code{jget}, @code{jcopy}, @code{jkeys}, and their aliases to
-manipulate the decoded objects' properties without the need to worry
-about the low-level details of how these values are decoded.
+(define-public ecl-string-pokemonize
+ (sbcl-package->ecl-package sbcl-string-pokemonize))
-@item @code{jif}, @code{jwhen}, @code{jor}, @code{jand}, and other macros
-mimicking Lisp ones, while using truth values of JSON-decoded data.
+(define-public sbcl-stripe
+ (let ((commit "b59631d21d63e101de6eb96b56941471504ba644")
+ (revision "0"))
+ (package
+ (name "sbcl-stripe")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atlas-engineer/stripe")
+ (commit commit)))
+ (file-name (git-file-name "cl-stripe" version))
+ (sha256
+ (base32 "00sfq2f6dnpwa6pf7rgw5hazbwx4yf1g0jrkfz9h4kq5zyxwk1cy"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-dexador
+ sbcl-golden-utils
+ sbcl-local-time
+ sbcl-yason))
+ (home-page "https://github.com/atlas-engineer/stripe")
+ (synopsis "Stripe payment API client for Common Lisp")
+ (description "A client for the Stripe payment API.")
+ (license license:expat))))
-@item @code{jbind} and @code{jmatch} macros to destructure and
-validate parsed JSON.
+(define-public cl-stripe
+ (sbcl-package->cl-source-package sbcl-stripe))
-@item @code{njson/aliases} package to nickname to @code{j} for all the
-forms conveniently accessible as @code{j:get}, @code{j:copy},
-@code{j:if} etc.
+(define-public ecl-stripe
+ (sbcl-package->ecl-package sbcl-stripe))
-@end itemize\n")
- (license license:bsd-3)))
+(define-public sbcl-supertrace
+ (let ((commit "66d22c3ff131ecd1c8048dfced1d62ed6024ecb0"))
+ (package
+ (name "sbcl-supertrace")
+ (version (git-version "0.1.0" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/supertrace")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0n369n6b7y1m49biccnnr7svymjdsk8sksrkqrn3mj21vgv7s7bg"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-cffi sbcl-rove sbcl-cl-ppcre sbcl-bordeaux-threads))
+ (inputs
+ (list sbcl-cffi))
+ (home-page "https://github.com/fukamachi/supertrace")
+ (synopsis "Improved Common Lisp tracing for debugging and profiling")
+ (description
+ "Supertrace provides a superior Common Lisp @code{trace} functionality
+for debugging and profiling real world applications.")
+ (license license:bsd-2))))
-(define-public cl-njson
- (sbcl-package->cl-source-package sbcl-njson))
+(define-public cl-supertrace
+ (sbcl-package->cl-source-package sbcl-supertrace))
-(define-public ecl-njson
- (sbcl-package->ecl-package sbcl-njson))
+(define-public ecl-supertrace
+ (sbcl-package->ecl-package sbcl-supertrace))
-(define-public sbcl-nactivitypub
+(define-public sbcl-swap-bytes
(package
- (name "sbcl-nactivitypub")
- (version "0.0.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/nactivitypub")
- (commit version)))
- (file-name (git-file-name "cl-nactivitypub" version))
- (sha256
- (base32
- "0m2vwi11zp0bpvr0hglq1svdxlp3cc70yvix30yksfzp6kk3amyn"))))
+ (name "sbcl-swap-bytes")
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cl-str
- sbcl-dexador
- sbcl-local-time
- sbcl-lparallel
- sbcl-njson
- sbcl-quri
- sbcl-serapeum))
- (home-page "https://github.com/atlas-engineer/nactivitypub")
- (synopsis
- "Common Lisp implementation of ActivityPub and ActivityStreams standards")
- (description
- "This package provides a Common Lisp implementation of ActivityPub and
-ActivityStreams standards for social networking.
+ (version "1.2")
+ (home-page "https://github.com/sionescu/swap-bytes")
+ (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
+ "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"))))
+ (inputs
+ (list sbcl-trivial-features))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Efficient endianness conversion for Common Lisp")
+ (description "This Common Lisp library provides optimized byte-swapping
+primitives. The library can change endianness of unsigned integers of length
+1/2/4/8. Very useful in implementing various network protocols and file
+formats.")
+ (license license:expat)))
-Features:
-@itemize
+(define-public cl-swap-bytes
+ (sbcl-package->cl-source-package sbcl-swap-bytes))
-@item Parsing and un-parsing ActivityStreams JSON-LD objects to/from CLOS
-objects with convenient accessors on those.
+(define-public ecl-swap-bytes
+ (sbcl-package->ecl-package sbcl-swap-bytes))
-@item Sending and fetching ActivityStreams objects to/from the
-ActivityStreams-enabled HTTP(S) URLs.
+(define-public sbcl-sxql
+ (let ((commit "cc3478cacb0557475a59cf619dad66c5dc8080ba")
+ (revision "3"))
+ (package
+ (name "sbcl-sxql")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/sxql")
+ (commit commit)))
+ (file-name (git-file-name "cl-sqxl" version))
+ (sha256
+ (base32 "011an993amy8q3gl4hyqrgnc93cgny3cv9gbp679rrmyyp8zmywr"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cl-package-locks
+ sbcl-cl-syntax
+ sbcl-iterate
+ sbcl-optima
+ sbcl-split-sequence
+ sbcl-trivia
+ sbcl-trivial-types))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/fukamachi/sxql")
+ (synopsis "SQL generator for Common Lisp")
+ (description "SQL generator for Common Lisp.")
+ (license license:bsd-3))))
-@item Semantic info extraction with methods like @code{name*}, @code{url*},
-@code{author*}, and @code{published*}.
+(define-public cl-sxql
+ (sbcl-package->cl-source-package sbcl-sxql))
-@item No reliance on JSON parser. @code{njson} is used for parser-independent
-JSON handling. Load the parser backend you prefer!
+(define-public ecl-sxql
+ (sbcl-package->ecl-package sbcl-sxql))
-@end itemize")
- (license license:bsd-3)))
+(define-public sbcl-sxql-composer
+ (let ((commit "2b2230cb01ae1b68e28921d99e4814046867fb75")
+ (revision "1"))
+ (package
+ (name "sbcl-sxql-composer")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mmontone/sxql-composer")
+ (commit commit)))
+ (file-name (git-file-name "sxql-composer" version))
+ (sha256
+ (base32 "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-sxql))
+ (synopsis "Build and compose SXQL queries dynamically")
+ (description
+ "This is a Common Lisp library to build and compose SXQL queries
+dynamically.")
+ (home-page "https://github.com/mmontone/sxql-composer")
+ (license license:expat))))
-(define-public cl-nactivitypub
- (sbcl-package->cl-source-package sbcl-nactivitypub))
+(define-public cl-sxql-composer
+ (sbcl-package->cl-source-package sbcl-sxql-composer))
-(define-public ecl-nactivitypub
- (sbcl-package->ecl-package sbcl-nactivitypub))
+(define-public ecl-sxql-composer
+ (sbcl-package->ecl-package sbcl-sxql-composer))
-(define-public sbcl-nsymbols
- (package
- (name "sbcl-nsymbols")
- (version "0.3.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atlas-engineer/nsymbols")
- (commit version)))
- (file-name (git-file-name "cl-nsymbols" version))
- (sha256
- (base32 "1awh793s4fwhddllfcjz4sbkxwinh5w54s3glxh7rv00c7skdjd6"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-lisp-unit2))
- (inputs (list cl-closer-mop))
- (arguments
- '(#:asd-systems '("nsymbols" "nsymbols/star")))
- (synopsis
- "Functions to search, filter, and group symbols in chosen packages")
- (home-page "https://github.com/atlas-engineer/nsymbols")
- (description "Nsymbols extends the regular package API of ANSI CL with more
-operations, allowing one to list:
+(define-public sbcl-sycamore
+ (let ((commit "fd2820fec165ad514493426dea209728f64e6d18"))
+ (package
+ (name "sbcl-sycamore")
+ (version "0.0.20120604")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ndantam/sycamore/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00bv1aj89q5vldmq92zp2364jq312zjq2mbd3iyz1s2b4widzhl7"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-cl-ppcre))
+ (synopsis "Purely functional data structure library in Common Lisp")
+ (description
+ "Sycamore is a fast, purely functional data structure library in Common Lisp.
+If features:
@itemize
-@item @code{package-symbols}.
-@item @code{package-variables}.
-@item @code{package-functions}.
-@item @code{package-generic-functions}.
-@item @code{package-macros}.
-@item @code{package-classes}.
-@item @code{package-structures}.
-@item And other symbol types, given @code{define-symbol-type} for those.
-@end itemize
+@item Fast, purely functional weight-balanced binary trees.
+@item Leaf nodes are simple-vectors, greatly reducing tree height.
+@item Interfaces for tree Sets and Maps (dictionaries).
+@item Ropes.
+@item Purely functional pairing heaps.
+@item Purely functional amortized queue.
+@end itemize\n")
+ (home-page "https://ndantam.github.io/sycamore/")
+ (license license:bsd-3))))
-Nsymbols can also find symbols by their name/matching symbol with
-@code{resolve-symbol}. All these operations are aware of symbol
-visibility in the given packages, due to a @code{symbol-visibility}
-function.
+(define-public cl-sycamore
+ (sbcl-package->cl-source-package sbcl-sycamore))
-An additional @code{nsymbols/star} system has a set of functions
-mirroring the regular Nsymbols ones, but using @code{closer-mop} to
-provide better results and returning structured data instead of
-symbols.")
- (license license:bsd-3)))
+(define-public ecl-sycamore
+ (sbcl-package->ecl-package sbcl-sycamore))
-(define-public cl-nsymbols
- (sbcl-package->cl-source-package sbcl-nsymbols))
+(define-public sbcl-symbol-munger
+ (let ((commit "e96558e8315b8eef3822be713354787b2348b25e")
+ (revision "2"))
+ (package
+ (name "sbcl-symbol-munger")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AccelerationNet/symbol-munger")
+ (commit commit)))
+ (file-name (git-file-name "cl-symbol-munger" version))
+ (sha256
+ (base32
+ "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("iterate" ,sbcl-iterate)))
+ (arguments
+ ;; There is a cyclical dependency between symbol-munger and lisp-unit2.
+ ;; See https://github.com/AccelerationNet/symbol-munger/issues/4
+ '(#:tests? #f))
+ (synopsis
+ "Capitalization and spacing conversion functions for Common Lisp")
+ (description
+ "This is a Common Lisp library to change the capitalization and spacing
+of a string or a symbol. It can convert to and from Lisp, english, underscore
+and camel-case rules.")
+ (home-page "https://github.com/AccelerationNet/symbol-munger")
+ ;; The package declares a BSD license, but all of the license
+ ;; text is MIT.
+ ;; See https://github.com/AccelerationNet/symbol-munger/issues/5
+ (license license:expat))))
-(define-public ecl-nsymbols
- (sbcl-package->ecl-package sbcl-nsymbols))
+(define-public cl-symbol-munger
+ (sbcl-package->cl-source-package sbcl-symbol-munger))
-(define-public sbcl-utils-kt
- (let ((commit "4adfe2889036ab5ffdd3cc2182ca2cc692bf11ff"))
+(define-public ecl-symbol-munger
+ (sbcl-package->ecl-package sbcl-symbol-munger))
+
+(define-public sbcl-system-load
+ (let ((commit "3ff1a40be55866cc5316ac7a530d872b12510294")
+ (revision "0"))
(package
- (name "sbcl-utils-kt")
- (version (git-version "2007-12-02" "1" commit))
+ (name "sbcl-system-load")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/kennytilton/utils-kt")
+ (url "https://github.com/Shinmera/system-load")
(commit commit)))
- (file-name (git-file-name "cl-utils-kt" version))
+ (file-name (git-file-name "cl-system-load" version))
(sha256
- (base32 "016x3w034brz02z9mrsrkhk2djizg3yqsvhl9k62xqcnpy3b87dn"))))
+ (base32 "08d8kr8j5l2m8p69f47iklxhna394vx9mrys0sgplf5f2bqb7xcv"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/kennytilton/utils-kt")
- (synopsis "Kenny's utilities for Common Lisp")
+ (home-page "https://github.com/Shinmera/system-load")
+ (synopsis "Access system's CPU and memory usage from Common Lisp")
(description
- "This library contains generic hacks meant to be used in any project.
-It was originally developed for the Cells library.")
- (license license:expat))))
+ "System-Load is a Common Lisp library for accessing the system's CPU and
+memory usage.")
+ (license license:zlib))))
-(define-public cl-utils-kt
- (sbcl-package->cl-source-package sbcl-utils-kt))
+(define-public cl-system-load
+ (sbcl-package->cl-source-package sbcl-system-load))
-(define-public ecl-utils-kt
- (sbcl-package->ecl-package sbcl-utils-kt))
+(define-public ecl-system-load
+ (sbcl-package->ecl-package sbcl-system-load))
-(define-public sbcl-cells
- (let ((commit "e8542b17fddd6340c1e237ce482a52327c8ead8e"))
+(define-public sbcl-system-locale
+ (let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17"))
(package
- (name "sbcl-cells")
- (version (git-version "3.0" "1" commit))
+ (name "sbcl-system-locale")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/kennytilton/cells")
+ (url "https://github.com/Shinmera/system-locale/")
(commit commit)))
- (file-name (git-file-name "cl-cells" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "0rkzvwq38lwb1045w54kw020pb9i63hxiawwhqkf8k1inhak3fdk"))))
+ (base32 "00p5c053kmgq4ks6l9mxsqz6g3bjcybvkvj0bh3r90qgpkaawm1p"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-utils-kt))
- (arguments
- ;; Tests fail with #<TYPE-ERROR expected-type: STREAM datum: NIL>.
- '(#:tests? #f))
- (home-page "https://github.com/kennytilton/cells")
- (synopsis "Common Lisp implementation of the dataflow programming paradigm")
+ (list sbcl-documentation-utils))
+ (home-page "https://shinmera.github.io/system-locale/")
+ (synopsis "Get the system's locale and language settings in Common Lisp")
(description
- "Cells is a mature, stable extension to CLOS allowing one to create
-classes whose instances can have slot values determined by instance-specific
-formulas.")
- (license license:llgpl))))
+ "This library retrieves locale information configured on the
+system. This is helpful if you want to write applications and libraries that
+display messages in the user's native language.")
+ (license license:zlib))))
-(define-public cl-cells
- (sbcl-package->cl-source-package sbcl-cells))
+(define-public cl-system-locale
+ (sbcl-package->cl-source-package sbcl-system-locale))
-(define-public ecl-cells
- (sbcl-package->ecl-package sbcl-cells))
+(define-public ecl-system-locale
+ (sbcl-package->ecl-package sbcl-system-locale))
-(define-public sbcl-cl-algebraic-data-type
- (let ((commit "b2568428193a512d141d6b615772d50ceb5f9bca"))
+(define-public sbcl-tailrec
+ (let ((commit "6f882846d8f5bca9138df26510862e64bb15d92f")
+ (revision "2"))
(package
- (name "sbcl-cl-algebraic-data-type")
- (version (git-version "1.2.0" "1" commit))
+ (name "sbcl-tailrec")
+ (version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/stylewarning/cl-algebraic-data-type")
+ (url "https://github.com/charje/tailrec")
(commit commit)))
- (file-name (git-file-name "cl-algebraic-data-type" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1lnqxcv8pd5z8n0g5p2l0dbljx9pqiv18hxl0vhsh7ldhkrjv2jx"))))
+ (base32 "1h8m2npdzd2cpnl75pvv4yvvfwxa7kl6qvalc9s0y4yws0kaih3i"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-global-vars))
- (arguments
- '(#:tests? #f)) ; No tests.
- (home-page "https://github.com/stylewarning/cl-algebraic-data-type")
- (synopsis "Common Lisp library for algebraic data types")
- (description
- "CL-ALGEBRAIC-DATA-TYPE, or ADT, is a library for defining algebraic
-data types in a similar spirit to Haskell or Standard ML, as well as for
-operating on them.")
- (license license:bsd-3))))
+ (list sbcl-alexandria sbcl-trivial-macroexpand-all
+ sbcl-trivial-with-current-source-form))
+ (home-page "https://github.com/charje/tailrec")
+ (synopsis "Macro to optimize a Common Lisp function for tail recursion")
+ (description "Just wrap your Common Lisp function in this macro call and
+it will be optimized for tail recursion. You will be warned if the function
+is not tail recursive.")
+ (license license:llgpl))))
-(define-public cl-algebraic-data-type
- (sbcl-package->cl-source-package sbcl-cl-algebraic-data-type))
+(define-public cl-tailrec
+ (sbcl-package->cl-source-package sbcl-tailrec))
-(define-public ecl-algebraic-data-type
- (sbcl-package->ecl-package sbcl-cl-algebraic-data-type))
+(define-public ecl-tailrec
+ (sbcl-package->ecl-package sbcl-tailrec))
-(define-public sbcl-screamer
- (let ((commit "ce50614024de090b376107668da5e53232540ec7"))
+(define-public sbcl-tar
+ (let ((commit "7c6e07a10c93d9e311f087b5f6328cddd481669a")
+ (revision "0"))
(package
- (name "sbcl-screamer")
- (version (git-version "0.0.1" "1" commit))
+ (name "sbcl-tar")
+ (version (git-version "0.2.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/nikodemus/screamer/")
+ (url "https://gitlab.common-lisp.net/cl-tar/cl-tar")
(commit commit)))
- (file-name (git-file-name "cl-screamer" version))
+ (file-name (git-file-name "cl-tar" version))
(sha256
- (base32 "1jl42pl6kwkiq71d0naf3r1mn1qy89ndimfgiz58c4g66xbjb7kx"))))
+ (base32 "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"))))
(build-system asdf-build-system/sbcl)
+ ;; TODO: Build the tar program with 'build-program' when the
+ ;; 'asdf-release-ops' library is added to Guix.
+ (arguments
+ '(#:asd-systems '("tar"
+ "tar/common-extract"
+ "tar/create"
+ "tar/docs"
+ "tar/extract"
+ "tar/simple-extract")))
(native-inputs
- (list sbcl-iterate
- sbcl-hu.dwim.stefil))
- (home-page "https://nikodemus.github.io/screamer/")
- (synopsis "Nondeterministic programming and constraint propagation")
+ (list sbcl-parachute))
+ (inputs
+ (list sbcl-40ants-doc
+ sbcl-alexandria
+ sbcl-babel
+ sbcl-local-time
+ sbcl-osicat
+ sbcl-split-sequence
+ sbcl-tar-file))
+ (home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar")
+ (synopsis "High-level interface for tar files")
(description
- "Screamer is an extension of Common Lisp that adds support for
-nondeterministic programming. Screamer consists of two levels. The basic
-nondeterministic level adds support for backtracking and undoable side
-effects. On top of this nondeterministic substrate, Screamer provides a
-comprehensive constraint programming language in which one can formulate and
-solve mixed systems of numeric and symbolic constraints. Together, these two
-levels augment Common Lisp with practically all of the functionality of both
-Prolog and constraint logic programming languages such as CHiP and CLP(R).
-Furthermore, Screamer is fully integrated with Common Lisp. Screamer programs
-can coexist and interoperate with other extensions to as CLIM and Iterate.")
+ "@code{cl-tar} is a Common Lisp library providing a high-level interface
+for interacting with tar archives.")
(license license:expat))))
-(define-public cl-screamer
- (sbcl-package->cl-source-package sbcl-screamer))
+(define-public cl-tar
+ (sbcl-package->cl-source-package sbcl-tar))
-(define-public ecl-screamer
- (sbcl-package->ecl-package sbcl-screamer))
+(define-public ecl-tar
+ (sbcl-package->ecl-package sbcl-tar))
-(define-public sbcl-clache
- (let ((commit "112976729565e1035532389ca25090ae99badd07"))
+(define-public sbcl-tar-file
+ (let ((commit "0c10bc82f14702c97a26dc25ce075b5d3a2347d1")
+ (revision "0"))
(package
- (name "sbcl-clache")
- (version (git-version "0.2.1" "1" commit))
+ (name "sbcl-tar-file")
+ (version (git-version "0.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/html/clache/")
+ (url "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
(commit commit)))
- (file-name (git-file-name "cl-clache" version))
+ (file-name (git-file-name "cl-tar-file" version))
(sha256
- (base32 "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"))))
+ (base32 "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
+ (list sbcl-40ants-doc
+ sbcl-alexandria
sbcl-babel
- sbcl-cl-annot
- sbcl-cl-fad
- sbcl-cl-store
- sbcl-cl-syntax
- sbcl-ironclad
- sbcl-trivial-garbage))
- (native-inputs
- (list sbcl-prove))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "clache-test.asd"
- (("cl-test-more") "prove"))
- #t)))))
- (home-page "https://github.com/html/clache/")
- (synopsis "General caching facility for Common Lisp")
+ sbcl-chipz
+ sbcl-flexi-streams
+ sbcl-salza2
+ sbcl-trivial-gray-streams))
+ (home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
+ (synopsis "Read and write physical entries to and from tar files")
(description
- "CLACHE provides a general caching facility for Common Lisp. The API is
-similar to the standard hash-table interface.")
- (license license:llgpl))))
+ "@code{cl-tar-file} is a Common Lisp library that allows reading from
+and writing to various tar archive formats. Currently supported are the POSIX
+ustar, PAX (ustar with a few new entry types), GNU, and v7 (very old) formats.
-(define-public cl-clache
- (sbcl-package->cl-source-package sbcl-clache))
+This library is rather low level and is focused exclusively on reading and
+writing physical tar file entries using streams. Therefore, it contains no
+functionality for automatically building archives from a set of files on the
+filesystem or writing the contents of a file to the filesystem. Additionally,
+there are no smarts that read multiple physical entries and combine them into
+a single logical entry (e.g., with PAX extended headers or GNU long link/path
+name support). For a higher-level library that reads and writes logical
+entries, and also includes filesystem integration, see @code{cl-tar}.")
+ (license license:bsd-3))))
-(define-public ecl-clache
- (sbcl-package->ecl-package sbcl-clache))
+(define-public cl-tar-file
+ (sbcl-package->cl-source-package sbcl-tar-file))
-(define-public sbcl-definitions
- (let ((commit "1f4bd7a634a2299aea19cefb5da8041bbb27f2ec"))
+(define-public ecl-tar-file
+ (sbcl-package->ecl-package sbcl-tar-file))
+
+(define-public sbcl-terminal-keypress
+ (let ((commit "2ef48c045aa627229764b2aa393a83d392d93d08")
+ (revision "1"))
(package
- (name "sbcl-definitions")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-terminal-keypress")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/definitions/")
+ (url "https://github.com/eudoxia0/terminal-keypress")
(commit commit)))
- (file-name (git-file-name "cl-definitions" version))
+ (file-name (git-file-name "cl-terminal-keypress" version))
(sha256
- (base32 "16dh9iy3v344xj4qllsp47007px3yx26fxxh9gh2cvs8dqgk3kch"))))
+ (base32 "11c4krpq5x55qkchx6ykcnb455ssb4r3jjywx3c3irfrkj733ybp"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-documentation-utils))
- (home-page "https://shinmera.github.io/definitions")
- (synopsis "General definitions reflection library")
+ (list sbcl-alexandria sbcl-trivial-raw-io))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/eudoxia0/terminal-keypress")
+ (synopsis "Read keyboard events in the terminal from Common Lisp")
(description
- "This system implements a general definitions introspection library.
-It gives you the ability to retrieve definitions or bindings associated with
-designators such as symbols, packages, and names in general. For instance, it
-allows you to retrieve all function, type, variable, method, etc. definitions
-of a symbol.")
- (license license:zlib))))
+ "This is a library for reading semi-raw user input from terminals.
+Semi-raw as in, we can't detect if the user pressed the @code{Control} key
+alone, and the function keys are a mystery. What is supported, however, is:
-(define-public cl-definitions
- (sbcl-package->cl-source-package sbcl-definitions))
+@itemize
+@item Regular characters
+@item Control+[key]
+@item Alt+[key]
+@item Control+Alt+[key]
+@end itemize")
+ (license license:expat))))
-(define-public ecl-definitions
- (sbcl-package->ecl-package sbcl-definitions))
+(define-public cl-terminal-keypress
+ (sbcl-package->cl-source-package sbcl-terminal-keypress))
-(define-public sbcl-filtered-functions
- (let ((commit "130f69e7b9e1051bf569ef63364b09a3873f0ced"))
+(define-public ecl-terminal-keypress
+ (sbcl-package->ecl-package sbcl-terminal-keypress))
+
+(define-public sbcl-terminal-size
+ (let ((commit "e0b3d56a9dd3366baf2a05d84381da5747a2ef4a")
+ (revision "1"))
(package
- (name "sbcl-filtered-functions")
- (version (git-version "0.2.0" "1" commit))
+ (name "sbcl-terminal-size")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pcostanza/filtered-functions")
+ (url "https://github.com/eudoxia0/terminal-size")
(commit commit)))
- (file-name (git-file-name "cl-filtered-functions" version))
+ (file-name (git-file-name "cl-terminal-size" version))
(sha256
- (base32 "0m13k8pl0gfll8ss83c0z3gax7zrrw2i4s26451jfbka1xr4fgy9"))))
+ (base32 "1212wbadms9jzrqgarpj3d9xh9w4dab8jhx4k2aryqgf116zs42h"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-closer-mop))
- (home-page "https://github.com/pcostanza/filtered-functions")
- (synopsis "Extension of CLOS generic function invocation")
+ (list sbcl-cffi sbcl-osicat))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/eudoxia0/terminal-size")
+ (synopsis "Get the size of the terminal from Common Lisp")
(description
- "Filtered functions provide an extension of CLOS generic function
-invocation that add a simple preprocessing step before the actual method
-dispatch is performed and thus enable the use of arbitrary predicates for
-selecting and applying methods. See
-@url{http://www.p-cos.net/documents/filtered-dispatch.pdf} for a paper that
-introduces and explains filtered functions in detail.")
+ "This package provides the @code{terminal-size:size} function to get the
+size of the terminal from Common Lisp.")
(license license:expat))))
-(define-public cl-filtered-functions
- (sbcl-package->cl-source-package sbcl-filtered-functions))
+(define-public cl-terminal-size
+ (sbcl-package->cl-source-package sbcl-terminal-size))
-(define-public ecl-filtered-functions
- (sbcl-package->ecl-package sbcl-filtered-functions))
+(define-public ecl-terminal-size
+ (sbcl-package->ecl-package sbcl-terminal-size))
-(define-public sbcl-defstar
- (let ((commit "132829dac9f84fa7202a0c5793aa6accb8d2662a"))
+(define-public sbcl-terminfo
+ (let ((commit "b8b2e3ed786bfcf9f1aa4a264cee2e93135080f5")
+ (revision "1"))
(package
- (name "sbcl-defstar")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-terminfo")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "http://bitbucket.org/eeeickythump/defstar/")
+ (url "https://github.com/npatrick04/terminfo")
(commit commit)))
- (file-name (git-file-name "cl-defstar" version))
+ (file-name (git-file-name "terminfo" version))
(sha256
- (base32 "0n6m3aqvdfnsrhlhqjcy72d1i55lbkjg13ij5c7vw003p1n78wxi"))))
+ (base32 "1nmin9rr6f75xdhxysba66xa1dh62fh27w9ad1cvmj0062armf6b"))))
(build-system asdf-build-system/sbcl)
- (home-page "http://bitbucket.org/eeeickythump/defstar/")
- (synopsis "Easy inline (return) type declarations for functions")
+ (synopsis "Terminfo database front end in Common Lisp")
+ (home-page "https://github.com/npatrick04/terminfo")
(description
- "Defstar is a collection of Common Lisp macros that can be used in
-place of @code{defun}, @code{defmethod}, @code{defgeneric}, @code{defvar},
-@code{defparameter}, @code{flet}, @code{labels}, @code{let*} and
-@code{lambda}. Each macro has the same name as the form it replaces, with a
-star added at the end, e.g. @code{defun}. (the exception is the @code{let*}
-replacement, which is called @code{*let}).")
- (license license:gpl3))))
+ "This is a terminfo database front end in Common Lisp. The package
+provides a method for determining which capabilities a terminal
+(e.g. \"xterm\") has and methods to compile or put commands to a stream.")
+ (license license:expat))))
-(define-public cl-defstar
- (sbcl-package->cl-source-package sbcl-defstar))
+(define-public cl-terminfo
+ (sbcl-package->cl-source-package sbcl-terminfo))
-(define-public ecl-defstar
- (sbcl-package->ecl-package sbcl-defstar))
+(define-public ecl-terminfo
+ (sbcl-package->ecl-package sbcl-terminfo))
-(define-public sbcl-dynamic-mixins
- (let ((commit "7cc09bee7d68527f37406671fabe910e8235b746"))
+(define-public sbcl-termp
+ (let ((commit "29789fe83db624679b6f341e3fae3f2577ce6a45")
+ (revision "0"))
(package
- (name "sbcl-dynamic-mixins")
- (version (git-version "0.0" "1" commit))
+ (name "sbcl-termp")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rpav/dynamic-mixins")
+ (url "https://github.com/vindarel/termp")
(commit commit)))
- (file-name (git-file-name "cl-dynamic-mixins" version))
+ (file-name (git-file-name "cl-termp" version))
(sha256
- (base32 "00g3s509ysh2jp1qwsgb5bwl6qvhzcljwjz3z4mspbcak51484zj"))))
+ (base32 "03r5cv01q4yg0a2dv2ckn2xys53y9isrq3hkp0dqa96q8wrindlh"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-closer-mop))
- (home-page "https://github.com/rpav/dynamic-mixins")
- (synopsis "Simple, dynamic class combination for CLOS")
+ (synopsis "Test for real vs. dumb terminal window")
(description
- "Dynamic-mixins is for simple, dynamic class combination; it allows
-objects to be mixed and updated without manually defining many permutations.")
- (license license:bsd-2))))
+ "This is a trivial utility for distinguishing between a process running
+in a real terminal window and a process running in a dumb one, e.g.
+emacs-slime.")
+ (home-page "https://github.com/vindarel/termp")
+ (license license:expat))))
-(define-public cl-dynamic-mixins
- (sbcl-package->cl-source-package sbcl-dynamic-mixins))
+(define-public cl-termp
+ (sbcl-package->cl-source-package sbcl-termp))
-(define-public ecl-dynamic-mixins
- (sbcl-package->ecl-package sbcl-dynamic-mixins))
+(define-public ecl-termp
+ (sbcl-package->ecl-package sbcl-termp))
-(define-public sbcl-stealth-mixin
- (let ((commit "2f853fcead554221d4be3b10522b502ea729e944")
+(define-public sbcl-terrable
+ (let ((commit "e4fe23ffa08e8d53a8168105b413861da59cc786")
+ (revision "1"))
+ (package
+ (name "sbcl-terrable")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shirakumo/terrable")
+ (commit commit)))
+ (file-name (git-file-name "terrable" version))
+ (sha256
+ (base32 "0pnqflgz410zydc1ivwnd8hcl24bgr7x12yjzr7g4lq3ibc8y97b"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-documentation-utils sbcl-fast-io sbcl-ieee-floats
+ sbcl-static-vectors sbcl-trivial-garbage))
+ (home-page "https://shirakumo.github.io/terrable/")
+ (synopsis "Parser library for Terragen TER terrain files")
+ (description
+ "This package provides Common Lisp support for reading the Terragen
+@code{.TER} format. The format specification can be found at
+@url{https://planetside.co.uk/wiki/index.php?title=Terragen_.TER_Format}")
+ (license license:zlib))))
+
+(define-public cl-terrable
+ (sbcl-package->cl-source-package sbcl-terrable))
+
+(define-public ecl-terrable
+ (sbcl-package->ecl-package sbcl-terrable))
+
+(define-public sbcl-the-cost-of-nothing
+ (let ((commit "f364029fbbf37ae5786f2f9ddf6185dd204a7185")
(revision "0"))
(package
- (name "sbcl-stealth-mixin")
+ (name "sbcl-the-cost-of-nothing")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robert-strandh/Stealth-mixin")
+ (url "https://github.com/marcoheisig/the-cost-of-nothing")
(commit commit)))
- (file-name (git-file-name "cl-stealth-mixin" version))
+ (file-name (git-file-name "cl-the-cost-of-nothing" version))
(sha256
- (base32 "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi"))))
+ (base32 "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ ;; The test operation benchmarks the Common Lisp implementation; it
+ ;; doesn't test the package.
+ (list #:tests? #f))
(inputs
- (list sbcl-closer-mop))
- (home-page "https://github.com/robert-strandh/Stealth-mixin")
- (synopsis "Create stealth mixin classes")
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-local-time
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/marcoheisig/the-cost-of-nothing")
+ (synopsis "Measure the run time of Common Lisp code")
(description
- "Stealth-mixin is a Common Lisp library for creating stealth mixin
-classes. These are classes that are dynamically mixed into other classes
-without the latter being aware of it.")
- (license license:bsd-2))))
+ "THE-COST-OF-NOTHING is a library for measuring the run time of Common
+Lisp code. It provides macros and functions for accurate benchmarking and
+lightweight monitoring. Furthermore, it provides predefined benchmarks to
+determine the cost of certain actions on a given platform and implementation.")
+ (license license:expat))))
-(define-public cl-stealth-mixin
- (sbcl-package->cl-source-package sbcl-stealth-mixin))
+(define-public cl-the-cost-of-nothing
+ (sbcl-package->cl-source-package sbcl-the-cost-of-nothing))
-(define-public ecl-stealth-mixin
- (sbcl-package->ecl-package sbcl-stealth-mixin))
+(define-public ecl-the-cost-of-nothing
+ (sbcl-package->ecl-package sbcl-the-cost-of-nothing))
-(define-public sbcl-sealable-metaobjects
- (let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee"))
+(define-public sbcl-tooter
+ (let ((commit "76fbb36552b036ee84ec7fe4773616470b1ce4c2")
+ (revision "5"))
(package
- (name "sbcl-sealable-metaobjects")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-tooter")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/sealable-metaobjects/")
+ (url "https://github.com/Shinmera/tooter")
(commit commit)))
- (file-name (git-file-name "cl-sealable-metaobjects" version))
+ (file-name (git-file-name "cl-tooter" version))
(sha256
- (base32 "0hz1ivlpfhnk1w2cw4q2i000j2dc7maay06ndzziyywg7li6zf2p"))))
+ (base32 "05icr9aflxvqbkjj0f6yh0g5cr77vf9qdvwvlicw2nvbw4jdnmm8"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-closer-mop))
- (home-page "https://github.com/marcoheisig/sealable-metaobjects/")
- (synopsis "CLOSsy way to trade genericity for performance")
+ (list sbcl-alexandria
+ sbcl-cl-ppcre
+ sbcl-documentation-utils
+ sbcl-drakma
+ sbcl-yason))
+ (synopsis "Common Lisp client library for Mastodon instances")
(description
- "This library is an extension of the Common Lisp Object System (CLOS)
-that allows a compiler to inline a generic function under certain
-conditions.")
- (license license:expat))))
+ "This is a Common Lisp library implementing the full v1 REST API
+protocol for Mastodon.")
+ (home-page "https://shinmera.github.io/tooter/")
+ (license license:zlib))))
-(define-public cl-sealable-metaobjects
- (sbcl-package->cl-source-package sbcl-sealable-metaobjects))
+(define-public cl-tooter
+ (sbcl-package->cl-source-package sbcl-tooter))
-(define-public ecl-sealable-metaobjects
- (sbcl-package->ecl-package sbcl-sealable-metaobjects))
+(define-public ecl-tooter
+ (sbcl-package->ecl-package sbcl-tooter))
-(define-public sbcl-fast-generic-functions
- (let ((commit "9c307cd28af6453e45038ac3510de3123ff23743"))
+(define-public sbcl-transmission
+ (let ((commit "4bbf1d2761bfa5dfa79b7bc12c3238089b994d95"))
(package
- (name "sbcl-fast-generic-functions")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-transmission")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/marcoheisig/fast-generic-functions/")
+ (url "https://github.com/libre-man/cl-transmission/")
(commit commit)))
- (file-name (git-file-name "cl-fast-generic-functions" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "16hf9bi2p5s77p3m3aqsihcd9iicqjhhxxpsarjv93c41qs54yad"))))
+ (base32 "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-closer-mop
- sbcl-sealable-metaobjects
- sbcl-trivial-macroexpand-all))
(arguments
- ;; Tests fail: https://github.com/marcoheisig/fast-generic-functions/issues/10
- '(#:tests? #f))
- (home-page "https://github.com/marcoheisig/fast-generic-functions/")
- (synopsis "Seal generic functions to boost performance")
+ '(#:asd-systems '("cl-transmission")))
+ (inputs
+ (list sbcl-cl-ppcre sbcl-jonathan sbcl-named-readtables sbcl-rutils
+ sbcl-drakma))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/libre-man/cl-transmission/")
+ (synopsis "Common Lisp interface with Transmission using its RPC")
(description
- "This library introduces @emph{fast generic functions}, i.e. functions
-that behave just like regular generic functions, except that the can be sealed
-on certain domains. If the compiler can then statically detect that the
-arguments to a fast generic function fall within such a domain, it will
-perform a variety of optimizations.")
+ "@code{cl-transmission} is a library to interface with the Transmission
+torrent client using its RPC (remote procedure call).")
(license license:expat))))
-(define-public cl-fast-generic-functions
- (sbcl-package->cl-source-package sbcl-fast-generic-functions))
-
-(define-public ecl-fast-generic-functions
- (sbcl-package->ecl-package sbcl-fast-generic-functions))
-
-(define-public sbcl-compiler-macro-notes
- (package
- (name "sbcl-compiler-macro-notes")
- (version "0.2.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/digikar99/compiler-macro-notes")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-compiler-macro-notes" version))
- (sha256
- (base32 "1jv8snj2wvim3k9qhl1vsx82n56nzdmwa3ms9c4ml2d58fwpfjzs"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cl-environments))
- (home-page "https://github.com/digikar99/compiler-macro-notes")
- (synopsis "Macros and conditions for use within macros and compiler-macros")
- (description
- "Alternative to the @code{compiler-macro} library:
-
-@itemize
-@item Here, we do not treat compiler notes as warnings, but instead these are
-a separate class of conditions. These are also not errors.
-@item Two main condition classes are provided: compiler-macro-notes:note and
-compiler-macro-notes:optimization-failure-note. While the latter is a subclass
-of the former, the latter notes are printed in a slightly different manner to
-the former.
-@item To be able to correctly print the expansion path that led to the
-condition, user code is expected to avoid performing a nonlocal exit to a
-place outside with-notes.
-@end itemize\n")
- (license license:expat)))
-
-(define-public cl-compiler-macro-notes
- (sbcl-package->cl-source-package sbcl-compiler-macro-notes))
+(define-public cl-transmission
+ (sbcl-package->cl-source-package sbcl-transmission))
-(define-public ecl-compiler-macro-notes
- (sbcl-package->ecl-package sbcl-compiler-macro-notes))
+(define-public ecl-transmission
+ (sbcl-package->ecl-package sbcl-transmission))
-(define-public sbcl-ctype
- (let ((commit "4fc4c5ae44c435ed82556969f698005bee50101c"))
+(define-public sbcl-trees
+ (let ((commit "7b06048af0248c4302088c758208276f9faf2beb"))
(package
- (name "sbcl-ctype")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-trees")
+ (version (git-version "0.11" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/s-expressionists/ctype")
+ (url "https://github.com/froydnj/trees/")
(commit commit)))
- (file-name (git-file-name "cl-ctype" version))
+ (file-name (git-file-name "cl-trees" version))
(sha256
- (base32 "05smc81ml9rbcbzdhqg2mi9drnjsipq62r5q7f7qql8hbx01vl9i"))))
+ (base32 "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (arguments
- '(#:asd-systems '("ctype" "ctype-tfun")))
- (home-page "https://github.com/s-expressionists/ctype")
- (synopsis "Common Lisp type system implementation")
+ (home-page "https://github.com/froydnj/trees/")
+ (synopsis "Binary trees in normal and balanced flavors")
(description
- "This system is an implementation of the Common Lisp type system;
-particularly @code{cl:typep} and @code{cl:subtypep}.")
- (license license:bsd-2))))
+ "This package implements binary trees of various kinds, presenting a
+uniform interface to them all.")
+ (license license:bsd-3))))
-(define-public cl-ctype
- (sbcl-package->cl-source-package sbcl-ctype))
+(define-public cl-trees
+ (sbcl-package->cl-source-package sbcl-trees))
-(define-public ecl-ctype
- (sbcl-package->ecl-package sbcl-ctype))
+(define-public ecl-trees
+ (sbcl-package->ecl-package sbcl-trees))
-(define-public sbcl-polymorphic-functions
+(define-public sbcl-triads
(package
- (name "sbcl-polymorphic-functions")
- (version "0.2.1")
+ (name "sbcl-triads")
+ (version "0.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/digikar99/polymorphic-functions/")
+ (url "https://git.sr.ht/~charje/triads")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-polymorphic-functions" version))
+ (file-name (git-file-name "cl-triads" version))
(sha256
- (base32 "161ylp3avmkylgfddp7i1kscv3bqx734jk1i97xhsbl7x83nin0h"))))
+ (base32 "0s47rcp3karml5b06g98adjr2wxn6y9p9bigh8y7wjihpr3075x1"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-closer-mop
- sbcl-compiler-macro-notes
- sbcl-ctype
- sbcl-fiveam
- sbcl-cl-form-types
- sbcl-introspect-environment
- sbcl-slime-swank))
+ (outputs '("out" "bin"))
(arguments
- ;; Tests fail: https://github.com/digikar99/polymorphic-functions/issues/8
- '(#:tests? #f))
- (home-page "https://github.com/digikar99/polymorphic-functions/")
- (synopsis "Function type to dispatch on types instead of classes")
- (description
- "This library provides all of
+ '(#:asd-systems '("charje.triads")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'create-asdf-configuration 'build-binary
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "HOME" (getcwd))
+ (invoke
+ "sbcl" "--eval" "(require :asdf)" "--eval"
+ (format
+ #f "~S"
+ `(progn
+ (require "charje.triads"
+ ,(string-append (getcwd) "/charje.triads.asd"))
+ (asdf:make "charje.triads"))))
+ (install-file
+ (string-append (getcwd) "/triads")
+ (string-append (assoc-ref outputs "bin") "/bin")))))))
+ (inputs
+ (list sbcl-charje.loop
+ sbcl-cl-str
+ sbcl-command-line-args
+ sbcl-serapeum
+ sbcl-trivia))
+ (home-page "https://git.sr.ht/~charje/triads")
+ (synopsis "Music composition tool to convert roman numerals into triads")
+ (description "Triads is a simple command line tool that reads roman
+numeral notation from standard input (or a file) and an musical key and outputs
+the roman numeral in addition to the notes of the triad associated with that
+roman numeral given in the key.")
+ (license license:gpl3)))
-@itemize
-@item ad hoc polymorphism and
-@item subtype polymorphism
-@item parametric polymorphism (in a very limited sense)
-@end itemize
+(define-public cl-triads
+ (sbcl-package->cl-source-package sbcl-triads))
-to dispatch on the basis of types rather than classes.")
- (license license:expat)))
+(define-public ecl-triads
+ (let ((ecl-package (sbcl-package->ecl-package sbcl-triads)))
+ (package
+ (inherit ecl-package)
+ (outputs '("out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ecl-package)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'build-binary))))))))
-(define-public cl-polymorphic-functions
- (sbcl-package->cl-source-package sbcl-polymorphic-functions))
+(define-public sbcl-trial
+ (let ((commit "db4e98ede16640238bd51bf5d63cda57c75a51ae")
+ (revision "2"))
+ (package
+ (name "sbcl-trial")
+ (version (git-version "1.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shirakumo/trial")
+ (commit commit)))
+ (file-name (git-file-name "cl-trial" version))
+ (sha256
+ (base32 "0haslkzcgivz42k23n90w1dzw8zdgdrqcndadl33pqqlf0d20ilw"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems '("trial"
+ "trial-alloy"
+ "trial-animation"
+ "trial-assimp"
+ ;; TODO: It requires a long packaging journey.
+ ;; "trial-feedback"
+ "trial-gif"
+ "trial-glfw"
+ ;; FIXME: Check why this system is failing:
+ ;; WARNING: Invalid qualifiers for APPEND method
+ ;; combination in method
+ ;; ...
+ ;; "trial-glop"
+ "trial-gltf"
+ "trial-harmony"
+ "trial-jpeg"
+ "trial-notify"
+ "trial-png"
+ ;; TODO: I'm not sure which QOI system to use here. There are two:
+ ;; - https://github.com/bpanthi977/qoi
+ ;; - https://github.com/mfiano/qoi
+ ;; "trial-qoi"
+ ;; TODO: It requires a long packaging journey.
+ ;; "trial-qt"
+ "trial-sdl2"
+ "trial-terragen"
+ "trial-tga"
+ "trial-tiff"
+ "trial-workbench")))
+ (native-inputs
+ (list sbcl-trivial-features))
+ (inputs
+ (list sbcl-3d-matrices
+ sbcl-3d-quaternions
+ sbcl-3d-transforms
+ sbcl-3d-vectors
+ sbcl-alexandria
+ sbcl-alloy
+ sbcl-atomics
+ sbcl-bordeaux-threads
+ sbcl-cl-gamepad
+ sbcl-cl-glfw3
+ sbcl-cl-gltf
+ sbcl-cl-jpeg
+ sbcl-cl-opengl
+ sbcl-cl-ppcre
+ sbcl-cl-tga
+ sbcl-classimp
+ sbcl-closer-mop
+ sbcl-deploy
+ sbcl-dns-client
+ sbcl-fast-io
+ sbcl-file-notify
+ sbcl-flare
+ sbcl-float-features
+ sbcl-flow
+ sbcl-for
+ sbcl-form-fiddle
+ sbcl-glop
+ sbcl-glsl-toolkit
+ sbcl-harmony
+ sbcl-ieee-floats
+ sbcl-jzon
+ sbcl-lambda-fiddle
+ sbcl-language-codes
+ sbcl-lquery
+ sbcl-messagebox
+ sbcl-mmap
+ sbcl-pathname-utils
+ sbcl-pngload
+ sbcl-promise
+ sbcl-retrospectiff
+ sbcl-sdl2
+ sbcl-simple-tasks
+ sbcl-static-vectors
+ sbcl-system-locale
+ sbcl-terrable
+ sbcl-trivial-extensible-sequences
+ sbcl-trivial-garbage
+ sbcl-trivial-indent
+ sbcl-trivial-main-thread
+ sbcl-verbose
+ sbcl-zpng))
+ (home-page "https://github.com/Shirakumo/trial")
+ (synopsis "Common Lisp game engine")
+ (description
+ "Trial is a game engine written in Common Lisp. Unlike many other
+engines, it is meant to be more of a loose connection of components that can be
+fit together as required by any particular game.")
+ (license license:zlib))))
-(define-public ecl-polymorphic-functions
- (sbcl-package->ecl-package sbcl-polymorphic-functions))
+(define-public cl-trial
+ (sbcl-package->cl-source-package sbcl-trial))
-(define-public sbcl-slot-extra-options
- (let ((commit "29517d980325cd63744f1acf4cfe5c8ccec2b318"))
+;; TODO: Enable with new ECL when this issue is fixed:
+;; https://github.com/Shinmera/3d-quaternions/issues/2
+;; (define-public ecl-trial
+;; (sbcl-package->ecl-package sbcl-trial))
+
+(define-public sbcl-tripod
+ (let ((commit "b019a27cd7eb895870f84b0eb6c3edc5d7b05928")
+ (revision "1"))
(package
- (name "sbcl-slot-extra-options")
- (version (git-version "1.1.1" "1" commit))
+ (name "sbcl-tripod")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/some-mthfka/slot-extra-options/")
+ (url "https://github.com/aartaka/tripod")
(commit commit)))
- (file-name (git-file-name "cl-slot-extra-options" version))
+ (file-name (git-file-name "cl-tripod" version))
(sha256
- (base32 "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"))))
+ (base32 "0y8sns6njq9x7km58vpj7gx4cia9zkcpng3d38300xk0nnk2kz8w"))))
(build-system asdf-build-system/sbcl)
+ (outputs '("out" "bin"))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'create-asdf-configuration 'build-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; FIXME: Using #$output:bin here prevents cl-tripod and
+ ;; ecl-tripod from building, but using assoc-ref works.
+ (build-program (string-append ;; #$output:bin
+ (assoc-ref outputs "bin")
+ "/bin/tripod")
+ outputs
+ #:entry-program '((tripod:entry-point))
+ #:compress? #t))))))
(inputs
(list sbcl-alexandria
- sbcl-closer-mop
- sbcl-serapeum
- sbcl-iterate))
- (native-inputs
- (list sbcl-parachute))
- (home-page "https://github.com/some-mthfka/slot-extra-options/")
- (synopsis "Extra options for slots using MOP")
+ sbcl-cl-gopher
+ sbcl-cl-markdown
+ sbcl-clss
+ sbcl-hunchentoot
+ sbcl-local-time
+ sbcl-nactivitypub
+ sbcl-njson
+ sbcl-phos
+ sbcl-plump
+ sbcl-trivial-mimes))
+ (home-page "https://aartaka.me/blog/tripod")
+ (synopsis "Common Lisp web server aiming to ease website hosting")
(description
- "This library lets you build a metaclass which in turn lets you specify
-extra slot options in its classes. Options may be easily inspected and custom
-inheritance may be set up. The Meta-Object Protocol (MOP) is used for the
-implementation - through @code{closer-mop}. Some convenience function for
-processing slot options are also available.
-
-Possible use case: you want to automatically set up some definitions based on
-some slots, but you want to have control over it right in the class
-definition.")
- (license license:lgpl3+))))
+ "Tripod is a Common Lisp web server aiming to ease plain text, HTML,
+and Gopher website hosting.")
+ (license license:bsd-2))))
-(define-public cl-slot-extra-options
- (sbcl-package->cl-source-package sbcl-slot-extra-options))
+(define-public cl-tripod
+ ;; No "bin" output for the source package.
+ (let ((pkg (sbcl-package->cl-source-package sbcl-tripod)))
+ (package/inherit pkg
+ (outputs '("out")))))
-(define-public ecl-slot-extra-options
- (sbcl-package->ecl-package sbcl-slot-extra-options))
+(define-public ecl-tripod
+ ;; FIXME: Making a standalone binary doesn't work with ECL.
+ (let ((pkg (sbcl-package->ecl-package sbcl-tripod)))
+ (package/inherit pkg
+ (outputs '("out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments pkg)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'build-program))))))))
-(define-public sbcl-slite
- (let ((commit "942a95330592d30be5ac02fb1b697fb14ccbf1af")
+;;; Split the trivia package in two to work around the circular dependency
+;;; between guicho271828/trivia and guicho271828/type-i.
+(define-public sbcl-trivia.trivial
+ (let ((commit "8b406c3f83521d290e97bb787d3f6c1eb3b716af")
(revision "0"))
(package
- (name "sbcl-slite")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-trivia.trivial")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tdrhq/slite/")
+ (url "https://github.com/guicho271828/trivia")
(commit commit)))
- (file-name (git-file-name "slite" version))
+ (file-name (git-file-name "cl-trivia" version))
(sha256
- (base32 "0b4c4vs1zlhcvr9flv8bx76v9hrwc9qmazmp60407q7cghn0k8zk"))))
+ (base32
+ "0fnnjnba07qrsf82jm4q6dini7z72xabcssy5y2bqy082r07l8l7"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-str
- sbcl-fiveam
- sbcl-parachute
- sbcl-lisp-unit2))
- (home-page "https://github.com/tdrhq/slite")
- (synopsis "Common Lisp system for Slite ")
- (description
- "This package provides the Common Lisp part of the emacs-slite test runner.")
- (license license:asl2.0))))
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-lisp-namespace
+ sbcl-trivial-cltl2))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (for-each delete-file
+ '("trivia.balland2006.asd"
+ "trivia.ppcre.asd"
+ "trivia.quasiquote.asd"
+ "trivia.cffi.asd"
+ "trivia.fset.asd"
+ "trivia.asd"
+ "trivia.test.asd")))))))
+ (synopsis "Pattern matching in Common Lisp")
+ (description "Trivia is a pattern matching compiler that is compatible
+with Optima, another pattern matching library for Common Lisp. It is meant to
+be faster and more extensible than Optima.")
+ (home-page "https://github.com/guicho271828/trivia")
+ (license license:llgpl))))
-(define-public cl-slite
- (sbcl-package->cl-source-package sbcl-slite))
+(define-public cl-trivia.trivial
+ (sbcl-package->cl-source-package sbcl-trivia.trivial))
-(define-public ecl-slite
- (sbcl-package->ecl-package sbcl-slite))
+(define-public ecl-trivia.trivial
+ (sbcl-package->ecl-package sbcl-trivia.trivial))
-(define-public emacs-slite
+(define-public sbcl-trivia
(package
- (inherit sbcl-slite)
- (name "emacs-slite")
- (build-system emacs-build-system)
- (synopsis "SLIme-based TEst runner for FiveAM and Parachute Tests")
- (description
- "Slite interactively runs your Common Lisp tests (currently only FiveAM
-and Parachute are supported). It allows you to see the summary of test
-failures, jump to test definitions, rerun tests with debugger all from inside
-Emacs.
-
-In order to work, this also requires the slite Common Lisp system to be
-present. See the code@{*cl-slite packages}.")))
+ (inherit sbcl-trivia.trivial)
+ (name "sbcl-trivia")
+ (native-inputs
+ (list sbcl-fiveam
+ sbcl-optima))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-cffi
+ sbcl-cl-ppcre
+ sbcl-fare-quasiquote
+ sbcl-fset
+ sbcl-iterate
+ sbcl-trivia.trivial
+ sbcl-type-i))
+ (arguments
+ '(#:asd-systems '("trivia"
+ "trivia.ppcre"
+ "trivia.quasiquote"
+ "trivia.cffi"
+ "trivia.fset")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (for-each delete-file
+ '("trivia.level0.asd"
+ "trivia.level1.asd"
+ "trivia.level2.asd"
+ "trivia.trivial.asd")))))))))
-(define-public sbcl-parseq
- (package
- (name "sbcl-parseq")
- (version "0.5.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mrossini-ethz/parseq")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-parseq" version))
- (sha256
- (base32 "0b4lnhwqdlaqccanyssdj2v0am2ygw6qr4543b49kz2rwirykw0w"))))
- (build-system asdf-build-system/sbcl)
- (home-page "https://github.com/mrossini-ethz/parseq")
- (synopsis "Parsing expression grammars for sequences")
- (description
- "Parseq (pronounced parsec) is a parsing library for common lisp. It can
-be used for parsing lisp's sequences types: strings, vectors (e.g. binary
-data) and lists. Furthermore, parseq is able to parse nested structures such
-as trees (e.g. lists of lists, lists of vectors, vectors of strings).
+(define-public cl-trivia
+ (sbcl-package->cl-source-package sbcl-trivia))
-Parseq uses parsing expression grammars (PEG) that can be defined through a
-simple interface. Extensions to the standard parsing expressions are
-available. Parsing expressions can be parameterised and made context
-aware. Additionally, the definition of each parsing expression allows the
-arbitrary transformation of the parsing tree.
+(define-public ecl-trivia
+ (sbcl-package->ecl-package sbcl-trivia))
-The library is inspired by Esrap and uses a very similar interface. No code
-is shared between the two projects, however. The features of Esrap are are
-mostly included in parseq and complemented with additional, orthogonal
-features. Any resemblance to esrap-liquid is merely coincidental.")
- (license license:gpl2)))
+(define-public sbcl-trivial-arguments
+ (let ((commit "ecd84ed9cf9ef8f1e873d7409e6bd04979372aa7")
+ (revision "1"))
+ (package
+ (name "sbcl-trivial-arguments")
+ (version (git-version "1.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/trivial-arguments")
+ (commit commit)))
+ (file-name (git-file-name "trivial-arguments" version))
+ (sha256
+ (base32 "02vaqfavhj8jqxnr68nnzvzshm8jbgcy6m9lvyv4daa6f7ihqf88"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/Shinmera/trivial-arguments")
+ (synopsis "Common Lisp library to retrieve a function's lambda-list")
+ (description
+ "This is a simple library to retrieve the argument list of a function.")
+ (license license:zlib))))
-(define-public cl-parseq
- (sbcl-package->cl-source-package sbcl-parseq))
+(define-public cl-trivial-arguments
+ (sbcl-package->cl-source-package sbcl-trivial-arguments))
-(define-public ecl-parseq
- (sbcl-package->ecl-package sbcl-parseq))
+(define-public ecl-trivial-arguments
+ (sbcl-package->ecl-package sbcl-trivial-arguments))
-(define-public sbcl-physical-quantities
- (package
- (name "sbcl-physical-quantities")
- (version "0.2.1")
- (source
- (origin
+(define-public sbcl-trivial-backtrace
+ (let ((commit "7f90b4a4144775cca0728791e4b92ac2557b07a1")
+ (revision "2"))
+ (package
+ (name "sbcl-trivial-backtrace")
+ (version (git-version "1.1.0" revision commit))
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/mrossini-ethz/physical-quantities")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-physical-quantities" version))
+ (url "https://github.com/hraban/trivial-backtrace")
+ (commit commit)))
+ (file-name (git-file-name "trivial-backtrace" version))
(sha256
- (base32 "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-parseq))
- (home-page "https://github.com/mrossini-ethz/physical-quantities")
- (synopsis "Numeric type with optional unit and/or uncertainty for physics")
- (description
- "This lisp library handles physical quantities which consist of
-
-@itemize
-@item value / magnitude
-@item uncertainty / error
-@item unit
-@end itemize
-
-where the type of the value can be any subtype of real. For the uncertainty,
-both absolute and relative values are possible. Combinations of lisp symbols
-or strings are used to describe units. User defined units including
-abbreviations and prefixes are supported. Error propagation and unit checking
-is performed for all defined operations.")
- (license license:gpl2)))
+ (base32 "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-lift))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'check 'delete-test-results
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((test-results (string-append (assoc-ref outputs "out")
+ "/share/common-lisp/"
+ (%lisp-type)
+ "/trivial-backtrace"
+ "/test-results")))
+ (when (file-exists? test-results)
+ (delete-file-recursively test-results)))
+ #t)))))
+ (home-page "https://common-lisp.net/project/trivial-backtrace/")
+ (synopsis "Portable simple API to work with backtraces in Common Lisp")
+ (description
+ "One of the many things that didn't quite get into the Common Lisp
+standard was how to get a Lisp to output its call stack when something has
+gone wrong. As such, each Lisp has developed its own notion of what to
+display, how to display it, and what sort of arguments can be used to
+customize it. @code{trivial-backtrace} is a simple solution to generating a
+backtrace portably.")
+ (license license:expat))))
-(define-public cl-physical-quantities
- (sbcl-package->cl-source-package sbcl-physical-quantities))
+(define-public cl-trivial-backtrace
+ (sbcl-package->cl-source-package sbcl-trivial-backtrace))
-(define-public ecl-physical-quantities
- (sbcl-package->ecl-package sbcl-physical-quantities))
+(define-public ecl-trivial-backtrace
+ (sbcl-package->ecl-package sbcl-trivial-backtrace))
-(define-public sbcl-sb-cga
- (let ((commit "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094"))
+(define-public sbcl-trivial-benchmark
+ (let ((commit "1fbc8d15f09ed8aa426bc73956b8b7c9b2668802")
+ (revision "2"))
(package
- (name "sbcl-sb-cga")
- (version (git-version "1.0.1" "1" commit))
+ (name "sbcl-trivial-benchmark")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/nikodemus/sb-cga/")
+ (url "https://github.com/Shinmera/trivial-benchmark/")
(commit commit)))
- (file-name (git-file-name "cl-sb-cga" version))
+ (file-name (git-file-name "cl-trivial-benchmark" version))
(sha256
- (base32 "1y54qlwfrhch9aghk7nsbdx7x2qsvgsws1g2k631l9dsgdakw4w8"))))
+ (base32 "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria))
- (home-page "https://github.com/nikodemus/sb-cga/")
- (synopsis "Computer graphic algebra for Common Lisp")
+ (home-page "https://shinmera.github.io/trivial-benchmark/")
+ (synopsis "Easy to use benchmarking system for Common Lisp")
(description
- "SB-CGA is a computer graphics algebra library for Common Lisp.
+ "Trivial-Benchmark runs a block of code many times and outputs some
+statistical data for it. On SBCL this includes the data from @code{time}, for
+all other implementations just the @code{real-time} and @code{run-time} data.
+However, you can extend the system by adding your own @code{metrics} to it, or
+even by adding additional statistical @code{compute}ations.")
+ (license license:zlib))))
-Despite the prefix it is actually portable - but optimizations that make it
-fast (using SIMD instructions) are currently implemented for SBCL/x86-64
-only.")
- (license license:expat))))
+(define-public cl-trivial-benchmark
+ (sbcl-package->cl-source-package sbcl-trivial-benchmark))
-(define-public cl-sb-cga
- (sbcl-package->cl-source-package sbcl-sb-cga))
+(define-public ecl-trivial-benchmark
+ (sbcl-package->ecl-package sbcl-trivial-benchmark))
-(define-public ecl-sb-cga
- (sbcl-package->ecl-package sbcl-sb-cga))
+(define-public sbcl-trivial-channels
+ (let ((commit "e2370118d8983ba69c0360a7695f8f2e2fd6a8a6")
+ (revision "1"))
+ (package
+ (name "sbcl-trivial-channels")
+ (version (git-version "1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rpav/trivial-channels")
+ (commit commit)))
+ (file-name (git-file-name "trivial-channels" version))
+ (sha256
+ (base32 "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-bordeaux-threads sbcl-trivial-timeout))
+ (home-page "https://github.com/rpav/trivial-channels")
+ (synopsis "Common Lisp simple thread-safe channels with timeout")
+ (description
+ "It's very basic implementation of channels and queue for Common Lisp.")
+ (license license:bsd-2))))
-(define-public sbcl-mathkit
- (let ((commit "fd884f94b36ef5e9bc19459ad0b3cda6303d2a2a"))
+(define-public cl-trivial-channels
+ (sbcl-package->cl-source-package sbcl-trivial-channels))
+
+(define-public ecl-trivial-channels
+ (sbcl-package->ecl-package sbcl-trivial-channels))
+
+(define-public sbcl-trivial-clipboard
+ (let ((commit "50b3d3a25717ac78fb1f0517635c3cb1c31c7667")
+ (revision "8"))
(package
- (name "sbcl-mathkit")
- (version (git-version "0.0" "1" commit))
+ (name "sbcl-trivial-clipboard")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/mathkit/")
+ (url "https://github.com/snmsts/trivial-clipboard")
(commit commit)))
- (file-name (git-file-name "cl-mathkit" version))
+ (file-name (git-file-name "cl-trivial-clipboard" version))
(sha256
- (base32 "174y6ndmf52h8sml87qjfl48llmynvdizzk2h0mr85zbaysx73i3"))))
+ (base32 "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-sb-cga))
- (home-page "https://github.com/lispgames/mathkit/")
- (synopsis "Pure math functions useful for games, 3D, and GL in general")
+ ;; Pick xsel instead of xclip because its closure size is slightly
+ ;; smaller.
+ (list wl-clipboard xsel))
+ (native-inputs
+ (list sbcl-fiveam))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/text.lisp"
+ (("\"xsel\"")
+ (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\""))
+ (("\"wl-copy\"")
+ (string-append "\""
+ (assoc-ref inputs "wl-clipboard")
+ "/bin/wl-copy\""))
+ (("\"wl-paste\"")
+ (string-append "\""
+ (assoc-ref inputs "wl-clipboard")
+ "/bin/wl-paste\""))))))))
+ (home-page "https://github.com/snmsts/trivial-clipboard")
+ (synopsis "Access system clipboard in Common Lisp")
(description
- "This is a purely math-related utility kit, providing functions which
-can be useful for games, 3D, and GL in general.")
+ "@command{trivial-clipboard} gives access to the system clipboard.")
(license license:expat))))
-(define-public cl-mathkit
- (sbcl-package->cl-source-package sbcl-mathkit))
+(define-public cl-trivial-clipboard
+ (sbcl-package->cl-source-package sbcl-trivial-clipboard))
-(define-public ecl-mathkit
- (sbcl-package->ecl-package sbcl-mathkit))
+(define-public ecl-trivial-clipboard
+ (sbcl-package->ecl-package sbcl-trivial-clipboard))
-(define-public sbcl-rucksack
- (let ((commit "89278f88513ef328d290aa8b2baa06d63b44a9b1")
- (revision "0"))
+(define-public sbcl-trivial-cltl2
+ (let ((commit "8a3bda30dc25d2f65fcf514d0eb6e6db75252c61")
+ (revision "2"))
(package
- (name "sbcl-rucksack")
- (version (git-version "0.1.20" revision commit))
- (source
+ (name "sbcl-trivial-cltl2")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1.1" revision commit))
+ (home-page "https://github.com/Zulu-Inuoe/trivial-cltl2")
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/arieltan/rucksack")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-rucksack" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0acpsxaxpp90km7gdbn9sysilycp3yg1g040fg1vqakpj2yb8vad"))))
- (build-system asdf-build-system/sbcl)
- (synopsis "Flexible, light weight, persistence library")
- (description
- "@code{cl-rucksack} is a persistence library based on Arthur Lemmens'
-Rucksack with some enhancements.")
- (home-page "https://github.com/arieltan/rucksack/")
- (license license:expat))))
+ (base32
+ "08cnzb9rnczn4pn2zpf0587ny4wjy1mjndy885fz9pw7xrlx37ip"))))
+ (synopsis "Simple CLtL2 compatibility layer for Common Lisp")
+ (description "This library is a portable compatibility layer around
+\"Common Lisp the Language, 2nd
+Edition\" (@url{https://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node102.html})
+and it exports symbols from implementation-specific packages.")
+ (license license:llgpl))))
-(define-public cl-rucksack
- (sbcl-package->cl-source-package sbcl-rucksack))
+(define-public cl-trivial-cltl2
+ (sbcl-package->cl-source-package sbcl-trivial-cltl2))
-(define-public sbcl-sdl2kit
- (let ((commit "aae663224a10ece2b0c374aa5942a3f0bc1b3c2f"))
+(define-public ecl-trivial-cltl2
+ (sbcl-package->ecl-package sbcl-trivial-cltl2))
+
+(define-public sbcl-trivial-custom-debugger
+ (let ((commit "a560594a673bbcd88136af82086107ee5ff9ca81"))
(package
- (name "sbcl-sdl2kit")
- (version (git-version "0.0.0" "1" commit))
+ (name "sbcl-trivial-custom-debugger")
+ (version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/sdl2kit/")
+ (url "https://github.com/phoe/trivial-custom-debugger")
(commit commit)))
- (file-name (git-file-name "cl-sdl2kit" version))
+ (file-name (git-file-name "trivial-custom-debugger" version))
(sha256
- (base32 "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"))))
+ (base32 "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cl-opengl
- sbcl-defpackage-plus
- sbcl-sdl2))
- (home-page "https://github.com/lispgames/sdl2kit/")
- (synopsis "Utility kit for CL-SDL2")
+ (arguments
+ '(;; FIXME: Tests disabled because of a circular dependency between
+ ;; trivial-custom-debugger and parachute.
+ #:tests? #f))
+ ;;(native-inputs
+ ;; (list sbcl-parachute))
+ (home-page "https://github.com/phoe/trivial-custom-debugger/")
+ (synopsis "Allow arbitrary functions as the standard Lisp debugger")
(description
- "This is a utility kit for @code{cl-sdl2} that provides something similar to
-GLUT. However, it's also geared at being useful for \"real\" applications or
-games.")
+ "This is a portability library that allows one to fully override the
+standard debugger provided by their Common Lisp system for situations where
+binding @code{*debugger-hook*} is not enough -- most notably, for
+@code{break}.")
(license license:expat))))
-(define-public cl-sdl2kit
- (sbcl-package->cl-source-package sbcl-sdl2kit))
+(define-public cl-trivial-custom-debugger
+ (sbcl-package->cl-source-package sbcl-trivial-custom-debugger))
-(define-public ecl-sdl2kit
- (sbcl-package->ecl-package sbcl-sdl2kit))
+(define-public ecl-trivial-custom-debugger
+ (package
+ (inherit (sbcl-package->ecl-package sbcl-trivial-custom-debugger))
+ (arguments
+ ;; Tests fail on ECL: https://github.com/phoe/trivial-custom-debugger/issues/3
+ '(#:tests? #f))))
-(define-public sbcl-glkit
- (let ((commit "0d8e7c5fed4231f2177afcf0f3ff66f196ed6a46"))
+(define-public sbcl-trivial-do
+ (let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163"))
(package
- (name "sbcl-glkit")
- (version (git-version "0.0" "1" commit))
+ (name "sbcl-trivial-do")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lispgames/glkit/")
+ (url "https://github.com/yitzchak/trivial-do")
(commit commit)))
- (file-name (git-file-name "cl-glkit" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"))))
+ (base32 "1ffva79nkicc7wc8c2ic5nayis3b2rk5sxzj74yjkymkjgbpcrgd"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-cl-opengl
- sbcl-defpackage-plus
- sbcl-mathkit
- sbcl-sb-cga
- sbcl-sdl2
- sbcl-static-vectors))
- (home-page "https://github.com/lispgames/glkit/")
- (synopsis "OpenGL utilities for math, shaders, and more")
+ (home-page "https://github.com/yitzchak/trivial-do")
+ (synopsis "Additional dolist style macros for Common Lisp")
(description
- "This is a utility kit for functionality related to OpenGL. It provides the following:
+ "Additional dolist style macros for Common Lisp, such as
+@code{doalist}, @code{dohash}, @code{dolist*}, @code{doplist}, @code{doseq}
+and @code{doseq*}.")
+ (license license:zlib))))
-@itemize
-@item @code{kit.glm}: This re-exports @code{sb-cga} and @code{mathkit} for
-convenience.
-@item @code{kit.gl.shader}: This provides shader dictionary and compilation
-functionality similar to what was originally found in @code{sdl2kit}.
-@item @code{kit.gl.vao}: This provides an interface for Vertex Array Objects.
-@end itemize\n")
- (license license:expat))))
+(define-public cl-trivial-do
+ (sbcl-package->cl-source-package sbcl-trivial-do))
-(define-public cl-glkit
- (sbcl-package->cl-source-package sbcl-glkit))
+(define-public ecl-trivial-do
+ (sbcl-package->ecl-package sbcl-trivial-do))
-(define-public ecl-glkit
- (sbcl-package->ecl-package sbcl-glkit))
+(define-public sbcl-trivial-download
+ (let ((commit "d2472061d86b1cf3d32f388daacd4e32a13af699"))
+ (package
+ (name "sbcl-trivial-download")
+ (version (git-version "0.3" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/eudoxia0/trivial-download/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06f46zr3gp3wlm2kgxna24qd2gpr1v89x9fynh1x5vrw6c6hqjcv"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-drakma))
+ (home-page "https://github.com/eudoxia0/trivial-download/")
+ (synopsis "Download files from Common Lisp")
+ (description
+ "@code{trivial-download} allows you to download files from the Internet
+from Common Lisp. It provides a progress bar.")
+ (license license:bsd-2))))
-(define-public sbcl-cl-fond
- (let ((commit "dac975cbc73f231b400d5b8d8539b16330239a4a")
- (revision "1"))
+(define-public cl-trivial-download
+ (sbcl-package->cl-source-package sbcl-trivial-download))
+
+(define-public ecl-trivial-download
+ (sbcl-package->ecl-package sbcl-trivial-download))
+
+(define-public sbcl-trivial-escapes
+ (let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1"))
(package
- (name "sbcl-cl-fond")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-trivial-escapes")
+ (version (git-version "1.2.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-fond")
+ (url "https://github.com/williamyaoh/trivial-escapes")
(commit commit)))
- (file-name (git-file-name "cl-fond" version))
+ (file-name (git-file-name name commit))
(sha256
- (base32 "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq"))))
+ (base32 "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-cffi
- sbcl-cl-opengl
- sbcl-documentation-utils
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (home-page "https://shirakumo.github.io/cl-fond/")
- (synopsis "Bindings to libfond, a simple text rendering engine for OpenGL")
- (description "This is a Common Lisp bindings library to libfond, a
-simple OpenGL text rendering engine.")
+ (list sbcl-named-readtables))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/williamyaoh/trivial-escapes")
+ (synopsis "C-style escape directives for Common Lisp")
+ (description
+ "This Common Lisp library interprets escape characters the same way that
+most other programming language do.
+It provides four readtables. The default one lets you write strings like this:
+@code{#\"This string has\na newline in it!\"}.")
+ (license license:public-domain))))
+
+(define-public cl-trivial-escapes
+ (sbcl-package->cl-source-package sbcl-trivial-escapes))
+
+(define-public ecl-trivial-escapes
+ (sbcl-package->ecl-package sbcl-trivial-escapes))
+
+(define-public sbcl-trivial-extensible-sequences
+ (let ((commit "d40b2da23716601578b1f645727047f80baeb49a")
+ (revision "0"))
+ (package
+ (name "sbcl-trivial-extensible-sequences")
+ (version (git-version "1.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/trivial-extensible-sequences")
+ (commit commit)))
+ (file-name (git-file-name "cl-trivial-extensible-sequences" version))
+ (sha256
+ (base32 "0352psdd8j0phjycr6ldckwspyal4jcf0f2fizi6fwdp7nvadng7"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://shinmera.github.io/trivial-extensible-sequences/")
+ (synopsis "Portability library for the extensible sequences protocol")
+ (description
+ "This package provides a portability layer for the extensible sequences
+standard extension to Common Lisp. Extensible sequences allow you to create
+your own sequence types that integrate with the rest of the functions and
+operations that interact with sequences.")
(license license:zlib))))
-(define-public cl-fond
- (sbcl-package->cl-source-package sbcl-cl-fond))
+(define-public cl-trivial-extensible-sequences
+ (sbcl-package->cl-source-package sbcl-trivial-extensible-sequences))
-(define-public ecl-cl-fond
- (sbcl-package->ecl-package sbcl-cl-fond))
+;; NOTE: (Sharlatan-20230312T215058+0000): ECL is not supported
+;; (define-public ecl-trivial-extensible-sequences
+;; (sbcl-package->ecl-package sbcl-trivial-extensible-sequences))
-(define-public sbcl-doplus
+(define-public sbcl-trivial-features
(package
- (name "sbcl-doplus")
- (version "1.1.0")
+ (name "sbcl-trivial-features")
+ (version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/alessiostalla/doplus")
+ (url "https://github.com/trivial-features/trivial-features")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-doplus" version))
+ (file-name (git-file-name "trivial-features" version))
(sha256
- (base32 "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"))))
+ (base32 "0jsqah1znzqilxnw5vannb083ayk0d7phkackqzwwqkyg5hpn6pq"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-parse-declarations sbcl-fset))
(arguments
- '(#:asd-systems '("doplus" "doplus-fset")))
- (synopsis "Iteration macro for Common Lisp")
- (description "@code{doplus} is an iteration macro for Common Lisp.")
- (home-page "https://github.com/alessiostalla/doplus")
- (license license:gpl3+)))
+ '(;; FIXME: Tests disabled because of a circular dependency between
+ ;; trivial-features and cffi.
+ #:tests? #f))
+ ;; (native-inputs
+ ;; `(("cffi" ,sbcl-cffi)))
+ (home-page "https://cliki.net/trivial-features")
+ (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp")
+ (description "Trivial-features ensures that @code{*FEATURES*} is
+consistent across multiple Common Lisp implementations.")
+ (license license:expat)))
-(define-public cl-doplus
- (sbcl-package->cl-source-package sbcl-doplus))
+(define-public cl-trivial-features
+ (sbcl-package->cl-source-package sbcl-trivial-features))
-(define-public ecl-doplus
- (sbcl-package->ecl-package sbcl-doplus))
+(define-public ecl-trivial-features
+ (sbcl-package->ecl-package sbcl-trivial-features))
-(define-public sbcl-trees
- (let ((commit "7b06048af0248c4302088c758208276f9faf2beb"))
+(define-public sbcl-trivial-file-size
+ (let ((commit "1c1d672a01a446ba0391dbb4ffc40be3b0476f23")
+ (revision "0"))
(package
- (name "sbcl-trees")
- (version (git-version "0.11" "1" commit))
+ (name "sbcl-trivial-file-size")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/ruricolist/trivial-file-size")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/froydnj/trees/")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-trees" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"))))
+ (base32
+ "17pp86c9zs4y7i1sh7q9gbfw9iqv6655k7fz8qbj9ly1ypgxp4qs"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/froydnj/trees/")
- (synopsis "Binary trees in normal and balanced flavors")
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Size of a file in bytes in Common Lisp")
(description
- "This package implements binary trees of various kinds, presenting a
-uniform interface to them all.")
- (license license:bsd-3))))
+ "The canonical way to determine the size of a file in bytes, using Common Lisp,
+is to open the file with an element type of (unsigned-byte 8) and then
+calculate the length of the stream. This is less than ideal. In most cases
+it is better to get the size of the file from its metadata, using a system
+call.
-(define-public cl-trees
- (sbcl-package->cl-source-package sbcl-trees))
+This library exports a single function, file-size-in-octets. It returns the
+size of a file in bytes, using system calls when possible.")
+ (license license:expat))))
-(define-public ecl-trees
- (sbcl-package->ecl-package sbcl-trees))
+(define-public cl-trivial-file-size
+ (sbcl-package->cl-source-package sbcl-trivial-file-size))
-(define-public sbcl-cl-geometry
- (let ((commit "24eddedc47b931cec27361752736ef0b54fc9984"))
+(define-public ecl-trivial-file-size
+ (sbcl-package->ecl-package sbcl-trivial-file-size))
+
+(define-public sbcl-trivial-garbage
+ (let ((commit "3474f6414b73d4e3aa2d5c53080f4247a34f6380")
+ (revision "0"))
(package
- (name "sbcl-cl-geometry")
- (version (git-version "0.0.3" "1" commit))
+ (name "sbcl-trivial-garbage")
+ (version (git-version "0.21" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/vydd/cl-geometry")
+ (url "https://github.com/trivial-garbage/trivial-garbage")
(commit commit)))
- (file-name (git-file-name "cl-cl-geometry" version))
+ (file-name (git-file-name "cl-trivial-garbage" version))
(sha256
- (base32 "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"))))
+ (base32 "0rfwxvwg0kpcaa0hsi035yrkfdfks4bq8d9azmrww2f0rmv9g6sd"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-iterate
- sbcl-trees))
- (home-page "https://github.com/lispgames/cl-geometry/")
- (synopsis "Simple two dimensional computational geometry in Common Lisp")
- (description
- "This is a system for two dimensional computational geometry for Common Lisp.
+ (native-inputs
+ (list sbcl-rt))
+ (home-page "https://common-lisp.net/project/trivial-garbage/")
+ (synopsis "Portable GC-related APIs for Common Lisp")
+ (description "@command{trivial-garbage} provides a portable API to
+finalizers, weak hash-tables and weak pointers on all major implementations of
+the Common Lisp programming language.")
+ (license license:public-domain))))
-Note: the system assumes exact rational arithmetic, so no floating point
-coordinates are allowed. This is not checked when creating geometric
-objects.")
- ;; The .asd says BSD-style but the LICENSE.txt is expat.
- (license license:expat))))
+(define-public cl-trivial-garbage
+ (sbcl-package->cl-source-package sbcl-trivial-garbage))
-(define-public cl-cl-geometry
- (sbcl-package->cl-source-package sbcl-cl-geometry))
+(define-public ecl-trivial-garbage
+ (sbcl-package->ecl-package sbcl-trivial-garbage))
-(define-public ecl-cl-geometry
- (sbcl-package->ecl-package sbcl-cl-geometry))
+(define-public sbcl-trivial-gray-streams
+ (let ((revision "1")
+ (commit "2b3823edbc78a450db4891fd2b566ca0316a7876"))
+ (package
+ (name "sbcl-trivial-gray-streams")
+ (version (git-version "2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/trivial-gray-streams/trivial-gray-streams")
+ (commit commit)))
+ (sha256
+ (base32 "1hipqwwd5ylskybd173rvlsk7ds4w4nq1cmh9952ivm6dgh7pwzn"))
+ (file-name (git-file-name "cl-trivial-gray-streams" version))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Compatibility layer for Gray streams implementations")
+ (description "Gray streams is an interface proposed for inclusion with
+ANSI CL by David N. Gray. The proposal did not make it into ANSI CL, but most
+popular CL implementations implement it. This package provides an extremely
+thin compatibility layer for gray streams.")
+ (home-page "https://www.cliki.net/trivial-gray-streams")
+ (license license:x11))))
-(define-public sbcl-amb
- (let ((commit "884bef69a1ea02f3b9deae0341e1a038ff31b896")
- (revision "0"))
+(define-public cl-trivial-gray-streams
+ (sbcl-package->cl-source-package sbcl-trivial-gray-streams))
+
+(define-public ecl-trivial-gray-streams
+ (sbcl-package->ecl-package sbcl-trivial-gray-streams))
+
+(define-public sbcl-trivial-indent
+ (let ((commit "f25275094b80df8aa158af46db980bbc3ce2f88b")
+ (revision "1"))
(package
- (name "sbcl-amb")
- (version (git-version "1.0.0" revision commit))
- (source
+ (name "sbcl-trivial-indent")
+ (version (git-version "1.0.0" revision commit))
+ (source
(origin
(method git-fetch)
- (uri (git-reference
- (url "https://github.com/phoe/amb")
- (commit commit)))
- (file-name (git-file-name "cl-amb" version))
+ (uri
+ (git-reference
+ (url "https://github.com/Shinmera/trivial-indent")
+ (commit commit)))
+ (file-name (git-file-name "cl-trivial-indent" version))
(sha256
- (base32 "1klh1aakklj1famrff0sccnwlv8238b1q446288aqnqgxxw6pf21"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria))
- (native-inputs
- (list sbcl-parachute))
- (synopsis "Implementation of John McCarthy's ambiguous operator")
- (description
- "@code{cl-amb} provides an implementation of John McCarthy's ambiguous
-operator in portable Common Lisp.")
- (home-page "https://github.com/phoe/amb/")
- (license license:expat))))
+ (base32 "1zg8cyy1xqpcjrxxqz5zb5xixhwcszkv4p2vq305lb2rka6f3dyx"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis
+ "Simple Common Lisp library to allow indentation hints for SWANK")
+ (description
+ "This library allows you to define custom indentation hints for your
+macros if the one recognised by SLIME automatically produces unwanted
+results.")
+ (home-page "https://shinmera.github.io/trivial-indent/")
+ (license license:zlib))))
-(define-public cl-amb
- (sbcl-package->cl-source-package sbcl-amb))
+(define-public cl-trivial-indent
+ (sbcl-package->cl-source-package sbcl-trivial-indent))
-(define-public ecl-amb
- (sbcl-package->ecl-package sbcl-amb))
+(define-public ecl-trivial-indent
+ (sbcl-package->ecl-package sbcl-trivial-indent))
-(define-public sbcl-quicklisp-stats
- (let ((commit "953b45c2212ae513d48a611d3dd09c846a6102cd")
+(define-public sbcl-trivial-macroexpand-all
+ (let ((commit "933270ac7107477de1bc92c1fd641fe646a7a8a9")
(revision "0"))
(package
- (name "sbcl-quicklisp-stats")
- (version (git-version "0.0.1" revision commit))
+ (name "sbcl-trivial-macroexpand-all")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/cbaggers/trivial-macroexpand-all")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/quicklisp-stats")
+ (url home-page)
(commit commit)))
- (file-name (git-file-name "cl-quicklisp-stats" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0v8dgmlgd283n1g486q4sj2mghgdvgywg2nqp43nnrfc04mkvgc0"))))
+ (base32
+ "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-drakma
- sbcl-split-sequence))
- (arguments
- `(#:tests? #f)) ; There are no tests.
- (synopsis "Fetches and operates on Quicklisp download statistics")
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Portable macroexpand-all for Common Lisp")
(description
- "@code{cl-quicklisp-stats} is a system that fetches and performs basic
-operations on the Quicklisp download statistics.")
- (home-page "https://github.com/phoe/quicklisp-stats/")
- (license license:expat))))
+ "This library provides a macroexpand-all function that calls the
+implementation specific equivalent.")
+ (license license:unlicense))))
-(define-public cl-quicklisp-stats
- (sbcl-package->cl-source-package sbcl-quicklisp-stats))
+(define-public cl-trivial-macroexpand-all
+ (sbcl-package->cl-source-package sbcl-trivial-macroexpand-all))
-(define-public ecl-quicklisp-stats
- (sbcl-package->ecl-package sbcl-quicklisp-stats))
+(define-public ecl-trivial-macroexpand-all
+ (sbcl-package->ecl-package sbcl-trivial-macroexpand-all))
-(define-public sbcl-sketch
- ;; No release in years.
- (let ((commit "4cc00b08e202c7adda41391463096cf9df1705c3"))
+(define-public sbcl-trivial-main-thread
+ (let ((commit "25f114973bb69eb63e01d0bbfead31f8e682846a")
+ (revision "1"))
(package
- (name "sbcl-sketch")
- (version (git-version "2017-11" "1" commit))
+ (name "sbcl-trivial-main-thread")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/vydd/sketch")
+ (url "https://github.com/Shinmera/trivial-main-thread")
(commit commit)))
- (file-name (git-file-name "cl-sketch" version))
+ (file-name (git-file-name "trivial-main-thread" version))
(sha256
- (base32 "1qrnma8yvmxps9rz3pvlzsir37namppsldijdlr4110pcwi9j9h6"))))
+ (base32 "0bw1887i7396lqg75qvmgjfzz4xbiq9w5dp8wxdgrcsm0qwlraw7"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-cl-geometry
- sbcl-glkit
- sbcl-mathkit
- sbcl-md5
- sbcl-sdl2
- sbcl-sdl2-image
- sbcl-sdl2-ttf
- sbcl-sdl2kit
- sbcl-split-sequence
- sbcl-static-vectors))
- (arguments
- '(#:asd-systems '("sketch" "sketch-examples")))
- (home-page "https://github.com/vydd/sketch")
- (synopsis "Creative framework for electronic art, visual design and more")
+ (list sbcl-bordeaux-threads sbcl-simple-tasks sbcl-trivial-features))
+ (home-page "https://shinmera.github.io/trivial-main-thread/")
+ (synopsis "Compatibility library to run things in the main thread")
(description
- "Sketch is a Common Lisp environment for the creation of electronic
-art, visual design, game prototyping, game making, computer graphics,
-exploration of human-computer interaction and more. It is inspired by
-the Processing language and shares some of the API.")
- (license license:expat))))
+ "This package provides a Common Lisp system which wraps the
+BORDEAUX-THREADS system to be able to run things in the main thread of the
+implementation, for example drawing calls of GUI applications.")
+ (license license:zlib))))
-(define-public cl-sketch
- (sbcl-package->cl-source-package sbcl-sketch))
+(define-public cl-trivial-main-thread
+ (sbcl-package->cl-source-package sbcl-trivial-main-thread))
-(define-public ecl-sketch
- (sbcl-package->ecl-package sbcl-sketch))
+(define-public ecl-trivial-main-thread
+ (sbcl-package->ecl-package sbcl-trivial-main-thread))
-(define-public sbcl-cl-cron
- (let ((commit "092aef5d5666fb43c04258e4043f609670a20456")
- (revision "0"))
+(define-public sbcl-trivial-mimes
+ (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9")
+ (revision "2"))
(package
- (name "sbcl-cl-cron")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-trivial-mimes")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ciel-lang/cl-cron")
+ (url "https://github.com/Shinmera/trivial-mimes")
(commit commit)))
- (file-name (git-file-name "cl-cron" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0y4li8j2h1nbpldpqm39ld9kgs4a7biy94h49n27l59l7mn1jd0d"))))
+ (base32 "00kcm17q5plpzdj1qwg83ldhxksilgpcdkf3m9azxcdr968xs9di"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-hu.dwim.stefil))
(inputs
- (list sbcl-bordeaux-threads))
- (home-page "https://github.com/ciel-lang/cl-cron/")
- (synopsis "Run cron like jobs in Common Lisp")
+ (list sbcl-cl-fad))
+ (home-page "https://shinmera.github.io/trivial-mimes/")
+ (synopsis "Tiny Common Lisp library to detect mime types in files")
(description
- "@code{cl-cron} is a simple tool that provides cron like facilities
-directly inside of Common Lisp.")
- (license license:gpl3+))))
+ "This is a teensy library that provides some functions to determine the
+mime-type of a file.")
+ (license license:zlib))))
-(define-public cl-cron
- (sbcl-package->cl-source-package sbcl-cl-cron))
+(define-public cl-trivial-mimes
+ (sbcl-package->cl-source-package sbcl-trivial-mimes))
-(define-public ecl-cl-cron
- (sbcl-package->ecl-package sbcl-cl-cron))
+(define-public ecl-trivial-mimes
+ (sbcl-package->ecl-package sbcl-trivial-mimes))
-(define-public sbcl-string-pokemonize
- (let ((commit "2dc01643defb497e4d1eb833def71dfc1e8d5da6")
+(define-public sbcl-trivial-monitored-thread
+ (let ((commit "b0bab23f9a9bd06f0f33809635c7ba4e6a3d5a21")
(revision "0"))
(package
- (name "sbcl-string-pokemonize")
- (version (git-version "20210503" revision commit))
- (source
+ (name "sbcl-trivial-monitored-thread")
+ (version (git-version "0.3.11" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/string-pokemonize")
+ (url "https://gitlab.com/ediethelm/trivial-monitored-thread")
(commit commit)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "trivial-monitored-thread" version))
(sha256
- (base32 "1zk5klc94pxv7mhx6qrp93rk4ypwd6wfijap7gf9l0wpphg90r9x"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f ; There are no tests.
- #:asd-systems '("string-pokemonize")))
- (synopsis "Alternate upper- and lowercase")
- (description
- "@code{string-pokemonize} provides a function that alternates uppercase
-and lowercase characters for a given string.")
- (home-page "https://github.com/phoe/string-pokemonize")
- (license license:expat))))
+ (base32 "1ipnp2l944hc587bifxsnmiymw468imar0v8bqvgxv8pc5sym4ib"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
+ (inputs
+ (list sbcl-iterate sbcl-log4cl sbcl-trivial-utilities))
+ (home-page "https://gitlab.com/ediethelm/trivial-monitored-thread")
+ (synopsis "Thread monitoring library for Common Lisp")
+ (description
+ "Trivial Monitored Thread offers a very simple (aka trivial) way of
+spawning threads and being informed when one any of them crash and die.")
+ (license license:expat))))
-(define-public cl-string-pokemonize
- (sbcl-package->cl-source-package sbcl-string-pokemonize))
+(define-public cl-trivial-monitored-thread
+ (sbcl-package->cl-source-package sbcl-trivial-monitored-thread))
-(define-public ecl-string-pokemonize
- (sbcl-package->ecl-package sbcl-string-pokemonize))
+(define-public ecl-trivial-monitored-thread
+ (sbcl-package->ecl-package sbcl-trivial-monitored-thread))
-(define-public sbcl-binary-types
- (let ((commit "9ec42042a50403961c08179a892ae3de725b1d7a"))
+(define-public sbcl-trivial-octet-streams
+ (let ((commit "bc5d398b18549fd42e9c2a365df28ad865f1b85d")
+ (revision "0"))
(package
- (name "sbcl-binary-types")
- (version (git-version "1.2" "1" commit))
+ (name "sbcl-trivial-octet-streams")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/frodef/binary-types/")
+ (url "https://github.com/sharplispers/trivial-octet-streams")
(commit commit)))
- (file-name (git-file-name "binary-types" version))
+ (file-name (git-file-name "cl-trivial-octet-streams" version))
(sha256
- (base32 "0kp4xwblfxh7gmgqc38k9xzrqlcr0q1jm5167ma1pajdxd3182j8"))))
+ (base32 "0ysnsarlzynb7jf4b63b6kkxjancxc66jwmn0sb3vxyh87siiv6n"))))
(build-system asdf-build-system/sbcl)
- (home-page "https://github.com/frodef/binary-types/")
- (synopsis "Read and write binary records for Common Lisp")
+ (home-page "https://github.com/sharplispers/trivial-octet-streams")
+ (synopsis "In-memory octet streams for Common Lisp")
(description
- "Binary-types is a Common Lisp package for reading and writing binary
-files. Binary-types provides macros that are used to declare the mapping
-between Lisp objects and some binary (i.e. octet-based) representation.")
+ "TRIVIAL-OCTET-STREAMS is a Common Lisp library implementing in-memory
+octet streams analogous to string streams.")
(license license:bsd-3))))
-(define-public cl-binary-types
- (sbcl-package->cl-source-package sbcl-binary-types))
+(define-public cl-trivial-octet-streams
+ (sbcl-package->cl-source-package sbcl-trivial-octet-streams))
-(define-public ecl-binary-types
- (sbcl-package->ecl-package sbcl-binary-types))
+(define-public ecl-trivial-octet-streams
+ (sbcl-package->ecl-package sbcl-trivial-octet-streams))
-(define-public sbcl-trivial-custom-debugger
- (let ((commit "a560594a673bbcd88136af82086107ee5ff9ca81"))
+(define-public sbcl-trivial-open-browser
+ (let ((commit "7ab4743dea9d592639f15c565bfa0756e828c427")
+ (revision "1"))
(package
- (name "sbcl-trivial-custom-debugger")
- (version (git-version "1.0.0" "1" commit))
+ (name "sbcl-trivial-open-browser")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/trivial-custom-debugger")
+ (url "https://github.com/eudoxia0/trivial-open-browser")
(commit commit)))
- (file-name (git-file-name "trivial-custom-debugger" version))
+ (file-name (git-file-name "cl-trivial-open-browser" version))
(sha256
- (base32 "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk"))))
+ (base32 "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb"))))
(build-system asdf-build-system/sbcl)
+ (inputs (list xdg-utils))
(arguments
- '(;; FIXME: Tests disabled because of a circular dependency between
- ;; trivial-custom-debugger and parachute.
- #:tests? #f))
- ;;(native-inputs
- ;; (list sbcl-parachute))
- (home-page "https://github.com/phoe/trivial-custom-debugger/")
- (synopsis "Allow arbitrary functions as the standard Lisp debugger")
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/trivial-open-browser.lisp"
+ (("xdg-open")
+ (search-input-file inputs "/bin/xdg-open"))))))))
+ (home-page "https://github.com/eudoxia0/trivial-open-browser")
+ (synopsis "Open a browser window from Common Lisp")
(description
- "This is a portability library that allows one to fully override the
-standard debugger provided by their Common Lisp system for situations where
-binding @code{*debugger-hook*} is not enough -- most notably, for
-@code{break}.")
+ "This package provides a library to open a web browser to a URL.")
(license license:expat))))
-(define-public cl-trivial-custom-debugger
- (sbcl-package->cl-source-package sbcl-trivial-custom-debugger))
+(define-public cl-trivial-open-browser
+ (sbcl-package->cl-source-package sbcl-trivial-open-browser))
-(define-public ecl-trivial-custom-debugger
+(define-public ecl-trivial-open-browser
+ (sbcl-package->ecl-package sbcl-trivial-open-browser))
+
+(define-public sbcl-trivial-package-local-nicknames
(package
- (inherit (sbcl-package->ecl-package sbcl-trivial-custom-debugger))
- (arguments
- ;; Tests fail on ECL: https://github.com/phoe/trivial-custom-debugger/issues/3
- '(#:tests? #f))))
+ (name "sbcl-trivial-package-local-nicknames")
+ (version "0.2")
+ (home-page "https://github.com/phoe/trivial-package-local-nicknames")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit "16b7ad4c2b120f50da65154191f468ea5598460e")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18qc27xkjzdcqrilpk3pm7djldwq5rm3ggd5h9cr8hqcd54i2fqg"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp compatibility library for package local nicknames")
+ (description
+ "This library is a portable compatibility layer around package local nicknames (PLN).
+This was done so there is a portability library for the PLN API not included
+in DEFPACKAGE.")
+ (license license:unlicense)))
-(define-public sbcl-safe-read
- (let ((commit "d25f08597b34d7aaeb86b045d57f7b020a5bb5f0")
- (revision "0"))
+(define-public cl-trivial-package-local-nicknames
+ (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames))
+
+(define-public ecl-trivial-package-local-nicknames
+ (sbcl-package->ecl-package sbcl-trivial-package-local-nicknames))
+
+(define-public sbcl-trivial-raw-io
+ (let ((commit "b1a3c876305baa0dead419841de7b3e433a75867")
+ (revision "1"))
(package
- (name "sbcl-safe-read")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-trivial-raw-io")
+ (version (git-version "0.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/safe-read")
+ (url "https://github.com/kingcons/trivial-raw-io")
(commit commit)))
- (file-name (git-file-name "cl-safe-read" version))
+ (file-name (git-file-name "trivial-raw-io" version))
(sha256
- (base32 "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26"))))
+ (base32 "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-local-time sbcl-trivial-garbage))
- (home-page "https://github.com/phoe/safe-read/")
- (synopsis "Safer variant of READ")
+ (list sbcl-alexandria))
+ (home-page "https://github.com/kingcons/trivial-raw-io")
+ (synopsis "Trivial portability for raw *nix IO in Common Lisp")
(description
- "This package provides a safer variant of @code{READ} secure against
-internbombing, excessive input and macro characters.")
+ "This library exports three symbols: @code{with-raw-io},
+@code{read-char}, and @code{read-line}, to provide raw POSIX I/O in Common
+Lisp.")
(license license:bsd-2))))
-(define-public cl-safe-read
- (sbcl-package->cl-source-package sbcl-safe-read))
+(define-public cl-trivial-raw-io
+ (sbcl-package->cl-source-package sbcl-trivial-raw-io))
-(define-public ecl-safe-read
- (sbcl-package->ecl-package sbcl-safe-read))
+(define-public ecl-trivial-raw-io
+ (sbcl-package->ecl-package sbcl-trivial-raw-io))
-(define-public sbcl-portable-condition-system
- (let ((commit "1307ec146d227a9d8ea42312c1ba2a5206a9eb3c")
+(define-public sbcl-trivial-rfc-1123
+ (let ((commit "9ef59c3fdec08b0e3c9ed02d39533887b6d1b8e3")
(revision "0"))
(package
- (name "sbcl-portable-condition-system")
- (version (git-version "1.1.0" revision commit))
+ (name "sbcl-trivial-rfc-1123")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/portable-condition-system")
+ (url "https://github.com/stacksmith/trivial-rfc-1123")
+ (commit commit)))
+ (file-name (git-file-name "cl-trivial-rfc-1123" version))
+ (sha256
+ (base32 "1w4ywpj10fnp7cya62dzlxlg8nyk4lppn2pnmfixsndwr4ib1h6x"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments `(#:asd-systems '("trivial-rfc-1123")))
+ (inputs (list sbcl-cl-ppcre))
+ (home-page "https://github.com/stacksmith/trivial-rfc-1123")
+ (synopsis "Parse and print RFC-1123 timestamps")
+ (description
+ "This package parses and prints dates in RFC-1123 format.")
+ (license license:bsd-3))))
+
+(define-public cl-trivial-rfc-1123
+ (sbcl-package->cl-source-package sbcl-trivial-rfc-1123))
+
+(define-public ecl-trivial-rfc-1123
+ (sbcl-package->ecl-package sbcl-trivial-rfc-1123))
+
+(define-public sbcl-trivial-shell
+ (let ((commit "e02ec191b34b52deca5d1c4ee99d4fa13b8772e0"))
+ (package
+ (name "sbcl-trivial-shell")
+ (version (git-version "0.2.0" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hraban/trivial-shell")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"))))
+ (base32 "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85"))))
(build-system asdf-build-system/sbcl)
(arguments
- '(#:asd-systems '("portable-condition-system")))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "dev/definitions.lisp"
+ (("/bin/sh")
+ (which "sh"))))))))
(native-inputs
- (list sbcl-1am))
- (inputs
- (list sbcl-alexandria
- sbcl-split-sequence))
- (home-page "https://github.com/phoe/portable-condition-system")
- (synopsis "Portable condition system for Common Lisp")
+ (list sbcl-lift))
+ (home-page "https://common-lisp.net/project/trivial-shell/")
+ (synopsis "Common Lisp access to the shell")
(description
- "This package provides an example implementation of the Common Lisp
-condition system and library, based on the original condition system
-implementation by Kent M. Pitman.")
- (license license:cc0))))
+ "A simple Common-Lisp interface to the underlying operating system.
+It's independent of the implementation and operating system.")
+ (license license:expat))))
-(define-public cl-portable-condition-system
- (sbcl-package->cl-source-package sbcl-portable-condition-system))
+(define-public cl-trivial-shell
+ (sbcl-package->cl-source-package sbcl-trivial-shell))
-(define-public ecl-portable-condition-system
- (sbcl-package->ecl-package sbcl-portable-condition-system))
+(define-public ecl-trivial-shell
+ (sbcl-package->ecl-package sbcl-trivial-shell))
-(define-public sbcl-ospm
+(define-public sbcl-trivial-sockets
(package
- (name "sbcl-ospm")
- (version "0.0.2")
+ (name "sbcl-trivial-sockets")
+ (version "0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/ospm")
- (commit version)))
- (file-name (git-file-name "cl-ospm" version))
+ (url "https://github.com/usocket/trivial-sockets/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-trivial-sockets" version))
(sha256
- (base32 "1z2wz2xg7rn7p1lladdhj789iz2f3wfjgpi2hjr08vkf1pkp15xf"))))
+ (base32 "0xj9x5z3psxqap9c29qz1xswx5fiqxyzd35kmbw2g6z08cgb7nd0"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-alexandria
- sbcl-calispel
- sbcl-hu.dwim.defclass-star
- sbcl-local-time
- sbcl-moptilities
- sbcl-named-readtables
- sbcl-serapeum
- sbcl-trivia))
- (native-inputs
- ;; FIXME: Tests have execution errors because of Guix being run in a container.
- (list sbcl-lisp-unit2 guix))
- (home-page "https://github.com/atlas-engineer/ospm")
- (synopsis "System package manager in Common Lisp")
+ (home-page "https://github.com/usocket/trivial-sockets")
+ (synopsis "Simple socket library for Common Lisp")
(description
- "This library is a universal interface to the operating system package manager.
-It has extensive support for Guix, among others:
-
-@itemize
-@item package listing and searching;
-@item package installation and uninstallation;
-@item package file listing;
-@item profile listing;
-@item manifest listing and installation;
-@item generation listing, switching and deletion.
-@end itemize\n")
- (license license:bsd-3)))
+ "This library is a portable socket interface that allows CL programs to
+open connected (client) stream sockets to network services.")
+ (license license:expat)))
-(define-public cl-ospm
- (let ((pkg (sbcl-package->cl-source-package sbcl-ospm)))
- (package
- (inherit pkg)
- (inputs
- (cons (list "osicat" cl-osicat)
- (package-inputs pkg))))))
+(define-public cl-trivial-sockets
+ (sbcl-package->cl-source-package sbcl-trivial-sockets))
-(define-public sbcl-data-lens
- (let ((commit "801bc1e0331f19fdc38be314c86ccac9362fde78")
- (revision "0"))
+(define-public sbcl-trivial-timeout
+ (let ((commit "e70d9b4f7caeab83ea6ac50d724470fe49561e66")
+ (revision "2"))
(package
- (name "sbcl-data-lens")
- (version (git-version "0.0.0" revision commit))
- (source
+ (name "sbcl-trivial-timeout")
+ (version (git-version "0.1.5" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/fiddlerwoaroof/data-lens")
+ (url "https://github.com/hraban/trivial-timeout")
(commit commit)))
- (file-name (git-file-name "cl-data-lens" version))
+ (file-name (git-file-name "trivial-timeout" version))
(sha256
- (base32 "1w4rvhcnss037q0bb1j70kdlhfh9085hy95d9q56sk519alhzhrp"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam))
- (inputs
- (list sbcl-cl-ppcre
- sbcl-alexandria
- sbcl-serapeum))
- (synopsis "Functional utilities for Common Lisp")
- (description
- "The @code{cl-data-lens} library provides a language for expressing data
-manipulations as the composition of more primitive operations.")
- (home-page "https://fiddlerwoaroof.github.io/data-lens/")
- (license license:asl2.0))))
+ (base32 "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-lift))
+ (home-page "https://github.com/hraban/trivial-timeout")
+ (synopsis "Timeout library for Common Lisp")
+ (description
+ "This library provides an OS and implementation independent access to
+timeouts.")
+ (license license:expat))))
-(define-public cl-data-lens
- (sbcl-package->cl-source-package sbcl-data-lens))
+(define-public cl-trivial-timeout
+ (sbcl-package->cl-source-package sbcl-trivial-timeout))
-(define-public ecl-data-lens
- (sbcl-package->ecl-package sbcl-data-lens))
+(define-public ecl-trivial-timeout
+ (sbcl-package->ecl-package sbcl-trivial-timeout))
-(define-public sbcl-ndebug
+(define-public sbcl-trivial-types
(package
- (name "sbcl-ndebug")
- (version "0.2.0")
+ (name "sbcl-trivial-types")
+ (version "0.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/atlas-engineer/ndebug")
- (commit version)))
- (file-name (git-file-name "cl-ndebug" version))
+ (url "https://github.com/m2ym/trivial-types")
+ (commit "ee869f2b7504d8aa9a74403641a5b42b16f47d88")))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1sndg4qclkdr53xkxrfjskx8gcqx0bn4r0vslzfx1kgznl4hbf1d"))))
+ (base32 "1s4cp9bdlbn8447q7w7f1wkgwrbvfzp20mgs307l5pxvdslin341"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-dissect
- sbcl-trivial-custom-debugger
- sbcl-bordeaux-threads
- sbcl-trivial-gray-streams))
- (native-inputs
- (list sbcl-lisp-unit2))
- (home-page "https://github.com/atlas-engineer/ndebug/")
- (synopsis "Toolkit to build UI-aware Common Lisp debugger hooks")
+ (home-page "https://github.com/m2ym/trivial-types")
+ (synopsis "Trivial type definitions for Common Lisp")
(description
- "NDebug provides a small set of utilities to make graphical (or, rather
-non-REPL-resident) Common Lisp applications easier to integrate with the
-standard Lisp debugger (@code{*debugger-hook*}, namely) and
-implementation-specific debugger hooks (via @code{trivial-custom-debugger}),
-especially in a multi-threaded context.")
- (license license:bsd-3)))
+ "TRIVIAL-TYPES provides missing but important type definitions such as
+PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.")
+ (license license:llgpl)))
-(define-public cl-ndebug
- (sbcl-package->cl-source-package sbcl-ndebug))
+(define-public cl-trivial-types
+ (sbcl-package->cl-source-package sbcl-trivial-types))
-(define-public ecl-ndebug
- (sbcl-package->ecl-package sbcl-ndebug))
+(define-public ecl-trivial-types
+ (sbcl-package->ecl-package sbcl-trivial-types))
-(define-public sbcl-canonicalized-initargs
- (package
- (name "sbcl-canonicalized-initargs")
- (version "2.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/canonicalized-initargs")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-canonicalized-initargs" version))
- (sha256
- (base32 "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-cesdi
- sbcl-closer-mop
- sbcl-compatible-metaclasses
- sbcl-enhanced-defclass
- sbcl-enhanced-typep))
- (home-page
- "https://www.hexstreamsoft.com/libraries/canonicalized-initargs/")
- (synopsis "Standard way to canonicalize slot values")
- (description
- "This package provides a standard way to canonicalize slot values.")
- (license license:unlicense)))
+(define-public sbcl-trivial-utf-8
+ (let ((commit "6ca9943588cbc61ad22a3c1ff81beb371e122394")
+ (revision "2"))
+ (package
+ (name "sbcl-trivial-utf-8")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url (string-append "https://gitlab.common-lisp.net/"
+ "trivial-utf-8/trivial-utf-8.git"))
+ (commit commit)))
+ (file-name (git-file-name "cl-trivial-utf-8" version))
+ (sha256
+ (base32 "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss"))))
+ (arguments
+ ;; Guix incorrectly assumes the "8" is part of the version
+ ;; number and lobs it off.
+ `(#:asd-systems '("trivial-utf-8")))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "UTF-8 input/output library")
+ (description
+ "The Babel library solves a similar problem while understanding more
+encodings. Trivial UTF-8 was written before Babel existed, but for new
+projects you might be better off going with Babel. The one plus that Trivial
+UTF-8 has is that it doesn't depend on any other libraries.")
+ (home-page "https://common-lisp.net/project/trivial-utf-8/")
+ (license license:bsd-3))))
-(define-public cl-canonicalized-initargs
- (sbcl-package->cl-source-package sbcl-canonicalized-initargs))
+(define-public cl-trivial-utf-8
+ (sbcl-package->cl-source-package sbcl-trivial-utf-8))
-(define-public ecl-canonicalized-initargs
- (sbcl-package->ecl-package sbcl-canonicalized-initargs))
+(define-public ecl-trivial-utf-8
+ (sbcl-package->ecl-package sbcl-trivial-utf-8))
-(define-public sbcl-enhanced-typep
- (package
- (name "sbcl-enhanced-typep")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/enhanced-typep")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-enhanced-typep" version))
- (sha256
- (base32 "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-enhanced-boolean sbcl-parachute))
- (home-page "https://www.hexstreamsoft.com/libraries/enhanced-typep/")
- (synopsis "Enhanced version of typep")
- (description
- "This package provides an enhanced version of @code{typep} that is exactly
-like the one in the Lisp spec, except it can also accept a single type argument,
-in which case it returns the appropriate closure.")
- (license license:unlicense)))
+(define-public sbcl-trivial-utilities
+ (let ((commit "279ff255562628196942632c543d91c357067221")
+ (revision "0"))
+ (package
+ (name "sbcl-trivial-utilities")
+ (version (git-version "0.4.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/ediethelm/trivial-utilities")
+ (commit commit)))
+ (file-name (git-file-name "trivial-utilities" version))
+ (sha256
+ (base32 "0k1xmn5f5dik7scadw0vyy67mik4ypnfqbhlv2vsg9afxzbpx2dz"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-iterate sbcl-closer-mop))
+ (home-page "https://gitlab.com/ediethelm/trivial-utilities")
+ (synopsis "Collection of useful types, functions and macros for Common Lisp")
+ (description
+ "This package provides a collection of types, functions and macros. Some
+ of the functionality is implemented from Graham's On Lisp and Seibel's Practical
+ Common Lisp.")
+ (license license:expat))))
-(define-public cl-enhanced-typep
- (sbcl-package->cl-source-package sbcl-enhanced-typep))
+(define-public cl-trivial-utilities
+ (sbcl-package->cl-source-package sbcl-trivial-utilities))
-(define-public ecl-enhanced-typep
- (sbcl-package->ecl-package sbcl-enhanced-typep))
+(define-public ecl-trivial-utilities
+ (sbcl-package->ecl-package sbcl-trivial-utilities))
-(define-public sbcl-enhanced-defclass
- (package
- (name "sbcl-enhanced-defclass")
- (version "2.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/enhanced-defclass")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-enhanced-defclass" version))
- (sha256
- (base32 "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-cesdi
- sbcl-closer-mop
- sbcl-compatible-metaclasses
- sbcl-enhanced-eval-when
- sbcl-object-class
- sbcl-shared-preferences
- sbcl-simple-guess))
- (home-page "https://www.hexstreamsoft.com/libraries/enhanced-defclass/")
- (synopsis "Extensible implementation of defclass")
- (description
- "This package provides an extensible implementation of defclass that can
-accurately control the expansion according to the metaclass and automatically
-detect the suitable metaclass by analyzing the @code{defclass} form.")
- (license license:unlicense)))
+(define-public sbcl-trivial-with-current-source-form
+ (let ((commit "9e343e043a77a5478c1f77bb626db22335fbbfb8")
+ (revision "1"))
+ (package
+ (name "sbcl-trivial-with-current-source-form")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/scymtym/trivial-with-current-source-form")
+ (commit commit)))
+ (file-name (git-file-name "trivial-with-current-source-form" version))
+ (sha256
+ (base32 "15zs7mc422ycp1cvcxmirif1dq15mlmv8vzd6l6nzn4qgmph9wz0"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria))
+ (home-page "https://github.com/scymtym/trivial-with-current-source-form")
+ (synopsis "Help producing better errors for macro users")
+ (description
+ "This library allows macro writers to provide better feedback to macro
+users when errors are signaled during macroexpansion. It uses the compiler's
+concept of a source-form to report where the error or warning is located.")
+ (license license:lgpl3))))
-(define-public cl-enhanced-defclass
- (sbcl-package->cl-source-package sbcl-enhanced-defclass))
+(define-public cl-trivial-with-current-source-form
+ (sbcl-package->cl-source-package sbcl-trivial-with-current-source-form))
-(define-public ecl-enhanced-defclass
- (sbcl-package->ecl-package sbcl-enhanced-defclass))
+(define-public ecl-trivial-with-current-source-form
+ ;; Trivial-with-current-source-form does not give any benefits on ECL.
+ ;; This package is so packages dependent on trivial-with-current-source-form
+ ;; can be loaded on ECL.
+ (sbcl-package->ecl-package sbcl-trivial-with-current-source-form))
-(define-public sbcl-object-class
- (package
- (name "sbcl-object-class")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/object-class")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-object-class" version))
- (sha256
- (base32 "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-closer-mop
- sbcl-compatible-metaclasses
- sbcl-enhanced-find-class))
- (home-page "https://www.hexstreamsoft.com/libraries/object-class/")
- (synopsis "Cluster special subclasses of the standard-object")
- (description
- "This package ensures that special subclasses of standard-object cluster
-right in front of standard-object in the class precedence list.")
- (license license:unlicense)))
+(define-public sbcl-trivialib-type-unify
+ (let ((commit "62492ebf04db567dcf435ae84c50b7b8202ecf99")
+ (revision "1"))
+ (package
+ (name "sbcl-trivialib-type-unify")
+ (version (git-version "0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/guicho271828/trivialib.type-unify")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1bkyfzbwv75p50zp8n1n9rh2r29pw3vgz91gmn2gzzkyq3khj1vh"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Common Lisp type unification")
+ (description
+ "Unifies a parametrized type specifier against an actual type specifier.
+Importantly, it handles complicated array-subtypes and number-related types
+correctly.")
+ (home-page "https://github.com/guicho271828/trivialib.type-unify")
+ (license license:lgpl3+)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("trivia" ,sbcl-trivia)
+ ("introspect-environment" ,sbcl-introspect-environment)
+ ("type-r" ,sbcl-type-r)))
+ (native-inputs
+ (list sbcl-fiveam))
+ (arguments
+ `(#:asd-systems '("trivialib.type-unify"))))))
-(define-public cl-object-class
- (sbcl-package->cl-source-package sbcl-object-class))
+(define-public cl-trivialib-type-unify
+ (sbcl-package->cl-source-package sbcl-trivialib-type-unify))
-(define-public ecl-object-class
- (sbcl-package->ecl-package sbcl-object-class))
+(define-public ecl-trivialib-type-unify
+ (sbcl-package->ecl-package sbcl-trivialib-type-unify))
-(define-public sbcl-shared-preferences
- (package
- (name "sbcl-shared-preferences")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/shared-preferences")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-shared-preferences" version))
- (sha256
- (base32 "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-inheriting-readers
- sbcl-trivial-garbage))
- (home-page "https://www.hexstreamsoft.com/libraries/shared-preferences/")
- (synopsis "Flexible specification of package-local preferences")
- (description
- "This package allows flexible specification of package-local preferences.")
- (license license:unlicense)))
+(define-public sbcl-trucler
+ (let ((commit "d40ff965520cbccf4980b7e7e3122912a11f24ad")
+ (revision "1"))
+ (package
+ (name "sbcl-trucler")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/s-expressionists/Trucler")
+ (commit commit)))
+ (file-name (git-file-name "cl-trucler" commit))
+ (sha256
+ (base32 "0a0zi7q88j31n0b17yfxb66xjvvridgqr4vr6z3pgnm9wha990a6"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-acclimation))
+ (arguments
+ '(#:asd-systems '("trucler"
+ "trucler-base"
+ "trucler-native"
+ "trucler-reference")))
+ (home-page "https://github.com/s-expressionists/Trucler")
+ (synopsis "Environment protocol for Common Lisp compilers")
+ (description
+ "Trucler defines a CLOS-based protocol to be used by Common Lisp
+compilers for environment query and update. In addition, library authors can
+use the @code{trucler-native} interface to inspect native environments.
+Trucler supports introspection for variables, functions, tags, blocks and
+optimization policies.")
+ (license license:bsd-2))))
-(define-public cl-shared-preferences
- (sbcl-package->cl-source-package sbcl-shared-preferences))
+(define-public cl-trucler
+ (sbcl-package->cl-source-package sbcl-trucler))
-(define-public ecl-shared-preferences
- (sbcl-package->ecl-package sbcl-shared-preferences))
+(define-public ecl-trucler
+ (sbcl-package->ecl-package sbcl-trucler))
-(define-public sbcl-inheriting-readers
+(define-public sbcl-type-i
+ (let ((commit "d34440ab4ebf5a46a58deccb35950b15670e3667")
+ (revision "2"))
+ (package
+ (name "sbcl-type-i")
+ (build-system asdf-build-system/sbcl)
+ (version (git-version "0.1" revision commit))
+ (home-page "https://github.com/guicho271828/type-i")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12wsga0pwjkkr176lnjwkmmlm3ccp0n310sjj9h20lk53iyd0z69"))))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("introspect-environment" ,sbcl-introspect-environment)
+ ("trivia.trivial" ,sbcl-trivia.trivial)))
+ (native-inputs
+ (list sbcl-fiveam))
+ (synopsis "Type inference utility on unary predicates for Common Lisp")
+ (description "This library tries to provide a way to detect what kind of
+type the given predicate is trying to check. This is different from inferring
+the return type of a function.")
+ (license license:llgpl))))
+
+(define-public cl-type-i
+ (sbcl-package->cl-source-package sbcl-type-i))
+
+(define-public ecl-type-i
(package
- (name "sbcl-inheriting-readers")
- (version "1.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/inheriting-readers")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-inheriting-readers" version))
- (sha256
- (base32 "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-class-options
- sbcl-closer-mop
- sbcl-compatible-metaclasses))
- (home-page "https://www.hexstreamsoft.com/libraries/inheriting-readers/")
- (synopsis "Simple yet powerful value inheritance scheme")
- (description
- "This package provides a simple yet powerful value inheritance scheme.")
- (license license:unlicense)))
+ (inherit (sbcl-package->ecl-package sbcl-type-i))
+ (arguments
+ ;; The tests get stuck indefinitly
+ '(#:tests? #f))))
-(define-public cl-inheriting-readers
- (sbcl-package->cl-source-package sbcl-inheriting-readers))
+(define-public sbcl-type-r
+ (let ((commit "83c89e38f2f7a7b16f1012777ecaf878cfa6a267")
+ (revision "1"))
+ (package
+ (name "sbcl-type-r")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/guicho271828/type-r")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Parser interface for Common Lisp built-in compound types")
+ (description
+ "Collections of accessor functions and patterns to access
+the elements in compound type specifier, e.g. @code{dimensions} in
+@code{(array element-type dimensions)}")
+ (home-page "https://github.com/guicho271828/type-r")
+ (license license:lgpl3+)
+ (inputs
+ `(("trivia" ,sbcl-trivia)
+ ("alexandria" ,sbcl-alexandria)))
+ (native-inputs
+ (list sbcl-fiveam)))))
-(define-public ecl-inheriting-readers
- (sbcl-package->ecl-package sbcl-inheriting-readers))
+(define-public cl-type-r
+ (sbcl-package->cl-source-package sbcl-type-r))
-(define-public sbcl-simple-guess
- (let ((commit "34744e3200a96e6aba285d70f91cdbd6c25508a6")
+(define-public ecl-type-r
+ (sbcl-package->ecl-package sbcl-type-r))
+
+(define-public sbcl-type-templates
+ (let ((commit "5b389ebcff61b81585a64d0b899b69fa12aa5f96")
(revision "0"))
(package
- (name "sbcl-simple-guess")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-type-templates")
+ (version (git-version "4.0.0" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/simple-guess")
- (commit commit)))
- (file-name (git-file-name "cl-simple-guess" version))
- (sha256
- (base32 "0404vj7ln97x7rn9ypbw4rshs56nnpyjnh1z9k03s039s5q3kpv0"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/type-templates")
+ (commit commit)))
+ (file-name (git-file-name "cl-type-templates" version))
+ (sha256
+ (base32 "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj"))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fakenil sbcl-parachute))
+ (arguments
+ ;; No tests
+ (list #:tests? #f))
(inputs
- (list sbcl-cesdi
- sbcl-closer-mop
- sbcl-compatible-metaclasses
- sbcl-evaled-when))
- (home-page "https://www.hexstreamsoft.com/libraries/simple-guess/")
- (synopsis "Extensible protocol for computing a guess using advisors")
+ (list sbcl-alexandria
+ sbcl-documentation-utils
+ sbcl-form-fiddle))
+ (home-page "https://shinmera.github.io/type-templates/")
+ (synopsis "Library for defining and expanding templated functions")
(description
- "This package defines a simple extensible protocol for computing a guess
-using advisors.")
- (license license:unlicense))))
+ "The Type-Templates library allows you to define types and “template
+functions” that can be expanded into various type-specialized versions to
+eliminate runtime dispatch overhead. It was specifically designed to
+implement low-level numerical data types and functionality.")
+ (license license:zlib))))
-(define-public cl-simple-guess
- (sbcl-package->cl-source-package sbcl-simple-guess))
+(define-public cl-type-templates
+ (sbcl-package->cl-source-package sbcl-type-templates))
-(define-public ecl-simple-guess
- (sbcl-package->ecl-package sbcl-simple-guess))
+(define-public ecl-type-templates
+ (sbcl-package->ecl-package sbcl-type-templates))
-(define-public sbcl-wild-package-inferred-system
- (let ((commit "800b5f89b61cc4a0a9cf14706fd3f7e7fcd3e539")
+(define-public sbcl-typo
+ (let ((commit "0e883490f81edf2a1be4e5b101d1caec78d7853b")
(revision "0"))
(package
- (name "sbcl-wild-package-inferred-system")
- (version (git-version "0.2.0" revision commit))
+ (name "sbcl-typo")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/privet-kitty/wild-package-inferred-system")
+ (url "https://github.com/marcoheisig/Typo")
(commit commit)))
- (file-name (git-file-name "cl-wild-package-inferred-system" version))
+ (file-name (git-file-name "cl-typo" version))
(sha256
- (base32 "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"))))
+ (base32 "08cmkjl3f77rfhxbjyd6f3kinhzak30mdfphnpf73sh1vw4v0vym"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-fiveam))
- (home-page "https://github.com/privet-kitty/wild-package-inferred-system/")
- (synopsis "Wildcard for ASDF package-inferred-system")
+ (inputs
+ (list sbcl-alexandria
+ sbcl-closer-mop
+ sbcl-introspect-environment
+ sbcl-trivia
+ sbcl-trivial-arguments
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/marcoheisig/Typo")
+ (synopsis "Portable type inference library for Common Lisp")
(description
- "@code{wild-package-inferred-system} is an extension of ASDF
-package-inferred-system that interprets star * and globstar ** in package
-or system names.")
+ "Typo is a portable library for Common Lisp that does approximate
+reasoning about types, but without consing.")
(license license:expat))))
-(define-public cl-wild-package-inferred-system
- (sbcl-package->cl-source-package sbcl-wild-package-inferred-system))
-
-(define-public ecl-wild-package-inferred-system
- (sbcl-package->ecl-package sbcl-wild-package-inferred-system))
-
-(define-public sbcl-fakenil
- (package
- (name "sbcl-fakenil")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/fakenil")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-fakenil" version))
- (sha256
- (base32 "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (home-page "https://www.hexstreamsoft.com/libraries/fakenil/")
- (synopsis "Provides a canonical stand-in for NIL")
- (description
- "This package provides a canonical stand-in for NIL for contexts where
-NIL means no value.")
- (license license:unlicense)))
-
-(define-public cl-fakenil
- (sbcl-package->cl-source-package sbcl-fakenil))
+(define-public cl-typo
+ (sbcl-package->cl-source-package sbcl-typo))
-(define-public ecl-fakenil
- (sbcl-package->ecl-package sbcl-fakenil))
+(define-public ecl-typo
+ (sbcl-package->ecl-package sbcl-typo))
-(define-public sbcl-evaled-when
- (let ((commit "c59f8ab20b846cac81d4be80d056a3d65676e8eb")
- (revision "0"))
+(define-public sbcl-uax-14
+ (let ((commit "0432162525119c401d3d705bb9bcc9580a03914f")
+ (revision "1"))
(package
- (name "sbcl-evaled-when")
- (version (git-version "1.0" revision commit))
+ (name "sbcl-uax-14")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Hexstream/evaled-when")
+ (url "https://github.com/Shinmera/uax-14")
(commit commit)))
- (file-name (git-file-name "cl-evaled-when" version))
+ (file-name (git-file-name "uax-14" version))
(sha256
- (base32 "07g1a50aairvsj57issb18si5a9r3skpbk05nlixmlj0mva3gkl3"))))
+ (base32 "1sb2s58k01yjaggaq8i7kbyfsh6mzyqbiz1vm59smxn9qqwd8apm"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-enhanced-boolean sbcl-parachute))
+ (list sbcl-parachute sbcl-cl-ppcre))
(inputs
- (list sbcl-trivial-cltl2))
- (home-page "https://www.hexstreamsoft.com/libraries/evaled-when/")
- (synopsis "Extract and replicate the compile-time side-effects of forms")
+ (list sbcl-documentation-utils))
+ (arguments
+ `(#:asd-systems '("uax-14")))
+ (home-page "https://shinmera.github.io/uax-14/")
+ (synopsis "Unicode Standard Annex #14 for standardised line breaking")
(description
- "This package provides a way of extracting and replicating the
-compile-time side-effects of forms.")
- (license license:unlicense))))
-
-(define-public cl-evaled-when
- (sbcl-package->cl-source-package sbcl-evaled-when))
+ "This is an implementation of the Unicode Standards Annex
+#14 (@url{http://www.unicode.org/reports/tr14/}) line breaking algorithm. It
+provides a fast and convenient way to determine line breaking opportunities in
+text.
-(define-public ecl-evaled-when
- (sbcl-package->ecl-package sbcl-evaled-when))
+Note that this algorithm does not support break opportunities that require
+morphological analysis. In order to handle such cases, please consult a system
+that provides this kind of capability, such as a hyphenation algorithm.
-(define-public sbcl-enhanced-eval-when
- (package
- (name "sbcl-enhanced-eval-when")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/enhanced-eval-when")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-enhanced-eval-when" version))
- (sha256
- (base32 "1ws1v297plcbqmcvckg7vqzzgnrwfyx5kd7281r1wrhc26998rx2"))))
- (build-system asdf-build-system/sbcl)
- ;; https://github.com/Hexstream/enhanced-eval-when/issues/1
- (arguments
- (list #:tests? #f)) ; There are no tests in version 1.0.
- (home-page "https://www.hexstreamsoft.com/libraries/enhanced-eval-when/")
- (synopsis "Shortcuts for EVAL-WHEN")
- (description
- "This package provides an enhanced @code{EVAL-WHEN} macro that supports a
-shorthand for @code{(eval-when (:compile-toplevel :load-toplevel :execute) ...)},
-addressing concerns about verbosity.")
- (license license:unlicense)))
+Also note that this system is completely unaware of layouting decisions. Any
+kind of layouting decisions, such as which breaks to pick, how to space
+between words, how to handle bidirectionality, and what to do in emergency
+situations when there are no breaks on an overfull line are left up to the
+user.")
+ (license license:zlib))))
-(define-public cl-enhanced-eval-when
- (sbcl-package->cl-source-package sbcl-enhanced-eval-when))
+(define-public cl-uax-14
+ (sbcl-package->cl-source-package sbcl-uax-14))
-(define-public ecl-enhanced-eval-when
- (sbcl-package->ecl-package sbcl-enhanced-eval-when))
+(define-public ecl-uax-14
+ (sbcl-package->ecl-package sbcl-uax-14))
-(define-public sbcl-enhanced-boolean
+(define-public sbcl-uax-15
(package
- (name "sbcl-enhanced-boolean")
- (version "1.0")
+ (name "sbcl-uax-15")
+ (version "0.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Hexstream/enhanced-boolean")
+ (url "https://github.com/sabracrolleton/uax-15")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-enhanced-boolean" version))
+ (file-name (git-file-name "uax-15" version))
(sha256
- (base32 "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"))))
+ (base32 "0p2ckw7mzxhwa9vbwj2q2dzayz9dl94d9yqd2ynp0pc5v8i0n2fr"))))
(build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:asd-systems
+ '("uax-15")))
(native-inputs
- (list sbcl-parachute))
- (home-page "https://www.hexstreamsoft.com/libraries/enhanced-boolean/")
- (synopsis "Convert generalized booleans to booleans")
+ (list sbcl-fiveam))
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("split-sequence" ,sbcl-split-sequence)))
+ (home-page "https://github.com/sabracrolleton/uax-15")
+ (synopsis "Common Lisp implementation of unicode normalization functions")
(description
- "This package provides a canonical way of converting generalized booleans
-to booleans.")
- (license license:unlicense)))
+ "This package provides supports for unicode normalization, RFC8264 and
+RFC7564.")
+ (license license:expat)))
-(define-public cl-enhanced-boolean
- (sbcl-package->cl-source-package sbcl-enhanced-boolean))
+(define-public cl-uax-15
+ (sbcl-package->cl-source-package sbcl-uax-15))
-(define-public ecl-enhanced-boolean
- (sbcl-package->ecl-package sbcl-enhanced-boolean))
+(define-public ecl-uax-15
+ (sbcl-package->ecl-package sbcl-uax-15))
-(define-public sbcl-cesdi
- (package
- (name "sbcl-cesdi")
- (version "1.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/cesdi")
- (commit version)))
- (file-name (git-file-name "cl-cesdi" version))
- (sha256
- (base32 "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-closer-mop))
- (home-page "https://www.hexstreamsoft.com/libraries/cesdi/")
- (synopsis "Ergonomic initialization of effective slot definition objects")
- (description
- "This package provides a @code{compute-effective-slot-definition-initargs}
-generic function that allows for more ergonomic initialization of effective slot
-definition objects.")
- (license license:unlicense)))
+(define-public sbcl-ubiquitous
+ (let ((commit "35eb7bd9e1b3daee1705f6b41260775180cce8af")
+ (revision "1"))
+ (package
+ (name "sbcl-ubiquitous")
+ (version (git-version "2.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/ubiquitous")
+ (commit commit)))
+ (file-name (git-file-name "ubiquitous" version))
+ (sha256
+ (base32 "1xlkaqmjcpkiv2xl2s2pvvrv976dlc846wm16s1lj62iy1315i49"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (arguments
+ '(#:asd-systems '("ubiquitous"
+ "ubiquitous-concurrent")))
+ (home-page "https://shinmera.github.io/ubiquitous/")
+ (synopsis "Application configuration mechanism for Common Lisp")
+ (description
+ "@code{UBIQUITOUS} is a very easy-to-use library for persistent
+configuration storage. It automatically takes care of finding a suitable place
+to save your data, and provides simple functions to access and modify the data
+within.")
+ (license license:zlib))))
-(define-public cl-cesdi
- (sbcl-package->cl-source-package sbcl-cesdi))
+(define-public cl-ubiquitous
+ (sbcl-package->cl-source-package sbcl-ubiquitous))
-(define-public ecl-cesdi
- (sbcl-package->ecl-package sbcl-cesdi))
+(define-public ecl-ubiquitous
+ (sbcl-package->ecl-package sbcl-ubiquitous))
-(define-public sbcl-compatible-metaclasses
- (package
- (name "sbcl-compatible-metaclasses")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/compatible-metaclasses")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-compatible-metaclasses" version))
- (sha256
- (base32 "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-class-options
- sbcl-closer-mop
- sbcl-enhanced-find-class))
- (home-page "https://www.hexstreamsoft.com/libraries/compatible-metaclasses/")
- (synopsis "Simplifies class mixins by validating superclasses")
- (description
- "This library validates superclasses according to a simple substitution
-model, thereby greatly simplifying the definition of class mixins.")
- (license license:unlicense)))
+(define-public sbcl-ucons
+ (let ((commit "d976810ef2b12a2caaf55bd0f258272e9b79f3be")
+ (revision "0"))
+ (package
+ (name "sbcl-ucons")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/marcoheisig/ucons")
+ (commit commit)))
+ (file-name (git-file-name "cl-ucons" version))
+ (sha256
+ (base32 "17aj47pdjiywnf33hl46p27za2q0pq5ar3fpqxaqskggxrfxmijl"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria
+ sbcl-atomics
+ sbcl-bordeaux-threads
+ sbcl-named-readtables
+ sbcl-trivia))
+ (home-page "https://github.com/marcoheisig/ucons")
+ (synopsis "Unique conses for Common Lisp")
+ (description "UCONS is a Common Lisp library providing unique conses.
+Unique conses are different from regular conses in that, in addition to their
+@code{car} and @code{cdr}, they maintain a table of past users. Also, the
+@code{cdr} of each ucons is restricted to other uconses or @code{nil}.
+Uconses are meant for those situations where even reusing regular conses (to
+avoid consing) is too computationally expensive.")
+ (license license:expat))))
-(define-public cl-compatible-metaclasses
- (sbcl-package->cl-source-package sbcl-compatible-metaclasses))
+(define-public cl-ucons
+ (sbcl-package->cl-source-package sbcl-ucons))
-(define-public ecl-compatible-metaclasses
- (sbcl-package->ecl-package sbcl-compatible-metaclasses))
+(define-public ecl-ucons
+ (sbcl-package->ecl-package sbcl-ucons))
-(define-public sbcl-class-options
+(define-public sbcl-uffi
(package
- (name "sbcl-class-options")
- (version "1.0.1")
+ (name "sbcl-uffi")
+ (version "2.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Hexstream/class-options")
+ (url "http://git.kpe.io/uffi.git")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-class-options" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"))))
+ (base32 "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; The useless bundled debian folder drags `make' into the closure.
+ `(begin
+ (delete-file-recursively "debian")
+ #t))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-enhanced-boolean sbcl-parachute))
- (inputs
- (list sbcl-closer-mop sbcl-enhanced-find-class))
- (home-page "https://www.hexstreamsoft.com/libraries/class-options/")
- (synopsis "Accessing defining class and its options during modification")
+ (arguments
+ `(#:tests? #f ; TODO: Fix use of deprecated ASDF functions
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-permissions
+ (lambda _
+ (make-file-writable "doc/html.tar.gz")
+ #t)))))
+ (synopsis "Universal foreign function library for Common Lisp")
(description
- "This package provides easy access to the defining class and its options
-during initialization or reinitialization of its subcomponents.")
- (license license:unlicense)))
+ "UFFI provides a universal foreign function interface (FFI)
+ for Common Lisp.")
+ (home-page "https://quickdocs.org/uffi/")
+ (license license:llgpl)))
-(define-public cl-class-options
- (sbcl-package->cl-source-package sbcl-class-options))
+(define-public cl-uffi
+ (package
+ (inherit (sbcl-package->cl-source-package sbcl-uffi))
+ (arguments
+ `(#:phases
+ ;; asdf-build-system/source has its own phases and does not inherit
+ ;; from asdf-build-system/sbcl phases.
+ (modify-phases %standard-phases/source
+ ;; Already done in SBCL package.
+ (delete 'reset-gzip-timestamps))))))
-(define-public ecl-class-options
- (sbcl-package->ecl-package sbcl-class-options))
+(define-public sbcl-umbra
+ (let ((commit "d6ef2f6cbfa26180929061129eaf325bf17f73d8")
+ (revision "1"))
+ (package
+ (name "sbcl-umbra")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.mfiano.net/mfiano/umbra")
+ (commit commit)))
+ (file-name (git-file-name "umbra" version))
+ (sha256
+ (base32 "04vyh2j00zdpb8ryxr8g81wjcmqlz9wrn55r3cypcj4qg970r5wi"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-golden-utils sbcl-shadow sbcl-varjo))
+ (home-page "https://git.mfiano.net/mfiano/umbra")
+ (synopsis "Common Lisp library of reusable GPU shader functions")
+ (description
+ "This is a Common Lisp library consisting of a collection of useful GPU
+shader functions, written with @code{Shadow}.")
+ (license license:expat))))
-(define-public sbcl-enhanced-find-class
- (package
- (name "sbcl-enhanced-find-class")
- (version "1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Hexstream/enhanced-find-class")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-enhanced-find-class" version))
- (sha256
- (base32 "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"))))
- (build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-parachute))
- (inputs
- (list sbcl-closer-mop))
- (home-page "https://www.hexstreamsoft.com/libraries/enhanced-find-class/")
- (synopsis "Canonical way of converting class designators to classes")
- (description
- "This package provides a canonical way of converting class designators
-to classes.")
- (license license:unlicense)))
+(define-public ecl-umbra
+ (sbcl-package->ecl-package sbcl-umbra))
-(define-public cl-enhanced-find-class
- (sbcl-package->cl-source-package sbcl-enhanced-find-class))
+(define-public cl-umbra
+ (sbcl-package->cl-source-package sbcl-umbra))
-(define-public ecl-enhanced-find-class
- (sbcl-package->ecl-package sbcl-enhanced-find-class))
+(define-public sbcl-unix-opts
+ (let ((commit "0e61f34b2ecf62288437810d4abb31e572048b04")
+ (revision "1"))
+ (package
+ (name "sbcl-unix-opts")
+ (version (git-version "0.1.7" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libre-man/unix-opts")
+ (commit commit)))
+ (file-name (git-file-name "unix-opts" version))
+ (sha256
+ (base32 "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/hankhero/cl-json")
+ (synopsis "Unix-style command line options parser")
+ (description
+ "This is a minimalistic parser of command line options. The main
+advantage of the library is the ability to concisely define command line
+options once and then use this definition for parsing and extraction of
+command line arguments, as well as printing description of command line
+options (you get --help for free). This way you don't need to repeat
+yourself. Also, @command{unix-opts} doesn't depend on anything and
+precisely controls the behavior of the parser via Common Lisp restarts.")
+ (license license:expat))))
-(define-public sbcl-definitions-systems
+(define-public cl-unix-opts
+ (sbcl-package->cl-source-package sbcl-unix-opts))
+
+(define-public ecl-unix-opts
+ (sbcl-package->ecl-package sbcl-unix-opts))
+
+(define-public sbcl-usocket
(package
- (name "sbcl-definitions-systems")
- (version "2.0.1")
+ (name "sbcl-usocket")
+ (version "0.8.8")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Hexstream/definitions-systems")
+ (url "https://github.com/usocket/usocket/")
(commit (string-append "v" version))))
- (file-name (git-file-name "cl-definitions-systems" version))
+ (file-name (git-file-name "cl-usocket" version))
(sha256
- (base32 "009392mj0qdq4jy0dw5r41schnygwj286759yvyg7xja30a0psfq"))))
+ (base32 "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-parachute))
+ (list sbcl-rt))
(inputs
- (list sbcl-canonicalized-initargs
- sbcl-enhanced-defclass
- sbcl-enhanced-find-class
- sbcl-shared-preferences))
- (home-page "https://www.hexstreamsoft.com/libraries/definitions-systems/")
- (synopsis "Unified extensible way of processing named definitions")
+ (list sbcl-bordeaux-threads sbcl-split-sequence))
+ (arguments
+ `(#:tests? #f ; FIXME: Tests need network access?
+ #:asd-systems '("usocket"
+ "usocket-server")))
+ (home-page "https://common-lisp.net/project/usocket/")
+ (synopsis "Universal socket library for Common Lisp")
(description
- "@code{definitions-systems} provides a simple unified extensible way of
-processing named definitions.")
- (license license:unlicense)))
+ "This library strives to provide a portable TCP/IP and UDP/IP socket
+interface for as many Common Lisp implementations as possible, while keeping
+the abstraction and portability layer as thin as possible.")
+ (license license:expat)))
-(define-public cl-definitions-systems
- (sbcl-package->cl-source-package sbcl-definitions-systems))
+(define-public cl-usocket
+ (sbcl-package->cl-source-package sbcl-usocket))
-(define-public ecl-definitions-systems
- (sbcl-package->ecl-package sbcl-definitions-systems))
+(define-public ecl-usocket
+ (sbcl-package->ecl-package sbcl-usocket))
-(define-public sbcl-numerical-utilities
- (let ((commit "44f45ba952b35675640630e40cf90df6f8279746")
+(define-public sbcl-utils-kt
+ (let ((commit "4adfe2889036ab5ffdd3cc2182ca2cc692bf11ff"))
+ (package
+ (name "sbcl-utils-kt")
+ (version (git-version "2007-12-02" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kennytilton/utils-kt")
+ (commit commit)))
+ (file-name (git-file-name "cl-utils-kt" version))
+ (sha256
+ (base32 "016x3w034brz02z9mrsrkhk2djizg3yqsvhl9k62xqcnpy3b87dn"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/kennytilton/utils-kt")
+ (synopsis "Kenny's utilities for Common Lisp")
+ (description
+ "This library contains generic hacks meant to be used in any project.
+It was originally developed for the Cells library.")
+ (license license:expat))))
+
+(define-public cl-utils-kt
+ (sbcl-package->cl-source-package sbcl-utils-kt))
+
+(define-public ecl-utils-kt
+ (sbcl-package->ecl-package sbcl-utils-kt))
+
+(define-public sbcl-utm-ups
+ (let ((commit "f1e6fd469871051470dfaabdf199afb75f2fa302")
(revision "0"))
(package
- (name "sbcl-numerical-utilities")
- (version (git-version "1.2.0" revision commit))
+ (name "sbcl-utm-ups")
+ (version (git-version "1.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/numerical-utilities")
+ (url "https://codeberg.org/glv/utm-ups")
(commit commit)))
- (file-name (git-file-name "cl-numerical-utilities" version))
+ (file-name (git-file-name "cl-utm-ups" version))
(sha256
- (base32 "1dwz8zxhqzi31qp863zj1cn1lgljny14snycb9nk871qs121kmsd"))))
+ (base32 "19nnnqagfg1c1vzwlqpp8mq2d0hrk8r6r07a46nvdyzmwbnmbwyr"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("num-utils" "num-utils/tests")))
- (inputs
- (list sbcl-alexandria
- sbcl-alexandria-plus
- sbcl-anaphora
- sbcl-array-operations
- sbcl-let-plus
- sbcl-select))
(native-inputs
(list sbcl-fiveam))
- (home-page "https://lisp-stat.github.io/numerical-utilities")
- (synopsis "Utilities for numerical programming")
+ (synopsis
+ "Convert coordinates between latitude/longitude and UTM or UPS")
(description
- "@code{cl-numerical-utilities} is a collection of packages useful in
-numerical applications, each big enough to be its own package, but too small
-to split out into a separate ASDF system.")
- (license license:ms-pl))))
+ "This a Common Lisp library to convert geographic coordinates between
+latitude/longitude and UTM (Universal Transverse Mercator) or UPS (Universal
+Polar Stereographic).")
+ (home-page "https://codeberg.org/glv/utm-ups")
+ (license license:gpl3+))))
-(define-public cl-numerical-utilities
- (sbcl-package->cl-source-package sbcl-numerical-utilities))
+(define-public cl-utm-ups
+ (sbcl-package->cl-source-package sbcl-utm-ups))
-(define-public ecl-numerical-utilities
- (sbcl-package->ecl-package sbcl-numerical-utilities))
+(define-public ecl-utm-ups
+ (sbcl-package->ecl-package sbcl-utm-ups))
-(define-public sbcl-zr-utils
- (let ((commit "e7eaffcb71811f6e1ab85fb15a079bcac4038eeb")
- (revision "0"))
+(define-public sbcl-uuid
+ (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8"))
(package
- (name "sbcl-zr-utils")
- (version (git-version "0.0.0.0" revision commit))
+ (name "sbcl-uuid")
+ (version (git-version "2012.12.26" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/zombie-raptor/zr-utils.git")
+ (url "https://github.com/dardoria/uuid")
(commit commit)))
- (file-name (git-file-name "cl-zr-utils" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1nx388974wdc49h3simr1jnv4rw1mcs2llv4xai88qwjf4y66hsy"))))
+ (base32
+ "0jnyp2kibcf5cwi60l6grjrj8wws9chasjvsw7xzwyym2lyid46f"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-closer-mop
- sbcl-cl-unicode
- sbcl-trivial-gray-streams))
- (arguments
- (list #:tests? #f ; FIXME: Failing with new parachute.
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "zr-utils.asd"
- (("\\(:parachute")
- "(:parachute :zr-utils/tests/all")))))))
- (synopsis "Common Lisp utilities library")
+ (list sbcl-ironclad sbcl-trivial-utf-8))
+ (home-page "https://github.com/dardoria/uuid")
+ (synopsis
+ "Common Lisp implementation of UUIDs according to RFC4122")
(description
- "This is a Common Lisp utilities library originating from the
-Zombie Raptor game engine project.")
- (home-page "https://gitlab.com/zombie-raptor/zr-utils")
- (license license:expat))))
+ "Common Lisp implementation of UUIDs according to RFC4122.")
+ (license license:llgpl))))
-(define-public cl-zr-utils
- (sbcl-package->cl-source-package sbcl-zr-utils))
+(define-public cl-uuid
+ (sbcl-package->cl-source-package sbcl-uuid))
-(define-public ecl-zr-utils
- (sbcl-package->ecl-package sbcl-zr-utils))
+(define-public ecl-uuid
+ (sbcl-package->ecl-package sbcl-uuid))
-(define-public sbcl-draw-cons-tree
- (let ((commit "04334f5885a85cd7127db8dda3f6d6686a0438b1")
- (revision "0"))
+(define-public sbcl-varjo
+ (let ((commit "9e77f30220053155d2ef8870ceba157f75e538d4")
+ (revision "1"))
(package
- (name "sbcl-draw-cons-tree")
- (version (git-version "1.0" revision commit))
- ;; https://github.com/quicklisp/quicklisp-projects/issues/2149
+ (name "sbcl-varjo")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/phoe/draw-cons-tree")
+ (url "https://github.com/cbaggers/varjo")
(commit commit)))
- (file-name (git-file-name "cl-draw-cons-tree" version))
+ (file-name (git-file-name "varjo" version))
(sha256
- (base32 "1523bdkq8a5qn0qp9q7r16w47y6jb0hkfj7hbjfj6mg3xv001s3x"))))
+ (base32 "1p9x1wj576x5d31yvls9r1avkjkyhri7kyxbjfkg9z93a1w18j9z"))))
(build-system asdf-build-system/sbcl)
(native-inputs
- (list sbcl-fiveam sbcl-split-sequence))
+ (list sbcl-fiveam))
(inputs
- (list sbcl-alexandria))
- (synopsis "Draw an ascii picture of a cons tree")
+ (list sbcl-alexandria
+ sbcl-cl-ppcre
+ sbcl-documentation-utils
+ sbcl-fn
+ sbcl-glsl-spec
+ sbcl-named-readtables
+ sbcl-parse-float
+ sbcl-vas-string-metrics))
+ (home-page "https://github.com/cbaggers/varjo")
+ (synopsis "Lisp to GLSL Language Translator")
(description
- "@code{cl-draw-cons-tree} draws a cons tree in ASCII-art style.")
- (home-page "https://github.com/phoe/draw-cons-tree/")
- (license license:unlicense))))
+ "Varjo is a Lisp to GLSL compiler. Vari is the dialect of lisp Varjo
+compiles. It aims to be as close to Common Lisp as possible, but naturally it
+is statically typed so there are differences.")
+ (license license:bsd-2))))
-(define-public cl-draw-cons-tree
- (sbcl-package->cl-source-package sbcl-draw-cons-tree))
+(define-public cl-varjo
+ (sbcl-package->cl-source-package sbcl-varjo))
-(define-public ecl-draw-cons-tree
- (sbcl-package->ecl-package sbcl-draw-cons-tree))
+(define-public ecl-varjo
+ (sbcl-package->ecl-package sbcl-varjo))
-(define-public sbcl-triads
- (let ((commit "840b025bf3d65cc5eaead4542a02a3ca6d77c2b6")
- (revision "0"))
+(define-public sbcl-vas-string-metrics
+ (let ((commit "f2e4500b180316123fbd549bd51c751ee2d6ba0f")
+ (revision "1"))
(package
- (name "sbcl-triads")
- (version (git-version "0" revision commit))
+ (name "sbcl-vas-string-metrics")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/charJe/triads")
+ (url "https://github.com/vsedach/vas-string-metrics")
(commit commit)))
- (file-name (git-file-name "cl-triads" version))
+ (file-name (git-file-name "vas-string-metrics" version))
(sha256
- (base32 "146mwshynhdw82m2nxrcjvf1nk0z3fn6ywcd2vqxkly5qricc53w"))))
+ (base32 "11fcnd03ybzz37rkg3z0wsb727yqgcd9gn70sccfb34l89ia279k"))))
(build-system asdf-build-system/sbcl)
- (outputs '("out" "bin"))
(arguments
- '(#:asd-systems '("charje.triads")
+ '(#:asd-test-systems '("test.vas-string-metrics")
#:phases
(modify-phases %standard-phases
- (add-after 'create-asdf-configuration 'build-binary
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "HOME" (getcwd))
- (invoke
- "sbcl" "--eval" "(require :asdf)" "--eval"
- (format
- #f "~S"
- `(progn
- (require "charje.triads"
- ,(string-append (getcwd) "/charje.triads.asd"))
- (asdf:make "charje.triads"))))
- (install-file
- (string-append (getcwd) "/triads")
- (string-append (assoc-ref outputs "bin") "/bin")))))))
+ (add-after 'unpack 'fix-test-asd
+ (lambda _
+ (substitute* "test.vas-string-metrics.asd"
+ ((":depends-on")
+ (string-append
+ ":perform (test-op (op c) (symbol-call :vas-string-metrics :run-tests))"
+ "\n"
+ " :depends-on"))))))))
+ (home-page "https://github.com/vsedach/vas-string-metrics")
+ (synopsis "String distance algorithms for Common Lisp")
+ (description
+ "VAS-STRING-METRICS provides the Jaro, Jaro-Winkler, Soerensen-Dice,
+Levenshtein, and normalized Levenshtein string distance/similarity metrics
+algorithms.")
+ (license license:lgpl3+))))
+
+(define-public cl-vas-string-metrics
+ (sbcl-package->cl-source-package sbcl-vas-string-metrics))
+
+(define-public ecl-vas-string-metrics
+ (sbcl-package->ecl-package sbcl-vas-string-metrics))
+
+(define-public sbcl-verbose
+ (let ((commit "c5b7ecd465be61b35af17ef57564697b88397174")
+ (revision "1"))
+ (package
+ (name "sbcl-verbose")
+ (version (git-version "2.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Shinmera/verbose/")
+ (commit commit)))
+ (file-name (git-file-name "verbose" version))
+ (sha256
+ (base32 "0r51ydj5v7afi2jrlscbhxprv13d9vzg5316g1yzwaxc1kzsdsw6"))))
+ (build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-cl-str
- sbcl-serapeum
- sbcl-trivia))
- (home-page "https://github.com/charJe/triads")
- (synopsis "Music composition tool to convert roman numerals into triads")
- (description "Triads is a simple command line tool that reads roman
-numeral notation from standard input (or a file) and an musical key and outputs
-the roman numeral in addition to the notes of the triad associated with that
-roman numeral given in the key.")
- (license license:gpl3))))
+ (list sbcl-bordeaux-threads sbcl-dissect sbcl-documentation-utils
+ sbcl-local-time sbcl-piping))
+ (home-page "https://shinmera.github.io/verbose/")
+ (synopsis "Logging framework using the piping library")
+ (description
+ "This is a Common Lisp library providing logging faciltiy similar to
+@code{CL-LOG} and @code{LOG4CL}.")
+ (license license:zlib))))
-(define-public cl-triads
- (sbcl-package->cl-source-package sbcl-triads))
+(define-public cl-verbose
+ (sbcl-package->cl-source-package sbcl-verbose))
-(define-public ecl-triads
- (let ((ecl-package (sbcl-package->ecl-package sbcl-triads)))
+(define-public ecl-verbose
+ (sbcl-package->ecl-package sbcl-verbose))
+
+(define-public sbcl-vernacular
+ ;; No release.
+ (let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f"))
(package
- (inherit ecl-package)
- (outputs '("out"))
+ (name "sbcl-vernacular")
+ (version (git-version "0.8.0" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ruricolist/vernacular/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; The demo depends on cl-js, which we don't have at this point.
+ (delete-file-recursively "demo")
+ #t))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("overlord" ,sbcl-overlord)
+ ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all)
+ ("local-time" ,sbcl-local-time)
+ ("parse-js" ,sbcl-parse-js)
+ ("trivia" ,sbcl-trivia)
+ ("trivial-garbage" ,sbcl-trivial-garbage)
+ ("named-readtables" ,sbcl-named-readtables)
+ ("alexandria" ,sbcl-alexandria)
+ ("serapeum" ,sbcl-serapeum)
+ ("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
(arguments
- (substitute-keyword-arguments (package-arguments ecl-package)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'build-binary))))))))
+ ;; Circular dependency: Tests depend on core-lisp
+ ;; (http://github.com/ruricolist/core-lisp) which depends on
+ ;; Vernacular.
+ '(#:tests? #f))
+ (home-page "https://github.com/ruricolist/vernacular")
+ (synopsis "Module system for languages that compile to Common Lisp")
+ (description
+ "Vernacular is a build and module system for languages that compile to
+Common Lisp. It allows languages to compile to Lisp while remaining part of
+the Common Lisp ecosystem. Vernacular languages interoperate with Common Lisp
+and one another.
-(define-public sbcl-music-spelling
- (let ((commit "a2d492af440ad30a21042140cf8ffce4b73fbd42")
+Vernacular handles locating files, compiling files into FASLs, tracking
+dependencies and rebuilding, and export and import between your new language,
+Lisp, and any other language Vernacular supports.
+
+Vernacular builds on Overlord and is inspired by Racket.")
+ (license license:expat))))
+
+(define-public cl-vernacular
+ (sbcl-package->cl-source-package sbcl-vernacular))
+
+(define-public sbcl-vgplot
+ (let ((commit "76329928a3709387c0779175af56ec49d16bcd35")
(revision "0"))
(package
- (name "sbcl-music-spelling")
- (version (git-version "0.1" revision commit))
+ (name "sbcl-vgplot")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ntrocado/music-spelling")
+ (url "https://github.com/volkers/vgplot")
(commit commit)))
- (file-name (git-file-name "cl-music-spelling" version))
+ (file-name (git-file-name "vgplot" version))
(sha256
- (base32 "0fgahb0jjr4sp2739d55gylmx8alsghnx3spyaqfqci4cxfrys52"))))
+ (base32 "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y"))))
(build-system asdf-build-system/sbcl)
- (inputs (list sbcl-alexandria))
- (home-page "https://github.com/ntrocado/music-spelling/")
- (synopsis "Automatically spell musical pitches and rhythms")
- (description "This package implements an algorithm for the spelling
-of enharmonics and dealing with ties and dots in rhythm notation.")
- (license license:asl2.0))))
+ (native-inputs
+ (list sbcl-lisp-unit))
+ (inputs
+ (list sbcl-cl-fad sbcl-cl-ppcre sbcl-ltk))
+ (home-page "https://github.com/volkers/vgplot")
+ (synopsis "Common lisp library interfacing to the gnuplot utility")
+ (description
+ "This package provides an interface to the @code{gnuplot} plotting
+utility. The intention of the API is to resemble to some of the plot commands
+of octave or matlab.")
+ (license license:gpl3+))))
-(define-public cl-music-spelling
- (sbcl-package->cl-source-package sbcl-music-spelling))
+(define-public cl-vgplot
+ (sbcl-package->cl-source-package sbcl-vgplot))
-(define-public ecl-music-spelling
- (sbcl-package->ecl-package sbcl-music-spelling))
+(define-public ecl-vgplot
+ (sbcl-package->ecl-package sbcl-vgplot))
-(define-public sbcl-closure-template
- ;; There are no releases since 2015.
- (let ((commit "f1983aa525045691e128027d2a2d74831c873d6e")
- (revision "0"))
+(define-public sbcl-virality
+ (let ((commit "cdc19cca9b028f0c30d14ed8b3e51359dd46069a")
+ (revision "1"))
(package
- (name "sbcl-closure-template")
- (version (git-version "0.2.1" revision commit))
+ (name "sbcl-virality")
+ (version (git-version "0.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/archimag/cl-closure-template")
+ (url "https://github.com/bufferswap/ViralityEngine")
(commit commit)))
- (file-name (git-file-name "cl-closure-template" version))
+ (file-name (git-file-name "cl-virality" version))
(sha256
- (base32 "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"))))
+ (base32 "1s25aapkqcr8fxi0i9wjw0n4jax7r4a9d9wflpr3sqz2vgrg2lz6"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-lift))
+ (arguments
+ `(#:asd-systems '("virality"
+ "vorigin"
+ "vorigin.test"
+ "vshadow"
+ "vumbra"
+ "vutils")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'delete-examples
+ (lambda _
+ ;; Don't install the big "examples" directory.
+ (delete-file-recursively "examples")
+ ;; Remove example asd files that cause issues during
+ ;; the 'copy-source' phase because they have the same
+ ;; names.
+ (for-each
+ delete-file
+ (find-files "."
+ "^xXx-SYSTEM-NAME-xXx\\.asd$")))))))
(inputs
- (list sbcl-alexandria
+ (list sbcl-3b-bmfont
sbcl-babel
+ sbcl-cl-cpus
+ sbcl-cl-graph
+ sbcl-cl-opengl
+ sbcl-cl-ppcre
+ sbcl-cl-slug
sbcl-closer-mop
- sbcl-esrap
- sbcl-iterate
- sbcl-parse-number
- sbcl-split-sequence))
- (synopsis "Lisp implementation of Google Closure Templates")
+ sbcl-fast-io
+ sbcl-global-vars
+ sbcl-glsl-packing
+ sbcl-jsown
+ sbcl-lparallel
+ sbcl-pngload
+ sbcl-printv
+ sbcl-queues
+ sbcl-sdl2
+ sbcl-serapeum
+ sbcl-split-sequence
+ sbcl-static-vectors
+ sbcl-trivial-features
+ sbcl-varjo))
+ (home-page "https://github.com/bufferswap/ViralityEngine")
+ (synopsis "Component-based game engine written in Common Lisp")
(description
- "This package provides a Common Lisp implementation of Google
-Closure Templates.")
- (home-page "https://github.com/archimag/cl-closure-template/")
- (license license:llgpl))))
+ "Virality Engine provides a system and workflow that helps describe the
+elements needed to write 2D or 3D games. It was designed with several domain
+specific languages that make it easier to describe, manipulate, and use assets
+commonly found in game making. Such assets include (but are not limited to)
+textures, materials, shader programs, and scene trees of actors that are
+available for instantiation. Virality Engine also knows how to accept input
+from keyboards and most joysticks and gamepads.
-(define-public cl-closure-template
- (sbcl-package->cl-source-package sbcl-closure-template))
+The component system is a hybrid model between an ECS and an object model. The
+components are defined similar to CLOS defclass, and regular generic methods
+can be used with them. Components are added to Actors which represent game
+concepts like players, scenery, effects, etc. We define a component protocol
+invoked by Virality Engine to move your components to the next state and
+render them each frame.")
+ (license license:expat))))
-(define-public ecl-closure-template
- (sbcl-package->ecl-package sbcl-closure-template))
+(define-public cl-virality
+ (sbcl-package->cl-source-package sbcl-virality))
-(define-public sbcl-cl-morse
- (package
- (name "sbcl-cl-morse")
- (version "1.0.0")
- (source
- (origin
+(define-public sbcl-vom
+ (let ((commit "1aeafeb5b74c53741b79497e0ef4acf85c92ff24")
+ (revision "1"))
+ (package
+ (name "sbcl-vom")
+ (version (git-version "0.1.4" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/orthecreedence/vom")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0536kppj76ax4lrxhv42npkfjsmx45km2g439vf9jmw3apinz9cy"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Tiny logging utility for Common Lisp")
+ (description
+ "Vom is a logging library for Common Lisp. It's goal is to be useful
+and small. It does not provide a lot of features as other loggers do, but
+has a small codebase that's easy to understand and use.")
+ (home-page "https://github.com/orthecreedence/vom")
+ (license license:expat))))
+
+(define-public cl-vom
+ (sbcl-package->cl-source-package sbcl-vom))
+
+(define-public ecl-vom
+ (sbcl-package->ecl-package sbcl-vom))
+
+(define-public sbcl-websocket-driver
+ (let ((commit "df94496ecb525d086eeada4f5875975515b7212e")
+ (revision "0"))
+ (package
+ (name "sbcl-websocket-driver")
+ (version (git-version "0.2.0" revision commit))
+ (home-page "https://github.com/fukamachi/websocket-driver")
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/em7/cl-morse")
- (commit (string-append "v" version))))
- (file-name (git-file-name "cl-morse" version))
+ (url "https://github.com/fukamachi/websocket-driver")
+ (commit commit)))
+ (file-name (git-file-name "cl-websocket-driver" version))
(sha256
- (base32 "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"))))
- (build-system asdf-build-system/sbcl)
- (inputs (list sbcl-cl-ppcre))
- (native-inputs (list sbcl-fiveam))
- (home-page "https://github.com/em7/cl-morse")
- (synopsis "Morse code translation library for Common Lisp")
- (description
- "@code{cl-morse} is a Morse code translation library for Common Lisp.")
- (license license:bsd-3)))
+ (base32 "0y852sqdnxfma6kw833by4wkgbgbv4ppzawjk8pk3y1pmh6is83y"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-babel
+ sbcl-clack
+ sbcl-fast-http
+ sbcl-fast-io
+ sbcl-fast-websocket
+ sbcl-event-emitter
+ sbcl-sha1
+ sbcl-cl-base64
+ sbcl-split-sequence
+ sbcl-bordeaux-threads
+ sbcl-quri))
+ (synopsis "WebSocket server/client for Common Lisp")
+ (description "This library provides a WebSocket server and client
+implementation for Common Lisp.")
+ (license license:bsd-2))))
-(define-public cl-morse
- (sbcl-package->cl-source-package sbcl-cl-morse))
+(define-public cl-websocket-driver
+ (sbcl-package->cl-source-package sbcl-websocket-driver))
-(define-public ecl-cl-morse
- (sbcl-package->ecl-package sbcl-cl-morse))
+(define-public ecl-websocket-driver
+ (sbcl-package->ecl-package sbcl-websocket-driver))
-(define-public sbcl-smug
- (let ((commit "647a2428df297e1dd183ba7c19574bdb1320ae79")
- (revision "0"))
+(define-public sbcl-which
+ (let ((commit "b2333e4fcacab6e5d85eecd28b5ef4944bda1448")
+ (revision "1"))
(package
- (name "sbcl-smug")
- (version (git-version "0.0.0" revision commit))
- (source
+ (name "sbcl-which")
+ (version (git-version "0.1" revision commit))
+ (source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/drewc/smug")
+ (url "https://github.com/eudoxia0/which")
(commit commit)))
- (file-name (git-file-name "cl-smug" version))
+ (file-name (git-file-name "cl-which" version))
(sha256
- (base32 "13gzkj9skya2ziwclk041v7sif392ydbvhvikhg2raa3qjcxb3rq"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- `(#:tests? #f)) ; There are no tests.
- (synopsis "Parser combinators for Common Lisp")
- (description
- "@code{cl-smug} is a library for parsing text, based on monadic parser
-combinators. Using a simple technique from the functional programming
-camp, @code{cl-smug} makes it simple to create quick extensible recursive
-descent parsers without funky syntax or impenetrable macrology.")
- (home-page "https://smug.drewc.ca/")
- (license license:expat))))
+ (base32 "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-cl-fad sbcl-path-parse))
+ (native-inputs
+ (list sbcl-fiveam))
+ (home-page "https://github.com/eudoxia0/which")
+ (synopsis "The which command in Common Lisp")
+ (description
+ "This package provides an implementation of the @code{which} UNIX
+command in Common Lisp.")
+ (license license:expat))))
-(define-public cl-smug
- (sbcl-package->cl-source-package sbcl-smug))
+(define-public cl-which
+ (sbcl-package->cl-source-package sbcl-which))
-(define-public ecl-smug
- (sbcl-package->ecl-package sbcl-smug))
+(define-public ecl-which
+ (sbcl-package->ecl-package sbcl-which))
-(define-public sbcl-cl-variates
- (let ((commit "4e7548754d8a8731a42487fae31174db4bf36d47")
+(define-public sbcl-wild-package-inferred-system
+ (let ((commit "800b5f89b61cc4a0a9cf14706fd3f7e7fcd3e539")
(revision "0"))
(package
- (name "sbcl-cl-variates")
- (version "0.9.0")
+ (name "sbcl-wild-package-inferred-system")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.common-lisp.net/cl-variates/cl-variates")
+ (url "https://github.com/privet-kitty/wild-package-inferred-system")
(commit commit)))
- (file-name (git-file-name "cl-variates" version))
+ (file-name (git-file-name "cl-wild-package-inferred-system" version))
(sha256
- (base32 "03wnvfi3yfflpvi0mr732r834msij4vrwdbgf6csh0b8kqxl47zn"))))
+ (base32 "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"))))
(build-system asdf-build-system/sbcl)
- ;; USE-PACKAGE #<PACKAGE "CL-VARIATES"> causes name-conflicts in
- ;; #<PACKAGE "CL-VARIATES-TEST"> between the following symbols:
- ;; CL-VARIATES:RANDOM-ELEMENT, LIFT:RANDOM-ELEMENT
- (arguments (list #:tests? #f))
- (native-inputs (list sbcl-lift))
- (home-page "https://gitlab.common-lisp.net/cl-variates/cl-variates")
- (synopsis "Portable Common Lisp Random Number Generation")
- (description "The variates package provides portable random number
-generation as well as numerous distributions.")
+ (native-inputs (list sbcl-fiveam))
+ (home-page "https://github.com/privet-kitty/wild-package-inferred-system/")
+ (synopsis "Wildcard for ASDF package-inferred-system")
+ (description
+ "@code{wild-package-inferred-system} is an extension of ASDF
+package-inferred-system that interprets star * and globstar ** in package
+or system names.")
(license license:expat))))
-(define-public cl-variates
- (sbcl-package->cl-source-package sbcl-cl-variates))
+(define-public cl-wild-package-inferred-system
+ (sbcl-package->cl-source-package sbcl-wild-package-inferred-system))
-(define-public ecl-cl-variates
- (sbcl-package->ecl-package sbcl-cl-variates))
+(define-public ecl-wild-package-inferred-system
+ (sbcl-package->ecl-package sbcl-wild-package-inferred-system))
-(define-public sbcl-cl-vorbis
- (let ((commit "c5835cd7091aea9e2e389ad359d244542d637758")
+(define-public sbcl-with-user-abort
+ (let ((commit "60693b4a1354faf17107ad6003b0b870cca37081")
(revision "0"))
(package
- (name "sbcl-cl-vorbis")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-with-user-abort")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/cl-vorbis")
+ (url "https://github.com/compufox/with-user-abort")
(commit commit)))
- (file-name (git-file-name "cl-vorbis" version))
+ (file-name (git-file-name "cl-with-user-abort" version))
(sha256
- (base32 "0713pl5c2khfpf8m3h1l2y0ilack7akf580h70jq6qcrnq3h4b40"))
- (modules '((guix build utils)))
- (snippet
- ;; Delete bundled libraries, GlibC and Vorbis sources.
- `(begin
- (delete-file-recursively "static")
- (for-each delete-file '("glibc-2.13.h"
- "stb_vorbis.c"
- "stb_vorbis_patch.c"))))))
+ (base32 "0k1xxfvncdw4fx8nncis1ma128bqq05zky1mrzak5rjbivzjm8j1"))))
(build-system asdf-build-system/sbcl)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "low-level.lisp"
- (("libvorbis-lin-amd64.so")
- (search-input-file inputs "/lib/libvorbis.so"))))))))
- (inputs
- (list libvorbis
- sbcl-cffi
- sbcl-documentation-utils
- sbcl-static-vectors
- sbcl-trivial-features
- sbcl-trivial-garbage))
- (home-page "https://shirakumo.github.io/cl-vorbis/")
- (synopsis "OGG/Vorbis decoding using stb_vorbis for Common Lisp")
- (description "This package provides CFFI bindings for the
-@code{stb_vorbis} audio library to Common Lisp.")
- (license license:zlib))))
+ (home-page "https://github.com/compufox/with-user-abort")
+ (synopsis "Portability library for catching SIGINT from Common Lisp")
+ (description
+ "@code{with-user-abort} is a Common Lisp portability library providing a
+like-named macro that catches the SIGINT signal.")
+ (license license:bsd-3))))
-(define-public ecl-cl-vorbis
- (sbcl-package->ecl-package sbcl-cl-vorbis))
+(define-public cl-with-user-abort
+ (sbcl-package->cl-source-package sbcl-with-user-abort))
-(define-public cl-vorbis
- (sbcl-package->cl-source-package sbcl-cl-vorbis))
+(define-public ecl-with-user-abort
+ (sbcl-package->ecl-package sbcl-with-user-abort))
-(define-public sbcl-cephes
- (let ((commit "d87146fa38c8425ffb5fe425eee5eb3e818bacd4")
- (revision "0"))
+(define-public sbcl-woo
+ (let ((commit "fba3567be95ed6e782d98a4c1477d3a74b8ad124")
+ (revision "1"))
(package
- (name "sbcl-cephes")
- (version (git-version "1.2" revision commit))
+ (name "sbcl-woo")
+ (version (git-version "0.12.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/cephes.cl")
+ (url "https://github.com/fukamachi/woo")
(commit commit)))
- (file-name (git-file-name "cl-cephes" version))
+ (file-name (git-file-name "woo" version))
(sha256
- (base32 "09adls1lwwzwm1jmvhf11arwlsy5w0bi2rmniahas824mysv77lr"))))
+ (base32 "06f95x8s8v523gxmrkn9wwgw2pvc3bc66znbgrzhqb30y4aar5v5"))))
(build-system asdf-build-system/sbcl)
- (inputs
- (list sbcl-cffi))
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- ;; ECL has issues making the shared library automatically,
- ;; so we make it explicitly.
- (add-before 'build 'build-shared-library
- (lambda _
- (with-directory-excursion
- (string-append #$output "/share/common-lisp/"
- (%lisp-type) "/cephes/scipy-cephes")
- (invoke "make")
- ;; Remove temporary object files.
- (for-each delete-file (find-files "." "\\.o$"))))))))
- (home-page "https://lisp-stat.github.io/cephes.cl/")
- (synopsis "Common Lisp wrapper for the Cephes Mathematical Library")
+ ;; FIXME: Tests fail because they try to compile clack-test:
+ ;;
+ ;; Error opening #P"/gnu/store/...-sbcl-clack-2.0.0-1.e3e0328/
+ ;; lib/common-lisp/sbcl/clack/src/test-tmpGHU3ALSV.fasl":
+ ;;
+ ;; Permission denied
+ ;;
+ ;; clack-test should be compiled when building the sbcl-clack package,
+ ;; but it isn't right now because of the circular dependency between
+ ;; clack-test and dexador.
+ `(#:tests? #f))
+ (native-inputs
+ (list sbcl-clack sbcl-rove))
+ (inputs
+ (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-cffi
+ sbcl-cl-speedy-queue ;; Required for ecl build
+ sbcl-clack
+ sbcl-fast-http
+ sbcl-fast-io
+ sbcl-lev
+ sbcl-quri
+ sbcl-rove
+ sbcl-smart-buffer
+ sbcl-static-vectors
+ sbcl-swap-bytes
+ sbcl-trivial-utf-8
+ sbcl-vom))
+ (home-page "https://github.com/fukamachi/woo")
+ (synopsis "Non-blocking HTTP server based on libev")
(description
- "This package provides a common lisp CFFI wrapper for the SciPy version
-of Cephes special functions.")
- (license license:ms-pl))))
+ "This package provides the Common Lisp HTTP server @code{WOO}, which
+is built on top of the @code{libev} event library.")
+ (license license:expat))))
-(define-public cl-cephes
- (sbcl-package->cl-source-package sbcl-cephes))
+(define-public cl-woo
+ (sbcl-package->cl-source-package sbcl-woo))
-(define-public ecl-cephes
- (sbcl-package->ecl-package sbcl-cephes))
+(define-public ecl-woo
+ (sbcl-package->ecl-package sbcl-woo))
-(define-public sbcl-special-functions
- (let ((commit "f3ca2792ff3f8351839c366413da6b1bb2965a58")
+(define-public sbcl-wordnet
+ (let ((commit "8cd0db8f5e84e7a930fa74e590ecddf75cd8e5d6")
(revision "0"))
(package
- (name "sbcl-special-functions")
- (version (git-version "1.2.0" revision commit))
+ (name "sbcl-wordnet")
+ (version (git-version "0.0.1" revision commit))
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Lisp-Stat/special-functions")
- (commit commit)))
- (file-name (git-file-name "cl-special-functions" version))
- (sha256
- (base32 "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phoe/wordnet")
+ (commit commit)))
+ (sha256
+ (base32 "07p60k295fsfcp0gmkqhrxd68hb38aqva8f4k8xk8bqqxxf42vkq"))
+ (file-name (git-file-name "cl-wordnet" commit))))
(build-system asdf-build-system/sbcl)
- (native-inputs
- (list sbcl-fiveam
- sbcl-select
- sbcl-cl-variates))
+ (arguments
+ `(#:tests? #f)) ; There are no tests.
(inputs
- (list sbcl-alexandria-plus
- sbcl-float-features
- sbcl-let-plus
- sbcl-numerical-utilities))
- (home-page "https://lisp-stat.dev/docs/resources/special-functions/")
- (synopsis "Special functions in Common Lisp")
- (description "This library implements
-@url{http://specialfunctionswiki.org/index.php/Main_Page, special
-functions} and has a focus on high accuracy double-float calculations
-using the latest algorithms.")
- (license license:ms-pl))))
+ (list sbcl-split-sequence))
+ (home-page "https://github.com/phoe/wordnet")
+ (synopsis "Common Lisp interface to WordNet")
+ (description
+ "This software provides an interface by which Common Lisp programs can
+access lexicographic data from WordNet.")
+ (license license:expat))))
-(define-public cl-special-functions
- (sbcl-package->cl-source-package sbcl-special-functions))
+(define-public cl-wordnet
+ (sbcl-package->cl-source-package sbcl-wordnet))
-(define-public ecl-special-functions
- (package
- (inherit (sbcl-package->ecl-package sbcl-special-functions))
- ;; https://github.com/Lisp-Stat/special-functions/issues/4
- (arguments (list #:tests? #f))))
+(define-public ecl-wordnet
+ (sbcl-package->ecl-package sbcl-wordnet))
-(define-public sbcl-distributions
- (let ((commit "ea72622073ee7e005dfdc621ce1e5a83b22bb39e")
+(define-public sbcl-wu-decimal
+ (let ((commit "5b348bdb32a0f83e80e17aa68cd51787ae8c8a45")
(revision "0"))
(package
- (name "sbcl-distributions")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-wu-decimal")
+ (version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/distributions")
+ (url "https://github.com/Wukix/wu-decimal")
(commit commit)))
- (file-name (git-file-name "cl-distributions" version))
+ (file-name (git-file-name "cl-wu-decimal" version))
(sha256
- (base32 "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk"))))
+ (base32 "1p7na4hic7297amwm4idfwkyx664ny8cdssncyra37pmv4wzp8dm"))))
(build-system asdf-build-system/sbcl)
- ;; https://github.com/Lisp-Stat/distributions/issues/1
- (arguments (list #:tests? #f))
- (native-inputs (list sbcl-fiveam))
- (inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-array-operations
- sbcl-cephes
- sbcl-float-features
- sbcl-let-plus
- sbcl-numerical-utilities
- sbcl-special-functions))
- (home-page "https://lisp-stat.dev/docs/manuals/distributions/")
- (synopsis "Statistical distributions for Common Lisp")
- (description "The Distributions package provides a collection of
-probabilistic distributions and related functions")
- (license license:ms-pl))))
+ (home-page "https://github.com/Wukix/wu-decimal")
+ (synopsis "Arbitrary-precision decimal arithmetic")
+ (description
+ "Wu-Decimal enables convenient, arbitrary-precision decimal arithmetic
+through a reader macro, @code{#$}, and an update to the @code{pprint} dispatch
+table. Wu-Decimal uses the CL rational type to store decimals, which enables
+numeric functions such as @code{+}, @code{-}, etc., to operate on decimal
+numbers in a natural way.")
+ (license license:bsd-2))))
-(define-public cl-distributions
- (sbcl-package->cl-source-package sbcl-distributions))
+(define-public cl-wu-decimal
+ (sbcl-package->cl-source-package sbcl-wu-decimal))
-(define-public ecl-distributions
- (sbcl-package->ecl-package sbcl-distributions))
+(define-public ecl-wu-decimal
+ (sbcl-package->ecl-package sbcl-wu-decimal))
-(define-public sbcl-statistics
- (let ((commit "94fc87a2bf81355a40ce3730b4ed77710ecfabaf")
+(define-public sbcl-xhtmlambda
+ (let ((commit "c86376bccebf77ca428e8033df2ba7d8450ea1e8")
(revision "0"))
(package
- (name "sbcl-statistics")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-xhtmlambda")
+ (version
+ ;; The source repository doesn't provide any version nor revision, but
+ ;; a timestamp
+ (git-version "2022-01-21" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/statistics")
+ (url "https://gitlab.common-lisp.net/xhtmlambda/XHTMLambda")
(commit commit)))
- (file-name (git-file-name "cl-statistics" version))
+ (file-name (git-file-name "cl-xhtmlambda" version))
(sha256
- (base32 "0is69w6iwh4hyzc5ndgb3i2331f677sa7kw5wy8pmx6hawbkgyir"))))
+ (base32 "0narbzz06ry1wn048avm1fwihvnjvvc4wfcv5hmdazkilpvnqz2y"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-clunit2))
- (inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-conduit-packages
- sbcl-distributions
- sbcl-let-plus
- sbcl-numerical-utilities))
- (home-page "https://lisp-stat.dev/docs/")
- (synopsis "Statistical functions in Common Lisp")
- (description "This package provides a consolidation of Common Lisp
-statistics libraries.")
- (license (list license:expat license:ms-pl)))))
-
-(define-public cl-statistics
- (sbcl-package->cl-source-package sbcl-statistics))
+ (inputs (list sbcl-cl-unicode))
+ (synopsis "(X)HTML library for Common Lisp")
+ (description
+ "(X)HTMLambda is yet another (X)HTML library which
+emphasizes programmability and user-friendliness. Each (X)HTML element is a
+structured object and pretty-printing of (X)HTML trees is well defined to
+provide properly indented human-readable output even for complex recursive
+arrangements.")
+ (home-page "https://xhtmlambda.common-lisp.dev/")
+ (license license:expat))))
-(define-public ecl-statistics
- (sbcl-package->ecl-package sbcl-statistics))
+(define-public cl-xhtmlambda
+ (sbcl-package->cl-source-package sbcl-xhtmlambda))
-(define-public sbcl-data-frame
- (let ((commit "6f02e58312654ddf19d686f234dcf699fc4cd0f5")
+(define-public sbcl-xkbcommon
+ (let ((commit "aa9513d93f42d7816f88dd1bd8bd21375e7d7512")
(revision "0"))
(package
- (name "sbcl-data-frame")
- (version (git-version "1.1.1" revision commit))
+ (name "sbcl-xkbcommon")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/data-frame")
+ (url "https://github.com/sdilts/cl-xkbcommon")
(commit commit)))
- (file-name (git-file-name "cl-data-frame" version))
+ (file-name (git-file-name "cl-xkbcommon" version))
(sha256
- (base32 "0bs1jh66bml25bj1lxdzz8cjhj3g060yyd5ggqsnsr4l2j0zyszv"))))
+ (base32 "02zdbkh7yliw9vg8i8wx2xgcpfni0fr4z0w19kkxvaib8xm9rx1q"))))
(build-system asdf-build-system/sbcl)
- (native-inputs (list sbcl-clunit2))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "xkbcommon.lisp"
+ (("libxkbcommon.so.0")
+ (search-input-file inputs "/lib/libxkbcommon.so"))))))))
+ (native-inputs
+ (list pkg-config))
(inputs
- (list sbcl-alexandria
- sbcl-alexandria-plus
- sbcl-anaphora
- sbcl-array-operations
- sbcl-duologue
- sbcl-let-plus
- sbcl-numerical-utilities
- sbcl-select
- sbcl-serapeum
- sbcl-statistics))
- (home-page "https://lisp-stat.dev/docs/manuals/data-frame/")
- (synopsis "Data frames for Common Lisp")
- (description "This package provides data frames for Common Lisp, a
-two-dimensional array-like structure in which each column contains values
-of one variable and each row contains one set of values from each column.")
- (license license:ms-pl))))
+ (list libxkbcommon
+ sbcl-cffi))
+ (home-page "https://github.com/sdilts/cl-xkbcommon")
+ (synopsis "Common Lisp FFI bindings for xkbcommon")
+ (description
+ "This package provides Common Lisp FFI bindings for xkbcommon
+(libxkbcommon) using cffi-grovel.")
+ (license license:expat))))
-(define-public cl-data-frame
- (sbcl-package->cl-source-package sbcl-data-frame))
+(define-public cl-xkbcommon
+ (sbcl-package->cl-source-package sbcl-xkbcommon))
-;; The data-frame system depends on the sb-cltl2 system, which is only
-;; available with SBCL.
-;; (define-public ecl-data-frame
-;; (sbcl-package->ecl-package sbcl-data-frame))
+(define-public ecl-xkbcommon
+ (sbcl-package->ecl-package sbcl-xkbcommon))
-(define-public sbcl-dfio
- (let ((commit "5caf473acb9bc464839e87395724cbd941167915")
- (revision "0"))
+(define-public sbcl-xml-emitter
+ (package
+ (name "sbcl-xml-emitter")
+ (version "1.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/VitoVan/xml-emitter")
+ (commit version)))
+ (file-name (git-file-name "cl-xml-emitter" version))
+ (sha256
+ (base32
+ "1w9yx8gc4imimvjqkhq8yzpg3kjrp2y37rjix5c1lnz4s7bxvhk9"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs (list sbcl-1am))
+ (inputs (list sbcl-cl-utilities))
+ (synopsis "Common lisp library for emitting XML output")
+ (description
+ "This package provides functions to emit XML, with some complexity for
+handling indentation. It can be used to produce all sorts of useful XML
+output; it has an RSS 2.0 emitter built in, so you can make RSS feeds
+trivially.")
+ (home-page "https://www.cliki.net/xml-emitter")
+ (license license:expat)))
+
+(define-public cl-xml-emitter
+ (sbcl-package->cl-source-package sbcl-xml-emitter))
+
+(define-public ecl-xml-emitter
+ (sbcl-package->ecl-package sbcl-xml-emitter))
+
+(define-public sbcl-xmls
+ (package
+ (name "sbcl-xmls")
+ (version "3.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rpgoldman/xmls")
+ (commit version)))
+ (file-name (git-file-name "cl-xmls" version))
+ (sha256
+ (base32 "10406sgap9kdaip7blxldnv6kabiczd6890jgic4pacsrfx6jypk"))))
+ (native-inputs
+ (list sbcl-fiveam))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/rpgoldman/xmls")
+ (synopsis "Non-validating XML parser for Common Lisp")
+ (description "Xmls is a self-contained, easily embedded parser that
+recognizes a useful subset of the XML spec. It provides a simple mapping from
+XML to Lisp structures or s-expressions and back.")
+ (license license:bsd-2)))
+
+(define-public cl-xmls
+ (sbcl-package->cl-source-package sbcl-xmls))
+
+(define-public ecl-xmls
+ (sbcl-package->ecl-package sbcl-xmls))
+
+(define-public sbcl-xpath
+ ;; No release.
+ (let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3"))
(package
- (name "sbcl-dfio")
- (version (git-version "1.0.2" revision commit))
+ (name "sbcl-xpath")
+ (version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/dfio")
+ (url "https://github.com/sharplispers/xpath/")
(commit commit)))
- (file-name (git-file-name "cl-dfio" version))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"))))
+ (base32 "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-anaphora
- sbcl-data-frame
- sbcl-dexador
- sbcl-fare-csv
- sbcl-let-plus
- sbcl-yason))
- (native-inputs
- (list sbcl-clunit2))
- (home-page "https://lisp-stat.dev/docs/manuals/data-frame/")
- (synopsis "Read data to and from data frames")
- (description "This package provides tools for manipulating data
-in files using data frames.")
- (license license:ms-pl))))
+ (list sbcl-cxml sbcl-parse-number sbcl-cl-ppcre sbcl-cl-yacc))
+ (home-page "https://github.com/sharplispers/xpath/")
+ (synopsis "Implementation of the XML Path Language (XPath) Version 1.0")
+ (description
+ "This library is an implementation of the XML Path Language (XPath)
+Version 1.0.")
+ (license license:bsd-2))))
-(define-public cl-dfio
- (sbcl-package->cl-source-package sbcl-dfio))
+;; According to
+;; https://github.com/sharplispers/xpath/blob/master/doc/index.xml ECL is not
+;; supported.
+(define-public cl-xpath
+ (sbcl-package->cl-source-package sbcl-xpath))
-;; This depends on ecl-data-frame, which doesn't work yet.
-;; (define-public ecl-dfio
-;; (sbcl-package->ecl-package sbcl-dfio))
+(define-public sbcl-xsubseq
+ (let ((commit "5ce430b3da5cda3a73b9cf5cee4df2843034422b")
+ (revision "1"))
+ (package
+ (name "sbcl-xsubseq")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/xsubseq")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("xsubseq-test" "xsubseq")))
+ (native-inputs
+ (list sbcl-prove))
+ (home-page "https://github.com/fukamachi/xsubseq")
+ (synopsis "Efficient way to use \"subseq\"s in Common Lisp")
+ (description
+ "XSubseq provides functions to be able to handle \"subseq\"s more
+effieiently.")
+ (license license:bsd-2))))
-(define-public sbcl-lisp-stat
- (let ((commit "357a0d2b5f68a5ff925776235c2b7455e12b78ba")
- (revision "0"))
+(define-public cl-xsubseq
+ (sbcl-package->cl-source-package sbcl-xsubseq))
+
+(define-public ecl-xsubseq
+ (sbcl-package->ecl-package sbcl-xsubseq))
+
+(define-public sbcl-yason
+ (package
+ (name "sbcl-yason")
+ (version "0.8.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/phmarek/yason")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "cl-yason" version))
+ (sha256
+ (base32 "0d22sw7nf2ygqm56ilybg7bza63cv43pc4184r8rvsjz2in37n51"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-alexandria sbcl-trivial-gray-streams))
+ (synopsis "Common Lisp JSON parser/encoder")
+ (description
+ "YASON is a Common Lisp library for encoding and decoding data in the
+JSON interchange format.")
+ (home-page "https://github.com/phmarek/yason")
+ (license license:bsd-3)))
+
+(define-public cl-yason
+ (sbcl-package->cl-source-package sbcl-yason))
+
+(define-public ecl-yason
+ (sbcl-package->ecl-package sbcl-yason))
+
+(define-public sbcl-yxorp
+ (let ((commit "c306898a467995e123a22316c9b79fcac442415b")
+ (revision "4"))
(package
- (name "sbcl-lisp-stat")
- (version (git-version "1.2.0" revision commit))
+ (name "sbcl-yxorp")
+ (version (git-version "0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Lisp-Stat/lisp-stat")
+ (url "https://github.com/charJe/cl-yxorp")
(commit commit)))
- (file-name (git-file-name "cl-lisp-stat" version))
+ (file-name (git-file-name "cl-yxorp" version))
(sha256
- (base32 "0qwlxrbwj884mr67sf6aj0zwrndv33aiiid4bqrkji41kjhqfcz5"))))
+ (base32 "0ll1s9w29yhhgqssgiw58fcapw4n040gkvpz4sxwv3q2v60rbidj"))))
(build-system asdf-build-system/sbcl)
- ;; https://github.com/Lisp-Stat/lisp-stat/issues/22
- (arguments (list #:tests? #f))
- (native-inputs (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
- sbcl-alexandria-plus
- sbcl-array-operations
- sbcl-conduit-packages
- sbcl-data-frame
- sbcl-dexador
- sbcl-dfio
- sbcl-distributions
- sbcl-numerical-utilities
- sbcl-select
- sbcl-statistics))
- (home-page "https://lisp-stat.github.io/lisp-stat/")
- (synopsis "Statistical Computing in Common Lisp")
- (description "This package provides a statistical computing
-environment for Common Lisp.")
- (license license:ms-pl))))
+ (list sbcl-chipz
+ sbcl-chunga
+ sbcl-cl+ssl
+ sbcl-binding-arrows
+ sbcl-cl-str
+ sbcl-usocket
+ sbcl-flexi-streams
+ sbcl-rutils
+ sbcl-salza2
+ sbcl-trivial-garbage))
+ (home-page "https://github.com/charje/cl-yxorp")
+ (synopsis
+ "Reverse proxy server written in and configurable in Common Lisp")
+ (description
+ "This is a reverse proxy server written in and configurable in
+Common Lisp. It supports WebSocket, HTTP, HTTPS, HTTP to HTTPS
+redirecting, port and host forwarding configuration using a real programming
+language, HTTP header and body manipulation (also using a real programming
+language).")
+ (license license:agpl3))))
-(define-public cl-lisp-stat
- (sbcl-package->cl-source-package sbcl-lisp-stat))
+(define-public cl-yxorp
+ (sbcl-package->cl-source-package sbcl-yxorp))
-;; This depends on ecl-data-frame and ecl-dfio, which don't work yet.
-;; (define-public ecl-lisp-stat
-;; (sbcl-package->ecl-package sbcl-lisp-stat))
+(define-public ecl-yxorp
+ ;; Note that due to a bug in ECL this package does not build.
+ ;; The bug has already been fixed on the development branch,
+ ;; so this package will work work in the version after 21.2.1.
+ (sbcl-package->ecl-package sbcl-yxorp))
-(define-public sbcl-cl-modio
- (let ((commit "2fd288af27b574f448357fa6de4b42acf44e2f11")
+(define-public cl-yxorp-cli
+ (package
+ (inherit sbcl-yxorp)
+ (name "cl-yxorp-cli")
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f
+ #:strip-binaries? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'set-home
+ (lambda _
+ (setenv "HOME" "/tmp")))
+ (replace 'build
+ (lambda _
+ (invoke
+ "sbcl" "--noinform"
+ "--non-interactive"
+ "--no-userinit"
+ "--eval" "(require :asdf)"
+ "--eval" "(pushnew (uiop:getcwd) asdf:*central-registry*)"
+ "--load" "build.lisp")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+ (mkdir-p bin)
+ (install-file "cl-yxorp" bin)))))))
+ (inputs (cons (list "sbcl" sbcl) (package-inputs sbcl-yxorp)))))
+
+(define-public sbcl-zip
+ ;; named branch is outdated
+ (let ((commit "688b1545dd7a4fe355556768bb03f8bd9b847a87")
(revision "1"))
(package
- (name "sbcl-cl-modio")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-zip")
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/cl-modio/")
+ (url "https://github.com/bluelisp/zip")
(commit commit)))
(sha256
- (base32 "0hz87v81pi8kr2c7az30czpdf7v757lkzlsmdcc59p94pipca7m9"))
- (file-name (git-file-name "cl-modio" version))))
+ (base32 "0s08a6fq182fzsbfyvihqbdllq6gxcwkvphxnrd9wwz65dhg5y66"))
+ (file-name (git-file-name "cl-zip" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
- sbcl-zippy
- sbcl-jzon
- sbcl-cl-ppcre
- sbcl-drakma
- sbcl-documentation-utils
- sbcl-language-codes))
- (synopsis "Client library for the mod.io API")
- (description "This is a client library to interact with the
-\"mod.io\" (@url{https://mod.io}) platform to manage \"mods\" or extensions
-for games and other applications. It covers the full v1 API and includes
-convenience methods to make interacting with the API as well as syncing mods
-and so on easy.")
- (home-page "https://shinmera.github.io/cl-modio/")
- (license license:zlib))))
+ (list sbcl-babel
+ sbcl-cl-fad
+ sbcl-salza2
+ sbcl-trivial-gray-streams))
+ (synopsis "Zip library written in Common Lisp")
+ (description "This package provide a Common Lisp library for .zip-file
+reading and writing.")
+ (home-page "https://zip.common-lisp.dev")
+ (license (list license:bsd-2 license:llgpl)))))
-(define-public cl-modio
- (sbcl-package->cl-source-package sbcl-cl-modio))
+(define-public cl-zip
+ (sbcl-package->cl-source-package sbcl-zip))
-(define-public ecl-cl-modio
- (sbcl-package->ecl-package sbcl-cl-modio))
+(define-public ecl-zip
+ (sbcl-package->ecl-package sbcl-zip))
-(define-public sbcl-cl-steamworks
- (let ((commit "9d6a4de653a8cc256ae35e0298912b518aa92ba3")
+(define-public sbcl-zippy
+ (let ((commit "ed9bca591ded2ff27a9ac95d9a60827773a0e707")
(revision "1"))
(package
- (name "sbcl-cl-steamworks")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-zippy")
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/cl-steamworks/")
+ (url "https://github.com/Shinmera/zippy/")
(commit commit)))
(sha256
- (base32 "1fzj3rlqw1kwdlmh0ga0y71p2n1adflcamzx4yp9kga552c1db5j"))
- (file-name (git-file-name "cl-steamworks" version))))
+ (base32 "16cvyyf2nzd9r3fcy4w6d5wh8n3x833wldmrxmnzd3k2xrkhzfl9"))
+ (file-name (git-file-name "zippy" version))))
(build-system asdf-build-system/sbcl)
(inputs
- (list sbcl-alexandria
+ (list sbcl-documentation-utils
+ sbcl-file-attributes
+ sbcl-pathname-utils
+ sbcl-alexandria
+ sbcl-nibbles
sbcl-babel
- sbcl-cffi
- sbcl-documentation-utils
- sbcl-float-features
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams))
- (synopsis "Wrapper for the Valve SteamWorks API")
- (description "This is a wrapper library to allow you to interface with
-the Valve SteamWorks API.")
- (home-page "https://shinmera.github.io/cl-steamworks/")
+ sbcl-3bz
+ sbcl-salza2))
+ (synopsis "Fast zip archive library")
+ (description "Zippy is a library for the PKWARE Zip archive format. It
+can read and write zip files. It features:
+
+@itemize
+@item archive inspection without extraction;
+@item Zip64 support;
+@item split archive support;
+@item PKWARE decryption;
+@item fast deflate decompression thanks to 3bz;
+@item operates on streams and vectors;
+@item can compress stream->stream;
+@item extensible for other encryption and compression mechanisms.
+@end itemize\n")
+ (home-page "https://shinmera.github.io/zippy/")
(license license:zlib))))
-(define-public cl-steamworks
- (sbcl-package->cl-source-package sbcl-cl-steamworks))
+(define-public cl-zippy
+ (sbcl-package->cl-source-package sbcl-zippy))
-(define-public ecl-cl-steamworks
- (sbcl-package->ecl-package sbcl-cl-steamworks))
+(define-public ecl-zippy
+ (sbcl-package->ecl-package sbcl-zippy))
-(define-public sbcl-forge
- (let ((commit "012324e251d91436f4a610e2fe2eb50674c3c3ce")
- (revision "1"))
+(define-public sbcl-zpb-exif
+ (package
+ (name "sbcl-zpb-exif")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/zpb-exif")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name "cl-zpb-exif" version))
+ (sha256
+ (base32 "0h1n36lfl8xn8rfyl5jxz9m8zlg0if2avmryas79f684yczrvdnd"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://xach.com/lisp/zpb-exif/")
+ (synopsis "EXIF information extractor for Common Lisp")
+ (description
+ "This is a Common Lisp library to extract EXIF information from image
+files.")
+ (license license:bsd-2)))
+
+(define-public cl-zpb-exif
+ (sbcl-package->cl-source-package sbcl-zpb-exif))
+
+(define-public ecl-zpb-exif
+ (sbcl-package->ecl-package sbcl-zpb-exif))
+
+(define-public sbcl-zpb-ttf
+ (package
+ (name "sbcl-zpb-ttf")
+ (version "1.0.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/zpb-ttf")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name "cl-zpb-ttf" version))
+ (sha256
+ (base32 "043xga76jms7dipcwnyh8lkj3gx66cvrkwhc728hjaf7axarvcmv"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/xach/zpb-ttf")
+ (synopsis "TrueType font file access for Common Lisp")
+ (description
+ "ZPB-TTF is a TrueType font file parser that provides an interface for
+reading typographic metrics, glyph outlines, and other information from the
+file.")
+ (license license:bsd-2)))
+
+(define-public cl-zpb-ttf
+ (sbcl-package->cl-source-package sbcl-zpb-ttf))
+
+(define-public ecl-zpb-ttf
+ (sbcl-package->ecl-package sbcl-zpb-ttf))
+
+(define-public sbcl-zpng
+ (package
+ (name "sbcl-zpng")
+ (version "1.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/zpng")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b3ag3jhl3z7kdls3ahdsdxsfhhw5qrizk769984f4wkxhb69rcm"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-salza2))
+ (synopsis "PNG encoder for Common Lisp")
+ (description "This is a Common Lisp library for creating PNG images.")
+ (home-page "https://www.xach.com/lisp/zpng/")
+ (license license:bsd-2)))
+
+(define-public cl-zpng
+ (sbcl-package->cl-source-package sbcl-zpng))
+
+(define-public ecl-zpng
+ (sbcl-package->ecl-package sbcl-zpng))
+
+(define-public sbcl-zr-utils
+ (let ((commit "e7eaffcb71811f6e1ab85fb15a079bcac4038eeb")
+ (revision "0"))
(package
- (name "sbcl-forge")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-zr-utils")
+ (version (git-version "0.0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shinmera/forge/")
+ (url "https://gitlab.com/zombie-raptor/zr-utils.git")
(commit commit)))
+ (file-name (git-file-name "cl-zr-utils" version))
(sha256
- (base32 "006vi2ihrn28pzrwa8b7axmv98bdaxzx7lacnh9pbacbjg3b7hb0"))
- (file-name (git-file-name "forge" version))))
+ (base32 "1nx388974wdc49h3simr1jnv4rw1mcs2llv4xai88qwjf4y66hsy"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("forge-support"
- "forge-communication"
- "forge")))
+ (native-inputs (list sbcl-parachute))
(inputs
- (list sbcl-alexandria
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-ppcre
- sbcl-closer-mop
- sbcl-documentation-utils
- sbcl-ironclad
- sbcl-pathname-utils
- sbcl-promise
- sbcl-usocket
- sbcl-verbose))
- (synopsis "General, modular build system")
- (description "Forge is a generic build system. Refer to documentation
-for the specific kind of project you're building to get the full picture.")
- (home-page "https://github.com/shinmera/forge")
- (license license:zlib))))
+ (list sbcl-alexandria
+ sbcl-babel
+ sbcl-closer-mop
+ sbcl-cl-unicode
+ sbcl-trivial-gray-streams))
+ (arguments
+ (list #:tests? #f ; FIXME: Failing with new parachute.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "zr-utils.asd"
+ (("\\(:parachute")
+ "(:parachute :zr-utils/tests/all")))))))
+ (synopsis "Common Lisp utilities library")
+ (description
+ "This is a Common Lisp utilities library originating from the
+Zombie Raptor game engine project.")
+ (home-page "https://gitlab.com/zombie-raptor/zr-utils")
+ (license license:expat))))
-(define-public forge
- (sbcl-package->cl-source-package sbcl-forge))
+(define-public cl-zr-utils
+ (sbcl-package->cl-source-package sbcl-zr-utils))
-(define-public sbcl-maiden
- (let ((commit "164e8df1b513fcbf097315b51242d337c183a5ef")
+(define-public ecl-zr-utils
+ (sbcl-package->ecl-package sbcl-zr-utils))
+
+(define-public sbcl-zs3
+ (package
+ (name "sbcl-zs3")
+ (version "1.3.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/xach/zs3")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name "zs3" version))
+ (sha256
+ (base32 "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ (list sbcl-drakma
+ sbcl-alexandria
+ sbcl-cxml
+ sbcl-ironclad
+ sbcl-puri
+ sbcl-cl-base64))
+ (synopsis "Work with Amazon S3 and Amazon CloudFront from Common Lisp")
+ (description "This is ZS3, a library for working with Amazon's Simple Storage
+Service (S3) and CloudFront service from Common Lisp.")
+ (home-page "https://github.com/xach/zs3")
+ (license license:bsd-2)))
+
+(define-public cl-zs3
+ (sbcl-package->cl-source-package sbcl-zs3))
+
+(define-public ecl-zs3
+ (sbcl-package->ecl-package sbcl-zs3))
+
+(define-public sbcl-zsort
+ (let ((commit "f6724a6fff7662a942195cedb0d7f00da59c74ed")
(revision "1"))
(package
- (name "sbcl-maiden")
- (version (git-version "3.1.0" revision commit))
+ (name "sbcl-zsort")
+ (version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/maiden/")
+ (url "https://github.com/jorgetavares/zsort")
(commit commit)))
+ (file-name (git-file-name "cl-zsort" version))
(sha256
- (base32 "1m16qi019cmfpfs6538hc4qsplpb8nl9ly1qlckgfxgjag0z3wdr"))
- (file-name (git-file-name "maiden" version))))
+ (base32 "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49"))))
(build-system asdf-build-system/sbcl)
- (arguments
- '(#:asd-systems '("maiden"
- "maiden-commands"
- "maiden-networking"
- "maiden-client-entities"
- "maiden-irc"
- "maiden-silly")))
(inputs
- (list sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cl-base64
- sbcl-cl+ssl
- sbcl-closer-mop
- sbcl-deeds
- sbcl-documentation-utils
- sbcl-drakma
- sbcl-form-fiddle
- sbcl-jsown
- sbcl-lambda-fiddle
- sbcl-lquery
- sbcl-pathname-utils
- sbcl-trivial-garbage
- sbcl-trivial-indent
- sbcl-ubiquitous
- sbcl-usocket
- sbcl-uuid
- sbcl-verbose))
- (synopsis "Modern and extensible chat bot framework")
- (description "Maiden is a collection of systems to help you build
-applications and libraries that interact with chat servers. It can help you
-build a chat bot, or a general chat client. It also offers a variety of parts
-that should make it much easier to write a client for a new chat protocol.")
- (home-page "http://shirakumo.github.io/maiden/")
- (license license:zlib))))
+ (list sbcl-alexandria))
+ (home-page "https://github.com/jorgetavares/zsort")
+ (synopsis "Collection of portable sorting algorithms in Common Lisp")
+ (description
+ "@code{zsort} is a collection of portable sorting algorithms. Common
+Lisp provides the @code{sort} and @code{stable-sort} functions but these can
+have different algorithms implemented according to each implementation. Also,
+the standard sorting functions might not be the best for a certain situations.
+This library aims to provide developers with more options.")
+ (license license:expat))))
-(define-public maiden
- (sbcl-package->cl-source-package sbcl-maiden))
+(define-public cl-zsort
+ (sbcl-package->cl-source-package sbcl-zsort))
-(define-public sbcl-speechless
- (let ((commit "50e9b03bdfc8a3bc0836a650d92de47b51c39834")
+(define-public ecl-zsort
+ (sbcl-package->ecl-package sbcl-zsort))
+
+(define-public sbcl-zstd
+ (let ((commit "134f058eee11512cf772a8d5b64364acf56a10b8")
(revision "1"))
(package
- (name "sbcl-speechless")
- (version (git-version "1.0.0" revision commit))
+ (name "sbcl-zstd")
+ (version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Shirakumo/speechless/")
+ (url "https://codeberg.org/glv/cl-zstd")
(commit commit)))
+ (file-name (git-file-name "cl-zstd" version))
(sha256
- (base32 "1k0kc2l98jyv04l48xnj38qwpddan80c7m41srjld64jkna0fhas"))
- (file-name (git-file-name "speechless" version))))
+ (base32 "1iqpi5v6fdm6xxc9l8zhk6kcgl8hgxiwk1ki2yx2j3j4kfvqv8j9"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ (list sbcl-fiveam))
(inputs
- (list sbcl-cl-markless
- sbcl-documentation-utils))
- (synopsis "Dialogue system language implementation")
- (description "This is a system implementing an advanced dialogue system
-that is capable of complex dialogue flow including choice trees and
-conditional branching. Speechless was first developed for the
-\"Kandria\" (@url{https://kandria.com}) game, and has since been separated and
-made public in the hopes that it may find use elsewhere or inspire other
-developers to build similar systems.
-
-Speechless is based on the
-\"Markless\" (@url{https://shirakumo.github.io/markless}) document standard
-for its syntax and makes use of Markless' ability to be extended to add
-additional constructs useful for dialogue systems.
-
-Speechless can compile dialogue from its base textual form into an efficient
-instruction set, which is then executed when the game is run. Execution of the
-dialogue is completely engine-agnostic, and only requires some simple
-integration with a client protocol to run.
-
-Thanks to Markless' extensibility, Speechless can also be further extended to
-include additional syntax and constructs that may be useful for your
-particular game.")
- (home-page "http://shirakumo.github.io/speechless/")
- (license license:zlib))))
-
-(define-public speechless
- (sbcl-package->cl-source-package sbcl-speechless))
+ (list sbcl-cffi
+ sbcl-cl-octet-streams
+ (list zstd "lib")))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/libzstd.lisp"
+ (("libzstd\\.so")
+ (search-input-file inputs "/lib/libzstd.so"))))))))
+ (synopsis "Common Lisp library for Zstandard (de)compression")
+ (description
+ "This Common Lisp library provides functions for Zstandard
+compression/decompression using bindings to the libzstd C library.")
+ (home-page "https://codeberg.org/glv/cl-zstd")
+ (license license:gpl3+))))
-(define-public ecl-speechless
- (sbcl-package->ecl-package sbcl-speechless))
+(define-public cl-zstd
+ (sbcl-package->cl-source-package sbcl-zstd))
-;;;
-;;; 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
-;;; functionality or similar names.
-;;;
+(define-public ecl-zstd
+ (sbcl-package->ecl-package sbcl-zstd))
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 83ff93719e..5d4399f145 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -27,6 +27,8 @@
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Andrew Kravchuk <awkravchuk@gmail.com>
;;; Copyright © 2024 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2024 bigbug <bigbookofbug@proton.me>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -62,12 +64,17 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages dbm)
+ #:use-module (gnu packages elf)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
@@ -81,15 +88,19 @@
#:use-module (gnu packages libffcall)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libsigsegv)
+ #:use-module (gnu packages libunwind)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages m4)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages ninja)
#:use-module (gnu packages notcurses)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages tcl)
@@ -102,10 +113,346 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
+(define-public buildapp
+ (package
+ (name "buildapp")
+ (version "1.5.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xach/buildapp")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list sbcl))
+ (arguments
+ `(#:tests? #f
+ #:make-flags
+ (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+ #:strip-binaries? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'set-home
+ (lambda _
+ (setenv "HOME" "/tmp")
+ #t))
+ (add-before 'install 'create-target-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((bin (string-append (assoc-ref outputs "out") "/bin")))
+ (mkdir-p bin)
+ #t))))))
+ (home-page "https://www.xach.com/lisp/buildapp/")
+ (synopsis "Makes easy to build application executables with SBCL")
+ (description
+ "Buildapp is an application for SBCL or CCL that configures and saves an
+executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
+ (license license:bsd-2)))
+
+(define-public carp
+ ;; Release 0.5.5 does not support GHC 9.2.
+ (let ((commit "339722325ec607091f6035866ebedea2b69080fe")
+ (revision "1"))
+ (package
+ (name "carp")
+ (version (git-version "0.5.5" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/carp-lang/Carp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0w0j3imi4270dsmrh96spsc9xllsk5rrh817l80q1nyay9p53xwd"))))
+ (build-system haskell-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; Carp looks inside the sources checkout to know where to
+ ;; find its core libraries and other files.
+ ;; Carp emits C code and tries to compile it with an external
+ ;; C compiler. On Linux it defaults to Clang.
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (wrap-carp-program program)
+ (wrap-program (string-append
+ #$output "/bin/" program)
+ `("CARP_DIR" prefix
+ (#$(package-source this-package)))
+ `("PATH" prefix
+ ,(list (dirname
+ (search-input-file inputs "bin/clang"))
+ (dirname
+ (search-input-file inputs "bin/ld"))))
+ `("C_INCLUDE_PATH" prefix
+ ,(list (dirname
+ (search-input-directory
+ inputs "include/linux"))
+ (dirname
+ (search-input-file
+ inputs "include/stdlib.h"))))))
+
+ (for-each wrap-carp-program
+ (list "carp"
+ "carp-header-parse")))))))
+ (inputs
+ (list bash-minimal
+ clang
+ ghc-blaze-markup
+ ghc-blaze-html
+ ghc-split
+ ghc-ansi-terminal
+ ghc-cmark
+ ghc-edit-distance
+ ghc-hashable
+ ghc-open-browser
+ ghc-optparse-applicative))
+ (native-inputs
+ (list ghc-hunit))
+ (home-page "https://carp-lang.org/")
+ (synopsis "Statically typed Lisp without a garbage collector")
+ (description
+ "@code{carp} is a Lisp-like programming language that compiles to
+C. It features inferred static typing, macros, automatic memory
+management without a garbage collector, a REPL, and straightforward
+integration with code written in C.")
+ (license license:asl2.0))))
+
+(define-public ccl
+ ;; Warning: according to upstream, CCL is not bootstrappable.
+ ;; See https://github.com/Clozure/ccl/issues/222 from 2019-09-02:
+ ;;
+ ;; "As far as I know, there is no way to build CCL without an existing
+ ;; running CCL image. It was bootstrapped back in 1986 or so as
+ ;; Macintosh Common Lisp, by Gary Byers, I believe, who is no longer on
+ ;; the planet to tell us the story. It SHOULD be possible to port the
+ ;; CCL compiler to portable Common Lisp, so that ANY lisp could build
+ ;; it, as is the case for SBCL, but I know of no attempt to do so."
+ (package
+ (name "ccl")
+ ;; XXX When updating this package, check whether we can simply append
+ ;; VERSION to the ccl-bootstrap URL again, instead of per architecture.
+ (version "1.13")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Clozure/ccl/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "ccl" version))
+ (sha256
+ (base32
+ "12cb3gp43bhl7nyms3a4lix8j1s3arnp124d3ahc2lhlrjirs0mr"))))
+ (build-system gnu-build-system)
+ ;; CCL consists of a "lisp kernel" and "heap image", both of which are
+ ;; shipped in precompiled form in source tarballs. The former is a C
+ ;; program which we can rebuild from scratch, but the latter cannot be
+ ;; generated without an already working copy of CCL, and is platform
+ ;; dependent, so we need to fetch the correct tarball for the platform.
+ (inputs
+ `(("ccl-bootstrap"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/Clozure/ccl/releases/download/v"
+ (match (%current-system)
+ ("armhf-linux" "1.13/linuxarm")
+ ;; XXX: This source only works on x86, but provide it as a
+ ;; catch-all to prevent errors when querying this package
+ ;; on unsupported platforms.
+ (_ "1.13/linuxx86"))
+ ".tar.gz"))
+ (sha256
+ (base32
+ (match (%current-system)
+ ("armhf-linux"
+ "1mlj7lgn4p9bw1ki7gk00sj89cjv0cjpdmpp65brhx9q3fvkk9xf")
+ (_ "04ry8zwrcjjmzbxp43nkknchabk6i6mclrzg5biwfp1h64bcnzfx"))))))))
+ (native-inputs
+ (list cl-asdf m4))
+ (arguments
+ `(#:tests? #f ;no 'check' target
+ #:modules ((ice-9 match)
+ (srfi srfi-26)
+ (guix build utils)
+ (guix build gnu-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'unpack-image
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke "tar" "xzvf" (assoc-ref inputs "ccl-bootstrap"))))
+ (add-after 'unpack 'replace-asdf
+ ;; Use system ASDF instead of bundled one.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
+ (guix-asdf (string-append
+ cl-asdf
+ "/share/common-lisp/source/asdf/asdf.lisp"))
+ (contrib-asdf "tools/asdf.lisp"))
+ (delete-file contrib-asdf)
+ (copy-file guix-asdf contrib-asdf))))
+ (delete 'configure)
+ (add-before 'build 'pre-build
+ ;; Enter the source directory for the current platform's lisp
+ ;; kernel, and run 'make clean' to remove the precompiled one.
+ (lambda* (#:key system #:allow-other-keys)
+ (substitute* "lisp-kernel/m4macros.m4"
+ (("/bin/pwd") (which "pwd")))
+ (chdir (string-append
+ "lisp-kernel/"
+ (match system
+ ("i686-linux" "linuxx8632")
+ ("x86_64-linux" "linuxx8664")
+ ("armhf-linux" "linuxarm")
+ (_ (string-append "unknown system: " system)))))
+ (substitute* '("Makefile")
+ (("/bin/rm") "rm"))
+ (setenv "CC" "gcc")
+ (invoke "make" "clean")))
+ ;; XXX Do we need to recompile the heap image as well for Guix?
+ ;; For now just use the one we already got in the tarball.
+ (replace 'install
+ (lambda* (#:key outputs inputs system #:allow-other-keys)
+ ;; The lisp kernel built by running 'make' in lisp-kernel/$system
+ ;; is put back into the original directory, so go back. The heap
+ ;; image is there as well.
+ (chdir "../..")
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/"))
+ (bindir (string-append out "/bin/"))
+ (wrapper (string-append bindir "ccl"))
+ (bash (assoc-ref inputs "bash"))
+ (kernel
+ (match system
+ ("i686-linux" "lx86cl")
+ ("x86_64-linux" "lx86cl64")
+ ("armhf-linux" "armcl")
+ ;; Unlikely to work, but try it anyway...
+ (_ system)))
+ (heap (string-append kernel ".image")))
+ (install-file kernel libdir)
+ (install-file heap libdir)
+
+ (let ((dirs `("lib" "library" "examples" "tools" "objc-bridge"
+ ,@(match system
+ ("x86_64-linux"
+ '("x86-headers64"))
+ ("i686-linux"
+ '("x86-headers"))
+ (_ '())))))
+ (for-each copy-recursively
+ dirs
+ (map (cut string-append libdir <>) dirs)))
+
+ (mkdir-p bindir)
+ (with-output-to-file wrapper
+ (lambda ()
+ (display
+ (string-append
+ "#!" bash "/bin/sh\n"
+ "export CCL_DEFAULT_DIRECTORY=" libdir "\n"
+ "exec -a \"$0\" " libdir kernel " \"$@\"\n"))))
+ (chmod wrapper #o755))
+ #t)))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))
+ (search-path-specification
+ (variable "XDG_CONFIG_DIRS")
+ (files '("etc")))))
+ (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
+ (home-page "https://ccl.clozure.com/")
+ (synopsis "Common Lisp implementation")
+ (description "Clozure CL (often called CCL for short) is a Common Lisp
+implementation featuring fast compilation speed, native threads, a precise,
+generational, compacting garbage collector, and a convenient foreign-function
+interface.")
+ (license license:asl2.0)))
+
+(define-public clasp-cl
+ (package
+ (name "clasp-cl")
+ (version "2.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/clasp-developers/clasp/releases/download/"
+ version "/clasp-" version ".tar.gz"))
+ (sha256
+ (base32 "10jjhcid6qp64gx29iyy5rqqijwy8hrvx66f0xabdj8w3007ky39"))))
+ (build-system gnu-build-system)
+ (inputs
+ (list boost clang-15 fmt `(,gcc "lib") gmp libelf libunwind llvm-15))
+ (native-inputs
+ (list binutils-gold ninja pkg-config sbcl))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (delete 'check)
+ (add-after 'unpack 'patch-koga
+ (lambda* _
+ (call-with-port (open-file "src/koga/units.lisp" "a")
+ (lambda (p)
+ (display "(defmethod configure-unit (c (u (eql :git))))\n" p)))))
+ (add-before 'configure 'set-configure-environment
+ (lambda* _
+ (setenv "SOURCE_DATE_EPOCH" "1")
+ (setenv "ASDF_OUTPUT_TRANSLATIONS"
+ (string-append (getenv "PWD")
+ ":"
+ (getenv "PWD")
+ "/__fasls"))))
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (clang (assoc-ref inputs "clang"))
+ (ld-flags
+ (string-join
+ (apply append
+ (map (lambda (f)
+ (list "-L" f "-rpath" f))
+ (string-split (getenv "LIBRARY_PATH") #\:)))
+ ",")))
+ (invoke "sbcl"
+ "--script"
+ "./koga"
+ "--skip-sync"
+ "--build-mode=bytecode-faso"
+ (string-append "--cc=" clang "/bin/clang")
+ (string-append "--cxx=" clang "/bin/clang++")
+ (string-append "--ldflags=-Wl," ld-flags)
+ "--reproducible-build"
+ "--package-path=/"
+ (string-append "--bin-path=" out "/bin")
+ (string-append "--lib-path=" out "/lib/clasp")
+ (string-append "--share-path=" out "/share/clasp")))))
+ (replace 'build
+ (lambda* _
+ (invoke "ninja" "-C" "build")))
+ (replace 'install
+ (lambda* _
+ (invoke "ninja" "-C" "build" "install"))))))
+ (home-page "https://clasp-developers.github.io/")
+ (synopsis "Common Lisp implementation based on LLVM and C++")
+ (description "Clasp is a new Common Lisp implementation that seamlessly
+ interoperates with C++ libraries and programs using LLVM for compilation to
+ native code. This allows Clasp to take advantage of a vast array of
+ preexisting libraries and programs, such as out of the scientific computing
+ ecosystem. Embedding them in a Common Lisp environment allows you to make use
+ of rapid prototyping, incremental development, and other capabilities that
+ make it a powerful language.")
+ (license license:lgpl2.1+)))
+
(define-public cl-asdf
(package
(name "cl-asdf")
- (version "3.3.5")
+ (version "3.3.7")
(source
(origin
(method url-fetch)
@@ -113,11 +460,11 @@
(string-append "https://common-lisp.net/project/asdf/archives/asdf-"
version ".lisp"))
(sha256
- (base32 "1mydyrii3f0aig1q5admj6hyf59vjn4a5x1q8hqgh483987ilz6h"))))
+ (base32 "12dirg0qaq2rk8s11z7nnw793l94ysqna9mbqy8a0cx6bqiqykl7"))))
(build-system trivial-build-system)
(native-inputs
`(("config-patch" ,@(search-patches "cl-asdf-config-directories.patch"))
- ("patch" ,patch)))
+ ("patch" ,patch/pinned)))
(arguments
`(#:modules ((guix build utils)
(guix build lisp-utils))
@@ -145,6 +492,276 @@ Definition Facility.")
;; MIT License
(license license:expat)))
+(define-public clisp
+ (package
+ (name "clisp")
+ (version "2.49-92")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/gnu-clisp/clisp")
+ (commit "clisp-2.49.92-2018-02-18")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list cl-asdf))
+ (inputs (list libffcall ncurses readline libsigsegv))
+ (arguments
+ `(#:configure-flags '(,@(if (string-prefix? "armhf-linux"
+ (or (%current-system)
+ (%current-target-system)))
+ '("CFLAGS=-falign-functions=4")
+ '())
+ ,@(if (target-x86-64?)
+ '("--enable-portability"
+ "--with-threads=POSIX_THREADS")
+ '())
+ "--with-dynamic-ffi"
+ "--with-dynamic-modules"
+ "--with-ffcall"
+ "--with-readline"
+ "--with-sigsegv"
+ "--with-module=asdf"
+ "--with-module=rawsock")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-sh-and-pwd
+ (lambda _
+ ;; The package is very messy with its references to "/bin/sh" and
+ ;; some other absolute paths to traditional tools. These appear in
+ ;; many places where our automatic patching misses them. Therefore
+ ;; we do the following, in this early (post-unpack) phase, to solve
+ ;; the problem from its root.
+ (substitute* '("src/clisp-link.in"
+ "src/unix.d"
+ "src/makemake.in")
+ (("/bin/sh") (which "sh")))
+ (substitute* (find-files "." "configure|Makefile")
+ (("/bin/sh") "sh"))
+ (substitute* '("src/clisp-link.in")
+ (("/bin/pwd") "pwd"))
+ #t))
+ (add-after 'unpack 'replace-asdf
+ ;; Use system ASDF instead of bundled one.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
+ (guix-asdf (string-append
+ cl-asdf
+ "/share/common-lisp/source/asdf/asdf.lisp"))
+ (contrib-asdf "modules/asdf/asdf.lisp"))
+ (delete-file contrib-asdf)
+ (copy-file guix-asdf contrib-asdf)))))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))
+ (search-path-specification
+ (variable "XDG_CONFIG_DIRS")
+ (files '("etc")))))
+ (home-page "https://clisp.sourceforge.io/")
+ (synopsis "Common Lisp implementation")
+ (description
+ "GNU CLISP is an implementation of ANSI Common Lisp. Common Lisp is a
+high-level, object-oriented functional programming language. CLISP includes
+an interpreter, a compiler, a debugger, and much more.")
+ (license license:gpl2+)))
+
+(define-public confusion-mdl
+ (let* ((commit "12a055581fc262225272df43287dae48281900f5"))
+ (package
+ (name "confusion-mdl")
+ (version "0.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url (string-append "https://gitlab.com/emacsomancer/" name))
+ (commit commit)))
+ (sha256
+ (base32
+ "1zi8kflzvwqg97ha1sa5xjisbjs5z1mvbpa772vfxiv5ksnpxp0d"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; there are no tests
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key (make-flags '()) #:allow-other-keys)
+ (apply invoke "make" "CC=gcc" make-flags)))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "mdli" bin)
+ #t))))))
+ (native-inputs
+ (list perl))
+ (inputs
+ (list libgc))
+ (synopsis "Interpreter for the MIT Design Language (MDL)")
+ (description "MDL (the MIT Design Language) is a descendant of Lisp. It
+was originally developed in 1971 on the PDP-10 computer under the Incompatible
+Timesharing System (ITS) to provide high level language support for the
+Dynamic Modeling Group at MIT's Project MAC. Infocom built the original
+PDP-10 Zork in MDL and their later ZIL (Zork Implementation Language) was
+based on a subset of MDL. Confusion is a MDL interpreter that works just well
+enough to play the original mainframe Zork all the way through.")
+ (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README")
+ (license license:gpl3+))))
+
+(define-public ecl
+ (package
+ (name "ecl")
+ (version "24.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ecl.common-lisp.dev/static/files/release/"
+ name "-" version ".tgz"))
+ (sha256
+ (base32 "0av2prf474cg0glr37fgsfb4w0dxfg38pykb72ay9q3132xnbsp4"))))
+ (build-system gnu-build-system)
+ ;; src/configure uses 'which' to confirm the existence of 'gzip'.
+ (native-inputs
+ (list cl-asdf which texinfo))
+ (inputs (list bash-minimal))
+ ;; When ECL is embedded in a program that wants to use Common Lisp as an
+ ;; extension language, libgmp, libatomic-ops, libgc and libffi must be
+ ;; present when compiling the program because they are required by ECL's
+ ;; header file.
+ ;; Therefore we put these libraries in 'propagated-inputs' instead
+ ;; of 'inputs'.
+ (propagated-inputs
+ (list gmp libatomic-ops libgc libffi))
+ (arguments
+ `(#:configure-flags '("--without-rt")
+ #:parallel-tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; FIXME: As of version 20.4.24, we pass 17995 tests and fail 7.
+ ;; 2-3 tests may be due to FHS assumptions.
+ (delete 'check)
+ (add-after 'unpack 'replace-asdf
+ ;; Use system ASDF instead of bundled one.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
+ (guix-asdf (string-append
+ cl-asdf
+ "/share/common-lisp/source/asdf/asdf.lisp"))
+ (contrib-asdf "contrib/asdf/asdf.lisp"))
+ (copy-file guix-asdf contrib-asdf))))
+ (add-after 'install 'remove-build-stamp
+ (lambda* (#:key outputs #:allow-other-keys)
+ (delete-file (string-append (assoc-ref outputs "out")
+ "/lib/ecl-" ,version "/build-stamp"))))
+ (add-after 'remove-build-stamp 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((ecl (assoc-ref outputs "out"))
+ (input-path (lambda (lib path)
+ (string-append
+ (assoc-ref inputs lib) path)))
+ (libraries '("gmp" "libatomic-ops" "libgc" "libffi" "libc"))
+ (binaries '("gcc" "ld-wrapper" "binutils"))
+ (library-directories
+ (map (lambda (lib) (input-path lib "/lib"))
+ libraries)))
+ (wrap-program (string-append ecl "/bin/ecl")
+ `("PATH" prefix
+ ,(map (lambda (binary)
+ (input-path binary "/bin"))
+ binaries))
+ `("CPATH" suffix
+ ,(map (lambda (lib)
+ (input-path lib "/include"))
+ `("kernel-headers" ,@libraries)))
+ `("LIBRARY_PATH" suffix ,library-directories)
+ `("LD_LIBRARY_PATH" suffix ,library-directories)))))
+ (add-after 'wrap 'check (assoc-ref %standard-phases 'check))
+ (add-before 'check 'fix-path-to-ecl
+ (lambda _
+ (substitute* "build/tests/Makefile"
+ (("\\$\\{exec_prefix\\}/") "")))))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))
+ (search-path-specification
+ (variable "XDG_CONFIG_DIRS")
+ (files '("etc")))))
+ (home-page "https://ecl.common-lisp.dev/")
+ (synopsis "Embeddable Common Lisp")
+ (supported-systems (delete "i586-gnu" %supported-systems))
+ (description "ECL is an implementation of the Common Lisp language as
+defined by the ANSI X3J13 specification. Its most relevant features are: a
+bytecode compiler and interpreter, being able to compile Common Lisp with any
+C/C++ compiler, being able to build standalone executables and libraries, and
+supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
+ ;; Note that the file "Copyright" points to some files and directories
+ ;; which aren't under the lgpl2.1+ and instead contain many different,
+ ;; non-copyleft licenses.
+ ;; See https://common-lisp.net/project/ecl/posts/ECL-license.html.
+ (license license:lgpl2.1+)))
+
+(define-public eisl
+ (package
+ (name "eisl")
+ (version "4.00")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sasagawa888/eisl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0bksy893hvhxn308h3vfj4k0pb7ryizn74lmcswxdk7jmyfccdx1"))))
+ (build-system gnu-build-system)
+ (inputs
+ (list bash-minimal freeglut gdbm libiconv ncurses tcl tk))
+ (native-inputs
+ (list cppcheck))
+ (arguments
+ (list #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "library/compiler.lsp"
+ (("\"cc ")
+ "\"gcc "))
+ (substitute* "library/tcltk.lsp"
+ (("include <tcl/tcl\\.h>")
+ "include <tcl.h>")
+ (("c-option \"-ltcl -ltk\" linux")
+ "c-option \"-ltcl8.6 -ltk8.6\" linux"))))
+ (delete 'configure)
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-program (string-append #$output "/bin/eisl")
+ `("PATH" prefix
+ ,(map (lambda (bin)
+ (string-append (assoc-ref inputs bin) "/bin"))
+ '("binutils" "coreutils" "gcc" "ld-wrapper")))
+ `("LIBRARY_PATH" suffix
+ ,(map (lambda (lib)
+ (string-append (assoc-ref inputs lib) "/lib"))
+ '("libc")))))))))
+ (home-page "https://github.com/sasagawa888/eisl")
+ (synopsis "Implementation of ISLisp")
+ (description "Easy ISLISP (eisl) is an implementation of ISLisp which
+includes a compiler as well as an interpreter.")
+ (license (list license:bsd-2 ;; documents/license.txt
+ license:expat ;; cii/LICENSE
+ license:gpl2+ ;; nana/gdb/test.c and others under nana/
+ license:bsd-3)))) ;; bench/*
+
(define-public gcl
(package
(name "gcl")
@@ -265,192 +882,487 @@ stratified garbage collection strategy, a source-level debugger and a built-in
interface to the Tk widget system.")
(license license:lgpl2.0+)))
-(define-public ecl
+(define-public janet
(package
- (name "ecl")
- (version "23.9.9")
+ (name "janet")
+ (version "1.35.2")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://ecl.common-lisp.dev/static/files/release/"
- name "-" version ".tgz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/janet-lang/janet")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "107q6gmxlsya4yv38r1x1axrgyyfgdrfkkz97zfp64bcrasdl6y5"))))
+ (base32 "0kgya9zv8xq6mbrkpllm29zfxkr626ip83ivqkgqfcs5a33b39wa"))))
(build-system gnu-build-system)
- ;; src/configure uses 'which' to confirm the existence of 'gzip'.
- (native-inputs
- (list cl-asdf which texinfo))
- (inputs (list bash-minimal))
- ;; When ECL is embedded in a program that wants to use Common Lisp as an
- ;; extension language, libgmp, libatomic-ops, libgc and libffi must be
- ;; present when compiling the program because they are required by ECL's
- ;; header file.
- ;; Therefore we put these libraries in 'propagated-inputs' instead
- ;; of 'inputs'.
- (propagated-inputs
- (list gmp libatomic-ops libgc libffi))
(arguments
- `(#:configure-flags '("--without-rt")
- #:parallel-tests? #f
+ (list #:make-flags
+ #~(list
+ (string-append "DESTDIR=" #$output)
+ (string-append "PREFIX=")
+ (string-append "CC=" #$(cc-for-target)))
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure))))
+ (home-page "https://janet-lang.org/")
+ (synopsis "Functional, imperative and embeddable programming language")
+ (description
+ "Janet is a functional and imperative programming language. It can be
+used for rapid prototyping, dynamic systems, and other domains where dynamic
+languages shine. You can also add Janet scripting to an application by
+embedding a single C file and two headers. It can be easily ported to new
+platforms. The entire language (core library, interpreter, compiler,
+assembler, PEG) is less than 1MB.")
+ (license license:expat)))
+
+(define-public lisp-repl-core-dumper
+ (package
+ (name "lisp-repl-core-dumper")
+ (version "0.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/ambrevar/lisp-repl-core-dumper.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04c12gi5izpkv8ha98z9qdkbmyrsq6ga060adrx53da8z31gnhk1"))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan
+ '(("lisp-repl-core-dumper" "bin/"))
#:phases
(modify-phases %standard-phases
- ;; FIXME: As of version 20.4.24, we pass 17995 tests and fail 7.
- ;; 2-3 tests may be due to FHS assumptions.
- (delete 'check)
- (add-after 'unpack 'replace-asdf
- ;; Use system ASDF instead of bundled one.
+ (add-before 'install 'fix-utils-path
(lambda* (#:key inputs #:allow-other-keys)
- (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
- (guix-asdf (string-append
- cl-asdf
- "/share/common-lisp/source/asdf/asdf.lisp"))
- (contrib-asdf "contrib/asdf/asdf.lisp"))
- (copy-file guix-asdf contrib-asdf))))
- (add-after 'install 'remove-build-stamp
- (lambda* (#:key outputs #:allow-other-keys)
- (delete-file (string-append (assoc-ref outputs "out")
- "/lib/ecl-" ,version "/build-stamp"))))
- (add-after 'remove-build-stamp 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((ecl (assoc-ref outputs "out"))
- (input-path (lambda (lib path)
- (string-append
- (assoc-ref inputs lib) path)))
- (libraries '("gmp" "libatomic-ops" "libgc" "libffi" "libc"))
- (binaries '("gcc" "ld-wrapper" "binutils"))
- (library-directories
- (map (lambda (lib) (input-path lib "/lib"))
- libraries)))
+ (let* ((cat (search-input-file inputs "/bin/cat"))
+ (paste (search-input-file inputs "/bin/paste"))
+ (sort (search-input-file inputs "/bin/sort"))
+ (basename (search-input-file inputs "/bin/basename"))
+ (sed (search-input-file inputs "/bin/sed")))
+ (substitute* "lisp-repl-core-dumper"
+ (("\\$\\(basename") (string-append "$(" basename))
+ (("\\<cat\\>") cat)
+ (("\\<paste\\>") paste)
+ (("\\<sed\\>") sed)
+ (("\\<sort\\>") sort))))))))
+ (inputs
+ `(("coreutils" ,coreutils-minimal)
+ ("sed" ,sed)))
+ (home-page "https://gitlab.com/ambrevar/lisp-repl-core-dumper")
+ (synopsis "Generate REPL-optimized Lisp cores on demand")
+ (description
+ "This tool generates Lisp images that can embed the provided systems
+and make for REPLs that start blazing fast.
- (wrap-program (string-append ecl "/bin/ecl")
- `("PATH" prefix
- ,(map (lambda (binary)
- (input-path binary "/bin"))
- binaries))
- `("CPATH" suffix
- ,(map (lambda (lib)
- (input-path lib "/include"))
- `("kernel-headers" ,@libraries)))
- `("LIBRARY_PATH" suffix ,library-directories)
- `("LD_LIBRARY_PATH" suffix ,library-directories)))))
- (add-after 'wrap 'check (assoc-ref %standard-phases 'check))
- (add-before 'check 'fix-path-to-ecl
- (lambda _
- (substitute* "build/tests/Makefile"
- (("\\$\\{exec_prefix\\}/") "")))))))
- (native-search-paths
- (list (search-path-specification
- (variable "XDG_DATA_DIRS")
- (files '("share")))
- (search-path-specification
- (variable "XDG_CONFIG_DIRS")
- (files '("etc")))))
- (home-page "https://ecl.common-lisp.dev/")
- (synopsis "Embeddable Common Lisp")
- (supported-systems (delete "i586-gnu" %supported-systems))
- (description "ECL is an implementation of the Common Lisp language as
-defined by the ANSI X3J13 specification. Its most relevant features are: a
-bytecode compiler and interpreter, being able to compile Common Lisp with any
-C/C++ compiler, being able to build standalone executables and libraries, and
-supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
- ;; Note that the file "Copyright" points to some files and directories
- ;; which aren't under the lgpl2.1+ and instead contain many different,
- ;; non-copyleft licenses.
- ;; See https://common-lisp.net/project/ecl/posts/ECL-license.html.
+@itemize
+@item It’s portable and should work with any compiler.
+@item It works for any REPL.
+@item It allows you to include arbitrary libraries.
+@end itemize\n")
+ (license license:gpl3+)))
+
+(define-public lush2
+ (package
+ (name "lush2")
+ (version "2.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/lush/lush2/lush-"
+ version ".tar.gz"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "src/unix.c"
+ (("\\{ \"LUSH_DATE\", __DATE__ \\},") "")
+ (("\\{ \"LUSH_TIME\", __TIME__ \\},") ""))
+ (substitute* "src/main.c"
+ (("\" \\(built \" __DATE__ \"\\)\"") ""))
+ #t))
+ (sha256
+ (base32
+ "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(;; We have to add these LIBS so that they are found.
+ #:configure-flags (list "LIBS=-lz"
+ "X_EXTRA_LIBS=-lfontconfig"
+ "--with-x")
+ #:tests? #f)) ; No make check.
+ (native-inputs (list intltool))
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("sdl" ,sdl)
+ ("sdl-image" ,sdl-image)
+ ("sdl-mixer" ,sdl-mixer)
+ ("sdl-net" ,sdl-net)
+ ("sdl-ttf" ,sdl-ttf)
+ ("libxft" ,libxft)
+ ("fontconfig" ,fontconfig)
+ ("gsl" ,gsl)
+ ("openblas" ,openblas)
+ ("glu" ,glu)
+ ("mesa" ,mesa)
+ ("mesa-utils" ,mesa-utils)
+ ("binutils" ,binutils)
+ ("libiberty" ,libiberty)
+ ("readline" ,readline)
+ ("zlib" ,zlib)
+ ("gettext-minimal" ,gettext-minimal)))
+ (synopsis "Lisp Universal Shell")
+ (description
+ "Lush is an object-oriented Lisp interpreter/compiler with features
+designed to please people who want to prototype large numerical
+applications. Lush includes an extensive library of
+vector/matrix/tensor manipulation, numerous numerical libraries
+(including GSL, LAPACK, and BLAS), a set of graphic functions, a
+simple GUI toolkit, and interfaces to various graphic and multimedia
+libraries such as OpenGL, SDL, Video4Linux, and ALSA (video/audio
+grabbing), and others. Lush is an ideal frontend script language for
+programming projects written in C or other languages. Lush also has
+libraries for Machine Learning, Neural Nets and statistical estimation.")
+ (home-page "https://lush.sourceforge.net/")
(license license:lgpl2.1+)))
-(define-public clisp
+(define picolisp32
(package
- (name "clisp")
- (version "2.49-92")
+ (name "picolisp32")
+ (version "19.12")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/gnu-clisp/clisp")
- (commit "clisp-2.49.92-2018-02-18")))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append "https://software-lab.de/picoLisp-" version ".tgz"))
(sha256
- (base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb"))))
+ (base32 "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Delete the pre-compiled jar file.
+ (delete-file "ersatz/picolisp.jar")
+ #t))))
(build-system gnu-build-system)
- (native-inputs
- (list cl-asdf))
- (inputs (list libffcall ncurses readline libsigsegv))
+ (inputs
+ `(("libxcrypt" ,libxcrypt)
+ ("openssl" ,openssl)))
(arguments
- `(#:configure-flags '(,@(if (string-prefix? "armhf-linux"
- (or (%current-system)
- (%current-target-system)))
- '("CFLAGS=-falign-functions=4")
- '())
- ,@(if (target-x86-64?)
- '("--enable-portability"
- "--with-threads=POSIX_THREADS")
- '())
- "--with-dynamic-ffi"
- "--with-dynamic-modules"
- "--with-ffcall"
- "--with-readline"
- "--with-sigsegv"
- "--with-module=asdf"
- "--with-module=rawsock")
+ `(#:system ,(match (%current-system)
+ ((or "armhf-linux" "aarch64-linux")
+ "armhf-linux")
+ (_
+ "i686-linux"))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-sh-and-pwd
+ (delete 'configure)
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (shebang-line (string-append
+ "#!" out "/bin/picolisp "
+ out "/lib/picolisp/lib.l")))
+ (substitute* '("bin/pil"
+ "bin/pilIndent"
+ "bin/pilPretty"
+ "bin/psh"
+ "bin/replica"
+ "bin/vip"
+ "bin/watchdog"
+ "games/xchess"
+ "misc/bigtest"
+ "misc/calc"
+ "misc/chat"
+ "misc/mailing"
+ "src/mkVers")
+ (("#\\!bin/picolisp lib.l")
+ shebang-line)
+ (("#\\!\\.\\./bin/picolisp \\.\\./lib.l")
+ shebang-line)
+ (("#\\!/usr/bin/picolisp /usr/lib/picolisp/lib.l")
+ shebang-line)))
+ #t))
+ (add-after 'fix-paths 'make-build-reproducible
(lambda _
- ;; The package is very messy with its references to "/bin/sh" and
- ;; some other absolute paths to traditional tools. These appear in
- ;; many places where our automatic patching misses them. Therefore
- ;; we do the following, in this early (post-unpack) phase, to solve
- ;; the problem from its root.
- (substitute* '("src/clisp-link.in"
- "src/unix.d"
- "src/makemake.in")
- (("/bin/sh") (which "sh")))
- (substitute* (find-files "." "configure|Makefile")
- (("/bin/sh") "sh"))
- (substitute* '("src/clisp-link.in")
- (("/bin/pwd") "pwd"))
+ (substitute* "src64/lib/asm.l"
+ (("\\(prinl \"/\\* \" \\(datSym \\(date\\)\\) \" \\*/\\)")
+ ""))
#t))
- (add-after 'unpack 'replace-asdf
- ;; Use system ASDF instead of bundled one.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
- (guix-asdf (string-append
- cl-asdf
- "/share/common-lisp/source/asdf/asdf.lisp"))
- (contrib-asdf "modules/asdf/asdf.lisp"))
- (delete-file contrib-asdf)
- (copy-file guix-asdf contrib-asdf)))))))
- (native-search-paths
- (list (search-path-specification
- (variable "XDG_DATA_DIRS")
- (files '("share")))
- (search-path-specification
- (variable "XDG_CONFIG_DIRS")
- (files '("etc")))))
- (home-page "https://clisp.sourceforge.io/")
- (synopsis "Common Lisp implementation")
+ (add-after 'make-build-reproducible 'fix-permissions
+ (lambda _
+ (for-each make-file-writable
+ '("doc/family.tgz"
+ "doc/family64.tgz"
+ "lib/map"
+ "src64/tags"))
+ #t))
+ (replace 'build
+ (lambda _
+ (invoke "make" "-C" "src" "picolisp" "tools" "gate")))
+ (add-before 'check 'set-home-for-tests
+ (lambda _
+ (setenv "HOME" "/tmp")
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "./pil" "test/lib.l" "-bye" "+")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (man (string-append out "/share/man"))
+ (picolisp (string-append out "/lib/picolisp")))
+ (copy-recursively "man" man)
+ (copy-recursively "." picolisp)
+ (for-each (lambda (name)
+ (let ((path (string-append picolisp "/" name)))
+ (delete-file-recursively path)))
+ '("CHANGES" "COPYING" "CREDITS" "cygwin"
+ "INSTALL" "man" "pil" "README" "src" "src64"
+ "test"))
+ (mkdir-p bin)
+ (symlink (string-append picolisp "/bin/picolisp")
+ (string-append bin "/picolisp"))
+ (symlink (string-append picolisp "/bin/pil")
+ (string-append bin "/pil")))
+ #t)))))
+ (synopsis "Interpreter for the PicoLisp programming language")
(description
- "GNU CLISP is an implementation of ANSI Common Lisp. Common Lisp is a
-high-level, object-oriented functional programming language. CLISP includes
-an interpreter, a compiler, a debugger, and much more.")
- (license license:gpl2+)))
+ "PicoLisp is a programming language, or really a programming system,
+including a built-in database engine and a GUI system.")
+ (home-page "https://picolisp.com/wiki/?home")
+ (license license:expat)))
+
+(define-public picolisp
+ (match (%current-system)
+ ((or "aarch64-linux" "x86_64-linux")
+ (package
+ ;; Use the 32-bit picolisp to generate the assembly files required by
+ ;; the 64-bit picolisp.
+ (inherit picolisp32)
+ (name "picolisp")
+ (native-inputs
+ (list picolisp32 which))
+ (arguments
+ (substitute-keyword-arguments (package-arguments picolisp32)
+ ((#:system _ "") (%current-system))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'fix-paths)
+ (add-before 'build 'fix-paths
+ ;; This must run after the other shebang-patching phases,
+ ;; or they will override our changes.
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((picolisp32 (assoc-ref inputs "picolisp32"))
+ (out (assoc-ref outputs "out"))
+ (shebang-line (string-append
+ "#!" out "/bin/picolisp "
+ out "/lib/picolisp/lib.l")))
+ (substitute* '("bin/pil"
+ "bin/pilIndent"
+ "bin/pilPretty"
+ "bin/psh"
+ "bin/replica"
+ "bin/vip"
+ "bin/watchdog"
+ "games/xchess"
+ "misc/bigtest"
+ "misc/calc"
+ "misc/chat"
+ "misc/mailing"
+ "src/mkVers")
+ (("#\\!.*picolisp32.*/bin/picolisp .*lib\\.l")
+ shebang-line))
+ (substitute* "src64/mkAsm"
+ (("/usr/bin/")
+ (string-append picolisp32 "/bin/"))))
+ #t))
+ (replace 'build
+ (lambda _
+ (invoke "make" "-C" "src" "tools" "gate")
+ (invoke "make" "-C" "src64" "CC=gcc" "picolisp")))))))))
+ (_
+ (package
+ (inherit picolisp32)
+ (name "picolisp")))))
+
+(define-public roswell
+ (package
+ (name "roswell")
+ (version "23.10.14.114")
+ (home-page "https://github.com/roswell/roswell")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/roswell/roswell")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05w5sjh1bfy2wnblc09cb9qs8h7hxkx5hcqlbgpn7md32b0m4h7g"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags #~(list (string-append "--prefix=" #$output))
+ #:tests? #f))
+ (native-inputs
+ (list autoconf automake intltool))
+ (inputs
+ (list curl))
+ (propagated-inputs
+ ;; Has to be propagated in order to be found during setup.
+ (list gnu-make patchelf))
+ (synopsis "Common Lisp implementation manager, launcher, and more")
+ (description
+ "Roswell started out as a command-line tool with the aim to make
+installing and managing Common Lisp implementations really simple and easy.
+Roswell has now evolved into a full-stack environment for Common Lisp
+development, and has many features that makes it easy to test, share, and
+distribute your Lisp applications.
+
+Roswell is still in beta. Despite this, the basic interfaces are stable and
+not likely to change.")
+ (license license:expat)))
+
+(define-public s7-bootstrap
+ ;; Need s7-bootstrap to build libc_s7.so (for the REPL) and run tests
+ (let ((commit "23a64facfac06c4bc23a7de8f04691c55f88bd40") ;no releases
+ (revision "0"))
+ (hidden-package
+ (package
+ (name "s7-bootstrap")
+ (version (git-version "24.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://cm-gitlab.stanford.edu/bil/s7.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0"))
+ (patches (search-patches "s7-flint-3.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no tests in bootstrap
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure
+ (replace 'build
+ (lambda _
+ ;; using build commands from s7 home page
+ (display "[BUILD] repl\n")
+ (invoke #$(cc-for-target) "s7.c" "-o" "repl"
+ "-I." "-O2" "-g"
+ "-DWITH_MAIN"
+ (string-append
+ "-DS7_LOAD_PATH=\""
+ #$output "/share/s7/scm\"")
+ "-ldl" "-lm"
+ "-Wl,-export-dynamic")
+ (display "[BUILD] nrepl\n")
+ (invoke #$(cc-for-target) "s7.c" "-o" "nrepl"
+ "-I." "-O2" "-g"
+ "-DWITH_MAIN" "-DWITH_NOTCURSES"
+ (string-append
+ "-DS7_LOAD_PATH=\""
+ #$output "/share/s7/scm\"")
+ "-ldl" "-lm" "-lnotcurses-core"
+ "-Wl,-export-dynamic")
+ (display "[BUILD] libarb_s7.so\n")
+ (invoke #$(cc-for-target) "libarb_s7.c"
+ "-I." "-O2" "-g"
+ "-shared" "-o" "libarb_s7.so"
+ "-lflint" "-lmpc" "-fPIC")
+ (display "[BUILD] libnotcurses_s7.so\n")
+ (invoke #$(cc-for-target) "notcurses_s7.c"
+ "-I." "-O2" "-g"
+ "-shared" "-o" "libnotcurses_s7.so"
+ "-lnotcurses-core" "-fPIC")
+ ;; Need s7.o and ffitest for tests
+ (display "[BUILD] s7.o\n")
+ (invoke #$(cc-for-target) "-c" "s7.c" "-o"
+ "s7.o" "-I." "-O2" "-ldl" "-lm")
+ (display "[BUILD] ffitest\n")
+ (invoke #$(cc-for-target) "-o" "ffitest"
+ "ffitest.c" "-g2" "s7.o" "-lm" "-I."
+ "-ldl" "-Wl,-export-dynamic")))
+ (add-before 'check 'install-scm
+ ;; scm files need to be installed before testing
+ (lambda _
+ (for-each (lambda (x)
+ (install-file
+ x (string-append
+ #$output "/share/s7/scm/")))
+ (find-files "." "\\.scm"))))
+ (replace 'install
+ (lambda _
+ (let ((bin (string-append #$output "/bin"))
+ (share (string-append #$output
+ "/share/s7/"))
+ (doc (string-append #$output
+ "/share/doc/s7/"))
+ (lib (string-append #$output "/lib"))
+ (inc (string-append #$output "/include/")))
+ (install-file "repl" bin)
+ (install-file "nrepl" bin)
+ (install-file "ffitest" bin)
+ (install-file "libarb_s7.so" lib)
+ (install-file "libnotcurses_s7.so" lib)
+ (install-file "s7.c" share)
+ (install-file "s7.h" inc)
+ (install-file "s7.html" doc)))))))
+ (inputs (list flint mpc notcurses))
+ (home-page "https://ccrma.stanford.edu/software/snd/snd/s7.html")
+ (synopsis "Scheme interpreter intended as an extension language")
+ (description
+ "s7 is a Scheme interpreter intended as an extension language for
+other applications. It exists as just two files, @code{s7.c} and @code{s7.h},
+that may be copied into the source tree of another application. There are no
+libraries, no run-time init files, and no configuration scripts. It can also
+be built as a stand-alone REPL interpreter.")
+ (license license:bsd-0)))))
+
+(define-public s7
+ (package
+ (inherit s7-bootstrap)
+ (name "s7")
+ (arguments
+ (substitute-keyword-arguments
+ (strip-keyword-arguments
+ '(#:tests?)
+ (package-arguments s7-bootstrap))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* "s7.c"
+ (("libc_s7.so")
+ (string-append #$output "/lib/libc_s7.so")))))
+ (add-after 'build 'build-full
+ (lambda _
+ (invoke "repl" "./libc.scm")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "repl" "./s7test.scm"))))
+ (add-after 'install 'install-full
+ (lambda _
+ (install-file "libc_s7.so"
+ (string-append #$output "/lib/"))
+ (delete-file (string-append #$output "/bin/ffitest"))))))))
+ (native-inputs (list s7-bootstrap))
+ (properties (alist-delete 'hidden? (package-properties s7-bootstrap)))))
(define-public sbcl
(package
(name "sbcl")
- (version "2.4.0")
+ (version "2.4.7")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
- (base32 "0xhpdnsg8idzxkn20iw8gd2rk470d7vc22vrp5clq9fj117vgn43"))
- ;; TODO: Remove these patches when updating to sbcl > 2.4.0.
- (patches (search-patches "sbcl-fix-ppc64-build.patch"
- "sbcl-fix-riscv-build.patch"))
+ (base32 "1lhia29g0byj7w3akd99sjb8kxp95adwqk2kbl0wsnk30cjlsm38"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -493,7 +1405,8 @@ an interpreter, a compiler, a debugger, and much more.")
(texlive-updmap.cfg (list texlive-texinfo))
which))
(inputs
- (list gmp ; for sb-gmp
+ (list bash-minimal
+ gmp ; for sb-gmp
mpfr ; for sb-mpfr
(list zstd "lib")))
(arguments
@@ -528,8 +1441,7 @@ an interpreter, a compiler, a debugger, and much more.")
cl-asdf
"/share/common-lisp/source/asdf/asdf.lisp"))
(contrib-asdf "contrib/asdf/asdf.lisp"))
- (copy-file guix-asdf contrib-asdf))
- #t))
+ (copy-file guix-asdf contrib-asdf))))
(add-before 'build 'patch-unix-tool-paths
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@@ -575,17 +1487,17 @@ an interpreter, a compiler, a debugger, and much more.")
(("\\(deftest pwent\\.[12]" all)
(string-append "#+nil ;disabled by Guix\n" all))
(("\\(deftest grent\\.[12]" all)
- (string-append "#+nil ;disabled by Guix\n" all))))
- #t))
+ (string-append "#+nil ;disabled by Guix\n" all))))))
(add-before 'build 'fix-contrib-library-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref inputs "gmp"))
(mpfr (assoc-ref inputs "mpfr")))
(substitute* '("contrib/sb-gmp/gmp.lisp")
- (("\"libgmp\\.so") (string-append "\"" gmp "/lib/libgmp.so")))
+ (("\"libgmp\\.so")
+ (string-append "\"" gmp "/lib/libgmp.so")))
(substitute* '("contrib/sb-mpfr/mpfr.lisp")
- (("\"libmpfr\\.so") (string-append "\"" mpfr "/lib/libmpfr.so"))))
- #t))
+ (("\"libmpfr\\.so")
+ (string-append "\"" mpfr "/lib/libmpfr.so"))))))
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc")
@@ -596,8 +1508,9 @@ an interpreter, a compiler, a debugger, and much more.")
`("clisp")))
(string-append "--prefix="
(assoc-ref outputs "out"))
- ,@(if (target-ppc32?)
- ;; 3072 is too much for this architecture.
+ ,@(if (or (target-ppc32?)
+ (target-x86-32?))
+ ;; 3072 is too much for these architectures.
`("--dynamic-space-size=2048")
`("--dynamic-space-size=3072"))
"--with-sb-core-compression"
@@ -631,8 +1544,7 @@ an interpreter, a compiler, a debugger, and much more.")
(lambda ()
(display
(string-append "(sb-ext:set-sbcl-source-location \""
- source-dir "\")") )))
- #t)))
+ source-dir "\")") ))))))
(add-after 'install 'remove-coreutils-references
;; They are only useful on non-Linux, non-SBCL.
(lambda* (#:key outputs #:allow-other-keys)
@@ -646,14 +1558,12 @@ an interpreter, a compiler, a debugger, and much more.")
"(\"/usr/bin/env\""))
(substitute* (string-append share-dir "contrib/asdf/uiop.lisp")
(("\\(\".*/usr/bin/env\"")
- "(\"/usr/bin/env\""))
- #t)))
+ "(\"/usr/bin/env\"")))))
(add-after 'install 'install-shared-library
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib-dir (string-append out "/lib")))
- (install-file "src/runtime/libsbcl.so" lib-dir)
- #t)))
+ (install-file "src/runtime/libsbcl.so" lib-dir))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -664,8 +1574,7 @@ an interpreter, a compiler, a debugger, and much more.")
(mkdir-p new-doc/sbcl-dir)
(copy-recursively (string-append old-doc-dir "/sbcl")
new-doc/sbcl-dir)
- (delete-file-recursively old-doc-dir)
- #t))))
+ (delete-file-recursively old-doc-dir)))))
;; No 'check' target, though "make.sh" (build phase) runs tests.
#:tests? #f))
(native-search-paths
@@ -687,264 +1596,6 @@ statistical profiler, a code coverage tool, and many other extensions.")
(license (list license:public-domain license:bsd-2
(license:x11-style "file://src/code/loop.lisp")))))
-(define-public ccl
- ;; Warning: according to upstream, CCL is not bootstrappable.
- ;; See https://github.com/Clozure/ccl/issues/222 from 2019-09-02:
- ;;
- ;; "As far as I know, there is no way to build CCL without an existing
- ;; running CCL image. It was bootstrapped back in 1986 or so as
- ;; Macintosh Common Lisp, by Gary Byers, I believe, who is no longer on
- ;; the planet to tell us the story. It SHOULD be possible to port the
- ;; CCL compiler to portable Common Lisp, so that ANY lisp could build
- ;; it, as is the case for SBCL, but I know of no attempt to do so."
- (package
- (name "ccl")
- ;; XXX When updating this package, check whether we can simply append
- ;; VERSION to the ccl-bootstrap URL again, instead of per architecture.
- (version "1.12.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Clozure/ccl/")
- (commit (string-append "v" version))))
- (file-name (git-file-name "ccl" version))
- (sha256
- (base32
- "1zz291lvsrr7pps8wfl2kdxsnzjngqi4v3mil14pga4r5zanmsi7"))))
- (build-system gnu-build-system)
- ;; CCL consists of a "lisp kernel" and "heap image", both of which are
- ;; shipped in precompiled form in source tarballs. The former is a C
- ;; program which we can rebuild from scratch, but the latter cannot be
- ;; generated without an already working copy of CCL, and is platform
- ;; dependent, so we need to fetch the correct tarball for the platform.
- (inputs
- `(("ccl-bootstrap"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/Clozure/ccl/releases/download/v"
- (match (%current-system)
- ("armhf-linux" "1.12/linuxarm")
- ;; XXX: This source only works on x86, but provide it as a
- ;; catch-all to prevent errors when querying this package
- ;; on unsupported platforms.
- (_ "1.12.1/linuxx86"))
- ".tar.gz"))
- (sha256
- (base32
- (match (%current-system)
- ("armhf-linux"
- "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c")
- (_ "0ll017ajcfsyx8f7zsy4394y8xxvz40iz0gcsmznp0n3mf0xi67c"))))))))
- (native-inputs
- (list cl-asdf m4))
- (arguments
- `(#:tests? #f ;no 'check' target
- #:modules ((ice-9 match)
- (srfi srfi-26)
- (guix build utils)
- (guix build gnu-build-system))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'unpack-image
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke "tar" "xzvf" (assoc-ref inputs "ccl-bootstrap"))))
- (add-after 'unpack 'replace-asdf
- ;; Use system ASDF instead of bundled one.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
- (guix-asdf (string-append
- cl-asdf
- "/share/common-lisp/source/asdf/asdf.lisp"))
- (contrib-asdf "tools/asdf.lisp"))
- (delete-file contrib-asdf)
- (copy-file guix-asdf contrib-asdf))))
- (delete 'configure)
- (add-before 'build 'pre-build
- ;; Enter the source directory for the current platform's lisp
- ;; kernel, and run 'make clean' to remove the precompiled one.
- (lambda* (#:key system #:allow-other-keys)
- (substitute* "lisp-kernel/m4macros.m4"
- (("/bin/pwd") (which "pwd")))
- (chdir (string-append
- "lisp-kernel/"
- (match system
- ("i686-linux" "linuxx8632")
- ("x86_64-linux" "linuxx8664")
- ("armhf-linux" "linuxarm")
- (_ (string-append "unknown system: " system)))))
- (substitute* '("Makefile")
- (("/bin/rm") "rm"))
- (setenv "CC" "gcc")
- (invoke "make" "clean")))
- ;; XXX Do we need to recompile the heap image as well for Guix?
- ;; For now just use the one we already got in the tarball.
- (replace 'install
- (lambda* (#:key outputs inputs system #:allow-other-keys)
- ;; The lisp kernel built by running 'make' in lisp-kernel/$system
- ;; is put back into the original directory, so go back. The heap
- ;; image is there as well.
- (chdir "../..")
- (let* ((out (assoc-ref outputs "out"))
- (libdir (string-append out "/lib/"))
- (bindir (string-append out "/bin/"))
- (wrapper (string-append bindir "ccl"))
- (bash (assoc-ref inputs "bash"))
- (kernel
- (match system
- ("i686-linux" "lx86cl")
- ("x86_64-linux" "lx86cl64")
- ("armhf-linux" "armcl")
- ;; Unlikely to work, but try it anyway...
- (_ system)))
- (heap (string-append kernel ".image")))
- (install-file kernel libdir)
- (install-file heap libdir)
-
- (let ((dirs `("lib" "library" "examples" "tools" "objc-bridge"
- ,@(match system
- ("x86_64-linux"
- '("x86-headers64"))
- ("i686-linux"
- '("x86-headers"))
- (_ '())))))
- (for-each copy-recursively
- dirs
- (map (cut string-append libdir <>) dirs)))
-
- (mkdir-p bindir)
- (with-output-to-file wrapper
- (lambda ()
- (display
- (string-append
- "#!" bash "/bin/sh\n"
- "export CCL_DEFAULT_DIRECTORY=" libdir "\n"
- "exec -a \"$0\" " libdir kernel " \"$@\"\n"))))
- (chmod wrapper #o755))
- #t)))))
- (native-search-paths
- (list (search-path-specification
- (variable "XDG_DATA_DIRS")
- (files '("share")))
- (search-path-specification
- (variable "XDG_CONFIG_DIRS")
- (files '("etc")))))
- (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
- (home-page "https://ccl.clozure.com/")
- (synopsis "Common Lisp implementation")
- (description "Clozure CL (often called CCL for short) is a Common Lisp
-implementation featuring fast compilation speed, native threads, a precise,
-generational, compacting garbage collector, and a convenient foreign-function
-interface.")
- (license license:asl2.0)))
-
-(define-public lush2
- (package
- (name "lush2")
- (version "2.0.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/lush/lush2/lush-"
- version ".tar.gz"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "src/unix.c"
- (("\\{ \"LUSH_DATE\", __DATE__ \\},") "")
- (("\\{ \"LUSH_TIME\", __TIME__ \\},") ""))
- (substitute* "src/main.c"
- (("\" \\(built \" __DATE__ \"\\)\"") ""))
- #t))
- (sha256
- (base32
- "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"))))
- (build-system gnu-build-system)
- (arguments
- `(;; We have to add these LIBS so that they are found.
- #:configure-flags (list "LIBS=-lz"
- "X_EXTRA_LIBS=-lfontconfig"
- "--with-x")
- #:tests? #f)) ; No make check.
- (native-inputs (list intltool))
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("sdl" ,sdl)
- ("sdl-image" ,sdl-image)
- ("sdl-mixer" ,sdl-mixer)
- ("sdl-net" ,sdl-net)
- ("sdl-ttf" ,sdl-ttf)
- ("libxft" ,libxft)
- ("fontconfig" ,fontconfig)
- ("gsl" ,gsl)
- ("openblas" ,openblas)
- ("glu" ,glu)
- ("mesa" ,mesa)
- ("mesa-utils" ,mesa-utils)
- ("binutils" ,binutils)
- ("libiberty" ,libiberty)
- ("readline" ,readline)
- ("zlib" ,zlib)
- ("gettext-minimal" ,gettext-minimal)))
- (synopsis "Lisp Universal Shell")
- (description
- "Lush is an object-oriented Lisp interpreter/compiler with features
-designed to please people who want to prototype large numerical
-applications. Lush includes an extensive library of
-vector/matrix/tensor manipulation, numerous numerical libraries
-(including GSL, LAPACK, and BLAS), a set of graphic functions, a
-simple GUI toolkit, and interfaces to various graphic and multimedia
-libraries such as OpenGL, SDL, Video4Linux, and ALSA (video/audio
-grabbing), and others. Lush is an ideal frontend script language for
-programming projects written in C or other languages. Lush also has
-libraries for Machine Learning, Neural Nets and statistical estimation.")
- (home-page "https://lush.sourceforge.net/")
- (license license:lgpl2.1+)))
-
-(define-public confusion-mdl
- (let* ((commit "12a055581fc262225272df43287dae48281900f5"))
- (package
- (name "confusion-mdl")
- (version "0.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url (string-append "https://gitlab.com/emacsomancer/" name))
- (commit commit)))
- (sha256
- (base32
- "1zi8kflzvwqg97ha1sa5xjisbjs5z1mvbpa772vfxiv5ksnpxp0d"))
- (file-name (git-file-name name version))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f ; there are no tests
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (replace 'build
- (lambda* (#:key (make-flags '()) #:allow-other-keys)
- (apply invoke "make" "CC=gcc" make-flags)))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "mdli" bin)
- #t))))))
- (native-inputs
- (list perl))
- (inputs
- (list libgc))
- (synopsis "Interpreter for the MIT Design Language (MDL)")
- (description "MDL (the MIT Design Language) is a descendant of Lisp. It
-was originally developed in 1971 on the PDP-10 computer under the Incompatible
-Timesharing System (ITS) to provide high level language support for the
-Dynamic Modeling Group at MIT's Project MAC. Infocom built the original
-PDP-10 Zork in MDL and their later ZIL (Zork Implementation Language) was
-based on a subset of MDL. Confusion is a MDL interpreter that works just well
-enough to play the original mainframe Zork all the way through.")
- (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README")
- (license license:gpl3+))))
-
(define man-for-txr
(let ((commit "dfbf19b9a96474b8c1bacac85e43605e5691ceb2")
;; Number of additional commits since the last tag (see the output of
@@ -1002,7 +1653,7 @@ the HTML documentation of TXR.")
(define-public txr
(package
(name "txr")
- (version "294")
+ (version "296")
(source
(origin
(method git-fetch)
@@ -1011,7 +1662,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0cd0ah6lzwszn4jjxrbwknhscdm6rgsprpiybzlikcckgcylpkdn"))))
+ (base32 "1b91s5kpsf62j9qdk352kh94knd9iykk64dvbrba09h3zryankyv"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -1068,6 +1719,7 @@ the HTML documentation of TXR.")
(inputs
(list bash-minimal
libffi
+ libxcrypt
zlib))
(synopsis "General-purpose, multi-paradigm programming language")
(description
@@ -1080,537 +1732,3 @@ command line, to data scanning and extracting scripts, to full application
development in a wide-range of areas.")
(home-page "https://www.nongnu.org/txr/")
(license license:bsd-2)))
-
-(define picolisp32
- (package
- (name "picolisp32")
- (version "19.12")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://software-lab.de/picoLisp-" version ".tgz"))
- (sha256
- (base32 "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Delete the pre-compiled jar file.
- (delete-file "ersatz/picolisp.jar")
- #t))))
- (build-system gnu-build-system)
- (inputs
- `(("openssl" ,openssl)))
- (arguments
- `(#:system ,(match (%current-system)
- ((or "armhf-linux" "aarch64-linux")
- "armhf-linux")
- (_
- "i686-linux"))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'fix-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (shebang-line (string-append
- "#!" out "/bin/picolisp "
- out "/lib/picolisp/lib.l")))
- (substitute* '("bin/pil"
- "bin/pilIndent"
- "bin/pilPretty"
- "bin/psh"
- "bin/replica"
- "bin/vip"
- "bin/watchdog"
- "games/xchess"
- "misc/bigtest"
- "misc/calc"
- "misc/chat"
- "misc/mailing"
- "src/mkVers")
- (("#\\!bin/picolisp lib.l")
- shebang-line)
- (("#\\!\\.\\./bin/picolisp \\.\\./lib.l")
- shebang-line)
- (("#\\!/usr/bin/picolisp /usr/lib/picolisp/lib.l")
- shebang-line)))
- #t))
- (add-after 'fix-paths 'make-build-reproducible
- (lambda _
- (substitute* "src64/lib/asm.l"
- (("\\(prinl \"/\\* \" \\(datSym \\(date\\)\\) \" \\*/\\)")
- ""))
- #t))
- (add-after 'make-build-reproducible 'fix-permissions
- (lambda _
- (for-each make-file-writable
- '("doc/family.tgz"
- "doc/family64.tgz"
- "lib/map"
- "src64/tags"))
- #t))
- (replace 'build
- (lambda _
- (invoke "make" "-C" "src" "picolisp" "tools" "gate")))
- (add-before 'check 'set-home-for-tests
- (lambda _
- (setenv "HOME" "/tmp")
- #t))
- (replace 'check
- (lambda _
- (invoke "./pil" "test/lib.l" "-bye" "+")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (man (string-append out "/share/man"))
- (picolisp (string-append out "/lib/picolisp")))
- (copy-recursively "man" man)
- (copy-recursively "." picolisp)
- (for-each (lambda (name)
- (let ((path (string-append picolisp "/" name)))
- (delete-file-recursively path)))
- '("CHANGES" "COPYING" "CREDITS" "cygwin"
- "INSTALL" "man" "pil" "README" "src" "src64"
- "test"))
- (mkdir-p bin)
- (symlink (string-append picolisp "/bin/picolisp")
- (string-append bin "/picolisp"))
- (symlink (string-append picolisp "/bin/pil")
- (string-append bin "/pil")))
- #t)))))
- (synopsis "Interpreter for the PicoLisp programming language")
- (description
- "PicoLisp is a programming language, or really a programming system,
-including a built-in database engine and a GUI system.")
- (home-page "https://picolisp.com/wiki/?home")
- (license license:expat)))
-
-(define-public picolisp
- (match (%current-system)
- ((or "aarch64-linux" "x86_64-linux")
- (package
- ;; Use the 32-bit picolisp to generate the assembly files required by
- ;; the 64-bit picolisp.
- (inherit picolisp32)
- (name "picolisp")
- (native-inputs
- (list picolisp32 which))
- (arguments
- (substitute-keyword-arguments (package-arguments picolisp32)
- ((#:system _ "") (%current-system))
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'fix-paths)
- (add-before 'build 'fix-paths
- ;; This must run after the other shebang-patching phases,
- ;; or they will override our changes.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((picolisp32 (assoc-ref inputs "picolisp32"))
- (out (assoc-ref outputs "out"))
- (shebang-line (string-append
- "#!" out "/bin/picolisp "
- out "/lib/picolisp/lib.l")))
- (substitute* '("bin/pil"
- "bin/pilIndent"
- "bin/pilPretty"
- "bin/psh"
- "bin/replica"
- "bin/vip"
- "bin/watchdog"
- "games/xchess"
- "misc/bigtest"
- "misc/calc"
- "misc/chat"
- "misc/mailing"
- "src/mkVers")
- (("#\\!.*picolisp32.*/bin/picolisp .*lib\\.l")
- shebang-line))
- (substitute* "src64/mkAsm"
- (("/usr/bin/")
- (string-append picolisp32 "/bin/"))))
- #t))
- (replace 'build
- (lambda _
- (invoke "make" "-C" "src" "tools" "gate")
- (invoke "make" "-C" "src64" "CC=gcc" "picolisp")))))))))
- (_
- (package
- (inherit picolisp32)
- (name "picolisp")))))
-
-(define-public janet
- (package
- (name "janet")
- (version "1.33.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/janet-lang/janet")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "16wgljca7hp29fz5p2dnvy2cbscjx4imf85rhjwc1jkgdjswjxli"))))
- (build-system gnu-build-system)
- (arguments
- (list #:make-flags
- #~(list
- (string-append "DESTDIR=" #$output)
- (string-append "PREFIX=")
- (string-append "CC=" #$(cc-for-target)))
- #:test-target "test"
- #:phases
- #~(modify-phases %standard-phases
- (delete 'configure))))
- (home-page "https://janet-lang.org/")
- (synopsis "Functional, imperative and embeddable programming language")
- (description
- "Janet is a functional and imperative programming language. It can be
-used for rapid prototyping, dynamic systems, and other domains where dynamic
-languages shine. You can also add Janet scripting to an application by
-embedding a single C file and two headers. It can be easily ported to new
-platforms. The entire language (core library, interpreter, compiler,
-assembler, PEG) is less than 1MB.")
- (license license:expat)))
-
-(define-public carp
- ;; Release 0.5.5 does not support GHC 9.2.
- (let ((commit "339722325ec607091f6035866ebedea2b69080fe")
- (revision "1"))
- (package
- (name "carp")
- (version (git-version "0.5.5" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/carp-lang/Carp")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0w0j3imi4270dsmrh96spsc9xllsk5rrh817l80q1nyay9p53xwd"))))
- (build-system haskell-build-system)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- ;; Carp looks inside the sources checkout to know where to
- ;; find its core libraries and other files.
- ;; Carp emits C code and tries to compile it with an external
- ;; C compiler. On Linux it defaults to Clang.
- (add-after 'install 'wrap-programs
- (lambda* (#:key inputs #:allow-other-keys)
- (define (wrap-carp-program program)
- (wrap-program (string-append
- #$output "/bin/" program)
- `("CARP_DIR" prefix
- (#$(package-source this-package)))
- `("PATH" prefix
- ,(list (dirname
- (search-input-file inputs "bin/clang"))
- (dirname
- (search-input-file inputs "bin/ld"))))
- `("C_INCLUDE_PATH" prefix
- ,(list (dirname
- (search-input-directory
- inputs "include/linux"))
- (dirname
- (search-input-file
- inputs "include/stdlib.h"))))))
-
- (for-each wrap-carp-program
- (list "carp"
- "carp-header-parse")))))))
- (inputs
- (list bash-minimal
- clang
- ghc-blaze-markup
- ghc-blaze-html
- ghc-split
- ghc-ansi-terminal
- ghc-cmark
- ghc-edit-distance
- ghc-hashable
- ghc-open-browser
- ghc-optparse-applicative))
- (native-inputs
- (list ghc-hunit))
- (home-page "https://carp-lang.org/")
- (synopsis "Statically typed Lisp without a garbage collector")
- (description
- "@code{carp} is a Lisp-like programming language that compiles to
-C. It features inferred static typing, macros, automatic memory
-management without a garbage collector, a REPL, and straightforward
-integration with code written in C.")
- (license license:asl2.0))))
-
-(define-public lisp-repl-core-dumper
- (package
- (name "lisp-repl-core-dumper")
- (version "0.8.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/ambrevar/lisp-repl-core-dumper.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "04c12gi5izpkv8ha98z9qdkbmyrsq6ga060adrx53da8z31gnhk1"))))
- (build-system copy-build-system)
- (arguments
- '(#:install-plan
- '(("lisp-repl-core-dumper" "bin/"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'install 'fix-utils-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((cat (search-input-file inputs "/bin/cat"))
- (paste (search-input-file inputs "/bin/paste"))
- (sort (search-input-file inputs "/bin/sort"))
- (basename (search-input-file inputs "/bin/basename"))
- (sed (search-input-file inputs "/bin/sed")))
- (substitute* "lisp-repl-core-dumper"
- (("\\$\\(basename") (string-append "$(" basename))
- (("\\<cat\\>") cat)
- (("\\<paste\\>") paste)
- (("\\<sed\\>") sed)
- (("\\<sort\\>") sort))))))))
- (inputs
- `(("coreutils" ,coreutils-minimal)
- ("sed" ,sed)))
- (home-page "https://gitlab.com/ambrevar/lisp-repl-core-dumper")
- (synopsis "Generate REPL-optimized Lisp cores on demand")
- (description
- "This tool generates Lisp images that can embed the provided systems
-and make for REPLs that start blazing fast.
-
-@itemize
-@item It’s portable and should work with any compiler.
-@item It works for any REPL.
-@item It allows you to include arbitrary libraries.
-@end itemize\n")
- (license license:gpl3+)))
-
-(define-public buildapp
- (package
- (name "buildapp")
- (version "1.5.6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xach/buildapp")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"))))
- (build-system gnu-build-system)
- (native-inputs
- (list sbcl))
- (arguments
- `(#:tests? #f
- #:make-flags
- (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
- #:strip-binaries? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'set-home
- (lambda _
- (setenv "HOME" "/tmp")
- #t))
- (add-before 'install 'create-target-directory
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((bin (string-append (assoc-ref outputs "out") "/bin")))
- (mkdir-p bin)
- #t))))))
- (home-page "https://www.xach.com/lisp/buildapp/")
- (synopsis "Makes easy to build application executables with SBCL")
- (description
- "Buildapp is an application for SBCL or CCL that configures and saves an
-executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
- (license license:bsd-2)))
-
-(define-public eisl
- (package
- (name "eisl")
- (version "3.50")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sasagawa888/eisl")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "18alxwpvkcjfm63bc5kp6nn8351fl0p0ccxc8j9a7nb3fmg4fvyb"))))
- (build-system gnu-build-system)
- (inputs
- (list bash-minimal freeglut gdbm libiconv ncurses tcl tk))
- (native-inputs
- (list cppcheck))
- (arguments
- (list #:make-flags
- #~(list (string-append "PREFIX=" #$output)
- (string-append "CC=" #$(cc-for-target)))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "library/compiler.lsp"
- (("\"cc ")
- "\"gcc "))
- (substitute* "library/tcltk.lsp"
- (("include <tcl/tcl\\.h>")
- "include <tcl.h>")
- (("c-option \"-ltcl -ltk\" linux")
- "c-option \"-ltcl8.6 -ltk8.6\" linux"))))
- (delete 'configure)
- (add-after 'install 'wrap
- (lambda* (#:key inputs #:allow-other-keys)
- (wrap-program (string-append #$output "/bin/eisl")
- `("PATH" prefix
- ,(map (lambda (bin)
- (string-append (assoc-ref inputs bin) "/bin"))
- '("binutils" "coreutils" "gcc" "ld-wrapper")))
- `("LIBRARY_PATH" suffix
- ,(map (lambda (lib)
- (string-append (assoc-ref inputs lib) "/lib"))
- '("libc")))))))))
- (home-page "https://github.com/sasagawa888/eisl")
- (synopsis "Implementation of ISLisp")
- (description "Easy ISLISP (eisl) is an implementation of ISLisp which
-includes a compiler as well as an interpreter.")
- (license (list license:bsd-2 ;; documents/license.txt
- license:expat ;; cii/LICENSE
- license:gpl2+ ;; nana/gdb/test.c and others under nana/
- license:bsd-3)))) ;; bench/*
-
-(define-public s7-bootstrap
- ;; Need s7-bootstrap to build libc_s7.so (for the REPL) and run tests
- (let ((commit "23a64facfac06c4bc23a7de8f04691c55f88bd40") ;no releases
- (revision "0"))
- (hidden-package
- (package
- (name "s7-bootstrap")
- (version (git-version "24.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://cm-gitlab.stanford.edu/bil/s7.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0"))
- (patches (search-patches "s7-flint-3.patch"))))
- (build-system gnu-build-system)
- (arguments
- (list #:tests? #f ;no tests in bootstrap
- #:phases #~(modify-phases %standard-phases
- (delete 'configure) ;no configure
- (replace 'build
- (lambda _
- ;; using build commands from s7 home page
- (display "[BUILD] repl\n")
- (invoke #$(cc-for-target) "s7.c" "-o" "repl"
- "-I." "-O2" "-g"
- "-DWITH_MAIN"
- (string-append
- "-DS7_LOAD_PATH=\""
- #$output "/share/s7/scm\"")
- "-ldl" "-lm"
- "-Wl,-export-dynamic")
- (display "[BUILD] nrepl\n")
- (invoke #$(cc-for-target) "s7.c" "-o" "nrepl"
- "-I." "-O2" "-g"
- "-DWITH_MAIN" "-DWITH_NOTCURSES"
- (string-append
- "-DS7_LOAD_PATH=\""
- #$output "/share/s7/scm\"")
- "-ldl" "-lm" "-lnotcurses-core"
- "-Wl,-export-dynamic")
- (display "[BUILD] libarb_s7.so\n")
- (invoke #$(cc-for-target) "libarb_s7.c"
- "-I." "-O2" "-g"
- "-shared" "-o" "libarb_s7.so"
- "-lflint" "-lmpc" "-fPIC")
- (display "[BUILD] libnotcurses_s7.so\n")
- (invoke #$(cc-for-target) "notcurses_s7.c"
- "-I." "-O2" "-g"
- "-shared" "-o" "libnotcurses_s7.so"
- "-lnotcurses-core" "-fPIC")
- ;; Need s7.o and ffitest for tests
- (display "[BUILD] s7.o\n")
- (invoke #$(cc-for-target) "-c" "s7.c" "-o"
- "s7.o" "-I." "-O2" "-ldl" "-lm")
- (display "[BUILD] ffitest\n")
- (invoke #$(cc-for-target) "-o" "ffitest"
- "ffitest.c" "-g2" "s7.o" "-lm" "-I."
- "-ldl" "-Wl,-export-dynamic")))
- (add-before 'check 'install-scm
- ;; scm files need to be installed before testing
- (lambda _
- (for-each (lambda (x)
- (install-file
- x (string-append
- #$output "/share/s7/scm/")))
- (find-files "." "\\.scm"))))
- (replace 'install
- (lambda _
- (let ((bin (string-append #$output "/bin"))
- (share (string-append #$output
- "/share/s7/"))
- (doc (string-append #$output
- "/share/doc/s7/"))
- (lib (string-append #$output "/lib"))
- (inc (string-append #$output "/include/")))
- (install-file "repl" bin)
- (install-file "nrepl" bin)
- (install-file "ffitest" bin)
- (install-file "libarb_s7.so" lib)
- (install-file "libnotcurses_s7.so" lib)
- (install-file "s7.c" share)
- (install-file "s7.h" inc)
- (install-file "s7.html" doc)))))))
- (inputs (list flint mpc notcurses))
- (home-page "https://ccrma.stanford.edu/software/snd/snd/s7.html")
- (synopsis "Scheme interpreter intended as an extension language")
- (description
- "s7 is a Scheme interpreter intended as an extension language for
-other applications. It exists as just two files, @code{s7.c} and @code{s7.h},
-that may be copied into the source tree of another application. There are no
-libraries, no run-time init files, and no configuration scripts. It can also
-be built as a stand-alone REPL interpreter.")
- (license license:bsd-0)))))
-
-(define-public s7
- (package
- (inherit s7-bootstrap)
- (name "s7")
- (arguments
- (substitute-keyword-arguments
- (strip-keyword-arguments
- '(#:tests?)
- (package-arguments s7-bootstrap))
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'patch
- (lambda _
- (substitute* "s7.c"
- (("libc_s7.so")
- (string-append #$output "/lib/libc_s7.so")))))
- (add-after 'build 'build-full
- (lambda _
- (invoke "repl" "./libc.scm")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "repl" "./s7test.scm"))))
- (add-after 'install 'install-full
- (lambda _
- (install-file "libc_s7.so"
- (string-append #$output "/lib/"))
- (delete-file (string-append #$output "/bin/ffitest"))))))))
- (native-inputs (list s7-bootstrap))
- (properties (alist-delete 'hidden? (package-properties s7-bootstrap)))))
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 8855e1ade3..fd2e815fe0 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@@ -17,11 +17,10 @@
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2024 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
@@ -51,6 +50,7 @@
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix memoization)
+ #:use-module (guix search-paths)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
@@ -60,6 +60,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages gcc)
#:use-module (gnu packages bootstrap) ;glibc-dynamic-linker
#:use-module (gnu packages check) ;python-lit
@@ -79,6 +80,8 @@
#:use-module (gnu packages vulkan)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:export (make-lld-wrapper
system->llvm-target))
@@ -108,8 +111,7 @@ as \"x86_64-linux\"."
(if (string-prefix? system-prefix system)
target
(matches rest ...)))
- ((_)
- (error "LLVM target arch for system is unknown" system)))))
+ ((_) #f))))
(matches ("aarch64" => "AArch64")
("armhf" => "ARM")
("mips64el" => "Mips")
@@ -377,6 +379,11 @@ until LLVM/Clang 14."
"add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\
ttest third-party/unittest)\n" line))))))
'())
+ ;; The build daemon goes OOM on i686-linux on this phase.
+ ,@(if (and (version>=? version "15")
+ (target-x86-32?))
+ '((delete 'make-dynamic-linker-cache))
+ '())
;; Awkwardly, multiple phases added after the same phase,
;; e.g. unpack, get applied in the reverse order. In other
;; words, adding 'change-directory last means it occurs
@@ -459,19 +466,7 @@ ttest third-party/unittest)\n" line))))))
#t)))))
;; Clang supports the same environment variables as GCC.
- (native-search-paths
- (list (search-path-specification
- (variable "C_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "CPLUS_INCLUDE_PATH")
- (files '("include/c++" "include")))
- (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64")))))
+ (native-search-paths %gcc-search-paths)
(home-page "https://clang.llvm.org")
(synopsis "C language family frontend for LLVM")
@@ -551,15 +546,19 @@ output), and Binutils.")
("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2")
("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky")
("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")
- ("18.1.4" . "1kddjysa6qj1qlb88a4m7lqni6922drgb37kj2hnspj9hrph891g")))
+ ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la")))
(define %llvm-patches
- '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
- ("15.0.7" . ("clang-15.0-libc-search-path.patch"))
- ("16.0.6" . ("clang-16.0-libc-search-path.patch"))
+ '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
+ "clang-runtime-14-glibc-2.36-compat.patch"
+ "clang-14-remove-crypt-interceptors.patch"))
+ ("15.0.7" . ("clang-15.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
+ ("16.0.6" . ("clang-16.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
("17.0.6" . ("clang-17.0-libc-search-path.patch"
"clang-17.0-link-dsymutil-latomic.patch"))
- ("18.1.4" . ("clang-18.0-libc-search-path.patch"
+ ("18.1.8" . ("clang-18.0-libc-search-path.patch"
"clang-17.0-link-dsymutil-latomic.patch"))))
(define (llvm-monorepo version)
@@ -587,15 +586,21 @@ output), and Binutils.")
;; These options are required for cross-compiling LLVM according
;; to <https://llvm.org/docs/HowToCrossCompileLLVM.html>.
#$@(if (%current-target-system)
- #~((string-append "-DLLVM_TABLEGEN="
+ (or (and=>
+ (system->llvm-target-arch)
+ (lambda (llvm-target-arch)
+ #~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
- #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
- (%current-target-system))
- #$(string-append "-DLLVM_TARGET_ARCH="
- (system->llvm-target-arch))
- #$(string-append "-DLLVM_TARGETS_TO_BUILD="
- (system->llvm-target)))
+ #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
+ (%current-target-system))
+ #$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch)
+ #$(string-append "-DLLVM_TARGETS_TO_BUILD="
+ (system->llvm-target)))))
+ (raise (condition
+ (&package-unsupported-target-error
+ (package this-package)
+ (target (%current-target-system))))))
'())
;; Note: sadly, the build system refuses the use of
;; -DBUILD_SHARED_LIBS=ON and the large static archives are needed to
@@ -647,15 +652,21 @@ of programming tools as well as libraries with equivalent functionality.")
;; These options are required for cross-compiling LLVM according
;; to <https://llvm.org/docs/HowToCrossCompileLLVM.html>.
#$@(if (%current-target-system)
- #~((string-append "-DLLVM_TABLEGEN="
- #+(file-append this-package
- "/bin/llvm-tblgen"))
- #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
- (%current-target-system))
- #$(string-append "-DLLVM_TARGET_ARCH="
- (system->llvm-target-arch))
- #$(string-append "-DLLVM_TARGETS_TO_BUILD="
- (system->llvm-target)))
+ (or (and=>
+ (system->llvm-target-arch)
+ (lambda (llvm-target-arch)
+ #~((string-append "-DLLVM_TABLEGEN="
+ #+(file-append this-package
+ "/bin/llvm-tblgen"))
+ #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
+ (%current-target-system))
+ #$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch)
+ #$(string-append "-DLLVM_TARGETS_TO_BUILD="
+ (system->llvm-target)))))
+ (raise (condition
+ (&package-unsupported-target-error
+ (package this-package)
+ (target (%current-target-system))))))
'())
;; undefined reference to `__atomic_fetch_add_8' in lib/libLLVMOrcJIT.so.14
#$@(if (target-ppc32?)
@@ -806,7 +817,9 @@ Library.")
(define-public clang-runtime-13
(clang-runtime-from-llvm
llvm-13
- "1z2xr9nn4mgc3hn9ark2k5y4wznpk47xppkp63bcbagr6589acvv"))
+ "1z2xr9nn4mgc3hn9ark2k5y4wznpk47xppkp63bcbagr6589acvv"
+ '("clang-runtime-13-glibc-2.36-compat.patch"
+ "clang-13-remove-crypt-interceptors.patch")))
(define-public clang-13
(clang-from-llvm llvm-13 clang-runtime-13
@@ -885,7 +898,8 @@ Library.")
(define-public clang-runtime-12
(clang-runtime-from-llvm
llvm-12
- "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"))
+ "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"
+ '("clang-runtime-13-glibc-2.36-compat.patch")))
(define-public clang-12
(clang-from-llvm llvm-12 clang-runtime-12
@@ -941,7 +955,8 @@ Library.")
(define-public clang-runtime-11
(clang-runtime-from-llvm
llvm-11
- "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy"))
+ "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy"
+ '("clang-runtime-13-glibc-2.36-compat.patch")))
(define-public clang-11
(clang-from-llvm llvm-11 clang-runtime-11
@@ -999,7 +1014,8 @@ Library.")
(define-public clang-runtime-10
(clang-runtime-from-llvm
llvm-10
- "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr"))
+ "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr"
+ '("clang-runtime-13-glibc-2.36-compat.patch")))
(define-public clang-10
(clang-from-llvm llvm-10 clang-runtime-10
@@ -1070,7 +1086,8 @@ Library.")
(clang-runtime-from-llvm
llvm-9
"0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"
- '("clang-runtime-9-libsanitizer-mode-field.patch")))
+ '("clang-runtime-9-libsanitizer-mode-field.patch"
+ "clang-runtime-9-glibc-2.36-compat.patch")))
(define-public clang-9
(clang-from-llvm llvm-9 clang-runtime-9
@@ -1115,7 +1132,8 @@ Library.")
(clang-runtime-from-llvm
llvm-8
"0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"
- '("clang-runtime-9-libsanitizer-mode-field.patch")))
+ '("clang-runtime-9-libsanitizer-mode-field.patch"
+ "clang-runtime-9-glibc-2.36-compat.patch")))
(define-public clang-8
(clang-from-llvm llvm-8 clang-runtime-8
@@ -1158,7 +1176,8 @@ Library.")
(clang-runtime-from-llvm
llvm-7
"1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"
- '("clang-runtime-9-libsanitizer-mode-field.patch")))
+ '("clang-runtime-9-libsanitizer-mode-field.patch"
+ "clang-runtime-9-glibc-2.36-compat.patch")))
(define-public clang-7
(clang-from-llvm llvm-7 clang-runtime-7
@@ -1200,7 +1219,8 @@ Library.")
(clang-runtime-from-llvm
llvm-6
"1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"
- '("clang-runtime-9-libsanitizer-mode-field.patch")))
+ '("clang-runtime-9-libsanitizer-mode-field.patch"
+ "clang-runtime-9-glibc-2.36-compat.patch")))
(define-public clang-6
(clang-from-llvm llvm-6 clang-runtime-6
@@ -1388,7 +1408,15 @@ Library.")
(package
(inherit llvm-15)
(version "16.0.6")
- (source (llvm-monorepo version))))
+ (source (llvm-monorepo version))
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm-15)
+ ;; The build daemon goes OOM on i686-linux on this phase.
+ ((#:phases phases #~'%standard-phases)
+ (if (target-x86-32?)
+ #~(modify-phases #$phases
+ (delete 'make-dynamic-linker-cache))
+ phases))))))
(define-public clang-runtime-16
(clang-runtime-from-llvm llvm-16))
@@ -1422,7 +1450,15 @@ Library.")
(package
(inherit llvm-15)
(version "17.0.6")
- (source (llvm-monorepo version))))
+ (source (llvm-monorepo version))
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm-15)
+ ;; The build daemon goes OOM on i686-linux on this phase.
+ ((#:phases phases #~'%standard-phases)
+ (if (target-x86-32?)
+ #~(modify-phases #$phases
+ (delete 'make-dynamic-linker-cache))
+ phases))))))
(define-public clang-runtime-17
(clang-runtime-from-llvm llvm-17))
@@ -1455,8 +1491,16 @@ Library.")
(define-public llvm-18
(package
(inherit llvm-15)
- (version "18.1.4")
- (source (llvm-monorepo version))))
+ (version "18.1.8")
+ (source (llvm-monorepo version))
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm-15)
+ ;; The build daemon goes OOM on i686-linux on this phase.
+ ((#:phases phases #~'%standard-phases)
+ (if (target-x86-32?)
+ #~(modify-phases #$phases
+ (delete 'make-dynamic-linker-cache))
+ phases))))))
(define-public clang-runtime-18
(clang-runtime-from-llvm llvm-18))
@@ -1471,7 +1515,7 @@ Library.")
(package-version llvm-18)))
(sha256
(base32
- "1rrf9x7n3hvzqqijfx8v8kxa2i39jdf7c164my8k6vzr7aa0dj1c")))))
+ "1wd7y1a0db4y51swlq6dmm9hrv8pvmv158yi9f10dlayv7y7g275")))))
(define-public libomp-18
(package
@@ -1905,10 +1949,11 @@ standard C++ library.")
(native-inputs
(list clang-6 llvm-6 libcxxabi-6))))
+;; WARNING: This package is a dependency of mesa.
(define-public libclc
(package
(name "libclc")
- (version (package-version llvm-15))
+ (version (package-version llvm-18))
(source (llvm-monorepo version))
(build-system cmake-build-system)
(arguments
@@ -1932,7 +1977,7 @@ standard C++ library.")
(propagated-inputs
(list spirv-llvm-translator spirv-tools))
(native-inputs
- (list clang-15 llvm-15 python))
+ (list clang-18 llvm-18 python))
(home-page "https://libclc.llvm.org")
(synopsis "Libraries for the OpenCL programming language")
(description
@@ -2236,180 +2281,155 @@ LLVM bitcode files.")
(properties `((hidden? . #t)
,@(package-properties llvm-13)))))
-(define %cling-version "0.9")
-
-(define llvm-cling ;LLVM 9 with approximately 10 patches for cling
- (let ((base llvm-9))
+(define llvm-cling
+ ;; To determine which version of LLVM a given release of Cling should use,
+ ;; consult the
+ ;; https://raw.githubusercontent.com/root-project/cling/master/LastKnownGoodLLVMSVNRevision.txt
+ ;; file.
+ (let ((base llvm-15)) ;for a DYLIB build
(package/inherit base
(name "llvm-cling")
+ (version "13-20240318-01")
(source
(origin
(inherit (package-source base))
(method git-fetch)
(uri (git-reference
- (url "http://root.cern/git/llvm.git")
- (commit (string-append "cling-v" %cling-version))))
- (file-name (git-file-name "llvm-cling" %cling-version))
+ (url "https://github.com/root-project/llvm-project")
+ (commit (string-append "cling-llvm" version))))
+ (file-name (git-file-name "llvm-cling" version))
(sha256
(base32
- "0y3iwv3c9152kybmdrwvadggjs163r25h7rmlxzr3hfpr463pnwf"))
- (modules '((guix build utils)))
- (snippet
- ;; The source is missing an include directive (see:
- ;; https://github.com/vgvassilev/cling/issues/219).
- '(substitute* "utils/benchmark/src/benchmark_register.h"
- (("^#include <vector>.*" all)
- (string-append all "#include <limits>\n"))))))
- (outputs '("out"))
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:configure-flags _ ''())
- '(list "-DLLVM_PARALLEL_LINK_JOBS=1" ;cater to smaller build machines
- ;; Only enable compiler support for the host architecture to
- ;; save on build time.
- "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
- "-DLLVM_INSTALL_UTILS=ON"
- "-DLLVM_ENABLE_RTTI=ON"
- "-DLLVM_ENABLE_FFI=ON"
- "-DLLVM_BUILD_LLVM_DYLIB=ON"
- "-DLLVM_LINK_LLVM_DYLIB=ON"))
- ((#:phases phases '%standard-phases)
- #~(modify-phases #$phases
- (delete 'shared-lib-workaround)
- (delete 'install-opt-viewer))))))))
+ "1zh6yp8px9hla7v9i67a6anbph140f8ixxbsz65aj7fizksjs1h3"))
+ (patches (search-patches "clang-cling-13-libc-search-path.patch")))))))
(define clang-cling-runtime
- (let ((base clang-runtime-9))
+ (let ((base clang-runtime-13))
(package/inherit base
(name "clang-cling-runtime")
+ (version (package-version llvm-cling))
+ (source (package-source llvm-cling))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-after 'install 'delete-static-libraries
- ;; This reduces the size from 22 MiB to 4 MiB.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each delete-file (find-files out "\\.a$")))))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'change-directory
+ (lambda _
+ (chdir "compiler-rt")))
+ (add-after 'install 'delete-static-libraries
+ ;; This reduces the size from 22 MiB to 4 MiB.
+ (lambda _
+ (for-each delete-file (find-files #$output "\\.a$"))))))))
(inputs (modify-inputs (package-inputs base)
(replace "llvm" llvm-cling))))))
-(define clang-cling ;modified clang 9 with ~ 60 patches for cling
- (let ((base clang-9))
+(define clang-cling
+ (let ((base clang-13))
(package/inherit base
(name "clang-cling")
- (source
- (origin
- (inherit (package-source base))
- (method git-fetch)
- (uri (git-reference
- (url "http://root.cern/git/clang.git")
- (commit (string-append "cling-v" %cling-version))))
- (file-name (git-file-name "clang-cling" %cling-version))
- (sha256
- (base32
- "128mxkwghss6589wvm6amzv183aq88rdrnfxjiyjcji5hx84vpby"))))
+ (version (package-version llvm-cling))
+ (source (package-source llvm-cling))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-after 'install 'delete-static-libraries
- ;; This reduces the size by half, from 220 MiB to 112 MiB.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each delete-file (find-files out "\\.a$")))))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'change-directory
+ (lambda _
+ (chdir "clang")))
+ (add-after 'install 'delete-static-libraries
+ ;; This reduces the size by half, from 220 MiB to 112 MiB.
+ (lambda _
+ (for-each delete-file (find-files #$output "\\.a$"))))))))
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "llvm" llvm-cling)
(replace "clang-runtime" clang-cling-runtime))))))
(define-public cling
- ;; The tagged v0.9 release doesn't build, so use the latest commit.
- (let ((commit "d78d1a03fedfd2bf6d2b6ff295aca576d98940df")
- (revision "1")
- (version* "0.9"))
- (package
- (name "cling")
- (version (git-version version* revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "http://root.cern/git/cling.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lsbxv21b4qw11xkw9iipdpca64jjwwqxm0qf5v2cgdlibf8m8n9"))
- ;; Patch submitted upstream here:
- ;; https://github.com/root-project/cling/pull/433.
- (patches (search-patches "cling-use-shared-library.patch"))))
- (build-system cmake-build-system)
- (arguments
- (list
- #:build-type "Release" ;keep the build as lean as possible
- #:tests? #f ;FIXME: 78 tests fail (out of ~200)
- #:test-target "check-cling"
- #:configure-flags
- #~(list (string-append "-DCLING_CXX_PATH="
- (search-input-file %build-inputs "bin/g++"))
- ;; XXX: The AddLLVM.cmake module expects LLVM_EXTERNAL_LIT to
- ;; be a Python script, not a shell executable.
- (string-append "-DLLVM_EXTERNAL_LIT="
- (search-input-file %build-inputs "bin/.lit-real")))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'set-version
- (lambda _
- (make-file-writable "VERSION")
- (call-with-output-file "VERSION"
- (lambda (port)
- (format port "~a~%" #$version)))))
- (add-after 'unpack 'patch-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "lib/Interpreter/CIFactory.cpp"
- (("\\bsed\\b")
- (which "sed"))
- ;; This ensures that the default C++ library used by Cling is
- ;; that of the compiler that was used to build it, rather
- ;; than that of whatever g++ happens to be on PATH.
- (("ReadCompilerIncludePaths\\(CLING_CXX_RLTV")
- (format #f "ReadCompilerIncludePaths(~s"
- (search-input-file inputs "bin/g++")))
- ;; Cling uses libclang's CompilerInvocation::GetResourcesPath
- ;; to resolve Clang's library prefix, but this fails on Guix
- ;; because it is relative to the output of cling rather than
- ;; clang (see:
- ;; https://github.com/root-project/cling/issues/434). Fully
- ;; shortcut the logic in this method to return the correct
- ;; static location.
- (("static std::string getResourceDir.*" all)
- (string-append all
- " return std::string(\""
- #$(this-package-input "clang-cling")
- "/lib/clang/" #$(package-version clang-cling)
- "\");")))
- ;; Check for the 'lit' command for the tests, not 'lit.py'
- ;; (see: https://github.com/root-project/cling/issues/432).
- (substitute* "CMakeLists.txt"
- (("lit.py")
- "lit"))))
- (add-after 'unpack 'adjust-lit.cfg
- ;; See: https://github.com/root-project/cling/issues/435.
- (lambda _
- (substitute* "test/lit.cfg"
- (("config.llvm_tools_dir \\+ '")
- "config.cling_obj_root + '/bin"))))
- (add-after 'install 'delete-static-libraries
- ;; This reduces the size from 17 MiB to 5.4 MiB.
- (lambda _
- (for-each delete-file (find-files #$output "\\.a$")))))))
- (native-inputs
- (list python python-lit))
- (inputs
- (list clang-cling llvm-cling))
- (home-page "https://root.cern/cling/")
- (synopsis "Interactive C++ interpreter")
- (description "Cling is an interactive C++17 standard compliant
+ (package
+ (name "cling")
+ (version "1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/root-project/cling")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17n66wf5yg1xjc94d6yb8g2gydjz0b8cj4a2pn6xrygdvhh09vv1"))
+ ;; Patch submitted upstream here:
+ ;; https://github.com/root-project/cling/pull/433.
+ (patches (search-patches "cling-use-shared-library.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:build-type "Release" ;keep the build as lean as possible
+ #:tests? #f ;FIXME: 78 tests fail (out of ~200)
+ #:test-target "check-cling"
+ #:configure-flags
+ #~(list (string-append "-DCLING_CXX_PATH="
+ (search-input-file %build-inputs "bin/g++"))
+ ;; XXX: The AddLLVM.cmake module expects LLVM_EXTERNAL_LIT to
+ ;; be a Python script, not a shell executable.
+ (string-append "-DLLVM_EXTERNAL_LIT="
+ (search-input-file %build-inputs "bin/.lit-real")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-version
+ (lambda _
+ (make-file-writable "VERSION")
+ (call-with-output-file "VERSION"
+ (lambda (port)
+ (format port "~a~%" #$version)))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "lib/Interpreter/CIFactory.cpp"
+ (("\\bsed\\b")
+ (which "sed"))
+ ;; This ensures that the default C++ library used by Cling is
+ ;; that of the compiler that was used to build it, rather
+ ;; than that of whatever g++ happens to be on PATH.
+ (("ReadCompilerIncludePaths\\(CLING_CXX_RLTV")
+ (format #f "ReadCompilerIncludePaths(~s"
+ (search-input-file inputs "bin/g++")))
+ ;; Cling uses libclang's CompilerInvocation::GetResourcesPath
+ ;; to resolve Clang's library prefix, but this fails on Guix
+ ;; because it is relative to the output of cling rather than
+ ;; clang (see:
+ ;; https://github.com/root-project/cling/issues/434). Fully
+ ;; shortcut the logic in this method to return the correct
+ ;; static location.
+ (("static std::string getResourceDir.*" all)
+ (string-append all
+ " return std::string(\""
+ #$(this-package-input "clang-cling")
+ "/lib/clang/"
+ #$(first
+ (take (string-split
+ (package-version clang-cling) #\-)
+ 1)) ".0.0" ;e.g. 13.0.0
+ "\");")))
+ ;; Check for the 'lit' command for the tests, not 'lit.py'
+ ;; (see: https://github.com/root-project/cling/issues/432).
+ (substitute* "CMakeLists.txt"
+ (("lit.py")
+ "lit"))))
+ (add-after 'unpack 'adjust-lit.cfg
+ ;; See: https://github.com/root-project/cling/issues/435.
+ (lambda _
+ (substitute* "test/lit.cfg"
+ (("config.llvm_tools_dir \\+ '")
+ "config.cling_obj_root + '/bin"))))
+ (add-after 'install 'delete-static-libraries
+ ;; This reduces the size from 17 MiB to 5.4 MiB.
+ (lambda _
+ (for-each delete-file (find-files #$output "\\.a$")))))))
+ (native-inputs (list python python-lit))
+ (inputs (list clang-cling llvm-cling libxcrypt))
+ (home-page "https://root.cern/cling/")
+ (synopsis "Interactive C++ interpreter")
+ (description "Cling is an interactive C++17 standard compliant
interpreter, built on top of LLVM and Clang. Cling can be used as a
read-eval-print loop (REPL) to assist with rapid application development.
Here's how to print @samp{\"Hello World!\"} using @command{cling}:
@@ -2417,4 +2437,4 @@ Here's how to print @samp{\"Hello World!\"} using @command{cling}:
@example
cling '#include <stdio.h>' 'printf(\"Hello World!\\n\");'
@end example")
- (license license:lgpl2.1+)))) ;for the combined work
+ (license license:lgpl2.1+))) ;for the combined work
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 7b17c0756b..074ab6a0aa 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -20,6 +20,9 @@
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Valter Nazianzeno <manipuladordedados@gmail.com>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2024 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,12 +51,19 @@
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages build-tools)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
@@ -65,11 +75,15 @@
#:use-module (gnu packages rdf)
#:use-module (gnu packages re2c)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages rsync)
+ #:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages version-control)
#:use-module (gnu packages vim)
+ #:use-module (gnu packages wget)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
- #:use-module (srfi srfi-1))
+ #:use-module ((srfi srfi-1) #:hide (zip)))
(define-public lua
(package
@@ -156,8 +170,8 @@ for configuration, scripting, and rapid prototyping.")
"lua51-pkgconfig.patch"))))))
(define-public luajit
- (let ((branch "2.1.0-beta3")
- (commit "6c4826f12c4d33b8b978004bc681eb1eef2be977"))
+ (let ((branch "v2.1")
+ (commit "04dca7911ea255f37be799c18d74c305b921c1a6"))
(package
(name "luajit")
(version (git-version branch "0" commit))
@@ -169,20 +183,13 @@ for configuration, scripting, and rapid prototyping.")
(file-name (git-file-name name version))
(sha256
(base32
- "1a002yh8v1i1q9w09494q0b8vsbmw3amn9jgfs5qnz7ba54jij0q"))))
+ "0srwk9nmiz8a93f70inq2597ff6xy203ckr4c0k7jcksdixymi9v"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; luajit is distributed without tests
#:phases
(modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'install 'create-luajit-symlink
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (with-directory-excursion bin
- (symlink ,(string-append name "-" branch)
- ,name))))))
+ (delete 'configure)) ; no configure script
#:make-flags (list (string-append "PREFIX="
(assoc-ref %outputs "out")))))
(home-page "https://www.luajit.org/")
@@ -905,6 +912,44 @@ on numbers.")
(define-public lua5.1-bitop
(make-lua-bitop "lua5.1-bitop" lua-5.1))
+(define-public lutok
+ (package
+ (name "lutok")
+ (version "0.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freebsd/lutok")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a2vc2wy5hasw69h1mz768ywx6c4ccl9jzzd4ixddwba3z3ha03b"))))
+ (build-system gnu-build-system)
+ ;; Disable the test suite to avoid a circular dependency on kyua.
+ (arguments (list #:tests? #f))
+ (native-inputs (list autoconf automake libtool pkg-config))
+ (inputs (list atf))
+ (propagated-inputs (list lua-5.2)) ;included in c_gate.hpp
+ (home-page "https://github.com/freebsd/lutok")
+ (synopsis "Lightweight C++ API for Lua")
+ (description "Lutok is a lightweight C++ API library for Lua.
+
+Lutok provides thin C++ wrappers around the Lua C API to ease the interaction
+between C++ and Lua. These wrappers make intensive use of @acronym{RAII,
+Resource Acquisition is Initialization} to prevent resource leakage, expose
+C++-friendly data types, report errors by means of exceptions and ensure that
+the Lua stack is always left untouched in the face of errors. The library
+also provides a small subset of miscellaneous utility functions built on top
+of the wrappers.
+
+Lutok focuses on providing a clean and safe C++ interface; the drawback is
+that it is not suitable for performance-critical environments. In order to
+implement error-safe C++ wrappers on top of a Lua C binary library, Lutok adds
+several layers or abstraction and error checking that go against the original
+spirit of the Lua C API and thus degrade performance.")
+ (license license:bsd-3)))
+
(define-public selene
(package
(name "selene")
@@ -1139,6 +1184,117 @@ signals to Linux processes.")
shell command executions.")
(license license:bsd-3)))
+(define-public (make-luarocks name lua)
+ (package
+ (name name)
+ (version "3.9.2")
+ (home-page "https://luarocks.org/")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://luarocks.org/releases/luarocks-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nsfp7cwqcxa8vmkcqkgi5wc0iax0j3gbdfd183kw81cq3nf99mw"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ;upstream has no tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'patch-bin-sh
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
+ "src/luarocks/core/sysdetect.lua")
+ (("/bin/sh")
+ (search-input-file inputs "/bin/sh")))))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "./configure"
+ (string-append "--prefix=" out)))))
+ (add-after 'install 'patch-unzip
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute*
+ (string-append
+ (assoc-ref outputs "out") "/etc/luarocks/config-"
+ ,(substring (package-version lua) 0 3) ".lua") ;e.g. "5.2"
+ (("variables = \\{")
+ (string-append
+ "variables = {\n"
+ " AR = \"" (search-input-file inputs "/bin/ar") "\";\n"
+ " BUNZIP2 = \"" (search-input-file inputs "/bin/bunzip2") "\";\n"
+ " CC = \"" (search-input-file inputs "/bin/gcc") "\";\n"
+ " CHMOD = \"" (search-input-file inputs "/bin/chmod") "\";\n"
+ " CP = \"" (search-input-file inputs "/bin/cp") "\";\n"
+ " CURL = \"" (search-input-file inputs "/bin/curl") "\";\n"
+ " FIND = \"" (search-input-file inputs "/bin/find") "\";\n"
+ " GIT = \"" (search-input-file inputs "/bin/git") "\";\n"
+ " GPG = \"" (search-input-file inputs "/bin/gpg") "\";\n"
+ " GUNZIP = \"" (search-input-file inputs "/bin/gunzip") "\";\n"
+ " HG = \"" (search-input-file inputs "/bin/hg") "\";\n"
+ " LD = \"" (search-input-file inputs "/bin/ld") "\";\n"
+ " LS = \"" (search-input-file inputs "/bin/ls") "\";\n"
+ " MAKE = \"" (search-input-file inputs "/bin/make") "\";\n"
+ " MD5SUM = \"" (search-input-file inputs "/bin/md5sum") "\";\n"
+ " MKDIR = \"" (search-input-file inputs "/bin/mkdir") "\";\n"
+ " MKTEMP = \"" (search-input-file inputs "/bin/mktemp") "\";\n"
+ " OPENSSL = \"" (search-input-file inputs "/bin/openssl") "\";\n"
+ " PWD = \"" (search-input-file inputs "/bin/pwd") "\";\n"
+ " RANLIB = \"" (search-input-file inputs "/bin/ranlib") "\";\n"
+ " RM = \"" (search-input-file inputs "/bin/rm") "\";\n"
+ " RMDIR = \"" (search-input-file inputs "/bin/rmdir") "\";\n"
+ " RSYNC = \"" (search-input-file inputs "/bin/rsync") "\";\n"
+ " SCP = \"" (search-input-file inputs "/bin/scp") "\";\n"
+ " TAR = \"" (search-input-file inputs "/bin/tar") "\";\n"
+ " TEST = \"" (search-input-file inputs "/bin/test") "\";\n"
+ " TOUCH = \"" (search-input-file inputs "/bin/touch") "\";\n"
+ " UNZIP = \"" (search-input-file inputs "/bin/unzip") " -n\";\n"
+ " WGET = \"" (search-input-file inputs "/bin/wget") "\";\n"
+ " ZIP = \"" (search-input-file inputs "/bin/zip") "\";"))))))))
+ (inputs (list lua
+ bash-minimal
+ ;; Executables required by luarocks.
+ binutils
+ bzip2
+ coreutils
+ curl
+ findutils
+ gcc
+ git
+ gnupg
+ gzip
+ gnu-make
+ mercurial
+ openssh
+ openssl
+ rsync
+ tar
+ unzip
+ wget
+ zip))
+ (native-inputs (list unzip))
+ (synopsis "Package manager for Lua modules")
+ (description
+ "LuaRocks is the package manager for the Lua programming
+language.
+
+It allows you to install Lua modules as self-contained packages called
+@url{https://luarocks.org/en/Types_of_rocks, @emph{rocks}}, which also contain
+version @url{https://luarocks.org/en/Dependencies, dependency} information.
+This information can be used both during installation, so that when one rock
+is requested all rocks it depends on are installed as well, and also
+optionally at run time, so that when a module is required, the correct version
+is loaded. LuaRocks supports both local and
+@url{http://luarocks.org/en/Rocks_repositories, remote} repositories, and
+multiple local rocks trees.")
+ (license license:expat)))
+
+(define-public lua5.2-luarocks
+ (make-luarocks "lua5.2-luarocks" lua-5.2))
+
+(define-public luarocks
+ (make-luarocks "luarocks" lua))
+
(define-public emilua
(package
(name "emilua")
@@ -1240,7 +1396,7 @@ enabled.")
(define-public fennel
(package
(name "fennel")
- (version "1.4.2")
+ (version "1.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1249,7 +1405,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/lxde.scm b/gnu/packages/lxde.scm
index 0291f50302..1a969eb4b5 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -372,26 +372,23 @@ with freedesktop.org standard.")
(substitute* '("mime-type/mime-type.c" "ptk/ptk-file-menu.c")
(("/usr(/local)?/share/mime") mime)))
#t)))
- (add-after 'patch-mime-dirs 'patch-setuid-progs
+ (add-after 'patch-mime-dirs 'patch-privileged-programs
(lambda _
- (let* ((su "/run/setuid-programs/su")
- (mount "/run/setuid-programs/mount")
- (umount "/run/setuid-programs/umount")
- (udevil "/run/setuid-programs/udevil"))
+ (let ((privileged (lambda (command)
+ (string-append "/run/privileged/bin/"
+ command))))
(with-directory-excursion "src"
(substitute* '("settings.c" "settings.h" "vfs/vfs-file-task.c"
"vfs/vfs-volume-hal.c" "../data/ui/prefdlg.ui"
"../data/ui/prefdlg2.ui")
- (("(/usr)?/bin/su") su)
- (("/(bin|sbin)/mount") mount)
- (("/(bin|sbin)/umount") umount)
- (("/usr/bin/udevil") udevil)))
+ (("(/usr)?/s?bin/(mount|umount|su|udevil)" _ _ command)
+ (privileged command))))
#t)))
- (add-after 'patch-setuid-progs 'patch-spacefm-conf
+ (add-after 'patch-privileged-programs 'patch-spacefm.conf
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "etc/spacefm.conf"
(("#terminal_su=/bin/su")
- "terminal_su=/run/setuid-programs/su")
+ "terminal_su=/run/privileged/bin/su")
(("#graphical_su=/usr/bin/gksu")
(string-append "graphical_su="
(search-input-file inputs "/bin/ktsuss")))))))
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index f0ae01614e..ae6da00142 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.
;;;
@@ -39,6 +40,7 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages compton)
@@ -227,7 +229,7 @@ applications.")
"DESTINATION \"share/polkit-1/actions"))
#t)))))
(inputs
- (list kwindowsystem
+ (list kwindowsystem-5
libqtxdg
libxscrnsaver
polkit-qt
@@ -280,7 +282,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 +317,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 +356,7 @@ the operating system LXQt is running on.")
(build-system cmake-build-system)
(inputs
(list eudev
- kwindowsystem
+ kwindowsystem-5
liblxqt
libqtxdg
libxcursor
@@ -362,7 +364,7 @@ the operating system LXQt is running on.")
qtbase-5
qtsvg-5
qtx11extras
- solid
+ solid-5
xf86-input-libinput
xkeyboard-config
zlib))
@@ -371,7 +373,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 +406,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 +435,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 +463,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 +510,7 @@ of other programs.")
qtbase-5
qtsvg-5
qtx11extras
- solid
+ solid-5
xcb-util
xcb-util-image
xkeyboard-config))
@@ -517,7 +519,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 +550,7 @@ of other programs.")
(base32 "051lb4kx29rx3ls3whlrbi83r9z9pdiqwyb1wbni56aqilv0svh0"))))
(build-system cmake-build-system)
(inputs
- (list kwindowsystem
+ (list kwindowsystem-5
liblxqt
libqtxdg
pcre
@@ -578,15 +580,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 +649,7 @@ Qt with LXQt.")
(base32 "1916cl12v09x4iqrgvp2dwchy50wa97a0y68q4rdigarpdrp3x7j"))))
(build-system cmake-build-system)
(inputs
- (list kwindowsystem
+ (list kwindowsystem-5
liblxqt
libqtxdg
lxqt-globalkeys
@@ -678,8 +680,9 @@ allows for launching applications or shutting down the system.")
(base32 "0xa5nqiq9mxwfynnw91i4c2cgpmpapl4nxys084nbs7yd88kbm2l"))))
(build-system cmake-build-system)
(inputs
- (list eudev
- kwindowsystem
+ (list bash-minimal
+ eudev
+ kwindowsystem-5
liblxqt
qtxdg-tools
procps
@@ -736,7 +739,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 +967,7 @@ window manager OpenBox.")
(base32 "126zkj9jvjwxrh2fcm9h0c2iq9m5rm5hbkh155swijn2i8airxgx"))))
(build-system cmake-build-system)
(inputs
- (list kwindowsystem
+ (list kwindowsystem-5
libxrender
liblxqt
libqtxdg
@@ -1040,7 +1043,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 +1099,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 4e54ca3350..f51b31c4ba 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>
@@ -27,6 +27,7 @@
;;; Copyright © 2024 David Pflug <david@pflug.io>
;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,7 @@
#:use-module (guix download)
#:use-module (guix svn-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system ocaml)
#:use-module (guix build-system pyproject)
@@ -90,6 +92,7 @@
#:use-module (gnu packages image-processing)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages jupyter)
+ #:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -102,6 +105,7 @@
#:use-module (gnu packages parallel)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
@@ -120,6 +124,7 @@
#:use-module (gnu packages swig)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages valgrind)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
@@ -150,6 +155,26 @@
representations and sentence classification.")
(license license:expat)))
+(define-public python-autograd-gamma
+ (package
+ (name "python-autograd-gamma")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "autograd-gamma" version))
+ (sha256
+ (base32 "1i699a9m5ndnj8cwzjjf2agb77aawhzrzxfbmn5zrkxridxvnypj"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-autograd python-scipy))
+ (home-page "https://github.com/CamDavidsonPilon/autograd-gamma")
+ (synopsis
+ "Autograd-compatible approximations to the gamma family of functions")
+ (description
+ "This package provides Autograd-compatible approximations to the gamma
+family of functions.")
+ (license license:expat)))
+
(define-public python-fasttext
(package
(inherit fasttext)
@@ -359,10 +384,10 @@ Learning usecases.")
"07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z"))))
(build-system gnu-build-system)
(arguments
- `(#:imported-modules (,@%gnu-build-system-modules
+ `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
#:modules ((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-dir
@@ -524,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 "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc")
- (revision "1"))
+ (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95")
+ (revision "3"))
(package
(name "llama-cpp")
(version (git-version "0.0.0" revision commit))
@@ -537,19 +562,27 @@ Performance is achieved by using the LLVM JIT compiler.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1ag1jash84hasz10h0piw72a8ginm8kzvhihbzzljz96gq2kjm88"))))
+ (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)
@@ -559,6 +592,14 @@ Performance is achieved by using the LLVM JIT compiler.")
(guix build python-build-system))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-unrunable-tests
+ ;; test-eval-callback downloads ML model from network, cannot
+ ;; run in Guix build environment
+ (lambda _
+ (substitute* '("examples/eval-callback/CMakeLists.txt")
+ (("add_test") "#add_test"))
+ (substitute* '("examples/eval-callback/CMakeLists.txt")
+ (("set_property") "#set_property"))))
(add-before 'install 'install-python-scripts
(lambda _
(let ((bin (string-append #$output "/bin/")))
@@ -576,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))
- (replace 'install
+ (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
@@ -1456,11 +1497,12 @@ with a single function call.")
(license license:expat)))
(define-public onnx-optimizer-for-torch2
- (package
- (inherit onnx-optimizer)
- (inputs
- (modify-inputs (package-inputs onnx-optimizer)
- (replace "onnx" onnx-for-torch2)))))
+ (hidden-package
+ (package
+ (inherit onnx-optimizer)
+ (inputs
+ (modify-inputs (package-inputs onnx-optimizer)
+ (replace "onnx" onnx-for-torch2))))))
(define-public rxcpp
(package
@@ -1680,7 +1722,7 @@ computing environments.")
(define-public python-scikit-learn
(package
(name "python-scikit-learn")
- (version "1.3.2")
+ (version "1.4.2")
(source
(origin
(method git-fetch)
@@ -1690,7 +1732,7 @@ computing environments.")
(file-name (git-file-name name version))
(sha256
(base32
- "1hr024vcilbjwlwn32ppadri0ypnzjmkfxhkkw8gih0qjvcvjbs7"))))
+ "0pdd508c9540x9qimq83b8kspb6mb98w7w7i7lnb1jqj7rijal6f"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1700,7 +1742,8 @@ computing environments.")
;; This test tries to access the internet.
"not test_load_boston_alternative"
;; DID NOT RAISE <class 'ValueError'>
- " and not test_singular_matrix"))
+ " and not test_check_pandas_sparse_invalid"
+ ))
#:phases
'(modify-phases %standard-phases
(add-before 'build 'configure
@@ -1726,7 +1769,7 @@ computing environments.")
test-flags))))))))
(inputs (list openblas))
(native-inputs
- (list python-cython-0.29.35
+ (list python-cython-3
python-pandas
python-pytest
python-pytest-xdist))
@@ -1761,26 +1804,30 @@ data analysis.")
#:test-flags
;; ignore tests that require network
'(list "--pyargs" "sklearn_extra"
- "-k" "not test_build")
+ "-k" (string-append "not test_build"
+ ;; The error message format has changed,
+ ;; but the behavior itself is still the
+ ;; same.
+ " and not test_parameter_validation"))
#:phases
- #~(modify-phases %standard-phases
- (add-after 'build 'build-ext
- (lambda _
- (invoke "python" "setup.py" "build_ext"
- "--inplace")))
- (replace 'check
- (lambda* (#:key tests? test-flags #:allow-other-keys)
- (when tests?
- ;; Restrict OpenBLAS threads to prevent segfaults while testing!
- (setenv "OPENBLAS_NUM_THREADS" "1")
-
- ;; Some tests require write access to $HOME.
- (setenv "HOME" "/tmp")
-
- ;; Step out of the source directory to avoid interference;
- ;; we want to run the installed code with extensions etc.
- (with-directory-excursion "/tmp"
- (apply invoke "pytest" "-vv" test-flags))))))))
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-ext
+ (lambda _
+ (invoke "python" "setup.py" "build_ext"
+ "--inplace")))
+ (replace 'check
+ (lambda* (#:key tests? test-flags #:allow-other-keys)
+ (when tests?
+ ;; Restrict OpenBLAS threads to prevent segfaults while testing!
+ (setenv "OPENBLAS_NUM_THREADS" "1")
+
+ ;; Some tests require write access to $HOME.
+ (setenv "HOME" "/tmp")
+
+ ;; Step out of the source directory to avoid interference;
+ ;; we want to run the installed code with extensions etc.
+ (with-directory-excursion "/tmp"
+ (apply invoke "pytest" "-vv" test-flags))))))))
(propagated-inputs
(list python-numpy
python-scikit-learn
@@ -1883,13 +1930,13 @@ for scientific computing and data science (e.g. BLAS and OpenMP).")
(define-public python-imbalanced-learn
(package
(name "python-imbalanced-learn")
- (version "0.11.0")
+ (version "0.12.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "imbalanced-learn" version))
(sha256
- (base32 "1p4gdgc8nsq0vjmw4y4d2bp9g0m1c23d0zgrzs90pnz6b24ax0km"))))
+ (base32 "1hgncab4g4xry7yl6wwsj1wmfnxbsajx6qmycvr28wdhvk75c358"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1910,7 +1957,6 @@ for scientific computing and data science (e.g. BLAS and OpenMP).")
python-flake8
python-keras
python-mypy
- python-numpydoc
python-pandas
python-pytest
python-pytest-cov
@@ -2054,7 +2100,7 @@ standard feature selection algorithms.")
(define-public python-cleanlab
(package
(name "python-cleanlab")
- (version "2.2.0")
+ (version "2.6.3")
;; The version on pypi does not come with tests.
(source (origin
(method git-fetch)
@@ -2064,7 +2110,7 @@ standard feature selection algorithms.")
(file-name (git-file-name name version))
(sha256
(base32
- "00dqhxpwg781skknw943ynll2s44g4j125dx8aapk1d5d71sbzqy"))))
+ "1f5iq4f8rzvn8scrwgfvc9qaqs9h159wiiy7wp6526frr67xk918"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2074,8 +2120,16 @@ standard feature selection algorithms.")
'(list "-k" "not test_aux_inputs"
;; Requires Tensorflow
"--ignore=tests/test_frameworks.py"
+ ;; These need datasets, which needs jax, so it could only live in
+ ;; the guix-science channel.
+ "--ignore-glob=tests/datalab/**"
;; Tries to download datasets from the internet at runtime.
- "--ignore=tests/test_dataset.py")))
+ "--ignore=tests/test_dataset.py")
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'remove-datasets
+ (lambda _
+ (delete-file "tests/datalab/conftest.py"))))))
(propagated-inputs
(list python-numpy
python-pandas
@@ -2123,13 +2177,13 @@ data by providing clean labels during training.")
(define-public python-cma
(package
(name "python-cma")
- (version "3.3.0")
+ (version "3.4.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "cma" version))
(sha256
(base32
- "1v31b2vnnr4v6ack7zfmw7zb47vbzjr9nyvx2lbfhyjf7zhbhj5p"))))
+ "0v0gs46n4ividm9viml09sllxw2cymxlp8nm2lvvwwcqp5lxksx1"))))
(build-system python-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
@@ -2342,13 +2396,13 @@ discrete, and conditional dimensions.")
(define-public python-deepxde
(package
(name "python-deepxde")
- (version "1.11.0")
+ (version "1.12.1")
(source (origin
(method url-fetch)
- (uri (pypi-uri "DeepXDE" version))
+ (uri (pypi-uri "deepxde" version))
(sha256
(base32
- "0qx6iq8n2j8ab80bs2n85v8g6xi2bnq83vfiaj7a4nsmf62rhkzg"))))
+ "1i7ibj968hxgqhv1jzkk5sph1608bkz147jmz0v943m9rqvscw10"))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #f ; there are no tests
@@ -3346,7 +3400,7 @@ advanced research.")
(string-append "-DEigen3_DIR=" #$(this-package-input "eigen")
"/share/eigen3/cmake")
(string-append "-DFlatBuffers_DIR="
- #$(this-package-input "flatbuffers-shared")
+ #$(this-package-input "flatbuffers")
"/lib/cmake/flatbuffers")
(string-append "-DNEON_2_SSE_DIR=" #$(this-package-input "neon2sse")
"/lib/cmake/NEON_2_SSE")
@@ -3433,7 +3487,7 @@ advanced research.")
("cpuinfo" ,cpuinfo)
("eigen" ,eigen)
("fp16" ,fp16)
- ("flatbuffers-shared" ,flatbuffers-next-shared)
+ ("flatbuffers" ,flatbuffers-23.1)
("gemmlowp" ,gemmlowp)
("mesa-headers" ,mesa-headers)
("neon2sse" ,neon2sse)
@@ -3810,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
@@ -3913,7 +3967,7 @@ methodxs at scale on CPU or GPU.")
(define-public python-umap-learn
(package
(name "python-umap-learn")
- (version "0.5.5")
+ (version "0.5.6")
(source
(origin
(method git-fetch) ;no tests in pypi release
@@ -3923,10 +3977,14 @@ methodxs at scale on CPU or GPU.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ijyiaqycynwj1383cxp519c765gjbg1f6fjwbvqj1gims710w3d"))))
+ "0rb0nx0zwi5gddiqil20ssqwb45a8w9fk65bnam001kp7vqjb9ky"))))
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags
+ ;; XXX: this one fails with unusually large deviation from the expected
+ ;; result.
+ '(list "-k" "not test_umap_update_large")
#:phases
#~(modify-phases %standard-phases
;; Numba needs a writable dir to cache functions.
@@ -3948,10 +4006,11 @@ reduction technique that can be used for visualization similarly to t-SNE, but
also for general non-linear dimension reduction.")
(license license:bsd-3)))
+;; Requires AVX2 on x86_64-linux.
(define-public nnpack
(let ((version "0.0")
- (commit "c07e3a0400713d546e0dea2d5466dd22ea389c73")
- (revision "1"))
+ (commit "70a77f485e8b934224f3a79efd8edcd84cd377b8")
+ (revision "2"))
(package
(name "nnpack")
(version (git-version version revision commit))
@@ -3962,19 +4021,11 @@ also for general non-linear dimension reduction.")
(file-name (git-file-name name version))
(sha256
(base32
- "0s0kk3a35w3yzf0q447p72350sbsh4qhg6vm3y2djbj4xpg7jc8v"))
+ "0c4pw926279s3rlx7mg4l4vhnfy6dh374n6w7zqhcn0bxpym1hv1"))
(patches (search-patches "nnpack-system-libraries.patch"))))
(build-system cmake-build-system)
- ;; XXX: The test suite runs but it's very expensive, and on x86_64 CPUs
- ;; that lack the right ISA extensions, tests fail with:
- ;;
- ;; Expected equality of these values:
- ;; nnp_status_success
- ;; Which is: 0
- ;; status
- ;; Which is: 51
- ;;
- ;; where 51 is 'nnp_status_unsupported_hardware'.
+ ;; XXX: The test suite runs but it's very expensive. On x86_64-linux, it
+ ;; requires AVX2 instructions.
(arguments '(#:tests? #f))
(synopsis "Acceleration package for neural network computations")
(description
@@ -3995,46 +4046,168 @@ and Darknet.")
googletest))
(native-inputs
(list python python-peachpy python-six))
+ ;; Supported for Linux.
+ (supported-systems '("x86_64-linux" "armhf-linux" "aarch64-linux"))
(license license:bsd-2))))
+(define-public qnnpack
+ (let ((commit "7d2a4e9931a82adc3814275b6219a03e24e36b4c")
+ (revision "0"))
+ (package
+ (name "qnnpack")
+ (version (git-version "0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pytorch/qnnpack")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dgzriiaz9arsrfwhx42y4l74wbzn6xvdmllfb66v4pmvi5gpxc5"))
+ (modules '((guix build utils)))
+ (snippet
+ '(delete-file-recursively "deps"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; The shared library build fails with linker errors, so we build the
+ ;; static library with -fPIC as in the bundled PyTorch version.
+ #:configure-flags
+ ''("-DQNNPACK_LIBRARY_TYPE=static"
+ "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("IF.*SOURCE_DIR.*")
+ "IF(FALSE)\n")
+ (("IF\\(NOT TARGET.*")
+ "IF(FALSE)\n")
+ (("TARGET_LINK_LIBRARIES.*(fxdiv|psimd|fp16)\\).*")
+ "")
+ (("(TARGET_LINK_LIBRARIES.*) fp16 (.*)" _ before after)
+ (string-append before " " after))))))))
+ (inputs (list clog cpuinfo fp16 fxdiv psimd pthreadpool))
+ (native-inputs (list googletest googlebenchmark))
+ (home-page "https://github.com/pytorch/qnnpack")
+ (synopsis "Quantized Neural Network PACKage")
+ (description "QNNPACK is a library for low-precision neural network
+inference. It contains the implementation of common neural network operators
+on quantized 8-bit tensors.")
+ (supported-systems
+ '("armhf-linux" "aarch64-linux" "i686-linux" "x86_64-linux"))
+ (license license:bsd-3))))
+
(define-public xnnpack
;; There's currently no tag on this repo.
(let ((version "0.0")
- (commit "ae108ef49aa5623b896fc93d4298c49d1750d9ba")
- (revision "2"))
+ (commit "51a987591a6fc9f0fc0707077f53d763ac132cbf")
+ (revision "3"))
(package
(name "xnnpack")
(version (git-version version revision commit))
(home-page "https://github.com/google/XNNPACK") ;fork of QNNPACK
- (source (origin
- (method git-fetch)
- (uri (git-reference (url home-page) (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0q68q2jxiiiblx45q4337k13ppgh5vqjwrwznchcnpb8hawjj3zl"))
- (patches (search-patches "xnnpack-system-libraries.patch"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rzby82xq8d0rl1d148yz88jh9cpsw5c8b2yw7yg39mi7qmr55rm"))
+ ;; Some tests fail to link as they use internal symbols, which are
+ ;; not included in the shared library.
+ ;; XXX: Additionally, these tests fail on i686 due to incorrect results:
+ ;; 171 - f32-vlrelu-test (Failed)
+ ;; 211 - qs8-gavgpool-minmax-fp32-test (Failed)
+ ;; 224 - qu8-avgpool-minmax-fp32-test (Failed)
+ ;; 228 - qu8-gavgpool-minmax-fp32-test (Failed)
+ ;; 263 - x32-packx-test (Failed)
+ (patches (search-patches "xnnpack-remove-broken-tests.patch"))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (ice-9 textual-ports)
+ (srfi srfi-26)))
+ (snippet
+ '(begin
+ ;; Remove autogenerated files
+ (for-each
+ (lambda (dir)
+ (let ((gendir (string-append "src/" dir "/gen")))
+ (when (file-exists? gendir)
+ (delete-file-recursively gendir)
+ ;; Needed for the scripts generating the files
+ (mkdir gendir))))
+ (scandir "src" (negate (cut member <> '("." "..")))))
+ (delete-file-recursively "google3")
+ (delete-file "cmake/microkernels.cmake")
+ ;; Additional autogenerated files which contain the string
+ ;; "Auto-generated file"
+ (for-each
+ (lambda (dir)
+ (for-each
+ (lambda (name)
+ (let ((path (string-append dir "/" name)))
+ (when (call-with-input-file path
+ (lambda (port)
+ (string-contains
+ (get-string-all port)
+ "Auto-generated file")))
+ (delete-file path))))
+ (scandir dir (negate (cut member <> '("." ".."))))))
+ '("test" "bench" "eval" "models" "src/enums" "src/xnnpack"))))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags '("-DXNNPACK_USE_SYSTEM_LIBS=YES"
+ (list
+ #:build-type "Release" ;; Debugging symbols require a lot of disk space
+ #:configure-flags ''("-DXNNPACK_USE_SYSTEM_LIBS=YES"
"-DBUILD_SHARED_LIBS=ON"
+ "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
"-DXNNPACK_LIBRARY_TYPE=shared"
- "-DXNNPACK_BUILD_TESTS=FALSE" ;FIXME: see below
"-DXNNPACK_BUILD_BENCHMARKS=FALSE")
-
- ;; FIXME: Building tests leads to a CMake error:
- ;;
- ;; ADD_LIBRARY cannot create target "all_microkernels" because
- ;; another target with the same name already exists.
- #:tests? #f))
+ #:modules '((ice-9 ftw)
+ (guix build cmake-build-system)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-cmake
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("TARGET_INCLUDE_DIRECTORIES\\((pthreadpool|cpuinfo).*") "")
+ ((".*IF\\(NOT TARGET gtest\\).*")
+ "IF(FALSE)\n")
+ (("SET\\(CMAKE_CXX_STANDARD 11\\)")
+ "SET(CMAKE_CXX_STANDARD 14)")
+ (("AMD64") "x86_64"))))
+ (add-after 'patch-source-shebangs 'generate-files
+ (lambda _
+ (for-each
+ (lambda (name)
+ (when (and (string-prefix? "generate" name)
+ (string-suffix? ".sh" name)
+ (not (equal? "generate-amalgamation.sh" name)))
+ (display (string-append name "\n"))
+ (invoke "bash" (string-append "scripts/" name))))
+ (scandir "scripts"))
+ ;; These need to run after the above scripts
+ (display "Remaining files\n")
+ (invoke "python3" "tools/update-microkernels.py")
+ (substitute* "tools/amalgamate-microkernels.py"
+ (("BUILD") "BUILD.bazel"))
+ (invoke "bash" "scripts/generate-amalgamation.sh"))))))
(inputs
- (list cpuinfo
+ (list clog
+ cpuinfo
pthreadpool
googletest
googlebenchmark
fxdiv
fp16
psimd))
+ (native-inputs (list python-pyyaml python-wrapper))
(synopsis "Optimized floating-point neural network inference operators")
(description
"XNNPACK is a highly optimized library of floating-point neural network
@@ -4043,169 +4216,531 @@ intended for direct use by deep learning practitioners and researchers;
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
+ '("armhf-linux" "aarch64-linux" "riscv64-linux"
+ "i686-linux" "x86_64-linux"))
(license license:bsd-3))))
-(define-public xnnpack-for-torch2
- ;; There's currently no tag on this repo.
- (let ((version "0.0")
- (commit "51a987591a6fc9f0fc0707077f53d763ac132cbf")
- (revision "3"))
+;; Warning: This package requires AVX2 or AVX-512 instructions.
+(define-public fbgemm
+ (package
+ (name "fbgemm")
+ (version "0.6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pytorch/fbgemm")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0mw30v55aicqdbh3xwfj9p8f38nw70ks5cxiwpgwjsk0dylah9rf"))
+ (patches (search-patches "fbgemm-use-system-libraries.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(delete-file-recursively "third_party"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ ''("-DFBGEMM_LIBRARY_TYPE=shared")
+ ;; Tests require AVX2 or AVX-512 instructions
+ #:tests? #f))
+ (inputs (list asmjit cpuinfo))
+ (native-inputs (list pkg-config python googletest))
+ (home-page "https://github.com/pytorch/fbgemm")
+ (synopsis "Facebook GEneral Matrix Multiplication")
+ (description "Low-precision, high-performance matrix-matrix
+multiplications and convolution library for server-side inference.")
+ (supported-systems '("x86_64-linux"))
+ (license license:bsd-3)))
+
+(define-public tensorpipe
+ (let ((commit "bb1473a4b38b18268e8693044afdb8635bc8351b")
+ (revision "0"))
(package
- (inherit xnnpack)
- (name "xnnpack")
- (version (git-version version revision commit))
- (home-page "https://github.com/google/XNNPACK") ;fork of QNNPACK
+ (name "tensorpipe")
+ (version (git-version "0" revision commit))
(source (origin
(method git-fetch)
- (uri (git-reference (url home-page) (commit commit)))
+ (uri (git-reference
+ (url "https://github.com/pytorch/tensorpipe")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "1rzby82xq8d0rl1d148yz88jh9cpsw5c8b2yw7yg39mi7qmr55rm"))
- (patches (search-patches "xnnpack-for-torch2-system-libraries.patch"))))
+ "0sbpkd69rzybw2j89sjkf4s0j8vkk96d51bsps28894989a75j6v"))
+ (modules '((guix build utils)))
+ (snippet
+ '(delete-file-recursively "third_party"))))
+ (build-system cmake-build-system)
(arguments
(list
- #:tests? #false
- #:configure-flags '(list "-DXNNPACK_USE_SYSTEM_LIBS=YES"
- "-DBUILD_SHARED_LIBS=ON"
- "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
- "-DXNNPACK_LIBRARY_TYPE=shared"
- "-DXNNPACK_BUILD_TESTS=FALSE" ;FIXME: see below
- "-DXNNPACK_BUILD_BENCHMARKS=FALSE"))))))
+ #:configure-flags
+ ''("-DBUILD_SHARED_LIBS=ON")
+ ;; There are no tests
+ #:tests? #f))
+ (inputs (list libuv))
+ (native-inputs (list googletest pkg-config pybind11 libnop))
+ (home-page "https://github.com/pytorch/tensorpipe")
+ (synopsis "Tensor-aware point-to-point communication primitive for
+machine learning")
+ (description "TensorPipe provides a tensor-aware channel to transfer
+rich objects from one process to another while using the fastest transport for
+the tensors contained therein.")
+ (license license:bsd-3))))
+
+(define-public foxi
+ (let
+ ((commit "c278588e34e535f0bb8f00df3880d26928038cad")
+ (revision "0"))
+ (package
+ (name "foxi")
+ (version (git-version "1.4.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/houseroad/foxi")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q3ssm5hmmvwfwx87mnnajbavzgpahybw6rpn8ysr9r095dwgq5a"))
+ (patches (search-patches "foxi-fix-build.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; No tests
+ #:tests? #f))
+ (home-page "https://github.com/houseroad/foxi")
+ (synopsis "ONNXIFI with Facebook Extension")
+ (description "ONNX Interface for Framework Integration is a cross-platform
+API for loading and executing ONNX graphs on optimized backends. This package
+contains facebook extensions and is used by PyTorch.")
+ (license license:expat))))
+
+(define-public ideep-pytorch
+ (package
+ (name "ideep-pytorch")
+ (version "3.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/intel/ideep")
+ (commit (string-append "pytorch-rls-v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0y6r938qryi3bnf15rp0fbilsfimdcgmvsa0ygwrn3zifw6386rb"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ ''(("include" "include"))))
+ (home-page "https://github.com/intel/ideep")
+ (synopsis "Ideep headers for interal use by PyTorch")
+ (description "This library is used internally as header-only library by
+PyTorch.")
+ (license license:expat)))
+
+(define-public ideep-pytorch-for-r-torch
+ (package
+ (inherit ideep-pytorch)
+ (version "2.7.3-1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/intel/ideep")
+ (commit (string-append "pytorch-rls-v" version))))
+ (file-name (git-file-name (package-name ideep-pytorch) version))
+ (sha256
+ (base32
+ "0hdpkhcjry22fjx2zg2r48v7f4ljrclzj0li2pgk76kvyblfbyvm"))))))
+
+(define %python-pytorch-version "2.2.1")
+
+(define %python-pytorch-src
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pytorch/pytorch")
+ (commit (string-append "v" %python-pytorch-version))))
+ (file-name (git-file-name "python-pytorch" %python-pytorch-version))
+ (sha256
+ (base32
+ "03mm0pwwb5lxdsmmiw3cch9fijgjw81kmmc4ln9rlyazkm7l1r48"))
+ (patches (search-patches "python-pytorch-system-libraries.patch"
+ "python-pytorch-runpath.patch"
+ "python-pytorch-without-kineto.patch"
+ ;; Some autogeneration scripts depend on the
+ ;; compile PyTorch library. Therefore, we create
+ ;; dummy versions which are regenerated later.
+ "python-pytorch-fix-codegen.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Bundled or unused code
+ (for-each
+ (lambda (dir)
+ (when (file-exists? dir)
+ (delete-file-recursively dir)))
+ '("android"
+ "aten/src/ATen/native/cuda/cutlass_extensions"
+ "aten/src/ATen/native/quantized/cpu/qnnpack"
+ "caffe2/mobile/contrib/libopencl-stub"
+ "caffe2/mobile/contrib/libvulkan-stub"
+ "third_party"))
+
+ ;; Autogenerated files
+ (for-each
+ delete-file
+ '("aten/src/ATen/nnapi/nnapi_wrapper.cpp"
+ "aten/src/ATen/nnapi/nnapi_wrapper.h"
+ "caffe2/mobile/contrib/ios/mpscnn/mpscnn_kernels.h"
+ "caffe2/proto/caffe2_legacy_pb2.pyi"
+ "caffe2/proto/caffe2_pb2.pyi"
+ "caffe2/proto/hsm_pb2.pyi"
+ "caffe2/proto/metanet_pb2.pyi"
+ "caffe2/proto/predictor_consts_pb2.pyi"
+ "caffe2/proto/prof_dag_pb2.pyi"
+ "caffe2/proto/torch_pb2.pyi"
+ ;; These files contain just lists of floating point values and
+ ;; might be as well hand-written.
+ ;; "test/cpp/api/init_baseline.h"
+ ;; "test/cpp/api/optim_baseline.h"
+ "test/mobile/test_upgrader_bytecode_table_example.cpp"
+ "torch/csrc/jit/mobile/upgrader_mobile.cpp"
+ "torch/csrc/jit/runtime/decomposition_registry_util.cpp"
+ "torch/csrc/jit/runtime/serialized_shape_function_registry.cpp"
+ "torch/csrc/jit/tensorexpr/external_functions_codegen.cpp"
+ "torch/csrc/jit/serialization/mobile_bytecode_generated.h"))
+ (delete-file-recursively ".github")
+ (for-each
+ (lambda (dir)
+ (for-each
+ delete-file
+ (find-files dir "\\.cu$")))
+ '("aten/src/ATen/native/transformers/cuda/flash_attn/kernels"
+ "aten/src/ATen/native/transformers/cuda/mem_eff_attention/kernels"))))))
+
+(define-public qnnpack-pytorch
+ (package
+ (inherit qnnpack)
+ (name "qnnpack-pytorch")
+ (version (string-append "pytorch-" %python-pytorch-version))
+ (source
+ (origin
+ (inherit %python-pytorch-src)
+ (patches '())
+ (modules '((guix build utils)
+ (srfi srfi-26)
+ (ice-9 ftw)))
+ (snippet
+ '(begin
+ (rename-file "aten/src/ATen/native/quantized/cpu/qnnpack"
+ "../qnnpack")
+ (let ((outdir (getcwd)))
+ (chdir "..")
+ (rename-file outdir "dummy")
+ (rename-file "qnnpack" outdir)
+ (chdir outdir)
+ (delete-file-recursively "deps"))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qnnpack)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("project\\(.*" orig)
+ (apply
+ string-append
+ orig "\n"
+ (map (lambda (name)
+ (string-append
+ "option(" name " \"\" ON)\n"))
+ '("USE_SYSTEM_CPUINFO" "USE_SYSTEM_FP16" "USE_SYSTEM_FXDIV"
+ "USE_SYSTEM_PSIMD" "USE_SYSTEM_PTHREADPOOL"))))
+ (("if.*SOURCE_DIR.*")
+ "if(FALSE)\n")
+ (("if\\(NOT TARGET (clog|gtest|benchmark).*")
+ "if(FALSE)\n")
+ (("target_link_libraries.*(fxdiv|psimd|fp16)\\).*")
+ "")
+ (("(target_link_libraries.*) fp16 (.*)" _ before after)
+ (string-append before " " after)))))
+ (add-after 'unpack 'fix-cstring-include
+ (lambda _
+ (substitute* "include/pack_block_sparse.h"
+ (("#include.*<vector>.*" orig)
+ (string-append orig "\n#include <cstring>\n")))))
+ (add-after 'install 'install-missing-headers
+ (lambda _
+ (for-each
+ (lambda (name)
+ (install-file (string-append "../source/include/" name)
+ (string-append #$output "/include")))
+ '("pack_block_sparse.h"
+ "pytorch_qnnpack.h"
+ "qnnpack_func.h"))
+ (copy-recursively
+ "../source/src/qnnpack"
+ (string-append #$output "/include/qnnpack"))))))
+ ;; Some tests occasionally fail on i686 due to floating point rounding.
+ ((#:tests? _ #t)
+ (not (string-prefix? "i686" (or (%current-target-system)
+ (%current-system)))))))))
;; Please also update python-torchvision when updating this package.
(define-public python-pytorch
(package
(name "python-pytorch")
- (version "1.13.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pytorch/pytorch")
- (commit (string-append "v" version))
- (recursive? #t)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17yxjzwp4zp75fz7czgz9acijzw7dpyqcza50v8y1x7hfg2gw369"))
- (patches (search-patches "python-pytorch-system-libraries.patch"
- "python-pytorch-runpath.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; XXX: Let's be clear: this package is a bundling fest. We
- ;; delete as much as we can, but there's still a lot left.
- (for-each (lambda (directory)
- (delete-file-recursively
- (string-append "third_party/" directory)))
- '("benchmark" "cpuinfo" "eigen"
-
- ;; FIXME: QNNPACK (of which XNNPACK is a fork)
- ;; needs these.
- ;; "FP16" "FXdiv" "gemmlowp" "psimd"
-
- "gloo" "googletest" "ios-cmake" "NNPACK"
- "onnx" "protobuf" "pthreadpool"
- "pybind11" "python-enum" "python-peachpy"
- "python-six" "tbb" "XNNPACK" "zstd"))
- (substitute* "functorch/CMakeLists.txt"
- (("\\$\\{_rpath_portable_origin\\}/../torch/lib")
- "$ORIGIN/../torch/lib"))))))
+ (version %python-pytorch-version)
+ (source %python-pytorch-src)
(build-system python-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (add-before 'build 'use-system-libraries
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Tell 'setup.py' to let 'CMakeLists.txt' know that we
- ;; want to use "system libraries" instead of the bundled
- ;; ones.
- (setenv "USE_SYSTEM_LIBS" "1")
-
- (substitute* "cmake/Dependencies.cmake"
- (("if\\(USE_SYSTEM_BIND11\\)")
- "if(TRUE)"))
-
- ;; XXX: Disable that for simplicity for now.
- (setenv "USE_FBGEMM" "0")))
- (add-before 'build 'make-things-writable
- (lambda _
- ;; The 'build_caffe2' function in
- ;; 'tools/build_pytorch_libs.py', called from the
- ;; top-level 'setup.py', needs write access to this
- ;; directory.
- (for-each make-file-writable
- (find-files "caffe2/proto" "."
- #:directories? #t))))
- (replace 'check
- (lambda* (#:key inputs outputs tests? #:allow-other-keys)
- ;; Run the test suite following the instructions in
- ;; 'CONTRIBUTING.md'. XXX: Unfortunately this doesn't
- ;; work, unless you set GUIX_PYTHONPATH presumably.
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (invoke "python" "test/run_test.py"))))
- (add-after 'install 'remove-test-executables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Remove test executables, but keep other executables
- ;; such as 'torch_shm_manager' and and .so files such as
- ;; 'libtorch_global_deps.so'.
- (let ((python-site (site-packages inputs outputs)))
- (for-each delete-file
- (find-files python-site
- "(^test_cpp_rpc|_test)$")))))
- (add-after 'install 'remove-caffe2-onnx-scripts
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- ;; Remove 'convert-caffe2-to-onnx' and
- ;; 'convert-onnx-to-caffe2': they seem to be
- ;; deprecated and they cause a failure of the
- ;; 'sanity-check' phase:
- ;;
- ;; ImportError: cannot import name 'metanet_pb2' from partially initialized module 'caffe2.proto' (most likely due to a circular import)
- (for-each delete-file
- (find-files bin "^convert-.*caffe2"))
-
- (substitute* (find-files out "^entry_points\\.txt$")
- (("^convert-.*" all)
- (string-append "# " all "\n")))))))
-
- ;; XXX: Tests attempt to download data such as
- ;; <https://raw.githubusercontent.com/pytorch/test-infra/master/stats/slow-tests.json>.
- ;; We're also missing some Python modules, such as expecttest.
- #:tests? #f))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'cmake-patches
+ (lambda _
+ (substitute* "cmake/Dependencies.cmake"
+ (("#POCKETFFT_INCLUDE_DIR")
+ (string-append
+ #$(this-package-native-input "pocketfft-cpp") "/include"))
+ (("#FP16_INCLUDE_DIR")
+ (string-append
+ #$(this-package-input "fp16") "/include")))))
+ (add-before 'build 'use-system-libraries
+ (lambda _
+ (substitute* '("caffe2/serialize/crc.cc"
+ "caffe2/serialize/inline_container.cc")
+ (("\"miniz\\.h\"") "<miniz/miniz.h>"))
+ (substitute* "aten/src/ATen/native/vulkan/api/Allocator.h"
+ (("<include/vk_mem_alloc.h>")
+ "<vk_mem_alloc.h>"))
+ ;; For Vulkan
+ (substitute* "CMakeLists.txt"
+ (("append_cxx_flag.*-Werror=(return-type|range-loop-construct).*") ""))
+ (substitute*
+ (cons*
+ "torch/csrc/Module.cpp"
+ (map
+ (lambda (name)
+ (string-append
+ "torch/utils/benchmark/utils/valgrind_wrapper/"
+ name))
+ '("compat_bindings.cpp" "timer_callgrind_template.cpp")))
+ (("<callgrind.h>") "<valgrind/callgrind.h>"))
+ (setenv "USE_FFMPEG" "1")
+ (setenv "USE_VULKAN" "1")
+ (setenv "USE_OPENCV" "1")
+ ;; Tell 'setup.py' to let 'CMakeLists.txt' know that we
+ ;; want to use "system libraries" instead of the bundled
+ ;; ones.
+ (setenv "USE_SYSTEM_LIBS" "1")
+ ;; For oneDNN
+ (setenv "USE_MKLDNN" "1")
+ ;; Only works with CUPTI
+ (setenv "USE_KINETO" "0")
+ ;; Prevent CMake error by disabling explicitely
+ (setenv "USE_ITT" "0")
+ ;; Disable on unsupported systems
+ (if #$(not (member
+ (or (%current-target-system)
+ (%current-system))
+ (package-transitive-supported-systems qnnpack)))
+ (setenv "USE_QNNPACK" "0")
+ (setenv "USE_PYTORCH_QNNPACK" "0"))))
+ ;; PyTorch is still built with AVX2 and AVX-512 support selected at
+ ;; runtime, but these dependencies require it (nnpack only for
+ ;; x86_64).
+ (add-before 'build 'disable-avx-dependencies
+ (lambda _
+ (setenv "USE_FBGEMM" "0")
+ (if #$(not
+ (member (or (%current-target-system)
+ (%current-system))
+ '("armhf-linux" "aarch64-linux")))
+ (setenv "USE_NNPACK" "0"))))
+ (add-after 'use-system-libraries 'set-max-jobs
+ (lambda _
+ (setenv "MAX_JOBS" (number->string (parallel-job-count)))))
+ (add-after 'set-max-jobs 'codegen1
+ (lambda _
+ (with-directory-excursion "torch/csrc/jit/tensorexpr"
+ (setenv "PYTHONPATH" "../../../..")
+ (invoke "python3" "codegen_external.py")
+ (setenv "PYTHONPATH" #f))
+
+ (invoke "python3" "aten/src/ATen/nnapi/codegen.py")
+
+ (invoke "bash" "tools/gen_flatbuffers.sh")
+
+ ;; Generate dummy files as the generation depends on the compiled
+ ;; library. They are regenerated later.
+ (setenv "PYTHONPATH" ".")
+ (invoke "python3"
+ "torchgen/operator_versions/gen_mobile_upgraders.py"
+ "dummy")
+ (setenv "PYTHONPATH" #f)
+
+ (invoke "python3"
+ "torchgen/shape_functions/gen_jit_shape_functions.py"
+ "dummy")
+
+ (invoke "python3"
+ "torchgen/decompositions/gen_jit_decompositions.py"
+ "dummy")))
+ ;; Properly generate autogenerated files ...
+ (add-after 'install 'codegen2
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (invoke "python3"
+ "torchgen/operator_versions/gen_mobile_upgraders.py")
+ (invoke "python3"
+ "torchgen/shape_functions/gen_jit_shape_functions.py")
+ (invoke "python3"
+ "torchgen/decompositions/gen_jit_decompositions.py")))
+ ;; ... rebuild their dependencies ...
+ (add-after 'codegen2 'build2
+ (lambda _
+ (invoke "python3" "setup.py" "build")))
+ ;; ... and install again.
+ (add-after 'build2 'install2
+ (lambda _
+ (invoke "python3" "setup.py" "install" (string-append "--prefix=" #$output)
+ "--no-compile" "--single-version-externally-managed" "--root=/")
+ (invoke "python" "-m" "compileall"
+ "--invalidation-mode=unchecked-hash" #$output)))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ ;; Run the test suite following the instructions in
+ ;; 'CONTRIBUTING.md'. Unfortunately this doesn't work, unless
+ ;; you set PYTHONPATH or GUIX_PYTHONPATH, but this is done in
+ ;; the codegen2 phase already.
+ (when tests?
+ (invoke "python3" "test/run_test.py" "--core"))))
+ (add-after 'install2 'remove-test-executables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Remove test executables, but keep other executables
+ ;; such as 'torch_shm_manager' and and .so files such as
+ ;; 'libtorch_global_deps.so'.
+ (let ((python-site (site-packages inputs outputs)))
+ (for-each delete-file
+ (find-files python-site
+ "(^test_cpp_rpc|_test)$")))))
+ (add-after 'install2 'remove-caffe2-onnx-scripts
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ ;; Remove 'convert-caffe2-to-onnx' and
+ ;; 'convert-onnx-to-caffe2': they seem to be
+ ;; deprecated and they cause a failure of the
+ ;; 'sanity-check' phase:
+ ;;
+ ;; ImportError: cannot import name 'metanet_pb2' from
+ ;; partially initialized module 'caffe2.proto' (most likely
+ ;; due to a circular import)
+ (for-each delete-file
+ (find-files bin "^convert-.*caffe2"))
+
+ (substitute* (find-files out "^entry_points\\.txt$")
+ (("^convert-.*" all)
+ (string-append "# " all "\n")))))))
+
+ ;; Even only the core tests take a very long time to run.
+ #:tests? #f))
(native-inputs
- (list cmake ninja))
+ (list cmake
+ doxygen
+ ideep-pytorch
+ ninja
+ pocketfft-cpp
+ python-expecttest
+ python-pytest-flakefinder
+ python-pytest-rerunfailures-13
+ python-pytest-shard
+ python-pytest-xdist
+ python-hypothesis
+ python-types-dataclasses
+ python-typing-extensions-4.10
+ shaderc
+ valgrind))
(inputs
- (list eigen
- ;; ("fmt" ,fmt)
- fp16
- gemmlowp
- googletest
- googlebenchmark
- gloo
- nnpack
- openblas
- openmpi
- pthreadpool
- protobuf
- pybind11
- sleef
- xnnpack
- zstd))
+ (append
+ (list asmjit
+ clog
+ eigen
+ ffmpeg
+ flatbuffers-next
+ fmt
+ foxi
+ fp16
+ fxdiv
+ gemmlowp
+ gloo
+ googletest
+ googlebenchmark
+ libuv
+ miniz-for-pytorch
+ openblas
+ opencv
+ openmpi
+ pthreadpool
+ protobuf
+ pybind11
+ sleef
+ tensorpipe
+ vulkan-headers
+ vulkan-loader
+ vulkan-memory-allocator
+ zstd)
+ ;; TODO: fix build on 32 bit systems once Rust is available.
+ (filter
+ (lambda (pkg)
+ (member (or (%current-target-system)
+ (%current-system))
+ (package-transitive-supported-systems pkg)))
+ (list oneapi-dnnl
+ qnnpack
+ qnnpack-pytorch
+ xnnpack))
+ ;; nnpack requires AVX2 for x86_64-linux
+ (filter
+ (lambda (pkg)
+ (member (or (%current-target-system)
+ (%current-system))
+ '("armhf-linux" "aarch64-linux")))
+ (list nnpack))))
(propagated-inputs
- (list python-astunparse
- python-click
- python-numpy
- python-pyyaml
- python-cffi
- python-typing-extensions
- python-future
- python-six
- python-requests
- onnx ;propagated for its Python modules
- onnx-optimizer
- cpuinfo))
+ (append
+ (list onnx ;propagated for its Python modules
+ onnx-optimizer
+ python-astunparse
+ python-click
+ python-filelock
+ python-fsspec
+ python-future
+ python-jinja2
+ python-networkx
+ python-numpy
+ python-opt-einsum
+ python-optree
+ python-packaging
+ python-psutil
+ python-pyyaml
+ python-requests
+ python-sympy
+ python-typing-extensions)
+ (filter
+ (lambda (pkg)
+ (member (or (%current-target-system)
+ (%current-system))
+ (package-transitive-supported-systems pkg)))
+ (list cpuinfo))))
(home-page "https://pytorch.org/")
(synopsis "Python library for tensor computation and deep neural networks")
(description
@@ -4222,114 +4757,78 @@ PyTorch when needed.
Note: currently this package does not provide GPU support.")
(license license:bsd-3)))
-(define-public python-pytorch2
- (package
- (inherit python-pytorch)
- (name "python-pytorch")
- (version "2.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pytorch/pytorch")
- (commit (string-append "v" version))
- (recursive? #t)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0hdr0d6n072qd0nq2dkxhc9pva6vggj9hpzc0glpc60vfgk0cgzb"))
- (patches (search-patches "python-pytorch2-system-libraries.patch"
- "python-pytorch-runpath.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; XXX: Let's be clear: this package is a bundling fest. We
- ;; delete as much as we can, but there's still a lot left.
- (for-each (lambda (directory)
- (delete-file-recursively
- (string-append "third_party/" directory)))
- '("benchmark" "cpuinfo" "eigen"
-
- ;; FIXME: QNNPACK (of which XNNPACK is a fork)
- ;; needs these.
- ;; "FP16" "FXdiv" "gemmlowp" "psimd"
-
- "gloo" "googletest" "ios-cmake" "NNPACK"
- "onnx" "protobuf" "pthreadpool"
- "pybind11" "python-peachpy"
- "tbb" "XNNPACK" "zstd"))
- (substitute* "caffe2/CMakeLists.txt"
- (("target_link_libraries\\(\\$\\{test_name\\}_\\$\\{CPU_CAPABILITY\\} c10 sleef gtest_main\\)")
- "target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest gtest_main)"))
- (substitute* "functorch/CMakeLists.txt"
- (("\\$\\{_rpath_portable_origin\\}/../torch/lib")
- "$ORIGIN/../torch/lib"))))))
+;; This package variant includes the dependencies requiring at least AVX2 or
+;; AVX-512.
+(define-public python-pytorch-avx
+ (package/inherit python-pytorch
+ (name "python-pytorch-avx")
(inputs
(modify-inputs (package-inputs python-pytorch)
- (replace "xnnpack" xnnpack-for-torch2)))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs python-pytorch)
- (append python-filelock
- python-fsspec
- python-jinja2
- python-networkx
- python-opt-einsum
- python-sympy)
- (replace "onnx" onnx-for-torch2)
- (replace "onnx-optimizer" onnx-optimizer-for-torch2)))))
+ (append fbgemm nnpack)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-pytorch)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'disable-avx-dependencies)))))
+ (supported-systems '("x86_64-linux"))))
+
+(define %python-pytorch-for-r-torch-version "2.0.1")
+
+(define %python-pytorch-for-r-torch-src
+ (origin
+ (inherit %python-pytorch-src)
+ (uri (git-reference
+ (url "https://github.com/pytorch/pytorch")
+ (commit (string-append "v" %python-pytorch-for-r-torch-version))))
+ (file-name (git-file-name "python-pytorch"
+ %python-pytorch-for-r-torch-version))
+ (sha256
+ (base32
+ "0iirrn687i7sfv0p0i7dn89x3rf13a7l8y1y5h190h51yjxpxqxa"))
+ (patches (search-patches
+ "python-pytorch-for-r-torch-system-libraries.patch"
+ "python-pytorch-runpath.patch"
+ "python-pytorch-without-kineto.patch"
+ ;; Some autogeneration scripts depend on the
+ ;; compile PyTorch library. Therefore, we create
+ ;; dummy versions which are regenerated later.
+ "python-pytorch-for-r-torch-fix-codegen.patch"))))
+
+(define-public qnnpack-pytorch-for-r-torch
+ (package
+ (inherit qnnpack-pytorch)
+ (version (string-append "pytorch-" %python-pytorch-for-r-torch-version))
+ (source
+ (origin
+ (inherit %python-pytorch-for-r-torch-src)
+ (patches '())
+ (modules '((guix build utils)
+ (srfi srfi-26)
+ (ice-9 ftw)))
+ (snippet
+ (origin-snippet (package-source qnnpack-pytorch)))))))
+;; Keep in sync with r-torch
(define-public python-pytorch-for-r-torch
(package
(inherit python-pytorch)
(name "python-pytorch")
- (version "2.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pytorch/pytorch")
- (commit (string-append "v" version))
- (recursive? #t)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "14m7v54zyd2qg2xk9mqdpbf4ps7091mdzinzh4vq9p5k4bpznj65"))
- (patches (search-patches "python-pytorch2-system-libraries.patch"
- "python-pytorch-runpath.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; XXX: Let's be clear: this package is a bundling fest. We
- ;; delete as much as we can, but there's still a lot left.
- (for-each (lambda (directory)
- (delete-file-recursively
- (string-append "third_party/" directory)))
- '("benchmark" "cpuinfo" "eigen"
-
- ;; FIXME: QNNPACK (of which XNNPACK is a fork)
- ;; needs these.
- ;; "FP16" "FXdiv" "gemmlowp" "psimd"
-
- "gloo" "googletest" "ios-cmake" "NNPACK"
- "onnx" "protobuf" "pthreadpool"
- "pybind11" "python-enum" "python-peachpy"
- "python-six" "tbb" "XNNPACK" "zstd"))
- (substitute* "caffe2/CMakeLists.txt"
- (("target_link_libraries\\(\\$\\{test_name\\}_\\$\\{CPU_CAPABILITY\\} c10 sleef gtest_main\\)")
- "target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest gtest_main)"))
- (substitute* "functorch/CMakeLists.txt"
- (("\\$\\{_rpath_portable_origin\\}/../torch/lib")
- "$ORIGIN/../torch/lib"))))))
+ (version %python-pytorch-for-r-torch-version)
+ (source %python-pytorch-for-r-torch-src)
+ (native-inputs
+ (modify-inputs (package-native-inputs python-pytorch)
+ (replace "ideep-pytorch" ideep-pytorch-for-r-torch)))
(inputs
(modify-inputs (package-inputs python-pytorch)
- (replace "xnnpack" xnnpack-for-torch2)))
+ (replace "qnnpack-pytorch" qnnpack-pytorch-for-r-torch)
+ (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch)))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-pytorch)
(append python-filelock
python-jinja2
python-networkx
python-opt-einsum
- python-sympy)
- (replace "onnx" onnx-for-torch2)
- (replace "onnx-optimizer" onnx-optimizer-for-torch2)))))
+ python-sympy)))))
(define-public python-pytorch-geometric
(package
@@ -4731,7 +5230,7 @@ implementations and an easy-to-use API to create custom metrics. It offers:
(define-public python-torchvision
(package
(name "python-torchvision")
- (version "0.15.2")
+ (version "0.17.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4741,7 +5240,12 @@ implementations and an easy-to-use API to create custom metrics. It offers:
(file-name (git-file-name name version))
(sha256
(base32
- "1cq2s13vkgg9rljjbrm4g33yxq7q5zqp7f4xm5cq624gvs0wxmi8"))))
+ "094jz0ryzh0yjxf687r61r482fdh3bax8ix2csghraps0z1sns1b"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "android")
+ (delete-file-recursively "ios")))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #false)) ;the test suite is expensive and there is no easy
@@ -4823,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
@@ -4984,7 +5484,7 @@ and Numpy.")
(define-public python-pyro-ppl
(package
(name "python-pyro-ppl")
- (version "1.8.6")
+ (version "1.9.1")
;; The sources on pypi don't include tests.
(source
(origin
@@ -4994,59 +5494,18 @@ and Numpy.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0n1vsih99pvswcaygdxkc6kq6r48ny130z6ca8pp3281396r2ykw"))))
+ (base32 "0q87d0frgzn1ljnpbyxmj582yfn6zy3m960m3ab826h4rpzybxhf"))))
(build-system pyproject-build-system)
(arguments
- (list
- #:test-flags
- '(list "-vv" "--stage=unit"
- ;; This tests features that are only implemented when non-free
- ;; software is available (Intel MKL or CUDA).
- "--ignore=tests/distributions/test_spanning_tree.py"
- "--ignore=tests/infer/mcmc/test_mcmc_api.py"
- ;; This test fails sometimes.
- "--ignore=tests/optim/test_optim.py"
- ;; Four test_gamma_elbo tests fail with bad values for unknown
- ;; reasons.
- "--ignore=tests/distributions/test_rejector.py"
- ;; This looks like a test system failure. All of these fail
- ;; because x is an array of functions, not an array of numbers.
- "-k" "not test_sample")))
+ ;; Tests take too long.
+ ;; XXX: Maybe select the most important test modules.
+ (list #:tests? #f))
(propagated-inputs
(list python-numpy
python-opt-einsum
python-pyro-api
python-pytorch
python-tqdm))
- (native-inputs
- (list ninja
- jupyter
- python-black
- python-flake8
- python-graphviz
- python-isort
- python-lap
- python-matplotlib
- python-mypy
- python-nbformat
- python-nbsphinx
- python-nbstripout
- python-nbval
- python-pandas
- python-pillow
- python-pypandoc
- python-pytest
- python-pytest-cov
- python-pytest-xdist
- python-scikit-learn
- python-scipy
- python-seaborn
- python-sphinx
- python-sphinx-rtd-theme
- python-torchvision
- python-visdom
- python-wget
- python-yapf))
(home-page "https://pyro.ai")
(synopsis "Python library for probabilistic modeling and inference")
(description
@@ -5083,22 +5542,22 @@ linear algebra routines needed for structured matrices (or operators).")
(define-public python-gpytorch
(package
(name "python-gpytorch")
- (version "1.11")
+ (version "1.12")
(source (origin
(method url-fetch)
(uri (pypi-uri "gpytorch" version))
(sha256
(base32
- "0q17bml53vixk3cwj3p893809927hz81fprwsmxpxqv5i4mvgyvj"))))
+ "1pwsccll1hrgkifdmlxzcn6cvnwvyq2cimqzbfgihr13yw51cb6w"))))
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- ;; The error message in test_t_matmul_matrix suggests the error may
- ;; be due to a bug in gpytorch. test_deprecated_methods fails with
- ;; an AssertionError.
- #~(list "-k" (string-append "not test_deprecated_methods"
- " and not test_t_matmul_matrix"))))
- (propagated-inputs (list python-linear-operator python-scikit-learn))
+ ;; test_deprecated_methods fails with an AssertionError.
+ #~(list "-k" (string-append "not test_deprecated_methods"))))
+ (propagated-inputs (list python-linear-operator
+ python-mpmath
+ python-scikit-learn
+ python-scipy))
(native-inputs (list python-coverage
python-flake8
python-flake8-print
@@ -5111,6 +5570,46 @@ linear algebra routines needed for structured matrices (or operators).")
"GPyTorch is a Gaussian process library implemented using PyTorch.")
(license license:expat)))
+(define-public python-botorch
+ (package
+ (name "python-botorch")
+ (version "0.11.3")
+ (source (origin
+ (method git-fetch) ;no tests in PyPI
+ (uri (git-reference
+ (url "https://github.com/pytorch/botorch")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0nf9zrg1khvckb8kdpffqc3bnlhc0x03jd1560qmjamwl3j59m02"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags #~(list "-k" "not test_all_cases_covered")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; The version string is usually derived via setuptools-scm,
+ ;; but without the git metadata available, the version string
+ ;; is set to '0.0.0'.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
+ #$(package-version this-package)))))))
+ (propagated-inputs (list python-gpytorch
+ python-linear-operator
+ python-multipledispatch
+ python-pyro-ppl
+ python-pytorch
+ python-scipy))
+ (native-inputs (list python-pytest
+ python-pytest-cov
+ python-setuptools-scm))
+ (home-page "https://botorch.org")
+ (synopsis "Bayesian Optimization in PyTorch")
+ (description
+ "BoTorch is a library for Bayesian Optimization built on PyTorch.")
+ (license license:expat)))
+
(define-public vosk-api
(let* ((openfst openfst-for-vosk)
(kaldi kaldi-for-vosk))
@@ -5402,7 +5901,7 @@ Brian 2 simulator.")
(define-public oneapi-dnnl
(package
(name "oneapi-dnnl")
- (version "3.1")
+ (version "3.3.5")
(source
(origin
(method git-fetch)
@@ -5411,7 +5910,7 @@ Brian 2 simulator.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1jgmb5kl0bf4a2zfn94zlb117672r9lvvkkmwl86ihlyr1mpr3d0"))))
+ (base32 "05ra5zziys2hvn29y6ysiqzsf4jr9bf2bci5sc3swvf3bs2y5ihf"))))
(build-system cmake-build-system)
(arguments (if (target-riscv64?)
(list #:configure-flags #~'("-DDNNL_CPU_RUNTIME=SEQ"))
@@ -5421,8 +5920,23 @@ Brian 2 simulator.")
(description
"OneAPI Deep Neural Network Library (oneDNN) is a cross-platform
performance library of basic building blocks for deep learning applications.")
+ (supported-systems %64bit-supported-systems)
(license license:asl2.0)))
+(define-public oneapi-dnnl-for-r-torch
+ (package
+ (inherit oneapi-dnnl)
+ (version "2.7.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/oneapi-src/oneDNN")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name (package-name oneapi-dnnl) version))
+ (sha256
+ (base32 "1zyw5rd8x346bb7gac9a7x3saviw3zvp6aqz2z1l9sv163vmjfz6"))))))
+
(define-public python-gguf
(package
(name "python-gguf")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fd2fcd31c2..30fa194df3 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -49,13 +49,14 @@
;;; 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>
;;; Copyright © 2023 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -82,8 +83,10 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #: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)
@@ -385,6 +388,7 @@ example, modify the message headers or body, or encrypt or sign the message.")
readline
linux-pam
libltdl
+ libxcrypt
gdbm
;; Required for SEARCH CHARSET.
libunistring))
@@ -810,7 +814,7 @@ It adds a large amount of new and improved features to mutt.")
(define-public gmime
(package
(name "gmime")
- (version "3.2.7")
+ (version "3.2.14")
(source
(origin
(method git-fetch)
@@ -819,7 +823,7 @@ It adds a large amount of new and improved features to mutt.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0yiylbw9iy49hgj29czinv246hh5c18qv6qkvbdrmq9z5m00sp01"))))
+ (base32 "0kvhyd1rn6wi9wrqi2a4f26yp0l6shsg9sd45hckzf04p9687hb7"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -842,7 +846,7 @@ It adds a large amount of new and improved features to mutt.")
(or prog (error "not found: "
base))))))))))))
(native-inputs
- (list autoconf
+ (list autoconf-2.71
automake
pkg-config
gnupg ; for tests only
@@ -1009,7 +1013,8 @@ mailpack. What can alterMIME do?
w3m
xorg-server-for-tests))
(inputs
- (list boost
+ (list bash-minimal
+ boost
gmime
gobject-introspection ; it is referenced
gtkmm-3
@@ -1259,14 +1264,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu
(package
(name "mu")
- (version "1.12.4")
+ (version "1.12.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/download/v"
version "/mu-" version ".tar.xz"))
(sha256
- (base32 "1ja4b9r9712zjvz8223r5vh2kmmyhkrmb7cbhxdn9hbpa5n16hdx"))))
+ (base32 "0qdpag5skcwml4mrhz8205wfirayn55cqdydsy7ng6f9hyv3k9gq"))))
(build-system meson-build-system)
(native-inputs
(list pkg-config
@@ -1279,8 +1284,11 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(list
#:modules '((guix build meson-build-system)
(guix build emacs-utils)
+ ((guix build guile-build-system)
+ #:select (target-guile-effective-version))
(guix build utils))
#:imported-modules `(,@%meson-build-system-modules
+ (guix build guile-build-system)
(guix build emacs-utils))
#:configure-flags
#~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
@@ -1302,11 +1310,18 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(("\"libguile-mu\"")
(format #f "\"~a/lib/libguile-mu\"" #$output)))))
(add-after 'install 'install-emacs-autoloads
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda _
(emacs-generate-autoloads
"mu4e"
- (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp/mu4e")))))))
+ (string-append #$output
+ "/share/emacs/site-lisp/mu4e"))))
+ (add-after 'install 'wrap-executable
+ (lambda _
+ (let* ((bin (string-append #$output "/bin"))
+ (version (target-guile-effective-version))
+ (scm (string-append #$output "/share/guile/site/" version)))
+ (wrap-program (string-append bin "/mu")
+ `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
(home-page "https://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description
@@ -1396,7 +1411,7 @@ Notmuch.")
(file-name (string-append name "-" version "-checkout"))))
(build-system python-build-system)
(inputs
- (list python-notmuch python-pygobject gobject-introspection
+ (list bash-minimal python-notmuch python-pygobject gobject-introspection
libnotify gtk+))
(arguments
`(#:phases
@@ -1466,11 +1481,12 @@ invoking @command{notifymuch} from the post-new hook.")
emacs-no-x ; -minimal lacks libxml, needed for some tests
which
dtach
+ git-minimal/pinned
gnupg
man-db
perl))
(inputs
- (list glib gmime talloc xapian zlib))
+ (list glib gmime sfsexp talloc xapian zlib))
(home-page "https://notmuchmail.org/")
(synopsis "Thread-based email index, search, and tagging")
(description
@@ -1500,7 +1516,23 @@ ing, and tagging large collections of email messages.")
(let ((notmuch (search-input-file inputs "/bin/notmuch")))
(substitute* "notmuch-lib.el"
(("\"notmuch\"")
- (string-append "\"" notmuch "\"")))))))))
+ (string-append "\"" notmuch "\""))))))
+ ;; Install desktop files so that mailto URIs can be opened using
+ ;; emacs-notmuch.
+ (add-after 'install 'install-desktop-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ (install-file "notmuch-emacs-mua"
+ (string-append #$output "/bin"))
+ (let ((applications (string-append #$output "/share/applications")))
+ (install-file "notmuch-emacs-mua.desktop"
+ applications)
+ (copy-file "notmuch-emacs-mua.desktop"
+ (string-append applications
+ "/notmuch-emacsclient-mua.desktop"))
+ (substitute* (string-append applications
+ "/notmuch-emacsclient-mua.desktop")
+ (("Exec=notmuch-emacs-mua" all)
+ (string-append all " --client")))))))))
(synopsis "Run Notmuch within Emacs")
(description
"This package provides an Emacs-based interface to the Notmuch mail
@@ -1615,7 +1647,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
@@ -1625,7 +1657,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
@@ -1795,7 +1827,7 @@ compresses it.")
(define-public claws-mail
(package
(name "claws-mail")
- (version "4.1.1")
+ (version "4.3.0")
(source
(origin
(method url-fetch)
@@ -1803,7 +1835,7 @@ compresses it.")
(string-append "https://www.claws-mail.org/releases/claws-mail-"
version ".tar.xz"))
(sha256
- (base32 "0i037bskrnmsmylhmqayjg0pmsr0m2zx8xhbxc6mwvw9q40fg2di"))))
+ (base32 "1q8wb2fh5fmbbyrvzdwkhxkzdbsvyk5w783z8qlg05mris41vp4m"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@@ -1896,14 +1928,14 @@ addons which can add many functionalities to the base client.")
(define-public msmtp
(package
(name "msmtp")
- (version "1.8.25")
+ (version "1.8.26")
(source
(origin
(method url-fetch)
(uri (string-append "https://marlam.de/msmtp/releases"
"/msmtp-" version ".tar.xz"))
(sha256
- (base32 "0f6pa8kdlfingw6yf61dshnxgygx5v6ykcmnn3h6zllpnfxivzid"))))
+ (base32 "1n363w94s2jjkijnqg5mb4m7wk0dy20s9bk0gqk8kwff8j1liz3c"))))
(build-system gnu-build-system)
(inputs
(list libsecret gnutls zlib gsasl))
@@ -1947,7 +1979,7 @@ delivery.")
(define-public exim
(package
(name "exim")
- (version "4.96.1")
+ (version "4.98")
(source
(origin
(method url-fetch)
@@ -1961,7 +1993,7 @@ delivery.")
(string-append "https://ftp.exim.org/pub/exim/exim4/old/"
file-name))))
(sha256
- (base32 "0g83cxkq3znh5b3r2a3990qxysw7d2l71jwcxaxzvq8pqdahgb4k"))))
+ (base32 "1xsjb2hqasxsqsmrcv98c2dvfgcsiy0j0g229fx974lzfy511g0f"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -2023,6 +2055,12 @@ delivery.")
(substitute* "scripts/Configure-config.h"
(("\\| /bin/sh") "| sh"))
(patch-shebang "scripts/Configure-eximon")))
+ (add-before 'build 'fix-perl-file-names
+ (lambda _
+ (substitute* (list "Local/Makefile"
+ "OS/Makefile-Default")
+ (("PERL_COMMAND=/usr/bin/perl")
+ (string-append "PERL_COMMAND=" #$perl "/bin/perl")))))
(add-before 'build 'build-reproducibly
(lambda _
;; The ‘compilation number’ increments on every build in the
@@ -2051,8 +2089,10 @@ delivery.")
gzip
libnsl
libxaw
+ libxcrypt
libxt
perl
+ perl-file-fcntllock
xz))
(home-page "https://www.exim.org/")
(synopsis
@@ -2070,7 +2110,7 @@ facilities for checking incoming mail.")
(package
(name "dovecot")
;; Also update dovecot-pigeonhole when updating to a new minor version.
- (version "2.3.21")
+ (version "2.3.21.1")
(source
(origin
(method url-fetch)
@@ -2078,7 +2118,7 @@ facilities for checking incoming mail.")
(version-major+minor version) "/"
"dovecot-" version ".tar.gz"))
(sha256
- (base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
+ (base32 "0zh9971d49dl5q1km31jnrd3vg53j9aaxnppic412xi9qiwa341d"))
(patches
(search-patches "dovecot-opensslv3.patch"))))
(build-system gnu-build-system)
@@ -2091,6 +2131,7 @@ facilities for checking incoming mail.")
libsodium ; extra password algorithms
libstemmer
libunwind
+ libxcrypt
linux-pam
lz4
openssl
@@ -2140,7 +2181,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
(let ((dovecot-version (version-major+minor (package-version dovecot))))
(package
(name "dovecot-pigeonhole")
- (version "0.5.21")
+ (version "0.5.21.1")
(source
(origin
(method url-fetch)
@@ -2148,7 +2189,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
"https://pigeonhole.dovecot.org/releases/" dovecot-version "/"
"dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz"))
(sha256
- (base32 "09zd7n6ljqaj3i3m6r1hn1vb1cjhy64040vji82i4rq7b4k1v9qw"))
+ (base32 "14j6bj9dc0c2f6pi251jyhfiwyg7n9gi2c840vg261v29cldnxq3"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -2293,17 +2334,14 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.")
(define-public isync
(package
(name "isync")
- (version "1.4.4")
+ (version "1.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/isync/isync/"
version "/isync-" version ".tar.gz"))
(sha256 (base32
- "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"))
- (patches
- ;; Likely to be included in next version
- (search-patches "isync-openssl3-fix.patch"))))
+ "13gpawspfpiw87wm2p6gzrm98xwy741k2ib1l6fjggw7jc81xj50"))))
(build-system gnu-build-system)
(arguments
(list
@@ -2873,7 +2911,8 @@ DKIM and/or DomainKeys.")
"perl-net-dns"
"perl-timedate"))))))))
(inputs
- (list perl
+ (list bash-minimal
+ perl
perl-crypt-openssl-rsa
perl-cryptx
perl-io-socket-inet6
@@ -3034,14 +3073,14 @@ easily (one at a time).")
(define-public mpop
(package
(name "mpop")
- (version "1.4.18")
+ (version "1.4.19")
(source
(origin
(method url-fetch)
(uri (string-append "https://marlam.de/mpop/releases/"
"mpop-" version ".tar.xz"))
(sha256
- (base32 "1dw5kwflga26kfjl999lilq14vvk6fcapryihakr9l7phh0rb6b0"))))
+ (base32 "12jwalxf14z0rwkhdfw1whizc9dzcba9yv63wanwmszzqq9ixi13"))))
(build-system gnu-build-system)
(inputs
(list gnutls))
@@ -3258,49 +3297,63 @@ from the Cyrus IMAP project.")
(define-public opensmtpd
(package
(name "opensmtpd")
- (version "7.4.0p1")
+ (version "7.5.0p0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/"
"opensmtpd-" version ".tar.gz"))
(sha256
- (base32 "1dbhvf73z9qi9pzj4h58bgnzsafiwpmy7n17rba83q8rjkna50ly"))))
+ (base32 "1763w26zvvc3kf8giqg4lwn5n1ypmgh73agf5k3yq6qc7hww3xc4"))))
(build-system gnu-build-system)
(inputs
;; OpenSMTPd bundled (a subset of) libasr and libtls, which we use. See
;; https://www.mail-archive.com/misc@opensmtpd.org/msg05909.html for why.
- (list bdb
+ (list bash-minimal ;sh invoked at run time
+ bdb
+ coreutils ;for cat
+ gzip ;for zcat
libbsd ;https://github.com/OpenSMTPD/OpenSMTPD/issues/1233
libevent
libressl
linux-pam
+ libxcrypt
zlib))
(native-inputs
(list bison
groff ;for man pages
pkg-config))
(arguments
- `(#:configure-flags
- (list "--localstatedir=/var"
- "--with-libbsd"
- ;; This is the default only if it exists at build time—it doesn't.
- "--with-path-socket=/var/run"
- "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt"
- "--with-user-smtpd=smtpd"
- "--with-user-queue=smtpq" "--with-group-queue=smtpq"
- "--with-auth-pam"
- "--with-table-db")
- #:phases
- (modify-phases %standard-phases
+ (list
+ #:configure-flags
+ #~(list "--localstatedir=/var"
+ "--with-libbsd"
+ ;; This is the default only if it exists at build time—it doesn't.
+ "--with-path-socket=/var/run"
+ "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt"
+ "--with-user-smtpd=smtpd"
+ "--with-user-queue=smtpq" "--with-group-queue=smtpq"
+ "--with-auth-pam"
+ "--with-table-db"
+
+ ;; This is called at run time but defaults to the native zcat in
+ ;; $PATH, breaking cross-compilation.
+ (string-append "ac_cv_path_ZCAT="
+ #$(this-package-input "gzip") "/bin/zcat"))
+ #:phases
+ `(modify-phases %standard-phases
;; Fix some incorrectly hard-coded external tool file names.
(add-after 'unpack 'patch-FHS-file-names
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; avoids warning smtpd: couldn't enqueue offline message
+ ;; smtpctl exited abnormally
+ (substitute* "usr.sbin/smtpd/smtpd.h"
+ (("/usr/bin/smtpctl") "/run/privileged/bin/smtpctl"))
(substitute* "usr.sbin/smtpd/smtpctl.c"
;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't.
- (("/bin/cat") (which "cat")))
+ (("/bin/cat" file) (search-input-file inputs file)))
(substitute* "usr.sbin/smtpd/mda_unpriv.c"
- (("/bin/sh") (which "sh")))))
+ (("/bin/sh" file) (search-input-file inputs file)))))
;; OpenSMTPD provides a single smtpctl utility to control both the
;; daemon and the local submission subsystem. To accomodate systems
;; that require historical interfaces such as sendmail, newaliases or
@@ -3347,6 +3400,7 @@ to esoteric or niche requirements.")
(inputs
`(("libressl" ,libressl)
("libevent" ,libevent)
+ ("libxcrypt" ,libxcrypt) ;required by Python.h
("mysql" ,mariadb "dev")
("opensmtpd" ,opensmtpd)
("postgresql" ,postgresql)
@@ -3836,7 +3890,11 @@ on the fly. Both programs are written in C and are very fast.")
(base32 "131i2b1yxhnbqkfk4kky40pfanqw2c5lcgbnjhfqp5cvpawpk2ai"))))
(build-system perl-build-system)
(inputs
- (list perl-io-socket-inet6 perl-net-dns perl-net-ssleay perl-socket6)) ; used by perl-io-socket-inet6
+ (list bash-minimal
+ perl-io-socket-inet6
+ perl-net-dns
+ perl-net-ssleay
+ perl-socket6)) ; used by perl-io-socket-inet6
(arguments
`(#:tests? #f ; no tests
#:phases
@@ -3844,8 +3902,7 @@ on the fly. Both programs are written in C and are very fast.")
(add-after 'unpack 'set-build_version
(lambda _
(substitute* "swaks"
- (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version)))
- #true))
+ (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version)))))
(delete 'configure)
(replace 'build
(lambda _
@@ -3854,14 +3911,12 @@ on the fly. Both programs are written in C and are very fast.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "swaks" (string-append out "/bin"))
- (install-file "swaks.1" (string-append out "/share/man/man1")))
- #t))
+ (install-file "swaks.1" (string-append out "/share/man/man1")))))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/swaks")
- `("PERL5LIB" ":" = (,(getenv "PERL5LIB"))))
- #t)))))
+ `("PERL5LIB" ":" = (,(getenv "PERL5LIB")))))))))
(home-page "https://jetmore.org/john/code/swaks/")
(synopsis "Featureful SMTP test tool")
(description "Swaks is a flexible, scriptable, transaction-oriented SMTP
@@ -3900,6 +3955,7 @@ operators and scripters.")
(arguments
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target)))
+ #:parallel-build? #f ;fails otherwise
#:configure-flags (list (string-append "--with-ssl-include-dir="
(assoc-ref %build-inputs "openssl")
"/include/openssl")
@@ -3936,6 +3992,7 @@ operators and scripters.")
mit-krb5
aspell
tcl
+ libxcrypt
linux-pam))
(home-page "https://repo.or.cz/alpine.git")
(synopsis "Alternatively Licensed Program for Internet News and Email")
@@ -4172,7 +4229,7 @@ It is a replacement for the @command{urlview} program.")
(define-public mumi
(package
(name "mumi")
- (version "0.0.10")
+ (version "0.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4181,7 +4238,7 @@ It is a replacement for the @command{urlview} program.")
(file-name (git-file-name name version))
(sha256
(base32
- "1rfhbi25kh84whi88423736v2vxgsc6fdps3kqrc1gs6dni9li17"))))
+ "0b93hd6jjay70rj3520cmwzji00prn2fyjbxgys6ihw962nj3hpg"))))
(build-system gnu-build-system)
(arguments
(list
@@ -4190,7 +4247,7 @@ It is a replacement for the @command{urlview} program.")
#:select (target-guile-effective-version))
(guix build utils))
#:imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:configure-flags '(list "--localstatedir=/var")
@@ -4226,7 +4283,8 @@ It is a replacement for the @command{urlview} program.")
guile-webutils
guile-xapian
guile-3.0
- mailutils))
+ mailutils
+ xdg-utils))
(native-inputs
(list autoconf automake pkg-config sassc
(origin
@@ -4315,6 +4373,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")
@@ -4809,7 +4898,7 @@ ex-like commands on it.")
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(ice-9 string-fun))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:make-flags (list (string-append "prefix=" %output)
@@ -4977,7 +5066,7 @@ remote SMTP server.")
(define-public aerc
(package
(name "aerc")
- (version "0.15.2")
+ (version "0.18.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4986,7 +5075,7 @@ remote SMTP server.")
(file-name (git-file-name name version))
(sha256
(base32
- "1gbprx0i8d13q974n5hsys6lllav5cpll3cwrr1hfw6307hc001r"))))
+ "1gj8m8xvqaf0lsnk4h1n9d0qhwi8d3mm0w9zhw16v888n7rll9fb"))))
(build-system go-build-system)
(arguments
(list #:import-path "git.sr.ht/~rjarry/aerc"
@@ -4995,23 +5084,19 @@ remote SMTP server.")
#:build-flags
#~(list "-tags=notmuch"
(string-append
- "-ldflags=-X main.Version=" #$version
- " -X git.sr.ht/~rjarry/aerc/config.libexecDir="
- #$output "/libexec/aerc"
- " -X git.sr.ht/~rjarry/aerc/config.shareDir="
- #$output "/share/aerc"))
+ "-ldflags=-X main.Version=" #$version
+ " -X git.sr.ht/~rjarry/aerc/config.libexecDir="
+ #$output "/libexec/aerc"
+ " -X git.sr.ht/~rjarry/aerc/config.shareDir="
+ #$output "/share/aerc"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key import-path inputs #:allow-other-keys)
- (with-directory-excursion
- (string-append "src/" import-path)
- (substitute* (list "config/config.go"
- "lib/templates/template.go"
- "widgets/compose.go"
- "widgets/msgviewer.go"
- "worker/maildir/worker.go"
- "worker/notmuch/worker.go")
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* (find-files "." "\\.go$")
+ ;; Patch all occurrences to "sh" with absolute path to
+ ;; the shell available in Guix.
(("\"sh\"")
(string-append
"\"" (search-input-file inputs "bin/sh")
@@ -5020,8 +5105,8 @@ remote SMTP server.")
(substitute* "commands/z.go"
(("\"zoxide\"")
(string-append
- "\"" (search-input-file inputs "bin/zoxide")
- "\""))))
+ "\"" (search-input-file inputs "bin/zoxide")
+ "\""))))
(substitute* (list "lib/crypto/gpg/gpg.go"
"lib/crypto/gpg/gpg_test.go"
"lib/crypto/gpg/gpgbin/keys.go"
@@ -5043,51 +5128,47 @@ remote SMTP server.")
(string-append "PREFIX=" #$output)))))))
(inputs
(append
- (list gnupg
- go-github-com-zenhack-go-notmuch
- go-golang-org-x-oauth2
- go-github-com-xo-terminfo
- go-github-com-stretchr-testify
- go-github-com-riywo-loginshell
- go-github-com-pkg-errors
- go-github-com-mitchellh-go-homedir
- go-github-com-miolini-datacounter
- go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-isatty
- go-github-com-lithammer-fuzzysearch
- go-github-com-kyoh86-xdg
- go-github-com-imdario-mergo
- go-github-com-google-shlex
- go-github-com-go-ini-ini
- go-github-com-gdamore-tcell-v2
- go-github-com-gatherstars-com-jwz
- go-github-com-fsnotify-fsnotify
- go-github-com-emersion-go-smtp
- go-github-com-emersion-go-sasl
- go-github-com-emersion-go-pgpmail
- go-github-com-emersion-go-message
- go-github-com-emersion-go-maildir
- go-github-com-emersion-go-imap-sortthread
- go-github-com-emersion-go-imap
- go-github-com-emersion-go-msgauth
- go-github-com-emersion-go-mbox
- go-github-com-ddevault-go-libvterm
- go-github-com-danwakefield-fnmatch
- go-github-com-creack-pty
- go-github-com-arran4-golang-ical
- go-github-com-protonmail-go-crypto
- go-github-com-syndtr-goleveldb-leveldb
- go-git-sr-ht-sircmpwn-getopt
- go-git-sr-ht-rockorager-tcell-term
- python
- python-vobject)
- (if (supported-package? zoxide)
- (list zoxide)
- '())))
- (native-inputs (list scdoc))
+ (list gnupg
+ notmuch ; Failing to build without it.
+ python
+ python-vobject)
+ (if (supported-package? zoxide)
+ (list zoxide)
+ '())))
+ (native-inputs
+ (list go-git-sr-ht-rjarry-go-opt
+ go-git-sr-ht-rockorager-go-jmap
+ go-git-sr-ht-rockorager-vaxis
+ go-github-com-protonmail-go-crypto
+ go-github-com-arran4-golang-ical
+ go-github-com-danwakefield-fnmatch
+ go-github-com-emersion-go-imap
+ go-github-com-emersion-go-imap-sortthread
+ go-github-com-emersion-go-maildir
+ go-github-com-emersion-go-mbox
+ go-github-com-emersion-go-message
+ go-github-com-emersion-go-msgauth
+ go-github-com-emersion-go-pgpmail
+ go-github-com-emersion-go-sasl
+ go-github-com-emersion-go-smtp
+ go-github-com-fsnotify-fsnotify
+ go-github-com-gatherstars-com-jwz
+ go-github-com-go-ini-ini
+ go-github-com-lithammer-fuzzysearch
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-runewidth
+ go-github-com-pkg-errors
+ go-github-com-riywo-loginshell
+ go-github-com-stretchr-testify
+ go-github-com-syndtr-goleveldb
+ go-golang-org-x-image
+ go-golang-org-x-oauth2
+ go-golang-org-x-sys
+ go-golang-org-x-tools
+ scdoc))
(home-page "https://git.sr.ht/~rjarry/aerc")
(synopsis "Email client for the terminal")
- (description "@code{aerc} is a textual email client for terminals. It
+ (description "@code{aerc} is a textual email client for terminals. It
features:
@enumerate
@item First-class support for using patches and @code{git send-email}
@@ -5100,3 +5181,41 @@ features:
;; <https://lists.sr.ht/~rjarry/aerc-devel/%3Cb5cb213a7d0c699a886971658c2476
;; 1073eb2391%40disroot.org%3E>
(license license:gpl3+)))
+
+(define-public hydroxide
+ (package
+ (name "hydroxide")
+ (version "0.2.29")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/hydroxide")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11gbikrgm7nf0zjav64202wsnr9pvrmslm2rzg9d9rbvwdqcq1jl"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/emersion/hydroxide/cmd/hydroxide"
+ #:unpack-path "github.com/emersion/hydroxide"))
+ (native-inputs
+ (list go-github-com-protonmail-go-crypto
+ go-github-com-boltdb-bolt
+ go-github-com-emersion-go-bcrypt
+ go-github-com-emersion-go-imap
+ go-github-com-emersion-go-mbox
+ go-github-com-emersion-go-message
+ go-github-com-emersion-go-smtp
+ go-github-com-emersion-go-vcard
+ go-github-com-emersion-go-webdav
+ go-golang-org-x-crypto
+ go-golang-org-x-term))
+ (home-page "https://github.com/emersion/hydroxide")
+ (synopsis "ProtonMail CardDAV, IMAP and SMTP bridge")
+ (description
+ "This package implements a functionality to translate standard
+protocols (SMTP, IMAP, CardDAV) into ProtonMail API requests.")
+ (license license:expat)))
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4dd45a4a27..91796efd0f 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -74,7 +74,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inherit base)
(source (origin (inherit (package-source base))
(patches (append (search-patches
- "glibc-bootstrap-system.patch")
+ (match (package-version base)
+ ("2.39" "glibc-2.39-bootstrap-system.patch")
+ (_ "glibc-bootstrap-system.patch")))
(origin-patches (package-source base))))))
(arguments
(substitute-keyword-arguments (package-arguments base)
@@ -83,13 +85,18 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; and can use statically-linked NSS modules.
`(cons* "--disable-nscd" "--disable-build-nscd"
"--enable-static-nss"
- ,flags))))
-
- ;; Make sure to build glibc with the same compiler version as the rest
- ;; of the bootstrap. Otherwise it fails to statically link on aarch64.
- (native-inputs
- `(("gcc" ,gcc-7)
- ,@(package-native-inputs base)))
+ ,flags))
+ ((#:phases phases #~%standard-phases)
+ ;; Apply i686-linux-specific patch.
+ (if (target-x86-32?)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'apply-libm-patch
+ (lambda _
+ (define patch
+ #$(local-file
+ (search-patch "glibc-2.39-fmod-libm-a.patch")))
+ (invoke "patch" "--force" "-p1" "-i" patch))))
+ phases))))
;; Remove the 'debug' output to allow bit-reproducible builds (when the
;; 'debug' output is used, ELF files end up with a .gnu_debuglink, which
@@ -101,13 +108,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(mlambdaq (glibc)
"Return a variant of GCC that uses the bootstrap variant of GLIBC."
(package
- (inherit gcc-7)
+ (inherit gcc)
(outputs '("out")) ;all in one so libgcc_s is easily found
(inputs
`( ;; Distinguish the name so we can refer to it below.
("bootstrap-libc" ,(glibc-for-bootstrap glibc))
("libc:static" ,(glibc-for-bootstrap glibc) "static")
- ,@(package-inputs gcc-7))))))
+ ,@(package-inputs gcc))))))
(define (package-with-relocatable-glibc p)
"Return a variant of P that uses the libc as defined by
@@ -146,7 +153,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(cons (search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH")
(files '("include")))
- (package-search-paths gcc-7)))))
+ (package-search-paths gcc)))))
("cross-binutils" ,(cross-binutils target))
,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap glibc))
@@ -271,9 +278,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inputs '()) ;remove PCRE, which is optional
(arguments
(substitute-keyword-arguments (package-arguments grep)
+ ((#:configure-flags flags #~'())
+ #~(cons "--disable-perl-regexp"
+ (delete "--enable-perl-regexp" #$flags)))
((#:phases phases)
- `(modify-phases ,phases
- (delete 'fix-egrep-and-fgrep)))))))
+ #~(modify-phases #$phases
+ (delete 'fix-egrep-and-fgrep)))))))
(finalize (compose static-package
package-with-relocatable-glibc)))
(append (map finalize
@@ -375,32 +385,34 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %binutils-static
;; Statically-linked Binutils.
- (package (inherit binutils)
+ (package
+ (inherit binutils)
(name "binutils-static")
(arguments
- `(#:configure-flags (cons "--disable-gold"
- ,(match (memq #:configure-flags
- (package-arguments binutils))
- ((#:configure-flags flags _ ...)
- flags)))
- #:make-flags ,(match (memq #:make-flags (package-arguments binutils))
- ((#:make-flags flags _ ...)
- flags)
- (_ ''()))
- #:strip-flags '("--strip-all")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'all-static
- (lambda _
- ;; The `-all-static' libtool flag can only be passed
- ;; after `configure', since configure tests don't use
- ;; libtool, and only for executables built with libtool.
- (substitute* '("binutils/Makefile.in"
- "gas/Makefile.in"
- "ld/Makefile.in")
- (("^LDFLAGS =(.*)$" line)
- (string-append line
- "\nAM_LDFLAGS = -static -all-static\n")))
- #t)))))))
+ (list #:configure-flags
+ #~(cons "--disable-gold"
+ #$(match (memq #:configure-flags (package-arguments binutils))
+ ((#:configure-flags flags _ ...)
+ flags)))
+ #:make-flags
+ (match (memq #:make-flags (package-arguments binutils))
+ ((#:make-flags flags _ ...)
+ flags)
+ (_ #~'()))
+ #:strip-flags #~'("--strip-all")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'all-static
+ (lambda _
+ ;; The `-all-static' libtool flag can only be passed after
+ ;; `configure', since configure tests don't use libtool,
+ ;; and only for executables built with libtool.
+ (substitute* '("binutils/Makefile.in"
+ "gas/Makefile.in" "ld/Makefile.in")
+ (("^LDFLAGS =(.*)$" line)
+ (string-append
+ line
+ "\nAM_LDFLAGS = -static -all-static\n"))))))))))
(define %binutils-static-stripped
;; The subset of Binutils that we need.
@@ -447,19 +459,20 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(make-stripped-libc (assoc-ref %outputs "out")
(assoc-ref %build-inputs "libc")
(assoc-ref %build-inputs "kernel-headers")))))
- (inputs `(("kernel-headers"
- ,(if (or (and (%current-target-system)
- (target-hurd? (%current-target-system)))
- (string-suffix? "-hurd" (%current-system)))
- gnumach-headers
- linux-libre-headers))
- ("libc" ,(let ((target (%current-target-system)))
- (if target
- (glibc-for-bootstrap
- (parameterize ((%current-target-system #f))
- (cross-libc target)))
- glibc)))))
- (native-inputs '())
+ (native-inputs
+ `(("libc" ,(let ((target (%current-target-system)))
+ (if target
+ (glibc-for-bootstrap
+ (parameterize ((%current-target-system #f))
+ (cross-libc target)))
+ glibc)))))
+ (inputs
+ `(("kernel-headers"
+ ,(if (or (and (%current-target-system)
+ (target-hurd? (%current-target-system)))
+ (string-suffix? "-hurd" (%current-system)))
+ gnumach-headers
+ linux-libre-headers))))
(propagated-inputs '())
;; Only one output.
@@ -468,12 +481,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %gcc-static
;; A statically-linked GCC, with stripped-down functionality.
(package-with-relocatable-glibc
- (package (inherit gcc-7)
+ (package (inherit gcc)
(name "gcc-static")
(outputs '("out")) ; all in one
(arguments
- (substitute-keyword-arguments (package-arguments gcc-7)
- ((#:modules modules %gnu-build-system-modules)
+ (substitute-keyword-arguments (package-arguments gcc)
+ ((#:modules modules %default-gnu-modules)
`((srfi srfi-1)
(srfi srfi-26)
(ice-9 regex)
@@ -523,7 +536,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inputs
`(("zlib:static" ,zlib "static")
("isl:static" ,isl "static")
- ,@(package-inputs gcc-7)))
+ ,@(package-inputs gcc)))
(native-inputs
(if (%current-target-system)
`(;; When doing a Canadian cross, we need GMP/MPFR/MPC both
@@ -536,13 +549,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
("gmp-native" ,gmp)
("mpfr-native" ,mpfr)
("mpc-native" ,mpc)
- ,@(package-native-inputs gcc-7))
- (package-native-inputs gcc-7))))))
+ ,@(package-native-inputs gcc))
+ (package-native-inputs gcc))))))
(define %gcc-stripped
;; The subset of GCC files needed for bootstrap.
(package
- (inherit gcc-7)
+ (inherit gcc)
(name "gcc-stripped")
(build-system trivial-build-system)
(source #f)
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 780f6bf6d8..3148fcc8a1 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Imran Iqbal <imran@imraniqbal.org>
;;;
@@ -37,6 +37,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system ruby)
#:use-module (guix utils)
+ #:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages dbm)
#:use-module (gnu packages flex)
@@ -127,14 +128,14 @@ a flexible and convenient way.")
(define-public man-db
(package
(name "man-db")
- (version "2.11.1")
+ (version "2.12.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/man-db/man-db-"
version ".tar.xz"))
(sha256
(base32
- "1k5nhy2c33k0p2f1sbb4hxpwrjw6v4scchwykkg4g61la59amarf"))))
+ "15bak56wf99xdr1p3kaish6pkrrvhl6p2rhgzwiasr17la264nj1"))))
(build-system gnu-build-system)
(arguments
(list #:phases
@@ -294,7 +295,7 @@ pages into HTML format.")
(("^PREFIX=.*")
(string-append "PREFIX=" (assoc-ref outputs "out")
"\n"))))))))
- (native-inputs (list perl)) ;used to run tests
+ (native-inputs (list (libc-utf8-locales-for-target) perl)) ;used to run tests
(inputs (list zlib))
(native-search-paths
(list (search-path-specification
@@ -374,11 +375,11 @@ Linux kernel and C library interfaces employed by user-space programs.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f
- ;; The compress-documentation phase doesn't pick up on our manpages as
- ;; its regex doesn't support trailing letters, so manually compress.
- #:make-flags ,#~(list (string-append "prefix=" #$output) "gz")
+ #:make-flags ,#~(list (string-append "prefix=" #$output))
#:license-file-regexp "POSIX-COPYRIGHT"
- #:phases (modify-phases %standard-phases (delete 'configure))))
+ ;; The build phase only compresses documentation, which we already do.
+ #:phases (modify-phases %standard-phases (delete 'configure)
+ (delete 'build))))
(home-page "https://www.kernel.org/doc/man-pages/")
(synopsis "Man pages from the POSIX.1-2013 standard")
(description
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 5a6c6b5b64..f83d26b26b 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
@@ -78,7 +80,7 @@
(define-public mate-common
(package
(name "mate-common")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -86,7 +88,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf"))))
+ "02ms4s6kfxkbghc24rx9g1axdv50rndzdm0s3iz1vxv8wb7c5ds2"))))
(build-system gnu-build-system)
(home-page "https://mate-desktop.org/")
(synopsis "Common files for development of MATE packages")
@@ -98,14 +100,14 @@ MATE applications.")
(define-public mate-power-manager
(package
(name "mate-power-manager")
- (version "1.26.1")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-power-manager-" version ".tar.xz"))
(sha256
- (base32 "0hhhzfmnr9vxz1w34wl7c93qm2npql71mrshpfcbzfh4xli9vk90"))))
+ (base32 "08gf3vvmh335pyrhqaswag77pygqvrn19a59dcrnis07nrscpgcf"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config
@@ -121,10 +123,12 @@ MATE applications.")
cairo
dbus
libnotify
+ mate-desktop
mate-panel
libxrandr
libcanberra
libsecret
+ startup-notification
upower))
(home-page "https://mate-desktop.org/")
(synopsis "Power manager for MATE")
@@ -137,7 +141,7 @@ actions.")
(define-public mate-icon-theme
(package
(name "mate-icon-theme")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -145,7 +149,7 @@ actions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"))))
+ "0fkdk9pqgplmdlsikjb1fp804zcblgpf87cj892zfpfac280gmll"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config intltool icon-naming-utils))
@@ -223,14 +227,14 @@ themes for both gtk+-2 and gtk+-3.")
(define-public mate-desktop
(package
(name "mate-desktop")
- (version "1.26.1")
+ (version "1.28.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-desktop-" version ".tar.xz"))
(sha256
- (base32 "04d2h1y5v225xzwsrf57cy281fr1k3rx70akjdhbs6mc4y56dl8j"))))
+ (base32 "18jajrj5bs98gnx4qjwqa1v48k9bm0c9rbmqw70r3cql41wlpfrj"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config
@@ -238,7 +242,7 @@ themes for both gtk+-2 and gtk+-3.")
`(,glib "bin")
gobject-introspection
yelp-tools
- gtk-doc))
+ gtk-doc/stable))
(inputs
(list gtk+ libxrandr iso-codes startup-notification))
(propagated-inputs
@@ -253,16 +257,14 @@ desktop and the mate-about program.")
(define-public libmateweather
(package
(name "libmateweather")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"libmateweather-" version ".tar.xz"))
(sha256
- (base32 "0fpgc2l46024j2sqqsvclg9c6x33hyjk2zbg5h74v7cf9c7rj062"))
- (patches
- (list (search-patch "libmateweather-use-TZDIR.patch")))))
+ (base32 "1dfj68q3x9camd7h94pcwv8a5969cv5d4p979gcbk4xknpg76hsm"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
@@ -297,14 +299,14 @@ the MATE desktop environment.")
(define-public mate-terminal
(package
(name "mate-terminal")
- (version "1.26.1")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-terminal-" version ".tar.xz"))
(sha256
- (base32 "1l71w64vf49iqaknja2p6h8m3blzq7w76ki7r7l8fy5ly03044vw"))))
+ (base32 "14ly8v4wcz735caw0rdvwrsdgkxlzla1kp5jxjc2gqiakqdfndgi"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config
@@ -336,14 +338,14 @@ configurations (profiles).")
(define-public mate-session-manager
(package
(name "mate-session-manager")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-session-manager-" version ".tar.xz"))
(sha256
- (base32 "0y22plz44pspjk02gasfyv6m6g29lxksp0iqhqy2k77x85j7v32v"))))
+ (base32 "0yrd1acnhp7gl60418532jr77n9br0mky83p0wlnbnm1bdcy8b6k"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--with-elogind"
@@ -378,14 +380,14 @@ configuration program to choose applications starting on login.")
(define-public mate-settings-daemon
(package
(name "mate-settings-daemon")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-settings-daemon-" version ".tar.xz"))
(sha256
- (base32 "0n8q9dg0ascqhskx45l3vb19q06kd3994lhlcsvw4899aidsczk9"))))
+ (base32 "0fhsc505p34zk1bln764fbh7dfq32x0vi0h2zkzrxjd4manwvmsf"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool gobject-introspection))
@@ -417,14 +419,14 @@ configuration program to choose applications starting on login.")
(define-public libmatemixer
(package
(name "libmatemixer")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"libmatemixer-" version ".tar.xz"))
(sha256
- (base32 "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"))))
+ (base32 "1ix0f3c40b535wsvbc9d4q7c6inf5d9ync4m7j76hq3z74ibjwsx"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool gobject-introspection))
@@ -441,14 +443,14 @@ sound systems.")
(define-public libmatekbd
(package
(name "libmatekbd")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"libmatekbd-" version ".tar.xz"))
(sha256
- (base32 "1vdwjyryv1f12yx6np4nrl13vn0v4g8p90zxi3mfwi994n8qv4v3"))))
+ (base32 "03p8dx7n0fi77qdh1r6pi40wqa0ap7w8hk6j0csx68rb7i45hbjx"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool gobject-introspection))
@@ -469,14 +471,14 @@ MATE desktop environment.")
(define-public mate-menus
(package
(name "mate-menus")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-menus-" version ".tar.xz"))
(sha256
- (base32 "130xvpszl1p3407b8annbvj8p0sa9jazxya02z9cfl5nwnd5k3a5"))))
+ (base32 "13ahf1cy9mzasswhnkx8qqmj5ii54338z0k994fss2kggmfcfh6g"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -507,14 +509,14 @@ assorted menu related utility programs.")
(define-public mate-applets
(package
(name "mate-applets")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-applets-" version ".tar.xz"))
(sha256
- (base32 "1hn22xxmkm3s1477war7w7lb7yh77b3251y1why37p3nncfzdf1s"))))
+ (base32 "11k66nfgs403r70isc8ccss994hv9c793zr8r2fzn9nksmmyysqv"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config
@@ -532,7 +534,7 @@ assorted menu related utility programs.")
glib
gucharmap
gtk+
- gtksourceview-3
+ gtksourceview-4
libgtop
libmateweather
libnl
@@ -540,6 +542,7 @@ assorted menu related utility programs.")
libx11
libxml2
libwnck
+ mate-desktop
mate-panel
pango
polkit ; either polkit or setuid
@@ -580,14 +583,14 @@ Interactive Weather Information Network (IWIN).
(define-public mate-media
(package
(name "mate-media")
- (version "1.26.1")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-media-" version ".tar.xz"))
(sha256
- (base32 "02zb4rgahs50pick4nw9xhycshc5kbs1dlnr0ry5r4bd54da5ci8"))))
+ (base32 "04lr7bl0k1m88m1qf2m3wrq3a48wx44cgmb667k5agzn48p11p5w"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool gettext-minimal gobject-introspection))
@@ -612,14 +615,14 @@ mate-volume-control, a MATE volume control application and applet.")
(define-public mate-panel
(package
(name "mate-panel")
- (version "1.26.3")
+ (version "1.28.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0ag03lbslsqva5ycrnv6ksm304s8miav42n7iklsf2s54zai0gzk"))))
+ (base32 "0cxsmp92cpvlvqfjxzc0bmzg0v4hpccxzz84894ih9xa6zl472k7"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@@ -651,6 +654,7 @@ mate-volume-control, a MATE volume control application and applet.")
(list pkg-config intltool itstool xtrans gobject-introspection))
(inputs
(list dconf
+ dconf-editor
cairo
dbus-glib
gtk-layer-shell
@@ -682,7 +686,7 @@ infamous 'Wanda the Fish'.")
(define-public atril
(package
(name "atril")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -690,7 +694,7 @@ infamous 'Wanda the Fish'.")
name "-" version ".tar.xz"))
(sha256
(base32
- "194inkvgsj49pp0f46xfl1mq7kniah15kgviss5a20cprcx62fm5"))))
+ "0qji6nsf0r3rp5x7mah8pafx42dyqcygqsv7cgmc8wcvdrgp5m6f"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list (string-append "--with-openjpeg="
@@ -727,65 +731,71 @@ infamous 'Wanda the Fish'.")
(("gtk-update-icon-cache") "true"))
#t)))))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("intltool" ,intltool)
- ("itstool" ,itstool)
- ("yelp-tools" ,yelp-tools)
- ("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc)
- ("texlive-bin" ,texlive-bin) ;synctex
- ("xmllint" ,libxml2)
- ("zlib" ,zlib)))
+ (list pkg-config
+ intltool
+ itstool
+ yelp-tools
+ (list glib "bin")
+ gobject-introspection
+ gtk-doc/stable
+ texlive-bin ;synctex
+ libxml2
+ zlib))
(inputs
- `(("at-spi2-core" ,at-spi2-core)
- ("cairo" ,cairo)
- ("caja" ,caja)
- ("dconf" ,dconf)
- ("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
- ("djvulibre" ,djvulibre)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("ghostscript" ,ghostscript)
- ("glib" ,glib)
- ("gtk+" ,gtk+)
- ("js-mathjax" ,js-mathjax)
- ("libcanberra" ,libcanberra)
- ("libsecret" ,libsecret)
- ("libspectre" ,libspectre)
- ("libtiff" ,libtiff)
- ("libx11" ,libx11)
- ("libice" ,libice)
- ("libsm" ,libsm)
- ("libgxps" ,libgxps)
- ("libjpeg" ,libjpeg-turbo)
- ("libxml2" ,libxml2)
- ("dogtail" ,python-dogtail)
- ("shared-mime-info" ,shared-mime-info)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("libgnome-keyring" ,libgnome-keyring)
- ("libarchive" ,libarchive)
- ("marco" ,marco)
- ("openjpeg" ,openjpeg)
- ("pango" ,pango)
- ;;("texlive" ,texlive)
- ;; TODO:
- ;; Build libkpathsea as a shared library for DVI support.
- ;; ("libkpathsea" ,texlive-bin)
- ("poppler" ,poppler)
- ("webkitgtk" ,webkitgtk-for-gtk3)))
+ (list at-spi2-core
+ cairo
+ caja
+ dconf
+ dbus
+ dbus-glib
+ djvulibre
+ fontconfig
+ freetype
+ ghostscript
+ glib
+ gtk+
+ js-mathjax
+ libcanberra
+ libsecret
+ libspectre
+ libtiff
+ libx11
+ libice
+ libsm
+ libgxps
+ libjpeg-turbo
+ libxml2
+ mate-desktop
+ python-dogtail
+ shared-mime-info
+ gdk-pixbuf
+ gsettings-desktop-schemas
+ libgnome-keyring
+ libarchive
+ marco
+ openjpeg
+ pango
+ ;;texlive
+ ;; TODO:
+ ;; Build libkpathsea as a shared library for DVI support.
+ ;; ("libkpathsea" ,texlive-bin)
+ poppler
+ startup-notification
+ webkitgtk-for-gtk3))
(home-page "https://mate-desktop.org")
(synopsis "Document viewer for Mate")
(description
- "Document viewer for Mate")
+ "Atril is a simple multi-page document viewer. It can display and print
+@acronym{PostScript, PS}, @acronym{Encapsulated PostScript EPS}, DJVU, DVI, XPS
+and @acronym{Portable Document Format PDF} files. When supported by the
+document, it also allows searching for text, copying text to the clipboard,
+hypertext navigation, and table-of-contents bookmarks.")
(license license:gpl2)))
(define-public caja
(package
(name "caja")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -793,7 +803,7 @@ infamous 'Wanda the Fish'.")
name "-" version ".tar.xz"))
(sha256
(base32
- "01scw5wk4fgps8fk9l7ic2q6p1wplxzsv678wbv010m301pnxz9h"))))
+ "0ylm46wgg7linppid6pdfaixhdb8zgyrxl3lxz17x0am2k718c0y"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags '("--disable-update-mimedb")
@@ -843,24 +853,33 @@ icons on the MATE desktop. It works on local and remote file systems.")
(define-public caja-extensions
(package
(name "caja-extensions")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://mate/" (version-major+minor version) "/"
- "caja-extensions-" version ".tar.xz"))
+ (uri (string-append "mirror://mate/"
+ (version-major+minor version)
+ "/"
+ "caja-extensions-"
+ version
+ ".tar.xz"))
(sha256
- (base32 "086mw7650n8blnr2wkg9xdb6lhwqamcbkk5575i2s90hzbiik72q"))))
+ (base32 "0x9ikq8biaq08wzj0qqpmy8k5w7axqimigfgf7i5z0s00xg6r66j"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--enable-sendto"
;; TODO: package "gupnp" to enable 'upnp', package
;; "gksu" to enable 'gksu'.
- (string-append "--with-sendto-plugins=removable-devices,"
- "caja-burn,emailclient,pidgin,gajim")
+ (string-append
+ "--with-sendto-plugins=removable-devices,"
+ "caja-burn,emailclient,pidgin,gajim")
"--enable-image-converter"
- "--enable-open-terminal" "--enable-share"
- "--enable-wallpaper" "--enable-xattr-tags"
+ "--enable-open-terminal"
+ "--enable-share"
+ "--enable-wallpaper"
+ "--enable-xattr-tags"
+ "--enable-av=yes"
+
(string-append "--with-cajadir="
(assoc-ref %outputs "out")
"/lib/caja/extensions-2.0/"))))
@@ -869,7 +888,7 @@ icons on the MATE desktop. It works on local and remote file systems.")
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc)
+ ("gtk-doc" ,gtk-doc/stable)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)))
(inputs
@@ -879,6 +898,7 @@ icons on the MATE desktop. It works on local and remote file systems.")
dbus
dbus-glib
gajim ;runtime only?
+ gst-plugins-base
gtk+
graphicsmagick
mate-desktop
@@ -896,17 +916,21 @@ icons on the MATE desktop. It works on local and remote file systems.")
(define-public mate-control-center
(package
(name "mate-control-center")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-control-center-" version ".tar.xz"))
(sha256
- (base32 "022nbgdvhfjj9zdy9zaiagigh3f8r0dzfz4gqmpsayk57cm4jpz0"))))
+ (base32 "1g0lg4x3idilaxhwq1s90pajkvv9i012kzrnk0pxqj2jzl2cgwpb"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'use-elogind-as-systemd
+ (lambda _
+ (substitute* "configure"
+ (("systemd") "libelogind"))))
(add-before 'build 'fix-polkit-action
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure the polkit file refers to the right
@@ -933,11 +957,14 @@ icons on the MATE desktop. It works on local and remote file systems.")
("dconf" ,dconf)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
+ ("elogind" ,elogind)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
("gtk+" ,gtk+)
+ ("libappindicator" ,libappindicator)
("libcanberra" ,libcanberra)
+ ("libgtop" ,libgtop)
("libmatekbd" ,libmatekbd)
("libx11" ,libx11)
("libxcursor" ,libxcursor)
@@ -954,7 +981,8 @@ icons on the MATE desktop. It works on local and remote file systems.")
("mate-settings-daemon" ,mate-settings-daemon)
("pango" ,pango)
("polkit" ,polkit)
- ("startup-notification" ,startup-notification)))
+ ("startup-notification" ,startup-notification)
+ ("udisks" ,udisks)))
(propagated-inputs
(list (librsvg-for-system))) ;mate-slab.pc
(home-page "https://mate-desktop.org/")
@@ -967,14 +995,14 @@ of various aspects of your desktop.")
(define-public marco
(package
(name "marco")
- (version "1.26.2")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "18q71r4bkrldscp414qm0457i0jnk841wwc490qg0whhzraa5w8j"))))
+ (base32 "1qf219zmg6m1kf6xlx66h65yq3gxz3hc6fj995lcv0791vjfb5i4"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config
@@ -1017,7 +1045,7 @@ for use with MATE or as a standalone window manager.")
(define-public mate-user-guide
(package
(name "mate-user-guide")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -1025,7 +1053,7 @@ for use with MATE or as a standalone window manager.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0by2gzvhx3ksb9shw9374a7dsjpchn79jf248a8g6bvznxscj12x"))))
+ "17jb0537xzlhiilzjzjgy6lx7j0w4bjppav1xla4cm06yla0ivsk"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -1056,14 +1084,14 @@ sessions, panels, menus, file management, and preferences.")
(define-public mate-calc
(package
(name "mate-calc")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-calc-" version ".tar.xz"))
(sha256
- (base32 "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y"))))
+ (base32 "1x98wsjssmbkxqvl95xgp5r99cdq5adxl5pq9bkv2r183rfi4jw0"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list gettext-minimal intltool pkg-config yelp-tools))
@@ -1085,7 +1113,7 @@ sessions, panels, menus, file management, and preferences.")
(define-public mate-backgrounds
(package
(name "mate-backgrounds")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -1093,7 +1121,7 @@ sessions, panels, menus, file management, and preferences.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"))))
+ "0hv97805gb89v64f90laskq4h483lgpvd9m54an0ggc64k8azlah"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list intltool))
@@ -1146,14 +1174,14 @@ Re-decorates windows on un-maximise.
(define-public mate-screensaver
(package
(name "mate-screensaver")
- (version "1.26.2")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-screensaver-" version ".tar.xz"))
(sha256
- (base32 "0zpzlmbb6m2hqsr67rc6mqpabl1idpzfqzlj4ifxanql4k7015ys"))))
+ (base32 "0w7awc8a9q2hsqz51p2zln4adb6l7zk57aql07hrabsaz2l283va"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@@ -1216,7 +1244,7 @@ can be used as backgrounds in the MATE Desktop environment.")
(define-public mate-utils
(package
(name "mate-utils")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
@@ -1224,11 +1252,15 @@ can be used as backgrounds in the MATE Desktop environment.")
name "-" version ".tar.xz"))
(sha256
(base32
- "08066w98y45ilna6sn2kj8jnyhafra7sbpfrjdddv48939dlflrg"))))
+ "1lw85zr38666y5zywsy2gzs9f7n2k1z9zjkq7gq0z40x1mx9si2q"))))
(build-system glib-or-gtk-build-system)
+ (arguments
+ ;; Newer itstool does the following--and that causes parallel builds to fail:
+ ;; <https://github.com/itstool/itstool/commit/d3adf0264ee2b6fd28b7eff7dec33501d6e75a7c>
+ (list #:parallel-build? #f))
(native-inputs
(list gettext-minimal
- gtk-doc
+ gtk-doc/stable
intltool
libice
libsm
@@ -1246,8 +1278,10 @@ can be used as backgrounds in the MATE Desktop environment.")
libgtop
libx11
libxext
+ mate-desktop
mate-panel
pango
+ startup-notification
udisks
zlib))
(home-page "https://mate-desktop.org/")
@@ -1269,18 +1303,18 @@ can be used as backgrounds in the MATE Desktop environment.")
(define-public eom
(package
(name "eom")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"eom-" version ".tar.xz"))
(sha256
- (base32 "0q4r9f3dcb6w6fia06sm9h3lzpq86gj13clzw1i6qzjg94li49dm"))))
+ (base32 "1g1sspnj7r077bfaywj6qhq4gvc2y7jylrf8b1r8q6jsk6rcl0cs"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list gettext-minimal
- gtk-doc
+ gtk-doc/stable
gobject-introspection
intltool
pkg-config
@@ -1317,14 +1351,14 @@ can be used as backgrounds in the MATE Desktop environment.")
(define-public engrampa
(package
(name "engrampa")
- (version "1.26.1")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"engrampa-" version ".tar.xz"))
(sha256
- (base32 "0jkci8gaxrx978laqj9ayx62r05czajqmry915iymsd4lw3l28ph"))))
+ (base32 "0siqhm6vh0lwx0qh7v4asn4m15ac9g93hm97iymfw24brydlqp4w"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--disable-schemas-compile"
@@ -1344,7 +1378,7 @@ can be used as backgrounds in the MATE Desktop environment.")
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
- ("gtk-doc" ,gtk-doc)
+ ("gtk-doc" ,gtk-doc/stable)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("yelp-tools" ,yelp-tools)))
@@ -1369,14 +1403,14 @@ can be used as backgrounds in the MATE Desktop environment.")
(define-public pluma
(package
(name "pluma")
- (version "1.26.1")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1wcl74pbmgwcrlm5vfmv1g8klxni1qnj0kgnb5k113hisziyqnar"))))
+ (base32 "1m51cmcl6z68bx37zhi72wfl58kq9bg7xcih1sjr6l1li6axz2ma"))))
(build-system glib-or-gtk-build-system)
(arguments
`(; Tests can not succeed.
@@ -1384,7 +1418,7 @@ can be used as backgrounds in the MATE Desktop environment.")
#:tests? #f))
(native-inputs
`(("gettext" ,gettext-minimal)
- ("gtk-doc" ,gtk-doc)
+ ("gtk-doc" ,gtk-doc/stable)
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("libtool" ,libtool)
@@ -1405,10 +1439,12 @@ can be used as backgrounds in the MATE Desktop environment.")
libpeas
libxml2
libice
+ mate-desktop
packagekit
pango
python
- scrollkeeper))
+ scrollkeeper
+ startup-notification))
(home-page "https://mate-desktop.org/")
(synopsis "Text Editor for MATE")
(description
@@ -1418,15 +1454,17 @@ can be used as backgrounds in the MATE Desktop environment.")
(define-public mate-system-monitor
(package
(name "mate-system-monitor")
- (version "1.26.0")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-system-monitor-" version ".tar.xz"))
(sha256
- (base32 "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3"))))
+ (base32 "09asjqln7sn6rbqy8anwfnnf5wfnhdwm9xhkphg3dd8gp7b67mj2"))))
(build-system glib-or-gtk-build-system)
+ (arguments
+ `(#:configure-flags '("--enable-systemd=no")))
(native-inputs
(list autoconf gettext-minimal intltool pkg-config yelp-tools))
(inputs
@@ -1453,7 +1491,7 @@ MATE Desktop to monitor your system resources and usage.")
(define-public mate-polkit
(package
(name "mate-polkit")
- (version "1.26.1")
+ (version "1.28.1")
(source
(origin
(method url-fetch)
@@ -1461,10 +1499,10 @@ MATE Desktop to monitor your system resources and usage.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0mq3a9ab4fxpkah6c5p7a0zsy8cixfc5j9030k204cy5vysv1dzm"))))
+ "1s2ac2p5smiwr7lf4snciyb9waclychjmzrw32f2qspdm381s2im"))))
(build-system glib-or-gtk-build-system)
(native-inputs
- (list gettext-minimal gtk-doc intltool libtool pkg-config))
+ (list gettext-minimal gtk-doc/stable intltool libtool pkg-config))
(inputs
(list accountsservice
glib
@@ -1496,6 +1534,33 @@ used to bring up authentication dialogs.")
(rename-file old new)))))))
(properties `((hidden? . #t)))))
+
+(define-public mozo
+ (package
+ (name "mozo")
+ (version "1.28.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://mate/" (version-major+minor version) "/"
+ "mozo-" version ".tar.xz"))
+ (sha256
+ (base32 "0929yk7g7103d18p400ysi19pqrxl3dyzg4l0mnw7a3azm7ri67y"))))
+ (build-system glib-or-gtk-build-system)
+ (native-inputs
+ (list pkg-config))
+ (inputs
+ (list gettext-minimal
+ mate-menus
+ python
+ python-pygobject))
+ (home-page "https://mate-desktop.org/")
+ (synopsis "Menu editor for MATE")
+ (description "Mozo is a menu editor for MATE using the freedesktop.org
+menu specification.")
+ (license (list license:lgpl2.1+))))
+
+
(define-public mate
(package
(name "mate")
@@ -1525,6 +1590,7 @@ used to bring up authentication dialogs.")
caja
dbus
dconf
+ dconf-editor
engrampa
eom
font-abattis-cantarell
@@ -1554,6 +1620,7 @@ used to bring up authentication dialogs.")
mate-polkit
mate-system-monitor
mate-utils
+ mozo
pluma
pinentry-gnome3
pulseaudio
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 71a7146c89..f3f799421a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023, 2024 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2014-2022 Eric Bavier <bavier@posteo.net>
@@ -22,7 +22,7 @@
;;; Copyright © 2017, 2019, 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
-;;; Copyright © 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Nadya Voronova <voronovank@gmail.com>
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
@@ -63,6 +63,9 @@
;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;; Copyright © 2023 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -221,14 +224,14 @@ beginners.")
(define-public bitwise
(package
(name "bitwise")
- (version "0.43")
+ (version "0.50")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mellowcandle/bitwise"
"/releases/download/v" version
"/bitwise-v" version ".tar.gz"))
(sha256
- (base32 "1yrgrbfgp6cavc6gyfp9b0zgjf9p1g7xhwzn9pydw44a32agf97m"))))
+ (base32 "0zp9rb0qv1m9hk593sc08jajkxd80h075s0m0dhf07gkbgx72ql0"))))
(build-system gnu-build-system)
(inputs
(list ncurses readline))
@@ -305,6 +308,40 @@ programmatic functions.")
(home-page "http://www.isthe.com/chongo/tech/comp/calc/")
(license license:lgpl2.1)))
+(define-public chuffed
+ (package
+ (name "chuffed")
+ (version "0.13.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chuffed/chuffed")
+ (commit version)))
+ (sha256
+ (base32
+ "164brmwn71p9gb2441kh7b1gzmy2sg7bjv5z00wjs9nw41qc908g"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:tests? #f ;no 'test' target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'patch-msc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "chuffed.msc"
+ (("\\.\\./../..") out)
+ (("\\.\\.")
+ (string-append out "/share/minizinc")))))))))
+ (synopsis "Lazy clause generation solver")
+ (description
+ "Chuffed is a state of the art lazy clause solver designed from the
+ground up with lazy clause generation in mind. Lazy clause generation
+is a hybrid approach to constraint solving that combines features of
+finite domain propagation and Boolean satisfiability.")
+ (home-page "https://github.com/chuffed/chuffed")
+ (license license:expat)))
+
(define-public coda
(package
(name "coda")
@@ -435,9 +472,10 @@ programming language.")
"0w3kl58y7fq9paaq8ayn5gwylc4n8jbk6lf42kkcj9ar4i8v8myr"))))
(build-system gnu-build-system)
(inputs
- `(("readline" ,readline)
- ("python" ,python-wrapper) ;for 'units_cur' script
- ("python-requests" ,python-requests)))
+ (list bash-minimal ;for wrap-program
+ readline
+ python-wrapper ;for 'units_cur' script
+ python-requests))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-units_cur
@@ -446,8 +484,8 @@ programming language.")
(bin (string-append out "/bin")))
(wrap-program (string-append bin "/units_cur")
`("GUIX_PYTHONPATH" ":" prefix
- ,(search-path-as-string->list (getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ ,(search-path-as-string->list
+ (getenv "GUIX_PYTHONPATH"))))))))))
(synopsis "Conversion between thousands of scales")
(description
"GNU Units converts numeric quantities between units of measure. It
@@ -455,8 +493,8 @@ can handle scale changes through adaptive usage of standard scale
prefixes (micro-, kilo-, etc.). It can also handle nonlinear
conversions such as Fahrenheit to Celsius. Its interpreter is powerful
enough to be used effectively as a scientific calculator.")
- (license license:gpl3+)
- (home-page "https://www.gnu.org/software/units/")))
+ (license license:gpl3+)
+ (home-page "https://www.gnu.org/software/units/")))
(define-public double-conversion
(package
@@ -687,56 +725,71 @@ precision floating point numbers.")
(sha256
(base32
"0jxkxrnpys2j3rh8bzx0bmnh4w6xm28jd57rgxsjp0s863agpc6w"))))
+ (outputs '("out" "static"))
(build-system gnu-build-system)
(arguments
- (let ((system (%current-system)))
- `(#:configure-flags (list "--disable-static") ;halves package size
- #:phases
- (modify-phases %standard-phases
- ,@(cond
- ((and (target-riscv64?)
- (%current-target-system))
- '((add-after 'unpack 'force-bootstrap
- (lambda _
- ;; gsl ships with an old configure script that does not
- ;; support riscv64. Regenerate it.
- (delete-file "configure")))))
-
- ((or (string-prefix? "aarch64" system)
- (string-prefix? "powerpc" system))
- ;; Some sparse matrix tests are failing on AArch64 and PowerPC:
- ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html
- '((add-before 'check 'disable-failing-tests
- (lambda _
- (substitute* "spmatrix/test.c"
- ((".*test_complex.*") "\n"))))))
-
- ((string-prefix? "i686" system)
- ;; There are rounding issues with these tests on i686:
- ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html
- ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html
- '((add-before 'check 'disable-failing-tests
- (lambda _
- (substitute* "linalg/test.c"
- ((".*gsl_test\\(test_LU_decomp.*") "\n")
- ((".*gsl_test\\(test_LUc_decomp.*") "\n")
- ((".*gsl_test\\(test_QR_decomp_r.*") "\n")
- ((".*gsl_test\\(test_cholesky_decomp.*") "\n")
- ((".*gsl_test\\(test_pcholesky_solve.*") "\n")
- ((".*gsl_test\\(test_COD_lssolve2.*") "\n"))
- (substitute* "spmatrix/test.c"
- ((".*test_all.*") "\n")
- ((".*test_float.*") "\n")
- ((".*test_complex.*") "\n"))
-
- ;; XXX: These tests abort with:
- ;; gsl: cholesky.c:645: ERROR: matrix is not positive definite
- (substitute* '("multifit_nlinear/test.c"
- "multilarge_nlinear/test.c")
- (("gsl_ieee_env_setup.*" all)
- (string-append "exit (77);\n" all)))))))
-
- (else '()))))))
+ (list ;; FIXME: Setting CFLAGS=-fPIC is not only unnecessary, it's also
+ ;; harmful because it removes the default '-O2 -g', meaning that the
+ ;; library ends up being compiled as -O0. Consequently, some
+ ;; numerical tests fail, notably on i686-linux. TODO: Remove
+ ;; 'CFLAGS=-fPIC' for all systems and revisit or remove
+ ;; 'disable-failing-tests' phases accordingly.
+ #:make-flags (if (and (not (%current-target-system))
+ (string=? (%current-system) "i686-linux"))
+ #~'()
+ #~(list "CFLAGS=-fPIC"))
+ #:phases
+ #~(modify-phases %standard-phases
+ #$@(cond
+ ((and (target-riscv64?)
+ (%current-target-system))
+ #~((add-after 'unpack 'force-bootstrap
+ (lambda _
+ ;; gsl ships with an old configure script that does not
+ ;; support riscv64. Regenerate it.
+ (delete-file "configure")))))
+
+ ((or (string-prefix? "aarch64" (%current-system))
+ (string-prefix? "powerpc" (%current-system)))
+ ;; Some sparse matrix tests are failing on AArch64 and PowerPC:
+ ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html
+ #~((add-before 'check 'disable-failing-tests
+ (lambda _
+ (substitute* "spmatrix/test.c"
+ ((".*test_complex.*")
+ "\n"))))))
+
+ ((string-prefix? "i686" (%current-system))
+ ;; There are rounding issues with these tests on i686:
+ ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html
+ ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html
+ #~((add-before 'check 'disable-failing-tests
+ (lambda _
+ (substitute* "spmatrix/test.c"
+ ((".*test_all.*") "\n")
+ ((".*test_float.*") "\n")
+ ((".*test_complex.*") "\n"))
+
+ ;; XXX: These tests abort with:
+ ;; gsl: cholesky.c:645: ERROR: matrix is not positive definite
+ (substitute* '("multifit_nlinear/test.c"
+ "multilarge_nlinear/test.c")
+ (("gsl_ieee_env_setup.*" all)
+ (string-append "exit (77);\n" all)))))))
+
+ (else #~()))
+ (add-after 'install 'move-static-library
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((static (string-append (assoc-ref outputs
+ "static")
+ "/lib/"))
+ (out (string-append (assoc-ref outputs "out")
+ "/lib/")))
+ (mkdir-p static)
+ (rename-file (string-append out "libgsl.a")
+ (string-append static "libgsl.a"))
+ (rename-file (string-append out "libgslcblas.a")
+ (string-append static "libgslcblas.a"))))))))
(native-inputs
(if (and (target-riscv64?)
(%current-target-system))
@@ -756,15 +809,6 @@ numbers.")
(license license:gpl3+)))
-;; TODO: Merge back into the gsl package as a separate output.
-(define-public gsl-static
- (package/inherit gsl
- (name "gsl-static")
- (arguments
- `(,@(package-arguments gsl)
- #:configure-flags (list "--disable-shared")
- #:make-flags (list "CFLAGS=-fPIC")))))
-
(define-public sleef
(package
(name "sleef")
@@ -839,6 +883,63 @@ LP/MIP solver is included in the package.")
(base32
"040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"))))))
+(define-public python-libensemble
+ (package
+ (name "python-libensemble")
+ (version "1.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "libensemble" version))
+ (sha256
+ (base32 "0qxb0sn624jaxjxg2ayd65zaiq1p043w3kk55w8r6drkjiar70yj"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list ncurses
+ python-mock
+ python-mpi4py
+ python-pytest
+ python-pytest-cov
+ python-pytest-timeout))
+ (propagated-inputs (list python-mpmath
+ python-numpy
+ python-psutil
+ python-pydantic-2
+ python-pyyaml
+ python-tomli))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-psutil
+ (lambda _
+ (substitute* "setup.py"
+ (("psutil>=5.9.4") "psutil>=5.9.2"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; These files require MPI and call subprocesses.
+ (delete-file
+ "libensemble/tests/unit_tests/test_executor.py")
+ (delete-file
+ "libensemble/tests/unit_tests/test_executor_gpus.py")
+ ;; This file has one failing MPI test but since tests run from
+ ;; a shell script, they can't be disabled individually.
+ ;; Failing test: 'test_ensemble_prevent_comms_overwrite'
+ (delete-file "libensemble/tests/unit_tests/test_ensemble.py")
+ (setenv "TERM" "xterm")
+ ;; A very bad way to skip another MPI test.
+ (substitute* "libensemble/tests/run-tests.sh"
+ (("export UNIT_TEST_MPI_SUBDIR=.*")
+ "export UNIT_TEST_MPI_SUBDIR=''"))
+ ;; Run only unit tests, regression tests require MPI.
+ (invoke "bash" "libensemble/tests/run-tests.sh" "-u")))))))
+ (home-page "https://github.com/Libensemble/libensemble")
+ (synopsis "Toolkit for dynamic ensembles of calculations")
+ (description "@code{libensemble} is a complete toolkit for dynamic
+ensembles of calculations. It connects @code{deciders} to experiments or
+simulations.")
+ (license license:bsd-3)))
+
(define-public linasm
(package
(name "linasm")
@@ -1271,7 +1372,7 @@ singular value problems.")
`("PERL5LIB" ":" suffix (,PERL5LIB))
`("PATH" ":" suffix (,(dirname gnuplot))))))))))
(inputs
- (list gnuplot perl-list-moreutils vnlog))
+ (list bash-minimal gnuplot perl-list-moreutils vnlog))
(native-inputs
;; For tests.
(list perl-ipc-run perl-string-shellquote))
@@ -1311,19 +1412,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"
@@ -1370,7 +1471,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
@@ -1379,7 +1480,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"
@@ -1397,7 +1498,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
@@ -1406,7 +1507,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")))
@@ -1725,7 +1826,7 @@ extremely large and complex data collections.")
(define-public hdf5-1.14
(package
(inherit hdf5-1.8)
- (version "1.14.0")
+ (version "1.14.3")
(source
(origin
(method url-fetch)
@@ -1739,8 +1840,19 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2")))
(sha256
- (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4"))
- (patches (search-patches "hdf5-config-date.patch"))))))
+ (base32 "05zr11y3bivfwrbvzbky1q2gjf6r7n92cvvdnh5jilbmxljg49cl"))
+ (patches (search-patches "hdf5-config-date.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments hdf5-1.8)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'configure 'skip-version-test
+ (lambda _
+ ;; Skip test_check_version since the 'patch-settings' phase
+ ;; modifies the test reference.
+ (substitute* "test/test_check_version.sh.in"
+ (("TESTING\\(\\).*" all)
+ (string-append all "\nSKIP; exit 0\n")))))))))))
(define-public hdf5
;; Default version of HDF5.
@@ -1980,35 +2092,34 @@ Swath).")
(license (license:non-copyleft home-page))))
(define-public hdf5-parallel-openmpi
- (package/inherit hdf5-1.10 ;use the latest
+ (package/inherit hdf5-1.14 ;use the latest
(name "hdf5-parallel-openmpi")
(inputs
`(("mpi" ,openmpi)
,@(package-inputs hdf5)))
(arguments
- (substitute-keyword-arguments (package-arguments hdf5)
+ (substitute-keyword-arguments (package-arguments hdf5-1.14)
((#:configure-flags flags)
- ``("--enable-parallel"
- ,@(delete "--enable-cxx"
- (delete "--enable-threadsafe" ,flags))))
+ #~(cons "--enable-parallel"
+ (delete "--enable-cxx"
+ (delete "--enable-threadsafe" #$flags))))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'build 'mpi-setup
- ,%openmpi-setup)
- (add-before 'check 'patch-tests
- (lambda _
- ;; OpenMPI's mpirun will exit with non-zero status if it
- ;; detects an "abnormal termination", i.e. any process not
- ;; calling MPI_Finalize(). Since the test is explicitly
- ;; avoiding MPI_Finalize so as not to have at_exit and thus
- ;; H5C_flush_cache from being called, mpirun will always
- ;; complain, so turn this test off.
- (substitute* "testpar/Makefile"
- (("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back)
- (string-append front back "\n")))
- (substitute* "tools/test/h5diff/testph5diff.sh"
- (("/bin/sh") (which "sh")))
- #t))))))
+ #~(modify-phases #$phases
+ (add-after 'build 'mpi-setup
+ #$%openmpi-setup)
+ (add-before 'check 'patch-tests
+ (lambda _
+ ;; OpenMPI's mpirun will exit with non-zero status if it
+ ;; detects an "abnormal termination", i.e. any process not
+ ;; calling MPI_Finalize(). Since the test is explicitly
+ ;; avoiding MPI_Finalize so as not to have at_exit and thus
+ ;; H5C_flush_cache from being called, mpirun will always
+ ;; complain, so turn this test off.
+ (substitute* "testpar/Makefile"
+ (("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back)
+ (string-append front back "\n")))
+ (substitute* "tools/test/h5diff/testph5diff.sh"
+ (("/bin/sh") (which "sh")))))))))
(synopsis "Management suite for data with parallel IO support")))
(define-public hdf5-blosc
@@ -2614,73 +2725,79 @@ and quadratic objectives using the Simplex algorithm.")
(license license:epl1.0)))
(define-public gecode
- (package
- (name "gecode")
- (version "6.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Gecode/gecode")
- (commit (string-append "release-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; delete generated sources
- (for-each delete-file
- '("gecode/kernel/var-imp.hpp"
- "gecode/kernel/var-type.hpp"))))))
- (outputs '("out" "examples"))
- (build-system gnu-build-system)
- (arguments
- `(#:configure-flags
- (list (string-append "GLDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib")
- "--enable-examples=no")
- #:modules ((guix build gnu-build-system)
- (guix build utils)
- (ice-9 rdelim)
- (ice-9 popen))
- #:phases
- (modify-phases %standard-phases
- (add-after 'build 'build-examples
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "make" "compileexamples")))
- ;; The Makefile disrespects GLDFLAGS for some reason, so we have to
- ;; patch it ourselves... *sigh*
- (add-after 'install 'fix-rpath
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((libdir (string-append (assoc-ref outputs "out") "/lib")))
- (for-each
- (lambda (file)
- (let* ((pipe (open-pipe* OPEN_READ "patchelf"
- "--print-rpath" file))
- (line (read-line pipe)))
- (and (zero? (close-pipe pipe))
- (invoke "patchelf" "--set-rpath"
- (string-append libdir ":" line)
- file))))
- (find-files libdir ".*\\.so$")))))
- (add-after 'install 'install-examples
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "make" "installexamples"
- (string-append "bindir=" (assoc-ref outputs "examples")
- "/bin"))))
- ;; Tests depend on installed libraries.
- (delete 'check)
- (add-after 'fix-rpath 'check
- (assoc-ref %standard-phases 'check)))))
- (native-inputs
- (list patchelf perl sed))
- (home-page "https://www.gecode.org")
- (synopsis "Toolkit for developing constraint-based systems")
- (description "Gecode is a C++ toolkit for developing constraint-based
-systems and applications. It provides a modular and extensible solver.")
- (license license:expat)))
+ (let* ((commit "f7f0d7c273d6844698f01cec8229ebe0b66a016a")
+ (version (git-version "6.2.0" "1" commit)))
+ (package
+ (name "gecode")
+ (version version)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Gecode/gecode")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16gzwa64w90vifaflmii515rsrqclf2y7nziq621m4ad9cjgcixj"))
+ (modules '((guix build utils)))
+ ;; delete generated sources
+ (snippet '(for-each delete-file
+ '("gecode/kernel/var-imp.hpp"
+ "gecode/kernel/var-type.hpp")))))
+ (outputs '("out" "examples"))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list (string-append "GLDFLAGS=-Wl,-rpath="
+ #$output "/lib")
+ "--enable-examples=no")
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 rdelim)
+ (ice-9 popen))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'patch-msc-and-version
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "tools/flatzinc/gecode.msc.in"
+ (("\\.\\./../..") out)
+ (("\\.\\.")
+ (string-append out "/share/minizinc")))
+ (substitute* "configure"
+ (("(PACKAGE_[^0-9]*)[0-9\\.]+" all match)
+ (string-append match #$version))))))
+ (add-after 'build 'build-examples
+ (lambda _
+ (invoke "make" "compileexamples")))
+ ;; The Makefile disrespects GLDFLAGS for some reason,
+ ;; so we have to patch it ourselves.
+ (add-after 'install 'fix-rpath
+ (lambda _
+ (let ((libdir (string-append #$output "/lib")))
+ (for-each
+ (lambda (file)
+ (let* ((pipe (open-pipe* OPEN_READ "patchelf"
+ "--print-rpath" file))
+ (line (read-line pipe)))
+ (and (zero? (close-pipe pipe))
+ (invoke "patchelf" "--set-rpath"
+ (string-append libdir ":" line)
+ file))))
+ (find-files libdir ".*\\.so$")))))
+ (add-after 'install 'install-examples
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((examples (assoc-ref outputs "examples"))
+ (bindir (format #f "bindir=~a/bin" examples)))
+ (invoke "make" "installexamples" bindir)))))))
+ (native-inputs (list patchelf perl sed))
+ (home-page "https://www.gecode.org")
+ (synopsis "Toolkit for developing constraint-based systems")
+ (description
+ "Gecode is a C++ toolkit for developing constraint-based systems
+and applications. It provides a modular and extensible solver.")
+ (license license:expat))))
(define-public libfixmath
(let ((commit "1416c9979635c69f344d3c1de84b3246001a6540")
@@ -2926,7 +3043,7 @@ can solve two kinds of problems:
(define-public octave-cli
(package
(name "octave-cli")
- (version "9.1.0")
+ (version "9.2.0")
(source
(origin
(method url-fetch)
@@ -2934,7 +3051,7 @@ can solve two kinds of problems:
version ".tar.xz"))
(sha256
(base32
- "0jqk3amfkqzn1c5rzb9gm3v7r2y5xcgx6cgi4r5w8mpa9814nrgd"))))
+ "01sqfqrglzkjp20sg45fjd43hbjj069a1gn0r8sv01ciazxplh91"))))
(build-system gnu-build-system)
(inputs
(list alsa-lib
@@ -3335,8 +3452,7 @@ ASCII text files using Gmsh's own scripting language.")
(add-after 'unpack 'fix-sip-dir
(lambda _
(substitute* "pyqtdistutils.py"
- (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir"))
- #t))
+ (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir"))))
;; Now we have to pass the correct sip_dir to setup.py.
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
@@ -3344,8 +3460,7 @@ ASCII text files using Gmsh's own scripting language.")
((@@ (guix build python-build-system) call-setuppy)
"build_ext"
(list (string-append "--sip-dir="
- (search-input-directory inputs "share/sip")))
- #t)))
+ (search-input-directory inputs "share/sip"))))))
;; Ensure that icons are found at runtime.
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -3359,7 +3474,8 @@ ASCII text files using Gmsh's own scripting language.")
;;("python-astropy" ,python-astropy) ;; FIXME: Package this.
qttools-5 python-sip-4))
(inputs
- (list ghostscript ;optional, for EPS/PS output
+ (list bash-minimal
+ ghostscript ;optional, for EPS/PS output
python-dbus
python-h5py ;optional, for HDF5 data
python-pyqt
@@ -3434,7 +3550,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.
@@ -3449,6 +3566,11 @@ September 2004}")
(let* ((prefix (assoc-ref outputs "out"))
(flags `(,(string-append "--prefix=" prefix)
,@configure-flags)))
+ ;; Sort source files in configure (for reproducibility).
+ (substitute* "config/gmakegen.py"
+ (("join\\(srcs\\[lang\\]\\)")
+ "join(sorted(srcs[lang]))"))
+
(format #t "build directory: ~s~%" (getcwd))
(format #t "configure flags: ~s~%" flags)
(apply invoke "./configure" flags)
@@ -3463,8 +3585,8 @@ September 2004}")
(substitute* (find-files "." "^petsc(conf|machineinfo).h$")
;; Prevent build directory from leaking into compiled code
(((getcwd)) out)
- ;; Scrub timestamp for reproducibility
- ((".*Libraries compiled on.*") ""))
+ (("Machine characteristics: Linux-[0-9]+\\.[0-9]+\\.[0-9]+")
+ "Machine characteristics: Linux-x.x.x"))
(substitute* (find-files "." "petscvariables")
;; Do not expose build machine characteristics, set to defaults.
(("MAKE_NP = [:digit:]+") "MAKE_NP = 2")
@@ -3997,7 +4119,7 @@ book.")
(define-public minizinc
(package
(name "minizinc")
- (version "2.5.5")
+ (version "2.8.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4006,7 +4128,7 @@ book.")
(file-name (git-file-name name version))
(sha256
(base32
- "10b2hsl1fx9psh0iagmp8ki3f60f3qg5hmvra5aczjlfmbl88ggp"))
+ "03iliizyadd0wvx6a63rg22lb6p4m6krhlpfm2hfzwj66y3a76j6"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
@@ -4028,9 +4150,9 @@ book.")
(lambda (file)
(member file (cons* "." ".." targets)))
(scandir ".")))
- (substitute* "libmzn.cmake"
- (("include\\(cmake/targets/(.*)\\)" all target)
- (if (member target targets) all "")))))
+ (substitute* "libmzn.cmake"
+ (("include\\(cmake/targets/(.*)\\)" all target)
+ (if (member target targets) all "")))))
(with-directory-excursion "include/minizinc/solvers/MIP"
(for-each delete-file
(remove
@@ -4061,17 +4183,19 @@ book.")
#t))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no ‘check’ target
- #:modules ((guix build cmake-build-system)
- (guix build utils)
- (srfi srfi-1))
+ (list
+ #:tests? #f ; no ‘check’ target
+ #:modules '((guix build cmake-build-system)
+ (guix build utils)
+ (srfi srfi-1))
#:phases
- (modify-phases %standard-phases
+ #~(modify-phases %standard-phases
(add-after 'install 'install-solver-configs
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((gecode (assoc-ref inputs "gecode"))
- (pkgdatadir (string-append (assoc-ref outputs "out")
- "/share/minizinc")))
+ (lambda _
+ (let ((chuffed #$(this-package-input "chuffed"))
+ (gecode #$(this-package-input "gecode"))
+ (pkgdatadir (string-append #$output
+ "/share/minizinc")))
(call-with-output-file (string-append pkgdatadir
"/Preferences.json")
(lambda (port)
@@ -4085,35 +4209,16 @@ book.")
}"
port)
(newline port)))
-
- (mkdir-p (string-append pkgdatadir "/solvers"))
- (call-with-output-file (string-append pkgdatadir
- "/solvers/gecode.msc")
- (lambda (port)
- (format port
- "\
-{
- \"id\": \"org.gecode.gecode\",
- \"name\": \"Gecode\",
- \"description\": \"Gecode FlatZinc executable\",
- \"version\": ~s,
- \"mznlib\": ~s,
- \"executable\": ~s,
- \"supportsMzn\": false,
- \"supportsFzn\": true,
- \"needsSolns2Out\": true,
- \"needsMznExecutable\": false,
- \"needsStdlibDir\": false,
- \"isGUIApplication\": false
-}"
- (last (string-split gecode #\-))
- (string-append gecode "/share/gecode/mznlib")
- (string-append gecode "/bin/fzn-gecode"))
- (newline port)))))))))
+ (for-each
+ (lambda (solver)
+ (copy-recursively
+ (string-append solver "/share/minizinc/solvers")
+ (string-append pkgdatadir "/solvers")))
+ (list gecode chuffed))))))))
(native-inputs
(list bison flex))
(inputs
- (list cbc gecode zlib))
+ (list cbc chuffed gecode zlib))
(home-page "https://www.minizinc.org")
(synopsis "High-level constraint modeling language")
(description "MiniZinc is a high-level modeling language for constraint
@@ -4148,7 +4253,7 @@ language understood by many solvers.")
`(#:modules ((ice-9 match)
(ice-9 popen)
(srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -4915,7 +5020,7 @@ point numbers.")
(define-public wxmaxima
(package
(name "wxmaxima")
- (version "23.11.0")
+ (version "24.02.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4924,7 +5029,7 @@ point numbers.")
(file-name (git-file-name name version))
(sha256
(base32
- "0xj91wfkm19avwmpcfwgzdkcqjwfpkl3glhkpn4advsqc6sx3ra0"))))
+ "1k2fbhyg7xrbk6ivfns6sq68rrbcl5dn84s64viv6iavk3ws033v"))))
(build-system cmake-build-system)
(native-inputs (list gettext-minimal))
(inputs (list bash-minimal
@@ -5126,8 +5231,7 @@ parts of it.")
(define-public openblas-ilp64
(package/inherit openblas
(name "openblas-ilp64")
- (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux"
- "powerpc64le-linux"))
+ (supported-systems %64bit-supported-systems)
(arguments
(substitute-keyword-arguments (package-arguments openblas)
((#:make-flags flags #~'())
@@ -6989,7 +7093,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
@@ -6998,53 +7102,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,
@@ -7118,7 +7222,7 @@ set.")
(list openblas))
(arguments
`(#:modules ((srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:configure-flags '("--enable-shared"
"--disable-fortran"
"--without-MPI"
@@ -7340,14 +7444,14 @@ Longest Commons Subsequence of a set of strings.")
(define-public jacal
(package
(name "jacal")
- (version "1c7")
+ (version "1c8")
(source (origin
(method url-fetch)
(uri (string-append
- "http://groups.csail.mit.edu/mac/ftpdir/scm/jacal-"
+ "https://groups.csail.mit.edu/mac/ftpdir/scm/jacal-"
version ".zip"))
(sha256
- (base32 "06a5sx9ikd62bpnd898g3yk818b020b1a27mk7dbfla2zizib4xz"))))
+ (base32 "0dn706gl5nd36177m7rkx9sdzpxy116jy2mdmc0dcb758r64qvmw"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -7377,7 +7481,7 @@ Longest Commons Subsequence of a set of strings.")
(string-append "--prefix="
(assoc-ref outputs "out"))))))))
(inputs (list scm))
- (native-inputs (list unzip texinfo))
+ (native-inputs (list time unzip texinfo))
(synopsis "Symbolic mathematics system")
(description "GNU JACAL is an interactive symbolic mathematics program based on
Scheme. It manipulate and simplify a range of mathematical expressions such
@@ -7625,7 +7729,7 @@ theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.")
(build-system gnu-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system)
(guix build utils))
@@ -7832,7 +7936,7 @@ reduction.")
(define-public mcrl2
(package
(name "mcrl2")
- (version "202206.1")
+ (version "202307.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -7840,7 +7944,7 @@ reduction.")
version ".tar.gz"))
(sha256
(base32
- "1rbfyw47bi31qla1sa4fd1npryb5kbdr0vijmdc2gg1zhpqfv0ia"))))
+ "147002dl3gq2jsk5gcmvw7hj3mfxrpgxwcfda5mfrj26rcxw48fc"))))
(inputs
(list boost glu mesa qtbase-5))
(build-system cmake-build-system)
@@ -8754,7 +8858,7 @@ management via the GIMPS project's Primenet server.")
(define-public nauty
(package
(name "nauty")
- (version "2.8.8")
+ (version "2.8.9")
(source
(origin
(method url-fetch)
@@ -8762,7 +8866,7 @@ management via the GIMPS project's Primenet server.")
"https://pallini.di.uniroma1.it/"
"nauty" (string-join (string-split version #\.) "_") ".tar.gz"))
(sha256
- (base32 "1ki9z60qcyx3va68hp7iv6451n5d86v1xmhc850b4sqah5b2378m"))))
+ (base32 "1vn4abz498h8fbh27z0l5jrs4z04d693xklbb5mai5l7yhmv8yn9"))))
(build-system gnu-build-system)
(outputs '("out" "lib"))
(arguments
@@ -8775,9 +8879,12 @@ management via the GIMPS project's Primenet server.")
(lambda _
(substitute* "makefile.in"
(("^(pkgconfigexecdir=).*" _ prefix)
- (string-append prefix "${libdir}/pkgconfig\n"))))))))
- (inputs
- (list gmp)) ;for sumlines
+ (string-append prefix "${libdir}/pkgconfig\n")))))
+ (add-after 'unpack 'fix-failing-test
+ (lambda _
+ (substitute* "runalltests.in"
+ ((" uniqg") " ./uniqg")))))))
+ (inputs (list gmp)) ;for sumlines
(home-page "https://pallini.di.uniroma1.it/")
(synopsis "Library for graph automorphisms")
(description "@code{nauty} (No AUTomorphisms, Yes?) is a set of
@@ -9112,7 +9219,7 @@ symbolic reasoning engines that need to reason about polynomial constraints.")
(arguments
(list #:test-target "test"
#:modules `((ice-9 match)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:configure-flags #~(list "--aiger=.")
#:phases
#~(modify-phases %standard-phases
@@ -9166,7 +9273,7 @@ symbolic reasoning engines that need to reason about polynomial constraints.")
;; values to construct commands (yes, eww), so we
;; can't easily substitute* them.
'("lglddtrace" "lgluntrace" "lingeling" "plingeling"))))))))
- (inputs (list `(,aiger "static") gzip bzip2 xz p7zip))
+ (inputs (list `(,aiger "static") bash-minimal gzip bzip2 xz p7zip))
(home-page "http://fmv.jku.at/lingeling")
(synopsis "SAT solver")
(description "This package provides a range of SAT solvers, including
@@ -9388,7 +9495,7 @@ numeric differences and differences in numeric formats.")
(define-public why3
(package
(name "why3")
- (version "1.6.0")
+ (version "1.7.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -9397,38 +9504,49 @@ numeric differences and differences in numeric formats.")
(file-name (git-file-name name version))
(sha256
(base32
- "0k3y98xzhrl44vwzq2m6k4nrllrwp3ll69lc2gfl8d77w0wg7gkp"))))
+ "0fq8wg8ji2v2ssz1d681glmk8glps1irnmdlhqfklaggx01hlf4p"))))
(build-system ocaml-build-system)
- (native-inputs
- (list autoconf automake coq ocaml which))
- (propagated-inputs
- (list camlzip ocaml-graph ocaml-menhir ocaml-num ocaml-zarith))
- (inputs
- (list coq-flocq emacs-minimal zlib))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'bootstrap
- (lambda _
- (invoke "./autogen.sh")
- (setenv "CONFIG_SHELL" (which "sh"))
- (substitute* "configure"
- (("#! /bin/sh") (string-append "#!" (which "sh")))
- ;; find ocaml-num in the correct directory
- (("\\$DIR/nums.cma") "$DIR/num.cma")
- (("\\$DIR/num.cmi") "$DIR/core/num.cmi"))
- #t))
- (add-after 'configure 'fix-makefile
- (lambda _
- (substitute* "Makefile"
- ;; find ocaml-num in the correct directory
- (("site-lib/num") "site-lib"))
- #t))
- (add-after 'install 'install-lib
- (lambda _
- (invoke "make" "byte")
- (invoke "make" "install-lib")
- #t)))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'bootstrap
+ (lambda _
+ (invoke "./autogen.sh")
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (substitute* "configure"
+ (("#! /bin/sh") (string-append "#!" (which "sh")))
+ ;; find ocaml-num in the correct directory
+ (("\\$DIR/nums.cma") "$DIR/num.cma")
+ (("\\$DIR/num.cmi") "$DIR/core/num.cmi"))))
+ (add-after 'configure 'fix-makefile
+ (lambda _
+ (substitute* "Makefile"
+ ;; find ocaml-num in the correct directory
+ (("site-lib/num") "site-lib"))))
+ (add-after 'install 'install-lib
+ (lambda _
+ (invoke "make" "byte")
+ (invoke "make" "install-lib"))))))
+ (native-inputs (list autoconf
+ automake
+ coq
+ ocaml
+ ocaml-findlib
+ which))
+ (propagated-inputs (list camlzip
+ lablgtk3
+ ocaml-graph
+ ocaml-lablgtk3-sourceview3
+ ocaml-menhir
+ ocaml-ppx-deriving
+ ocaml-ppx-sexp-conv
+ ocaml-num
+ ocaml-re
+ ocaml-sexplib
+ ocaml-zarith))
+ (inputs (list coq-flocq
+ emacs-minimal
+ zlib))
(home-page "https://why3.lri.fr")
(synopsis "Deductive program verification")
(description "Why3 provides a language for specification and programming,
@@ -9445,23 +9563,34 @@ of C, Java, or Ada programs.")
(define-public frama-c
(package
(name "frama-c")
- (version "27.1")
+ (version "29.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://frama-c.com/download/frama-c-"
- version "-Cobalt.tar.gz"))
+ (uri (string-append "https://frama-c.com/download/frama-c-"
+ version "-Copper.tar.gz"))
(sha256
(base32
- "1lirkvhf5m53d33l0aw5jzc1fyzkwx5fkgh9g71732d52r55f4sv"))))
+ "14vlvynp3yfmnkixm676c1ip0jlkiqjzmrp9f9c990zzs2wb7yyj"))))
(build-system dune-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'set-env
- (lambda _
- (setenv "CC" "gcc"))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-env
+ (lambda _
+ (setenv "CC" "gcc")))
+ (add-after 'install 'wrap-programs
+ (lambda _
+ (let ((ocamlpath
+ `(,(string-append #$output "/lib/ocaml/site-lib")
+ ,@(search-path-as-string->list
+ (getenv "OCAMLPATH")))))
+ (for-each
+ (lambda (program)
+ (wrap-program (string-append #$output "/bin/" program)
+ `("OCAMLPATH" ":" prefix ,ocamlpath)))
+ '("frama-c" "frama-c-gui"))))))))
(inputs
- (list gmp zlib))
+ (list bash-minimal gmp zlib))
(propagated-inputs (list
graphviz
lablgtk3
@@ -9475,6 +9604,7 @@ of C, Java, or Ada programs.")
ocaml-ppx-deriving-yojson
ocaml-ppx-deriving-yaml
ocaml-ppx-import
+ ocaml-unionfind
why3))
(native-inputs (list dune-site time ocaml-menhir ocaml-graph))
(native-search-paths
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index df7fbb409b..ffcfd13833 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
@@ -154,14 +154,14 @@ parsers to allow execution with Guile as extension languages.")))
(define-public mes
(package
(name "mes")
- (version "0.26")
+ (version "0.27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mes/"
"mes-" version ".tar.gz"))
(sha256
(base32
- "1m45wcrpp3syzdniqx12nyr6v8f9hsg516pwl1k9894nb2ni08hg"))))
+ "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 20bdb713b5..6355c73fe6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -28,8 +28,9 @@
;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021, 2024 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
@@ -41,6 +42,10 @@
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2024 Carlo Zancanaro <carlo@zancanaro.id.au>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -70,6 +75,7 @@
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
+ #:use-module (gnu packages certs)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
@@ -80,6 +86,8 @@
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
+ #:use-module (gnu packages erlang)
+ #:use-module (gnu packages erlang-xyz)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -88,6 +96,7 @@
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
@@ -115,6 +124,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)
@@ -139,6 +149,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)
@@ -153,6 +164,7 @@
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
+ #:use-module (guix build-system rebar)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial)
#:use-module (guix download)
@@ -163,6 +175,49 @@
#:use-module (guix packages)
#:use-module (guix utils))
+(define-public biboumi
+ (package
+ (name "biboumi")
+ (version "9.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://git.louiz.org/biboumi/snapshot/biboumi-"
+ version ".tar.xz"))
+ (sha256
+ (base32 "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"))
+ ;; see https://sources.debian.org/patches/biboumi/9.0-5/2001_cmake_ignore_git.patch/
+ (patches (search-patches "biboumi-cmake-ignore-git.patch"))))
+ (arguments
+ ;; Tests seem to partially depend on networking as well as
+ ;; louiz/Catch which we remove as a dependency via the patch above as
+ ;; the repository seems dead. Deactivating those for now, possibly fix
+ ;; some of them later.
+ `(#:tests? #f
+ #:configure-flags '("-DWITHOUT_SYSTEMD=1")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-cmake-substitutions
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "CMakeLists.txt"
+ (("/etc") (string-append (assoc-ref outputs "out") "/etc"))))))))
+ (build-system cmake-build-system)
+ (inputs (list botan
+ expat
+ libiconv
+ libidn
+ openssl
+ postgresql ;; libpq
+ sqlite
+ ;; TODO: package optional dependency: udns
+ (list util-linux "lib") ;; libuuid
+ pkg-config))
+ (home-page "https://biboumi.louiz.org")
+ (synopsis "Biboumi is a XMPP gateway that connects to IRC")
+ (description "Biboumi is a Free, Libre and Open Source XMPP gateway that connects to IRC
+servers and translates between the two protocols. Its goal is to let XMPP
+users take part in IRC discussions, using their favourite XMPP client.")
+ (license license:zlib)))
+
(define-public omemo-wget
(package
(name "omemo-wget")
@@ -217,6 +272,7 @@ XMPP-based sessions.")
(outputs '("out" "doc"))
(arguments
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags #~'("-Dpython2=false")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-ncurses-path
@@ -235,10 +291,10 @@ XMPP-based sessions.")
(list docbook-xml-4.1.2
`(,glib "bin")
gobject-introspection
- gtk-doc
+ gtk-doc/stable
pkg-config))
- (inputs (list ncurses))
- (propagated-inputs (list glib libxml2 python-2))
+ (inputs (list libxcrypt ncurses))
+ (propagated-inputs (list glib libxml2))
(synopsis "GLib Ncurses Toolkit")
(description "GNT is an ncurses toolkit for creating text-mode graphical
user interfaces in a fast and easy way. It is based on GLib and ncurses.")
@@ -771,34 +827,36 @@ used by Pidgin and Bitlbee, among others, to access
(define-public hexchat
(package
(name "hexchat")
- (version "2.16.1")
+ (version "2.16.2")
(source
(origin
(method url-fetch)
- (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
- version ".tar.xz"))
+ (uri (string-append "https://github.com/hexchat/hexchat/releases/"
+ "download/v" version "/hexchat-" version ".tar.xz"))
(sha256
- (base32 "1iy4ln6yfgy3xysrfpjxw8fn38i3qx8jsn2mk2prshfzf7d9gr57"))))
+ (base32 "0jhfg6n9r6fn9ld21pdzdz6210d7dms401zcfdrvhx52il53921f"))))
(build-system meson-build-system)
- (native-inputs `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin") ;need glib-genmarshal
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)))
- (inputs `(("dbus-glib" ,dbus-glib)
- ("dbus" ,dbus)
- ("enchant" ,enchant)
- ("gtk" ,gtk+-2)
- ("libcanberra" ,libcanberra)
- ("openssl" ,openssl)
-
- ;; Bindings for add-on scripts.
- ("luajit" ,luajit)
- ("perl-xml-parser" ,perl-xml-parser)
- ("python" ,python)
- ("python-cffi" ,python-cffi)
-
- ;; For the ensuing WRAP-PROGRAM.
- ("bash-minimal" ,bash-minimal)))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin") ;need glib-genmarshal
+ perl
+ pkg-config))
+ (inputs
+ (list dbus-glib
+ dbus
+ enchant
+ gtk+-2
+ libcanberra
+ openssl
+
+ ;; Bindings for add-on scripts.
+ luajit
+ perl-xml-parser
+ python
+ python-cffi
+
+ ;; For the ensuing WRAP-PROGRAM.
+ bash-minimal))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -895,15 +953,15 @@ authentication.")
(define-public pidgin
(package
(name "pidgin")
- (version "2.14.5")
+ (version "2.14.13")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://sourceforge/pidgin/Pidgin/"
- version "/pidgin-" version ".tar.gz"))
+ version "/pidgin-" version ".tar.bz2"))
(sha256
- (base32 "12llip3r8126gph82r638xjv2v2rg34qgggn1nbwfmc3s7halimr"))
+ (base32 "1a3by4niw5ls67mwgj20p2mr317zj4hzysi5glm9mq0pivf4j00j"))
(patches
(search-patches "pidgin-add-search-path.patch"))
(modules '((guix build utils)))
@@ -914,53 +972,54 @@ authentication.")
#t))))
(build-system glib-or-gtk-build-system)
(native-inputs
- `(("autoconf" ,autoconf) ;; For bootstrap
- ("automake" ,automake) ;; For bootstrap
- ("check" ,check)
- ("dot" ,graphviz)
- ("gconf" ,gconf)
- ("intltool" ,intltool)
- ("libtool" ,libtool) ;; For bootstrap
- ("pkg-config" ,pkg-config)))
+ (list autoconf ;; For bootstrap
+ automake ;; For bootstrap
+ check
+ graphviz
+ gconf
+ intltool
+ libtool ;; For bootstrap
+ pkg-config))
(inputs
- `(("avahi" ,avahi)
- ("cyrus-sasl" ,cyrus-sasl)
- ("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
- ;; ("evolution-data-server" ,evolution-data-server)
- ("farstream" ,farstream)
- ("gnutls" ,gnutls)
- ("gstreamer" ,gstreamer)
- ;; ("gtkspell2" ,gtkspell2)
- ("libgadu" ,libgadu)
- ("libgcrypt" ,libgcrypt)
- ("libgnt" ,libgnt)
- ("libice" ,libice)
- ("libidn" ,libidn)
- ("libltdl" ,libltdl)
- ("libsm" ,libsm)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxml2" ,libxml2)
- ("libxscrnsaver" ,libxscrnsaver)
- ("libxslt" ,libxslt)
- ;; ("libzephyr" ,libzephyr)
- ("meanwhile" ,meanwhile)
- ("ncurses" ,ncurses)
- ("network-manager" ,network-manager)
- ("nspr" ,nspr)
- ("nss" ,nss)
- ("pango" ,pango)
- ("perl" ,perl)
- ("python" ,python-2)
- ("python2-dbus" ,python2-dbus)
- ("silc" ,silc-toolkit)
- ("sqlite" ,sqlite)
- ("startup-notification" ,startup-notification)
- ("tcl" ,tcl)
- ("tk" ,tk)))
+ (list avahi
+ cyrus-sasl
+ dbus
+ dbus-glib
+ ;; evolution-data-server
+ farstream
+ gnutls
+ gstreamer
+ ;; gtkspell2
+ libgadu
+ libgcrypt
+ libice
+ libidn
+ libltdl
+ libsm
+ libx11
+ libxext
+ libxml2
+ libxscrnsaver
+ libxslt
+ ;; libzephyr
+ meanwhile
+ ncurses
+ network-manager
+ nspr
+ nss
+ nss-certs
+ pango
+ perl
+ python-wrapper
+ python-dbus
+ silc-toolkit
+ sqlite
+ startup-notification
+ tcl
+ tk))
(propagated-inputs
- (list glib gtk+-2))
+ ;; Required by finch.pc, pidgin.pc and purple.pc
+ (list glib gtk+-2 libgnt))
(arguments
`(#:configure-flags
(list
@@ -971,6 +1030,10 @@ authentication.")
"--disable-gevolution"
"--enable-cap"
"--enable-cyrus-sasl"
+ ;; Use nss-certs instead of bundled ones.
+ (string-append "--with-system-ssl-certs="
+ (assoc-ref %build-inputs "nss-certs")
+ "/etc/ssl/certs")
(string-append "--with-ncurses-headers="
(assoc-ref %build-inputs "ncurses")
"/include")
@@ -1046,14 +1109,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
@@ -1069,15 +1132,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
@@ -1230,7 +1294,8 @@ of xmpppy.")
python-setuptools
xorg-server-for-tests))
(inputs
- (list avahi
+ (list bash-minimal
+ avahi
dbus
farstream
geoclue
@@ -1343,7 +1408,7 @@ Encryption to Gajim.")
(define-public dino
(package
(name "dino")
- (version "0.4.3")
+ (version "0.4.4")
(source
(origin
(method url-fetch)
@@ -1351,7 +1416,7 @@ Encryption to Gajim.")
(string-append "https://github.com/dino/dino/releases/download/v"
version "/dino-" version ".tar.gz"))
(sha256
- (base32 "01jbggjqsbqrzd76bq4h8ccnijsw3m3mav838mnk20kls8agq5d6"))))
+ (base32 "1zvxyvql695bwbic17z86vrh2j1qkwvab1irqjkvza4szbklr29i"))))
(build-system cmake-build-system)
(outputs '("out" "debug"))
(arguments
@@ -1360,7 +1425,7 @@ Encryption to Gajim.")
#:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:phases
@@ -1436,12 +1501,12 @@ default.")
(method url-fetch)
(uri (string-append "mirror://kde/unstable/kaidan/" version
"/kaidan-" version ".tar.xz"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- (delete-file-recursively "3rdparty")))
- (sha256
- (base32 "1waqv0fdkhvp3cqy2a2g6i2wc9s0zbvgzknymrwxy99mnx9ymw9g"))))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ (delete-file-recursively "3rdparty")))
+ (sha256
+ (base32 "1waqv0fdkhvp3cqy2a2g6i2wc9s0zbvgzknymrwxy99mnx9ymw9g"))))
(build-system qt-build-system)
(arguments
(list #:configure-flags #~(list "-DBUILD_TESTS=true")))
@@ -1449,12 +1514,12 @@ default.")
perl
pkg-config
python-wrapper))
- (inputs (list kirigami
- knotifications
+ (inputs (list kirigami-5
+ knotifications-5
qtbase-5
qtdeclarative-5
qtgraphicaleffects
- qtlocation
+ qtlocation-5
qtquickcontrols2-5
qtsvg-5
qtmultimedia-5
@@ -1726,20 +1791,24 @@ of the most common use cases is to define avatars for MUC rooms.")))
(define-public c-toxcore
(package
(name "c-toxcore")
- (version "0.2.12")
+ (version "0.2.19")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TokTok/c-toxcore")
- (commit (string-append "v" version))))
+ (commit (string-append "v" version))
+ ;; XXX: c-toxcore now depends on a package called 'cmp', an
+ ;; implementation of MessagePack in C. Fetch the submodule
+ ;; for now, maybe package it later.
+ (recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
- "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp"))))
+ "0wq6grc5lfjip39gm0ji1cw6b1sdv1zvimg1g40haqzhj51755za"))))
(arguments
- `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable
- ; for now.
+ (list #:tests? #f ; figure out how to run the tests
+ #:configure-flags #~(list "-DENABLE_STATIC=false")))
(build-system cmake-build-system)
(native-inputs
(list pkg-config))
@@ -1754,58 +1823,59 @@ messenger protocol.")
(define-public utox
(package
- (name "utox")
- (version "0.18.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/uTox/uTox")
- (commit (string-append "v" version))
- (recursive? #t))) ;; Needed for 'minini' git submodule.
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags '("-DENABLE_TESTS=on")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-absolute-filename-libgtk-3
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "../source/src/xlib/gtk.c"
- (("libgtk-3.so")
- (search-input-file inputs "/lib/libgtk-3.so")))))
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (string-append (assoc-ref outputs "out")
- "/bin/utox")
- ;; For GtkFileChooserDialog.
- `("GSETTINGS_SCHEMA_DIR" =
- (,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas")))))))))
- (inputs
- `(("dbus" ,dbus)
- ("filteraudio" ,filteraudio)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("c-toxcore" ,c-toxcore)
- ("gtk+" ,gtk+)
- ("libvpx" ,libvpx)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrender" ,libxrender)
- ("openal" ,openal)
- ("v4l-utils" ,v4l-utils)))
- (native-inputs
- (list check pkg-config))
- (synopsis "Lightweight Tox client")
- (description
- "uTox is a lightweight Tox client. Tox is a distributed and secure
+ (name "utox")
+ (version "0.18.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uTox/uTox")
+ (commit (string-append "v" version))
+ (recursive? #t))) ;; Needed for 'minini' git submodule.
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags '("-DENABLE_TESTS=on")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'patch-absolute-filename-libgtk-3
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "../source/src/xlib/gtk.c"
+ (("libgtk-3.so")
+ (search-input-file inputs "/lib/libgtk-3.so")))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append (assoc-ref outputs "out")
+ "/bin/utox")
+ ;; For GtkFileChooserDialog.
+ `("GSETTINGS_SCHEMA_DIR" =
+ (,(string-append (assoc-ref inputs "gtk+")
+ "/share/glib-2.0/schemas")))))))))
+ (inputs
+ (list bash-minimal ;for wrap-program
+ dbus
+ filteraudio
+ fontconfig
+ freetype
+ c-toxcore
+ gtk+
+ libvpx
+ libx11
+ libxext
+ libxrender
+ openal
+ v4l-utils))
+ (native-inputs
+ (list check pkg-config))
+ (synopsis "Lightweight Tox client")
+ (description
+ "uTox is a lightweight Tox client. Tox is a distributed and secure
instant messenger with audio and video chat capabilities.")
- (home-page "https://github.com/uTox/uTox")
- (license license:gpl3)))
+ (home-page "https://github.com/uTox/uTox")
+ (license license:gpl3)))
(define-public qtox
(package
@@ -1847,7 +1917,8 @@ instant messenger with audio and video chat capabilities.")
(native-inputs
(list pkg-config qttools-5))
(inputs
- (list ffmpeg
+ (list bash-minimal
+ ffmpeg
filteraudio
glib
gtk+-2
@@ -1935,7 +2006,7 @@ into existing applications.")
(native-inputs
(list unzip))
(inputs
- (list perl-curses perl-io-socket-ssl))
+ (list bash-minimal perl-curses perl-io-socket-ssl))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1966,8 +2037,7 @@ into existing applications.")
(install-file "README.txt" doc)
(install-file "TODO.txt" doc)
(copy-recursively "share/man/man1" man1)
- (copy-recursively "share/man/man3" man3)
- #t)))
+ (copy-recursively "share/man/man3" man3))))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure all executables in "bin" find the Perl modules
@@ -1978,8 +2048,7 @@ into existing applications.")
(for-each (lambda (file)
(wrap-program file
`("PERL5LIB" ":" prefix (,path))))
- (find-files bin "\\.*$"))
- #t))))))
+ (find-files bin "\\.*$"))))))))
(description
"@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and
Gtk2 event loops. This package includes 12 applications and additional scripts:
@@ -2061,7 +2130,7 @@ including psyced.")
(native-inputs
(list pkg-config check
`(,glib "bin") ; gtester
- gtk-doc))
+ gtk-doc/stable))
(home-page "https://mcabber.com/")
(description
"Loudmouth is a lightweight and easy-to-use C library for programming
@@ -2182,7 +2251,7 @@ is also scriptable and extensible via Guile.")
(lambda _
(substitute* "Makefile.am"
(("'\\^xmpp_'") "'.'"))))
- (add-after 'install-licence-files 'install-extra-licence-files
+ (add-after 'install 'install-extra-licence-files
(lambda _
(let ((license-directory (string-append #$output
"/share/doc/"
@@ -2290,7 +2359,7 @@ building the IRC clients and bots.")
(define-public toxic
(package
(name "toxic")
- (version "0.8.4")
+ (version "0.15.1")
(source
(origin
(method git-fetch)
@@ -2298,29 +2367,25 @@ building the IRC clients and bots.")
(url "https://github.com/JFreegman/toxic")
(commit (string-append "v" version))))
(sha256
- (base32 "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"))
+ (base32 "1cbgw9my7nd8b215a3db2jc74nibi9kj0yk5q3c9dnh306as6wzs"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:make-flags
- (list
- "CC=gcc"
- (string-append "PREFIX="
- (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'enable-python-scripting
- (lambda _
- ;; XXX: For compatibility with Python 3.8, adjust python3-config
- ;; invokation to include --embed; see
- ;; <https://github.com/JFreegman/toxic/issues/533>.
- (substitute* "cfg/checks/python.mk"
- (("python3-config --ldflags")
- "python3-config --ldflags --embed"))
- (setenv "ENABLE_PYTHON" "1")
- #t)))))
+ (list #:tests? #f ; no tests
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'enable-python-scripting
+ (lambda _
+ ;; XXX: For compatibility with Python 3.8, adjust
+ ;; python3-config invocation to include --embed; see
+ ;; <https://github.com/JFreegman/toxic/issues/533>.
+ (substitute* "cfg/checks/python.mk"
+ (("python3-config --ldflags")
+ "python3-config --ldflags --embed"))
+ (setenv "ENABLE_PYTHON" "1"))))))
(inputs
(list c-toxcore
curl
@@ -2374,7 +2439,7 @@ QMatrixClient project.")
(define-public mtxclient
(package
(name "mtxclient")
- (version "0.9.1")
+ (version "0.10.0")
(source
(origin
(method git-fetch)
@@ -2383,20 +2448,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
@@ -2420,7 +2484,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)
@@ -2429,41 +2493,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.
@@ -2475,37 +2523,39 @@ 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
+ (list bash-minimal
blurhash
- cpp-httplib
+ 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
+ xdg-utils ; xdg-open for opening URLs
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
@@ -2687,11 +2737,11 @@ replacement.")
(license license:gpl2+)))
(define-public tdlib
- (let ((commit "c5c55092dd61b9eb15d6bbfd0f02c04c593450e7")
+ (let ((commit "af69dd4397b6dc1bf23ba0fd0bf429fcba6454f6")
(revision "0"))
(package
(name "tdlib")
- (version (git-version "1.8.24" revision commit))
+ (version (git-version "1.8.29" revision commit))
(source
(origin
(method git-fetch)
@@ -2699,7 +2749,7 @@ replacement.")
(url "https://github.com/tdlib/td")
(commit commit)))
(sha256
- (base32 "1kwbp4ay4zvk9jscp0xv9rv4jz2krm9jya8q81wnvn9qd0ybg94f"))
+ (base32 "04b3aj73q4zf1mqrryarhbv6yk59m7727iw2xy0gn0ml3i5ll66r"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@@ -3084,8 +3134,7 @@ social and chat platform.")
(("qiteaudio.h")
"qite/qiteaudio.h")
(("qiteaudiorecorder.h")
- "qite/qiteaudiorecorder.h"))
- #t))
+ "qite/qiteaudiorecorder.h"))))
(add-after 'install 'wrap-env
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -3097,48 +3146,48 @@ social and chat platform.")
(wrap-program file
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
- '("psi-plus")))
- #t))
+ '("psi-plus")))))
(add-after 'wrap-env 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("ruby" ,ruby)))
+ (list `(,glib "bin")
+ gobject-introspection
+ perl
+ pkg-config
+ python-wrapper
+ ruby))
(inputs
- `(("blake2" ,libb2)
- ("dbus" ,dbus)
- ("enchant" ,enchant)
- ("glib" ,glib)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
- ("http-parser" ,http-parser)
- ("libgcrypt" ,libgcrypt)
- ("libgpg-error" ,libgpg-error)
- ("libidn" ,libidn)
- ("libotr" ,libotr)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
- ("libtidy" ,tidy-html)
- ("openssl" ,openssl)
- ("qca" ,qca)
- ("qhttp" ,qhttp)
- ("qite" ,qite)
- ("qtbase" ,qtbase-5)
- ("qtkeychain" ,qtkeychain)
- ("qtmultimedia-5" ,qtmultimedia-5)
- ("qtsvg-5" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
- ("usrsctp" ,usrsctp)
- ("x11" ,libx11)
- ("xext" ,libxext)
- ("xcb" ,libxcb)
- ("xss" ,libxscrnsaver)
- ("zlib" ,zlib)))
+ (list bash-minimal ; for wrap-program
+ libb2
+ dbus
+ enchant
+ glib
+ gstreamer
+ gst-plugins-base
+ http-parser
+ libgcrypt
+ libgpg-error
+ libidn
+ libotr
+ libsignal-protocol-c
+ tidy-html
+ openssl
+ qca
+ qhttp
+ qite
+ qtbase-5
+ qtkeychain
+ qtmultimedia-5
+ qtsvg-5
+ qtx11extras
+ usrsctp
+ libx11
+ libxext
+ libxcb
+ libxscrnsaver
+ zlib))
(home-page "https://psi-plus.com/")
(synopsis "Qt-based XMPP Client")
(description
@@ -3256,39 +3305,10 @@ designed for experienced users.")
(sha256
(base32
"0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80"))))
- ;; Using the go-build-system results in the same error message
- ;; than in the bug 1551[1]. So we fix it by running go build
- ;; manually in the git repository as-is as this is the solution
- ;; given to that bug by the matterbridge developers.
- ;; [1]https://github.com/42wim/matterbridge/issues/1551
- (build-system gnu-build-system)
+ (build-system go-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (delete 'configure)
- (replace 'build
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "GOCACHE"
- (string-append (getcwd) "/go-build"))
- (setenv "GOBIN"
- (string-append (assoc-ref outputs "out") "/bin"))
- (invoke "go" "build" "-v" "-x")))
- (replace 'check
- (lambda* (#:key outputs tests? #:allow-other-keys)
- (when tests?
- (setenv "GOCACHE"
- (string-append (getcwd) "/go-build"))
- (setenv "GOBIN"
- (string-append (assoc-ref outputs "out")
- "/bin"))
- (invoke "go" "test" "-v" "-x"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "GOCACHE"
- (string-append (getcwd) "/go-build"))
- (setenv "GOBIN"
- (string-append (assoc-ref outputs "out") "/bin"))
- (invoke "go" "install" "-v" "-x"))))))
- (native-inputs (list go))
+ (list
+ #:import-path "github.com/42wim/matterbridge"))
(synopsis "Bridge together various messaging networks and protocols")
(description
"Relays messages between different channels from various
@@ -3355,7 +3375,7 @@ notifications.")
(native-inputs
(list pkg-config universal-ctags))
(inputs
- (list libressl))
+ (list libressl libxcrypt))
(home-page "https://git.causal.agency/pounce")
(synopsis "Simple multi-client TLS-only IRC bouncer")
(description
@@ -3432,7 +3452,7 @@ Weechat communicate over the Matrix protocol.")
(define-public weechat-wee-slack
(package
(name "weechat-wee-slack")
- (version "2.10.1")
+ (version "2.10.2")
(source
(origin
(method git-fetch)
@@ -3442,7 +3462,7 @@ Weechat communicate over the Matrix protocol.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ykzmn4q592ih9d6m5ks2dzbxkz3mj81sxwsn9g2vzsxj7w3p2r7"))))
+ "0klvvrrvdjh3wph1cdqd4x3nj170v1wirmr2mm91q3sqs5lf3lqj"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -3581,7 +3601,7 @@ a text snippet), using @code{libphonenumber}.")
(method git-fetch)
(uri
(git-reference
- (url "https://git.sr.ht/~taiite/senpai")
+ (url "https://git.sr.ht/~delthas/senpai")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@@ -3619,10 +3639,144 @@ a text snippet), using @code{libphonenumber}.")
go-golang-org-x-time
go-mvdan-cc-xurls
scdoc))
- (home-page "https://sr.ht/~taiite/senpai")
+ (home-page "https://sr.ht/~delthas/senpai")
(synopsis "Modern terminal IRC client")
(description
"@code{senpai} is an IRC client that works best with bouncers.")
(license license:isc)))
+(define-public ejabberd
+ (package
+ (name "ejabberd")
+ (version "24.07")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/processone/ejabberd")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0d5i9skgfjzs2100k0g99sigc2w61480ysz3va6pmb4nx43100g3"))))
+ (build-system rebar-build-system)
+ (native-inputs
+ (list autoconf
+ automake
+ erlang-base64url
+ erlang-cache-tab
+ erlang-eimp
+ erlang-epam
+ erlang-eredis
+ erlang-esip
+ erlang-ezlib
+ erlang-fast-tls
+ erlang-fast-xml
+ erlang-fast-yaml
+ erlang-idna
+ erlang-jiffy
+ erlang-jose
+ erlang-luerl
+ erlang-mqtree
+ erlang-p1-acme
+ erlang-p1-mysql
+ erlang-p1-oauth2
+ erlang-p1-pgsql
+ erlang-p1-utils
+ erlang-pc
+ erlang-pkix
+ erlang-provider-asn1
+ erlang-stringprep
+ erlang-stun
+ erlang-sqlite3
+ erlang-unicode-util-compat
+ erlang-xmpp
+ erlang-yconf))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-environment
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "CC" "gcc")))
+ (add-after 'unpack 'bootstrap
+ (lambda _
+ (invoke "aclocal" "-I" "m4")
+ (invoke "autoconf" "-f")))
+ (add-after 'bootstrap 'make-various-fixes
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((sh (search-input-file inputs "/bin/sh")))
+ ;; Fix shell locations.
+ (substitute* "configure" (("/bin/sh") sh))
+ (substitute* "rebar.config.script"
+ (("sh -c '") (string-append sh " -c '")))
+ ;; Do not recompile dependences.
+ (substitute* "rebar.config"
+ (("\\[\\{\"eimp\", \\[\\]\\},") "[]}.\n{nop, ["))
+ ;; Do not include source files into release.
+ (substitute* "rebar.config"
+ (("\\{include_src, true\\},") "{include_src, false},"))
+ ;; Do not install erl wrapper, we will do it ourselves.
+ (substitute* "rebar.config"
+ (("\\{copy, \"rel/files/erl\",")
+ "%{copy, \"rel/files/erl\","))
+ ;; It seems ejabberd still needs jiffy due to p1_acme.
+ (substitute* "rebar.config"
+ (("\\{if_version_below, \"27\",") "{if_version_below, \"30\","))
+ ;; Unpin pinned dependences.
+ (substitute* "rebar.lock"
+ ((",1\\}") ",0}"))
+ ;; Set proper paths.
+ (substitute* "vars.config.in"
+ (("\\{sysconfdir, \".*\"\\}\\.")
+ "{sysconfdir, \"/etc\"}."))
+ (substitute* "vars.config.in"
+ (("\\{localstatedir, \".*\"\\}\\.")
+ "{sysconfdir, \"/var\"}."))
+ (substitute* "vars.config.in"
+ (("\\{config_dir, \".*\"\\}\\.")
+ "{config_dir, \"/etc/ejabberd\"}."))
+ (substitute* "vars.config.in"
+ (("\\{logs_dir, \".*\"\\}\\.")
+ "{logs_dir, \"/var/log/ejabberd\"}."))
+ (substitute* "vars.config.in"
+ (("\\{spool_dir, \".*\"\\}\\.")
+ "{spool_dir, \"/var/lib/ejabberd\"}.")))))
+ (add-after 'make-various-fixes 'configure
+ (lambda _
+ (invoke "./configure"
+ (string-append "--prefix=" #$output))))
+ (replace 'build
+ (lambda _
+ (invoke "make" "rel")))
+ (replace 'install
+ (lambda _
+ (let ((ejabberd "_build/prod/rel/ejabberd"))
+ (copy-recursively
+ (string-append ejabberd "/conf")
+ (string-append ejabberd "/share/doc/ejabberd-"
+ #$version "/examples"))
+ (for-each
+ (lambda (rmdir)
+ (delete-file-recursively
+ (string-append ejabberd "/" rmdir)))
+ '("conf" "database" "logs"))
+ (delete-file
+ (string-append (string-append ejabberd "/ejabberd-"
+ #$version ".tar.gz")))
+ (let ((erts (car (find-files ejabberd "erts-.*"
+ #:directories? #t))))
+ (delete-file (string-append erts "/bin/erl"))
+ (install-file "rel/files/erl"
+ (string-append erts "/bin")))
+ (chmod (string-append ejabberd
+ "/bin/install_upgrade.escript") #o755)
+ (copy-recursively ejabberd #$output)))))))
+ (synopsis "Robust, Ubiquitous and Massively Scalable Messaging Platform")
+ (description "This package provides Ejabberd -- Robust, Ubiquitous and
+Massively Scalable Messaging Platform. It supports XMPP, MQTT and SIP
+protocols.")
+ (home-page "https://www.ejabberd.im")
+ (license license:gpl2+)))
+
;;; messaging.scm ends here
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/mold.scm b/gnu/packages/mold.scm
index 8625efff27..322214893c 100644
--- a/gnu/packages/mold.scm
+++ b/gnu/packages/mold.scm
@@ -35,7 +35,7 @@
(define-public mold
(package
(name "mold")
- (version "2.4.0")
+ (version "2.33.0")
(source
(origin
(method git-fetch)
@@ -44,7 +44,7 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0rqw7p61qijxhbfm887xbh8idbp5w30axvwgmm68s03xirnr7ymr"))
+ (base32 "0wsb0aiqia3jfc9k3h2d446y0mzmaq6rz9xkjf9125npdygm7kpb"))
(modules '((guix build utils)))
(snippet
#~(begin
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index ad9af078eb..6325c9b96f 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -186,7 +186,7 @@ etc. via a Web interface. Features include:
"src/zabbix_server/server.c")
;; 'fping' must be setuid, so look for it in the usual location.
(("/usr/sbin/fping6?")
- "/run/setuid-programs/fping")))))
+ "/run/privileged/bin/fping")))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm
index b1162d1078..286a80312d 100644
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@ -20,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages moreutils)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages docbook)
#:use-module (gnu packages perl)
#:use-module (gnu packages xml)
@@ -64,14 +65,15 @@
"docbook-xsl")))
(string-append "CC=" #$(cc-for-target)))))
(inputs
- (list perl
+ (list bash-minimal
+ perl
perl-ipc-run
perl-timedate
perl-time-duration))
;; For building the manual pages.
(native-inputs
(list docbook-xml-4.4
- docbook-xsl ;without -next, man pages are corrupted
+ docbook-xsl
libxml2
libxslt))
(home-page "https://joeyh.name/code/moreutils/")
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 3916d4c406..4e0edc2d5e 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -388,7 +388,7 @@ interface for the Music Player Daemon.")
(guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)
(guix build glib-or-gtk-build-system))
#:phases
@@ -400,12 +400,12 @@ interface for the Music Player Daemon.")
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program (string-append out "/bin/sonata")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- #t)))))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(native-inputs
- `(("gettext" ,gettext-minimal)))
+ (list gettext-minimal))
(inputs
- (list python-mpd2
+ (list bash-minimal
+ python-mpd2
gtk+
gsettings-desktop-schemas
gobject-introspection
@@ -563,6 +563,7 @@ artists along with albumart.")
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
(inputs (list avahi
+ bash-minimal
dconf
gsettings-desktop-schemas
gtk+
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index f1e4414bac..75cfd4af66 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2024 Romain Garbage <romain.garbage@inria.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,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)
@@ -42,6 +44,7 @@
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages pciutils)
+ #:use-module (gnu packages python)
#:use-module (gnu packages xorg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages xml)
@@ -49,6 +52,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages parallel)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
#:use-module (gnu packages valgrind)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
@@ -143,7 +147,7 @@ bind processes, and much more.")
(define-public hwloc-2
(package
(inherit hwloc-1)
- (version "2.9.3")
+ (version "2.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@@ -151,11 +155,12 @@ bind processes, and much more.")
"/hwloc-" version ".tar.bz2"))
(sha256
(base32
- "1v0dzzgzp40slakdwdb8vy0hy4m2ff3gnzqpzi8k8vbgap764h2w"))))
+ "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)
@@ -183,7 +188,7 @@ bind processes, and much more.")
;; The latest stable series of hwloc.
hwloc-2)
-(define-public openmpi
+(define-public openmpi-4
(package
(name "openmpi")
(version "4.1.6")
@@ -307,6 +312,65 @@ software vendors, application developers and computer science researchers.")
;; See file://LICENSE
(license license:bsd-2)))
+(define-public openmpi openmpi-4)
+
+(define-public openmpi-5
+ (package
+ (inherit openmpi)
+ (version "5.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.open-mpi.org/software/ompi/v"
+ (version-major+minor version)
+ "/downloads/openmpi-" version ".tar.bz2"))
+ (sha256
+ (base32 "02x9xmpggw77mdpikjjx83j6i4v3gkqbncda73lk5axk0vr841cr"))))
+
+ (inputs (modify-inputs (package-inputs openmpi)
+ ;; As of Open MPI 5.0.X, PMIx is used to communicate
+ ;; with SLURM, so SLURM'S PMI is no longer needed.
+ (delete "slurm")
+ (append ucx) ;for Infiniband support
+ (append openpmix) ;for PMI support (launching via "srun")
+ (append prrte))) ;for PMI support (launching via "srun")
+ (native-inputs (modify-inputs (package-native-inputs openmpi)
+ (append python)))
+
+ (outputs '("out" "debug"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments openmpi)
+ ((#:configure-flags _)
+ #~(list "--enable-mpi-ext=affinity" ;cr doesn't work
+ "--with-sge"
+
+ #$@(if (package? (this-package-input "valgrind"))
+ #~("--enable-memchecker"
+ "--with-valgrind")
+ #~("--without-valgrind"))
+
+ "--with-hwloc=external"
+ "--with-libevent"
+
+ ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated
+ ;; since 5.x.
+ "--enable-prte-prefix-by-default"
+
+ ;; Enable support for the 'Process Management Interface for Exascale'
+ ;; (PMIx) used e.g. by Slurm for the management communication and
+ ;; coordination of MPI processes.
+ (string-append "--with-pmix=" #$(this-package-input "openpmix"))
+ (string-append "--with-prrte=" #$(this-package-input "prrte"))
+
+ ;; Since 5.x, Infiniband support is provided by ucx.
+ ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
+ (string-append "--with-ucx=" #$(this-package-input "ucx"))))
+
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'remove-absolute)
+ (delete 'scrub-timestamps)))))))
+
(define-public openmpi-c++
(package/inherit openmpi
(name "openmpi-c++")
@@ -335,7 +399,7 @@ software vendors, application developers and computer science researchers.")
((guix build ant-build-system) #:prefix ant:)
(guix build utils))
#:imported-modules `((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
(substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags)
#~(cons "--enable-mpi-java" #$flags))
@@ -448,14 +512,14 @@ arrays) that expose a buffer interface.")
(define-public mpich
(package
(name "mpich")
- (version "3.3.2")
+ (version "4.2.2")
(source (origin
(method url-fetch)
(uri (string-append "http://www.mpich.org/static/downloads/"
version "/mpich-" version ".tar.gz"))
(sha256
(base32
- "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"))))
+ "0h8xg1wi2d88hnfmj3xydf1hj78r7fh05jljhk5jgxmbmsrmngw8"))))
(build-system gnu-build-system)
(inputs
`(,zlib
@@ -466,7 +530,7 @@ arrays) that expose a buffer interface.")
(list ucx)
'())))
(native-inputs
- (list perl which gfortran))
+ (list perl which gfortran python-minimal))
(outputs '("out" "debug"))
(arguments
`(#:configure-flags
@@ -545,3 +609,28 @@ Gigabit Ethernet, InfiniBand, Myrinet, Quadrics), and proprietary high-end
computing systems (Blue Gene, Cray). It enables research in MPI through a
modular framework for other derived implementations.")
(license license:bsd-2)))
+
+(define-public mpich-ofi
+ (package/inherit mpich
+ (name "mpich-ofi")
+ (inputs (modify-inputs (package-inputs mpich)
+ (delete ucx)
+ (append libfabric)
+ (append rdma-core)
+ (append psm2)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments mpich)
+ ((#:configure-flags flags)
+ #~(list "--disable-silent-rules" ;let's see what's happening
+ "--enable-debuginfo"
+ "--with-device=ch4:ofi"
+
+ (string-append "--with-hwloc-prefix="
+ #$(this-package-input "hwloc"))
+
+ (string-append "--with-libfabric="
+ #$(this-package-input "libfabric"))))
+ ((#:phases phases
+ '%standard-phases)
+ phases)))
+ (synopsis "Implementation of the Message Passing Interface (MPI) for OmniPath")))
diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm
index 3174e3852a..92706083b4 100644
--- a/gnu/packages/mtools.scm
+++ b/gnu/packages/mtools.scm
@@ -29,14 +29,14 @@
(define-public mtools
(package
(name "mtools")
- (version "4.0.42")
+ (version "4.0.44")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mtools/mtools-"
version ".tar.bz2"))
(sha256
(base32
- "05fg5i8da5jdym3cq2939j7n3fqw4cz2riy1yci6pbw29pgdzgv4"))
+ "1f6x3srkssjcnrmd9hkladc8nzkwq9rqkiy15r5ksg2k4bq4vp1p"))
(patches
(search-patches "mtools-mformat-uninitialized.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm
index 9ae79afed9..2c36439ea3 100644
--- a/gnu/packages/multiprecision.scm
+++ b/gnu/packages/multiprecision.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019, 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
@@ -45,63 +45,46 @@
(define-public gmp
(package
- (name "gmp")
- (version "6.2.1")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "mirror://gnu/gmp/gmp-"
- version ".tar.xz"))
- (sha256
- (base32
- "1wml97fdmpcynsbw9yl77rj29qibfp652d0w3222zlfx5j8jjj7x"))
- (patches (search-patches "gmp-faulty-test.patch"))))
- (build-system gnu-build-system)
- (native-inputs (list m4))
- (outputs '("out" "debug"))
- (arguments
- `(#:parallel-tests? #f ; mpz/reuse fails otherwise
+ (name "gmp")
+ (version "6.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnu/gmp/gmp-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1648ad1mr7c1r8lkkqshrv1jfjgfdb30plsadxhni7mq041bihm3"))
+ (patches (search-patches "gmp-faulty-test.patch"))))
+ (build-system gnu-build-system)
+ (native-inputs (list m4))
+ (outputs '("out" "debug"))
+ (arguments
+ (list
+ #:parallel-tests? #f ; mpz/reuse fails otherwise
#:configure-flags
- '(;; Build a "fat binary", with routines for several
- ;; sub-architectures.
- "--enable-fat"
- "--enable-cxx"
- ,@(cond ((target-mingw?)
- ;; Static and shared cannot be built in one go:
- ;; they produce different headers. We need shared.
- `("--disable-static"
- "--enable-shared"))
- ((target-x32?)
- `("ABI=x32"))
- (else '())))
- ;; Remove after core-updates merge.
- ;; Workaround for gcc-7 transition breakage, -system and cross-build,
- ;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
- ;; Note: See <http://bugs.gnu.org/30756> for why not 'C_INCLUDE_PATH' & co.
- ,@(if (target-mingw?)
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'setenv
- (lambda _
- (let ((gcc (assoc-ref %build-inputs "cross-gcc"))
- (libc (assoc-ref %build-inputs "cross-libc")))
- (setenv "CROSS_CPLUS_INCLUDE_PATH"
- (string-append gcc "/include/c++"
- ":" gcc "/include"
- ":" libc "/include"))
- (format #t "environment variable `CROSS_CPLUS_INCLUDE_PATH' set to `~a'\n"
- (getenv "CROSS_CPLUS_INCLUDE_PATH"))
- #t)))))
- '())))
- (synopsis "Multiple-precision arithmetic library")
- (description
- "The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs
+ #~(list
+ ;; Build a "fat binary", with routines for several sub-architectures.
+ "--enable-fat"
+ "--enable-cxx"
+ #$@(cond
+ ((target-mingw?)
+ ;; Static and shared cannot be built in one go: they produce
+ ;; different headers. We need shared.
+ '("--disable-static"
+ "--enable-shared"))
+ ((target-x32?)
+ `("ABI=x32"))
+ (else '())))))
+ (synopsis "Multiple-precision arithmetic library")
+ (description
+ "The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs
arbitrary-precision arithmetic on signed integers, rational numbers and floating
point numbers. The precision is only limited by the available memory.
The library is highly optimized, with a design focus on execution speed.
It is aimed at use in, for example, cryptography and computational algebra.")
- (license lgpl3+)
- (home-page "https://gmplib.org/")))
+ (license lgpl3+)
+ (home-page "https://gmplib.org/")))
(define-public gmp-6.0
;; We keep this one around to bootstrap GCC, to work around a compilation
@@ -123,13 +106,13 @@ It is aimed at use in, for example, cryptography and computational algebra.")
(define-public mpfr
(package
(name "mpfr")
- (version "4.2.0")
+ (version "4.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mpfr/mpfr-" version
".tar.xz"))
(sha256 (base32
- "14yr4sf4mys64nzbgnd997l6l4n8l9vsjnnvnb0lh4jh2ggpi8q6"))))
+ "1cnb3y7y351qg6r7ynwsgaykm7l2a8zg2nlljs4rf9k778shfy17"))))
(arguments
(list
#:phases (if (system-hurd?)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 798aad11f7..bc2d7f62f1 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
-;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2018, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
@@ -44,6 +44,7 @@
;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Thomas Albers Raviola <thomas@thomaslabs.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -56,6 +57,8 @@
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Parnikkapore <poomklao@yahoo.com>
+;;; Copyright © 2024 hapster <o.rojon@posteo.net>
+;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -183,6 +186,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages rsync)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages scsi)
#:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx)
@@ -195,6 +199,7 @@
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages vim) ;for 'xxd'
@@ -431,6 +436,58 @@ and play MIDI files with a few clicks in a user-friendly interface offering
score, keyboard, guitar, drum and controller views.")
(license license:gpl3+)))
+(define-public libgpod
+ (package
+ (name "libgpod")
+ (version "0.8.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.code.sf.net/p/gtkpod/libgpod")
+ (commit "8dc5015ae036b219c4c9579a156886aa3a722aa5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yzngb7h1mibz4x56w9fh02vx8xi4wyq4fjc3ad0jayv3hxjjkqv"))))
+ (arguments
+ (list
+ #:configure-flags
+ #~(list
+ "--without-hal"
+ "--enable-udev"
+ (string-append "--with-udev-dir=" #$output "/lib/udev")
+ (string-append "--prefix=" #$output))
+
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-autotools-version-requirement
+ (lambda _
+ (setenv "ACLOCAL_FLAGS"
+ (string-join
+ (map (lambda (s) (string-append "-I " s))
+ (string-split (getenv "ACLOCAL_PATH") #\:))
+ " "))
+ (substitute* "configure.ac"
+ (("libplist >= 1\\.0") "libplist-2.0 >= 2.2")
+ (("-Werror") ""))
+ ;; patch for plist-2.0
+ (substitute* "tools/ipod-lockdown.c"
+ (("plist_dict_insert_item") "plist_dict_set_item"))
+ ;; it expects version-suffixed binary
+ (substitute* "gnome-autogen.sh"
+ (("automake-1\\.13") "automake")))))))
+
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake libtool autoconf intltool pkg-config `(,glib "bin") gtk-doc))
+ (propagated-inputs (list libimobiledevice gdk-pixbuf))
+ (inputs (list libxml2 sg3-utils sqlite taglib libplist))
+ (home-page "https://sourceforge.net/projects/gtkpod")
+ (synopsis "Library to access iPod contents")
+ (description "This package provides a library to access iPod contents. It
+enables iPod support in music players such as Clementine.")
+ (license license:lgpl2.1+)))
+
(define-public clementine
(package
(name "clementine")
@@ -470,8 +527,7 @@ score, keyboard, guitar, drum and controller views.")
(find-files "3rdparty"
(lambda (file stat)
(string-match "^3rdparty/[^/]*$" file))
- #:directories? #t))
- #t))))
+ #:directories? #t))))))
(build-system cmake-build-system)
(arguments
'(#:test-target "clementine_test"
@@ -493,15 +549,16 @@ score, keyboard, guitar, drum and controller views.")
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/clementine")
- `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
- #t))))))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
+ (,gst-plugin-path)))))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("googletest" ,googletest)
- ("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools-5)))
+ (list gettext-minimal
+ googletest
+ pkg-config
+ qttools-5))
(inputs
- (list boost
+ (list bash-minimal
+ boost
chromaprint
fftw
glib
@@ -512,7 +569,7 @@ score, keyboard, guitar, drum and controller views.")
gst-libav
libcdio
libmygpo-qt
- ;; TODO: Package libgpod.
+ libgpod
libmtp
libxml2
protobuf
@@ -604,7 +661,7 @@ you create custom user interfaces for your MIDI hardware.")
(define-public qmmp
(package
(name "qmmp")
- (version "2.1.7")
+ (version "2.1.8")
(source
(origin
(method url-fetch)
@@ -612,7 +669,7 @@ you create custom user interfaces for your MIDI hardware.")
(version-major+minor version) "/"
"qmmp-" version ".tar.bz2"))
(sha256
- (base32 "0wqy4dh5cci67d822zn2535l0vsvd9c9sqsbscz4j530c6y6g9z6"))))
+ (base32 "1vk9bbw8lfypn2a5vh8pdxrz5pa1iqja4p9gxjw2kax9qx1n2sl4"))))
(build-system qt-build-system)
(arguments
(list #:qtbase qtbase
@@ -721,7 +778,8 @@ Winamp/XMMS skins.")
(setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd)))))))
(native-inputs
- (list gettext-minimal
+ (list bash-minimal
+ gettext-minimal
googletest
pkg-config
qttools
@@ -762,7 +820,7 @@ It is a fork of Clementine aimed at music collectors and audiophiles.")
(define-public cmus
(package
(name "cmus")
- (version "2.10.0")
+ (version "2.11.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -771,20 +829,18 @@ It is a fork of Clementine aimed at music collectors and audiophiles.")
(file-name (git-file-name name version))
(sha256
(base32
- "0csj59q2n7hz9zihq92kb4kzvb51rgzl65y6vd0chq6j3li1pb8x"))))
+ "1k50z99v2yqshycx6mbk4g5bsaalg5dgzjv3xvwq14abwkw44hli"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; cmus does not include tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; It's an idiosyncratic configure script that doesn't
- ;; understand --prefix=..; it wants prefix=.. instead.
- (invoke "./configure"
- (string-append "prefix=" out))
- #t))))))
+ (list
+ #:tests? #f ; cmus does not include tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ ;; It's an idiosyncratic configure script that doesn't
+ ;; understand --prefix=..; it wants prefix=.. instead.
+ (invoke "./configure" (string-append "prefix=" #$output)))))))
;; TODO: cmus optionally supports the following formats, which haven't yet
;; been added to Guix:
;;
@@ -860,7 +916,7 @@ many input formats and provides a customisable Vi-style user interface.")
(native-inputs
(list diffutils
`(,glib "bin") ; for gtester
- gtk-doc
+ gtk-doc/stable
intltool
libtool
pkg-config))
@@ -889,7 +945,7 @@ typed in using the computer keyboard, played in using a MIDI keyboard, or
even input via a microphone connected to the sound card. The final product
is publication-quality music notation that is continuously generated in the
background while you work.")
- (home-page "http://www.denemo.org")
+ (home-page "https://www.denemo.org")
(license license:gpl3+)))
(define-public dumb
@@ -1618,7 +1674,7 @@ and auto-mapping slices to MIDI note numbers.")
python))
(native-inputs
(list bison
- dblatex
+ dblatex/stable
flex
fontforge
gettext-minimal
@@ -1635,7 +1691,8 @@ and auto-mapping slices to MIDI note numbers.")
texlive-fontinst
texlive-lh
texlive-lm
- texlive-metapost))
+ texlive-metapost
+ texlive-t1utils))
zip))
(home-page "https://lilypond.org")
(synopsis "Music typesetting")
@@ -2233,7 +2290,8 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
(wrap-program (search-input-file outputs "bin/solfege")
`("GUIX_PYTHONPATH" ":" prefix (,path)))))))))
(inputs
- (list python-wrapper
+ (list bash-minimal
+ python-wrapper
python-pygobject
gettext-minimal
gtk+
@@ -2377,7 +2435,7 @@ a JACK session.")
(define-public mixxx
(package
(name "mixxx")
- (version "2.3.6")
+ (version "2.4.1")
(source
(origin
(method git-fetch)
@@ -2385,90 +2443,85 @@ a JACK session.")
(url "https://github.com/mixxxdj/mixxx")
(commit version)))
(file-name (git-file-name name version))
- (patches
- (search-patches "mixxx-link-qtscriptbytearray-qtscript.patch"
- "mixxx-system-googletest-benchmark.patch"))
(sha256
- (base32 "1v1sza75rf2q1m0bdc0j2k53qd34m12d1573jmac3g7vvyqh5n2m"))
+ (base32 "0cfdgrxfhck6cg4j9mb2rdp06n57kca1403qw92c3pmk1y05grq4"))
(modules '((guix build utils)))
(snippet
;; Delete libraries that we already have or don't need.
;; TODO: try to unbundle more (see lib/).
`(begin
- (let ((third-parties '("apple" "benchmark" "googletest" "hidapi"
- "libebur128")))
+ (let ((third-parties '("apple" "hidapi")))
(with-directory-excursion "lib"
(map (lambda (third-party)
- (delete-file-recursively third-party))
- third-parties)))
+ (delete-file-recursively third-party)) third-parties)))
#t))))
(build-system qt-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; Tests need a running X server.
- (add-before 'check 'prepare-x-for-test
- (lambda _
- (system "Xvfb &")
- (setenv "DISPLAY" ":0")))
- (add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (faad2 (assoc-ref inputs "faad2")))
- (wrap-program (string-append out "/bin/mixxx")
- `("LD_LIBRARY_PATH" ":" prefix
- ,(list (string-append faad2 "/lib"))))))))))
- (native-inputs
- (list benchmark
- googletest
- python-wrapper
- qttools-5
- xorg-server-for-tests))
- (inputs
- (list bash-minimal
- chromaprint
- faad2
- ffmpeg
- fftw
- flac
- glu
- hidapi
- jack-1
- lame
- libdjinterop
- libebur128
- libid3tag
- libkeyfinder
- libmad
- libmp4v2
- libmodplug
- libsndfile
- libshout
- ;; XXX: Mixxx complains the libshout-idjc package suffers from bug
- ;; lp1833225 and refuses to use it. Use the bundle for now.
- ;; libshout-idjc
- libusb
- libvorbis
- lilv
- mp3guessenc
- openssl
- opusfile
- portaudio
- portmidi
- protobuf
- qtbase-5
- qtdeclarative-5
- qtkeychain
- qtscript
- qtsvg-5
- qtx11extras
- rubberband
- soundtouch
- sqlite
- taglib
- upower
- vamp
- wavpack))
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'disable-bugged-test
+ ;; This test regularly fails and aborts the build process, hence it
+ ;; was disabled (no impact on functionality). It appears this is a
+ ;; problem for some upstream as well, as indicated by:
+ ;; https://github.com/mixxxdj/mixxx/issues/12887 (featuring a
+ ;; reference to another issue related to the same problem).
+ (lambda _
+ (substitute* "src/test/soundproxy_test.cpp"
+ (("TEST_F\\(SoundSourceProxyTest, firstSoundTest\\)")
+ "TEST_F(SoundSourceProxyTest, DISABLED_firstSoundTest)"))))
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (faad2 (assoc-ref inputs "faad2")))
+ (wrap-program (string-append out "/bin/mixxx")
+ `("LD_LIBRARY_PATH" ":" prefix
+ ,(list (string-append faad2 "/lib"))))))))))
+ (native-inputs (list benchmark googletest python-wrapper qttools-5
+ xorg-server-for-tests))
+ (inputs (list bash-minimal
+ chromaprint
+ faad2
+ ffmpeg
+ fftw
+ flac
+ glu
+ hidapi
+ jack-1
+ lame
+ libdjinterop
+ libebur128
+ libid3tag
+ libkeyfinder
+ libmad
+ libmp4v2
+ libmodplug
+ libsndfile
+ libshout
+ ;; XXX: Mixxx complains the libshout-idjc package suffers from bug
+ ;; lp1833225 and refuses to use it. Use the bundle for now.
+ libshout-idjc
+ libusb
+ libvorbis
+ lilv
+ mp3guessenc
+ openssl
+ opusfile
+ portaudio
+ portmidi
+ protobuf
+ qtbase-5
+ qtdeclarative-5
+ qtkeychain
+ qtscript
+ qtsvg-5
+ qtx11extras
+ rubberband
+ soundtouch
+ sqlite
+ taglib
+ upower
+ vamp
+ wavpack
+ c++-gsl))
(home-page "https://mixxx.org/")
(synopsis "DJ software to perform live mixes")
(description "Mixxx is a DJ software. It integrates the tools DJs need to
@@ -2970,7 +3023,7 @@ export.")
(define-public pd
(package
(name "pd")
- (version "0.53-1")
+ (version "0.55-0")
(source (origin
(method url-fetch)
(uri
@@ -2978,7 +3031,7 @@ export.")
version ".src.tar.gz"))
(sha256
(base32
- "0g0ks2h55p0kwz2cc5n7d6vcl6crg299zfwwwwnzc6fibclaqksl"))))
+ "1gn3mc65v29b9s7qbqmi7y5ka4j7y997fyqrb3s1b5g7drxbwfph"))))
(build-system gnu-build-system)
(arguments
(let ((wish (string-append "wish" (version-major+minor
@@ -3267,18 +3320,7 @@ browser.")
"1rs248pkgn6d29nkvw9ab6dvi1vsz220jdmz1ddzr29cpyc0adfh"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no test target
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'fix-docbook
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cmake_admin/CreateManpages.cmake"
- (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/manpages/docbook.xsl")))
- #t)))))
+ `(#:tests? #f)) ; no test target
(inputs
(list qtbase-5 qtsvg-5 qttools-5 alsa-lib))
(native-inputs
@@ -3311,23 +3353,12 @@ backends, including ALSA, OSS, Network and FluidSynth.")
"0kh8pns9pla9c47y2nwckjpiihczg6rpg96aignsdsd7vkql69s9"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no test target
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'fix-docbook
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cmake_admin/CreateManpages.cmake"
- (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/manpages/docbook.xsl")))
- #t)))))
+ `(#:tests? #f)) ; no test target
(inputs
(list drumstick qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
(list libxslt ;for xsltproc
- docbook-xsl qttools-5 pkg-config))
+ docbook-xml-4.4 docbook-xsl qttools-5 pkg-config))
(home-page "https://vmpk.sourceforge.io/")
(synopsis "Virtual MIDI piano keyboard")
(description
@@ -3559,7 +3590,7 @@ can connect to any JACK port and record the output into a stereo WAV file.")
`(#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
@@ -5126,6 +5157,131 @@ includes instruments based on audio samples and various soft sythesizers. It
can receive input from a MIDI keyboard.")
(license license:gpl2+)))
+(define-public stargate
+ (package
+ (name "stargate")
+ (version "24.02.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stargatedaw/stargate")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0hy0pf6gcw4hjhsvb1x60m1v0wqm28j7cc91g1vcna2f42kk8gyh"))
+ (modules '((guix build utils)))
+ (snippet
+ '(with-directory-excursion "src"
+ ;; Delete bundled libraries.
+ (delete-file-recursively "sg_py_vendor")
+ ;; Disable compiling and installing bundled libraries.
+ (substitute* "Makefile"
+ ((" sg_py_vendor") "")
+ (("install -m 755 vendor") "# install -m 755 vendor"))
+ ;; Import python modules from packaged libraries.
+ (substitute* (find-files "sglib" "\\.py$")
+ (("from sg_py_vendor ") "")
+ (("from sg_py_vendor.") "from "))
+ (substitute* "engine/tests/test_daw.c"
+ ;; Disable assignment of a string to an expression with
+ ;; array type which fails tests.
+ (("INSTALL_PREFIX =") "// INSTALL_PREFIX"))
+ ;; Disable manual tests requiring opening a browser.
+ (substitute* '("Makefile"
+ "engine/Makefile"
+ "engine/libcds/Makefile")
+ (("\\$\\(BROWSER\\)") "# $(BROWSER)"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:test-target "tests"
+ #:make-flags
+ #~(list "PREFIX=/"
+ "LIBDIR=/lib"
+ "INCLUDEDIR=/include"
+ (string-append "DESTDIR=" #$output)
+ (string-append "CC=" #$(cc-for-target))
+ (string-append "CXX=" #$(cxx-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-portaudio-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/sgui/widgets/hardware_dialog.py"
+ (("\\\"libportaudio")
+ (string-append "\"" (assoc-ref inputs "portaudio")
+ "/lib/libportaudio")))))
+ (add-after 'patch-portaudio-path 'change-directory
+ (lambda _
+ (chdir "src")))
+ (delete 'configure) ;no configure script
+ (add-before 'build 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "test_parse.sh"
+ (("python") (which "python3")))
+ (with-directory-excursion "files/share"
+ (substitute* '"applications/stargate.desktop"
+ (("/usr") #$output)))))
+ (replace 'build
+ (lambda* (#:key (make-flags '()) (parallel-build? #t)
+ #:allow-other-keys)
+ (apply invoke "make" "-Cengine"
+ `(,@(if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ '())
+ ,@make-flags))))
+ (add-before 'check 'check-setup
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (setenv "LD_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
+ ;; Test fails with AssertionError.
+ (delete-file "test/sglib/models/daw/routing/test_midi.py")))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-program (string-append #$output "/bin/stargate")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ `("PATH" ":" prefix
+ (,(getenv "PATH")))))))))
+ (native-inputs
+ (list pkg-config
+ python-gcovr
+ python-packaging
+ python-pytest
+ python-pytest-cov
+ python-pytest-runner))
+ (inputs
+ (list alsa-lib
+ bash-minimal
+ fftw
+ fftwf
+ jq
+ libsndfile
+ portaudio
+ portmidi
+ python
+ python-jinja2
+ python-mido
+ python-mutagen
+ python-numpy
+ python-psutil
+ python-pymarshal
+ python-pyqt
+ python-pyyaml
+ python-wavefile
+ python-yq
+ rubberband
+ valgrind
+
+ stargate-sbsms
+ stargate-soundtouch))
+ (home-page "https://github.com/stargatedaw/stargate")
+ (synopsis "Digital audio workstation")
+ (description
+ "Stargate is a digital audio workstation with built-in instrument and
+effect plugins and wave editor, providing innovative features, especially for
+EDM production.")
+ (license license:gpl3)))
+
(define-public liquidsfz
(package
(name "liquidsfz")
@@ -5216,7 +5372,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)
@@ -5225,7 +5381,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
@@ -5274,6 +5430,8 @@ includes LV2 plugins and a JACK standalone client.")
qtsvg-5
qtx11extras
qtxmlpatterns))
+ (propagated-inputs
+ (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so
(synopsis "Music composition and notation software")
(description
"MuseScore is a music score typesetter. Its main purpose is the creation
@@ -5359,7 +5517,7 @@ studio.")
(define-public gsequencer
(package
(name "gsequencer")
- (version "6.5.2")
+ (version "6.16.8")
(source
(origin
(method git-fetch)
@@ -5368,7 +5526,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
@@ -5383,7 +5541,7 @@ studio.")
cunit
gettext-minimal
gobject-introspection
- gtk-doc
+ gtk-doc/stable
libtool
libxslt
pkg-config
@@ -5402,6 +5560,7 @@ studio.")
libsamplerate
libsndfile
libsoup
+ libxcrypt
libxml2
lv2
pulseaudio
@@ -5454,7 +5613,7 @@ specification and header.")
(define-public rosegarden
(package
(name "rosegarden")
- (version "23.12")
+ (version "24.06")
(source
(origin
(method url-fetch)
@@ -5462,7 +5621,7 @@ specification and header.")
(version-major+minor version) "/"
"rosegarden-" version ".tar.xz"))
(sha256
- (base32 "0clkzrs931dypvqcn5hzx2v3bq9gc439g71phahgwkh4c1jfcmrz"))))
+ (base32 "09www13ndba14krzycwm44qgcy7j11wa6a6xiqh6i2hjghlx8v46"))))
(build-system cmake-build-system)
(arguments
(list
@@ -5952,8 +6111,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))
@@ -5967,7 +6126,7 @@ console music players.")
(file-name (git-file-name name version))
(sha256
(base32
- "1afkbqhzn6da7zaf5ab7dvyqj1izqhzprwfb4hw448fllda9bdvk"))))
+ "1wx7pwgvg1fiq55jdc22353frcdlz548g97dy4j353lqxy8vxfyj"))))
(build-system go-build-system)
(native-inputs
(list lua
@@ -5980,9 +6139,10 @@ console music players.")
go-github-com-wtolson-go-taglib
go-github-com-yookoala-realpath))
(inputs
- (list chromaprint ffmpeg))
+ (list bash-minimal 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
@@ -5996,8 +6156,7 @@ console music players.")
,(map (lambda (dir)
(string-append dir "/bin:"
dir "/sbin"))
- (list ffmpeg chromaprint))))
- #t)))
+ (list ffmpeg chromaprint)))))))
(add-after 'install 'install-scripts
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -6010,8 +6169,8 @@ console music players.")
(install-file (string-append root "/config.lua") xdg-data-dirs)
;; TODO: Test fish completion.
(install-file (string-append root "/completion/demlo.fish")
- (string-append out "/share/fish/vendor_completions.d"))
- #t))))))
+ (string-append
+ out "/share/fish/vendor_completions.d"))))))))
(home-page "https://gitlab.com/ambrevar/demlo")
(synopsis "Dynamic and extensible music library organizer")
(description "Demlo is a music library organizer. It can encode, fix
@@ -6076,6 +6235,7 @@ discard bad quality ones.
'("qtmultimedia"))))))))))
(inputs
(list alsa-lib
+ bash-minimal
fftw
jack-1
portaudio
@@ -6108,7 +6268,8 @@ with error and volume history, and advanced features.")
(native-inputs
(list intltool pkg-config))
(inputs
- (list glib
+ (list bash-minimal
+ glib
grilo
gstreamer
gst-plugins-base
@@ -6131,8 +6292,8 @@ with error and volume history, and advanced features.")
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/pragha")
- `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
- #t))))))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
+ (,gst-plugin-path)))))))))
(home-page "https://pragha-music-player.github.io")
(synopsis "Music player")
(description "Pragha is a lightweight music player based on Gtk and
@@ -6671,9 +6832,6 @@ ones.")
mesa))
(native-search-paths
(list (search-path-specification
- (variable "LV2_PATH")
- (files '("lib/lv2")))
- (search-path-specification
(variable "VST2_PATH")
(files '("lib/vst")))
(search-path-specification
@@ -7295,7 +7453,8 @@ plugin and a standalone JACK application.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
- #:make-flags (list "CC=gcc")
+ #:make-flags (list "CC=gcc"
+ "NOOPT=true")
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configure target
@@ -7329,6 +7488,7 @@ plugin and a standalone JACK application.")
(description "Wolf Shaper is a waveshaper plugin with a graph editor.
It is provided as an LV2 plugin and as a standalone Jack application.")
(home-page "https://pdesaulniers.github.io/wolf-shaper/")
+ (properties `((tunable? . #t)))
(license license:gpl3)))
(define-public wolf-spectrum
diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm
index dfd0e12186..f5963928bc 100644
--- a/gnu/packages/musl.scm
+++ b/gnu/packages/musl.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018–2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,26 +22,30 @@
(define-module (gnu packages musl)
#:use-module (guix download)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (gnu packages))
+ #:use-module (gnu packages)
+ #:use-module (gnu packages bash))
(define-public musl
(package
(name "musl")
- (version "1.2.4")
+ (version "1.2.5")
(source (origin
(method url-fetch)
(uri (string-append "https://www.musl-libc.org/releases/"
"musl-" version ".tar.gz"))
(sha256
(base32
- "0fgh2hhsbaksx7my6yiva4jqixi6hxwxx20ivb0afwjk7piyldbs"))))
+ "1r3mgky9d19b2285s274qxzlgs7sncx8plm01vd691sdx2xii8d9"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; musl has no tests
- #:configure-flags
- (list "--disable-gcc-wrapper")))
+ (list #:tests? #f ; musl has no tests
+ #:configure-flags
+ #~(list "--enable-wrapper=all"
+ (string-append "--syslibdir=" #$output "/lib"))))
+ (inputs (list bash-minimal))
(synopsis "Small C standard library")
(description "musl is a simple and lightweight C standard library. It
strives to be correct in the sense of standards-conformance and safety.")
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/nettle.scm b/gnu/packages/nettle.scm
index 96ffb8821a..15533ca629 100644
--- a/gnu/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@ -83,14 +83,14 @@ themselves.")
;; This version is not API-compatible with version 2. In particular, lsh
;; cannot use it yet. So keep it separate.
(package (inherit nettle-2)
- (version "3.8.1")
+ (version "3.9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/nettle/nettle-"
version ".tar.gz"))
(sha256
(base32
- "1znb87fi4gd2jkwbca74fl64pr9lr0cm5i6p7zlcszfdfwmkwkrn"))))
+ "1qvc1iamnvbiss0bx9c98djgn3y60zs59c5wdyyip9qc3fcgzznc"))))
(arguments
(substitute-keyword-arguments (package-arguments nettle-2)
((#:configure-flags flags)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 5501c8dfca..beb5f378b9 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
@@ -14,7 +14,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2020, 2021 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
@@ -60,7 +60,7 @@
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
;;; Copyright © 2024 Alexey Abramov <levenson@mmer.org>
@@ -123,6 +123,8 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gawk)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -159,6 +161,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages pretty-print)
+ #:use-module (gnu packages prometheus)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
@@ -245,7 +248,7 @@ IP hosts on the local network.")
(define-public axel
(package
(name "axel")
- (version "2.17.11")
+ (version "2.17.14")
(source
(origin
(method url-fetch)
@@ -253,7 +256,7 @@ IP hosts on the local network.")
"releases/download/v" version "/"
"axel-" version ".tar.xz"))
(sha256
- (base32 "1yfcsi0zv07bvhj8klgna3y1ycc4jhaija1b3rzzv0i4d4c2q2sq"))))
+ (base32 "14rn8k0lb77awd9qx40kicz0767jfsavz6rmhb66zgvqqk4fg3lk"))))
(build-system gnu-build-system)
(native-inputs
(list gettext-minimal pkg-config))
@@ -368,12 +371,10 @@ local filesystem. It splits the file into blocks, hashes them, and compares
them in order to efficiently transfer a minimal amount of data.")
(license (list license:gpl2 license:gpl3))))
-;; This package does not have a release yet.
-;; But this is required to provide a feature in PipeWire.
(define-public libcamera
(package
(name "libcamera")
- (version "0.1.0")
+ (version "0.3.1")
(source
(origin
(method git-fetch)
@@ -384,7 +385,7 @@ them in order to efficiently transfer a minimal amount of data.")
(file-name
(git-file-name name version))
(sha256
- (base32 "06dj3dpfbayj61015n5kffin2g3hyys11ra0px2g4hmrznvdkhc9"))))
+ (base32 "15wgy6dc56dwjyasw6w6x6d4j8475clbrxkgphc2zly6232ds7mw"))))
(build-system meson-build-system)
(outputs '("out" "doc" "gst" "tools"))
(arguments
@@ -392,19 +393,31 @@ them in order to efficiently transfer a minimal amount of data.")
#:configure-flags
#~(list (string-append "-Dbindir="
(assoc-ref %outputs "tools") "/bin")
+
+ ;; In 0.3.1 release simple pipeline wasn't enabled for
+ ;; x86_64 by mistake, it's enabled a couple commits later.
+ ;; Remove this expression on the next release.
+ #$@(if (target-x86-64?)
+ '("-Dpipelines=ipu3,vimc,uvcvideo,simple")
+ '())
+ "-Dudev=enabled"
"-Dtest=true" "-Dv4l2=true"
;; XXX: Requires bundled pybind11.
"-Dpycamera=disabled")
#:phases
#~(modify-phases %standard-phases
#$@(if (target-aarch64?)
- ;; The 'log_process' test fails on aarch64-linux with a
- ;; SIGinvalid error (see:
- ;; https://bugs.libcamera.org/show_bug.cgi?id=173).
#~((add-after 'unpack 'disable-problematic-tests
(lambda _
+ ;; The 'log_process' test fails on aarch64-linux with a
+ ;; SIGinvalid error (see:
+ ;; https://bugs.libcamera.org/show_bug.cgi?id=173).
(substitute* "test/log/meson.build"
((".*'name': 'log_process'.*")
+ ""))
+ ;; The 'file' test fails on aarch64-linux with SIGinvalid.
+ (substitute* "test/meson.build"
+ ((".*'name': 'file'.*")
"")))))
#~())
(add-after 'install 'move-doc-and-gst
@@ -418,7 +431,21 @@ them in order to efficiently transfer a minimal amount of data.")
(mkdir-p (string-append gst "/lib"))
(rename-file
(string-append out "/lib/gstreamer-1.0")
- (string-append gst "/lib/gstreamer-1.0"))))))))
+ (string-append gst "/lib/gstreamer-1.0")))))
+ (add-after 'shrink-runpath 're-sign-binaries
+ (lambda* (#:key outputs #:allow-other-keys)
+ "Update signatures of all ipa libraries.
+
+After stipping phases signatures are not valid anymore, so it's necessary to
+re-sign."
+ (let* ((out (assoc-ref outputs "out")))
+ (for-each
+ (lambda (file)
+ (invoke
+ "source/src/ipa/ipa-sign.sh" "src/ipa-priv-key.pem"
+ file (string-append file ".sign")))
+ (find-files
+ (string-append out "/lib/libcamera") "\\.so$"))))))))
(native-inputs
(list googletest
graphviz ;for 'dot'
@@ -433,12 +460,13 @@ them in order to efficiently transfer a minimal amount of data.")
glib
gst-plugins-base
gnutls
+ libevent
libtiff
libyaml
openssl
python-jinja2
python-ply
- qtbase-5))
+ qtbase))
(synopsis "Camera stack and framework")
(description "LibCamera is a complex camera support library for GNU+Linux,
Android, and ChromeOS.")
@@ -959,7 +987,8 @@ systems with no further dependencies.")
intltool
pkg-config))
(inputs
- (list bluez
+ (list bash-minimal
+ bluez
dbus
(librsvg-for-system)
glib
@@ -1000,7 +1029,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")
@@ -1197,7 +1226,7 @@ and SSH, and it can use both TCP and UDP as transport mechanisms.")
(define-public socat
(package
(name "socat")
- (version "1.7.4.3")
+ (version "1.7.4.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1205,10 +1234,10 @@ and SSH, and it can use both TCP and UDP as transport mechanisms.")
version ".tar.bz2"))
(sha256
(base32
- "01w0hpqf5xmgn40s1ablfd4y67dlrx5y9zlx24spc1qm8h81hwyl"))))
+ "1b40ccdvxq5kaghsbwg4q3dq5aw4acw1bpqvs3v3ljp5y392pm7v"))))
(build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no test suite
- (inputs (list openssl))
+ (inputs (list openssl readline))
(home-page "http://www.dest-unreach.org/socat/")
(synopsis
"Open bidirectional communication channels from the command line")
@@ -1629,28 +1658,34 @@ intended as a substitute for the PPPStatus and EthStatus projects.")
(("if build_ping == true")
"if false")))))))
(native-inputs
- (list gettext-minimal
- pkg-config
- docbook-xsl
- docbook-xml
- libxml2 ;for XML_CATALOG_FILES
- libxslt))
+ (list docbook-xsl docbook-xml-5.0.1
+ gettext-minimal libxslt pkg-config))
(inputs
(list libcap libidn2 openssl))
(synopsis "Collection of network utilities")
(description
"This package contains a variety of tools for dealing with network
configuration, troubleshooting, or servers. Utilities included are:
-
-@itemize @bullet
-@item @command{arping}: Ping hosts using the @dfn{Address Resolution Protocol}.
-@item @command{clockdiff}: Compute time difference between network hosts
-using ICMP TSTAMP messages.
-@item @command{ping}: Use ICMP ECHO messages to measure round-trip delays
-and packet loss across network paths.
-@item @command{tracepath}: Trace network path to an IPv4 or IPv6 address and
-discover MTU along the way.
-@end itemize")
+@table @command
+@item arping
+Ping hosts using @acronym{ARP, Address Resolution Protocol}.
+@item clockdiff
+Compute time difference between network hosts using ICMP TSTAMP messages.
+@item ninfod
+Daemon that responds to IPv6 Node Information Queries.
+@item ping
+Use ICMP ECHO messages to measure round-trip delays and packet loss across
+network paths.
+@item rarpd
+Answer RARP requests from clients.
+@item rdisc
+Populate network routing tables with information from the ICMP router
+discovery protocol.
+@item tftpd
+Trivial file transfer protocol server.
+@item tracepath
+Trace network path to an IPv4 or IPv6 address and discover MTU along the way.
+@end table")
;; The various utilities are covered by different licenses, see LICENSE
;; for details.
(license (list license:gpl2+ ;arping, tracepath
@@ -1753,7 +1788,7 @@ and up to 1 Mbit/s downstream.")
(lambda _
(setenv "HAVE_ICONV" "1"))))))
(inputs
- (list libidn2))
+ (list libidn2 libxcrypt))
(native-inputs
(list gettext-minimal
perl
@@ -1774,14 +1809,14 @@ of the same name.")
(define-public wireshark
(package
(name "wireshark")
- (version "4.2.4")
+ (version "4.2.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz"))
(sha256
- (base32 "034cmp6wv6k1gc5zw90z7782cap72j7jvyqn12rl8w9kfi20zga6"))))
+ (base32 "07r6n7xjckx5scp3d6s61hc54v5p5k4kaqik8jn3m9x9hymr7rsm"))))
(build-system qt-build-system)
(arguments
(list
@@ -1845,14 +1880,14 @@ network frames.")
(define-public fping
(package
(name "fping")
- (version "5.1")
+ (version "5.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://fping.org/dist/fping-"
version ".tar.gz"))
(sha256
- (base32 "1zh9fkyn0bixgn77v9z6ayv446nqwx960hmly9m68xix0s62dr8y"))))
+ (base32 "0bz4n0c4p5v8yh1fzvfvbbydpg4vy6krligpw5vbpc1zsw82ssd7"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--enable-ipv6")))
(home-page "https://fping.org/")
@@ -1914,30 +1949,40 @@ manage, and delete Internet resources from Gandi.net such as domain names,
virtual machines, and certificates.")
(license license:gpl3+)))
-(define-public go-netns
- (let ((commit "13995c7128ccc8e51e9a6bd2b551020a27180abd")
- (revision "1"))
- (package
- (name "go-netns")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vishvananda/netns")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/vishvananda/netns"
- #:tests? #f)) ;tests require root privileges
- (home-page "https://github.com/vishvananda/netns")
- (synopsis "Simple network namespace handling for Go")
- (description "The netns package provides a simple interface for
-handling network namespaces in Go.")
- (license license:asl2.0))))
+(define-public go-github-com-vishvananda-netns
+ (package
+ (name "go-github-com-vishvananda-netns")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vishvananda/netns")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rci8c211m57nya9il81fz6459pia3dj5i4b16fp34vjrkcxliml"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/vishvananda/netns"
+ #: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$")
+ ;; Disable tests requiring root access.
+ (("TestGetNewSetDelete") "OffTestGetNewSetDelete")
+ (("TestThreaded") "OffTestThreaded"))))))))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/vishvananda/netns")
+ (synopsis "Simple network namespace handling for Go")
+ (description
+ "The netns package provides a simple interface for handling network
+namespaces in Go.")
+ (license license:asl2.0)))
(define-public go-sctp
;; docker-libnetwork-cmd-proxy requires this exact commit.
@@ -2040,14 +2085,14 @@ TCP connection, TLS handshake and so on) in the terminal.")
(define-public squid
(package
(name "squid")
- (version "6.3")
+ (version "6.10")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.squid-cache.org/Versions/v6/squid-"
version ".tar.xz"))
(sha256
- (base32 "1yj869jnbdv1fb604j6g602dyvfnw7ahh9sh7mbqjpbsd9cgb83l"))))
+ (base32 "19q86j2jd2vwv298ialnhqahl0qjxjdbigi5vmq4gw13wy3v21qb"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
@@ -2066,6 +2111,7 @@ TCP connection, TLS handshake and so on) in the terminal.")
openldap
linux-pam
libcap
+ libxcrypt
cyrus-sasl
expat
libxml2
@@ -2735,7 +2781,7 @@ that block port 22.")
(define-public iperf
(package
(name "iperf")
- (version "3.16")
+ (version "3.17.1")
(source
(origin
(method git-fetch)
@@ -2744,7 +2790,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
@@ -3086,9 +3132,14 @@ does not use SSH and requires a pre-shared symmetric key.")
(base32
"1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"))
(patches
- (search-patches "quagga-reproducible-build.patch"))))
+ (search-patches "quagga-reproducible-build.patch"))
+ (snippet
+ #~(begin (delete-file "lib/memtypes.h")
+ (delete-file "lib/route_types.h")
+ (delete-file "lib/version.h")
+ (delete-file "vtysh/extract.pl")))))
(build-system gnu-build-system)
- (native-inputs (list pkg-config perl dejagnu))
+ (native-inputs (list gawk gcc-9 pkg-config perl dejagnu))
(inputs (list readline c-ares))
(synopsis "Routing Software Suite")
(description "Quagga is a routing software suite, providing implementations
@@ -3702,6 +3753,7 @@ and check if the WLAN key or the master key was transmitted unencrypted.")
(patches (search-patches "dante-non-darwin.patch"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--with-libc=libc.so.6")))
+ (inputs (list libxcrypt))
(home-page "https://www.inet.no/dante/")
(synopsis "SOCKS server and client")
(description "Dante is a SOCKS client and server implementation. It can
@@ -3841,117 +3893,121 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
(replace "llhttp" http-parser)))))
(define-public opendht
- (package
- (name "opendht")
- (version "3.1.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/savoirfairelinux/opendht")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15jx62fm1frbbvpkxysvvwz1a8d605xi53aacf0bvp4mb1dzpddn"))))
- (outputs '("out" "python" "tools" "debug"))
- (build-system gnu-build-system)
- (arguments
- (list
- #:imported-modules `((guix build python-build-system) ;for site-packages
- ,@%gnu-build-system-modules)
- #:modules '(((guix build python-build-system) #:prefix python:)
- (guix build gnu-build-system)
- (guix build utils))
- #:configure-flags
- #~(list "--disable-static" ;to reduce size
- "--enable-tests"
- "--enable-proxy-server"
- "--enable-push-notifications"
- "--enable-proxy-server-identity"
- "--enable-proxy-client")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'disable-problematic-tests
- (lambda _
- ;; The dhtrunnertester test suite includes 'testListen', which
- ;; is sensitive to the performance/load of the machine it runs
- ;; on, introducing nondeterminism (see:
- ;; https://github.com/savoirfairelinux/opendht/issues/626).
- (substitute* "tests/Makefile.am"
- (("\\bdhtrunnertester\\.(h|cpp)\\b")
- ""))))
- (add-after 'unupack 'relax-test-timeouts
- (lambda _
- ;; At least the 'test_send_json' has been seen to fail
- ;; non-deterministically, but it seems hard to reproducible that
- ;; failure.
- (substitute* "tests/httptester.cpp"
- (("std::chrono::seconds\\(10)")
- "std::chrono::seconds(30)"))))
- (add-after 'unpack 'fix-python-installation-prefix
- ;; Specify the installation prefix for the compiled Python module
- ;; that would otherwise attempt to installs itself to Python's own
- ;; site-packages directory.
- (lambda _
- (substitute* "python/Makefile.am"
- (("--root=\\$\\(DESTDIR)/")
- (string-append "--root=/ --single-version-externally-managed "
- "--prefix=" #$output:python)))))
- (add-after 'unpack 'specify-runpath-for-python-module
- (lambda _
- (substitute* "python/setup.py.in"
- (("extra_link_args=\\[(.*)\\]" _ args)
- (string-append "extra_link_args=[" args
- ", '-Wl,-rpath=" #$output "/lib']")))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "tests/opendht_unit_tests"))))
- (add-before 'bootstrap 'delete-autogen.sh
- (lambda _
- ;; The autogen.sh script lacks a shebang, cannot be executed
- ;; directly. Let the bootstrap phase invoke autoreconf itself.
- (delete-file "autogen.sh")))
- (add-after 'install 'move-and-wrap-tools
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((tools (assoc-ref outputs "tools"))
- (dhtcluster (string-append tools "/bin/dhtcluster"))
- (site-packages (python:site-packages inputs outputs)))
- (mkdir tools)
- (rename-file (string-append #$output "/bin")
- (string-append tools "/bin"))
- ;; TODO: Contribute a patch to python/Makefile.am to
- ;; automate this.
- (copy-file "python/tools/dhtcluster.py" dhtcluster)
- (chmod dhtcluster #o555)
- (wrap-program dhtcluster
- `("GUIX_PYTHONPATH" prefix (,site-packages)))))))))
- (inputs
- (list bash-minimal
- fmt
- readline))
- (propagated-inputs
- (list msgpack-cxx ;included in several installed headers
- restinio-0.6 ;included in opendht/http.h
- ;; The following are listed in the 'Requires.private' field of
- ;; opendht.pc:
- argon2
- gnutls
- jsoncpp
- nettle
- openssl ;required for the DHT proxy
- python))
- (native-inputs
- (list autoconf
- automake
- pkg-config
- python
- python-cython
- libtool
- cppunit))
- (home-page "https://github.com/savoirfairelinux/opendht/")
- (synopsis "Lightweight Distributed Hash Table (DHT) library")
- (description "OpenDHT provides an easy to use distributed in-memory data
+ ;; Temporarily use the latest commit, as the latest release lacks a 'detach'
+ ;; procedure used by a recent DhtNet, required by Jami.
+ (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42")
+ (revision "0"))
+ (package
+ (name "opendht")
+ (version (git-version "3.1.11" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/savoirfairelinux/opendht")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0"))))
+ (outputs '("out" "python" "tools" "debug"))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:imported-modules `((guix build python-build-system) ;for site-packages
+ ,@%default-gnu-imported-modules)
+ #:modules '(((guix build python-build-system) #:prefix python:)
+ (guix build gnu-build-system)
+ (guix build utils))
+ #:configure-flags
+ #~(list "--disable-static" ;to reduce size
+ "--enable-tests"
+ "--enable-proxy-server"
+ "--enable-push-notifications"
+ "--enable-proxy-server-identity"
+ "--enable-proxy-client")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ ;; The dhtrunnertester test suite includes 'testListen', which
+ ;; is sensitive to the performance/load of the machine it runs
+ ;; on, introducing nondeterminism (see:
+ ;; https://github.com/savoirfairelinux/opendht/issues/626).
+ (substitute* "tests/Makefile.am"
+ (("\\bdhtrunnertester\\.(h|cpp)\\b")
+ ""))))
+ (add-after 'unpack 'relax-test-timeouts
+ (lambda _
+ ;; At least the 'test_send_json' has been seen to fail
+ ;; non-deterministically, but it seems hard to reproducible that
+ ;; failure.
+ (substitute* "tests/httptester.cpp"
+ (("std::chrono::seconds\\(10)")
+ "std::chrono::seconds(30)"))))
+ (add-after 'unpack 'fix-python-installation-prefix
+ ;; Specify the installation prefix for the compiled Python module
+ ;; that would otherwise attempt to installs itself to Python's own
+ ;; site-packages directory.
+ (lambda _
+ (substitute* "python/Makefile.am"
+ (("--root=\\$\\(DESTDIR)/")
+ (string-append "--root=/ --single-version-externally-managed "
+ "--prefix=" #$output:python)))))
+ (add-after 'unpack 'specify-runpath-for-python-module
+ (lambda _
+ (substitute* "python/setup.py.in"
+ (("extra_link_args=\\[(.*)\\]" _ args)
+ (string-append "extra_link_args=[" args
+ ", '-Wl,-rpath=" #$output "/lib']")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "tests/opendht_unit_tests"))))
+ (add-before 'bootstrap 'delete-autogen.sh
+ (lambda _
+ ;; The autogen.sh script lacks a shebang, cannot be executed
+ ;; directly. Let the bootstrap phase invoke autoreconf itself.
+ (delete-file "autogen.sh")))
+ (add-after 'install 'move-and-wrap-tools
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((tools (assoc-ref outputs "tools"))
+ (dhtcluster (string-append tools "/bin/dhtcluster"))
+ (site-packages (python:site-packages inputs outputs)))
+ (mkdir tools)
+ (rename-file (string-append #$output "/bin")
+ (string-append tools "/bin"))
+ ;; TODO: Contribute a patch to python/Makefile.am to
+ ;; automate this.
+ (copy-file "python/tools/dhtcluster.py" dhtcluster)
+ (chmod dhtcluster #o555)
+ (wrap-program dhtcluster
+ `("GUIX_PYTHONPATH" prefix (,site-packages)))))))))
+ (inputs
+ (list bash-minimal
+ fmt
+ readline))
+ (propagated-inputs
+ (list msgpack-cxx ;included in several installed headers
+ restinio-0.6 ;included in opendht/http.h
+ ;; The following are listed in the 'Requires.private' field of
+ ;; opendht.pc:
+ argon2
+ gnutls
+ jsoncpp
+ nettle
+ openssl ;required for the DHT proxy
+ python))
+ (native-inputs
+ (list autoconf
+ automake
+ pkg-config
+ python
+ python-cython
+ libtool
+ cppunit))
+ (home-page "https://github.com/savoirfairelinux/opendht/")
+ (synopsis "Lightweight Distributed Hash Table (DHT) library")
+ (description "OpenDHT provides an easy to use distributed in-memory data
store. Every node in the network can read and write values to the store.
Values are distributed over the network, with redundancy. It includes the
following features:
@@ -3974,15 +4030,16 @@ library (get, put, etc.) with text values.
@item dhtchat
A very simple IM client working over the DHT.
@end table")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public dhtnet
;; There is no tag nor release; use the latest available commit.
- (let ((revision "2")
- (commit "024c46fb1f14276d4adf15764ed97b733890826e"))
+ (let ((revision "3")
+ (commit "77331098ff663a5ac54fae7d0bedafe076c575a1"))
(package
(name "dhtnet")
- ;; The base version is taken from the CMakeLists.txt file.
+ ;; The base version is taken from the CMakeLists.txt file (see:
+ ;; https://review.jami.net/plugins/gitiles/dhtnet/+/master/CMakeLists.txt#3).
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
@@ -3992,7 +4049,7 @@ A very simple IM client working over the DHT.
(file-name (git-file-name name version))
(sha256
(base32
- "191gmfdg22hkmxvzh5i19lr512q4bhgajhlg9mxxgb7jq0842mc6"))))
+ "1ch736misnlv2aqalj3n62gnz5xlhmip9xfv1aimp0aqinfc94p7"))))
(outputs (list "out" "debug"))
(build-system cmake-build-system)
(arguments
@@ -4005,13 +4062,16 @@ A very simple IM client working over the DHT.
(add-after 'unpack 'delete-problematic-tests
(lambda _
(substitute* "CMakeLists.txt"
- ;; The connectionManager test currently segfaults (see:
- ;; https://git.jami.net/savoirfairelinux/dhtnet/-/issues/18).
- ((".*tests_connectionManager.*") "")
- ;; The ICE tests fail inside the containerized build
- ;; environment, perhaps relying on a name resolver (see:
+ ;; The connectionaMnager, the ICE and turnCache tests fail
+ ;; inside the containerized build environment, due to
+ ;; relying on a name resolver (see:
;; https://git.jami.net/savoirfairelinux/dhtnet/-/issues/25).
- ((".*tests_ice.*") "")))))))
+ ((".*tests_connectionManager.*") "")
+ ((".*tests_ice.*") "")
+ ((".*tests_turnCache.*") "")
+ ;; The peerDiscovery test fails for unknown reasons, on an
+ ;; assertion that checks the value of 'isBobRecvChanlReq'.
+ ((".*tests_peerDiscovery.*") "")))))))
(native-inputs (list cppunit pkg-config))
;; This library depends on the Jami fork of pjproject that adds ICE
;; support.
@@ -4044,7 +4104,7 @@ for interacting with an OpenDHT distributed network.")
"1r7gh5h27ii7d1d0z0x48wx7hs8vvympv3gqvy3cwzg05q5vk9xs"))))
(build-system gnu-build-system)
(inputs
- (list c-ares json-c libcap libyang readline))
+ (list c-ares json-c libcap libxcrypt libyang readline))
(native-inputs
(list perl pkg-config python-wrapper python-pytest))
(home-page "https://frrouting.org/")
@@ -4338,7 +4398,8 @@ easy-to-understand binary values.")
(lambda _
(setenv "CC" "gcc")
(invoke "make" "tunctl")))
- ;; TODO: Requires docbook2x to generate man page from SGML.
+ ;; TODO: Requires docbook-to-man (unrelated to docbook2x and
+ ;; docbook-utils) to generate man page from SGML.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -4566,15 +4627,15 @@ network.")
(define-public ngtcp2
(package
(name "ngtcp2")
- (version "1.4.0")
+ (version "1.7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ngtcp2/ngtcp2/"
"releases/download/v" version "/"
- "ngtcp2-" version ".tar.xz"))
+ "ngtcp2-" version ".tar.gz"))
(sha256
- (base32 "0jnay7m4zkg6v2zcidswv9xbyjgsvjbhwf8ykqjcw1jwkwxl7ldm"))))
+ (base32 "0r06ib077n4i7s5bfrdq2f2sh8jc2fck5k73wffsypk1k9fcpp2r"))))
(build-system gnu-build-system)
(arguments
(list
@@ -4593,7 +4654,7 @@ QUIC protocol.")
(define-public yggdrasil
(package
(name "yggdrasil")
- (version "0.5.5")
+ (version "0.5.8")
(source
(origin
(method git-fetch)
@@ -4604,15 +4665,12 @@ QUIC protocol.")
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "0yzgs4b0q945ygrqlc5hnmh78awl5p35azx83fz61bzfg20d52b4"))
+ (base32 "0qcly06bljlilihrqrylhq53w3l4bfzmqqjq4cbn55nvsz2gbify"))
(patches (search-patches "yggdrasil-extra-config.patch"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/yggdrasil-network/yggdrasil-go"
- ;; TODO: figure out how tests are run
- #:tests? #f
#:install-source? #f
- #:go go-1.21
#:phases
#~(modify-phases %standard-phases
(replace 'build
@@ -4630,34 +4688,31 @@ QUIC protocol.")
#:import-path directory))
(list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil"
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl"
- "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))))))))
+ "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "go" "test" "-v" "./cmd/..." "./src/..."))))))))
(propagated-inputs
- (list go-golang-zx2c4-com-wireguard
- go-golang-org-x-text
- go-golang-org-x-net
+ (list ;; go-golang-org-x-mobile ; Not packed yet, for contrib.
+ ;; go-golang-zx2c4-com-wireguard-windows ; Not packed yet, for tun.
+ go-github-com-arceliar-ironwood
+ go-github-com-arceliar-phony
+ go-github-com-cheggaaa-pb-v3
+ go-github-com-gologme-log
+ go-github-com-hashicorp-go-syslog
+ go-github-com-hjson-hjson-go-v4
+ go-github-com-kardianos-minwinsvc
+ go-github-com-olekukonko-tablewriter
+ go-github-com-quic-go-quic-go
+ go-github-com-vishvananda-netlink
go-golang-org-x-crypto
- go-golang-org-x-tools
+ go-golang-org-x-net
go-golang-org-x-sys
- go-netns
- go-netlink
- go-github-com-bits-and-blooms-bitset
- go-github-com-bits-and-blooms-bloom
- go-github-com-quic-go-quic-go
- go-github-com-hjson-hjson-go
- go-github-com-olekukonko-tablewriter
- go-github-com-mitchellh-mapstructure
- go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-colorable
- go-github-com-kardianos-minwinsvc
- go-github-com-hjson-hjson-go
- go-github-com-hashicorp-go-syslog
- go-github-com-gologme-log
- go-github-com-fatih-color
- go-github-com-cheggaaa-pb-v3
- go-github-com-vividcortex-ewma
- go-github-com-arceliar-phony
- go-github-com-arceliar-ironwood))
+ go-golang-org-x-text
+ go-golang-zx2c4-com-wireguard
+ go-nhooyr-io-websocket))
(home-page "https://yggdrasil-network.github.io/blog.html")
(synopsis
"Experiment in scalable routing as an encrypted IPv6 overlay network")
@@ -4688,7 +4743,7 @@ IPv6 Internet connectivity - it also works over IPv4.")
(define-public nebula
(package
(name "nebula")
- (version "1.8.2")
+ (version "1.9.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4697,7 +4752,7 @@ IPv6 Internet connectivity - it also works over IPv4.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ly1axgmskrkmxhzymqis6gxf2wd7rvhycm94wfb8k0hirndvg5m"))
+ "08zzbx2v713zd9p7i4kd1bvcw47xb0092p5apba1x5wg6fpxw5zr"))
;; Remove windows-related binary blobs and files
(snippet
#~(begin
@@ -4707,7 +4762,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
@@ -4736,7 +4790,7 @@ IPv6 Internet connectivity - it also works over IPv4.")
(list go-dario-cat-mergo
go-github-com-anmitsu-go-shlex
go-github-com-armon-go-radix
- go-github-com-cespare-xxhash
+ go-github-com-cespare-xxhash-v2
go-github-com-cyberdelia-go-metrics-graphite
go-github-com-flynn-noise
go-github-com-gogo-protobuf
@@ -4757,8 +4811,8 @@ IPv6 Internet connectivity - it also works over IPv4.")
go-golang-org-x-term
go-google-golang-org-protobuf
go-gopkg-in-yaml-v2
- go-netlink
- go-netns))
+ go-github-com-vishvananda-netlink
+ go-github-com-vishvananda-netns))
(home-page "https://github.com/slackhq/nebula")
(synopsis "Scalable, peer-to-peer overlay networking tool")
(description
@@ -4813,8 +4867,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/node.scm b/gnu/packages/node.scm
index a9d4e5ab13..7c320a00d6 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -77,6 +78,10 @@
(("TRUE") "true")
(("FALSE") "false"))
+ ;; Fix process.versions.XXXX assumption of always having
+ ;; a version string of major.minor.patch and not major.minor.
+ (substitute* "test/parallel/test-process-versions.js"
+ (("\\\\d\\+\\\\.\\\\d\\+\\\\.") "(\\d+\\.)+"))
;; Remove bundled software.
(for-each delete-file-recursively
'("deps/cares"
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 162e748094..6c60e9fbae 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -28,6 +28,8 @@
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system mozilla)
#:use-module ((guix licenses) #:prefix license:)
@@ -35,9 +37,11 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
+ #:use-module (gnu packages crates-io)
#:use-module (gnu packages compression)
#:use-module (gnu packages perl)
- #:use-module (gnu packages sqlite))
+ #:use-module (gnu packages sqlite)
+ #:use-module (gnu packages time))
(define-public nspr
(package
@@ -103,14 +107,15 @@ in the Mozilla clients.")
(base32
"0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv"))))))
+;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR.
+
(define-public nss
(package
(name "nss")
;; IMPORTANT: Also update and test the nss-certs package, which duplicates
;; version and source to avoid a top-level variable reference & module
;; cycle.
- (version "3.88.1")
- (replacement nss/fixed)
+ (version "3.99")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -121,7 +126,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz")))
(sha256
(base32
- "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))
+ "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"
@@ -181,11 +186,8 @@ in the Mozilla clients.")
(replace 'configure
(lambda _
(setenv "CC" #$(cc-for-target))
- ;; TODO: Set this unconditionally
- #$@(if (%current-target-system)
- #~((setenv "CCC" #$(cxx-for-target))
- (setenv "NATIVE_CC" "gcc"))
- #~())
+ (setenv "CCC" #$(cxx-for-target))
+ (setenv "NATIVE_CC" "gcc")
;; No VSX on powerpc-linux.
#$@(if (target-ppc32?)
#~((setenv "NSS_DISABLE_CRYPTO_VSX" "1"))
@@ -204,11 +206,29 @@ in the Mozilla clients.")
(setenv "USE_IP" "TRUE")
(setenv "IP_ADDRESS" "127.0.0.1")
+ ;; This specific test is looking at performance "now
+ ;; verify that we can quickly dump a database", and
+ ;; we're not testing performance here (especially
+ ;; since we're using faketime), so raise the
+ ;; threshold
+ (substitute* "nss/tests/dbtests/dbtests.sh"
+ ((" -lt 5") " -lt 50"))
+
+ #$@(if (target-64bit?)
+ '()
+ ;; The script fails to determine the source
+ ;; directory when running under 'datefudge' (see
+ ;; <https://issues.guix.gnu.org/72239>). Help it.
+ #~((substitute* "nss/tests/gtests/gtests.sh"
+ (("SOURCE_DIR=.*")
+ (string-append "SOURCE_DIR=" (getcwd) "/nss\n")))))
+
;; The "PayPalEE.cert" certificate expires every six months,
;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date.
- (invoke "faketime" "2022-11-01" "./nss/tests/all.sh"))
+ (invoke #$(if (target-64bit?) "faketime" "datefudge")
+ "2024-01-23" "./nss/tests/all.sh"))
(format #t "test suite not run~%"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
@@ -233,7 +253,9 @@ in the Mozilla clients.")
(copy-recursively (string-append obj "/lib") lib)))))))
(inputs (list sqlite zlib))
(propagated-inputs (list nspr)) ;required by nss.pc.
- (native-inputs (list perl libfaketime which)) ;for tests
+ (native-inputs (list perl ;for tests
+ (if (target-64bit?) libfaketime datefudge)
+ which))
;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when
;; another build is happening concurrently on the same machine.
@@ -280,9 +302,134 @@ security standards.")
(setenv "USE_IP" "TRUE")
(setenv "IP_ADDRESS" "127.0.0.1")
+ ;; This specific test is looking at performance "now
+ ;; verify that we can quickly dump a database", and
+ ;; we're not testing performance here (especially
+ ;; since we're using faketime), so raise the
+ ;; threshold
+ (substitute* "nss/tests/dbtests/dbtests.sh"
+ ((" -lt 5") " -lt 50"))
+
+ ;; Since the test suite is very lengthy, run the test
+ ;; suite once, not thrice as done by default, by
+ ;; selecting only the 'standard' cycle.
+ (setenv "NSS_CYCLES" "standard")
+
;; The "PayPalEE.cert" certificate expires every six months,
;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date.
(invoke "faketime" "2024-01-23" "./nss/tests/all.sh"))
(format #t "test suite not run~%"))))))))))))
+
+;; nss-rapid tracks the rapid release channel. Unless your package requires a
+;; newer version, you should prefer the `nss' package, which tracks the ESR
+;; channel.
+;;
+;; See https://wiki.mozilla.org/NSS:Release_Versions
+;; and https://wiki.mozilla.org/Rapid_Release_Model
+
+(define-public nss-rapid
+ (package
+ (inherit nss)
+ (name "nss-rapid")
+ (version "3.103")
+ (source (origin
+ (inherit (package-source nss))
+ (uri (let ((version-with-underscores
+ (string-join (string-split version #\.) "_")))
+ (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
+ "releases/NSS_" version-with-underscores "_RTM/src/"
+ "nss-" version ".tar.gz")))
+ (sha256
+ (base32
+ "0qp9rs226rr6gh51b42cdbydr4mj80cli3bfqhh7bp3jyxbvcjkv"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments nss)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for
+ ;; testing. The latter requires a working DNS or /etc/hosts.
+ (setenv "DOMSUF" "localdomain")
+ (setenv "USE_IP" "TRUE")
+ (setenv "IP_ADDRESS" "127.0.0.1")
+
+ ;; This specific test is looking at performance "now
+ ;; verify that we can quickly dump a database", and
+ ;; we're not testing performance here (especially
+ ;; since we're using faketime), so raise the
+ ;; threshold
+ (substitute* "nss/tests/dbtests/dbtests.sh"
+ ((" -lt 5") " -lt 50"))
+
+ ;; Since the test suite is very lengthy, run the test
+ ;; suite once, not thrice as done by default, by
+ ;; selecting only the 'standard' cycle.
+ (setenv "NSS_CYCLES" "standard")
+
+ ;; The "PayPalEE.cert" certificate expires every six months,
+ ;; leading to test failures:
+ ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
+ ;; work around that, set the time to roughly the release date.
+ (invoke "faketime" "2024-08-17" "./nss/tests/all.sh"))
+ (format #t "test suite not run~%"))))))))
+ (synopsis "Network Security Services (Rapid Release)")
+ (description
+ "Network Security Services (@dfn{NSS}) is a set of libraries designed to
+support cross-platform development of security-enabled client and server
+applications. Applications built with NSS can support SSL v2 and v3, TLS,
+PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other
+security standards.
+
+This package tracks the Rapid Release channel, which updates frequently.")))
+(define-public nsncd
+ (package
+ (name "nsncd")
+ (version "2024-04-09")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/twosigma/nsncd")
+ (commit "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hk8bh2a02nyk3rpzbjx1a2iiz15d0vx3ysa180wmr8gsc9ymph5"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--"
+ ;; 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)
+ ("rust-slog-term" ,rust-slog-term-2)
+ ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+ ("rust-nix" ,rust-nix-0.28)
+ ("rust-num-derive" ,rust-num-derive-0.3)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-sd-notify" ,rust-sd-notify-0.4)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-dns-lookup" ,rust-dns-lookup-2))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.5)
+ ("rust-temp-env" ,rust-temp-env-0.3))))
+ (home-page "https://github.com/twosigma/nsncd")
+ (synopsis "The name service non-caching daemon")
+ (description
+ "This package provides @command{nscd}, a daemon compatible that proxies
+lookups, compatible with the GNU C Library's @command{nscd}, but without
+caching. It can be used in situations where you want to make an application
+use @acronym{NSS, Name Service Switch} plugins available to a different libc
+than the one the application will load.")
+ (license (list license:asl2.0))))
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 3b56580842..cb9fdaa09f 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -9,6 +9,8 @@
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,11 +31,13 @@
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bison)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages tls)
#:use-module (guix build-system gnu)
#:use-module (guix download)
@@ -47,14 +51,16 @@
(define-public chrony
(package
(name "chrony")
- (version "4.4")
+ (version "4.5")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://download.tuxfamily.org/chrony/"
- "chrony-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/chrony/chrony")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "123h2a9rpc6wbvnysvhl5pmckvynzrnqay7l00i18azrvbk0gyza"))))
+ (base32 "0w6wgpgvwidsfc4mmi5zb73y9lydzwgwxpj0q5r1m47gd1qxa24n"))))
(build-system gnu-build-system)
(arguments
(list
@@ -68,6 +74,9 @@
"--with-user=chrony")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'set-CC
+ (lambda _
+ (setenv "CC" #$(cc-for-target))))
(add-after 'unpack 'stay-inside-out
;; Simply setting CHRONYVARDIR to something nonsensical at install
;; time would result in nonsense file names in man pages.
@@ -79,23 +88,24 @@
(let* ((doc (string-append #$output "/share/doc/"
#$name "-" #$version)))
(for-each (cut install-file <> doc)
- (list "README" "FAQ"))
+ (list "README"))
(copy-recursively "examples"
(string-append doc "/examples"))))))))
(native-inputs
- (list pkg-config))
+ (list bison ruby-asciidoctor pkg-config))
(inputs
(list gnutls libcap libseccomp nettle))
- (home-page "https://chrony.tuxfamily.org/")
- (synopsis "System clock synchronisation service that speaks NTP")
+ (home-page "https://chrony-project.org/")
+ (synopsis "System clock synchronization service that speaks NTP")
(description
"Chrony keeps your system time accurate. It synchronises your computer's
clock with @acronym{NTP, Network Time Protocol} servers, reference clocks such
as GPS receivers, or even manual input of the correct time from a wristwatch.
Chrony will determine the rate at which the computer gains or loses time, and
-compensate for it. It can also operate as an NTPv4 (RFC 5905) server and peer
-to tell time to other computers on the network.
+compensate for it. It can also operate as an
+NTPv4 (@url{https://www.rfc-editor.org/rfc/rfc5905, RFC 5905}) server and peer to
+tell time to other computers on the network.
It's designed to perform well even under adverse conditions: congested
networks, unreliable clocks drifting with changes in temperature, and devices
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3bd923f97d..6ba5f5e374 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2016, 2018-2020, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018-2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2024 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -28,7 +28,7 @@
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Garek Dyszel <garekdyszel@disroot.org>
;;; Copyright © 2023 Csepp <raingloom@riseup.net>
-;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
+;;; Copyright © 2023, 2024 Foundation Devices, Inc. <hello@foundation.xyz>
;;; Copyright © 2023 Arnaud DABY-SEESARAM <ds-ac@nanein.fr>
;;; Copyright © 2024 Sören Tempel <soeren@soeren-tempel.net>
;;;
@@ -1320,7 +1320,7 @@ the OCaml core distribution.")
(build-system gnu-build-system)
(arguments
(list
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:modules '((guix build gnu-build-system)
@@ -1419,9 +1419,12 @@ Knuth’s LR(1) parser construction technique.")
"179ipx0c6bpxm4gz0syxgqy09dp5p4x9qsdil7s9jlx8ffg1mm0w"))))
(build-system gnu-build-system)
(native-inputs
- `(("ocaml" ,ocaml)
- ("findlib" ,ocaml-findlib)
- ("pkg-config" ,pkg-config)))
+ (list ;; Build failure with make-4.4, so we use make-4.2.
+ ;; See <https://github.com/garrigue/lablgtk/issues/170>.
+ gnu-make-4.2
+ ocaml
+ ocaml-findlib
+ pkg-config))
;; FIXME: Add inputs gtkgl-2.0, libpanelapplet-2.0, gtkspell-2.0,
;; and gtk+-quartz-2.0 once available.
(inputs
@@ -1430,7 +1433,7 @@ Knuth’s LR(1) parser construction technique.")
libgnomecanvas
libgnomeui
libglade
- librsvg))
+ (librsvg-for-system)))
(arguments
`(#:tests? #f ; no check target
@@ -1503,7 +1506,7 @@ software engineering.")
(define-public unison
(package
(name "unison")
- (version "2.53.3")
+ (version "2.53.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1512,7 +1515,7 @@ software engineering.")
(file-name (git-file-name name version))
(sha256
(base32
- "05ihxk1yynw08586i06w19xab9r24h9hr6v9bknqm98qrlshm92w"))))
+ "1fy4c1wb6xn9gxdabs25yajbzik3amifyr7nzd4d9vn6r3gll9sw"))))
(build-system dune-build-system)
(propagated-inputs (list lablgtk3 zlib))
(native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which))
@@ -3186,6 +3189,34 @@ OCaml with fibers.")
(define-public ocaml5.0-eio-luv
(package-with-ocaml5.0 ocaml-eio-luv))
+(define-public ocaml-unionfind
+ (package
+ (name "ocaml-unionfind")
+ (version "20220122")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.inria.fr/fpottier/unionfind")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hdh56rbg8vfjd61q09cbmh8l5wmry5ykivg7gsm0v5ckkb3531r"))))
+ (build-system dune-build-system)
+ (arguments
+ (list ;; The test allocates an Array that is too large for OCaml when on a
+ ;; 32-bit architecture.
+ #:tests? (target-64bit?)))
+ (home-page "https://gitlab.inria.fr/fpottier/unionFind")
+ (synopsis "Union-find data structure")
+ (description "This package provides two union-find data structure
+implementations for OCaml. Both implementations are based on disjoint sets
+forests, with path compression and linking-by-rank, so as to guarantee good
+asymptotic complexity: every operation requires a quasi-constant number of
+accesses to the store.")
+ ;; Version 2 only, with linking exception.
+ (license license:lgpl2.0)))
+
(define-public ocaml-uring
(package
(name "ocaml-uring")
@@ -8570,8 +8601,7 @@ generate OCaml code from .glade files), libpanel, librsvg and quartz.")
(package
(inherit lablgtk3)
(name "ocaml-lablgtk3-sourceview3")
- (propagated-inputs (list lablgtk3))
- (native-inputs (list gtksourceview-3 pkg-config))
+ (propagated-inputs (list gtksourceview-3 lablgtk3))
(arguments
`(#:package "lablgtk3-sourceview3"))
(synopsis "OCaml interface to GTK+ gtksourceview library")
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 089bea7f01..8e376da78b 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -160,7 +160,6 @@ models for the Tesseract OCR Engine.")
libarchive
libtiff
libtool
- libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
tesseract-ocr-tessdata-fast))
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index bd244cea1e..efc4a9cc06 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -28,8 +28,10 @@
(define-module (gnu packages openldap)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dbm)
@@ -222,7 +224,15 @@ servers from Python programs.")
(file-name (git-file-name name version))
(sha256
(base32
- "1sdvfbjfg0091f47562gw3gdc2vgvvhyhdi21lrpwnw9lqc8xdxk"))))
+ "1sdvfbjfg0091f47562gw3gdc2vgvvhyhdi21lrpwnw9lqc8xdxk"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Put '#define f_type' after '#include <sys/statvfs.h>' to
+ ;; avoid name conflict.
+ '(substitute* "ldap/servers/slapd/slap.h"
+ (("#include <sys/types\\.h>")
+ "#include <sys/types.h>
+#include <sys/statvfs.h>")))))
(build-system gnu-build-system)
(arguments
(list
@@ -232,7 +242,7 @@ servers from Python programs.")
#:select (add-installed-pythonpath python-version))
(guix build utils))
#:imported-modules `((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:disallowed-references (list httpd)
#:configure-flags
#~(list "--enable-cmocka"
@@ -319,7 +329,8 @@ servers from Python programs.")
"/bin/ds-logpipe.py"
"/bin/ds-replcheck"))))))))
(inputs
- (list bdb
+ (list bash-minimal
+ bdb
cracklib
cyrus-sasl
gnutls
@@ -329,6 +340,7 @@ servers from Python programs.")
libevent
libselinux
linux-pam
+ libxcrypt
lmdb
mit-krb5
net-snmp
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 0937dc2e4f..8e53ba8f62 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages openstack)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages gnupg)
@@ -977,14 +978,10 @@ permanence.")
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
- (list git openssh)))))
- #t)))))
- (native-inputs
- (list python-pbr))
- (propagated-inputs
- (list python-requests))
- (inputs
- (list git openssh))
+ (list git openssh))))))))))
+ (native-inputs (list python-pbr))
+ (propagated-inputs (list python-requests))
+ (inputs (list bash-minimal git openssh))
(home-page "https://docs.openstack.org/infra/git-review/")
(synopsis "Command-line tool for Gerrit")
(description
diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm
index 8b22124c35..cbc8029729 100644
--- a/gnu/packages/orange.scm
+++ b/gnu/packages/orange.scm
@@ -22,6 +22,7 @@
#:use-module (guix download)
#:use-module (guix build-system python)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages graph)
#:use-module (gnu packages machine-learning)
@@ -143,7 +144,8 @@ GUI based workflow. It is primarily used in the Orange framework.")
(native-inputs
(list python-cython))
(inputs
- (list python-anyqt
+ (list bash-minimal
+ python-anyqt
python-baycomp
python-bottleneck
python-chardet
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index faa1a75aa0..b1c7172db6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
@@ -24,6 +24,7 @@
;;; Copyright © 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -177,8 +178,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.4.0")
- (commit "4c94b9e983bc51d9504655f1e7727c4f6d14b6b7")
- (revision 18))
+ (commit "9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a")
+ (revision 24))
(package
(name "guix")
@@ -194,7 +195,7 @@
(commit commit)))
(sha256
(base32
- "19lqlfafs5mrnciw4jz4iccx5zzhj4pyb20bz6cdqcqbf9nmkfp1"))
+ "0823vl88gbgqadc20in9qvxnrd7zhnq047bfvw4gvdsmgxpcpvpx"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -464,7 +465,8 @@ $(prefix)/etc/openrc\n")))
;; the 'patch-shebangs' phase, which would otherwise
;; change it to 'GUILE/bin/guile'.
(delete 'patch-shebangs))))
- (native-inputs `(("pkg-config" ,pkg-config)
+ (native-inputs `(("locales" ,(libc-utf8-locales-for-target))
+ ("pkg-config" ,pkg-config)
;; Guile libraries are needed here for
;; cross-compilation.
@@ -482,6 +484,7 @@ $(prefix)/etc/openrc\n")))
("guile-zstd" ,guile-zstd)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)
+ ("guile-semver" ,guile-semver)
;; XXX: Keep the development inputs here even though
;; they're unnecessary, just so that 'guix environment
@@ -493,9 +496,10 @@ $(prefix)/etc/openrc\n")))
("graphviz" ,graphviz-minimal)
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
("help2man" ,help2man)
- ("po4a" ,po4a)))
+ ("po4a" ,po4a-minimal)))
(inputs
- `(("bzip2" ,bzip2)
+ `(("bash-minimal", bash-minimal)
+ ("bzip2" ,bzip2)
("gzip" ,gzip)
("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt)
@@ -789,7 +793,7 @@ which are indicated in the file name.")
(build-system guile-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
- (add-after 'install 'move-to-extension-directory
+ (add-after 'build 'move-to-extension-directory
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(target (string-append
@@ -886,7 +890,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
@@ -1004,8 +1008,8 @@ transactions from C or Python.")
(license license:gpl2+)))
(define-public bffe
- (let ((commit "bdfaab91e82d7d43c35405da3b18c46cde8096de")
- (revision "5"))
+ (let ((commit "0fc06c7dad2904989fc8c48f5a20c46a60254e9b")
+ (revision "7"))
(package
(name "bffe")
(version (git-version "0" revision commit))
@@ -1016,7 +1020,7 @@ transactions from C or Python.")
(commit commit)))
(sha256
(base32
- "0qwnd49apwdx8wrfms2spii1kdg5ashf4591kyfyr89070jjmpa7"))
+ "0wkszdlsxw335wwh3qi2g7hfyrrnmmqx0kr02yqb8vasmn3vm8jz"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs
@@ -1545,8 +1549,8 @@ environments.")
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
- (let ((commit "53dddfa62c281ac428325a9d642093979dce77d2")
- (revision "102"))
+ (let ((commit "492d4628887ea726cedc1c2b55743acfe32dfe0c")
+ (revision "110"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1557,16 +1561,16 @@ environments.")
(commit commit)))
(sha256
(base32
- "11i2qwnz7lhjvkg95vdv1520baa2lzqhb9slvm6xxql8lxmsjvj0"))
+ "0ssns2l4dl54igqrr874g6z32s9r9qdf7dzfrqar4mmjz343n8rp"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(list
#:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE
@@ -1803,8 +1807,8 @@ in an isolated environment, in separate namespaces.")
(license license:gpl3+)))
(define-public nar-herder
- (let ((commit "71115bd073d58c48eb4a1d456ac4c89b262799ef")
- (revision "30"))
+ (let ((commit "82f9371c714f14ca59efb8d67b20e9c85b5c86d1")
+ (revision "37"))
(package
(name "nar-herder")
(version (git-version "0" revision commit))
@@ -1815,16 +1819,16 @@ in an isolated environment, in separate namespaces.")
(commit commit)))
(sha256
(base32
- "139d2ajnm1s0y7iirbvxdr14g6ywkj7zrfskwbmvlkz5ldn7v9zb"))
+ "0907hrb02qfa0xvkgzap7bwlx0w9ywfcfr6iw41w4rxarf7xkjlg"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(list
#:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE
@@ -2041,7 +2045,8 @@ the boot loader configuration.")
(sha256
(base32 "0ij93vl9skcfdfgkmgd80q0q4c6q39dss4rds7phxizqqsr3d3sk"))
(patches
- (search-patches "flatpak-fix-path.patch"
+ (search-patches "flatpak-fix-fonts-icons.patch"
+ "flatpak-fix-path.patch"
"flatpak-unset-gdk-pixbuf-for-sandbox.patch"))))
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
@@ -2246,19 +2251,18 @@ Python eggs, Ruby gems, and more to RPMs, debs, Solaris packages and more.")
(mkdir-p datadir)
(invoke "touch" (string-append datadir "index.db"))
(setenv "HOME" home))
- (invoke "./bootstrap")
- #t))
+ (invoke "./bootstrap")))
(add-after 'install 'wrap-executables
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(curl (assoc-ref inputs "curl")))
(wrap-program (string-append out "/bin/akku")
- `("LD_LIBRARY_PATH" ":" prefix (,(string-append curl "/lib"))))
- #t))))))
+ `("LD_LIBRARY_PATH" ":" prefix
+ (,(string-append curl "/lib"))))))))))
(native-inputs
(list which autoconf automake pkg-config))
(inputs
- (list guile-3.0 curl))
+ (list bash-minimal guile-3.0 curl))
(home-page "https://akkuscm.org/")
(synopsis "Language package manager for Scheme")
(description
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 5b83b96801..3c551d778b 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2023 Wamm K. D. <jaft.r@outlook.com>
-;;; Copyright © 2023 altadil <Altadil@protonmail.com>
+;;; Copyright © 2023, 2024 altadil <Altadil@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,17 +25,21 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
#:use-module (gnu packages package-management)
#:use-module (gnu packages pcre)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages xml)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (guix build-system meson)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -94,7 +98,7 @@ in apps built for the Pantheon desktop.")
(define-public pantheon-calculator
(package
(name "pantheon-calculator")
- (version "2.0.2")
+ (version "8.0.0")
(source
(origin
(method git-fetch)
@@ -104,15 +108,15 @@ in apps built for the Pantheon desktop.")
(file-name (git-file-name name version))
(sha256
(base32
- "1w59sgznzybawhz411avqayws8jq0471n6hwhkplvcz7inxlzdrw"))))
+ "1as5rxd0b6z3lnh8my36szr056rxxqwkjzvaiylspx5g2kg3qjs0"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-schema-cache-generation
- (lambda _
- (setenv "DESTDIR" "/"))))))
+ (list
+ #:glib-or-gtk? #t
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-schema-cache-generation
+ (lambda _
+ (setenv "DESTDIR" "/"))))))
(inputs
(list granite
glib
@@ -132,6 +136,90 @@ arithmetic. It is the default calculator application in the Pantheon
desktop.")
(license license:gpl3)))
+(define-public pantheon-photos
+ (package
+ (name "pantheon-photos")
+ (version "8.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elementary/photos")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1z3b582y093x6pb3bl7zs4w97vg88rflyhwxfaycxw0rv8pcshhi"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-schema-cache-generation
+ (lambda _
+ (setenv "DESTDIR" "/")))
+ (add-after 'install 'install-symlinks
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((bin (string-append #$output
+ "/bin/io.elementary.photos"))
+ (link (string-append #$output "/bin/pantheon-photos")))
+ (symlink bin link)))))))
+ (native-inputs
+ (list desktop-file-utils
+ `(,glib "bin")
+ intltool
+ pkg-config
+ python
+ vala))
+ (inputs
+ (list geocode-glib
+ gexiv2
+ granite-6
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-ugly
+ gstreamer
+ gtk+
+ libexif
+ libgee
+ libgphoto2
+ libgudev
+ libhandy
+ libportal
+ libraw
+ libwebp
+ sqlite))
+ (synopsis "Photo viewer and organizer designed for the Pantheon desktop")
+ (description
+ "Photos is an image viewer and organizer. It originally comes
+from elementary OS and is designed for the Pantheon desktop environment (but can
+also be used on others.")
+ (home-page "https://elementary.io/open-source")
+ (license license:lgpl2.1+)))
+
+(define-public pantheon-stylesheet
+ (package
+ (name "pantheon-stylesheet")
+ (version "8.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elementary/stylesheet")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h8k75m9jrqxwq0py8hrqrsc83myrwpmnrwx05aljdyr6sys06k6"))))
+ (build-system meson-build-system)
+ (native-inputs (list gettext-minimal)) ;for msgfmt
+ (inputs (list sassc))
+ (synopsis "GTK stylesheet for the Pantheon desktop")
+ (description "pantheon-stylesheet is the GTK Stylesheet for the Pantheon
+desktop environment (originally from elementary OS).")
+ (home-page "https://elementary.io/open-source")
+ (license license:gpl3+)))
+
(define-public pantheon-terminal
(package
(name "pantheon-terminal")
@@ -147,20 +235,21 @@ desktop.")
"0x3gzghnfx4a1q2zhra4dysc0pm1zvlfdxj96qhfb627pz16iv4k"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; Tests invole launching the terminal.
- #:glib-or-gtk? #t
- #:phases (modify-phases %standard-phases
- (add-before 'install 'set-environment-variables
- (lambda _
- ;; Disable compiling schemas and updating desktop databases
- (setenv "DESTDIR" "/")))
- (add-after 'install 'install-symlinks
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out
- "/bin/io.elementary.terminal"))
- (link (string-append out "/bin/pantheon-terminal")))
- (symlink bin link)))))))
+ (list
+ #:tests? #f ; Tests invole launching the terminal.
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'set-environment-variables
+ (lambda _
+ ;; Disable compiling schemas and updating desktop databases
+ (setenv "DESTDIR" "/")))
+ (add-after 'install 'install-symlinks
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((bin (string-append #$output
+ "/bin/io.elementary.terminal"))
+ (link (string-append #$output "/bin/pantheon-terminal")))
+ (symlink bin link)))))))
(native-inputs (list appstream
desktop-file-utils ;required for tests
gettext-minimal ;for msgfmt
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 11199594f1..ce1f4f9f79 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>
@@ -9,10 +9,12 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2024 Romain Garbage <romain.garbage@inria.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +37,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (guix build-system pyproject)
#:use-module ((guix licenses) #:prefix license:)
#:use-module ((guix utils) #:select (target-64bit?))
#:use-module (guix packages)
@@ -49,12 +52,14 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages freeipmi)
+ #:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
@@ -65,14 +70,14 @@
(define-public parallel
(package
(name "parallel")
- (version "20240422")
+ (version "20240822")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2"))
(sha256
- (base32 "0rr4i1a5gcxz60cb3p4ga3s8k79sr84yicqysg794ayy7qh8hf3q"))
+ (base32 "179hr24gs3gpz7c5mnnncg0dixym70hvsk705cbhp61ifrdxkfyp"))
(snippet
'(begin
(use-modules (guix build utils))
@@ -112,11 +117,12 @@
'("perl"
"procps")))))))
(add-after 'wrap-program 'post-install-test
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke (string-append
- (assoc-ref outputs "out") "/bin/parallel")
- "echo"
- ":::" "1" "2" "3"))))))
+ (lambda* (#:key tests? outputs #:allow-other-keys)
+ (when tests?
+ (invoke (string-append
+ (assoc-ref outputs "out") "/bin/parallel")
+ "echo"
+ ":::" "1" "2" "3")))))))
(native-inputs
(list perl pod2pdf))
(inputs
@@ -195,6 +201,8 @@ when jobs finish.")
(sha256
(base32
"08rz3r1rlnb3pmfdnbh542gm44ja0fdy8rkj4vm4lclc48cvqp2a"))
+ (patches
+ (search-patches "slurm-23-salloc-fallback-shell.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -222,6 +230,7 @@ when jobs finish.")
`(,hwloc-2 "lib")
json-c
linux-pam
+ openpmix
munge
numactl
readline))
@@ -238,6 +247,14 @@ when jobs finish.")
(string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-munge=" #$(this-package-input "munge"))
+ ;; Use PMIx bundled with Open MPI (this is required for Open MPI 5.x).
+ ;; Note: Older versions that inherit from this package lack the
+ ;; 'openpmix' dependency.
+ #$(let ((openmpix (this-package-input "openpmix")))
+ (if openmpix
+ #~(string-append "--with-pmix=" #$openmpix)
+ "--without-pmix"))
+
;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled.
#$@(if (target-64bit?) '() '("--enable-deprecated")))
@@ -292,53 +309,62 @@ by managing a queue of pending work.")
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
"0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))))))
(define-public slurm-21.08
(package
- (inherit slurm)
+ (inherit slurm-22.05)
(version "21.08.8")
(source (origin
- (inherit (package-source slurm))
+ (inherit (package-source slurm-22.05))
(method url-fetch)
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
- "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf"))))))
+ "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf"))))
+
+ ;; This and older versions of slurm have PMIx support but they seem to
+ ;; require an older version of openpmix. Disable PMIx support.
+ (inputs (modify-inputs (package-inputs slurm-22.05)
+ (delete "openpmix")))))
(define-public slurm-20.11
(package
- (inherit slurm)
+ (inherit slurm-21.08)
(version "20.11.9")
(source (origin
- (inherit (package-source slurm))
+ (inherit (package-source slurm-21.08))
(method url-fetch)
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
"0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m"))))))
(define-public slurm-20.02
(package
- (inherit slurm)
+ (inherit slurm-20.11)
(version "20.02.6-1")
(source (origin
- (inherit (package-source slurm))
+ (inherit (package-source slurm-20.11))
(method url-fetch)
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
"0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc"))))
(arguments
- (substitute-keyword-arguments (package-arguments slurm)
+ (substitute-keyword-arguments (package-arguments slurm-20.11)
((#:configure-flags flags ''())
#~(append '("CFLAGS=-O2 -g -fcommon" "LDFLAGS=-fcommon")
#$flags))))))
@@ -348,11 +374,12 @@ by managing a queue of pending work.")
(inherit slurm-20.02)
(version "19.05.8")
(source (origin
- (inherit (package-source slurm))
+ (inherit (package-source slurm-20.02))
(method url-fetch)
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
"10c9j4a9a6d4ibpf75006mn03p8xgpaprc247x2idakysjf2fw43"))))))
@@ -360,14 +387,15 @@ by managing a queue of pending work.")
;; Same as Debian 10
(define-public slurm-18.08
(package
- (inherit slurm-20.02)
+ (inherit slurm-19.05)
(version "18.08.9")
(source
(origin
- (inherit (package-source slurm))
+ (inherit (package-source slurm-20.02))
(uri (string-append
"https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2"))
+ (patches '()) ;drop 'salloc' patch
(sha256
(base32
"1bgrpz75m7l4xhirsd0fvnkzlkrl8v2qpmjcz60barc5qm2kn457"))))))
@@ -401,6 +429,33 @@ can use the same high-level API to link their software with different
cluster/resource management systems.")
(license license:gpl3+)))
+(define-public python-schwimmbad
+ (package
+ (name "python-schwimmbad")
+ (version "0.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "schwimmbad" version))
+ (sha256
+ (base32 "1aac1rswb0r0vzbxvjj2jyx5j0vqyjj7mygc71n9zbkpmr8m1rpg"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs
+ (list python-dill
+ python-joblib
+ python-mpi4py
+ python-multiprocess))
+ (native-inputs
+ (list python-hatch-vcs python-hatchling python-pytest))
+ (home-page "https://github.com/adrn/schwimmbad")
+ (synopsis "Common interface for parallel processing pools")
+ (description
+ "@code{schwimmbad} provides a uniform interface to parallel processing
+pools and enables switching easily between local development (e.g., serial
+processing or with @code{multiprocessing}) and deployment on a cluster or
+supercomputer (via, e.g., MPI or JobLib).")
+ (license license:expat)))
+
(define-public python-slurm-magic
(let ((commit "73dd1a2b85799f7dae4b3f1cd9027536eff0c4d7")
(revision "0"))
@@ -450,9 +505,9 @@ command---e.g., @code{%salloc}, @code{%sbatch}, etc.")
(define-public pthreadpool
;; This repository has only one tag, 0.1, which is older than what users
;; such as XNNPACK expect.
- (let ((commit "1787867f6183f056420e532eec640cba25efafea")
+ (let ((commit "178e3e0646cc671708bf78e77c273940130ac637")
(version "0.1")
- (revision "1"))
+ (revision "2"))
(package
(name "pthreadpool")
(version (git-version version revision commit))
@@ -463,7 +518,7 @@ command---e.g., @code{%salloc}, @code{%sbatch}, etc.")
(file-name (git-file-name name version))
(sha256
(base32
- "02hdvxfn5krw8zivkgjx3b4rk9p02yr4mpdjlp75lsv6z1xf5yrx"))
+ "1s86lnq9bahacf5wxn7y14w70jh3g9lq1l7y16ijwhifd01nc2km"))
(patches (search-patches "pthreadpool-system-libraries.patch"))))
(build-system cmake-build-system)
(arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
@@ -480,8 +535,8 @@ features.")
(define-public cpuinfo
;; There's currently no tag on this repo.
(let ((version "0.0")
- (revision "2")
- (commit "53298db833c5c5a1598639e9b47cc1a602bbac26"))
+ (revision "3")
+ (commit "aa4b2163b99ac9534194520f70b93eeefb0b3b4e"))
(package
(name "cpuinfo")
(version (git-version version revision commit))
@@ -492,12 +547,13 @@ features.")
(file-name (git-file-name name version))
(sha256
(base32
- "01kfgxya2w32dz9bd3qm3i2d6nffw0qfyql11rxl7d3g830brj5k"))
- (patches (search-patches "cpuinfo-system-libraries.patch"))))
+ "12x4krkyzxngf1l2ck33lnsp8pyzf6gyjj9mp9cnka9mw3h6617m"))))
(build-system cmake-build-system)
(arguments
(list
- #:configure-flags '(list "-DBUILD_SHARED_LIBS=ON")
+ #:configure-flags
+ '(list "-DBUILD_SHARED_LIBS=ON"
+ "-DUSE_SYSTEM_LIBS=ON")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'skip-bad-test
@@ -513,6 +569,9 @@ GTEST_SKIP() << \"See https://github.com/pytorch/cpuinfo/issues/132\";"))))))))
"The cpuinfo library provides a C/C++ and a command-line interface to
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 '("armhf-linux" "i686-linux" "x86_64-linux"))
(license license:bsd-2))))
(define-public clog
@@ -523,11 +582,14 @@ processor name, cache information, and topology information.")
(inherit (package-source cpuinfo))
(patches (search-patches "clog-fix-shared-build.patch"))))
(arguments
- (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "deps/clog"))))))
+ (list
+ #:configure-flags
+ ''("-DBUILD_SHARED_LIBS=ON"
+ "-DUSE_SYSTEM_LIBS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "deps/clog"))))))
(native-inputs (list googletest))
(inputs '())
(synopsis "C-style logging library based on printf")
@@ -567,3 +629,63 @@ debug information.
"This header-only C++ library provides a portable interface to
single-instruction multiple-data (SIMD) intrinsics.")
(license license:expat))))
+
+(define-public openpmix
+ (package
+ (name "openpmix")
+ (version "4.2.8")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/openpmix/openpmix/releases/download/v"
+ version "/pmix-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "1j9xlhqrrmgjdkwakamn78y5gj756adi53hn25zksgr3is3l5d09"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list (string-append "--with-hwloc="
+ (ungexp (this-package-input "hwloc") "lib")))))
+ (inputs (list libevent `(,hwloc "lib")))
+ (native-inputs (list perl python))
+ (synopsis "PMIx library")
+ (description
+ "PMIx is an application programming interface standard that provides
+libraries and programming models with portable and well-defined access to
+commonly needed services in distributed and parallel computing systems.")
+ (home-page "https://pmix.org/")
+ ;; The provided license is kind of BSD-style but specific.
+ (license (license:fsf-free "https://github.com/openpmix/openpmix?tab=License-1-ov-file#License-1-ov-file"))))
+
+(define-public prrte
+ (package
+ (name "prrte")
+ (version "3.0.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/openpmix/prrte/releases/download/v"
+ version "/prrte-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0wiy0vk37v4db1jgxza8bci0cczcvj34dalzsrlz05dk45zb7dl3"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:configure-flags #~(list (string-append "--with-hwloc="
+ (assoc-ref %build-inputs "hwloc"))
+ (string-append "--with-pmix=" #$(this-package-input "openpmix")))))
+ (inputs (list libevent
+ `(,hwloc "lib")
+ openpmix))
+ (native-inputs (list perl))
+ (synopsis "PMIx Reference RunTime Environment (PRRTE)")
+ (description
+ "The PMIx Reference RunTime Environment is a runtime environment
+containing the reference implementation and capable of operating
+within a host SMS. The reference RTE therefore provides an easy way of
+exploring PMIx capabilities and testing PMIx-based applications
+outside of a PMIx-enabled environment.")
+ (home-page "https://openpmix.github.io/")
+ ;; The provided license is kind of BSD-style but specific.
+ (license (license:fsf-free "https://github.com/openpmix/prrte?tab=License-1-ov-file#License-1-ov-file"))))
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index eb64a7f306..dc2ee27e29 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Christian Miller <christian.miller@dadoes.de>
+;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -150,7 +151,7 @@ human.")
(define-public keepassxc
(package
(name "keepassxc")
- (version "2.7.7")
+ (version "2.7.9")
(source
(origin
(method url-fetch)
@@ -158,7 +159,7 @@ human.")
"/releases/download/" version "/keepassxc-"
version "-src.tar.xz"))
(sha256
- (base32 "0rzfh8xdsd1r0xb7yb0h2zyzwhbsp7si8c0haaqgzcz4k2p4bz2q"))))
+ (base32 "1za6xnwnq68gswz8vh7s5wia1bdhnia11hcb7p3dl3f049gy8i1w"))))
(build-system qt-build-system)
(arguments
(list
@@ -351,10 +352,10 @@ Counterpane's Passwordsafe.")
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
- (add-after 'wrap 'glib-or-gtk-compile-schemas
+ (add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases
'glib-or-gtk-compile-schemas))
- (add-after 'wrap 'glib-or-gtk-wrap
+ (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs (list adwaita-icon-theme
libcotp
@@ -409,10 +410,8 @@ client, supporting @acronym{TOTP, Time-based one time passwords} and
"/lib/guile/" effective "/site-ccache"))
(prog (string-append out "/bin/shroud")))
(wrap-program prog
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir)))
- #t))))))
- (inputs
- (list guile-2.2 gnupg xclip))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir)))))))))
+ (inputs (list bash-minimal guile-2.2 gnupg xclip))
(synopsis "GnuPG-based secret manager")
(description "Shroud is a simple secret manager with a command line
interface. The password database is stored as a Scheme s-expression and
@@ -575,7 +574,7 @@ random passwords that pass the checks.")
#:phases
#~(modify-phases %standard-phases
(delete 'configure)))) ;no configure script
- (inputs (list linux-pam))
+ (inputs (list linux-pam libxcrypt))
(home-page "https://www.openwall.com/passwdqc/")
(synopsis
"Password/passphrase strength checking and policy enforcement toolset")
@@ -619,8 +618,7 @@ command-line programs (@command{pwqcheck}, @command{pwqfilter}, and
"/bin/assword"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program prog
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
- #t)))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))
(add-after 'install 'manpage
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "assword.1")
@@ -631,7 +629,7 @@ command-line programs (@command{pwqcheck}, @command{pwqfilter}, and
(native-inputs
(list txt2man))
(inputs
- (list gtk+ python-xdo python-gpg python-pygobject))
+ (list bash-minimal gtk+ python-xdo python-gpg python-pygobject))
(propagated-inputs
(list xclip))
(home-page "https://finestructure.net/assword/")
@@ -724,7 +722,8 @@ any X11 window.")
(separator #f) ;single entry
(files '("lib/password-store/extensions")))))
(inputs
- (list coreutils
+ (list bash-minimal
+ coreutils
dmenu
util-linux
git
@@ -799,7 +798,7 @@ through the pass command.")
("src/completion/pass.zsh-completion"
"/share/zsh/site-functions/"))))
(inputs
- (list age age-keygen git procps qrencode sed tree util-linux))
+ (list age age-keygen bash-minimal git procps qrencode sed tree util-linux))
(home-page "https://github.com/FiloSottile/passage")
(synopsis "Encrypted password manager")
(description "This package provides an encrypted password manager, forked
@@ -906,35 +905,64 @@ encryption.")
(license license:gpl3+)))
(define-public rofi-pass
- (package
- (name "rofi-pass")
- (version "2.0.2")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append "https://raw.githubusercontent.com/carnager/rofi-pass/"
- version "/rofi-pass"))
- (sha256
- (base32 "0msldkndqp40nx1s5s7ggcr97ir4nshpmnyzvj5hqw1l7m3gvw6j"))
- (file-name name)))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (string-append (assoc-ref %build-inputs "source")))
- (script "rofi-pass")
- (out (assoc-ref %outputs "out")))
- (copy-file source script)
- (chmod script #o555)
- (install-file script (string-append out "/bin"))))))
- (propagated-inputs
- (list password-store rofi xdotool))
- (home-page "https://github.com/carnager/rofi-pass")
- (synopsis "Rofi frontend for password-store")
- (description "Rofi-pass provides a way to manipulate information stored
+ ;; No release in over 5 years with recent commits adding features like
+ ;; Wayland support.
+ (let ((commit "8aa6b9293a8f0af267425326fa966966ca42085e")
+ (revision "0"))
+ (package
+ (name "rofi-pass")
+ (version (git-version "2.0.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/carnager/rofi-pass")
+ (commit commit)))
+ (sha256
+ (base32
+ "0axz4ijp6fay6f2yn1cg6223l89jkg8wnxslbk1g5jpli0njxw43"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ; no tests
+ #:make-flags #~(list (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-etc-path
+ (lambda _
+ (substitute* "Makefile"
+ (("\\$\\(DESTDIR\\)/etc")
+ (string-append #$output "/etc")))
+ (substitute* "rofi-pass"
+ (("/etc")
+ (string-append #$output "/etc")))))
+ (delete 'configure) ; no configure
+ (delete 'build) ; no build
+ (add-after 'install 'wrap-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin")))
+ (for-each
+ (lambda (script)
+ (wrap-program (string-append bin "/" script)
+ (list "PATH" 'prefix
+ (map
+ (lambda (binary)
+ (dirname (search-input-file
+ inputs
+ (string-append "bin/" binary))))
+ '("pass" "pwgen" "rofi"
+ "xclip" "xdotool" "xset")))))
+ (list "addpass" "rofi-pass"))))))))
+ (inputs (list bash-minimal ;for wrap-program
+ password-store
+ pwgen
+ rofi
+ xclip
+ xdotool
+ xset))
+ (home-page "https://github.com/carnager/rofi-pass")
+ (synopsis "Rofi frontend for password-store")
+ (description "Rofi-pass provides a way to manipulate information stored
using password-store through rofi interface:
@enumerate
@item open URLs of entries with hotkey;
@@ -944,7 +972,54 @@ using password-store through rofi interface:
@item auto-typing of more than one field, using the autotype entry;
@item bookmarks mode (open stored URLs in browser, default: Alt+x).
@end enumerate")
- (license license:gpl3)))
+ (license license:gpl3))))
+
+(define-public rofi-pass-wayland
+ (package
+ (inherit rofi-pass)
+ (name "rofi-pass-wayland")
+ (arguments
+ (substitute-keyword-arguments (package-arguments rofi-pass)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ ;; Set the clipboard and backend tools to ones for Wayland in the
+ ;; default configuration file.
+ (add-after 'fix-etc-path 'set-wayland-defaults
+ (lambda _
+ (substitute* "config.example"
+ ;; Note the typo in current configuration.
+ (("#clibpoard_backend=xclip")
+ "clipboard_backend=wl-clipboard")
+ (("#backend=xdotool")
+ "backend=wtype"))
+ (substitute* "rofi-pass"
+ (("/etc")
+ (string-append #$output "/etc")))))
+ ;; Use Wayland related tools instead.
+ (replace 'wrap-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin")))
+ (for-each
+ (lambda (script)
+ (wrap-program (string-append bin "/" script)
+ (list "PATH" 'prefix
+ (map
+ (lambda (binary)
+ (dirname (search-input-file
+ inputs
+ (string-append "bin/" binary))))
+ ;; wl-copy for wl-clipboard.
+ '("pass" "pwgen" "rofi" "wl-copy" "wtype")))))
+ (list "addpass" "rofi-pass")))))))))
+ (inputs
+ (modify-inputs (package-inputs rofi-pass)
+ (replace "rofi" rofi-wayland)
+ (replace "xclip" wl-clipboard)
+ (replace "xdotool" wtype)
+ (delete "xset")))
+ (description (string-append
+ (package-description rofi-pass)
+ "\nThis package provides Wayland support by default."))))
(define-public tessen
(package
@@ -1567,7 +1642,7 @@ try every password contained in a file.")
(native-inputs
(list pkg-config libxslt libxml2 docbook-xsl docbook-xml))
(inputs
- (list openssl))
+ (list libxcrypt openssl))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch b/gnu/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch
new file mode 100644
index 0000000000..ae52e103a7
--- /dev/null
+++ b/gnu/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch
@@ -0,0 +1,60 @@
+https://sources.debian.org/data/main/a/abseil/0~20200923.3-2/debian/patches/cpu-frequency.diff
+This patch is taken from Debian instead of the upstream URL because the
+upstream URL contains far more changes than occur in this patch.
+
+It was then modified to also work for armhf.
+
+From: Benjamin Barenblat <bbaren@google.com>
+Subject: Ignore missing CPU frequency on more architectures
+Forwarded: yes
+Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/1918ad2ae38aa32c74b558b322479a8efdd76363
+
+Linux on MIPS, PA-RISC, RISC-V, and SystemZ doesn’t expose the nominal CPU
+frequency via /sys, so don’t worry if `NominalCPUFrequency` returns 1.0 on those
+platforms.
+
+Some POWER machines expose the CPU frequency; others do not. Since we can’t
+predict which type of machine the tests will run on, simply disable testing for
+`NominalCPUFrequency` on POWER.
+
+The author works at Google. Upstream applied this patch as Piper revision
+347079873 and exported it to GitHub; the Applied-Upstream URL above points to
+the exported commit.
+
+--- a/absl/base/internal/sysinfo_test.cc
++++ b/absl/base/internal/sysinfo_test.cc
+@@ -37,17 +37,28 @@ TEST(SysinfoTest, NumCPUs) {
+ << "NumCPUs() should not have the default value of 0";
+ }
+
++// Ensure that NominalCPUFrequency returns a reasonable value, or 1.00 on
++// platforms where the CPU frequency is not available through sysfs.
++//
++// POWER is particularly problematic here; some Linux kernels expose the CPU
++// frequency, while others do not. Since we can't predict a priori what a given
++// machine is going to do, just disable this test on POWER on Linux.
++#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__)))
+ TEST(SysinfoTest, NominalCPUFrequency) {
+-#if !(defined(__aarch64__) && defined(__linux__)) && !defined(__EMSCRIPTEN__)
+- EXPECT_GE(NominalCPUFrequency(), 1000.0)
+- << "NominalCPUFrequency() did not return a reasonable value";
+-#else
+- // Aarch64 cannot read the CPU frequency from sysfs, so we get back 1.0.
+- // Emscripten does not have a sysfs to read from at all.
++ // Linux only exposes the CPU frequency on certain architectures, and
++ // Emscripten doesn't expose it at all.
++#if defined(__linux__) && \
++ (defined(__aarch64__) || defined(__hppa__) || defined(__mips__) || \
++ defined(__arm__) || defined(__riscv) || defined(__s390x__)) || \
++ defined(__EMSCRIPTEN__)
+ EXPECT_EQ(NominalCPUFrequency(), 1.0)
+ << "CPU frequency detection was fixed! Please update unittest.";
++#else
++ EXPECT_GE(NominalCPUFrequency(), 1000.0)
++ << "NominalCPUFrequency() did not return a reasonable value";
+ #endif
+ }
++#endif
+
+ TEST(SysinfoTest, GetTID) {
+ EXPECT_EQ(GetTID(), GetTID()); // Basic compile and equality test.
diff --git a/gnu/packages/patches/abseil-cpp-20200923.3-duration-test.patch b/gnu/packages/patches/abseil-cpp-20200923.3-duration-test.patch
new file mode 100644
index 0000000000..9609c2588b
--- /dev/null
+++ b/gnu/packages/patches/abseil-cpp-20200923.3-duration-test.patch
@@ -0,0 +1,86 @@
+This patch is taken from upstream and helps the test pass on all architectures.
+
+The adjustment to absl/numeric/internal/bits.h was removed since the file
+didn't appear in the git checkout.
+
+From b0735979d778a768caee207f01f327535cbd2140 Mon Sep 17 00:00:00 2001
+From: Abseil Team <absl-team@google.com>
+Date: Tue, 2 Mar 2021 14:28:07 -0800
+Subject: [PATCH] Export of internal Abseil changes
+
+--
+a74bdb72c3a6983e08a805938dd0e20e97d55bba by Abseil Team <absl-team@google.com>:
+
+Fix typo: calcualte -> calculate
+
+PiperOrigin-RevId: 360515509
+
+--
+3ddf8ac194e81a13e9de095e59dd061c1beacfe3 by Benjamin Barenblat <bbaren@google.com>:
+
+Make tests tolerant of FMA contraction
+
+Weaken Duration.ToDoubleSecondsCheckEdgeCases and
+Duration.ToDoubleSecondsCheckRandom to make them less sensitive to fused
+multiply/add contraction.
+
+PiperOrigin-RevId: 360297653
+GitOrigin-RevId: a74bdb72c3a6983e08a805938dd0e20e97d55bba
+Change-Id: I0c55383bc13040ea77511c4130d142368103dc57
+---
+ absl/numeric/internal/bits.h | 2 +-
+ absl/time/duration_test.cc | 18 +++++++++++-------
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/absl/time/duration_test.cc b/absl/time/duration_test.cc
+index 4d85a2c4f45..fb28fa987f6 100644
+--- a/absl/time/duration_test.cc
++++ b/absl/time/duration_test.cc
+@@ -1369,10 +1369,13 @@ TEST(Duration, SmallConversions) {
+ EXPECT_THAT(ToTimeval(absl::Nanoseconds(2000)), TimevalMatcher(tv));
+ }
+
+-void VerifySameAsMul(double time_as_seconds, int* const misses) {
++void VerifyApproxSameAsMul(double time_as_seconds, int* const misses) {
+ auto direct_seconds = absl::Seconds(time_as_seconds);
+ auto mul_by_one_second = time_as_seconds * absl::Seconds(1);
+- if (direct_seconds != mul_by_one_second) {
++ // These are expected to differ by up to one tick due to fused multiply/add
++ // contraction.
++ if (absl::AbsDuration(direct_seconds - mul_by_one_second) >
++ absl::time_internal::MakeDuration(0, 1u)) {
+ if (*misses > 10) return;
+ ASSERT_LE(++(*misses), 10) << "Too many errors, not reporting more.";
+ EXPECT_EQ(direct_seconds, mul_by_one_second)
+@@ -1384,7 +1387,8 @@ void VerifySameAsMul(double time_as_seconds, int* const misses) {
+ // For a variety of interesting durations, we find the exact point
+ // where one double converts to that duration, and the very next double
+ // converts to the next duration. For both of those points, verify that
+-// Seconds(point) returns the same duration as point * Seconds(1.0)
++// Seconds(point) returns a duration near point * Seconds(1.0). (They may
++// not be exactly equal due to fused multiply/add contraction.)
+ TEST(Duration, ToDoubleSecondsCheckEdgeCases) {
+ constexpr uint32_t kTicksPerSecond = absl::time_internal::kTicksPerSecond;
+ constexpr auto duration_tick = absl::time_internal::MakeDuration(0, 1u);
+@@ -1423,8 +1427,8 @@ TEST(Duration, ToDoubleSecondsCheckEdgeCases) {
+ }
+ // Now low_edge is the highest double that converts to Duration d,
+ // and high_edge is the lowest double that converts to Duration after_d.
+- VerifySameAsMul(low_edge, &misses);
+- VerifySameAsMul(high_edge, &misses);
++ VerifyApproxSameAsMul(low_edge, &misses);
++ VerifyApproxSameAsMul(high_edge, &misses);
+ }
+ }
+ }
+@@ -1444,8 +1448,8 @@ TEST(Duration, ToDoubleSecondsCheckRandom) {
+ int misses = 0;
+ for (int i = 0; i < 1000000; ++i) {
+ double d = std::exp(uniform(gen));
+- VerifySameAsMul(d, &misses);
+- VerifySameAsMul(-d, &misses);
++ VerifyApproxSameAsMul(d, &misses);
++ VerifyApproxSameAsMul(-d, &misses);
+ }
+ }
+
diff --git a/gnu/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch b/gnu/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch
new file mode 100644
index 0000000000..ba4e27511b
--- /dev/null
+++ b/gnu/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch
@@ -0,0 +1,23 @@
+After an upstream code dump on 20220314 when this code was added this test started to fail on i686-linux.
+
+diff --git a/absl/random/uniform_real_distribution_test.cc b/absl/random/uniform_real_distribution_test.cc
+index 260aac96..0abef9b0 100644
+--- a/absl/random/uniform_real_distribution_test.cc
++++ b/absl/random/uniform_real_distribution_test.cc
+@@ -228,6 +228,8 @@ TYPED_TEST(UniformRealDistributionTest, ViolatesPreconditionsDeathTest) {
+
+ #endif // GTEST_HAS_DEATH_TEST
+ #if defined(NDEBUG)
++ // Except apparently not with 387 math
++#if !((defined(__i386__) || defined(_M_IX86)) && FLT_EVAL_METHOD != 0)
+ // opt-mode, for invalid parameters, will generate a garbage value,
+ // but should not enter an infinite loop.
+ absl::InsecureBitGen gen;
+@@ -243,6 +245,7 @@ TYPED_TEST(UniformRealDistributionTest, ViolatesPreconditionsDeathTest) {
+ // Infinite result.
+ EXPECT_FALSE(std::isfinite(x)) << x;
+ }
++#endif // skip on i386
+ #endif // NDEBUG
+ }
+ #ifdef _MSC_VER
diff --git a/gnu/packages/patches/aegisub-boost81.patch b/gnu/packages/patches/aegisub-boost81.patch
new file mode 100644
index 0000000000..4b63fba9b7
--- /dev/null
+++ b/gnu/packages/patches/aegisub-boost81.patch
@@ -0,0 +1,62 @@
+Source: https://gitlab.archlinux.org/archlinux/packaging/packages/aegisub/-/blob/main/boost-1.81.0.patch
+From 12e1e5ee64afb7cfb5a43a998774642bc1eeede6 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <foutrelis@archlinux.org>
+Date: Sat, 21 Jan 2023 18:00:10 +0000
+Subject: [PATCH] Fix build with boost 1.81.0
+---
+diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h
+index c5a65d6e4..f4921d582 100644
+--- a/libaegisub/include/libaegisub/lua/utils.h
++++ b/libaegisub/include/libaegisub/lua/utils.h
+@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) {
+
+ template<typename T>
+ void set_field(lua_State *L, const char *name, T value) {
+- push_value(L, value);
++ if constexpr(std::is_convertible<T, std::string>::value)
++ push_value(L, static_cast<std::string>(value));
++ else
++ push_value(L, value);
+ lua_setfield(L, -2, name);
+ }
+
+diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp
+index 245689679..6d479b2c3 100644
+--- a/src/auto4_lua.cpp
++++ b/src/auto4_lua.cpp
+@@ -115,7 +115,8 @@ namespace {
+ int get_translation(lua_State *L)
+ {
+ wxString str(check_wxstring(L, 1));
+- push_value(L, _(str).utf8_str());
++ const char* val = static_cast<const char*>( _(str).utf8_str());
++ push_value(L, val);
+ return 1;
+ }
+
+diff --git a/src/command/video.cpp b/src/command/video.cpp
+index fb2bcb0ba..77e3e9ca7 100644
+--- a/src/command/video.cpp
++++ b/src/command/video.cpp
+@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
+ // If where ever that is isn't defined, we can't save there
+ if ((basepath == "\\") || (basepath == "/")) {
+ // So save to the current user's home dir instead
+- basepath = wxGetHomeDir().c_str();
++ basepath = static_cast<const char*>(wxGetHomeDir().c_str());
+ }
+ }
+ // Actual fixed (possibly relative) path, decode it
+diff --git a/src/dialog_attachments.cpp b/src/dialog_attachments.cpp
+index 38ff53027..e30339f81 100644
+--- a/src/dialog_attachments.cpp
++++ b/src/dialog_attachments.cpp
+@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) {
+
+ // Multiple or single?
+ if (listView->GetNextSelected(i) != -1)
+- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str();
++ path = static_cast<const char*>(wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str());
+ else {
+ path = SaveFileSelector(
+ _("Select the path to save the file to:"),
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/asli-use-system-libs.patch b/gnu/packages/patches/asli-use-system-libs.patch
index 6c4518e04e..82e49addb6 100644
--- a/gnu/packages/patches/asli-use-system-libs.patch
+++ b/gnu/packages/patches/asli-use-system-libs.patch
@@ -1,12 +1,20 @@
-Adjust CMakeLists.txt to use system-provided mmg and yaml-cpp libraries.
+From edfff0027c3cdacbbc0f288078366058f598544d Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Wed, 14 Aug 2024 07:57:20 +0300
+Subject: [PATCH] CMakeLists.txt: Adjust to use system libraries.
+
+* CMakeLists.txt: Adjust to use system-provided mmg and yaml-cpp libraries.
+---
+ CMakeLists.txt | 38 ++++++--------------------------------
+ 1 file changed, 6 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b11c5ba..702423e 100755
+index ca2a01f9..c6eff22f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -122,28 +122,8 @@ if(MMG_MESH)
- add_definitions(-DMMG_MESH)
+@@ -113,28 +113,8 @@ endif()
+ # Mmg and its components
# MMG
- set(MMG_PREFIX mmg3d)
- set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
@@ -19,7 +27,7 @@ index b11c5ba..702423e 100755
- INSTALL_DIR ${MMG_INSTALL_DIR}
-
- CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON
-- -DLIBMMG3D_SHARED=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
+- -DLIBMMG3D_SHARED=OFF -DUSE_ELAS=OFF -DUSE_VTK=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
-
- BUILD_COMMAND make
- INSTALL_COMMAND make install
@@ -35,8 +43,8 @@ index b11c5ba..702423e 100755
# MshMet
set(MSHMET_PREFIX mshmet)
-@@ -192,14 +172,8 @@ target_include_directories(tet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/tetgen)
- target_compile_definitions(tet PUBLIC TETLIBRARY) # -DTETLIBRARY: flag to compile tetgen as a library
+@@ -174,14 +154,8 @@ target_include_directories(alg PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/alglib/sr
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs/mTT/include)
# yaml
-file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended!
@@ -52,21 +60,22 @@ index b11c5ba..702423e 100755
# Compile options for debuging
if(CMAKE_BUILD_TYPE MATCHES Debug)
-@@ -259,7 +233,7 @@ if(MARCH_NATIVE)
- endif()
+@@ -218,7 +192,7 @@ endif()
# Create entries for C++ files in "ASLI" routine
--target_link_libraries(ASLI PUBLIC alg tet yaml)
-+target_link_libraries(ASLI PUBLIC alg tet ${YAML_CPP_LIBRARIES})
- if(NOT MSVC)
- target_link_libraries(ASLI PUBLIC stdc++fs)
- endif()
-@@ -272,7 +246,7 @@ if(CGAL_MESH)
- endif()
-
- if(MMG_MESH)
-- add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
-+ add_dependencies(ASLI ${MSHMET_PREFIX})
- target_link_libraries(ASLI PUBLIC ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES})
- if(SCOTCH_FOUND)
- target_link_libraries(ASLI PUBLIC ${SCOTCH_LIBRARIES} scotch)
+ add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
+-target_link_libraries(ASLI PUBLIC alg yaml
++target_link_libraries(ASLI PUBLIC alg ${YAML_CPP_LIBRARIES}
+ CGAL::CGAL CGAL::Eigen_support
+ ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES}
+ )
+@@ -301,4 +275,4 @@ if(MSYS AND ASLI_DLL)
+ $<TARGET_FILE_DIR:ASLI>
+ )
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+--
+2.45.2
+
diff --git a/gnu/packages/patches/atf-execute-with-shell.patch b/gnu/packages/patches/atf-execute-with-shell.patch
new file mode 100644
index 0000000000..bde4fb336a
--- /dev/null
+++ b/gnu/packages/patches/atf-execute-with-shell.patch
@@ -0,0 +1,39 @@
+Submitted here: https://github.com/freebsd/atf/pull/57
+
+From 098b66269b1cf1d944b8b214ceb7ce9febde3682 Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Mon, 29 Jan 2024 22:35:49 -0500
+Subject: [PATCH] Fix use after free in execute_with_shell.
+
+The temporary string returned by atf::env::get would be used outside
+its statement, which is invalid and cause undefined behavior. Copy it
+to a local variable to avoid the issue.
+
+Fixes: https://github.com/freebsd/atf/issues/26
+Fixes: https://github.com/freebsd/kyua/issues/223
+
+Reported-by: Ruslan Bukin <br@bsdpad.com>
+---
+ atf-sh/atf-check.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp
+index 41f0b13..9d6f7a8 100644
+--- a/atf-sh/atf-check.cpp
++++ b/atf-sh/atf-check.cpp
+@@ -436,7 +436,9 @@ execute_with_shell(char* const* argv)
+ const std::string cmd = flatten_argv(argv);
+
+ const char* sh_argv[4];
+- sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str();
++ const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL);
++
++ sh_argv[0] = shell.c_str();
+ sh_argv[1] = "-c";
+ sh_argv[2] = cmd.c_str();
+ sh_argv[3] = NULL;
+
+base-commit: 18eb8168b70a0f934b4824b6391b55ac0b2f4fdf
+--
+2.41.0
+
diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch
index d18583c9bd..c845e10277 100644
--- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch
+++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch
@@ -13,20 +13,20 @@ Bugs-added-by: Marius Bakke <marius@gnu.org>
diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt
index b8803a1f5..f86559cca 100644
---- a/libraries/lib-ffmpeg-support/CMakeLists.txt
-+++ b/libraries/lib-ffmpeg-support/CMakeLists.txt
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
@@ -1,5 +1,7 @@
-
+
if (${_OPT}use_ffmpeg)
+ pkg_check_modules(FFMPEG libavcodec libavformat libavutil)
+
set( SOURCES
FFmpegTypes.h
-
+
@@ -107,6 +109,12 @@ if (${_OPT}use_ffmpeg)
list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE )
endif()
-
+
+ if (FFMPEG_FOUND)
+ pkg_get_variable(LIBAVCODEC_LIBDIR libavcodec libdir)
+ list(APPEND DEFINITIONS PRIVATE
@@ -38,12 +38,12 @@ index b8803a1f5..f86559cca 100644
)
diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
index 55d6f676b..46640ef83 100644
---- a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
-+++ b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
@@ -246,6 +246,18 @@ struct FFmpegFunctions::Private final
if (library->IsLoaded())
return library;
-
+
+#if defined(FFMPEG_PC_LIBDIR)
+ {
+ static const wxString libdir{FFMPEG_PC_LIBDIR};
diff --git a/gnu/packages/patches/biboumi-cmake-ignore-git.patch b/gnu/packages/patches/biboumi-cmake-ignore-git.patch
new file mode 100644
index 0000000000..cf9aa6c82d
--- /dev/null
+++ b/gnu/packages/patches/biboumi-cmake-ignore-git.patch
@@ -0,0 +1,45 @@
+Description: Avoid cmake messing with git
+Author: Jonas Smedegaard <dr@jones.dk>
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -288,27 +288,6 @@
+ endforeach()
+
+ #
+-## Add a rule to download the catch unit test framework
+-#
+-include(ExternalProject)
+-ExternalProject_Add(catch
+- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
+- PREFIX "external"
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+- )
+-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-ExternalProject_Get_Property(catch SOURCE_DIR)
+-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
+- target_include_directories(test_suite
+- PUBLIC "${SOURCE_DIR}/single_include/"
+- )
+- add_dependencies(test_suite catch)
+-endif()
+-
+-#
+ ## Add some custom rules to launch the tests
+ #
+ add_custom_target(check COMMAND "test_suite"
+@@ -371,8 +350,7 @@
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ )
+ add_custom_target(dist
+- DEPENDS ${ARCHIVE_NAME}.tar.xz
+- DEPENDS catch)
++ DEPENDS ${ARCHIVE_NAME}.tar.xz)
+
+ add_custom_target(rpm
+ DEPENDS dist
diff --git a/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch b/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch
new file mode 100644
index 0000000000..f2e3decedb
--- /dev/null
+++ b/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch
@@ -0,0 +1,38 @@
+Fix the build of libetonyek / libreoffice:
+
+https://issues.guix.gnu.org/72040
+
+Patch copied from upstream source repository:
+
+https://github.com/boostorg/phoenix/commit/8913607a3788cb82d48ed461ea59c919b7bad3df
+
+From 8913607a3788cb82d48ed461ea59c919b7bad3df Mon Sep 17 00:00:00 2001
+From: djowel <djowel@gmail.com>
+Date: Tue, 29 Aug 2023 14:32:41 +0800
+Subject: [PATCH] Disabled this for now, due to ODR violations $$$ Fix Me $$$
+
+---
+ include/boost/phoenix/stl/tuple.hpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/stl/tuple.hpp
+index fb9440d2..a2e42bec 100644
+--- a/include/boost/phoenix/stl/tuple.hpp
++++ b/include/boost/phoenix/stl/tuple.hpp
+@@ -106,6 +106,7 @@ namespace boost { namespace phoenix {
+ tuple_detail::idx_wrap<N>(), t);
+ }
+
++#if 0 // Disabled this for now due to ODR viaolations $$$ Fix Me $$$
+ // Make unpacked argument placeholders
+ namespace placeholders {
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
+@@ -114,6 +115,8 @@ namespace boost { namespace phoenix {
+ boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
+ #include BOOST_PP_LOCAL_ITERATE()
+ }
++#endif
++
+ }} // namespace boost::phoenix
+
+ #endif // C++ 14
diff --git a/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch b/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch
deleted file mode 100644
index 8565d8d851..0000000000
--- a/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e89a6a9..a594786 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -126,10 +126,6 @@ find_package(LibBpf)
- find_package(LibBfd)
- find_package(LibOpcodes)
-
--if(${LIBBFD_FOUND} AND ${LIBOPCODES_FOUND})
-- set(HAVE_BFD_DISASM TRUE)
--endif()
--
- include(CheckIncludeFile)
- check_include_file("sys/sdt.h" HAVE_SYSTEMTAP_SYS_SDT_H)
-
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/cf-tool-add-languages.patch b/gnu/packages/patches/cf-tool-add-languages.patch
new file mode 100644
index 0000000000..a5dc0c8cfa
--- /dev/null
+++ b/gnu/packages/patches/cf-tool-add-languages.patch
@@ -0,0 +1,22 @@
+Add newer language options.
+
+diff --git a/client/langs.go b/tmp/langs.go
+index b09c69f..0695958 100644
+--- a/client/langs.go
++++ b/tmp/langs.go
+@@ -9,6 +9,7 @@ var Langs = map[string]string{
+ "42": "GNU G++11 5.1.0",
+ "50": "GNU G++14 6.4.0",
+ "54": "GNU G++17 7.3.0",
++ "89": "GNU G++20 13.2 (64 bit, winlibs)",
+ "2": "Microsoft Visual C++ 2010",
+ "59": "Microsoft Visual C++ 2017",
+ "9": "C# Mono 5.18",
+@@ -60,6 +61,7 @@ var LangsExt = map[string]string{
+ "GNU C++11": "cpp",
+ "GNU C++14": "cpp",
+ "GNU C++17": "cpp",
++ "GNU G++20": "cpp",
+ "MS C++": "cpp",
+ "MS C++ 2017": "cpp",
+ "Mono C#": "cs",
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/clang-13-remove-crypt-interceptors.patch b/gnu/packages/patches/clang-13-remove-crypt-interceptors.patch
new file mode 100644
index 0000000000..578f246c39
--- /dev/null
+++ b/gnu/packages/patches/clang-13-remove-crypt-interceptors.patch
@@ -0,0 +1,214 @@
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+ .../TestCases/Linux/crypt_r.cpp | 36 ------------------
+ .../TestCases/Posix/crypt.cpp | 32 ----------------
+ 6 files changed, 116 deletions(-)
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
+
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb0..490a8b12d8b17d 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd59839..c82ab5c2105621 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e..6d61d276d77e3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -142,5 +142,4 @@
+ #include <linux/serial.h>
+ #include <sys/msg.h>
+ #include <sys/ipc.h>
+-#include <crypt.h>
+ #endif // SANITIZER_ANDROID
+@@ -243,7 +244,6 @@
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb6..58244c9944a03a 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
+diff --git a/test/sanitizer_common/TestCases/Linux/crypt_r.cpp b/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+deleted file mode 100644
+index 69bfb46aa5f171..00000000000000
+--- a/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -lcrypt -o %t && %run %t
+-
+-// crypt.h is missing from Android.
+-// UNSUPPORTED: android
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#include <crypt.h>
+-
+-int main(int argc, char **argv) {
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "xz", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$1$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$5$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$6$", &cd);
+- volatile size_t z = strlen(p);
+- }
+-}
+diff --git a/test/sanitizer_common/TestCases/Posix/crypt.cpp b/test/sanitizer_common/TestCases/Posix/crypt.cpp
+deleted file mode 100644
+index 3a8faaa1ae7682..00000000000000
+--- a/test/sanitizer_common/TestCases/Posix/crypt.cpp
++++ /dev/null
+@@ -1,32 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -o %t -lcrypt && %run %t
+-
+-// crypt() is missing from Android and -lcrypt from darwin.
+-// UNSUPPORTED: android, darwin
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#if __has_include(<crypt.h>)
+-#include <crypt.h>
+-#endif
+-
+-int
+-main (int argc, char** argv)
+-{
+- {
+- char *p = crypt("abcdef", "xz");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$1$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$5$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$6$");
+- volatile size_t z = strlen(p);
+- }
+-}
diff --git a/gnu/packages/patches/clang-14-remove-crypt-interceptors.patch b/gnu/packages/patches/clang-14-remove-crypt-interceptors.patch
new file mode 100644
index 0000000000..1043240fe2
--- /dev/null
+++ b/gnu/packages/patches/clang-14-remove-crypt-interceptors.patch
@@ -0,0 +1,214 @@
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+ .../TestCases/Linux/crypt_r.cpp | 36 ------------------
+ .../TestCases/Posix/crypt.cpp | 32 ----------------
+ 6 files changed, 116 deletions(-)
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb0..490a8b12d8b17d 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd59839..c82ab5c2105621 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e..6d61d276d77e3 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -142,5 +142,4 @@
+ #include <linux/serial.h>
+ #include <sys/msg.h>
+ #include <sys/ipc.h>
+-#include <crypt.h>
+ #endif // SANITIZER_ANDROID
+@@ -243,7 +244,6 @@
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb6..58244c9944a03a 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
+diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+deleted file mode 100644
+index 69bfb46aa5f171..00000000000000
+--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -lcrypt -o %t && %run %t
+-
+-// crypt.h is missing from Android.
+-// UNSUPPORTED: android
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#include <crypt.h>
+-
+-int main(int argc, char **argv) {
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "xz", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$1$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$5$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$6$", &cd);
+- volatile size_t z = strlen(p);
+- }
+-}
+diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
+deleted file mode 100644
+index 3a8faaa1ae7682..00000000000000
+--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
++++ /dev/null
+@@ -1,32 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -o %t -lcrypt && %run %t
+-
+-// crypt() is missing from Android and -lcrypt from darwin.
+-// UNSUPPORTED: android, darwin
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#if __has_include(<crypt.h>)
+-#include <crypt.h>
+-#endif
+-
+-int
+-main (int argc, char** argv)
+-{
+- {
+- char *p = crypt("abcdef", "xz");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$1$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$5$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$6$");
+- volatile size_t z = strlen(p);
+- }
+-}
diff --git a/gnu/packages/patches/clang-16-remove-crypt-interceptors.patch b/gnu/packages/patches/clang-16-remove-crypt-interceptors.patch
new file mode 100644
index 0000000000..bd0717b5fb
--- /dev/null
+++ b/gnu/packages/patches/clang-16-remove-crypt-interceptors.patch
@@ -0,0 +1,222 @@
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+ .../TestCases/Linux/crypt_r.cpp | 36 ------------------
+ .../TestCases/Posix/crypt.cpp | 32 ----------------
+ 6 files changed, 116 deletions(-)
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+ delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb0..490a8b12d8b17d 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd59839..c82ab5c2105621 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e3..6d61d276d77e35 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -177,10 +177,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include "sanitizer_platform_interceptors.h"
+ # include "sanitizer_platform_limits_posix.h"
+
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-#include <crypt.h>
+-#endif
+-
+ namespace __sanitizer {
+ unsigned struct_utsname_sz = sizeof(struct utsname);
+ unsigned struct_stat_sz = sizeof(struct stat);
+@@ -300,10 +296,6 @@ namespace __sanitizer {
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_GLIBC
+
+-#if SANITIZER_INTERCEPT_CRYPT_R
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+-#endif
+-
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ unsigned struct_timex_sz = sizeof(struct timex);
+ unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds);
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb6..58244c9944a03a 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
+diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
+deleted file mode 100644
+index 69bfb46aa5f171..00000000000000
+--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/crypt_r.cpp
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -lcrypt -o %t && %run %t
+-
+-// crypt.h is missing from Android.
+-// UNSUPPORTED: android
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#include <crypt.h>
+-
+-int main(int argc, char **argv) {
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "xz", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$1$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$5$", &cd);
+- volatile size_t z = strlen(p);
+- }
+- {
+- crypt_data cd;
+- cd.initialized = 0;
+- char *p = crypt_r("abcdef", "$6$", &cd);
+- volatile size_t z = strlen(p);
+- }
+-}
+diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
+deleted file mode 100644
+index 3a8faaa1ae7682..00000000000000
+--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/crypt.cpp
++++ /dev/null
+@@ -1,32 +0,0 @@
+-// RUN: %clangxx -O0 -g %s -o %t -lcrypt && %run %t
+-
+-// crypt() is missing from Android and -lcrypt from darwin.
+-// UNSUPPORTED: android, darwin
+-
+-#include <assert.h>
+-#include <unistd.h>
+-#include <cstring>
+-#if __has_include(<crypt.h>)
+-#include <crypt.h>
+-#endif
+-
+-int
+-main (int argc, char** argv)
+-{
+- {
+- char *p = crypt("abcdef", "xz");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$1$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$5$");
+- volatile size_t z = strlen(p);
+- }
+- {
+- char *p = crypt("abcdef", "$6$");
+- volatile size_t z = strlen(p);
+- }
+-}
diff --git a/gnu/packages/patches/clang-cling-13-libc-search-path.patch b/gnu/packages/patches/clang-cling-13-libc-search-path.patch
new file mode 100644
index 0000000000..c7d22eaaa3
--- /dev/null
+++ b/gnu/packages/patches/clang-cling-13-libc-search-path.patch
@@ -0,0 +1,96 @@
+Clang attempts to guess file names based on the OS and distro (yes!),
+but unfortunately, that doesn't work for us.
+
+This patch makes it easy to insert libc's $libdir so that Clang passes the
+correct absolute file name of crt1.o etc. to 'ld'. It also disables all
+the distro-specific stuff and removes the hard-coded FHS directory names
+to make sure Clang also works on foreign distros.
+
+diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
+index ee4fe841..f0313bbe 100644
+--- a/clang/lib/Driver/Distro.cpp
++++ b/clang/lib/Driver/Distro.cpp
+@@ -93,6 +93,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
+ }
+
+ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
++ // The compiler should always behave the same, even when used via Guix on a
++ // foreign distro.
++ return Distro::UnknownDistro;
++
+ Distro::DistroType Version = Distro::UnknownDistro;
+
+ // Newer freedesktop.org's compilant systemd-based systems
+diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp
+index d14776c5..88bc3ccd 100644
+--- a/clang/lib/Driver/ToolChains/Cuda.cpp
++++ b/clang/lib/Driver/ToolChains/Cuda.cpp
+@@ -119,6 +119,9 @@ CudaInstallationDetector::CudaInstallationDetector(
+ const Driver &D, const llvm::Triple &HostTriple,
+ const llvm::opt::ArgList &Args)
+ : D(D) {
++ // Don't look for CUDA in /usr.
++ return;
++
+ struct Candidate {
+ std::string Path;
+ bool StrictChecking;
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -186,6 +186,10 @@
+
+ Generic_GCC::PushPPaths(PPaths);
+
++ // Comment out the distro-specific tweaks so that they don't bite when
++ // using Guix on a foreign distro.
++#if 0
++
+ Distro Distro(D.getVFS(), Triple);
+
+ if (Distro.IsAlpineLinux() || Triple.isAndroid()) {
+@@ -251,6 +255,7 @@
+
+ if (IsAndroid || Distro.IsOpenSUSE())
+ ExtraOpts.push_back("--enable-new-dtags");
++#endif
+
+ // The selection of paths to try here is designed to match the patterns which
+ // the GCC driver itself uses, as this is part of the GCC-compatible driver.
+@@ -264,6 +269,7 @@
+
+ Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths);
+
++#if 0
+ addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
+ addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
+
+@@ -295,9 +301,11 @@
+ addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths);
+ addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths);
+ }
++#endif
+
+ Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths);
+
++#if 0
+ // Similar to the logic for GCC above, if we are currently running Clang
+ // inside of the requested system root, add its parent library path to those
+ // searched.
+@@ -305,9 +313,14 @@
+ // directory ('Dir' below) or the ResourceDir.
+ if (StringRef(D.Dir).startswith(SysRoot))
+ addPathIfExists(D, D.Dir + "/../lib", Paths);
++#endif
++
++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o,
++ // and friends can be found.
++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths);
+
+- addPathIfExists(D, SysRoot + "/lib", Paths);
+- addPathIfExists(D, SysRoot + "/usr/lib", Paths);
++ // Add GCC's lib/ directory so libstdc++.so can be found.
++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths);
+ }
+
+ ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const {
diff --git a/gnu/packages/patches/clang-runtime-13-glibc-2.36-compat.patch b/gnu/packages/patches/clang-runtime-13-glibc-2.36-compat.patch
new file mode 100644
index 0000000000..e457713d16
--- /dev/null
+++ b/gnu/packages/patches/clang-runtime-13-glibc-2.36-compat.patch
@@ -0,0 +1,50 @@
+This commit is from upstream and is included in the llvm-15 release
+
+commit b379129c4beb3f26223288627a1291739f33af02
+Author: Fangrui Song <i@maskray.me>
+Date: Mon Jul 11 11:38:28 2022 -0700
+
+ [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+ It is generally not a good idea to mix usage of glibc headers and Linux UAPI
+ headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
+ since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
+ defines `fsconfig_command` which conflicts with linux/mount.h:
+
+ .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
+
+ Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually.
+
+ Fix https://github.com/llvm/llvm-project/issues/56421
+
+ Reviewed By: #sanitizers, vitalybuka, zatrazz
+
+ Differential Revision: https://reviews.llvm.org/D129471
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index 4bd425435d56..81740bf4ab39 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -73,7 +73,6 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+-#include <linux/fs.h>
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
diff --git a/gnu/packages/patches/clang-runtime-14-glibc-2.36-compat.patch b/gnu/packages/patches/clang-runtime-14-glibc-2.36-compat.patch
new file mode 100644
index 0000000000..79b36f1383
--- /dev/null
+++ b/gnu/packages/patches/clang-runtime-14-glibc-2.36-compat.patch
@@ -0,0 +1,50 @@
+This commit is from upstream and is included in the llvm-15 release
+
+commit b379129c4beb3f26223288627a1291739f33af02
+Author: Fangrui Song <i@maskray.me>
+Date: Mon Jul 11 11:38:28 2022 -0700
+
+ [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+ It is generally not a good idea to mix usage of glibc headers and Linux UAPI
+ headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
+ since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
+ defines `fsconfig_command` which conflicts with linux/mount.h:
+
+ .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
+
+ Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually.
+
+ Fix https://github.com/llvm/llvm-project/issues/56421
+
+ Reviewed By: #sanitizers, vitalybuka, zatrazz
+
+ Differential Revision: https://reviews.llvm.org/D129471
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index 4bd425435d56..81740bf4ab39 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -73,7 +73,6 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+-#include <linux/fs.h>
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
diff --git a/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch b/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch
new file mode 100644
index 0000000000..9d0ab94222
--- /dev/null
+++ b/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch
@@ -0,0 +1,50 @@
+This commit is from upstream and is included in the llvm-15 release
+
+commit b379129c4beb3f26223288627a1291739f33af02
+Author: Fangrui Song <i@maskray.me>
+Date: Mon Jul 11 11:38:28 2022 -0700
+
+ [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+ It is generally not a good idea to mix usage of glibc headers and Linux UAPI
+ headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
+ since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
+ defines `fsconfig_command` which conflicts with linux/mount.h:
+
+ .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
+
+ Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually.
+
+ Fix https://github.com/llvm/llvm-project/issues/56421
+
+ Reviewed By: #sanitizers, vitalybuka, zatrazz
+
+ Differential Revision: https://reviews.llvm.org/D129471
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 4bd425435d56..81740bf4ab39 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -73,7 +73,6 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+-#include <linux/fs.h>
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
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/cling-use-shared-library.patch b/gnu/packages/patches/cling-use-shared-library.patch
index 6385b307b3..415f542add 100644
--- a/gnu/packages/patches/cling-use-shared-library.patch
+++ b/gnu/packages/patches/cling-use-shared-library.patch
@@ -1,329 +1,107 @@
-From 811f0a575231496318b5e9c9a0ff0ed195b16dc0 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Tue, 7 Sep 2021 16:35:07 -0400
-Subject: [PATCH] build: Allow building Cling using the Clang shared library.
+Upstream status: https://github.com/root-project/root/pull/15563
-The officially supported way to build LLVM/Clang as a shared library
-is via the LLVM_BUILD_LLVM_DYLIB and LLVM_LINK_LLVM_DYLIB CMake
-options (see: https://llvm.org/docs/BuildingADistribution.html). When
-built this way, the whole of Clang API is exposed as a shared
-library (libclang-cpp.so).
-
-* CMakeLists.txt: Query if we're in shared mode via llvm-config, and
-register the result as LLVM_LIB_IS_SHARED.
-[LLVM_LIB_IS_SHARED] <target_link_libraries>: Use the PUBLIC interface of the
-LLVM shared library.
-* lib/Interpreter/CMakeLists.txt [LLVM_LIB_IS_SHARED]: When defined, replace the
-individual Clang components by clang-cpp.
-* lib/MetaProcessor/CMakeLists.txt: Likewise.
-* lib/Utils/CMakeLists.txt: Likewise.
-* tools/Jupyter/CMakeLists.txt: Likewise.
-* tools/driver/CMakeLists.txt: Likewise.
-* tools/libcling/CMakeLists.txt: Likewise.
----
- CMakeLists.txt | 10 ++++++--
- lib/Interpreter/CMakeLists.txt | 40 ++++++++++++++++++--------------
- lib/MetaProcessor/CMakeLists.txt | 16 +++++++++----
- lib/Utils/CMakeLists.txt | 34 +++++++++++++++------------
- tools/Jupyter/CMakeLists.txt | 11 ++++++++-
- tools/driver/CMakeLists.txt | 16 +++----------
- tools/libcling/CMakeLists.txt | 38 +++++++++++++++---------------
- 7 files changed, 93 insertions(+), 72 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 65b14b27..888f7ee9 100644
+diff --git a/interpreter/cling/CMakeLists.txt b/interpreter/cling/CMakeLists.txt
+index 9775b07f10..7028042096 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -23,6 +23,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
- "--libdir"
- "--includedir"
- "--prefix"
-+ "--shared-mode"
- "--src-root")
- execute_process(
- COMMAND ${CONFIG_COMMAND}
-@@ -47,7 +48,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
- list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
- list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)
- list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
-- list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)
-+ list(GET CONFIG_OUTPUT 5 LLVM_LIB_IS_SHARED)
-+ list(GET CONFIG_OUTPUT 6 MAIN_SRC_DIR)
-
- if(NOT MSVC_IDE)
- set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
-@@ -427,7 +429,11 @@ macro(add_cling_library name)
- endif()
-
- if(TARGET ${name})
-- target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
-+ if(LLVM_LIB_IS_SHARED)
-+ target_link_libraries(${name} PUBLIC LLVM)
-+ else()
-+ target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
-+ endif()
-
- if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libcling")
- install(TARGETS ${name}
-diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt
-index 921c773c..af65c020 100644
---- a/lib/Interpreter/CMakeLists.txt
-+++ b/lib/Interpreter/CMakeLists.txt
-@@ -6,22 +6,28 @@
- # LICENSE.TXT for details.
- #------------------------------------------------------------------------------
-
--set(LIBS
-- clingUtils
-- clangCodeGen
-- clangDriver
-- clangFrontend
-- clangParse
-- clangSema
-- clangAnalysis
-- clangEdit
-- clangRewrite
-- clangRewriteFrontend
-- clangSerialization
-- clangAST
-- clangBasic
-- clangLex
--)
-+if (LLVM_LIB_IS_SHARED)
-+ set(LIBS
-+ clang-cpp
-+ clingUtils)
-+else()
-+ set(LIBS
-+ clingUtils
-+ clangCodeGen
-+ clangDriver
-+ clangFrontend
-+ clangParse
-+ clangSema
-+ clangAnalysis
-+ clangEdit
-+ clangRewrite
-+ clangRewriteFrontend
-+ clangSerialization
-+ clangAST
-+ clangBasic
-+ clangLex
-+ )
-+endif()
-
- set(LLVM_LINK_COMPONENTS
- analysis
-@@ -369,4 +375,4 @@ if ((NOT builtin_llvm) AND builtin_clang)
- get_property(P SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES)
- list(INSERT P 0 ${FixInclude})
- set_property(SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/lib/MetaProcessor/CMakeLists.txt b/lib/MetaProcessor/CMakeLists.txt
-index e753dca3..5f4641bb 100644
---- a/lib/MetaProcessor/CMakeLists.txt
-+++ b/lib/MetaProcessor/CMakeLists.txt
-@@ -10,7 +10,16 @@ set( LLVM_LINK_COMPONENTS
- core
- support
- binaryformat
--)
-+ )
-+
-+if (LLVM_LIB_IS_SHARED)
-+ set(LIBS clang-cpp)
-+else()
-+ set(LIBS
-+ clangLex
-+ clangAST
-+ clangBasic)
-+endif()
-
- add_cling_library(clingMetaProcessor OBJECT
- Display.cpp
-@@ -21,10 +30,7 @@ add_cling_library(clingMetaProcessor OBJECT
- MetaSema.cpp
-
- LINK_LIBS
-- clangLex
-- clangAST
-- clangBasic
--
-+ ${LIBS}
- clingInterpreter
- clingUtils
- )
-diff --git a/lib/Utils/CMakeLists.txt b/lib/Utils/CMakeLists.txt
-index 327c9fff..fbe4bd87 100644
---- a/lib/Utils/CMakeLists.txt
-+++ b/lib/Utils/CMakeLists.txt
-@@ -26,21 +26,25 @@ set(LLVM_LINK_COMPONENTS
- ${LLVM_TARGETS_TO_BUILD}
- )
-
--set(LIBS
-- clangCodeGen
-- clangDriver
-- clangFrontend
-- clangParse
-- clangSema
-- clangAnalysis
-- clangEdit
-- clangRewrite
-- clangRewriteFrontend
-- clangSerialization
-- clangAST
-- clangBasic
-- clangLex
--)
-+if (LLVM_LIB_IS_SHARED)
-+ set(LIBS clang-cpp)
-+else()
-+ set(LIBS
-+ clangCodeGen
-+ clangDriver
-+ clangFrontend
-+ clangParse
-+ clangSema
-+ clangAnalysis
-+ clangEdit
-+ clangRewrite
-+ clangRewriteFrontend
-+ clangSerialization
-+ clangAST
-+ clangBasic
-+ clangLex
-+ )
-+endif()
-
- find_library(DL_LIBRARY_PATH dl)
- if (DL_LIBRARY_PATH)
-diff --git a/tools/Jupyter/CMakeLists.txt b/tools/Jupyter/CMakeLists.txt
-index aad5f3f7..8b4ac36f 100644
---- a/tools/Jupyter/CMakeLists.txt
-+++ b/tools/Jupyter/CMakeLists.txt
-@@ -39,6 +39,14 @@ else()
- endif()
- endif()
-
-+if (LLVM_LIB_IS_SHARED)
-+ set(LIBS
-+ clang-cpp
-+ clingUserInterface
-+ clingMetaProcessor
-+ ${INTERPRETER}
-+ clingUtils)
-+else()
- set(LIBS
- clangAST
- clangBasic
-@@ -54,7 +62,8 @@ set(LIBS
- clingMetaProcessor
- ${INTERPRETER}
- clingUtils
+@@ -13,81 +13,22 @@ endif(WIN32)
+ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
+ project(Cling)
+
+- # Rely on llvm-config.
+- set(CONFIG_OUTPUT)
+- find_program(LLVM_CONFIG "llvm-config")
+- if(LLVM_CONFIG)
+- message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
+- set(CONFIG_COMMAND ${LLVM_CONFIG}
+- "--assertion-mode"
+- "--bindir"
+- "--libdir"
+- "--includedir"
+- "--prefix")
+- execute_process(
+- COMMAND ${CONFIG_COMMAND}
+- RESULT_VARIABLE HAD_ERROR
+- OUTPUT_VARIABLE CONFIG_OUTPUT
- )
-+ )
-+endif()
-
- if( LLVM_ENABLE_PIC )
- set(ENABLE_SHARED SHARED)
-diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
-index 1968b97f..5ed53fb7 100644
---- a/tools/driver/CMakeLists.txt
-+++ b/tools/driver/CMakeLists.txt
-@@ -9,23 +9,13 @@
- # Keep symbols for JIT resolution
- set(LLVM_NO_DEAD_STRIP 1)
-
--if(BUILD_SHARED_LIBS)
-- set(LIBS
-- LLVMSupport
+- if(NOT HAD_ERROR)
+- string(REGEX REPLACE
+- "[ \t]*[\r\n]+[ \t]*" ";"
+- CONFIG_OUTPUT ${CONFIG_OUTPUT})
+- else()
+- string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")
+- message(STATUS "${CONFIG_COMMAND_STR}")
+- message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")
+- endif()
+- else()
+- message(FATAL_ERROR "llvm-config not found -- ${LLVM_CONFIG}")
+- endif()
++ # See <https://llvm.org/docs/CMake.html#embedding-llvm-in-your-project>.
++ find_package(LLVM REQUIRED CONFIG)
++ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
++ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+
+- list(GET CONFIG_OUTPUT 0 ENABLE_ASSERTIONS)
+- list(GET CONFIG_OUTPUT 1 TOOLS_BINARY_DIR)
+- list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
+- list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)
+- list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
-
-- clangFrontendTool
+- if(NOT MSVC_IDE)
+- set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
+- CACHE BOOL "Enable assertions")
+- # Assertions should follow llvm-config's.
+- mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
+- endif()
++ separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
++ add_definitions(${LLVM_DEFINITIONS_LIST})
+
+- set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
+- set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
+- set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+- set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
++ find_package(Clang REQUIRED CONFIG)
++ message(STATUS "Found supported version: Clang ${CLANG_PACKAGE_VERSION}")
++ message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
+
+ find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
+ NO_DEFAULT_PATH)
+
+- set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
+- set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
+- if(EXISTS ${LLVMCONFIG_FILE})
+- list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
+- include(${LLVMCONFIG_FILE})
+- else()
+- message(FATAL_ERROR "Not found: ${LLVMCONFIG_FILE}")
+- endif()
-
-- clingInterpreter
-- clingMetaProcessor
-- clingUserInterface
-- clingUtils
-- )
-+if(LLVM_LIB_IS_SHARED)
-+ set(LIBS clang-cpp clingUserInterface)
- add_cling_executable(cling
- cling.cpp
- )
- else()
- set(LIBS
-- LLVMSupport
-
- clangASTMatchers
- clangFrontendTool
-@@ -38,7 +28,7 @@ else()
- $<TARGET_OBJECTS:obj.clingMetaProcessor>
- $<TARGET_OBJECTS:obj.clingUtils>
- )
--endif(BUILD_SHARED_LIBS)
-+endif(LLVM_LIB_IS_SHARED)
-
- set_target_properties(cling
- PROPERTIES ENABLE_EXPORTS 1)
-diff --git a/tools/libcling/CMakeLists.txt b/tools/libcling/CMakeLists.txt
-index 143d3bdb..ba000d44 100644
---- a/tools/libcling/CMakeLists.txt
-+++ b/tools/libcling/CMakeLists.txt
-@@ -10,21 +10,25 @@ set(SOURCES
- ADDITIONAL_HEADERS
- )
-
--set(LIBS
-- clangAnalysis
-- clangDriver
-- clangFrontend
-- clangParse
-- clangSema
-- clangAST
-- clangLex
-- clangSerialization
-- clangCodeGen
-- clangBasic
-- clangEdit
+- # They are used as destination of target generators.
+- set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
+- set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+- if(WIN32 OR CYGWIN)
+- # DLL platform -- put DLLs into bin.
+- set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+- else()
+- set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
+- endif()
+-
+- option(LLVM_INSTALL_TOOLCHAIN_ONLY
+- "Only include toolchain files in the 'install' target." OFF)
+-
+- option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN
+- "Set to ON to force using an old, unsupported host toolchain." OFF)
-
-- clingUtils
--)
-+if (LLVM_LIB_IS_SHARED)
-+ set(LIBS clang-cpp)
-+else()
-+ set(LIBS
-+ clangAnalysis
-+ clangDriver
-+ clangFrontend
-+ clangParse
-+ clangSema
-+ clangAST
-+ clangLex
-+ clangSerialization
-+ clangCodeGen
-+ clangBasic
-+ clangEdit
-+
-+ clingUtils
-+ )
-+endif()
++ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
+ include(AddLLVM)
+ include(TableGen)
+ include(HandleLLVMOptions)
+@@ -99,7 +40,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
+ set(LLVM_INCLUDE_TESTS ON)
+ endif()
- set( LLVM_LINK_COMPONENTS
- analysis
-@@ -63,10 +67,6 @@ option(LIBCLING_BUILD_STATIC
- # set(LLVM_EXPORTED_SYMBOL_FILE)
- #endif()
+- include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
++ include_directories("${LLVM_INCLUDE_DIRS}")
+ link_directories("${LLVM_LIBRARY_DIR}")
--if( LLVM_ENABLE_PIC )
-- set(ENABLE_SHARED SHARED)
--endif()
--
- if((NOT LLVM_ENABLE_PIC OR LIBCLING_BUILD_STATIC) AND NOT WIN32)
- set(ENABLE_STATIC STATIC)
- endif()
---
-2.33.0
-
+ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
diff --git a/gnu/packages/patches/clog-fix-shared-build.patch b/gnu/packages/patches/clog-fix-shared-build.patch
index bf80544b90..eb305339f5 100644
--- a/gnu/packages/patches/clog-fix-shared-build.patch
+++ b/gnu/packages/patches/clog-fix-shared-build.patch
@@ -1,50 +1,19 @@
Author: Antero Mejr <antero@mailbox.org>
-Notes: Disabled function visibility hacks and googletest download. Enabled
-non-static builds.
+Notes: Disabled function visibility hacks. Enabled non-static builds.
diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt
-index 083f519..b7b225a 100644
+index 6e50c41..db02e95 100644
--- a/deps/clog/CMakeLists.txt
+++ b/deps/clog/CMakeLists.txt
-@@ -38,20 +38,8 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deps
- SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps
- CACHE PATH "Confu-style dependencies binary directory")
+@@ -55,7 +55,7 @@ IF(CLOG_BUILD_TESTS)
+ ENDIF()
--IF(CLOG_BUILD_TESTS)
-- IF(NOT DEFINED GOOGLETEST_SOURCE_DIR)
-- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
-- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
-- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download")
-- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
-- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download")
-- SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory")
-- ENDIF()
--ENDIF()
--
# ---[ clog library
-ADD_LIBRARY(clog STATIC src/clog.c)
+ADD_LIBRARY(clog src/clog.c)
SET_TARGET_PROPERTIES(clog PROPERTIES
C_STANDARD 99
C_EXTENSIONS NO)
-@@ -74,16 +62,6 @@ INSTALL(TARGETS clog
-
- # ---[ clog tests
- IF(CLOG_BUILD_TESTS)
-- # ---[ Build google test
-- IF(NOT TARGET gtest)
-- IF(MSVC AND NOT CLOG_RUNTIME_TYPE STREQUAL "static")
-- SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-- ENDIF()
-- ADD_SUBDIRECTORY(
-- "${GOOGLETEST_SOURCE_DIR}"
-- "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest")
-- ENDIF()
--
- ADD_EXECUTABLE(clog-test test/clog.cc)
- SET_TARGET_PROPERTIES(clog-test PROPERTIES
- CXX_STANDARD 11
diff --git a/deps/clog/include/clog.h b/deps/clog/include/clog.h
index 4143761..aa9000f 100644
--- a/deps/clog/include/clog.h
diff --git a/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch
new file mode 100644
index 0000000000..cc76672798
--- /dev/null
+++ b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch
@@ -0,0 +1,43 @@
+This patch compatibility problems with Coq 8.19.
+
+It was taken from the master branch of coq-autosubst as there is only
+this change since version 1.8 of autosubst and they haven't released a
+newer version yet.
+
+To recreate this patch:
+
+wget https://github.com/coq-community/autosubst/commit/97eea491813b691c6187d53d92ae6020874a82a3.patch \
+ -O coq-autosubst-1.8-remove-deprecated-files.patch
+
+From 97eea491813b691c6187d53d92ae6020874a82a3 Mon Sep 17 00:00:00 2001
+From: Pierre Rousselin <rousselin@math.univ-paris13.fr>
+Date: Sun, 15 Oct 2023 14:34:31 +0200
+Subject: [PATCH] Remove deprecated files in Coq.Arith
+
+This is necessary for Coq/Coq:#18164
+---
+ theories/Autosubst_Basics.v | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/theories/Autosubst_Basics.v b/theories/Autosubst_Basics.v
+index 477c87c..1940c3b 100644
+--- a/theories/Autosubst_Basics.v
++++ b/theories/Autosubst_Basics.v
+@@ -5,7 +5,7 @@
+ *)
+
+ Require Import Coq.Program.Tactics.
+-Require Import Coq.Arith.Plus List FunctionalExtensionality.
++Require Import Coq.Arith.PeanoNat List FunctionalExtensionality.
+
+ (** Annotate "a" with additional information. *)
+ Definition annot {A B} (a : A) (b : B) : A := a.
+@@ -240,7 +240,7 @@ Lemma plusSn n m : S n + m = S (n + m). reflexivity. Qed.
+ Lemma plusnS n m : n + S m = S (n + m). symmetry. apply plus_n_Sm. Qed.
+ Lemma plusOn n : O + n = n. reflexivity. Qed.
+ Lemma plusnO n : n + O = n. symmetry. apply plus_n_O. Qed.
+-Lemma plusA n m k : n + (m + k) = (n + m) + k. apply plus_assoc. Qed.
++Lemma plusA n m k : n + (m + k) = (n + m) + k. apply Nat.add_assoc. Qed.
+
+ Lemma scons_eta f n : f n .: (+S n) >>> f = (+n) >>> f.
+ Proof.
diff --git a/gnu/packages/patches/cpuinfo-system-libraries.patch b/gnu/packages/patches/cpuinfo-system-libraries.patch
deleted file mode 100644
index e25446e9da..0000000000
--- a/gnu/packages/patches/cpuinfo-system-libraries.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-This patch allows the build process to use the provided dependencies instead
-of adding their source as CMake sub-directories (in which case "make install"
-would install googletest's and googlebenchmark's libraries and headers).
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57abc26..761c612 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@ SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps
- CACHE PATH "Confu-style dependencies binary directory")
-
- IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS)
-- IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
-+ IF(FALSE)
- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -105,7 +105,7 @@ IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS)
- ENDIF()
-
- IF(CPUINFO_BUILD_BENCHMARKS)
-- IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLEBENCHMARK_SOURCE_DIR)
-+ IF(FALSE)
- MESSAGE(STATUS "Downloading Google Benchmark to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark (define GOOGLEBENCHMARK_SOURCE_DIR to avoid it)")
- CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt")
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -271,14 +271,6 @@ INSTALL(TARGETS cpuinfo
-
- # ---[ cpuinfo micro-benchmarks
- IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_BENCHMARKS)
-- # ---[ Build google benchmark
-- IF(NOT TARGET benchmark)
-- SET(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "")
-- ADD_SUBDIRECTORY(
-- "${GOOGLEBENCHMARK_SOURCE_DIR}"
-- "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark")
-- ENDIF()
--
- IF(CMAKE_SYSTEM_NAME MATCHES "^(Linux|Android)$")
- ADD_EXECUTABLE(get-current-bench bench/get-current.cc)
- TARGET_LINK_LIBRARIES(get-current-bench cpuinfo benchmark)
-@@ -289,7 +281,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_BENCHMARKS)
- ENDIF()
-
- IF(CPUINFO_SUPPORTED_PLATFORM)
-- IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS)
-+ IF(FALSE)
- # ---[ Build google test
- IF(NOT TARGET gtest)
- IF(MSVC AND NOT CPUINFO_RUNTIME_TYPE STREQUAL "static")
diff --git a/gnu/packages/patches/date-ignore-zonenow.patch b/gnu/packages/patches/date-ignore-zonenow.patch
new file mode 100644
index 0000000000..7243eef80b
--- /dev/null
+++ b/gnu/packages/patches/date-ignore-zonenow.patch
@@ -0,0 +1,13 @@
+Ignore the new zonenow.tab file introduced in tzdata 2023d.
+
+diff -u a/src/tz.cpp b/src/tz.cpp
+--- a/src/tz.cpp 2024-03-08 11:14:14.822488065 +0100
++++ b/src/tz.cpp 2024-03-08 11:47:12.105268426 +0100
+@@ -2667,6 +2667,7 @@
+ strcmp(d->d_name, "right") == 0 ||
+ strcmp(d->d_name, "+VERSION") == 0 ||
+ strcmp(d->d_name, "zone.tab") == 0 ||
++ strcmp(d->d_name, "zonenow.tab") == 0 ||
+ strcmp(d->d_name, "zone1970.tab") == 0 ||
+ strcmp(d->d_name, "tzdata.zi") == 0 ||
+ strcmp(d->d_name, "leapseconds") == 0 ||
diff --git a/gnu/packages/patches/datefudge-gettimeofday.patch b/gnu/packages/patches/datefudge-gettimeofday.patch
deleted file mode 100644
index 11c7640869..0000000000
--- a/gnu/packages/patches/datefudge-gettimeofday.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Add the 'restrict' qualifier to match the 'gettimeofday' declaration found
-in glibc 2.31.
-
---- datefudge-1.23/datefudge.c 2020-02-17 22:35:21.343341725 +0100
-+++ datefudge-1.23/datefudge.c 2020-02-17 22:35:49.619117874 +0100
-@@ -78,6 +78,6 @@
- return 0;
- }
-
--int gettimeofday(struct timeval *x, struct timezone *y) {
-+int gettimeofday(struct timeval *restrict x, void *restrict y) {
- return __gettimeofday(x,y);
- }
diff --git a/gnu/packages/patches/dblatex-inkscape-1.0.patch b/gnu/packages/patches/dblatex-inkscape-1.0.patch
new file mode 100644
index 0000000000..634c99481a
--- /dev/null
+++ b/gnu/packages/patches/dblatex-inkscape-1.0.patch
@@ -0,0 +1,39 @@
+# Imported from <https://sourceforge.net/p/dblatex/dblatex/merge-requests/4/>
+
+# HG changeset patch
+# User Jan Tojnar <jtojnar@gmail.com>
+# Date 1588714251 -7200
+# Tue May 05 23:30:51 2020 +0200
+# Branch inkscape1
+# Node ID 611cc4a4a878d57f5877f2d418864560f68d25cf
+# Parent 3ddf5d6cedcbc9c8b98c4da77fd545b2478d90a3
+Port to Inkscape 1.0
+
+Inkscape revamped the CLI flags:
+
+https://gitlab.com/inkscape/inbox/issues/2416
+
+diff -r 3ddf5d6cedcb -r 611cc4a4a878 docs/custom/dblatex.xconf
+--- a/docs/custom/dblatex.xconf Tue Sep 10 00:40:26 2019 +0200
++++ b/docs/custom/dblatex.xconf Tue May 05 23:30:51 2020 +0200
+@@ -18,7 +18,7 @@
+ <imagedata>
+ <converter src="svg" dst="*" docformat="pdf">
+ <command>
+- inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s
++ inkscape -D --export-dpi=600 --export-type=%(dst)s --export-filename=%(output)s %(input)s
+ </command>
+ </converter>
+ </imagedata>
+diff -r 3ddf5d6cedcb -r 611cc4a4a878 lib/dbtexmf/core/imagedata.py
+--- a/lib/dbtexmf/core/imagedata.py Tue Sep 10 00:40:26 2019 +0200
++++ b/lib/dbtexmf/core/imagedata.py Tue May 05 23:30:51 2020 +0200
+@@ -178,7 +178,7 @@
+ class SvgConverter(ImageConverter):
+ def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+ ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
++ self.add_command(["inkscape", "-D", "--export-type=%(dst)s", "--export-filename=%(output)s",
+ "%(input)s"])
+
+
diff --git a/gnu/packages/patches/diffutils-fix-signal-processing.patch b/gnu/packages/patches/diffutils-fix-signal-processing.patch
deleted file mode 100644
index 134dd3f718..0000000000
--- a/gnu/packages/patches/diffutils-fix-signal-processing.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Author: Frédéric Bonnard <frediz@debian.org>
-
-Obtained from:
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922552#19
-
-Fixes bug reported upstream at:
-
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34519
-
-diff --git a/src/diff.c b/src/diff.c
-index e2eb32437353..b574e8282dc9 100644
---- a/src/diff.c
-+++ b/src/diff.c
-@@ -1451,6 +1451,8 @@ compare_files (struct comparison const *parent,
- }
- }
-
-+ final_process_signals ();
-+
- /* Now the comparison has been done, if no error prevented it,
- and STATUS is the value this function will return. */
-
-diff --git a/src/diff.h b/src/diff.h
-index 03daaa4a0530..e177fe600a25 100644
---- a/src/diff.h
-+++ b/src/diff.h
-@@ -390,6 +390,7 @@ extern enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *);
- extern void begin_output (void);
- extern void debug_script (struct change *);
- extern void fatal (char const *) __attribute__((noreturn));
-+extern void final_process_signals (void);
- extern void finish_output (void);
- extern void message (char const *, char const *, char const *);
- extern void message5 (char const *, char const *, char const *,
-diff --git a/src/util.c b/src/util.c
-index 4f4d9bb285eb..56d292de2927 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -237,6 +237,18 @@ process_signals (void)
- }
- }
-
-+/* Process remaining signals once before exit */
-+void
-+final_process_signals (void)
-+{
-+ static int last = 1;
-+
-+ if (last) {
-+ process_signals ();
-+ last = 0;
-+ }
-+}
-+
- static void
- install_signal_handlers (void)
- {
diff --git a/gnu/packages/patches/docbook-utils-documentation-edits.patch b/gnu/packages/patches/docbook-utils-documentation-edits.patch
new file mode 100644
index 0000000000..7258d12675
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-documentation-edits.patch
@@ -0,0 +1,102 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/spellingtypo.patch/>
+
+Description: Fix some typos in man pages
+Author: Mathieu Malaterre <malat@debian.org>
+
+Index: docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:17.932819095 +0200
++++ docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:24.780818845 +0200
+@@ -17,7 +17,7 @@
+ .SH "DESCRIPTION"
+ .PP
+ \fBdocbook2man\fR is a sgmlspl spec file that produced man
+-pages (using the -man macros) from DocBook RefEntry markup.
++pages (using the \-man macros) from DocBook RefEntry markup.
+ .PP
+ The program reads ESIS produced by nsgmls (or other SGML parsers) from
+ standard input. Markup not found in RefEntry is discarded.
+Index: docbook-utils-0.6.14/doc/man/frontend-spec.7
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/frontend-spec.7 2012-05-09 18:41:45.172813778 +0200
++++ docbook-utils-0.6.14/doc/man/frontend-spec.7 2012-05-09 18:42:03.176813129 +0200
+@@ -10,7 +10,7 @@
+ .SH "DESCRIPTION"
+ .PP
+ \fBjw\fR(1) calls frontends like
+-\fIfrontends/docbook\fR to get the informations
++\fIfrontends/docbook\fR to get the information
+ specific to a given input format. The frontend knows which information
+ to return from the first command line parameter. It gets all necessary
+ data via environment variables ready to use.
+Index: docbook-utils-0.6.14/doc/man/jw.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/jw.1 2012-05-09 18:39:35.612818456 +0200
++++ docbook-utils-0.6.14/doc/man/jw.1 2012-05-09 18:40:51.736815708 +0200
+@@ -142,7 +142,7 @@
+ The following options apply to the conversion script:
+ .TP
+ \fB -f \fIfrontend\fB | --frontend \fIfrontend\fB \fR
+-Allows to specify another frontend than default \fIdocbook\fR\&.
++Allows one to specify another frontend than default \fIdocbook\fR\&.
+ The list of currently available frontends is:
+ .RS
+ .TP
+@@ -156,13 +156,13 @@
+ .RE
+ .TP
+ \fB -b \fIbackend\fB | --backend \fIbackend\fB \fR
+-Allows to specify another backend than default
++Allows one to specify another backend than default
+ \fIHTML\fR\&. The list of currently available
+ backends is:
+ .RS
+ .TP
+ \fB\fIdvi\fB\fR
+-Converts to DVI (DeVice Independant
++Converts to DVI (DeVice Independent
+ files) by calling \fBJade\fR or
+ \fBOpenJade\fR\&.
+ .TP
+@@ -210,7 +210,7 @@
+ .RE
+ .TP
+ \fB -c \fIfile\fB | --cat \fIfile\fB \fR
+-Allows to use an extra SGML Open Catalog that will list
++Allows one to use an extra SGML Open Catalog that will list
+ other files like customization style sheets, adaptations to the
+ DocBook Document Type Definition, special character entities,
+ etc. This catalog is added to the list of catalogs determined
+@@ -241,7 +241,7 @@
+ are specified on the command line.
+ .TP
+ \fB -d \fIfile\fB|default|none | --dsl \fIfile\fB|default|none \fR
+-Allows to use a customized style sheet instead
++Allows one to use a customized style sheet instead
+ of the default one.
+
+ A "target" starting with a hash mark "#" can be appended
+Index: docbook-utils-0.6.14/doc/man/sgmldiff.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/sgmldiff.1 2012-05-09 18:41:13.316814927 +0200
++++ docbook-utils-0.6.14/doc/man/sgmldiff.1 2012-05-09 18:41:38.032814038 +0200
+@@ -17,7 +17,7 @@
+
+ .SH "DESCRIPTION"
+ .PP
+-This perl script allows to determine the structural differences
++This perl script allows one to determine the structural differences
+ between two SGML files. It compares the files, regardless of what
+ is in between the tags, to only focus on the markup. Its output
+ is similar to \fBdiff\fR(1)\&.
+@@ -62,8 +62,8 @@
+ Lines 5 to 7 of the first file have been changed
+ into lines 8 to 10 of the second line.
+ In addition to those summaries, the lines of the first file are
+-shown preceeded by '<' and the lines of the second file are
+-shown preceeded by '>".
++shown preceded by '<' and the lines of the second file are
++shown preceded by '>".
+ .SH "OPTIONS"
+ .PP
+ Here is the list of actions that can be requested to
diff --git a/gnu/packages/patches/docbook-utils-escape-characters.patch b/gnu/packages/patches/docbook-utils-escape-characters.patch
new file mode 100644
index 0000000000..3845ee6238
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-escape-characters.patch
@@ -0,0 +1,36 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/bug_528334.patch/>
+
+Description: incorrectly strips whitespace (patch included)
+ In the previous upload, docbook2man was patched to escape the special
+ characters . and ' at the beginning of a line (see #399947).
+ Unfortunately that patch was incorrect -- as well as escaping the special
+ characters, it also removes all whitespace from the beginning of
+ affected lines. As a result, if you are in a block where whitespace
+ matters (such as <screen>...</screen>) then the output is now incorrect.
+
+ This is very easy to fix -- just match the whitespace and preserve it,
+ instead of tossing it away. The full patch (just two lines) is included
+ below.
+Author: Ben Burton <bab@debian.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/528334
+
+Edit by Bruno Victal <mirai@makinata.eu>:
+ Patch was edited so that it could be applied against the original
+ docbook-utils-0.6.14 sources.
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:59:42.584774885 +0200
++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 19:00:34.788773002 +0200
+@@ -1212,8 +1212,8 @@
+ $_[0] =~ s/\\/\\\\/g;
+
+ # Escape dots and single quotes in column 1
+- $_[0] =~ s/^\./\\\&\./;
+- $_[0] =~ s/^\'/\\\&\'/;
++ $_[0] =~ s/^([ \t]*)\./$1\\\&\./;
++ $_[0] =~ s/^([ \t]*)\'/$1\\\&\'/;
+
+ # In non-'pre'-type elements:
+ if(!$nocollapse_whitespace) {
diff --git a/gnu/packages/patches/docbook-utils-remove-jade-sp.patch b/gnu/packages/patches/docbook-utils-remove-jade-sp.patch
new file mode 100644
index 0000000000..99751b4de3
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-remove-jade-sp.patch
@@ -0,0 +1,216 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/remove-jade-sp.patch/>
+Description: Change dependencies on jade and sp to openjade and opensp
+Author: Neil Roeth <neil@debian.org>
+Last-Update: 2016-07-24
+
+Edit by Bruno Victal <mirai@makinata.eu>:
+ Patch was edited so that it could be applied against the original
+ docbook-utils-0.6.14 sources.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/HTML/Makefile.am
++++ b/doc/HTML/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir = $(docdir)/html/docbook-utils-@VERSION@
++htmldir = $(docdir)/html
+ html_DATA = api.html \
+ backend-spec.html \
+ docbook2man.html \
+@@ -25,6 +25,6 @@
+ $(top_srcdir)/doc/refentry/sgmldiff.sgml
+ SGML_CATALOG_FILES=/etc/sgml/catalog \
+ SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
+- jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
++ openjade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
+ -V '%use-id-as-filename%' $<
+
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -12,5 +12,5 @@
+ $(top_srcdir)/helpers/docbook2man-spec.pl
+ SGML_CATALOG_FILES=/etc/sgml/catalog \
+ SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
+- nsgmls $< | \
++ onsgmls $< | \
+ sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
+--- a/backends/man.in
++++ b/backends/man.in
+@@ -7,8 +7,8 @@
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+ { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
+-sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
++onsgmls $SGML_FILE > "${TMPDIR}/onsgmls.tmp"
++sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+ cat "${TMPDIR}/errs"
+@@ -18,7 +18,7 @@
+ if grep unresolved "${TMPDIR}/errs" >/dev/null 2>&1
+ then
+ echo "Resolving references.."
+- sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp"
++ sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- a/backends/texi.in
++++ b/backends/texi.in
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++onsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- a/bin/sgmldiff.in
++++ b/bin/sgmldiff.in
+@@ -22,13 +22,13 @@
+
+ use strict;
+ use integer;
+-use vars qw($nsgmls $errors $errorlog $VERSION);
++use vars qw($onsgmls $errors $errorlog $VERSION);
+ use Getopt::Long 2.01;
+
+ $VERSION = 1.03;
+
+-my $nsgmls;
+-$nsgmls = "@jade_bindir@/nsgmls";
++my $onsgmls;
++$onsgmls = "@jade_bindir@/onsgmls";
+
+ #----------------------------------------------------------------------
+ # TODO:
+@@ -37,7 +37,7 @@
+ # - Wait for suggestions ;-)
+ #
+ # Note: the input file need not be valid, nor is it necessary to have
+-# the DTDs. nsgmls always returns a structure.
++# the DTDs. onsgmls always returns a structure.
+ #----------------------------------------------------------------------
+
+ # Get file name
+@@ -141,11 +141,11 @@
+ unlink $diff2;
+
+ #---------------------------------------------------------------------
+-# Process nsgmls output: keep all stuff that is important for the
++# Process onsgmls output: keep all stuff that is important for the
+ # structure comparison. Make two structures: one that is diffed
+ # (without text) (DIFF) and one that is used to present the
+ # differences to the user (@full). For more info: see SP
+-# documentation, nsgmls output format.
++# documentation, onsgmls output format.
+
+ sub prepare {
+ my($filename,$todiffname) = @_;
+@@ -161,7 +161,7 @@
+ my @line_numbered = ();
+ my $line = 0;
+
+- open(ESIS, "$nsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | "); #-oentity generates strange output; ? -ononsgml
++ open(ESIS, "$onsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | "); #-oentity generates strange output; ? -ononsgml
+ open(DIFF, "> $todiffname");
+ while (<ESIS>) {
+ chomp $_;
+@@ -375,7 +375,7 @@
+ };
+
+ #----------------------------------------------------------------------
+-# Normalise data text from nsgmls (i.e. don't print the escaped text).
++# Normalise data text from onsgmls (i.e. don't print the escaped text).
+ sub normalise_text {
+ my($string,$prefix) = @_;
+ my $result = "$prefix";
+--- a/configure.in
++++ b/configure.in
+@@ -21,7 +21,7 @@
+
+ dnl Checks for programs.
+ jade_bindirs="/usr/bin /usr/local/bin"
+-AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir)
++AC_FIND_PROGRAM(onsgmls, $jade_bindirs, jade_bindir)
+ AC_SUBST(jade_bindir)
+
+ perl_bindirs="/usr/bin /usr/local/bin"
+--- a/doc/refentry/docbook2man-spec.pl.sgml
++++ b/doc/refentry/docbook2man-spec.pl.sgml
+@@ -19,7 +19,7 @@
+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->
+
+ <CmdSynopsis>
+-<Command>nsgmls</command>
++<Command>onsgmls</command>
+ <Arg><Replaceable>sgml document</replaceable></Arg>
+ <Command>| sgmlspl</command>
+ <Arg choice=req>docbook2man-spec.pl</arg>
+@@ -35,7 +35,7 @@
+ </Para>
+
+ <Para>
+-The program reads ESIS produced by nsgmls (or other SGML parsers) from
++The program reads ESIS produced by onsgmls (or other SGML parsers) from
+ standard input. Markup not found in RefEntry is discarded.
+ </Para>
+
+--- a/doc/refentry/docbook2texi-spec.pl.sgml
++++ b/doc/refentry/docbook2texi-spec.pl.sgml
+@@ -20,7 +20,7 @@
+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->
+
+ <CmdSynopsis>
+-<Command>nsgmls</command>
++<Command>onsgmls</command>
+ <Arg><Replaceable>sgml document</replaceable></Arg>
+ <Command>| sgmlspl</command>
+ <Arg choice=req>docbook2texi-spec.pl</arg>
+@@ -37,7 +37,7 @@
+ </Para>
+
+ <Para>
+-The program reads ESIS produced by nsgmls (or other SGML parsers) from
++The program reads ESIS produced by onsgmls (or other SGML parsers) from
+ standard input. Currently the document element must be <SGMLTag>Book</sgmltag>,
+ otherwise the results are undefined.
+ </Para>
+--- a/doc/refentry/jw.sgml
++++ b/doc/refentry/jw.sgml
+@@ -630,7 +630,7 @@
+ <manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>install-catalog</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>,
+- <citerefentry><refentrytitle>nsgmls</refentrytitle>
++ <citerefentry><refentrytitle>onsgmls</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>, <ulink
+ url="http://sources.redhat.com/docbook-tools/">docbook-utils
+ homepage</ulink>.</para>
+--- a/doc/refentry/sgmldiff.sgml
++++ b/doc/refentry/sgmldiff.sgml
+@@ -238,10 +238,10 @@
+ <glossterm>
+ <!-- Next line is a hack to force a paragraph break in the man-page. -->
+ <cmdsynopsis> <command></command> </cmdsynopsis>
+- <citerefentry> <refentrytitle>nsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
++ <citerefentry> <refentrytitle>onsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
+ </glossterm>
+ <glossdef>
+- <para>a base component of <application>Jade</application> DSSSL engine</para>
++ <para>a base component of <application>OpenJade</application> DSSSL engine</para>
+ </glossdef>
+ </glossentry>
+
+--- a/helpers/docbook2man-spec.pl
++++ b/helpers/docbook2man-spec.pl
+@@ -7,7 +7,7 @@
+ The SGMLSpm package from CPAN. This contains the sgmlspl script which
+ is used to grok this file. Use it like this:
+
+-nsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
++onsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
+
+ =head1 DESCRIPTION
+
diff --git a/gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch b/gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch
new file mode 100644
index 0000000000..1b8ce7a0de
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch
@@ -0,0 +1,36 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/bug_394511.patch/>
+
+Description: docbook2man should translate the NAME section according to the REFENTRY's lang attribute
+ Currently, docbook2man translates the NAME section according to the lang
+ attribute provided to the REFNAMEDIV tag.
+ When a lang attribute is specified in the REFENTRY tag and no lang
+ attribute is specified with the REFNAMEDIV, the lang attribute of the
+ REFENTRY should be used.
+Author: Nicolas François <nicolas.francois@centraliens.net>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/394511
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:55:53.276783163 +0200
++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:58:04.792778418 +0200
+@@ -359,11 +359,14 @@
+ # NAME section
+ man_sgml('<REFNAMEDIV>', sub {
+ my %words = qw( fr NOM es NOMBRE de NAME );
+- if (defined($_[0]->attribute('LANG')->value)) {
+- my $id = $_[0]->attribute('LANG')->value;
+- my $ad = $words{$id};
+- output("\n.SH $ad\n");}
+- else {output("\n.SH NAME\n");}
++ # Use the REFNAMEDIV's lang attribute, and default to the
++ # REFENTRY's lang attribute.
++ my $lang = $_[0]->attribute('LANG')->value;
++ $lang = $manpage_lang unless defined $lang;
++ if (defined($lang) and defined $words{lc($lang)}) {
++ my $ad = $words{lc($lang)};
++ output("\n.SH $ad\n");}
++ else { output("\n.SH NAME\n");}
+ });
+
+ sgml('<REFNAME>', \&save_cdata);
diff --git a/gnu/packages/patches/docbook-utils-source-date-epoch.patch b/gnu/packages/patches/docbook-utils-source-date-epoch.patch
new file mode 100644
index 0000000000..15c025a726
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-source-date-epoch.patch
@@ -0,0 +1,31 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/support_source_date_epoch.patch/>
+
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Support SOURCE_DATE_EPOCH for timestamps
+ To allow generating documents in a reproducible way,
+ allow overriding the timestamp through the environment.
+ .
+ See also: https://reproducible-builds.org/specs/source-date-epoch/
+Bug-Debian: https://bugs.debian.org/800797
+
+--- a/helpers/docbook2man-spec.pl
++++ b/helpers/docbook2man-spec.pl
+@@ -57,6 +57,7 @@
+ use SGMLS; # Use the SGMLS package.
+ use SGMLS::Output; # Use stack-based output.
+ use SGMLS::Refs;
++use POSIX qw(strftime setlocale LC_TIME);
+
+ ########################################################################
+ # SGMLSPL script produced automatically by the script sgmlspl.pl
+@@ -279,6 +280,10 @@
+ _END_BANNER
+
+ my $date = `date "+%d %B %Y"`;
++ if ($ENV{SOURCE_DATE_EPOCH}) {
++ setlocale(LC_TIME, "C");
++ $date = strftime("%d %B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time));
++ }
+ my $manpage_date = $manpage_date || $date ;
+
+ output '.TH "';
diff --git a/gnu/packages/patches/docbook-utils-use-date-element.patch b/gnu/packages/patches/docbook-utils-use-date-element.patch
new file mode 100644
index 0000000000..106707f7d4
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-use-date-element.patch
@@ -0,0 +1,63 @@
+# Source: <https://sources.debian.org/patches/docbook-utils/0.6.14-4/bug_214982.patch/>
+
+Description: patch to get the <date> from the sgml file
+ For the moment, docbook2man doesn't use the tag date in <date> </date>
+ to but `date "+%d %B %Y"`, and thus depend on the current locale.
+
+ <refentry>
+ <docinfo>
+ <date>06 September 2003</>
+ </docinfo>
+ </refentry>
+
+ A patch against /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl
+ allows to use the date written in the source SGML file (which can be
+ localized) instead of the current date.
+
+ However, if no correct date tag is present in the SGML file, the date
+ written in the manpage will depend on the current locale.
+Author: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/214982
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:27:28.000000000 +0200
++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:55:53.276783163 +0200
+@@ -278,8 +278,9 @@
+ .\\" etc. to Steve Cheng <steve\@ggi-project.org>.
+ _END_BANNER
+
+- my $manpage_date = `date "+%d %B %Y"`;
+-
++ my $date = `date "+%d %B %Y"`;
++ my $manpage_date = $manpage_date || $date ;
++
+ output '.TH "';
+
+ # If the title is not mixed-case, convention says to
+@@ -292,7 +293,7 @@
+ }
+
+ output '" "', fold_string($manpage_sect),
+- '" "', fold_string(`date "+%d %B %Y"`),
++ '" "', fold_string($manpage_date),
+ '" "', $manpage_misc,
+ '" "', $manpage_manual,
+ "\"\n";
+@@ -568,6 +569,15 @@
+ sgml('</ATTRIBUTION>', sub { $_[0]->parent->ext->{'attribution'} = pop_output(); });
+
+
++sgml('<DATE>', sub {
++ save_cdata();
++});
++sgml('</DATE>', sub {
++ $manpage_date = fold_string(pop_output());
++ $raw_cdata--;
++});
++
++
+ # IGNORE.
+ sgml('<DOCINFO>', sub { push_output('nul'); });
+ sgml('</DOCINFO>', sub { pop_output(); });
diff --git a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch
deleted file mode 100644
index fed4b76429..0000000000
--- a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Use a non-recursive replace function when the parser supports it.
-
-https://bugs.gnu.org/29782
-https://bugzilla.samba.org/show_bug.cgi?id=9515
-https://bugzilla.gnome.org/show_bug.cgi?id=736077 (for xsltproc)
-
-Patch copied from Debian:
-https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/765567_non-recursive_string_subst.patch
-
-Description: use EXSLT "replace" function when available
- A recursive implementation of string.subst is problematic,
- long strings with many matches will cause stack overflows.
-Author: Peter De Wachter <pdewacht@gmail.com>
-Bug-Debian: https://bugs.debian.org/750593
-
---- a/lib/lib.xsl
-+++ b/lib/lib.xsl
-@@ -6,7 +6,11 @@
-
- This module implements DTD-independent functions
-
-- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-+ ******************************************************************** -->
-+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+ xmlns:str="http://exslt.org/strings"
-+ exclude-result-prefixes="str"
-+ version="1.0">
-
- <xsl:template name="dot.count">
- <!-- Returns the number of "." characters in a string -->
-@@ -52,6 +56,9 @@
- <xsl:param name="replacement"/>
-
- <xsl:choose>
-+ <xsl:when test="function-available('str:replace')">
-+ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
-+ </xsl:when>
- <xsl:when test="contains($string, $target)">
- <xsl:variable name="rest">
- <xsl:call-template name="string.subst">
diff --git a/gnu/packages/patches/docbook-xsl-support-old-url.patch b/gnu/packages/patches/docbook-xsl-support-old-url.patch
deleted file mode 100644
index 5b7dda458f..0000000000
--- a/gnu/packages/patches/docbook-xsl-support-old-url.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Docbook 1.79.2 makes very few changes apart from changing the canonical URL
-to cdn.docbook.org. This patch adds support for the previous URL to avoid
-breaking packages that still use that.
-
-Adapted from Debian:
-https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/0005-catalog.xml-Compatibility-with-1.79.1-or-earlier.patch
-
---- a/catalog.xml
-+++ b/catalog.xml
-@@ -5,4 +5,7 @@
- <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/current/" rewritePrefix="./"/>
- <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
- <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
-+ <!-- Also support old URI of v1.79.1 or earlier -->
-+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
-+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
- </catalog>
diff --git a/gnu/packages/patches/docbook2x-filename-handling.patch b/gnu/packages/patches/docbook2x-filename-handling.patch
new file mode 100644
index 0000000000..ebffd7b7ae
--- /dev/null
+++ b/gnu/packages/patches/docbook2x-filename-handling.patch
@@ -0,0 +1,44 @@
+# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/03_fix_420153_filename_whitespace_handling.patch/>
+
+## 03_fix_420153_filename_whitespace_handling.dpatch by
+## Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Peter Eisentraut reported a regression in the whitespace handling of
+## DP: refentrytitle content during filename creation:
+## DP: http://bugs.debian.org/420153. The problem is, that upstream first
+## DP: replaces all spaces (but not linebreaks btw) with underlines and then
+## DP: it tries to normalize the result. This means, that a linebreak with
+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
+## DP: So what we basically do in this patch is, that we first normalize the
+## DP: refentrytitle and then replace any spaces left with underlines.
+
+Edit by Bruno Victal <mirai@makinata.eu>:
+ Removed dpatch lines.
+
+--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ <xsl:template name="manpage-filename">
+ <xsl:param name="filename" />
+- <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />
++ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />
+ </xsl:template>
+
+
+--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200
+@@ -38,7 +38,11 @@
+ <xsl:template name="refentry-filename">
+ <xsl:param name="title" />
+
+- <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />
++ <xsl:variable name="title2">
++ <xsl:call-template name="manpage-filename">
++ <xsl:with-param name="filename" select="$title" />
++ </xsl:call-template>
++ </xsl:variable>
+
+ <!-- not using gentext here since man page names tend not to have
+ accented chars / non-Latin chars ...
diff --git a/gnu/packages/patches/docbook2x-fix-synopsis.patch b/gnu/packages/patches/docbook2x-fix-synopsis.patch
new file mode 100644
index 0000000000..315c93029b
--- /dev/null
+++ b/gnu/packages/patches/docbook2x-fix-synopsis.patch
@@ -0,0 +1,26 @@
+# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/07_Fix-hyphens-in-commands-and-options-in-synopsis.patch/>
+
+From 06944d2bf8aa761ec6c145c964e59c3b1f41d7a5 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <sthibault@debian.org>
+Date: Wed, 6 Sep 2023 21:48:59 +0200
+Subject: man: Fix hyphens in commands and options in synopsis
+
+diff --git a/xslt/man/synop.xsl b/xslt/man/synop.xsl
+index 9713a1b..e535b75 100644
+--- a/xslt/man/synop.xsl
++++ b/xslt/man/synop.xsl
+@@ -107,9 +107,9 @@
+ <xsl:call-template name="cmdsynopsis-gentext-sepchar" />
+ </xsl:if>
+
+- <b>
++ <xsl:call-template name="inline-bold-monospace">
+ <xsl:apply-templates mode="cmdsynopsis" />
+- </b>
++ </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template match="replaceable" mode="cmdsynopsis">
+--
+2.34.1
+
diff --git a/gnu/packages/patches/docbook2x-manpage-typo.patch b/gnu/packages/patches/docbook2x-manpage-typo.patch
new file mode 100644
index 0000000000..5b64ca837b
--- /dev/null
+++ b/gnu/packages/patches/docbook2x-manpage-typo.patch
@@ -0,0 +1,26 @@
+# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/06_fix_man_typo.patch/>
+
+Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+
+--- docbook2x-0.8.8.orig/doc/docbook2man.1
++++ docbook2x-0.8.8/doc/docbook2man.1
+@@ -187,7 +187,7 @@ parameter instead.
+
+ However, inside a custom stylesheet
+ (\fInot on the command-line\fR)
+-this paramter can be set to the XPath expression
++this parameter can be set to the XPath expression
+ \*(T<document('')\*(T>,
+ which will cause the custom translations
+ directly embedded inside the custom stylesheet to be read.
+--- docbook2x-0.8.8.orig/doc/docbook2texi.1
++++ docbook2x-0.8.8/doc/docbook2texi.1
+@@ -230,7 +230,7 @@ parameter instead.
+
+ However, inside a custom stylesheet
+ (\fInot on the command-line\fR)
+-this paramter can be set to the XPath expression
++this parameter can be set to the XPath expression
+ \*(T<document('')\*(T>,
+ which will cause the custom translations
+ directly embedded inside the custom stylesheet to be read.
diff --git a/gnu/packages/patches/docbook2x-preprocessor-declaration.patch b/gnu/packages/patches/docbook2x-preprocessor-declaration.patch
new file mode 100644
index 0000000000..34fb64c059
--- /dev/null
+++ b/gnu/packages/patches/docbook2x-preprocessor-declaration.patch
@@ -0,0 +1,91 @@
+# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/04_fix_442782_preprocessor_declaration_syntax.patch/>
+
+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Conventionally, preprocessor declarations should start with
+## DP: '\"
+## DP: rather than
+## DP: .\"
+## DP: Current man-db only supports the first (and recommended) syntax. So
+## DP: Colin Watson provided this patch to fix docbook2x.
+## DP:
+## DP: <URL:http://bugs.debian.org/442782>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+Edit by Bruno Victal <mirai@makinata.eu>:
+ Removed dpatch lines.
+
+--- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200
++++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100
+@@ -342,6 +342,25 @@
+ $self->{line_start} = 1;
+ }
+
++#
++# Print a comment in the output, without causing a break.
++# Params: comment - the comment text.
++# May use any characters; they need not be escaped.
++#
++sub comment_nobreak
++{
++ my ($self, $comment) = @_;
++ $self->write("\n") unless $self->{line_start};
++
++ foreach my $line (split(/\n/, $comment)) {
++ $self->write('\'\" ');
++ $self->write($line);
++ $self->write("\n");
++ }
++
++ $self->{line_start} = 1;
++}
++
+
+ #
+ # Use a roff "escape" i.e. commands embedded in text starting with \
+@@ -510,16 +529,20 @@
+
+ $self->{'adjust-stack'} = [ 'b' ];
+
+- $self->{rw}->comment($elem->attr('preprocessors'))
+- if($elem->attr('preprocessors') ne '');
+-
++ my $preprocessors = $elem->attr('preprocessors');
+ # I've dug through the Internet to see if there was any
+ # standard way to specify encoding with man pages.
+ # The following seems to be a reasonable proposal:
+ # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>
+ my $encoding = $self->{options}->{'encoding'};
+ $encoding =~ s#//TRANSLIT$##i;
+- $self->{rw}->comment("-*- coding: $encoding -*-");
++ $encoding = "-*- coding: $encoding -*-";
++ if ($preprocessors eq '') {
++ $preprocessors = $encoding;
++ } else {
++ $preprocessors = "$preprocessors $encoding";
++ }
++ $self->{rw}->comment_nobreak($preprocessors);
+
+ # Define escapes for switching to and from monospace fonts (groff only)
+ $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
+--- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +0200
++++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100
+@@ -528,7 +528,7 @@
+ <exslt:document method="text"
+ encoding="{$encoding}"
+ href="{$path}">
+- <xsl:text>.\" -*- coding: </xsl:text>
++ <xsl:text>'\" -*- coding: </xsl:text>
+ <xsl:value-of select="$encoding" />
+ <xsl:text> -*-&#10;</xsl:text>
+ <xsl:copy-of select="$content" />
+@@ -538,7 +538,7 @@
+ <saxon:output method="text"
+ encoding="{$encoding}"
+ href="{$path}">
+- <xsl:text>.\" -*- coding: </xsl:text>
++ <xsl:text>'\" -*- coding: </xsl:text>
+ <xsl:value-of select="$encoding" />
+ <xsl:text> -*-&#10;</xsl:text>
+ <xsl:copy-of select="$content" />
diff --git a/gnu/packages/patches/docbook2x-static-datadir-evaluation.patch b/gnu/packages/patches/docbook2x-static-datadir-evaluation.patch
new file mode 100644
index 0000000000..eb8844d379
--- /dev/null
+++ b/gnu/packages/patches/docbook2x-static-datadir-evaluation.patch
@@ -0,0 +1,21 @@
+# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/01_fix_static_datadir_evaluation.patch/>
+
+Description:
+ 01_fix_static_datadir_evaluation.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+ All lines beginning with `## DP:' are a description of the patch.
+ The evaluation of datadir results in "${prefix}/share" without
+ evaluation of the ${prefix} variable with autoconf 2.60.
+
+Index: docbook2X-0.8.8/configure.ac
+===================================================================
+--- docbook2X-0.8.8.orig/configure.ac
++++ docbook2X-0.8.8/configure.ac
+@@ -148,7 +148,7 @@
+ dnl they will reside and should use these static_* values.
+ dnl Ensure that all static_* are fully expanded.
+
+-eval static_datadir="$datadir"
++eval eval static_datadir="$datadir"
+
+ eval static_bindir="$bindir"
+ old_val=""
diff --git a/gnu/packages/patches/dwarves-threading-reproducibility.patch b/gnu/packages/patches/dwarves-threading-reproducibility.patch
new file mode 100644
index 0000000000..8771ca6b0d
--- /dev/null
+++ b/gnu/packages/patches/dwarves-threading-reproducibility.patch
@@ -0,0 +1,23 @@
+Retrieved from nixpkgs.
+
+This causes pahole to use '-j1' (single thread) when SOURCE_DATE_EPOCH
+is set, to ensure it produces reproducible output.
+
+diff --git a/pahole.c b/pahole.c
+index 6fc4ed6..a4e306f 100644
+--- a/pahole.c
++++ b/pahole.c
+@@ -1687,8 +1687,11 @@ static error_t pahole__options_parser(int key, char *arg,
+ class_name = arg; break;
+ case 'j':
+ #if _ELFUTILS_PREREQ(0, 178)
+- conf_load.nr_jobs = arg ? atoi(arg) :
+- sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
++ // Force single thread if reproducibility is desirable.
++ if (!getenv("SOURCE_DATE_EPOCH")) {
++ conf_load.nr_jobs = arg ? atoi(arg) :
++ sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
++ }
+ #else
+ fputs("pahole: Multithreading requires elfutils >= 0.178. Continuing with a single thread...\n", stderr);
+ #endif
diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch
index 07ab8c1e66..e87fd89736 100644
--- a/gnu/packages/patches/emacs-telega-path-placeholder.patch
+++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch
@@ -1,31 +1,32 @@
-From bfcd616f2870c8c3ffc9a526fcd574eb5e726a96 Mon Sep 17 00:00:00 2001
+From 52b9a0f91094888b9dd55d3d5a50cb44887ff3d3 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
-Date: Sat, 14 Jan 2023 09:33:34 +0400
+Date: Mon, 6 May 2024 10:41:53 +0200
Subject: [PATCH] Add path placeholder for telega-server-command and etc-file.
---
- telega-core.el | 2 +-
+ telega-core.el | 3 +--
telega-customize.el | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/telega-core.el b/telega-core.el
-index 36f121e..f9f7976 100644
+index f798b40..2db0d64 100644
--- a/telega-core.el
+++ b/telega-core.el
-@@ -41,7 +41,7 @@
-
+@@ -45,8 +45,7 @@
(defun telega-etc-file (filename)
- "Return absolute path to FILENAME from etc/ directory in telega."
-- (expand-file-name (concat "etc/" filename) telega--lib-directory))
-+ (concat "@TELEGA_SHARE@" "/" filename))
-
- (defconst telega-spoiler-translation-table
- (let ((table (make-char-table 'translation-table)))
+ "Return absolute path to FILENAME from etc/ directory in telega.
+ Use FILENAME as is if resulting file does not exist."
+- (let ((abspath (expand-file-name (concat "etc/" filename)
+- telega--lib-directory)))
++ (let ((abspath (concat "@TELEGA_SHARE@" "/" filename)))
+ (if (file-exists-p abspath)
+ abspath
+ filename)))
diff --git a/telega-customize.el b/telega-customize.el
-index 0efb001..77cec5f 100644
+index 8393f0f..cb21465 100644
--- a/telega-customize.el
+++ b/telega-customize.el
-@@ -633,7 +633,7 @@ In range [1..3]. Use 1."
+@@ -678,7 +678,7 @@ In range [1..3]. Use 1."
:prefix "telega-server-"
:group 'telega)
@@ -35,4 +36,4 @@ index 0efb001..77cec5f 100644
It should be absolute path or binary file searchable in `exec-path'."
:type 'string
--
-2.38.1
+2.41.0
diff --git a/gnu/packages/patches/emacs-xelb-ignore-length-element.patch b/gnu/packages/patches/emacs-xelb-ignore-length-element.patch
deleted file mode 100644
index 48c3e35155..0000000000
--- a/gnu/packages/patches/emacs-xelb-ignore-length-element.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Work around build failure due to XCB "length" element.
-Patch from <https://sources.debian.org/patches/xelb/0.18-4/>.
-
-Author: Martin <debacle@debian.org>
-Bug: https://github.com/ch11ng/xelb/issues/28
-Bug-Debian: https://bugs.debian.org/1017294
-
----
---- a/el_client.el
-+++ b/el_client.el
-@@ -519,7 +519,7 @@
- (`list (xelb-parse-list node))
- (`exprfield (xelb-parse-exprfield node))
- (`switch (xelb-parse-switch node))
-- ((or `comment `doc)) ;simply ignored
-+ ((or `comment `doc `length)) ;simply ignored
- (x (error "Unsupported structure content: <%s>" x))))
-
- ;; The car of the result shall be renamed to prevent duplication of slot names
diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch
index e4f98de7c8..7233b91da8 100644
--- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch
+++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch
@@ -10,7 +10,7 @@ index 6d07a0ac3..31e0e728f 100644
snprintf(buf, sizeof(buf),
- "%s/enlightenment/utils/enlightenment_ckpasswd pw",
- e_prefix_lib_get());
-+ "/run/setuid-programs/enlightenment_ckpasswd pw");
++ "/run/privileged/bin/enlightenment_ckpasswd pw");
exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
if (!exe) goto out;
snprintf(buf, sizeof(buf), "pw %s", passwd);
@@ -20,7 +20,7 @@ index 6d07a0ac3..31e0e728f 100644
snprintf(buf, sizeof(buf),
- "%s/enlightenment/utils/enlightenment_ckpasswd pk",
- e_prefix_lib_get());
-+ "/run/setuid-programs/enlightenment_ckpasswd pk");
++ "/run/privileged/bin/enlightenment_ckpasswd pk");
exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
if (!exe) goto out;
snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd);
@@ -33,7 +33,7 @@ index 9b10b3117..74e6b72ad 100644
char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
-+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_sys");
++ snprintf(buf, sizeof(buf), "/run/privileged/bin/enlightenment_sys");
eeze_disk_mount_wrapper_set(v->disk, buf);
}
v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);
@@ -42,7 +42,7 @@ index 9b10b3117..74e6b72ad 100644
char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
-+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_sys");
++ snprintf(buf, sizeof(buf), "/run/privileged/bin/enlightenment_sys");
eeze_disk_mount_wrapper_set(v->disk, buf);
}
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);
@@ -51,7 +51,7 @@ index 9b10b3117..74e6b72ad 100644
char buf2[PATH_MAX];
- snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
-+ snprintf(buf2, sizeof(buf2), "/run/setuid-programs/enlightenment_sys");
++ snprintf(buf2, sizeof(buf2), "/run/privileged/bin/enlightenment_sys");
eeze_disk_mount_wrapper_set(v->disk, buf2);
}
v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);
@@ -65,7 +65,7 @@ index 722063339..2da2d5a23 100644
myasprintf(&buf3,
- "E_ALERT_SYSTEM_BIN=%s/enlightenment/utils/enlightenment_system",
- eina_prefix_lib_get(pfx));
-+ "E_ALERT_SYSTEM_BIN=/run/setuid-programs/enlightenment_system");
++ "E_ALERT_SYSTEM_BIN=/run/privileged/bin/enlightenment_system");
putenv(buf3);
home = getenv("HOME");
@@ -78,7 +78,7 @@ index bfd43e7e2..45d78b7ed 100644
if (_respawn_count > 5) return;
snprintf(buf, sizeof(buf),
- "%s/enlightenment/utils/enlightenment_system", e_prefix_lib_get());
-+ "/run/setuid-programs/enlightenment_system");
++ "/run/privileged/bin/enlightenment_system");
_system_exe = ecore_exe_pipe_run
(buf, ECORE_EXE_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT |
ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, NULL);
diff --git a/gnu/packages/patches/epiphany-fix-encoding-test.patch b/gnu/packages/patches/epiphany-fix-encoding-test.patch
new file mode 100644
index 0000000000..a491053d06
--- /dev/null
+++ b/gnu/packages/patches/epiphany-fix-encoding-test.patch
@@ -0,0 +1,40 @@
+From 3b334ba2c9dc869dc84e4b2f84d00df972c0e734 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Fri, 10 Nov 2023 15:36:14 -0600
+Subject: [PATCH] Fix encodings test when running in non-English locale
+
+Let's force use of the C.UTF-8 locale, so the value of the collation key
+does not depend on the host locale.
+
+Fixes #1842
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1413>
+---
+ tests/ephy-encodings-test.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
+index a3ea7e781d..992d80d2c2 100644
+--- a/tests/ephy-encodings-test.c
++++ b/tests/ephy-encodings-test.c
+@@ -44,7 +44,7 @@ test_ephy_encodings_create (void)
+ g_assert_cmpstr (ephy_encoding_get_encoding (encoding), ==, "UTF-8");
+ g_assert_cmpstr (ephy_encoding_get_title (encoding), ==, "Unicode (UTF-8)");
+ g_assert_cmpstr (ephy_encoding_get_title_elided (encoding), ==, "Unicode (UTF-8)");
+- g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "\311\263\307\276\307\205\305\271\310\215\306\202\306\216\311\263\311\250\306\245\305\237\001\035\035\035\035\035\035\035\035\035\035\035\001\007\002\002\002\002\002\002\007\007\007\002\001\001\346\244\273\001\346\215\264\001\346\211\243\001\346\204\235\001\346\216\257\001\346\205\217\001\346\206\212\001\343\265\233\001\343\265\242\001\346\244\273\001\346\244\231\001\346\234\257\001\343\265\247\001\345\277\241\001\343\265\243");
++ g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "Unicode (UTF-8)");
+ g_assert_cmpint (ephy_encoding_get_language_groups (encoding), ==, LG_UNICODE);
+
+ g_object_unref (encoding);
+@@ -80,7 +80,7 @@ main (int argc,
+ int ret;
+
+ gtk_test_init (&argc, &argv);
+- setlocale (LC_ALL, "");
++ setlocale (LC_ALL, "C.UTF-8");
+
+ ephy_debug_init ();
+
+--
+GitLab
+
diff --git a/gnu/packages/patches/esmini-no-clutter-log.patch b/gnu/packages/patches/esmini-no-clutter-log.patch
deleted file mode 100644
index 0920244f78..0000000000
--- a/gnu/packages/patches/esmini-no-clutter-log.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Don't clutter /tmp with logs.
-
----
- EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp
-index 56c655dc..2750f5a6 100644
---- a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp
-+++ b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp
-@@ -1013,14 +1013,8 @@ void Logger::OpenLogfile(std::string filename)
- file_.open(filename.c_str());
- if (file_.fail())
- {
-- const char* filename_tmp = std::tmpnam(NULL);
-- printf("Cannot open log file: %s in working directory. Trying system tmp-file: %s\n",
-- SE_Env::Inst().GetLogFilePath().c_str(), filename_tmp);
-- file_.open(filename_tmp);
-- if (file_.fail())
-- {
-- printf("Also failed to open log file: %s. Continue without logfile, still logging to console.\n", filename_tmp);
-- }
-+ printf("Cannot open log file: %s in working directory. Continuing without logfile, still logging to console.\n",
-+ filename.c_str());
- }
- }
- #endif
---
-2.38.1
-
diff --git a/gnu/packages/patches/esmini-use-pkgconfig.patch b/gnu/packages/patches/esmini-use-pkgconfig.patch
index 73e1b50015..7f7dafbc55 100644
--- a/gnu/packages/patches/esmini-use-pkgconfig.patch
+++ b/gnu/packages/patches/esmini-use-pkgconfig.patch
@@ -1,461 +1,153 @@
Find dependencies via pkg-config.
---
- CMakeLists.txt | 16 +-
- .../Applications/esmini-dyn/CMakeLists.txt | 5 +-
- .../Applications/esmini/CMakeLists.txt | 1 +
- EnvironmentSimulator/CMakeLists.txt | 296 +-----------------
- .../Modules/Controllers/ControllerSumo.cpp | 1 -
- .../Modules/RoadManager/CMakeLists.txt | 8 +-
- .../Modules/ScenarioEngine/CMakeLists.txt | 15 +-
- 7 files changed, 23 insertions(+), 319 deletions(-)
+ CMakeLists.txt | 72 +++----------------
+ .../Applications/esmini/main.cpp | 2 +
+ EnvironmentSimulator/CMakeLists.txt | 3 -
+ .../Modules/Controllers/ControllerSumo.cpp | 1 -
+ .../Modules/RoadManager/CMakeLists.txt | 7 +-
+ .../Modules/ScenarioEngine/CMakeLists.txt | 17 +----
+ 6 files changed, 16 insertions(+), 86 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 156d9448..10ec48f9 100644
+index aec4cf55..c9689b44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -8,6 +8,7 @@ else()
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
+@@ -13,6 +13,8 @@ else()
+ FATAL_ERROR)
endif()
+include(FindPkgConfig)
++
+ # ############################# Project generate options ###########################################################
- project (EnvironmentSimulator)
-
-@@ -33,15 +34,10 @@ else ()
- set (LINUX false)
- endif ()
+ project(
+@@ -138,75 +140,26 @@ set_special_build_flags()
+ include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/utils/get_subdirectories.cmake)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/utils/set_folder.cmake)
--if (LINUX OR APPLE OR MINGW OR MSVC)
-- set(INSTALL_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin")
--else ()
-- message(FATAL_ERROR "Unrecognized platform therefore there isn't an installation directory. Stopping the cmake process.")
--endif ()
+-# ############################### Downloading cloud packages #########################################################
-
- set(INSTALL_DIRECTORY_CODE_EXAMPLES "${CMAKE_HOME_DIRECTORY}/code-examples-bin")
-
--set(PUGIXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/pugixml")
-+find_package(pugixml)
-+
- set(EXPR_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/expr")
- if(MSVC)
- set(DIRENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/dirent/win")
-@@ -61,10 +57,14 @@ set(ENABLE_SANITIZERS False CACHE BOOL "Enable sanitizers (Only valid for Linux
+-include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/cloud/set_cloud_links.cmake)
+-set_cloud_links()
+-
+-include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/cloud/download.cmake)
+-
+-message(STATUS "Downloading dependencies...")
+-
+-download(
+- osg
+- ${EXTERNALS_OSG_PATH}
+- ${EXTERNALS_OSG_OS_SPECIFIC_PATH}
+- "${OSG_PACKAGE_URL}")
+-
+-download(
+- osi
+- ${EXTERNALS_OSI_PATH}
+- ${EXTERNALS_OSI_OS_SPECIFIC_PATH}
+- "${OSI_PACKAGE_URL}")
+-
+-download(
+- sumo
+- ${EXTERNALS_SUMO_PATH}
+- ${EXTERNALS_SUMO_OS_SPECIFIC_PATH}
+- "${SUMO_PACKAGE_URL}")
+-
+-download(
+- implot
+- ${EXTERNALS_IMPLOT_PATH}
+- ${EXTERNALS_IMPLOT_OS_SPECIFIC_PATH}
+- "${IMPLOT_PACKAGE_URL}")
+-
+-download(
+- models
+- ${RESOURCES_PATH}
+- ${MODELS_PATH}
+- "${MODELS_PACKAGE_URL}")
+-
+-if(NOT
+- (APPLE
+- OR MINGW))
+- download(
+- googletest
+- ${EXTERNALS_GOOGLETEST_PATH}
+- ${EXTERNALS_GOOGLETEST_OS_SPECIFIC_PATH}
+- ${GTEST_PACKAGE_URL})
+-endif()
+-
+ # ############################### Loading external packages ##########################################################
+ if(USE_GTEST)
+- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/gtest.cmake)
+- set_gtest_libs()
++ find_package(GTest REQUIRED)
+ endif()
- if (USE_OSG)
+ if(USE_OSG)
+- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/osg.cmake)
+- set_osg_libs()
+ pkg_check_modules(OSG REQUIRED openscenegraph osgdb_jpeg osgdb_osg
+ osgdb_serializers_osg
+ osgdb_serializers_osgsim)
- add_definitions(-D_USE_OSG)
- endif (USE_OSG)
-
- if (USE_OSI)
-+ find_package(open_simulation_interface REQUIRED)
- add_definitions(-D_USE_OSI)
- endif (USE_OSI)
+ endif()
-@@ -73,6 +73,7 @@ if (USE_SUMO)
- endif (USE_SUMO)
+ if(USE_OSI)
+- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/osi.cmake)
+- set_osi_libs()
++ find_package(open_simulation_interface REQUIRED)
++ set(EXTERNALS_OSI_INCLUDES "${OPEN_SIMULATION_INTERFACE_INCLUDE_DIRS}")
++ set(OSI_LIBRARIES open_simulation_interface::open_simulation_interface)
+ endif()
- if (USE_GTEST)
-+ find_package(GTest REQUIRED)
- add_definitions(-D_USE_GTEST)
- endif (USE_GTEST)
+ if(USE_SUMO)
+- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/sumo.cmake)
+- set_sumo_libs()
++ set ( SUMO_LIBRARIES sumocpp tracicpp )
+ endif()
-@@ -90,5 +91,4 @@ if( NOT EXISTS "test/OSC-ALKS-scenarios/.git" )
+ if(USE_IMPLOT)
+@@ -229,10 +182,7 @@ if(NOT
endif()
# Add variables to global scope, e.g. when esmini is used as submodule
--set(PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR} CACHE INTERNAL "")
- set(EXPR_INCLUDE_DIR ${EXPR_INCLUDE_DIR} CACHE INTERNAL "")
-diff --git a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt
-index 83d89420..e15062d3 100644
---- a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt
-+++ b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt
-@@ -1,7 +1,7 @@
-
- include_directories (
- ${SCENARIOENGINE_DLL_INCLUDE_DIR}
-- ${COMMON_MINI_INCLUDE_DIR}
-+ ${COMMON_MINI_INCLUDE_DIR}
- ${OSI_INCLUDE_DIR}
- )
-
-@@ -19,11 +19,12 @@ link_directories( ${OSI_DIR}/lib )
- add_executable ( ${TARGET} ${SOURCES} ${INCLUDES} )
-
-
--target_link_libraries (
-+target_link_libraries (
- ${TARGET}
- esminiLib
- CommonMini
- ${TIME_LIB}
-+ pugixml::pugixml
- project_options
- )
-
-diff --git a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt
-index 6890c26a..a088ebdc 100644
---- a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt
-+++ b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt
-@@ -44,6 +44,7 @@ target_link_libraries (
- ${sumo_libs}
- ${TIME_LIB}
- ${SOCK_LIB}
-+ pugixml::pugixml
- project_options
- )
+-set(EXTERNALS_PUGIXML_PATH
+- ${EXTERNALS_PUGIXML_PATH}
+- CACHE INTERNAL
+- "")
++find_package(pugixml)
+ set(EXTERNALS_EXPR_PATH
+ ${EXTERNALS_EXPR_PATH}
+ CACHE INTERNAL
+diff --git a/EnvironmentSimulator/Applications/esmini/main.cpp b/EnvironmentSimulator/Applications/esmini/main.cpp
+index 84f38c7f..943c42c8 100644
+--- a/EnvironmentSimulator/Applications/esmini/main.cpp
++++ b/EnvironmentSimulator/Applications/esmini/main.cpp
+@@ -13,7 +13,9 @@
+ #include "playerbase.hpp"
+ #include "CommonMini.cpp"
+ #include "OSCParameterDistribution.hpp"
++#if _USE_IMPLOT
+ #include "Plot.hpp"
++#endif
+ #include <osgViewer/ViewerEventHandlers>
+ #include <signal.h>
diff --git a/EnvironmentSimulator/CMakeLists.txt b/EnvironmentSimulator/CMakeLists.txt
-index 157e8fe0..e771231a 100644
+index 87e1dd98..3db513a0 100644
--- a/EnvironmentSimulator/CMakeLists.txt
+++ b/EnvironmentSimulator/CMakeLists.txt
-@@ -1,7 +1,3 @@
--
--set ( FILE_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day)
--set ( MODEL_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day)
--
- set ( VIEWER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/ViewerBase" )
- set ( PLAYER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlayerBase" )
- set ( ROADMANAGER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/RoadManager" )
-@@ -17,88 +13,12 @@ set ( CONTROLLERS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/Controllers")
-
- # OpenSceneGraph package adapted for this project
- set ( OSG_VERSION "osg161" )
--set ( OSG_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OpenSceneGraph" )
--set ( OSI_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OSI" )
--set ( SUMO_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/SUMO" )
-
- # GoogleTest package
- set ( GTEST_VERSION "1.10.1" )
--set ( GTEST_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/googletest" )
-
- set( CMAKE_VERBOSE_MAKEFILE true )
-
--if ( ${FILE_STORAGE} STREQUAL "dropbox" )
-- if (APPLE)
-- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/d0czj6b89p9jyvv/OpenSceneGraph_mac.7z?dl=1 )
-- set ( OSI_PACKAGE_URL https://www.dropbox.com/s/m62v19gp0m73dte/osi_mac.7z?dl=1 )
-- set ( SUMO_PACKAGE_URL https://www.dropbox.com/s/0x8kwztk7nmacs1/sumo_mac.7z?dl=1 )
-- elseif (LINUX)
-- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/4ug0gmkgdavzyb4/osg_linux_glibc_2_31_gcc_7_5_0.7z?dl=1 )
-- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/kwtdg0c1c8pawa1/osi_linux.7z?dl=1 )
-- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/gfwtqd3gf76f86a/sumo_linux.7z?dl=1 )
-- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/si7jsjjsy5bpoym/googletest_linux.7z?dl=1 )
-- elseif (MSVC)
-- set ( OSG_PACKAGE_URL https://dl.dropboxusercontent.com/s/e95hnoo782p40uc/OpenSceneGraph_v10.7z?dl=1 )
-- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/an58ckp2qfx5069/osi_v10.7z?dl=1 )
-- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/5jtpnnd61wonxuh/sumo_v10.7z?dl=1 )
-- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/aaiehwzc6woqbc6/googletest_v10.7z?dl=1 )
-- elseif (MINGW)
-- message("MinGW, enforcing slimmed esmini")
-- else ()
-- message ("Unsupported configuration")
-- endif ()
--elseif ( ${FILE_STORAGE} STREQUAL "google" )
-- if (APPLE)
-- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1mfn_vrcXBoFBekR_t8RXTWB4sD59JD7p&export=download )
-- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1UVzO8cPQaDU9KVn9v2v8Suj0uUw1dzYI&export=download )
-- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1FAve0-MlJPv6lUZy0HvriZI7xstLAzvX&export=download )
-- elseif (LINUX)
-- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Ya1bLp_0-qqlhs67WAwbGW7l37wqP3o2&export=download )
-- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Q8O9YciIC0BPEszIKtQ2UW9KcVRZS4iB&export=download )
-- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1m4znxNIXapP0D-l21oIm2l7L5ti-JbZH&export=download )
-- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Hyr9eJX2GmgpYwZhx14xOoXlZ2j-FY_p&export=download )
-- elseif (MSVC)
-- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1RTag0aUn_pJPK697j0-E72ABW10wZvOm&export=download )
-- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1pcQcVHUESOk2Wmi-zUA7uzdxxE6iwRJx&export=download )
-- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=18PhbSLyvs0IGWTAY3YBoYzpVnMFPbOuR&export=download )
-- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1So-3gtrmEdW9RhEvVQisj1QFksHM_otU&export=download )
-- elseif (MINGW)
-- message("MinGW, enforcing slimmed esmini")
-- else ()
-- message ("Unsupported configuration")
-- endif ()
--elseif ( ${FILE_STORAGE} STREQUAL "esmini" )
-- if (APPLE)
-- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_mac.7z )
-- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_mac.7z )
-- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_mac.7z )
-- elseif (LINUX)
-- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osg_linux_glibc_2_31_gcc_7_5_0.7z )
-- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_linux.7z )
-- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_linux.7z )
-- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_linux.7z )
-- elseif (MSVC)
-- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_v10.7z )
-- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_v10.7z )
-- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_v10.7z )
-- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_v10.7z )
-- elseif (MINGW)
-- message("MinGW, enforcing slimmed esmini")
-- else ()
-- message ("Unsupported configuration")
-- endif ()
--else ()
-- Message("Unknown storage type: " ${FILE_STORAGE})
--endif()
--
--if ( ${MODEL_STORAGE} STREQUAL "dropbox" )
-- set ( MODELS_PACKAGE_URL https://dl.dropboxusercontent.com/s/5gk8bvgzqiaaoco/models.7z?dl=0 )
--elseif ( ${MODEL_STORAGE} STREQUAL "google" )
-- set ( MODELS_PACKAGE_URL https://drive.google.com/u/1/uc?id=1c3cqRzwY41gWXbg0rmugQkL5I_5L6DH_&export=download )
--elseif ( ${MODEL_STORAGE} STREQUAL "esmini" )
-- set ( MODELS_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD779364751/models/models.7z )
--endif()
--
- if (APPLE)
- set ( EXT_DIR_NAME "mac" )
- set ( TIME_LIB "" )
-@@ -127,21 +47,8 @@ set ( OSI_DIR "${OSI_BASE_DIR}/${EXT_DIR_NAME}" )
- set ( SUMO_DIR "${SUMO_BASE_DIR}/${EXT_DIR_NAME}" )
- set ( GTEST_DIR "${GTEST_BASE_DIR}/${EXT_DIR_NAME}" )
-
--set ( OSG_INCLUDE_DIR
-- "${OSG_DIR}/build/include"
-- "${OSG_DIR}/include"
--)
--set ( OSG_LIBRARIES_PATH
-- "${OSG_DIR}/lib"
-- "${OSG_DIR}/lib/osgPlugins-3.6.5"
--)
--
- set ( OSI_INCLUDE_DIR "${OSI_DIR}/include" )
--if (DYN_PROTOBUF)
-- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib-dyn" )
--else ()
-- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" )
--endif (DYN_PROTOBUF)
-+set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" )
-
- set ( SUMO_INCLUDE_DIR "${SUMO_DIR}/include" )
- set ( SUMO_LIBRARIES_PATH "${SUMO_DIR}/lib" )
-@@ -153,74 +60,6 @@ link_directories(${OSG_LIBRARIES_PATH} ${OSI_LIBRARIES_PATH} ${SUMO_LIBRARIES_PA
-
- if(APPLE)
- SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -std=c++14 -pthread -fPIC -flto -DGL_SILENCE_DEPRECATION -Wl,-dead_strip")
--
-- set ( OSG_LIBRARIES
-- osg
-- osgViewer
-- osgDB
-- osgdb_serializers_osgsim
-- osgdb_serializers_osg
-- osgGA
-- osgText
-- osgSim
-- osgdb_osg
-- osgdb_jpeg
-- osgUtil
-- osgAnimation
-- osg
-- OpenThreads
-- jpeg
-- "-framework OpenGL"
-- "-framework Cocoa"
-- dl
-- z
-- )
--
-- if (DYN_PROTOBUF)
-- set ( OSI_LIBRARIES
-- open_simulation_interface
-- protobuf
-- )
-- else ()
-- set ( OSI_LIBRARIES
-- open_simulation_interface_pic
-- protobuf
-- )
-- endif (DYN_PROTOBUF)
--
--
-- set ( SUMO_LIBRARIES
-- optimized libsumostatic debug libsumostaticd
-- optimized netload debug netloadd
-- optimized traciserver debug traciserverd
-- optimized libsumostatic debug libsumostaticd
-- optimized utils_vehicle debug utils_vehicled
-- optimized utils_distribution debug utils_distributiond
-- optimized utils_shapes debug utils_shapesd
-- optimized utils_options debug utils_optionsd
-- optimized utils_xml debug utils_xmld
-- optimized utils_geom debug utils_geomd
-- optimized utils_common debug utils_commond
-- optimized utils_iodevices debug utils_iodevicesd
-- optimized utils_traction_wire debug utils_traction_wired
-- optimized utils_emissions debug utils_emissionsd
-- optimized microsim_engine debug microsim_engined
-- optimized microsim_lcmodels debug microsim_lcmodelsd
-- optimized microsim_devices debug microsim_devicesd
-- optimized microsim_trigger debug microsim_triggerd
-- optimized microsim_output debug microsim_outputd
-- optimized microsim_transportables debug microsim_transportablesd
-- optimized microsim_actions debug microsim_actionsd
-- optimized microsim_traffic_lights debug microsim_traffic_lightsd
-- optimized microsim debug microsimd
-- optimized mesosim debug mesosimd
-- optimized foreign_phemlight debug foreign_phemlightd
-- optimized foreign_tcpip debug foreign_tcpipd
-- optimized microsim_cfmodels debug microsim_cfmodelsd
-- optimized zlibstatic debug zlibstaticd
-- optimized xerces-c_3 debug xerces-c_3D
-- "-framework CoreServices"
-- )
-
- elseif(LINUX)
-
-@@ -251,82 +90,8 @@ elseif(LINUX)
- SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -pthread -fPIC -Wl,-strip-all")
- endif()
-
-- set ( OSG_LIBRARIES
-- optimized osg debug osgd
-- optimized osgViewer debug osgViewerd
-- optimized osgDB debug osgDBd
-- optimized osgdb_serializers_osgsim debug osgdb_serializers_osgsimd
-- optimized osgdb_serializers_osg debug osgdb_serializers_osgd
-- optimized osgGA debug osgGAd
-- optimized osgText debug osgTextd
-- optimized osgSim debug osgSimd
-- optimized osgdb_osg debug osgdb_osgd
-- optimized osgdb_jpeg debug osgdb_jpegd
-- optimized osgUtil debug osgUtild
-- optimized osgAnimation debug osgAnimationd
-- optimized osg debug osgd
-- optimized OpenThreads debug OpenThreadsd
-- optimized jpeg debug jpegd
--
-- GL
-- X11
-- Xrandr
-- dl
-- z
-- Xinerama
-- fontconfig
-- )
--
-- if (DYN_PROTOBUF)
-- set ( OSI_LIBRARIES
-- optimized open_simulation_interface debug open_simulation_interfaced
-- optimized protobuf debug protobufd
-- )
-- else ()
-- set ( OSI_LIBRARIES
-- optimized open_simulation_interface_pic debug open_simulation_interface_picd
-- optimized protobuf debug protobufd
-- )
-- endif (DYN_PROTOBUF)
--
-- set ( SUMO_LIBRARIES
-- optimized libsumostatic debug libsumostaticd
-- optimized netload debug netloadd
-- optimized traciserver debug traciserverd
-- optimized libsumostatic debug libsumostaticd
-- optimized utils_vehicle debug utils_vehicled
-- optimized utils_distribution debug utils_distributiond
-- optimized utils_shapes debug utils_shapesd
-- optimized utils_options debug utils_optionsd
-- optimized utils_xml debug utils_xmld
-- optimized utils_geom debug utils_geomd
-- optimized utils_common debug utils_commond
-- optimized utils_iodevices debug utils_iodevicesd
-- optimized utils_traction_wire debug utils_traction_wired
-- optimized utils_emissions debug utils_emissionsd
-- optimized microsim_engine debug microsim_engined
-- optimized microsim_lcmodels debug microsim_lcmodelsd
-- optimized microsim_devices debug microsim_devicesd
-- optimized microsim_trigger debug microsim_triggerd
-- optimized microsim_output debug microsim_outputd
-- optimized microsim_transportables debug microsim_transportablesd
-- optimized microsim_actions debug microsim_actionsd
-- optimized microsim_traffic_lights debug microsim_traffic_lightsd
-- optimized microsim debug microsimd
-- optimized mesosim debug mesosimd
-- optimized foreign_phemlight debug foreign_phemlightd
-- optimized foreign_tcpip debug foreign_tcpipd
-- optimized microsim_cfmodels debug microsim_cfmodelsd
-- optimized zlibstatic debug zlibstaticd
-- optimized xerces-c_3 debug xerces-c_3D
-- )
--
-- set (GTEST_LIBRARIES
-- optimized gmock debug gmockd
-- optimized gmock_main debug gmock_maind
-- optimized gtest debug gtestd
-- optimized gtest_main debug gtest_maind
-- )
-+ set ( OSI_LIBRARIES open_simulation_interface::open_simulation_interface )
-+ set ( SUMO_LIBRARIES sumocpp tracicpp )
-
- elseif(MSVC)
-
-@@ -510,61 +275,6 @@ FOREACH(subdir ${SUBDIRS})
- endif ()
- ENDFOREACH()
-
--
--#
--# Download library and content binary packets
--#
--
--function (download_and_extract url target_folder target_filename)
-- message (STATUS "downloading ${target_filename} ...")
-- file (DOWNLOAD ${url} ${target_folder}/${target_filename} STATUS DOWNLOAD_STATUS)
--
-- if(DOWNLOAD_STATUS AND NOT DOWNLOAD_STATUS EQUAL 0)
-- message(FATAL_ERROR "FAILED to download ${target_filename} (Status: ${DOWNLOAD_STATUS})")
-- endif()
--
-- execute_process (COMMAND sleep 1) # allow for file to be completely flushed
--
-- message (STATUS "extracting ${target_filename} ... ")
-- execute_process (COMMAND ${CMAKE_COMMAND} -E tar xfz ${target_filename} WORKING_DIRECTORY ${target_folder} RESULT_VARIABLE STATUS)
--
-- if(STATUS AND NOT STATUS EQUAL 0)
-- message(FATAL_ERROR "FAILED to unpack ${target_filename}")
-- endif()
--
-- file (REMOVE ${target_folder}/${target_filename})
--endfunction (download_and_extract)
--
--# download OpenSceneGraph
--set ( OSG_PACKAGE_FILENAME "osg.7z" )
--if (DEFINED OSG_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSG_DIR} ))
-- download_and_extract( ${OSG_PACKAGE_URL} ${OSG_BASE_DIR} ${OSG_PACKAGE_FILENAME} )
--endif()
--
--# download OSI
--set ( OSI_PACKAGE_FILENAME "osi.7z" )
--if (DEFINED OSI_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSI_DIR} ))
-- download_and_extract( ${OSI_PACKAGE_URL} ${OSI_BASE_DIR} ${OSI_PACKAGE_FILENAME} )
--endif()
--
--# download SUMO
--set ( SUMO_PACKAGE_FILENAME "sumo.7z" )
--if (DEFINED SUMO_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${SUMO_DIR} ))
-- download_and_extract( ${SUMO_PACKAGE_URL} ${SUMO_BASE_DIR} ${SUMO_PACKAGE_FILENAME} )
--endif()
--
--# download googletest
--if(NOT (APPLE OR MINGW)) # not available for Mac yet
-- set ( GTEST_PACKAGE_FILENAME "googletest.7z" )
-- if (DEFINED GTEST_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${GTEST_DIR} ))
-- download_and_extract( ${GTEST_PACKAGE_URL} ${GTEST_BASE_DIR} ${GTEST_PACKAGE_FILENAME} )
-- endif()
--endif()
--
--if (DEFINED MODELS_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${MODELS_DIR} ))
-- download_and_extract(${MODELS_PACKAGE_URL} ${MODELS_BASE_DIR} ${MODELS_PACKAGE_FILENAME})
--endif()
--
- add_subdirectory(Applications/odrplot)
- add_subdirectory(Applications/replayer)
-
+@@ -57,9 +57,6 @@ set_folder(
+ set_folder(
+ ScenarioEngine
+ ${ModulesFolder})
+-set_folder(
+- Externals
+- ${ModulesFolder})
+ set_folder(
+ RoadManager
+ ${ModulesFolder})
diff --git a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp
-index 4c701d94..cb5de5bb 100644
+index 92b40c90..764d2d3b 100644
--- a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp
+++ b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp
@@ -16,7 +16,6 @@
@@ -467,75 +159,95 @@ index 4c701d94..cb5de5bb 100644
#include <libsumo/Vehicle.h>
#include <libsumo/TraCIDefs.h>
diff --git a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt
-index e4fad5f1..32d7a79c 100644
+index afb77338..b8beba48 100644
--- a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt
+++ b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt
-@@ -2,7 +2,7 @@
- include_directories (
- ${PUGIXML_INCLUDE_DIR}
- ${COMMON_MINI_INCLUDE_DIR}
-- ${ROADMANAGER_INCLUDE_DIR}
-+ ${ROADMANAGER_INCLUDE_DIR}
+@@ -20,9 +20,6 @@ set(SOURCES
+ odrSpiral.cpp
+ LaneIndependentRouter.cpp)
+
+-set(SRC_ADDITIONAL
+- ${EXTERNALS_PUGIXML_PATH}/pugixml.cpp)
+-
+ source_group(
+ "External Libraries"
+ FILES ${SRC_ADDITIONAL})
+@@ -44,6 +41,7 @@ add_library(
+ target_link_libraries(
+ ${TARGET}
+ PRIVATE CommonMini
++ pugixml
+ # project_options
)
- set ( SOURCES
-@@ -11,8 +11,6 @@ set ( SOURCES
- LaneIndependentRouter.cpp
- )
-
--set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp)
--
- SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL})
+@@ -54,8 +52,7 @@ target_include_directories(
+ target_include_directories(
+ ${TARGET}
+ SYSTEM
+- PUBLIC ${EXTERNALS_PUGIXML_PATH}
+- ${ROAD_MANAGER_PATH})
++ PUBLIC ${ROAD_MANAGER_PATH})
- set ( INCLUDES
-@@ -25,6 +23,6 @@ if(MSVC)
- add_definitions("/wd4482")
- endif()
-
--add_library ( RoadManager STATIC ${SOURCES} ${SRC_ADDITIONAL} ${INCLUDES} )
-+add_library ( RoadManager STATIC ${SOURCES} ${INCLUDES} )
-
--target_link_libraries ( RoadManager CommonMini project_options)
-\ No newline at end of file
-+target_link_libraries ( RoadManager CommonMini pugixml::pugixml project_options)
+ disable_static_analysis(${TARGET})
+ disable_iwyu(${TARGET})
diff --git a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt
-index aec86ad6..86da77c1 100644
+index 5089dfc1..4b95a071 100644
--- a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt
+++ b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt
-@@ -5,7 +5,7 @@ include_directories (
- ${ROADMANAGER_INCLUDE_DIR}
- ${COMMON_MINI_INCLUDE_DIR}
- ${CONTROLLERS_INCLUDE_DIR}
-- ${REPLAY_INCLUDE_DIR}
-+ ${REPLAY_INCLUDE_DIR}
- ${RDB_INCLUDE_DIR}
- ${OSI_INCLUDE_DIR}
- ${SUMO_INCLUDE_DIR}
-@@ -20,20 +20,15 @@ if (NOT USE_OSI)
- list(REMOVE_ITEM SRC_SOURCEFILES "${CMAKE_CURRENT_LIST_DIR}/SourceFiles/OSIReporter.cpp")
- endif (NOT USE_OSI)
-
--set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp )
--
- SOURCE_GROUP(OSCTypeDefs FILES ${SRC_OSCTYPEDEFS})
- SOURCE_GROUP("Source Files" FILES ${SRC_SOURCEFILES})
- SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL})
-
--add_library ( ScenarioEngine STATIC
-- ${SRC_OSCTYPEDEFS}
-- ${SRC_SOURCEFILES}
-- ${SRC_ADDITIONAL}
-+add_library ( ScenarioEngine STATIC
-+ ${SRC_OSCTYPEDEFS}
-+ ${SRC_SOURCEFILES}
- )
-
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-
--target_link_libraries(ScenarioEngine PRIVATE project_options)
--
--
-+target_link_libraries(ScenarioEngine PRIVATE pugixml::pugixml project_options)
+@@ -3,9 +3,6 @@
+ set(TARGET
+ ScenarioEngine)
+
+-set(EXTERNAL_TARGET
+- Externals)
+-
+ # ############################### Loading desired rules ##############################################################
+
+ include(${CMAKE_SOURCE_DIR}/support/cmake/rule/disable_static_analysis.cmake)
+@@ -40,26 +37,15 @@ endif(
+ NOT
+ USE_OSI)
+
+-set(SRC_ADDITIONAL
+- ${EXTERNALS_PUGIXML_PATH}/pugixml.cpp)
+-
+ source_group(
+ OSCTypeDefs
+ FILES ${SRC_OSCTYPEDEFS})
+ source_group(
+ "Source Files"
+ FILES ${SRC_SOURCEFILES})
+-source_group(
+- "External Libraries"
+- FILES ${SRC_ADDITIONAL})
+
+ # ############################### Creating library ###################################################################
+
+-add_library(
+- ${EXTERNAL_TARGET}
+- STATIC
+- ${SRC_ADDITIONAL})
+-
+ add_library(
+ ${TARGET}
+ STATIC
+@@ -68,7 +54,7 @@ add_library(
+
+ target_link_libraries(
+ ${TARGET}
+- PRIVATE project_options)
++ PRIVATE project_options pugixml)
+
+ target_include_directories(
+ ${TARGET}
+@@ -84,7 +70,6 @@ target_include_directories(
+ PUBLIC ${ROAD_MANAGER_PATH}
+ ${EXTERNALS_OSI_INCLUDES}
+ ${EXTERNALS_SUMO_INCLUDES}
+- ${EXTERNALS_PUGIXML_PATH}
+ ${EXTERNALS_EXPR_PATH})
+
+ target_link_libraries(
--
-2.38.1
+2.45.1
diff --git a/gnu/packages/patches/falcosecurity-libs-install-pman.patch b/gnu/packages/patches/falcosecurity-libs-install-pman.patch
new file mode 100644
index 0000000000..38dcc0c4b8
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-install-pman.patch
@@ -0,0 +1,14 @@
+Install the pman library and its header.
+Upstream status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/userspace/libpman/CMakeLists.txt b/userspace/libpman/CMakeLists.txt
+index da92e9f27..4b57365fe 100644
+--- a/userspace/libpman/CMakeLists.txt
++++ b/userspace/libpman/CMakeLists.txt
+@@ -58,3 +58,6 @@ endif()
+ if(USE_BUNDLED_LIBBPF)
+ add_dependencies(pman libbpf)
+ endif()
++
++install(TARGETS pman LIBRARY ARCHIVE FRAMEWORK)
++install(FILES include/libpman.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch b/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
new file mode 100644
index 0000000000..ff650942ff
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
@@ -0,0 +1,16 @@
+libscap: Guard against install_lib_link_libraries-NOTFOUND.
+Upstream status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake
+index 81ad2d28d..8b6b4197e 100644
+--- a/cmake/modules/libscap.cmake
++++ b/cmake/modules/libscap.cmake
+@@ -95,7 +95,7 @@ foreach(libscap_install_lib ${LIBSCAP_INSTALL_LIBS})
+ list(APPEND libscap_link_libraries ${libscap_install_lib})
+ get_target_property(install_lib_link_libraries ${libscap_install_lib} LINK_LIBRARIES)
+ foreach (install_lib_link_library ${install_lib_link_libraries})
+- if (NOT ${install_lib_link_library} IN_LIST libscap_subdir_targets)
++ if (${install_lib_link_library} AND (NOT ${install_lib_link_library} IN_LIST libscap_subdir_targets))
+ if(${install_lib_link_library} MATCHES "/")
+ # We have a path. Convert it to -L<dir> + -l<lib>.
+ get_filename_component(scap_lib_dir ${install_lib_link_library} DIRECTORY)
diff --git a/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch b/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
new file mode 100644
index 0000000000..b2d38e42e0
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
@@ -0,0 +1,155 @@
+libsinsp: Refine pkg-config file generation.
+Upstream status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
+index c5948489f..829bcd19b 100644
+--- a/userspace/libscap/libscap.pc.in
++++ b/userspace/libscap/libscap.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+@@ -6,5 +6,6 @@ Name: libscap
+ Description: lib for System CAPture
+ Version: @FALCOSECURITY_LIBS_VERSION@
+
+-Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
++Requires: zlib
++Libs: -L${libdir} -L{libdir}/@LIBS_PACKAGE_NAME@/libscap @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
+ Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ -I@UTHASH_INCLUDE@
+diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
+index 6104603e8..832f86067 100644
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
+@@ -169,13 +169,9 @@ target_link_libraries(sinsp
+ "${RE2_LIB}"
+ )
+
+-set(SINSP_PKGCONFIG_LIBRARIES
+- scap
+- "${ZLIB_LIB}"
+- "${CURL_LIBRARIES}"
+- "${JSONCPP_LIB}"
+- "${RE2_LIB}"
+-)
++set(SINSP_PKGCONFIG_LIBRARIES)
++set(SINSP_PKGCONFIG_REQUIRES jsoncpp)
++set(SINSP_PKGCONFIG_REQUIRES_PRIVATE libcurl re2)
+
+ if(NOT EMSCRIPTEN)
+ target_link_libraries(sinsp
+@@ -184,7 +180,8 @@ if(NOT EMSCRIPTEN)
+ PRIVATE
+ "${TBB_LIB}"
+ )
+- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${CARES_LIB}")
++ list(APPEND SINSP_PKGCONFIG_REQUIRES libcares)
++ list(APPEND SINSP_PKGCONFIG_REQUIRES_PRIVATE tbb)
+ endif()
+
+ if(USE_BUNDLED_VALIJSON)
+@@ -248,14 +245,12 @@ if(NOT WIN32)
+ "${PROTOBUF_LIB}"
+ "${CARES_LIB}"
+ )
+- list(APPEND SINSP_PKGCONFIG_LIBRARIES
+- "${GRPC_LIBRARIES}"
+- "${GRPCPP_LIB}"
+- "${GRPC_LIB}"
+- "${GPR_LIB}"
+- "${PROTOBUF_LIB}"
+- "${CARES_LIB}"
+- )
++ list(APPEND SINSP_PKGCONFIG_REQUIRES
++ gpr
++ grpc
++ grpc++
++ protobuf
++ libcares)
+
+ if(NOT MUSL_OPTIMIZED_BUILD)
+ target_link_libraries(sinsp INTERFACE rt anl)
+@@ -269,7 +264,7 @@ if(NOT WIN32)
+ endif() # NOT APPLE
+
+ target_link_libraries(sinsp INTERFACE "${OPENSSL_LIBRARIES}")
+- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${OPENSSL_LIBRARIES}")
++ list(APPEND SINSP_PKGCONFIG_REQUIRES libcrypto libssl)
+
+ target_link_libraries(sinsp INTERFACE dl pthread)
+ list(APPEND SINSP_PKGCONFIG_LIBRARIES dl pthread)
+@@ -306,41 +301,17 @@ if(NOT DEFINED SINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR)
+ endif()
+ add_definitions(-DSINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR="${SINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR}")
+
+-# Build our pkg-config "Libs:" flags. For now, loop over SINSP_PKGCONFIG_LIBRARIES. If
+-# we ever start using pkg_search_module or pkg_check_modules in cmake/modules
+-# we could add each module to our "Requires:" line instead. We might need to
+-# expand this to use some of the techniques in
+-# https://github.com/curl/curl/blob/curl-7_84_0/CMakeLists.txt#L1539
+-set(SINSP_PKG_CONFIG_LIBS)
+-set(SINSP_PKG_CONFIG_LIBDIRS "")
+-foreach(sinsp_lib ${SINSP_PKGCONFIG_LIBRARIES})
+- if(${sinsp_lib} MATCHES "^-")
+- # We have a flag. Pass it through unchanged.
+- list(APPEND SINSP_PKG_CONFIG_LIBS ${sinsp_lib})
+- elseif(${sinsp_lib} MATCHES "/")
+- # We have a path. Convert it to -L<dir> + -l<lib>.
+- get_filename_component(sinsp_lib_dir ${sinsp_lib} DIRECTORY)
+- list(APPEND SINSP_PKG_CONFIG_LIBDIRS -L${sinsp_lib_dir})
+- get_filename_component(sinsp_lib_base ${sinsp_lib} NAME_WE)
+- string(REGEX REPLACE "^lib" "" sinsp_lib_base ${sinsp_lib_base})
+- list(APPEND SINSP_PKG_CONFIG_LIBS -l${sinsp_lib_base})
+- elseif(${sinsp_lib} STREQUAL "scap")
+- # We require libscap.pc, so skip it.
+- else()
+- # Assume we have a plain library name. Prefix it with "-l".
+- list(APPEND SINSP_PKG_CONFIG_LIBS -l${sinsp_lib})
+- endif()
+-endforeach()
++list(REMOVE_DUPLICATES SINSP_PKGCONFIG_LIBRARIES)
++list(REMOVE_DUPLICATES SINSP_PKGCONFIG_REQUIRES)
++list(REMOVE_DUPLICATES SINSP_PKGCONFIG_REQUIRES_PRIVATE)
+
+-# Build our pkg-config "Cflags:" flags.
+-set(SINSP_PKG_CONFIG_INCLUDES "")
+-foreach(sinsp_include_directory ${LIBSINSP_INCLUDE_DIRS})
+- list(APPEND SINSP_PKG_CONFIG_INCLUDES -I${sinsp_include_directory})
++set(SINSP_LINK_FLAGS)
++foreach(sinsp_link_library ${SINSP_PKGCONFIG_LIBRARIES})
++ list(APPEND SINSP_LINK_FLAGS "-l${sinsp_link_library}")
+ endforeach()
+
+-string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBS "${SINSP_PKG_CONFIG_LIBS}")
+-list(REMOVE_DUPLICATES SINSP_PKG_CONFIG_LIBDIRS)
+-string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBDIRS "${SINSP_PKG_CONFIG_LIBDIRS}")
+-list(REMOVE_DUPLICATES SINSP_PKG_CONFIG_INCLUDES)
+-string(REPLACE ";" " " SINSP_PKG_CONFIG_INCLUDES "${SINSP_PKG_CONFIG_INCLUDES}")
++string(REPLACE ";" " " LIBSINSP_LINK_FLAGS "${SINSP_LINK_FLAGS}")
++string(REPLACE ";" " " LIBSINSP_REQUIRES "${SINSP_PKGCONFIG_REQUIRES}")
++string(REPLACE ";" " " LIBSINSP_REQUIRES_PRIVATE "${SINSP_PKGCONFIG_REQUIRES_PRIVATE}")
++
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libsinsp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libsinsp.pc @ONLY)
+diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
+index 9292e73ce..f20da76b3 100644
+--- a/userspace/libsinsp/libsinsp.pc.in
++++ b/userspace/libsinsp/libsinsp.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+@@ -6,6 +6,7 @@ Name: libsinsp
+ Description: lib for System INSPection
+ Version: @FALCOSECURITY_LIBS_VERSION@
+
+-Requires: libscap
+-Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
+-Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ @SINSP_PKG_CONFIG_INCLUDES@
++Requires: libscap @LIBSINSP_REQUIRES@
++Requires.private: @LIBSINSP_REQUIRES_PRIVATE@
++Libs: -L${libdir} -lsinsp @LIBSINSP_LINK_FLAGS@
++Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@
diff --git a/gnu/packages/patches/falcosecurity-libs-pkg-config.patch b/gnu/packages/patches/falcosecurity-libs-pkg-config.patch
new file mode 100644
index 0000000000..f686cec3f7
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-pkg-config.patch
@@ -0,0 +1,23 @@
+userspace: Extend CFLAGS of libscap.pc and libsinsp.pc.
+Upstream status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
+index 40b6e96ed..c5948489f 100644
+--- a/userspace/libscap/libscap.pc.in
++++ b/userspace/libscap/libscap.pc.in
+@@ -7,4 +7,4 @@ Description: lib for System CAPture
+ Version: @FALCOSECURITY_LIBS_VERSION@
+
+ Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
+-Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap
++Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ -I@UTHASH_INCLUDE@
+diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
+index c1cc4a1e2..9292e73ce 100644
+--- a/userspace/libsinsp/libsinsp.pc.in
++++ b/userspace/libsinsp/libsinsp.pc.in
+@@ -8,4 +8,4 @@ Version: @FALCOSECURITY_LIBS_VERSION@
+
+ Requires: libscap
+ Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
+-Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp @SINSP_PKG_CONFIG_INCLUDES@
++Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ @SINSP_PKG_CONFIG_INCLUDES@
diff --git a/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch b/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch
new file mode 100644
index 0000000000..3334a89516
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch
@@ -0,0 +1,50 @@
+Fix shared library build.
+Upstream status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
+index 80229cc03..70c9ba65b 100644
+--- a/driver/CMakeLists.txt
++++ b/driver/CMakeLists.txt
+@@ -152,6 +152,11 @@ set(DRIVER_SOURCES
+ ppm_consumer.h
+ capture_macro.h
+ socketcall_to_syscall.h
++ syscall_compat_loongarch64.h
++ syscall_compat_ppc64le.h
++ syscall_compat_riscv64.h
++ syscall_compat_s390x.h
++ syscall_compat_x86_64.h
+ syscall_ia32_64_map.c
+ )
+
+diff --git a/test/libscap/CMakeLists.txt b/test/libscap/CMakeLists.txt
+index e88603ebd..fa26ba7ee 100644
+--- a/test/libscap/CMakeLists.txt
++++ b/test/libscap/CMakeLists.txt
+@@ -45,6 +45,7 @@ set(LIBSCAP_TESTS_LIBRARIES
+ "${GTEST_LIB}"
+ "${GTEST_MAIN_LIB}"
+ "${CMAKE_THREAD_LIBS_INIT}"
++ "${PROTOBUF_LIB}"
+ scap
+ )
+
+diff --git a/userspace/libscap/engine/gvisor/CMakeLists.txt b/userspace/libscap/engine/gvisor/CMakeLists.txt
+index 6dfbafb14..875847b5d 100644
+--- a/userspace/libscap/engine/gvisor/CMakeLists.txt
++++ b/userspace/libscap/engine/gvisor/CMakeLists.txt
+@@ -76,6 +76,14 @@ if (BUILD_SHARED_LIBS)
+ add_dependencies(scap_engine_gvisor_o uthash)
+ add_dependencies(scap scap_engine_gvisor_o)
+ target_sources(scap PRIVATE $<TARGET_OBJECTS:scap_engine_gvisor_o>)
++
++ target_include_directories(scap_engine_gvisor_o
++ PRIVATE
++ ${CMAKE_BINARY_DIR}
++ ${CMAKE_CURRENT_BINARY_DIR}
++ ${CMAKE_SOURCE_DIR}
++ ${CMAKE_SOURCE_DIR}/userspace
++ )
+ else()
+ add_library(scap_engine_gvisor
+ ${scap_engine_gvisor_sources}
diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch
new file mode 100644
index 0000000000..456bc3021c
--- /dev/null
+++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch
@@ -0,0 +1,62 @@
+Use the asmjit and cpuinfo packages.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 134523e..b88b0e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,7 +235,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
+ message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
+ message(WARNING "==========")
+
+-if(NOT TARGET asmjit)
++if(FALSE)
+ #Download asmjit from github if ASMJIT_SRC_DIR is not specified.
+ if(NOT DEFINED ASMJIT_SRC_DIR)
+ set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
+@@ -264,7 +264,7 @@ if(NOT TARGET asmjit)
+ endif()
+ endif()
+
+-if(NOT TARGET cpuinfo)
++if(FALSE)
+ #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
+ if(NOT DEFINED CPUINFO_SOURCE_DIR)
+ set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
+@@ -340,9 +340,12 @@ target_include_directories(fbgemm BEFORE
+ target_link_libraries(fbgemm
+ $<BUILD_INTERFACE:asmjit>
+ $<BUILD_INTERFACE:cpuinfo>)
+-add_dependencies(fbgemm
+- asmjit
+- cpuinfo)
++
++find_package(asmjit)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(libcpuinfo REQUIRED IMPORTED_TARGET libcpuinfo)
++
++target_link_libraries(fbgemm asmjit::asmjit PkgConfig::libcpuinfo)
+
+ if(OpenMP_FOUND)
+ target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 2cffddf..bd4d409 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 11)
+ set(CMAKE_C_EXTENSIONS OFF)
+ set(CMAKE_C_STANDARD_REQUIRED ON)
+
+-if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest)
++if(FALSE)
+ #Download Googletest framework from github if
+ #GOOGLETEST_SOURCE_DIR is not specified.
+ if(NOT DEFINED GOOGLETEST_SOURCE_DIR)
+@@ -78,7 +78,7 @@ macro(add_gtest TESTNAME)
+ target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES})
+ endif()
+
+- add_dependencies(${TESTNAME} gtest fbgemm)
++ add_dependencies(${TESTNAME} fbgemm)
+ add_test(${TESTNAME} ${TESTNAME})
+ set_target_properties(${TESTNAME} PROPERTIES FOLDER test)
+ endmacro()
diff --git a/gnu/packages/patches/ffmpeg-4-binutils-2.41.patch b/gnu/packages/patches/ffmpeg-4-binutils-2.41.patch
new file mode 100644
index 0000000000..52a9310029
--- /dev/null
+++ b/gnu/packages/patches/ffmpeg-4-binutils-2.41.patch
@@ -0,0 +1,76 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+--
+2.25.1
+
diff --git a/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch b/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
index f2da4f478f..53b6ad7da2 100644
--- a/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
+++ b/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
@@ -75,7 +75,7 @@ new file mode 100644
index 0000000000..ff9c3468ab
--- /dev/null
+++ b/libavfilter/vsrc_pipewiregrab.c
-@@ -0,0 +1,1373 @@
+@@ -0,0 +1,1375 @@
+/*
+ * PipeWire input grabber (ScreenCast)
+ * Copyright (C) 2024 Savoir-faire Linux, Inc.
@@ -117,6 +117,8 @@ index 0000000000..ff9c3468ab
+#include <sys/mman.h>
+#include <sys/queue.h>
+
++#include "libavfilter/formats.h"
++#include "libavfilter/video.h"
+#include "libavutil/internal.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
diff --git a/gnu/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch b/gnu/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch
new file mode 100644
index 0000000000..3eac98d1f9
--- /dev/null
+++ b/gnu/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch
@@ -0,0 +1,43 @@
+From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <christopher.degawa@intel.com>
+Date: Thu, 20 Oct 2022 22:55:27 -0500
+Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and
+ simplify alloc_buffer
+
+compressed_ten_bit_format has been deprecated upstream and has no effect
+and can be removed. Plus, technically it was never used in the first place
+since it would require the app (ffmpeg) to set it and do additional
+processing of the input frames.
+
+Also simplify alloc_buffer by removing calculations relating to the
+non-existant processing.
+
+Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
+---
+ libavcodec/libsvtav1.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
+index 2f5634cee0241..28da206cf8512 100644
+--- a/libavcodec/libsvtav1.c
++++ b/libavcodec/libsvtav1.c
+@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
+
+ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
+ {
+- const int pack_mode_10bit =
+- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
+- const size_t luma_size_8bit =
+- config->source_width * config->source_height * (1 << pack_mode_10bit);
+- const size_t luma_size_10bit =
+- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
++ const size_t luma_size = config->source_width * config->source_height *
++ (config->encoder_bit_depth > 8 ? 2 : 1);
+
+ EbSvtIOFormat *in_data;
+
+- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
++ svt_enc->raw_size = luma_size * 3 / 2;
+
+ // allocate buffer for in and out
+ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
diff --git a/gnu/packages/patches/file-32bit-time.patch b/gnu/packages/patches/file-32bit-time.patch
new file mode 100644
index 0000000000..671bcfdf66
--- /dev/null
+++ b/gnu/packages/patches/file-32bit-time.patch
@@ -0,0 +1,40 @@
+Upstream uses CVS, this is taken from the Github mirror
+https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch
+https://sources.debian.org/src/file/1%3A5.45-2/debian/patches/1690555105.FILE5_45-1-g218fdf81.deal-with-32-bit-time-t.patch/
+
+From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Fri, 28 Jul 2023 14:38:25 +0000
+Subject: [PATCH] deal with 32 bit time_t
+
+---
+ src/file.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/file.h b/src/file.h
+index 2e0494d2f..78f574ea1 100644
+--- a/src/file.h
++++ b/src/file.h
+@@ -27,7 +27,7 @@
+ */
+ /*
+ * file.h - definitions for file(1) program
+- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $
++ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $
+ */
+
+ #ifndef __file_h__
+@@ -159,9 +159,11 @@
+ /*
+ * Dec 31, 23:59:59 9999
+ * we need to make sure that we don't exceed 9999 because some libc
+- * implementations like muslc crash otherwise
++ * implementations like muslc crash otherwise. If you are unlucky
++ * to be running on a system with a 32 bit time_t, then it is even less.
+ */
+-#define MAX_CTIME CAST(time_t, 0x3afff487cfULL)
++#define MAX_CTIME \
++ CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL)
+
+ #define FILE_BADSIZE CAST(size_t, ~0ul)
+ #define MAXDESC 64 /* max len of text description/MIME type */
diff --git a/gnu/packages/patches/flatpak-fix-fonts-icons.patch b/gnu/packages/patches/flatpak-fix-fonts-icons.patch
new file mode 100644
index 0000000000..5b9d855b2e
--- /dev/null
+++ b/gnu/packages/patches/flatpak-fix-fonts-icons.patch
@@ -0,0 +1,89 @@
+modify from https://github.com/NixOS/nixpkgs/pull/262462
+
+diff --git a/common/flatpak-run.c b/common/flatpak-run.c
+index 94ad013..5c9f55e 100644
+--- a/common/flatpak-run.c
++++ b/common/flatpak-run.c
+@@ -871,6 +871,49 @@ out:
+ return res;
+ }
+
++static void
++get_gnu_closure (GHashTable *closure, const gchar *source_path)
++{
++ if (g_file_test (source_path, G_FILE_TEST_IS_SYMLINK))
++ {
++ g_autofree gchar *path = g_malloc(PATH_MAX);
++ realpath(source_path, path);
++ if (g_str_has_prefix(path, "/gnu/store/"))
++ {
++ *strchr(path + strlen("/gnu/store/"), '/') = 0;
++ g_hash_table_add(closure, g_steal_pointer (&path));
++ }
++ }
++ else if (g_file_test (source_path, G_FILE_TEST_IS_DIR))
++ {
++ g_autoptr(GDir) dir = g_dir_open(source_path, 0, NULL);
++ const gchar *file_name;
++ while ((file_name = g_dir_read_name(dir)))
++ {
++ g_autofree gchar *path = g_build_filename (source_path, file_name, NULL);
++ get_gnu_closure (closure, path);
++ }
++ }
++}
++
++static void
++add_gnu_store_symlink_targets (FlatpakBwrap *bwrap, const gchar *source_path)
++{
++ GHashTable *closure = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
++
++ get_gnu_closure(closure, source_path);
++
++ GHashTableIter iter;
++ gpointer path;
++ g_hash_table_iter_init(&iter, closure);
++ while (g_hash_table_iter_next(&iter, &path, NULL))
++ {
++ flatpak_bwrap_add_args (bwrap, "--ro-bind", path, path, NULL);
++ }
++
++ g_hash_table_destroy(closure);
++}
++
+ static void
+ add_font_path_args (FlatpakBwrap *bwrap)
+ {
+@@ -898,6 +946,18 @@ add_font_path_args (FlatpakBwrap *bwrap)
+ "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n",
+ SYSTEM_FONTS_DIR);
+ }
++ else if (g_file_test ("/run/current-system/profile/share/fonts", G_FILE_TEST_EXISTS))
++ {
++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/fonts");
++ flatpak_bwrap_add_args (bwrap,
++ "--ro-bind",
++ "/run/current-system/profile/share/fonts",
++ "/run/host/fonts",
++ NULL);
++ g_string_append_printf (xml_snippet,
++ "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n",
++ "/run/current-system/profile/share/fonts");
++ }
+
+ if (g_file_test ("/usr/local/share/fonts", G_FILE_TEST_EXISTS))
+ {
+@@ -998,6 +1058,13 @@ add_icon_path_args (FlatpakBwrap *bwrap)
+ "--ro-bind", "/usr/share/icons", "/run/host/share/icons",
+ NULL);
+ }
++ else if (g_file_test ("/run/current-system/profile/share/icons", G_FILE_TEST_IS_DIR))
++ {
++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/icons");
++ flatpak_bwrap_add_args (bwrap,
++ "--ro-bind", "/run/current-system/profile/share/icons", "/run/host/share/icons",
++ NULL);
++ }
+
+ user_icons_path = g_build_filename (g_get_user_data_dir (), "icons", NULL);
+ user_icons = g_file_new_for_path (user_icons_path);
diff --git a/gnu/packages/patches/font-gnu-freefont-python3-compat.patch b/gnu/packages/patches/font-gnu-freefont-python3-compat.patch
new file mode 100644
index 0000000000..3b21d53b0b
--- /dev/null
+++ b/gnu/packages/patches/font-gnu-freefont-python3-compat.patch
@@ -0,0 +1,200 @@
+This patch is based off the following patch from Debian.
+https://sources.debian.org/data/main/f/fonts-freefont/20120503-10/debian/patches/build_python3_syntax.patch
+
+diff --git a/tools/generate/MacTT b/tools/generate/MacTT
+index 30d19e1..f93472f 100755
+--- a/tools/generate/MacTT
++++ b/tools/generate/MacTT
+@@ -43,7 +43,7 @@ if argc > 1:
+ f = fontforge.open( argv[i] )
+ ttfile = f.fontname + ".mac.ttf"
+ vstr = trim_version_str( f )
+- print "Generating Mac TrueType file ", ttfile, ' ', vstr
++ print("Generating Mac TrueType file ", ttfile, ' ', vstr)
+ f.selection.all()
+ f.autoHint()
+ f.autoInstr()
+@@ -51,4 +51,4 @@ if argc > 1:
+ #f.generate( ttfile, flags=('opentype','old-kern') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff --git a/tools/generate/OpenType b/tools/generate/OpenType
+index 4307231..0ab7987 100755
+--- a/tools/generate/OpenType
++++ b/tools/generate/OpenType
+@@ -42,7 +42,7 @@ if argc > 1:
+ f = fontforge.open( argv[i] )
+ otfile = f.fontname + ".otf"
+ vstr = trim_version_str( f )
+- print "Generating OpenType file ", otfile, ' ', vstr
++ print("Generating OpenType file ", otfile, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -51,4 +51,4 @@ if argc > 1:
+ f.generate( otfile, flags=('opentype','old-kern','round') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff --git a/tools/generate/TrueType b/tools/generate/TrueType
+index 1f6cc2f..974c84f 100755
+--- a/tools/generate/TrueType
++++ b/tools/generate/TrueType
+@@ -42,7 +42,7 @@ if argc > 1:
+ f = fontforge.open( sys.argv[i] )
+ ttfile = f.fontname + ".ttf"
+ vstr = trim_version_str( f )
+- print "Generating TrueType file ", ttfile, ' ', vstr
++ print("Generating TrueType file ", ttfile, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -54,4 +54,4 @@ if argc > 1:
+ f.generate( ttfile, flags=('opentype','old-kern','no-hints') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff --git a/tools/generate/WOFF b/tools/generate/WOFF
+index 7a3a790..45bff0b 100755
+--- a/tools/generate/WOFF
++++ b/tools/generate/WOFF
+@@ -153,7 +153,7 @@ if argc > 1:
+ f = fontforge.open( sys.argv[i] )
+ woff_file = f.fontname + ".woff"
+ vstr = trim_version_str( f )
+- print "Generating WOFF file ", woff_file, ' ', vstr
++ print("Generating WOFF file ", woff_file, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -171,4 +171,4 @@ if argc > 1:
+ f.generate( woff_file, flags=('opentype','no-hints') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print("Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff --git a/tools/test/checkGlyphNumbers.py b/tools/test/checkGlyphNumbers.py
+index c845d0d..6540c46 100755
+--- a/tools/test/checkGlyphNumbers.py
++++ b/tools/test/checkGlyphNumbers.py
+@@ -53,12 +53,12 @@ def isSpecialTrueType( glyph ):
+ from os import path
+ def checkGlyphNumbers( fontDir, fontFile ):
+ if isinstance( fontFile, ( list, tuple ) ):
+- print "In directory " + fontDir
++ print("In directory " + fontDir)
+ for fontName in fontFile:
+ checkGlyphNumbers( fontDir, fontName )
+ return
+
+- print "Checking slot numbers in " + fontFile
++ print("Checking slot numbers in " + fontFile)
+ font = fontforge.open( path.join( fontDir, fontFile ) )
+
+ g = font.selection.all()
+@@ -71,13 +71,13 @@ def checkGlyphNumbers( fontDir, fontFile ):
+ pass
+ elif inPrivateUseRange( glyph ):
+ if glyph.unicode != -1:
+- print "Glyph at slot " + str( glyph.encoding ) \
+- + " is Private Use but has Unicode"
++ print("Glyph at slot " + str( glyph.encoding ) \
++ + " is Private Use but has Unicode")
+ problem = True
+ else:
+ if glyph.encoding != glyph.unicode:
+- print "Glyph at slot " + str( glyph.encoding ) \
+- + " has wrong Unicode"
++ print("Glyph at slot " + str( glyph.encoding ) \
++ + " has wrong Unicode")
+ problem = True
+
+ # --------------------------------------------------------------------------
+diff --git a/tools/test/isMonoMono.py b/tools/test/isMonoMono.py
+index 0eca9fe..cc35015 100755
+--- a/tools/test/isMonoMono.py
++++ b/tools/test/isMonoMono.py
+@@ -35,7 +35,7 @@ import sys
+ problem = False
+
+ def ismonomono( fontfilename ):
+- print "Checking character bounding boxes: " + fontfilename
++ print("Checking character bounding boxes: " + fontfilename)
+ font = fontforge.open( fontfilename )
+
+ g = font.selection.all()
+@@ -49,16 +49,16 @@ def ismonomono( fontfilename ):
+ nonzero = e.width
+ else:
+ if e.width > 0 and e.width != nonzero:
+- print ' ' + e.glyphname \
++ print(' ' + e.glyphname \
+ + '(' + str( e.encoding ) \
+ + ') width is ' + str( e.width ) \
+- + ' not ' + str( nonzero )
++ + ' not ' + str( nonzero ))
+ problem = True
+
+ ( xmin, ymin, xmax, ymax ) = e.boundingBox()
+ if ymin < -200 or ymax > 800:
+- print ' ' + e.glyphname + ' goes between heights ' \
+- + str( ymin ) + ' and ' + str( ymax )
++ print(' ' + e.glyphname + ' goes between heights ' \
++ + str( ymin ) + ' and ' + str( ymax ))
+ """
+ For FontForge handling of TrueType/OpenType magic characters:
+ 1) check that 0x0000 0x0001, 0x000D exist and have names
+@@ -71,15 +71,15 @@ def ismonomono( fontfilename ):
+ if not font[0x0000] \
+ or font[0x0000].glyphname != '.notdef' \
+ or font[0x0000].width != nonzero:
+- print 'Should be full-width ".notdef" glyph at 0x0000.'
++ print('Should be full-width ".notdef" glyph at 0x0000.')
+ if not font[0x0001] \
+ or font[0x0001].glyphname != '.null' \
+ or font[0x0001].width != 0:
+- print 'Should be zero-width ".null" glyph at 0x0001.'
++ print('Should be zero-width ".null" glyph at 0x0001.')
+ if not font[0x000D] \
+ or font[0x000D].glyphname != 'nonmarkingreturn' \
+ or font[0x000D].width != nonzero:
+- print 'Should be full-width "nonmarkingreturn" glyph at 0x000D.'
++ print('Should be full-width "nonmarkingreturn" glyph at 0x000D.')
+
+ scriptname = sys.argv[0];
+ argc = len( sys.argv )
+diff --git a/tools/test/validate.py b/tools/test/validate.py
+index da9ce96..a8b216f 100755
+--- a/tools/test/validate.py
++++ b/tools/test/validate.py
+@@ -43,7 +43,7 @@ def countPointsInLayer( layer ):
+ return p
+
+ def printProblemLine( e, msg ):
+- print "\t" + e.glyphname + msg
++ print( "\t" + e.glyphname + msg)
+
+ def dealWithValidationState( state, e ):
+ if state & 0x2:
+@@ -87,7 +87,7 @@ def dealWithValidationState( state, e ):
+ def validate( dir, fontFile ):
+ try:
+ font = fontforge.open( dir + fontFile )
+- print "Validating " + fontFile
++ print("Validating " + fontFile)
+
+ g = font.selection.all()
+ g = font.selection.byGlyphs
+@@ -98,7 +98,7 @@ def validate( dir, fontFile ):
+ if state != 0:
+ dealWithValidationState( state, e )
+ font.validate
+- except Exception, e:
++ except(Exception, e):
+ problem = True
+ print >> sys.stderr, str( e )
+
diff --git a/gnu/packages/patches/foxi-fix-build.patch b/gnu/packages/patches/foxi-fix-build.patch
new file mode 100644
index 0000000000..d82090ad38
--- /dev/null
+++ b/gnu/packages/patches/foxi-fix-build.patch
@@ -0,0 +1,55 @@
+Taken from https://github.com/houseroad/foxi/pull/25.
+
+diff --git a/foxi/onnxifi_dummy.c b/foxi/onnxifi_dummy.c
+index 2115af9..73e25fc 100644
+--- a/foxi/onnxifi_dummy.c
++++ b/foxi/onnxifi_dummy.c
+@@ -103,7 +103,10 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI onnxInitGraph(
+ const void* onnxModel,
+ uint32_t weightCount,
+ const onnxTensorDescriptorV1* weightDescriptors,
+- onnxGraph* graph) {
++ onnxGraph* graph,
++ uint32_t maxSeqLength,
++ void* deferredWeightReader) {
++
+ if (graph == NULL) {
+ return ONNXIFI_STATUS_INVALID_POINTER;
+ }
+@@ -215,6 +218,8 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI
+ onnxWaitEventFor(onnxEvent event,
+ uint32_t timeoutMs,
+ onnxEventState* eventState,
+- onnxStatus* eventStatus) {
++ onnxStatus* eventStatus,
++ char* message,
++ size_t* messageLength) {
+ return ONNXIFI_STATUS_SUCCESS;
+ }
+\ No newline at end of file
+diff --git a/foxi/onnxifi_wrapper.c b/foxi/onnxifi_wrapper.c
+index 98a9325..abe1440 100644
+--- a/foxi/onnxifi_wrapper.c
++++ b/foxi/onnxifi_wrapper.c
+@@ -761,7 +761,9 @@ ONNXIFI_PUBLIC onnxStatus ONNXIFI_ABI onnxInitGraph(
+ const void* onnxModel,
+ uint32_t weightsCount,
+ const onnxTensorDescriptorV1* weightDescriptors,
+- onnxGraph* graph)
++ onnxGraph* graph,
++ uint32_t maxSeqLength,
++ void* deferredWeightReader)
+ {
+ if (graph == NULL) {
+ return ONNXIFI_STATUS_INVALID_POINTER;
+@@ -797,7 +799,9 @@ ONNXIFI_PUBLIC onnxStatus ONNXIFI_ABI onnxInitGraph(
+ onnxModel,
+ weightsCount,
+ weightDescriptors,
+- &graph_wrapper->graph);
++ &graph_wrapper->graph,
++ maxSeqLength,
++ deferredWeightReader);
+ switch (status) {
+ case ONNXIFI_STATUS_SUCCESS:
+ case ONNXIFI_STATUS_FALLBACK:
diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch
new file mode 100644
index 0000000000..af9d654046
--- /dev/null
+++ b/gnu/packages/patches/freecad-vtk-9.3.patch
@@ -0,0 +1,43 @@
+From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001
+From: Adrian Insaurralde Avalos <adrianinsaval@gmail.com>
+Date: Wed, 22 Nov 2023 16:42:06 -0300
+Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility
+
+minimum required version is 7.1
+---
+ src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ----
+ src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
+index 7f89573efd0d..47a52fe585fe 100644
+--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
+@@ -39,10 +39,6 @@
+ #define SMDS_EXPORT
+ #endif
+
+-#ifdef VTK_HAS_MTIME_TYPE
+ #define VTK_MTIME_TYPE vtkMTimeType
+-#else
+-#define VTK_MTIME_TYPE unsigned long
+-#endif
+
+ #endif
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index 7e3de0070a02..e9895d615717 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
+ GetLinks()->Allocate(this->GetNumberOfPoints());
+ GetLinks()->Register(this);
+ //FIXME: vtk9
++ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
+ GetLinks()->BuildLinks(this);
++ #else
++ GetLinks()->SetDataSet(this);
++ GetLinks()->BuildLinks();
++ #endif
+ GetLinks()->Delete();
+ #else
+ this->Links = SMDS_CellLinks::New(); \ No newline at end of file
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/gcc-10-libsanitizer-no-crypt.patch b/gnu/packages/patches/gcc-10-libsanitizer-no-crypt.patch
new file mode 100644
index 0000000000..72707ea982
--- /dev/null
+++ b/gnu/packages/patches/gcc-10-libsanitizer-no-crypt.patch
@@ -0,0 +1,134 @@
+Adapted from LLVM's patch, removed LLVM-specific test stuff. Original commit
+message follows.
+
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb..490a8b12d8b17 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd5983..c82ab5c210562 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e..6d61d276d77e3 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -142,7 +142,6 @@
+ #include <linux/serial.h>
+ #include <sys/msg.h>
+ #include <sys/ipc.h>
+-#include <crypt.h>
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ #if SANITIZER_ANDROID
+@@ -243,7 +244,6 @@
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb..58244c9944a03 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
diff --git a/gnu/packages/patches/gcc-12-libsanitizer-no-crypt.patch b/gnu/packages/patches/gcc-12-libsanitizer-no-crypt.patch
new file mode 100644
index 0000000000..d9c0a2557a
--- /dev/null
+++ b/gnu/packages/patches/gcc-12-libsanitizer-no-crypt.patch
@@ -0,0 +1,134 @@
+Adapted from LLVM's patch, removed LLVM-specific test stuff. Original commit
+message follows.
+
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb..490a8b12d8b17 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd5983..c82ab5c210562 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e..6d61d276d77e3 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -142,7 +142,6 @@
+ #include <linux/serial.h>
+ #include <sys/msg.h>
+ #include <sys/ipc.h>
+-#include <crypt.h>
+ #endif // SANITIZER_ANDROID
+
+ #include <link.h>
+@@ -243,7 +244,6 @@
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb..58244c9944a03 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
diff --git a/gnu/packages/patches/gcc-13-libsanitizer-no-crypt.patch b/gnu/packages/patches/gcc-13-libsanitizer-no-crypt.patch
new file mode 100644
index 0000000000..0785830c36
--- /dev/null
+++ b/gnu/packages/patches/gcc-13-libsanitizer-no-crypt.patch
@@ -0,0 +1,140 @@
+Adapted from LLVM's patch, removed LLVM-specific test stuff. Original commit
+message follows.
+
+From d7bead833631486e337e541e692d9b4a1ca14edd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Fri, 28 Apr 2023 09:59:17 -0700
+Subject: [PATCH] [sanitizer] Remove crypt and crypt_r interceptors
+
+From Florian Weimer's D144073
+
+> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation.
+>
+> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets.
+
+Let's remove crypt and crypt_r interceptors (D68431) to fix issues with
+newer glibc.
+
+For older glibc, msan will not know that an uninstrumented crypt_r call
+initializes `data`, so there is a risk for false positives. However, with some
+codebase survey, I think crypt_r uses are very few and the call sites typically
+have a `memset(&data, 0, sizeof(data));` anyway.
+
+Fix https://github.com/google/sanitizers/issues/1365
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432
+
+Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka
+
+Differential Revision: https://reviews.llvm.org/D149403
+---
+ .../sanitizer_common_interceptors.inc | 37 -------------------
+ .../sanitizer_platform_interceptors.h | 2 -
+ .../sanitizer_platform_limits_posix.cpp | 8 ----
+ .../sanitizer_platform_limits_posix.h | 1 -
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+index b30c91f06cfeb..490a8b12d8b17 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
+@@ -10086,41 +10086,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) {
+ #define INIT_GETRANDOM
+ #endif
+
+-#if SANITIZER_INTERCEPT_CRYPT
+-INTERCEPTOR(char *, crypt, char *key, char *salt) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt)(key, salt);
+- if (res != nullptr)
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- return res;
+-}
+-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt);
+-#else
+-#define INIT_CRYPT
+-#endif
+-
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) {
+- void *ctx;
+- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1);
+- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1);
+- char *res = REAL(crypt_r)(key, salt, data);
+- if (res != nullptr) {
+- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data,
+- __sanitizer::struct_crypt_data_sz);
+- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1);
+- }
+- return res;
+-}
+-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r);
+-#else
+-#define INIT_CRYPT_R
+-#endif
+-
+ #if SANITIZER_INTERCEPT_GETENTROPY
+ INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) {
+ void *ctx;
+@@ -10698,8 +10663,6 @@ static void InitializeCommonInterceptors() {
+ INIT_GETUSERSHELL;
+ INIT_SL_INIT;
+ INIT_GETRANDOM;
+- INIT_CRYPT;
+- INIT_CRYPT_R;
+ INIT_GETENTROPY;
+ INIT_QSORT;
+ INIT_QSORT_R;
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+index eb39fabfd5983..c82ab5c210562 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -569,8 +569,6 @@
+ #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
+ #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
+ #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
+-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID)
+-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID)
+
+ #define SANITIZER_INTERCEPT_GETRANDOM \
+ ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD)
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index a04eed7aa5a6e..6d61d276d77e3 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -177,10 +177,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include "sanitizer_platform_interceptors.h"
+ # include "sanitizer_platform_limits_posix.h"
+
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-#include <crypt.h>
+-#endif
+-
+ namespace __sanitizer {
+ unsigned struct_utsname_sz = sizeof(struct utsname);
+ unsigned struct_stat_sz = sizeof(struct stat);
+@@ -300,10 +296,6 @@ namespace __sanitizer {
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_GLIBC
+
+-#if SANITIZER_INTERCEPT_CRYPT_R
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+-#endif
+-
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ unsigned struct_timex_sz = sizeof(struct timex);
+ unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds);
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index e6f298c26e1fb..58244c9944a03 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -309,7 +309,6 @@ extern unsigned struct_msqid_ds_sz;
+ extern unsigned struct_mq_attr_sz;
+ extern unsigned struct_timex_sz;
+ extern unsigned struct_statvfs_sz;
+-extern unsigned struct_crypt_data_sz;
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+
+ struct __sanitizer_iovec {
diff --git a/gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch b/gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch
new file mode 100644
index 0000000000..9252b6920a
--- /dev/null
+++ b/gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch
@@ -0,0 +1,50 @@
+# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html>
+
+From 2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1 Mon Sep 17 00:00:00 2001
+Message-Id: <2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1.1692808412.git.mirai@makinata.eu>
+In-Reply-To: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>
+References: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>
+From: Bruno Victal <mirai@makinata.eu>
+Date: Mon, 21 Aug 2023 20:58:43 +0100
+Subject: [PATCH 2/2] libstdc++: Update docbook xsl URI.
+
+The URI for namespaced docbook-xsl was updated to reflect the current
+DocBook upstream at <https://cdn.docbook.org/>.
+
+libstdc++-v3/Changelog:
+ * acinclude.m4: Update docbook xsl URI.
+ * configure: Regenerate.
+---
+ libstdc++-v3/acinclude.m4 | 2 +-
+ libstdc++-v3/configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
+index b25378eaace..152811fd00d 100644
+--- a/libstdc++-v3/acinclude.m4
++++ b/libstdc++-v3/acinclude.m4
+@@ -604,7 +604,7 @@ dnl XSL_STYLE_DIR
+ dnl
+ AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
+
+-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
++glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/
+
+ AC_MSG_CHECKING([for local stylesheet directory])
+ glibcxx_local_stylesheets=no
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index c4da56c3042..d967b137ea1 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -73923,7 +73923,7 @@ fi
+
+
+
+-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
++glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5
+ $as_echo_n "checking for local stylesheet directory... " >&6; }
+--
+2.40.1
+
diff --git a/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch b/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch
new file mode 100644
index 0000000000..abc4cc877f
--- /dev/null
+++ b/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch
@@ -0,0 +1,70 @@
+# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html>
+
+From 2db0606adfdb800f3fcc95f2cb6c13ff76246e5f Mon Sep 17 00:00:00 2001
+Message-Id: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>
+From: Bruno Victal <mirai@makinata.eu>
+Date: Mon, 21 Aug 2023 20:58:22 +0100
+Subject: [PATCH 1/2] libstdc++: Fix 'doc-install-info' rule.
+
+The info manual isn't moved to the expected location after
+generation which causes the install rule for it to fail.
+
+libstdc++-v3/Changelog:
+
+ * doc/Makefile.in: Regenerate.
+ * doc/Makefile.am: Fix 'doc-install-info' rule.
+ Fix typo in commment.
+---
+ libstdc++-v3/doc/Makefile.am | 4 ++--
+ libstdc++-v3/doc/Makefile.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
+index 8371441c62e..373522d593d 100644
+--- a/libstdc++-v3/doc/Makefile.am
++++ b/libstdc++-v3/doc/Makefile.am
+@@ -598,7 +598,7 @@ stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook
+ doc-pdf-docbook: stamp-pdf-docbook
+
+ # TEXINFO, via docbook2X
+-# NB: Both experimental and tempermental
++# NB: Both experimental and temperamental
+ manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi
+ manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info
+ DB2TEXI_FLAGS = \
+@@ -615,7 +615,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo
+
+ stamp-info-docbook: stamp-texinfo-docbook
+ @echo "Generating info files..."
+- $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}
++ $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info}
+ $(STAMP) stamp-info-docbook
+
+ doc-texinfo-docbook: stamp-texinfo-docbook
+diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
+index 21ad8557f7a..c19e3e3044c 100644
+--- a/libstdc++-v3/doc/Makefile.in
++++ b/libstdc++-v3/doc/Makefile.in
+@@ -645,7 +645,7 @@ manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
+ DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex
+
+ # TEXINFO, via docbook2X
+-# NB: Both experimental and tempermental
++# NB: Both experimental and temperamental
+ manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi
+ manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info
+ DB2TEXI_FLAGS = \
+@@ -1096,7 +1096,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo
+
+ stamp-info-docbook: stamp-texinfo-docbook
+ @echo "Generating info files..."
+- $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}
++ $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info}
+ $(STAMP) stamp-info-docbook
+
+ doc-texinfo-docbook: stamp-texinfo-docbook
+
+base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509
+--
+2.40.1
+
diff --git a/gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch b/gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch
new file mode 100644
index 0000000000..473e08e240
--- /dev/null
+++ b/gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch
@@ -0,0 +1,402 @@
+From 7f792d2acc0d3eeb95c6f8e0acd72ae304cec9be Mon Sep 17 00:00:00 2001
+Message-Id: <7f792d2acc0d3eeb95c6f8e0acd72ae304cec9be.1692813549.git.mirai@makinata.eu>
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Wed, 27 Feb 2019 11:25:44 +0000
+Subject: [PATCH] PR libstdc++/89466 avoid slow xsltproc command in configure
+
+Note: Backported from a4395a846a9343960714568e7cf8af4425e63a50.
+
+Certain broken versions of xsltproc ignore the --nonet option and will
+attempt to fetch the docbook stylesheet from the WWW when it isn't in
+the local XML catalog.
+
+This patch checks for the local stylesheet directory first, and doesn't
+use xsltproc if no local stylesheets are found. Checking for the local
+directory is done using xmlcatalog if available, only checking the
+hardcoded list of directories if xmlcatalog fails. The right directory
+for Suse is added to the hardcoded list.
+
+This should avoid doing an xsltproc check that would need to download
+the stylesheet, so no network connection is made even if a broken
+xsltproc is present.
+
+ PR libstdc++/89466
+ * acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Reorder check for local
+ stylesheet directories before check for xsltproc. Try to use
+ xmlcatalog to find local stylesheet directory before trying hardcoded
+ paths. Add path used by suse to hardcoded paths. Adjust xsltproc
+ check to look for the same stylesheet as doc/Makefile.am uses. Don't
+ use xsltproc if xmlcatalog fails to find a local stylesheet.
+ * configure.ac: Check for xmlcatalog.
+ * Makefile.in: Regenerate.
+ * configure: Likewise.
+ * doc/Makefile.in: Likewise.
+ * include/Makefile.in: Likewise.
+ * libsupc++/Makefile.in: Likewise.
+ * po/Makefile.in: Likewise.
+ * python/Makefile.in: Likewise.
+ * src/Makefile.in: Likewise.
+ * src/c++11/Makefile.in: Likewise.
+ * src/c++98/Makefile.in: Likewise.
+ * src/filesystem/Makefile.in: Likewise.
+ * testsuite/Makefile.in: Likewise.
+
+From-SVN: r269249
+Modified-by: Bruno Victal <mirai@makinata.eu>
+---
+ libstdc++-v3/Makefile.in | 1 +
+ libstdc++-v3/acinclude.m4 | 47 +++++++------
+ libstdc++-v3/configure | 90 +++++++++++++++++++------
+ libstdc++-v3/configure.ac | 1 +
+ libstdc++-v3/doc/Makefile.in | 1 +
+ libstdc++-v3/include/Makefile.in | 1 +
+ libstdc++-v3/libsupc++/Makefile.in | 1 +
+ libstdc++-v3/po/Makefile.in | 1 +
+ libstdc++-v3/python/Makefile.in | 1 +
+ libstdc++-v3/src/Makefile.in | 1 +
+ libstdc++-v3/src/c++11/Makefile.in | 1 +
+ libstdc++-v3/src/c++98/Makefile.in | 1 +
+ libstdc++-v3/src/filesystem/Makefile.in | 1 +
+ libstdc++-v3/testsuite/Makefile.in | 1 +
+ 14 files changed, 109 insertions(+), 40 deletions(-)
+
+diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
+index a9451e19a96..6aee8281f77 100644
+--- a/libstdc++-v3/Makefile.in
++++ b/libstdc++-v3/Makefile.in
+@@ -230,6 +230,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
+index 18b7b6638ec..fde3fb6da6e 100644
+--- a/libstdc++-v3/acinclude.m4
++++ b/libstdc++-v3/acinclude.m4
+@@ -674,34 +674,43 @@ dnl XSL_STYLE_DIR
+ dnl
+ AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
+
+-AC_MSG_CHECKING([for docbook stylesheets for documentation creation])
+-glibcxx_stylesheets=no
+-if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then
+- glibcxx_stylesheets=yes
+-fi
+-AC_MSG_RESULT($glibcxx_stylesheets)
++glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
+
+ AC_MSG_CHECKING([for local stylesheet directory])
+ glibcxx_local_stylesheets=no
+-if test x"$glibcxx_stylesheets" = x"yes"; then
+- if test -d /usr/share/sgml/docbook/xsl-ns-stylesheets; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/sgml/docbook/xsl-ns-stylesheets
+- fi
+- if test -d /usr/share/xml/docbook/stylesheet/docbook-xsl-ns; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
+- fi
+- if test -d /usr/share/xml/docbook/stylesheet/nwalsh5/current; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/nwalsh5/current
+- fi
++if test x${XMLCATALOG} = xyes && xsl_style_dir=`xmlcatalog "" $glibcxx_docbook_url 2>/dev/null`
++then
++ XSL_STYLE_DIR=`echo $xsl_style_dir | sed -n 's;^file://;;p'`
++ glibcxx_local_stylesheets=yes
++else
++ for dir in \
++ /usr/share/sgml/docbook/xsl-ns-stylesheets \
++ /usr/share/xml/docbook/stylesheet/docbook-xsl-ns \
++ /usr/share/xml/docbook/stylesheet/nwalsh5/current \
++ /usr/share/xml/docbook/stylesheet/nwalsh/current
++ do
++ if test -d $dir; then
++ glibcxx_local_stylesheets=yes
++ XSL_STYLE_DIR=$dir
++ break
++ fi
++ done
+ fi
+ AC_MSG_RESULT($glibcxx_local_stylesheets)
+
+ if test x"$glibcxx_local_stylesheets" = x"yes"; then
+ AC_SUBST(XSL_STYLE_DIR)
+ AC_MSG_NOTICE($XSL_STYLE_DIR)
++
++ AC_MSG_CHECKING([for docbook stylesheets for documentation creation])
++ glibcxx_stylesheets=no
++ if test x${XMLCATALOG} = xno || xmlcatalog "" $glibcxx_docbook_url/xhtml/docbook.xsl >/dev/null 2>&1; then
++ if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude $glibcxx_docbook_url/xhtml/docbook.xsl - 2>/dev/null; then
++ glibcxx_stylesheets=yes
++ fi
++ fi
++ AC_MSG_RESULT($glibcxx_stylesheets)
++
+ else
+ glibcxx_stylesheets=no
+ fi
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index a51dfe6eb13..0c462490b81 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -634,6 +634,7 @@ BUILD_EPUB_TRUE
+ XSL_STYLE_DIR
+ XMLLINT
+ XSLTPROC
++XMLCATALOG
+ DOT
+ DOXYGEN
+ BUILD_INFO_FALSE
+@@ -79678,6 +79679,44 @@ fi
+
+
+ # Check for docbook
++# Extract the first word of "xmlcatalog", so it can be a program name with args.
++set dummy xmlcatalog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_XMLCATALOG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$XMLCATALOG"; then
++ ac_cv_prog_XMLCATALOG="$XMLCATALOG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_XMLCATALOG="yes"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_prog_XMLCATALOG" && ac_cv_prog_XMLCATALOG="no"
++fi
++fi
++XMLCATALOG=$ac_cv_prog_XMLCATALOG
++if test -n "$XMLCATALOG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCATALOG" >&5
++$as_echo "$XMLCATALOG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
+ # Extract the first word of "xsltproc", so it can be a program name with args.
+ set dummy xsltproc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -79756,31 +79795,28 @@ fi
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook stylesheets for documentation creation" >&5
+-$as_echo_n "checking for docbook stylesheets for documentation creation... " >&6; }
+-glibcxx_stylesheets=no
+-if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then
+- glibcxx_stylesheets=yes
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_stylesheets" >&5
+-$as_echo "$glibcxx_stylesheets" >&6; }
++glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5
+ $as_echo_n "checking for local stylesheet directory... " >&6; }
+ glibcxx_local_stylesheets=no
+-if test x"$glibcxx_stylesheets" = x"yes"; then
+- if test -d /usr/share/sgml/docbook/xsl-ns-stylesheets; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/sgml/docbook/xsl-ns-stylesheets
+- fi
+- if test -d /usr/share/xml/docbook/stylesheet/docbook-xsl-ns; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
+- fi
+- if test -d /usr/share/xml/docbook/stylesheet/nwalsh5/current; then
+- glibcxx_local_stylesheets=yes
+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/nwalsh5/current
+- fi
++if test x${XMLCATALOG} = xyes && xsl_style_dir=`xmlcatalog "" $glibcxx_docbook_url 2>/dev/null`
++then
++ XSL_STYLE_DIR=`echo $xsl_style_dir | sed -n 's;^file://;;p'`
++ glibcxx_local_stylesheets=yes
++else
++ for dir in \
++ /usr/share/sgml/docbook/xsl-ns-stylesheets \
++ /usr/share/xml/docbook/stylesheet/docbook-xsl-ns \
++ /usr/share/xml/docbook/stylesheet/nwalsh5/current \
++ /usr/share/xml/docbook/stylesheet/nwalsh/current
++ do
++ if test -d $dir; then
++ glibcxx_local_stylesheets=yes
++ XSL_STYLE_DIR=$dir
++ break
++ fi
++ done
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_local_stylesheets" >&5
+ $as_echo "$glibcxx_local_stylesheets" >&6; }
+@@ -79789,6 +79825,18 @@ if test x"$glibcxx_local_stylesheets" = x"yes"; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $XSL_STYLE_DIR" >&5
+ $as_echo "$as_me: $XSL_STYLE_DIR" >&6;}
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook stylesheets for documentation creation" >&5
++$as_echo_n "checking for docbook stylesheets for documentation creation... " >&6; }
++ glibcxx_stylesheets=no
++ if test x${XMLCATALOG} = xno || xmlcatalog "" $glibcxx_docbook_url/xhtml/docbook.xsl >/dev/null 2>&1; then
++ if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude $glibcxx_docbook_url/xhtml/docbook.xsl - 2>/dev/null; then
++ glibcxx_stylesheets=yes
++ fi
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_stylesheets" >&5
++$as_echo "$glibcxx_stylesheets" >&6; }
++
+ else
+ glibcxx_stylesheets=no
+ fi
+diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
+index 580fb8b2eb8..92a18b88135 100644
+--- a/libstdc++-v3/configure.ac
++++ b/libstdc++-v3/configure.ac
+@@ -422,6 +422,7 @@ AC_CHECK_PROG([DOXYGEN], doxygen, yes, no)
+ AC_CHECK_PROG([DOT], dot, yes, no)
+
+ # Check for docbook
++AC_CHECK_PROG([XMLCATALOG], xmlcatalog, yes, no)
+ AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no)
+ AC_CHECK_PROG([XMLLINT], xmllint, yes, no)
+ GLIBCXX_CONFIGURE_DOCBOOK
+diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
+index 4690fad8ac6..522a96c681d 100644
+--- a/libstdc++-v3/doc/Makefile.in
++++ b/libstdc++-v3/doc/Makefile.in
+@@ -202,6 +202,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+
+ # Validate existing XML structure.
+ XMLLINT = xmllint
+diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
+index 591301add5f..c28b1f4504f 100644
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -202,6 +202,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
+index 8f627c6bcd3..5f63c6c0f72 100644
+--- a/libstdc++-v3/libsupc++/Makefile.in
++++ b/libstdc++-v3/libsupc++/Makefile.in
+@@ -273,6 +273,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
+index 5bcf4da7fa5..cabd3f3368c 100644
+--- a/libstdc++-v3/po/Makefile.in
++++ b/libstdc++-v3/po/Makefile.in
+@@ -202,6 +202,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in
+index 26eb2abfb19..c1f46c02ea1 100644
+--- a/libstdc++-v3/python/Makefile.in
++++ b/libstdc++-v3/python/Makefile.in
+@@ -232,6 +232,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
+index 5221a5d5c29..e0c7bab1e78 100644
+--- a/libstdc++-v3/src/Makefile.in
++++ b/libstdc++-v3/src/Makefile.in
+@@ -265,6 +265,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
+index 4f92d71d19c..88a2dd5c7a0 100644
+--- a/libstdc++-v3/src/c++11/Makefile.in
++++ b/libstdc++-v3/src/c++11/Makefile.in
+@@ -235,6 +235,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in
+index 8dca17f360e..58ea47a9db6 100644
+--- a/libstdc++-v3/src/c++98/Makefile.in
++++ b/libstdc++-v3/src/c++98/Makefile.in
+@@ -236,6 +236,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/src/filesystem/Makefile.in b/libstdc++-v3/src/filesystem/Makefile.in
+index f8f0180f9ba..c7c997686cb 100644
+--- a/libstdc++-v3/src/filesystem/Makefile.in
++++ b/libstdc++-v3/src/filesystem/Makefile.in
+@@ -244,6 +244,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
+index 4f67a37966d..d7417fe5a1f 100644
+--- a/libstdc++-v3/testsuite/Makefile.in
++++ b/libstdc++-v3/testsuite/Makefile.in
+@@ -202,6 +202,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
+ WARN_FLAGS = @WARN_FLAGS@
+ WERROR = @WERROR@
++XMLCATALOG = @XMLCATALOG@
+ XMLLINT = @XMLLINT@
+ XSLTPROC = @XSLTPROC@
+ XSL_STYLE_DIR = @XSL_STYLE_DIR@
+--
+2.40.1
+
diff --git a/gnu/packages/patches/gcc-7-libsanitizer-fsconfig-command.patch b/gnu/packages/patches/gcc-7-libsanitizer-fsconfig-command.patch
new file mode 100644
index 0000000000..f203a5542d
--- /dev/null
+++ b/gnu/packages/patches/gcc-7-libsanitizer-fsconfig-command.patch
@@ -0,0 +1,32 @@
+Avoid redefinition of ‘enum fsconfig_command’ and ‘struct mount_attr’ in
+libsanitizer with glibc 2.38.
+
+ https://github.com/draperlaboratory/hope-llvm-project/commit/d8daef856858ecbd19898c3e0de63e76221e2baa
+ https://github.com/llvm/llvm-project/issues/56421
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113181
+
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -73,7 +73,6 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+-#include <linux/fs.h>
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
diff --git a/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch b/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch
deleted file mode 100644
index 6329b129d3..0000000000
--- a/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 9b31dfda73ee2d1b56b3f0dcfd3246c2faa592fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= <lle-bout@zaclys.net>
-Date: Sun, 28 Mar 2021 19:47:25 +0200
-Subject: [PATCH] Revert "fix #303: gdlib.pc: use Requires instead of Libs
- (#537)"
-
-This reverts commit 28ecfe77c817aff8ce56422d3e4e8533a281bc76.
----
- CMakeLists.txt | 12 ------------
- config/gdlib.pc.cmake | 4 +---
- config/gdlib.pc.in | 4 +---
- configure.ac | 11 +----------
- src/CMakeLists.txt | 6 ------
- 5 files changed, 3 insertions(+), 34 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57cd95d..6bd0c73 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,8 +53,6 @@ SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
- "Single Directory for all static libraries."
- )
-
--SET(PKG_REQUIRES_PRIVATES "")
--
- if (USE_EXT_GD)
- message("Using GD at: ${USE_EXT_GD}")
- INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR})
-@@ -170,13 +168,11 @@ else (USE_EXT_GD)
- INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
- SET(HAVE_FT2BUILD_H 1)
- SET(HAVE_LIBFREETYPE 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES freetype2)
- ENDIF(FREETYPE_FOUND)
-
- IF(ZLIB_FOUND)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
- SET(HAVE_LIBZ 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES zlib)
- ENDIF(ZLIB_FOUND)
-
- IF(WEBP_FOUND)
-@@ -192,7 +188,6 @@ else (USE_EXT_GD)
- IF(PNG_FOUND)
- INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
- SET(HAVE_LIBPNG 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES libpng)
- ENDIF(PNG_FOUND)
-
- IF(ICONV_FOUND)
-@@ -209,25 +204,21 @@ else (USE_EXT_GD)
- IF(XPM_FOUND)
- INCLUDE_DIRECTORIES(${XPM_INCLUDE_DIR})
- SET(HAVE_LIBXPM 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES xpm)
- ENDIF(XPM_FOUND)
-
- IF(JPEG_FOUND)
- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
- SET(HAVE_LIBJPEG 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES libjpeg)
- ENDIF(JPEG_FOUND)
-
- IF(TIFF_FOUND)
- INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
- SET(HAVE_LIBTIFF 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES libtiff-4)
- ENDIF(TIFF_FOUND)
-
- IF(FONTCONFIG_FOUND)
- INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
- SET(HAVE_LIBFONTCONFIG 1)
-- LIST(APPEND PKG_REQUIRES_PRIVATES fontconfig)
- ELSE (FONTCONFIG_FOUND)
- SET(FONTCONFIG_LIBRARY "")
- SET(FONTCONFIG_INCLUDE_DIR "")
-@@ -236,11 +227,8 @@ else (USE_EXT_GD)
-
- IF(RAQM_FOUND)
- INCLUDE_DIRECTORIES(${RAQM_INCLUDE_DIR})
-- SET(HAVE_RAQM 1)
-- LIST(APPEND PKG_REQUIRES_PRIVAES raqm)
- ENDIF(RAQM_FOUND)
-
-- string(REPLACE ";" ", " PKG_REQUIRES_PRIVATES "${PKG_REQUIRES_PRIVATES}")
- SET(HAVE_CONFIG_H 1)
-
- ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-diff --git a/config/gdlib.pc.cmake b/config/gdlib.pc.cmake
-index 5fc8af4..d1a0dda 100644
---- a/config/gdlib.pc.cmake
-+++ b/config/gdlib.pc.cmake
-@@ -6,8 +6,6 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- Name: gd
- Description: GD graphics library
- Version: @GDLIB_VERSION@
--Requires:
--Requires.private: @PKG_REQUIRES_PRIVATES@
- Cflags: -I${includedir}
--Libs.private: @LIBS_PRIVATES@
-+Libs.private: @LIBGD_DEP_LIBS@
- Libs: -L${libdir} -lgd
-diff --git a/config/gdlib.pc.in b/config/gdlib.pc.in
-index d6bc375..b980a60 100644
---- a/config/gdlib.pc.in
-+++ b/config/gdlib.pc.in
-@@ -6,8 +6,6 @@ includedir=@includedir@
- Name: gd
- Description: GD graphics library
- Version: @VERSION@
--Requires:
--Requires.private: @PKG_REQUIRES_PRIVATES@
- Cflags: -I${includedir}
--Libs.private: @LIBS_PRIVATES@ @LIBICONV@
-+Libs.private: @LIBS@ @LIBICONV@
- Libs: -L${libdir} -lgd
-diff --git a/configure.ac b/configure.ac
-index 535db68..329c99c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,9 +33,6 @@ AC_SUBST(GDLIB_LT_CURRENT)
- AC_SUBST(GDLIB_LT_REVISION)
- AC_SUBST(GDLIB_LT_AGE)
-
--AC_SUBST(LIBS_PRIVATES)
--AC_SUBST(PKG_REQUIRES_PRIVATES)
--
- AM_INIT_AUTOMAKE([1.11 foreign dist-xz -Wall -Werror subdir-objects])
- AC_CONFIG_HEADERS([src/config.h:src/config.hin])
-
-@@ -133,7 +130,6 @@ m4_define([GD_LIB_CHECK], [dnl
- AC_MSG_RESULT([$gd_with_lib])
-
- gd_found_lib=no
-- gd_require_pkg_name=""
- if test "$gd_with_lib" != "no"; then
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
-@@ -165,11 +161,6 @@ m4_define([GD_LIB_CHECK], [dnl
- $1][_CFLAGS="$gd_lib_cflags $][$1][_CFLAGS"
- AS_VAR_APPEND([LIBS], [" $][$1][_LIBS"])
- AS_VAR_APPEND([CPPFLAGS], [" $][$1][_CFLAGS"])
-- if test -z "$gd_require_pkg_name"; then
-- AS_VAR_APPEND([LIBS_PRIVATES], [" $][$1][_LIBS"])
-- else
-- AS_VAR_APPEND([PKG_REQUIRES_PRIVATES], [" $gd_require_pkg_name"])
-- fi
- elif test "$gd_with_lib" = "yes"; then
- AC_MSG_ERROR([$3 requested but not found])
- else
-@@ -189,7 +180,7 @@ dnl $4 - pkg-config module to look for
- dnl $5 - fallback test for the feature
- m4_define([GD_LIB_PKG_CHECK], [dnl
- GD_LIB_CHECK([$1], [$2], [$3], [dnl
-- PKG_CHECK_MODULES([$1], [$4], [gd_found_lib=yes gd_require_pkg_name="$4"], [$5])
-+ PKG_CHECK_MODULES([$1], [$4], [gd_found_lib=yes], [$5])
- ])
- ])
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 509c422..49adbd6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -142,12 +142,6 @@ if (BUILD_STATIC_LIBS)
- target_link_libraries(${GD_LIB_STATIC} ${LIBGD_DEP_LIBS})
- endif()
-
--SET(LIBS_PRIVATES
-- ${ICONV_LIBRARIES}
-- ${LIQ_LIBRARIES}
-- ${WEBP_LIBRARIES}
--)
--
- set(GD_PROGRAMS gdcmpgif)
-
- if (PNG_FOUND)
---
-2.31.1
-
diff --git a/gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch b/gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch
new file mode 100644
index 0000000000..3e40da4cc6
--- /dev/null
+++ b/gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch
@@ -0,0 +1,33 @@
+From d61f742876bdf2cd32e76f7bca389106ad99a316 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Tue, 3 May 2022 12:40:43 -0400
+Subject: [PATCH] rts/ghc.mk: Only build StgCRunAsm.S when it is needed
+
+Previously the make build system unconditionally included StgCRunAsm.S
+in the link, meaning that the RTS would require an execstack
+unnecessarily.
+
+Fixes #21478.
+---
+ rts/ghc.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/rts/ghc.mk b/rts/ghc.mk
+index 36a82f9f2c8..0e56515a569 100644
+--- a/rts/ghc.mk
++++ b/rts/ghc.mk
+@@ -57,8 +57,11 @@ ifneq "$(PORTING_HOST)" "YES"
+
+ # unregisterised builds use the mini interpreter
+ ifneq "$(GhcUnregisterised)" "YES"
++# use StgCRunAsm.S on ppc, ppc64, s390x, and riscv64
++ifneq "$(findstring $(TargetArch_CPP), ppc)$(findstring $(TargetArch_CPP), ppc64)$(findstring $(TargetArch_CPP), s390x)$(findstring $(TargetArch_CPP), riscv64)" ""
+ rts_S_SRCS += rts/StgCRunAsm.S
+ endif
++endif
+
+ # select adjustor implementation. This much match the logic in rts.cabal.in.
+ ifneq "$(CLEANING)" "YES"
+--
+GitLab
+
diff --git a/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch
new file mode 100644
index 0000000000..9e4c405c50
--- /dev/null
+++ b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch
@@ -0,0 +1,67 @@
+Without this patch, Cabal terminates if GHC_PACKAGE_PATH is set. This is
+an annoyance with Guix as it makes heavy use of GHC_PACKAGE_PATH to have
+GHC pickup Haskell package installed via Guix. Therefore, Cabal does
+presently not work by default in environments created by Guix. This is
+a workaround which makes Cabal respect GHC_PACKAGE_PATH.
+
+Taken from https://github.com/haskell/cabal/issues/3728
+
+diff -upr a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs
+--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2022-11-06 20:41:17.000000000 +0100
++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2023-12-18 14:34:15.148911717 +0100
+@@ -71,6 +71,7 @@ module Distribution.Simple.GHC (
+ ) where
+
+ import Prelude ()
++import Distribution.Compat.Environment (lookupEnv)
+ import Distribution.Compat.Prelude
+
+ import qualified Distribution.Simple.GHC.Internal as Internal
+@@ -117,7 +118,7 @@ import System.Directory
+ , canonicalizePath, removeFile, renameFile, getDirectoryContents )
+ import System.FilePath ( (</>), (<.>), takeExtension
+ , takeDirectory, replaceExtension
+- ,isRelative )
++ , isRelative, searchPathSeparator )
+ import qualified System.Info
+ #ifndef mingw32_HOST_OS
+ import System.Posix (createSymbolicLink)
+@@ -333,9 +334,11 @@ getInstalledPackages :: Verbosity -> Com
+ -> ProgramDb
+ -> IO InstalledPackageIndex
+ getInstalledPackages verbosity comp packagedbs progdb = do
+- checkPackageDbEnvVar verbosity
+ checkPackageDbStack verbosity comp packagedbs
+- pkgss <- getInstalledPackages' verbosity packagedbs progdb
++ envPackageDBs <-
++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator)
++ <$> lookupEnv "GHC_PACKAGE_PATH"
++ pkgss <- getInstalledPackages' verbosity (envPackageDBs ++ packagedbs) progdb
+ index <- toPackageIndex verbosity pkgss progdb
+ return $! hackRtsPackage index
+
+@@ -405,10 +408,6 @@ getUserPackageDB _verbosity ghcProg plat
+ packageConfFileName = "package.conf.d"
+ ghcVersion = fromMaybe (error "GHC.getUserPackageDB: no ghc version") $ programVersion ghcProg
+
+-checkPackageDbEnvVar :: Verbosity -> IO ()
+-checkPackageDbEnvVar verbosity =
+- Internal.checkPackageDbEnvVar verbosity "GHC" "GHC_PACKAGE_PATH"
+-
+ checkPackageDbStack :: Verbosity -> Compiler -> PackageDBStack -> IO ()
+ checkPackageDbStack verbosity comp =
+ if flagPackageConf implInfo
+@@ -461,8 +460,11 @@ getInstalledPackagesMonitorFiles :: Verb
+ -> ProgramDb
+ -> [PackageDB]
+ -> IO [FilePath]
+-getInstalledPackagesMonitorFiles verbosity platform progdb =
+- traverse getPackageDBPath
++getInstalledPackagesMonitorFiles verbosity platform progdb packageDBs = do
++ envPackageDBs <-
++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator)
++ <$> lookupEnv "GHC_PACKAGE_PATH"
++ traverse getPackageDBPath (envPackageDBs ++ packageDBs)
+ where
+ getPackageDBPath :: PackageDB -> IO FilePath
+ getPackageDBPath GlobalPackageDB =
diff --git a/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch b/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch
deleted file mode 100644
index 5d4afa28c1..0000000000
--- a/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Slightly modified version of
-https://gitlab.haskell.org/ghc/ghc/-/issues/19029#note_447989, required
-for older, buggy glibc versions < 2.34.
-
-diff -Naur ghc-9.2.5/compiler/GHC/Linker/Unit.hs ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs
---- ghc-9.2.5/compiler/GHC/Linker/Unit.hs 2022-11-06 20:40:29.000000000 +0100
-+++ ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs 2023-01-15 14:52:57.511275338 +0100
-@@ -31,11 +31,26 @@
- ps <- mayThrowUnitErr $ preloadUnitsInfo' unit_env pkgs
- return (collectLinkOpts dflags ps)
-
-+fixOrderLinkOpts :: [String] -> [String]
-+fixOrderLinkOpts opts
-+ | have_bad_glibc_version -- glibc version strictly less than 2.34
-+ , let (before, rest) = break (== libc) opts
-+ , not (pthread `elem` before)
-+ , pthread `elem` rest -- optional if we know pthread is definitely present
-+ = before ++ pthread_and_deps ++ rest
-+ | otherwise
-+ = opts
-+ where
-+ pthread = "-lpthread"
-+ libc = "-lc"
-+ pthread_and_deps = [ "-lrt", pthread ] -- should depend on the environment
-+ have_bad_glibc_version = True
-+
- collectLinkOpts :: DynFlags -> [UnitInfo] -> ([String], [String], [String])
- collectLinkOpts dflags ps =
- (
- concatMap (map ("-l" ++) . unitHsLibs (ghcNameVersion dflags) (ways dflags)) ps,
-- concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps,
-+ fixOrderLinkOpts $ concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps,
- concatMap (map ST.unpack . unitLinkerOptions) ps
- )
-
diff --git a/gnu/packages/patches/ghc-aeson-encodeDouble.patch b/gnu/packages/patches/ghc-aeson-encodeDouble.patch
new file mode 100644
index 0000000000..11ad425eae
--- /dev/null
+++ b/gnu/packages/patches/ghc-aeson-encodeDouble.patch
@@ -0,0 +1,25 @@
+From 58766a1916b4980792763bab74f0c86e2a7ebf20 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus@iki.fi>
+Date: Thu, 1 Jun 2023 22:58:28 +0300
+Subject: [PATCH] QC-2.14.3 Double generators generates infinite number too
+
+---
+ tests/PropUtils.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/PropUtils.hs b/tests/PropUtils.hs
+index 3c449029a..43de85d7f 100644
+--- a/tests/PropUtils.hs
++++ b/tests/PropUtils.hs
+@@ -51,8 +51,9 @@ import qualified Data.Aeson.Decoding as Dec
+
+ encodeDouble :: Double -> Double -> Property
+ encodeDouble num denom
+- | isInfinite d || isNaN d = encode d === "null"
+- | otherwise = (read . L.unpack . encode) d === d
++ | isNaN d = encode d === "null"
++ | isInfinite d = if d > 0 then encode d === "\"+inf\"" else encode d === "\"-inf\""
++ | otherwise = (read . L.unpack . encode) d === d
+ where d = num / denom
+
+ encodeInteger :: Integer -> Property
diff --git a/gnu/packages/patches/ghc-basement-fix-32-bit.patch b/gnu/packages/patches/ghc-basement-fix-32-bit.patch
new file mode 100644
index 0000000000..0a9f78bdd4
--- /dev/null
+++ b/gnu/packages/patches/ghc-basement-fix-32-bit.patch
@@ -0,0 +1,226 @@
+Fix compilation of ghc-basement with newer GHC on 32-bit platforms.
+
+Patch taken from:
+
+ https://github.com/NixOS/nixpkgs/blob/83f6c2617c662c541763ab20e0210ed02686137c/pkgs/development/haskell-modules/patches/basement-fix-32-bit.patch
+
+Upstream issue:
+
+ https://github.com/haskell-foundation/foundation/pull/573
+
+--- a/Basement/Bits.hs
++++ b/Basement/Bits.hs
+@@ -54,8 +54,12 @@
+ import Basement.Compat.Primitive
+
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++import GHC.Exts
++#else
+ import GHC.IntWord64
+ #endif
++#endif
+
+ -- | operation over finite bits
+ class FiniteBitsOps bits where
+--- a/Basement/From.hs
++++ b/Basement/From.hs
+@@ -272,23 +272,11 @@
+ tryFrom = BlockN.toBlockN . UArray.toBlock . BoxArray.mapToUnboxed id
+
+ instance (KnownNat n, NatWithinBound Word8 n) => From (Zn64 n) Word8 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word16 n) => From (Zn64 n) Word16 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word32 n) => From (Zn64 n) Word32 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
+-#endif
+ instance From (Zn64 n) Word64 where
+ from = unZn64
+ instance From (Zn64 n) Word128 where
+@@ -297,23 +285,11 @@
+ from = from . unZn64
+
+ instance (KnownNat n, NatWithinBound Word8 n) => From (Zn n) Word8 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word16 n) => From (Zn n) Word16 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word32 n) => From (Zn n) Word32 where
+-#if __GLASGOW_HASKELL__ >= 904
+- from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+ from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word64 n) => From (Zn n) Word64 where
+ from = naturalToWord64 . unZn
+ instance (KnownNat n, NatWithinBound Word128 n) => From (Zn n) Word128 where
+--- a/Basement/Numerical/Additive.hs
++++ b/Basement/Numerical/Additive.hs
+@@ -30,8 +30,12 @@
+ import qualified Basement.Types.Word256 as Word256
+
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++import GHC.Exts
++#else
+ import GHC.IntWord64
+ #endif
++#endif
+
+ -- | Represent class of things that can be added together,
+ -- contains a neutral element and is commutative.
+--- a/Basement/Numerical/Conversion.hs
++++ b/Basement/Numerical/Conversion.hs
+@@ -26,8 +26,12 @@
+ import Basement.Compat.Primitive
+
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++import GHC.Exts
++#else
+ import GHC.IntWord64
+ #endif
++#endif
+
+ intToInt64 :: Int -> Int64
+ #if WORD_SIZE_IN_BITS == 64
+@@ -96,11 +100,22 @@
+ #endif
+
+ #if WORD_SIZE_IN_BITS == 64
++#if __GLASGOW_HASKELL__ >= 902
++word64ToWord# :: Word64# -> Word#
++word64ToWord# i = word64ToWord# i
++#else
+ word64ToWord# :: Word# -> Word#
+ word64ToWord# i = i
++#endif
+ {-# INLINE word64ToWord# #-}
+ #endif
+
++#if WORD_SIZE_IN_BITS < 64
++word64ToWord32# :: Word64# -> Word32#
++word64ToWord32# i = wordToWord32# (word64ToWord# i)
++{-# INLINE word64ToWord32# #-}
++#endif
++
+ -- | 2 Word32s
+ data Word32x2 = Word32x2 {-# UNPACK #-} !Word32
+ {-# UNPACK #-} !Word32
+@@ -113,9 +128,14 @@
+ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64))
+ #endif
+ #else
++#if __GLASGOW_HASKELL__ >= 902
++word64ToWord32s :: Word64 -> Word32x2
++word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64))
++#else
+ word64ToWord32s :: Word64 -> Word32x2
+ word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
+ #endif
++#endif
+
+ wordToChar :: Word -> Char
+ wordToChar (W# word) = C# (chr# (word2Int# word))
+--- a/Basement/PrimType.hs
++++ b/Basement/PrimType.hs
+@@ -54,7 +54,11 @@
+ import qualified Prelude (quot)
+
+ #if WORD_SIZE_IN_BITS < 64
+-import GHC.IntWord64
++#if __GLASGOW_HASKELL__ >= 902
++import GHC.Exts
++#else
++import GHC.IntWord64
++#endif
+ #endif
+
+ #ifdef FOUNDATION_BOUNDS_CHECK
+--- a/Basement/Types/OffsetSize.hs
++++ b/Basement/Types/OffsetSize.hs
+@@ -70,8 +70,12 @@
+ import qualified Prelude
+
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++import GHC.Exts
++#else
+ import GHC.IntWord64
+ #endif
++#endif
+
+ -- | File size in bytes
+ newtype FileSize = FileSize Word64
+@@ -225,20 +229,26 @@
+
+ csizeOfSize :: CountOf Word8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
++#else
+ csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
++#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+-
+ #else
+ csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz))
+-
+ #endif
+ #endif
+
+ csizeOfOffset :: Offset8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
++#else
+ csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
++#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+@@ -250,7 +260,11 @@
+ sizeOfCSSize :: CSsize -> CountOf Word8
+ sizeOfCSSize (CSsize (-1)) = error "invalid size: CSSize is -1"
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
++#else
+ sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
++#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
+@@ -261,7 +275,11 @@
+
+ sizeOfCSize :: CSize -> CountOf Word8
+ #if WORD_SIZE_IN_BITS < 64
++#if __GLASGOW_HASKELL__ >= 902
++sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
++#else
+ sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
++#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))
diff --git a/gnu/packages/patches/ghc-clock-realfrag.patch b/gnu/packages/patches/ghc-clock-realfrag.patch
new file mode 100644
index 0000000000..0f7bb0542a
--- /dev/null
+++ b/gnu/packages/patches/ghc-clock-realfrag.patch
@@ -0,0 +1,22 @@
+From 8372e801ef062223756db69818a7b60cfd9bb066 Mon Sep 17 00:00:00 2001
+From: amesgen <amesgen@amesgen.de>
+Date: Tue, 8 Aug 2023 23:36:45 +0200
+Subject: [PATCH] Fix `RealFrac Seconds` instance
+
+---
+ System/Clock/Seconds.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs
+index a9a1c78..f7457cb 100644
+--- a/System/Clock/Seconds.hs
++++ b/System/Clock/Seconds.hs
+@@ -50,7 +50,7 @@ instance Fractional Seconds where
+
+ instance RealFrac Seconds where
+ properFraction (Seconds (TimeSpec s ns))
+- | s >= 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
++ | s >= 0 || ns == 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
+ | otherwise = (fromIntegral (s+1), Seconds $ TimeSpec (-1) ns)
+
+ -- | The 'getTime' function shall return the current value for the
diff --git a/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch b/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch
new file mode 100644
index 0000000000..cdaf5b180d
--- /dev/null
+++ b/gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch
@@ -0,0 +1,10 @@
+--- a/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:22:42.643106725 +0100
++++ b/testsuite/tests/driver/recomp015/Makefile 2024-01-13 16:23:18.406867917 +0100
+@@ -26,6 +26,7 @@
+ # number of sections)
+ '$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs
+ ./Generate > ManySections.s
++ echo '.section .note.GNU-stack,"",@progbits' > ManySections.s
+ echo 'main = putStrLn "Running main..."' > Main.hs
+ '$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s
+ '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o
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/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch
index 0acaeb1e46..1796a8a720 100644
--- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch
+++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch
@@ -1,11 +1,3 @@
-From d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279 Mon Sep 17 00:00:00 2001
-Message-Id: <d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279.1683980025.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Sat, 13 May 2023 14:10:43 +0200
-Subject: [PATCH] Add versioned locpath
-
-From: Josselin Poiret <dev@jpoiret.xyz>
-
The format of locale data can be incompatible between libc versions, and
loading incompatible data can lead to 'setlocale' returning EINVAL at best
or triggering an assertion failure at worst. See
@@ -20,20 +12,22 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in
That way, a single 'GUIX_LOCPATH' setting can work even if different libc
versions coexist on the system.
-
-This patch is adapted from the 2.35 patch.
-
----
- locale/newlocale.c | 15 ++--------
- locale/setlocale.c | 68 +++++++++++++++++++++++++++++++++++++-------
- string/Makefile | 1 +
- string/argz-suffix.c | 56 ++++++++++++++++++++++++++++++++++++
- string/argz.h | 10 +++++++
- 5 files changed, 127 insertions(+), 23 deletions(-)
- create mode 100644 string/argz-suffix.c
-
+diff --git a/locale/Makefile b/locale/Makefile
+index d7036b08..b5125166 100644
+--- a/locale/Makefile
++++ b/locale/Makefile
+@@ -94,7 +94,9 @@ localepath = "$(complocaledir):$(i18ndir)"
+ # -Iprograms doesn't really belong here, but this gets it at the head
+ # of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
+ # We need it before the standard -I's to see programs/config.h first.
++# Define 'LOCALEDIR' for use in 'compute_locale_search_path'.
+ locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
++ -DLOCALEDIR='"$(libdir)/locale"' \
+ -DLOCALE_ALIAS_PATH='"$(localedir)"' \
+ -Iprograms
+
diff --git a/locale/newlocale.c b/locale/newlocale.c
-index 108d2428bf..6218e0fa77 100644
+index 108d2428..6218e0fa 100644
--- a/locale/newlocale.c
+++ b/locale/newlocale.c
@@ -29,6 +29,7 @@
@@ -73,15 +67,15 @@ index 108d2428bf..6218e0fa77 100644
/* Get the names for the locales we are interested in. We either
allow a composite name or a single name. */
diff --git a/locale/setlocale.c b/locale/setlocale.c
-index dd73fa4248..d8eb799384 100644
+index 6a902faa..2d07a644 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
-@@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data)
+@@ -213,12 +213,60 @@ setdata (int category, struct __locale_data *data)
}
}
+/* Return in *LOCALE_PATH and *LOCALE_PATH_LEN the locale data search path as
-+ a colon-separated list. Return ENOMEN on error, zero otherwise. */
++ an argz list. Return ENOMEN on error, zero otherwise. */
+error_t
+compute_locale_search_path (char **locale_path, size_t *locale_path_len)
+{
@@ -93,8 +87,8 @@ index dd73fa4248..d8eb799384 100644
+ /* Entries in 'GUIX_LOCPATH' take precedence over 'LOCPATH'. These
+ entries are systematically prefixed with "/X.Y" where "X.Y" is the
+ libc version. */
-+ if (__argz_create_sep (guix_locpath_var, ':',
-+ locale_path, locale_path_len) != 0
++ if (__argz_add_sep (locale_path, locale_path_len,
++ guix_locpath_var, ':') != 0
+ || __argz_suffix_entries (locale_path, locale_path_len,
+ "/" VERSION) != 0)
+ goto bail_out;
@@ -102,27 +96,22 @@ index dd73fa4248..d8eb799384 100644
+
+ if (locpath_var != NULL && locpath_var[0] != '\0')
+ {
-+ char *reg_locale_path = NULL;
-+ size_t reg_locale_path_len = 0;
-+
-+ if (__argz_create_sep (locpath_var, ':',
-+ &reg_locale_path, &reg_locale_path_len) != 0)
-+ goto bail_out;
-+
-+ if (__argz_append (locale_path, locale_path_len,
-+ reg_locale_path, reg_locale_path_len) != 0)
++ if (__argz_add_sep (locale_path, locale_path_len,
++ locpath_var, ':') != 0)
+ goto bail_out;
+
-+ free (reg_locale_path);
+ }
+
-+ if (*locale_path != NULL)
-+ {
-+ /* Append the system default locale directory. */
-+ if (__argz_add_sep (locale_path, locale_path_len,
-+ _nl_default_locale_path, ':') != 0)
-+ goto bail_out;
-+ }
++ /* Append the system default locale directory. */
++ if (__argz_add_sep (locale_path, locale_path_len,
++ _nl_default_locale_path, ':') != 0)
++ goto bail_out;
++
++ /* Last, unconditionally append our own locale directory, which should
++ contain data for C.UTF-8. */
++ if (__argz_add_sep (locale_path, locale_path_len,
++ LOCALEDIR "/" VERSION, ':') != 0)
++ goto bail_out;
+
+ return 0;
+
@@ -143,7 +132,7 @@ index dd73fa4248..d8eb799384 100644
char *composite;
/* Sanity check for CATEGORY argument. */
-@@ -249,17 +302,10 @@ setlocale (int category, const char *locale)
+@@ -249,17 +308,10 @@ setlocale (int category, const char *locale)
locale_path = NULL;
locale_path_len = 0;
@@ -165,7 +154,7 @@ index dd73fa4248..d8eb799384 100644
if (category == LC_ALL)
diff --git a/string/Makefile b/string/Makefile
-index 3eced0d027..a7e68729ad 100644
+index 8cdfd5b0..6b0d606d 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -51,6 +51,7 @@ routines := \
@@ -178,10 +167,10 @@ index 3eced0d027..a7e68729ad 100644
bzero \
diff --git a/string/argz-suffix.c b/string/argz-suffix.c
new file mode 100644
-index 0000000000..505b0f248c
+index 00000000..505b0f24
--- /dev/null
+++ b/string/argz-suffix.c
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,58 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ludovic Courtès <ludo@gnu.org>.
@@ -213,6 +202,8 @@ index 0000000000..505b0f248c
+ size_t suffix_len = strlen (suffix);
+ size_t count = __argz_count (*argz, *argz_len);
+ size_t new_argz_len = *argz_len + count * suffix_len;
++ if (new_argz_len == 0)
++ return 0;
+ char *new_argz = malloc (new_argz_len);
+
+ if (new_argz)
@@ -239,7 +230,7 @@ index 0000000000..505b0f248c
+}
+weak_alias (__argz_suffix_entries, argz_suffix_entries)
diff --git a/string/argz.h b/string/argz.h
-index cbc588a8e6..bc6e484c9d 100644
+index cbc588a8..bc6e484c 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz,
@@ -259,6 +250,3 @@ index cbc588a8e6..bc6e484c9d 100644
/* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
are no more. If entry is NULL, then the first entry is returned. This
---
-2.40.1
-
diff --git a/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch
new file mode 100644
index 0000000000..9db412b5f2
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch
@@ -0,0 +1,8 @@
+By default, 'RTDLLIST' in 'ldd' refers to 'lib64/ld-linux-x86-64.so', whereas
+it's in 'lib/' for us. This patch fixes that.
+
+--- glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
++++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
+@@ -1 +1 @@
+-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
diff --git a/gnu/packages/patches/glibc-2.39-bootstrap-system.patch b/gnu/packages/patches/glibc-2.39-bootstrap-system.patch
new file mode 100644
index 0000000000..5495b35948
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.39-bootstrap-system.patch
@@ -0,0 +1,69 @@
+We want to allow builds in chroots that lack /bin/sh. Thus, system(3)
+and popen(3) need to be tweaked to use the right shell. For the bootstrap
+glibc, we just use whatever `sh' can be found in $PATH. The final glibc
+instead uses the hard-coded absolute file name of `bash'.
+
+In addition, status should be initialized to 0 and not -1.
+
+Adapted to glibc-2.39.
+
+diff --git a/libio/iopopen.c b/libio/iopopen.c
+index ebc381ed7c..e0d3ed1bc3 100644
+--- a/libio/iopopen.c
++++ b/libio/iopopen.c
+@@ -85,8 +85,8 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command,
+ return false;
+ }
+
+- err = __posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0,
++ err = __posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0,
+ (char *const[]){ (char*) "sh", (char*) "-c", (char*) "--",
+ (char *) command, NULL }, __environ);
+ if (err != 0)
+ return err;
+diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
+index a03f478fc7..94da6facf3 100644
+--- a/sysdeps/posix/system.c
++++ b/sysdeps/posix/system.c
+@@ -101,7 +101,7 @@ cancel_handler (void *arg)
+ static int
+ do_system (const char *line)
+ {
+- int status = -1;
++ int status = 0;
+ int ret;
+ pid_t pid;
+ struct sigaction sa;
+@@ -145,7 +145,7 @@ do_system (const char *line)
+ __posix_spawnattr_setflags (&spawn_attr,
+ POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK);
+
+- ret = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr,
++ ret = __posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr,
+ (char *const[]){ (char *) SHELL_NAME,
+ (char *) "-c",
+ (char *) line, NULL },
+
+--- a/include/spawn.h
++++ b/include/spawn.h
+@@ -5,6 +5,9 @@
+ __typeof (posix_spawn) __posix_spawn;
+ libc_hidden_proto (__posix_spawn)
+
++__typeof (posix_spawnp) __posix_spawnp;
++libc_hidden_proto (__posix_spawnp)
++
+ __typeof (posix_spawn_file_actions_addclose)
+ __posix_spawn_file_actions_addclose attribute_hidden;
+
+--- a/posix/spawnp.c
++++ b/posix/spawnp.c
+@@ -31,6 +31,7 @@ __posix_spawnp (pid_t *pid, const char *file,
+ SPAWN_XFLAGS_USE_PATH);
+ }
+ versioned_symbol (libc, __posix_spawnp, posix_spawnp, GLIBC_2_15);
++libc_hidden_def (__posix_spawnp)
+
+
+ #if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
+
diff --git a/gnu/packages/patches/glibc-2.39-fmod-libm-a.patch b/gnu/packages/patches/glibc-2.39-fmod-libm-a.patch
new file mode 100644
index 0000000000..91b1871bee
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.39-fmod-libm-a.patch
@@ -0,0 +1,98 @@
+Fixes lack of 'fmod' in libm.a on i686-linux:
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=31488
+ https://issues.guix.gnu.org/72725
+
+commit 0b716305dfb48c2d13ed4f7d06c082b90c1d226f
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Thu Mar 14 14:59:35 2024 -0300
+
+ math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488)
+
+diff --git a/sysdeps/i386/fpu/w_fmod_compat.c b/sysdeps/i386/fpu/w_fmod_compat.c
+index 5ac9995ffd..528bfc2a13 100644
+--- a/sysdeps/i386/fpu/w_fmod_compat.c
++++ b/sysdeps/i386/fpu/w_fmod_compat.c
+@@ -7,8 +7,9 @@
+ # define LIBM_SVID_COMPAT 1
+ # undef compat_symbol
+ # define compat_symbol(a, b, c, d)
+-#endif
+-#include <math/w_fmod_compat.c>
+-#ifdef SHARED
++# include <math/w_fmod_compat.c>
+ libm_alias_double (__fmod_compat, fmod)
++#else
++#include <math-type-macros-double.h>
++#include <w_fmod_template.c>
+ #endif
+diff --git a/sysdeps/i386/fpu/w_fmodf_compat.c b/sysdeps/i386/fpu/w_fmodf_compat.c
+index cc417e07d3..5a61693e51 100644
+--- a/sysdeps/i386/fpu/w_fmodf_compat.c
++++ b/sysdeps/i386/fpu/w_fmodf_compat.c
+@@ -7,8 +7,9 @@
+ # define LIBM_SVID_COMPAT 1
+ # undef compat_symbol
+ # define compat_symbol(a, b, c, d)
+-#endif
+-#include <math/w_fmodf_compat.c>
+-#ifdef SHARED
++# include <math/w_fmodf_compat.c>
+ libm_alias_float (__fmod_compat, fmod)
++#else
++#include <math-type-macros-float.h>
++#include <w_fmod_template.c>
+ #endif
+diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
+index 1afbe7d8ad..932cc4341c 100644
+--- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
++++ b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
+@@ -17,13 +17,13 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#if IS_IN (libc)
++#if IS_IN (libc) && defined SHARED
+ # define declare_mgen_alias(f,t)
+ #endif
+ #include <math-type-macros-ldouble.h>
+ #include <s_ldexp_template.c>
+
+-#if IS_IN (libc)
++#if IS_IN (libc) && defined SHARED
+ long_double_symbol (libc, __ldexpl, ldexpl);
+ long_double_symbol (libc, __wrap_scalbnl, scalbnl);
+ #endif
+diff --git a/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c b/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
+index 527d4fbed2..57f38091e6 100644
+--- a/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
++++ b/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
+@@ -7,8 +7,9 @@
+ # define LIBM_SVID_COMPAT 1
+ # undef compat_symbol
+ # define compat_symbol(a, b, c, d)
+-#endif
+ #include <math/w_fmod_compat.c>
+-#ifdef SHARED
+ libm_alias_double (__fmod_compat, fmod)
++#else
++#include <math-type-macros-double.h>
++#include <w_fmod_template.c>
+ #endif
+diff --git a/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c b/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
+index 5043586b91..88db07f443 100644
+--- a/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
++++ b/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
+@@ -7,8 +7,9 @@
+ # define LIBM_SVID_COMPAT 1
+ # undef compat_symbol
+ # define compat_symbol(a, b, c, d)
+-#endif
+-#include <math/w_fmodf_compat.c>
+-#ifdef SHARED
++# include <math/w_fmodf_compat.c>
+ libm_alias_float (__fmod_compat, fmod)
++#else
++#include <math-type-macros-float.h>
++#include <w_fmod_template.c>
+ #endif
diff --git a/gnu/packages/patches/glibc-2.39-git-updates.patch b/gnu/packages/patches/glibc-2.39-git-updates.patch
new file mode 100644
index 0000000000..251ff36872
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.39-git-updates.patch
@@ -0,0 +1,9653 @@
+Updates from upstream's release/2.39/master branch, up to commit c7c3f5bf80ae86b34501f473f1a9fc545c911b7f.
+
+diff --git a/ADVISORIES b/ADVISORIES
+new file mode 100644
+index 0000000000..d4e33f2df3
+--- /dev/null
++++ b/ADVISORIES
+@@ -0,0 +1,2 @@
++For the GNU C Library Security Advisories, see the git master branch:
++https://sourceware.org/git/?p=glibc.git;a=tree;f=advisories;hb=HEAD
+diff --git a/Makeconfig b/Makeconfig
+index 85e00cef94..522182abdc 100644
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -586,10 +586,13 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link)
+ # before the expansion of LDLIBS-* variables).
+
+ # Tests use -Wl,-rpath instead of -Wl,-rpath-link for
+-# build-hardcoded-path-in-tests.
++# build-hardcoded-path-in-tests. Add -Wl,--disable-new-dtags to force
++# DT_RPATH instead of DT_RUNPATH which only applies to DT_NEEDED entries
++# in the executable and doesn't applies to DT_NEEDED entries in shared
++# libraries which are loaded via DT_NEEDED entries in the executable.
+ ifeq (yes,$(build-hardcoded-path-in-tests))
+-link-libc-tests-rpath-link = $(link-libc-rpath)
+-link-test-modules-rpath-link = $(link-libc-rpath)
++link-libc-tests-rpath-link = $(link-libc-rpath) -Wl,--disable-new-dtags
++link-test-modules-rpath-link = $(link-libc-rpath) -Wl,--disable-new-dtags
+ else
+ link-libc-tests-rpath-link = $(link-libc-rpath-link)
+ link-test-modules-rpath-link =
+diff --git a/Makefile b/Makefile
+index 7052b46df8..2e351c0321 100644
+--- a/Makefile
++++ b/Makefile
+@@ -577,6 +577,13 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh
+ $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \
+ $(evaluate-test)
+
++# Link libc.a as a whole to verify that it does not contain multiple
++# definitions of any symbols.
++tests-special += $(objpfx)link-static-libc.out
++$(objpfx)link-static-libc.out:
++ $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \
++ $(evaluate-test)
++
+ # Print test summary for tests in $1 .sum file;
+ # $2 is optional test identifier.
+ # Fail if there are unexpected failures in the test results.
+diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001
+deleted file mode 100644
+index 3d19c91b6a..0000000000
+--- a/advisories/GLIBC-SA-2023-0001
++++ /dev/null
+@@ -1,14 +0,0 @@
+-printf: incorrect output for integers with thousands separator and width field
+-
+-When the printf family of functions is called with a format specifier
+-that uses an <apostrophe> (enable grouping) and a minimum width
+-specifier, the resulting output could be larger than reasonably expected
+-by a caller that computed a tight bound on the buffer size. The
+-resulting larger than expected output could result in a buffer overflow
+-in the printf family of functions.
+-
+-CVE-Id: CVE-2023-25139
+-Public-Date: 2023-02-02
+-Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37)
+-Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38)
+-Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4)
+diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002
+deleted file mode 100644
+index 5122669a64..0000000000
+--- a/advisories/GLIBC-SA-2023-0002
++++ /dev/null
+@@ -1,15 +0,0 @@
+-getaddrinfo: Stack read overflow in no-aaaa mode
+-
+-If the system is configured in no-aaaa mode via /etc/resolv.conf,
+-getaddrinfo is called for the AF_UNSPEC address family, and a DNS
+-response is received over TCP that is larger than 2048 bytes,
+-getaddrinfo may potentially disclose stack contents via the returned
+-address data, or crash.
+-
+-CVE-Id: CVE-2023-4527
+-Public-Date: 2023-09-12
+-Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36)
+-Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39)
+-Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113)
+-Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38)
+-Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19)
+diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003
+deleted file mode 100644
+index d3aef80348..0000000000
+--- a/advisories/GLIBC-SA-2023-0003
++++ /dev/null
+@@ -1,15 +0,0 @@
+-getaddrinfo: Potential use-after-free
+-
+-When an NSS plugin only implements the _gethostbyname2_r and
+-_getcanonname_r callbacks, getaddrinfo could use memory that was freed
+-during buffer resizing, potentially causing a crash or read or write to
+-arbitrary memory.
+-
+-CVE-Id: CVE-2023-4806
+-Public-Date: 2023-09-12
+-Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39)
+-Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420)
+-Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270)
+-Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115)
+-Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39)
+-Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20)
+diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004
+deleted file mode 100644
+index 5286a7aa54..0000000000
+--- a/advisories/GLIBC-SA-2023-0004
++++ /dev/null
+@@ -1,16 +0,0 @@
+-tunables: local privilege escalation through buffer overflow
+-
+-If a tunable of the form NAME=NAME=VAL is passed in the environment of a
+-setuid program and NAME is valid, it may result in a buffer overflow,
+-which could be exploited to achieve escalated privileges. This flaw was
+-introduced in glibc 2.34.
+-
+-CVE-Id: CVE-2023-4911
+-Public-Date: 2023-10-03
+-Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34)
+-Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39)
+-Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423)
+-Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274)
+-Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118)
+-Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45)
+-Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27)
+diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005
+deleted file mode 100644
+index cc4eb90b82..0000000000
+--- a/advisories/GLIBC-SA-2023-0005
++++ /dev/null
+@@ -1,18 +0,0 @@
+-getaddrinfo: DoS due to memory leak
+-
+-The fix for CVE-2023-4806 introduced a memory leak when an application
+-calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED
+-flags set.
+-
+-CVE-Id: CVE-2023-5156
+-Public-Date: 2023-09-25
+-Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420)
+-Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270)
+-Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115)
+-Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39)
+-Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20)
+-Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421)
+-Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272)
+-Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116)
+-Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42)
+-Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24)
+diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001
+deleted file mode 100644
+index 28931c75ae..0000000000
+--- a/advisories/GLIBC-SA-2024-0001
++++ /dev/null
+@@ -1,15 +0,0 @@
+-syslog: Heap buffer overflow in __vsyslog_internal
+-
+-__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER
+-containing a long program name failed to update the required buffer
+-size, leading to the allocation and overflow of a too-small buffer on
+-the heap.
+-
+-CVE-Id: CVE-2023-6246
+-Public-Date: 2024-01-30
+-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37)
+-Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39)
+-Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42)
+-Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57)
+-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16)
+-Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126)
+diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002
+deleted file mode 100644
+index 940bfcf2fc..0000000000
+--- a/advisories/GLIBC-SA-2024-0002
++++ /dev/null
+@@ -1,15 +0,0 @@
+-syslog: Heap buffer overflow in __vsyslog_internal
+-
+-__vsyslog_internal used the return value of snprintf/vsnprintf to
+-calculate buffer sizes for memory allocation. If these functions (for
+-any reason) failed and returned -1, the resulting buffer would be too
+-small to hold output.
+-
+-CVE-Id: CVE-2023-6779
+-Public-Date: 2024-01-30
+-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37)
+-Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39)
+-Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43)
+-Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58)
+-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16)
+-Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127)
+diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003
+deleted file mode 100644
+index b43a5150ab..0000000000
+--- a/advisories/GLIBC-SA-2024-0003
++++ /dev/null
+@@ -1,13 +0,0 @@
+-syslog: Integer overflow in __vsyslog_internal
+-
+-__vsyslog_internal calculated a buffer size by adding two integers, but
+-did not first check if the addition would overflow.
+-
+-CVE-Id: CVE-2023-6780
+-Public-Date: 2024-01-30
+-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37)
+-Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39)
+-Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44)
+-Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59)
+-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16)
+-Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128)
+diff --git a/advisories/README b/advisories/README
+deleted file mode 100644
+index 94e68b1350..0000000000
+--- a/advisories/README
++++ /dev/null
+@@ -1,73 +0,0 @@
+-GNU C Library Security Advisory Format
+-======================================
+-
+-Security advisories in this directory follow a simple git commit log
+-format, with a heading and free-format description augmented with tags
+-to allow parsing key information. References to code changes are
+-specific to the glibc repository and follow a specific format:
+-
+- Tag-name: <commit-ref> (release-version)
+-
+-The <commit-ref> indicates a specific commit in the repository. The
+-release-version indicates the publicly consumable release in which this
+-commit is known to exist. The release-version is derived from the
+-git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and
+-is of the form 2.34-NNN. If the -NNN suffix is absent, it means that
+-the change is in that release tarball, otherwise the change is on the
+-release/2.YY/master branch and not in any released tarball.
+-
+-The following tags are currently being used:
+-
+-CVE-Id:
+-This is the CVE-Id assigned under the CVE Program
+-(https://www.cve.org/).
+-
+-Public-Date:
+-The date this issue became publicly known.
+-
+-Vulnerable-Commit:
+-The commit that introduced this vulnerability. There could be multiple
+-entries, one for each release branch in the glibc repository; the
+-release-version portion of this tag should tell you which branch this is
+-on.
+-
+-Fix-Commit:
+-The commit that fixed this vulnerability. There could be multiple
+-entries for each release branch in the glibc repository, indicating that
+-all of those commits contributed to fixing that issue in each of those
+-branches.
+-
+-Adding an Advisory
+-------------------
+-
+-An advisory for a CVE needs to be added on the master branch in two steps:
+-
+-1. Add the text of the advisory without any Fix-Commit tags along with
+- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable.
+- The advisories directory does not exist in release branches, so keep
+- the advisory text commit distinct from the code changes, to ease
+- backports. Ask for the GLIBC-SA advisory number from the security
+- team.
+-
+-2. Finish all backports on release branches and then back on the msater
+- branch, add all commit refs to the advisory using the Fix-Commit
+- tags. Don't bother adding the release-version subscript since the
+- next step will overwrite it.
+-
+-3. Run the process-advisories.sh script in the scripts directory on the
+- advisory:
+-
+- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN
+-
+- (replace YYYY-NNNN with the actual advisory number).
+-
+-4. Verify the updated advisory and push the result.
+-
+-Getting a NEWS snippet from advisories
+---------------------------------------
+-
+-Run:
+-
+- scripts/process-advisories.sh news
+-
+-and copy the content into the NEWS file.
+diff --git a/bits/wordsize.h b/bits/wordsize.h
+index 14edae3a11..53013a9275 100644
+--- a/bits/wordsize.h
++++ b/bits/wordsize.h
+@@ -21,7 +21,9 @@
+ #define __WORDSIZE32_PTRDIFF_LONG
+
+ /* Set to 1 in order to force time types to be 32 bits instead of 64 bits in
+- struct lastlog and struct utmp{,x} on 64-bit ports. This may be done in
++ struct lastlog and struct utmp{,x}. This may be done in
+ order to make 64-bit ports compatible with 32-bit ports. Set to 0 for
+- 64-bit ports where the time types are 64-bits or for any 32-bit ports. */
++ 64-bit ports where the time types are 64-bits and new 32-bit ports
++ where time_t is 64 bits, and there is no companion architecture with
++ 32-bit time_t. */
+ #define __WORDSIZE_TIME64_COMPAT32
+diff --git a/config.h.in b/config.h.in
+index 44a34072a4..1e647de585 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -141,6 +141,9 @@
+ /* LOONGARCH floating-point ABI for ld.so. */
+ #undef LOONGARCH_ABI_FRLEN
+
++/* Define whether ARM used hard-float and support VFPvX-D32. */
++#undef HAVE_ARM_PCS_VFP_D32
++
+ /* Linux specific: minimum supported kernel version. */
+ #undef __LINUX_KERNEL_VERSION
+
+@@ -283,6 +286,9 @@
+ /* Define if x86 ISA level should be included in shared libraries. */
+ #undef INCLUDE_X86_ISA_LEVEL
+
++/* The x86 ISA level. 1 for baseline. Undefined on non-x86. */
++#undef MINIMUM_X86_ISA_LEVEL
++
+ /* Define if -msahf is enabled by default on x86. */
+ #undef HAVE_X86_LAHF_SAHF
+
+diff --git a/configure b/configure
+index 59ff1e415d..432e40a592 100755
+--- a/configure
++++ b/configure
+@@ -653,7 +653,7 @@ LIBGD
+ libc_cv_cc_loop_to_function
+ libc_cv_cc_submachine
+ libc_cv_cc_nofma
+-libc_cv_mtls_dialect_gnu2
++libc_cv_mtls_descriptor
+ libc_cv_has_glob_dat
+ libc_cv_fpie
+ libc_cv_z_execstack
+@@ -4760,6 +4760,9 @@ libc_config_ok=no
+ # whether to use such directories.
+ with_fp_cond=1
+
++# A preconfigure script may define another name to TLS descriptor variant
++mtls_descriptor=gnu2
++
+ if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null`
+ then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5
+@@ -7006,9 +7009,9 @@ fi
+ printf "%s\n" "$libc_cv_has_glob_dat" >&6; }
+
+
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect=gnu2" >&5
+-printf %s "checking for -mtls-dialect=gnu2... " >&6; }
+-if test ${libc_cv_mtls_dialect_gnu2+y}
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tls descriptor support" >&5
++printf %s "checking for tls descriptor support... " >&6; }
++if test ${libc_cv_mtls_descriptor+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+@@ -7019,25 +7022,25 @@ void foo (void)
+ i = 10;
+ }
+ EOF
+-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles
+- conftest.c -o conftest 1>&5'
++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles
++ -shared conftest.c -o conftest 1>&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }
+ then
+- libc_cv_mtls_dialect_gnu2=yes
++ libc_cv_mtls_descriptor=$mtls_descriptor
+ else
+- libc_cv_mtls_dialect_gnu2=no
++ libc_cv_mtls_descriptor=no
+ fi
+ rm -f conftest*
+ fi
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_dialect_gnu2" >&5
+-printf "%s\n" "$libc_cv_mtls_dialect_gnu2" >&6; }
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_descriptor" >&5
++printf "%s\n" "$libc_cv_mtls_descriptor" >&6; }
+
+ config_vars="$config_vars
+-have-mtls-dialect-gnu2 = $libc_cv_mtls_dialect_gnu2"
++have-mtls-descriptor = $libc_cv_mtls_descriptor"
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases" >&5
+ printf %s "checking if -Wno-ignored-attributes is required for aliases... " >&6; }
+diff --git a/configure.ac b/configure.ac
+index 65799e5685..bdc385d03c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -442,6 +442,9 @@ libc_config_ok=no
+ # whether to use such directories.
+ with_fp_cond=1
+
++# A preconfigure script may define another name to TLS descriptor variant
++mtls_descriptor=gnu2
++
+ dnl Let sysdeps/*/preconfigure act here.
+ LIBC_PRECONFIGURE([$srcdir], [for sysdeps])
+
+@@ -1287,7 +1290,7 @@ fi
+ rm -f conftest*])
+ AC_SUBST(libc_cv_has_glob_dat)
+
+-AC_CACHE_CHECK([for -mtls-dialect=gnu2], libc_cv_mtls_dialect_gnu2,
++AC_CACHE_CHECK([for tls descriptor support], libc_cv_mtls_descriptor,
+ [dnl
+ cat > conftest.c <<EOF
+ __thread int i;
+@@ -1296,16 +1299,16 @@ void foo (void)
+ i = 10;
+ }
+ EOF
+-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles
+- conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD])
++if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles
++ -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD])
+ then
+- libc_cv_mtls_dialect_gnu2=yes
++ libc_cv_mtls_descriptor=$mtls_descriptor
+ else
+- libc_cv_mtls_dialect_gnu2=no
++ libc_cv_mtls_descriptor=no
+ fi
+ rm -f conftest*])
+-AC_SUBST(libc_cv_mtls_dialect_gnu2)
+-LIBC_CONFIG_VAR([have-mtls-dialect-gnu2], [$libc_cv_mtls_dialect_gnu2])
++AC_SUBST(libc_cv_mtls_descriptor)
++LIBC_CONFIG_VAR([have-mtls-descriptor], [$libc_cv_mtls_descriptor])
+
+ dnl clang emits an warning for a double alias redirection, to warn the
+ dnl original symbol is sed even when weak definition overrides it.
+diff --git a/elf/Makefile b/elf/Makefile
+index 5d78b659ce..a50a988e73 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -170,6 +170,7 @@ CFLAGS-.op += $(call elide-stack-protector,.op,$(elide-routines.os))
+ CFLAGS-.os += $(call elide-stack-protector,.os,$(all-rtld-routines))
+
+ # Add the requested compiler flags to the early startup code.
++CFLAGS-dl-misc.os += $(rtld-early-cflags)
+ CFLAGS-dl-printf.os += $(rtld-early-cflags)
+ CFLAGS-dl-setup_hash.os += $(rtld-early-cflags)
+ CFLAGS-dl-sysdep.os += $(rtld-early-cflags)
+@@ -424,6 +425,7 @@ tests += \
+ tst-glibc-hwcaps-prepend \
+ tst-global1 \
+ tst-global2 \
++ tst-gnu2-tls2 \
+ tst-initfinilazyfail \
+ tst-initorder \
+ tst-initorder2 \
+@@ -846,6 +848,9 @@ modules-names += \
+ tst-filterobj-flt \
+ tst-finilazyfailmod \
+ tst-globalmod2 \
++ tst-gnu2-tls2mod0 \
++ tst-gnu2-tls2mod1 \
++ tst-gnu2-tls2mod2 \
+ tst-initlazyfailmod \
+ tst-initorder2a \
+ tst-initorder2b \
+@@ -995,13 +1000,13 @@ modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\
+ # For +depfiles in Makerules.
+ extra-test-objs += tst-auditmod17.os
+
+-ifeq (yes,$(have-mtls-dialect-gnu2))
++ifneq (no,$(have-mtls-descriptor))
+ tests += tst-gnu2-tls1
+ modules-names += tst-gnu2-tls1mod
+ $(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so
+ tst-gnu2-tls1mod.so-no-z-defs = yes
+-CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2
+-endif # $(have-mtls-dialect-gnu2)
++CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=$(have-mtls-descriptor)
++endif # $(have-mtls-descriptor)
+
+ ifeq (yes,$(have-protected-data))
+ modules-names += tst-protected1moda tst-protected1modb
+@@ -2968,11 +2973,11 @@ $(objpfx)tst-tls-allocation-failure-static-patched.out: \
+ $(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \
+ $(objpfx)tst-audit-tlsdesc-mod2.so \
+ $(shared-thread-library)
+-ifeq (yes,$(have-mtls-dialect-gnu2))
++ifneq (no,$(have-mtls-descriptor))
+ # The test is valid for all TLS types, but we want to exercise GNU2
+ # TLS if possible.
+-CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=gnu2
+-CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=gnu2
++CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=$(have-mtls-descriptor)
+ endif
+ $(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library)
+ $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.so \
+@@ -3044,8 +3049,18 @@ $(objpfx)tst-tlsgap.out: \
+ $(objpfx)tst-tlsgap-mod0.so \
+ $(objpfx)tst-tlsgap-mod1.so \
+ $(objpfx)tst-tlsgap-mod2.so
+-ifeq (yes,$(have-mtls-dialect-gnu2))
+-CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2
+-CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2
+-CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2
++
++$(objpfx)tst-gnu2-tls2: $(shared-thread-library)
++$(objpfx)tst-gnu2-tls2.out: \
++ $(objpfx)tst-gnu2-tls2mod0.so \
++ $(objpfx)tst-gnu2-tls2mod1.so \
++ $(objpfx)tst-gnu2-tls2mod2.so
++
++ifneq (no,$(have-mtls-descriptor))
++CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=$(have-mtls-descriptor)
+ endif
+diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c
+index 7345ebc4e5..aaf67b87e8 100644
+--- a/elf/dl-diagnostics.c
++++ b/elf/dl-diagnostics.c
+@@ -235,6 +235,8 @@ _dl_print_diagnostics (char **environ)
+ _dl_diagnostics_print_labeled_value ("dl_hwcap", GLRO (dl_hwcap));
+ _dl_diagnostics_print_labeled_value ("dl_hwcap_important", HWCAP_IMPORTANT);
+ _dl_diagnostics_print_labeled_value ("dl_hwcap2", GLRO (dl_hwcap2));
++ _dl_diagnostics_print_labeled_value ("dl_hwcap3", GLRO (dl_hwcap3));
++ _dl_diagnostics_print_labeled_value ("dl_hwcap4", GLRO (dl_hwcap4));
+ _dl_diagnostics_print_labeled_string
+ ("dl_hwcaps_subdirs", _dl_hwcaps_subdirs);
+ _dl_diagnostics_print_labeled_value
+diff --git a/elf/dl-support.c b/elf/dl-support.c
+index 2f502c8b0d..451932dd03 100644
+--- a/elf/dl-support.c
++++ b/elf/dl-support.c
+@@ -158,6 +158,8 @@ const ElfW(Phdr) *_dl_phdr;
+ size_t _dl_phnum;
+ uint64_t _dl_hwcap;
+ uint64_t _dl_hwcap2;
++uint64_t _dl_hwcap3;
++uint64_t _dl_hwcap4;
+
+ enum dso_sort_algorithm _dl_dso_sort_algo;
+
+diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
+index 03e1a68675..614ac9c047 100644
+--- a/elf/dl-tunables.c
++++ b/elf/dl-tunables.c
+@@ -32,6 +32,7 @@
+ #include <ldsodefs.h>
+ #include <array_length.h>
+ #include <dl-minimal-malloc.h>
++#include <dl-symbol-redir-ifunc.h>
+
+ #define TUNABLES_INTERNAL 1
+ #include "dl-tunables.h"
+@@ -223,6 +224,7 @@ parse_tunables_string (const char *valstring, struct tunable_toset_t *tunables)
+ {
+ tunables[ntunables++] =
+ (struct tunable_toset_t) { cur, value, p - value };
++
+ break;
+ }
+ }
+@@ -234,23 +236,27 @@ parse_tunables_string (const char *valstring, struct tunable_toset_t *tunables)
+ static void
+ parse_tunables (const char *valstring)
+ {
+- struct tunable_toset_t tunables[tunables_list_size];
+- int ntunables = parse_tunables_string (valstring, tunables);
+- if (ntunables == -1)
++ struct tunable_toset_t tunables[tunables_list_size] = { 0 };
++ if (parse_tunables_string (valstring, tunables) == -1)
+ {
+ _dl_error_printf (
+ "WARNING: ld.so: invalid GLIBC_TUNABLES `%s': ignored.\n", valstring);
+ return;
+ }
+
+- for (int i = 0; i < ntunables; i++)
+- if (!tunable_initialize (tunables[i].t, tunables[i].value,
+- tunables[i].len))
+- _dl_error_printf ("WARNING: ld.so: invalid GLIBC_TUNABLES value `%.*s' "
+- "for option `%s': ignored.\n",
+- (int) tunables[i].len,
+- tunables[i].value,
+- tunables[i].t->name);
++ for (int i = 0; i < tunables_list_size; i++)
++ {
++ if (tunables[i].t == NULL)
++ continue;
++
++ if (!tunable_initialize (tunables[i].t, tunables[i].value,
++ tunables[i].len))
++ _dl_error_printf ("WARNING: ld.so: invalid GLIBC_TUNABLES value `%.*s' "
++ "for option `%s': ignored.\n",
++ (int) tunables[i].len,
++ tunables[i].value,
++ tunables[i].t->name);
++ }
+ }
+
+ /* Initialize the tunables list from the environment. For now we only use the
+diff --git a/elf/elf.h b/elf/elf.h
+index 455731663c..1c394c64cd 100644
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -1234,6 +1234,10 @@ typedef struct
+ #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size. */
+ #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment. */
+
++/* More machine-dependent hints about processor capabilities. */
++#define AT_HWCAP3 29 /* extension of AT_HWCAP. */
++#define AT_HWCAP4 30 /* extension of AT_HWCAP. */
++
+ #define AT_EXECFN 31 /* Filename of executable. */
+
+ /* Pointer to the global system page used for system calls and other
+diff --git a/elf/tst-gnu2-tls2.c b/elf/tst-gnu2-tls2.c
+new file mode 100644
+index 0000000000..7ac04d7f33
+--- /dev/null
++++ b/elf/tst-gnu2-tls2.c
+@@ -0,0 +1,122 @@
++/* Test TLSDESC relocation.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <dlfcn.h>
++#include <pthread.h>
++#include <support/xdlfcn.h>
++#include <support/xthread.h>
++#include <support/check.h>
++#include <support/test-driver.h>
++#include "tst-gnu2-tls2.h"
++
++#ifndef IS_SUPPORTED
++# define IS_SUPPORTED() true
++#endif
++
++/* An architecture can define it to clobber caller-saved registers in
++ malloc below to verify that the implicit TLSDESC call won't change
++ caller-saved registers. */
++#ifndef PREPARE_MALLOC
++# define PREPARE_MALLOC()
++#endif
++
++extern void * __libc_malloc (size_t);
++
++size_t malloc_counter = 0;
++
++void *
++malloc (size_t n)
++{
++ PREPARE_MALLOC ();
++ malloc_counter++;
++ return __libc_malloc (n);
++}
++
++static void *mod[3];
++#ifndef MOD
++# define MOD(i) "tst-gnu2-tls2mod" #i ".so"
++#endif
++static const char *modname[3] = { MOD(0), MOD(1), MOD(2) };
++#undef MOD
++
++static void
++open_mod (int i)
++{
++ mod[i] = xdlopen (modname[i], RTLD_LAZY);
++ printf ("open %s\n", modname[i]);
++}
++
++static void
++close_mod (int i)
++{
++ xdlclose (mod[i]);
++ mod[i] = NULL;
++ printf ("close %s\n", modname[i]);
++}
++
++static void
++access_mod (int i, const char *sym)
++{
++ struct tls var = { -1, -1, -1, -1 };
++ struct tls *(*f) (struct tls *) = xdlsym (mod[i], sym);
++ /* Check that our malloc is called. */
++ malloc_counter = 0;
++ struct tls *p = f (&var);
++ TEST_VERIFY (malloc_counter != 0);
++ printf ("access %s: %s() = %p\n", modname[i], sym, p);
++ TEST_VERIFY_EXIT (memcmp (p, &var, sizeof (var)) == 0);
++ ++(p->a);
++}
++
++static void *
++start (void *arg)
++{
++ /* The DTV generation is at the last dlopen of mod0 and the
++ entry for mod1 is NULL. */
++
++ open_mod (1); /* Reuse modid of mod1. Uses dynamic TLS. */
++
++ /* Force the slow path in GNU2 TLS descriptor call. */
++ access_mod (1, "apply_tls");
++
++ return arg;
++}
++
++static int
++do_test (void)
++{
++ if (!IS_SUPPORTED ())
++ return EXIT_UNSUPPORTED;
++
++ open_mod (0);
++ open_mod (1);
++ open_mod (2);
++ close_mod (0);
++ close_mod (1); /* Create modid gap at mod1. */
++ open_mod (0); /* Reuse modid of mod0, bump generation count. */
++
++ /* Create a thread where DTV of mod1 is NULL. */
++ pthread_t t = xpthread_create (NULL, start, NULL);
++ xpthread_join (t);
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h
+new file mode 100644
+index 0000000000..1ade8151e2
+--- /dev/null
++++ b/elf/tst-gnu2-tls2.h
+@@ -0,0 +1,40 @@
++/* Test TLSDESC relocation.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdint.h>
++
++struct tls
++{
++ int64_t a, b, c, d;
++};
++
++extern struct tls *apply_tls (struct tls *);
++
++/* An architecture can define them to verify that clobber caller-saved
++ registers aren't changed by the implicit TLSDESC call. */
++#ifndef INIT_TLSDESC_CALL
++# define INIT_TLSDESC_CALL()
++#endif
++
++#ifndef BEFORE_TLSDESC_CALL
++# define BEFORE_TLSDESC_CALL()
++#endif
++
++#ifndef AFTER_TLSDESC_CALL
++# define AFTER_TLSDESC_CALL()
++#endif
+diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c
+new file mode 100644
+index 0000000000..3fe3c14277
+--- /dev/null
++++ b/elf/tst-gnu2-tls2mod0.c
+@@ -0,0 +1,32 @@
++/* DSO used by tst-gnu2-tls2.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <tst-gnu2-tls2.h>
++
++__thread struct tls tls_var0 __attribute__ ((visibility ("hidden")));
++
++struct tls *
++apply_tls (struct tls *p)
++{
++ INIT_TLSDESC_CALL ();
++ BEFORE_TLSDESC_CALL ();
++ tls_var0 = *p;
++ struct tls *ret = &tls_var0;
++ AFTER_TLSDESC_CALL ();
++ return ret;
++}
+diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c
+new file mode 100644
+index 0000000000..e210538468
+--- /dev/null
++++ b/elf/tst-gnu2-tls2mod1.c
+@@ -0,0 +1,32 @@
++/* DSO used by tst-gnu2-tls2.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <tst-gnu2-tls2.h>
++
++__thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden")));
++
++struct tls *
++apply_tls (struct tls *p)
++{
++ INIT_TLSDESC_CALL ();
++ BEFORE_TLSDESC_CALL ();
++ tls_var1[1] = *p;
++ struct tls *ret = &tls_var1[1];
++ AFTER_TLSDESC_CALL ();
++ return ret;
++}
+diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c
+new file mode 100644
+index 0000000000..6d3031dc5f
+--- /dev/null
++++ b/elf/tst-gnu2-tls2mod2.c
+@@ -0,0 +1,32 @@
++/* DSO used by tst-gnu2-tls2.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <tst-gnu2-tls2.h>
++
++__thread struct tls tls_var2 __attribute__ ((visibility ("hidden")));
++
++struct tls *
++apply_tls (struct tls *p)
++{
++ INIT_TLSDESC_CALL ();
++ BEFORE_TLSDESC_CALL ();
++ tls_var2 = *p;
++ struct tls *ret = &tls_var2;
++ AFTER_TLSDESC_CALL ();
++ return ret;
++}
+diff --git a/elf/tst-tunables.c b/elf/tst-tunables.c
+index 095b5c81d9..dff34ed748 100644
+--- a/elf/tst-tunables.c
++++ b/elf/tst-tunables.c
+@@ -17,6 +17,10 @@
+ <https://www.gnu.org/licenses/>. */
+
+ #include <array_length.h>
++/* The test uses the tunable_list size, which is only exported for
++ ld.so. This will result in a copy of tunable_list, which is ununsed by
++ the test itself. */
++#define TUNABLES_INTERNAL 1
+ #include <dl-tunables.h>
+ #include <getopt.h>
+ #include <intprops.h>
+@@ -24,12 +28,13 @@
+ #include <stdlib.h>
+ #include <support/capture_subprocess.h>
+ #include <support/check.h>
++#include <support/support.h>
+
+ static int restart;
+ #define CMDLINE_OPTIONS \
+ { "restart", no_argument, &restart, 1 },
+
+-static const struct test_t
++static struct test_t
+ {
+ const char *name;
+ const char *value;
+@@ -284,6 +289,29 @@ static const struct test_t
+ 0,
+ 0,
+ },
++ /* Also check for repeated tunables with a count larger than the total number
++ of tunables. */
++ {
++ "GLIBC_TUNABLES",
++ NULL,
++ 2,
++ 0,
++ 0,
++ },
++ {
++ "GLIBC_TUNABLES",
++ NULL,
++ 1,
++ 0,
++ 0,
++ },
++ {
++ "GLIBC_TUNABLES",
++ NULL,
++ 0,
++ 0,
++ 0,
++ },
+ };
+
+ static int
+@@ -327,6 +355,37 @@ do_test (int argc, char *argv[])
+ spargv[i] = NULL;
+ }
+
++ /* Create a tunable line with the duplicate values with a total number
++ larger than the different number of tunables. */
++ {
++ enum { tunables_list_size = array_length (tunable_list) };
++ const char *value = "";
++ for (int i = 0; i < tunables_list_size; i++)
++ value = xasprintf ("%sglibc.malloc.check=2%c",
++ value,
++ i == (tunables_list_size - 1) ? '\0' : ':');
++ tests[33].value = value;
++ }
++ /* Same as before, but the last tunable values is differen than the
++ rest. */
++ {
++ enum { tunables_list_size = array_length (tunable_list) };
++ const char *value = "";
++ for (int i = 0; i < tunables_list_size - 1; i++)
++ value = xasprintf ("%sglibc.malloc.check=2:", value);
++ value = xasprintf ("%sglibc.malloc.check=1", value);
++ tests[34].value = value;
++ }
++ /* Same as before, but with an invalid last entry. */
++ {
++ enum { tunables_list_size = array_length (tunable_list) };
++ const char *value = "";
++ for (int i = 0; i < tunables_list_size - 1; i++)
++ value = xasprintf ("%sglibc.malloc.check=2:", value);
++ value = xasprintf ("%sglibc.malloc.check=1=1", value);
++ tests[35].value = value;
++ }
++
+ for (int i = 0; i < array_length (tests); i++)
+ {
+ snprintf (nteststr, sizeof nteststr, "%d", i);
+diff --git a/iconvdata/Makefile b/iconvdata/Makefile
+index ea019ce5c0..7196a8744b 100644
+--- a/iconvdata/Makefile
++++ b/iconvdata/Makefile
+@@ -75,7 +75,8 @@ ifeq (yes,$(build-shared))
+ tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
+ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
+ bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
+- bug-iconv13 bug-iconv14 bug-iconv15
++ bug-iconv13 bug-iconv14 bug-iconv15 \
++ tst-iconv-iso-2022-cn-ext
+ ifeq ($(have-thread-library),yes)
+ tests += bug-iconv3
+ endif
+@@ -330,6 +331,8 @@ $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \
+ $(addprefix $(objpfx),$(modules.so))
+ $(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \
+ $(addprefix $(objpfx),$(modules.so))
++$(objpfx)tst-iconv-iso-2022-cn-ext.out: $(addprefix $(objpfx), $(gconv-modules)) \
++ $(addprefix $(objpfx),$(modules.so))
+
+ $(objpfx)iconv-test.out: run-iconv-test.sh \
+ $(addprefix $(objpfx), $(gconv-modules)) \
+diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c
+index b34c8a36f4..cce29b1969 100644
+--- a/iconvdata/iso-2022-cn-ext.c
++++ b/iconvdata/iso-2022-cn-ext.c
+@@ -574,6 +574,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ { \
+ const char *escseq; \
+ \
++ if (outptr + 4 > outend) \
++ { \
++ result = __GCONV_FULL_OUTPUT; \
++ break; \
++ } \
++ \
+ assert (used == CNS11643_2_set); /* XXX */ \
+ escseq = "*H"; \
+ *outptr++ = ESC; \
+@@ -587,6 +593,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ { \
+ const char *escseq; \
+ \
++ if (outptr + 4 > outend) \
++ { \
++ result = __GCONV_FULL_OUTPUT; \
++ break; \
++ } \
++ \
+ assert ((used >> 5) >= 3 && (used >> 5) <= 7); \
+ escseq = "+I+J+K+L+M" + ((used >> 5) - 3) * 2; \
+ *outptr++ = ESC; \
+diff --git a/iconvdata/tst-iconv-iso-2022-cn-ext.c b/iconvdata/tst-iconv-iso-2022-cn-ext.c
+new file mode 100644
+index 0000000000..96a8765fd5
+--- /dev/null
++++ b/iconvdata/tst-iconv-iso-2022-cn-ext.c
+@@ -0,0 +1,128 @@
++/* Verify ISO-2022-CN-EXT does not write out of the bounds.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdio.h>
++#include <string.h>
++
++#include <errno.h>
++#include <iconv.h>
++#include <sys/mman.h>
++
++#include <support/xunistd.h>
++#include <support/check.h>
++#include <support/support.h>
++
++/* The test sets up a two memory page buffer with the second page marked
++ PROT_NONE to trigger a fault if the conversion writes beyond the exact
++ expected amount. Then we carry out various conversions and precisely
++ place the start of the output buffer in order to trigger a SIGSEGV if the
++ process writes anywhere between 1 and page sized bytes more (only one
++ PROT_NONE page is setup as a canary) than expected. These tests exercise
++ all three of the cases in ISO-2022-CN-EXT where the converter must switch
++ character sets and may run out of buffer space while doing the
++ operation. */
++
++static int
++do_test (void)
++{
++ iconv_t cd = iconv_open ("ISO-2022-CN-EXT", "UTF-8");
++ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
++
++ char *ntf;
++ size_t ntfsize;
++ char *outbufbase;
++ {
++ int pgz = getpagesize ();
++ TEST_VERIFY_EXIT (pgz > 0);
++ ntfsize = 2 * pgz;
++
++ ntf = xmmap (NULL, ntfsize, PROT_READ | PROT_WRITE, MAP_PRIVATE
++ | MAP_ANONYMOUS, -1);
++ xmprotect (ntf + pgz, pgz, PROT_NONE);
++
++ outbufbase = ntf + pgz;
++ }
++
++ /* Check if SOdesignation escape sequence does not trigger an OOB write. */
++ {
++ char inbuf[] = "\xe4\xba\xa4\xe6\x8d\xa2";
++
++ for (int i = 0; i < 9; i++)
++ {
++ char *inp = inbuf;
++ size_t inleft = sizeof (inbuf) - 1;
++
++ char *outp = outbufbase - i;
++ size_t outleft = i;
++
++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft)
++ == (size_t) -1);
++ TEST_COMPARE (errno, E2BIG);
++
++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0);
++ }
++ }
++
++ /* Same as before for SS2designation. */
++ {
++ char inbuf[] = "㴽 \xe3\xb4\xbd";
++
++ for (int i = 0; i < 14; i++)
++ {
++ char *inp = inbuf;
++ size_t inleft = sizeof (inbuf) - 1;
++
++ char *outp = outbufbase - i;
++ size_t outleft = i;
++
++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft)
++ == (size_t) -1);
++ TEST_COMPARE (errno, E2BIG);
++
++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0);
++ }
++ }
++
++ /* Same as before for SS3designation. */
++ {
++ char inbuf[] = "劄 \xe5\x8a\x84";
++
++ for (int i = 0; i < 14; i++)
++ {
++ char *inp = inbuf;
++ size_t inleft = sizeof (inbuf) - 1;
++
++ char *outp = outbufbase - i;
++ size_t outleft = i;
++
++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft)
++ == (size_t) -1);
++ TEST_COMPARE (errno, E2BIG);
++
++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0);
++ }
++ }
++
++ TEST_VERIFY_EXIT (iconv_close (cd) != -1);
++
++ xmunmap (ntf, ntfsize);
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/login/Makefile b/login/Makefile
+index 1e22008a61..f91190e3dc 100644
+--- a/login/Makefile
++++ b/login/Makefile
+@@ -44,7 +44,9 @@ subdir-dirs = programs
+ vpath %.c programs
+
+ tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \
+- tst-pututxline-lockfail tst-pututxline-cache
++ tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64
++
++CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
+
+ # Empty compatibility library for old binaries.
+ extra-libs := libutil
+diff --git a/login/tst-utmp-size-64.c b/login/tst-utmp-size-64.c
+new file mode 100644
+index 0000000000..7a581a4c12
+--- /dev/null
++++ b/login/tst-utmp-size-64.c
+@@ -0,0 +1,2 @@
++/* The on-disk layout must not change in time64 mode. */
++#include "tst-utmp-size.c"
+diff --git a/login/tst-utmp-size.c b/login/tst-utmp-size.c
+new file mode 100644
+index 0000000000..1b7f7ff042
+--- /dev/null
++++ b/login/tst-utmp-size.c
+@@ -0,0 +1,33 @@
++/* Check expected sizes of struct utmp, struct utmpx, struct lastlog.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <utmp.h>
++#include <utmpx.h>
++#include <utmp-size.h>
++
++static int
++do_test (void)
++{
++ _Static_assert (sizeof (struct utmp) == UTMP_SIZE, "struct utmp size");
++ _Static_assert (sizeof (struct utmpx) == UTMP_SIZE, "struct utmpx size");
++ _Static_assert (sizeof (struct lastlog) == LASTLOG_SIZE,
++ "struct lastlog size");
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/manual/stdbit.texi b/manual/stdbit.texi
+index fe41c671d8..6c75ed9a20 100644
+--- a/manual/stdbit.texi
++++ b/manual/stdbit.texi
+@@ -32,7 +32,13 @@ and @code{unsigned long long int}. In addition, there is a
+ corresponding type-generic macro (not listed below), named the same as
+ the functions but without any suffix such as @samp{_uc}. The
+ type-generic macro can only be used with an argument of an unsigned
+-integer type with a width of 8, 16, 32 or 64 bits.
++integer type with a width of 8, 16, 32 or 64 bits, or when using
++a compiler with support for
++@uref{https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html,@code{__builtin_stdc_bit_ceil}},
++etc.@:, built-in functions such as GCC 14.1 or later
++any unsigned integer type those built-in functions support.
++In GCC 14.1 that includes support for @code{unsigned __int128} and
++@code{unsigned _BitInt(@var{n})} if supported by the target.
+
+ @deftypefun {unsigned int} stdc_leading_zeros_uc (unsigned char @var{x})
+ @deftypefunx {unsigned int} stdc_leading_zeros_us (unsigned short @var{x})
+diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
+index 0c6e46f15c..01d554af9c 100644
+--- a/nscd/netgroupcache.c
++++ b/nscd/netgroupcache.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
++#include <scratch_buffer.h>
+
+ #include "../nss/netgroup.h"
+ #include "nscd.h"
+@@ -65,6 +66,16 @@ struct dataset
+ char strdata[0];
+ };
+
++/* Send a notfound response to FD. Always returns -1 to indicate an
++ ephemeral error. */
++static time_t
++send_notfound (int fd)
++{
++ if (fd != -1)
++ TEMP_FAILURE_RETRY (send (fd, &notfound, sizeof (notfound), MSG_NOSIGNAL));
++ return -1;
++}
++
+ /* Sends a notfound message and prepares a notfound dataset to write to the
+ cache. Returns true if there was enough memory to allocate the dataset and
+ returns the dataset in DATASETP, total bytes to write in TOTALP and the
+@@ -83,8 +94,7 @@ do_notfound (struct database_dyn *db, int fd, request_header *req,
+ total = sizeof (notfound);
+ timeout = time (NULL) + db->negtimeout;
+
+- if (fd != -1)
+- TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
++ send_notfound (fd);
+
+ dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1);
+ /* If we cannot permanently store the result, so be it. */
+@@ -109,11 +119,78 @@ do_notfound (struct database_dyn *db, int fd, request_header *req,
+ return cacheable;
+ }
+
++struct addgetnetgrentX_scratch
++{
++ /* This is the result that the caller should use. It can be NULL,
++ point into buffer, or it can be in the cache. */
++ struct dataset *dataset;
++
++ struct scratch_buffer buffer;
++
++ /* Used internally in addgetnetgrentX as a staging area. */
++ struct scratch_buffer tmp;
++
++ /* Number of bytes in buffer that are actually used. */
++ size_t buffer_used;
++};
++
++static void
++addgetnetgrentX_scratch_init (struct addgetnetgrentX_scratch *scratch)
++{
++ scratch->dataset = NULL;
++ scratch_buffer_init (&scratch->buffer);
++ scratch_buffer_init (&scratch->tmp);
++
++ /* Reserve space for the header. */
++ scratch->buffer_used = sizeof (struct dataset);
++ static_assert (sizeof (struct dataset) < sizeof (scratch->tmp.__space),
++ "initial buffer space");
++ memset (scratch->tmp.data, 0, sizeof (struct dataset));
++}
++
++static void
++addgetnetgrentX_scratch_free (struct addgetnetgrentX_scratch *scratch)
++{
++ scratch_buffer_free (&scratch->buffer);
++ scratch_buffer_free (&scratch->tmp);
++}
++
++/* Copy LENGTH bytes from S into SCRATCH. Returns NULL if SCRATCH
++ could not be resized, otherwise a pointer to the copy. */
++static char *
++addgetnetgrentX_append_n (struct addgetnetgrentX_scratch *scratch,
++ const char *s, size_t length)
++{
++ while (true)
++ {
++ size_t remaining = scratch->buffer.length - scratch->buffer_used;
++ if (remaining >= length)
++ break;
++ if (!scratch_buffer_grow_preserve (&scratch->buffer))
++ return NULL;
++ }
++ char *copy = scratch->buffer.data + scratch->buffer_used;
++ memcpy (copy, s, length);
++ scratch->buffer_used += length;
++ return copy;
++}
++
++/* Copy S into SCRATCH, including its null terminator. Returns false
++ if SCRATCH could not be resized. */
++static bool
++addgetnetgrentX_append (struct addgetnetgrentX_scratch *scratch, const char *s)
++{
++ if (s == NULL)
++ s = "";
++ return addgetnetgrentX_append_n (scratch, s, strlen (s) + 1) != NULL;
++}
++
++/* Caller must initialize and free *SCRATCH. If the return value is
++ negative, this function has sent a notfound response. */
+ static time_t
+ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ const char *key, uid_t uid, struct hashentry *he,
+- struct datahead *dh, struct dataset **resultp,
+- void **tofreep)
++ struct datahead *dh, struct addgetnetgrentX_scratch *scratch)
+ {
+ if (__glibc_unlikely (debug_level > 0))
+ {
+@@ -132,14 +209,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+
+ char *key_copy = NULL;
+ struct __netgrent data;
+- size_t buflen = MAX (1024, sizeof (*dataset) + req->key_len);
+- size_t buffilled = sizeof (*dataset);
+- char *buffer = NULL;
+ size_t nentries = 0;
+ size_t group_len = strlen (key) + 1;
+ struct name_list *first_needed
+ = alloca (sizeof (struct name_list) + group_len);
+- *tofreep = NULL;
+
+ if (netgroup_database == NULL
+ && !__nss_database_get (nss_database_netgroup, &netgroup_database))
+@@ -147,12 +220,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ /* No such service. */
+ cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout,
+ &key_copy);
+- goto writeout;
++ goto maybe_cache_add;
+ }
+
+ memset (&data, '\0', sizeof (data));
+- buffer = xmalloc (buflen);
+- *tofreep = buffer;
+ first_needed->next = first_needed;
+ memcpy (first_needed->name, key, group_len);
+ data.needed_groups = first_needed;
+@@ -195,8 +266,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ while (1)
+ {
+ int e;
+- status = getfct.f (&data, buffer + buffilled,
+- buflen - buffilled - req->key_len, &e);
++ status = getfct.f (&data, scratch->tmp.data,
++ scratch->tmp.length, &e);
+ if (status == NSS_STATUS_SUCCESS)
+ {
+ if (data.type == triple_val)
+@@ -204,68 +275,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ const char *nhost = data.val.triple.host;
+ const char *nuser = data.val.triple.user;
+ const char *ndomain = data.val.triple.domain;
+-
+- size_t hostlen = strlen (nhost ?: "") + 1;
+- size_t userlen = strlen (nuser ?: "") + 1;
+- size_t domainlen = strlen (ndomain ?: "") + 1;
+-
+- if (nhost == NULL || nuser == NULL || ndomain == NULL
+- || nhost > nuser || nuser > ndomain)
+- {
+- const char *last = nhost;
+- if (last == NULL
+- || (nuser != NULL && nuser > last))
+- last = nuser;
+- if (last == NULL
+- || (ndomain != NULL && ndomain > last))
+- last = ndomain;
+-
+- size_t bufused
+- = (last == NULL
+- ? buffilled
+- : last + strlen (last) + 1 - buffer);
+-
+- /* We have to make temporary copies. */
+- size_t needed = hostlen + userlen + domainlen;
+-
+- if (buflen - req->key_len - bufused < needed)
+- {
+- buflen += MAX (buflen, 2 * needed);
+- /* Save offset in the old buffer. We don't
+- bother with the NULL check here since
+- we'll do that later anyway. */
+- size_t nhostdiff = nhost - buffer;
+- size_t nuserdiff = nuser - buffer;
+- size_t ndomaindiff = ndomain - buffer;
+-
+- char *newbuf = xrealloc (buffer, buflen);
+- /* Fix up the triplet pointers into the new
+- buffer. */
+- nhost = (nhost ? newbuf + nhostdiff
+- : NULL);
+- nuser = (nuser ? newbuf + nuserdiff
+- : NULL);
+- ndomain = (ndomain ? newbuf + ndomaindiff
+- : NULL);
+- *tofreep = buffer = newbuf;
+- }
+-
+- nhost = memcpy (buffer + bufused,
+- nhost ?: "", hostlen);
+- nuser = memcpy ((char *) nhost + hostlen,
+- nuser ?: "", userlen);
+- ndomain = memcpy ((char *) nuser + userlen,
+- ndomain ?: "", domainlen);
+- }
+-
+- char *wp = buffer + buffilled;
+- wp = memmove (wp, nhost ?: "", hostlen);
+- wp += hostlen;
+- wp = memmove (wp, nuser ?: "", userlen);
+- wp += userlen;
+- wp = memmove (wp, ndomain ?: "", domainlen);
+- wp += domainlen;
+- buffilled = wp - buffer;
++ if (!(addgetnetgrentX_append (scratch, nhost)
++ && addgetnetgrentX_append (scratch, nuser)
++ && addgetnetgrentX_append (scratch, ndomain)))
++ return send_notfound (fd);
+ ++nentries;
+ }
+ else
+@@ -317,8 +330,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ }
+ else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE)
+ {
+- buflen *= 2;
+- *tofreep = buffer = xrealloc (buffer, buflen);
++ if (!scratch_buffer_grow (&scratch->tmp))
++ return send_notfound (fd);
+ }
+ else if (status == NSS_STATUS_RETURN
+ || status == NSS_STATUS_NOTFOUND
+@@ -348,13 +361,20 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ {
+ cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout,
+ &key_copy);
+- goto writeout;
++ goto maybe_cache_add;
+ }
+
+- total = buffilled;
++ /* Capture the result size without the key appended. */
++ total = scratch->buffer_used;
++
++ /* Make a copy of the key. The scratch buffer must not move after
++ this point. */
++ key_copy = addgetnetgrentX_append_n (scratch, key, req->key_len);
++ if (key_copy == NULL)
++ return send_notfound (fd);
+
+ /* Fill in the dataset. */
+- dataset = (struct dataset *) buffer;
++ dataset = scratch->buffer.data;
+ timeout = datahead_init_pos (&dataset->head, total + req->key_len,
+ total - offsetof (struct dataset, resp),
+ he == NULL ? 0 : dh->nreloads + 1,
+@@ -363,11 +383,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ dataset->resp.version = NSCD_VERSION;
+ dataset->resp.found = 1;
+ dataset->resp.nresults = nentries;
+- dataset->resp.result_len = buffilled - sizeof (*dataset);
+-
+- assert (buflen - buffilled >= req->key_len);
+- key_copy = memcpy (buffer + buffilled, key, req->key_len);
+- buffilled += req->key_len;
++ dataset->resp.result_len = total - sizeof (*dataset);
+
+ /* Now we can determine whether on refill we have to create a new
+ record or not. */
+@@ -398,7 +414,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ if (__glibc_likely (newp != NULL))
+ {
+ /* Adjust pointer into the memory block. */
+- key_copy = (char *) newp + (key_copy - buffer);
++ key_copy = (char *) newp + (key_copy - (char *) dataset);
+
+ dataset = memcpy (newp, dataset, total + req->key_len);
+ cacheable = true;
+@@ -410,14 +426,12 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ }
+
+ if (he == NULL && fd != -1)
+- {
+- /* We write the dataset before inserting it to the database
+- since while inserting this thread might block and so would
+- unnecessarily let the receiver wait. */
+- writeout:
++ /* We write the dataset before inserting it to the database since
++ while inserting this thread might block and so would
++ unnecessarily let the receiver wait. */
+ writeall (fd, &dataset->resp, dataset->head.recsize);
+- }
+
++ maybe_cache_add:
+ if (cacheable)
+ {
+ /* If necessary, we also propagate the data to disk. */
+@@ -441,7 +455,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
+ }
+
+ out:
+- *resultp = dataset;
++ scratch->dataset = dataset;
+
+ return timeout;
+ }
+@@ -462,6 +476,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ if (user != NULL)
+ key = strchr (key, '\0') + 1;
+ const char *domain = *key++ ? key : NULL;
++ struct addgetnetgrentX_scratch scratch;
++
++ addgetnetgrentX_scratch_init (&scratch);
+
+ if (__glibc_unlikely (debug_level > 0))
+ {
+@@ -477,12 +494,8 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ group, group_len,
+ db, uid);
+ time_t timeout;
+- void *tofree;
+ if (result != NULL)
+- {
+- timeout = result->head.timeout;
+- tofree = NULL;
+- }
++ timeout = result->head.timeout;
+ else
+ {
+ request_header req_get =
+@@ -491,7 +504,10 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ .key_len = group_len
+ };
+ timeout = addgetnetgrentX (db, -1, &req_get, group, uid, NULL, NULL,
+- &result, &tofree);
++ &scratch);
++ result = scratch.dataset;
++ if (timeout < 0)
++ goto out;
+ }
+
+ struct indataset
+@@ -502,24 +518,26 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ = (struct indataset *) mempool_alloc (db,
+ sizeof (*dataset) + req->key_len,
+ 1);
+- struct indataset dataset_mem;
+ bool cacheable = true;
+ if (__glibc_unlikely (dataset == NULL))
+ {
+ cacheable = false;
+- dataset = &dataset_mem;
++ /* The alloca is safe because nscd_run_worker verfies that
++ key_len is not larger than MAXKEYLEN. */
++ dataset = alloca (sizeof (*dataset) + req->key_len);
+ }
+
+ datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len,
+ sizeof (innetgroup_response_header),
+- he == NULL ? 0 : dh->nreloads + 1, result->head.ttl);
++ he == NULL ? 0 : dh->nreloads + 1,
++ result == NULL ? db->negtimeout : result->head.ttl);
+ /* Set the notfound status and timeout based on the result from
+ getnetgrent. */
+- dataset->head.notfound = result->head.notfound;
++ dataset->head.notfound = result == NULL || result->head.notfound;
+ dataset->head.timeout = timeout;
+
+ dataset->resp.version = NSCD_VERSION;
+- dataset->resp.found = result->resp.found;
++ dataset->resp.found = result != NULL && result->resp.found;
+ /* Until we find a matching entry the result is 0. */
+ dataset->resp.result = 0;
+
+@@ -567,7 +585,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ goto out;
+ }
+
+- if (he == NULL)
++ /* addgetnetgrentX may have already sent a notfound response. Do
++ not send another one. */
++ if (he == NULL && dataset->resp.found)
+ {
+ /* We write the dataset before inserting it to the database
+ since while inserting this thread might block and so would
+@@ -601,7 +621,7 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
+ }
+
+ out:
+- free (tofree);
++ addgetnetgrentX_scratch_free (&scratch);
+ return timeout;
+ }
+
+@@ -611,11 +631,12 @@ addgetnetgrentX_ignore (struct database_dyn *db, int fd, request_header *req,
+ const char *key, uid_t uid, struct hashentry *he,
+ struct datahead *dh)
+ {
+- struct dataset *ignore;
+- void *tofree;
+- time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh,
+- &ignore, &tofree);
+- free (tofree);
++ struct addgetnetgrentX_scratch scratch;
++ addgetnetgrentX_scratch_init (&scratch);
++ time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh, &scratch);
++ addgetnetgrentX_scratch_free (&scratch);
++ if (timeout < 0)
++ timeout = 0;
+ return timeout;
+ }
+
+@@ -659,5 +680,9 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he,
+ .key_len = he->len
+ };
+
+- return addinnetgrX (db, -1, &req, db->data + he->key, he->owner, he, dh);
++ time_t timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner,
++ he, dh);
++ if (timeout < 0)
++ timeout = 0;
++ return timeout;
+ }
+diff --git a/socket/Makefile b/socket/Makefile
+index 74ca5b8452..fc1bd0a260 100644
+--- a/socket/Makefile
++++ b/socket/Makefile
+@@ -70,6 +70,7 @@ tests := \
+ tst-accept4 \
+ tst-cmsg_cloexec \
+ tst-cmsghdr \
++ tst-connect \
+ tst-sockopt \
+ # tests
+
+diff --git a/socket/tst-connect.c b/socket/tst-connect.c
+new file mode 100644
+index 0000000000..ec2fdd92c0
+--- /dev/null
++++ b/socket/tst-connect.c
+@@ -0,0 +1,113 @@
++/* Test the connect function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <arpa/inet.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <stdbool.h>
++#include <support/check.h>
++#include <support/xsocket.h>
++#include <support/xunistd.h>
++#include <sys/socket.h>
++#include <stdio.h>
++
++static struct sockaddr_in server_address;
++
++int
++open_socket_inet_tcp (void)
++{
++ int fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
++ if (fd < 0)
++ {
++ if (errno == EAFNOSUPPORT)
++ FAIL_UNSUPPORTED ("The host does not support IPv4");
++ else
++ FAIL_EXIT1 ("socket (AF_INET, SOCK_STREAM, IPPROTO_TCP): %m\n");
++ }
++ return fd;
++}
++
++static pid_t
++start_server (void)
++{
++ server_address.sin_family = AF_INET;
++ server_address.sin_port = 0;
++ server_address.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
++
++ int server_sock = open_socket_inet_tcp ();
++
++ xbind (server_sock, (struct sockaddr *) &server_address,
++ sizeof (server_address));
++
++ socklen_t sa_len = sizeof (server_address);
++ xgetsockname (server_sock, (struct sockaddr *) &server_address, &sa_len);
++ xlisten (server_sock, 5);
++
++ pid_t my_pid = xfork ();
++ if (my_pid > 0)
++ {
++ xclose (server_sock);
++ return my_pid;
++ }
++
++ struct sockaddr_in client_address;
++ socklen_t ca_len = sizeof (server_address);
++ int client_sock = xaccept (server_sock, (struct sockaddr *) &client_address,
++ &ca_len);
++ printf ("socket accepted %d\n", client_sock);
++
++ _exit (0);
++}
++
++static int
++do_test (void)
++{
++ pid_t serv_pid;
++ struct sockaddr_in peer;
++ socklen_t peer_len;
++
++ serv_pid = start_server ();
++ int client_sock = open_socket_inet_tcp ();
++ xconnect (client_sock, (const struct sockaddr *) &server_address,
++ sizeof (server_address));
++
++ /* A second connect with same arguments should fail with EISCONN. */
++ int result = connect (client_sock,
++ (const struct sockaddr *) &server_address,
++ sizeof (server_address));
++ if (result == 0 || errno != EISCONN)
++ FAIL_EXIT1 ("Second connect (%d), should fail with EISCONN: %m",
++ client_sock);
++
++ peer_len = sizeof (peer);
++ xgetpeername (client_sock, (struct sockaddr *) &peer, &peer_len);
++ TEST_COMPARE (peer_len, sizeof (peer));
++ TEST_COMPARE (peer.sin_port, server_address.sin_port);
++ TEST_COMPARE_BLOB (&peer.sin_addr, sizeof (peer.sin_addr),
++ &server_address.sin_addr,
++ sizeof (server_address.sin_addr));
++
++ int status;
++ xwaitpid (serv_pid, &status, 0);
++ TEST_COMPARE (status, 0);
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/stdlib/Makefile b/stdlib/Makefile
+index d587f054d1..9898cc5d8a 100644
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -308,6 +308,7 @@ tests := \
+ tst-setcontext10 \
+ tst-setcontext11 \
+ tst-stdbit-Wconversion \
++ tst-stdbit-builtins \
+ tst-stdc_bit_ceil \
+ tst-stdc_bit_floor \
+ tst-stdc_bit_width \
+diff --git a/stdlib/stdbit.h b/stdlib/stdbit.h
+index f334eb174d..2801590c63 100644
+--- a/stdlib/stdbit.h
++++ b/stdlib/stdbit.h
+@@ -64,9 +64,13 @@ extern unsigned int stdc_leading_zeros_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_leading_zeros_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_leading_zeros(x) \
++#if __glibc_has_builtin (__builtin_stdc_leading_zeros)
++# define stdc_leading_zeros(x) (__builtin_stdc_leading_zeros (x))
++#else
++# define stdc_leading_zeros(x) \
+ (stdc_leading_zeros_ull (x) \
+ - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x))))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline unsigned int
+@@ -116,9 +120,13 @@ extern unsigned int stdc_leading_ones_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_leading_ones_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_leading_ones(x) \
++#if __glibc_has_builtin (__builtin_stdc_leading_ones)
++# define stdc_leading_ones(x) (__builtin_stdc_leading_ones (x))
++#else
++# define stdc_leading_ones(x) \
+ (stdc_leading_ones_ull ((unsigned long long int) (x) \
+ << 8 * (sizeof (0ULL) - sizeof (x))))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline unsigned int
+@@ -168,11 +176,15 @@ extern unsigned int stdc_trailing_zeros_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_trailing_zeros_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_trailing_zeros(x) \
++#if __glibc_has_builtin (__builtin_stdc_trailing_zeros)
++# define stdc_trailing_zeros(x) (__builtin_stdc_trailing_zeros (x))
++#else
++# define stdc_trailing_zeros(x) \
+ (sizeof (x) == 8 ? stdc_trailing_zeros_ull (x) \
+ : sizeof (x) == 4 ? stdc_trailing_zeros_ui (x) \
+ : sizeof (x) == 2 ? stdc_trailing_zeros_us (__pacify_uint16 (x)) \
+ : stdc_trailing_zeros_uc (__pacify_uint8 (x)))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll)
+ static __always_inline unsigned int
+@@ -222,7 +234,11 @@ extern unsigned int stdc_trailing_ones_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_trailing_ones_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x))
++#if __glibc_has_builtin (__builtin_stdc_trailing_ones)
++# define stdc_trailing_ones(x) (__builtin_stdc_trailing_ones (x))
++#else
++# define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll)
+ static __always_inline unsigned int
+@@ -272,11 +288,15 @@ extern unsigned int stdc_first_leading_zero_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_first_leading_zero_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_first_leading_zero(x) \
++#if __glibc_has_builtin (__builtin_stdc_first_leading_zero)
++# define stdc_first_leading_zero(x) (__builtin_stdc_first_leading_zero (x))
++#else
++# define stdc_first_leading_zero(x) \
+ (sizeof (x) == 8 ? stdc_first_leading_zero_ull (x) \
+ : sizeof (x) == 4 ? stdc_first_leading_zero_ui (x) \
+ : sizeof (x) == 2 ? stdc_first_leading_zero_us (__pacify_uint16 (x)) \
+ : stdc_first_leading_zero_uc (__pacify_uint8 (x)))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline unsigned int
+@@ -326,11 +346,15 @@ extern unsigned int stdc_first_leading_one_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_first_leading_one_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_first_leading_one(x) \
++#if __glibc_has_builtin (__builtin_stdc_first_leading_one)
++# define stdc_first_leading_one(x) (__builtin_stdc_first_leading_one (x))
++#else
++# define stdc_first_leading_one(x) \
+ (sizeof (x) == 8 ? stdc_first_leading_one_ull (x) \
+ : sizeof (x) == 4 ? stdc_first_leading_one_ui (x) \
+ : sizeof (x) == 2 ? stdc_first_leading_one_us (__pacify_uint16 (x)) \
+ : stdc_first_leading_one_uc (__pacify_uint8 (x)))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline unsigned int
+@@ -380,11 +404,15 @@ extern unsigned int stdc_first_trailing_zero_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_first_trailing_zero_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_first_trailing_zero(x) \
++#if __glibc_has_builtin (__builtin_stdc_first_trailing_zero)
++# define stdc_first_trailing_zero(x) (__builtin_stdc_first_trailing_zero (x))
++#else
++# define stdc_first_trailing_zero(x) \
+ (sizeof (x) == 8 ? stdc_first_trailing_zero_ull (x) \
+ : sizeof (x) == 4 ? stdc_first_trailing_zero_ui (x) \
+ : sizeof (x) == 2 ? stdc_first_trailing_zero_us (__pacify_uint16 (x)) \
+ : stdc_first_trailing_zero_uc (__pacify_uint8 (x)))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll)
+ static __always_inline unsigned int
+@@ -434,11 +462,15 @@ extern unsigned int stdc_first_trailing_one_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_first_trailing_one_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_first_trailing_one(x) \
++#if __glibc_has_builtin (__builtin_stdc_first_trailing_one)
++# define stdc_first_trailing_one(x) (__builtin_stdc_first_trailing_one (x))
++#else
++# define stdc_first_trailing_one(x) \
+ (sizeof (x) == 8 ? stdc_first_trailing_one_ull (x) \
+ : sizeof (x) == 4 ? stdc_first_trailing_one_ui (x) \
+ : sizeof (x) == 2 ? stdc_first_trailing_one_us (__pacify_uint16 (x)) \
+ : stdc_first_trailing_one_uc (__pacify_uint8 (x)))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll)
+ static __always_inline unsigned int
+@@ -488,9 +520,13 @@ extern unsigned int stdc_count_zeros_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_count_zeros_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_count_zeros(x) \
++#if __glibc_has_builtin (__builtin_stdc_count_zeros)
++# define stdc_count_zeros(x) (__builtin_stdc_count_zeros (x))
++#else
++# define stdc_count_zeros(x) \
+ (stdc_count_zeros_ull (x) \
+ - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x))))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll)
+ static __always_inline unsigned int
+@@ -540,7 +576,11 @@ extern unsigned int stdc_count_ones_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_count_ones_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_count_ones(x) (stdc_count_ones_ull (x))
++#if __glibc_has_builtin (__builtin_stdc_count_ones)
++# define stdc_count_ones(x) (__builtin_stdc_count_ones (x))
++#else
++# define stdc_count_ones(x) (stdc_count_ones_ull (x))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll)
+ static __always_inline unsigned int
+@@ -590,10 +630,14 @@ extern bool stdc_has_single_bit_ul (unsigned long int __x)
+ __extension__
+ extern bool stdc_has_single_bit_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_has_single_bit(x) \
++#if __glibc_has_builtin (__builtin_stdc_has_single_bit)
++# define stdc_has_single_bit(x) (__builtin_stdc_has_single_bit (x))
++#else
++# define stdc_has_single_bit(x) \
+ ((bool) (sizeof (x) <= sizeof (unsigned int) \
+ ? stdc_has_single_bit_ui (x) \
+ : stdc_has_single_bit_ull (x)))
++#endif
+
+ static __always_inline bool
+ __hsb64_inline (uint64_t __x)
+@@ -641,7 +685,11 @@ extern unsigned int stdc_bit_width_ul (unsigned long int __x)
+ __extension__
+ extern unsigned int stdc_bit_width_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_bit_width(x) (stdc_bit_width_ull (x))
++#if __glibc_has_builtin (__builtin_stdc_bit_width)
++# define stdc_bit_width(x) (__builtin_stdc_bit_width (x))
++#else
++# define stdc_bit_width(x) (stdc_bit_width_ull (x))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline unsigned int
+@@ -691,7 +739,11 @@ extern unsigned long int stdc_bit_floor_ul (unsigned long int __x)
+ __extension__
+ extern unsigned long long int stdc_bit_floor_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x))
++#if __glibc_has_builtin (__builtin_stdc_bit_floor)
++# define stdc_bit_floor(x) (__builtin_stdc_bit_floor (x))
++#else
++# define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline uint64_t
+@@ -743,7 +795,11 @@ extern unsigned long int stdc_bit_ceil_ul (unsigned long int __x)
+ __extension__
+ extern unsigned long long int stdc_bit_ceil_ull (unsigned long long int __x)
+ __THROW __attribute_const__;
+-#define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x))
++#if __glibc_has_builtin (__builtin_stdc_bit_ceil)
++# define stdc_bit_ceil(x) (__builtin_stdc_bit_ceil (x))
++#else
++# define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x))
++#endif
+
+ #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll)
+ static __always_inline uint64_t
+diff --git a/stdlib/tst-stdbit-builtins.c b/stdlib/tst-stdbit-builtins.c
+new file mode 100644
+index 0000000000..536841ca8a
+--- /dev/null
++++ b/stdlib/tst-stdbit-builtins.c
+@@ -0,0 +1,778 @@
++/* Test <stdbit.h> type-generic macros with compiler __builtin_stdc_* support.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdbit.h>
++#include <limits.h>
++#include <support/check.h>
++
++#if __glibc_has_builtin (__builtin_stdc_leading_zeros) \
++ && __glibc_has_builtin (__builtin_stdc_leading_ones) \
++ && __glibc_has_builtin (__builtin_stdc_trailing_zeros) \
++ && __glibc_has_builtin (__builtin_stdc_trailing_ones) \
++ && __glibc_has_builtin (__builtin_stdc_first_leading_zero) \
++ && __glibc_has_builtin (__builtin_stdc_first_leading_one) \
++ && __glibc_has_builtin (__builtin_stdc_first_trailing_zero) \
++ && __glibc_has_builtin (__builtin_stdc_first_trailing_one) \
++ && __glibc_has_builtin (__builtin_stdc_count_zeros) \
++ && __glibc_has_builtin (__builtin_stdc_count_ones) \
++ && __glibc_has_builtin (__builtin_stdc_has_single_bit) \
++ && __glibc_has_builtin (__builtin_stdc_bit_width) \
++ && __glibc_has_builtin (__builtin_stdc_bit_floor) \
++ && __glibc_has_builtin (__builtin_stdc_bit_ceil)
++
++# if !defined (BITINT_MAXWIDTH) && defined (__BITINT_MAXWIDTH__)
++# define BITINT_MAXWIDTH __BITINT_MAXWIDTH__
++# endif
++
++typedef unsigned char uc;
++typedef unsigned short us;
++typedef unsigned int ui;
++typedef unsigned long int ul;
++typedef unsigned long long int ull;
++
++# define expr_has_type(e, t) _Generic (e, default : 0, t : 1)
++
++static int
++do_test (void)
++{
++ TEST_COMPARE (stdc_leading_zeros ((uc) 0), CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros ((us) 0), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros (0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0U), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros (0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0UL), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros (0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0ULL), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_leading_zeros ((us) ~0U), 0);
++ TEST_COMPARE (stdc_leading_zeros (~0U), 0);
++ TEST_COMPARE (stdc_leading_zeros (~0UL), 0);
++ TEST_COMPARE (stdc_leading_zeros (~0ULL), 0);
++ TEST_COMPARE (stdc_leading_zeros ((uc) 3), CHAR_BIT - 2);
++ TEST_COMPARE (stdc_leading_zeros ((us) 9), sizeof (short) * CHAR_BIT - 4);
++ TEST_COMPARE (stdc_leading_zeros (34U), sizeof (int) * CHAR_BIT - 6);
++ TEST_COMPARE (stdc_leading_zeros (130UL), sizeof (long int) * CHAR_BIT - 8);
++ TEST_COMPARE (stdc_leading_zeros (512ULL),
++ sizeof (long long int) * CHAR_BIT - 10);
++ TEST_COMPARE (stdc_leading_ones ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_leading_ones ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_leading_ones (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0U), ui), 1);
++ TEST_COMPARE (stdc_leading_ones (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0UL), ui), 1);
++ TEST_COMPARE (stdc_leading_ones (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0ULL), ui), 1);
++ TEST_COMPARE (stdc_leading_ones ((uc) ~0U), CHAR_BIT);
++ TEST_COMPARE (stdc_leading_ones ((us) ~0U), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (stdc_leading_ones (~0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (stdc_leading_ones (~0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_leading_ones (~0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_leading_ones ((uc) ~3), CHAR_BIT - 2);
++ TEST_COMPARE (stdc_leading_ones ((us) ~9), sizeof (short) * CHAR_BIT - 4);
++ TEST_COMPARE (stdc_leading_ones (~34U), sizeof (int) * CHAR_BIT - 6);
++ TEST_COMPARE (stdc_leading_ones (~130UL), sizeof (long int) * CHAR_BIT - 8);
++ TEST_COMPARE (stdc_leading_ones (~512ULL),
++ sizeof (long long int) * CHAR_BIT - 10);
++ TEST_COMPARE (stdc_trailing_zeros ((uc) 0), CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros ((us) 0), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0U), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0UL), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0ULL), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_trailing_zeros ((us) ~0U), 0);
++ TEST_COMPARE (stdc_trailing_zeros (~0U), 0);
++ TEST_COMPARE (stdc_trailing_zeros (~0UL), 0);
++ TEST_COMPARE (stdc_trailing_zeros (~0ULL), 0);
++ TEST_COMPARE (stdc_trailing_zeros ((uc) 2), 1);
++ TEST_COMPARE (stdc_trailing_zeros ((us) 24), 3);
++ TEST_COMPARE (stdc_trailing_zeros (32U), 5);
++ TEST_COMPARE (stdc_trailing_zeros (128UL), 7);
++ TEST_COMPARE (stdc_trailing_zeros (512ULL), 9);
++ TEST_COMPARE (stdc_trailing_ones ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0U), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0UL), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0ULL), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones ((uc) ~0U), CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_ones ((us) ~0U), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_ones (~0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_ones (~0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_ones (~0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_ones ((uc) 5), 1);
++ TEST_COMPARE (stdc_trailing_ones ((us) 15), 4);
++ TEST_COMPARE (stdc_trailing_ones (127U), 7);
++ TEST_COMPARE (stdc_trailing_ones (511UL), 9);
++ TEST_COMPARE (stdc_trailing_ones (~0ULL >> 2),
++ sizeof (long long int) * CHAR_BIT - 2);
++ TEST_COMPARE (stdc_first_leading_zero ((uc) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero ((us) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (0U), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0U), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (0UL), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0UL), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (0ULL), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0ULL), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_first_leading_zero ((us) ~0U), 0);
++ TEST_COMPARE (stdc_first_leading_zero (~0U), 0);
++ TEST_COMPARE (stdc_first_leading_zero (~0UL), 0);
++ TEST_COMPARE (stdc_first_leading_zero (~0ULL), 0);
++ TEST_COMPARE (stdc_first_leading_zero ((uc) ~3U), CHAR_BIT - 1);
++ TEST_COMPARE (stdc_first_leading_zero ((us) ~15U),
++ sizeof (short) * CHAR_BIT - 3);
++ TEST_COMPARE (stdc_first_leading_zero (~63U), sizeof (int) * CHAR_BIT - 5);
++ TEST_COMPARE (stdc_first_leading_zero (~255UL),
++ sizeof (long int) * CHAR_BIT - 7);
++ TEST_COMPARE (stdc_first_leading_zero (~1023ULL),
++ sizeof (long long int) * CHAR_BIT - 9);
++ TEST_COMPARE (stdc_first_leading_one ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0U), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0UL), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0ULL), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one ((uc) ~0U), 1);
++ TEST_COMPARE (stdc_first_leading_one ((us) ~0U), 1);
++ TEST_COMPARE (stdc_first_leading_one (~0U), 1);
++ TEST_COMPARE (stdc_first_leading_one (~0UL), 1);
++ TEST_COMPARE (stdc_first_leading_one (~0ULL), 1);
++ TEST_COMPARE (stdc_first_leading_one ((uc) 3), CHAR_BIT - 1);
++ TEST_COMPARE (stdc_first_leading_one ((us) 9),
++ sizeof (short) * CHAR_BIT - 3);
++ TEST_COMPARE (stdc_first_leading_one (34U), sizeof (int) * CHAR_BIT - 5);
++ TEST_COMPARE (stdc_first_leading_one (130UL),
++ sizeof (long int) * CHAR_BIT - 7);
++ TEST_COMPARE (stdc_first_leading_one (512ULL),
++ sizeof (long long int) * CHAR_BIT - 9);
++ TEST_COMPARE (stdc_first_trailing_zero ((uc) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero ((us) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (0U), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0U), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (0UL), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0UL), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (0ULL), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0ULL), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_first_trailing_zero ((us) ~0U), 0);
++ TEST_COMPARE (stdc_first_trailing_zero (~0U), 0);
++ TEST_COMPARE (stdc_first_trailing_zero (~0UL), 0);
++ TEST_COMPARE (stdc_first_trailing_zero (~0ULL), 0);
++ TEST_COMPARE (stdc_first_trailing_zero ((uc) 2), 1);
++ TEST_COMPARE (stdc_first_trailing_zero ((us) 15), 5);
++ TEST_COMPARE (stdc_first_trailing_zero (63U), 7);
++ TEST_COMPARE (stdc_first_trailing_zero (128UL), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (511ULL), 10);
++ TEST_COMPARE (stdc_first_trailing_one ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0U), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0UL), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0ULL), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one ((uc) ~0U), 1);
++ TEST_COMPARE (stdc_first_trailing_one ((us) ~0U), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~0U), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~0UL), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~0ULL), 1);
++ TEST_COMPARE (stdc_first_trailing_one ((uc) 4), 3);
++ TEST_COMPARE (stdc_first_trailing_one ((us) 96), 6);
++ TEST_COMPARE (stdc_first_trailing_one (127U), 1);
++ TEST_COMPARE (stdc_first_trailing_one (511UL), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~0ULL << 12), 13);
++ TEST_COMPARE (stdc_count_zeros ((uc) 0), CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_count_zeros ((us) 0), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_count_zeros (0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0U), ui), 1);
++ TEST_COMPARE (stdc_count_zeros (0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0UL), ui), 1);
++ TEST_COMPARE (stdc_count_zeros (0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0ULL), ui), 1);
++ TEST_COMPARE (stdc_count_zeros ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_count_zeros ((us) ~0U), 0);
++ TEST_COMPARE (stdc_count_zeros (~0U), 0);
++ TEST_COMPARE (stdc_count_zeros (~0UL), 0);
++ TEST_COMPARE (stdc_count_zeros (~0ULL), 0);
++ TEST_COMPARE (stdc_count_zeros ((uc) 1U), CHAR_BIT - 1);
++ TEST_COMPARE (stdc_count_zeros ((us) 42), sizeof (short) * CHAR_BIT - 3);
++ TEST_COMPARE (stdc_count_zeros (291U), sizeof (int) * CHAR_BIT - 4);
++ TEST_COMPARE (stdc_count_zeros (~1315UL), 5);
++ TEST_COMPARE (stdc_count_zeros (3363ULL),
++ sizeof (long long int) * CHAR_BIT - 6);
++ TEST_COMPARE (stdc_count_ones ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_count_ones ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_count_ones (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones (0U), ui), 1);
++ TEST_COMPARE (stdc_count_ones (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones (0UL), ui), 1);
++ TEST_COMPARE (stdc_count_ones (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones (0ULL), ui), 1);
++ TEST_COMPARE (stdc_count_ones ((uc) ~0U), CHAR_BIT);
++ TEST_COMPARE (stdc_count_ones ((us) ~0U), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (stdc_count_ones (~0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (stdc_count_ones (~0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_count_ones (~0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_count_ones ((uc) ~1U), CHAR_BIT - 1);
++ TEST_COMPARE (stdc_count_ones ((us) ~42), sizeof (short) * CHAR_BIT - 3);
++ TEST_COMPARE (stdc_count_ones (~291U), sizeof (int) * CHAR_BIT - 4);
++ TEST_COMPARE (stdc_count_ones (1315UL), 5);
++ TEST_COMPARE (stdc_count_ones (~3363ULL),
++ sizeof (long long int) * CHAR_BIT - 6);
++ TEST_COMPARE (stdc_has_single_bit ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((uc) 0), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((us) 0), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0U), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0UL), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0ULL), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit ((uc) 2), 1);
++ TEST_COMPARE (stdc_has_single_bit ((us) 8), 1);
++ TEST_COMPARE (stdc_has_single_bit (32U), 1);
++ TEST_COMPARE (stdc_has_single_bit (128UL), 1);
++ TEST_COMPARE (stdc_has_single_bit (512ULL), 1);
++ TEST_COMPARE (stdc_has_single_bit ((uc) 7), 0);
++ TEST_COMPARE (stdc_has_single_bit ((us) 96), 0);
++ TEST_COMPARE (stdc_has_single_bit (513U), 0);
++ TEST_COMPARE (stdc_has_single_bit (1022UL), 0);
++ TEST_COMPARE (stdc_has_single_bit (12ULL), 0);
++ TEST_COMPARE (stdc_bit_width ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width ((uc) 0), ui), 1);
++ TEST_COMPARE (stdc_bit_width ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width ((us) 0), ui), 1);
++ TEST_COMPARE (stdc_bit_width (0U), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width (0U), ui), 1);
++ TEST_COMPARE (stdc_bit_width (0UL), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width (0UL), ui), 1);
++ TEST_COMPARE (stdc_bit_width (0ULL), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width (0ULL), ui), 1);
++ TEST_COMPARE (stdc_bit_width ((uc) ~0U), CHAR_BIT);
++ TEST_COMPARE (stdc_bit_width ((us) ~0U), sizeof (short) * CHAR_BIT);
++ TEST_COMPARE (stdc_bit_width (~0U), sizeof (int) * CHAR_BIT);
++ TEST_COMPARE (stdc_bit_width (~0UL), sizeof (long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_bit_width (~0ULL), sizeof (long long int) * CHAR_BIT);
++ TEST_COMPARE (stdc_bit_width ((uc) ((uc) ~0U >> 1)), CHAR_BIT - 1);
++ TEST_COMPARE (stdc_bit_width ((uc) 6), 3);
++ TEST_COMPARE (stdc_bit_width ((us) 12U), 4);
++ TEST_COMPARE (stdc_bit_width ((us) ((us) ~0U >> 5)),
++ sizeof (short) * CHAR_BIT - 5);
++ TEST_COMPARE (stdc_bit_width (137U), 8);
++ TEST_COMPARE (stdc_bit_width (269U), 9);
++ TEST_COMPARE (stdc_bit_width (39UL), 6);
++ TEST_COMPARE (stdc_bit_width (~0UL >> 2), sizeof (long int) * CHAR_BIT - 2);
++ TEST_COMPARE (stdc_bit_width (1023ULL), 10);
++ TEST_COMPARE (stdc_bit_width (1024ULL), 11);
++ TEST_COMPARE (stdc_bit_floor ((uc) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((uc) 0), uc), 1);
++ TEST_COMPARE (stdc_bit_floor ((us) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((us) 0), us), 1);
++ TEST_COMPARE (stdc_bit_floor (0U), 0U);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0U), ui), 1);
++ TEST_COMPARE (stdc_bit_floor (0UL), 0UL);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0UL), ul), 1);
++ TEST_COMPARE (stdc_bit_floor (0ULL), 0ULL);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0ULL), ull), 1);
++ TEST_COMPARE (stdc_bit_floor ((uc) ~0U), (1U << (CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_floor ((us) ~0U),
++ (1U << (sizeof (short) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_floor (~0U), (1U << (sizeof (int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_floor (~0UL),
++ (1UL << (sizeof (long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_floor (~0ULL),
++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_floor ((uc) 4), 4);
++ TEST_COMPARE (stdc_bit_floor ((uc) 7), 4);
++ TEST_COMPARE (stdc_bit_floor ((us) 8U), 8);
++ TEST_COMPARE (stdc_bit_floor ((us) 31U), 16);
++ TEST_COMPARE (stdc_bit_floor (137U), 128U);
++ TEST_COMPARE (stdc_bit_floor (269U), 256U);
++ TEST_COMPARE (stdc_bit_floor (511UL), 256UL);
++ TEST_COMPARE (stdc_bit_floor (512UL), 512UL);
++ TEST_COMPARE (stdc_bit_floor (513UL), 512ULL);
++ TEST_COMPARE (stdc_bit_floor (1024ULL), 1024ULL);
++ TEST_COMPARE (stdc_bit_ceil ((uc) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((uc) 0), uc), 1);
++ TEST_COMPARE (stdc_bit_ceil ((us) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((us) 0), us), 1);
++ TEST_COMPARE (stdc_bit_ceil (0U), 1U);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0U), ui), 1);
++ TEST_COMPARE (stdc_bit_ceil (0UL), 1UL);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0UL), ul), 1);
++ TEST_COMPARE (stdc_bit_ceil (0ULL), 1ULL);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0ULL), ull), 1);
++ TEST_COMPARE (stdc_bit_ceil ((uc) ~0U), 0);
++ TEST_COMPARE (stdc_bit_ceil ((us) ~0U), 0);
++ TEST_COMPARE (stdc_bit_ceil (~0U), 0U);
++ TEST_COMPARE (stdc_bit_ceil (~0UL), 0UL);
++ TEST_COMPARE (stdc_bit_ceil (~0ULL), 0ULL);
++ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)),
++ (1U << (sizeof (short) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)),
++ (1U << (sizeof (short) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (~0U >> 1),
++ (1U << (sizeof (int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (1U << (sizeof (int) * CHAR_BIT - 1)),
++ (1U << (sizeof (int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1),
++ (1UL << (sizeof (long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1),
++ (1UL << (sizeof (long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (1ULL
++ << (sizeof (long long int) * CHAR_BIT - 1)),
++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil (~0ULL >> 1),
++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1)));
++ TEST_COMPARE (stdc_bit_ceil ((uc) 1), 1);
++ TEST_COMPARE (stdc_bit_ceil ((uc) 2), 2);
++ TEST_COMPARE (stdc_bit_ceil ((us) 3U), 4);
++ TEST_COMPARE (stdc_bit_ceil ((us) 4U), 4);
++ TEST_COMPARE (stdc_bit_ceil (5U), 8U);
++ TEST_COMPARE (stdc_bit_ceil (269U), 512U);
++ TEST_COMPARE (stdc_bit_ceil (511UL), 512UL);
++ TEST_COMPARE (stdc_bit_ceil (512UL), 512UL);
++ TEST_COMPARE (stdc_bit_ceil (513ULL), 1024ULL);
++ TEST_COMPARE (stdc_bit_ceil (1025ULL), 2048ULL);
++# ifdef __SIZEOF_INT128__
++ TEST_COMPARE (stdc_leading_zeros ((unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned __int128) 0), ui),
++ 1);
++ TEST_COMPARE (stdc_leading_zeros (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_leading_ones ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned __int128) 0), ui),
++ 1);
++ TEST_COMPARE (stdc_leading_ones (~(unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (stdc_trailing_zeros ((unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned __int128) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_trailing_ones ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned __int128) 0), ui),
++ 1);
++ TEST_COMPARE (stdc_trailing_ones (~(unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (stdc_first_leading_zero ((unsigned __int128) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned __int128) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_first_leading_one ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned __int128) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (~(unsigned __int128) 0), 1);
++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned __int128) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned __int128)
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_first_trailing_one ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned __int128) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned __int128) 0), 1);
++ TEST_COMPARE (stdc_count_zeros ((unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned __int128) 0), ui),
++ 1);
++ TEST_COMPARE (stdc_count_zeros (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_count_ones ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned __int128) 0), ui),
++ 1);
++ TEST_COMPARE (stdc_count_ones (~(unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (stdc_has_single_bit ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned __int128) 0),
++ _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (~(unsigned __int128) 0), 0);
++ TEST_COMPARE (stdc_bit_width ((unsigned __int128) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned __int128) 0), ui), 1);
++ TEST_COMPARE (stdc_bit_width (~(unsigned __int128) 0),
++ sizeof (__int128) * CHAR_BIT);
++ TEST_COMPARE (stdc_bit_floor ((unsigned __int128) 0) != 0, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned __int128) 0),
++ unsigned __int128), 1);
++ TEST_COMPARE (stdc_bit_floor (~(unsigned __int128) 0)
++ != ((unsigned __int128) 1) << (sizeof (__int128)
++ * CHAR_BIT - 1), 0);
++ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 0) != 1, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned __int128) 0),
++ unsigned __int128), 1);
++ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 1) != 1, 0);
++ TEST_COMPARE (stdc_bit_ceil ((~(unsigned __int128) 0) >> 1)
++ != ((unsigned __int128) 1) << (sizeof (__int128)
++ * CHAR_BIT - 1), 0);
++ TEST_COMPARE (stdc_bit_ceil (~(unsigned __int128) 0) != 0, 0);
++# endif
++ uc a = 0;
++ TEST_COMPARE (stdc_bit_width (a++), 0);
++ TEST_COMPARE (a, 1);
++ ull b = 0;
++ TEST_COMPARE (stdc_bit_width (b++), 0);
++ TEST_COMPARE (b, 1);
++ TEST_COMPARE (stdc_bit_floor (a++), 1);
++ TEST_COMPARE (a, 2);
++ TEST_COMPARE (stdc_bit_floor (b++), 1);
++ TEST_COMPARE (b, 2);
++ TEST_COMPARE (stdc_bit_ceil (a++), 2);
++ TEST_COMPARE (a, 3);
++ TEST_COMPARE (stdc_bit_ceil (b++), 2);
++ TEST_COMPARE (b, 3);
++ TEST_COMPARE (stdc_leading_zeros (a++), CHAR_BIT - 2);
++ TEST_COMPARE (a, 4);
++ TEST_COMPARE (stdc_leading_zeros (b++),
++ sizeof (long long int) * CHAR_BIT - 2);
++ TEST_COMPARE (b, 4);
++ TEST_COMPARE (stdc_leading_ones (a++), 0);
++ TEST_COMPARE (a, 5);
++ TEST_COMPARE (stdc_leading_ones (b++), 0);
++ TEST_COMPARE (b, 5);
++ TEST_COMPARE (stdc_trailing_zeros (a++), 0);
++ TEST_COMPARE (a, 6);
++ TEST_COMPARE (stdc_trailing_zeros (b++), 0);
++ TEST_COMPARE (b, 6);
++ TEST_COMPARE (stdc_trailing_ones (a++), 0);
++ TEST_COMPARE (a, 7);
++ TEST_COMPARE (stdc_trailing_ones (b++), 0);
++ TEST_COMPARE (b, 7);
++ TEST_COMPARE (stdc_first_leading_zero (a++), 1);
++ TEST_COMPARE (a, 8);
++ TEST_COMPARE (stdc_first_leading_zero (b++), 1);
++ TEST_COMPARE (b, 8);
++ TEST_COMPARE (stdc_first_leading_one (a++), CHAR_BIT - 3);
++ TEST_COMPARE (a, 9);
++ TEST_COMPARE (stdc_first_leading_one (b++),
++ sizeof (long long int) * CHAR_BIT - 3);
++ TEST_COMPARE (b, 9);
++ TEST_COMPARE (stdc_first_trailing_zero (a++), 2);
++ TEST_COMPARE (a, 10);
++ TEST_COMPARE (stdc_first_trailing_zero (b++), 2);
++ TEST_COMPARE (b, 10);
++ TEST_COMPARE (stdc_first_trailing_one (a++), 2);
++ TEST_COMPARE (a, 11);
++ TEST_COMPARE (stdc_first_trailing_one (b++), 2);
++ TEST_COMPARE (b, 11);
++ TEST_COMPARE (stdc_count_zeros (a++), CHAR_BIT - 3);
++ TEST_COMPARE (a, 12);
++ TEST_COMPARE (stdc_count_zeros (b++),
++ sizeof (long long int) * CHAR_BIT - 3);
++ TEST_COMPARE (b, 12);
++ TEST_COMPARE (stdc_count_ones (a++), 2);
++ TEST_COMPARE (a, 13);
++ TEST_COMPARE (stdc_count_ones (b++), 2);
++ TEST_COMPARE (b, 13);
++ TEST_COMPARE (stdc_has_single_bit (a++), 0);
++ TEST_COMPARE (a, 14);
++ TEST_COMPARE (stdc_has_single_bit (b++), 0);
++ TEST_COMPARE (b, 14);
++# ifdef BITINT_MAXWIDTH
++# if BITINT_MAXWIDTH >= 64
++ TEST_COMPARE (stdc_leading_zeros (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0uwb), ui), 1);
++ TEST_COMPARE (stdc_leading_zeros (1uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (1uwb), ui), 1);
++ TEST_COMPARE (stdc_leading_ones (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0uwb), ui), 1);
++ TEST_COMPARE (stdc_leading_ones (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones (1uwb), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0uwb), ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (1uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (1uwb), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0uwb), ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (1uwb), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0uwb), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (1uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (1uwb), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0uwb), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (1uwb), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0uwb), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (1uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (1uwb), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0uwb), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (1uwb), ui), 1);
++ TEST_COMPARE (stdc_count_zeros (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0uwb), ui), 1);
++ TEST_COMPARE (stdc_count_zeros (1uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros (1uwb), ui), 1);
++ TEST_COMPARE (stdc_count_ones (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones (0uwb), ui), 1);
++ TEST_COMPARE (stdc_count_ones (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_count_ones (1uwb), ui), 1);
++ TEST_COMPARE (stdc_has_single_bit (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0uwb), _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (1uwb), _Bool), 1);
++ TEST_COMPARE (stdc_bit_width (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width (0uwb), ui), 1);
++ TEST_COMPARE (stdc_bit_width (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_width (1uwb), ui), 1);
++ TEST_COMPARE (stdc_bit_floor (0uwb), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0uwb), unsigned _BitInt(1)), 1);
++ TEST_COMPARE (stdc_bit_floor (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor (1uwb), unsigned _BitInt(1)), 1);
++ TEST_COMPARE (stdc_bit_ceil (0uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0uwb), unsigned _BitInt(1)), 1);
++ TEST_COMPARE (stdc_bit_ceil (1uwb), 1);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (1uwb), unsigned _BitInt(1)), 1);
++ unsigned _BitInt(1) c = 0;
++ TEST_COMPARE (stdc_bit_floor (c++), 0);
++ TEST_COMPARE (c, 1);
++ TEST_COMPARE (stdc_bit_floor (c++), 1);
++ TEST_COMPARE (c, 0);
++ TEST_COMPARE (stdc_bit_ceil (c++), 1);
++ TEST_COMPARE (c, 1);
++ TEST_COMPARE (stdc_bit_ceil (c++), 1);
++ TEST_COMPARE (c, 0);
++# endif
++# if BITINT_MAXWIDTH >= 512
++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 275), 512 - 9);
++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 512), 373 - 10);
++ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 275), 512 - 9);
++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 512), 373 - 10);
++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 256), 8);
++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 512), 9);
++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 255), 8);
++ TEST_COMPARE (stdc_trailing_ones ((~(unsigned _BitInt(373)) 0) >> 2),
++ 373 - 2);
++ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(512)) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(512))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(373)) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(373))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 511),
++ 512 - 8);
++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 1023),
++ 373 - 9);
++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(512))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(373))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(512)) 0), 1);
++ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(373)) 0), 1);
++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 275), 512 - 8);
++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 512), 373 - 9);
++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned
++ _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 0), 1);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned
++ _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 255), 9);
++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 511), 10);
++ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(512))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(373))
++ 0), ui), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(512)) 0), 1);
++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(373)) 0), 1);
++ TEST_COMPARE (stdc_first_trailing_one (((unsigned _BitInt(512)) 255) << 175),
++ 176);
++ TEST_COMPARE (stdc_first_trailing_one ((~(unsigned _BitInt(373)) 0) << 311),
++ 312);
++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 1315), 512 - 5);
++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 3363), 373 - 6);
++ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 1315), 512 - 5);
++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 3363), 373 - 6);
++ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(512)) 0),
++ _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(373)) 0),
++ _Bool), 1);
++ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(512)) 1022) << 279),
++ 0);
++ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(373)) 12) << 305), 0);
++ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(512)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(512)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(373)) 0), 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(373)) 0),
++ ui), 1);
++ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(512)) 0), 512);
++ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(373)) 0), 373);
++ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(512)) 1023) << 405),
++ 405 + 10);
++ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(373)) 1024) << 242),
++ 242 + 11);
++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(512)) 0) != 0, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(512)) 0),
++ unsigned _BitInt(512)), 1);
++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(373)) 0) != 0, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(373)) 0),
++ unsigned _BitInt(373)), 1);
++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(512)) 0)
++ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0);
++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(373)) 0)
++ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0);
++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(512)) 511) << 405)
++ != (((unsigned _BitInt(512)) 256) << 405), 0);
++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(373)) 512) << 242)
++ != (((unsigned _BitInt(512)) 512) << 242), 0);
++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(512)) 0) != 1, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(512)) 0),
++ unsigned _BitInt(512)), 1);
++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(373)) 0) != 1, 0);
++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(373)) 0),
++ unsigned _BitInt(373)), 1);
++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(512)) 0) != 0, 0);
++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(373)) 0) != 0, 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 1) << (512 - 1))
++ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0);
++ TEST_COMPARE (stdc_bit_ceil ((~(unsigned _BitInt(373)) 0) >> 1)
++ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 512) << 405)
++ != (((unsigned _BitInt(512)) 512) << 405), 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(373)) 513) << 242)
++ != (((unsigned _BitInt(512)) 1024) << 242), 0);
++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0,
++ 0);
++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0)
++ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH
++ - 1), 0);
++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 511)
++ << 405)
++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 256) << 405), 0);
++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 512)
++ << 405)
++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0);
++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 1, 0);
++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0,
++ 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 1)
++ << (BITINT_MAXWIDTH - 1))
++ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH
++ - 1), 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 512)
++ << 405)
++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0);
++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 513)
++ << 405)
++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 1024) << 405), 0);
++# endif
++# endif
++ return 0;
++}
++#else
++static int
++do_test (void)
++{
++ return 0;
++}
++#endif
++
++#include <support/test-driver.c>
+diff --git a/support/Makefile b/support/Makefile
+index 362a51f882..aa57207bdc 100644
+--- a/support/Makefile
++++ b/support/Makefile
+@@ -131,6 +131,7 @@ libsupport-routines = \
+ xfreopen \
+ xftruncate \
+ xgetline \
++ xgetpeername \
+ xgetsockname \
+ xlisten \
+ xlseek \
+diff --git a/support/xgetpeername.c b/support/xgetpeername.c
+new file mode 100644
+index 0000000000..6f448e456a
+--- /dev/null
++++ b/support/xgetpeername.c
+@@ -0,0 +1,30 @@
++/* getpeername with error checking.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <support/xsocket.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <support/check.h>
++
++void
++xgetpeername (int fd, struct sockaddr *sa, socklen_t *plen)
++{
++ if (getpeername (fd, sa, plen) != 0)
++ FAIL_EXIT1 ("getpeername (%d): %m", fd);
++}
+diff --git a/support/xsocket.h b/support/xsocket.h
+index 3e44103546..4ac0e1f5ff 100644
+--- a/support/xsocket.h
++++ b/support/xsocket.h
+@@ -26,6 +26,7 @@
+ int xsocket (int, int, int);
+ void xsetsockopt (int, int, int, const void *, socklen_t);
+ void xgetsockname (int, struct sockaddr *, socklen_t *);
++void xgetpeername (int, struct sockaddr *, socklen_t *);
+ void xconnect (int, const struct sockaddr *, socklen_t);
+ void xbind (int, const struct sockaddr *, socklen_t);
+ void xlisten (int, int);
+diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
+old mode 100644
+new mode 100755
+index ca57edce47..9606137e8d
+--- a/sysdeps/aarch64/configure
++++ b/sysdeps/aarch64/configure
+@@ -325,9 +325,10 @@ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+ cat > conftest.s <<\EOF
+- ptrue p0.b
++ .arch armv8.2-a+sve
++ ptrue p0.b
+ EOF
+-if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5'
++if { ac_try='${CC-cc} -c conftest.s 1>&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
+index 27874eceb4..56d12d661d 100644
+--- a/sysdeps/aarch64/configure.ac
++++ b/sysdeps/aarch64/configure.ac
+@@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs])
+ # Check if asm support armv8.2-a+sve
+ AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl
+ cat > conftest.s <<\EOF
+- ptrue p0.b
++ .arch armv8.2-a+sve
++ ptrue p0.b
+ EOF
+-if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then
++if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
+ libc_cv_aarch64_sve_asm=yes
+ else
+ libc_cv_aarch64_sve_asm=no
+diff --git a/sysdeps/aarch64/cpu-features.h b/sysdeps/aarch64/cpu-features.h
+index 77a782422a..5f2da91ebb 100644
+--- a/sysdeps/aarch64/cpu-features.h
++++ b/sysdeps/aarch64/cpu-features.h
+@@ -71,6 +71,7 @@ struct cpu_features
+ /* Currently, the GLIBC memory tagging tunable only defines 8 bits. */
+ uint8_t mte_state;
+ bool sve;
++ bool prefer_sve_ifuncs;
+ bool mops;
+ };
+
+diff --git a/sysdeps/aarch64/fpu/acos_advsimd.c b/sysdeps/aarch64/fpu/acos_advsimd.c
+index a8eabb5e71..0a86c9823a 100644
+--- a/sysdeps/aarch64/fpu/acos_advsimd.c
++++ b/sysdeps/aarch64/fpu/acos_advsimd.c
+@@ -40,8 +40,8 @@ static const struct data
+ };
+
+ #define AllMask v_u64 (0xffffffffffffffff)
+-#define Oneu (0x3ff0000000000000)
+-#define Small (0x3e50000000000000) /* 2^-53. */
++#define Oneu 0x3ff0000000000000
++#define Small 0x3e50000000000000 /* 2^-53. */
+
+ #if WANT_SIMD_EXCEPT
+ static float64x2_t VPCS_ATTR NOINLINE
+diff --git a/sysdeps/aarch64/fpu/asin_advsimd.c b/sysdeps/aarch64/fpu/asin_advsimd.c
+index 141646e954..2de6eff407 100644
+--- a/sysdeps/aarch64/fpu/asin_advsimd.c
++++ b/sysdeps/aarch64/fpu/asin_advsimd.c
+@@ -39,8 +39,8 @@ static const struct data
+ };
+
+ #define AllMask v_u64 (0xffffffffffffffff)
+-#define One (0x3ff0000000000000)
+-#define Small (0x3e50000000000000) /* 2^-12. */
++#define One 0x3ff0000000000000
++#define Small 0x3e50000000000000 /* 2^-12. */
+
+ #if WANT_SIMD_EXCEPT
+ static float64x2_t VPCS_ATTR NOINLINE
+diff --git a/sysdeps/aarch64/fpu/atan2_sve.c b/sysdeps/aarch64/fpu/atan2_sve.c
+index 09a4c559b8..04fa71fa37 100644
+--- a/sysdeps/aarch64/fpu/atan2_sve.c
++++ b/sysdeps/aarch64/fpu/atan2_sve.c
+@@ -37,9 +37,6 @@ static const struct data
+ .pi_over_2 = 0x1.921fb54442d18p+0,
+ };
+
+-/* Useful constants. */
+-#define SignMask sv_u64 (0x8000000000000000)
+-
+ /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */
+ static svfloat64_t NOINLINE
+ special_case (svfloat64_t y, svfloat64_t x, svfloat64_t ret,
+@@ -72,14 +69,15 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg)
+ svbool_t cmp_y = zeroinfnan (iy, pg);
+ svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y);
+
+- svuint64_t sign_x = svand_x (pg, ix, SignMask);
+- svuint64_t sign_y = svand_x (pg, iy, SignMask);
+- svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y);
+-
+ svfloat64_t ax = svabs_x (pg, x);
+ svfloat64_t ay = svabs_x (pg, y);
++ svuint64_t iax = svreinterpret_u64 (ax);
++ svuint64_t iay = svreinterpret_u64 (ay);
++
++ svuint64_t sign_x = sveor_x (pg, ix, iax);
++ svuint64_t sign_y = sveor_x (pg, iy, iay);
++ svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y);
+
+- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0);
+ svbool_t pred_aygtax = svcmpgt (pg, ay, ax);
+
+ /* Set up z for call to atan. */
+@@ -88,8 +86,9 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg)
+ svfloat64_t z = svdiv_x (pg, n, d);
+
+ /* Work out the correct shift. */
+- svfloat64_t shift = svsel (pred_xlt0, sv_f64 (-2.0), sv_f64 (0.0));
+- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift);
++ svfloat64_t shift = svreinterpret_f64 (svlsr_x (pg, sign_x, 1));
++ shift = svsel (pred_aygtax, sv_f64 (1.0), shift);
++ shift = svreinterpret_f64 (svorr_x (pg, sign_x, svreinterpret_u64 (shift)));
+ shift = svmul_x (pg, shift, data_ptr->pi_over_2);
+
+ /* Use split Estrin scheme for P(z^2) with deg(P)=19. */
+@@ -109,10 +108,10 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg)
+ ret = svadd_m (pg, ret, shift);
+
+ /* Account for the sign of x and y. */
+- ret = svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy));
+-
+ if (__glibc_unlikely (svptest_any (pg, cmp_xy)))
+- return special_case (y, x, ret, cmp_xy);
+-
+- return ret;
++ return special_case (
++ y, x,
++ svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)),
++ cmp_xy);
++ return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy));
+ }
+diff --git a/sysdeps/aarch64/fpu/atan2f_sve.c b/sysdeps/aarch64/fpu/atan2f_sve.c
+index b92f83cdea..9ea197147c 100644
+--- a/sysdeps/aarch64/fpu/atan2f_sve.c
++++ b/sysdeps/aarch64/fpu/atan2f_sve.c
+@@ -32,10 +32,8 @@ static const struct data
+ .pi_over_2 = 0x1.921fb6p+0f,
+ };
+
+-#define SignMask sv_u32 (0x80000000)
+-
+ /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */
+-static inline svfloat32_t
++static svfloat32_t NOINLINE
+ special_case (svfloat32_t y, svfloat32_t x, svfloat32_t ret,
+ const svbool_t cmp)
+ {
+@@ -67,14 +65,15 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg)
+ svbool_t cmp_y = zeroinfnan (iy, pg);
+ svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y);
+
+- svuint32_t sign_x = svand_x (pg, ix, SignMask);
+- svuint32_t sign_y = svand_x (pg, iy, SignMask);
+- svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y);
+-
+ svfloat32_t ax = svabs_x (pg, x);
+ svfloat32_t ay = svabs_x (pg, y);
++ svuint32_t iax = svreinterpret_u32 (ax);
++ svuint32_t iay = svreinterpret_u32 (ay);
++
++ svuint32_t sign_x = sveor_x (pg, ix, iax);
++ svuint32_t sign_y = sveor_x (pg, iy, iay);
++ svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y);
+
+- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0);
+ svbool_t pred_aygtax = svcmpgt (pg, ay, ax);
+
+ /* Set up z for call to atan. */
+@@ -83,11 +82,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg)
+ svfloat32_t z = svdiv_x (pg, n, d);
+
+ /* Work out the correct shift. */
+- svfloat32_t shift = svsel (pred_xlt0, sv_f32 (-2.0), sv_f32 (0.0));
+- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift);
++ svfloat32_t shift = svreinterpret_f32 (svlsr_x (pg, sign_x, 1));
++ shift = svsel (pred_aygtax, sv_f32 (1.0), shift);
++ shift = svreinterpret_f32 (svorr_x (pg, sign_x, svreinterpret_u32 (shift)));
+ shift = svmul_x (pg, shift, sv_f32 (data_ptr->pi_over_2));
+
+- /* Use split Estrin scheme for P(z^2) with deg(P)=7. */
++ /* Use pure Estrin scheme for P(z^2) with deg(P)=7. */
+ svfloat32_t z2 = svmul_x (pg, z, z);
+ svfloat32_t z4 = svmul_x (pg, z2, z2);
+ svfloat32_t z8 = svmul_x (pg, z4, z4);
+@@ -101,10 +101,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg)
+ ret = svadd_m (pg, ret, shift);
+
+ /* Account for the sign of x and y. */
+- ret = svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy));
+
+ if (__glibc_unlikely (svptest_any (pg, cmp_xy)))
+- return special_case (y, x, ret, cmp_xy);
++ return special_case (
++ y, x,
++ svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)),
++ cmp_xy);
+
+- return ret;
++ return svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy));
+ }
+diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c
+index 2897e8b909..3924c9ce44 100644
+--- a/sysdeps/aarch64/fpu/cos_advsimd.c
++++ b/sysdeps/aarch64/fpu/cos_advsimd.c
+@@ -63,8 +63,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x)
+ special-case handler later. */
+ r = vbslq_f64 (cmp, v_f64 (1.0), r);
+ #else
+- cmp = vcageq_f64 (d->range_val, x);
+- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */
++ cmp = vcageq_f64 (x, d->range_val);
+ r = x;
+ #endif
+
+diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c
+index 60abc8dfcf..d0c285b03a 100644
+--- a/sysdeps/aarch64/fpu/cosf_advsimd.c
++++ b/sysdeps/aarch64/fpu/cosf_advsimd.c
+@@ -64,8 +64,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x)
+ special-case handler later. */
+ r = vbslq_f32 (cmp, v_f32 (1.0f), r);
+ #else
+- cmp = vcageq_f32 (d->range_val, x);
+- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */
++ cmp = vcageq_f32 (x, d->range_val);
+ r = x;
+ #endif
+
+diff --git a/sysdeps/aarch64/fpu/exp10_advsimd.c b/sysdeps/aarch64/fpu/exp10_advsimd.c
+index fe7149b191..eeb31ca839 100644
+--- a/sysdeps/aarch64/fpu/exp10_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp10_advsimd.c
+@@ -57,7 +57,7 @@ const static struct data
+ # define BigBound v_u64 (0x4070000000000000) /* asuint64 (0x1p8). */
+ # define Thres v_u64 (0x2070000000000000) /* BigBound - TinyBound. */
+
+-static inline float64x2_t VPCS_ATTR
++static float64x2_t VPCS_ATTR NOINLINE
+ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp)
+ {
+ /* If fenv exceptions are to be triggered correctly, fall back to the scalar
+@@ -72,7 +72,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp)
+ # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */
+ # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */
+
+-static float64x2_t VPCS_ATTR NOINLINE
++static inline float64x2_t VPCS_ATTR
+ special_case (float64x2_t s, float64x2_t y, float64x2_t n,
+ const struct data *d)
+ {
+diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c
+index 7ee0c90948..ab117b69da 100644
+--- a/sysdeps/aarch64/fpu/exp10f_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c
+@@ -25,7 +25,8 @@
+ static const struct data
+ {
+ float32x4_t poly[5];
+- float32x4_t shift, log10_2, log2_10_hi, log2_10_lo;
++ float32x4_t log10_2_and_inv, shift;
++
+ #if !WANT_SIMD_EXCEPT
+ float32x4_t scale_thresh;
+ #endif
+@@ -38,9 +39,9 @@ static const struct data
+ .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f),
+ V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) },
+ .shift = V4 (0x1.8p23f),
+- .log10_2 = V4 (0x1.a934fp+1),
+- .log2_10_hi = V4 (0x1.344136p-2),
+- .log2_10_lo = V4 (-0x1.ec10cp-27),
++
++ /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0. */
++ .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 },
+ #if !WANT_SIMD_EXCEPT
+ .scale_thresh = V4 (ScaleBound)
+ #endif
+@@ -98,24 +99,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x)
+ #if WANT_SIMD_EXCEPT
+ /* asuint(x) - TinyBound >= BigBound - TinyBound. */
+ uint32x4_t cmp = vcgeq_u32 (
+- vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)),
+- TinyBound),
+- Thres);
++ vsubq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (x)), TinyBound), Thres);
+ float32x4_t xm = x;
+ /* If any lanes are special, mask them with 1 and retain a copy of x to allow
+ special case handler to fix special lanes later. This is only necessary if
+ fenv exceptions are to be triggered correctly. */
+ if (__glibc_unlikely (v_any_u32 (cmp)))
+- x = vbslq_f32 (cmp, v_f32 (1), x);
++ x = v_zerofy_f32 (x, cmp);
+ #endif
+
+ /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)),
+ with poly(r) in [1/sqrt(2), sqrt(2)] and
+ x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2]. */
+- float32x4_t z = vfmaq_f32 (d->shift, x, d->log10_2);
++ float32x4_t z = vfmaq_laneq_f32 (d->shift, x, d->log10_2_and_inv, 0);
+ float32x4_t n = vsubq_f32 (z, d->shift);
+- float32x4_t r = vfmsq_f32 (x, n, d->log2_10_hi);
+- r = vfmsq_f32 (r, n, d->log2_10_lo);
++ float32x4_t r = vfmsq_laneq_f32 (x, n, d->log10_2_and_inv, 1);
++ r = vfmsq_laneq_f32 (r, n, d->log10_2_and_inv, 2);
+ uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23);
+
+ float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias));
+diff --git a/sysdeps/aarch64/fpu/exp2_advsimd.c b/sysdeps/aarch64/fpu/exp2_advsimd.c
+index 391a93180c..ae1e63d503 100644
+--- a/sysdeps/aarch64/fpu/exp2_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp2_advsimd.c
+@@ -24,6 +24,7 @@
+ #define IndexMask (N - 1)
+ #define BigBound 1022.0
+ #define UOFlowBound 1280.0
++#define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */
+
+ static const struct data
+ {
+@@ -48,14 +49,13 @@ lookup_sbits (uint64x2_t i)
+
+ #if WANT_SIMD_EXCEPT
+
+-# define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */
+ # define Thres 0x2080000000000000 /* asuint64(512.0) - TinyBound. */
+
+ /* Call scalar exp2 as a fallback. */
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x)
++special_case (float64x2_t x, float64x2_t y, uint64x2_t is_special)
+ {
+- return v_call_f64 (exp2, x, x, v_u64 (0xffffffffffffffff));
++ return v_call_f64 (exp2, x, y, is_special);
+ }
+
+ #else
+@@ -65,7 +65,7 @@ special_case (float64x2_t x)
+ # define SpecialBias1 0x7000000000000000 /* 0x1p769. */
+ # define SpecialBias2 0x3010000000000000 /* 0x1p-254. */
+
+-static float64x2_t VPCS_ATTR
++static inline float64x2_t VPCS_ATTR
+ special_case (float64x2_t s, float64x2_t y, float64x2_t n,
+ const struct data *d)
+ {
+@@ -94,10 +94,10 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x)
+ #if WANT_SIMD_EXCEPT
+ uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x));
+ cmp = vcgeq_u64 (vsubq_u64 (ia, v_u64 (TinyBound)), v_u64 (Thres));
+- /* If any special case (inf, nan, small and large x) is detected,
+- fall back to scalar for all lanes. */
+- if (__glibc_unlikely (v_any_u64 (cmp)))
+- return special_case (x);
++ /* Mask special lanes and retain a copy of x for passing to special-case
++ handler. */
++ float64x2_t xc = x;
++ x = v_zerofy_f64 (x, cmp);
+ #else
+ cmp = vcagtq_f64 (x, d->scale_big_bound);
+ #endif
+@@ -120,9 +120,11 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x)
+ float64x2_t y = v_pairwise_poly_3_f64 (r, r2, d->poly);
+ y = vmulq_f64 (r, y);
+
+-#if !WANT_SIMD_EXCEPT
+ if (__glibc_unlikely (v_any_u64 (cmp)))
++#if !WANT_SIMD_EXCEPT
+ return special_case (s, y, n, d);
++#else
++ return special_case (xc, vfmaq_f64 (s, s, y), cmp);
+ #endif
+ return vfmaq_f64 (s, s, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c
+index 9a5a523a10..8a686e3e05 100644
+--- a/sysdeps/aarch64/fpu/exp2f_sve.c
++++ b/sysdeps/aarch64/fpu/exp2f_sve.c
+@@ -20,6 +20,8 @@
+ #include "sv_math.h"
+ #include "poly_sve_f32.h"
+
++#define Thres 0x1.5d5e2ap+6f
++
+ static const struct data
+ {
+ float poly[5];
+@@ -33,7 +35,7 @@ static const struct data
+ .shift = 0x1.903f8p17f,
+ /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled
+ correctly by FEXPA. */
+- .thres = 0x1.5d5e2ap+6f,
++ .thres = Thres,
+ };
+
+ static svfloat32_t NOINLINE
+diff --git a/sysdeps/aarch64/fpu/exp_advsimd.c b/sysdeps/aarch64/fpu/exp_advsimd.c
+index fd215f1d2c..5e3a9a0d44 100644
+--- a/sysdeps/aarch64/fpu/exp_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp_advsimd.c
+@@ -54,7 +54,7 @@ const static volatile struct
+ # define BigBound v_u64 (0x4080000000000000) /* asuint64 (0x1p9). */
+ # define SpecialBound v_u64 (0x2080000000000000) /* BigBound - TinyBound. */
+
+-static inline float64x2_t VPCS_ATTR
++static float64x2_t VPCS_ATTR NOINLINE
+ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp)
+ {
+ /* If fenv exceptions are to be triggered correctly, fall back to the scalar
+@@ -69,7 +69,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp)
+ # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */
+ # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */
+
+-static float64x2_t VPCS_ATTR NOINLINE
++static inline float64x2_t VPCS_ATTR
+ special_case (float64x2_t s, float64x2_t y, float64x2_t n)
+ {
+ /* 2^(n/N) may overflow, break it up into s1*s2. */
+diff --git a/sysdeps/aarch64/fpu/expm1_advsimd.c b/sysdeps/aarch64/fpu/expm1_advsimd.c
+index 0b85bd06f3..3628398674 100644
+--- a/sysdeps/aarch64/fpu/expm1_advsimd.c
++++ b/sysdeps/aarch64/fpu/expm1_advsimd.c
+@@ -23,7 +23,7 @@
+ static const struct data
+ {
+ float64x2_t poly[11];
+- float64x2_t invln2, ln2_lo, ln2_hi, shift;
++ float64x2_t invln2, ln2, shift;
+ int64x2_t exponent_bias;
+ #if WANT_SIMD_EXCEPT
+ uint64x2_t thresh, tiny_bound;
+@@ -38,8 +38,7 @@ static const struct data
+ V2 (0x1.71ddf82db5bb4p-19), V2 (0x1.27e517fc0d54bp-22),
+ V2 (0x1.af5eedae67435p-26), V2 (0x1.1f143d060a28ap-29) },
+ .invln2 = V2 (0x1.71547652b82fep0),
+- .ln2_hi = V2 (0x1.62e42fefa39efp-1),
+- .ln2_lo = V2 (0x1.abc9e3b39803fp-56),
++ .ln2 = { 0x1.62e42fefa39efp-1, 0x1.abc9e3b39803fp-56 },
+ .shift = V2 (0x1.8p52),
+ .exponent_bias = V2 (0x3ff0000000000000),
+ #if WANT_SIMD_EXCEPT
+@@ -83,7 +82,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x)
+ x = v_zerofy_f64 (x, special);
+ #else
+ /* Large input, NaNs and Infs. */
+- uint64x2_t special = vceqzq_u64 (vcaltq_f64 (x, d->oflow_bound));
++ uint64x2_t special = vcageq_f64 (x, d->oflow_bound);
+ #endif
+
+ /* Reduce argument to smaller range:
+@@ -93,8 +92,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x)
+ where 2^i is exact because i is an integer. */
+ float64x2_t n = vsubq_f64 (vfmaq_f64 (d->shift, d->invln2, x), d->shift);
+ int64x2_t i = vcvtq_s64_f64 (n);
+- float64x2_t f = vfmsq_f64 (x, n, d->ln2_hi);
+- f = vfmsq_f64 (f, n, d->ln2_lo);
++ float64x2_t f = vfmsq_laneq_f64 (x, n, d->ln2, 0);
++ f = vfmsq_laneq_f64 (f, n, d->ln2, 1);
+
+ /* Approximate expm1(f) using polynomial.
+ Taylor expansion for expm1(x) has the form:
+diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c
+index 8d4c9a2193..93db200f61 100644
+--- a/sysdeps/aarch64/fpu/expm1f_advsimd.c
++++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c
+@@ -23,7 +23,8 @@
+ static const struct data
+ {
+ float32x4_t poly[5];
+- float32x4_t invln2, ln2_lo, ln2_hi, shift;
++ float32x4_t invln2_and_ln2;
++ float32x4_t shift;
+ int32x4_t exponent_bias;
+ #if WANT_SIMD_EXCEPT
+ uint32x4_t thresh;
+@@ -34,9 +35,8 @@ static const struct data
+ /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2]. */
+ .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5),
+ V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) },
+- .invln2 = V4 (0x1.715476p+0f),
+- .ln2_hi = V4 (0x1.62e4p-1f),
+- .ln2_lo = V4 (0x1.7f7d1cp-20f),
++ /* Stores constants: invln2, ln2_hi, ln2_lo, 0. */
++ .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 },
+ .shift = V4 (0x1.8p23f),
+ .exponent_bias = V4 (0x3f800000),
+ #if !WANT_SIMD_EXCEPT
+@@ -80,7 +80,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x)
+ x = v_zerofy_f32 (x, special);
+ #else
+ /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf. */
+- uint32x4_t special = vceqzq_u32 (vcaltq_f32 (x, d->oflow_bound));
++ uint32x4_t special = vcagtq_f32 (x, d->oflow_bound);
+ #endif
+
+ /* Reduce argument to smaller range:
+@@ -88,10 +88,11 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x)
+ and f = x - i * ln2, then f is in [-ln2/2, ln2/2].
+ exp(x) - 1 = 2^i * (expm1(f) + 1) - 1
+ where 2^i is exact because i is an integer. */
+- float32x4_t j = vsubq_f32 (vfmaq_f32 (d->shift, d->invln2, x), d->shift);
++ float32x4_t j = vsubq_f32 (
++ vfmaq_laneq_f32 (d->shift, x, d->invln2_and_ln2, 0), d->shift);
+ int32x4_t i = vcvtq_s32_f32 (j);
+- float32x4_t f = vfmsq_f32 (x, j, d->ln2_hi);
+- f = vfmsq_f32 (f, j, d->ln2_lo);
++ float32x4_t f = vfmsq_laneq_f32 (x, j, d->invln2_and_ln2, 1);
++ f = vfmsq_laneq_f32 (f, j, d->invln2_and_ln2, 2);
+
+ /* Approximate expm1(f) using polynomial.
+ Taylor expansion for expm1(x) has the form:
+diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c
+index 067ae79613..21df61728c 100644
+--- a/sysdeps/aarch64/fpu/log_advsimd.c
++++ b/sysdeps/aarch64/fpu/log_advsimd.c
+@@ -58,8 +58,13 @@ lookup (uint64x2_t i)
+ uint64_t i1 = (i[1] >> (52 - V_LOG_TABLE_BITS)) & IndexMask;
+ float64x2_t e0 = vld1q_f64 (&__v_log_data.table[i0].invc);
+ float64x2_t e1 = vld1q_f64 (&__v_log_data.table[i1].invc);
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ e.invc = vuzp1q_f64 (e0, e1);
+ e.logc = vuzp2q_f64 (e0, e1);
++#else
++ e.invc = vuzp1q_f64 (e1, e0);
++ e.logc = vuzp2q_f64 (e1, e0);
++#endif
+ return e;
+ }
+
+diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c
+index efce183e86..a0d9d3b819 100644
+--- a/sysdeps/aarch64/fpu/sin_advsimd.c
++++ b/sysdeps/aarch64/fpu/sin_advsimd.c
+@@ -75,8 +75,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x)
+ r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x);
+ #else
+ r = x;
+- cmp = vcageq_f64 (d->range_val, x);
+- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */
++ cmp = vcageq_f64 (x, d->range_val);
+ #endif
+
+ /* n = rint(|x|/pi). */
+diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c
+index 60cf3f2ca1..375dfc3331 100644
+--- a/sysdeps/aarch64/fpu/sinf_advsimd.c
++++ b/sysdeps/aarch64/fpu/sinf_advsimd.c
+@@ -67,8 +67,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x)
+ r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x);
+ #else
+ r = x;
+- cmp = vcageq_f32 (d->range_val, x);
+- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */
++ cmp = vcageq_f32 (x, d->range_val);
+ #endif
+
+ /* n = rint(|x|/pi) */
+diff --git a/sysdeps/aarch64/fpu/tan_advsimd.c b/sysdeps/aarch64/fpu/tan_advsimd.c
+index d7e5ba7b1a..0459821ab2 100644
+--- a/sysdeps/aarch64/fpu/tan_advsimd.c
++++ b/sysdeps/aarch64/fpu/tan_advsimd.c
+@@ -23,7 +23,7 @@
+ static const struct data
+ {
+ float64x2_t poly[9];
+- float64x2_t half_pi_hi, half_pi_lo, two_over_pi, shift;
++ float64x2_t half_pi, two_over_pi, shift;
+ #if !WANT_SIMD_EXCEPT
+ float64x2_t range_val;
+ #endif
+@@ -34,8 +34,7 @@ static const struct data
+ V2 (0x1.226e5e5ecdfa3p-7), V2 (0x1.d6c7ddbf87047p-9),
+ V2 (0x1.7ea75d05b583ep-10), V2 (0x1.289f22964a03cp-11),
+ V2 (0x1.4e4fd14147622p-12) },
+- .half_pi_hi = V2 (0x1.921fb54442d18p0),
+- .half_pi_lo = V2 (0x1.1a62633145c07p-54),
++ .half_pi = { 0x1.921fb54442d18p0, 0x1.1a62633145c07p-54 },
+ .two_over_pi = V2 (0x1.45f306dc9c883p-1),
+ .shift = V2 (0x1.8p52),
+ #if !WANT_SIMD_EXCEPT
+@@ -56,15 +55,15 @@ special_case (float64x2_t x)
+
+ /* Vector approximation for double-precision tan.
+ Maximum measured error is 3.48 ULP:
+- __v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37
+- want -0x1.f6ccd8ecf7deap+37. */
++ _ZGVnN2v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37
++ want -0x1.f6ccd8ecf7deap+37. */
+ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x)
+ {
+ const struct data *dat = ptr_barrier (&data);
+- /* Our argument reduction cannot calculate q with sufficient accuracy for very
+- large inputs. Fall back to scalar routine for all lanes if any are too
+- large, or Inf/NaN. If fenv exceptions are expected, also fall back for tiny
+- input to avoid underflow. */
++ /* Our argument reduction cannot calculate q with sufficient accuracy for
++ very large inputs. Fall back to scalar routine for all lanes if any are
++ too large, or Inf/NaN. If fenv exceptions are expected, also fall back for
++ tiny input to avoid underflow. */
+ #if WANT_SIMD_EXCEPT
+ uint64x2_t iax = vreinterpretq_u64_f64 (vabsq_f64 (x));
+ /* iax - tiny_bound > range_val - tiny_bound. */
+@@ -82,8 +81,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x)
+ /* Use q to reduce x to r in [-pi/4, pi/4], by:
+ r = x - q * pi/2, in extended precision. */
+ float64x2_t r = x;
+- r = vfmsq_f64 (r, q, dat->half_pi_hi);
+- r = vfmsq_f64 (r, q, dat->half_pi_lo);
++ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 0);
++ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 1);
+ /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle
+ formula. */
+ r = vmulq_n_f64 (r, 0.5);
+@@ -106,14 +105,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x)
+ and reciprocity around pi/2:
+ tan(x) = 1 / (tan(pi/2 - x))
+ to assemble result using change-of-sign and conditional selection of
+- numerator/denominator, dependent on odd/even-ness of q (hence quadrant). */
++ numerator/denominator, dependent on odd/even-ness of q (hence quadrant).
++ */
+ float64x2_t n = vfmaq_f64 (v_f64 (-1), p, p);
+ float64x2_t d = vaddq_f64 (p, p);
+
+ uint64x2_t no_recip = vtstq_u64 (vreinterpretq_u64_s64 (qi), v_u64 (1));
+
+ #if !WANT_SIMD_EXCEPT
+- uint64x2_t special = vceqzq_u64 (vcaleq_f64 (x, dat->range_val));
++ uint64x2_t special = vcageq_f64 (x, dat->range_val);
+ if (__glibc_unlikely (v_any_u64 (special)))
+ return special_case (x);
+ #endif
+diff --git a/sysdeps/aarch64/fpu/tanf_advsimd.c b/sysdeps/aarch64/fpu/tanf_advsimd.c
+index 1f16103f8a..5a7489390a 100644
+--- a/sysdeps/aarch64/fpu/tanf_advsimd.c
++++ b/sysdeps/aarch64/fpu/tanf_advsimd.c
+@@ -23,7 +23,8 @@
+ static const struct data
+ {
+ float32x4_t poly[6];
+- float32x4_t neg_half_pi_1, neg_half_pi_2, neg_half_pi_3, two_over_pi, shift;
++ float32x4_t pi_consts;
++ float32x4_t shift;
+ #if !WANT_SIMD_EXCEPT
+ float32x4_t range_val;
+ #endif
+@@ -31,10 +32,9 @@ static const struct data
+ /* Coefficients generated using FPMinimax. */
+ .poly = { V4 (0x1.55555p-2f), V4 (0x1.11166p-3f), V4 (0x1.b88a78p-5f),
+ V4 (0x1.7b5756p-6f), V4 (0x1.4ef4cep-8f), V4 (0x1.0e1e74p-7f) },
+- .neg_half_pi_1 = V4 (-0x1.921fb6p+0f),
+- .neg_half_pi_2 = V4 (0x1.777a5cp-25f),
+- .neg_half_pi_3 = V4 (0x1.ee59dap-50f),
+- .two_over_pi = V4 (0x1.45f306p-1f),
++ /* Stores constants: (-pi/2)_high, (-pi/2)_mid, (-pi/2)_low, and 2/pi. */
++ .pi_consts
++ = { -0x1.921fb6p+0f, 0x1.777a5cp-25f, 0x1.ee59dap-50f, 0x1.45f306p-1f },
+ .shift = V4 (0x1.8p+23f),
+ #if !WANT_SIMD_EXCEPT
+ .range_val = V4 (0x1p15f),
+@@ -58,10 +58,11 @@ eval_poly (float32x4_t z, const struct data *d)
+ {
+ float32x4_t z2 = vmulq_f32 (z, z);
+ #if WANT_SIMD_EXCEPT
+- /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. If fp exceptions
+- are to be triggered correctly, sidestep this by fixing such lanes to 0. */
++ /* Tiny z (<= 0x1p-31) will underflow when calculating z^4.
++ If fp exceptions are to be triggered correctly,
++ sidestep this by fixing such lanes to 0. */
+ uint32x4_t will_uflow
+- = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound);
++ = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound);
+ if (__glibc_unlikely (v_any_u32 (will_uflow)))
+ z2 = vbslq_f32 (will_uflow, v_f32 (0), z2);
+ #endif
+@@ -94,16 +95,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tan) (float32x4_t x)
+ #endif
+
+ /* n = rint(x/(pi/2)). */
+- float32x4_t q = vfmaq_f32 (d->shift, d->two_over_pi, x);
++ float32x4_t q = vfmaq_laneq_f32 (d->shift, x, d->pi_consts, 3);
+ float32x4_t n = vsubq_f32 (q, d->shift);
+ /* Determine if x lives in an interval, where |tan(x)| grows to infinity. */
+ uint32x4_t pred_alt = vtstq_u32 (vreinterpretq_u32_f32 (q), v_u32 (1));
+
+ /* r = x - n * (pi/2) (range reduction into -pi./4 .. pi/4). */
+ float32x4_t r;
+- r = vfmaq_f32 (x, d->neg_half_pi_1, n);
+- r = vfmaq_f32 (r, d->neg_half_pi_2, n);
+- r = vfmaq_f32 (r, d->neg_half_pi_3, n);
++ r = vfmaq_laneq_f32 (x, n, d->pi_consts, 0);
++ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 1);
++ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 2);
+
+ /* If x lives in an interval, where |tan(x)|
+ - is finite, then use a polynomial approximation of the form
+diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h
+index c52860efb2..61dc40088f 100644
+--- a/sysdeps/aarch64/multiarch/init-arch.h
++++ b/sysdeps/aarch64/multiarch/init-arch.h
+@@ -36,5 +36,7 @@
+ MTE_ENABLED (); \
+ bool __attribute__((unused)) sve = \
+ GLRO(dl_aarch64_cpu_features).sve; \
++ bool __attribute__((unused)) prefer_sve_ifuncs = \
++ GLRO(dl_aarch64_cpu_features).prefer_sve_ifuncs; \
+ bool __attribute__((unused)) mops = \
+ GLRO(dl_aarch64_cpu_features).mops;
+diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
+index d12eccfca5..ce53567dab 100644
+--- a/sysdeps/aarch64/multiarch/memcpy.c
++++ b/sysdeps/aarch64/multiarch/memcpy.c
+@@ -47,7 +47,7 @@ select_memcpy_ifunc (void)
+ {
+ if (IS_A64FX (midr))
+ return __memcpy_a64fx;
+- return __memcpy_sve;
++ return prefer_sve_ifuncs ? __memcpy_sve : __memcpy_generic;
+ }
+
+ if (IS_THUNDERX (midr))
+diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c
+index 2081eeb4d4..fe95037be3 100644
+--- a/sysdeps/aarch64/multiarch/memmove.c
++++ b/sysdeps/aarch64/multiarch/memmove.c
+@@ -47,7 +47,7 @@ select_memmove_ifunc (void)
+ {
+ if (IS_A64FX (midr))
+ return __memmove_a64fx;
+- return __memmove_sve;
++ return prefer_sve_ifuncs ? __memmove_sve : __memmove_generic;
+ }
+
+ if (IS_THUNDERX (midr))
+diff --git a/sysdeps/aarch64/multiarch/memset_generic.S b/sysdeps/aarch64/multiarch/memset_generic.S
+index 81748bdbce..e125a5ed85 100644
+--- a/sysdeps/aarch64/multiarch/memset_generic.S
++++ b/sysdeps/aarch64/multiarch/memset_generic.S
+@@ -33,3 +33,7 @@
+ #endif
+
+ #include <../memset.S>
++
++#if IS_IN (rtld)
++strong_alias (memset, __memset_generic)
++#endif
+diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure
+index d9bd1f8558..19657b627b 100644
+--- a/sysdeps/aarch64/preconfigure
++++ b/sysdeps/aarch64/preconfigure
+@@ -2,5 +2,6 @@ case "$machine" in
+ aarch64*)
+ base_machine=aarch64
+ machine=aarch64
++ mtls_descriptor=desc
+ ;;
+ esac
+diff --git a/sysdeps/arc/utmp-size.h b/sysdeps/arc/utmp-size.h
+new file mode 100644
+index 0000000000..a247fcd3da
+--- /dev/null
++++ b/sysdeps/arc/utmp-size.h
+@@ -0,0 +1,3 @@
++/* arc has less padding than other architectures with 64-bit time_t. */
++#define UTMP_SIZE 392
++#define LASTLOG_SIZE 296
+diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
+index d5cea717a9..619474eca9 100644
+--- a/sysdeps/arm/Makefile
++++ b/sysdeps/arm/Makefile
+@@ -13,15 +13,15 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
+ lib-noranlib: $(objpfx)libgcc-stubs.a
+
+ ifeq ($(build-shared),yes)
+-ifeq (yes,$(have-mtls-dialect-gnu2))
++ifneq (no,$(have-mtls-descriptor))
+ tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy
+ modules-names += tst-armtlsdesclocmod
+ modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod
+ CPPFLAGS-tst-armtlsdescextnowmod.c += -Dstatic=
+ CPPFLAGS-tst-armtlsdescextlazymod.c += -Dstatic=
+-CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=gnu2
+-CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=gnu2
+-CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=gnu2
++CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=$(have-mtls-descriptor)
++CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=$(have-mtls-descriptor)
+ LDFLAGS-tst-armtlsdescextnowmod.so += -Wl,-z,now
+ tst-armtlsdescloc-ENV = LD_BIND_NOW=1
+ tst-armtlsdescextnow-ENV = LD_BIND_NOW=1
+diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/arm/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure
+index 35e2918922..4ef4d46cbd 100644
+--- a/sysdeps/arm/configure
++++ b/sysdeps/arm/configure
+@@ -187,6 +187,38 @@ else
+ default-abi = soft"
+ fi
+
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether VFP supports 32 registers" >&5
++printf %s "checking whether VFP supports 32 registers... " >&6; }
++if test ${libc_cv_arm_pcs_vfp_d32+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++void foo (void)
++{
++ asm volatile ("vldr d16,=17" : : : "d16");
++}
++
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
++then :
++ libc_cv_arm_pcs_vfp_d32=yes
++else $as_nop
++ libc_cv_arm_pcs_vfp_d32=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp_d32" >&5
++printf "%s\n" "$libc_cv_arm_pcs_vfp_d32" >&6; }
++if test "$libc_cv_arm_pcs_vfp_d32" = yes ;
++then
++ printf "%s\n" "#define HAVE_ARM_PCS_VFP_D32 1" >>confdefs.h
++
++fi
++
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether PC-relative relocs in movw/movt work properly" >&5
+ printf %s "checking whether PC-relative relocs in movw/movt work properly... " >&6; }
+ if test ${libc_cv_arm_pcrel_movw+y}
+diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac
+index 5172e30bbe..cd00ddc9d9 100644
+--- a/sysdeps/arm/configure.ac
++++ b/sysdeps/arm/configure.ac
+@@ -21,6 +21,21 @@ else
+ LIBC_CONFIG_VAR([default-abi], [soft])
+ fi
+
++AC_CACHE_CHECK([whether VFP supports 32 registers],
++ libc_cv_arm_pcs_vfp_d32, [
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
++void foo (void)
++{
++ asm volatile ("vldr d16,=17" : : : "d16");
++}
++]])],
++ [libc_cv_arm_pcs_vfp_d32=yes],
++ [libc_cv_arm_pcs_vfp_d32=no])])
++if test "$libc_cv_arm_pcs_vfp_d32" = yes ;
++then
++ AC_DEFINE(HAVE_ARM_PCS_VFP_D32)
++fi
++
+ AC_CACHE_CHECK([whether PC-relative relocs in movw/movt work properly],
+ libc_cv_arm_pcrel_movw, [
+ cat > conftest.s <<\EOF
+diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
+index b857bbc868..dd1a0f6b6e 100644
+--- a/sysdeps/arm/dl-machine.h
++++ b/sysdeps/arm/dl-machine.h
+@@ -139,7 +139,6 @@ _start:\n\
+ _dl_start_user:\n\
+ adr r6, .L_GET_GOT\n\
+ add sl, sl, r6\n\
+- ldr r4, [sl, r4]\n\
+ @ save the entry point in another register\n\
+ mov r6, r0\n\
+ @ get the original arg count\n\
+diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S
+index 764c56e70f..ada106521d 100644
+--- a/sysdeps/arm/dl-tlsdesc.S
++++ b/sysdeps/arm/dl-tlsdesc.S
+@@ -19,6 +19,7 @@
+ #include <sysdep.h>
+ #include <arm-features.h>
+ #include <tls.h>
++#include <rtld-global-offsets.h>
+ #include "tlsdesc.h"
+
+ .text
+@@ -83,14 +84,20 @@ _dl_tlsdesc_dynamic(struct tlsdesc *tdp)
+ .align 2
+ _dl_tlsdesc_dynamic:
+ /* Our calling convention is to clobber r0, r1 and the processor
+- flags. All others that are modified must be saved */
+- eabi_save ({r2,r3,r4,lr})
+- push {r2,r3,r4,lr}
+- cfi_adjust_cfa_offset (16)
++ flags. All others that are modified must be saved. r5 is
++ used as the hwcap value to avoid reload after __tls_get_addr
++ call. If required we will save the vector register on the slow
++ path. */
++ eabi_save ({r2,r3,r4,r5,ip,lr})
++ push {r2,r3,r4,r5,ip,lr}
++ cfi_adjust_cfa_offset (24)
+ cfi_rel_offset (r2,0)
+ cfi_rel_offset (r3,4)
+ cfi_rel_offset (r4,8)
+- cfi_rel_offset (lr,12)
++ cfi_rel_offset (r5,12)
++ cfi_rel_offset (ip,16)
++ cfi_rel_offset (lr,20)
++
+ ldr r1, [r0] /* td */
+ GET_TLS (lr)
+ mov r4, r0 /* r4 = tp */
+@@ -113,22 +120,69 @@ _dl_tlsdesc_dynamic:
+ rsbne r0, r4, r3
+ bne 2f
+ 1: mov r0, r1
++
++ /* Load the hwcap to check for vector support. */
++ ldr r2, 3f
++ ldr r1, .Lrtld_global_ro
++0: add r2, pc, r2
++ ldr r2, [r2, r1]
++ ldr r5, [r2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET]
++
++#ifdef __SOFTFP__
++ tst r5, #HWCAP_ARM_VFP
++ beq .Lno_vfp
++#endif
++
++ /* Store the VFP registers. Don't use VFP instructions directly
++ because this code is used in non-VFP multilibs. */
++#define VFP_STACK_REQ (32*8 + 8)
++ sub sp, sp, VFP_STACK_REQ
++ cfi_adjust_cfa_offset (VFP_STACK_REQ)
++ mov r3, sp
++ .inst 0xeca30b20 /* vstmia r3!, {d0-d15} */
++ tst r5, #HWCAP_ARM_VFPD32
++ beq 4f
++ .inst 0xece30b20 /* vstmia r3!, {d16-d31} */
++ /* Store the floating-point status register. */
++4: .inst 0xeef12a10 /* vmrs r2, fpscr */
++ str r2, [r3]
++.Lno_vfp:
+ bl __tls_get_addr
+ rsb r0, r4, r0
++#ifdef __SOFTFP__
++ tst r5, #HWCAP_ARM_VFP
++ beq 2f
++#endif
++ mov r3, sp
++ .inst 0xecb30b20 /* vldmia r3!, {d0-d15} */
++ tst r5, #HWCAP_ARM_VFPD32
++ beq 5f
++ .inst 0xecf30b20 /* vldmia r3!, {d16-d31} */
++ ldr r4, [r3]
++5: .inst 0xeee14a10 /* vmsr fpscr, r4 */
++ add sp, sp, VFP_STACK_REQ
++ cfi_adjust_cfa_offset (-VFP_STACK_REQ)
++
+ 2:
+ #if ((defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)) \
+ || defined (ARM_ALWAYS_BX))
+- pop {r2,r3,r4, lr}
+- cfi_adjust_cfa_offset (-16)
++ pop {r2,r3,r4,r5,ip, lr}
++ cfi_adjust_cfa_offset (-20)
+ cfi_restore (lr)
++ cfi_restore (ip)
++ cfi_restore (r5)
+ cfi_restore (r4)
+ cfi_restore (r3)
+ cfi_restore (r2)
+ bx lr
+ #else
+- pop {r2,r3,r4, pc}
++ pop {r2,r3,r4,r5,ip, pc}
+ #endif
+ eabi_fnend
+ cfi_endproc
+ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
++
++3: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
++.Lrtld_global_ro:
++ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT)
+ #endif /* SHARED */
+diff --git a/sysdeps/arm/tst-gnu2-tls2.h b/sysdeps/arm/tst-gnu2-tls2.h
+new file mode 100644
+index 0000000000..e413ac21fb
+--- /dev/null
++++ b/sysdeps/arm/tst-gnu2-tls2.h
+@@ -0,0 +1,128 @@
++/* Test TLSDESC relocation. ARM version.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <config.h>
++#include <sys/auxv.h>
++#include <string.h>
++#include <stdlib.h>
++#include <endian.h>
++
++#ifndef __SOFTFP__
++
++# ifdef HAVE_ARM_PCS_VFP_D32
++# define SAVE_VFP_D32 \
++ asm volatile ("vldr d16,=17" : : : "d16"); \
++ asm volatile ("vldr d17,=18" : : : "d17"); \
++ asm volatile ("vldr d18,=19" : : : "d18"); \
++ asm volatile ("vldr d19,=20" : : : "d19"); \
++ asm volatile ("vldr d20,=21" : : : "d20"); \
++ asm volatile ("vldr d21,=22" : : : "d21"); \
++ asm volatile ("vldr d22,=23" : : : "d22"); \
++ asm volatile ("vldr d23,=24" : : : "d23"); \
++ asm volatile ("vldr d24,=25" : : : "d24"); \
++ asm volatile ("vldr d25,=26" : : : "d25"); \
++ asm volatile ("vldr d26,=27" : : : "d26"); \
++ asm volatile ("vldr d27,=28" : : : "d27"); \
++ asm volatile ("vldr d28,=29" : : : "d28"); \
++ asm volatile ("vldr d29,=30" : : : "d29"); \
++ asm volatile ("vldr d30,=31" : : : "d30"); \
++ asm volatile ("vldr d31,=32" : : : "d31");
++# else
++# define SAVE_VFP_D32
++# endif
++
++# define INIT_TLSDESC_CALL() \
++ unsigned long hwcap = getauxval (AT_HWCAP)
++
++/* Set each vector register to a value from 1 to 32 before the TLS access,
++ dump to memory after TLS access, and compare with the expected values. */
++
++# define BEFORE_TLSDESC_CALL() \
++ if (hwcap & HWCAP_ARM_VFP) \
++ { \
++ asm volatile ("vldr d0,=1" : : : "d0"); \
++ asm volatile ("vldr d1,=2" : : : "d1"); \
++ asm volatile ("vldr d2,=3" : : : "d1"); \
++ asm volatile ("vldr d3,=4" : : : "d3"); \
++ asm volatile ("vldr d4,=5" : : : "d4"); \
++ asm volatile ("vldr d5,=6" : : : "d5"); \
++ asm volatile ("vldr d6,=7" : : : "d6"); \
++ asm volatile ("vldr d7,=8" : : : "d7"); \
++ asm volatile ("vldr d8,=9" : : : "d8"); \
++ asm volatile ("vldr d9,=10" : : : "d9"); \
++ asm volatile ("vldr d10,=11" : : : "d10"); \
++ asm volatile ("vldr d11,=12" : : : "d11"); \
++ asm volatile ("vldr d12,=13" : : : "d12"); \
++ asm volatile ("vldr d13,=14" : : : "d13"); \
++ asm volatile ("vldr d14,=15" : : : "d14"); \
++ asm volatile ("vldr d15,=16" : : : "d15"); \
++ } \
++ if (hwcap & HWCAP_ARM_VFPD32) \
++ { \
++ SAVE_VFP_D32 \
++ }
++
++# define VFP_STACK_REQ (16*8)
++# if __BYTE_ORDER == __BIG_ENDIAN
++# define DISP 7
++# else
++# define DISP 0
++# endif
++
++# ifdef HAVE_ARM_PCS_VFP_D32
++# define CHECK_VFP_D32 \
++ char vfp[VFP_STACK_REQ]; \
++ asm volatile ("vstmia %0, {d16-d31}\n" \
++ : \
++ : "r" (vfp) \
++ : "memory"); \
++ \
++ char expected[VFP_STACK_REQ] = { 0 }; \
++ for (int i = 0; i < 16; ++i) \
++ expected[i * 8 + DISP] = i + 17; \
++ \
++ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \
++ abort ();
++# else
++# define CHECK_VFP_D32
++# endif
++
++# define AFTER_TLSDESC_CALL() \
++ if (hwcap & HWCAP_ARM_VFP) \
++ { \
++ char vfp[VFP_STACK_REQ]; \
++ asm volatile ("vstmia %0, {d0-d15}\n" \
++ : \
++ : "r" (vfp) \
++ : "memory"); \
++ \
++ char expected[VFP_STACK_REQ] = { 0 }; \
++ for (int i = 0; i < 16; ++i) \
++ expected[i * 8 + DISP] = i + 1; \
++ \
++ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \
++ abort (); \
++ } \
++ if (hwcap & HWCAP_ARM_VFPD32) \
++ { \
++ CHECK_VFP_D32 \
++ }
++
++#endif /* __SOFTFP__ */
++
++#include_next <tst-gnu2-tls2.h>
+diff --git a/sysdeps/arm/utmp-size.h b/sysdeps/arm/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/arm/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/csky/bits/wordsize.h b/sysdeps/csky/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/csky/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/csky/utmp-size.h b/sysdeps/csky/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/csky/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
+index 117c901ccc..50f58a60e3 100644
+--- a/sysdeps/generic/ldsodefs.h
++++ b/sysdeps/generic/ldsodefs.h
+@@ -646,6 +646,8 @@ struct rtld_global_ro
+ /* Mask for more hardware capabilities that are available on some
+ platforms. */
+ EXTERN uint64_t _dl_hwcap2;
++ EXTERN uint64_t _dl_hwcap3;
++ EXTERN uint64_t _dl_hwcap4;
+
+ EXTERN enum dso_sort_algorithm _dl_dso_sort_algo;
+
+diff --git a/sysdeps/generic/utmp-size.h b/sysdeps/generic/utmp-size.h
+new file mode 100644
+index 0000000000..89dbe878b0
+--- /dev/null
++++ b/sysdeps/generic/utmp-size.h
+@@ -0,0 +1,23 @@
++/* Expected sizes of utmp-related structures stored in files. 64-bit version.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++/* Expected size, in bytes, of struct utmp and struct utmpx. */
++#define UTMP_SIZE 400
++
++/* Expected size, in bytes, of struct lastlog. */
++#define LASTLOG_SIZE 296
+diff --git a/sysdeps/hppa/utmp-size.h b/sysdeps/hppa/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/hppa/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
+index fc1ef96587..50d74fe6e9 100644
+--- a/sysdeps/i386/dl-machine.h
++++ b/sysdeps/i386/dl-machine.h
+@@ -347,7 +347,7 @@ and creates an unsatisfiable circular dependency.\n",
+ {
+ td->arg = _dl_make_tlsdesc_dynamic
+ (sym_map, sym->st_value + (ElfW(Word))td->arg);
+- td->entry = _dl_tlsdesc_dynamic;
++ td->entry = GLRO(dl_x86_tlsdesc_dynamic);
+ }
+ else
+ # endif
+diff --git a/sysdeps/i386/dl-tlsdesc-dynamic.h b/sysdeps/i386/dl-tlsdesc-dynamic.h
+new file mode 100644
+index 0000000000..3627028577
+--- /dev/null
++++ b/sysdeps/i386/dl-tlsdesc-dynamic.h
+@@ -0,0 +1,190 @@
++/* Thread-local storage handling in the ELF dynamic linker. i386 version.
++ Copyright (C) 2004-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#undef REGISTER_SAVE_AREA
++
++#if !defined USE_FNSAVE && (STATE_SAVE_ALIGNMENT % 16) != 0
++# error STATE_SAVE_ALIGNMENT must be multiple of 16
++#endif
++
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++# ifdef USE_FNSAVE
++# error USE_FNSAVE shouldn't be defined
++# endif
++# ifdef USE_FXSAVE
++/* Use fxsave to save all registers. */
++# define REGISTER_SAVE_AREA 512
++# endif
++#else
++# ifdef USE_FNSAVE
++/* Use fnsave to save x87 FPU stack registers. */
++# define REGISTER_SAVE_AREA 108
++# else
++# ifndef USE_FXSAVE
++# error USE_FXSAVE must be defined
++# endif
++/* Use fxsave to save all registers. Add 12 bytes to align the stack
++ to 16 bytes. */
++# define REGISTER_SAVE_AREA (512 + 12)
++# endif
++#endif
++
++ .hidden _dl_tlsdesc_dynamic
++ .global _dl_tlsdesc_dynamic
++ .type _dl_tlsdesc_dynamic,@function
++
++ /* This function is used for symbols that need dynamic TLS.
++
++ %eax points to the TLS descriptor, such that 0(%eax) points to
++ _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct
++ tlsdesc_dynamic_arg object. It must return in %eax the offset
++ between the thread pointer and the object denoted by the
++ argument, without clobbering any registers.
++
++ The assembly code that follows is a rendition of the following
++ C code, hand-optimized a little bit.
++
++ptrdiff_t
++__attribute__ ((__regparm__ (1)))
++_dl_tlsdesc_dynamic (struct tlsdesc *tdp)
++{
++ struct tlsdesc_dynamic_arg *td = tdp->arg;
++ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET);
++ if (__builtin_expect (td->gen_count <= dtv[0].counter
++ && (dtv[td->tlsinfo.ti_module].pointer.val
++ != TLS_DTV_UNALLOCATED),
++ 1))
++ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset
++ - __thread_pointer;
++
++ return ___tls_get_addr (&td->tlsinfo) - __thread_pointer;
++}
++*/
++ cfi_startproc
++ .align 16
++_dl_tlsdesc_dynamic:
++ /* Like all TLS resolvers, preserve call-clobbered registers.
++ We need two scratch regs anyway. */
++ subl $32, %esp
++ cfi_adjust_cfa_offset (32)
++ movl %ecx, 20(%esp)
++ movl %edx, 24(%esp)
++ movl TLSDESC_ARG(%eax), %eax
++ movl %gs:DTV_OFFSET, %edx
++ movl TLSDESC_GEN_COUNT(%eax), %ecx
++ cmpl (%edx), %ecx
++ ja 2f
++ movl TLSDESC_MODID(%eax), %ecx
++ movl (%edx,%ecx,8), %edx
++ cmpl $-1, %edx
++ je 2f
++ movl TLSDESC_MODOFF(%eax), %eax
++ addl %edx, %eax
++1:
++ movl 20(%esp), %ecx
++ subl %gs:0, %eax
++ movl 24(%esp), %edx
++ addl $32, %esp
++ cfi_adjust_cfa_offset (-32)
++ ret
++ .p2align 4,,7
++2:
++ cfi_adjust_cfa_offset (32)
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++ movl %ebx, -28(%esp)
++ movl %esp, %ebx
++ cfi_def_cfa_register(%ebx)
++ and $-STATE_SAVE_ALIGNMENT, %esp
++#endif
++#ifdef REGISTER_SAVE_AREA
++ subl $REGISTER_SAVE_AREA, %esp
++# if !DL_RUNTIME_RESOLVE_REALIGN_STACK
++ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA)
++# endif
++#else
++# if !DL_RUNTIME_RESOLVE_REALIGN_STACK
++# error DL_RUNTIME_RESOLVE_REALIGN_STACK must be true
++# endif
++ /* Allocate stack space of the required size to save the state. */
++ LOAD_PIC_REG (cx)
++ subl RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET+_rtld_local_ro@GOTOFF(%ecx), %esp
++#endif
++#ifdef USE_FNSAVE
++ fnsave (%esp)
++#elif defined USE_FXSAVE
++ fxsave (%esp)
++#else
++ /* Save the argument for ___tls_get_addr in EAX. */
++ movl %eax, %ecx
++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax
++ xorl %edx, %edx
++ /* Clear the XSAVE Header. */
++# ifdef USE_XSAVE
++ movl %edx, (512)(%esp)
++ movl %edx, (512 + 4 * 1)(%esp)
++ movl %edx, (512 + 4 * 2)(%esp)
++ movl %edx, (512 + 4 * 3)(%esp)
++# endif
++ movl %edx, (512 + 4 * 4)(%esp)
++ movl %edx, (512 + 4 * 5)(%esp)
++ movl %edx, (512 + 4 * 6)(%esp)
++ movl %edx, (512 + 4 * 7)(%esp)
++ movl %edx, (512 + 4 * 8)(%esp)
++ movl %edx, (512 + 4 * 9)(%esp)
++ movl %edx, (512 + 4 * 10)(%esp)
++ movl %edx, (512 + 4 * 11)(%esp)
++ movl %edx, (512 + 4 * 12)(%esp)
++ movl %edx, (512 + 4 * 13)(%esp)
++ movl %edx, (512 + 4 * 14)(%esp)
++ movl %edx, (512 + 4 * 15)(%esp)
++# ifdef USE_XSAVE
++ xsave (%esp)
++# else
++ xsavec (%esp)
++# endif
++ /* Restore the argument for ___tls_get_addr in EAX. */
++ movl %ecx, %eax
++#endif
++ call HIDDEN_JUMPTARGET (___tls_get_addr)
++ /* Get register content back. */
++#ifdef USE_FNSAVE
++ frstor (%esp)
++#elif defined USE_FXSAVE
++ fxrstor (%esp)
++#else
++ /* Save and retore ___tls_get_addr return value stored in EAX. */
++ movl %eax, %ecx
++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax
++ xorl %edx, %edx
++ xrstor (%esp)
++ movl %ecx, %eax
++#endif
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++ mov %ebx, %esp
++ cfi_def_cfa_register(%esp)
++ movl -28(%esp), %ebx
++ cfi_restore(%ebx)
++#else
++ addl $REGISTER_SAVE_AREA, %esp
++ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA)
++#endif
++ jmp 1b
++ cfi_endproc
++ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
++
++#undef STATE_SAVE_ALIGNMENT
+diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S
+index 90d93caa0c..f002feee56 100644
+--- a/sysdeps/i386/dl-tlsdesc.S
++++ b/sysdeps/i386/dl-tlsdesc.S
+@@ -18,8 +18,27 @@
+
+ #include <sysdep.h>
+ #include <tls.h>
++#include <cpu-features-offsets.h>
++#include <features-offsets.h>
+ #include "tlsdesc.h"
+
++#ifndef DL_STACK_ALIGNMENT
++/* Due to GCC bug:
++
++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066
++
++ __tls_get_addr may be called with 4-byte stack alignment. Although
++ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume
++ that stack will be always aligned at 16 bytes. */
++# define DL_STACK_ALIGNMENT 4
++#endif
++
++/* True if _dl_tlsdesc_dynamic should align stack for STATE_SAVE or align
++ stack to MINIMUM_ALIGNMENT bytes before calling ___tls_get_addr. */
++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \
++ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \
++ || MINIMUM_ALIGNMENT > DL_STACK_ALIGNMENT)
++
+ .text
+
+ /* This function is used to compute the TP offset for symbols in
+@@ -65,69 +84,35 @@ _dl_tlsdesc_undefweak:
+ .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak
+
+ #ifdef SHARED
+- .hidden _dl_tlsdesc_dynamic
+- .global _dl_tlsdesc_dynamic
+- .type _dl_tlsdesc_dynamic,@function
+-
+- /* This function is used for symbols that need dynamic TLS.
+-
+- %eax points to the TLS descriptor, such that 0(%eax) points to
+- _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct
+- tlsdesc_dynamic_arg object. It must return in %eax the offset
+- between the thread pointer and the object denoted by the
+- argument, without clobbering any registers.
+-
+- The assembly code that follows is a rendition of the following
+- C code, hand-optimized a little bit.
+-
+-ptrdiff_t
+-__attribute__ ((__regparm__ (1)))
+-_dl_tlsdesc_dynamic (struct tlsdesc *tdp)
+-{
+- struct tlsdesc_dynamic_arg *td = tdp->arg;
+- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET);
+- if (__builtin_expect (td->gen_count <= dtv[0].counter
+- && (dtv[td->tlsinfo.ti_module].pointer.val
+- != TLS_DTV_UNALLOCATED),
+- 1))
+- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset
+- - __thread_pointer;
+-
+- return ___tls_get_addr (&td->tlsinfo) - __thread_pointer;
+-}
+-*/
+- cfi_startproc
+- .align 16
+-_dl_tlsdesc_dynamic:
+- /* Like all TLS resolvers, preserve call-clobbered registers.
+- We need two scratch regs anyway. */
+- subl $28, %esp
+- cfi_adjust_cfa_offset (28)
+- movl %ecx, 20(%esp)
+- movl %edx, 24(%esp)
+- movl TLSDESC_ARG(%eax), %eax
+- movl %gs:DTV_OFFSET, %edx
+- movl TLSDESC_GEN_COUNT(%eax), %ecx
+- cmpl (%edx), %ecx
+- ja .Lslow
+- movl TLSDESC_MODID(%eax), %ecx
+- movl (%edx,%ecx,8), %edx
+- cmpl $-1, %edx
+- je .Lslow
+- movl TLSDESC_MODOFF(%eax), %eax
+- addl %edx, %eax
+-.Lret:
+- movl 20(%esp), %ecx
+- subl %gs:0, %eax
+- movl 24(%esp), %edx
+- addl $28, %esp
+- cfi_adjust_cfa_offset (-28)
+- ret
+- .p2align 4,,7
+-.Lslow:
+- cfi_adjust_cfa_offset (28)
+- call HIDDEN_JUMPTARGET (___tls_get_addr)
+- jmp .Lret
+- cfi_endproc
+- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
++# define USE_FNSAVE
++# define MINIMUM_ALIGNMENT 4
++# define STATE_SAVE_ALIGNMENT 4
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fnsave
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef MINIMUM_ALIGNMENT
++# undef USE_FNSAVE
++
++# define MINIMUM_ALIGNMENT 16
++
++# define USE_FXSAVE
++# define STATE_SAVE_ALIGNMENT 16
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_FXSAVE
++
++# define USE_XSAVE
++# define STATE_SAVE_ALIGNMENT 64
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_XSAVE
++
++# define USE_XSAVEC
++# define STATE_SAVE_ALIGNMENT 64
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_XSAVEC
+ #endif /* SHARED */
+diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
+index 84e6686eba..f2139fc172 100644
+--- a/sysdeps/i386/fpu/libm-test-ulps
++++ b/sysdeps/i386/fpu/libm-test-ulps
+@@ -1232,6 +1232,7 @@ ldouble: 6
+
+ Function: "hypot":
+ double: 1
++float: 1
+ float128: 1
+ ldouble: 1
+
+diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
+index 3e26f112d6..79856d498a 100644
+--- a/sysdeps/i386/i586/memcpy.S
++++ b/sysdeps/i386/i586/memcpy.S
+@@ -26,7 +26,7 @@
+ #define LEN SRC+4
+
+ .text
+-#if defined PIC && IS_IN (libc)
++#if defined SHARED && IS_IN (libc)
+ ENTRY (__memcpy_chk)
+ movl 12(%esp), %eax
+ cmpl %eax, 16(%esp)
+diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S
+index f230359ad6..effd958120 100644
+--- a/sysdeps/i386/i686/memmove.S
++++ b/sysdeps/i386/i686/memmove.S
+@@ -29,7 +29,7 @@
+ #define SRC DEST+4
+ #define LEN SRC+4
+
+-#if defined PIC && IS_IN (libc)
++#if defined SHARED && IS_IN (libc)
+ ENTRY_CHK (__memmove_chk)
+ movl 12(%esp), %eax
+ cmpl %eax, 16(%esp)
+diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S
+index f02f5a6df7..ab06771ea0 100644
+--- a/sysdeps/i386/i686/memset.S
++++ b/sysdeps/i386/i686/memset.S
+@@ -27,7 +27,7 @@
+ #define LEN CHR+4
+
+ .text
+-#if defined PIC && IS_IN (libc)
++#if defined SHARED && IS_IN (libc)
+ ENTRY_CHK (__memset_chk)
+ movl 12(%esp), %eax
+ cmpl %eax, 16(%esp)
+diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c
+index ef7bbbe792..20bfdf3af3 100644
+--- a/sysdeps/i386/i686/multiarch/memrchr-c.c
++++ b/sysdeps/i386/i686/multiarch/memrchr-c.c
+@@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t);
+ #endif
+
+ #include "string/memrchr.c"
++strong_alias (__memrchr_ia32, __GI___memrchr)
+diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
+index d9dae04171..e123f87435 100644
+--- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S
++++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
+@@ -720,5 +720,4 @@ L(ret_null):
+ ret
+
+ END (__memrchr_sse2)
+-strong_alias (__memrchr_sse2, __GI___memrchr)
+ #endif
+diff --git a/sysdeps/loongarch/fpu/e_scalbf.c b/sysdeps/loongarch/fpu/e_scalbf.c
+index 9f05485236..7c0395fbb5 100644
+--- a/sysdeps/loongarch/fpu/e_scalbf.c
++++ b/sysdeps/loongarch/fpu/e_scalbf.c
+@@ -57,4 +57,4 @@ __ieee754_scalbf (float x, float fn)
+
+ return x;
+ }
+-libm_alias_finite (__ieee754_scalb, __scalb)
++libm_alias_finite (__ieee754_scalbf, __scalbf)
+diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile b/sysdeps/loongarch/lp64/multiarch/Makefile
+index fe863e1ba4..01762ef526 100644
+--- a/sysdeps/loongarch/lp64/multiarch/Makefile
++++ b/sysdeps/loongarch/lp64/multiarch/Makefile
+@@ -1,52 +1,52 @@
+ ifeq ($(subdir),string)
+ sysdep_routines += \
+- strlen-aligned \
+- strlen-lsx \
+- strlen-lasx \
+- strnlen-aligned \
+- strnlen-lsx \
+- strnlen-lasx \
++ memchr-aligned \
++ memchr-lasx \
++ memchr-lsx \
++ memcmp-aligned \
++ memcmp-lasx \
++ memcmp-lsx \
++ memcpy-aligned \
++ memcpy-unaligned \
++ memmove-lasx \
++ memmove-lsx \
++ memmove-unaligned \
++ memrchr-generic \
++ memrchr-lasx \
++ memrchr-lsx \
++ memset-aligned \
++ memset-lasx \
++ memset-lsx \
++ memset-unaligned \
++ rawmemchr-aligned \
++ rawmemchr-lasx \
++ rawmemchr-lsx \
++ stpcpy-aligned \
++ stpcpy-lasx \
++ stpcpy-lsx \
++ stpcpy-unaligned \
+ strchr-aligned \
+- strchr-lsx \
+ strchr-lasx \
+- strrchr-aligned \
+- strrchr-lsx \
+- strrchr-lasx \
++ strchr-lsx \
+ strchrnul-aligned \
+- strchrnul-lsx \
+ strchrnul-lasx \
++ strchrnul-lsx \
+ strcmp-aligned \
+ strcmp-lsx \
+- strncmp-aligned \
+- strncmp-lsx \
+ strcpy-aligned \
+- strcpy-unaligned \
+- strcpy-lsx \
+ strcpy-lasx \
+- stpcpy-aligned \
+- stpcpy-unaligned \
+- stpcpy-lsx \
+- stpcpy-lasx \
+- memcpy-aligned \
+- memcpy-unaligned \
+- memmove-unaligned \
+- memmove-lsx \
+- memmove-lasx \
+- rawmemchr-aligned \
+- rawmemchr-lsx \
+- rawmemchr-lasx \
+- memchr-aligned \
+- memchr-lsx \
+- memchr-lasx \
+- memrchr-generic \
+- memrchr-lsx \
+- memrchr-lasx \
+- memset-aligned \
+- memset-unaligned \
+- memset-lsx \
+- memset-lasx \
+- memcmp-aligned \
+- memcmp-lsx \
+- memcmp-lasx \
++ strcpy-lsx \
++ strcpy-unaligned \
++ strlen-aligned \
++ strlen-lasx \
++ strlen-lsx \
++ strncmp-aligned \
++ strncmp-lsx \
++ strnlen-aligned \
++ strnlen-lasx \
++ strnlen-lsx \
++ strrchr-aligned \
++ strrchr-lasx \
++ strrchr-lsx \
+ # sysdep_routines
+ endif
+diff --git a/sysdeps/loongarch/lp64/multiarch/dl-symbol-redir-ifunc.h b/sysdeps/loongarch/lp64/multiarch/dl-symbol-redir-ifunc.h
+index cb640d77b7..a73390b12f 100644
+--- a/sysdeps/loongarch/lp64/multiarch/dl-symbol-redir-ifunc.h
++++ b/sysdeps/loongarch/lp64/multiarch/dl-symbol-redir-ifunc.h
+@@ -19,6 +19,9 @@
+ #ifndef _DL_IFUNC_GENERIC_H
+ #define _DL_IFUNC_GENERIC_H
+
++#ifndef SHARED
+ asm ("memset = __memset_aligned");
++asm ("memcmp = __memcmp_aligned");
++#endif
+
+ #endif
+diff --git a/sysdeps/m68k/bits/wordsize.h b/sysdeps/m68k/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/m68k/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/m68k/utmp-size.h b/sysdeps/m68k/utmp-size.h
+new file mode 100644
+index 0000000000..5946685819
+--- /dev/null
++++ b/sysdeps/m68k/utmp-size.h
+@@ -0,0 +1,3 @@
++/* m68k has 2-byte alignment. */
++#define UTMP_SIZE 382
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/microblaze/bits/wordsize.h b/sysdeps/microblaze/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/microblaze/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/microblaze/utmp-size.h b/sysdeps/microblaze/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/microblaze/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h
+index 57f0f2a22f..30dd3fd85d 100644
+--- a/sysdeps/mips/bits/wordsize.h
++++ b/sysdeps/mips/bits/wordsize.h
+@@ -19,11 +19,7 @@
+
+ #define __WORDSIZE _MIPS_SZPTR
+
+-#if _MIPS_SIM == _ABI64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+-#else
+-# define __WORDSIZE_TIME64_COMPAT32 0
+-#endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+
+ #if __WORDSIZE == 32
+ #define __WORDSIZE32_SIZE_ULONG 0
+diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps
+index 78969745b2..933aba4735 100644
+--- a/sysdeps/mips/mips64/libm-test-ulps
++++ b/sysdeps/mips/mips64/libm-test-ulps
+@@ -1066,17 +1066,17 @@ double: 1
+ ldouble: 1
+
+ Function: "j0":
+-double: 2
++double: 3
+ float: 9
+ ldouble: 2
+
+ Function: "j0_downward":
+-double: 5
++double: 6
+ float: 9
+ ldouble: 9
+
+ Function: "j0_towardzero":
+-double: 6
++double: 7
+ float: 9
+ ldouble: 9
+
+@@ -1146,6 +1146,7 @@ float: 6
+ ldouble: 8
+
+ Function: "log":
++double: 1
+ float: 1
+ ldouble: 1
+
+diff --git a/sysdeps/mips/utmp-size.h b/sysdeps/mips/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/mips/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/nios2/bits/wordsize.h b/sysdeps/nios2/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/nios2/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/nios2/utmp-size.h b/sysdeps/nios2/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/nios2/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/or1k/utmp-size.h b/sysdeps/or1k/utmp-size.h
+new file mode 100644
+index 0000000000..6b3653aa4d
+--- /dev/null
++++ b/sysdeps/or1k/utmp-size.h
+@@ -0,0 +1,3 @@
++/* or1k has less padding than other architectures with 64-bit time_t. */
++#define UTMP_SIZE 392
++#define LASTLOG_SIZE 296
+diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
+index a76bb6e5b0..8cf00aa7e3 100644
+--- a/sysdeps/powerpc/dl-procinfo.c
++++ b/sysdeps/powerpc/dl-procinfo.c
+@@ -38,6 +38,10 @@
+ needed.
+ */
+
++/* The total number of available bits (including those prior to
++ _DL_HWCAP_FIRST). Some of these bits might not be used. */
++#define _DL_HWCAP_COUNT 128
++
+ #ifndef PROCINFO_CLASS
+ # define PROCINFO_CLASS
+ #endif
+@@ -61,7 +65,7 @@ PROCINFO_CLASS struct cpu_features _dl_powerpc_cpu_features
+ #if !defined PROCINFO_DECL && defined SHARED
+ ._dl_powerpc_cap_flags
+ #else
+-PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15]
++PROCINFO_CLASS const char _dl_powerpc_cap_flags[_DL_HWCAP_COUNT][15]
+ #endif
+ #ifndef PROCINFO_DECL
+ = {
+diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
+index 68f4241095..b36697ba44 100644
+--- a/sysdeps/powerpc/dl-procinfo.h
++++ b/sysdeps/powerpc/dl-procinfo.h
+@@ -22,22 +22,23 @@
+ #include <ldsodefs.h>
+ #include <sysdep.h> /* This defines the PPC_FEATURE[2]_* macros. */
+
+-/* The total number of available bits (including those prior to
+- _DL_HWCAP_FIRST). Some of these bits might not be used. */
+-#define _DL_HWCAP_COUNT 64
++/* Feature masks are all 32-bits in size. */
++#define _DL_HWCAP_SIZE 32
+
+-/* Features started at bit 31 and decremented as new features were added. */
+-#define _DL_HWCAP_LAST 31
++/* AT_HWCAP2 feature strings follow the AT_HWCAP feature strings. */
++#define _DL_HWCAP2_OFFSET _DL_HWCAP_SIZE
+
+-/* AT_HWCAP2 features started at bit 31 and decremented as new features were
+- added. HWCAP2 feature bits start at bit 0. */
+-#define _DL_HWCAP2_LAST 31
++/* AT_HWCAP3 feature strings follow the AT_HWCAP2 feature strings. */
++#define _DL_HWCAP3_OFFSET (_DL_HWCAP2_OFFSET + _DL_HWCAP_SIZE)
++
++/* AT_HWCAP4 feature strings follow the AT_HWCAP3 feature strings. */
++#define _DL_HWCAP4_OFFSET (_DL_HWCAP3_OFFSET + _DL_HWCAP_SIZE)
+
+ /* These bits influence library search. */
+ #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \
+ + PPC_FEATURE_HAS_DFP)
+
+-#define _DL_PLATFORMS_COUNT 16
++#define _DL_PLATFORMS_COUNT 17
+
+ #define _DL_FIRST_PLATFORM 32
+ /* Mask to filter out platforms. */
+@@ -61,6 +62,7 @@
+ #define PPC_PLATFORM_POWER8 13
+ #define PPC_PLATFORM_POWER9 14
+ #define PPC_PLATFORM_POWER10 15
++#define PPC_PLATFORM_POWER11 16
+
+ static inline const char *
+ __attribute__ ((unused))
+@@ -88,6 +90,11 @@ _dl_string_platform (const char *str)
+ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
+ str++;
+ }
++ else if (str[1] == '1')
++ {
++ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER11;
++ str++;
++ }
+ else
+ return -1;
+ break;
+@@ -187,21 +194,42 @@ _dl_procinfo (unsigned int type, unsigned long int word)
+ case AT_HWCAP:
+ _dl_printf ("AT_HWCAP: ");
+
+- for (int i = 0; i <= _DL_HWCAP_LAST; ++i)
++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i)
+ if (word & (1 << i))
+ _dl_printf (" %s", _dl_hwcap_string (i));
+ break;
+ case AT_HWCAP2:
+ {
+- unsigned int offset = _DL_HWCAP_LAST + 1;
+
+ _dl_printf ("AT_HWCAP2: ");
+
+- /* We have to go through them all because the kernel added the
+- AT_HWCAP2 features starting with the high bits. */
+- for (int i = 0; i <= _DL_HWCAP2_LAST; ++i)
+- if (word & (1 << i))
+- _dl_printf (" %s", _dl_hwcap_string (offset + i));
++ /* We have to go through them all because the kernel added the
++ AT_HWCAP2 features starting with the high bits. */
++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i)
++ if (word & (1 << i))
++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP2_OFFSET + i));
++ break;
++ }
++ case AT_HWCAP3:
++ {
++ _dl_printf ("AT_HWCAP3: ");
++
++ /* We have to go through them all because the kernel added the
++ AT_HWCAP3 features starting with the high bits. */
++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i)
++ if (word & (1 << i))
++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP3_OFFSET + i));
++ break;
++ }
++ case AT_HWCAP4:
++ {
++ _dl_printf ("AT_HWCAP4: ");
++
++ /* We have to go through them all because the kernel added the
++ AT_HWCAP4 features starting with the high bits. */
++ for (int i = 0; i <= _DL_HWCAP_SIZE; ++i)
++ if (word & (1 << i))
++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP4_OFFSET + i));
+ break;
+ }
+ case AT_L1I_CACHEGEOMETRY:
+diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c
+index 76344f285a..f6fede15a7 100644
+--- a/sysdeps/powerpc/hwcapinfo.c
++++ b/sysdeps/powerpc/hwcapinfo.c
+@@ -31,7 +31,7 @@ void
+ __tcb_parse_hwcap_and_convert_at_platform (void)
+ {
+
+- uint64_t h1, h2;
++ uint64_t h1, h2, h3, h4;
+
+ /* Read AT_PLATFORM string from auxv and convert it to a number. */
+ __tcb.at_platform = _dl_string_platform (GLRO (dl_platform));
+@@ -39,6 +39,8 @@ __tcb_parse_hwcap_and_convert_at_platform (void)
+ /* Read HWCAP and HWCAP2 from auxv. */
+ h1 = GLRO (dl_hwcap);
+ h2 = GLRO (dl_hwcap2);
++ h3 = GLRO (dl_hwcap3);
++ h4 = GLRO (dl_hwcap4);
+
+ /* hwcap contains only the latest supported ISA, the code checks which is
+ and fills the previous supported ones. */
+@@ -64,13 +66,16 @@ __tcb_parse_hwcap_and_convert_at_platform (void)
+ else if (h1 & PPC_FEATURE_POWER5)
+ h1 |= PPC_FEATURE_POWER4;
+
+- uint64_t array_hwcaps[] = { h1, h2 };
++ uint64_t array_hwcaps[] = { h1, h2, h3, h4 };
+ init_cpu_features (&GLRO(dl_powerpc_cpu_features), array_hwcaps);
+
+ /* Consolidate both HWCAP and HWCAP2 into a single doubleword so that
+ we can read both in a single load later. */
+ __tcb.hwcap = (h1 << 32) | (h2 & 0xffffffff);
+- __tcb.hwcap_extn = 0x0;
++
++ /* Consolidate both HWCAP3 and HWCAP4 into a single doubleword so that
++ we can read both in a single load later. */
++ __tcb.hwcap_extn = (h3 << 32) | (h4 & 0xffffffff);
+
+ }
+ #if IS_IN (rtld)
+diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h
+index 04ca9debf0..6993fb6b29 100644
+--- a/sysdeps/powerpc/powerpc32/bits/wordsize.h
++++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h
+@@ -2,10 +2,9 @@
+
+ #if defined __powerpc64__
+ # define __WORDSIZE 64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ #else
+ # define __WORDSIZE 32
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ # define __WORDSIZE32_SIZE_ULONG 0
+ # define __WORDSIZE32_PTRDIFF_LONG 0
+ #endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+diff --git a/sysdeps/powerpc/powerpc32/power11/Implies b/sysdeps/powerpc/powerpc32/power11/Implies
+new file mode 100644
+index 0000000000..051cbe0f79
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc32/power11/Implies
+@@ -0,0 +1,2 @@
++powerpc/powerpc32/power10/fpu
++powerpc/powerpc32/power10
+diff --git a/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies
+new file mode 100644
+index 0000000000..58edb2861d
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/power10/fpu/multiarch
+diff --git a/sysdeps/powerpc/powerpc32/power11/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies
+new file mode 100644
+index 0000000000..c70f0428ba
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/power10/multiarch
+diff --git a/sysdeps/powerpc/powerpc64/be/power11/Implies b/sysdeps/powerpc/powerpc64/be/power11/Implies
+new file mode 100644
+index 0000000000..de481d1c13
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/be/power11/Implies
+@@ -0,0 +1,2 @@
++powerpc/powerpc64/be/power10/fpu
++powerpc/powerpc64/be/power10
+diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies
+new file mode 100644
+index 0000000000..dff0e13064
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/be/power10/fpu
+diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies
+new file mode 100644
+index 0000000000..c3f259e009
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/be/power10/fpu/multiarch
+diff --git a/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies
+new file mode 100644
+index 0000000000..9491a394c9
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/be/power10/multiarch
+diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h
+index 04ca9debf0..6993fb6b29 100644
+--- a/sysdeps/powerpc/powerpc64/bits/wordsize.h
++++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h
+@@ -2,10 +2,9 @@
+
+ #if defined __powerpc64__
+ # define __WORDSIZE 64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ #else
+ # define __WORDSIZE 32
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ # define __WORDSIZE32_SIZE_ULONG 0
+ # define __WORDSIZE32_PTRDIFF_LONG 0
+ #endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h
+index c6682f3445..2b6f5d2b08 100644
+--- a/sysdeps/powerpc/powerpc64/dl-machine.h
++++ b/sysdeps/powerpc/powerpc64/dl-machine.h
+@@ -78,6 +78,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr)
+ static inline Elf64_Addr
+ elf_machine_load_address (void) __attribute__ ((const));
+
++#ifndef __PCREL__
+ static inline Elf64_Addr
+ elf_machine_load_address (void)
+ {
+@@ -105,6 +106,24 @@ elf_machine_dynamic (void)
+ /* Then subtract off the load address offset. */
+ return runtime_dynamic - elf_machine_load_address() ;
+ }
++#else /* __PCREL__ */
++/* In PCREL mode, r2 may have been clobbered. Rely on relative
++ relocations instead. */
++
++static inline ElfW(Addr)
++elf_machine_load_address (void)
++{
++ extern const ElfW(Ehdr) __ehdr_start attribute_hidden;
++ return (ElfW(Addr)) &__ehdr_start;
++}
++
++static inline ElfW(Addr)
++elf_machine_dynamic (void)
++{
++ extern ElfW(Dyn) _DYNAMIC[] attribute_hidden;
++ return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address ();
++}
++#endif /* __PCREL__ */
+
+ /* The PLT uses Elf64_Rela relocs. */
+ #define elf_machine_relplt elf_machine_rela
+diff --git a/sysdeps/powerpc/powerpc64/le/power11/Implies b/sysdeps/powerpc/powerpc64/le/power11/Implies
+new file mode 100644
+index 0000000000..e18182dcc1
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/le/power11/Implies
+@@ -0,0 +1,2 @@
++powerpc/powerpc64/le/power10/fpu
++powerpc/powerpc64/le/power10
+diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies
+new file mode 100644
+index 0000000000..e41bd55684
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/le/power10/fpu
+diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies
+new file mode 100644
+index 0000000000..c838d50931
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/le/power10/fpu/multiarch
+diff --git a/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies
+new file mode 100644
+index 0000000000..687248c3c2
+--- /dev/null
++++ b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/le/power10/multiarch
+diff --git a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c
+index 77465d9133..65d3e69303 100644
+--- a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c
++++ b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c
+@@ -36,9 +36,11 @@ compute_level (void)
+ return 9;
+ if (strcmp (platform, "power10") == 0)
+ return 10;
++ if (strcmp (platform, "power11") == 0)
++ return 11;
+ printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform);
+- /* Assume that the new platform supports POWER10. */
+- return 10;
++ /* Assume that the new platform supports POWER11. */
++ return 11;
+ }
+
+ static int
+diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure
+index 4de94089a3..9e5a07ab6d 100644
+--- a/sysdeps/powerpc/preconfigure
++++ b/sysdeps/powerpc/preconfigure
+@@ -58,7 +58,7 @@ fi
+
+ ;;
+
+- a2|970|power[4-9]|power5x|power6+|power10)
++ a2|970|power[4-9]|power5x|power6+|power10|power11)
+ submachine=${archcpu}
+ if test ${libc_cv_cc_submachine+y}
+ then :
+diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac
+index 6c63bd8257..14b6dafd4a 100644
+--- a/sysdeps/powerpc/preconfigure.ac
++++ b/sysdeps/powerpc/preconfigure.ac
+@@ -46,7 +46,7 @@ case "${machine}:${submachine}" in
+ AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
+ ;;
+
+- a2|970|power[[4-9]]|power5x|power6+|power10)
++ a2|970|power[[4-9]]|power5x|power6+|power10|power11)
+ submachine=${archcpu}
+ AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
+ ;;
+diff --git a/sysdeps/powerpc/utmp-size.h b/sysdeps/powerpc/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/powerpc/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c
+index 3030660e5f..94ad6281bc 100644
+--- a/sysdeps/pthread/tst-cancel30.c
++++ b/sysdeps/pthread/tst-cancel30.c
+@@ -18,6 +18,7 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
++#include <errno.h>
+ #include <support/check.h>
+ #include <support/xstdio.h>
+ #include <support/xthread.h>
+@@ -46,13 +47,19 @@ tf (void *arg)
+
+ /* Wait indefinitely for cancellation, which only works if asynchronous
+ cancellation is enabled. */
+-#if defined SYS_ppoll || defined SYS_ppoll_time64
+-# ifndef SYS_ppoll_time64
+-# define SYS_ppoll_time64 SYS_ppoll
++#ifdef SYS_ppoll_time64
++ long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
++ (void) ret;
++# ifdef SYS_ppoll
++ if (ret == -1 && errno == ENOSYS)
++ syscall (SYS_ppoll, NULL, 0, NULL, NULL);
+ # endif
+- syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
+ #else
++# ifdef SYS_ppoll
++ syscall (SYS_ppoll, NULL, 0, NULL, NULL);
++# else
+ for (;;);
++# endif
+ #endif
+
+ return 0;
+diff --git a/sysdeps/riscv/utmp-size.h b/sysdeps/riscv/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/riscv/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/sh/bits/wordsize.h b/sysdeps/sh/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/sh/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/sh/utmp-size.h b/sysdeps/sh/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/sh/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h
+index 4bbd2e63b4..a2e79e0fa9 100644
+--- a/sysdeps/sparc/sparc32/bits/wordsize.h
++++ b/sysdeps/sparc/sparc32/bits/wordsize.h
+@@ -1,6 +1,6 @@
+ /* Determine the wordsize from the preprocessor defines. */
+
+ #define __WORDSIZE 32
+-#define __WORDSIZE_TIME64_COMPAT32 0
++#define __WORDSIZE_TIME64_COMPAT32 1
+ #define __WORDSIZE32_SIZE_ULONG 0
+ #define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h
+index 2f66f10d72..ea103e5970 100644
+--- a/sysdeps/sparc/sparc64/bits/wordsize.h
++++ b/sysdeps/sparc/sparc64/bits/wordsize.h
+@@ -2,10 +2,9 @@
+
+ #if defined __arch64__ || defined __sparcv9
+ # define __WORDSIZE 64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ #else
+ # define __WORDSIZE 32
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ # define __WORDSIZE32_SIZE_ULONG 0
+ # define __WORDSIZE32_PTRDIFF_LONG 0
+ #endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+diff --git a/sysdeps/sparc/sparc64/rtld-memset.c b/sysdeps/sparc/sparc64/rtld-memset.c
+index 55f3835790..a19202a620 100644
+--- a/sysdeps/sparc/sparc64/rtld-memset.c
++++ b/sysdeps/sparc/sparc64/rtld-memset.c
+@@ -1 +1,4 @@
+ #include <string/memset.c>
++#if IS_IN(rtld)
++strong_alias (memset, __memset_ultra1)
++#endif
+diff --git a/sysdeps/sparc/utmp-size.h b/sysdeps/sparc/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/sparc/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+index b1a3f673f0..c0b047bc0d 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
++++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+@@ -21,6 +21,7 @@
+ #include <sys/auxv.h>
+ #include <elf/dl-hwcaps.h>
+ #include <sys/prctl.h>
++#include <sys/utsname.h>
+ #include <dl-tunables-parse.h>
+
+ #define DCZID_DZP_MASK (1 << 4)
+@@ -62,6 +63,46 @@ get_midr_from_mcpu (const struct tunable_str_t *mcpu)
+ return UINT64_MAX;
+ }
+
++#if __LINUX_KERNEL_VERSION < 0x060200
++
++/* Return true if we prefer using SVE in string ifuncs. Old kernels disable
++ SVE after every system call which results in unnecessary traps if memcpy
++ uses SVE. This is true for kernels between 4.15.0 and before 6.2.0, except
++ for 5.14.0 which was patched. For these versions return false to avoid using
++ SVE ifuncs.
++ Parse the kernel version into a 24-bit kernel.major.minor value without
++ calling any library functions. If uname() is not supported or if the version
++ format is not recognized, assume the kernel is modern and return true. */
++
++static inline bool
++prefer_sve_ifuncs (void)
++{
++ struct utsname buf;
++ const char *p = &buf.release[0];
++ int kernel = 0;
++ int val;
++
++ if (__uname (&buf) < 0)
++ return true;
++
++ for (int shift = 16; shift >= 0; shift -= 8)
++ {
++ for (val = 0; *p >= '0' && *p <= '9'; p++)
++ val = val * 10 + *p - '0';
++ kernel |= (val & 255) << shift;
++ if (*p++ != '.')
++ break;
++ }
++
++ if (kernel >= 0x060200 || kernel == 0x050e00)
++ return true;
++ if (kernel >= 0x040f00)
++ return false;
++ return true;
++}
++
++#endif
++
+ static inline void
+ init_cpu_features (struct cpu_features *cpu_features)
+ {
+@@ -126,6 +167,13 @@ init_cpu_features (struct cpu_features *cpu_features)
+ /* Check if SVE is supported. */
+ cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE;
+
++ cpu_features->prefer_sve_ifuncs = cpu_features->sve;
++
++#if __LINUX_KERNEL_VERSION < 0x060200
++ if (cpu_features->sve)
++ cpu_features->prefer_sve_ifuncs = prefer_sve_ifuncs ();
++#endif
++
+ /* Check if MOPS is supported. */
+ cpu_features->mops = GLRO (dl_hwcap2) & HWCAP2_MOPS;
+ }
+diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h
+index e3d758b163..ea2a58ecb1 100644
+--- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h
++++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h
+@@ -47,6 +47,8 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values)
+ GLRO(dl_platform) = (void *) auxv_values[AT_PLATFORM];
+ GLRO(dl_hwcap) = auxv_values[AT_HWCAP];
+ GLRO(dl_hwcap2) = auxv_values[AT_HWCAP2];
++ GLRO(dl_hwcap3) = auxv_values[AT_HWCAP3];
++ GLRO(dl_hwcap4) = auxv_values[AT_HWCAP4];
+ GLRO(dl_clktck) = auxv_values[AT_CLKTCK];
+ GLRO(dl_fpu_control) = auxv_values[AT_FPUCW];
+ _dl_random = (void *) auxv_values[AT_RANDOM];
+diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
+index ad3692d738..e1b14e9eb3 100644
+--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
++++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
+@@ -197,6 +197,8 @@ _dl_show_auxv (void)
+ [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex },
+ [AT_RANDOM - 2] = { "RANDOM: 0x", hex },
+ [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex },
++ [AT_HWCAP3 - 2] = { "HWCAP3: 0x", hex },
++ [AT_HWCAP4 - 2] = { "HWCAP4: 0x", hex },
+ [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec },
+ [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec },
+ [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex },
+diff --git a/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h
+new file mode 100644
+index 0000000000..6ecbfe7c86
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h
+@@ -0,0 +1,21 @@
++/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#define __WORDSIZE 32
++#define __WORDSIZE_TIME64_COMPAT32 1
++#define __WORDSIZE32_SIZE_ULONG 0
++#define __WORDSIZE32_PTRDIFF_LONG 0
+diff --git a/sysdeps/unix/sysv/linux/mips/clone3.S b/sysdeps/unix/sysv/linux/mips/clone3.S
+index e9fec2fa47..481b8ae963 100644
+--- a/sysdeps/unix/sysv/linux/mips/clone3.S
++++ b/sysdeps/unix/sysv/linux/mips/clone3.S
+@@ -37,11 +37,6 @@
+
+ .text
+ .set nomips16
+-#if _MIPS_SIM == _ABIO32
+-# define EXTRA_LOCALS 1
+-#else
+-# define EXTRA_LOCALS 0
+-#endif
+ #define FRAMESZ ((NARGSAVE*SZREG)+ALSZ)&ALMASK
+ GPOFF= FRAMESZ-(1*SZREG)
+ NESTED(__clone3, SZREG, sp)
+@@ -68,8 +63,31 @@ NESTED(__clone3, SZREG, sp)
+ beqz a0, L(error) /* No NULL cl_args pointer. */
+ beqz a2, L(error) /* No NULL function pointer. */
+
++#if _MIPS_SIM == _ABIO32
++ /* Both stack and stack_size on clone_args are defined as uint64_t, and
++ there is no need to handle values larger than to 32 bits for o32. */
++# if __BYTE_ORDER == __BIG_ENDIAN
++# define CL_STACKPOINTER_OFFSET 44
++# define CL_STACKSIZE_OFFSET 52
++# else
++# define CL_STACKPOINTER_OFFSET 40
++# define CL_STACKSIZE_OFFSET 48
++# endif
++
++ /* For o32 we need to setup a minimal stack frame to allow cprestore
++ on __thread_start_clone3. Also there is no guarantee by kABI that
++ $8 will be preserved after syscall execution (so we need to save it
++ on the provided stack). */
++ lw t0, CL_STACKPOINTER_OFFSET(a0) /* Load the stack pointer. */
++ lw t1, CL_STACKSIZE_OFFSET(a0) /* Load the stack_size. */
++ addiu t1, -32 /* Update the stack size. */
++ addu t2, t1, t0 /* Calculate the thread stack. */
++ sw a3, 0(t2) /* Save argument pointer. */
++ sw t1, CL_STACKSIZE_OFFSET(a0) /* Save the new stack size. */
++#else
+ move $8, a3 /* a3 is set to 0/1 for syscall success/error
+ while a4/$8 is returned unmodified. */
++#endif
+
+ /* Do the system call, the kernel expects:
+ v0: system call number
+@@ -125,7 +143,11 @@ L(thread_start_clone3):
+
+ /* Restore the arg for user's function. */
+ move t9, a2 /* Function pointer. */
++#if _MIPS_SIM == _ABIO32
++ PTR_L a0, 0(sp)
++#else
+ move a0, $8 /* Argument pointer. */
++#endif
+
+ /* Call the user's function. */
+ jal t9
+diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
+index 04ca9debf0..6993fb6b29 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
++++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
+@@ -2,10 +2,9 @@
+
+ #if defined __powerpc64__
+ # define __WORDSIZE 64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ #else
+ # define __WORDSIZE 32
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ # define __WORDSIZE32_SIZE_ULONG 0
+ # define __WORDSIZE32_PTRDIFF_LONG 0
+ #endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c
+index 8e8a5ec2ea..a947d62db6 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c
++++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c
+@@ -94,6 +94,8 @@ init_cpu_features (struct cpu_features *cpu_features, uint64_t hwcaps[])
+ which are set by __tcb_parse_hwcap_and_convert_at_platform. */
+ cpu_features->hwcap = hwcaps[0];
+ cpu_features->hwcap2 = hwcaps[1];
++ cpu_features->hwcap3 = hwcaps[2];
++ cpu_features->hwcap4 = hwcaps[3];
+ /* Default is to use aligned memory access on optimized function unless
+ tunables is enable, since for this case user can explicit disable
+ unaligned optimizations. */
+diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h
+index 1294f0b601..e9eb6a13c8 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h
++++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h
+@@ -26,6 +26,8 @@ struct cpu_features
+ bool use_cached_memopt;
+ unsigned long int hwcap;
+ unsigned long int hwcap2;
++ unsigned long int hwcap3;
++ unsigned long int hwcap4;
+ };
+
+ static const char hwcap_names[] = {
+diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
+index a4705daf1c..6a00cd88cd 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c
++++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
+@@ -87,6 +87,12 @@ __libc_start_main_impl (int argc, char **argv,
+ case AT_HWCAP2:
+ _dl_hwcap2 = (unsigned long int) av->a_un.a_val;
+ break;
++ case AT_HWCAP3:
++ _dl_hwcap3 = (unsigned long int) av->a_un.a_val;
++ break;
++ case AT_HWCAP4:
++ _dl_hwcap4 = (unsigned long int) av->a_un.a_val;
++ break;
+ case AT_PLATFORM:
+ _dl_platform = (void *) av->a_un.a_val;
+ break;
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
+index 4c882ef2ee..a7a863242c 100644
+--- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
++++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
+@@ -53,6 +53,7 @@ ENTRY(__clone)
+ br %r14
+ error:
+ lhi %r2,-EINVAL
++ lm %r6,%r7,24(%r15) /* Load registers. */
+ j SYSCALL_ERROR_LABEL
+ PSEUDO_END (__clone)
+
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
+index 4eb104be71..c552a6b8de 100644
+--- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
++++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
+@@ -54,6 +54,7 @@ ENTRY(__clone)
+ br %r14
+ error:
+ lghi %r2,-EINVAL
++ lmg %r6,%r7,48(%r15) /* Restore registers. */
+ jg SYSCALL_ERROR_LABEL
+ PSEUDO_END (__clone)
+
+diff --git a/sysdeps/unix/sysv/linux/sched_getcpu.c b/sysdeps/unix/sysv/linux/sched_getcpu.c
+index dfb884568d..72a3360550 100644
+--- a/sysdeps/unix/sysv/linux/sched_getcpu.c
++++ b/sysdeps/unix/sysv/linux/sched_getcpu.c
+@@ -33,17 +33,9 @@ vsyscall_sched_getcpu (void)
+ return r == -1 ? r : cpu;
+ }
+
+-#ifdef RSEQ_SIG
+ int
+ sched_getcpu (void)
+ {
+ int cpu_id = THREAD_GETMEM_VOLATILE (THREAD_SELF, rseq_area.cpu_id);
+ return __glibc_likely (cpu_id >= 0) ? cpu_id : vsyscall_sched_getcpu ();
+ }
+-#else /* RSEQ_SIG */
+-int
+-sched_getcpu (void)
+-{
+- return vsyscall_sched_getcpu ();
+-}
+-#endif /* RSEQ_SIG */
+diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
+index 7562875ee2..ea103e5970 100644
+--- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
++++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
+@@ -2,10 +2,9 @@
+
+ #if defined __arch64__ || defined __sparcv9
+ # define __WORDSIZE 64
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ #else
+ # define __WORDSIZE 32
+ # define __WORDSIZE32_SIZE_ULONG 0
+ # define __WORDSIZE32_PTRDIFF_LONG 0
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ #endif
++#define __WORDSIZE_TIME64_COMPAT32 1
+diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c
+index c6e5e66289..778d1e3354 100644
+--- a/sysdeps/unix/sysv/linux/timespec_get.c
++++ b/sysdeps/unix/sysv/linux/timespec_get.c
+@@ -5,7 +5,7 @@
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+- version 2.1 of the License.
++ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+diff --git a/sysdeps/unix/sysv/linux/timespec_getres.c b/sysdeps/unix/sysv/linux/timespec_getres.c
+index 5acebe2a2c..2eef9e512c 100644
+--- a/sysdeps/unix/sysv/linux/timespec_getres.c
++++ b/sysdeps/unix/sysv/linux/timespec_getres.c
+@@ -5,7 +5,7 @@
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+- version 2.1 of the License.
++ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c
+index 470676ab2b..2bc7124983 100644
+--- a/sysdeps/unix/sysv/linux/tst-clone.c
++++ b/sysdeps/unix/sysv/linux/tst-clone.c
+@@ -16,12 +16,16 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-/* BZ #2386 */
++/* BZ #2386, BZ #31402 */
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sched.h>
++#include <stackinfo.h> /* For _STACK_GROWS_{UP,DOWN}. */
++#include <support/check.h>
++
++volatile unsigned v = 0xdeadbeef;
+
+ int child_fn(void *arg)
+ {
+@@ -30,22 +34,67 @@ int child_fn(void *arg)
+ }
+
+ static int
+-do_test (void)
++__attribute__((noinline))
++do_clone (int (*fn)(void *), void *stack)
+ {
+ int result;
++ unsigned int a = v;
++ unsigned int b = v;
++ unsigned int c = v;
++ unsigned int d = v;
++ unsigned int e = v;
++ unsigned int f = v;
++ unsigned int g = v;
++ unsigned int h = v;
++ unsigned int i = v;
++ unsigned int j = v;
++ unsigned int k = v;
++ unsigned int l = v;
++ unsigned int m = v;
++ unsigned int n = v;
++ unsigned int o = v;
++
++ result = clone (fn, stack, 0, NULL);
++
++ /* Check that clone does not clobber call-saved registers. */
++ TEST_VERIFY (a == v && b == v && c == v && d == v && e == v && f == v
++ && g == v && h == v && i == v && j == v && k == v && l == v
++ && m == v && n == v && o == v);
++
++ return result;
++}
++
++static void
++__attribute__((noinline))
++do_test_single (int (*fn)(void *), void *stack)
++{
++ printf ("%s (fn=%p, stack=%p)\n", __FUNCTION__, fn, stack);
++ errno = 0;
++
++ int result = do_clone (fn, stack);
++
++ TEST_COMPARE (errno, EINVAL);
++ TEST_COMPARE (result, -1);
++}
+
+- result = clone (child_fn, NULL, 0, NULL);
++static int
++do_test (void)
++{
++ char st[128 * 1024] __attribute__ ((aligned));
++ void *stack = NULL;
++#if _STACK_GROWS_DOWN
++ stack = st + sizeof (st);
++#elif _STACK_GROWS_UP
++ stack = st;
++#else
++# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
++#endif
+
+- if (errno != EINVAL || result != -1)
+- {
+- printf ("FAIL: clone()=%d (wanted -1) errno=%d (wanted %d)\n",
+- result, errno, EINVAL);
+- return 1;
+- }
++ do_test_single (child_fn, NULL);
++ do_test_single (NULL, stack);
++ do_test_single (NULL, NULL);
+
+- puts ("All OK");
+ return 0;
+ }
+
+-#define TEST_FUNCTION do_test ()
+-#include "../test-skeleton.c"
++#include <support/test-driver.c>
+diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile
+index 4223feb95f..9a1e7aa646 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/Makefile
++++ b/sysdeps/unix/sysv/linux/x86_64/Makefile
+@@ -63,6 +63,33 @@ $(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-is
+ $(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so
+ cp $< $@
+ endif
++
++ifeq (yes,$(have-mamx-tile))
++tests += \
++ tst-gnu2-tls2-amx \
++# tests
++
++modules-names += \
++ tst-gnu2-tls2-amx-mod0 \
++ tst-gnu2-tls2-amx-mod1 \
++ tst-gnu2-tls2-amx-mod2 \
++# modules-names
++
++$(objpfx)tst-gnu2-tls2-amx: $(shared-thread-library)
++$(objpfx)tst-gnu2-tls2-amx.out: \
++ $(objpfx)tst-gnu2-tls2-amx-mod0.so \
++ $(objpfx)tst-gnu2-tls2-amx-mod1.so \
++ $(objpfx)tst-gnu2-tls2-amx-mod2.so
++$(objpfx)tst-gnu2-tls2-amx-mod0.so: $(libsupport)
++$(objpfx)tst-gnu2-tls2-amx-mod1.so: $(libsupport)
++$(objpfx)tst-gnu2-tls2-amx-mod2.so: $(libsupport)
++
++CFLAGS-tst-gnu2-tls2-amx.c += -mamx-tile
++CFLAGS-tst-gnu2-tls2-amx-mod0.c += -mamx-tile -mtls-dialect=gnu2
++CFLAGS-tst-gnu2-tls2-amx-mod1.c += -mamx-tile -mtls-dialect=gnu2
++CFLAGS-tst-gnu2-tls2-amx-mod2.c += -mamx-tile -mtls-dialect=gnu2
++endif
++
+ endif # $(subdir) == elf
+
+ ifneq ($(enable-cet),no)
+diff --git a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h
+index 2f511321ad..ef4631bf4b 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h
++++ b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h
+@@ -20,3 +20,8 @@
+ # define ARCH_SHSTK_SHSTK 0x1
+ # define ARCH_SHSTK_WRSS 0x2
+ #endif
++
++#ifndef ARCH_GET_XCOMP_PERM
++# define ARCH_GET_XCOMP_PERM 0x1022
++# define ARCH_REQ_XCOMP_PERM 0x1023
++#endif
+diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c
+new file mode 100644
+index 0000000000..2e0c7b91b7
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c
+@@ -0,0 +1,2 @@
++#include "tst-gnu2-tls2-amx.h"
++#include <tst-gnu2-tls2mod0.c>
+diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c
+new file mode 100644
+index 0000000000..b8a8ccf1c1
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c
+@@ -0,0 +1,2 @@
++#include "tst-gnu2-tls2-amx.h"
++#include <tst-gnu2-tls2mod1.c>
+diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c
+new file mode 100644
+index 0000000000..cdf4a8f363
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c
+@@ -0,0 +1,2 @@
++#include "tst-gnu2-tls2-amx.h"
++#include <tst-gnu2-tls2mod2.c>
+diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c
+new file mode 100644
+index 0000000000..ae4dd82556
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c
+@@ -0,0 +1,83 @@
++/* Test TLSDESC relocation with AMX.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <stdbool.h>
++#include <asm/prctl.h>
++#include <support/check.h>
++#include "tst-gnu2-tls2-amx.h"
++
++extern int arch_prctl (int, ...);
++
++#define X86_XSTATE_TILECFG_ID 17
++#define X86_XSTATE_TILEDATA_ID 18
++
++/* Initialize tile config. */
++__attribute__ ((noinline, noclone))
++static void
++init_tile_config (__tilecfg *tileinfo)
++{
++ int i;
++ tileinfo->palette_id = 1;
++ tileinfo->start_row = 0;
++
++ tileinfo->colsb[0] = MAX_ROWS;
++ tileinfo->rows[0] = MAX_ROWS;
++
++ for (i = 1; i < 4; ++i)
++ {
++ tileinfo->colsb[i] = MAX_COLS;
++ tileinfo->rows[i] = MAX_ROWS;
++ }
++
++ _tile_loadconfig (tileinfo);
++}
++
++static bool
++enable_amx (void)
++{
++ uint64_t bitmask;
++ if (arch_prctl (ARCH_GET_XCOMP_PERM, &bitmask) != 0)
++ return false;
++
++ if ((bitmask & (1 << X86_XSTATE_TILECFG_ID)) == 0)
++ return false;
++
++ if (arch_prctl (ARCH_REQ_XCOMP_PERM, X86_XSTATE_TILEDATA_ID) != 0)
++ return false;
++
++ /* Load tile configuration. */
++ __tilecfg tile_data = { 0 };
++ init_tile_config (&tile_data);
++
++ return true;
++}
++
++/* An architecture can define it to clobber caller-saved registers in
++ malloc below to verify that the implicit TLSDESC call won't change
++ caller-saved registers. */
++static void
++clear_tile_register (void)
++{
++ _tile_zero (2);
++}
++
++#define MOD(i) "tst-gnu2-tls2-amx-mod" #i ".so"
++#define IS_SUPPORTED() enable_amx ()
++#define PREPARE_MALLOC() clear_tile_register ()
++
++#include <elf/tst-gnu2-tls2.c>
+diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h
+new file mode 100644
+index 0000000000..1845a3caba
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h
+@@ -0,0 +1,63 @@
++/* Test TLSDESC relocation with AMX.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <stdint.h>
++#include <string.h>
++#include <x86intrin.h>
++#include <support/check.h>
++
++#define MAX_ROWS 16
++#define MAX_COLS 64
++#define MAX 1024
++#define STRIDE 64
++
++typedef struct __tile_config
++{
++ uint8_t palette_id;
++ uint8_t start_row;
++ uint8_t reserved_0[14];
++ uint16_t colsb[16];
++ uint8_t rows[16];
++} __tilecfg __attribute__ ((aligned (64)));
++
++/* Initialize int8_t buffer */
++static inline void
++init_buffer (int8_t *buf, int8_t value)
++{
++ int rows, colsb, i, j;
++ rows = MAX_ROWS;
++ colsb = MAX_COLS;
++
++ for (i = 0; i < rows; i++)
++ for (j = 0; j < colsb; j++)
++ buf[i * colsb + j] = value;
++}
++
++#define BEFORE_TLSDESC_CALL() \
++ int8_t src[MAX]; \
++ int8_t res[MAX]; \
++ /* Initialize src with data */ \
++ init_buffer (src, 2); \
++ /* Load tile rows from memory. */ \
++ _tile_loadd (2, src, STRIDE);
++
++#define AFTER_TLSDESC_CALL() \
++ /* Store the tile data to memory. */ \
++ _tile_stored (2, res, STRIDE); \
++ _tile_release (); \
++ TEST_VERIFY_EXIT (memcmp (src, res, sizeof (res)) == 0);
+diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
+index 4d50b327b5..5311b594af 100644
+--- a/sysdeps/x86/Makefile
++++ b/sysdeps/x86/Makefile
+@@ -1,5 +1,5 @@
+ ifeq ($(subdir),csu)
+-gen-as-const-headers += cpu-features-offsets.sym
++gen-as-const-headers += cpu-features-offsets.sym features-offsets.sym
+ endif
+
+ ifeq ($(subdir),elf)
+@@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags)
+ CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector)
+
+ tests += \
+- tst-get-cpu-features \
+- tst-get-cpu-features-static \
+ tst-cpu-features-cpuinfo \
+ tst-cpu-features-cpuinfo-static \
+ tst-cpu-features-supports \
+ tst-cpu-features-supports-static \
++ tst-get-cpu-features \
++ tst-get-cpu-features-static \
+ tst-hwcap-tunables \
+ # tests
+ tests-static += \
+- tst-get-cpu-features-static \
+ tst-cpu-features-cpuinfo-static \
+ tst-cpu-features-supports-static \
++ tst-get-cpu-features-static \
+ # tests-static
+ ifeq (yes,$(have-ifunc))
+ ifeq (yes,$(have-gcc-ifunc))
+@@ -86,6 +86,11 @@ endif
+ tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F
+ tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV)
+ tst-hwcap-tunables-ARGS = -- $(host-test-program-cmd)
++
++CFLAGS-tst-gnu2-tls2.c += -msse
++CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell
++CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell
++CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell
+ endif
+
+ ifeq ($(subdir),math)
+diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h
+index 70f652bca1..3f40aa76f9 100644
+--- a/sysdeps/x86/bits/wordsize.h
++++ b/sysdeps/x86/bits/wordsize.h
+@@ -8,10 +8,9 @@
+ #define __WORDSIZE32_PTRDIFF_LONG 0
+ #endif
+
++#define __WORDSIZE_TIME64_COMPAT32 1
++
+ #ifdef __x86_64__
+-# define __WORDSIZE_TIME64_COMPAT32 1
+ /* Both x86-64 and x32 use the 64-bit system call interface. */
+ # define __SYSCALL_WORDSIZE 64
+-#else
+-# define __WORDSIZE_TIME64_COMPAT32 0
+ #endif
+diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure
+index 1f4c2d67fd..d28d9bcb29 100644
+--- a/sysdeps/x86/configure
++++ b/sysdeps/x86/configure
+@@ -98,6 +98,7 @@ printf "%s\n" "$libc_cv_have_x86_lahf_sahf" >&6; }
+ if test $libc_cv_have_x86_lahf_sahf = yes; then
+ printf "%s\n" "#define HAVE_X86_LAHF_SAHF 1" >>confdefs.h
+
++ ISAFLAG="-DHAVE_X86_LAHF_SAHF"
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOVBE instruction support" >&5
+ printf %s "checking for MOVBE instruction support... " >&6; }
+@@ -120,8 +121,47 @@ printf "%s\n" "$libc_cv_have_x86_movbe" >&6; }
+ if test $libc_cv_have_x86_movbe = yes; then
+ printf "%s\n" "#define HAVE_X86_MOVBE 1" >>confdefs.h
+
++ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE"
+ fi
++
++ # Check for ISA level support.
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ISA level support" >&5
++printf %s "checking for ISA level support... " >&6; }
++if test ${libc_cv_have_x86_isa_level+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++ cat > conftest.c <<EOF
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL >= 4
++libc_cv_have_x86_isa_level=4
++#elif MINIMUM_X86_ISA_LEVEL == 3
++libc_cv_have_x86_isa_level=3
++#elif MINIMUM_X86_ISA_LEVEL == 2
++libc_cv_have_x86_isa_level=2
++#else
++libc_cv_have_x86_isa_level=baseline
++#endif
++EOF
++ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level`
++ rm -rf conftest*
+ fi
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_x86_isa_level" >&5
++printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; }
++else
++ libc_cv_have_x86_isa_level=baseline
++fi
++if test $libc_cv_have_x86_isa_level = baseline; then
++ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL 1" >>confdefs.h
++
++else
++ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL $libc_cv_have_x86_isa_level" >>confdefs.h
++
++fi
++config_vars="$config_vars
++have-x86-isa-level = $libc_cv_have_x86_isa_level"
++config_vars="$config_vars
++x86-isa-level-3-or-above = 3 4"
+ config_vars="$config_vars
+ enable-x86-isa-level = $libc_cv_include_x86_isa_level"
+
+diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac
+index 437a50623b..5b0acd03d2 100644
+--- a/sysdeps/x86/configure.ac
++++ b/sysdeps/x86/configure.ac
+@@ -72,6 +72,7 @@ if test $libc_cv_include_x86_isa_level = yes; then
+ fi])
+ if test $libc_cv_have_x86_lahf_sahf = yes; then
+ AC_DEFINE(HAVE_X86_LAHF_SAHF)
++ ISAFLAG="-DHAVE_X86_LAHF_SAHF"
+ fi
+ AC_CACHE_CHECK([for MOVBE instruction support],
+ libc_cv_have_x86_movbe, [dnl
+@@ -81,8 +82,36 @@ if test $libc_cv_include_x86_isa_level = yes; then
+ fi])
+ if test $libc_cv_have_x86_movbe = yes; then
+ AC_DEFINE(HAVE_X86_MOVBE)
++ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE"
+ fi
++
++ # Check for ISA level support.
++ AC_CACHE_CHECK([for ISA level support],
++ libc_cv_have_x86_isa_level, [dnl
++cat > conftest.c <<EOF
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL >= 4
++libc_cv_have_x86_isa_level=4
++#elif MINIMUM_X86_ISA_LEVEL == 3
++libc_cv_have_x86_isa_level=3
++#elif MINIMUM_X86_ISA_LEVEL == 2
++libc_cv_have_x86_isa_level=2
++#else
++libc_cv_have_x86_isa_level=baseline
++#endif
++EOF
++ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level`
++ rm -rf conftest*])
++else
++ libc_cv_have_x86_isa_level=baseline
++fi
++if test $libc_cv_have_x86_isa_level = baseline; then
++ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, 1)
++else
++ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, $libc_cv_have_x86_isa_level)
+ fi
++LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level])
++LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4])
+ LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level])
+
+ dnl Static PIE is supported.
+diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym
+index 6a8fd29813..21fc88d651 100644
+--- a/sysdeps/x86/cpu-features-offsets.sym
++++ b/sysdeps/x86/cpu-features-offsets.sym
+@@ -3,3 +3,4 @@
+ #include <ldsodefs.h>
+
+ XSAVE_STATE_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_size)
++XSAVE_STATE_FULL_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_full_size)
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 25e6622a79..3d7c2819d7 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -18,6 +18,7 @@
+
+ #include <dl-hwcap.h>
+ #include <libc-pointer-arith.h>
++#include <isa-level.h>
+ #include <get-isa-level.h>
+ #include <cacheinfo.h>
+ #include <dl-cacheinfo.h>
+@@ -27,8 +28,13 @@
+ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *)
+ attribute_hidden;
+
+-#if defined SHARED && defined __x86_64__
+-# include <dl-plt-rewrite.h>
++#if defined SHARED
++extern void _dl_tlsdesc_dynamic_fxsave (void) attribute_hidden;
++extern void _dl_tlsdesc_dynamic_xsave (void) attribute_hidden;
++extern void _dl_tlsdesc_dynamic_xsavec (void) attribute_hidden;
++
++# ifdef __x86_64__
++# include <dl-plt-rewrite.h>
+
+ static void
+ TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp)
+@@ -47,6 +53,15 @@ TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp)
+ : plt_rewrite_jmp);
+ }
+ }
++# else
++extern void _dl_tlsdesc_dynamic_fnsave (void) attribute_hidden;
++# endif
++#endif
++
++#ifdef __x86_64__
++extern void _dl_runtime_resolve_fxsave (void) attribute_hidden;
++extern void _dl_runtime_resolve_xsave (void) attribute_hidden;
++extern void _dl_runtime_resolve_xsavec (void) attribute_hidden;
+ #endif
+
+ #ifdef __LP64__
+@@ -293,8 +308,10 @@ update_active (struct cpu_features *cpu_features)
+ __cpuid_count (0xd, 0, eax, ebx, ecx, edx);
+ if (ebx != 0)
+ {
++ /* NB: On AMX capable processors, ebx always includes AMX
++ states. */
+ unsigned int xsave_state_full_size
+- = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64);
++ = ALIGN_UP (ebx + TLSDESC_CALL_REGISTER_SAVE_AREA, 64);
+
+ cpu_features->xsave_state_size
+ = xsave_state_full_size;
+@@ -306,6 +323,11 @@ update_active (struct cpu_features *cpu_features)
+ {
+ unsigned int xstate_comp_offsets[32];
+ unsigned int xstate_comp_sizes[32];
++#ifdef __x86_64__
++ unsigned int xstate_amx_comp_offsets[32];
++ unsigned int xstate_amx_comp_sizes[32];
++ unsigned int amx_ecx;
++#endif
+ unsigned int i;
+
+ xstate_comp_offsets[0] = 0;
+@@ -313,16 +335,39 @@ update_active (struct cpu_features *cpu_features)
+ xstate_comp_offsets[2] = 576;
+ xstate_comp_sizes[0] = 160;
+ xstate_comp_sizes[1] = 256;
++#ifdef __x86_64__
++ xstate_amx_comp_offsets[0] = 0;
++ xstate_amx_comp_offsets[1] = 160;
++ xstate_amx_comp_offsets[2] = 576;
++ xstate_amx_comp_sizes[0] = 160;
++ xstate_amx_comp_sizes[1] = 256;
++#endif
+
+ for (i = 2; i < 32; i++)
+ {
+- if ((STATE_SAVE_MASK & (1 << i)) != 0)
++ if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0)
+ {
+ __cpuid_count (0xd, i, eax, ebx, ecx, edx);
+- xstate_comp_sizes[i] = eax;
++#ifdef __x86_64__
++ /* Include this in xsave_state_full_size. */
++ amx_ecx = ecx;
++ xstate_amx_comp_sizes[i] = eax;
++ if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0)
++ {
++ /* Exclude this from xsave_state_size. */
++ ecx = 0;
++ xstate_comp_sizes[i] = 0;
++ }
++ else
++#endif
++ xstate_comp_sizes[i] = eax;
+ }
+ else
+ {
++#ifdef __x86_64__
++ amx_ecx = 0;
++ xstate_amx_comp_sizes[i] = 0;
++#endif
+ ecx = 0;
+ xstate_comp_sizes[i] = 0;
+ }
+@@ -335,6 +380,15 @@ update_active (struct cpu_features *cpu_features)
+ if ((ecx & (1 << 1)) != 0)
+ xstate_comp_offsets[i]
+ = ALIGN_UP (xstate_comp_offsets[i], 64);
++#ifdef __x86_64__
++ xstate_amx_comp_offsets[i]
++ = (xstate_amx_comp_offsets[i - 1]
++ + xstate_amx_comp_sizes[i - 1]);
++ if ((amx_ecx & (1 << 1)) != 0)
++ xstate_amx_comp_offsets[i]
++ = ALIGN_UP (xstate_amx_comp_offsets[i],
++ 64);
++#endif
+ }
+ }
+
+@@ -343,8 +397,23 @@ update_active (struct cpu_features *cpu_features)
+ = xstate_comp_offsets[31] + xstate_comp_sizes[31];
+ if (size)
+ {
++#ifdef __x86_64__
++ unsigned int amx_size
++ = (xstate_amx_comp_offsets[31]
++ + xstate_amx_comp_sizes[31]);
++ amx_size
++ = ALIGN_UP ((amx_size
++ + TLSDESC_CALL_REGISTER_SAVE_AREA),
++ 64);
++ /* Set xsave_state_full_size to the compact AMX
++ state size for XSAVEC. NB: xsave_state_full_size
++ is only used in _dl_tlsdesc_dynamic_xsave and
++ _dl_tlsdesc_dynamic_xsavec. */
++ cpu_features->xsave_state_full_size = amx_size;
++#endif
+ cpu_features->xsave_state_size
+- = ALIGN_UP (size + STATE_SAVE_OFFSET, 64);
++ = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA,
++ 64);
+ CPU_FEATURE_SET (cpu_features, XSAVEC);
+ }
+ }
+@@ -1130,6 +1199,45 @@ no_cpuid:
+ TUNABLE_CALLBACK (set_x86_shstk));
+ #endif
+
++ if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL
++ || (GLRO(dl_x86_cpu_features).xsave_state_size != 0))
++ {
++ if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC))
++ {
++#ifdef __x86_64__
++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsavec;
++#endif
++#ifdef SHARED
++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsavec;
++#endif
++ }
++ else
++ {
++#ifdef __x86_64__
++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsave;
++#endif
++#ifdef SHARED
++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsave;
++#endif
++ }
++ }
++ else
++ {
++#ifdef __x86_64__
++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave;
++# ifdef SHARED
++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave;
++# endif
++#else
++# ifdef SHARED
++ if (CPU_FEATURE_USABLE_P (cpu_features, FXSR))
++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave;
++ else
++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave;
++# endif
++#endif
++ }
++
+ #ifdef SHARED
+ # ifdef __x86_64__
+ TUNABLE_GET (plt_rewrite, tunable_val_t *,
+diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
+index d5101615e3..5a98f70364 100644
+--- a/sysdeps/x86/dl-cacheinfo.h
++++ b/sysdeps/x86/dl-cacheinfo.h
+@@ -791,7 +791,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ long int data = -1;
+ long int shared = -1;
+ long int shared_per_thread = -1;
+- long int core = -1;
+ unsigned int threads = 0;
+ unsigned long int level1_icache_size = -1;
+ unsigned long int level1_icache_linesize = -1;
+@@ -809,7 +808,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ if (cpu_features->basic.kind == arch_kind_intel)
+ {
+ data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features);
+- core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features);
+ shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features);
+ shared_per_thread = shared;
+
+@@ -822,7 +820,8 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ = handle_intel (_SC_LEVEL1_DCACHE_ASSOC, cpu_features);
+ level1_dcache_linesize
+ = handle_intel (_SC_LEVEL1_DCACHE_LINESIZE, cpu_features);
+- level2_cache_size = core;
++ level2_cache_size
++ = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features);
+ level2_cache_assoc
+ = handle_intel (_SC_LEVEL2_CACHE_ASSOC, cpu_features);
+ level2_cache_linesize
+@@ -835,12 +834,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ level4_cache_size
+ = handle_intel (_SC_LEVEL4_CACHE_SIZE, cpu_features);
+
+- get_common_cache_info (&shared, &shared_per_thread, &threads, core);
++ get_common_cache_info (&shared, &shared_per_thread, &threads,
++ level2_cache_size);
+ }
+ else if (cpu_features->basic.kind == arch_kind_zhaoxin)
+ {
+ data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE);
+- core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE);
+ shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE);
+ shared_per_thread = shared;
+
+@@ -849,19 +848,19 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ level1_dcache_size = data;
+ level1_dcache_assoc = handle_zhaoxin (_SC_LEVEL1_DCACHE_ASSOC);
+ level1_dcache_linesize = handle_zhaoxin (_SC_LEVEL1_DCACHE_LINESIZE);
+- level2_cache_size = core;
++ level2_cache_size = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE);
+ level2_cache_assoc = handle_zhaoxin (_SC_LEVEL2_CACHE_ASSOC);
+ level2_cache_linesize = handle_zhaoxin (_SC_LEVEL2_CACHE_LINESIZE);
+ level3_cache_size = shared;
+ level3_cache_assoc = handle_zhaoxin (_SC_LEVEL3_CACHE_ASSOC);
+ level3_cache_linesize = handle_zhaoxin (_SC_LEVEL3_CACHE_LINESIZE);
+
+- get_common_cache_info (&shared, &shared_per_thread, &threads, core);
++ get_common_cache_info (&shared, &shared_per_thread, &threads,
++ level2_cache_size);
+ }
+ else if (cpu_features->basic.kind == arch_kind_amd)
+ {
+ data = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
+- core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
+ shared = handle_amd (_SC_LEVEL3_CACHE_SIZE);
+
+ level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE);
+@@ -869,7 +868,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ level1_dcache_size = data;
+ level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC);
+ level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE);
+- level2_cache_size = core;
++ level2_cache_size = handle_amd (_SC_LEVEL2_CACHE_SIZE);;
+ level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC);
+ level2_cache_linesize = handle_amd (_SC_LEVEL2_CACHE_LINESIZE);
+ level3_cache_size = shared;
+@@ -880,12 +879,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ if (shared <= 0)
+ {
+ /* No shared L3 cache. All we have is the L2 cache. */
+- shared = core;
++ shared = level2_cache_size;
+ }
+ else if (cpu_features->basic.family < 0x17)
+ {
+ /* Account for exclusive L2 and L3 caches. */
+- shared += core;
++ shared += level2_cache_size;
+ }
+
+ shared_per_thread = shared;
+@@ -987,6 +986,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ if (CPU_FEATURE_USABLE_P (cpu_features, FSRM))
+ rep_movsb_threshold = 2112;
+
++ /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of
++ cases slower than the vectorized path (and for some alignments,
++ it is really slow, check BZ #30994). */
++ if (cpu_features->basic.kind == arch_kind_amd)
++ rep_movsb_threshold = non_temporal_threshold;
++
+ /* The default threshold to use Enhanced REP STOSB. */
+ unsigned long int rep_stosb_threshold = 2048;
+
+@@ -1016,6 +1021,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ minimum value is fixed. */
+ rep_stosb_threshold = TUNABLE_GET (x86_rep_stosb_threshold,
+ long int, NULL);
++ if (cpu_features->basic.kind == arch_kind_amd
++ && !TUNABLE_IS_INITIALIZED (x86_rep_stosb_threshold))
++ /* For AMD Zen3+ architecture, the performance of the vectorized loop is
++ slightly better than ERMS. */
++ rep_stosb_threshold = SIZE_MAX;
+
+ TUNABLE_SET_WITH_BOUNDS (x86_data_cache_size, data, 0, SIZE_MAX);
+ TUNABLE_SET_WITH_BOUNDS (x86_shared_cache_size, shared, 0, SIZE_MAX);
+@@ -1028,16 +1038,9 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+ SIZE_MAX);
+
+ unsigned long int rep_movsb_stop_threshold;
+- /* ERMS feature is implemented from AMD Zen3 architecture and it is
+- performing poorly for data above L2 cache size. Henceforth, adding
+- an upper bound threshold parameter to limit the usage of Enhanced
+- REP MOVSB operations and setting its value to L2 cache size. */
+- if (cpu_features->basic.kind == arch_kind_amd)
+- rep_movsb_stop_threshold = core;
+ /* Setting the upper bound of ERMS to the computed value of
+- non-temporal threshold for architectures other than AMD. */
+- else
+- rep_movsb_stop_threshold = non_temporal_threshold;
++ non-temporal threshold for all architectures. */
++ rep_movsb_stop_threshold = non_temporal_threshold;
+
+ cpu_features->data_cache_size = data;
+ cpu_features->shared_cache_size = shared;
+diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c
+index ee957b4d70..5920d4b320 100644
+--- a/sysdeps/x86/dl-procinfo.c
++++ b/sysdeps/x86/dl-procinfo.c
+@@ -86,3 +86,19 @@ PROCINFO_CLASS const char _dl_x86_platforms[4][9]
+ #else
+ ,
+ #endif
++
++#if defined SHARED && !IS_IN (ldconfig)
++# if !defined PROCINFO_DECL
++ ._dl_x86_tlsdesc_dynamic
++# else
++PROCINFO_CLASS void * _dl_x86_tlsdesc_dynamic
++# endif
++# ifndef PROCINFO_DECL
++= NULL
++# endif
++# ifdef PROCINFO_DECL
++;
++# else
++,
++# endif
++#endif
+diff --git a/sysdeps/x86_64/features-offsets.sym b/sysdeps/x86/features-offsets.sym
+similarity index 89%
+rename from sysdeps/x86_64/features-offsets.sym
+rename to sysdeps/x86/features-offsets.sym
+index 9e4be3393a..77e990c705 100644
+--- a/sysdeps/x86_64/features-offsets.sym
++++ b/sysdeps/x86/features-offsets.sym
+@@ -3,4 +3,6 @@
+ #include <ldsodefs.h>
+
+ RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features)
++#ifdef __x86_64__
+ RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1)
++#endif
+diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
+index b9bf3115b6..cd7bd27cf3 100644
+--- a/sysdeps/x86/include/cpu-features.h
++++ b/sysdeps/x86/include/cpu-features.h
+@@ -934,6 +934,8 @@ struct cpu_features
+ /* The full state size for XSAVE when XSAVEC is disabled by
+
+ GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC
++
++ and the AMX state size when XSAVEC is available.
+ */
+ unsigned int xsave_state_full_size;
+ /* Data cache size for use in memory and string routines, typically
+diff --git a/sysdeps/x86/isa-level.h b/sysdeps/x86/isa-level.h
+index 11fe1ca90c..2c7f74212b 100644
+--- a/sysdeps/x86/isa-level.h
++++ b/sysdeps/x86/isa-level.h
+@@ -61,8 +61,10 @@
+ # define __X86_ISA_V4 0
+ #endif
+
+-#define MINIMUM_X86_ISA_LEVEL \
++#ifndef MINIMUM_X86_ISA_LEVEL
++# define MINIMUM_X86_ISA_LEVEL \
+ (__X86_ISA_V1 + __X86_ISA_V2 + __X86_ISA_V3 + __X86_ISA_V4)
++#endif
+
+ /* Depending on the minimum ISA level, a feature check result can be a
+ compile-time constant.. */
+diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h
+index 85d0a8c943..7359149e17 100644
+--- a/sysdeps/x86/sysdep.h
++++ b/sysdeps/x86/sysdep.h
+@@ -21,14 +21,118 @@
+
+ #include <sysdeps/generic/sysdep.h>
+
++/* The extended state feature IDs in the state component bitmap. */
++#define X86_XSTATE_X87_ID 0
++#define X86_XSTATE_SSE_ID 1
++#define X86_XSTATE_AVX_ID 2
++#define X86_XSTATE_BNDREGS_ID 3
++#define X86_XSTATE_BNDCFG_ID 4
++#define X86_XSTATE_K_ID 5
++#define X86_XSTATE_ZMM_H_ID 6
++#define X86_XSTATE_ZMM_ID 7
++#define X86_XSTATE_PKRU_ID 9
++#define X86_XSTATE_TILECFG_ID 17
++#define X86_XSTATE_TILEDATA_ID 18
++#define X86_XSTATE_APX_F_ID 19
++
++#ifdef __x86_64__
+ /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need
+ space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be
+- aligned to 16 bytes for fxsave and 64 bytes for xsave. */
+-#define STATE_SAVE_OFFSET (8 * 7 + 8)
++ aligned to 16 bytes for fxsave and 64 bytes for xsave. It is non-zero
++ because MOV, instead of PUSH, is used to save registers onto stack.
++
++ +==================+<- stack frame start aligned at 8 or 16 bytes
++ | |<- paddings for stack realignment of 64 bytes
++ |------------------|<- xsave buffer end aligned at 64 bytes
++ | |<-
++ | |<-
++ | |<-
++ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp)
++ | |<- 8-byte padding for 64-byte alignment
++ | |<- R9
++ | |<- R8
++ | |<- RDI
++ | |<- RSI
++ | |<- RDX
++ | |<- RCX
++ | |<- RAX
++ +==================+<- RSP aligned at 64 bytes
++
++ */
++# define STATE_SAVE_OFFSET (8 * 7 + 8)
++
++/* _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning
++ stack. After realigning stack, it saves RCX, RDX, R8, R9, R10 and
++ R11. Allocate space for RDI, RSI and RBX to avoid clobbering saved
++ RDI, RSI and RBX values on stack by xsave.
++
++ +==================+<- stack frame start aligned at 8 or 16 bytes
++ | |<- RDI saved in the red zone
++ | |<- RSI saved in the red zone
++ | |<- RBX saved in the red zone
++ | |<- paddings for stack realignment of 64 bytes
++ |------------------|<- xsave buffer end aligned at 64 bytes
++ | |<-
++ | |<-
++ | |<-
++ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp)
++ | |<- 8-byte padding for 64-byte alignment
++ | |<- 8-byte padding for 64-byte alignment
++ | |<- R11
++ | |<- R10
++ | |<- R9
++ | |<- R8
++ | |<- RDX
++ | |<- RCX
++ +==================+<- RSP aligned at 64 bytes
++
++ Define the total register save area size for all integer registers by
++ adding 24 to STATE_SAVE_OFFSET since RDI, RSI and RBX are saved onto
++ stack without adjusting stack pointer first, using the red-zone. */
++# define TLSDESC_CALL_REGISTER_SAVE_AREA (STATE_SAVE_OFFSET + 24)
++
++/* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX
++ registers are mutually exclusive. */
++# define STATE_SAVE_MASK \
++ ((1 << X86_XSTATE_SSE_ID) \
++ | (1 << X86_XSTATE_AVX_ID) \
++ | (1 << X86_XSTATE_BNDREGS_ID) \
++ | (1 << X86_XSTATE_K_ID) \
++ | (1 << X86_XSTATE_ZMM_H_ID) \
++ | (1 << X86_XSTATE_ZMM_ID) \
++ | (1 << X86_XSTATE_APX_F_ID))
++
++/* AMX state mask. */
++# define AMX_STATE_SAVE_MASK \
++ ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID))
++
++/* States to be included in xsave_state_full_size. */
++# define FULL_STATE_SAVE_MASK \
++ (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK)
++#else
++/* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386
++ uses PUSH to save registers onto stack, use 0 here. */
++# define STATE_SAVE_OFFSET 0
++# define TLSDESC_CALL_REGISTER_SAVE_AREA 0
++
++/* Save SSE, AVX, AXV512, mask and bound registers. */
++# define STATE_SAVE_MASK \
++ ((1 << X86_XSTATE_SSE_ID) \
++ | (1 << X86_XSTATE_AVX_ID) \
++ | (1 << X86_XSTATE_BNDREGS_ID) \
++ | (1 << X86_XSTATE_K_ID) \
++ | (1 << X86_XSTATE_ZMM_H_ID))
++
++/* States to be included in xsave_state_size. */
++# define FULL_STATE_SAVE_MASK STATE_SAVE_MASK
++#endif
+
+-/* Save SSE, AVX, AVX512, mask and bound registers. */
+-#define STATE_SAVE_MASK \
+- ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7))
++/* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL.
++ Compiler assumes that all registers, including AMX and x87 FPU
++ stack registers, are unchanged after CALL, except for EFLAGS and
++ RAX/EAX. */
++#define TLSDESC_CALL_STATE_SAVE_MASK \
++ (FULL_STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID))
+
+ /* Constants for bits in __x86_string_control: */
+
+diff --git a/sysdeps/x86/tst-gnu2-tls2.c b/sysdeps/x86/tst-gnu2-tls2.c
+new file mode 100644
+index 0000000000..de900a423b
+--- /dev/null
++++ b/sysdeps/x86/tst-gnu2-tls2.c
+@@ -0,0 +1,20 @@
++#ifndef __x86_64__
++#include <sys/platform/x86.h>
++
++#define IS_SUPPORTED() CPU_FEATURE_ACTIVE (SSE2)
++#endif
++
++/* Clear XMM0...XMM7 */
++#define PREPARE_MALLOC() \
++{ \
++ asm volatile ("xorps %%xmm0, %%xmm0" : : : "xmm0" ); \
++ asm volatile ("xorps %%xmm1, %%xmm1" : : : "xmm1" ); \
++ asm volatile ("xorps %%xmm2, %%xmm2" : : : "xmm2" ); \
++ asm volatile ("xorps %%xmm3, %%xmm3" : : : "xmm3" ); \
++ asm volatile ("xorps %%xmm4, %%xmm4" : : : "xmm4" ); \
++ asm volatile ("xorps %%xmm5, %%xmm5" : : : "xmm5" ); \
++ asm volatile ("xorps %%xmm6, %%xmm6" : : : "xmm6" ); \
++ asm volatile ("xorps %%xmm7, %%xmm7" : : : "xmm7" ); \
++}
++
++#include <elf/tst-gnu2-tls2.c>
+diff --git a/sysdeps/x86/utmp-size.h b/sysdeps/x86/utmp-size.h
+new file mode 100644
+index 0000000000..8f21ebe1b6
+--- /dev/null
++++ b/sysdeps/x86/utmp-size.h
+@@ -0,0 +1,2 @@
++#define UTMP_SIZE 384
++#define LASTLOG_SIZE 292
+diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
+index 90f4ecfd26..0ede447405 100644
+--- a/sysdeps/x86_64/Makefile
++++ b/sysdeps/x86_64/Makefile
+@@ -10,7 +10,7 @@ LDFLAGS-rtld += -Wl,-z,nomark-plt
+ endif
+
+ ifeq ($(subdir),csu)
+-gen-as-const-headers += features-offsets.sym link-defines.sym
++gen-as-const-headers += link-defines.sym
+ endif
+
+ ifeq ($(subdir),gmon)
+@@ -210,6 +210,8 @@ tst-plt-rewrite2-ENV = GLIBC_TUNABLES=glibc.cpu.plt_rewrite=2
+ $(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so
+ endif
+
++test-internal-extras += tst-gnu2-tls2mod1
++
+ endif # $(subdir) == elf
+
+ ifeq ($(subdir),csu)
+@@ -250,6 +252,10 @@ sysdep-dl-routines += dl-cet
+
+ tests += \
+ tst-cet-legacy-1 \
++ tst-cet-legacy-10 \
++ tst-cet-legacy-10-static \
++ tst-cet-legacy-10a \
++ tst-cet-legacy-10a-static \
+ tst-cet-legacy-1a \
+ tst-cet-legacy-2 \
+ tst-cet-legacy-2a \
+@@ -261,15 +267,11 @@ tests += \
+ tst-cet-legacy-8 \
+ tst-cet-legacy-9 \
+ tst-cet-legacy-9-static \
+- tst-cet-legacy-10 \
+- tst-cet-legacy-10-static \
+- tst-cet-legacy-10a \
+- tst-cet-legacy-10a-static \
+ # tests
+ tests-static += \
+- tst-cet-legacy-9-static \
+ tst-cet-legacy-10-static \
+ tst-cet-legacy-10a-static \
++ tst-cet-legacy-9-static \
+ # tests-static
+ tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd)
+
+diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
+index 418cc4a9b8..04a534fa12 100755
+--- a/sysdeps/x86_64/configure
++++ b/sysdeps/x86_64/configure
+@@ -134,6 +134,34 @@ fi
+ config_vars="$config_vars
+ enable-cet = $enable_cet"
+
++# Check if -mamx-tile works properly.
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -mamx-tile works properly" >&5
++printf %s "checking whether -mamx-tile works properly... " >&6; }
++if test ${libc_cv_x86_have_amx_tile+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++ cat > conftest.c <<EOF
++#include <x86intrin.h>
++EOF
++ libc_cv_x86_have_amx_tile=no
++ if { ac_try='${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i'
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ if grep -q __builtin_ia32_ldtilecfg conftest.i; then
++ libc_cv_x86_have_amx_tile=yes
++ fi
++ fi
++ rm -rf conftest*
++fi
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_have_amx_tile" >&5
++printf "%s\n" "$libc_cv_x86_have_amx_tile" >&6; }
++config_vars="$config_vars
++have-mamx-tile = $libc_cv_x86_have_amx_tile"
++
+ test -n "$critic_missing" && as_fn_error $? "
+ *** $critic_missing" "$LINENO" 5
+
+diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac
+index d1f803c02e..c714c47351 100644
+--- a/sysdeps/x86_64/configure.ac
++++ b/sysdeps/x86_64/configure.ac
+@@ -61,5 +61,20 @@ elif test $enable_cet = permissive; then
+ fi
+ LIBC_CONFIG_VAR([enable-cet], [$enable_cet])
+
++# Check if -mamx-tile works properly.
++AC_CACHE_CHECK(whether -mamx-tile works properly,
++ libc_cv_x86_have_amx_tile, [dnl
++cat > conftest.c <<EOF
++#include <x86intrin.h>
++EOF
++ libc_cv_x86_have_amx_tile=no
++ if AC_TRY_COMMAND(${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i); then
++ if grep -q __builtin_ia32_ldtilecfg conftest.i; then
++ libc_cv_x86_have_amx_tile=yes
++ fi
++ fi
++ rm -rf conftest*])
++LIBC_CONFIG_VAR([have-mamx-tile], [$libc_cv_x86_have_amx_tile])
++
+ test -n "$critic_missing" && AC_MSG_ERROR([
+ *** $critic_missing])
+diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
+index 6d605d0d32..ff5d45f7cb 100644
+--- a/sysdeps/x86_64/dl-machine.h
++++ b/sysdeps/x86_64/dl-machine.h
+@@ -71,9 +71,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
+ int lazy, int profile)
+ {
+ Elf64_Addr *got;
+- extern void _dl_runtime_resolve_fxsave (ElfW(Word)) attribute_hidden;
+- extern void _dl_runtime_resolve_xsave (ElfW(Word)) attribute_hidden;
+- extern void _dl_runtime_resolve_xsavec (ElfW(Word)) attribute_hidden;
+ extern void _dl_runtime_profile_sse (ElfW(Word)) attribute_hidden;
+ extern void _dl_runtime_profile_avx (ElfW(Word)) attribute_hidden;
+ extern void _dl_runtime_profile_avx512 (ElfW(Word)) attribute_hidden;
+@@ -96,8 +93,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
+ /* Identify this shared object. */
+ *(ElfW(Addr) *) (got + 1) = (ElfW(Addr)) l;
+
+- const struct cpu_features* cpu_features = __get_cpu_features ();
+-
+ #ifdef SHARED
+ /* The got[2] entry contains the address of a function which gets
+ called to get the address of a so far unresolved function and
+@@ -107,6 +102,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
+ end in this function. */
+ if (__glibc_unlikely (profile))
+ {
++ const struct cpu_features* cpu_features = __get_cpu_features ();
+ if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX512F))
+ *(ElfW(Addr) *) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx512;
+ else if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX))
+@@ -126,15 +122,8 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
+ /* This function will get called to fix up the GOT entry
+ indicated by the offset on the stack, and then jump to
+ the resolved address. */
+- if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL
+- || GLRO(dl_x86_cpu_features).xsave_state_size != 0)
+- *(ElfW(Addr) *) (got + 2)
+- = (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)
+- ? (ElfW(Addr)) &_dl_runtime_resolve_xsavec
+- : (ElfW(Addr)) &_dl_runtime_resolve_xsave);
+- else
+- *(ElfW(Addr) *) (got + 2)
+- = (ElfW(Addr)) &_dl_runtime_resolve_fxsave;
++ *(ElfW(Addr) *) (got + 2)
++ = (ElfW(Addr)) GLRO(dl_x86_64_runtime_resolve);
+ }
+ }
+
+@@ -383,7 +372,7 @@ and creates an unsatisfiable circular dependency.\n",
+ {
+ td->arg = _dl_make_tlsdesc_dynamic
+ (sym_map, sym->st_value + reloc->r_addend);
+- td->entry = _dl_tlsdesc_dynamic;
++ td->entry = GLRO(dl_x86_tlsdesc_dynamic);
+ }
+ else
+ # endif
+diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c
+index 4d1d790fbb..06637a8154 100644
+--- a/sysdeps/x86_64/dl-procinfo.c
++++ b/sysdeps/x86_64/dl-procinfo.c
+@@ -41,5 +41,21 @@
+
+ #include <sysdeps/x86/dl-procinfo.c>
+
++#if !IS_IN (ldconfig)
++# if !defined PROCINFO_DECL && defined SHARED
++ ._dl_x86_64_runtime_resolve
++# else
++PROCINFO_CLASS void * _dl_x86_64_runtime_resolve
++# endif
++# ifndef PROCINFO_DECL
++= NULL
++# endif
++# if !defined SHARED || defined PROCINFO_DECL
++;
++# else
++,
++# endif
++#endif
++
+ #undef PROCINFO_DECL
+ #undef PROCINFO_CLASS
+diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h
+new file mode 100644
+index 0000000000..9f02cfc3eb
+--- /dev/null
++++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h
+@@ -0,0 +1,166 @@
++/* Thread-local storage handling in the ELF dynamic linker. x86_64 version.
++ Copyright (C) 2004-2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#ifndef SECTION
++# define SECTION(p) p
++#endif
++
++#undef REGISTER_SAVE_AREA
++#undef LOCAL_STORAGE_AREA
++#undef BASE
++
++#include "dl-trampoline-state.h"
++
++ .section SECTION(.text),"ax",@progbits
++
++ .hidden _dl_tlsdesc_dynamic
++ .global _dl_tlsdesc_dynamic
++ .type _dl_tlsdesc_dynamic,@function
++
++ /* %rax points to the TLS descriptor, such that 0(%rax) points to
++ _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct
++ tlsdesc_dynamic_arg object. It must return in %rax the offset
++ between the thread pointer and the object denoted by the
++ argument, without clobbering any registers.
++
++ The assembly code that follows is a rendition of the following
++ C code, hand-optimized a little bit.
++
++ptrdiff_t
++_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax"))
++{
++ struct tlsdesc_dynamic_arg *td = tdp->arg;
++ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET);
++ if (__builtin_expect (td->gen_count <= dtv[0].counter
++ && (dtv[td->tlsinfo.ti_module].pointer.val
++ != TLS_DTV_UNALLOCATED),
++ 1))
++ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset
++ - __thread_pointer;
++
++ return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer;
++}
++*/
++ cfi_startproc
++ .align 16
++_dl_tlsdesc_dynamic:
++ _CET_ENDBR
++ /* Preserve call-clobbered registers that we modify.
++ We need two scratch regs anyway. */
++ movq %rsi, -16(%rsp)
++ mov %fs:DTV_OFFSET, %RSI_LP
++ movq %rdi, -8(%rsp)
++ movq TLSDESC_ARG(%rax), %rdi
++ movq (%rsi), %rax
++ cmpq %rax, TLSDESC_GEN_COUNT(%rdi)
++ ja 2f
++ movq TLSDESC_MODID(%rdi), %rax
++ salq $4, %rax
++ movq (%rax,%rsi), %rax
++ cmpq $-1, %rax
++ je 2f
++ addq TLSDESC_MODOFF(%rdi), %rax
++1:
++ movq -16(%rsp), %rsi
++ sub %fs:0, %RAX_LP
++ movq -8(%rsp), %rdi
++ ret
++2:
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++ movq %rbx, -24(%rsp)
++ mov %RSP_LP, %RBX_LP
++ cfi_def_cfa_register(%rbx)
++ and $-STATE_SAVE_ALIGNMENT, %RSP_LP
++#endif
++#ifdef REGISTER_SAVE_AREA
++# if DL_RUNTIME_RESOLVE_REALIGN_STACK
++ /* STATE_SAVE_OFFSET has space for 8 integer registers. But we
++ need space for RCX, RDX, RSI, RDI, R8, R9, R10 and R11, plus
++ RBX above. */
++ sub $(REGISTER_SAVE_AREA + STATE_SAVE_ALIGNMENT), %RSP_LP
++# else
++ sub $REGISTER_SAVE_AREA, %RSP_LP
++ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA)
++# endif
++#else
++ /* Allocate stack space of the required size to save the state. */
++ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP
++#endif
++ /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9,
++ r10 and r11. */
++ movq %rcx, REGISTER_SAVE_RCX(%rsp)
++ movq %rdx, REGISTER_SAVE_RDX(%rsp)
++ movq %r8, REGISTER_SAVE_R8(%rsp)
++ movq %r9, REGISTER_SAVE_R9(%rsp)
++ movq %r10, REGISTER_SAVE_R10(%rsp)
++ movq %r11, REGISTER_SAVE_R11(%rsp)
++#ifdef USE_FXSAVE
++ fxsave STATE_SAVE_OFFSET(%rsp)
++#else
++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax
++ xorl %edx, %edx
++ /* Clear the XSAVE Header. */
++# ifdef USE_XSAVE
++ movq %rdx, (STATE_SAVE_OFFSET + 512)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8)(%rsp)
++# endif
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 2)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 3)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 4)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 5)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 6)(%rsp)
++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 7)(%rsp)
++# ifdef USE_XSAVE
++ xsave STATE_SAVE_OFFSET(%rsp)
++# else
++ xsavec STATE_SAVE_OFFSET(%rsp)
++# endif
++#endif
++ /* %rdi already points to the tlsinfo data structure. */
++ call HIDDEN_JUMPTARGET (__tls_get_addr)
++ # Get register content back.
++#ifdef USE_FXSAVE
++ fxrstor STATE_SAVE_OFFSET(%rsp)
++#else
++ /* Save and retore __tls_get_addr return value stored in RAX. */
++ mov %RAX_LP, %RCX_LP
++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax
++ xorl %edx, %edx
++ xrstor STATE_SAVE_OFFSET(%rsp)
++ mov %RCX_LP, %RAX_LP
++#endif
++ movq REGISTER_SAVE_R11(%rsp), %r11
++ movq REGISTER_SAVE_R10(%rsp), %r10
++ movq REGISTER_SAVE_R9(%rsp), %r9
++ movq REGISTER_SAVE_R8(%rsp), %r8
++ movq REGISTER_SAVE_RDX(%rsp), %rdx
++ movq REGISTER_SAVE_RCX(%rsp), %rcx
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++ mov %RBX_LP, %RSP_LP
++ cfi_def_cfa_register(%rsp)
++ movq -24(%rsp), %rbx
++ cfi_restore(%rbx)
++#else
++ add $REGISTER_SAVE_AREA, %RSP_LP
++ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA)
++#endif
++ jmp 1b
++ cfi_endproc
++ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
++
++#undef STATE_SAVE_ALIGNMENT
+diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S
+index f748af2ece..057a10862a 100644
+--- a/sysdeps/x86_64/dl-tlsdesc.S
++++ b/sysdeps/x86_64/dl-tlsdesc.S
+@@ -18,7 +18,20 @@
+
+ #include <sysdep.h>
+ #include <tls.h>
++#include <cpu-features-offsets.h>
++#include <features-offsets.h>
++#include <isa-level.h>
+ #include "tlsdesc.h"
++#include "dl-trampoline-save.h"
++
++/* Area on stack to save and restore registers used for parameter
++ passing when calling _dl_tlsdesc_dynamic. */
++#define REGISTER_SAVE_RCX 0
++#define REGISTER_SAVE_RDX (REGISTER_SAVE_RCX + 8)
++#define REGISTER_SAVE_R8 (REGISTER_SAVE_RDX + 8)
++#define REGISTER_SAVE_R9 (REGISTER_SAVE_R8 + 8)
++#define REGISTER_SAVE_R10 (REGISTER_SAVE_R9 + 8)
++#define REGISTER_SAVE_R11 (REGISTER_SAVE_R10 + 8)
+
+ .text
+
+@@ -67,80 +80,26 @@ _dl_tlsdesc_undefweak:
+ .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak
+
+ #ifdef SHARED
+- .hidden _dl_tlsdesc_dynamic
+- .global _dl_tlsdesc_dynamic
+- .type _dl_tlsdesc_dynamic,@function
+-
+- /* %rax points to the TLS descriptor, such that 0(%rax) points to
+- _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct
+- tlsdesc_dynamic_arg object. It must return in %rax the offset
+- between the thread pointer and the object denoted by the
+- argument, without clobbering any registers.
+-
+- The assembly code that follows is a rendition of the following
+- C code, hand-optimized a little bit.
+-
+-ptrdiff_t
+-_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax"))
+-{
+- struct tlsdesc_dynamic_arg *td = tdp->arg;
+- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET);
+- if (__builtin_expect (td->gen_count <= dtv[0].counter
+- && (dtv[td->tlsinfo.ti_module].pointer.val
+- != TLS_DTV_UNALLOCATED),
+- 1))
+- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset
+- - __thread_pointer;
+-
+- return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer;
+-}
+-*/
+- cfi_startproc
+- .align 16
+-_dl_tlsdesc_dynamic:
+- _CET_ENDBR
+- /* Preserve call-clobbered registers that we modify.
+- We need two scratch regs anyway. */
+- movq %rsi, -16(%rsp)
+- mov %fs:DTV_OFFSET, %RSI_LP
+- movq %rdi, -8(%rsp)
+- movq TLSDESC_ARG(%rax), %rdi
+- movq (%rsi), %rax
+- cmpq %rax, TLSDESC_GEN_COUNT(%rdi)
+- ja .Lslow
+- movq TLSDESC_MODID(%rdi), %rax
+- salq $4, %rax
+- movq (%rax,%rsi), %rax
+- cmpq $-1, %rax
+- je .Lslow
+- addq TLSDESC_MODOFF(%rdi), %rax
+-.Lret:
+- movq -16(%rsp), %rsi
+- sub %fs:0, %RAX_LP
+- movq -8(%rsp), %rdi
+- ret
+-.Lslow:
+- /* Besides rdi and rsi, saved above, save rdx, rcx, r8, r9,
+- r10 and r11. Also, align the stack, that's off by 8 bytes. */
+- subq $72, %rsp
+- cfi_adjust_cfa_offset (72)
+- movq %rdx, 8(%rsp)
+- movq %rcx, 16(%rsp)
+- movq %r8, 24(%rsp)
+- movq %r9, 32(%rsp)
+- movq %r10, 40(%rsp)
+- movq %r11, 48(%rsp)
+- /* %rdi already points to the tlsinfo data structure. */
+- call HIDDEN_JUMPTARGET (__tls_get_addr)
+- movq 8(%rsp), %rdx
+- movq 16(%rsp), %rcx
+- movq 24(%rsp), %r8
+- movq 32(%rsp), %r9
+- movq 40(%rsp), %r10
+- movq 48(%rsp), %r11
+- addq $72, %rsp
+- cfi_adjust_cfa_offset (-72)
+- jmp .Lret
+- cfi_endproc
+- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
++# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL
++# define USE_FXSAVE
++# define STATE_SAVE_ALIGNMENT 16
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_FXSAVE
++# endif
++
++# define USE_XSAVE
++# define STATE_SAVE_ALIGNMENT 64
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_XSAVE
++
++# define USE_XSAVEC
++# define STATE_SAVE_ALIGNMENT 64
++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec
++# include "dl-tlsdesc-dynamic.h"
++# undef _dl_tlsdesc_dynamic
++# undef USE_XSAVEC
+ #endif /* SHARED */
+diff --git a/sysdeps/x86_64/dl-trampoline-save.h b/sysdeps/x86_64/dl-trampoline-save.h
+new file mode 100644
+index 0000000000..84eac4a8ac
+--- /dev/null
++++ b/sysdeps/x86_64/dl-trampoline-save.h
+@@ -0,0 +1,34 @@
++/* x86-64 PLT trampoline register save macros.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#ifndef DL_STACK_ALIGNMENT
++/* Due to GCC bug:
++
++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066
++
++ __tls_get_addr may be called with 8-byte stack alignment. Although
++ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume
++ that stack will be always aligned at 16 bytes. */
++# define DL_STACK_ALIGNMENT 8
++#endif
++
++/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align
++ stack to 16 bytes before calling _dl_fixup. */
++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \
++ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \
++ || 16 > DL_STACK_ALIGNMENT)
+diff --git a/sysdeps/x86_64/dl-trampoline-state.h b/sysdeps/x86_64/dl-trampoline-state.h
+new file mode 100644
+index 0000000000..575f120797
+--- /dev/null
++++ b/sysdeps/x86_64/dl-trampoline-state.h
+@@ -0,0 +1,51 @@
++/* x86-64 PLT dl-trampoline state macros.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#if (STATE_SAVE_ALIGNMENT % 16) != 0
++# error STATE_SAVE_ALIGNMENT must be multiple of 16
++#endif
++
++#if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0
++# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT
++#endif
++
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
++/* Local stack area before jumping to function address: RBX. */
++# define LOCAL_STORAGE_AREA 8
++# define BASE rbx
++# ifdef USE_FXSAVE
++/* Use fxsave to save XMM registers. */
++# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET)
++# if (REGISTER_SAVE_AREA % 16) != 0
++# error REGISTER_SAVE_AREA must be multiple of 16
++# endif
++# endif
++#else
++# ifndef USE_FXSAVE
++# error USE_FXSAVE must be defined
++# endif
++/* Use fxsave to save XMM registers. */
++# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8)
++/* Local stack area before jumping to function address: All saved
++ registers. */
++# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA
++# define BASE rsp
++# if (REGISTER_SAVE_AREA % 16) != 8
++# error REGISTER_SAVE_AREA must be odd multiple of 8
++# endif
++#endif
+diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
+index b2e7e0f69b..87c5137837 100644
+--- a/sysdeps/x86_64/dl-trampoline.S
++++ b/sysdeps/x86_64/dl-trampoline.S
+@@ -22,25 +22,7 @@
+ #include <features-offsets.h>
+ #include <link-defines.h>
+ #include <isa-level.h>
+-
+-#ifndef DL_STACK_ALIGNMENT
+-/* Due to GCC bug:
+-
+- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066
+-
+- __tls_get_addr may be called with 8-byte stack alignment. Although
+- this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume
+- that stack will be always aligned at 16 bytes. We use unaligned
+- 16-byte move to load and store SSE registers, which has no penalty
+- on modern processors if stack is 16-byte aligned. */
+-# define DL_STACK_ALIGNMENT 8
+-#endif
+-
+-/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align
+- stack to 16 bytes before calling _dl_fixup. */
+-#define DL_RUNTIME_RESOLVE_REALIGN_STACK \
+- (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \
+- || 16 > DL_STACK_ALIGNMENT)
++#include "dl-trampoline-save.h"
+
+ /* Area on stack to save and restore registers used for parameter
+ passing when calling _dl_fixup. */
+diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h
+index f55c6ea040..d9ccfb40d4 100644
+--- a/sysdeps/x86_64/dl-trampoline.h
++++ b/sysdeps/x86_64/dl-trampoline.h
+@@ -27,39 +27,7 @@
+ # undef LOCAL_STORAGE_AREA
+ # undef BASE
+
+-# if (STATE_SAVE_ALIGNMENT % 16) != 0
+-# error STATE_SAVE_ALIGNMENT must be multiple of 16
+-# endif
+-
+-# if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0
+-# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT
+-# endif
+-
+-# if DL_RUNTIME_RESOLVE_REALIGN_STACK
+-/* Local stack area before jumping to function address: RBX. */
+-# define LOCAL_STORAGE_AREA 8
+-# define BASE rbx
+-# ifdef USE_FXSAVE
+-/* Use fxsave to save XMM registers. */
+-# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET)
+-# if (REGISTER_SAVE_AREA % 16) != 0
+-# error REGISTER_SAVE_AREA must be multiple of 16
+-# endif
+-# endif
+-# else
+-# ifndef USE_FXSAVE
+-# error USE_FXSAVE must be defined
+-# endif
+-/* Use fxsave to save XMM registers. */
+-# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8)
+-/* Local stack area before jumping to function address: All saved
+- registers. */
+-# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA
+-# define BASE rsp
+-# if (REGISTER_SAVE_AREA % 16) != 8
+-# error REGISTER_SAVE_AREA must be odd multiple of 8
+-# endif
+-# endif
++# include "dl-trampoline-state.h"
+
+ .globl _dl_runtime_resolve
+ .hidden _dl_runtime_resolve
+diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
+index ea81753b70..6ddd50240c 100644
+--- a/sysdeps/x86_64/fpu/multiarch/Makefile
++++ b/sysdeps/x86_64/fpu/multiarch/Makefile
+@@ -1,49 +1,4 @@
+ ifeq ($(subdir),math)
+-libm-sysdep_routines += \
+- s_ceil-c \
+- s_ceilf-c \
+- s_floor-c \
+- s_floorf-c \
+- s_rint-c \
+- s_rintf-c \
+- s_nearbyint-c \
+- s_nearbyintf-c \
+- s_roundeven-c \
+- s_roundevenf-c \
+- s_trunc-c \
+- s_truncf-c \
+-# libm-sysdep_routines
+-
+-libm-sysdep_routines += \
+- s_ceil-sse4_1 \
+- s_ceilf-sse4_1 \
+- s_floor-sse4_1 \
+- s_floorf-sse4_1 \
+- s_nearbyint-sse4_1 \
+- s_nearbyintf-sse4_1 \
+- s_roundeven-sse4_1 \
+- s_roundevenf-sse4_1 \
+- s_rint-sse4_1 \
+- s_rintf-sse4_1 \
+- s_trunc-sse4_1 \
+- s_truncf-sse4_1 \
+-# libm-sysdep_routines
+-
+-libm-sysdep_routines += \
+- e_asin-fma \
+- e_atan2-fma \
+- e_exp-fma \
+- e_log-fma \
+- e_log2-fma \
+- e_pow-fma \
+- s_atan-fma \
+- s_expm1-fma \
+- s_log1p-fma \
+- s_sin-fma \
+- s_sincos-fma \
+- s_tan-fma \
+-# libm-sysdep_routines
+-
+ CFLAGS-e_asin-fma.c = -mfma -mavx2
+ CFLAGS-e_atan2-fma.c = -mfma -mavx2
+ CFLAGS-e_exp-fma.c = -mfma -mavx2
+@@ -57,23 +12,6 @@ CFLAGS-s_sin-fma.c = -mfma -mavx2
+ CFLAGS-s_tan-fma.c = -mfma -mavx2
+ CFLAGS-s_sincos-fma.c = -mfma -mavx2
+
+-libm-sysdep_routines += \
+- s_cosf-sse2 \
+- s_sincosf-sse2 \
+- s_sinf-sse2 \
+-# libm-sysdep_routines
+-
+-libm-sysdep_routines += \
+- e_exp2f-fma \
+- e_expf-fma \
+- e_log2f-fma \
+- e_logf-fma \
+- e_powf-fma \
+- s_cosf-fma \
+- s_sincosf-fma \
+- s_sinf-fma \
+-# libm-sysdep_routines
+-
+ CFLAGS-e_exp2f-fma.c = -mfma -mavx2
+ CFLAGS-e_expf-fma.c = -mfma -mavx2
+ CFLAGS-e_log2f-fma.c = -mfma -mavx2
+@@ -83,17 +21,93 @@ CFLAGS-s_sinf-fma.c = -mfma -mavx2
+ CFLAGS-s_cosf-fma.c = -mfma -mavx2
+ CFLAGS-s_sincosf-fma.c = -mfma -mavx2
+
++# Check if ISA level is 3 or above.
++ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above)))
++libm-sysdep_routines += \
++ s_ceil-avx \
++ s_ceilf-avx \
++ s_floor-avx \
++ s_floorf-avx \
++ s_nearbyint-avx \
++ s_nearbyintf-avx \
++ s_rint-avx \
++ s_rintf-avx \
++ s_roundeven-avx \
++ s_roundevenf-avx \
++ s_trunc-avx \
++ s_truncf-avx \
++# libm-sysdep_routines
++else
+ libm-sysdep_routines += \
++ e_asin-fma \
++ e_asin-fma4 \
++ e_atan2-avx \
++ e_atan2-fma \
++ e_atan2-fma4 \
++ e_exp-avx \
++ e_exp-fma \
+ e_exp-fma4 \
++ e_exp2f-fma \
++ e_expf-fma \
++ e_log-avx \
++ e_log-fma \
+ e_log-fma4 \
++ e_log2-fma \
++ e_log2f-fma \
++ e_logf-fma \
++ e_pow-fma \
+ e_pow-fma4 \
+- e_asin-fma4 \
++ e_powf-fma \
++ s_atan-avx \
++ s_atan-fma \
+ s_atan-fma4 \
+- e_atan2-fma4 \
++ s_ceil-sse4_1 \
++ s_ceilf-sse4_1 \
++ s_cosf-fma \
++ s_cosf-sse2 \
++ s_expm1-fma \
++ s_floor-sse4_1 \
++ s_floorf-sse4_1 \
++ s_log1p-fma \
++ s_nearbyint-sse4_1 \
++ s_nearbyintf-sse4_1 \
++ s_rint-sse4_1 \
++ s_rintf-sse4_1 \
++ s_roundeven-sse4_1 \
++ s_roundevenf-sse4_1 \
++ s_sin-avx \
++ s_sin-fma \
+ s_sin-fma4 \
++ s_sincos-avx \
++ s_sincos-fma \
+ s_sincos-fma4 \
++ s_sincosf-fma \
++ s_sincosf-sse2 \
++ s_sinf-fma \
++ s_sinf-sse2 \
++ s_tan-avx \
++ s_tan-fma \
+ s_tan-fma4 \
++ s_trunc-sse4_1 \
++ s_truncf-sse4_1 \
++# libm-sysdep_routines
++ifeq ($(have-x86-isa-level),baseline)
++libm-sysdep_routines += \
++ s_ceil-c \
++ s_ceilf-c \
++ s_floor-c \
++ s_floorf-c \
++ s_nearbyint-c \
++ s_nearbyintf-c \
++ s_rint-c \
++ s_rintf-c \
++ s_roundeven-c \
++ s_roundevenf-c \
++ s_trunc-c \
++ s_truncf-c \
+ # libm-sysdep_routines
++endif
++endif
+
+ CFLAGS-e_asin-fma4.c = -mfma4
+ CFLAGS-e_atan2-fma4.c = -mfma4
+@@ -105,16 +119,6 @@ CFLAGS-s_sin-fma4.c = -mfma4
+ CFLAGS-s_tan-fma4.c = -mfma4
+ CFLAGS-s_sincos-fma4.c = -mfma4
+
+-libm-sysdep_routines += \
+- e_exp-avx \
+- e_log-avx \
+- s_atan-avx \
+- e_atan2-avx \
+- s_sin-avx \
+- s_sincos-avx \
+- s_tan-avx \
+-# libm-sysdep_routines
+-
+ CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX
+ CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX
+ CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin.c b/sysdeps/x86_64/fpu/multiarch/e_asin.c
+index 2eaa6c2c04..d64fca2586 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_asin.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_asin.c
+@@ -16,26 +16,29 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-finite.h>
+
+ extern double __redirect_ieee754_asin (double);
+ extern double __redirect_ieee754_acos (double);
+
+-#define SYMBOL_NAME ieee754_asin
+-#include "ifunc-fma4.h"
++# define SYMBOL_NAME ieee754_asin
++# include "ifunc-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_asin, __ieee754_asin,
+ IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_asin, __asin)
+
+-#undef SYMBOL_NAME
+-#define SYMBOL_NAME ieee754_acos
+-#include "ifunc-fma4.h"
++# undef SYMBOL_NAME
++# define SYMBOL_NAME ieee754_acos
++# include "ifunc-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_acos, __ieee754_acos,
+ IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_acos, __acos)
+
+-#define __ieee754_acos __ieee754_acos_sse2
+-#define __ieee754_asin __ieee754_asin_sse2
++# define __ieee754_acos __ieee754_acos_sse2
++# define __ieee754_asin __ieee754_asin_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_asin.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
+index 17ee4f3c36..8a86c14ded 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
+@@ -16,16 +16,19 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-finite.h>
+
+ extern double __redirect_ieee754_atan2 (double, double);
+
+-#define SYMBOL_NAME ieee754_atan2
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME ieee754_atan2
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_atan2,
+ __ieee754_atan2, IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_atan2, __atan2)
+
+-#define __ieee754_atan2 __ieee754_atan2_sse2
++# define __ieee754_atan2 __ieee754_atan2_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_atan2.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
+index 406b7ebd44..d56329291a 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <math.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <math.h>
++# include <libm-alias-finite.h>
+
+ extern double __redirect_ieee754_exp (double);
+
+-#define SYMBOL_NAME ieee754_exp
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME ieee754_exp
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_exp, __ieee754_exp,
+ IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_exp, __exp)
+
+-#define __exp __ieee754_exp_sse2
++# define __exp __ieee754_exp_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_exp.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c
+index 804fd6be85..06fe5028d6 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c
+@@ -16,25 +16,28 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# include <libm-alias-finite.h>
+
+ extern float __redirect_exp2f (float);
+
+-#define SYMBOL_NAME exp2f
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME exp2f
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_exp2f, __exp2f, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ versioned_symbol (libm, __ieee754_exp2f, exp2f, GLIBC_2_27);
+ libm_alias_float_other (__exp2, exp2)
+-#else
++# else
+ libm_alias_float (__exp2, exp2)
+-#endif
++# endif
+
+ strong_alias (__exp2f, __ieee754_exp2f)
+ libm_alias_finite (__exp2f, __exp2f)
+
+-#define __exp2f __exp2f_sse2
++# define __exp2f __exp2f_sse2
++#endif
+ #include <sysdeps/ieee754/flt-32/e_exp2f.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_expf.c b/sysdeps/x86_64/fpu/multiarch/e_expf.c
+index 4a7e2a5bce..19d767f636 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_expf.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_expf.c
+@@ -16,28 +16,31 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# include <libm-alias-finite.h>
+
+ extern float __redirect_expf (float);
+
+-#define SYMBOL_NAME expf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME expf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_expf, __expf, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ __hidden_ver1 (__expf, __GI___expf, __redirect_expf)
+ __attribute__ ((visibility ("hidden")));
+
+ versioned_symbol (libm, __ieee754_expf, expf, GLIBC_2_27);
+ libm_alias_float_other (__exp, exp)
+-#else
++# else
+ libm_alias_float (__exp, exp)
+-#endif
++# endif
+
+ strong_alias (__expf, __ieee754_expf)
+ libm_alias_finite (__expf, __expf)
+
+-#define __expf __expf_sse2
++# define __expf __expf_sse2
++#endif
+ #include <sysdeps/ieee754/flt-32/e_expf.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
+index 067fbf58c3..d80c1b1463 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_log.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <math.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <math.h>
++# include <libm-alias-finite.h>
+
+ extern double __redirect_ieee754_log (double);
+
+-#define SYMBOL_NAME ieee754_log
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME ieee754_log
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log,
+ IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_log, __log)
+
+-#define __log __ieee754_log_sse2
++# define __log __ieee754_log_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_log.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2.c b/sysdeps/x86_64/fpu/multiarch/e_log2.c
+index 9c57a2f6cc..9686782c09 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_log2.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_log2.c
+@@ -16,28 +16,31 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# include <libm-alias-finite.h>
+
+ extern double __redirect_log2 (double);
+
+-#define SYMBOL_NAME log2
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME log2
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_log2, __log2, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ __hidden_ver1 (__log2, __GI___log2, __redirect_log2)
+ __attribute__ ((visibility ("hidden")));
+
+ versioned_symbol (libm, __ieee754_log2, log2, GLIBC_2_29);
+ libm_alias_double_other (__log2, log2)
+-#else
++# else
+ libm_alias_double (__log2, log2)
+-#endif
++# endif
+
+ strong_alias (__log2, __ieee754_log2)
+ libm_alias_finite (__log2, __log2)
+
+-#define __log2 __log2_sse2
++# define __log2 __log2_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_log2.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2f.c b/sysdeps/x86_64/fpu/multiarch/e_log2f.c
+index 2b45c87f38..8ada46e11e 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_log2f.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_log2f.c
+@@ -16,28 +16,31 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# include <libm-alias-finite.h>
+
+ extern float __redirect_log2f (float);
+
+-#define SYMBOL_NAME log2f
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME log2f
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_log2f, __log2f, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ __hidden_ver1 (__log2f, __GI___log2f, __redirect_log2f)
+ __attribute__ ((visibility ("hidden")));
+
+ versioned_symbol (libm, __ieee754_log2f, log2f, GLIBC_2_27);
+ libm_alias_float_other (__log2, log2)
+-#else
++# else
+ libm_alias_float (__log2, log2)
+-#endif
++# endif
+
+ strong_alias (__log2f, __ieee754_log2f)
+ libm_alias_finite (__log2f, __log2f)
+
+-#define __log2f __log2f_sse2
++# define __log2f __log2f_sse2
++#endif
+ #include <sysdeps/ieee754/flt-32/e_log2f.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_logf.c b/sysdeps/x86_64/fpu/multiarch/e_logf.c
+index 97e23c8fea..a3978d9a8e 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_logf.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_logf.c
+@@ -16,28 +16,31 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# include <libm-alias-finite.h>
+
+ extern float __redirect_logf (float);
+
+-#define SYMBOL_NAME logf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME logf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_logf, __logf, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ __hidden_ver1 (__logf, __GI___logf, __redirect_logf)
+ __attribute__ ((visibility ("hidden")));
+
+ versioned_symbol (libm, __ieee754_logf, logf, GLIBC_2_27);
+ libm_alias_float_other (__log, log)
+-#else
++# else
+ libm_alias_float (__log, log)
+-#endif
++# endif
+
+ strong_alias (__logf, __ieee754_logf)
+ libm_alias_finite (__logf, __logf)
+
+-#define __logf __logf_sse2
++# define __logf __logf_sse2
++#endif
+ #include <sysdeps/ieee754/flt-32/e_logf.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow.c b/sysdeps/x86_64/fpu/multiarch/e_pow.c
+index 42618e7112..f8f17aff9f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_pow.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_pow.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <math.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <math.h>
++# include <libm-alias-finite.h>
+
+ extern double __redirect_ieee754_pow (double, double);
+
+-#define SYMBOL_NAME ieee754_pow
+-#include "ifunc-fma4.h"
++# define SYMBOL_NAME ieee754_pow
++# include "ifunc-fma4.h"
+
+ libc_ifunc_redirected (__redirect_ieee754_pow,
+ __ieee754_pow, IFUNC_SELECTOR ());
+ libm_alias_finite (__ieee754_pow, __pow)
+
+-#define __pow __ieee754_pow_sse2
++# define __pow __ieee754_pow_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/e_pow.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_powf.c b/sysdeps/x86_64/fpu/multiarch/e_powf.c
+index 8e6ce13cc1..8b1a4c7d04 100644
+--- a/sysdeps/x86_64/fpu/multiarch/e_powf.c
++++ b/sysdeps/x86_64/fpu/multiarch/e_powf.c
+@@ -16,31 +16,34 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
+-#include <libm-alias-finite.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# include <libm-alias-finite.h>
+
+-#define powf __redirect_powf
+-#define __DECL_SIMD___redirect_powf
+-#include <math.h>
+-#undef powf
++# define powf __redirect_powf
++# define __DECL_SIMD___redirect_powf
++# include <math.h>
++# undef powf
+
+-#define SYMBOL_NAME powf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME powf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_powf, __powf, IFUNC_SELECTOR ());
+
+-#ifdef SHARED
++# ifdef SHARED
+ __hidden_ver1 (__powf, __GI___powf, __redirect_powf)
+ __attribute__ ((visibility ("hidden")));
+
+ versioned_symbol (libm, __ieee754_powf, powf, GLIBC_2_27);
+ libm_alias_float_other (__pow, pow)
+-#else
++# else
+ libm_alias_float (__pow, pow)
+-#endif
++# endif
+
+ strong_alias (__powf, __ieee754_powf)
+ libm_alias_finite (__powf, __powf)
+
+-#define __powf __powf_sse2
++# define __powf __powf_sse2
++#endif
+ #include <sysdeps/ieee754/flt-32/e_powf.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
+index 71bad096a9..4d2c6ce006 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
+@@ -16,15 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern double __redirect_atan (double);
+
+-#define SYMBOL_NAME atan
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME atan
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_atan, __atan, IFUNC_SELECTOR ());
+ libm_alias_double (__atan, atan)
+
+-#define __atan __atan_sse2
++# define __atan __atan_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_atan.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S
+new file mode 100644
+index 0000000000..e6c1106753
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of ceil function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__ceil)
++ vroundsd $10, %xmm0, %xmm0, %xmm0
++ ret
++END(__ceil)
++
++libm_alias_double (__ceil, ceil)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S
+index 64119011ad..dba756c38f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __ceil_sse41 __ceil
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__ceil_sse41)
+ roundsd $10, %xmm0, %xmm0
+ ret
+ END(__ceil_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__ceil, ceil)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.c b/sysdeps/x86_64/fpu/multiarch/s_ceil.c
+index cc028addee..46c8e91e19 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-double.h>
+
+-#define ceil __redirect_ceil
+-#define __ceil __redirect___ceil
+-#include <math.h>
+-#undef ceil
+-#undef __ceil
++# define ceil __redirect_ceil
++# define __ceil __redirect___ceil
++# include <math.h>
++# undef ceil
++# undef __ceil
+
+-#define SYMBOL_NAME ceil
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME ceil
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_ceil, __ceil, IFUNC_SELECTOR ());
+ libm_alias_double (__ceil, ceil)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S
+new file mode 100644
+index 0000000000..b4d8ac0455
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of ceilf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__ceilf)
++ vroundss $10, %xmm0, %xmm0, %xmm0
++ ret
++END(__ceilf)
++
++libm_alias_float (__ceil, ceil)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S
+index dd9a9f6b71..9abc87b91a 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __ceilf_sse41 __ceilf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__ceilf_sse41)
+ roundss $10, %xmm0, %xmm0
+ ret
+ END(__ceilf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__ceil, ceil)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c
+index 97a0ca7d19..bb53108f73 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-float.h>
+
+-#define ceilf __redirect_ceilf
+-#define __ceilf __redirect___ceilf
+-#include <math.h>
+-#undef ceilf
+-#undef __ceilf
++# define ceilf __redirect_ceilf
++# define __ceilf __redirect___ceilf
++# include <math.h>
++# undef ceilf
++# undef __ceilf
+
+-#define SYMBOL_NAME ceilf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME ceilf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_ceilf, __ceilf, IFUNC_SELECTOR ());
+ libm_alias_float (__ceil, ceil)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c
+index 2703c576df..8a02e04538 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_cosf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c
+@@ -16,13 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
+
+ extern float __redirect_cosf (float);
+
+-#define SYMBOL_NAME cosf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME cosf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ());
+
+ libm_alias_float (__cos, cos)
++#else
++# include <sysdeps/ieee754/flt-32/s_cosf.c>
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_expm1.c b/sysdeps/x86_64/fpu/multiarch/s_expm1.c
+index 8a2d69f9b2..d58ef3d8f5 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_expm1.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_expm1.c
+@@ -16,21 +16,24 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern double __redirect_expm1 (double);
+
+-#define SYMBOL_NAME expm1
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME expm1
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_expm1, __expm1, IFUNC_SELECTOR ());
+ libm_alias_double (__expm1, expm1)
+
+-#define __expm1 __expm1_sse2
++# define __expm1 __expm1_sse2
+
+ /* NB: __expm1 may be expanded to __expm1_sse2 in the following
+ prototypes. */
+ extern long double __expm1l (long double);
+ extern long double __expm1f128 (long double);
+
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_expm1.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S
+new file mode 100644
+index 0000000000..ff74b5a8bf
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of floor function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__floor)
++ vroundsd $9, %xmm0, %xmm0, %xmm0
++ ret
++END(__floor)
++
++libm_alias_double (__floor, floor)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S
+index 2f7521f39f..c9b9b0639b 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __floor_sse41 __floor
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__floor_sse41)
+ roundsd $9, %xmm0, %xmm0
+ ret
+ END(__floor_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__floor, floor)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.c b/sysdeps/x86_64/fpu/multiarch/s_floor.c
+index 8cebd48e10..2c87dd0056 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_floor.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_floor.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-double.h>
+
+-#define floor __redirect_floor
+-#define __floor __redirect___floor
+-#include <math.h>
+-#undef floor
+-#undef __floor
++# define floor __redirect_floor
++# define __floor __redirect___floor
++# include <math.h>
++# undef floor
++# undef __floor
+
+-#define SYMBOL_NAME floor
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME floor
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_floor, __floor, IFUNC_SELECTOR ());
+ libm_alias_double (__floor, floor)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S
+new file mode 100644
+index 0000000000..c378baae8e
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of floorf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__floorf)
++ vroundss $9, %xmm0, %xmm0, %xmm0
++ ret
++END(__floorf)
++
++libm_alias_float (__floor, floor)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S
+index 5f6020d27d..c2216899db 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __floorf_sse41 __floorf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__floorf_sse41)
+ roundss $9, %xmm0, %xmm0
+ ret
+ END(__floorf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__floor, floor)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf.c b/sysdeps/x86_64/fpu/multiarch/s_floorf.c
+index a14e18b03c..a277802b6d 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_floorf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-float.h>
+
+-#define floorf __redirect_floorf
+-#define __floorf __redirect___floorf
+-#include <math.h>
+-#undef floorf
+-#undef __floorf
++# define floorf __redirect_floorf
++# define __floorf __redirect___floorf
++# include <math.h>
++# undef floorf
++# undef __floorf
+
+-#define SYMBOL_NAME floorf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME floorf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_floorf, __floorf, IFUNC_SELECTOR ());
+ libm_alias_float (__floor, floor)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_log1p.c b/sysdeps/x86_64/fpu/multiarch/s_log1p.c
+index a8e1a3f21b..3fa1185d81 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_log1p.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_log1p.c
+@@ -16,14 +16,17 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern double __redirect_log1p (double);
+
+-#define SYMBOL_NAME log1p
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME log1p
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_log1p, __log1p, IFUNC_SELECTOR ());
+
+-#define __log1p __log1p_sse2
++# define __log1p __log1p_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_log1p.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S
+new file mode 100644
+index 0000000000..5bfdf73c28
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of nearbyint function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__nearbyint)
++ vroundsd $0xc, %xmm0, %xmm0, %xmm0
++ ret
++END(__nearbyint)
++
++libm_alias_double (__nearbyint, nearbyint)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S
+index 674f7eb40a..9d84410a1f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __nearbyint_sse41 __nearbyint
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__nearbyint_sse41)
+ roundsd $0xc, %xmm0, %xmm0
+ ret
+ END(__nearbyint_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__nearbyint, nearbyint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c
+index 693e42dd4e..057a7ca60f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+-#define nearbyint __redirect_nearbyint
+-#define __nearbyint __redirect___nearbyint
+-#include <math.h>
+-#undef nearbyint
+-#undef __nearbyint
++# define nearbyint __redirect_nearbyint
++# define __nearbyint __redirect___nearbyint
++# include <math.h>
++# undef nearbyint
++# undef __nearbyint
+
+-#define SYMBOL_NAME nearbyint
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME nearbyint
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_nearbyint, __nearbyint,
+ IFUNC_SELECTOR ());
+ libm_alias_double (__nearbyint, nearbyint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S
+new file mode 100644
+index 0000000000..1dbaed0324
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implmentation of nearbyintf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__nearbyintf)
++ vroundss $0xc, %xmm0, %xmm0, %xmm0
++ ret
++END(__nearbyintf)
++
++libm_alias_float (__nearbyint, nearbyint)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S
+index 5892bd7563..3cf35f92d6 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __nearbyintf_sse41 __nearbyintf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__nearbyintf_sse41)
+ roundss $0xc, %xmm0, %xmm0
+ ret
+ END(__nearbyintf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__nearbyint, nearbyint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c
+index a0ac009f4b..41f374ba72 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
+
+-#define nearbyintf __redirect_nearbyintf
+-#define __nearbyintf __redirect___nearbyintf
+-#include <math.h>
+-#undef nearbyintf
+-#undef __nearbyintf
++# define nearbyintf __redirect_nearbyintf
++# define __nearbyintf __redirect___nearbyintf
++# include <math.h>
++# undef nearbyintf
++# undef __nearbyintf
+
+-#define SYMBOL_NAME nearbyintf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME nearbyintf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_nearbyintf, __nearbyintf,
+ IFUNC_SELECTOR ());
+ libm_alias_float (__nearbyint, nearbyint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S
+new file mode 100644
+index 0000000000..2b403b331f
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of rint function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__rint)
++ vroundsd $4, %xmm0, %xmm0, %xmm0
++ ret
++END(__rint)
++
++libm_alias_double (__rint, rint)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S
+index 405372991b..8cd9cf759f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __rint_sse41 __rint
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__rint_sse41)
+ roundsd $4, %xmm0, %xmm0
+ ret
+ END(__rint_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__rint, rint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint.c b/sysdeps/x86_64/fpu/multiarch/s_rint.c
+index 754c87e004..18623b7d99 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_rint.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_rint.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-double.h>
+
+-#define rint __redirect_rint
+-#define __rint __redirect___rint
+-#include <math.h>
+-#undef rint
+-#undef __rint
++# define rint __redirect_rint
++# define __rint __redirect___rint
++# include <math.h>
++# undef rint
++# undef __rint
+
+-#define SYMBOL_NAME rint
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME rint
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_rint, __rint, IFUNC_SELECTOR ());
+ libm_alias_double (__rint, rint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S
+new file mode 100644
+index 0000000000..171c2867f4
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of rintf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__rintf)
++ vroundss $4, %xmm0, %xmm0, %xmm0
++ ret
++END(__rintf)
++
++libm_alias_float (__rint, rint)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S
+index 8ac67ce767..fc1e70f0c9 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __rintf_sse41 __rintf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__rintf_sse41)
+ roundss $4, %xmm0, %xmm0
+ ret
+ END(__rintf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__rint, rint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf.c b/sysdeps/x86_64/fpu/multiarch/s_rintf.c
+index e9d6b7a5f2..e275368dec 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_rintf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-float.h>
+
+-#define rintf __redirect_rintf
+-#define __rintf __redirect___rintf
+-#include <math.h>
+-#undef rintf
+-#undef __rintf
++# define rintf __redirect_rintf
++# define __rintf __redirect___rintf
++# include <math.h>
++# undef rintf
++# undef __rintf
+
+-#define SYMBOL_NAME rintf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME rintf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_rintf, __rintf, IFUNC_SELECTOR ());
+ libm_alias_float (__rint, rint)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S
+new file mode 100644
+index 0000000000..576790355c
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of roundeven function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__roundeven)
++ vroundsd $8, %xmm0, %xmm0, %xmm0
++ ret
++END(__roundeven)
++
++libm_alias_double (__roundeven, roundeven)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S
+index 5ef102336b..f00be56c59 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __roundeven_sse41 __roundeven
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__roundeven_sse41)
+ roundsd $8, %xmm0, %xmm0
+ ret
+ END(__roundeven_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__roundeven, roundeven)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c
+index 8737b32e26..139aad088f 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c
+@@ -16,16 +16,19 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+-#define roundeven __redirect_roundeven
+-#define __roundeven __redirect___roundeven
+-#include <math.h>
+-#undef roundeven
+-#undef __roundeven
++# define roundeven __redirect_roundeven
++# define __roundeven __redirect___roundeven
++# include <math.h>
++# undef roundeven
++# undef __roundeven
+
+-#define SYMBOL_NAME roundeven
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME roundeven
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_roundeven, __roundeven, IFUNC_SELECTOR ());
+ libm_alias_double (__roundeven, roundeven)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S
+new file mode 100644
+index 0000000000..42c359f4cd
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of roundevenf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__roundevenf)
++ vroundss $8, %xmm0, %xmm0, %xmm0
++ ret
++END(__roundevenf)
++
++libm_alias_float (__roundeven, roundeven)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S
+index 792c90ba07..6b148e4353 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S
+@@ -17,8 +17,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __roundevenf_sse41 __roundevenf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__roundevenf_sse41)
+ roundss $8, %xmm0, %xmm0
+ ret
+ END(__roundevenf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__roundeven, roundeven)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c
+index e96016a4d5..2fb090075d 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c
+@@ -16,16 +16,19 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
+
+-#define roundevenf __redirect_roundevenf
+-#define __roundevenf __redirect___roundevenf
+-#include <math.h>
+-#undef roundevenf
+-#undef __roundevenf
++# define roundevenf __redirect_roundevenf
++# define __roundevenf __redirect___roundevenf
++# include <math.h>
++# undef roundevenf
++# undef __roundevenf
+
+-#define SYMBOL_NAME roundevenf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME roundevenf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_roundevenf, __roundevenf, IFUNC_SELECTOR ());
+ libm_alias_float (__roundeven, roundeven)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
+index 355cc0092e..21e77943a3 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
+@@ -16,24 +16,27 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern double __redirect_sin (double);
+ extern double __redirect_cos (double);
+
+-#define SYMBOL_NAME sin
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME sin
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_sin, __sin, IFUNC_SELECTOR ());
+ libm_alias_double (__sin, sin)
+
+-#undef SYMBOL_NAME
+-#define SYMBOL_NAME cos
+-#include "ifunc-avx-fma4.h"
++# undef SYMBOL_NAME
++# define SYMBOL_NAME cos
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_cos, __cos, IFUNC_SELECTOR ());
+ libm_alias_double (__cos, cos)
+
+-#define __cos __cos_sse2
+-#define __sin __sin_sse2
++# define __cos __cos_sse2
++# define __sin __sin_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_sin.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincos.c b/sysdeps/x86_64/fpu/multiarch/s_sincos.c
+index 70107e999c..b35757f8de 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_sincos.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_sincos.c
+@@ -16,15 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern void __redirect_sincos (double, double *, double *);
+
+-#define SYMBOL_NAME sincos
+-#include "ifunc-fma4.h"
++# define SYMBOL_NAME sincos
++# include "ifunc-fma4.h"
+
+ libc_ifunc_redirected (__redirect_sincos, __sincos, IFUNC_SELECTOR ());
+ libm_alias_double (__sincos, sincos)
+
+-#define __sincos __sincos_sse2
++# define __sincos __sincos_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_sincos.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c
+index 80bc028451..0ea9b40e84 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c
+@@ -16,13 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
+
+ extern void __redirect_sincosf (float, float *, float *);
+
+-#define SYMBOL_NAME sincosf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME sincosf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_sincosf, __sincosf, IFUNC_SELECTOR ());
+
+ libm_alias_float (__sincos, sincos)
++#else
++# include <sysdeps/ieee754/flt-32/s_sincosf.c>
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
+index a32b9e9550..c61624e3ee 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_sinf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
+@@ -16,13 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-float.h>
+
+ extern float __redirect_sinf (float);
+
+-#define SYMBOL_NAME sinf
+-#include "ifunc-fma.h"
++# define SYMBOL_NAME sinf
++# include "ifunc-fma.h"
+
+ libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ());
+
+ libm_alias_float (__sin, sin)
++#else
++# include <sysdeps/ieee754/flt-32/s_sinf.c>
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
+index f9a2474a13..125d992ba1 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
+@@ -16,15 +16,18 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-double.h>
+
+ extern double __redirect_tan (double);
+
+-#define SYMBOL_NAME tan
+-#include "ifunc-avx-fma4.h"
++# define SYMBOL_NAME tan
++# include "ifunc-avx-fma4.h"
+
+ libc_ifunc_redirected (__redirect_tan, __tan, IFUNC_SELECTOR ());
+ libm_alias_double (__tan, tan)
+
+-#define __tan __tan_sse2
++# define __tan __tan_sse2
++#endif
+ #include <sysdeps/ieee754/dbl-64/s_tan.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S
+new file mode 100644
+index 0000000000..b3e87e9606
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of trunc function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-double.h>
++
++ .text
++ENTRY(__trunc)
++ vroundsd $11, %xmm0, %xmm0, %xmm0
++ ret
++END(__trunc)
++
++libm_alias_double (__trunc, trunc)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S
+index b496a6ef49..2b79174eed 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S
+@@ -18,8 +18,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-double.h>
++# define __trunc_sse41 __trunc
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__trunc_sse41)
+ roundsd $11, %xmm0, %xmm0
+ ret
+ END(__trunc_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_double (__trunc, trunc)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc.c b/sysdeps/x86_64/fpu/multiarch/s_trunc.c
+index 9bc9df8744..ea89c4f85d 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_trunc.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-double.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-double.h>
+
+-#define trunc __redirect_trunc
+-#define __trunc __redirect___trunc
+-#include <math.h>
+-#undef trunc
+-#undef __trunc
++# define trunc __redirect_trunc
++# define __trunc __redirect___trunc
++# include <math.h>
++# undef trunc
++# undef __trunc
+
+-#define SYMBOL_NAME trunc
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME trunc
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_trunc, __trunc, IFUNC_SELECTOR ());
+ libm_alias_double (__trunc, trunc)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S
+new file mode 100644
+index 0000000000..f31ac7d7f7
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S
+@@ -0,0 +1,28 @@
++/* AVX implementation of truncf function.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++#include <libm-alias-float.h>
++
++ .text
++ENTRY(__truncf)
++ vroundss $11, %xmm0, %xmm0, %xmm0
++ ret
++END(__truncf)
++
++libm_alias_float (__trunc, trunc)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S
+index 22e9a83307..60498b2cb2 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S
++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S
+@@ -18,8 +18,20 @@
+
+ #include <sysdep.h>
+
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++# include <libm-alias-float.h>
++# define __truncf_sse41 __truncf
++ .text
++#else
+ .section .text.sse4.1,"ax",@progbits
++#endif
++
+ ENTRY(__truncf_sse41)
+ roundss $11, %xmm0, %xmm0
+ ret
+ END(__truncf_sse41)
++
++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL
++libm_alias_float (__trunc, trunc)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf.c b/sysdeps/x86_64/fpu/multiarch/s_truncf.c
+index dae01d166a..92435ce39d 100644
+--- a/sysdeps/x86_64/fpu/multiarch/s_truncf.c
++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf.c
+@@ -16,17 +16,20 @@
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+-#define NO_MATH_REDIRECT
+-#include <libm-alias-float.h>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL
++# define NO_MATH_REDIRECT
++# include <libm-alias-float.h>
+
+-#define truncf __redirect_truncf
+-#define __truncf __redirect___truncf
+-#include <math.h>
+-#undef truncf
+-#undef __truncf
++# define truncf __redirect_truncf
++# define __truncf __redirect___truncf
++# include <math.h>
++# undef truncf
++# undef __truncf
+
+-#define SYMBOL_NAME truncf
+-#include "ifunc-sse4_1.h"
++# define SYMBOL_NAME truncf
++# include "ifunc-sse4_1.h"
+
+ libc_ifunc_redirected (__redirect_truncf, __truncf, IFUNC_SELECTOR ());
+ libm_alias_float (__trunc, trunc)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/w_exp.c b/sysdeps/x86_64/fpu/multiarch/w_exp.c
+index 27eee98a0a..3584187e0e 100644
+--- a/sysdeps/x86_64/fpu/multiarch/w_exp.c
++++ b/sysdeps/x86_64/fpu/multiarch/w_exp.c
+@@ -1 +1,6 @@
+-#include <sysdeps/../math/w_exp.c>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL
++# include <sysdeps/ieee754/dbl-64/w_exp.c>
++#else
++# include <sysdeps/../math/w_exp.c>
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/w_log.c b/sysdeps/x86_64/fpu/multiarch/w_log.c
+index 9b2b018711..414ca3ca3d 100644
+--- a/sysdeps/x86_64/fpu/multiarch/w_log.c
++++ b/sysdeps/x86_64/fpu/multiarch/w_log.c
+@@ -1 +1,6 @@
+-#include <sysdeps/../math/w_log.c>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL
++# include <sysdeps/ieee754/dbl-64/w_log.c>
++#else
++# include <sysdeps/../math/w_log.c>
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/w_pow.c b/sysdeps/x86_64/fpu/multiarch/w_pow.c
+index b50c1988de..d5fcc4f871 100644
+--- a/sysdeps/x86_64/fpu/multiarch/w_pow.c
++++ b/sysdeps/x86_64/fpu/multiarch/w_pow.c
+@@ -1 +1,6 @@
+-#include <sysdeps/../math/w_pow.c>
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL
++# include <sysdeps/ieee754/dbl-64/w_pow.c>
++#else
++# include <sysdeps/../math/w_pow.c>
++#endif
+diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile
+index e1e894c963..d3d2270394 100644
+--- a/sysdeps/x86_64/multiarch/Makefile
++++ b/sysdeps/x86_64/multiarch/Makefile
+@@ -4,8 +4,8 @@ sysdep_routines += \
+ memchr-avx2 \
+ memchr-avx2-rtm \
+ memchr-evex \
+- memchr-evex512 \
+ memchr-evex-rtm \
++ memchr-evex512 \
+ memchr-sse2 \
+ memcmp-avx2-movbe \
+ memcmp-avx2-movbe-rtm \
+@@ -37,8 +37,8 @@ sysdep_routines += \
+ rawmemchr-avx2 \
+ rawmemchr-avx2-rtm \
+ rawmemchr-evex \
+- rawmemchr-evex512 \
+ rawmemchr-evex-rtm \
++ rawmemchr-evex512 \
+ rawmemchr-sse2 \
+ stpcpy-avx2 \
+ stpcpy-avx2-rtm \
+diff --git a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S
+index 9984c3ca0f..97839a2248 100644
+--- a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S
++++ b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S
+@@ -21,7 +21,9 @@
+ 2. If size is less than VEC, use integer register stores.
+ 3. If size is from VEC_SIZE to 2 * VEC_SIZE, use 2 VEC stores.
+ 4. If size is from 2 * VEC_SIZE to 4 * VEC_SIZE, use 4 VEC stores.
+- 5. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with
++ 5. On machines ERMS feature, if size is greater or equal than
++ __x86_rep_stosb_threshold then REP STOSB will be used.
++ 6. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with
+ 4 VEC stores and store 4 * VEC at a time until done. */
+
+ #include <sysdep.h>
+diff --git a/sysdeps/x86_64/multiarch/wcsncat-evex.S b/sysdeps/x86_64/multiarch/wcsncat-evex.S
+index 392215950a..10bfb0a531 100644
+--- a/sysdeps/x86_64/multiarch/wcsncat-evex.S
++++ b/sysdeps/x86_64/multiarch/wcsncat-evex.S
+@@ -1,9 +1,9 @@
+-#ifndef WCSCAT
+-# define WCSCAT __wcsncat_evex
++#ifndef WCSNCAT
++# define WCSNCAT __wcsncat_evex
+ #endif
+
+ #define USE_AS_WCSCPY
+ #define USE_AS_STRCAT
+
+-#define STRNCAT WCSCAT
++#define STRNCAT WCSNCAT
+ #include "strncat-evex.S"
+diff --git a/sysdeps/x86_64/tst-gnu2-tls2mod1.S b/sysdeps/x86_64/tst-gnu2-tls2mod1.S
+new file mode 100644
+index 0000000000..1d636669ba
+--- /dev/null
++++ b/sysdeps/x86_64/tst-gnu2-tls2mod1.S
+@@ -0,0 +1,87 @@
++/* Check if TLSDESC relocation preserves %rdi, %rsi and %rbx.
++ Copyright (C) 2024 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <sysdep.h>
++
++/* On AVX512 machines, OFFSET == 40 caused _dl_tlsdesc_dynamic_xsavec
++ to clobber %rdi, %rsi and %rbx. On Intel AVX CPUs, the state size
++ is 960 bytes and this test didn't fail. It may be due to the unused
++ last 128 bytes. On AMD AVX CPUs, the state size is 832 bytes and
++ this test might fail without the fix. */
++#ifndef OFFSET
++# define OFFSET 40
++#endif
++
++ .text
++ .p2align 4
++ .globl apply_tls
++ .type apply_tls, @function
++apply_tls:
++ cfi_startproc
++ _CET_ENDBR
++ pushq %rbp
++ cfi_def_cfa_offset (16)
++ cfi_offset (6, -16)
++ movdqu (%RDI_LP), %xmm0
++ lea tls_var1@TLSDESC(%rip), %RAX_LP
++ mov %RSP_LP, %RBP_LP
++ cfi_def_cfa_register (6)
++ /* Align stack to 64 bytes. */
++ and $-64, %RSP_LP
++ sub $OFFSET, %RSP_LP
++ pushq %rbx
++ /* Set %ebx to 0xbadbeef. */
++ movl $0xbadbeef, %ebx
++ movl $0xbadbeef, %esi
++ movq %rdi, saved_rdi(%rip)
++ movq %rsi, saved_rsi(%rip)
++ call *tls_var1@TLSCALL(%RAX_LP)
++ /* Check if _dl_tlsdesc_dynamic preserves %rdi, %rsi and %rbx. */
++ cmpq saved_rdi(%rip), %rdi
++ jne L(hlt)
++ cmpq saved_rsi(%rip), %rsi
++ jne L(hlt)
++ cmpl $0xbadbeef, %ebx
++ jne L(hlt)
++ add %fs:0, %RAX_LP
++ movups %xmm0, 32(%RAX_LP)
++ movdqu 16(%RDI_LP), %xmm1
++ mov %RAX_LP, %RBX_LP
++ movups %xmm1, 48(%RAX_LP)
++ lea 32(%RBX_LP), %RAX_LP
++ pop %rbx
++ leave
++ cfi_def_cfa (7, 8)
++ ret
++L(hlt):
++ hlt
++ cfi_endproc
++ .size apply_tls, .-apply_tls
++ .hidden tls_var1
++ .globl tls_var1
++ .section .tbss,"awT",@nobits
++ .align 16
++ .type tls_var1, @object
++ .size tls_var1, 3200
++tls_var1:
++ .zero 3200
++ .local saved_rdi
++ .comm saved_rdi,8,8
++ .local saved_rsi
++ .comm saved_rsi,8,8
++ .section .note.GNU-stack,"",@progbits
+diff --git a/time/timespec_get.c b/time/timespec_get.c
+index b031e42ca2..26a044bca6 100644
+--- a/time/timespec_get.c
++++ b/time/timespec_get.c
+@@ -4,7 +4,7 @@
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+- version 2.1 of the License.
++ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+diff --git a/time/timespec_getres.c b/time/timespec_getres.c
+index edb397507c..2e18b8bcac 100644
+--- a/time/timespec_getres.c
++++ b/time/timespec_getres.c
+@@ -5,7 +5,7 @@
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+- version 2.1 of the License.
++ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch
index 9c0fac3ff5..c1d532198e 100644
--- a/gnu/packages/patches/glibc-bootstrap-system.patch
+++ b/gnu/packages/patches/glibc-bootstrap-system.patch
@@ -6,23 +6,23 @@ instead uses the hard-coded absolute file name of `bash'.
In addition, status should be initialized to 0 and not -1.
diff --git a/libio/iopopen.c b/libio/iopopen.c
-index ebc381ed7c..e0d3ed1bc3 100644
+index 4cc405f2de..8842c989c8 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
-@@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command,
- return false;
+@@ -86,7 +86,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command,
+ }
}
-- if (__posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0,
-+ if (__posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0,
- (char *const[]){ (char*) "sh", (char*) "-c",
- (char *) command, NULL }, __environ) != 0)
- return false;
+- err = __posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0,
++ err = __posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0,
+ (char *const[]){ (char*) "sh", (char*) "-c", (char*) "--",
+ (char *) command, NULL }, __environ);
+ if (err != 0)
diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
-index a03f478fc7..94da6facf3 100644
+index 488b95163b..56b8a028ae 100644
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
-@@ -101,7 +101,7 @@ cancel_handler (void *arg)
+@@ -100,7 +100,7 @@ cancel_handler (void *arg)
static int
do_system (const char *line)
{
@@ -31,7 +31,7 @@ index a03f478fc7..94da6facf3 100644
int ret;
pid_t pid;
struct sigaction sa;
-@@ -145,7 +145,7 @@ do_system (const char *line)
+@@ -144,7 +144,7 @@ do_system (const char *line)
__posix_spawnattr_setflags (&spawn_attr,
POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK);
@@ -39,8 +39,9 @@ index a03f478fc7..94da6facf3 100644
+ ret = __posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr,
(char *const[]){ (char *) SHELL_NAME,
(char *) "-c",
- (char *) line, NULL },
-
+ (char *) "--",
+diff --git a/include/spawn.h b/include/spawn.h
+index 4a0b1849da..9e47f74391 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -5,6 +5,9 @@
diff --git a/gnu/packages/patches/glibc-versioned-locpath.patch b/gnu/packages/patches/glibc-versioned-locpath.patch
index bc7652127f..8702531934 100644
--- a/gnu/packages/patches/glibc-versioned-locpath.patch
+++ b/gnu/packages/patches/glibc-versioned-locpath.patch
@@ -54,12 +54,12 @@ diff --git a/locale/setlocale.c b/locale/setlocale.c
index ead030d..0c0e314 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
-@@ -215,12 +215,65 @@ setdata (int category, struct __locale_data *data)
+@@ -215,12 +215,54 @@ setdata (int category, struct __locale_data *data)
}
}
+/* Return in *LOCALE_PATH and *LOCALE_PATH_LEN the locale data search path as
-+ a colon-separated list. Return ENOMEN on error, zero otherwise. */
++ an argz list. Return ENOMEN on error, zero otherwise. */
+error_t
+compute_locale_search_path (char **locale_path, size_t *locale_path_len)
+{
@@ -71,8 +71,8 @@ index ead030d..0c0e314 100644
+ /* Entries in 'GUIX_LOCPATH' take precedence over 'LOCPATH'. These
+ entries are systematically prefixed with "/X.Y" where "X.Y" is the
+ libc version. */
-+ if (__argz_create_sep (guix_locpath_var, ':',
-+ locale_path, locale_path_len) != 0
++ if (__argz_add_sep (locale_path, locale_path_len,
++ guix_locpath_var, ':') != 0
+ || __argz_suffix_entries (locale_path, locale_path_len,
+ "/" VERSION) != 0)
+ goto bail_out;
@@ -80,27 +80,16 @@ index ead030d..0c0e314 100644
+
+ if (locpath_var != NULL && locpath_var[0] != '\0')
+ {
-+ char *reg_locale_path = NULL;
-+ size_t reg_locale_path_len = 0;
-+
-+ if (__argz_create_sep (locpath_var, ':',
-+ &reg_locale_path, &reg_locale_path_len) != 0)
-+ goto bail_out;
-+
-+ if (__argz_append (locale_path, locale_path_len,
-+ reg_locale_path, reg_locale_path_len) != 0)
++ if (__argz_add_sep (locale_path, locale_path_len,
++ locpath_var, ':') != 0)
+ goto bail_out;
+
-+ free (reg_locale_path);
+ }
+
-+ if (*locale_path != NULL)
-+ {
-+ /* Append the system default locale directory. */
-+ if (__argz_add_sep (locale_path, locale_path_len,
-+ _nl_default_locale_path, ':') != 0)
-+ goto bail_out;
-+ }
++ /* Append the system default locale directory. */
++ if (__argz_add_sep (locale_path, locale_path_len,
++ _nl_default_locale_path, ':') != 0)
++ goto bail_out;
+
+ return 0;
+
@@ -160,7 +149,7 @@ new file mode 100644
index 0000000..505b0f2
--- /dev/null
+++ b/string/argz-suffix.c
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,58 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ludovic Courtès <ludo@gnu.org>.
@@ -192,6 +181,8 @@ index 0000000..505b0f2
+ size_t suffix_len = strlen (suffix);
+ size_t count = __argz_count (*argz, *argz_len);
+ size_t new_argz_len = *argz_len + count * suffix_len;
++ if (new_argz_len == 0)
++ return 0;
+ char *new_argz = malloc (new_argz_len);
+
+ if (new_argz)
diff --git a/gnu/packages/patches/gnulib-bootstrap.patch b/gnu/packages/patches/gnulib-bootstrap.patch
new file mode 100644
index 0000000000..c0c9a5e732
--- /dev/null
+++ b/gnu/packages/patches/gnulib-bootstrap.patch
@@ -0,0 +1,75 @@
+From adbf7ce2c2b03ce5ee25d4c68f9bb247b0dcbc2b Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Thu, 30 May 2024 14:48:04 -0400
+Subject: [PATCH] bootstrap: Use gnulib-tool from PATH if available.
+
+Some distributions such as GNU Guix include in their package for
+gnulib a 'gnulib-tool' command under their $bindir
+prefix (e.g. '/bin') for users to use, along the unmodified full
+sources. The idea is that any wrapping or distribution modifications
+for the *execution* of the script at run time is done on these
+commands, while the rest of the source should be in their
+pristine (unmodified) version. Adjust the 'gnulib-tool' discovery
+mechanism to support such installation layout.
+
+* build-aux/bootstrap (autogen) <gnulib_tool>: Prefer to use from
+PATH, else from $GNULIB_SRCDIR/../../bin/gnulib-tool, else from
+$GNULIB_SRCDIR/gnulib-tool.
+* gnulib-tool.sh (func_gnulib_dir): Honor GNULIB_SRCDIR to locate
+gnulib's main directory.
+---
+ build-aux/bootstrap | 11 +++++++++--
+ gnulib-tool.sh | 6 +++++-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/build-aux/bootstrap b/build-aux/bootstrap
+index 6295b8a128..06271eea8b 100755
+--- a/build-aux/bootstrap
++++ b/build-aux/bootstrap
+@@ -3,7 +3,7 @@
+
+ # Bootstrap this package from checked-out sources.
+
+-scriptversion=2024-04-13.15; # UTC
++scriptversion=2024-05-30.20; # UTC
+
+ # Copyright (C) 2003-2024 Free Software Foundation, Inc.
+ #
+@@ -1164,7 +1164,14 @@ autogen()
+ fi
+
+ if $use_gnulib; then
+- gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
++ gnulib_tool=$(command -v gnulib-tool)
++ if test -x "$gnulib_tool"; then
++ : # done
++ elif test -x $GNULIB_SRCDIR/../../bin/gnulib-tool; then
++ gnulib_tool=$GNULIB_SRCDIR/../../bin/gnulib-tool
++ else
++ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
++ fi
+ <$gnulib_tool || return
+ fi
+
+diff --git a/gnulib-tool.sh b/gnulib-tool.sh
+index 12f0b82461..0aefbe2b2b 100755
+--- a/gnulib-tool.sh
++++ b/gnulib-tool.sh
+@@ -518,7 +518,11 @@ func_gnulib_dir ()
+ * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
+ esac
+ done
+- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
++ if test -n "$GNULIB_SRCDIR"; then
++ gnulib_dir=$GNULIB_SRCDIR
++ else
++ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
++ fi
+ }
+
+ # func_tmpdir
+
+base-commit: ac4b301ae15223c98b51cd5a0eda2e2cf57c817b
+--
+2.41.0
+
diff --git a/gnu/packages/patches/gnumach-support-noide.patch b/gnu/packages/patches/gnumach-support-noide.patch
deleted file mode 100644
index 723d4bcac4..0000000000
--- a/gnu/packages/patches/gnumach-support-noide.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream status: Taken from Debian/upsream.
-
- https://salsa.debian.org/hurd-team/gnumach/-/blob/master/debian/patches/90_noide.patch
-
-This supports using `noide' on the gnumach command line, disabling
-gnumach IDE support and thus forcing use of rumdisk.
-
----
- linux/dev/glue/block.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/linux/dev/glue/block.c
-+++ b/linux/dev/glue/block.c
-@@ -207,7 +207,10 @@ int
- blk_dev_init ()
- {
- #ifdef CONFIG_BLK_DEV_IDE
-- ide_init ();
-+ extern char *kernel_cmdline;
-+ if (strncmp(kernel_cmdline, "noide", 5) &&
-+ !strstr(kernel_cmdline, " noide"))
-+ ide_init ();
- #endif
- #ifdef CONFIG_BLK_DEV_FD
- floppy_init ();
diff --git a/gnu/packages/patches/gnutls-cross.patch b/gnu/packages/patches/gnutls-cross.patch
deleted file mode 100644
index 82d08da24e..0000000000
--- a/gnu/packages/patches/gnutls-cross.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Not sent upstream.
-
-From e23de62e28f64599148ff06e439fac116a391299 Mon Sep 17 00:00:00 2001
-From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
-Date: Fri, 10 Apr 2020 07:24:48 +0200
-Subject: [PATCH] guile: Cross build fix.
-
-To cross-build, both the host guile and the native guile-for-build
-must be available. If the native guile is not available, no snarfing
-is done and the guile cross build is skipped.
-
-During the cross-build gnutls.scm does not load when compliling
-extra.scm, becase of missing definitions from guile-gnutls-v-2.
-
-* guile/modules/gnutls.in (protocol/ssl-3 protocol/tls-1.0,
-protocol/tls-1.1, credentials/anonymous, cipher/rijndael-256-cbc,
-cipher/rijndael-128-cbc, cipher/rijndael-cbc, cipher/arcfour-128,
-certificate-verify/allow-any-x509-v1-ca-certificate,
-certificate-verify/allow-x509-v1-ca-certificate): Define to #f
-initially. When "GNUTLS_GUILE_CROSS_COMPILING" not set, set! to value
-from "guile-gnutls-v-2" load-extension C module.
----
- guile/modules/gnutls.in | 40 +++++++++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 13 deletions(-)
-
-diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in
-index 6461c404a..954e315de 100644
---- a/guile/modules/gnutls.in
-+++ b/guile/modules/gnutls.in
-@@ -564,22 +564,36 @@ This defines 'variable' as an alias for 'alias', and emits a warning when
- (identifier? #'id)
- #'alias))))))))))
-
--
- ;; Renaming.
--(define protocol/ssl-3 protocol/ssl3)
--(define protocol/tls-1.0 protocol/tls1-0)
--(define protocol/tls-1.1 protocol/tls1-1)
-+(define protocol/ssl-3 #f)
-+(define protocol/tls-1.0 #f)
-+(define protocol/tls-1.1 #f)
-
- ;; Aliases.
--(define credentials/anonymous credentials/anon)
--(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
--(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
--(define cipher/rijndael-cbc cipher/aes-128-cbc)
--(define cipher/arcfour-128 cipher/arcfour)
--(define certificate-verify/allow-any-x509-v1-ca-certificate
-- certificate-verify/allow-any-x509-v1-ca-crt)
--(define certificate-verify/allow-x509-v1-ca-certificate
-- certificate-verify/allow-x509-v1-ca-crt)
-+(define credentials/anonymous #f)
-+(define cipher/rijndael-256-cbc #f)
-+(define cipher/rijndael-128-cbc #f)
-+(define cipher/rijndael-cbc #f)
-+(define cipher/arcfour-128 #f)
-+(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
-+(define certificate-verify/allow-x509-v1-ca-certificate #f)
-+
-+(unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
-+ ;; Renaming.
-+ (set! protocol/ssl-3 protocol/ssl3)
-+ (set! protocol/tls-1.0 protocol/tls1-0)
-+ (set! protocol/tls-1.1 protocol/tls1-1)
-+
-+ ;; Aliases.
-+ (set! credentials/anonymous credentials/anon)
-+ (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
-+ (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
-+ (set! cipher/rijndael-cbc cipher/aes-128-cbc)
-+ (set! cipher/arcfour-128 cipher/arcfour)
-+ (set! certificate-verify/allow-any-x509-v1-ca-certificate
-+ certificate-verify/allow-any-x509-v1-ca-crt)
-+ (set! certificate-verify/allow-x509-v1-ca-certificate
-+ certificate-verify/allow-x509-v1-ca-crt))
-
- ;; Deprecated OpenPGP bindings.
- (define-deprecated certificate-type/openpgp)
---
-2.26.0
-
diff --git a/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch b/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch
new file mode 100644
index 0000000000..27738ac59b
--- /dev/null
+++ b/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch
@@ -0,0 +1,85 @@
+From d53c651a8fd65656e486eb5c7e20ab889f64639b Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Sun, 28 Apr 2024 13:24:34 +0300
+Subject: [PATCH] output_test.go: Fix tests
+
+* output_test.go (TestGoTestOutputTree, TestGoTestOutputFun): Fix
+ tests.
+---
+ output_test.go | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/output_test.go b/output_test.go
+index eb3e0e9..58948c2 100644
+--- a/output_test.go
++++ b/output_test.go
+@@ -75,15 +75,15 @@ func TestGoTestOutputTree(t *testing.T) {
+ diff := strdiff(nom, Dedent(`
+ === RUN TestGoTestOutputTree_helper
+ === RUN TestGoTestOutputTree_helper/subtest
++ output_test.go:NN: wtf
+ === RUN TestGoTestOutputTree_helper/subtest/subsubtest
++ output_test.go:NN: sadz
+ === RUN TestGoTestOutputTree_helper/subtest/happy_subsubtest
++ output_test.go:NN: ooh!
+ --- FAIL: TestGoTestOutputTree_helper (N.NNs)
+ --- FAIL: TestGoTestOutputTree_helper/subtest (N.NNs)
+- output_test.go:NN: wtf
+ --- FAIL: TestGoTestOutputTree_helper/subtest/subsubtest (N.NNs)
+- output_test.go:NN: sadz
+ --- PASS: TestGoTestOutputTree_helper/subtest/happy_subsubtest (N.NNs)
+- output_test.go:NN: ooh!
+ FAIL
+ exit status N
+ FAIL github.com/warpfork/go-wish N.NNNs
+@@ -149,28 +149,28 @@ func TestGoTestOutputFun(t *testing.T) {
+ diff := strdiff(nom, Dedent(`
+ === RUN TestGoTestOutputFun_helper
+ === RUN TestGoTestOutputFun_helper/subtest
++ output_test.go:NNN: hello!
+ === RUN TestGoTestOutputFun_helper/subtest/subsubtest
++ output_test.go:NNN: ShouldEqual check rejected:
++ @@ -N +N @@
++ - snafoo
++ + zounds
++
++ output_test.go:NNN: ShouldEqual check rejected:
++ @@ -N +N @@
++ - zebras
++ + cats
++
++ output_test.go:NNN: ShouldEqual check rejected:
++ interface{}(
++ - struct{ Foo string }{},
++ + struct{ Bar string }{},
++ )
++
+ === RUN TestGoTestOutputFun_helper/subtest/happy_subsubtest
+ --- FAIL: TestGoTestOutputFun_helper (N.NNs)
+ --- FAIL: TestGoTestOutputFun_helper/subtest (N.NNs)
+- output_test.go:NNN: hello!
+ --- FAIL: TestGoTestOutputFun_helper/subtest/subsubtest (N.NNs)
+- output_test.go:NNN: ShouldEqual check rejected:
+- @@ -N +N @@
+- - snafoo
+- + zounds
+-
+- output_test.go:NNN: ShouldEqual check rejected:
+- @@ -N +N @@
+- - zebras
+- + cats
+-
+- output_test.go:NNN: ShouldEqual check rejected:
+- interface{}(
+- - struct{ Foo string }{},
+- + struct{ Bar string }{},
+- )
+-
+ --- PASS: TestGoTestOutputFun_helper/subtest/happy_subsubtest (N.NNs)
+ FAIL
+ exit status N
+
+base-commit: 39a1cc7a02d01d037bc6bc075e6550279026e645
+--
+2.41.0
+
diff --git a/gnu/packages/patches/gpsbabel-fix-i686-test.patch b/gnu/packages/patches/gpsbabel-fix-i686-test.patch
deleted file mode 100644
index 5ba0305113..0000000000
--- a/gnu/packages/patches/gpsbabel-fix-i686-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/gpsbabel/gpsbabel/commit/465a74194d53acea5c8d74c5cf3cb2940546ec92.patch
-Can be removed next release
-
-From 465a74194d53acea5c8d74c5cf3cb2940546ec92 Mon Sep 17 00:00:00 2001
-From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
-Date: Fri, 7 Aug 2020 11:29:22 -0600
-Subject: [PATCH] fix i386 regression error with engima. (#620)
-
-this was motivated by the test failure seen at
-https://buildd.debian.org/status/fetch.php?pkg=gpsbabel&arch=i386&ver=1.7.0%2Bds-4&stamp=1596794554&raw=0
----
- enigma.cc | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/enigma.cc b/enigma.cc
-index 850f27b4e..32fea92d6 100644
---- a/enigma.cc
-+++ b/enigma.cc
-@@ -21,9 +21,16 @@
-
- */
-
-+#include <cmath> // for fabs, lround
-+#include <cstdint> // for int32_t, uint8_t, uint32_t
-+#include <cstdlib> // for abs
-+#include <cstring> // for strlen, memcpy, memset
-+
-+#include <QtCore/QString> // for QString
-+
- #include "defs.h"
--#include <cmath>
--#include <cstdlib>
-+#include "gbfile.h" // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
-+
-
- #define MYNAME "Enigma binary route and waypoint file format"
-
-@@ -177,7 +184,7 @@ enigma_waypt_disp(const Waypoint* wpt)
- le_write32(&ewpt.longitude, decToEnigmaPosition(wpt->longitude));
- ewpt.waypoint_type = WTYPE_WAYPOINT;
- if (wpt->altitude != unknown_alt) {
-- le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
-+ le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);
- }
- if (wpt->shortname != nullptr) {
- ewpt.shortname_len = (uint8_t) min(6, strlen(CSTRc(wpt->shortname)));
diff --git a/gnu/packages/patches/grantlee-register-metaenumvariable.patch b/gnu/packages/patches/grantlee-register-metaenumvariable.patch
new file mode 100644
index 0000000000..26ff20a413
--- /dev/null
+++ b/gnu/packages/patches/grantlee-register-metaenumvariable.patch
@@ -0,0 +1,54 @@
+https://patch-diff.githubusercontent.com/raw/steveire/grantlee/pull/91
+also in Debian
+https://sources.debian.org/data/main/g/grantlee5/5.3.1-3/debian/patches/register-comparator.diff
+
+From e6a2c1f4f29623f0ced1a946f5ff0c3831ab213b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 12 Aug 2023 12:06:15 +0200
+Subject: [PATCH] Register MetaEnumVariable for comparison
+
+This is needed to ensure that MetaEnumVariable can be properly handled
+for comparisons, e.g. as done via QVariant::compare().
+
+Followup of commit 3b1931e30a23286a64f713a815f701d194a3c759
+
+Fixes #89
+---
+ templates/lib/engine.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/templates/lib/engine.cpp b/templates/lib/engine.cpp
+index c6a6987b..fc6b7797 100644
+--- a/templates/lib/engine.cpp
++++ b/templates/lib/engine.cpp
+@@ -24,6 +24,9 @@
+ #include "exception.h"
+ #include "grantlee_config_p.h"
+ #include "grantlee_version.h"
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
++#include "metaenumvariable_p.h"
++#endif
+ #ifdef QT_QML_LIB
+ #include "scriptabletags.h"
+ #endif
+@@ -32,6 +35,9 @@
+
+ #include <QtCore/QCoreApplication>
+ #include <QtCore/QDir>
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
++#include <QtCore/QMetaType>
++#endif
+ #include <QtCore/QPluginLoader>
+ #include <QtCore/QTextStream>
+
+@@ -48,6 +54,10 @@ Engine::Engine(QObject *parent)
+
+ d_ptr->m_pluginDirs = QCoreApplication::libraryPaths();
+ d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);
++
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
++ QMetaType::registerComparators<MetaEnumVariable>();
++#endif
+ }
+
+ Engine::~Engine()
diff --git a/gnu/packages/patches/guile-lib-fix-tests-for-guile2.2.patch b/gnu/packages/patches/guile-lib-fix-tests-for-guile2.2.patch
new file mode 100644
index 0000000000..051e73ed12
--- /dev/null
+++ b/gnu/packages/patches/guile-lib-fix-tests-for-guile2.2.patch
@@ -0,0 +1,52 @@
+From b1916e9a8ac8fa1bdd045d6e1d89e0f16ef7e441 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Mon, 29 Apr 2024 11:27:02 +0300
+Subject: [PATCH] unit-tests/logging.logger: Fix tests with Guile 2
+
+When tests are run with Guile 2 "logging.logger.scm" would always fail
+due to undefined reference to "mkstemp" that was introduced only in
+Guile 3. In Guile 2 the procedure is called "mkstemp!". Also
+"call-with-port" procedure is available only from (rnrs io ports) in
+Guile 2, while in Guile 3 this procedure is available out of box.
+This patch fixes these issues by adding an additional runtime check.
+
+* unit-tests/logging.logger.scm (call-with-temporary-file): Bugfix:
+ Check Guile major version and use "mkstemp!" when Guile 2 is used;
+ use "mkstemp" otherwise. Also for Guile 2 load "call-with-port"
+ from (rnrs io ports).
+---
+ unit-tests/logging.logger.scm | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/unit-tests/logging.logger.scm b/unit-tests/logging.logger.scm
+index c69a86d..fbf4ce7 100644
+--- a/unit-tests/logging.logger.scm
++++ b/unit-tests/logging.logger.scm
+@@ -3,6 +3,7 @@
+ ;;; Copyright (C) 2003 Richard Todd
+ ;;; Copyright (C) 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright (C) 2024 David Pirotte <david@altosw.be>
++;;; Copyright (C) 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+
+ ;;; This program is free software; you can redistribute it and/or modify
+ ;;; it under the terms of the GNU General Public License as published by
+@@ -28,8 +29,12 @@
+ (define* (call-with-temporary-file proc #:key (mode "w+"))
+ "Open a temporary file name and pass it to PROC, a procedure of one
+ argument. The port is automatically closed."
+- (let ((port (mkstemp "/tmp/file-XXXXXX" mode)))
+- (call-with-port port proc)))
++ (let ((file-name "/tmp/file-XXXXXX"))
++ (if (< (string->number (major-version)) 3)
++ (let ((port (mkstemp! (string-copy file-name) mode)))
++ ((@ (rnrs io ports) call-with-port) port proc))
++ (let ((port (mkstemp file-name mode)))
++ (call-with-port port proc)))))
+
+ (define-class <test-logging> (<test-case>))
+
+
+base-commit: 0e2b6b0ae5cc43c98075386bb4c69defb705f3b3
+--
+2.41.0
+
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/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch
new file mode 100644
index 0000000000..f67f87126e
--- /dev/null
+++ b/gnu/packages/patches/heatshrink-add-cmake.patch
@@ -0,0 +1,111 @@
+From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001
+From: tamasmeszaros <meszaros.q@gmail.com>
+Date: Thu, 27 Jul 2023 23:11:25 +0200
+Subject: [PATCH] Add CMake build script
+
+---
+ CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
+ Config.cmake.in | 5 +++
+ 2 files changed, 87 insertions(+)
+ create mode 100644 CMakeLists.txt
+ create mode 100644 Config.cmake.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..5b840eb
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,82 @@
++cmake_minimum_required(VERSION 3.10)
++
++project(heatshrink C)
++
++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c)
++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c)
++
++find_library(MATH_LIBRARY m) # Business as usual
++if(MATH_LIBRARY)
++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY})
++endif()
++
++target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $<INSTALL_INTERFACE:include>)
++
++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0)
++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1)
++
++if (UNIX)
++ add_executable(${PROJECT_NAME}_cmd heatshrink.c)
++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc)
++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
++endif ()
++
++# Installation and export:
++
++include(CMakePackageConfigHelpers)
++
++write_basic_package_version_file(
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
++ VERSION 0.4.1
++ COMPATIBILITY AnyNewerVersion
++)
++
++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc)
++if (UNIX)
++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd)
++endif ()
++
++install(TARGETS ${_exported_targets}
++ EXPORT ${PROJECT_NAME}Targets
++)
++
++export(EXPORT ${PROJECT_NAME}Targets
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake"
++ NAMESPACE ${PROJECT_NAME}::
++)
++
++include(GNUInstallDirs)
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++
++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++ INSTALL_DESTINATION ${ConfigPackageLocation}
++)
++
++install(
++ FILES
++ heatshrink_common.h
++ heatshrink_config.h
++ heatshrink_encoder.h
++ heatshrink_decoder.h
++ DESTINATION
++ include/${PROJECT_NAME}
++ )
++
++install(EXPORT ${PROJECT_NAME}Targets
++ FILE
++ ${PROJECT_NAME}Targets.cmake
++ NAMESPACE
++ ${PROJECT_NAME}::
++ DESTINATION
++ ${ConfigPackageLocation}
++)
++
++install(
++ FILES
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
++ DESTINATION
++ ${ConfigPackageLocation}
++)
+diff --git a/Config.cmake.in b/Config.cmake.in
+new file mode 100644
+index 0000000..0809ba9
+--- /dev/null
++++ b/Config.cmake.in
+@@ -0,0 +1,5 @@
++@PACKAGE_INIT@
++
++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
++endif ()
diff --git a/gnu/packages/patches/hurd-add-without-rump-configure-option.patch b/gnu/packages/patches/hurd-add-without-rump-configure-option.patch
deleted file mode 100644
index 14cefdeac1..0000000000
--- a/gnu/packages/patches/hurd-add-without-rump-configure-option.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 80bc1678b7b859decae536e726a3e5870cbe84eb Mon Sep 17 00:00:00 2001
-Message-Id: <80bc1678b7b859decae536e726a3e5870cbe84eb.1678657122.git.dev@jpoiret.xyz>
-In-Reply-To: <c9b816085272dd07ed762c5ae775a994fa77df56.1678657122.git.dev@jpoiret.xyz>
-References: <c9b816085272dd07ed762c5ae775a994fa77df56.1678657122.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Mon, 31 Oct 2022 13:39:28 +0100
-Subject: [PATCH 2/2] Add --without-rump configure option
-
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-
-To allow cross-builds which cannot use AC_LINK_IFELSE at all.
----
- configure.ac | 47 ++++++++++++++++++++++++++---------------------
- 1 file changed, 26 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c1bf9b2..849b5fad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,33 +234,38 @@ AS_IF([test "x$with_libz" != xno], [
- ])
- AC_SUBST([HAVE_LIBZ])
-
--# Save
--oldLIBS="$LIBS"
-+AC_ARG_WITH([rump],
-+ [AS_HELP_STRING([--without-rump], [disable rump])], , [with_rump=yes])
-
--LIBS="$oldLIBS -lrump"
--AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <hurd.h>
-+AS_IF([test "x$with_rump" != xno], [
-+ # Save
-+ oldLIBS="$LIBS"
-+
-+ LIBS="$oldLIBS -lrump"
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [[#include <hurd.h>
- #define _STANDALONE
- #include <rump/rump.h>]],
-- [])],
-- [HAVE_LIBRUMP=yes],
-- [HAVE_LIBRUMP=no])
--AC_SUBST([HAVE_LIBRUMP])
--
--LIBS="$oldLIBS -lrumpvfs_nofifofs_pic"
--AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <hurd.h>
-+ [])],
-+ [HAVE_LIBRUMP=yes],
-+ [HAVE_LIBRUMP=no])
-+ AC_SUBST([HAVE_LIBRUMP])
-+
-+ LIBS="$oldLIBS -lrumpvfs_nofifofs_pic"
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [[#include <hurd.h>
- #define _STANDALONE
- #include <rump/rump.h>]],
-- [])],
-- [HAVE_LIBRUMP_VFSNOFIFO=yes],
-- [HAVE_LIBRUMP_VFSNOFIFO=no])
--AC_SUBST([HAVE_LIBRUMP_VFSNOFIFO])
-+ [])],
-+ [HAVE_LIBRUMP_VFSNOFIFO=yes],
-+ [HAVE_LIBRUMP_VFSNOFIFO=no])
-+ AC_SUBST([HAVE_LIBRUMP_VFSNOFIFO])
-
--# Reset
--LIBS="$oldLIBS"
-+ # Reset
-+ LIBS="$oldLIBS"
-+])
-
- AC_ARG_ENABLE(boot-store-types,
- [ --enable-boot-store-types=TYPES...
---
-2.39.1
-
diff --git a/gnu/packages/patches/hurd-fix-rumpdisk-build.patch b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch
deleted file mode 100644
index 4ecd5ed0ee..0000000000
--- a/gnu/packages/patches/hurd-fix-rumpdisk-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream status: taken from upstream.
-
-From a2b0f721d077fdc5c9decb21b975b58fb51a3e8f Mon Sep 17 00:00:00 2001
-From: Janneke Nieuwenhuizen <janneke@gnu.org>
-Date: Mon, 22 May 2023 19:21:47 +0200
-Subject: [PATCH] rumpdisk: Do not assume FHS /usr/lib, fixes Guix cross-build.
-
----
- rumpdisk/Makefile | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/rumpdisk/Makefile b/rumpdisk/Makefile
-index 60a209b3..b59aaf9a 100644
---- a/rumpdisk/Makefile
-+++ b/rumpdisk/Makefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (C) 2019 Free Software Foundation, Inc.
-+# Copyright (C) 2019, 2023 Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License as
-@@ -15,7 +15,6 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--RUMPPATH=/usr/lib
- RUMPLIBS=rump rumpuser rumpdev rumpdev_disk rumpdev_pci rumpvfs rumpdev_ahcisata rumpdev_piixide rumpdev_ata
- RUMPEXTRA=rumpdev_scsipi
-
-@@ -38,6 +37,6 @@ target = rumpdisk
- OBJS = $(SRCS:.c=.o)
- HURDLIBS = machdev ports trivfs shouldbeinlibc iohelp ihash fshelp
- LDLIBS += -lpthread -lpciaccess -ldl
--LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=$(RUMPPATH)/lib%_pic.a) -Wl,--no-whole-archive $(RUMPEXTRA:%=$(RUMPPATH)/lib%_pic.a)
-+LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=-l%_pic) -Wl,--no-whole-archive $(RUMPEXTRA:%=-l%_pic)
-
- include ../Makeconf
---
-2.40.1
-
diff --git a/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch b/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch
deleted file mode 100644
index dda95fb3d5..0000000000
--- a/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From eb1b2057d839249c955189c2cba8bc37c66d4151 Mon Sep 17 00:00:00 2001
-Message-Id: <eb1b2057d839249c955189c2cba8bc37c66d4151.1678793830.git.dev@jpoiret.xyz>
-In-Reply-To: <f0cacda83293e4d792b8d12665fcb795dc11d6fc.1678793830.git.dev@jpoiret.xyz>
-References: <f0cacda83293e4d792b8d12665fcb795dc11d6fc.1678793830.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Tue, 30 Aug 2022 00:59:59 +0200
-Subject: [PATCH 2/2] Fix types of read write and readables methods
-
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-
-This completes 5adb4b834b1e
----
- hurd/pci.defs | 2 +-
- lwip/io-ops.c | 6 +++---
- lwip/port/netif/hurdtunif.c | 6 +++---
- lwip/socket-ops.c | 4 ++--
- pci-arbiter/pci-ops.c | 4 ++--
- storeio/open.c | 2 +-
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/hurd/pci.defs b/hurd/pci.defs
-index 23c90334..e258f5ce 100644
---- a/hurd/pci.defs
-+++ b/hurd/pci.defs
-@@ -51,7 +51,7 @@ routine pci_conf_write(
- */
- routine pci_get_ndevs(
- master: pci_t;
-- out ndevs: vm_size_t
-+ out ndevs: mach_msg_type_number_t
- );
-
- /*
-diff --git a/lwip/io-ops.c b/lwip/io-ops.c
-index 5461d695..6cc724ce 100644
---- a/lwip/io-ops.c
-+++ b/lwip/io-ops.c
-@@ -36,7 +36,7 @@ error_t
- lwip_S_io_write (struct sock_user *user,
- const_data_t data,
- size_t datalen,
-- off_t offset, mach_msg_type_number_t * amount)
-+ off_t offset, vm_size_t * amount)
- {
- int sent;
- int sockflags;
-@@ -59,7 +59,7 @@ lwip_S_io_write (struct sock_user *user,
- error_t
- lwip_S_io_read (struct sock_user * user,
- data_t *data,
-- size_t * datalen, off_t offset, mach_msg_type_number_t amount)
-+ size_t * datalen, off_t offset, vm_size_t amount)
- {
- error_t err;
- int alloced = 0;
-@@ -112,7 +112,7 @@ lwip_S_io_seek (struct sock_user * user,
- }
-
- error_t
--lwip_S_io_readable (struct sock_user * user, mach_msg_type_number_t * amount)
-+lwip_S_io_readable (struct sock_user * user, vm_size_t * amount)
- {
- error_t err;
- if (!user)
-diff --git a/lwip/port/netif/hurdtunif.c b/lwip/port/netif/hurdtunif.c
-index 79a082cf..c976703f 100644
---- a/lwip/port/netif/hurdtunif.c
-+++ b/lwip/port/netif/hurdtunif.c
-@@ -348,7 +348,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t * data_len,
-- loff_t offs, size_t amount)
-+ loff_t offs, vm_size_t amount)
- {
- struct hurdtunif *tunif;
- struct pbuf *p;
-@@ -423,7 +423,7 @@ trivfs_S_io_write (struct trivfs_protid * cred,
- mach_msg_type_name_t replytype,
- const_data_t data,
- mach_msg_type_number_t datalen,
-- off_t offset, mach_msg_type_number_t * amount)
-+ off_t offset, vm_size_t * amount)
- {
- struct netif *netif;
- struct pbuf *p, *q;
-@@ -482,7 +482,7 @@ trivfs_S_io_write (struct trivfs_protid * cred,
- kern_return_t
- trivfs_S_io_readable (struct trivfs_protid * cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
-- mach_msg_type_number_t * amount)
-+ vm_size_t * amount)
- {
- struct hurdtunif *tunif;
-
-diff --git a/lwip/socket-ops.c b/lwip/socket-ops.c
-index 5b50f58c..d5e3cb07 100644
---- a/lwip/socket-ops.c
-+++ b/lwip/socket-ops.c
-@@ -342,7 +342,7 @@ lwip_S_socket_send (struct sock_user * user,
- const mach_port_t * ports,
- size_t nports,
- const char *control,
-- size_t controllen, mach_msg_type_number_t * amount)
-+ size_t controllen, vm_size_t * amount)
- {
- int sent;
- int sockflags;
-@@ -392,7 +392,7 @@ lwip_S_socket_recv (struct sock_user * user,
- size_t * nports,
- char **control,
- size_t * controllen,
-- int *outflags, mach_msg_type_number_t amount)
-+ int *outflags, vm_size_t amount)
- {
- error_t err;
- union { struct sockaddr_storage storage; struct sockaddr sa; } addr;
-diff --git a/pci-arbiter/pci-ops.c b/pci-arbiter/pci-ops.c
-index ef27a3cd..d721f368 100644
---- a/pci-arbiter/pci-ops.c
-+++ b/pci-arbiter/pci-ops.c
-@@ -80,7 +80,7 @@ calculate_ndevs (struct iouser *user)
- */
- error_t
- S_pci_conf_read (struct protid * master, int reg, char **data,
-- size_t * datalen, mach_msg_type_number_t amount)
-+ size_t * datalen, vm_size_t amount)
- {
- error_t err;
- pthread_mutex_t *lock;
-@@ -129,7 +129,7 @@ S_pci_conf_read (struct protid * master, int reg, char **data,
- /* Write `datalen' bytes from `data'. `amount' is updated. */
- error_t
- S_pci_conf_write (struct protid * master, int reg, const char *data, size_t datalen,
-- mach_msg_type_number_t * amount)
-+ vm_size_t * amount)
- {
- error_t err;
- pthread_mutex_t *lock;
-diff --git a/storeio/open.c b/storeio/open.c
-index f8eb6ce0..74902520 100644
---- a/storeio/open.c
-+++ b/storeio/open.c
-@@ -75,7 +75,7 @@ open_write (struct open *open, off_t offs, const void *buf, size_t len,
- otherwise the error code is returned. */
- error_t
- open_read (struct open *open, off_t offs, vm_size_t amount,
-- void **buf, size_t *len)
-+ void **buf, vm_size_t *len)
- {
- error_t err;
- if (offs < 0)
---
-2.39.1
-
diff --git a/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch b/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch
deleted file mode 100644
index aebe8d6847..0000000000
--- a/gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch
+++ /dev/null
@@ -1,891 +0,0 @@
-From 5adb4b834b1eba82b7f3eca6324bed0355cae0af Mon Sep 17 00:00:00 2001
-Message-Id: <5adb4b834b1eba82b7f3eca6324bed0355cae0af.1678815112.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Mon, 29 Aug 2022 21:36:17 +0200
-Subject: [PATCH] Fix types of read write and readables methods
-
-From: Etienne Brateau <etienne.brateau@gmail.com>
-
-Message-Id: <20220829193617.13481-1-etienne.brateau@gmail.com>
----
- boot/boot.c | 6 +++---
- console-client/trans.c | 4 ++--
- libdiskfs/io-read.c | 2 +-
- libdiskfs/io-readable.c | 2 +-
- libdiskfs/io-write.c | 2 +-
- libnetfs/io-read.c | 2 +-
- libnetfs/io-readable.c | 2 +-
- libnetfs/io-write.c | 2 +-
- libpager/data-return.c | 2 +-
- libstore/nbd.c | 6 +++---
- libstore/rdwr.c | 4 ++--
- libtrivfs/io-read.c | 2 +-
- libtrivfs/io-readable.c | 2 +-
- libtrivfs/io-write.c | 2 +-
- mach-defpager/default_pager.c | 4 ++--
- pfinet/io-ops.c | 10 +++++-----
- pfinet/socket-ops.c | 16 ++++++++--------
- pfinet/tunnel.c | 6 +++---
- pflocal/io.c | 6 +++---
- pflocal/socket.c | 14 +++++++-------
- storeio/io.c | 8 ++++----
- storeio/open.c | 4 ++--
- storeio/open.h | 6 +++---
- term/ptyio.c | 4 ++--
- term/term.h | 4 ++--
- term/users.c | 14 +++++++-------
- trans/fifo.c | 10 +++++-----
- trans/firmlink.c | 4 ++--
- trans/hello-mt.c | 2 +-
- trans/hello.c | 2 +-
- trans/mtab.c | 4 ++--
- trans/new-fifo.c | 10 +++++-----
- trans/null.c | 8 ++++----
- trans/proxy-defpager.c | 6 +++---
- trans/random.c | 6 +++---
- trans/streamio.c | 6 +++---
- 36 files changed, 97 insertions(+), 97 deletions(-)
-
-diff --git a/boot/boot.c b/boot/boot.c
-index 1b10c86b..f326e5b2 100644
---- a/boot/boot.c
-+++ b/boot/boot.c
-@@ -1412,7 +1412,7 @@ S_io_write (mach_port_t object,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amtwritten)
-+ vm_size_t *amtwritten)
- {
- if (object != pseudo_console)
- return EOPNOTSUPP;
-@@ -1437,7 +1437,7 @@ S_io_read (mach_port_t object,
- data_t *data,
- mach_msg_type_number_t *datalen,
- off_t offset,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- mach_msg_type_number_t avail;
-
-@@ -1489,7 +1489,7 @@ kern_return_t
- S_io_readable (mach_port_t object,
- mach_port_t reply_port,
- mach_msg_type_name_t reply_type,
-- mach_msg_type_number_t *amt)
-+ vm_size_t *amt)
- {
- if (object != pseudo_console)
- return EOPNOTSUPP;
-diff --git a/console-client/trans.c b/console-client/trans.c
-index fe4b9ca4..49e30a61 100644
---- a/console-client/trans.c
-+++ b/console-client/trans.c
-@@ -578,7 +578,7 @@ netfs_S_io_read (struct protid *user,
- data_t *data,
- mach_msg_type_number_t *datalen,
- off_t offset,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- struct node *np;
-
-@@ -597,7 +597,7 @@ netfs_S_io_write (struct protid *user,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- struct node *np;
-
-diff --git a/libdiskfs/io-read.c b/libdiskfs/io-read.c
-index 71803517..a706d677 100644
---- a/libdiskfs/io-read.c
-+++ b/libdiskfs/io-read.c
-@@ -25,7 +25,7 @@ diskfs_S_io_read (struct protid *cred,
- data_t *data,
- mach_msg_type_number_t *datalen,
- off_t offset,
-- mach_msg_type_number_t maxread)
-+ vm_size_t maxread)
- {
- struct node *np;
- int err;
-diff --git a/libdiskfs/io-readable.c b/libdiskfs/io-readable.c
-index c3debac3..03218bf3 100644
---- a/libdiskfs/io-readable.c
-+++ b/libdiskfs/io-readable.c
-@@ -22,7 +22,7 @@
- /* Implement io_readable as described in <hurd/io.defs>. */
- kern_return_t
- diskfs_S_io_readable (struct protid *cred,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- struct node *np;
-
-diff --git a/libdiskfs/io-write.c b/libdiskfs/io-write.c
-index 154bc887..9efed88f 100644
---- a/libdiskfs/io-write.c
-+++ b/libdiskfs/io-write.c
-@@ -25,7 +25,7 @@ diskfs_S_io_write (struct protid *cred,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amt)
-+ vm_size_t *amt)
- {
- struct node *np;
- error_t err;
-diff --git a/libnetfs/io-read.c b/libnetfs/io-read.c
-index 2427ce6c..688da1f6 100644
---- a/libnetfs/io-read.c
-+++ b/libnetfs/io-read.c
-@@ -28,7 +28,7 @@ netfs_S_io_read (struct protid *user,
- data_t *data,
- mach_msg_type_number_t *datalen,
- off_t offset,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- error_t err;
- off_t start;
-diff --git a/libnetfs/io-readable.c b/libnetfs/io-readable.c
-index 07becf66..7c365484 100644
---- a/libnetfs/io-readable.c
-+++ b/libnetfs/io-readable.c
-@@ -25,7 +25,7 @@
-
- error_t
- netfs_S_io_readable (struct protid *user,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
-
-diff --git a/libnetfs/io-write.c b/libnetfs/io-write.c
-index 482b45fc..2306d1f0 100644
---- a/libnetfs/io-write.c
-+++ b/libnetfs/io-write.c
-@@ -27,7 +27,7 @@ netfs_S_io_write (struct protid *user,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
- off_t off = offset;
-diff --git a/libpager/data-return.c b/libpager/data-return.c
-index c0f5aaf7..4c4affe8 100644
---- a/libpager/data-return.c
-+++ b/libpager/data-return.c
-@@ -258,7 +258,7 @@ _pager_S_memory_object_data_return (struct pager *p,
- mach_port_t control,
- vm_offset_t offset,
- pointer_t data,
-- vm_size_t length,
-+ mach_msg_type_number_t length,
- int dirty,
- int kcopy)
- {
-diff --git a/libstore/nbd.c b/libstore/nbd.c
-index 3138af01..8e0892e3 100644
---- a/libstore/nbd.c
-+++ b/libstore/nbd.c
-@@ -119,7 +119,7 @@ nbd_write (struct store *store,
- type: htonl (1), /* WRITE */
- };
- error_t err;
-- mach_msg_type_number_t cc;
-+ vm_size_t cc;
-
- addr <<= store->log2_block_size;
- *amount = 0;
-@@ -178,7 +178,7 @@ nbd_read (struct store *store,
- requested can be found in CHUNK. */
- inline error_t request_chunk (char **buf, size_t *len)
- {
-- mach_msg_type_number_t cc;
-+ vm_size_t cc;
-
- chunk = (amount - ofs) < NBD_IO_MAX ? (amount - ofs) : NBD_IO_MAX;
-
-@@ -435,7 +435,7 @@ nbdclose (struct store *store)
- magic: NBD_REQUEST_MAGIC,
- type: htonl (2), /* disconnect */
- };
-- mach_msg_type_number_t cc;
-+ vm_size_t cc;
- (void) io_write (store->port, (char *) &req, sizeof req, -1, &cc);
-
- /* Close the socket. */
-diff --git a/libstore/rdwr.c b/libstore/rdwr.c
-index 9737c515..f443ad9f 100644
---- a/libstore/rdwr.c
-+++ b/libstore/rdwr.c
-@@ -120,7 +120,7 @@ store_write (struct store *store,
- else
- /* ARGH, we've got to split up the write ... */
- {
-- mach_msg_type_number_t try, written;
-+ vm_size_t try, written;
-
- /* Write the initial bit in the first run. Errors here are returned. */
- try = (run->length - addr) << block_shift;
-@@ -138,7 +138,7 @@ store_write (struct store *store,
- && run->start >= 0) /* Check for holes. */
- /* Ok, we can write in this run, at least a bit. */
- {
-- mach_msg_type_number_t seg_written;
-+ vm_size_t seg_written;
-
- if ((len >> block_shift) <= run->length)
- try = len;
-diff --git a/libtrivfs/io-read.c b/libtrivfs/io-read.c
-index a911f778..4d3302e4 100644
---- a/libtrivfs/io-read.c
-+++ b/libtrivfs/io-read.c
-@@ -26,7 +26,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- data_t *data,
- mach_msg_type_number_t *datalen,
- off_t off,
-- mach_msg_type_number_t amt)
-+ vm_size_t amt)
- {
- assert_backtrace (!trivfs_support_read);
- return EOPNOTSUPP;
-diff --git a/libtrivfs/io-readable.c b/libtrivfs/io-readable.c
-index de4d32b8..acb3fa52 100644
---- a/libtrivfs/io-readable.c
-+++ b/libtrivfs/io-readable.c
-@@ -23,7 +23,7 @@ kern_return_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply,
- mach_msg_type_name_t replytype,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- assert_backtrace (!trivfs_support_read);
- return EOPNOTSUPP;
-diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
-index 74cbb32b..787b2544 100644
---- a/libtrivfs/io-write.c
-+++ b/libtrivfs/io-write.c
-@@ -27,7 +27,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t off,
-- mach_msg_type_number_t *amt)
-+ vm_size_t *amt)
- {
- if (!(trivfs_allow_open & O_WRITE))
- return EBADF;
-diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
-index fd3a7b22..5c1352f4 100644
---- a/mach-defpager/default_pager.c
-+++ b/mach-defpager/default_pager.c
-@@ -2572,7 +2572,7 @@ seqnos_memory_object_data_initialize(ds, seqno, pager_request,
- vm_offset_t offset;
- register
- pointer_t addr;
-- vm_size_t data_cnt;
-+ mach_msg_type_number_t data_cnt;
- {
- vm_offset_t amount_sent;
- static char here[] = "%sdata_initialize";
-@@ -2631,7 +2631,7 @@ seqnos_memory_object_data_return(ds, seqno, pager_request,
- mach_port_t pager_request;
- vm_offset_t offset;
- pointer_t addr;
-- vm_size_t data_cnt;
-+ mach_msg_type_number_t data_cnt;
- boolean_t dirty;
- boolean_t kernel_copy;
- {
-diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
-index fa6350c3..6269743d 100644
---- a/pfinet/io-ops.c
-+++ b/pfinet/io-ops.c
-@@ -37,9 +37,9 @@
- error_t
- S_io_write (struct sock_user *user,
- const_data_t data,
-- size_t datalen,
-+ mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
- struct iovec iov = { (void*) data, datalen };
-@@ -70,9 +70,9 @@ S_io_write (struct sock_user *user,
- error_t
- S_io_read (struct sock_user *user,
- data_t *data,
-- size_t *datalen,
-+ mach_msg_type_number_t *datalen,
- off_t offset,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- error_t err;
- int alloced = 0;
-@@ -135,7 +135,7 @@ S_io_seek (struct sock_user *user,
-
- error_t
- S_io_readable (struct sock_user *user,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- struct sock *sk;
- error_t err;
-diff --git a/pfinet/socket-ops.c b/pfinet/socket-ops.c
-index db1b92cd..8d27c383 100644
---- a/pfinet/socket-ops.c
-+++ b/pfinet/socket-ops.c
-@@ -431,12 +431,12 @@ S_socket_send (struct sock_user *user,
- struct sock_addr *addr,
- int flags,
- const_data_t data,
-- size_t datalen,
-+ mach_msg_type_number_t datalen,
- const mach_port_t *ports,
-- size_t nports,
-+ mach_msg_type_number_t nports,
- const_data_t control,
-- size_t controllen,
-- mach_msg_type_number_t *amount)
-+ mach_msg_type_number_t controllen,
-+ vm_size_t *amount)
- {
- int sent;
- struct iovec iov = { (void*) data, datalen };
-@@ -478,14 +478,14 @@ S_socket_recv (struct sock_user *user,
- mach_msg_type_name_t *addrporttype,
- int flags,
- data_t *data,
-- size_t *datalen,
-+ mach_msg_type_number_t *datalen,
- mach_port_t **ports,
- mach_msg_type_name_t *portstype,
-- size_t *nports,
-+ mach_msg_type_number_t *nports,
- data_t *control,
-- size_t *controllen,
-+ mach_msg_type_number_t *controllen,
- int *outflags,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- error_t err;
- union { struct sockaddr_storage storage; struct sockaddr sa; } addr;
-diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c
-index 1082404e..e11ab670 100644
---- a/pfinet/tunnel.c
-+++ b/pfinet/tunnel.c
-@@ -291,7 +291,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, size_t amount)
-+ off_t offs, vm_size_t amount)
- {
- struct tunnel_device *tdev;
- struct sk_buff *skb;
-@@ -372,7 +372,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
- const_data_t data,
- mach_msg_type_number_t datalen,
- off_t offset,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- struct tunnel_device *tdev;
- struct sk_buff *skb;
-@@ -415,7 +415,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
- kern_return_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- struct tunnel_device *tdev;
- struct sk_buff *skb;
-diff --git a/pflocal/io.c b/pflocal/io.c
-index 96b2fc48..06749756 100644
---- a/pflocal/io.c
-+++ b/pflocal/io.c
-@@ -44,7 +44,7 @@
- error_t
- S_io_read (struct sock_user *user,
- data_t *data, mach_msg_type_number_t *data_len,
-- off_t offset, mach_msg_type_number_t amount)
-+ off_t offset, vm_size_t amount)
- {
- error_t err;
- struct pipe *pipe;
-@@ -80,7 +80,7 @@ S_io_read (struct sock_user *user,
- error_t
- S_io_write (struct sock_user *user,
- const_data_t data, mach_msg_type_number_t data_len,
-- off_t offset, mach_msg_type_number_t *amount)
-+ off_t offset, vm_size_t *amount)
- {
- error_t err;
- struct pipe *pipe;
-@@ -119,7 +119,7 @@ S_io_write (struct sock_user *user,
- a "long time" (this should be the same meaning of "long time" used
- by the nonblocking flag. */
- error_t
--S_io_readable (struct sock_user *user, mach_msg_type_number_t *amount)
-+S_io_readable (struct sock_user *user, vm_size_t *amount)
- {
- error_t err;
- struct pipe *pipe;
-diff --git a/pflocal/socket.c b/pflocal/socket.c
-index 8c1ee3e9..8c240e09 100644
---- a/pflocal/socket.c
-+++ b/pflocal/socket.c
-@@ -287,10 +287,10 @@ S_socket_peername (struct sock_user *user,
- /* Send data over a socket, possibly including Mach ports. */
- error_t
- S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags,
-- const_data_t data, size_t data_len,
-- const mach_port_t *ports, size_t num_ports,
-- const_data_t control, size_t control_len,
-- size_t *amount)
-+ const_data_t data, mach_msg_type_number_t data_len,
-+ const mach_port_t *ports, mach_msg_type_number_t num_ports,
-+ const_data_t control, mach_msg_type_number_t control_len,
-+ vm_size_t *amount)
- {
- error_t err = 0;
- int noblock;
-@@ -378,11 +378,11 @@ error_t
- S_socket_recv (struct sock_user *user,
- mach_port_t *addr, mach_msg_type_name_t *addr_type,
- int in_flags,
-- data_t *data, size_t *data_len,
-+ data_t *data, mach_msg_type_name_t *data_len,
- mach_port_t **ports, mach_msg_type_name_t *ports_type,
- size_t *num_ports,
-- data_t *control, size_t *control_len,
-- int *out_flags, size_t amount)
-+ data_t *control, mach_msg_type_name_t *control_len,
-+ int *out_flags, vm_size_t amount)
- {
- error_t err;
- unsigned flags;
-diff --git a/storeio/io.c b/storeio/io.c
-index 634185f7..3c4cb9ff 100644
---- a/storeio/io.c
-+++ b/storeio/io.c
-@@ -83,8 +83,8 @@ trivfs_S_io_map (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ data_t *data, mach_msg_type_name_t *data_len,
-+ off_t offs, vm_size_t amount)
- {
- if (! cred)
- return EOPNOTSUPP;
-@@ -101,7 +101,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- if (! cred)
- return EOPNOTSUPP;
-@@ -126,7 +126,7 @@ error_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- const_data_t data, mach_msg_type_number_t data_len,
-- loff_t offs, mach_msg_type_number_t *amount)
-+ off_t offs, vm_size_t *amount)
- {
- if (! cred)
- return EOPNOTSUPP;
-diff --git a/storeio/open.c b/storeio/open.c
-index 4c2870c6..f8eb6ce0 100644
---- a/storeio/open.c
-+++ b/storeio/open.c
-@@ -74,8 +74,8 @@ open_write (struct open *open, off_t offs, const void *buf, size_t len,
- standard mach out-array convention. If no error occurs, zero is returned,
- otherwise the error code is returned. */
- error_t
--open_read (struct open *open, off_t offs, size_t amount,
-- void **buf, vm_size_t *len)
-+open_read (struct open *open, off_t offs, vm_size_t amount,
-+ void **buf, size_t *len)
- {
- error_t err;
- if (offs < 0)
-diff --git a/storeio/open.h b/storeio/open.h
-index 6be930a6..ad2678ff 100644
---- a/storeio/open.h
-+++ b/storeio/open.h
-@@ -51,13 +51,13 @@ void open_free (struct open *open);
- and returns the number of bytes written in AMOUNT. If no error occurs,
- zero is returned, otherwise the error code is returned. */
- error_t open_write (struct open *open, off_t offs, const void *buf, size_t len,
-- size_t *amount);
-+ vm_size_t *amount);
-
- /* Reads up to AMOUNT bytes from the device into BUF and BUF_LEN using the
- standard mach out-array convention. If no error occurs, zero is returned,
- otherwise the error code is returned. */
--error_t open_read (struct open *open, off_t offs, size_t amount,
-- void **buf, size_t *buf_len);
-+error_t open_read (struct open *open, off_t offs, vm_size_t amount,
-+ void **buf, vm_size_t *buf_len);
-
- /* Set OPEN's location to OFFS, interpreted according to WHENCE as by seek.
- The new absolute location is returned in NEW_OFFS (and may not be the same
-diff --git a/term/ptyio.c b/term/ptyio.c
-index 928ae0ac..acd1015a 100644
---- a/term/ptyio.c
-+++ b/term/ptyio.c
-@@ -302,7 +302,7 @@ error_t
- pty_io_read (struct trivfs_protid *cred,
- data_t *data,
- mach_msg_type_number_t *datalen,
-- mach_msg_type_number_t amount)
-+ vm_size_t amount)
- {
- int size;
-
-@@ -386,7 +386,7 @@ error_t
- pty_io_write (struct trivfs_protid *cred,
- const_data_t data,
- mach_msg_type_number_t datalen,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- int i, flush;
- int cancel = 0;
-diff --git a/term/term.h b/term/term.h
-index efe27ffa..1e6be5f2 100644
---- a/term/term.h
-+++ b/term/term.h
-@@ -387,9 +387,9 @@ extern dev_t rdev;
- /* kludge--these are pty versions of trivfs_S_io_* functions called by
- the real functions in users.c to do work for ptys. */
- error_t pty_io_write (struct trivfs_protid *, const char *,
-- mach_msg_type_number_t, mach_msg_type_number_t *);
-+ mach_msg_type_number_t, vm_size_t *);
- error_t pty_io_read (struct trivfs_protid *, char **,
-- mach_msg_type_number_t *, mach_msg_type_number_t);
-+ mach_msg_type_number_t *, vm_size_t);
- error_t pty_io_readable (size_t *);
- error_t pty_io_select (struct trivfs_protid *, mach_port_t,
- struct timespec *, int *);
-diff --git a/term/users.c b/term/users.c
-index 72f5507d..59f02b66 100644
---- a/term/users.c
-+++ b/term/users.c
-@@ -562,9 +562,9 @@ trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply,
- mach_msg_type_name_t replytype,
- const_data_t data,
-- size_t datalen,
-- loff_t offset,
-- size_t *amt)
-+ mach_msg_type_name_t datalen,
-+ off_t offset,
-+ vm_size_t *amt)
- {
- int i;
- int cancel;
-@@ -640,9 +640,9 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply,
- mach_msg_type_name_t replytype,
- data_t *data,
-- size_t *datalen,
-- loff_t offset,
-- size_t amount)
-+ mach_msg_type_name_t *datalen,
-+ off_t offset,
-+ vm_size_t amount)
- {
- int cancel;
- int i, max;
-@@ -820,7 +820,7 @@ error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply,
- mach_msg_type_name_t replytype,
-- size_t *amt)
-+ vm_size_t *amt)
- {
- if (!cred)
- return EOPNOTSUPP;
-diff --git a/trans/fifo.c b/trans/fifo.c
-index ce7c7729..894565f6 100644
---- a/trans/fifo.c
-+++ b/trans/fifo.c
-@@ -339,8 +339,8 @@ trivfs_S_io_map (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- data_t *data, size_t *data_len,
-- off_t offs, size_t amount)
-+ data_t *data, mach_msg_type_name_t *data_len,
-+ off_t offs, vm_size_t amount)
- {
- error_t err;
-
-@@ -368,7 +368,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- size_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
-
-@@ -502,8 +502,8 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- const_data_t data, size_t data_len,
-- off_t offs, size_t *amount)
-+ const_data_t data, mach_msg_type_name_t data_len,
-+ off_t offs, vm_size_t *amount)
- {
- error_t err;
-
-diff --git a/trans/firmlink.c b/trans/firmlink.c
-index 8a5d01a8..e216146a 100644
---- a/trans/firmlink.c
-+++ b/trans/firmlink.c
-@@ -207,7 +207,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- error_t err = 0;
-
-@@ -244,7 +244,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- if (! cred)
- return EOPNOTSUPP;
-diff --git a/trans/hello-mt.c b/trans/hello-mt.c
-index 92f814d6..e99ba754 100644
---- a/trans/hello-mt.c
-+++ b/trans/hello-mt.c
-@@ -125,7 +125,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- struct open *op;
-
-diff --git a/trans/hello.c b/trans/hello.c
-index f8f9e7ab..0405fad3 100644
---- a/trans/hello.c
-+++ b/trans/hello.c
-@@ -116,7 +116,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- struct open *op;
-
-diff --git a/trans/mtab.c b/trans/mtab.c
-index caff3385..a2feee7d 100644
---- a/trans/mtab.c
-+++ b/trans/mtab.c
-@@ -657,7 +657,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- error_t err = 0;
- struct mtab *op;
-@@ -774,7 +774,7 @@ void (*trivfs_peropen_destroy_hook) (struct trivfs_peropen *) = close_hook;
- kern_return_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- error_t err = 0;
- if (!cred)
-diff --git a/trans/new-fifo.c b/trans/new-fifo.c
-index 9a959a39..3e9a886c 100644
---- a/trans/new-fifo.c
-+++ b/trans/new-fifo.c
-@@ -524,8 +524,8 @@ trivfs_S_io_map (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- data_t *data, size_t *data_len,
-- off_t offs, size_t amount)
-+ data_t *data, mach_msg_type_name_t *data_len,
-+ off_t offs, vm_size_t amount)
- {
- error_t err;
-
-@@ -554,7 +554,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- size_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
-
-@@ -689,8 +689,8 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- const_data_t data, size_t data_len,
-- off_t offs, size_t *amount)
-+ const_data_t data, mach_msg_type_name_t data_len,
-+ off_t offs, vm_size_t *amount)
- {
- error_t err;
-
-diff --git a/trans/null.c b/trans/null.c
-index 034bb103..f4ba5582 100644
---- a/trans/null.c
-+++ b/trans/null.c
-@@ -149,8 +149,8 @@ trivfs_S_io_read(struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
- data_t *data,
- mach_msg_type_number_t *datalen,
-- loff_t offs,
-- mach_msg_type_number_t amt)
-+ off_t offs,
-+ vm_size_t amt)
- {
- if (!cred)
- return EOPNOTSUPP;
-@@ -169,7 +169,7 @@ trivfs_S_io_read(struct trivfs_protid *cred,
- kern_return_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- if (!cred)
- return EOPNOTSUPP;
-@@ -228,7 +228,7 @@ kern_return_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
- const_data_t data, mach_msg_type_number_t datalen,
-- loff_t offs, mach_msg_type_number_t *amt)
-+ off_t offs, vm_size_t *amt)
- {
- if (!cred)
- return EOPNOTSUPP;
-diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
-index 8ca25b72..bfeda063 100644
---- a/trans/proxy-defpager.c
-+++ b/trans/proxy-defpager.c
-@@ -169,8 +169,8 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
- data_t *data,
- mach_msg_type_number_t *datalen,
-- loff_t offs,
-- mach_msg_type_number_t amt)
-+ off_t offs,
-+ vm_size_t amt)
- {
- if (!cred)
- return EOPNOTSUPP;
-@@ -181,7 +181,7 @@ kern_return_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t replytype,
- const_data_t data, mach_msg_type_number_t datalen,
-- loff_t offs, mach_msg_type_number_t *amt)
-+ loff_t offs, vm_size_t *amt)
- {
- if (!cred)
- return EOPNOTSUPP;
-diff --git a/trans/random.c b/trans/random.c
-index c230280a..297253e4 100644
---- a/trans/random.c
-+++ b/trans/random.c
-@@ -318,7 +318,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- error_t err;
- void *buf = NULL;
-@@ -377,8 +377,8 @@ trivfs_S_io_write (struct trivfs_protid *cred,
- mach_msg_type_name_t replytype,
- const_data_t data,
- mach_msg_type_number_t datalen,
-- loff_t offset,
-- mach_msg_type_number_t *amount)
-+ off_t offset,
-+ vm_size_t *amount)
- {
- /* Deny access if they have bad credentials. */
- if (! cred)
-diff --git a/trans/streamio.c b/trans/streamio.c
-index 30b8b20e..acd5d674 100644
---- a/trans/streamio.c
-+++ b/trans/streamio.c
-@@ -482,7 +482,7 @@ error_t
- trivfs_S_io_read (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- data_t *data, mach_msg_type_number_t *data_len,
-- loff_t offs, mach_msg_type_number_t amount)
-+ off_t offs, vm_size_t amount)
- {
- error_t err;
-
-@@ -501,7 +501,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
- error_t
- trivfs_S_io_readable (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
-- mach_msg_type_number_t *amount)
-+ vm_size_t *amount)
- {
- error_t err;
-
-@@ -521,7 +521,7 @@ error_t
- trivfs_S_io_write (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- const_data_t data, mach_msg_type_number_t data_len,
-- loff_t offs, mach_msg_type_number_t *amount)
-+ off_t offs, vm_size_t *amount)
- {
- error_t err;
-
-
-base-commit: b6509385bb1dd2a6d47401465bfb98b6339c5c2b
-prerequisite-patch-id: 33c640aa0fcf19d49fff88cc58cecd3be8f7892d
-prerequisite-patch-id: 411256b31780cf9ea0b24efe9f2b20f82c6ce9c1
-prerequisite-patch-id: 830470d11762c6c5e09488a2b834dff0f4f6e434
-prerequisite-patch-id: 1a1293bebf97550d54d9dba3a1817f20a3ef6a2a
-prerequisite-patch-id: f12e5842dea12ed7b0ff4ae3fa2afe78f3647288
-prerequisite-patch-id: 4436fa0181c5e21580e6656634e35febf251dc5b
-prerequisite-patch-id: a938f788841d96151e9e4cc134114dc7652e4f27
-prerequisite-patch-id: bfc7264e11d3ca2dbc520f221cf8bf13857d4732
-prerequisite-patch-id: 50393cc222a3e9de9cfab0762f5acf10e394c9f0
---
-2.39.1
-
diff --git a/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch
new file mode 100644
index 0000000000..4fe520318a
--- /dev/null
+++ b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch
@@ -0,0 +1,31 @@
+Source: https://unicode-org.atlassian.net/browse/ICU-22132?focusedCommentId=166752
+Author: Sean Burke
+License:
+Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007
+
+diff --git a/icu4c/source/i18n/vtzone.cpp b/icu4c/source/i18n/vtzone.cpp
+index 3035106701..5e738e11fa 100644
+--- a/source/i18n/vtzone.cpp
++++ b/source/i18n/vtzone.cpp
+@@ -1735,14 +1735,14 @@ VTimeZone::write(VTZWriter& writer, UErrorCode& status) const {
+ }
+ }
+ } else {
+- UnicodeString icutzprop;
+- UVector customProps(nullptr, uhash_compareUnicodeString, status);
++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
+ if (olsonzid.length() > 0 && icutzver.length() > 0) {
+- icutzprop.append(olsonzid);
+- icutzprop.append(u'[');
+- icutzprop.append(icutzver);
+- icutzprop.append(u']');
+- customProps.addElement(&icutzprop, status);
++ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
++ icutzprop->append(olsonzid);
++ icutzprop->append(u'[');
++ icutzprop->append(icutzver);
++ icutzprop->append(u']');
++ customProps.adoptElement(icutzprop.orphan(), status);
+ }
+ writeZone(writer, *tz, &customProps, status);
+ }
diff --git a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch
deleted file mode 100644
index b15c1d0879..0000000000
--- a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-We omit the ChangeLog changes below, since they do not apply cleanly.
-
-
-From 6ee5059cd3ac8d82714a1ab1321399b88539abf0 Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Mon, 30 Nov 2020 16:26:59 +0000
-Subject: [PATCH] possible TIFF related-heap buffer overflow (alert & POC by
- Hardik Shah)
-
----
- ChangeLog | 6 ++++++
- coders/tiff.c | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/coders/tiff.c b/coders/tiff.c
-index e98f927ab..1eecf17ae 100644
---- a/coders/tiff.c
-+++ b/coders/tiff.c
-@@ -1975,7 +1975,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
- extent+=image->columns*sizeof(uint32);
- #endif
- strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
-- sizeof(*strip_pixels));
-+ 2*sizeof(*strip_pixels));
- if (strip_pixels == (unsigned char *) NULL)
- ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels));
diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch
deleted file mode 100644
index 42ece43682..0000000000
--- a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001
-From: Dirk Lemstra <dirk@lemstra.org>
-Date: Wed, 24 Mar 2021 20:37:15 +0100
-Subject: [PATCH] Throw exception when no exception was raised but status was
- false (#3432).
-
----
- coders/dcm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/coders/dcm.c b/coders/dcm.c
-index 7a68ed6e8..ed17c9567 100644
---- a/coders/dcm.c
-+++ b/coders/dcm.c
-@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
- if (redmap != (int *) NULL)
- redmap=(int *) RelinquishMagickMemory(redmap);
- image=DestroyImageList(image);
-+ if ((status == MagickFalse) && (exception->severity < ErrorException))
-+ ThrowReaderException(CorruptImageError,"CorruptImage");
- return(GetFirstImageInList(images));
- }
- if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH))
---
-2.31.0
-
diff --git a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
deleted file mode 100644
index a91999186b..0000000000
--- a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8f25953ad1dd38a8b2d92738f0f742ad7e0bce7 Mon Sep 17 00:00:00 2001
-From: Cristy <mikayla-grace@urban-warrior.org>
-Date: Sun, 21 Mar 2021 21:21:15 -0400
-Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32322
-
----
- coders/dcm.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/coders/dcm.c b/coders/dcm.c
-index 29eed9618..7a68ed6e8 100644
---- a/coders/dcm.c
-+++ b/coders/dcm.c
-@@ -2984,12 +2984,12 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info,
- }
- else
- {
-- SetPixelRed(q,(Quantum) (((ssize_t) pixel.red) |
-- (((ssize_t) GetPixelRed(q)) << 8)));
-- SetPixelGreen(q,(Quantum) (((ssize_t) pixel.green) |
-- (((ssize_t) GetPixelGreen(q)) << 8)));
-- SetPixelBlue(q,(Quantum) (((ssize_t) pixel.blue) |
-- (((ssize_t) GetPixelBlue(q)) << 8)));
-+ SetPixelRed(q,(Quantum) (((size_t) pixel.red) |
-+ (((size_t) GetPixelRed(q)) << 8)));
-+ SetPixelGreen(q,(Quantum) (((size_t) pixel.green) |
-+ (((size_t) GetPixelGreen(q)) << 8)));
-+ SetPixelBlue(q,(Quantum) (((size_t) pixel.blue) |
-+ (((size_t) GetPixelBlue(q)) << 8)));
- }
- q++;
- }
---
-2.31.0
-
diff --git a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch
deleted file mode 100644
index f38a45b800..0000000000
--- a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a5d3575487487f2703383338bd17c8c25068f19 Mon Sep 17 00:00:00 2001
-From: Cristy <mikayla-grace@urban-warrior.org>
-Date: Thu, 25 Mar 2021 08:58:18 -0400
-Subject: [PATCH] eliminate compiler warning
-
----
- coders/thumbnail.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coders/thumbnail.c b/coders/thumbnail.c
-index 3833341b0..1e2bfe8c2 100644
---- a/coders/thumbnail.c
-+++ b/coders/thumbnail.c
-@@ -199,7 +199,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
- q++;
- }
- if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) ||
-- (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q)))
-+ ((ssize_t) length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q)))
- ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail");
- thumbnail_image=BlobToImage(image_info,q,length,&image->exception);
- if (thumbnail_image == (Image *) NULL)
---
-2.31.0
-
diff --git a/gnu/packages/patches/inkscape-poppler-compat.patch b/gnu/packages/patches/inkscape-poppler-compat.patch
deleted file mode 100644
index cb7d1c8eb3..0000000000
--- a/gnu/packages/patches/inkscape-poppler-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix build with Poppler 22.9.0.
-
-Taken from upstream:
-
- https://gitlab.com/inkscape/inkscape/-/commit/fb00794923d19cfbb2ca4adca3ae8971553a06be
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
- _POPPLER_FREE(obj);
- }
- }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
- state->setLineDash(dash, length, args[1].getNum());
-+#endif
- builder->updateStyle(state);
- }
-
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
- sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
-
- // Line dash
-- double *dash_pattern;
- int dash_length;
- double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ const double *dash_pattern;
-+ const std::vector<double> &dash = state->getLineDash(&dash_start);
-+ dash_pattern = dash.data();
-+ dash_length = dash.size();
-+#else
-+ double *dash_pattern;
- state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
- if ( dash_length > 0 ) {
- Inkscape::CSSOStringStream os_array;
- for ( int i = 0 ; i < dash_length ; i++ ) {
diff --git a/gnu/packages/patches/isync-openssl3-fix.patch b/gnu/packages/patches/isync-openssl3-fix.patch
deleted file mode 100644
index 6a2363e972..0000000000
--- a/gnu/packages/patches/isync-openssl3-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Upstream status: Taken from master branch. Likely included in versions > 1.4.4
-
-Fixes issues with OpenSSL3. See related thread:
-https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2jnr8hESp1PUW+6@bulldog/
-
-From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <ossi@users.sf.net>
-Date: Mon, 6 Jun 2022 11:55:37 +0200
-Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL
- connections
-
-gmail apparently doesn't send a close notification (SSL_shutdown())
-before closing the TCP socket.
----
- src/drv_imap.c | 7 +++++--
- src/socket.c | 9 +++++++++
- src/socket.h | 1 +
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/drv_imap.c b/src/drv_imap.c
-index fb8d165..6286045 100644
---- a/src/drv_imap.c
-+++ b/src/drv_imap.c
-@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux )
- error( "IMAP error: unexpected BYE response: %s\n", cmd );
- /* We just wait for the server to close the connection now. */
- ctx->expectEOF = 1;
-+ socket_expect_eof( &ctx->conn );
- } else {
- /* We still need to wait for the LOGOUT's tagged OK. */
- }
-@@ -1882,10 +1883,12 @@ static void
- imap_cleanup_p2( imap_store_t *ctx,
- imap_cmd_t *cmd ATTR_UNUSED, int response )
- {
-- if (response == RESP_NO)
-+ if (response == RESP_NO) {
- imap_cancel_store( &ctx->gen );
-- else if (response == RESP_OK)
-+ } else if (response == RESP_OK) {
- ctx->expectEOF = 1;
-+ socket_expect_eof( &ctx->conn );
-+ }
- }
-
- /******************* imap_open_store *******************/
-diff --git a/src/socket.c b/src/socket.c
-index ac3c847..892cece 100644
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect )
- conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 );
- }
-
-+void
-+socket_expect_eof( conn_t *sock )
-+{
-+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL
-+ if (sock->ssl)
-+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF );
-+#endif
-+}
-+
- int
- socket_read( conn_t *conn, char *buf, uint len )
- {
-diff --git a/src/socket.h b/src/socket.h
-index 5b1edd0..af679aa 100644
---- a/src/socket.h
-+++ b/src/socket.h
-@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) );
- void socket_start_deflate( conn_t *conn );
- void socket_close( conn_t *sock );
- void socket_expect_activity( conn_t *sock, int expect );
-+void socket_expect_eof( conn_t *sock );
- int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */
- char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */
- typedef enum { KeepOwn = 0, GiveOwn } ownership_t;
---
-2.39.2
-
diff --git a/gnu/packages/patches/jami-disable-integration-tests.patch b/gnu/packages/patches/jami-disable-integration-tests.patch
deleted file mode 100644
index 18f13800ac..0000000000
--- a/gnu/packages/patches/jami-disable-integration-tests.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-This issue is tracked at https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/824.
-
-From 3fd7acc6e5a8c316c366827956d7c06affdc9685 Mon Sep 17 00:00:00 2001
-From: Olivier Dion <olivier.dion@savoirfairelinux.com>
-Date: Fri, 7 Oct 2022 15:20:37 -0400
-Subject: [PATCH] test/unitTest: Seperate pure tests from integration tests
-
-So we can now do `make check` in a reproducible way.
-
-To enable integration tests `./configure --enable-integration-tests`.
-
-Change-Id: Iaa68c77abade9fe78bae881abc25e034bcb6a067
----
-With file names adjusted for the source tarball.
-
- configure.ac | 5 ++++
- test/unitTest/Makefile.am | 52 +++++++++++++++++++++------------------
- 2 files changed, 33 insertions(+), 24 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 27215d044..aaeef1c1b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,11 @@ AS_IF([test "x$enable_debug" = "xyes"],
- [DAEMONCFLAGS+=" -DNDEBUG=1 -O3"
- DAEMONCXXFLAGS+=" -DNDEBUG=1 -O3 -Wno-deprecated"])
-
-+AC_ARG_ENABLE([enable_integration_tests],
-+ AS_HELP_STRING([--enable-integration-tests],
-+ [Also run integration tests with check target]))
-+AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS], [test "x$enable_integration_tests" = "xyes"])
-+
- AC_ARG_ENABLE([fuzzing],
- AS_HELP_STRING([--enable-fuzzing],
- [Build fuzzing tools]))
-diff --git a/test/unitTest/Makefile.am b/test/unitTest/Makefile.am
-index f2b0fd994..ab232ddb7 100644
---- a/test/unitTest/Makefile.am
-+++ b/test/unitTest/Makefile.am
-@@ -13,30 +13,6 @@ check_PROGRAMS =
-
- ####### Unit Test ########
-
--#
--# account_factory
--#
--check_PROGRAMS += ut_account_factory
--ut_account_factory_SOURCES = account_factory/testAccount_factory.cpp common.cpp
--
--#
--# account_archive
--#
--check_PROGRAMS += ut_account_archive
--ut_account_archive_SOURCES = account_archive/account_archive.cpp common.cpp
--
--#
--# migration
--#
--check_PROGRAMS += ut_migration
--ut_migration_SOURCES = account_archive/migration.cpp common.cpp
--
--#
--# certstore
--#
--check_PROGRAMS += ut_certstore
--ut_certstore_SOURCES = certstore.cpp common.cpp
--
- #
- # scheduler
- #
-@@ -127,6 +103,32 @@ ut_video_scaler_SOURCES = media/video/test_video_scaler.cpp common.cpp
- check_PROGRAMS += ut_audio_frame_resizer
- ut_audio_frame_resizer_SOURCES = media/audio/test_audio_frame_resizer.cpp common.cpp
-
-+if ENABLE_INTEGRATION_TESTS
-+
-+#
-+# account_factory
-+#
-+check_PROGRAMS += ut_account_factory
-+ut_account_factory_SOURCES = account_factory/testAccount_factory.cpp common.cpp
-+
-+#
-+# account_archive
-+#
-+check_PROGRAMS += ut_account_archive
-+ut_account_archive_SOURCES = account_archive/account_archive.cpp common.cpp
-+
-+#
-+# migration
-+#
-+check_PROGRAMS += ut_migration
-+ut_migration_SOURCES = account_archive/migration.cpp common.cpp
-+
-+#
-+# certstore
-+#
-+check_PROGRAMS += ut_certstore
-+ut_certstore_SOURCES = certstore.cpp common.cpp
-+
- #
- # call
- #
-@@ -237,4 +239,6 @@ ut_sip_srtp_SOURCES = sip_account/sip_srtp.cpp
- check_PROGRAMS += ut_plugins
- ut_plugins_SOURCES = plugins/plugins.cpp common.cpp
-
-+endif # ENABLE_INTEGRATION_TESTS
-+
- TESTS = $(check_PROGRAMS)
---
-2.37.3
-
diff --git a/gnu/packages/patches/jami-enable-testing.patch b/gnu/packages/patches/jami-enable-testing.patch
new file mode 100644
index 0000000000..3e27a8def9
--- /dev/null
+++ b/gnu/packages/patches/jami-enable-testing.patch
@@ -0,0 +1,26 @@
+Fix an issue where ctest wouldn't find the qml test files.
+Upstream status: forwarded to jami@gnu.org
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e802357f..75cffda2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -884,5 +884,6 @@ qt_finalize_executable(${PROJECT_NAME})
+ # tests
+ if(BUILD_TESTING)
+ message("Add Jami tests")
++ enable_testing()
+ add_subdirectory(${TESTS_DIR})
+ endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 37796e52..06008ccf 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+
+-enable_testing(true)
++enable_testing()
+
+ set(QT_TESTING_MODULES
+ ${QT_MODULES}
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/krita-bump-sip-abi-version-to-12.8.patch b/gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch
new file mode 100644
index 0000000000..02852e0f5a
--- /dev/null
+++ b/gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch
@@ -0,0 +1,25 @@
+From 2d71c47661d43a4e3c1ab0c27803de980bdf2bb2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 11 Dec 2023 20:26:13 +0100
+Subject: [PATCH] Bump SIP ABI version to 12.8
+
+Fixes build with SIP 6.8
+---
+ cmake/modules/pyproject.toml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/pyproject.toml.in b/cmake/modules/pyproject.toml.in
+index 090b2d4b0cb..085ddf41799 100644
+--- a/cmake/modules/pyproject.toml.in
++++ b/cmake/modules/pyproject.toml.in
+@@ -9,7 +9,7 @@ name = "@module_name_toml@"
+ sip-module = "@sip_name@"
+ sip-include-dirs = @sip_include_dirs@
+ sip-files-dir = "@module_srcs@"
+-abi-version = "12"
++abi-version = "12.8"
+
+ [tool.sip.bindings.@module_name_toml@]
+ tags = @module_tags@
+--
+GitLab
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/libgit2-uninitialized-proxy-settings.patch b/gnu/packages/patches/libgit2-uninitialized-proxy-settings.patch
new file mode 100644
index 0000000000..54116ce1a2
--- /dev/null
+++ b/gnu/packages/patches/libgit2-uninitialized-proxy-settings.patch
@@ -0,0 +1,28 @@
+Fix uses of uninitialized values in the http-parser backend, a bug introduced
+in libgit2 1.8.1:
+
+ https://github.com/libgit2/libgit2/pull/6870
+
+This code is exercised by 'tests/proxy.scm' in Guile-Git.
+
+diff --git a/src/libgit2/transports/httpparser.c b/src/libgit2/transports/httpparser.c
+index 50ba6d2e0..c19499b84 100644
+--- a/src/libgit2/transports/httpparser.c
++++ b/src/libgit2/transports/httpparser.c
+@@ -71,6 +71,7 @@ size_t git_http_parser_execute(
+ {
+ struct http_parser_settings settings_proxy;
+
++ settings_proxy.on_status = NULL;
+ settings_proxy.on_message_begin = parser->settings.on_message_begin ? on_message_begin : NULL;
+ settings_proxy.on_url = parser->settings.on_url ? on_url : NULL;
+ settings_proxy.on_header_field = parser->settings.on_header_field ? on_header_field : NULL;
+@@ -78,6 +79,8 @@ size_t git_http_parser_execute(
+ settings_proxy.on_headers_complete = parser->settings.on_headers_complete ? on_headers_complete : NULL;
+ settings_proxy.on_body = parser->settings.on_body ? on_body : NULL;
+ settings_proxy.on_message_complete = parser->settings.on_message_complete ? on_message_complete : NULL;
++ settings_proxy.on_chunk_header = NULL;
++ settings_proxy.on_chunk_complete = NULL;
+
+ return http_parser_execute(&parser->parser, &settings_proxy, data, len);
+ }
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/libmateweather-use-TZDIR.patch b/gnu/packages/patches/libmateweather-use-TZDIR.patch
deleted file mode 100644
index 5f72043986..0000000000
--- a/gnu/packages/patches/libmateweather-use-TZDIR.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 109fef8208188ddf4be76d6899f7d8fde5b8b3be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
-Date: Sat, 22 Jul 2023 14:40:31 +0800
-Subject: [PATCH] Use TZDIR for ZONEINFO_DIR if the variable is set.
-
----
- libmateweather/mateweather-timezone.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/libmateweather/mateweather-timezone.c b/libmateweather/mateweather-timezone.c
-index 2754728..6c858c4 100644
---- a/libmateweather/mateweather-timezone.c
-+++ b/libmateweather/mateweather-timezone.c
-@@ -61,7 +61,7 @@ static gboolean
- parse_tzdata (const char *tzname, time_t start, time_t end,
- int *offset, gboolean *has_dst, int *dst_offset)
- {
-- char *filename, *contents;
-+ char *tzdir, *filename, *contents;
- gsize length;
- int timecnt, transitions_size, ttinfo_map_size;
- int initial_transition = -1, second_transition = -1;
-@@ -71,7 +71,10 @@ parse_tzdata (const char *tzname, time_t start, time_t end,
- char initial_isdst, second_isdst;
- int i;
-
-- filename = g_build_filename (ZONEINFO_DIR, tzname, NULL);
-+ tzdir = g_getenv("TZDIR");
-+ if (tzdir == NULL)
-+ tzdir = ZONEINFO_DIR;
-+ filename = g_build_filename (tzdir, tzname, NULL);
- if (!g_file_get_contents (filename, &contents, &length, NULL)) {
- g_free (filename);
- return FALSE;
-@@ -403,4 +406,3 @@ mateweather_timezone_get_dst_offset (MateWeatherTimezone *zone)
- g_return_val_if_fail (zone->has_dst, 0);
- return zone->dst_offset;
- }
--
---
-2.41.0
-
diff --git a/gnu/packages/patches/libsepol-versioned-docbook.patch b/gnu/packages/patches/libsepol-versioned-docbook.patch
new file mode 100644
index 0000000000..6b39de0a5b
--- /dev/null
+++ b/gnu/packages/patches/libsepol-versioned-docbook.patch
@@ -0,0 +1,56 @@
+# Sent upstream: <https://lore.kernel.org/selinux/260cd39c55ff2d13f5ac916b508f023bedecfce9.1692025627.git.mirai@makinata.eu/>
+
+From 260cd39c55ff2d13f5ac916b508f023bedecfce9 Mon Sep 17 00:00:00 2001
+Message-Id: <260cd39c55ff2d13f5ac916b508f023bedecfce9.1692827278.git.mirai@makinata.eu>
+From: Bruno Victal <mirai@makinata.eu>
+Date: Mon, 14 Aug 2023 15:51:05 +0100
+Subject: [PATCH] secilc: Use versioned DocBook public identifier.
+
+Fix xml validation issues that often crop up since the XML catalogs
+for DocBook often only contain versioned public identifiers.
+
+Signed-off-by: Bruno Victal <mirai@makinata.eu>
+---
+ secilc/secil2conf.8.xml | 2 +-
+ secilc/secil2tree.8.xml | 2 +-
+ secilc/secilc.8.xml | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/secilc/secil2conf.8.xml b/secilc/secil2conf.8.xml
+index 33646f97..330b6a07 100644
+--- a/secilc/secil2conf.8.xml
++++ b/secilc/secil2conf.8.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+ <refentry>
+diff --git a/secilc/secil2tree.8.xml b/secilc/secil2tree.8.xml
+index e95a8947..d7bb177e 100644
+--- a/secilc/secil2tree.8.xml
++++ b/secilc/secil2tree.8.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+ <refentry>
+diff --git a/secilc/secilc.8.xml b/secilc/secilc.8.xml
+index e9a121e2..5c0680a8 100644
+--- a/secilc/secilc.8.xml
++++ b/secilc/secilc.8.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+ <refentry>
+
+base-commit: f6dc6acfa00707ce25c6357169111937f12512dd
+--
+2.40.1
+
diff --git a/gnu/packages/patches/libvpx-CVE-2023-44488.patch b/gnu/packages/patches/libvpx-CVE-2023-44488.patch
new file mode 100644
index 0000000000..4ebb034eb4
--- /dev/null
+++ b/gnu/packages/patches/libvpx-CVE-2023-44488.patch
@@ -0,0 +1,107 @@
+From the upstream repo, can be removed after 1.14.1
+https://github.com/webmproject/libvpx/commit/df9fd9d5b7325060b2b921558a1eb20ca7880937.patch
+https://www.openwall.com/lists/oss-security/2023/09/30/4
+
+The test change didn't apply so it was removed from the patch
+
+From df9fd9d5b7325060b2b921558a1eb20ca7880937 Mon Sep 17 00:00:00 2001
+From: Jerome Jiang <jianj@google.com>
+Date: Thu, 30 Jun 2022 13:48:56 -0400
+Subject: [PATCH] Fix bug with smaller width bigger size
+
+Fixed previous patch that clusterfuzz failed on.
+
+Local fuzzing passing overnight.
+
+Bug: webm:1642
+Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9
+(cherry picked from commit 263682c9a29395055f3b3afe2d97be1828a6223f)
+---
+ test/resize_test.cc | 11 +++--------
+ vp9/common/vp9_alloccommon.c | 13 ++++++-------
+ vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++--
+ 3 files changed, 34 insertions(+), 17 deletions(-)
+
+diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
+index e53883f621d..9e73e40ea09 100644
+--- a/vp9/common/vp9_alloccommon.c
++++ b/vp9/common/vp9_alloccommon.c
+@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
+ cm->free_mi(cm);
+ if (cm->alloc_mi(cm, new_mi_size)) goto fail;
+ }
+-
+- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
+- // Create the segmentation map structure and set to 0.
+- free_seg_map(cm);
+- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
+- }
+-
+ if (cm->above_context_alloc_cols < cm->mi_cols) {
+ vpx_free(cm->above_context);
+ cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
+@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
+ cm->above_context_alloc_cols = cm->mi_cols;
+ }
+
++ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
++ // Create the segmentation map structure and set to 0.
++ free_seg_map(cm);
++ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
++ }
++
+ if (vp9_alloc_loop_filter(cm)) goto fail;
+
+ return 0;
+diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
+index b66fdc0bca3..e3850775455 100644
+--- a/vp9/encoder/vp9_encoder.c
++++ b/vp9/encoder/vp9_encoder.c
+@@ -1973,6 +1973,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
+ }
+ }
+
++static void free_copy_partition_data(VP9_COMP *cpi) {
++ vpx_free(cpi->prev_partition);
++ cpi->prev_partition = NULL;
++ vpx_free(cpi->prev_segment_id);
++ cpi->prev_segment_id = NULL;
++ vpx_free(cpi->prev_variance_low);
++ cpi->prev_variance_low = NULL;
++ vpx_free(cpi->copied_frame_cnt);
++ cpi->copied_frame_cnt = NULL;
++}
++
+ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+ VP9_COMMON *const cm = &cpi->common;
+ RATE_CONTROL *const rc = &cpi->rc;
+@@ -2052,6 +2063,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+ new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
+ if (cm->mi_alloc_size < new_mi_size) {
+ vp9_free_context_buffers(cm);
++ vp9_free_pc_tree(&cpi->td);
++ vpx_free(cpi->mbmi_ext_base);
+ alloc_compressor_data(cpi);
+ realloc_segmentation_maps(cpi);
+ cpi->initial_width = cpi->initial_height = 0;
+@@ -2070,8 +2083,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+ update_frame_size(cpi);
+
+ if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
+- memset(cpi->consec_zero_mv, 0,
+- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
++ vpx_free(cpi->consec_zero_mv);
++ CHECK_MEM_ERROR(
++ cm, cpi->consec_zero_mv,
++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
++
++ vpx_free(cpi->skin_map);
++ CHECK_MEM_ERROR(
++ cm, cpi->skin_map,
++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
++
++ free_copy_partition_data(cpi);
++ alloc_copy_partition_data(cpi);
+ if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
+ vp9_cyclic_refresh_reset_resize(cpi);
+ rc->rc_1_frame = 0;
diff --git a/gnu/packages/patches/lvm2-no-systemd.patch b/gnu/packages/patches/lvm2-no-systemd.patch
new file mode 100644
index 0000000000..f43e568bb1
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -0,0 +1,18 @@
+Fixes <https://issues.guix.gnu.org/65177>.
+
+Run 'vgchange' directly instead of attempting to run it via 'systemd-run' as
+the udev rules included in lvm2 >= 2.03.14 do.
+
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index ff1568145..8879a2ef9 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
+@@ -76,7 +76,7 @@ LABEL="lvm_scan"
+ # it's better suited to appearing in the journal.
+
+ IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
+-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
+ GOTO="lvm_end"
+
+ LABEL="lvm_end"
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/miniz-for-pytorch.patch b/gnu/packages/patches/miniz-for-pytorch.patch
new file mode 100644
index 0000000000..19fa705a31
--- /dev/null
+++ b/gnu/packages/patches/miniz-for-pytorch.patch
@@ -0,0 +1,47 @@
+Modifications from the internal fork of the python-pytorch package.
+
+diff --git a/miniz.h b/miniz.h
+index 42e1ea2..5869ab9 100644
+--- a/miniz.h
++++ b/miniz.h
+@@ -123,7 +123,7 @@
+ /* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */
+ /* get/set file times, and the C run-time funcs that get/set times won't be called. */
+ /* The current downside is the times written to your archives will be from 1979. */
+-/*#define MINIZ_NO_TIME */
++#define MINIZ_NO_TIME
+
+ /* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */
+ /*#define MINIZ_NO_ARCHIVE_APIS */
+@@ -135,7 +135,7 @@
+ /*#define MINIZ_NO_ZLIB_APIS */
+
+ /* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
+-/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
++#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+
+ /* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
+ Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
+@@ -172,8 +172,7 @@
+ #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES)
+ #if MINIZ_X86_OR_X64_CPU
+ /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */
+-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
+-#define MINIZ_UNALIGNED_USE_MEMCPY
++#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+ #else
+ #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+ #endif
+diff --git a/miniz_zip.h b/miniz_zip.h
+index 82502bd..3d92255 100644
+--- a/miniz_zip.h
++++ b/miniz_zip.h
+@@ -150,7 +150,7 @@ typedef enum {
+ MZ_ZIP_TOTAL_ERRORS
+ } mz_zip_error;
+
+-typedef struct
++typedef struct mz_zip_archive
+ {
+ mz_uint64 m_archive_size;
+ mz_uint64 m_central_directory_file_ofs;
diff --git a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch b/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch
deleted file mode 100644
index d7cd1c0d28..0000000000
--- a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7554aefc886d4ebc4b4c139a5cddcab6163cf72f Mon Sep 17 00:00:00 2001
-From: Vinicius Monego <monego@posteo.net>
-Date: Thu, 30 Sep 2021 23:37:29 -0300
-Subject: [PATCH] Link QtScriptByteArray with QtScript.
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 492ccae..05fec08 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2077,7 +2077,7 @@ add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL
- lib/qtscript-bytearray/bytearrayprototype.cpp
- )
- set_target_properties(QtScriptByteArray PROPERTIES AUTOMOC ON)
--target_link_libraries(QtScriptByteArray Qt5::Core)
-+target_link_libraries(QtScriptByteArray Qt5::Core Qt5::Script)
- target_include_directories(mixxx-lib SYSTEM PUBLIC lib/qtscript-bytearray)
- target_link_libraries(mixxx-lib PRIVATE QtScriptByteArray)
-
---
-2.30.2
-
diff --git a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch b/gnu/packages/patches/mixxx-system-googletest-benchmark.patch
deleted file mode 100644
index 7adbe66208..0000000000
--- a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eb2079d467f8658eea13e2ed86cc69d864632866 Mon Sep 17 00:00:00 2001
-From: Vinicius Monego <monego@posteo.net>
-Date: Wed, 29 Sep 2021 19:07:35 -0300
-Subject: [PATCH] Use system googletest and benchmark.
-
----
- CMakeLists.txt | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10e9b0a..492ccae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1467,12 +1467,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Pass Mixxx compiler/linker options to
- # Prevent installation of GoogleTest libraries
- set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE)
-
--# Add googletest directly to our build. This adds the following targets:
--# gtest, gtest_main, gmock and gmock_main
--add_subdirectory(
-- "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest"
-- "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest"
--)
-+find_package(GTest CONFIG REQUIRED)
-
- add_executable(mixxx-test
- src/test/analyserwaveformtest.cpp
-@@ -1582,10 +1577,8 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
- # Prevent installation of google/benchmark artifacts
- set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE)
-
--add_subdirectory(
-- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark"
-- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark"
--)
-+find_package(benchmark CONFIG REQUIRED)
-+
- target_link_libraries(mixxx-test PRIVATE benchmark)
-
- # Test Suite
---
-2.30.2
-
diff --git a/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch b/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch
deleted file mode 100644
index c3fcfbbd0e..0000000000
--- a/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 21507b3600c616bca7049004eb518cf11f45f299 Mon Sep 17 00:00:00 2001
-From: "Anthony J. Bentley" <anthony@cathet.us>
-Date: Sun, 7 Jun 2015 02:41:28 -0600
-Subject: [PATCH] Correct the path to the GLEW header.
-
----
- src/glshader.cpp | 2 +-
- src/rgl.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/glshader.cpp b/src/glshader.cpp
-index 4729945..a8947ea 100644
---- a/src/glshader.cpp
-+++ b/src/glshader.cpp
-@@ -23,7 +23,7 @@
- #include <stdio.h>
- #include <string.h>
- #include "rgl_assert.h"
--#include <glew.h>
-+#include <GL/glew.h>
- #if defined(__MACOSX__)
- #include <OpenGL/gl.h>
- #include <OpenGL/glext.h>
-diff --git a/src/rgl.h b/src/rgl.h
-index c15f93f..1748406 100644
---- a/src/rgl.h
-+++ b/src/rgl.h
-@@ -26,7 +26,7 @@
- #include "rgl_assert.h"
- #include "rdp.h"
-
--#include <glew.h>
-+#include <GL/glew.h>
- #if defined(__MACOSX__)
- #include <OpenGL/gl.h>
- #elif defined(__MACOS__)
diff --git a/gnu/packages/patches/openjdk-10-char-reproducibility.patch b/gnu/packages/patches/openjdk-10-char-reproducibility.patch
new file mode 100644
index 0000000000..a7932678af
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-char-reproducibility.patch
@@ -0,0 +1,12 @@
+Danny
+--- orig/jdk-6fa770f9f8ab/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java 2022-04-13 19:24:10.211683257 +0200
++++ jdk-6fa770f9f8ab/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java 2022-04-13 22:51:50.680487330 +0200
+@@ -693,7 +693,7 @@
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
+ out.println(commentStart +
+ " This file was generated AUTOMATICALLY from a template file " +
+- new java.util.Date() + commentEnd);
++ (System.getenv("SOURCE_DATE_EPOCH") == null ? new java.util.Date() : new java.util.Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))) + commentEnd);
+ int marklen = commandMarker.length();
+ LOOP: while(true) {
+ try {
diff --git a/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch
new file mode 100644
index 0000000000..e1292ba82d
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch
@@ -0,0 +1,27 @@
+--- orig/jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk 2022-04-04 17:16:29.365930149 +0200
++++ jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk 2022-04-04 17:16:54.954624358 +0200
+@@ -61,11 +61,12 @@
+ $(call MakeDir, $(LINK_OPT_DIR))
+ $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
+ $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
+- $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
++ $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
+ -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
+ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
+ build.tools.classlist.HelloClasslist \
+ $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
++ sort $@.tmp > $@
+
+ # The jli trace is created by the same recipe as classlist. By declaring these
+ # dependencies, make will correctly rebuild both jli trace and classlist
+--- orig/jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk 2022-04-13 19:24:10.191682716 +0200
++++ jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk 2022-04-13 20:58:57.891368216 +0200
+@@ -83,6 +83,8 @@
+ $(CT_MODULESOURCEPATH) \
+ $(CT_MODULES) \
+ >$(@D)/A/system-modules
++ # Make files reproducible
++ find $(@D) -exec $(TOUCH) -h -c -t 197001010000.01 {} \;
+ $(TOUCH) $@
+
+ # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro
diff --git a/gnu/packages/patches/openjdk-10-corba-reproducibility.patch b/gnu/packages/patches/openjdk-10-corba-reproducibility.patch
new file mode 100644
index 0000000000..bd5ce1fd2b
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-corba-reproducibility.patch
@@ -0,0 +1,12 @@
+Danny
+--- orig/jdk-6fa770f9f8ab/make/corba/src/classes/build/tools/logutil/MC.java 2022-04-13 19:24:10.111680549 +0200
++++ jdk-6fa770f9f8ab/make/corba/src/classes/build/tools/logutil/MC.java 2022-04-13 22:51:13.399462259 +0200
+@@ -154,7 +154,7 @@
+ groupName);
+ pw.println("//");
+ pw.printMsg("// Generated by MC.java version @, DO NOT EDIT BY HAND!", VERSION);
+- pw.printMsg("// Generated from input file @ on @", inFile, new Date());
++ pw.printMsg("// Generated from input file @ on @", inFile, System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))));
+ pw.println();
+ }
+
diff --git a/gnu/packages/patches/openjdk-10-jar-reproducibility.patch b/gnu/packages/patches/openjdk-10-jar-reproducibility.patch
new file mode 100644
index 0000000000..176eedfce6
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-jar-reproducibility.patch
@@ -0,0 +1,103 @@
+diff -ru orig/jdk-6fa770f9f8ab/make/common/JarArchive.gmk jdk-6fa770f9f8ab/make/common/JarArchive.gmk
+--- orig/jdk-6fa770f9f8ab/make/common/JarArchive.gmk 2022-04-13 19:24:10.107680441 +0200
++++ jdk-6fa770f9f8ab/make/common/JarArchive.gmk 2022-04-13 19:31:18.031271019 +0200
+@@ -251,12 +251,14 @@
+ $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
+ $$(if $$($1_EXTRA_MANIFEST_ATTR), \
+ $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
++ $(TOUCH) -h -c -t 197001010000.00 $$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $(ECHO) Creating $$($1_NAME) $$(NEWLINE) \
+ $$($1_JAR_CMD) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $$($1_SCAPTURE_CONTENTS) \
+ $$($1_SCAPTURE_METAINF) \
+ $$($1_SUPDATE_CONTENTS) \
+- $$($1_JARINDEX) && true \
++ $$($1_JARINDEX) && true $$(NEWLINE) \
++ d="`mktemp -d`" && $(CP) -f $$@ "$$$$d/a.jar" && (cd "$$$$d" && unzip a.jar META-INF/MANIFEST.MF && $(TOUCH) -h -c -t 197001010000.00 META-INF && $(TOUCH) -h -c -t 197001010000.00 META-INF/MANIFEST.MF && (zip --symlinks -0 -X a.jar META-INF META-INF/MANIFEST.MF; zip --symlinks -0 -X a.jar META-INF META-INF/MANIFEST.MF)) && $(CP) -f "$$$$d/a.jar" $$@ \
+ , \
+ $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
+ $$($1_CAPTURE_CONTENTS) \
+diff -ru orig/jdk-6fa770f9f8ab/make/JrtfsJar.gmk jdk-6fa770f9f8ab/make/JrtfsJar.gmk
+--- orig/jdk-6fa770f9f8ab/make/JrtfsJar.gmk 2022-04-13 19:24:10.091680007 +0200
++++ jdk-6fa770f9f8ab/make/JrtfsJar.gmk 2022-04-13 19:29:30.044346222 +0200
+@@ -57,13 +57,18 @@
+ # file will not be copied unless META-INF/services would also be added to the INCLUDES.
+ # Adding META-INF/services would include all files in that directory when only the one
+ # is needed, which is why this explicit copy is defined instead.
+-$(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
++$(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
+ SRC := $(TOPDIR)/src/java.base/share/classes, \
+ DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+ FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
+
++.PHONY: $(COPY_JIMAGE_SERVICE_PROVIDER)_fix
++$(COPY_JIMAGE_SERVICE_PROVIDER)_fix: $(COPY_JIMAGE_SERVICE_PROVIDER)
++ find $(SUPPORT_OUTPUTDIR)/jrtfs_classes -exec $(TOUCH) -h -c -t 197001010000.00 {} \;
++ $(TOUCH) -h -c -t 197001010000.00 $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf
++
+ $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \
+- DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \
++ DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER)_fix, \
+ SRCS := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+ JAR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar, \
+ MANIFEST := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
+diff -ru orig/jdk-6fa770f9f8ab/src/jdk.jartool/share/classes/sun/tools/jar/Main.java jdk-6fa770f9f8ab/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
+--- orig/jdk-6fa770f9f8ab/src/jdk.jartool/share/classes/sun/tools/jar/Main.java 2022-04-13 19:24:12.555746751 +0200
++++ jdk-6fa770f9f8ab/src/jdk.jartool/share/classes/sun/tools/jar/Main.java 2022-04-13 19:25:34.117955999 +0200
+@@ -849,12 +849,18 @@
+ output(getMsg("out.added.manifest"));
+ }
+ ZipEntry e = new ZipEntry(MANIFEST_DIR);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ e.setSize(0);
+ e.setCrc(0);
+ zos.putNextEntry(e);
+ e = new ZipEntry(MANIFEST_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32Manifest(e, manifest);
+ }
+@@ -1021,7 +1027,10 @@
+ throws IOException
+ {
+ ZipEntry e = new ZipEntry(INDEX_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ CRC32OutputStream os = new CRC32OutputStream();
+ index.write(os);
+@@ -1040,7 +1049,10 @@
+ String name = mi.getKey();
+ byte[] bytes = mi.getValue();
+ ZipEntry e = new ZipEntry(name);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32ModuleInfo(e, bytes);
+ }
+@@ -1065,7 +1077,10 @@
+ addMultiRelease(m);
+ }
+ ZipEntry e = new ZipEntry(MANIFEST_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32Manifest(e, m);
+ }
diff --git a/gnu/packages/patches/openjdk-10-jtask-reproducibility.patch b/gnu/packages/patches/openjdk-10-jtask-reproducibility.patch
new file mode 100644
index 0000000000..3411ca12ae
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-jtask-reproducibility.patch
@@ -0,0 +1,53 @@
+--- jdk-10/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java.orig 2022-04-04 11:18:52.760626467 +0200
++++ jdk-10/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java 2022-04-04 12:03:40.645325687 +0200
+@@ -105,6 +105,7 @@
+ import jdk.internal.module.ModuleTarget;
+ import jdk.internal.module.Resources;
+ import jdk.tools.jlink.internal.Utils;
++import java.util.TreeSet;
+
+ import static java.util.stream.Collectors.joining;
+
+@@ -768,6 +769,7 @@
+ void processSection(JmodOutputStream out, Section section, Path path)
+ throws IOException
+ {
++ TreeSet<Path> paths = new TreeSet<>();
+ Files.walkFileTree(path, Set.of(FileVisitOption.FOLLOW_LINKS),
+ Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
+ @Override
+@@ -781,20 +783,24 @@
+
+ if (!relPath.toString().equals(MODULE_INFO)
+ && !matches(relPath, excludes)) {
+- try (InputStream in = Files.newInputStream(file)) {
+- out.writeEntry(in, section, relPath.toString());
+- } catch (IOException x) {
+- if (x.getMessage().contains("duplicate entry")) {
+- warning("warn.ignore.duplicate.entry",
+- relPath.toString(), section);
+- return FileVisitResult.CONTINUE;
+- }
+- throw x;
+- }
++ paths.add(file);
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
++ for (Path file : paths) {
++ Path relPath = path.relativize(file);
++ try (InputStream in = Files.newInputStream(file)) {
++ out.writeEntry(in, section, relPath.toString());
++ } catch (IOException x) {
++ if (x.getMessage().contains("duplicate entry")) {
++ warning("warn.ignore.duplicate.entry",
++ relPath.toString(), section);
++ continue;
++ }
++ throw x;
++ }
++ }
+ }
+
+ boolean matches(Path path, List<PathMatcher> matchers) {
diff --git a/gnu/packages/patches/openjdk-10-module-reproducibility.patch b/gnu/packages/patches/openjdk-10-module-reproducibility.patch
new file mode 100644
index 0000000000..165edd3b4a
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-module-reproducibility.patch
@@ -0,0 +1,305 @@
+From a52c4ef44c0553a399a8a47e528db92e3bf51c6c Mon Sep 17 00:00:00 2001
+From: Alan Bateman <alanb@openjdk.org>
+Date: Wed, 29 Apr 2020 08:38:28 +0100
+Subject: [PATCH] 8243666: ModuleHashes attribute generated for JMOD and JAR
+ files depends on timestamps
+
+Reviewed-by: mchung
+---
+
+--- orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java 2022-04-13 19:24:10.655695284 +0200
++++ jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java 2022-04-14 02:43:48.610326492 +0200
+@@ -27,9 +27,8 @@
+
+ import java.io.PrintStream;
+ import java.lang.module.Configuration;
++import java.lang.module.ModuleReference;
+ import java.lang.module.ResolvedModule;
+-import java.net.URI;
+-import java.nio.file.Path;
+ import java.nio.file.Paths;
+ import java.util.ArrayDeque;
+ import java.util.Collections;
+@@ -39,8 +38,8 @@
+ import java.util.LinkedList;
+ import java.util.Map;
+ import java.util.Set;
++import java.util.TreeMap;
+ import java.util.function.Consumer;
+-import java.util.function.Function;
+ import java.util.stream.Stream;
+ import static java.util.stream.Collectors.*;
+
+@@ -101,7 +100,7 @@
+ // the modules to record the hashes - it is the first matching
+ // module and has not been hashed during the traversal.
+ Set<String> mods = new HashSet<>();
+- Map<String, ModuleHashes> hashes = new HashMap<>();
++ Map<String, ModuleHashes> hashes = new TreeMap<>();
+ builder.build()
+ .orderedNodes()
+ .filter(mn -> roots.contains(mn) && !mods.contains(mn))
+@@ -116,27 +115,17 @@
+ mods.addAll(ns);
+
+ if (!ns.isEmpty()) {
+- Map<String, Path> moduleToPath = ns.stream()
+- .collect(toMap(Function.identity(), this::moduleToPath));
+- hashes.put(mn, ModuleHashes.generate(moduleToPath, "SHA-256"));
++ Set<ModuleReference> mrefs = ns.stream()
++ .map(name -> configuration.findModule(name)
++ .orElseThrow(InternalError::new))
++ .map(ResolvedModule::reference)
++ .collect(toSet());
++ hashes.put(mn, ModuleHashes.generate(mrefs, "SHA-256"));
+ }
+ });
+ return hashes;
+ }
+
+- private Path moduleToPath(String name) {
+- ResolvedModule rm = configuration.findModule(name).orElseThrow(
+- () -> new InternalError("Selected module " + name + " not on module path"));
+-
+- URI uri = rm.reference().location().get();
+- Path path = Paths.get(uri);
+- String fn = path.getFileName().toString();
+- if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
+- throw new UnsupportedOperationException(path + " is not a modular JAR or jmod file");
+- }
+- return path;
+- }
+-
+ /*
+ * Utility class
+ */diff -ru orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
+--- orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java 2022-04-12 16:58:05.639985936 +0200
+@@ -26,17 +26,21 @@
+ package jdk.internal.module;
+
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.io.UncheckedIOException;
+-import java.nio.ByteBuffer;
+-import java.nio.channels.FileChannel;
+-import java.nio.file.Path;
++import java.lang.module.ModuleReader;
++import java.lang.module.ModuleReference;
++import java.nio.charset.StandardCharsets;
+ import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
++import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Objects;
+ import java.util.Set;
++import java.util.TreeMap;
++import java.util.function.Supplier;
+
+ /**
+ * The result of hashing the contents of a number of module artifacts.
+@@ -60,8 +64,8 @@
+ * @param algorithm the algorithm used to create the hashes
+ * @param nameToHash the map of module name to hash value
+ */
+- public ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
+- this.algorithm = algorithm;
++ ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
++ this.algorithm = Objects.requireNonNull(algorithm);
+ this.nameToHash = Collections.unmodifiableMap(nameToHash);
+ }
+
+@@ -95,54 +99,125 @@
+ }
+
+ /**
+- * Computes the hash for the given file with the given message digest
+- * algorithm.
++ * Computes a hash from the names and content of a module.
+ *
++ * @param reader the module reader to access the module content
++ * @param algorithm the name of the message digest algorithm to use
++ * @return the hash
++ * @throws IllegalArgumentException if digest algorithm is not supported
+ * @throws UncheckedIOException if an I/O error occurs
+ * @throws RuntimeException if the algorithm is not available
+ */
+- public static byte[] computeHash(Path file, String algorithm) {
++ private static byte[] computeHash(ModuleReader reader, String algorithm) {
++ MessageDigest md;
+ try {
+- MessageDigest md = MessageDigest.getInstance(algorithm);
+-
+- // Ideally we would just mmap the file but this consumes too much
+- // memory when jlink is running concurrently on very large jmods
+- try (FileChannel fc = FileChannel.open(file)) {
+- ByteBuffer bb = ByteBuffer.allocate(32*1024);
+- while (fc.read(bb) > 0) {
+- bb.flip();
+- md.update(bb);
+- assert bb.remaining() == 0;
+- bb.clear();
+- }
+- }
+-
+- return md.digest();
++ md = MessageDigest.getInstance(algorithm);
+ } catch (NoSuchAlgorithmException e) {
+- throw new RuntimeException(e);
++ throw new IllegalArgumentException(e);
++ }
++ try {
++ byte[] buf = new byte[32*1024];
++ reader.list().sorted().forEach(rn -> {
++ md.update(rn.getBytes(StandardCharsets.UTF_8));
++ try (InputStream in = reader.open(rn).orElseThrow(java.util.NoSuchElementException::new)) {
++ int n;
++ while ((n = in.read(buf)) > 0) {
++ md.update(buf, 0, n);
++ }
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
++ });
+ } catch (IOException ioe) {
+ throw new UncheckedIOException(ioe);
+ }
++ return md.digest();
+ }
+
+ /**
+- * Computes the hash for every entry in the given map, returning a
+- * {@code ModuleHashes} to encapsulate the result. The map key is
+- * the entry name, typically the module name. The map value is the file
+- * path to the entry (module artifact).
++ * Computes a hash from the names and content of a module.
+ *
++ * @param supplier supplies the module reader to access the module content
++ * @param algorithm the name of the message digest algorithm to use
++ * @return the hash
++ * @throws IllegalArgumentException if digest algorithm is not supported
++ * @throws UncheckedIOException if an I/O error occurs
++ */
++ static byte[] computeHash(Supplier<ModuleReader> supplier, String algorithm) {
++ try (ModuleReader reader = supplier.get()) {
++ return computeHash(reader, algorithm);
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
++ }
++
++ /**
++ * Computes the hash from the names and content of a set of modules. Returns
++ * a {@code ModuleHashes} to encapsulate the result.
++ * @param mrefs the set of modules
++ * @param algorithm the name of the message digest algorithm to use
+ * @return ModuleHashes that encapsulates the hashes
++ * @throws IllegalArgumentException if digest algorithm is not supported
++ * @throws UncheckedIOException if an I/O error occurs
+ */
+- public static ModuleHashes generate(Map<String, Path> map, String algorithm) {
++ static ModuleHashes generate(Set<ModuleReference> mrefs, String algorithm) {
+ Map<String, byte[]> nameToHash = new HashMap<>();
+- for (Map.Entry<String, Path> entry: map.entrySet()) {
+- String name = entry.getKey();
+- Path path = entry.getValue();
+- nameToHash.put(name, computeHash(path, algorithm));
++ for (ModuleReference mref : mrefs) {
++ try (ModuleReader reader = mref.open()) {
++ byte[] hash = computeHash(reader, algorithm);
++ nameToHash.put(mref.descriptor().name(), hash);
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
+ }
+ return new ModuleHashes(algorithm, nameToHash);
+ }
+
++ @Override
++ public int hashCode() {
++ int h = algorithm.hashCode();
++ for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
++ h = h * 31 + e.getKey().hashCode();
++ h = h * 31 + Arrays.hashCode(e.getValue());
++ }
++ return h;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ if (!(obj instanceof ModuleHashes))
++ return false;
++ ModuleHashes other = (ModuleHashes) obj;
++ if (!algorithm.equals(other.algorithm)
++ || nameToHash.size() != other.nameToHash.size())
++ return false;
++ for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
++ String name = e.getKey();
++ byte[] hash = e.getValue();
++ if (!Arrays.equals(hash, other.nameToHash.get(name)))
++ return false;
++ }
++ return true;
++ }
++
++ @Override
++ public String toString() {
++ StringBuilder sb = new StringBuilder(algorithm);
++ sb.append(" ");
++ nameToHash.entrySet()
++ .stream()
++ .sorted(Map.Entry.comparingByKey())
++ .forEach(e -> {
++ sb.append(e.getKey());
++ sb.append("=");
++ byte[] ba = e.getValue();
++ for (byte b : ba) {
++ sb.append(String.format("%02x", b & 0xff));
++ }
++ });
++ return sb.toString();
++ }
++
+ /**
+ * This is used by jdk.internal.module.SystemModules class
+ * generated at link time.
+diff -ru orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
+--- orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java 2022-04-12 16:43:12.967868689 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+diff -ru orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
+--- orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java 2022-04-12 16:43:12.971868797 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -95,7 +95,7 @@
+ Path file) {
+ URI uri = file.toUri();
+ Supplier<ModuleReader> supplier = () -> new JarModuleReader(file, uri);
+- HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
++ HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
+ return newModule(attrs, uri, supplier, patcher, hasher);
+ }
+
+@@ -105,7 +105,7 @@
+ static ModuleReference newJModModule(ModuleInfo.Attributes attrs, Path file) {
+ URI uri = file.toUri();
+ Supplier<ModuleReader> supplier = () -> new JModModuleReader(file, uri);
+- HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
++ HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
+ return newModule(attrs, uri, supplier, null, hasher);
+ }
+
diff --git a/gnu/packages/patches/openjdk-10-module3-reproducibility.patch b/gnu/packages/patches/openjdk-10-module3-reproducibility.patch
new file mode 100644
index 0000000000..bc54803bea
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-module3-reproducibility.patch
@@ -0,0 +1,34 @@
+Danny wrote.
+
+--- orig/jdk-3cc80be736f2/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 2022-04-13 17:30:37.242775977 +0200
+@@ -43,6 +43,7 @@
+ import java.util.Objects;
+ import java.util.Optional;
+ import java.util.Set;
++import java.util.TreeSet;
+ import java.util.function.Supplier;
+ import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+@@ -2155,9 +2156,9 @@
+ * @return The module descriptor
+ */
+ public ModuleDescriptor build() {
+- Set<Requires> requires = new HashSet<>(this.requires.values());
+- Set<Exports> exports = new HashSet<>(this.exports.values());
+- Set<Opens> opens = new HashSet<>(this.opens.values());
++ Set<Requires> requires = new TreeSet<>(this.requires.values());
++ Set<Exports> exports = new TreeSet<>(this.exports.values());
++ Set<Opens> opens = new TreeSet<>(this.opens.values());
+
+ // add dependency on java.base
+ if (strict
+@@ -2169,7 +2170,7 @@
+ null));
+ }
+
+- Set<Provides> provides = new HashSet<>(this.provides.values());
++ Set<Provides> provides = new TreeSet<>(this.provides.values());
+
+ return new ModuleDescriptor(name,
+ version,
diff --git a/gnu/packages/patches/openjdk-10-module4-reproducibility.patch b/gnu/packages/patches/openjdk-10-module4-reproducibility.patch
new file mode 100644
index 0000000000..051c9344eb
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-module4-reproducibility.patch
@@ -0,0 +1,14 @@
+Danny wrote it
+
+--- orig/jdk-6fa770f9f8ab/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java 2022-04-13 19:24:12.655749459 +0200
++++ jdk-6fa770f9f8ab/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java 2022-04-14 01:53:23.555465018 +0200
+@@ -861,7 +861,8 @@
+ */
+ private void genModuleReads(ClassWriter cw, Configuration cf) {
+ // module name -> names of modules that it reads
+- Map<String, Set<String>> map = cf.modules().stream()
++ Map<String, Set<String>> map = cf.modules().stream()
++ .sorted(java.util.Comparator.comparing(ResolvedModule::name))
+ .collect(Collectors.toMap(
+ ResolvedModule::name,
+ m -> m.reads().stream()
diff --git a/gnu/packages/patches/openjdk-11-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-11-classlist-reproducibility.patch
new file mode 100644
index 0000000000..2ac7c2b664
--- /dev/null
+++ b/gnu/packages/patches/openjdk-11-classlist-reproducibility.patch
@@ -0,0 +1,11 @@
+--- jdk-11.0.13-ga/make/GenerateLinkOptData.gmk.orig 2022-04-04 17:18:56.801929954 +0200
++++ jdk-11.0.13-ga/make/GenerateLinkOptData.gmk 2022-04-04 17:19:14.962422622 +0200
+@@ -66,7 +66,7 @@
+ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
+ build.tools.classlist.HelloClasslist \
+ $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
+- $(GREP) -v HelloClasslist $@.raw > $@
++ $(GREP) -v HelloClasslist $@.raw |sort > $@
+
+ # The jli trace is created by the same recipe as classlist. By declaring these
+ # dependencies, make will correctly rebuild both jli trace and classlist
diff --git a/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch
new file mode 100644
index 0000000000..326f6875ec
--- /dev/null
+++ b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch
@@ -0,0 +1,11 @@
+--- 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk.orig 2022-04-04 17:20:33.012539984 +0200
++++ 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk 2022-04-04 17:20:51.181032859 +0200
+@@ -78,7 +78,7 @@
+ $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \
+ exit $$exitcode \
+ )
+- $(GREP) -v HelloClasslist $@.raw > $@
++ $(GREP) -v HelloClasslist $@.raw | sort > $@
+
+ # The jli trace is created by the same recipe as classlist. By declaring these
+ # dependencies, make will correctly rebuild both jli trace and classlist
diff --git a/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch b/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
new file mode 100644
index 0000000000..2052983ade
--- /dev/null
+++ b/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
@@ -0,0 +1,40 @@
+--- 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java.orig 2022-04-04 10:57:40.346312924 +0200
++++ 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java 2022-04-04 11:01:38.480751902 +0200
+@@ -82,6 +82,7 @@
+ import jdk.internal.module.ModuleTarget;
+ import jdk.internal.module.Resources;
+ import jdk.tools.jlink.internal.Utils;
++import java.util.TreeSet;
+
+ import static java.util.stream.Collectors.joining;
+
+@@ -750,6 +751,7 @@
+ void processSection(JmodOutputStream out, Section section, Path path)
+ throws IOException
+ {
++ TreeSet<Path> paths = new TreeSet<>();
+ Files.walkFileTree(path, Set.of(FileVisitOption.FOLLOW_LINKS),
+ Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
+ @Override
+@@ -765,14 +767,18 @@
+ if (out.contains(section, name)) {
+ warning("warn.ignore.duplicate.entry", name, section);
+ } else {
+- try (InputStream in = Files.newInputStream(file)) {
+- out.writeEntry(in, section, name);
+- }
++ paths.add(file);
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
++
++ for (Path file : paths) {
++ try (InputStream in = Files.newInputStream(file)) {
++ out.writeEntry(in, section, path.relativize(file).toString());
++ }
++ }
+ }
+
+ boolean matches(Path path, List<PathMatcher> matchers) {
diff --git a/gnu/packages/patches/openjdk-9-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-9-classlist-reproducibility.patch
new file mode 100644
index 0000000000..d0ce7bc4d6
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-classlist-reproducibility.patch
@@ -0,0 +1,31 @@
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Wed, 18 Apr 2022 18:38:28 +0100
+Subject: Make classlist reproducible
+
+--- jdk-09/make/GenerateLinkOptData.gmk.orig 2022-04-05 10:05:35.892134188 +0200
++++ jdk-09/make/GenerateLinkOptData.gmk 2022-04-05 10:06:07.885003056 +0200
+@@ -61,11 +61,12 @@
+ $(call MakeDir, $(LINK_OPT_DIR))
+ $(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%, %, $@))
+ $(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%, %, $(JLI_TRACE_FILE)))
+- $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
++ $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
+ -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
+ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
+ build.tools.classlist.HelloClasslist \
+ $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
++ sort $@.tmp >$@
+
+ # The jli trace is created by the same recipe as classlist. By declaring these
+ # dependencies, make will correctly rebuild both jli trace and classlist
+--- jdk-09/langtools/make/gendata/Gendata-jdk.compiler.gmk.orig 2022-04-08 22:04:05.784424812 +0200
++++ jdk-09/langtools/make/gendata/Gendata-jdk.compiler.gmk 2022-04-08 22:09:36.333575143 +0200
+@@ -79,6 +79,8 @@
+ $(CT_MODULESOURCEPATH) \
+ $(CT_MODULES) \
+ >$(@D)/9/system-modules
++ # Make files reproducible
++ find $(@D) -exec $(TOUCH) -h -c -t 197001010000.01 {} \;
+ $(TOUCH) $@
+
+ # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro
diff --git a/gnu/packages/patches/openjdk-9-idlj-reproducibility.patch b/gnu/packages/patches/openjdk-9-idlj-reproducibility.patch
new file mode 100644
index 0000000000..30dcdf2496
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-idlj-reproducibility.patch
@@ -0,0 +1,37 @@
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Wed, 18 Apr 2022 19:28:00 +0100
+Subject: Make IDL reproducible
+
+--- jdk-09/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java.orig 2022-04-05 02:46:26.805340292 +0200
++++ jdk-09/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java 2022-04-05 02:48:23.152494213 +0200
+@@ -1146,7 +1146,7 @@
+ else
+ formatter.setTimeZone (java.util.TimeZone.getDefault ());
+
+- stream.println ("* " + formatter.format (new Date ()));
++ stream.println ("* " + formatter.format (System.getenv("SOURCE_DATE_EPOCH") == null ? new Date () : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))));
+
+ // <daz>
+ ///////////////
+--- jdk-09/corba/make/src/classes/build/tools/logutil/MC.java.orig 2022-04-05 11:09:43.824720493 +0200
++++ jdk-09/corba/make/src/classes/build/tools/logutil/MC.java 2022-04-05 11:10:46.518435511 +0200
+@@ -154,7 +154,7 @@
+ groupName);
+ pw.println("//");
+ pw.printMsg("// Generated by MC.java version @, DO NOT EDIT BY HAND!", VERSION);
+- pw.printMsg("// Generated from input file @ on @", inFile, new Date());
++ pw.printMsg("// Generated from input file @ on @", inFile, System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))));
+ pw.println();
+ }
+
+--- jdk-09/jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java.orig 2022-04-05 11:14:29.228526408 +0200
++++ jdk-09/jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java 2022-04-05 11:15:32.658260748 +0200
+@@ -693,7 +693,7 @@
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
+ out.println(commentStart +
+ " This file was generated AUTOMATICALLY from a template file " +
+- new java.util.Date() + commentEnd);
++ (System.getenv("SOURCE_DATE_EPOCH") == null ? new java.util.Date() : new java.util.Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))) + commentEnd);
+ int marklen = commandMarker.length();
+ LOOP: while(true) {
+ try {
diff --git a/gnu/packages/patches/openjdk-9-jar-reproducibility.patch b/gnu/packages/patches/openjdk-9-jar-reproducibility.patch
new file mode 100644
index 0000000000..130eacd867
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-jar-reproducibility.patch
@@ -0,0 +1,107 @@
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Wed, 18 Apr 2022 20:10:01 +0100
+Subject: Make JARs reproducible
+
+--- jdk-09/make/common/JarArchive.gmk.orig 2022-04-08 21:56:04.075111687 +0200
++++ jdk-09/make/common/JarArchive.gmk 2022-04-11 00:49:16.809140388 +0200
+@@ -249,12 +249,16 @@
+ $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
+ $$(if $$($1_EXTRA_MANIFEST_ATTR), \
+ $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
+- $(ECHO) Creating $$($1_NAME) $$(NEWLINE) \
++ $(TOUCH) -h -c -t 197001010000.00 $$($1_MANIFEST_FILE) $$(NEWLINE) \
++ $(ECHO) XCreating $$($1_NAME) $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $$($1_SCAPTURE_CONTENTS) \
+ $$($1_SCAPTURE_METAINF) \
+ $$($1_SUPDATE_CONTENTS) \
+- $$($1_JARINDEX) && true \
++ $$($1_JARINDEX) && true $$(NEWLINE) \
++ $(ECHO) Kreppel2 $$@ $$(NEWLINE) \
++ unzip -v $$@ $$(NEWLINE) \
++ d="`mktemp -d`" && $(CP) -f $$@ "$$$$d/a.jar" && (cd "$$$$d" && unzip a.jar META-INF/MANIFEST.MF && $(TOUCH) -h -c -t 197001010000.00 META-INF && $(TOUCH) -h -c -t 197001010000.00 META-INF/MANIFEST.MF && (zip --symlinks -0 -X a.jar META-INF META-INF/MANIFEST.MF; zip --symlinks -0 -X a.jar META-INF META-INF/MANIFEST.MF)) && $(CP) -f "$$$$d/a.jar" $$@ \
+ , \
+ $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
+ $$($1_CAPTURE_CONTENTS) \
+--- jdk-09/make/JrtfsJar.gmk.orig 2022-04-10 13:48:57.385120008 +0200
++++ jdk-09/make/JrtfsJar.gmk 2022-04-10 13:58:04.688158538 +0200
+@@ -57,13 +57,18 @@
+ # file will not be copied unless META-INF/services would also be added to the INCLUDES.
+ # Adding META-INF/services would include all files in that directory when only the one
+ # is needed, which is why this explicit copy is defined instead.
+-$(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
++$(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER1, \
+ SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+ DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+ FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
+
++.PHONY: jrtfsfixtimestamps47
++jrtfsfixtimestamps47: $(COPY_JIMAGE_SERVICE_PROVIDER1)
++ find $(SUPPORT_OUTPUTDIR)/jrtfs_classes -exec $(TOUCH) -h -c -t 197001010000.00 {} \;
++ $(TOUCH) -h -c -t 197001010000.00 $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf
++
+ $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \
+- DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \
++ DEPENDENCIES := $(BUILD_JRTFS) jrtfsfixtimestamps47, \
+ SRCS := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+ JAR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar, \
+ MANIFEST := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
+--- jdk-09/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java.orig 2022-04-10 02:05:50.983247794 +0200
++++ jdk-09/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java 2022-04-10 02:13:01.638960337 +0200
+@@ -850,12 +850,18 @@
+ output(getMsg("out.added.manifest"));
+ }
+ ZipEntry e = new ZipEntry(MANIFEST_DIR);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ e.setSize(0);
+ e.setCrc(0);
+ zos.putNextEntry(e);
+ e = new ZipEntry(MANIFEST_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32Manifest(e, manifest);
+ }
+@@ -1022,7 +1028,10 @@
+ throws IOException
+ {
+ ZipEntry e = new ZipEntry(INDEX_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ CRC32OutputStream os = new CRC32OutputStream();
+ index.write(os);
+@@ -1041,7 +1050,10 @@
+ String name = mi.getKey();
+ byte[] bytes = mi.getValue();
+ ZipEntry e = new ZipEntry(name);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32ModuleInfo(e, bytes);
+ }
+@@ -1066,7 +1078,10 @@
+ addMultiRelease(m);
+ }
+ ZipEntry e = new ZipEntry(MANIFEST_NAME);
+- e.setTime(System.currentTimeMillis());
++ if (System.getenv("SOURCE_DATE_EPOCH") != null)
++ e.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++ else
++ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32Manifest(e, m);
+ }
diff --git a/gnu/packages/patches/openjdk-9-module-reproducibility.patch b/gnu/packages/patches/openjdk-9-module-reproducibility.patch
new file mode 100644
index 0000000000..320bb7806a
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-module-reproducibility.patch
@@ -0,0 +1,297 @@
+From a52c4ef44c0553a399a8a47e528db92e3bf51c6c Mon Sep 17 00:00:00 2001
+From: Alan Bateman <alanb@openjdk.org>
+Date: Wed, 29 Apr 2020 08:38:28 +0100
+Subject: [PATCH] 8243666: ModuleHashes attribute generated for JMOD and JAR
+ files depends on timestamps
+See: https://bugs.openjdk.org/browse/JDK-8243666
+
+Reviewed-by: mchung
+---
+
+diff -ru orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java 2022-04-12 16:47:15.690423653 +0200
+@@ -27,9 +27,8 @@
+
+ import java.io.PrintStream;
+ import java.lang.module.Configuration;
++import java.lang.module.ModuleReference;
+ import java.lang.module.ResolvedModule;
+-import java.net.URI;
+-import java.nio.file.Path;
+ import java.nio.file.Paths;
+ import java.util.ArrayDeque;
+ import java.util.Collections;
+@@ -40,7 +39,6 @@
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.function.Consumer;
+-import java.util.function.Function;
+ import java.util.stream.Stream;
+ import static java.util.stream.Collectors.*;
+
+@@ -116,27 +114,17 @@
+ mods.addAll(ns);
+
+ if (!ns.isEmpty()) {
+- Map<String, Path> moduleToPath = ns.stream()
+- .collect(toMap(Function.identity(), this::moduleToPath));
+- hashes.put(mn, ModuleHashes.generate(moduleToPath, "SHA-256"));
++ Set<ModuleReference> mrefs = ns.stream()
++ .map(name -> configuration.findModule(name)
++ .orElseThrow(InternalError::new))
++ .map(ResolvedModule::reference)
++ .collect(toSet());
++ hashes.put(mn, ModuleHashes.generate(mrefs, "SHA-256"));
+ }
+ });
+ return hashes;
+ }
+
+- private Path moduleToPath(String name) {
+- ResolvedModule rm = configuration.findModule(name).orElseThrow(
+- () -> new InternalError("Selected module " + name + " not on module path"));
+-
+- URI uri = rm.reference().location().get();
+- Path path = Paths.get(uri);
+- String fn = path.getFileName().toString();
+- if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
+- throw new UnsupportedOperationException(path + " is not a modular JAR or jmod file");
+- }
+- return path;
+- }
+-
+ /*
+ * Utility class
+ */
+diff -ru orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
+--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java 2022-04-12 16:58:05.639985936 +0200
+@@ -26,17 +26,21 @@
+ package jdk.internal.module;
+
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.io.UncheckedIOException;
+-import java.nio.ByteBuffer;
+-import java.nio.channels.FileChannel;
+-import java.nio.file.Path;
++import java.lang.module.ModuleReader;
++import java.lang.module.ModuleReference;
++import java.nio.charset.StandardCharsets;
+ import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
++import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Objects;
+ import java.util.Set;
++import java.util.TreeMap;
++import java.util.function.Supplier;
+
+ /**
+ * The result of hashing the contents of a number of module artifacts.
+@@ -60,8 +64,8 @@
+ * @param algorithm the algorithm used to create the hashes
+ * @param nameToHash the map of module name to hash value
+ */
+- public ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
+- this.algorithm = algorithm;
++ ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
++ this.algorithm = Objects.requireNonNull(algorithm);
+ this.nameToHash = Collections.unmodifiableMap(nameToHash);
+ }
+
+@@ -95,54 +99,125 @@
+ }
+
+ /**
+- * Computes the hash for the given file with the given message digest
+- * algorithm.
++ * Computes a hash from the names and content of a module.
+ *
++ * @param reader the module reader to access the module content
++ * @param algorithm the name of the message digest algorithm to use
++ * @return the hash
++ * @throws IllegalArgumentException if digest algorithm is not supported
+ * @throws UncheckedIOException if an I/O error occurs
+ * @throws RuntimeException if the algorithm is not available
+ */
+- public static byte[] computeHash(Path file, String algorithm) {
++ private static byte[] computeHash(ModuleReader reader, String algorithm) {
++ MessageDigest md;
+ try {
+- MessageDigest md = MessageDigest.getInstance(algorithm);
+-
+- // Ideally we would just mmap the file but this consumes too much
+- // memory when jlink is running concurrently on very large jmods
+- try (FileChannel fc = FileChannel.open(file)) {
+- ByteBuffer bb = ByteBuffer.allocate(32*1024);
+- while (fc.read(bb) > 0) {
+- bb.flip();
+- md.update(bb);
+- assert bb.remaining() == 0;
+- bb.clear();
+- }
+- }
+-
+- return md.digest();
++ md = MessageDigest.getInstance(algorithm);
+ } catch (NoSuchAlgorithmException e) {
+- throw new RuntimeException(e);
++ throw new IllegalArgumentException(e);
++ }
++ try {
++ byte[] buf = new byte[32*1024];
++ reader.list().sorted().forEach(rn -> {
++ md.update(rn.getBytes(StandardCharsets.UTF_8));
++ try (InputStream in = reader.open(rn).orElseThrow(java.util.NoSuchElementException::new)) {
++ int n;
++ while ((n = in.read(buf)) > 0) {
++ md.update(buf, 0, n);
++ }
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
++ });
+ } catch (IOException ioe) {
+ throw new UncheckedIOException(ioe);
+ }
++ return md.digest();
+ }
+
+ /**
+- * Computes the hash for every entry in the given map, returning a
+- * {@code ModuleHashes} to encapsulate the result. The map key is
+- * the entry name, typically the module name. The map value is the file
+- * path to the entry (module artifact).
++ * Computes a hash from the names and content of a module.
+ *
++ * @param supplier supplies the module reader to access the module content
++ * @param algorithm the name of the message digest algorithm to use
++ * @return the hash
++ * @throws IllegalArgumentException if digest algorithm is not supported
++ * @throws UncheckedIOException if an I/O error occurs
++ */
++ static byte[] computeHash(Supplier<ModuleReader> supplier, String algorithm) {
++ try (ModuleReader reader = supplier.get()) {
++ return computeHash(reader, algorithm);
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
++ }
++
++ /**
++ * Computes the hash from the names and content of a set of modules. Returns
++ * a {@code ModuleHashes} to encapsulate the result.
++ * @param mrefs the set of modules
++ * @param algorithm the name of the message digest algorithm to use
+ * @return ModuleHashes that encapsulates the hashes
++ * @throws IllegalArgumentException if digest algorithm is not supported
++ * @throws UncheckedIOException if an I/O error occurs
+ */
+- public static ModuleHashes generate(Map<String, Path> map, String algorithm) {
++ static ModuleHashes generate(Set<ModuleReference> mrefs, String algorithm) {
+ Map<String, byte[]> nameToHash = new HashMap<>();
+- for (Map.Entry<String, Path> entry: map.entrySet()) {
+- String name = entry.getKey();
+- Path path = entry.getValue();
+- nameToHash.put(name, computeHash(path, algorithm));
++ for (ModuleReference mref : mrefs) {
++ try (ModuleReader reader = mref.open()) {
++ byte[] hash = computeHash(reader, algorithm);
++ nameToHash.put(mref.descriptor().name(), hash);
++ } catch (IOException ioe) {
++ throw new UncheckedIOException(ioe);
++ }
+ }
+ return new ModuleHashes(algorithm, nameToHash);
+ }
+
++ @Override
++ public int hashCode() {
++ int h = algorithm.hashCode();
++ for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
++ h = h * 31 + e.getKey().hashCode();
++ h = h * 31 + Arrays.hashCode(e.getValue());
++ }
++ return h;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ if (!(obj instanceof ModuleHashes))
++ return false;
++ ModuleHashes other = (ModuleHashes) obj;
++ if (!algorithm.equals(other.algorithm)
++ || nameToHash.size() != other.nameToHash.size())
++ return false;
++ for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
++ String name = e.getKey();
++ byte[] hash = e.getValue();
++ if (!Arrays.equals(hash, other.nameToHash.get(name)))
++ return false;
++ }
++ return true;
++ }
++
++ @Override
++ public String toString() {
++ StringBuilder sb = new StringBuilder(algorithm);
++ sb.append(" ");
++ nameToHash.entrySet()
++ .stream()
++ .sorted(Map.Entry.comparingByKey())
++ .forEach(e -> {
++ sb.append(e.getKey());
++ sb.append("=");
++ byte[] ba = e.getValue();
++ for (byte b : ba) {
++ sb.append(String.format("%02x", b & 0xff));
++ }
++ });
++ return sb.toString();
++ }
++
+ /**
+ * This is used by jdk.internal.module.SystemModules class
+ * generated at link time.
+diff -ru orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
+--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java 2022-04-12 16:43:12.967868689 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+diff -ru orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
+--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java 2022-04-12 16:43:12.971868797 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -95,7 +95,7 @@
+ Path file) {
+ URI uri = file.toUri();
+ Supplier<ModuleReader> supplier = () -> new JarModuleReader(file, uri);
+- HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
++ HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
+ return newModule(attrs, uri, supplier, patcher, hasher);
+ }
+
+@@ -105,7 +105,7 @@
+ static ModuleReference newJModModule(ModuleInfo.Attributes attrs, Path file) {
+ URI uri = file.toUri();
+ Supplier<ModuleReader> supplier = () -> new JModModuleReader(file, uri);
+- HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
++ HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
+ return newModule(attrs, uri, supplier, null, hasher);
+ }
+
diff --git a/gnu/packages/patches/openjdk-9-module2-reproducibility.patch b/gnu/packages/patches/openjdk-9-module2-reproducibility.patch
new file mode 100644
index 0000000000..f167d94dc8
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-module2-reproducibility.patch
@@ -0,0 +1,125 @@
+Backport from openjdk 10
+
+--- orig/jdk-3cc80be736f2/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java 2022-04-12 20:48:04.474353305 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -30,13 +30,16 @@
+ import jdk.tools.jlink.plugin.ResourcePoolModuleView;
+
+ import java.lang.module.ModuleDescriptor;
++import java.lang.module.ModuleDescriptor.Requires;
+ import java.lang.module.ModuleDescriptor.Requires.Modifier;
+
+ import java.nio.ByteBuffer;
+-import java.util.Deque;
++import java.util.ArrayList;
++import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.HashSet;
+-import java.util.LinkedList;
++import java.util.LinkedHashSet;
++import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.stream.Stream;
+@@ -45,9 +48,8 @@
+ * Helper class to sort modules in topological order
+ */
+ public final class ModuleSorter {
+- private final Deque<ResourcePoolModule> nodes = new LinkedList<>();
+- private final Map<String, Set<ResourcePoolModule>> edges = new HashMap<>();
+- private final Deque<ResourcePoolModule> result = new LinkedList<>();
++ private final Map<ResourcePoolModule, Set<ResourcePoolModule>> graph = new HashMap<>();
++ private final List<ResourcePoolModule> result = new ArrayList<>();
+
+ private final ResourcePoolModuleView moduleView;
+
+@@ -69,11 +71,17 @@
+
+ private ModuleSorter addModule(ResourcePoolModule module) {
+ addNode(module);
+- readModuleDescriptor(module).requires().forEach(req -> {
++ // the module graph will be traversed in a stable order for
++ // the topological sort. So add the dependences in the module name order
++ readModuleDescriptor(module).requires()
++ .stream()
++ .sorted(Comparator.comparing(Requires::name))
++ .forEach(req ->
++ {
+ ResourcePoolModule dep = moduleView.findModule(req.name()).orElse(null);
+ if (dep != null) {
+ addNode(dep);
+- edges.get(module.name()).add(dep);
++ graph.get(module).add(dep);
+ } else if (!req.modifiers().contains(Modifier.STATIC)) {
+ throw new PluginException(req.name() + " not found");
+ }
+@@ -82,22 +90,23 @@
+ }
+
+ private void addNode(ResourcePoolModule module) {
+- nodes.add(module);
+- edges.computeIfAbsent(module.name(), _n -> new HashSet<>());
++ graph.computeIfAbsent(module, _n -> new LinkedHashSet<>());
+ }
+
++ /*
++ * The module graph will be traversed in a stable order
++ * (traversing the modules and their dependences in alphabetical order)
++ * so that it will produce the same result of a given module graph.
++ */
+ private synchronized void build() {
+- if (!result.isEmpty() || nodes.isEmpty())
++ if (!result.isEmpty() || graph.isEmpty())
+ return;
+
+- Deque<ResourcePoolModule> visited = new LinkedList<>();
+- Deque<ResourcePoolModule> done = new LinkedList<>();
+- ResourcePoolModule node;
+- while ((node = nodes.poll()) != null) {
+- if (!visited.contains(node)) {
+- visit(node, visited, done);
+- }
+- }
++ Set<ResourcePoolModule> visited = new HashSet<>();
++ Set<ResourcePoolModule> done = new HashSet<>();
++ graph.keySet().stream()
++ .sorted(Comparator.comparing(ResourcePoolModule::name))
++ .forEach(node -> visit(node, visited, done));
+ }
+
+ public Stream<ResourcePoolModule> sorted() {
+@@ -106,19 +115,21 @@
+ }
+
+ private void visit(ResourcePoolModule node,
+- Deque<ResourcePoolModule> visited,
+- Deque<ResourcePoolModule> done) {
++ Set<ResourcePoolModule> visited,
++ Set<ResourcePoolModule> done) {
+ if (visited.contains(node)) {
+ if (!done.contains(node)) {
+ throw new IllegalArgumentException("Cyclic detected: " +
+- node + " " + edges.get(node.name()));
++ node + " " + graph.get(node));
+ }
+ return;
+ }
++
++ // traverse the dependences of the given module which are
++ // also sorted in alphabetical order
+ visited.add(node);
+- edges.get(node.name())
+- .forEach(x -> visit(x, visited, done));
++ graph.get(node).forEach(x -> visit(x, visited, done));
+ done.add(node);
+- result.addLast(node);
++ result.add(node);
+ }
+ }
diff --git a/gnu/packages/patches/openjdk-9-module3-reproducibility.patch b/gnu/packages/patches/openjdk-9-module3-reproducibility.patch
new file mode 100644
index 0000000000..9db54f5531
--- /dev/null
+++ b/gnu/packages/patches/openjdk-9-module3-reproducibility.patch
@@ -0,0 +1,36 @@
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Wed, 18 Apr 2022 21:50:00 +0100
+Subject: Make module descriptor reproducible
+
+--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 1970-01-01 01:00:01.000000000 +0100
++++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 2022-04-13 17:30:37.242775977 +0200
+@@ -43,6 +43,7 @@
+ import java.util.Objects;
+ import java.util.Optional;
+ import java.util.Set;
++import java.util.TreeSet;
+ import java.util.function.Supplier;
+ import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+@@ -2155,9 +2156,9 @@
+ * @return The module descriptor
+ */
+ public ModuleDescriptor build() {
+- Set<Requires> requires = new HashSet<>(this.requires.values());
+- Set<Exports> exports = new HashSet<>(this.exports.values());
+- Set<Opens> opens = new HashSet<>(this.opens.values());
++ Set<Requires> requires = new TreeSet<>(this.requires.values());
++ Set<Exports> exports = new TreeSet<>(this.exports.values());
++ Set<Opens> opens = new TreeSet<>(this.opens.values());
+
+ // add dependency on java.base
+ if (strict
+@@ -2169,7 +2170,7 @@
+ null));
+ }
+
+- Set<Provides> provides = new HashSet<>(this.provides.values());
++ Set<Provides> provides = new TreeSet<>(this.provides.values());
+
+ return new ModuleDescriptor(name,
+ version,
diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch
index ad70ebd6f2..29a91fe595 100644
--- a/gnu/packages/patches/openresolv-restartcmd-guix.patch
+++ b/gnu/packages/patches/openresolv-restartcmd-guix.patch
@@ -1,4 +1,4 @@
-From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001
+From 439266671bbd790b3cb339c157c87db382e85c96 Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Sat, 9 May 2020 15:52:06 +0200
Subject: [PATCH] Add RESTARTCMD for Guix System.
@@ -12,13 +12,13 @@ to do it on Guix System by using shepherd.
1 file changed, 7 insertions(+)
diff --git a/resolvconf.in b/resolvconf.in
-index 3cad04d..5ef5294 100644
+index aa77ffe..921882e 100644
--- a/resolvconf.in
+++ b/resolvconf.in
-@@ -369,6 +369,13 @@ detect_init()
- then
- /etc/rc.d/$1 restart
+@@ -375,6 +375,13 @@ detect_init()
fi'
+ elif [ -d /etc/dinit.d ] && command -v dinitctl >/dev/null 2>&1; then
+ RESTARTCMD='dinitctl --quiet restart --ignore-unstarted $1'
+ elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then
+ # Guix System
+ RESTARTCMD='
@@ -30,5 +30,5 @@ index 3cad04d..5ef5294 100644
for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do
[ -d $x ] || continue
--
-2.26.0
+2.41.0
diff --git a/gnu/packages/patches/openscad-fix-boost-join.patch b/gnu/packages/patches/openscad-fix-boost-join.patch
new file mode 100644
index 0000000000..1347c2746a
--- /dev/null
+++ b/gnu/packages/patches/openscad-fix-boost-join.patch
@@ -0,0 +1,62 @@
+From 08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Wed, 2 Feb 2022 00:50:43 +0100
+Subject: [PATCH] Fix build issue with overloaded join().
+
+---
+ src/openscad.cc | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/openscad.cc b/src/openscad.cc
+index a6f648d2a2..3c46cda2af 100644
+--- a/src/openscad.cc
++++ b/src/openscad.cc
+@@ -65,7 +65,6 @@
+ #include <chrono>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/split.hpp>
+-#include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/transformed.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem.hpp>
+@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
+ }
+
+ if (exit_if_not_found) {
+- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
++ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
+
+ exit(1);
+ } else {
+@@ -885,7 +884,7 @@ struct CommaSeparatedVector
+ };
+
+ template <class Seq, typename ToString>
+-std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
++std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
+ {
+ return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
+ }
+@@ -947,7 +946,7 @@ int main(int argc, char **argv)
+ ("P,P", po::value<string>(), "customizer parameter set")
+ #ifdef ENABLE_EXPERIMENTAL
+ ("enable", po::value<vector<string>>(), ("enable experimental features: " +
+- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
++ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
+ [](const Feature *feature) {
+ return feature->get_name();
+ }) +
+@@ -964,11 +963,11 @@ int main(int argc, char **argv)
+ ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
+ ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
+ ("animate", po::value<unsigned>(), "export N animated frames")
+- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
++ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
+ ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
+ ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
+ ("colorscheme", po::value<string>(), ("=colorscheme: " +
+- join(ColorMap::inst()->colorSchemeNames(), " | ",
++ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
+ [](const std::string& colorScheme) {
+ return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
+ }) +
diff --git a/gnu/packages/patches/openscad-with-cgal-5.3.patch b/gnu/packages/patches/openscad-with-cgal-5.3.patch
new file mode 100644
index 0000000000..dc3c1caa3b
--- /dev/null
+++ b/gnu/packages/patches/openscad-with-cgal-5.3.patch
@@ -0,0 +1,47 @@
+From 9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
+From: Jordan Brown <github@jordan.maileater.net>
+Date: Sun, 18 Jul 2021 21:01:46 -0700
+Subject: [PATCH] Fix build failure with "generic_print_polyhedron" on
+ CGAL-5.3.
+
+---
+ src/cgalutils-polyhedron.cc | 13 -------------
+ src/cgalutils.h | 1 -
+ 2 files changed, 14 deletions(-)
+
+diff --git a/src/cgalutils-polyhedron.cc b/src/cgalutils-polyhedron.cc
+index 9f4f98f623..41cca4b3f2 100644
+--- a/src/cgalutils-polyhedron.cc
++++ b/src/cgalutils-polyhedron.cc
+@@ -337,19 +337,6 @@ namespace CGALUtils {
+ }
+ };
+
+- template <typename Polyhedron>
+- std::string printPolyhedron(const Polyhedron &p) {
+- std::ostringstream sstream;
+- sstream.precision(20);
+-
+- Polyhedron_writer writer;
+- generic_print_polyhedron(sstream, p, writer);
+-
+- return sstream.str();
+- }
+-
+- template std::string printPolyhedron(const CGAL_Polyhedron &p);
+-
+ }; // namespace CGALUtils
+
+ #endif /* ENABLE_CGAL */
+diff --git a/src/cgalutils.h b/src/cgalutils.h
+index 21a01cdba6..c08a3aa7df 100644
+--- a/src/cgalutils.h
++++ b/src/cgalutils.h
+@@ -45,7 +45,6 @@ namespace CGALUtils {
+ bool is_approximately_convex(const PolySet &ps);
+ Geometry const* applyMinkowski(const Geometry::Geometries &children);
+
+- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
+ template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
+ template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
+ template <class Polyhedron_A, class Polyhedron_B>
diff --git a/gnu/packages/patches/openscad-with-cgal-5.4.patch b/gnu/packages/patches/openscad-with-cgal-5.4.patch
new file mode 100644
index 0000000000..f1fedc2cd8
--- /dev/null
+++ b/gnu/packages/patches/openscad-with-cgal-5.4.patch
@@ -0,0 +1,38 @@
+From abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Wed, 2 Feb 2022 02:30:59 +0100
+Subject: [PATCH] CGAL build fix, v5.4 renames projection traits header files
+ and classes.
+
+---
+ src/cgalutils-tess.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/cgalutils-tess.cc b/src/cgalutils-tess.cc
+index ec1cc1eeb3..37f8cf08b1 100644
+--- a/src/cgalutils-tess.cc
++++ b/src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #pragma push_macro("NDEBUG")
+ #undef NDEBUG
+ #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
+- #include <CGAL/Triangulation_2_projection_traits_3.h>
++#if CGAL_VERSION_NR < 1050401000
++#include <CGAL/Triangulation_2_projection_traits_3.h>
++typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ #else
+- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
++#include <CGAL/Projection_traits_3.h>
++typedef CGAL::Filtered_projection_traits_3<K> Projection;
+ #endif
+ #include <CGAL/Triangulation_face_base_with_info_2.h>
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+ bool in_domain() { return nesting_level%2 == 1; }
+ };
+
+-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
+ typedef CGAL::Triangulation_data_structure_2<
+ CGAL::Triangulation_vertex_base_2<Projection>,
diff --git a/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch b/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
deleted file mode 100644
index 5f37bb0ba7..0000000000
--- a/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Rather than unconditionally using Mozilla's CA certificates, let the user tell
-LWP's UserAgent where to find certificates with the PERL_LWP_SSL_CA_FILE,
-HTTPS_CA_FILE, PERL_LWP_SSL_CA_PATH, or HTTPS_CA_DIR environment variables
-instead.
-
---- Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm.orig 2015-02-01 13:24:41.000000000 -0600
-+++ Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm 2015-07-07 20:09:47.278885944 -0500
-@@ -30,7 +30,6 @@
- package Finance::Quote::Tiaacref;
- require 5.005;
- require LWP::Protocol::https;
--require Mozilla::CA;
-
- use strict;
-
diff --git a/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch b/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch
deleted file mode 100644
index 8a075fa74c..0000000000
--- a/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-Submitted upstream: https://github.com/mquinson/po4a/pull/437
-
-From 43db5c0b14ec2a8ba44d338bce024df87256457b Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Thu, 27 Jul 2023 17:44:49 -0400
-Subject: [PATCH] lib: Texinfo: Translate partial menu node names.
-
-Fixes <https://issues.guix.gnu.org/64881>.
-
-* lib/Locale/Po4a/Texinfo.pm (translate_buffer_menuentry): Refine
-regexp, so that it matches menu entries lacking a description.
-Only call 'translate_buffer' on the description if it was provided.
-* t/fmt/texinfo/partialmenus.trans: New file.
-* t/fmt/texinfo/partialmenus.texi: Likewise.
-* t/fmt/texinfo/partialmenus.pot: Likewise.
-* t/fmt/texinfo/partialmenus.po: Likewise.
-* t/fmt/texinfo/partialmenus.norm: Likewise.
-* t/fmt-texinfo.t: Register the new 'partialmenus' test.
----
- lib/Locale/Po4a/Texinfo.pm | 7 +++---
- t/fmt-texinfo.t | 2 +-
- t/fmt/texinfo/partialmenus.norm | 21 +++++++++++++++++
- t/fmt/texinfo/partialmenus.po | 40 ++++++++++++++++++++++++++++++++
- t/fmt/texinfo/partialmenus.pot | 40 ++++++++++++++++++++++++++++++++
- t/fmt/texinfo/partialmenus.texi | 14 +++++++++++
- t/fmt/texinfo/partialmenus.trans | 21 +++++++++++++++++
- 7 files changed, 141 insertions(+), 4 deletions(-)
- create mode 100644 t/fmt/texinfo/partialmenus.norm
- create mode 100644 t/fmt/texinfo/partialmenus.po
- create mode 100644 t/fmt/texinfo/partialmenus.pot
- create mode 100644 t/fmt/texinfo/partialmenus.texi
- create mode 100644 t/fmt/texinfo/partialmenus.trans
-
-diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
-index b4750699..1c3a4bae 100644
---- a/lib/Locale/Po4a/Texinfo.pm
-+++ b/lib/Locale/Po4a/Texinfo.pm
-@@ -336,7 +336,7 @@ sub translate_buffer_menuentry {
-
- my $translated_buffer = "";
-
-- if ( $buffer =~ m/^(.*?)(::)\s+(.*)$/s
-+ if ( $buffer =~ m/^(.*?)(::)(?:\s+(.*))?$/s
- or $buffer =~ m/^(.*?: .*?)(\.)\s+(.*)$/s )
- {
- my ( $name, $sep, $description ) = ( $1, $2, $3 );
-@@ -347,8 +347,9 @@ sub translate_buffer_menuentry {
- $translated_buffer .= ' ' x ( $menu_sep_width - 1 - $l );
- $l = $menu_sep_width - 1;
- }
-- ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
--
-+ if ($description) {
-+ ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
-+ }
- # Replace newlines with space for proper wrapping
- # See https://github.com/mquinson/po4a/issues/122
- $t =~ s/\n/ /sg;
-diff --git a/t/fmt-texinfo.t b/t/fmt-texinfo.t
-index 4b067e43..d9ed5df3 100644
---- a/t/fmt-texinfo.t
-+++ b/t/fmt-texinfo.t
-@@ -10,7 +10,7 @@ use Testhelper;
-
- my @tests;
-
--for my $test (qw(longmenu comments tindex)) {
-+for my $test (qw(longmenu partialmenus comments tindex)) {
- push @tests,
- {
- 'format' => 'texinfo',
-diff --git a/t/fmt/texinfo/partialmenus.norm b/t/fmt/texinfo/partialmenus.norm
-new file mode 100644
-index 00000000..99240682
---- /dev/null
-+++ b/t/fmt/texinfo/partialmenus.norm
-@@ -0,0 +1,21 @@
-+\input texinfo
-+@c ===========================================================================
-+@c
-+@c This file was generated with po4a. Translate the source file.
-+@c
-+@c ===========================================================================
-+
-+
-+@c These menus do not contain a description, which used to cause a
-+@c Texinfo menu entry to not be translated.
-+@menu
-+* A menu entry without any description:: A menu entry without any
-+ description
-+* Optional menu name: The menu node:: Optional menu name: The menu node
-+@end menu
-+
-+@node A menu entry without any description
-+@chapter A menu entry without any description
-+
-+@node The menu node
-+@chapter Optional menu name
-diff --git a/t/fmt/texinfo/partialmenus.po b/t/fmt/texinfo/partialmenus.po
-new file mode 100644
-index 00000000..31a14443
---- /dev/null
-+++ b/t/fmt/texinfo/partialmenus.po
-@@ -0,0 +1,40 @@
-+# SOME DESCRIPTIVE TITLE
-+# Copyright (C) YEAR Free Software Foundation, Inc.
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"POT-Creation-Date: 2023-07-27 17:29-0400\n"
-+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\n"
-+"Language: \n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. type: chapter
-+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
-+#, no-wrap
-+msgid "A menu entry without any description"
-+msgstr "A MENU ENTRY WITHOUT ANY DESCRIPTION"
-+
-+#. type: menuentry
-+#: partialmenus.texi:8
-+msgid "Optional menu name: The menu node"
-+msgstr "OPTIONAL MENU NAME: THE MENU NODE"
-+
-+#. type: node
-+#: partialmenus.texi:13
-+#, no-wrap
-+msgid "The menu node"
-+msgstr "THE MENU NODE"
-+
-+#. type: chapter
-+#: partialmenus.texi:14
-+#, no-wrap
-+msgid "Optional menu name"
-+msgstr "OPTIONAL MENU NAME"
-diff --git a/t/fmt/texinfo/partialmenus.pot b/t/fmt/texinfo/partialmenus.pot
-new file mode 100644
-index 00000000..0379f805
---- /dev/null
-+++ b/t/fmt/texinfo/partialmenus.pot
-@@ -0,0 +1,40 @@
-+# SOME DESCRIPTIVE TITLE
-+# Copyright (C) YEAR Free Software Foundation, Inc.
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"POT-Creation-Date: 2023-08-16 09:47-0400\n"
-+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\n"
-+"Language: \n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. type: chapter
-+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
-+#, no-wrap
-+msgid "A menu entry without any description"
-+msgstr ""
-+
-+#. type: menuentry
-+#: partialmenus.texi:8
-+msgid "Optional menu name: The menu node"
-+msgstr ""
-+
-+#. type: node
-+#: partialmenus.texi:13
-+#, no-wrap
-+msgid "The menu node"
-+msgstr ""
-+
-+#. type: chapter
-+#: partialmenus.texi:14
-+#, no-wrap
-+msgid "Optional menu name"
-+msgstr ""
-diff --git a/t/fmt/texinfo/partialmenus.texi b/t/fmt/texinfo/partialmenus.texi
-new file mode 100644
-index 00000000..f8663a2b
---- /dev/null
-+++ b/t/fmt/texinfo/partialmenus.texi
-@@ -0,0 +1,14 @@
-+\input texinfo
-+
-+@c These menus do not contain a description, which used to cause a
-+@c Texinfo menu entry to not be translated.
-+@menu
-+* A menu entry without any description::
-+* Optional menu name: The menu node::
-+@end menu
-+
-+@node A menu entry without any description
-+@chapter A menu entry without any description
-+
-+@node The menu node
-+@chapter Optional menu name
-diff --git a/t/fmt/texinfo/partialmenus.trans b/t/fmt/texinfo/partialmenus.trans
-new file mode 100644
-index 00000000..0ef742a1
---- /dev/null
-+++ b/t/fmt/texinfo/partialmenus.trans
-@@ -0,0 +1,21 @@
-+\input texinfo
-+@c ===========================================================================
-+@c
-+@c This file was generated with po4a. Translate the source file.
-+@c
-+@c ===========================================================================
-+
-+
-+@c These menus do not contain a description, which used to cause a
-+@c Texinfo menu entry to not be translated.
-+@menu
-+* A MENU ENTRY WITHOUT ANY DESCRIPTION:: A MENU ENTRY WITHOUT ANY
-+ DESCRIPTION
-+* OPTIONAL MENU NAME: THE MENU NODE:: OPTIONAL MENU NAME: THE MENU NODE
-+@end menu
-+
-+@node A MENU ENTRY WITHOUT ANY DESCRIPTION
-+@chapter A MENU ENTRY WITHOUT ANY DESCRIPTION
-+
-+@node THE MENU NODE
-+@chapter OPTIONAL MENU NAME
-
-base-commit: 5b1cd768afdf4e9445812c5d43428495a0fde3c6
---
-2.41.0
-
diff --git a/gnu/packages/patches/podman-program-lookup.patch b/gnu/packages/patches/podman-program-lookup.patch
deleted file mode 100644
index 27a9421285..0000000000
--- a/gnu/packages/patches/podman-program-lookup.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 914aed3e04f71453fbdc30f4287e13ca3ce63a36 Mon Sep 17 00:00:00 2001
-From: Tomas Volf <~@wolfsden.cz>
-Date: Wed, 14 Feb 2024 20:02:03 +0100
-Subject: [PATCH] Modify search for binaries to fit Guix model
-
-Podman basically looked into the $PATH and into its libexec. That does not fit
-Guix's model very well, to an additional option to specify additional
-directories during compilation was added.
-
-* pkg/rootless/rootless_linux.go
-(tryMappingTool): Also check /run/setuid-programs.
-* vendor/github.com/containers/common/pkg/config/config.go
-(extraGuixDir): New function.
-(FindHelperBinary): Use it.
-* vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go
-(guixLookupSetuidPath): New function.
-(Start): Use it.
----
- pkg/rootless/rootless_linux.go | 3 +++
- .../containers/common/pkg/config/config.go | 23 +++++++++++++++++++
- .../storage/pkg/unshare/unshare_linux.go | 14 +++++++++--
- 3 files changed, 38 insertions(+), 2 deletions(-)
-
-diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
-index d303c8b..0191d90 100644
---- a/pkg/rootless/rootless_linux.go
-+++ b/pkg/rootless/rootless_linux.go
-@@ -102,6 +102,9 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err
- idtype = "setgid"
- }
- path, err := exec.LookPath(tool)
-+ if err != nil {
-+ path, err = exec.LookPath("/run/setuid-programs/" + tool)
-+ }
- if err != nil {
- return fmt.Errorf("command required for rootless mode with multiple IDs: %w", err)
- }
-diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
-index 75b917f..ed2f131 100644
---- a/vendor/github.com/containers/common/pkg/config/config.go
-+++ b/vendor/github.com/containers/common/pkg/config/config.go
-@@ -1102,6 +1102,24 @@ func findBindir() string {
- return bindirCached
- }
-
-+func extraGuixDir(bin_name string) string {
-+ if (bin_name == "slirp4netns") {
-+ return "@SLIRP4NETNS_DIR@";
-+ } else if (bin_name == "pasta") {
-+ return "@PASST_DIR@";
-+ } else if (strings.HasPrefix(bin_name, "qemu-")) {
-+ return "@QEMU_DIR@";
-+ } else if (bin_name == "gvproxy") {
-+ return "@GVPROXY_DIR@";
-+ } else if (bin_name == "netavark") {
-+ return "@NETAVARK_DIR@";
-+ } else if (bin_name == "aardvark-dns") {
-+ return "@AARDVARK_DNS_DIR@";
-+ } else {
-+ return "";
-+ }
-+}
-+
- // FindHelperBinary will search the given binary name in the configured directories.
- // If searchPATH is set to true it will also search in $PATH.
- func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) {
-@@ -1109,6 +1127,11 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error)
- bindirPath := ""
- bindirSearched := false
-
-+ if dir := extraGuixDir(name); dir != "" {
-+ /* If there is a Guix dir, skip the PATH search. */
-+ dirList = append([]string{dir}, dirList...)
-+ }
-+
- // If set, search this directory first. This is used in testing.
- if dir, found := os.LookupEnv("CONTAINERS_HELPER_BINARY_DIR"); found {
- dirList = append([]string{dir}, dirList...)
-diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go
-index a8dc1ba..0b0d755 100644
---- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go
-+++ b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go
-@@ -26,6 +26,16 @@ import (
- "github.com/syndtr/gocapability/capability"
- )
-
-+func guixLookupSetuidPath(prog string) (string, error) {
-+ path, err := exec.LookPath(prog)
-+ if err != nil {
-+ path, err = exec.LookPath("/run/setuid-programs/" + prog)
-+ }
-+ return path, err
-+}
-+
-+
-+
- // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and
- // handles setting ID maps and other related settings by triggering
- // initialization code in the child.
-@@ -237,7 +247,7 @@ func (c *Cmd) Start() error {
- gidmapSet := false
- // Set the GID map.
- if c.UseNewgidmap {
-- path, err := exec.LookPath("newgidmap")
-+ path, err := guixLookupSetuidPath("newgidmap")
- if err != nil {
- return fmt.Errorf("finding newgidmap: %w", err)
- }
-@@ -297,7 +307,7 @@ func (c *Cmd) Start() error {
- uidmapSet := false
- // Set the UID map.
- if c.UseNewuidmap {
-- path, err := exec.LookPath("newuidmap")
-+ path, err := guixLookupSetuidPath("newuidmap")
- if err != nil {
- return fmt.Errorf("finding newuidmap: %w", err)
- }
---
-2.41.0
-
diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch
deleted file mode 100644
index 5bca271625..0000000000
--- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Fixes for Boost compatibility.
-This patch comes from Gentoo:
- portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
-
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -1,6 +1,7 @@
- #include <iostream>
- #include <vector>
- #include <string>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
-@@ -9,7 +10,7 @@
-
- bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
- {
-- boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
-+ boost::nowide::ofstream file(std::move(path), std::ios_base::app);
- for (const auto& element : data)
- {
- //Example of .pot element
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -25,6 +25,7 @@
- #include <stdexcept>
- #include <unordered_map>
- #include <boost/format.hpp>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/algorithm/string.hpp>
-@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
- {
- ptree tree;
-- boost::filesystem::ifstream ifs(path);
-+ boost::nowide::ifstream ifs(path);
- boost::property_tree::read_ini(ifs, tree);
- return VendorProfile::from_ini(tree, path, load_all);
- }
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
-
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
-
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -13,6 +13,7 @@
- #include <cstdlib>
- #include <regex>
- #include <string_view>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string.hpp>
- #include <boost/format.hpp>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -15,6 +15,7 @@
- #include "libslic3r/PrintConfig.hpp"
-
- #include <boost/algorithm/string/replace.hpp>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
-@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
-
- void write_used_binary(const std::vector<std::string>& ids)
- {
-- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
-+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
- cereal::BinaryOutputArchive archive(file);
- HintsCerealData cd { ids };
- try
-@@ -84,7 +85,7 @@ void read_used_binary(std::vector<std::string>& ids)
- BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
- return;
- }
-- boost::filesystem::ifstream file(path);
-+ boost::nowide::ifstream file(path);
- cereal::BinaryInputArchive archive(file);
- HintsCerealData cd;
- try
diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch
deleted file mode 100644
index affa506b1c..0000000000
--- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix for building with cereal>=1.3.1.
-This patch comes from Gentoo:
- portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -127,7 +127,7 @@
- set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
-
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r libcereal)
-
- if (APPLE)
- # add_compile_options(-stdlib=libc++)
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@
-
- encoding_check(libslic3r_gui)
-
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-
- if (MSVC)
- target_link_libraries(libslic3r_gui Setupapi.lib)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -395,7 +395,7 @@
- target_link_libraries(libslic3r
- libnest2d
- admesh
-- cereal
-+ libcereal
- libigl
- miniz
- boost_libs
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -446,6 +446,12 @@
-
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+add_library(libcereal INTERFACE)
-+if (NOT TARGET cereal::cereal)
-+ target_link_libraries(libcereal INTERFACE cereal)
-+else()
-+ target_link_libraries(libcereal INTERFACE cereal::cereal)
-+endif()
-
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch
new file mode 100644
index 0000000000..aadf976588
--- /dev/null
+++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch
@@ -0,0 +1,112 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8f33aa2ff4..39928382da 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
+ monodll_msw_utils.o \
+ monodll_utilsexc.o \
+ monodll_fswatcher.o \
+- monodll_msw_secretstore.o
++ monodll_msw_secretstore.o \
+ monodll_msw_uilocale.o
+ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
+ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
+@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
+ monodll_uuid.o \
+ monodll_msw_evtloop.o \
+ monodll_access.o \
+- monodll_dark_mode.o
++ monodll_dark_mode.o \
+ monodll_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
+@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
+ monodll_uuid.o \
+ monodll_msw_evtloop.o \
+ monodll_access.o \
+- monodll_dark_mode.o
++ monodll_dark_mode.o \
+ monodll_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
+@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
+ monolib_msw_utils.o \
+ monolib_utilsexc.o \
+ monolib_fswatcher.o \
+- monolib_msw_secretstore.o
++ monolib_msw_secretstore.o \
+ monolib_msw_uilocale.o
+ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
+ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
+@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
+ monolib_uuid.o \
+ monolib_msw_evtloop.o \
+ monolib_access.o \
+- monolib_dark_mode.o
++ monolib_dark_mode.o \
+ monolib_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
+@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
+ monolib_uuid.o \
+ monolib_msw_evtloop.o \
+ monolib_access.o \
+- monolib_dark_mode.o
++ monolib_dark_mode.o \
+ monolib_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
+@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
+ basedll_msw_utils.o \
+ basedll_utilsexc.o \
+ basedll_fswatcher.o \
+- basedll_msw_secretstore.o
++ basedll_msw_secretstore.o \
+ basedll_msw_uilocale.o
+ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
+ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
+@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
+ baselib_msw_utils.o \
+ baselib_utilsexc.o \
+ baselib_fswatcher.o \
+- baselib_msw_secretstore.o
++ baselib_msw_secretstore.o \
+ baselib_msw_uilocale.o
+ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
+ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
+@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
+ coredll_uuid.o \
+ coredll_msw_evtloop.o \
+ coredll_access.o \
+- coredll_dark_mode.o
++ coredll_dark_mode.o \
+ coredll_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
+@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
+ coredll_uuid.o \
+ coredll_msw_evtloop.o \
+ coredll_access.o \
+- coredll_dark_mode.o
++ coredll_dark_mode.o \
+ coredll_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
+@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
+ corelib_uuid.o \
+ corelib_msw_evtloop.o \
+ corelib_access.o \
+- corelib_dark_mode.o
++ corelib_dark_mode.o \
+ corelib_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
+@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
+ corelib_uuid.o \
+ corelib_msw_evtloop.o \
+ corelib_access.o \
+- corelib_dark_mode.o
++ corelib_dark_mode.o \
+ corelib_msw_bmpbndl.o
+ @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
+ @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
diff --git a/gnu/packages/patches/pstoedit-fix-gcc12.patch b/gnu/packages/patches/pstoedit-fix-gcc12.patch
new file mode 100644
index 0000000000..4aeeaff818
--- /dev/null
+++ b/gnu/packages/patches/pstoedit-fix-gcc12.patch
@@ -0,0 +1,12 @@
+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree
+
+--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200
++++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100
+@@ -65,6 +65,7 @@
+ #define ZIP_EXTERN extern
+
+ #include <zip.h>
++#include <memory>
+
+ #ifdef _MSC_VER
+ // MS VC++ Windows
diff --git a/gnu/packages/patches/pstoedit-fix-plainC.patch b/gnu/packages/patches/pstoedit-fix-plainC.patch
new file mode 100644
index 0000000000..684c5043be
--- /dev/null
+++ b/gnu/packages/patches/pstoedit-fix-plainC.patch
@@ -0,0 +1,47 @@
+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree
+
+diff --git a/src/pstoedit.cpp b/src/pstoedit.cpp
+index a718f37..ac0df37 100755
+--- a/src/pstoedit.cpp
++++ b/src/pstoedit.cpp
+@@ -327,6 +327,11 @@ extern FILE *yyin; // used by lexer
+ // otherwise we could declare it locally where it is used
+
+
++extern "C" DLLEXPORT void loadpstoeditplugins_plainC(const char *progname, int verbose)
++{
++ return loadpstoeditplugins(progname, cerr, (bool) verbose);
++}
++
+ static void usage(ostream & outstream, bool forTeX, bool withdetails, bool withcategories )
+ {
+ if (withcategories) {
+diff --git a/src/pstoedit.h b/src/pstoedit.h
+index 294b3c2..74ebf2a 100755
+--- a/src/pstoedit.h
++++ b/src/pstoedit.h
+@@ -100,8 +100,13 @@ void clearPstoeditDriverInfo_plainC(struct DriverDescription_S * ptr);
+
+ #ifdef __cplusplus
+ extern "C" DLLEXPORT
+-#endif
+ void loadpstoeditplugins(const char* progname, std::ostream & errstream, bool verbose);
++#endif
++
++#ifdef __cplusplus
++extern "C" DLLEXPORT
++#endif
++void loadpstoeditplugins_plainC(const char* progname, int verbose);
+
+ #ifdef __cplusplus
+ extern "C" DLLEXPORT
+--- a/src/pstoedit.orig.h 2023-07-22 19:27:43.691166652 +0200
++++ b/src/pstoedit.h 2023-07-22 19:31:18.897952130 +0200
+@@ -37,6 +37,7 @@
+ #endif
+
+ #include "pstoedll.h"
++#include <stdbool.h>
+
+ typedef int (*execute_interpreter_function)(int argc, const char * const argv[]);
+
diff --git a/gnu/packages/patches/pstoedit-pkglibdir.patch b/gnu/packages/patches/pstoedit-pkglibdir.patch
new file mode 100644
index 0000000000..0734913593
--- /dev/null
+++ b/gnu/packages/patches/pstoedit-pkglibdir.patch
@@ -0,0 +1,19 @@
+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree
+
+--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200
++++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/pstoedit
+
+ Name: pstoedit
+ Description: converts PostScript(TM) and PDF files to other vector graphic formats
+@@ -8,4 +8,4 @@
+ Version: @VERSION@.0
+ Requires:
+ Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
+-Cflags: -I@includedir@
++Cflags: -I@includedir@/pstoedit
diff --git a/gnu/packages/patches/python-3-reproducible-build.patch b/gnu/packages/patches/python-3-reproducible-build.patch
new file mode 100644
index 0000000000..12bd8de7c2
--- /dev/null
+++ b/gnu/packages/patches/python-3-reproducible-build.patch
@@ -0,0 +1,30 @@
+From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Sat, 14 Jul 2018 00:46:11 +0900
+Subject: [PATCH] Use FLAG_REF always for interned strings
+
+---
+ Python/marshal.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Python/marshal.c b/Python/marshal.c
+index 6d06266c6a8e2e..51db2e3b2e29a2 100644
+--- a/Python/marshal.c
++++ b/Python/marshal.c
+@@ -275,9 +275,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
+ if (p->version < 3 || p->hashtable == NULL)
+ return 0; /* not writing object references */
+
+- /* if it has only one reference, it definitely isn't shared */
+- if (Py_REFCNT(v) == 1)
++ /* If it has only one reference, it definitely isn't shared.
++ * But we use TYPE_REF always for interned string, to PYC file stable
++ * as possible.
++ */
++ if (Py_REFCNT(v) == 1 &&
++ !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) {
+ return 0;
++ }
+
+ entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v);
+ if (entry != NULL) {
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-clarabel-blas.patch b/gnu/packages/patches/python-clarabel-blas.patch
new file mode 100644
index 0000000000..bd88a2171b
--- /dev/null
+++ b/gnu/packages/patches/python-clarabel-blas.patch
@@ -0,0 +1,38 @@
+Ensure that no feature set refers to blas-src or lapack-src, because we want
+to just use the existing openblas library.
+
+--- a/Cargo.toml 2024-04-24 14:13:23.519997967 +0200
++++ b/Cargo.toml 2024-04-24 14:13:09.983966101 +0200
+@@ -34,11 +34,11 @@
+ sdp = ["blas","lapack"]
+
+ # explicit configuration options for different blas flavours
+-sdp-accelerate = ["sdp", "blas-src/accelerate", "lapack-src/accelerate"]
+-sdp-netlib = ["sdp", "blas-src/netlib", "lapack-src/netlib"]
+-sdp-openblas = ["sdp", "blas-src/openblas", "lapack-src/openblas"]
+-sdp-mkl = ["sdp", "blas-src/intel-mkl", "lapack-src/intel-mkl"]
+-sdp-r = ["sdp", "blas-src/r", "lapack-src/r"]
++sdp-accelerate = ["sdp"]
++sdp-netlib = ["sdp"]
++sdp-openblas = ["sdp"]
++sdp-mkl = ["sdp"]
++sdp-r = ["sdp"]
+
+ # build as the julia interface
+ julia = ["sdp", "dep:libc", "dep:num-derive", "dep:serde", "dep:serde_json"]
+@@ -62,15 +62,6 @@
+ version = "0.19.0"
+ optional = true
+
+-[dependencies.blas-src]
+-version = "0.9"
+-optional = true
+-
+-[dependencies.lapack-src]
+-version = "0.9"
+-optional = true
+-
+-
+ # -------------------------------
+ # examples
+ # -------------------------------
diff --git a/gnu/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch b/gnu/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch
new file mode 100644
index 0000000000..9046eb2b4c
--- /dev/null
+++ b/gnu/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch
@@ -0,0 +1,84 @@
+From 3cc6610597ee16a0cce39f7b033ae529972177e7 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Thu, 10 Aug 2023 00:09:53 -0400
+Subject: [PATCH] TST: Improve test for Legend(loc='best') warning
+
+By patching the timer instead of using actually large data, we can both
+a) speed up these tests (~7.5s vs <0.2s for both), and b) consistently
+trigger the warning even on systems which are fast (such as the M1
+systems on Cirrus.)
+
+Also, copy the test data from `test_legend_auto3`, which correctly hits
+all candidate locations for the 'best' legend locator without having to
+fill up the entire Axes with data.
+---
+ lib/matplotlib/tests/test_legend.py | 38 ++++++++++++++++++++---------
+ 1 file changed, 27 insertions(+), 11 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index 759ac6aadaff..1549354ba56b 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -1,5 +1,7 @@
+ import collections
++import itertools
+ import platform
++import time
+ from unittest import mock
+ import warnings
+
+@@ -1109,29 +1111,43 @@ def test_usetex_no_warn(caplog):
+ assert "Font family ['serif'] not found." not in caplog.text
+
+
+-def test_warn_big_data_best_loc():
++def test_warn_big_data_best_loc(monkeypatch):
++ # Force _find_best_position to think it took a long time.
++ counter = itertools.count(0, step=1.5)
++ monkeypatch.setattr(time, 'perf_counter', lambda: next(counter))
++
+ fig, ax = plt.subplots()
+ fig.canvas.draw() # So that we can call draw_artist later.
+- for idx in range(1000):
+- ax.plot(np.arange(5000), label=idx)
++
++ # Place line across all possible legend locations.
++ x = [0.9, 0.1, 0.1, 0.9, 0.9, 0.5]
++ y = [0.95, 0.95, 0.05, 0.05, 0.5, 0.5]
++ ax.plot(x, y, 'o-', label='line')
++
+ with rc_context({'legend.loc': 'best'}):
+ legend = ax.legend()
+- with pytest.warns(UserWarning) as records:
++ with pytest.warns(UserWarning,
++ match='Creating legend with loc="best" can be slow with large '
++ 'amounts of data.') as records:
+ fig.draw_artist(legend) # Don't bother drawing the lines -- it's slow.
+ # The _find_best_position method of Legend is called twice, duplicating
+ # the warning message.
+ assert len(records) == 2
+- for record in records:
+- assert str(record.message) == (
+- 'Creating legend with loc="best" can be slow with large '
+- 'amounts of data.')
+
+
+-def test_no_warn_big_data_when_loc_specified():
++def test_no_warn_big_data_when_loc_specified(monkeypatch):
++ # Force _find_best_position to think it took a long time.
++ counter = itertools.count(0, step=1.5)
++ monkeypatch.setattr(time, 'perf_counter', lambda: next(counter))
++
+ fig, ax = plt.subplots()
+ fig.canvas.draw()
+- for idx in range(1000):
+- ax.plot(np.arange(5000), label=idx)
++
++ # Place line across all possible legend locations.
++ x = [0.9, 0.1, 0.1, 0.9, 0.9, 0.5]
++ y = [0.95, 0.95, 0.05, 0.05, 0.5, 0.5]
++ ax.plot(x, y, 'o-', label='line')
++
+ legend = ax.legend('best')
+ fig.draw_artist(legend) # Check that no warning is emitted.
+
diff --git a/gnu/packages/patches/python-optree-fix-32-bit.patch b/gnu/packages/patches/python-optree-fix-32-bit.patch
new file mode 100644
index 0000000000..6a32c39bd8
--- /dev/null
+++ b/gnu/packages/patches/python-optree-fix-32-bit.patch
@@ -0,0 +1,122 @@
+In include/utils.h, ssize_t is an alias for py::ssize_t, which is an alias for
+Py_ssize_t in Python, which is an alias for the system ssize_t.
+The latter is defined in glibc as int if __WORDSIZE == 32 and as long int if
+__WORDSIZE == 64. Therefore, we need to remove the explicit template
+specialization for int in the first case.
+
+diff --git a/include/utils.h b/include/utils.h
+index 950a02b..82a9591 100644
+--- a/include/utils.h
++++ b/include/utils.h
+@@ -141,10 +141,12 @@ template <>
+ inline py::handle GET_ITEM_HANDLE<py::tuple>(const py::handle& container, const size_t& item) {
+ return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::handle GET_ITEM_HANDLE<py::tuple>(const py::handle& container, const int& item) {
+ return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+ }
++#endif
+ template <>
+ inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const ssize_t& item) {
+ return PyList_GET_ITEM(container.ptr(), item);
+@@ -153,10 +155,12 @@ template <>
+ inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const size_t& item) {
+ return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const int& item) {
+ return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+ }
++#endif
+
+ template <typename Container, typename Item>
+ inline py::object GET_ITEM_BORROW(const py::handle& container, const Item& item) {
+@@ -171,11 +175,13 @@ inline py::object GET_ITEM_BORROW<py::tuple>(const py::handle& container, const
+ return py::reinterpret_borrow<py::object>(
+ PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::object GET_ITEM_BORROW<py::tuple>(const py::handle& container, const int& item) {
+ return py::reinterpret_borrow<py::object>(
+ PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#endif
+ template <>
+ inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const ssize_t& item) {
+ return py::reinterpret_borrow<py::object>(PyList_GET_ITEM(container.ptr(), item));
+@@ -185,11 +191,13 @@ inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const s
+ return py::reinterpret_borrow<py::object>(
+ PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const int& item) {
+ return py::reinterpret_borrow<py::object>(
+ PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#endif
+
+ template <typename Container, typename Item>
+ inline py::object GET_ITEM_STEAL(const py::handle& container, const Item& item) {
+@@ -204,11 +212,13 @@ inline py::object GET_ITEM_STEAL<py::tuple>(const py::handle& container, const s
+ return py::reinterpret_steal<py::object>(
+ PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::object GET_ITEM_STEAL<py::tuple>(const py::handle& container, const int& item) {
+ return py::reinterpret_steal<py::object>(
+ PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#endif
+ template <>
+ inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const ssize_t& item) {
+ return py::reinterpret_steal<py::object>(PyList_GET_ITEM(container.ptr(), item));
+@@ -218,11 +228,13 @@ inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const si
+ return py::reinterpret_steal<py::object>(
+ PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const int& item) {
+ return py::reinterpret_steal<py::object>(
+ PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+ }
++#endif
+
+ template <typename Container, typename Item>
+ inline void SET_ITEM(const py::handle& container, const Item& item, const py::handle& value) {
+@@ -240,12 +252,14 @@ inline void SET_ITEM<py::tuple>(const py::handle& container,
+ const py::handle& value) {
+ PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline void SET_ITEM<py::tuple>(const py::handle& container,
+ const int& item,
+ const py::handle& value) {
+ PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+ }
++#endif
+ template <>
+ inline void SET_ITEM<py::list>(const py::handle& container,
+ const ssize_t& item,
+@@ -258,12 +272,14 @@ inline void SET_ITEM<py::list>(const py::handle& container,
+ const py::handle& value) {
+ PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+ }
++#if __WORDSIZE != 32
+ template <>
+ inline void SET_ITEM<py::list>(const py::handle& container,
+ const int& item,
+ const py::handle& value) {
+ PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+ }
++#endif
+
+ template <typename PyType>
+ inline void AssertExact(const py::handle& object) {
diff --git a/gnu/packages/patches/python-pillow-use-zlib-1.3.patch b/gnu/packages/patches/python-pillow-use-zlib-1.3.patch
new file mode 100644
index 0000000000..48863ba8da
--- /dev/null
+++ b/gnu/packages/patches/python-pillow-use-zlib-1.3.patch
@@ -0,0 +1,21 @@
+From 9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1 Mon Sep 17 00:00:00 2001
+From: Andrew Murray <radarhere@users.noreply.github.com>
+Date: Fri, 18 Aug 2023 22:22:51 +1000
+Subject: [PATCH] Updated zlib to 1.3
+
+---
+ Tests/test_file_png.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
+index 3ffe93c6d15..f8df88d6777 100644
+--- a/Tests/test_file_png.py
++++ b/Tests/test_file_png.py
+@@ -79,6 +79,6 @@ def get_chunks(self, filename):
+
+ def test_sanity(self, tmp_path):
+ # internal version number
+- assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
++ assert re.search(r"\d+(\.\d+){1,3}$", features.version_codec("zlib"))
+
+ test_file = str(tmp_path / "temp.png")
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-pytorch-1.9.0-system-libraries.patch b/gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch
deleted file mode 100644
index 76c06520f0..0000000000
--- a/gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Use our own googletest rather than the bundled one.
-Get NNPACK to use our own PeachPy rather than the bundled one.
-
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 5d57b9ca78..620cca4e60 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -644,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
- # this shouldn't be necessary anymore.
- get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
-- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest)
-- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp})
--
-- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include)
-- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include)
-
- # We will not need to test benchmark lib itself.
- set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
-@@ -1485,7 +1480,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
- endif()
- set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
- message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
-- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
-+ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer)
- endif()
- include_directories(${FOXI_INCLUDE_DIRS})
- list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
-
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 50ebb224ce..5953d9ddf7 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -1632,7 +1632,7 @@ if(BUILD_TEST)
- if(NOT MSVC)
- add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp)
- # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
-- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main)
-+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest)
- if(USE_FBGEMM)
- target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
- endif()
-@@ -1655,7 +1655,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_CPU_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
-@@ -1673,7 +1673,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_GPU_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- cuda_add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
- add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
-@@ -1691,7 +1691,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
- add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
-@@ -1709,7 +1709,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_HIP_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE})
- target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS})
-
-diff --git a/torch/lib/c10d/test/CMakeLists.txt b/torch/lib/c10d/test/CMakeLists.txt
-index b74d4b65f7..fc7c207505 100644
---- a/torch/lib/c10d/test/CMakeLists.txt
-+++ b/torch/lib/c10d/test/CMakeLists.txt
-@@ -16,24 +16,24 @@ function(c10d_add_test test_src)
- add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
- endfunction()
-
--c10d_add_test(FileStoreTest.cpp c10d gtest_main)
--c10d_add_test(TCPStoreTest.cpp c10d gtest_main)
-+c10d_add_test(FileStoreTest.cpp c10d gtest_main gtest)
-+c10d_add_test(TCPStoreTest.cpp c10d gtest_main gtest)
- if(NOT WIN32)
-- c10d_add_test(HashStoreTest.cpp c10d gtest_main)
-+ c10d_add_test(HashStoreTest.cpp c10d gtest_main gtest)
- endif()
-
- if(USE_CUDA)
- if(USE_C10D_GLOO)
-- c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main)
-- c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main)
-+ c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main gtest)
-+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main gtest)
- endif()
- if(USE_C10D_NCCL)
-- c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main)
-+ c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main gtest)
- c10d_add_test(ProcessGroupNCCLErrorsTest.cpp c10d c10d_cuda_test
-- gtest_main)
-+ gtest_main gtest)
- endif()
- else()
- if(USE_C10D_GLOO)
-- c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main)
-+ c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main gtest)
- endif()
- endif()
-
-diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
-index a41343cbb5..6075bdd0a4 100644
---- a/cmake/External/nnpack.cmake
-+++ b/cmake/External/nnpack.cmake
-@@ -40,7 +40,7 @@ endif()
- # (3) Android, iOS, Linux, macOS - supported
- ##############################################################################
-
--if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-+if(FALSE)
- message(STATUS "Brace yourself, we are building NNPACK")
- set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party)
-
-@@ -114,6 +114,5 @@ endif()
- # (4) Catch-all: not supported.
- ##############################################################################
-
--message(WARNING "Unknown platform - I don't know how to build NNPACK. "
-- "See cmake/External/nnpack.cmake for details.")
--set(USE_NNPACK OFF)
-+set(NNPACK_FOUND TRUE)
-+set(USE_NNPACK ON)
diff --git a/gnu/packages/patches/python-pytorch-fix-codegen.patch b/gnu/packages/patches/python-pytorch-fix-codegen.patch
new file mode 100644
index 0000000000..cb246b25de
--- /dev/null
+++ b/gnu/packages/patches/python-pytorch-fix-codegen.patch
@@ -0,0 +1,167 @@
+This patch fixes some scripts for generating source files. For
+gen_jit_decompositions.py, gen_mobile_upgraders.py and
+gen_jit_shape_functions.py, which depend on the compiled PyTorch library, the
+option to generate "dummy" source files is added for the initial build, which
+is later corrected. codegen_external.py is patched to avoid duplicate
+functions and add the static keyword as in the existing generated file.
+
+diff --git a/tools/gen_flatbuffers.sh b/tools/gen_flatbuffers.sh
+index cc0263dbbf..ac34e84b82 100644
+--- a/tools/gen_flatbuffers.sh
++++ b/tools/gen_flatbuffers.sh
+@@ -1,13 +1,13 @@
+ #!/bin/bash
+ ROOT=$(pwd)
+-FF_LOCATION="$ROOT/third_party/flatbuffers"
+-cd "$FF_LOCATION" || exit
+-mkdir build
+-cd build || exit
+-cmake ..
+-cmake --build . --target flatc
+-mkdir -p "$ROOT/build/torch/csrc/jit/serialization"
+-./flatc --cpp --gen-mutable --scoped-enums \
++#FF_LOCATION="$ROOT/third_party/flatbuffers"
++#cd "$FF_LOCATION" || exit
++#mkdir build
++#cd build || exit
++#cmake ..
++#cmake --build . --target flatc
++#mkdir -p "$ROOT/build/torch/csrc/jit/serialization"
++flatc --cpp --gen-mutable --scoped-enums \
+ -o "$ROOT/torch/csrc/jit/serialization" \
+ -c "$ROOT/torch/csrc/jit/serialization/mobile_bytecode.fbs"
+ echo '// @generated' >> "$ROOT/torch/csrc/jit/serialization/mobile_bytecode_generated.h"
+diff --git a/torch/csrc/jit/tensorexpr/codegen_external.py b/torch/csrc/jit/tensorexpr/codegen_external.py
+index bc69b05162..0f8df81de3 100644
+--- a/torch/csrc/jit/tensorexpr/codegen_external.py
++++ b/torch/csrc/jit/tensorexpr/codegen_external.py
+@@ -20,9 +20,14 @@ def gen_external(native_functions_path, tags_path, external_path):
+ native_functions = parse_native_yaml(native_functions_path, tags_path)
+ func_decls = []
+ func_registrations = []
+- for func in native_functions:
++ done_names = set()
++ for func in native_functions[0]:
+ schema = func.func
+ name = schema.name.name.base
++ if name in done_names:
++ continue
++ else:
++ done_names.add(name)
+ args = schema.arguments
+ # Only supports extern calls for functions with out variants
+ if not schema.is_out_fn():
+@@ -62,7 +67,7 @@ def gen_external(native_functions_path, tags_path, external_path):
+
+ # print(tensor_decls, name, arg_names)
+ func_decl = f"""\
+-void nnc_aten_{name}(
++static void nnc_aten_{name}(
+ int64_t bufs_num,
+ void** buf_data,
+ int64_t* buf_ranks,
+diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py
+index 7cfbb803f9..2e69bb1868 100644
+--- a/torchgen/decompositions/gen_jit_decompositions.py
++++ b/torchgen/decompositions/gen_jit_decompositions.py
+@@ -1,8 +1,12 @@
+ #!/usr/bin/env python3
+ import os
+ from pathlib import Path
++import sys
+
+-from torch.jit._decompositions import decomposition_table
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ from torch.jit._decompositions import decomposition_table
++else:
++ decomposition_table = {}
+
+ # from torchgen.code_template import CodeTemplate
+
+@@ -85,7 +89,7 @@ def write_decomposition_util_file(path: str) -> None:
+
+
+ def main() -> None:
+- pytorch_dir = Path(__file__).resolve().parents[3]
++ pytorch_dir = Path(__file__).resolve().parents[2]
+ upgrader_path = pytorch_dir / "torch" / "csrc" / "jit" / "runtime"
+ write_decomposition_util_file(str(upgrader_path))
+
+diff --git a/torchgen/operator_versions/gen_mobile_upgraders.py b/torchgen/operator_versions/gen_mobile_upgraders.py
+index dab1568580..55c58715fc 100644
+--- a/torchgen/operator_versions/gen_mobile_upgraders.py
++++ b/torchgen/operator_versions/gen_mobile_upgraders.py
+@@ -2,10 +2,12 @@
+ import os
+ from enum import Enum
+ from pathlib import Path
++import sys
+ from typing import Any, Dict, List
+
+-import torch
+-from torch.jit.generate_bytecode import generate_upgraders_bytecode
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ import torch
++ from torch.jit.generate_bytecode import generate_upgraders_bytecode
+
+ from torchgen.code_template import CodeTemplate
+ from torchgen.operator_versions.gen_mobile_upgraders_constant import (
+@@ -262,7 +264,10 @@ def construct_register_size(register_size_from_yaml: int) -> str:
+ def construct_version_maps(
+ upgrader_bytecode_function_to_index_map: Dict[str, Any]
+ ) -> str:
+- version_map = torch._C._get_operator_version_map()
++ if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ version_map = torch._C._get_operator_version_map()
++ else:
++ version_map = {}
+ sorted_version_map_ = sorted(version_map.items(), key=lambda item: item[0]) # type: ignore[no-any-return]
+ sorted_version_map = dict(sorted_version_map_)
+
+@@ -378,7 +383,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+
+
+ def main() -> None:
+- upgrader_list = generate_upgraders_bytecode()
++ if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ upgrader_list = generate_upgraders_bytecode()
++ else:
++ upgrader_list = []
+ sorted_upgrader_list = sort_upgrader(upgrader_list)
+ for up in sorted_upgrader_list:
+ print("after sort upgrader : ", next(iter(up)))
+diff --git a/torchgen/shape_functions/gen_jit_shape_functions.py b/torchgen/shape_functions/gen_jit_shape_functions.py
+index c6336a6951..34e394d818 100644
+--- a/torchgen/shape_functions/gen_jit_shape_functions.py
++++ b/torchgen/shape_functions/gen_jit_shape_functions.py
+@@ -18,16 +18,20 @@ you are in the root directory of the Pytorch git repo"""
+ if not file_path.exists():
+ raise Exception(err_msg)
+
+-spec = importlib.util.spec_from_file_location(module_name, file_path)
+-assert spec is not None
+-module = importlib.util.module_from_spec(spec)
+-sys.modules[module_name] = module
+-assert spec.loader is not None
+-assert module is not None
+-spec.loader.exec_module(module)
+-
+-bounded_compute_graph_mapping = module.bounded_compute_graph_mapping
+-shape_compute_graph_mapping = module.shape_compute_graph_mapping
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ spec = importlib.util.spec_from_file_location(module_name, file_path)
++ assert spec is not None
++ module = importlib.util.module_from_spec(spec)
++ sys.modules[module_name] = module
++ assert spec.loader is not None
++ assert module is not None
++ spec.loader.exec_module(module)
++
++ bounded_compute_graph_mapping = module.bounded_compute_graph_mapping
++ shape_compute_graph_mapping = module.shape_compute_graph_mapping
++else:
++ bounded_compute_graph_mapping = {}
++ shape_compute_graph_mapping = {}
+
+
+ SHAPE_HEADER = r"""
diff --git a/gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch b/gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch
new file mode 100644
index 0000000000..8515e5ab13
--- /dev/null
+++ b/gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch
@@ -0,0 +1,167 @@
+This patch fixes some scripts for generating source files. For
+gen_jit_decompositions.py, gen_mobile_upgraders.py and
+gen_jit_shape_functions.py, which depend on the compiled PyTorch library, the
+option to generate "dummy" source files is added for the initial build, which
+is later corrected. codegen_external.py is patched to avoid duplicate
+functions and add the static keyword as in the existing generated file.
+
+diff --git a/tools/gen_flatbuffers.sh b/tools/gen_flatbuffers.sh
+index cc0263dbbf..ac34e84b82 100644
+--- a/tools/gen_flatbuffers.sh
++++ b/tools/gen_flatbuffers.sh
+@@ -1,13 +1,13 @@
+ #!/bin/bash
+ ROOT=$(pwd)
+-FF_LOCATION="$ROOT/third_party/flatbuffers"
+-cd "$FF_LOCATION" || exit
+-mkdir build
+-cd build || exit
+-cmake ..
+-cmake --build . --target flatc
+-mkdir -p "$ROOT/build/torch/csrc/jit/serialization"
+-./flatc --cpp --gen-mutable --scoped-enums \
++#FF_LOCATION="$ROOT/third_party/flatbuffers"
++#cd "$FF_LOCATION" || exit
++#mkdir build
++#cd build || exit
++#cmake ..
++#cmake --build . --target flatc
++#mkdir -p "$ROOT/build/torch/csrc/jit/serialization"
++flatc --cpp --gen-mutable --scoped-enums \
+ -o "$ROOT/torch/csrc/jit/serialization" \
+ -c "$ROOT/torch/csrc/jit/serialization/mobile_bytecode.fbs"
+ echo '// @generated' >> "$ROOT/torch/csrc/jit/serialization/mobile_bytecode_generated.h"
+diff --git a/torch/csrc/jit/tensorexpr/codegen_external.py b/torch/csrc/jit/tensorexpr/codegen_external.py
+index 120520b139..0c8587f02d 100644
+--- a/torch/csrc/jit/tensorexpr/codegen_external.py
++++ b/torch/csrc/jit/tensorexpr/codegen_external.py
+@@ -16,9 +16,14 @@ def gen_external(native_functions_path, tags_path, external_path):
+ native_functions = parse_native_yaml(native_functions_path, tags_path)
+ func_decls = []
+ func_registrations = []
+- for func in native_functions:
++ done_names = set()
++ for func in native_functions[0]:
+ schema = func.func
+ name = schema.name.name.base
++ if name in done_names:
++ continue
++ else:
++ done_names.add(name)
+ args = schema.arguments
+ # Only supports extern calls for functions with out variants
+ if not schema.is_out_fn():
+@@ -48,7 +53,7 @@ def gen_external(native_functions_path, tags_path, external_path):
+
+ # print(tensor_decls, name, arg_names)
+ func_decl = f"""\
+-void nnc_aten_{name}(
++static void nnc_aten_{name}(
+ int64_t bufs_num,
+ void** buf_data,
+ int64_t* buf_ranks,
+diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py
+index 7cfbb803f9..2e69bb1868 100644
+--- a/torchgen/decompositions/gen_jit_decompositions.py
++++ b/torchgen/decompositions/gen_jit_decompositions.py
+@@ -1,8 +1,12 @@
+ #!/usr/bin/env python3
+ import os
+ from pathlib import Path
++import sys
+
+-from torch.jit._decompositions import decomposition_table
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ from torch.jit._decompositions import decomposition_table
++else:
++ decomposition_table = {}
+
+ # from torchgen.code_template import CodeTemplate
+
+@@ -85,7 +89,7 @@ def write_decomposition_util_file(path: str) -> None:
+
+
+ def main() -> None:
+- pytorch_dir = Path(__file__).resolve().parents[3]
++ pytorch_dir = Path(__file__).resolve().parents[2]
+ upgrader_path = pytorch_dir / "torch" / "csrc" / "jit" / "runtime"
+ write_decomposition_util_file(str(upgrader_path))
+
+diff --git a/torchgen/operator_versions/gen_mobile_upgraders.py b/torchgen/operator_versions/gen_mobile_upgraders.py
+index e5287cffc5..57f3c38096 100644
+--- a/torchgen/operator_versions/gen_mobile_upgraders.py
++++ b/torchgen/operator_versions/gen_mobile_upgraders.py
+@@ -2,10 +2,12 @@
+ import os
+ from enum import Enum
+ from pathlib import Path
++import sys
+ from typing import Any, Dict, List
+
+-import torch
+-from torch.jit.generate_bytecode import generate_upgraders_bytecode
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ import torch
++ from torch.jit.generate_bytecode import generate_upgraders_bytecode
+
+ from torchgen.code_template import CodeTemplate
+ from torchgen.operator_versions.gen_mobile_upgraders_constant import (
+@@ -262,7 +264,10 @@ def construct_register_size(register_size_from_yaml: int) -> str:
+ def construct_version_maps(
+ upgrader_bytecode_function_to_index_map: Dict[str, Any]
+ ) -> str:
+- version_map = torch._C._get_operator_version_map()
++ if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ version_map = torch._C._get_operator_version_map()
++ else:
++ version_map = {}
+ sorted_version_map_ = sorted(version_map.items(), key=lambda item: item[0]) # type: ignore[no-any-return]
+ sorted_version_map = {name: lst for name, lst in sorted_version_map_}
+
+@@ -379,7 +384,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+
+ def main() -> None:
+
+- upgrader_list = generate_upgraders_bytecode()
++ if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ upgrader_list = generate_upgraders_bytecode()
++ else:
++ upgrader_list = []
+ sorted_upgrader_list = sort_upgrader(upgrader_list)
+ for up in sorted_upgrader_list:
+ print("after sort upgrader : ", next(iter(up)))
+diff --git a/torchgen/shape_functions/gen_jit_shape_functions.py b/torchgen/shape_functions/gen_jit_shape_functions.py
+index c6336a6951..34e394d818 100644
+--- a/torchgen/shape_functions/gen_jit_shape_functions.py
++++ b/torchgen/shape_functions/gen_jit_shape_functions.py
+@@ -18,16 +18,20 @@ you are in the root directory of the Pytorch git repo"""
+ if not file_path.exists():
+ raise Exception(err_msg)
+
+-spec = importlib.util.spec_from_file_location(module_name, file_path)
+-assert spec is not None
+-module = importlib.util.module_from_spec(spec)
+-sys.modules[module_name] = module
+-assert spec.loader is not None
+-assert module is not None
+-spec.loader.exec_module(module)
+-
+-bounded_compute_graph_mapping = module.bounded_compute_graph_mapping
+-shape_compute_graph_mapping = module.shape_compute_graph_mapping
++if len(sys.argv) < 2 or sys.argv[1] != "dummy":
++ spec = importlib.util.spec_from_file_location(module_name, file_path)
++ assert spec is not None
++ module = importlib.util.module_from_spec(spec)
++ sys.modules[module_name] = module
++ assert spec.loader is not None
++ assert module is not None
++ spec.loader.exec_module(module)
++
++ bounded_compute_graph_mapping = module.bounded_compute_graph_mapping
++ shape_compute_graph_mapping = module.shape_compute_graph_mapping
++else:
++ bounded_compute_graph_mapping = {}
++ shape_compute_graph_mapping = {}
+
+
+ SHAPE_HEADER = r"""
diff --git a/gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch b/gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch
new file mode 100644
index 0000000000..e5d647f70d
--- /dev/null
+++ b/gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch
@@ -0,0 +1,399 @@
+Patch build files to also system libraries instead of bundled ones for the
+libraries not supported or working only by specifying USE_SYSTEM_LIBS. This
+includes using the clog, cpuinfo, fbgemm, foxi, fp16, fxdiv, googletest,
+ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack,
+qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages.
+For QNNPACK, two versions were bundled and are required: The upstream one and
+an internal fork (now in the package qnnpack-pytorch).
+
+diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt
+index 96fc297..7f27b66 100644
+--- a/aten/src/ATen/CMakeLists.txt
++++ b/aten/src/ATen/CMakeLists.txt
+@@ -362,9 +362,9 @@ if(AT_NNPACK_ENABLED)
+ list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below
+ endif()
+
+-if(MKLDNN_FOUND)
+- list(APPEND ATen_CPU_DEPENDENCY_LIBS ${MKLDNN_LIBRARIES})
+-endif(MKLDNN_FOUND)
++if(USE_MKLDNN)
++ list(APPEND ATen_CPU_DEPENDENCY_LIBS DNNL::dnnl)
++endif(USE_MKLDNN)
+
+ list(APPEND ATen_CPU_DEPENDENCY_LIBS cpuinfo)
+
+diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
+index 221e3f3..417f601 100644
+--- a/caffe2/CMakeLists.txt
++++ b/caffe2/CMakeLists.txt
+@@ -110,9 +110,6 @@ if(NOT MSVC AND USE_XNNPACK)
+ if(NOT TARGET fxdiv)
+ set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+ set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+- add_subdirectory(
+- "${FXDIV_SOURCE_DIR}"
+- "${CMAKE_BINARY_DIR}/FXdiv")
+ endif()
+ endif()
+
+@@ -975,7 +972,6 @@ elseif(USE_CUDA)
+ endif()
+
+ if(NOT MSVC AND USE_XNNPACK)
+- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)
+ endif()
+
+ # ==========================================================
+@@ -1314,6 +1310,7 @@ target_link_libraries(torch_cpu PUBLIC c10)
+ target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS})
+ target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS})
+ target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS})
++target_link_libraries(torch_cpu PRIVATE miniz clog)
+ target_include_directories(torch_cpu INTERFACE $<INSTALL_INTERFACE:include>)
+ target_include_directories(torch_cpu PRIVATE ${Caffe2_CPU_INCLUDE})
+ target_include_directories(torch_cpu SYSTEM PRIVATE "${Caffe2_DEPENDENCY_INCLUDE}")
+@@ -1570,7 +1567,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK)
+ add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}")
+ add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}")
+ target_link_libraries(static_runtime_bench torch_library benchmark)
+- target_link_libraries(static_runtime_test torch_library gtest_main)
++ target_link_libraries(static_runtime_test torch_library gtest_main gtest)
+ endif()
+
+ if(BUILD_TENSOREXPR_BENCHMARK)
+@@ -1601,7 +1598,7 @@ if(BUILD_MOBILE_TEST)
+ foreach(test_src ${ATen_MOBILE_TEST_SRCS})
+ get_filename_component(test_name ${test_src} NAME_WE)
+ add_executable(${test_name} "${test_src}")
+- target_link_libraries(${test_name} torch_library gtest_main)
++ target_link_libraries(${test_name} torch_library gtest_main gtest)
+ target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+ target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
+@@ -1622,13 +1619,13 @@ if(BUILD_TEST)
+ if(NOT MSVC)
+ add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp)
+ # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
+- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main)
++ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest)
+ if(USE_FBGEMM)
+ target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
+ endif()
+ else()
+ add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}")
+- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main)
++ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main gtest)
+ endif()
+ target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+@@ -1645,7 +1642,7 @@ if(BUILD_TEST)
+ foreach(test_src ${Caffe2_CPU_TEST_SRCS})
+ get_filename_component(test_name ${test_src} NAME_WE)
+ add_executable(${test_name} "${test_src}")
+- target_link_libraries(${test_name} torch_library gtest_main)
++ target_link_libraries(${test_name} torch_library gtest_main gtest)
+ target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+ target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
+@@ -1703,7 +1700,7 @@ if(BUILD_TEST)
+ foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
+ get_filename_component(test_name ${test_src} NAME_WE)
+ add_executable(${test_name} "${test_src}")
+- target_link_libraries(${test_name} torch_library gtest_main)
++ target_link_libraries(${test_name} torch_library gtest_main gtest)
+ target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
+ add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
+diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt
+index 1552b59..67e1a9a 100644
+--- a/caffe2/serialize/CMakeLists.txt
++++ b/caffe2/serialize/CMakeLists.txt
+@@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc)
+
+ set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp})
+ list(APPEND Caffe2_CPU_SRCS
+- ${PROJECT_SOURCE_DIR}/third_party/miniz-2.1.0/miniz.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline_container.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 8c0e3c2..d65576a 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -298,7 +298,7 @@ endif()
+ # --- [ PocketFFT
+ set(AT_POCKETFFT_ENABLED 0)
+ if(NOT AT_MKL_ENABLED)
+- set(POCKETFFT_INCLUDE_DIR "${Torch_SOURCE_DIR}/third_party/pocketfft/")
++ set(POCKETFFT_INCLUDE_DIR "#POCKETFFT_INCLUDE_DIR")
+ if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}")
+ message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}")
+ elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h")
+@@ -501,19 +501,6 @@ if(USE_QNNPACK)
+ set(QNNPACK_BUILD_TESTS OFF CACHE BOOL "")
+ set(QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
+ set(QNNPACK_LIBRARY_TYPE "static" CACHE STRING "")
+- add_subdirectory(
+- "${QNNPACK_SOURCE_DIR}"
+- "${CONFU_DEPENDENCIES_BINARY_DIR}/QNNPACK")
+-
+- # TODO: See https://github.com/pytorch/pytorch/issues/56285
+- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+- target_compile_options(qnnpack PRIVATE -Wno-deprecated-declarations)
+- endif()
+-
+- # We build static versions of QNNPACK and pthreadpool but link
+- # them into a shared library for Caffe2, so they need PIC.
+- set_property(TARGET qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(QNNPACK_CUSTOM_THREADPOOL)
+ target_compile_definitions(
+@@ -562,13 +549,6 @@ if(USE_PYTORCH_QNNPACK)
+ set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "")
+ set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
+ set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "")
+- add_subdirectory(
+- "${PYTORCH_QNNPACK_SOURCE_DIR}"
+- "${CONFU_DEPENDENCIES_BINARY_DIR}/pytorch_qnnpack")
+- # We build static versions of QNNPACK and pthreadpool but link
+- # them into a shared library for Caffe2, so they need PIC.
+- set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL)
+ target_compile_definitions(
+@@ -750,11 +730,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
+ # this shouldn't be necessary anymore.
+ get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+ set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest)
+- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp})
+-
+- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include)
+- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include)
+
+ # We will not need to test benchmark lib itself.
+ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
+@@ -829,16 +804,6 @@ if(USE_FBGEMM)
+ else()
+ set(FBGEMM_LIBRARY_TYPE "static" CACHE STRING "")
+ endif()
+- add_subdirectory("${FBGEMM_SOURCE_DIR}")
+- set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm PROPERTY POSITION_INDEPENDENT_CODE ON)
+- if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0)
+- # See https://github.com/pytorch/pytorch/issues/74352
+- target_compile_options_if_supported(asmjit -Wno-deprecated-copy)
+- target_compile_options_if_supported(asmjit -Wno-unused-but-set-variable)
+- endif()
+ endif()
+
+ if(USE_FBGEMM)
+@@ -1001,7 +966,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16)
+ "${FP16_SOURCE_DIR}"
+ "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16")
+ elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16)
+- add_library(fp16 STATIC "/usr/include/fp16.h")
++ add_library(fp16 STATIC "#FP16_INCLUDE_DIR")
+ set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C)
+ endif()
+ list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
+@@ -1395,7 +1360,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
+
+ # Tensorpipe uses cuda_add_library
+ torch_update_find_cuda_flags()
+- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe)
+ if(USE_CUDA)
+@@ -1551,7 +1515,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+ set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17)
+ endif()
+ endif()
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL)
+
+ add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
+ if(NOT USE_SYSTEM_ONNX)
+@@ -1582,7 +1545,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+ endif()
+ set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
+ message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
+- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
++ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer)
+ endif()
+ include_directories(${FOXI_INCLUDE_DIRS})
+ list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
+@@ -1752,9 +1715,8 @@ if(NOT INTERN_BUILD_MOBILE)
+ endif()
+ if(USE_MKLDNN)
+ include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake)
+- if(MKLDNN_FOUND)
++ if(DNNL_FOUND)
+ set(AT_MKLDNN_ENABLED 1)
+- include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR})
+ if(BUILD_CAFFE2_OPS)
+ list(APPEND Caffe2_DEPENDENCY_LIBS caffe2::mkldnn)
+ endif(BUILD_CAFFE2_OPS)
+@@ -1819,7 +1781,7 @@ endif()
+ #
+ set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
++find_package(fmt)
+
+ # Disable compiler feature checks for `fmt`.
+ #
+@@ -1828,7 +1790,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+ # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
+ # `fmt` is compatible with a superset of the compilers that PyTorch is, it
+ # shouldn't be too bad to just disable the checks.
+-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
+index a41343c..6075bdd 100644
+--- a/cmake/External/nnpack.cmake
++++ b/cmake/External/nnpack.cmake
+@@ -40,7 +40,7 @@ endif()
+ # (3) Android, iOS, Linux, macOS - supported
+ ##############################################################################
+
+-if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
++if(FALSE)
+ message(STATUS "Brace yourself, we are building NNPACK")
+ set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party)
+
+@@ -114,6 +114,5 @@ endif()
+ # (4) Catch-all: not supported.
+ ##############################################################################
+
+-message(WARNING "Unknown platform - I don't know how to build NNPACK. "
+- "See cmake/External/nnpack.cmake for details.")
+-set(USE_NNPACK OFF)
++set(NNPACK_FOUND TRUE)
++set(USE_NNPACK ON)
+diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake
+index 50404d3..ca067f0 100644
+--- a/cmake/public/mkldnn.cmake
++++ b/cmake/public/mkldnn.cmake
+@@ -4,7 +4,7 @@ if(CPU_AARCH64)
+ include(${CMAKE_CURRENT_LIST_DIR}/ComputeLibrary.cmake)
+ endif()
+
+-find_package(MKLDNN QUIET)
++find_package(DNNL REQUIRED)
+
+ if(NOT TARGET caffe2::mkldnn)
+ add_library(caffe2::mkldnn INTERFACE IMPORTED)
+@@ -15,7 +15,7 @@ set_property(
+ ${MKLDNN_INCLUDE_DIR})
+ set_property(
+ TARGET caffe2::mkldnn PROPERTY INTERFACE_LINK_LIBRARIES
+- ${MKLDNN_LIBRARIES})
++ DNNL::dnnl)
+ if(BUILD_ONEDNN_GRAPH)
+ if(NOT TARGET caffe2::dnnl_graph)
+ add_library(caffe2::dnnl_graph INTERFACE IMPORTED)
+diff --git a/setup.py b/setup.py
+index 34b2854..5db117f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -418,13 +418,9 @@ def build_deps():
+ # Windows has very poor support for them.
+ sym_files = [
+ 'tools/shared/_utils_internal.py',
+- 'torch/utils/benchmark/utils/valgrind_wrapper/callgrind.h',
+- 'torch/utils/benchmark/utils/valgrind_wrapper/valgrind.h',
+ ]
+ orig_files = [
+ 'torch/_utils_internal.py',
+- 'third_party/valgrind-headers/callgrind.h',
+- 'third_party/valgrind-headers/valgrind.h',
+ ]
+ for sym_file, orig_file in zip(sym_files, orig_files):
+ same = False
+diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
+index 89c6b91..0c60d08 100644
+--- a/test/cpp/c10d/CMakeLists.txt
++++ b/test/cpp/c10d/CMakeLists.txt
+@@ -16,14 +16,14 @@ function(c10d_add_test test_src)
+ add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
+ endfunction()
+
+-c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main)
+-c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main)
++c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest)
++c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest)
+ if(INSTALL_TEST)
+ install(TARGETS FileStoreTest DESTINATION bin)
+ install(TARGETS TCPStoreTest DESTINATION bin)
+ endif()
+ if(NOT WIN32)
+- c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main)
++ c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest)
+ if(INSTALL_TEST)
+ install(TARGETS HashStoreTest DESTINATION bin)
+ endif()
+@@ -31,11 +31,11 @@ endif()
+
+ if(USE_CUDA)
+ if(USE_GLOO AND USE_C10D_GLOO)
+- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main)
++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
+ if(INSTALL_TEST)
+ install(TARGETS ProcessGroupGlooTest DESTINATION bin)
+ endif()
+- c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main)
++ c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
+ endif()
+ if(USE_NCCL AND USE_C10D_NCCL)
+ # NCCL is a private dependency of libtorch, but the tests include some
+@@ -44,10 +44,10 @@ if(USE_CUDA)
+ # a private dependency of the tests as well.
+ c10d_add_test(
+ ProcessGroupNCCLTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_nccl)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl)
+ c10d_add_test(
+ ProcessGroupNCCLErrorsTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_nccl)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl)
+ if(INSTALL_TEST)
+ install(TARGETS ProcessGroupNCCLTest DESTINATION bin)
+ install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin)
+@@ -61,7 +61,7 @@ if(USE_CUDA)
+ # a private dependency of the tests as well.
+ c10d_add_test(
+ ProcessGroupUCCTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_ucc)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_ucc)
+ if(INSTALL_TEST)
+ install(TARGETS ProcessGroupUCCTest DESTINATION bin)
+ install(TARGETS c10d_cuda_test DESTINATION lib)
+@@ -69,7 +69,7 @@ if(USE_CUDA)
+ endif()
+ else()
+ if(USE_GLOO AND USE_C10D_GLOO)
+- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main)
++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest)
+ endif()
+ endif()
+
+diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt
+index 7dff706..90b1003 100644
+--- a/test/cpp/tensorexpr/CMakeLists.txt
++++ b/test/cpp/tensorexpr/CMakeLists.txt
+@@ -54,7 +54,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
+ # pthreadpool header. For some build environment we need add the dependency
+ # explicitly.
+ if(USE_PTHREADPOOL)
+- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface)
++ target_link_libraries(test_tensorexpr PRIVATE pthreadpool)
+ endif()
+ if(USE_CUDA)
+ target_link_libraries(test_tensorexpr PRIVATE
diff --git a/gnu/packages/patches/python-pytorch-runpath.patch b/gnu/packages/patches/python-pytorch-runpath.patch
index 7f95b88a2b..2c1724cdb0 100644
--- a/gnu/packages/patches/python-pytorch-runpath.patch
+++ b/gnu/packages/patches/python-pytorch-runpath.patch
@@ -3,10 +3,10 @@ get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'.
Make sure RUNPATH matches that.
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 5b5622f0..30d27e57 100644
+index 74836372..c8eb69d1 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
-@@ -1909,7 +1909,7 @@ if(BUILD_PYTHON)
+@@ -1910,7 +1910,7 @@ if(BUILD_PYTHON)
if(${BUILDING_WITH_TORCH_LIBS})
# site-packages/caffe2/python/caffe2_pybind11_state
# site-packages/torch/lib
@@ -16,7 +16,7 @@ index 5b5622f0..30d27e57 100644
# Must also include `CMAKE_SHARED_LINKER_FLAGS` in linker flags for
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index ee9cf410..f190e69b 100644
+index acc95842..8f8fb7d7 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -4,7 +4,7 @@ if(APPLE)
@@ -28,3 +28,16 @@ index ee9cf410..f190e69b 100644
endif(APPLE)
# Use separate rpaths during build and install phases
set(CMAKE_SKIP_BUILD_RPATH FALSE)
+diff --git a/functorch/CMakeLists.txt b/functorch/CMakeLists.txt
+index f2f32745..db21b656 100644
+--- a/functorch/CMakeLists.txt
++++ b/functorch/CMakeLists.txt
+@@ -21,7 +21,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11)
+
+ set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY
+ ${CMAKE_BINARY_DIR}/functorch)
+-set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${_rpath_portable_origin}/../torch/lib")
++set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../torch/lib")
+
+ # Copy-pasted prefix/suffix logic for Python extensions from
+ # https://github.com/pytorch/pytorch/blob/33bb8ae350611760139457b85842b1d7edf9aa11/caffe2/CMakeLists.txt#L1975
diff --git a/gnu/packages/patches/python-pytorch-system-libraries.patch b/gnu/packages/patches/python-pytorch-system-libraries.patch
index fd849fd9e2..99f999f32f 100644
--- a/gnu/packages/patches/python-pytorch-system-libraries.patch
+++ b/gnu/packages/patches/python-pytorch-system-libraries.patch
@@ -1,38 +1,104 @@
-Use our own googletest rather than the bundled one.
-Get NNPACK to use our own PeachPy rather than the bundled one.
+Patch build files to also system libraries instead of bundled ones for the
+libraries not supported or working only by specifying USE_SYSTEM_LIBS. This
+includes using the clog, cpuinfo, fbgemm, foxi, fp16, fxdiv, googletest,
+ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack,
+qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages.
+For QNNPACK, two versions were bundled and are required: The upstream one and
+an internal fork (now in the package qnnpack-pytorch).
+diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt
+index 2c2b967..5ac5fa6 100644
+--- a/aten/src/ATen/CMakeLists.txt
++++ b/aten/src/ATen/CMakeLists.txt
+@@ -371,9 +371,9 @@ if(AT_NNPACK_ENABLED)
+ list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below
+ endif()
+
+-if(MKLDNN_FOUND)
+- list(APPEND ATen_CPU_DEPENDENCY_LIBS ${MKLDNN_LIBRARIES})
+-endif(MKLDNN_FOUND)
++if(USE_MKLDNN)
++ list(APPEND ATen_CPU_DEPENDENCY_LIBS DNNL::dnnl)
++endif(USE_MKLDNN)
+
+ if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(s390x|ppc64le)$")
+ list(APPEND ATen_CPU_DEPENDENCY_LIBS cpuinfo)
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index d57d7ebb..5b5622f0 100644
+index 7483637..093de40 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
-@@ -1736,7 +1736,7 @@ if(BUILD_TEST)
+@@ -111,9 +111,6 @@ if(NOT MSVC AND USE_XNNPACK)
+ if(NOT TARGET fxdiv)
+ set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+ set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+- add_subdirectory(
+- "${FXDIV_SOURCE_DIR}"
+- "${CMAKE_BINARY_DIR}/FXdiv")
+ endif()
+ endif()
+
+@@ -1055,7 +1052,6 @@ elseif(USE_CUDA)
+ endif()
+
+ if(NOT MSVC AND USE_XNNPACK)
+- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)
+ endif()
+
+ # ==========================================================
+@@ -1396,6 +1392,7 @@ target_link_libraries(torch_cpu PUBLIC c10)
+ target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS})
+ target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS})
+ target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS})
++target_link_libraries(torch_cpu PRIVATE miniz clog)
+ if(USE_MPI)
+ target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX)
+ endif()
+@@ -1653,7 +1650,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK)
+ add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}")
+ add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}")
+ target_link_libraries(static_runtime_bench torch_library benchmark)
+- target_link_libraries(static_runtime_test torch_library gtest_main)
++ target_link_libraries(static_runtime_test torch_library gtest_main gtest)
+ endif()
+
+ if(BUILD_TENSOREXPR_BENCHMARK)
+@@ -1680,7 +1677,7 @@ if(BUILD_MOBILE_TEST)
+ foreach(test_src ${ATen_MOBILE_TEST_SRCS})
+ get_filename_component(test_name ${test_src} NAME_WE)
+ add_executable(${test_name} "${test_src}")
+- target_link_libraries(${test_name} torch_library gtest_main)
++ target_link_libraries(${test_name} torch_library gtest_main gtest)
+ target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+ target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
+@@ -1701,7 +1698,7 @@ if(BUILD_TEST)
if(NOT MSVC)
- add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp)
+ add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp)
# TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main)
+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest)
if(USE_FBGEMM)
target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
endif()
-@@ -1759,7 +1759,7 @@ if(BUILD_TEST)
+@@ -1715,7 +1712,7 @@ if(BUILD_TEST)
+ endif()
+ else()
+ add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}")
+- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main)
++ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main gtest)
+ endif()
+ target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+@@ -1732,7 +1729,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_CPU_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- if(USE_OPENMP)
- # -fopenmp is a compile time flag and as result not guaranteed
- # to link executable against OpenMP runtime library
-@@ -1785,7 +1785,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_GPU_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
- add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
-@@ -1803,7 +1803,7 @@ if(BUILD_TEST)
+ target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+ target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+ target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
+@@ -1795,7 +1792,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
@@ -41,20 +107,66 @@ index d57d7ebb..5b5622f0 100644
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
-@@ -1821,7 +1821,7 @@ if(BUILD_TEST)
- foreach(test_src ${Caffe2_HIP_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE})
- target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS})
+diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt
+index 1552b59..67e1a9a 100644
+--- a/caffe2/serialize/CMakeLists.txt
++++ b/caffe2/serialize/CMakeLists.txt
+@@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc)
+
+ set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp})
+ list(APPEND Caffe2_CPU_SRCS
+- ${PROJECT_SOURCE_DIR}/third_party/miniz-2.1.0/miniz.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline_container.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 557ab649..ee9cf410 100644
+index acc9584..97275bf 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -732,11 +732,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
+@@ -283,7 +283,7 @@ endif()
+ # --- [ PocketFFT
+ set(AT_POCKETFFT_ENABLED 0)
+ if(NOT AT_MKL_ENABLED)
+- set(POCKETFFT_INCLUDE_DIR "${Torch_SOURCE_DIR}/third_party/pocketfft/")
++ set(POCKETFFT_INCLUDE_DIR "#POCKETFFT_INCLUDE_DIR")
+ if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}")
+ message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}")
+ elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h")
+@@ -489,19 +489,6 @@ if(USE_QNNPACK)
+ set(QNNPACK_BUILD_TESTS OFF CACHE BOOL "")
+ set(QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
+ set(QNNPACK_LIBRARY_TYPE "static" CACHE STRING "")
+- add_subdirectory(
+- "${QNNPACK_SOURCE_DIR}"
+- "${CONFU_DEPENDENCIES_BINARY_DIR}/QNNPACK")
+-
+- # TODO: See https://github.com/pytorch/pytorch/issues/56285
+- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+- target_compile_options(qnnpack PRIVATE -Wno-deprecated-declarations)
+- endif()
+-
+- # We build static versions of QNNPACK and pthreadpool but link
+- # them into a shared library for Caffe2, so they need PIC.
+- set_property(TARGET qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(QNNPACK_CUSTOM_THREADPOOL)
+ target_compile_definitions(
+@@ -550,13 +537,6 @@ if(USE_PYTORCH_QNNPACK)
+ set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "")
+ set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
+ set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "")
+- add_subdirectory(
+- "${PYTORCH_QNNPACK_SOURCE_DIR}"
+- "${CONFU_DEPENDENCIES_BINARY_DIR}/pytorch_qnnpack")
+- # We build static versions of QNNPACK and pthreadpool but link
+- # them into a shared library for Caffe2, so they need PIC.
+- set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL)
+ target_compile_definitions(
+@@ -728,11 +708,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
# this shouldn't be necessary anymore.
get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
@@ -66,7 +178,49 @@ index 557ab649..ee9cf410 100644
# We will not need to test benchmark lib itself.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
-@@ -1543,7 +1538,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+@@ -810,16 +785,6 @@ if(USE_FBGEMM)
+ if(USE_ASAN)
+ set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM")
+ endif()
+- add_subdirectory("${FBGEMM_SOURCE_DIR}")
+- set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
+- set_property(TARGET fbgemm PROPERTY POSITION_INDEPENDENT_CODE ON)
+- if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0)
+- # See https://github.com/pytorch/pytorch/issues/74352
+- target_compile_options_if_supported(asmjit -Wno-deprecated-copy)
+- target_compile_options_if_supported(asmjit -Wno-unused-but-set-variable)
+- endif()
+ endif()
+
+ if(USE_FBGEMM)
+@@ -979,7 +944,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16)
+ "${FP16_SOURCE_DIR}"
+ "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16")
+ elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16)
+- add_library(fp16 STATIC "/usr/include/fp16.h")
++ add_library(fp16 STATIC "#FP16_INCLUDE_DIR")
+ set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C)
+ endif()
+ list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
+@@ -1362,7 +1327,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
+
+ # Tensorpipe uses cuda_add_library
+ torch_update_find_cuda_flags()
+- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe)
+ if(USE_CUDA)
+@@ -1529,7 +1493,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+ set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17)
+ endif()
+ endif()
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL)
+
+ add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
+ if(NOT USE_SYSTEM_ONNX)
+@@ -1560,7 +1523,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
endif()
set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
@@ -75,8 +229,36 @@ index 557ab649..ee9cf410 100644
endif()
include_directories(${FOXI_INCLUDE_DIRS})
list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
+@@ -1739,9 +1702,8 @@ if(NOT INTERN_BUILD_MOBILE)
+ endif()
+ if(USE_MKLDNN)
+ include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake)
+- if(MKLDNN_FOUND)
++ if(DNNL_FOUND)
+ set(AT_MKLDNN_ENABLED 1)
+- include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR})
+ if(BUILD_CAFFE2_OPS)
+ list(APPEND Caffe2_DEPENDENCY_LIBS caffe2::mkldnn)
+ endif(BUILD_CAFFE2_OPS)
+@@ -1796,7 +1758,7 @@ endif()
+ #
+ set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
++find_package(fmt)
+
+ # Disable compiler feature checks for `fmt`.
+ #
+@@ -1805,7 +1767,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+ # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
+ # `fmt` is compatible with a superset of the compilers that PyTorch is, it
+ # shouldn't be too bad to just disable the checks.
+-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
-index a41343cb..6075bdd0 100644
+index 9d5f064..c3624e5 100644
--- a/cmake/External/nnpack.cmake
+++ b/cmake/External/nnpack.cmake
@@ -40,7 +40,7 @@ endif()
@@ -88,7 +270,7 @@ index a41343cb..6075bdd0 100644
message(STATUS "Brace yourself, we are building NNPACK")
set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party)
-@@ -114,6 +114,5 @@ endif()
+@@ -112,6 +112,5 @@ endif()
# (4) Catch-all: not supported.
##############################################################################
@@ -97,8 +279,45 @@ index a41343cb..6075bdd0 100644
-set(USE_NNPACK OFF)
+set(NNPACK_FOUND TRUE)
+set(USE_NNPACK ON)
+diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake
+index 8793562..9f8fa3d 100644
+--- a/cmake/public/mkldnn.cmake
++++ b/cmake/public/mkldnn.cmake
+@@ -4,7 +4,7 @@ if(CPU_AARCH64)
+ include(${CMAKE_CURRENT_LIST_DIR}/ComputeLibrary.cmake)
+ endif()
+
+-find_package(MKLDNN QUIET)
++find_package(DNNL REQUIRED)
+
+ if(NOT TARGET caffe2::mkldnn)
+ add_library(caffe2::mkldnn INTERFACE IMPORTED)
+@@ -15,4 +15,4 @@ set_property(
+ ${MKLDNN_INCLUDE_DIR})
+ set_property(
+ TARGET caffe2::mkldnn PROPERTY INTERFACE_LINK_LIBRARIES
+- ${MKLDNN_LIBRARIES})
++ DNNL::dnnl)
+diff --git a/setup.py b/setup.py
+index 81f3c6c..3251cab 100644
+--- a/setup.py
++++ b/setup.py
+@@ -482,13 +482,9 @@ def build_deps():
+ # Windows has very poor support for them.
+ sym_files = [
+ "tools/shared/_utils_internal.py",
+- "torch/utils/benchmark/utils/valgrind_wrapper/callgrind.h",
+- "torch/utils/benchmark/utils/valgrind_wrapper/valgrind.h",
+ ]
+ orig_files = [
+ "torch/_utils_internal.py",
+- "third_party/valgrind-headers/callgrind.h",
+- "third_party/valgrind-headers/valgrind.h",
+ ]
+ for sym_file, orig_file in zip(sym_files, orig_files):
+ same = False
diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
-index bf91460c..ef56948f 100644
+index 5c89748..ef84c57 100644
--- a/test/cpp/c10d/CMakeLists.txt
+++ b/test/cpp/c10d/CMakeLists.txt
@@ -16,14 +16,14 @@ function(c10d_add_test test_src)
@@ -133,7 +352,29 @@ index bf91460c..ef56948f 100644
endif()
if(USE_NCCL AND USE_C10D_NCCL)
# NCCL is a private dependency of libtorch, but the tests include some
-@@ -56,7 +56,7 @@ if(USE_CUDA)
+@@ -44,10 +44,10 @@ if(USE_CUDA)
+ # a private dependency of the tests as well.
+ c10d_add_test(
+ ProcessGroupNCCLTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_nccl)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl)
+ c10d_add_test(
+ ProcessGroupNCCLErrorsTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_nccl)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl)
+ if(INSTALL_TEST)
+ install(TARGETS ProcessGroupNCCLTest DESTINATION bin)
+ install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin)
+@@ -61,7 +61,7 @@ if(USE_CUDA)
+ # a private dependency of the tests as well.
+ c10d_add_test(
+ ProcessGroupUCCTest.cpp
+- torch_cpu c10d_cuda_test gtest_main __caffe2_ucc)
++ torch_cpu c10d_cuda_test gtest_main gtest __caffe2_ucc)
+ if(INSTALL_TEST)
+ install(TARGETS ProcessGroupUCCTest DESTINATION bin)
+ install(TARGETS c10d_cuda_test DESTINATION lib)
+@@ -69,7 +69,7 @@ if(USE_CUDA)
endif()
else()
if(USE_GLOO AND USE_C10D_GLOO)
@@ -143,10 +384,10 @@ index bf91460c..ef56948f 100644
endif()
diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt
-index 8fc5a0a1..643202f6 100644
+index 012471d..d39b625 100644
--- a/test/cpp/tensorexpr/CMakeLists.txt
+++ b/test/cpp/tensorexpr/CMakeLists.txt
-@@ -53,7 +53,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
+@@ -54,7 +54,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
# pthreadpool header. For some build environment we need add the dependency
# explicitly.
if(USE_PTHREADPOOL)
@@ -154,4 +395,4 @@ index 8fc5a0a1..643202f6 100644
+ target_link_libraries(test_tensorexpr PRIVATE pthreadpool)
endif()
if(USE_CUDA)
- target_link_libraries(test_tensorexpr PRIVATE
+ target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA)
diff --git a/gnu/packages/patches/python-pytorch-without-kineto.patch b/gnu/packages/patches/python-pytorch-without-kineto.patch
new file mode 100644
index 0000000000..f956316866
--- /dev/null
+++ b/gnu/packages/patches/python-pytorch-without-kineto.patch
@@ -0,0 +1,60 @@
+Even when building without Kineto, the <ActivityType.h> header is still
+imported and the ActivityType type is used. This patch was copied from
+https://github.com/pytorch/pytorch/pull/111048.
+
+diff --git a/torch/csrc/profiler/kineto_shim.h b/torch/csrc/profiler/kineto_shim.h
+index e92cbf00..68985ab7 100644
+--- a/torch/csrc/profiler/kineto_shim.h
++++ b/torch/csrc/profiler/kineto_shim.h
+@@ -12,7 +12,51 @@
+ #undef USE_KINETO
+ #endif
+
++#ifdef USE_KINETO
+ #include <ActivityType.h>
++#else
++namespace libkineto {
++// copied from header
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ * All rights reserved.
++ *
++ * This source code is licensed under the BSD-style license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++// Note : All activity types are not enabled by default. Please add them
++// at correct position in the enum
++enum class ActivityType {
++ // Activity types enabled by default
++ CPU_OP = 0, // cpu side ops
++ USER_ANNOTATION,
++ GPU_USER_ANNOTATION,
++ GPU_MEMCPY,
++ GPU_MEMSET,
++ CONCURRENT_KERNEL, // on-device kernels
++ EXTERNAL_CORRELATION,
++ CUDA_RUNTIME, // host side cuda runtime events
++ CUDA_DRIVER, // host side cuda driver events
++ CPU_INSTANT_EVENT, // host side point-like events
++ PYTHON_FUNCTION,
++ OVERHEAD, // CUPTI induced overhead events sampled from its overhead API.
++
++ // Optional Activity types
++ CUDA_SYNC, // synchronization events between runtime and kernels
++ GLOW_RUNTIME, // host side glow runtime events
++ MTIA_RUNTIME, // host side MTIA runtime events
++ CUDA_PROFILER_RANGE, // CUPTI Profiler range for performance metrics
++ MTIA_CCP_EVENTS, // MTIA ondevice CCP events
++ HPU_OP, // HPU host side runtime event
++ XPU_RUNTIME, // host side xpu runtime events
++
++ ENUM_COUNT, // This is to add buffer and not used for any profiling logic. Add your new type before it.
++ OPTIONAL_ACTIVITY_TYPE_START = CUDA_SYNC,
++};
++}
++
++#endif
+
+ #include <torch/csrc/Export.h>
+ #include <torch/csrc/profiler/api.h>
diff --git a/gnu/packages/patches/python-pytorch2-system-libraries.patch b/gnu/packages/patches/python-pytorch2-system-libraries.patch
deleted file mode 100644
index c2c44badbb..0000000000
--- a/gnu/packages/patches/python-pytorch2-system-libraries.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Use our own googletest rather than the bundled one.
-Get NNPACK to use our own PeachPy rather than the bundled one.
-
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
---- a/caffe2/CMakeLists.txt 2023-12-27 12:14:24.308751288 +0100
-+++ b/caffe2/CMakeLists.txt 2023-12-27 12:30:15.941562126 +0100
-@@ -1570,7 +1570,7 @@
- add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}")
- add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}")
- target_link_libraries(static_runtime_bench torch_library benchmark)
-- target_link_libraries(static_runtime_test torch_library gtest_main)
-+ target_link_libraries(static_runtime_test torch_library gtest_main gtest)
- endif()
-
- if(BUILD_TENSOREXPR_BENCHMARK)
-@@ -1601,7 +1601,7 @@
- foreach(test_src ${ATen_MOBILE_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
- target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
-@@ -1628,7 +1628,7 @@
- endif()
- else()
- add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}")
-- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main)
-+ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main gtest)
- endif()
- target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
-@@ -1645,7 +1645,7 @@
- foreach(test_src ${Caffe2_CPU_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
-@@ -1666,7 +1666,7 @@
- foreach(test_src ${Caffe2_MPS_TEST_SRCS})
- get_filename_component(test_name ${test_src} NAME_WE)
- add_executable(${test_name} "${test_src}")
-- target_link_libraries(${test_name} torch_library gtest_main)
-+ target_link_libraries(${test_name} torch_library gtest_main gtest)
- target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
- target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
- target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 557ab649..ee9cf410 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -732,11 +732,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
- # this shouldn't be necessary anymore.
- get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
-- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest)
-- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp})
--
-- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include)
-- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include)
-
- # We will not need to test benchmark lib itself.
- set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
-@@ -1543,7 +1538,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
- endif()
- set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
- message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
-- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
-+ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer)
- endif()
- include_directories(${FOXI_INCLUDE_DIRS})
- list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
-diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
-index a41343cb..6075bdd0 100644
---- a/cmake/External/nnpack.cmake
-+++ b/cmake/External/nnpack.cmake
-@@ -40,7 +40,7 @@ endif()
- # (3) Android, iOS, Linux, macOS - supported
- ##############################################################################
-
--if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-+if(FALSE)
- message(STATUS "Brace yourself, we are building NNPACK")
- set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party)
-
-@@ -114,6 +114,5 @@ endif()
- # (4) Catch-all: not supported.
- ##############################################################################
-
--message(WARNING "Unknown platform - I don't know how to build NNPACK. "
-- "See cmake/External/nnpack.cmake for details.")
--set(USE_NNPACK OFF)
-+set(NNPACK_FOUND TRUE)
-+set(USE_NNPACK ON)
-diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
-index bf91460c..ef56948f 100644
---- a/test/cpp/c10d/CMakeLists.txt
-+++ b/test/cpp/c10d/CMakeLists.txt
-@@ -16,14 +16,14 @@ function(c10d_add_test test_src)
- add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
- endfunction()
-
--c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main)
--c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main)
-+c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest)
-+c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest)
- if(INSTALL_TEST)
- install(TARGETS FileStoreTest DESTINATION bin)
- install(TARGETS TCPStoreTest DESTINATION bin)
- endif()
- if(NOT WIN32)
-- c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main)
-+ c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest)
- if(INSTALL_TEST)
- install(TARGETS HashStoreTest DESTINATION bin)
- endif()
-@@ -31,11 +31,11 @@ endif()
-
- if(USE_CUDA)
- if(USE_GLOO AND USE_C10D_GLOO)
-- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main)
-+ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
- if(INSTALL_TEST)
- install(TARGETS ProcessGroupGlooTest DESTINATION bin)
- endif()
-- c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main)
-+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
- endif()
- if(USE_NCCL AND USE_C10D_NCCL)
- # NCCL is a private dependency of libtorch, but the tests include some
-@@ -56,7 +56,7 @@ if(USE_CUDA)
- endif()
- else()
- if(USE_GLOO AND USE_C10D_GLOO)
-- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main)
-+ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest)
- endif()
- endif()
-
-diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt
-index 8fc5a0a1..643202f6 100644
---- a/test/cpp/tensorexpr/CMakeLists.txt
-+++ b/test/cpp/tensorexpr/CMakeLists.txt
-@@ -53,7 +53,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
- # pthreadpool header. For some build environment we need add the dependency
- # explicitly.
- if(USE_PTHREADPOOL)
-- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface)
-+ target_link_libraries(test_tensorexpr PRIVATE pthreadpool)
- endif()
- if(USE_CUDA)
- target_link_libraries(test_tensorexpr PRIVATE
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-scikit-bio-1887.patch b/gnu/packages/patches/python-scikit-bio-1887.patch
deleted file mode 100644
index 7ee7518128..0000000000
--- a/gnu/packages/patches/python-scikit-bio-1887.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 290da0472e3a0af01b242cd1d3dd6a24588db0e5 Mon Sep 17 00:00:00 2001
-From: qiyunzhu <qiyunzhu@gmail.com>
-Date: Sat, 4 Nov 2023 12:59:54 -0700
-Subject: [PATCH 1/2] removed kulsinski
-
----
- CHANGELOG.md | 6 ++++++
- ci/aarch64.conda_requirements.txt | 2 +-
- ci/conda_requirements.txt | 2 +-
- setup.py | 2 +-
- skbio/diversity/_driver.py | 2 --
- 5 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 0ce69c2c6..cd9adea6c 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -2,6 +2,12 @@
-
- ## Version 0.5.10
-
-+### Features
-+* SciPy 1.11+ is now supported.
-+
-+### Backward-incompatible changes [experimental]
-+* Beta diversity metric `kulsinski` was removed. This was motivated by that SciPy replaced this distance metric with `kulczynski1` in version 1.11 (see SciPy issue [#2009](https://github.com/scipy/scipy/issues/2009)), and that both metrics do not return 0 on two identical vectors.
-+
- ### Bug fixes
-
- * Re-enabled OpenMP support, which has been mistakenly disabled in 0.5.8 ([#1874](https://github.com/biocore/scikit-bio/pull/1874))
-diff --git a/ci/aarch64.conda_requirements.txt b/ci/aarch64.conda_requirements.txt
-index a329bc666..3564f4c3c 100644
---- a/ci/aarch64.conda_requirements.txt
-+++ b/ci/aarch64.conda_requirements.txt
-@@ -5,5 +5,5 @@ matplotlib >= 1.4.3
- natsort >= 4.0.3
- numpy >= 1.9.2
- pandas >= 1.5.0
--scipy <= 1.10.1
-+scipy >= 1.9.0
- h5py >= 3.6.0
-diff --git a/ci/conda_requirements.txt b/ci/conda_requirements.txt
-index 4402e4ebb..0f1bd715c 100644
---- a/ci/conda_requirements.txt
-+++ b/ci/conda_requirements.txt
-@@ -5,6 +5,6 @@ matplotlib >= 1.4.3
- natsort >= 4.0.3
- numpy >= 1.9.2
- pandas >= 1.5.0
--scipy <= 1.10.1
-+scipy >= 1.9.0
- h5py >= 3.6.0
- hdmedians >= 0.14.1
-diff --git a/setup.py b/setup.py
-index 36600e427..fa4d5e0a7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -221,7 +221,7 @@ def check_bin(ccbin, source, allow_dash):
- 'natsort >= 4.0.3',
- 'numpy >= 1.9.2',
- 'pandas >= 1.5.0',
-- 'scipy <= 1.10.1',
-+ 'scipy >= 1.9.0',
- 'h5py >= 3.6.0',
- 'hdmedians >= 0.14.1',
- ],
-diff --git a/skbio/diversity/_driver.py b/skbio/diversity/_driver.py
-index 016020743..1a792efb6 100644
---- a/skbio/diversity/_driver.py
-+++ b/skbio/diversity/_driver.py
-@@ -296,7 +296,6 @@ def partial_beta_diversity(metric, counts, ids, id_pairs, validate=True,
- "dice",
- "hamming",
- "jaccard",
-- "kulsinski",
- "mahalanobis",
- "manhattan", # aliases to "cityblock" in beta_diversity
- "matching",
-@@ -314,7 +313,6 @@ def partial_beta_diversity(metric, counts, ids, id_pairs, validate=True,
- _qualitative_beta_metrics = [
- "dice",
- "jaccard",
-- "kulsinski",
- "matching",
- "rogerstanimoto",
- "russellrao",
-
-From 9dd9c6dd68a015f1159f884c57878b8a00fad14c Mon Sep 17 00:00:00 2001
-From: Qiyun Zhu <qiyunzhu@gmail.com>
-Date: Tue, 7 Nov 2023 22:42:10 -0700
-Subject: [PATCH 2/2] fixing numpy exception
-
----
- skbio/stats/tests/test_composition.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/skbio/stats/tests/test_composition.py b/skbio/stats/tests/test_composition.py
-index 90921be5b..e720a594f 100644
---- a/skbio/stats/tests/test_composition.py
-+++ b/skbio/stats/tests/test_composition.py
-@@ -1222,7 +1222,7 @@ def test_ancom_fail_alpha(self):
- ancom(self.table1, self.cats1, alpha=1.1)
-
- def test_ancom_fail_multiple_groups(self):
-- with self.assertRaises(TypeError):
-+ with self.assertRaises((TypeError, np.AxisError)):
- ancom(self.table4, self.cats4,
- significance_test=scipy.stats.ttest_ind)
-
diff --git a/gnu/packages/patches/python-scikit-optimize-1148.patch b/gnu/packages/patches/python-scikit-optimize-1148.patch
deleted file mode 100644
index 6ad854ab1e..0000000000
--- a/gnu/packages/patches/python-scikit-optimize-1148.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3a5d5eb90ec9d8d4905c05387748486157cadbbb Mon Sep 17 00:00:00 2001
-From: valtron <valtron2000@gmail.com>
-Date: Tue, 14 Feb 2023 09:56:10 -0700
-Subject: [PATCH] `np.int` -> `int`
-
-`np.int is int` and it was deprecated in numpy 1.20: https://numpy.org/doc/1.20/release/1.20.0-notes.html#deprecations
----
- skopt/space/transformers.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/skopt/space/transformers.py b/skopt/space/transformers.py
-index 68892952..f2dfb164 100644
---- a/skopt/space/transformers.py
-+++ b/skopt/space/transformers.py
-@@ -259,7 +259,7 @@ def transform(self, X):
- if (self.high - self.low) == 0.:
- return X * 0.
- if self.is_int:
-- return (np.round(X).astype(np.int) - self.low) /\
-+ return (np.round(X).astype(int) - self.low) /\
- (self.high - self.low)
- else:
- return (X - self.low) / (self.high - self.low)
-@@ -272,7 +272,7 @@ def inverse_transform(self, X):
- raise ValueError("All values should be greater than 0.0")
- X_orig = X * (self.high - self.low) + self.low
- if self.is_int:
-- return np.round(X_orig).astype(np.int)
-+ return np.round(X_orig).astype(int)
- return X_orig
-
-
diff --git a/gnu/packages/patches/python-scikit-optimize-1150.patch b/gnu/packages/patches/python-scikit-optimize-1150.patch
deleted file mode 100644
index 0cdf361a80..0000000000
--- a/gnu/packages/patches/python-scikit-optimize-1150.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From cd74e00d0e4f435d548444e1a5edc20155e371d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
-Date: Wed, 15 Feb 2023 18:47:52 +0100
-Subject: [PATCH 1/5] Update RandomForesetRegressor criterion to be inline with
- scikit-learn change from mse to squared error this has the same funcitonality
-
----
- requirements.txt | 6 +++---
- setup.py | 6 +++---
- skopt/learning/forest.py | 30 +++++++++++++++---------------
- 3 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 1eaa3083a..23ab3d856 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,6 @@
--numpy>=1.13.3
--scipy>=0.19.1
--scikit-learn>=0.20
-+numpy>=1.23.2
-+scipy>=1.10.0
-+scikit-learn>=1.2.1
- matplotlib>=2.0.0
- pytest
- pyaml>=16.9
-diff --git a/setup.py b/setup.py
-index 8879da880..e7f921765 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,9 +42,9 @@
- classifiers=CLASSIFIERS,
- packages=['skopt', 'skopt.learning', 'skopt.optimizer', 'skopt.space',
- 'skopt.learning.gaussian_process', 'skopt.sampler'],
-- install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.13.3',
-- 'scipy>=0.19.1',
-- 'scikit-learn>=0.20.0'],
-+ install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.23.2',
-+ 'scipy>=1.10.0',
-+ 'scikit-learn>=1.2.1'],
- extras_require={
- 'plots': ["matplotlib>=2.0.0"]
- }
-diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
-index 096770c1d..ebde568f5 100644
---- a/skopt/learning/forest.py
-+++ b/skopt/learning/forest.py
-@@ -27,7 +27,7 @@ def _return_std(X, trees, predictions, min_variance):
- -------
- std : array-like, shape=(n_samples,)
- Standard deviation of `y` at `X`. If criterion
-- is set to "mse", then `std[i] ~= std(y | X[i])`.
-+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
-
- """
- # This derives std(y | x) as described in 4.3.2 of arXiv:1211.0906
-@@ -61,9 +61,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
- n_estimators : integer, optional (default=10)
- The number of trees in the forest.
-
-- criterion : string, optional (default="mse")
-+ criterion : string, optional (default="squared_error")
- The function to measure the quality of a split. Supported criteria
-- are "mse" for the mean squared error, which is equal to variance
-+ are "squared_error" for the mean squared error, which is equal to variance
- reduction as feature selection criterion, and "mae" for the mean
- absolute error.
-
-@@ -194,7 +194,7 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
- .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
-
- """
-- def __init__(self, n_estimators=10, criterion='mse', max_depth=None,
-+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
- min_samples_split=2, min_samples_leaf=1,
- min_weight_fraction_leaf=0.0, max_features='auto',
- max_leaf_nodes=None, min_impurity_decrease=0.,
-@@ -228,20 +228,20 @@ def predict(self, X, return_std=False):
- Returns
- -------
- predictions : array-like of shape = (n_samples,)
-- Predicted values for X. If criterion is set to "mse",
-+ Predicted values for X. If criterion is set to "squared_error",
- then `predictions[i] ~= mean(y | X[i])`.
-
- std : array-like of shape=(n_samples,)
- Standard deviation of `y` at `X`. If criterion
-- is set to "mse", then `std[i] ~= std(y | X[i])`.
-+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
-
- """
- mean = super(RandomForestRegressor, self).predict(X)
-
- if return_std:
-- if self.criterion != "mse":
-+ if self.criterion != "squared_error":
- raise ValueError(
-- "Expected impurity to be 'mse', got %s instead"
-+ "Expected impurity to be 'squared_error', got %s instead"
- % self.criterion)
- std = _return_std(X, self.estimators_, mean, self.min_variance)
- return mean, std
-@@ -257,9 +257,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
- n_estimators : integer, optional (default=10)
- The number of trees in the forest.
-
-- criterion : string, optional (default="mse")
-+ criterion : string, optional (default="squared_error")
- The function to measure the quality of a split. Supported criteria
-- are "mse" for the mean squared error, which is equal to variance
-+ are "squared_error" for the mean squared error, which is equal to variance
- reduction as feature selection criterion, and "mae" for the mean
- absolute error.
-
-@@ -390,7 +390,7 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
- .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
-
- """
-- def __init__(self, n_estimators=10, criterion='mse', max_depth=None,
-+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
- min_samples_split=2, min_samples_leaf=1,
- min_weight_fraction_leaf=0.0, max_features='auto',
- max_leaf_nodes=None, min_impurity_decrease=0.,
-@@ -425,19 +425,19 @@ def predict(self, X, return_std=False):
- Returns
- -------
- predictions : array-like of shape=(n_samples,)
-- Predicted values for X. If criterion is set to "mse",
-+ Predicted values for X. If criterion is set to "squared_error",
- then `predictions[i] ~= mean(y | X[i])`.
-
- std : array-like of shape=(n_samples,)
- Standard deviation of `y` at `X`. If criterion
-- is set to "mse", then `std[i] ~= std(y | X[i])`.
-+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
- """
- mean = super(ExtraTreesRegressor, self).predict(X)
-
- if return_std:
-- if self.criterion != "mse":
-+ if self.criterion != "squared_error":
- raise ValueError(
-- "Expected impurity to be 'mse', got %s instead"
-+ "Expected impurity to be 'squared_error', got %s instead"
- % self.criterion)
- std = _return_std(X, self.estimators_, mean, self.min_variance)
- return mean, std
-
-From 6eb2d4ddaa299ae47d9a69ffb31ebc4ed366d1c1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
-Date: Thu, 16 Feb 2023 11:34:58 +0100
-Subject: [PATCH 2/5] Change test to be consistent with code changes.
-
----
- skopt/learning/tests/test_forest.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/skopt/learning/tests/test_forest.py b/skopt/learning/tests/test_forest.py
-index 0711cde9d..c6ed610f3 100644
---- a/skopt/learning/tests/test_forest.py
-+++ b/skopt/learning/tests/test_forest.py
-@@ -35,7 +35,7 @@ def test_random_forest():
- assert_array_equal(clf.predict(T), true_result)
- assert 10 == len(clf)
-
-- clf = RandomForestRegressor(n_estimators=10, criterion="mse",
-+ clf = RandomForestRegressor(n_estimators=10, criterion="squared_error",
- max_depth=None, min_samples_split=2,
- min_samples_leaf=1,
- min_weight_fraction_leaf=0.,
-@@ -80,7 +80,7 @@ def test_extra_forest():
- assert_array_equal(clf.predict(T), true_result)
- assert 10 == len(clf)
-
-- clf = ExtraTreesRegressor(n_estimators=10, criterion="mse",
-+ clf = ExtraTreesRegressor(n_estimators=10, criterion="squared_error",
- max_depth=None, min_samples_split=2,
- min_samples_leaf=1, min_weight_fraction_leaf=0.,
- max_features="auto", max_leaf_nodes=None,
-
-From 52c620add07d845debbaff2ce2b1c5faf3eae79b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
-Date: Wed, 22 Feb 2023 16:59:03 +0100
-Subject: [PATCH 3/5] Update skopt/learning/forest.py
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix max line width
-
-Co-authored-by: Roland Laurès <roland@laures-valdivia.net>
----
- skopt/learning/forest.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
-index ebde568f5..07dc42664 100644
---- a/skopt/learning/forest.py
-+++ b/skopt/learning/forest.py
-@@ -194,8 +194,8 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
- .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
-
- """
-- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
-- min_samples_split=2, min_samples_leaf=1,
-+ def __init__(self, n_estimators=10, criterion='squared_error',
-+ max_depth=None, min_samples_split=2, min_samples_leaf=1,
- min_weight_fraction_leaf=0.0, max_features='auto',
- max_leaf_nodes=None, min_impurity_decrease=0.,
- bootstrap=True, oob_score=False,
-
-From 52a7db95cb567186fb4e9003139fea4592bdbf05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
-Date: Wed, 22 Feb 2023 17:03:25 +0100
-Subject: [PATCH 4/5] Fix line widht issues
-
----
- skopt/learning/forest.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
-index 07dc42664..d4c24456b 100644
---- a/skopt/learning/forest.py
-+++ b/skopt/learning/forest.py
-@@ -390,8 +390,8 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
- .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
-
- """
-- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
-- min_samples_split=2, min_samples_leaf=1,
-+ def __init__(self, n_estimators=10, criterion='squared_error',
-+ max_depth=None, min_samples_split=2, min_samples_leaf=1,
- min_weight_fraction_leaf=0.0, max_features='auto',
- max_leaf_nodes=None, min_impurity_decrease=0.,
- bootstrap=False, oob_score=False,
-
-From 6b185e489fb4a56625e8505292a20c80434f0633 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
-Date: Wed, 22 Feb 2023 18:37:11 +0100
-Subject: [PATCH 5/5] Fix lin width issues for comments.
-
----
- skopt/learning/forest.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
-index d4c24456b..eb3bd6648 100644
---- a/skopt/learning/forest.py
-+++ b/skopt/learning/forest.py
-@@ -63,9 +63,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
-
- criterion : string, optional (default="squared_error")
- The function to measure the quality of a split. Supported criteria
-- are "squared_error" for the mean squared error, which is equal to variance
-- reduction as feature selection criterion, and "mae" for the mean
-- absolute error.
-+ are "squared_error" for the mean squared error, which is equal to
-+ variance reduction as feature selection criterion, and "mae" for the
-+ mean absolute error.
-
- max_features : int, float, string or None, optional (default="auto")
- The number of features to consider when looking for the best split:
-@@ -259,9 +259,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
-
- criterion : string, optional (default="squared_error")
- The function to measure the quality of a split. Supported criteria
-- are "squared_error" for the mean squared error, which is equal to variance
-- reduction as feature selection criterion, and "mae" for the mean
-- absolute error.
-+ are "squared_error" for the mean squared error, which is equal to
-+ variance reduction as feature selection criterion, and "mae" for the
-+ mean absolute error.
-
- max_features : int, float, string or None, optional (default="auto")
- The number of features to consider when looking for the best split:
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/qemu-7.2.4-build-info-manual.patch b/gnu/packages/patches/qemu-7.2.4-build-info-manual.patch
new file mode 100644
index 0000000000..ff28266aaa
--- /dev/null
+++ b/gnu/packages/patches/qemu-7.2.4-build-info-manual.patch
@@ -0,0 +1,62 @@
+From 2793f47c066ed396b38893c10533202fceb1a05f Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Thu, 17 Sep 2020 13:28:19 -0400
+Subject: [PATCH] build: Build and install a Texinfo version of the manual.
+
+Take advantage of the Sphinx texinfo backend to generate a QEMU info
+manual. The Texinfo format allows for more structure and info readers
+provide more advanced navigation capabilities compared to manpages
+readers.
+
+* docs/meson.build (texi, info): New targets.
+
+Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+
+diff --git a/docs/meson.build b/docs/meson.build
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -92,4 +92,25 @@ if build_docs
+ alias_target('sphinxdocs', sphinxdocs)
+ alias_target('html', sphinxdocs)
+ alias_target('man', sphinxmans)
++
++ # Generate a Texinfo version of the QEMU manual.
++ makeinfo = find_program(['texi2any', 'makeinfo'])
++ if makeinfo.found()
++ sphinxtexi = custom_target(
++ 'QEMU manual generated texinfo source',
++ output: ['QEMU.texi', 'sphinxtexi.stamp'],
++ depfile: 'sphinxtexi.d',
++ command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@',
++ '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo',
++ meson.current_source_dir(), meson.current_build_dir()])
++ sphinxinfo = custom_target(
++ 'QEMU info manual',
++ input: sphinxtexi,
++ output: 'QEMU.info',
++ install: true,
++ install_dir: get_option('infodir'),
++ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@'])
++ alias_target('texi', sphinxtexi)
++ alias_target('info', sphinxinfo)
++ endif
+ endif
+diff --git a/meson.build b/meson.build
+--- a/meson.build
++++ b/meson.build
+@@ -37,6 +37,7 @@ endif
+ qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix')
+ qemu_datadir = get_option('datadir') / get_option('qemu_suffix')
+ qemu_docdir = get_option('docdir') / get_option('qemu_suffix')
++qemu_infodir = get_option('infodir') / get_option('qemu_suffix')
+ qemu_moddir = get_option('libdir') / get_option('qemu_suffix')
+
+ qemu_desktopdir = get_option('datadir') / 'applications'
+@@ -3698,6 +3699,7 @@ else
+ summary_info += {'local state directory': 'queried at runtime'}
+ endif
+ summary_info += {'Doc directory': get_option('prefix') / get_option('docdir')}
++summary_info += {'Info directory': get_option('prefix') / get_option('infodir')}
+ summary_info += {'Build directory': meson.current_build_dir()}
+ summary_info += {'Source path': meson.current_source_dir()}
+ summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
diff --git a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch
new file mode 100644
index 0000000000..bf60ed23bb
--- /dev/null
+++ b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch
@@ -0,0 +1,13 @@
+Disable the qtest-aarch64/migration-test, which sometimes fail non-deterministically.
+See: https://gitlab.com/qemu-project/qemu/-/issues/1230.
+
+--- qemu-7.1.0/tests/qtest/meson.build.old 1969-12-31 19:00:01.000000000 -0500
++++ qemu-7.1.0/tests/qtest/meson.build 2022-09-26 11:11:05.434209797 -0400
+@@ -219,7 +219,6 @@
+ ['arm-cpu-features',
+ 'numa-test',
+ 'boot-serial-test',
+- 'migration-test',
+ 'bcm2835-dma-test']
+
+ qtests_s390x = \
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/sbcl-fast-generic-functions-fix-sbcl-2.4.patch b/gnu/packages/patches/sbcl-fast-generic-functions-fix-sbcl-2.4.patch
new file mode 100644
index 0000000000..d8b30f24a3
--- /dev/null
+++ b/gnu/packages/patches/sbcl-fast-generic-functions-fix-sbcl-2.4.patch
@@ -0,0 +1,99 @@
+From f8bfa4d8ce6b831058935c793e9d9180a46e4171 Mon Sep 17 00:00:00 2001
+From: ajberkley <ajberkley@gmail.com>
+Date: Mon, 27 May 2024 14:21:22 -0700
+Subject: [PATCH 1/2] Fix to work with SBCL 2.4.0 and later
+
+---
+ code/expand-effective-method-body.lisp | 54 +++++++++++++-------------
+ 1 file changed, 28 insertions(+), 26 deletions(-)
+
+diff --git a/code/expand-effective-method-body.lisp b/code/expand-effective-method-body.lisp
+index c00c1b0..68c0b08 100644
+--- a/code/expand-effective-method-body.lisp
++++ b/code/expand-effective-method-body.lisp
+@@ -2,35 +2,37 @@
+
+ (defun expand-effective-method-body
+ (effective-method generic-function lambda-list)
+- (trivial-macroexpand-all:macroexpand-all
+- `(let ((.gf. #',(generic-function-name generic-function)))
+- (declare (ignorable .gf.))
+- #+sbcl(declare (sb-ext:disable-package-locks common-lisp:call-method))
+- #+sbcl(declare (sb-ext:disable-package-locks common-lisp:make-method))
+- #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::check-applicable-keywords))
+- #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::%no-primary-method))
+- (macrolet
+- (;; SBCL introduces explicit keyword argument checking into
+- ;; the effective method. Since we do our own checking, we
+- ;; can safely disable it. However, we touch the relevant
+- ;; variables to prevent unused variable warnings.
+- #+sbcl
+- (sb-pcl::check-applicable-keywords (&rest args)
+- (declare (ignore args))
+- `(progn sb-pcl::.valid-keys. sb-pcl::.keyargs-start. (values)))
+- ;; SBCL introduces a magic form to report when there are no
+- ;; primary methods. The problem is that this form contains a
+- ;; reference to the literal generic function, which is not an
+- ;; externalizable object. Our solution is to replace it with
+- ;; something portable.
+- #+sbcl
+- (sb-pcl::%no-primary-method (&rest args)
+- (declare (ignore args))
+- `(apply #'no-primary-method .gf. ,@',(lambda-list-apply-arguments lambda-list))))
++ (let ((%no-primary-method (find-symbol "%NO-PRIMARY-METHOD" :sb-pcl)))
++ (trivial-macroexpand-all:macroexpand-all
++ `(let ((.gf. #',(generic-function-name generic-function)))
++ (declare (ignorable .gf.))
++ #+sbcl(declare (sb-ext:disable-package-locks common-lisp:call-method))
++ #+sbcl(declare (sb-ext:disable-package-locks common-lisp:make-method))
++ #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::check-applicable-keywords))
++ #+sbcl(declare (sb-ext:disable-package-locks ,%no-primary-method))
++ (macrolet
++ (;; SBCL introduces explicit keyword argument checking into
++ ;; the effective method. Since we do our own checking, we
++ ;; can safely disable it. However, we touch the relevant
++ ;; variables to prevent unused variable warnings.
++ #+sbcl
++ (sb-pcl::check-applicable-keywords (&rest args)
++ (declare (ignore args))
++ `(progn sb-pcl::.valid-keys. sb-pcl::.keyargs-start. (values)))
++ ;; SBCL introduces a magic form to report when there are no
++ ;; primary methods. The problem is that this form contains a
++ ;; reference to the literal generic function, which is not an
++ ;; externalizable object. Our solution is to replace it with
++ ;; something portable.
++ #+sbcl
++ ,(when %no-primary-method
++ `(,%no-primary-method (&rest args)
++ (declare (ignore args))
++ `(apply #'no-primary-method .gf. ,@',(lambda-list-apply-arguments lambda-list)))))
+ ,(wrap-in-call-method-macrolet
+ effective-method
+ generic-function
+- lambda-list)))))
++ lambda-list))))))
+
+ (defun wrap-in-call-method-macrolet (form generic-function lambda-list)
+ `(macrolet ((call-method (method &optional next-methods)
+
+From 01baf2bc9157762029de11ab64429999fa7a58da Mon Sep 17 00:00:00 2001
+From: ajberkley <ajberkley@gmail.com>
+Date: Mon, 27 May 2024 14:37:58 -0700
+Subject: [PATCH 2/2] Fix for SBCL
+
+---
+ code/sbcl.lisp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/code/sbcl.lisp b/code/sbcl.lisp
+index 9e206a8..b97c00a 100644
+--- a/code/sbcl.lisp
++++ b/code/sbcl.lisp
+@@ -13,6 +13,6 @@
+ (prototypes static-call-signature-prototypes))
+ static-call-signature
+ (eval
+- `(sb-c:deftransform ,name ((&rest args) (,@types &rest *))
++ `(sb-c:deftransform ,name ((&rest args) (,@types &rest t))
+ (or (optimize-function-call #',name ',static-call-signature)
+ (sb-c::give-up-ir1-transform))))))))
diff --git a/gnu/packages/patches/sbcl-fix-ppc64-build.patch b/gnu/packages/patches/sbcl-fix-ppc64-build.patch
deleted file mode 100644
index a7d4d9a21e..0000000000
--- a/gnu/packages/patches/sbcl-fix-ppc64-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 255f3ead060129aa097b62f10d054cdc4997a431
-Author: Douglas Katzman <dougk@google.com>
-Date: Mon Jan 1 23:59:50 2024 -0500
-
- Fix ppc64 failure-to-build (from a few weeks ago)
-
- Git rev 7354472bb5 caused NIL to get a bogus widetag.
-
-diff --git a/make-target-2-load.lisp b/make-target-2-load.lisp
-index 6571ec27d..daef942ea 100644
---- a/make-target-2-load.lisp
-+++ b/make-target-2-load.lisp
-@@ -339,7 +339,13 @@ Please check that all strings which were not recognizable to the compiler
-
-
- (do-all-symbols (symbol)
-- (sb-kernel:logior-header-bits symbol sb-vm::+symbol-initial-core+)
-+ ;; Don't futz with the header of static symbols.
-+ ;; Technically LOGIOR-HEADER-BITS can only be used on an OTHER-POINTER-LOWTAG
-+ ;; objects, so modifying NIL should not ever work, but it's especially wrong
-+ ;; on ppc64 where OTHER- and LIST- pointer lowtags are 10 bytes apart instead
-+ ;; of 8, so this was making a random alteration to the header.
-+ (unless (eq (heap-allocated-p symbol) :static)
-+ (sb-kernel:logior-header-bits symbol sb-vm::+symbol-initial-core+))
-
- ;; A symbol whose INFO slot underwent any kind of manipulation
- ;; such that it now has neither properties nor globaldb info,
diff --git a/gnu/packages/patches/sbcl-fix-riscv-build.patch b/gnu/packages/patches/sbcl-fix-riscv-build.patch
deleted file mode 100644
index 3e01ee6579..0000000000
--- a/gnu/packages/patches/sbcl-fix-riscv-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b286d92af7468164c155c70d38213211b296fdfe
-Author: Douglas Katzman <dougk@google.com>
-Date: Wed Jan 10 11:46:55 2024 -0500
-
- Fix riscv build
-
-diff --git a/src/compiler/riscv/float.lisp b/src/compiler/riscv/float.lisp
-index ce46d24ac..a16380293 100644
---- a/src/compiler/riscv/float.lisp
-+++ b/src/compiler/riscv/float.lisp
-@@ -578,7 +578,7 @@
- (:results (res :scs (double-reg)))
- (:arg-types signed-num)
- (:result-types double-float)
-- (:translate make-double-float)
-+ (:translate %make-double-float)
- (:policy :fast-safe)
- (:generator 2
- (inst fmvx-> :double res bits)))
diff --git a/gnu/packages/patches/sbcl-s-sysdeps-bt2.patch b/gnu/packages/patches/sbcl-s-sysdeps-bt2.patch
new file mode 100644
index 0000000000..60749c6e62
--- /dev/null
+++ b/gnu/packages/patches/sbcl-s-sysdeps-bt2.patch
@@ -0,0 +1,61 @@
+From 800ca497282f6fb61e41ea151038d3baa05cdaeb Mon Sep 17 00:00:00 2001
+From: kilianmh <kilian.haemmerle@protonmail.com>
+Date: Sun, 9 Jun 2024 09:02:00 +0200
+Subject: [PATCH] Chore: Update to bordeaux-threads-2
+
+---
+ src/sysdeps.lisp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/sysdeps.lisp b/src/sysdeps.lisp
+index 638e88c..f3a9f19 100644
+--- a/src/sysdeps.lisp
++++ b/src/sysdeps.lisp
+@@ -21,19 +21,19 @@
+
+ (defun current-process ()
+ "Return the object representing the current process"
+- (bt:current-thread))
++ (bt2:current-thread))
+
+ (defun kill-process (process)
+ "Kill the process represented by the object process"
+- (bt:destroy-thread process))
++ (bt2:destroy-thread process))
+
+ (defun run-process (name function &rest arguments)
+ "Create and run a new process with name, executing function on arguments"
+- (bt:make-thread #'(lambda () (apply function arguments)) :name name))
++ (bt2:make-thread #'(lambda () (apply function arguments)) :name name))
+
+ (defun all-processes ()
+ "Return a list of all processes currently running"
+- (bt:all-threads))
++ (bt2:all-threads))
+
+ ;; opening a client TCP/IP socket stream
+
+@@ -75,19 +75,19 @@
+
+ (defun stop-process (name)
+ "Stop a named process by destroying it"
+- (let ((thread (find name (bt:all-threads) :key #'bt:thread-name :test #'equal)))
++ (let ((thread (find name (bt2:all-threads) :key #'bt2:thread-name :test #'equal)))
+ (when thread
+- (bt:destroy-thread thread)
++ (bt2:destroy-thread thread)
+ name)))
+
+ ;; working with process locks
+
+ (defun make-process-lock (name)
+ "Create a named process lock object"
+- (bt:make-recursive-lock name))
++ (bt2:make-recursive-lock :name name))
+
+ (defmacro with-process-lock ((lock) &body body)
+ "Execute body wih the process lock grabbed, wait otherwise"
+- `(bt:with-recursive-lock-held (,lock) ,@body))
++ `(bt2:with-recursive-lock-held (,lock) ,@body))
+
+ ;;;; eof
diff --git a/gnu/packages/patches/sdl-libx11-1.6.patch b/gnu/packages/patches/sdl-libx11-1.6.patch
deleted file mode 100644
index 73ba9ac071..0000000000
--- a/gnu/packages/patches/sdl-libx11-1.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Update _XData32 declaration in SDL_x11sym.h to match that of libx11 1.6.
-
---- SDL-1.2.15/src/video/x11/SDL_x11sym.h.~1~ 2012-01-19 01:30:06.000000000 -0500
-+++ SDL-1.2.15/src/video/x11/SDL_x11sym.h 2014-12-26 00:22:36.445067694 -0500
-@@ -165,7 +165,7 @@
- */
- #ifdef LONG64
- SDL_X11_MODULE(IO_32BIT)
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
- #endif
-
diff --git a/gnu/packages/patches/slurm-23-salloc-fallback-shell.patch b/gnu/packages/patches/slurm-23-salloc-fallback-shell.patch
new file mode 100644
index 0000000000..53605bf3ae
--- /dev/null
+++ b/gnu/packages/patches/slurm-23-salloc-fallback-shell.patch
@@ -0,0 +1,39 @@
+Have 'salloc' use $SHELL or /bin/sh as the fallback shell.
+
+This is useful in situations where glibc’s Name Service Switch (NSS) is
+dysfunctional (with ‘getpwuid’ returning NULL), which can happen when
+/etc/nsswitch.conf specifies plugins that fail to be loaded in user code, for
+instance because user code is linked against an incompatible libc.
+
+Similar patch submitted upstream: https://bugs.schedmd.com/show_bug.cgi?id=19896
+
+diff --git a/src/salloc/opt.c b/src/salloc/opt.c
+index ffff7c8..74563ad 100644
+--- a/src/salloc/opt.c
++++ b/src/salloc/opt.c
+@@ -329,6 +329,7 @@ static void _opt_args(int argc, char **argv, int het_job_offset)
+ * NOTE: This function is NOT reentrant (see getpwuid_r if needed) */
+ static char *_get_shell(void)
+ {
++ char *shell;
+ struct passwd *pw_ent_ptr;
+
+ if (opt.uid == SLURM_AUTH_NOBODY)
+@@ -336,11 +337,13 @@ static char *_get_shell(void)
+ else
+ pw_ent_ptr = getpwuid(opt.uid);
+
+- if (!pw_ent_ptr) {
+- pw_ent_ptr = getpwnam("nobody");
+- warning("no user information for user %u", opt.uid);
++ if (pw_ent_ptr) {
++ shell = pw_ent_ptr->pw_shell;
++ } else {
++ shell = getenv("SHELL") ?: "/bin/sh";
++ warning("no user information for user %u, using '%s' as the shell", opt.uid, shell);
+ }
+- return pw_ent_ptr->pw_shell;
++ return shell;
+ }
+
+ static void _salloc_default_command(int *argcp, char **argvp[])
diff --git a/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch b/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch
new file mode 100644
index 0000000000..5d0fd4d1fb
--- /dev/null
+++ b/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch
@@ -0,0 +1,84 @@
+Upstream status: https://github.com/draios/sysdig/pull/2093
+
+diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake
+index 7cee8a3c4..dd59c1b32 100644
+--- a/cmake/modules/falcosecurity-libs.cmake
++++ b/cmake/modules/falcosecurity-libs.cmake
+@@ -16,6 +16,19 @@
+ # limitations under the License.
+ #
+
++option(USE_BUNDLED_FALCOSECURITY_LIBS "Enable building of the bundled falcosecurity libraries" ${USE_BUNDLED_DEPS})
++
++if(NOT USE_BUNDLED_FALCOSECURITY_LIBS)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(LIBSINSP REQUIRED IMPORTED_TARGET libsinsp)
++ message(STATUS "Found libsinsp:
++ include: ${LIBSINSP_INCLUDE_DIRS}
++ lib: ${LIBSINSP_LIBRARIES}
++ cflags: ${LIBSINSP_CFLAGS}")
++ return()
++endif()
++
++# else(): using bundled falcosecurity libs
+ set(FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/falcosecurity-libs-repo")
+ set(FALCOSECURITY_LIBS_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/falcosecurity-libs-repo")
+
+diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt
+index 60f8072ad..0cb179ccc 100644
+--- a/userspace/sysdig/CMakeLists.txt
++++ b/userspace/sysdig/CMakeLists.txt
+@@ -20,7 +20,6 @@ if(NOT WIN32)
+ include(ncurses)
+ endif() # NOT WIN32
+
+-include(zlib)
+ include(luajit)
+
+ include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui")
+@@ -84,6 +83,12 @@ if(USE_BUNDLED_DEPS)
+ add_dependencies(csysdig luajit)
+ endif()
+
++if(USE_BUNDLED_FALCOSECURITY_LIBS)
++ set(SINSP_LIB sinsp)
++else()
++ set(SINSP_LIB PkgConfig::LIBSINSP)
++endif()
++
+ target_include_directories(
+ sysdig
+ PUBLIC
+@@ -108,7 +113,7 @@ if(NOT WIN32)
+ include_directories(${PROJECT_BINARY_DIR}/driver/src)
+
+ target_link_libraries(sysdig
+- sinsp
++ "${SINSP_LIB}"
+ "${LUAJIT_LIB}"
+ "${YAMLCPP_LIB}")
+
+@@ -117,7 +122,7 @@ if(NOT WIN32)
+ endif()
+
+ target_link_libraries(csysdig
+- sinsp
++ "${SINSP_LIB}"
+ "${LUAJIT_LIB}"
+ "${CURSES_LIBRARIES}"
+ "${YAMLCPP_LIB}")
+@@ -140,12 +145,12 @@ else()
+ add_definitions(-DNOCURSESUI)
+
+ target_link_libraries(sysdig
+- sinsp
++ "${SINSP_LIB}"
+ "${LUAJIT_LIB}"
+ "${YAMLCPP_LIB}")
+
+ target_link_libraries(csysdig
+- sinsp
++ "${SINSP_LIB}"
+ "${LUAJIT_LIB}"
+ "${YAMLCPP_LIB}")
+
diff --git a/gnu/packages/patches/transmission-4.0.5-fix-build.patch b/gnu/packages/patches/transmission-4.0.5-fix-build.patch
deleted file mode 100644
index 7eeb0f1921..0000000000
--- a/gnu/packages/patches/transmission-4.0.5-fix-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix the build with gtkmm 4:
-
-https://github.com/transmission/transmission/issues/6392
-
-Patch copied from upstream source repository:
-
-https://github.com/transmission/transmission/commit/e116672b27b314d54514c96b1fa7aef1dee900b1
-
-From e116672b27b314d54514c96b1fa7aef1dee900b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr>
-Date: Sun, 17 Dec 2023 16:37:35 +0100
-Subject: [PATCH] fix: build error on GTKMM-4 (#6393)
-
----
- gtk/OptionsDialog.cc | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
-index 08198540c10..8c28fc76f98 100644
---- a/gtk/OptionsDialog.cc
-+++ b/gtk/OptionsDialog.cc
-@@ -338,7 +338,16 @@ void TorrentFileChooserDialog::onOpenDialogResponse(int response, Glib::RefPtr<S
- bool const do_prompt = get_choice(std::string(ShowOptionsDialogChoice)) == "true";
- bool const do_notify = false;
-
-- auto const files = IF_GTKMM4(get_files2, get_files)();
-+#if GTKMM_CHECK_VERSION(4, 0, 0)
-+ auto files = std::vector<Glib::RefPtr<Gio::File>>();
-+ auto files_model = get_files();
-+ for (auto i = guint{ 0 }; i < files_model->get_n_items(); ++i)
-+ {
-+ files.push_back(gtr_ptr_dynamic_cast<Gio::File>(files_model->get_object(i)));
-+ }
-+#else
-+ auto const files = get_files();
-+#endif
- g_assert(!files.empty());
-
- /* remember this folder the next time we use this dialog */
diff --git a/gnu/packages/patches/transmission-4.0.6-fix-build.patch b/gnu/packages/patches/transmission-4.0.6-fix-build.patch
new file mode 100644
index 0000000000..18ac505459
--- /dev/null
+++ b/gnu/packages/patches/transmission-4.0.6-fix-build.patch
@@ -0,0 +1,275 @@
+The release tarball of Transmission 4.0.6 fails to build:
+
+https://github.com/transmission/transmission/issues/6873
+
+This patch, which is adapted from upstream source repository, fixes that
+problem:
+
+https://github.com/transmission/transmission/commit/a72a93764e556da6b45d086162e8bc941277ab0d
+
+From a72a93764e556da6b45d086162e8bc941277ab0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr>
+Date: Sat, 16 Mar 2024 07:19:51 +0800
+Subject: [PATCH] deps: update miniupnp to 2.3.4 (miniupnpc 2.2.6) (#6459)
+
+* refactor: add miniupnp 2.3.0 as a submodule
+
+* refactor: remove miniupnpc submodule
+
+* deps: specify the 2.3.0 branch
+
+* build: point to miniupnp monorepo subdirectory miniupnpc
+
+* Fix building miniupnp from Xcode
+
+* fixed miniupnp updateminiupnpcstrings.sh usage
+
+* updating to miniupnpc 2.2.6
+
+* fix build for Windows
+
+* code review: removing the header move
+
+---------
+
+Co-authored-by: Charles Kerr <charles@charleskerr.com>
+---
+ .gitmodules | 7 +-
+ CMakeLists.txt | 13 +++-
+ Transmission.xcodeproj/project.pbxproj | 95 ++++++++++++++++----------
+ third-party/miniupnp | 1 +
+ third-party/miniupnpc | 1 -
+ 5 files changed, 74 insertions(+), 43 deletions(-)
+ create mode 160000 third-party/miniupnp
+ delete mode 160000 third-party/miniupnpc
+
+#diff --git a/.gitmodules b/.gitmodules
+#index 07c4836a7..c81390096 100644
+#--- a/.gitmodules
+#+++ b/.gitmodules
+#@@ -18,10 +18,9 @@
+# path = third-party/libutp
+# url = https://github.com/transmission/libutp
+# branch = post-3.4-transmission
+#-[submodule "third-party/miniupnpc"]
+#- path = third-party/miniupnpc
+#- url = https://github.com/transmission/miniupnpc
+#- branch = post-2.0.20170509-transmission
+#+[submodule "third-party/miniupnp"]
+#+ path = third-party/miniupnp
+#+ url = https://github.com/transmission/miniupnp.git
+# [submodule "third-party/googletest"]
+# path = third-party/googletest
+# url = https://github.com/google/googletest.git
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5d667b35..c65fd3dd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -497,7 +497,13 @@ if(NOT USE_SYSTEM_NATPMP)
+ NATPMP_STATICLIB)
+ endif()
+
+-tr_add_external_auto_library(MINIUPNPC miniupnpc miniupnpc
++if(WIN32)
++ # https://github.com/miniupnp/miniupnp/pull/304
++ set(TR_MINIUPNPC_LIBNAME libminiupnpc)
++else()
++ set(TR_MINIUPNPC_LIBNAME miniupnpc)
++endif()
++tr_add_external_auto_library(MINIUPNPC miniupnp/miniupnpc ${TR_MINIUPNPC_LIBNAME}
+ TARGET miniupnpc::libminiupnpc
+ CMAKE_ARGS
+ -DUPNPC_BUILD_STATIC=ON
+@@ -508,9 +514,10 @@ if(NOT USE_SYSTEM_MINIUPNPC)
+ INTERFACE
+ MINIUPNP_STATICLIB)
+
+- set(MINIUPNPC_VERSION 1.9)
+- set(MINIUPNPC_API_VERSION 12)
++ set(MINIUPNPC_VERSION 2.2)
++ set(MINIUPNPC_API_VERSION 17)
+ endif()
++unset(TR_MINIUPNPC_LIBNAME)
+
+ target_compile_definitions(miniupnpc::libminiupnpc
+ INTERFACE
+#diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
+#index 3282fc02d..0f8f8d85f 100644
+#--- a/Transmission.xcodeproj/project.pbxproj
+#+++ b/Transmission.xcodeproj/project.pbxproj
+#@@ -434,6 +434,8 @@
+# C8B27BA328153F6300A22B5D /* create.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC02807FCE900867D3C /* create.cc */; };
+# C8B27BA428153F6600A22B5D /* edit.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC22807FCE900867D3C /* edit.cc */; };
+# C8B27BA528153F6900A22B5D /* show.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC32807FCE900867D3C /* show.cc */; };
+#+ C8ED0FB1281C10F100B44472 /* addr_is_reserved.c in Sources */ = {isa = PBXBuildFile; fileRef = C8ED0FAF281C10F100B44472 /* addr_is_reserved.c */; };
+#+ C8ED0FB2281C10F100B44472 /* addr_is_reserved.h in Headers */ = {isa = PBXBuildFile; fileRef = C8ED0FB0281C10F100B44472 /* addr_is_reserved.h */; };
+# CAB35C64252F6F5E00552A55 /* mime-types.h in Headers */ = {isa = PBXBuildFile; fileRef = CAB35C62252F6F5E00552A55 /* mime-types.h */; };
+# CCEBA596277340F6DF9F4480 /* session-alt-speeds.cc in Sources */ = {isa = PBXBuildFile; fileRef = CCEBA596277340F6DF9F4481 /* session-alt-speeds.cc */; };
+# CCEBA596277340F6DF9F4482 /* session-alt-speeds.h in Headers */ = {isa = PBXBuildFile; fileRef = CCEBA596277340F6DF9F4483 /* session-alt-speeds.h */; };
+#@@ -1347,6 +1349,8 @@
+# C8B27B7F28153F2B00A22B5D /* transmission-create */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-create"; sourceTree = BUILT_PRODUCTS_DIR; };
+# C8B27B9028153F3100A22B5D /* transmission-edit */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-edit"; sourceTree = BUILT_PRODUCTS_DIR; };
+# C8B27BA128153F3400A22B5D /* transmission-show */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-show"; sourceTree = BUILT_PRODUCTS_DIR; };
+#+ C8ED0FAF281C10F100B44472 /* addr_is_reserved.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = addr_is_reserved.c; sourceTree = "<group>"; };
+#+ C8ED0FB0281C10F100B44472 /* addr_is_reserved.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = addr_is_reserved.h; sourceTree = "<group>"; };
+# CAB35C62252F6F5E00552A55 /* mime-types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = "mime-types.h"; sourceTree = "<group>"; };
+# CCEBA596277340F6DF9F4481 /* session-alt-speeds.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "session-alt-speeds.cc"; sourceTree = "<group>"; };
+# CCEBA596277340F6DF9F4483 /* session-alt-speeds.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; path = "session-alt-speeds.h"; sourceTree = "<group>"; };
+#@@ -2092,39 +2096,12 @@
+# BE1183410CE15DF00002D0F3 /* libminiupnp */ = {
+# isa = PBXGroup;
+# children = (
+#- A22B00AE116A9E90003315FC /* connecthostport.c */,
+#- BE1183610CE160D50002D0F3 /* igd_desc_parse.c */,
+#- BE1183620CE160D50002D0F3 /* minixml.c */,
+#- BE1183630CE160D50002D0F3 /* miniwget.c */,
+#- BE1183640CE160D50002D0F3 /* minissdpc.c */,
+#- BE1183650CE160D50002D0F3 /* minisoap.c */,
+#- BE1183660CE160D50002D0F3 /* upnpreplyparse.c */,
+#- BE1183670CE160D50002D0F3 /* upnpcommands.c */,
+#- BE1183680CE160D50002D0F3 /* miniupnpc.c */,
+#- A20162CB13DE497000E15488 /* portlistingparse.c */,
+#- A20162C713DE48BF00E15488 /* receivedata.c */,
+#- C1BF7BA71F2A3CB7008E88A7 /* upnpdev.c */,
+#- C12F19771E1AE3C30005E93F /* upnperrors.c */,
+#- A22B00AF116A9E90003315FC /* connecthostport.h */,
+#- BE11834E0CE160C50002D0F3 /* miniupnpc_declspec.h */,
+#- BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */,
+#- BE1183500CE160C50002D0F3 /* minixml.h */,
+#- BE1183510CE160C50002D0F3 /* miniwget.h */,
+#- BE1183520CE160C50002D0F3 /* minisoap.h */,
+# A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */,
+#- A20162CF13DE49E500E15488 /* miniupnpctypes.h */,
+#- BE1183530CE160C50002D0F3 /* upnpreplyparse.h */,
+#- BE1183540CE160C50002D0F3 /* upnpcommands.h */,
+#- BE1183550CE160C50002D0F3 /* miniupnpc.h */,
+#- BE1183560CE160C50002D0F3 /* minissdpc.h */,
+#- A25485390EB66CBB004539DA /* codelength.h */,
+#- A20162CC13DE497000E15488 /* portlistingparse.h */,
+#- A20162C813DE48BF00E15488 /* receivedata.h */,
+#- C1BF7BA91F2A3CCE008E88A7 /* upnpdev.h */,
+#- C12F197A1E1AE4460005E93F /* upnperrors.h */,
+#+ C891A007281C02F3002E745F /* include */,
+#+ C8734FB02B9EA39F00EF2AD9 /* src */,
+# );
+# name = libminiupnp;
+#- path = "third-party/miniupnpc";
+#+ path = "third-party/miniupnp/miniupnpc";
+# sourceTree = "<group>";
+# };
+# BE75C3570C72A0D600DBEFE0 /* libevent */ = {
+#@@ -2279,6 +2256,51 @@
+# name = Compatibility;
+# sourceTree = "<group>";
+# };
+#+ C8734FB02B9EA39F00EF2AD9 /* src */ = {
+#+ isa = PBXGroup;
+#+ children = (
+#+ C8ED0FAF281C10F100B44472 /* addr_is_reserved.c */,
+#+ A22B00AE116A9E90003315FC /* connecthostport.c */,
+#+ BE1183610CE160D50002D0F3 /* igd_desc_parse.c */,
+#+ BE1183650CE160D50002D0F3 /* minisoap.c */,
+#+ BE1183640CE160D50002D0F3 /* minissdpc.c */,
+#+ BE1183680CE160D50002D0F3 /* miniupnpc.c */,
+#+ BE1183630CE160D50002D0F3 /* miniwget.c */,
+#+ BE1183620CE160D50002D0F3 /* minixml.c */,
+#+ A20162CB13DE497000E15488 /* portlistingparse.c */,
+#+ A20162C713DE48BF00E15488 /* receivedata.c */,
+#+ BE1183670CE160D50002D0F3 /* upnpcommands.c */,
+#+ C1BF7BA71F2A3CB7008E88A7 /* upnpdev.c */,
+#+ C12F19771E1AE3C30005E93F /* upnperrors.c */,
+#+ BE1183660CE160D50002D0F3 /* upnpreplyparse.c */,
+#+ C8ED0FB0281C10F100B44472 /* addr_is_reserved.h */,
+#+ A25485390EB66CBB004539DA /* codelength.h */,
+#+ A22B00AF116A9E90003315FC /* connecthostport.h */,
+#+ BE1183520CE160C50002D0F3 /* minisoap.h */,
+#+ BE1183560CE160C50002D0F3 /* minissdpc.h */,
+#+ BE1183500CE160C50002D0F3 /* minixml.h */,
+#+ A20162C813DE48BF00E15488 /* receivedata.h */,
+#+ );
+#+ path = src;
+#+ sourceTree = "<group>";
+#+ };
+#+ C891A007281C02F3002E745F /* include */ = {
+#+ isa = PBXGroup;
+#+ children = (
+#+ BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */,
+#+ BE11834E0CE160C50002D0F3 /* miniupnpc_declspec.h */,
+#+ BE1183550CE160C50002D0F3 /* miniupnpc.h */,
+#+ A20162CF13DE49E500E15488 /* miniupnpctypes.h */,
+#+ BE1183510CE160C50002D0F3 /* miniwget.h */,
+#+ A20162CC13DE497000E15488 /* portlistingparse.h */,
+#+ BE1183540CE160C50002D0F3 /* upnpcommands.h */,
+#+ C1BF7BA91F2A3CCE008E88A7 /* upnpdev.h */,
+#+ C12F197A1E1AE4460005E93F /* upnperrors.h */,
+#+ BE1183530CE160C50002D0F3 /* upnpreplyparse.h */,
+#+ );
+#+ path = include;
+#+ sourceTree = "<group>";
+#+ };
+# E1B6FBF80C0D719B0015FE4D /* Info Window */ = {
+# isa = PBXGroup;
+# children = (
+#@@ -2470,6 +2492,7 @@
+# BE11835D0CE160C50002D0F3 /* upnpreplyparse.h in Headers */,
+# C1BF7BAA1F2A3CCE008E88A7 /* upnpdev.h in Headers */,
+# BE1183600CE160C50002D0F3 /* minissdpc.h in Headers */,
+#+ C8ED0FB2281C10F100B44472 /* addr_is_reserved.h in Headers */,
+# A254853C0EB66CD4004539DA /* codelength.h in Headers */,
+# A2F8CD430F3D0F4A00DB356A /* miniupnpcstrings.h in Headers */,
+# A22B00B2116A9E9F003315FC /* connecthostport.h in Headers */,
+#@@ -3027,15 +3050,16 @@
+# files = (
+# );
+# inputPaths = (
+#- "third-party/miniupnpc/VERSION",
+#- "third-party/miniupnpc/miniupnpcstrings.h.in",
+#+ "third-party/miniupnp/miniupnpc/VERSION",
+#+ "third-party/miniupnp/miniupnpc/miniupnpcstrings.h.in",
+#+ "third-party/miniupnp/miniupnpc/updateminiupnpcstrings.sh",
+# );
+# outputPaths = (
+#- "third-party/miniupnpc/miniupnpcstrings.h",
+#+ "third-party/miniupnp/miniupnpc/miniupnpcstrings.h",
+# );
+# runOnlyForDeploymentPostprocessing = 0;
+# shellPath = /bin/sh;
+#- shellScript = "cd third-party/miniupnpc\nsh updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_INPUT_FILE_1\" \"$SCRIPT_OUTPUT_FILE_0\"\n";
+#+ shellScript = "cd third-party/miniupnp/miniupnpc\nsh updateminiupnpcstrings.sh\n";
+# };
+# BE75C3510C729EE100DBEFE0 /* Copy libevent headers */ = {
+# isa = PBXShellScriptBuildPhase;
+#@@ -3067,7 +3091,7 @@
+# );
+# runOnlyForDeploymentPostprocessing = 0;
+# shellPath = /bin/sh;
+#- shellScript = "cd third-party/miniupnpc && rm -f miniupnp && ln -s . miniupnp\n";
+#+ shellScript = "cd third-party/miniupnp && rm -f miniupnp && ln -s . miniupnp\n";
+# };
+# C12F197E1E1AE6D50005E93F /* ShellScript */ = {
+# isa = PBXShellScriptBuildPhase;
+#@@ -3340,6 +3364,7 @@
+# C12F19791E1AE3C30005E93F /* upnperrors.c in Sources */,
+# BE11836E0CE160D50002D0F3 /* upnpreplyparse.c in Sources */,
+# C1BF7BA81F2A3CB7008E88A7 /* upnpdev.c in Sources */,
+#+ C8ED0FB1281C10F100B44472 /* addr_is_reserved.c in Sources */,
+# BE11836F0CE160D50002D0F3 /* upnpcommands.c in Sources */,
+# BE1183700CE160D50002D0F3 /* miniupnpc.c in Sources */,
+# A22B00B3116A9EA4003315FC /* connecthostport.c in Sources */,
+#diff --git a/third-party/miniupnp b/third-party/miniupnp
+#new file mode 160000
+#index 000000000..faad29d73
+#--- /dev/null
+#+++ b/third-party/miniupnp
+#@@ -0,0 +1 @@
+#+Subproject commit faad29d7300f1bfa9dc7795031993c04c5191f59
+#diff --git a/third-party/miniupnpc b/third-party/miniupnpc
+#deleted file mode 160000
+#index e37cde82e..000000000
+#--- a/third-party/miniupnpc
+#+++ /dev/null
+#@@ -1 +0,0 @@
+#-Subproject commit e37cde82e8673a5e71bae43086828704fd5eeac1
+--
+2.45.2
+
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/webrtc-audio-processing-big-endian.patch b/gnu/packages/patches/webrtc-audio-processing-big-endian.patch
deleted file mode 100644
index 78333fe7b7..0000000000
--- a/gnu/packages/patches/webrtc-audio-processing-big-endian.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=95738
-https://bugs.freedesktop.org/attachment.cgi?id=124025
-
-diff -up webrtc-audio-processing-0.2/webrtc/common_audio/wav_file.cc.than webrtc-audio-processing-0.2/webrtc/common_audio/wav_file.cc
---- webrtc-audio-processing-0.2/webrtc/common_audio/wav_file.cc.than 2016-05-24 08:28:45.749940095 -0400
-+++ webrtc-audio-processing-0.2/webrtc/common_audio/wav_file.cc 2016-05-24 08:50:30.361020010 -0400
-@@ -64,9 +64,6 @@ WavReader::~WavReader() {
- }
-
- size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
--#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
--#error "Need to convert samples to big-endian when reading from WAV file"
--#endif
- // There could be metadata after the audio; ensure we don't read it.
- num_samples = std::min(rtc::checked_cast<uint32_t>(num_samples),
- num_samples_remaining_);
-@@ -76,6 +73,12 @@ size_t WavReader::ReadSamples(size_t num
- RTC_CHECK(read == num_samples || feof(file_handle_));
- RTC_CHECK_LE(read, num_samples_remaining_);
- num_samples_remaining_ -= rtc::checked_cast<uint32_t>(read);
-+#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
-+ //convert to big-endian
-+ for(size_t idx = 0; idx < num_samples; idx++) {
-+ samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
-+ }
-+#endif
- return read;
- }
-
-@@ -120,10 +123,17 @@ WavWriter::~WavWriter() {
-
- void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
- #ifndef WEBRTC_ARCH_LITTLE_ENDIAN
--#error "Need to convert samples to little-endian when writing to WAV file"
--#endif
-+ int16_t * le_samples = new int16_t[num_samples];
-+ for(size_t idx = 0; idx < num_samples; idx++) {
-+ le_samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
-+ }
-+ const size_t written =
-+ fwrite(le_samples, sizeof(*le_samples), num_samples, file_handle_);
-+ delete []le_samples;
-+#else
- const size_t written =
- fwrite(samples, sizeof(*samples), num_samples, file_handle_);
-+#endif
- RTC_CHECK_EQ(num_samples, written);
- num_samples_ += static_cast<uint32_t>(written);
- RTC_CHECK(written <= std::numeric_limits<uint32_t>::max() ||
-diff -up webrtc-audio-processing-0.2/webrtc/common_audio/wav_header.cc.than webrtc-audio-processing-0.2/webrtc/common_audio/wav_header.cc
---- webrtc-audio-processing-0.2/webrtc/common_audio/wav_header.cc.than 2016-05-24 08:50:52.591379263 -0400
-+++ webrtc-audio-processing-0.2/webrtc/common_audio/wav_header.cc 2016-05-24 08:52:08.552606848 -0400
-@@ -129,7 +129,39 @@ static inline std::string ReadFourCC(uin
- return std::string(reinterpret_cast<char*>(&x), 4);
- }
- #else
--#error "Write be-to-le conversion functions"
-+static inline void WriteLE16(uint16_t* f, uint16_t x) {
-+ *f = ((x << 8) & 0xff00) | ( ( x >> 8) & 0x00ff);
-+}
-+
-+static inline void WriteLE32(uint32_t* f, uint32_t x) {
-+ *f = ( (x & 0x000000ff) << 24 )
-+ | ((x & 0x0000ff00) << 8)
-+ | ((x & 0x00ff0000) >> 8)
-+ | ((x & 0xff000000) >> 24 );
-+}
-+
-+static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
-+ *f = (static_cast<uint32_t>(a) << 24 )
-+ | (static_cast<uint32_t>(b) << 16)
-+ | (static_cast<uint32_t>(c) << 8)
-+ | (static_cast<uint32_t>(d) );
-+}
-+
-+static inline uint16_t ReadLE16(uint16_t x) {
-+ return (( x & 0x00ff) << 8 )| ((x & 0xff00)>>8);
-+}
-+
-+static inline uint32_t ReadLE32(uint32_t x) {
-+ return ( (x & 0x000000ff) << 24 )
-+ | ( (x & 0x0000ff00) << 8 )
-+ | ( (x & 0x00ff0000) >> 8)
-+ | ( (x & 0xff000000) >> 24 );
-+}
-+
-+static inline std::string ReadFourCC(uint32_t x) {
-+ x = ReadLE32(x);
-+ return std::string(reinterpret_cast<char*>(&x), 4);
-+}
- #endif
-
- static inline uint32_t RiffChunkSize(uint32_t bytes_in_payload) {
diff --git a/gnu/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch b/gnu/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch
new file mode 100644
index 0000000000..e2d974afd9
--- /dev/null
+++ b/gnu/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/917493
+https://sources.debian.org/src/webrtc-audio-processing/1.0-0.2/debian/patches/Add-generic-byte-order-and-pointer-size-detection.patch/
+
+Description: Add generic byte order and pointer size detection
+Author: Than <than@redhat.com>
+Origin: https://bugs.freedesktop.org/show_bug.cgi?id=95738#c4
+Last-Update: 2022-02-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/webrtc/rtc_base/system/arch.h
++++ b/webrtc/rtc_base/system/arch.h
+@@ -58,7 +58,19 @@
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
+ #else
+-#error Please add support for your architecture in rtc_base/system/arch.h
++/* instead of failing, use typical unix defines... */
++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define WEBRTC_ARCH_BIG_ENDIAN
++#else
++#error __BYTE_ORDER__ is not defined
++#endif
++#if defined(__LP64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
+ #endif
+
+ #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
diff --git a/gnu/packages/patches/webrtc-audio-processing-x86-no-sse.patch b/gnu/packages/patches/webrtc-audio-processing-x86-no-sse.patch
new file mode 100644
index 0000000000..c194dd9244
--- /dev/null
+++ b/gnu/packages/patches/webrtc-audio-processing-x86-no-sse.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/921140
+https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+--- a/webrtc/rtc_base/system/arch.h
++++ b/webrtc/rtc_base/system/arch.h
+@@ -34,7 +34,7 @@
+ #else
+ #define WEBRTC_ARCH_32_BITS
+ #endif
+-#elif defined(_M_IX86) || defined(__i386__)
++#elif defined(__SSE__) && (defined(_M_IX86) || defined(__i386__))
+ #define WEBRTC_ARCH_X86_FAMILY
+ #define WEBRTC_ARCH_X86
+ #define WEBRTC_ARCH_32_BITS
diff --git a/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch b/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch
new file mode 100644
index 0000000000..b36124b268
--- /dev/null
+++ b/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch
@@ -0,0 +1,33 @@
+https://sources.debian.org/data/main/w/wmfire/1.2.4-7/debian/patches/08_removed-inline-from-function-with-extern-linkage.patch
+
+Description: remove inline from function with extern linkage
+ Fixes FTBFS with gcc 9.
+Author: Jeremy Sowden <jeremy@azazel.net>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925858
+Last-Update: 2019-06-22
+Forwarded: not-needed
+
+---
+ src/wmfire.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/wmfire.c
++++ b/src/wmfire.c
+@@ -111,7 +111,7 @@
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+-inline void draw_fire(unsigned int);
++void draw_fire(unsigned int);
+ static void make_wmfire_dockapp();
+ void read_config(int, char **);
+ void do_help(void);
+@@ -504,7 +504,7 @@
+ /* Draw fire */
+ /******************************************/
+
+-inline void
++void
+ draw_fire(unsigned int load)
+ {
+ int x, y, i, j;
diff --git a/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch b/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch
deleted file mode 100644
index a711aa0d6c..0000000000
--- a/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch
+++ /dev/null
@@ -1,2660 +0,0 @@
-This patch allows the build process to use the provided dependencies instead
-of adding their source as CMake sub-directories (in which case "make install"
-would install googletest's and googlebenchmark's libraries and headers).
-
-diff a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt 2023-12-27 13:29:04.608138355 +0100
-@@ -850,25 +850,8 @@
- SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}")
- ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(microkernels-all PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(hardware-config PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(indirection PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(jit PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(logging PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(normalization PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool)
- IF(XNNPACK_BUILD_LIBRARY)
- TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool)
-- TARGET_LINK_LIBRARIES(allocator PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(cache PRIVATE memory pthreadpool)
-- TARGET_LINK_LIBRARIES(subgraph PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(operators PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(operator-run PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(operator-utils PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(mutex PRIVATE pthreadpool)
-- TARGET_LINK_LIBRARIES(memory PRIVATE pthreadpool)
- TARGET_LINK_LIBRARIES(post-operation PUBLIC pthreadpool allocator)
- ENDIF()
-
-@@ -889,12 +872,6 @@
- SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
- ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fxdiv)
--TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fxdiv)
--TARGET_LINK_LIBRARIES(indirection PRIVATE fxdiv)
--IF(XNNPACK_BUILD_LIBRARY)
-- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv)
--ENDIF()
-
- # ---[ Configure FP16
- IF(NOT TARGET fp16)
-@@ -913,17 +890,7 @@
- SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C)
- ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fp16)
--TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fp16)
--TARGET_LINK_LIBRARIES(microparams-init PRIVATE fp16)
--TARGET_LINK_LIBRARIES(packing PRIVATE fp16)
--TARGET_LINK_LIBRARIES(indirection PRIVATE fp16)
- IF(XNNPACK_BUILD_LIBRARY)
-- TARGET_LINK_LIBRARIES(subgraph PRIVATE fp16)
-- TARGET_LINK_LIBRARIES(operators PRIVATE fp16)
-- TARGET_LINK_LIBRARIES(operator-run PRIVATE fp16)
--
-- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16)
- INSTALL(TARGETS XNNPACK
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -943,7 +910,7 @@
- # Helper libraries
- ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc)
- TARGET_INCLUDE_DIRECTORIES(gemm-microkernel-tester PRIVATE . include src test)
-- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE fp16 pthreadpool gtest)
-+ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE gtest)
- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE jit packing)
- IF(XNNPACK_BUILD_LIBRARY)
- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE XNNPACK post-operation)
-@@ -960,22 +927,22 @@
- # ---[ Build operator-level unit tests
- ADD_EXECUTABLE(abs-nc-test test/abs-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(abs-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME abs-nc-test COMMAND abs-nc-test)
-
- ADD_EXECUTABLE(abs-nc-eager-test test/abs-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(abs-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME abs-nc-eager-test COMMAND abs-nc-eager-test)
-
- ADD_EXECUTABLE(add-nd-test test/add-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(add-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME add-nd-test COMMAND add-nd-test)
-
- ADD_EXECUTABLE(add-nd-eager-test test/add-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(add-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test)
-
- ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc)
-@@ -985,27 +952,27 @@
-
- ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc)
- TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test)
-
- ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME bankers-rounding-nc-test COMMAND bankers-rounding-nc-test)
-
- ADD_EXECUTABLE(bankers-rounding-nc-eager-test test/bankers-rounding-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME bankers-rounding-nc-eager-test COMMAND bankers-rounding-nc-eager-test)
-
- ADD_EXECUTABLE(ceiling-nc-test test/ceiling-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(ceiling-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME ceiling-nc-test COMMAND ceiling-nc-test)
-
- ADD_EXECUTABLE(ceiling-nc-eager-test test/ceiling-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(ceiling-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME ceiling-nc-eager-test COMMAND ceiling-nc-eager-test)
-
- ADD_EXECUTABLE(channel-shuffle-nc-test test/channel-shuffle-nc.cc)
-@@ -1015,12 +982,12 @@
-
- ADD_EXECUTABLE(clamp-nc-test test/clamp-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(clamp-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME clamp-nc-test COMMAND clamp-nc-test)
-
- ADD_EXECUTABLE(clamp-nc-eager-test test/clamp-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(clamp-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME clamp-nc-eager-test COMMAND clamp-nc-eager-test)
-
- ADD_EXECUTABLE(constant-pad-nd-test test/constant-pad-nd.cc)
-@@ -1035,25 +1002,25 @@
-
- ADD_EXECUTABLE(convert-nc-test test/convert-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(convert-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME convert-nc-test COMMAND convert-nc-test)
-
- ADD_EXECUTABLE(convert-nc-eager-test test/convert-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(convert-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME convert-nc-eager-test COMMAND convert-nc-eager-test)
-
- ADD_EXECUTABLE(convolution-nhwc-test test/convolution-nhwc.cc)
- SET_TARGET_PROPERTIES(convolution-nhwc-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convolution-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE convolution-test-helpers)
- ADD_TEST(NAME convolution-nhwc-test COMMAND convolution-nhwc-test)
-
- ADD_EXECUTABLE(convolution-nchw-test test/convolution-nchw.cc)
- SET_TARGET_PROPERTIES(convolution-nchw-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convolution-nchw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME convolution-nchw-test COMMAND convolution-nchw-test)
-
- ADD_EXECUTABLE(copy-nc-test test/copy-nc.cc)
-@@ -1068,7 +1035,7 @@
-
- ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc)
- TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test)
-
- ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc)
-@@ -1083,197 +1050,197 @@
-
- ADD_EXECUTABLE(divide-nd-test test/divide-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(divide-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME divide-nd-test COMMAND divide-nd-test)
-
- ADD_EXECUTABLE(divide-nd-eager-test test/divide-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(divide-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME divide-nd-eager-test COMMAND divide-nd-eager-test)
-
- ADD_EXECUTABLE(elu-nc-test test/elu-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(elu-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME elu-nc-test COMMAND elu-nc-test)
-
- ADD_EXECUTABLE(elu-nc-eager-test test/elu-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(elu-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME elu-nc-eager-test COMMAND elu-nc-eager-test)
-
- ADD_EXECUTABLE(fully-connected-nc-test test/fully-connected-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(fully-connected-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME fully-connected-nc-test COMMAND fully-connected-nc-test)
-
- ADD_EXECUTABLE(floor-nc-test test/floor-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(floor-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME floor-nc-test COMMAND floor-nc-test)
-
- ADD_EXECUTABLE(floor-nc-eager-test test/floor-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(floor-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test)
-
- ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test)
-
- ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME global-average-pooling-ncw-test COMMAND global-average-pooling-ncw-test)
-
- ADD_EXECUTABLE(hardswish-nc-test test/hardswish-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(hardswish-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME hardswish-nc-test COMMAND hardswish-nc-test)
-
- ADD_EXECUTABLE(hardswish-nc-eager-test test/hardswish-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(hardswish-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME hardswish-nc-eager-test COMMAND hardswish-nc-eager-test)
-
- ADD_EXECUTABLE(leaky-relu-nc-test test/leaky-relu-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME leaky-relu-nc-test COMMAND leaky-relu-nc-test)
-
- ADD_EXECUTABLE(leaky-relu-nc-eager-test test/leaky-relu-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test)
-
- ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc)
- TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test)
-
- ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME maximum-nd-test COMMAND maximum-nd-test)
-
- ADD_EXECUTABLE(maximum-nd-eager-test test/maximum-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(maximum-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME maximum-nd-eager-test COMMAND maximum-nd-eager-test)
-
- ADD_EXECUTABLE(minimum-nd-test test/minimum-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(minimum-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME minimum-nd-test COMMAND minimum-nd-test)
-
- ADD_EXECUTABLE(minimum-nd-eager-test test/minimum-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(minimum-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME minimum-nd-eager-test COMMAND minimum-nd-eager-test)
-
- ADD_EXECUTABLE(multiply-nd-test test/multiply-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(multiply-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME multiply-nd-test COMMAND multiply-nd-test)
-
- ADD_EXECUTABLE(multiply-nd-eager-test test/multiply-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(multiply-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME multiply-nd-eager-test COMMAND multiply-nd-eager-test)
-
- ADD_EXECUTABLE(negate-nc-test test/negate-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(negate-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME negate-nc-test COMMAND negate-nc-test)
-
- ADD_EXECUTABLE(negate-nc-eager-test test/negate-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(negate-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test)
-
- ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test)
-
- ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc)
- TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME resize-bilinear-nhwc-test COMMAND resize-bilinear-nhwc-test)
-
- ADD_EXECUTABLE(resize-bilinear-nchw-test test/resize-bilinear-nchw.cc)
- TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nchw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME resize-bilinear-nchw-test COMMAND resize-bilinear-nchw-test)
-
- ADD_EXECUTABLE(sigmoid-nc-test test/sigmoid-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME sigmoid-nc-test COMMAND sigmoid-nc-test)
-
- ADD_EXECUTABLE(sigmoid-nc-eager-test test/sigmoid-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME sigmoid-nc-eager-test COMMAND sigmoid-nc-eager-test)
-
- ADD_EXECUTABLE(slice-nd-test test/slice-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(slice-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME slice-nd-test COMMAND slice-nd-test)
-
- ADD_EXECUTABLE(slice-nd-eager-test test/slice-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(slice-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME slice-nd-eager-test COMMAND slice-nd-eager-test)
-
- ADD_EXECUTABLE(softmax-nc-test test/softmax-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(softmax-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME softmax-nc-test COMMAND softmax-nc-test)
-
- ADD_EXECUTABLE(space-to-depth-nhwc-test test/space-to-depth-nhwc.cc)
- TARGET_INCLUDE_DIRECTORIES(space-to-depth-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME space-to-depth-nhwc-test COMMAND space-to-depth-nhwc-test)
-
- ADD_EXECUTABLE(square-nc-test test/square-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(square-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME square-nc-test COMMAND square-nc-test)
-
- ADD_EXECUTABLE(square-nc-eager-test test/square-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(square-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME square-nc-eager-test COMMAND square-nc-eager-test)
-
- ADD_EXECUTABLE(square-root-nc-test test/square-root-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(square-root-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME square-root-nc-test COMMAND square-root-nc-test)
-
- ADD_EXECUTABLE(square-root-nc-eager-test test/square-root-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(square-root-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME square-root-nc-eager-test COMMAND square-root-nc-eager-test)
-
- ADD_EXECUTABLE(squared-difference-nd-test test/squared-difference-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME squared-difference-nd-test COMMAND squared-difference-nd-test)
-
- ADD_EXECUTABLE(squared-difference-nd-eager-test test/squared-difference-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME squared-difference-nd-eager-test COMMAND squared-difference-nd-eager-test)
-
- ADD_EXECUTABLE(subtract-nd-test test/subtract-nd.cc)
- TARGET_INCLUDE_DIRECTORIES(subtract-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME subtract-nd-test COMMAND subtract-nd-test)
-
- ADD_EXECUTABLE(subtract-nd-eager-test test/subtract-nd-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(subtract-nd-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME subtract-nd-eager-test COMMAND subtract-nd-eager-test)
-
- ADD_EXECUTABLE(tanh-nc-test test/tanh-nc.cc)
-@@ -1293,12 +1260,12 @@
-
- ADD_EXECUTABLE(truncation-nc-test test/truncation-nc.cc)
- TARGET_INCLUDE_DIRECTORIES(truncation-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME truncation-nc-test COMMAND truncation-nc-test)
-
- ADD_EXECUTABLE(truncation-nc-eager-test test/truncation-nc-eager.cc)
- TARGET_INCLUDE_DIRECTORIES(truncation-nc-eager-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(NAME truncation-nc-eager-test COMMAND truncation-nc-eager-test)
-
- ADD_EXECUTABLE(unpooling-nhwc-test test/unpooling-nhwc.cc)
-@@ -1350,22 +1317,22 @@
-
- ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test)
-
- ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc)
- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test)
-
- ADD_EXECUTABLE(ceiling-test test/ceiling.cc)
- TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME ceiling-test COMMAND ceiling-test)
-
- ADD_EXECUTABLE(clamp-test test/clamp.cc)
- TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME clamp-test COMMAND clamp-test)
-
- ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc)
-@@ -1385,187 +1352,187 @@
-
- ADD_EXECUTABLE(convert-test test/convert.cc)
- TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME convert-test COMMAND convert-test)
-
- ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc)
- SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
-+ TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
- ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test)
-
- ADD_EXECUTABLE(copy-test test/copy.cc)
- TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME copy-test COMMAND copy-test)
-
- ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc)
- SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
-+ TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
- ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test)
-
- ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc)
- TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test)
-
- ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc)
- SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
-+ TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
- ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test)
-
- ADD_EXECUTABLE(divide2-test test/divide2.cc)
- TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME divide2-test COMMAND divide2-test)
-
- ADD_EXECUTABLE(elu-test test/elu.cc)
- TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME elu-test COMMAND elu-test)
-
- ADD_EXECUTABLE(even-split2-test test/even-split2.cc)
- TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME even-split2-test COMMAND even-split2-test)
-
- ADD_EXECUTABLE(even-split3-test test/even-split3.cc)
- TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME even-split3-test COMMAND even-split3-test)
-
- ADD_EXECUTABLE(even-split4-test test/even-split4.cc)
- TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME even-split4-test COMMAND even-split4-test)
-
- ADD_EXECUTABLE(floor-test test/floor.cc)
- TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME floor-test COMMAND floor-test)
-
- ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc)
- TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test)
-
- ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test)
-
- ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test)
-
- ADD_EXECUTABLE(hardswish-test test/hardswish.cc)
- TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME hardswish-test COMMAND hardswish-test)
-
- ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test)
-
- ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test)
-
- ADD_EXECUTABLE(maximum2-test test/maximum2.cc)
- TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME maximum2-test COMMAND maximum2-test)
-
- ADD_EXECUTABLE(minimum2-test test/minimum2.cc)
- TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME minimum2-test COMMAND minimum2-test)
-
- ADD_EXECUTABLE(multiply2-test test/multiply2.cc)
- TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME multiply2-test COMMAND multiply2-test)
-
- ADD_EXECUTABLE(negate-test test/negate.cc)
- TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME negate-test COMMAND negate-test)
-
- ADD_EXECUTABLE(prelu-test test/prelu.cc)
- TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME prelu-test COMMAND prelu-test)
-
- ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc)
- SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test)
-
- ADD_EXECUTABLE(static-slice-test test/static-slice.cc)
- SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK gmock gtest gtest_main subgraph)
- ADD_TEST(NAME static-slice-test COMMAND static-slice-test)
-
- ADD_EXECUTABLE(softmax-test test/softmax.cc)
- TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME softmax-test COMMAND softmax-test)
-
- ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test)
-
- ADD_EXECUTABLE(square-test test/square.cc)
- TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME square-test COMMAND square-test)
-
- ADD_EXECUTABLE(square-root-test test/square.cc)
- TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME square-root-test COMMAND square-root-test)
-
- ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc)
- TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test)
-
- ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc)
- TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test)
-
- ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc)
- TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test)
-
- ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test)
-
- ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test)
-
- ADD_EXECUTABLE(subtract2-test test/subtract2.cc)
- TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME subtract2-test COMMAND subtract2-test)
-
- ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc)
- TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
-+ TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
- ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test)
- ENDIF()
-
-@@ -1591,355 +1558,355 @@
-
- ADD_EXECUTABLE(f16-f32-vcvt-test test/f16-f32-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-f32-vcvt-test COMMAND f16-f32-vcvt-test)
-
- ADD_EXECUTABLE(f16-gavgpool-cw-test test/f16-gavgpool-cw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-gavgpool-cw-test COMMAND f16-gavgpool-cw-test)
-
- ADD_EXECUTABLE(f16-avgpool-minmax-test test/f16-avgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-avgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-avgpool-minmax-test COMMAND f16-avgpool-minmax-test)
-
- ADD_EXECUTABLE(f16-conv-hwc2chw-test test/f16-conv-hwc2chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f16-conv-hwc2chw-test COMMAND f16-conv-hwc2chw-test)
-
- ADD_EXECUTABLE(f16-dwconv-unipass-minmax-test test/f16-dwconv-unipass-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-dwconv-unipass-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f16-dwconv-unipass-minmax-test COMMAND f16-dwconv-unipass-minmax-test)
-
- ADD_EXECUTABLE(f16-dwconv2d-chw-test test/f16-dwconv2d-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f16-dwconv2d-chw-test COMMAND f16-dwconv2d-chw-test)
-
- ADD_EXECUTABLE(f16-gavgpool-minmax-test test/f16-gavgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-gavgpool-minmax-test COMMAND f16-gavgpool-minmax-test)
-
- ADD_EXECUTABLE(f16-gemm-minmax-test test/f16-gemm-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gemm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-gemm-minmax-test COMMAND f16-gemm-minmax-test)
-
- ADD_EXECUTABLE(f16-ibilinear-chw-test test/f16-ibilinear-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-ibilinear-chw-test COMMAND f16-ibilinear-chw-test)
-
- ADD_EXECUTABLE(f16-ibilinear-test test/f16-ibilinear.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-ibilinear-test COMMAND f16-ibilinear-test)
-
- ADD_EXECUTABLE(f16-igemm-minmax-test test/f16-igemm-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-igemm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-igemm-minmax-test COMMAND f16-igemm-minmax-test)
-
- ADD_EXECUTABLE(f16-maxpool-minmax-test test/f16-maxpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-maxpool-minmax-test COMMAND f16-maxpool-minmax-test)
-
- ADD_EXECUTABLE(f16-spmm-minmax-test test/f16-spmm-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-spmm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-spmm-minmax-test COMMAND f16-spmm-minmax-test)
-
- ADD_EXECUTABLE(f16-rmax-test test/f16-rmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-rmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-rmax-test COMMAND f16-rmax-test)
-
- ADD_EXECUTABLE(f16-vabs-test test/f16-vabs.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vabs-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vabs-test COMMAND f16-vabs-test)
-
- ADD_EXECUTABLE(f16-vadd-minmax-test test/f16-vadd-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vadd-minmax-test COMMAND f16-vadd-minmax-test)
-
- ADD_EXECUTABLE(f16-vaddc-minmax-test test/f16-vaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vaddc-minmax-test COMMAND f16-vaddc-minmax-test)
-
- ADD_EXECUTABLE(f16-vclamp-test test/f16-vclamp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vclamp-test COMMAND f16-vclamp-test)
-
- ADD_EXECUTABLE(f16-vdiv-minmax-test test/f16-vdiv-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vdiv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vdiv-minmax-test COMMAND f16-vdiv-minmax-test)
-
- ADD_EXECUTABLE(f16-vdivc-minmax-test test/f16-vdivc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vdivc-minmax-test COMMAND f16-vdivc-minmax-test)
-
- ADD_EXECUTABLE(f16-vrdivc-minmax-test test/f16-vrdivc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vrdivc-minmax-test COMMAND f16-vrdivc-minmax-test)
-
- ADD_EXECUTABLE(f16-velu-test test/f16-velu.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-velu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-velu-test COMMAND f16-velu-test)
-
- ADD_EXECUTABLE(f16-vhswish-test test/f16-vhswish.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vhswish-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vhswish-test COMMAND f16-vhswish-test)
-
- ADD_EXECUTABLE(f16-vlrelu-test test/f16-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vlrelu-test COMMAND f16-vlrelu-test)
-
- ADD_EXECUTABLE(f16-vmax-test test/f16-vmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vmax-test COMMAND f16-vmax-test)
-
- ADD_EXECUTABLE(f16-vmaxc-test test/f16-vmaxc.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmaxc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vmaxc-test COMMAND f16-vmaxc-test)
-
- ADD_EXECUTABLE(f16-vmin-test test/f16-vmin.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmin-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vmin-test COMMAND f16-vmin-test)
-
- ADD_EXECUTABLE(f16-vminc-test test/f16-vminc.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vminc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vminc-test COMMAND f16-vminc-test)
-
- ADD_EXECUTABLE(f16-vmul-minmax-test test/f16-vmul-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmul-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vmul-minmax-test COMMAND f16-vmul-minmax-test)
-
- ADD_EXECUTABLE(f16-vmulc-minmax-test test/f16-vmulc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmulc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vmulc-minmax-test COMMAND f16-vmulc-minmax-test)
-
- ADD_EXECUTABLE(f16-vmulcaddc-minmax-test test/f16-vmulcaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vmulcaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f16-vmulcaddc-minmax-test COMMAND f16-vmulcaddc-minmax-test)
-
- ADD_EXECUTABLE(f16-vneg-test test/f16-vneg.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vneg-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vneg-test COMMAND f16-vneg-test)
-
- ADD_EXECUTABLE(f16-pavgpool-minmax-test test/f16-pavgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-pavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-pavgpool-minmax-test COMMAND f16-pavgpool-minmax-test)
-
- ADD_EXECUTABLE(f16-prelu-test test/f16-prelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-prelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-prelu-test COMMAND f16-prelu-test)
-
- ADD_EXECUTABLE(f16-raddstoreexpminusmax-test test/f16-raddstoreexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-raddstoreexpminusmax-test COMMAND f16-raddstoreexpminusmax-test)
-
- ADD_EXECUTABLE(f16-vrndne-test test/f16-vrndne.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrndne-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vrndne-test COMMAND f16-vrndne-test)
-
- ADD_EXECUTABLE(f16-vrndz-test test/f16-vrndz.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrndz-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vrndz-test COMMAND f16-vrndz-test)
-
- ADD_EXECUTABLE(f16-vrndu-test test/f16-vrndu.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrndu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vrndu-test COMMAND f16-vrndu-test)
-
- ADD_EXECUTABLE(f16-vrndd-test test/f16-vrndd.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrndd-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vrndd-test COMMAND f16-vrndd-test)
-
- ADD_EXECUTABLE(f16-vsigmoid-test test/f16-vsigmoid.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vsigmoid-test COMMAND f16-vsigmoid-test)
-
- ADD_EXECUTABLE(f16-vsqr-test test/f16-vsqr.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsqr-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vsqr-test COMMAND f16-vsqr-test)
-
- ADD_EXECUTABLE(f16-vsqrt-test test/f16-vsqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f16-vsqrt-test COMMAND f16-vsqrt-test)
-
- ADD_EXECUTABLE(f16-vsub-minmax-test test/f16-vsub-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsub-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vsub-minmax-test COMMAND f16-vsub-minmax-test)
-
- ADD_EXECUTABLE(f16-vsubc-minmax-test test/f16-vsubc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vsubc-minmax-test COMMAND f16-vsubc-minmax-test)
-
- ADD_EXECUTABLE(f16-vrsubc-minmax-test test/f16-vrsubc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vrsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f16-vrsubc-minmax-test COMMAND f16-vrsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-argmaxpool-test test/f32-argmaxpool.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-argmaxpool-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-argmaxpool-test COMMAND f32-argmaxpool-test)
-
- ADD_EXECUTABLE(f32-avgpool-minmax-test test/f32-avgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-avgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-avgpool-minmax-test COMMAND f32-avgpool-minmax-test)
-
- ADD_EXECUTABLE(f32-conv-hwc-test test/f32-conv-hwc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-conv-hwc-test COMMAND f32-conv-hwc-test)
-
- ADD_EXECUTABLE(f32-conv-hwc2chw-test test/f32-conv-hwc2chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-conv-hwc2chw-test COMMAND f32-conv-hwc2chw-test)
-
- ADD_EXECUTABLE(f32-dwconv2d-chw-test test/f32-dwconv2d-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-dwconv2d-chw-test COMMAND f32-dwconv2d-chw-test)
-
- ADD_EXECUTABLE(f32-dwconv-multipass-test test/f32-dwconv-multipass.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-dwconv-multipass-test COMMAND f32-dwconv-multipass-test)
-
- ADD_EXECUTABLE(f32-dwconv-multipass-minmax-test test/f32-dwconv-multipass-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-dwconv-multipass-minmax-test COMMAND f32-dwconv-multipass-minmax-test)
-
- ADD_EXECUTABLE(f32-dwconv-unipass-test test/f32-dwconv-unipass.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-dwconv-unipass-test COMMAND f32-dwconv-unipass-test)
-
- ADD_EXECUTABLE(f32-dwconv-unipass-minmax-test test/f32-dwconv-unipass-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-dwconv-unipass-minmax-test COMMAND f32-dwconv-unipass-minmax-test)
-
- ADD_EXECUTABLE(f32-f16-vcvt-test test/f32-f16-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-f16-vcvt-test COMMAND f32-f16-vcvt-test)
-
- ADD_EXECUTABLE(f32-qs8-vcvt-test test/f32-qs8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-qs8-vcvt-test COMMAND f32-qs8-vcvt-test)
-
- ADD_EXECUTABLE(f32-qu8-vcvt-test test/f32-qu8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-qu8-vcvt-test COMMAND f32-qu8-vcvt-test)
-
- ADD_EXECUTABLE(f32-gavgpool-cw-test test/f32-gavgpool-cw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-gavgpool-cw-test COMMAND f32-gavgpool-cw-test)
-
- ADD_EXECUTABLE(f32-gavgpool-minmax-test test/f32-gavgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-gavgpool-minmax-test COMMAND f32-gavgpool-minmax-test)
-
-@@ -1975,13 +1942,13 @@
-
- ADD_EXECUTABLE(f32-ibilinear-test test/f32-ibilinear.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-ibilinear-test COMMAND f32-ibilinear-test)
-
- ADD_EXECUTABLE(f32-ibilinear-chw-test test/f32-ibilinear-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-ibilinear-chw-test COMMAND f32-ibilinear-chw-test)
-
-@@ -2016,13 +1983,13 @@
-
- ADD_EXECUTABLE(f32-maxpool-minmax-test test/f32-maxpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-maxpool-minmax-test COMMAND f32-maxpool-minmax-test)
-
- ADD_EXECUTABLE(f32-pavgpool-minmax-test test/f32-pavgpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-pavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-pavgpool-minmax-test COMMAND f32-pavgpool-minmax-test)
-
-@@ -2034,259 +2001,259 @@
-
- ADD_EXECUTABLE(f32-prelu-test test/f32-prelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-prelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-prelu-test COMMAND f32-prelu-test)
-
- ADD_EXECUTABLE(f32-raddexpminusmax-test test/f32-raddexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-raddexpminusmax-test COMMAND f32-raddexpminusmax-test)
-
- ADD_EXECUTABLE(f32-raddextexp-test test/f32-raddextexp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-raddextexp-test COMMAND f32-raddextexp-test)
-
- ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-raddstoreexpminusmax-test COMMAND f32-raddstoreexpminusmax-test)
-
- ADD_EXECUTABLE(f32-rmax-test test/f32-rmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-rmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-rmax-test COMMAND f32-rmax-test)
-
- ADD_EXECUTABLE(f32-spmm-minmax-test test/f32-spmm-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-spmm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-spmm-minmax-test COMMAND f32-spmm-minmax-test)
-
- ADD_EXECUTABLE(f32-vabs-test test/f32-vabs.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vabs-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vabs-test COMMAND f32-vabs-test)
-
- ADD_EXECUTABLE(f32-vadd-test test/f32-vadd.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vadd-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vadd-test COMMAND f32-vadd-test)
-
- ADD_EXECUTABLE(f32-vadd-minmax-test test/f32-vadd-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vadd-minmax-test COMMAND f32-vadd-minmax-test)
-
- ADD_EXECUTABLE(f32-vadd-relu-test test/f32-vadd-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vadd-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vadd-relu-test COMMAND f32-vadd-relu-test)
-
- ADD_EXECUTABLE(f32-vaddc-test test/f32-vaddc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vaddc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vaddc-test COMMAND f32-vaddc-test)
-
- ADD_EXECUTABLE(f32-vaddc-minmax-test test/f32-vaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vaddc-minmax-test COMMAND f32-vaddc-minmax-test)
-
- ADD_EXECUTABLE(f32-vaddc-relu-test test/f32-vaddc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vaddc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vaddc-relu-test COMMAND f32-vaddc-relu-test)
-
- ADD_EXECUTABLE(f32-vclamp-test test/f32-vclamp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE test gtest_main)
- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vclamp-test COMMAND f32-vclamp-test)
-
- ADD_EXECUTABLE(f32-vhswish-test test/f32-vhswish.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vhswish-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vhswish-test COMMAND f32-vhswish-test)
-
- ADD_EXECUTABLE(f32-vdiv-test test/f32-vdiv.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdiv-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vdiv-test COMMAND f32-vdiv-test)
-
- ADD_EXECUTABLE(f32-vdiv-minmax-test test/f32-vdiv-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdiv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vdiv-minmax-test COMMAND f32-vdiv-minmax-test)
-
- ADD_EXECUTABLE(f32-vdiv-relu-test test/f32-vdiv-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdiv-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vdiv-relu-test COMMAND f32-vdiv-relu-test)
-
- ADD_EXECUTABLE(f32-vdivc-test test/f32-vdivc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdivc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vdivc-test COMMAND f32-vdivc-test)
-
- ADD_EXECUTABLE(f32-vdivc-minmax-test test/f32-vdivc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vdivc-minmax-test COMMAND f32-vdivc-minmax-test)
-
- ADD_EXECUTABLE(f32-vdivc-relu-test test/f32-vdivc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vdivc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vdivc-relu-test COMMAND f32-vdivc-relu-test)
-
- ADD_EXECUTABLE(f32-vrdivc-test test/f32-vrdivc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vrdivc-test COMMAND f32-vrdivc-test)
-
- ADD_EXECUTABLE(f32-vrdivc-minmax-test test/f32-vrdivc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrdivc-minmax-test COMMAND f32-vrdivc-minmax-test)
-
- ADD_EXECUTABLE(f32-vrdivc-relu-test test/f32-vrdivc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vrdivc-relu-test COMMAND f32-vrdivc-relu-test)
-
- ADD_EXECUTABLE(f32-velu-test test/f32-velu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-velu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-velu-test COMMAND f32-velu-test)
-
- ADD_EXECUTABLE(f32-vlrelu-test test/f32-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vlrelu-test COMMAND f32-vlrelu-test)
-
- ADD_EXECUTABLE(f32-vmax-test test/f32-vmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmax-test COMMAND f32-vmax-test)
-
- ADD_EXECUTABLE(f32-vmaxc-test test/f32-vmaxc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmaxc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmaxc-test COMMAND f32-vmaxc-test)
-
- ADD_EXECUTABLE(f32-vmin-test test/f32-vmin.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmin-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmin-test COMMAND f32-vmin-test)
-
- ADD_EXECUTABLE(f32-vminc-test test/f32-vminc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vminc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vminc-test COMMAND f32-vminc-test)
-
- ADD_EXECUTABLE(f32-vmul-test test/f32-vmul.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmul-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmul-test COMMAND f32-vmul-test)
-
- ADD_EXECUTABLE(f32-vmul-minmax-test test/f32-vmul-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmul-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmul-minmax-test COMMAND f32-vmul-minmax-test microparams-init)
-
- ADD_EXECUTABLE(f32-vmul-relu-test test/f32-vmul-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmul-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmul-relu-test COMMAND f32-vmul-relu-test)
-
- ADD_EXECUTABLE(f32-vmulc-test test/f32-vmulc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmulc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmulc-test COMMAND f32-vmulc-test)
-
- ADD_EXECUTABLE(f32-vmulc-minmax-test test/f32-vmulc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmulc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmulc-minmax-test COMMAND f32-vmulc-minmax-test)
-
- ADD_EXECUTABLE(f32-vmulc-relu-test test/f32-vmulc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmulc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vmulc-relu-test COMMAND f32-vmulc-relu-test)
-
- ADD_EXECUTABLE(f32-vmulcaddc-minmax-test test/f32-vmulcaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vmulcaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME f32-vmulcaddc-minmax-test COMMAND f32-vmulcaddc-minmax-test)
-
- ADD_EXECUTABLE(f32-vneg-test test/f32-vneg.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vneg-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vneg-test COMMAND f32-vneg-test)
-
- ADD_EXECUTABLE(f32-vrelu-test test/f32-vrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vrelu-test COMMAND f32-vrelu-test)
-
- ADD_EXECUTABLE(f32-vrndne-test test/f32-vrndne.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrndne-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrndne-test COMMAND f32-vrndne-test)
-
- ADD_EXECUTABLE(f32-vrndz-test test/f32-vrndz.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrndz-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrndz-test COMMAND f32-vrndz-test)
-
- ADD_EXECUTABLE(f32-vrndu-test test/f32-vrndu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrndu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrndu-test COMMAND f32-vrndu-test)
-
- ADD_EXECUTABLE(f32-vrndd-test test/f32-vrndd.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrndd-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrndd-test COMMAND f32-vrndd-test)
-
-@@ -2304,91 +2271,91 @@
-
- ADD_EXECUTABLE(f32-vsigmoid-test test/f32-vsigmoid.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsigmoid-test COMMAND f32-vsigmoid-test)
-
- ADD_EXECUTABLE(f32-vsqr-test test/f32-vsqr.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsqr-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsqr-test COMMAND f32-vsqr-test)
-
- ADD_EXECUTABLE(f32-vsqrdiff-test test/f32-vsqrdiff.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiff-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsqrdiff-test COMMAND f32-vsqrdiff-test)
-
- ADD_EXECUTABLE(f32-vsqrdiffc-test test/f32-vsqrdiffc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiffc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsqrdiffc-test COMMAND f32-vsqrdiffc-test)
-
- ADD_EXECUTABLE(f32-vsqrt-test test/f32-vsqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsqrt-test COMMAND f32-vsqrt-test)
-
- ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsub-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vsub-test COMMAND f32-vsub-test)
-
- ADD_EXECUTABLE(f32-vsub-minmax-test test/f32-vsub-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsub-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsub-minmax-test COMMAND f32-vsub-minmax-test)
-
- ADD_EXECUTABLE(f32-vsub-relu-test test/f32-vsub-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsub-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vsub-relu-test COMMAND f32-vsub-relu-test)
-
- ADD_EXECUTABLE(f32-vsubc-test test/f32-vsubc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsubc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vsubc-test COMMAND f32-vsubc-test)
-
- ADD_EXECUTABLE(f32-vsubc-minmax-test test/f32-vsubc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vsubc-minmax-test COMMAND f32-vsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-vsubc-relu-test test/f32-vsubc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsubc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vsubc-relu-test COMMAND f32-vsubc-relu-test)
-
- ADD_EXECUTABLE(f32-vrsubc-test test/f32-vrsubc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vrsubc-test COMMAND f32-vrsubc-test)
-
- ADD_EXECUTABLE(f32-vrsubc-minmax-test test/f32-vrsubc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME f32-vrsubc-minmax-test COMMAND f32-vrsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-vrsubc-relu-test test/f32-vrsubc-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME f32-vrsubc-relu-test COMMAND f32-vrsubc-relu-test)
-
- ADD_EXECUTABLE(qc8-dwconv-unipass-minmax-fp32-test test/qc8-dwconv-unipass-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME qc8-dwconv-unipass-minmax-fp32-test COMMAND qc8-dwconv-unipass-minmax-fp32-test)
-
-@@ -2406,31 +2373,31 @@
-
- ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-fp32-test test/qs8-dwconv-unipass-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME qs8-dwconv-unipass-minmax-fp32-test COMMAND qs8-dwconv-unipass-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-rndnu-test test/qs8-dwconv-unipass-minmax-rndnu.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME qs8-dwconv-unipass-minmax-rndnu-test COMMAND qs8-dwconv-unipass-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qs8-f32-vcvt-test test/f32-f16-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-f32-vcvt-test COMMAND qs8-f32-vcvt-test)
-
- ADD_EXECUTABLE(qs8-gavgpool-minmax-fp32-test test/qs8-gavgpool-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-gavgpool-minmax-fp32-test COMMAND qs8-gavgpool-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-gavgpool-minmax-rndnu-test test/qs8-gavgpool-minmax-rndnu.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-gavgpool-minmax-rndnu-test COMMAND qs8-gavgpool-minmax-rndnu-test)
-
-@@ -2461,81 +2428,81 @@
- ADD_EXECUTABLE(qs8-requantization-test test/qs8-requantization.cc)
- SET_TARGET_PROPERTIES(qs8-requantization-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-requantization-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME qs8-requantization-test COMMAND qs8-requantization-test)
-
- ADD_EXECUTABLE(qs8-vadd-minmax-test test/qs8-vadd-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vadd-minmax-test COMMAND qs8-vadd-minmax-test)
-
- ADD_EXECUTABLE(qs8-vaddc-minmax-test test/qs8-vaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vaddc-minmax-test COMMAND qs8-vaddc-minmax-test)
-
- ADD_EXECUTABLE(qs8-vcvt-test test/qs8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vcvt-test COMMAND qs8-vcvt-test)
-
- ADD_EXECUTABLE(qs8-vlrelu-test test/qs8-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vlrelu-test COMMAND qs8-vlrelu-test)
-
- ADD_EXECUTABLE(qs8-vmul-minmax-fp32-test test/qs8-vmul-minmax-fp32.cc)
- SET_TARGET_PROPERTIES(qs8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-vmul-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vmul-minmax-fp32-test COMMAND qs8-vmul-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-vmulc-minmax-fp32-test test/qs8-vmulc-minmax-fp32.cc)
- SET_TARGET_PROPERTIES(qs8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qs8-vmulc-minmax-fp32-test COMMAND qs8-vmulc-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-avgpool-minmax-fp32-test test/qu8-avgpool-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-avgpool-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-avgpool-minmax-fp32-test COMMAND qu8-avgpool-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-fp32-test test/qu8-dwconv-unipass-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME qu8-dwconv-unipass-minmax-fp32-test COMMAND qu8-dwconv-unipass-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-rndnu-test test/qu8-dwconv-unipass-minmax-rndnu.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
- ADD_TEST(NAME qu8-dwconv-unipass-minmax-rndnu-test COMMAND qu8-dwconv-unipass-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-f32-vcvt-test test/f32-f16-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-f32-vcvt-test COMMAND qu8-f32-vcvt-test)
-
- ADD_EXECUTABLE(qu8-gavgpool-minmax-fp32-test test/qu8-gavgpool-minmax-fp32.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-gavgpool-minmax-fp32-test COMMAND qu8-gavgpool-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-gavgpool-minmax-rndnu-test test/qu8-gavgpool-minmax-rndnu.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-gavgpool-minmax-rndnu-test COMMAND qu8-gavgpool-minmax-rndnu-test)
-
-@@ -2566,161 +2533,161 @@
- ADD_EXECUTABLE(qu8-requantization-test test/qu8-requantization.cc)
- SET_TARGET_PROPERTIES(qu8-requantization-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-requantization-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME qu8-requantization-test COMMAND qu8-requantization-test)
-
- ADD_EXECUTABLE(qu8-vadd-minmax-test test/qu8-vadd-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vadd-minmax-test COMMAND qu8-vadd-minmax-test)
-
- ADD_EXECUTABLE(qu8-vaddc-minmax-test test/qu8-vaddc-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vaddc-minmax-test COMMAND qu8-vaddc-minmax-test)
-
- ADD_EXECUTABLE(qu8-vcvt-test test/qu8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vcvt-test COMMAND qu8-vcvt-test)
-
- ADD_EXECUTABLE(qu8-vlrelu-test test/qu8-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vlrelu-test COMMAND qu8-vlrelu-test)
-
- ADD_EXECUTABLE(qu8-vmul-minmax-fp32-test test/qu8-vmul-minmax-fp32.cc)
- SET_TARGET_PROPERTIES(qu8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vmul-minmax-fp32-test COMMAND qu8-vmul-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-vmul-minmax-rndnu-test test/qu8-vmul-minmax-rndnu.cc)
- SET_TARGET_PROPERTIES(qu8-vmul-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vmul-minmax-rndnu-test COMMAND qu8-vmul-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-vmulc-minmax-fp32-test test/qu8-vmulc-minmax-fp32.cc)
- SET_TARGET_PROPERTIES(qu8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vmulc-minmax-fp32-test COMMAND qu8-vmulc-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-vmulc-minmax-rndnu-test test/qu8-vmulc-minmax-rndnu.cc)
- SET_TARGET_PROPERTIES(qu8-vmulc-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME qu8-vmulc-minmax-rndnu-test COMMAND qu8-vmulc-minmax-rndnu-test)
-
- ADD_EXECUTABLE(s16-rmaxabs-test test/s16-rmaxabs.cc)
- TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME s16-rmaxabs-test COMMAND s16-rmaxabs-test)
-
- ADD_EXECUTABLE(s16-window-test test/s16-window.cc)
- TARGET_INCLUDE_DIRECTORIES(s16-window-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s16-window-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s16-window-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(s16-window-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME s16-window-test COMMAND s16-window-test)
-
- ADD_EXECUTABLE(u32-filterbank-accumulate-test test/u32-filterbank-accumulate.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u32-filterbank-accumulate-test COMMAND u32-filterbank-accumulate-test)
-
- ADD_EXECUTABLE(u32-filterbank-subtract-test test/u32-filterbank-subtract.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u32-filterbank-subtract-test COMMAND u32-filterbank-subtract-test)
-
- ADD_EXECUTABLE(u32-vlog-test test/u32-vlog.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-vlog-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u32-vlog-test COMMAND u32-vlog-test)
-
- ADD_EXECUTABLE(i16-vlshift-test test/i16-vlshift.cc)
- TARGET_INCLUDE_DIRECTORIES(i16-vlshift-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME i16-vlshift-test COMMAND i16-vlshift-test)
-
- ADD_EXECUTABLE(cs16-vsquareabs-test test/cs16-vsquareabs.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME cs16-vsquareabs-test COMMAND cs16-vsquareabs-test)
-
- ADD_EXECUTABLE(cs16-bfly4-test test/cs16-bfly4.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME cs16-bfly4-test COMMAND cs16-bfly4-test)
-
- ADD_EXECUTABLE(cs16-fftr-test test/cs16-fftr.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-fftr-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME cs16-fftr-test COMMAND cs16-fftr-test)
-
- ADD_EXECUTABLE(s8-ibilinear-test test/s8-ibilinear.cc)
- TARGET_INCLUDE_DIRECTORIES(s8-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME s8-ibilinear-test COMMAND s8-ibilinear-test)
-
- ADD_EXECUTABLE(s8-maxpool-minmax-test test/s8-maxpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(s8-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME s8-maxpool-minmax-test COMMAND s8-maxpool-minmax-test)
-
- ADD_EXECUTABLE(s8-vclamp-test test/s8-vclamp.cc)
- TARGET_INCLUDE_DIRECTORIES(s8-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME s8-vclamp-test COMMAND s8-vclamp-test)
-
- ADD_EXECUTABLE(u8-lut32norm-test test/u8-lut32norm.cc)
- TARGET_INCLUDE_DIRECTORIES(u8-lut32norm-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u8-lut32norm-test COMMAND u8-lut32norm-test)
-
- ADD_EXECUTABLE(u8-ibilinear-test test/u8-ibilinear.cc)
- TARGET_INCLUDE_DIRECTORIES(u8-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u8-ibilinear-test COMMAND u8-ibilinear-test)
-
- ADD_EXECUTABLE(u8-maxpool-minmax-test test/u8-maxpool-minmax.cc)
- TARGET_INCLUDE_DIRECTORIES(u8-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
-+ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE gtest gtest_main microparams-init)
- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME u8-maxpool-minmax-test COMMAND u8-maxpool-minmax-test)
-
- ADD_EXECUTABLE(u8-rmax-test test/u8-rmax.cc)
- TARGET_INCLUDE_DIRECTORIES(u8-rmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME u8-rmax-test COMMAND u8-rmax-test)
-
- ADD_EXECUTABLE(u8-vclamp-test test/u8-vclamp.cc)
- TARGET_INCLUDE_DIRECTORIES(u8-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME u8-vclamp-test COMMAND u8-vclamp-test)
-
-@@ -2762,25 +2729,25 @@
-
- ADD_EXECUTABLE(x32-zip-test test/x32-zip.cc)
- TARGET_INCLUDE_DIRECTORIES(x32-zip-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME x32-zip-test COMMAND x32-zip-test)
-
- ADD_EXECUTABLE(x64-transpose-test test/x64-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x64-transpose-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE hardware-config logging microkernels-all microparams-init)
- ADD_TEST(NAME x64-transpose-test COMMAND x64-transpose-test)
-
- ADD_EXECUTABLE(x8-lut-test test/x8-lut.cc)
- TARGET_INCLUDE_DIRECTORIES(x8-lut-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME x8-lut-test COMMAND x8-lut-test)
-
- ADD_EXECUTABLE(x8-zip-test test/x8-zip.cc)
- TARGET_INCLUDE_DIRECTORIES(x8-zip-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE hardware-config logging microkernels-all)
- ADD_TEST(NAME x8-zip-test COMMAND x8-zip-test)
-
-@@ -2842,12 +2809,12 @@
-
- ADD_EXECUTABLE(packing-test test/packing.cc)
- TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src)
-- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool)
-+ TARGET_LINK_LIBRARIES(packing-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing)
-
- ADD_EXECUTABLE(indirection-test test/indirection.cc)
- TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src)
-- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool)
-+ TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection)
- ENDIF()
-
-@@ -2864,7 +2831,7 @@
- ADD_LIBRARY(bench-utils STATIC bench/utils.cc)
- TARGET_INCLUDE_DIRECTORIES(bench-utils PRIVATE .)
- TARGET_INCLUDE_DIRECTORIES(bench-utils PUBLIC include src)
-- TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo pthreadpool)
-+ TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(bench-utils PRIVATE hardware-config)
- IF(XNNPACK_BUILD_LIBRARY)
- TARGET_LINK_LIBRARIES(bench-utils PRIVATE logging memory)
-@@ -2873,134 +2840,134 @@
- # ---[ Build accuracy microbenchmarks
- ADD_EXECUTABLE(f16-exp-ulp-eval eval/f16-exp-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-exp-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f16-expminus-ulp-eval eval/f16-expminus-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-expminus-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f16-expm1minus-ulp-eval eval/f16-expm1minus-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-expm1minus-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f16-sigmoid-ulp-eval eval/f16-sigmoid-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-sigmoid-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f16-sqrt-ulp-eval eval/f16-sqrt-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-sqrt-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-exp-ulp-eval eval/f32-exp-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-exp-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-expminus-ulp-eval eval/f32-expminus-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-expminus-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-expm1minus-ulp-eval eval/f32-expm1minus-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-extexp-ulp-eval eval/f32-extexp-ulp.cc)
- SET_TARGET_PROPERTIES(f32-extexp-ulp-eval PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-extexp-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-sigmoid-ulp-eval eval/f32-sigmoid-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-sigmoid-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-sqrt-ulp-eval eval/f32-sqrt-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-sqrt-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f32-tanh-ulp-eval eval/f32-tanh-ulp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-tanh-ulp-eval PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE bench-utils microkernels-all)
-
- # ---[ Build accuracy tests
- ADD_EXECUTABLE(f16-sqrt-eval eval/f16-sqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-sqrt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f16-f32-cvt-eval eval/f16-f32-cvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-f32-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-f16-cvt-eval eval/f32-f16-cvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-f16-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-qs8-cvt-eval eval/f32-qs8-cvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qs8-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-qu8-cvt-eval eval/f32-qu8-cvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qu8-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-exp-eval eval/f32-exp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-exp-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-expm1minus-eval eval/f32-expm1minus.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-expminus-eval eval/f32-expminus.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-expminus-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-roundne-eval eval/f32-roundne.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-roundne-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-roundd-eval eval/f32-roundd.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-roundd-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-roundu-eval eval/f32-roundu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-roundu-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(f32-roundz-eval eval/f32-roundz.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-roundz-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(u32-sqrt-eval eval/u32-sqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-sqrt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE hardware-config logging microkernels-all)
-
- ADD_EXECUTABLE(u64-sqrt-eval eval/u64-sqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(u64-sqrt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE gtest gtest_main)
- TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE hardware-config logging microkernels-all)
-
- IF(XNNPACK_BUILD_LIBRARY)
-@@ -3030,7 +2997,7 @@
- models/qu8-mobilenet-v2.cc)
- SET_TARGET_PROPERTIES(bench-models PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(bench-models PRIVATE .)
-- TARGET_LINK_LIBRARIES(bench-models PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(bench-models PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(bench-models PRIVATE XNNPACK bench-utils)
-
- ADD_EXECUTABLE(end2end-bench bench/end2end.cc)
-@@ -3039,7 +3006,7 @@
-
- ADD_EXECUTABLE(f16-gemm-e2e-bench bench/f16-gemm-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gemm-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-dwconv-e2e-bench bench/f32-dwconv-e2e.cc)
-@@ -3049,33 +3016,33 @@
-
- ADD_EXECUTABLE(f32-gemm-e2e-bench bench/f32-gemm-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-gemm-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-dwconv-e2e-bench bench/qs8-dwconv-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-gemm-e2e-bench bench/qs8-gemm-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-gemm-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-gemm-e2e-bench bench/qu8-gemm-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-gemm-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-dwconv-e2e-bench bench/qu8-dwconv-e2e.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-e2e-bench PRIVATE . src)
-- TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE fp16 benchmark)
-+ TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
-
- # ---[ Build operator-level microbenchmarks
- ADD_EXECUTABLE(abs-bench bench/abs.cc)
- TARGET_INCLUDE_DIRECTORIES(abs-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(average-pooling-bench bench/average-pooling.cc)
- TARGET_INCLUDE_DIRECTORIES(average-pooling-bench PRIVATE .)
-@@ -3083,11 +3050,11 @@
-
- ADD_EXECUTABLE(bankers-rounding-bench bench/bankers-rounding.cc)
- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(ceiling-bench bench/ceiling.cc)
- TARGET_INCLUDE_DIRECTORIES(ceiling-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(channel-shuffle-bench bench/channel-shuffle.cc)
- TARGET_INCLUDE_DIRECTORIES(channel-shuffle-bench PRIVATE .)
-@@ -3095,11 +3062,11 @@
-
- ADD_EXECUTABLE(convert-bench bench/convert.cc)
- TARGET_INCLUDE_DIRECTORIES(convert-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(convolution-bench bench/convolution.cc)
- TARGET_INCLUDE_DIRECTORIES(convolution-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(deconvolution-bench bench/deconvolution.cc)
- TARGET_INCLUDE_DIRECTORIES(deconvolution-bench PRIVATE .)
-@@ -3107,23 +3074,23 @@
-
- ADD_EXECUTABLE(elu-bench bench/elu.cc)
- TARGET_INCLUDE_DIRECTORIES(elu-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(floor-bench bench/floor.cc)
- TARGET_INCLUDE_DIRECTORIES(floor-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(global-average-pooling-bench bench/global-average-pooling.cc)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(hardswish-bench bench/hardswish.cc)
- TARGET_INCLUDE_DIRECTORIES(hardswish-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(leaky-relu-bench bench/leaky-relu.cc)
- TARGET_INCLUDE_DIRECTORIES(leaky-relu-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(max-pooling-bench bench/max-pooling.cc)
- TARGET_INCLUDE_DIRECTORIES(max-pooling-bench PRIVATE .)
-@@ -3139,7 +3106,7 @@
-
- ADD_EXECUTABLE(sigmoid-bench bench/sigmoid.cc)
- TARGET_INCLUDE_DIRECTORIES(sigmoid-bench PRIVATE .)
-- TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
-+ TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK benchmark bench-utils)
-
- ADD_EXECUTABLE(softmax-bench bench/softmax.cc)
- TARGET_INCLUDE_DIRECTORIES(softmax-bench PRIVATE .)
-@@ -3161,378 +3128,378 @@
- # ---[ Build microkernel-level microbenchmarks
- ADD_EXECUTABLE(bf16-gemm-bench bench/bf16-gemm.cc)
- TARGET_INCLUDE_DIRECTORIES(bf16-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-conv-hwc2chw-bench bench/f16-conv-hwc2chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-dwconv-bench bench/f16-dwconv.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-dwconv-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-dwconv2d-chw-bench bench/f16-dwconv2d-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-gavgpool-cw-bench bench/f16-gavgpool-cw.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f16-gemm-bench bench/f16-gemm.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-igemm-bench bench/f16-igemm.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-igemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f16-raddstoreexpminusmax-bench bench/f16-raddstoreexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f16-spmm-bench bench/f16-spmm.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-spmm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f16-velu-bench bench/f16-velu.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-velu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f16-vsigmoid-bench bench/f16-vsigmoid.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f16-vsqrt-bench bench/f16-vsqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(f16-f32-vcvt-bench bench/f16-f32-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark fp16 pthreadpool)
-+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-conv-hwc-bench bench/f32-conv-hwc.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-conv-hwc2chw-bench bench/f32-conv-hwc2chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-dwconv-bench bench/f32-dwconv.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernel-utils microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-dwconv2d-chw-bench bench/f32-dwconv2d-chw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-f16-vcvt-bench bench/f32-f16-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-gavgpool-cw-bench bench/f32-gavgpool-cw.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-gemm-bench bench/f32-gemm.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE jit bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-igemm-bench bench/f32-igemm.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-igemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE jit bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-im2col-gemm-bench bench/f32-im2col-gemm.cc src/im2col.c)
- TARGET_INCLUDE_DIRECTORIES(f32-im2col-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(f32-qs8-vcvt-bench bench/f32-qs8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-qu8-vcvt-bench bench/f32-qu8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-raddstoreexpminusmax-bench bench/f32-raddstoreexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-raddexpminusmax-bench bench/f32-raddexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-raddextexp-bench bench/f32-raddextexp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vscaleexpminusmax-bench bench/f32-vscaleexpminusmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vscaleexpminusmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vscaleextexp-bench bench/f32-vscaleextexp.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-rmax-bench bench/f32-rmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-rmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-spmm-bench bench/f32-spmm.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-spmm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-softmax-bench bench/f32-softmax.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-softmax-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-velu-bench bench/f32-velu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-velu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vhswish-bench bench/f32-vhswish.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vhswish-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vlrelu-bench bench/f32-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vrelu-bench bench/f32-vrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vrelu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vsigmoid-bench bench/f32-vsigmoid.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(f32-vsqrt-bench bench/f32-vsqrt.cc)
- TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-dwconv-bench bench/qs8-dwconv.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(qs8-f32-vcvt-bench bench/qs8-f32-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-gemm-bench bench/qs8-gemm.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark pthreadpool jit microparams-init)
-+ TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark jit microparams-init)
- TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE bench-utils jit hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(qs8-requantization-bench bench/qs8-requantization.cc)
- SET_TARGET_PROPERTIES(qs8-requantization-bench PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-requantization-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(qs8-vadd-bench bench/qs8-vadd.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vadd-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-vaddc-bench bench/qs8-vaddc.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-vcvt-bench bench/qs8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-vlrelu-bench bench/qs8-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-vmul-bench bench/qs8-vmul.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vmul-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qs8-vmulc-bench bench/qs8-vmulc.cc)
- TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-f32-vcvt-bench bench/qu8-f32-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-gemm-bench bench/qu8-gemm.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-gemm-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
-
- ADD_EXECUTABLE(qu8-requantization-bench bench/qu8-requantization.cc)
- SET_TARGET_PROPERTIES(qu8-requantization-bench PROPERTIES CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-requantization-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(qu8-vadd-bench bench/qu8-vadd.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vadd-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-vaddc-bench bench/qu8-vaddc.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-vcvt-bench bench/qu8-vcvt.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-vlrelu-bench bench/qu8-vlrelu.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-vmul-bench bench/qu8-vmul.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmul-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(qu8-vmulc-bench bench/qu8-vmulc.cc)
- TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(rounding-bench bench/rounding.cc)
- TARGET_INCLUDE_DIRECTORIES(rounding-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo pthreadpool)
-+ TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo)
- TARGET_LINK_LIBRARIES(rounding-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(s16-rmaxabs-bench bench/s16-rmaxabs.cc)
- TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(s16-window-bench bench/s16-window.cc)
- TARGET_INCLUDE_DIRECTORIES(s16-window-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(u32-filterbank-accumulate-bench bench/u32-filterbank-accumulate.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(u32-filterbank-subtract-bench bench/u32-filterbank-subtract.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(u32-vlog-bench bench/u32-vlog.cc)
- TARGET_INCLUDE_DIRECTORIES(u32-vlog-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(u64-u32-vsqrtshift-bench bench/u64-u32-vsqrtshift.cc)
- TARGET_INCLUDE_DIRECTORIES(u64-u32-vsqrtshift-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(i16-vlshift-bench bench/i16-vlshift.cc)
- TARGET_INCLUDE_DIRECTORIES(i16-vlshift-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(cs16-vsquareabs-bench bench/cs16-vsquareabs.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(cs16-bfly4-bench bench/cs16-bfly4.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(cs16-fftr-bench bench/cs16-fftr.cc)
- TARGET_INCLUDE_DIRECTORIES(cs16-fftr-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(xx-transpose-bench bench/xx-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(xx-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(x8-lut-bench bench/x8-lut.cc)
- TARGET_INCLUDE_DIRECTORIES(x8-lut-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE bench-utils microkernels-all)
-
- ADD_EXECUTABLE(x8-transpose-bench bench/x32-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x8-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(x16-transpose-bench bench/x16-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x16-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(x24-transpose-bench bench/x16-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x24-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(x32-transpose-bench bench/x32-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x32-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
-
- ADD_EXECUTABLE(x64-transpose-bench bench/x64-transpose.cc)
- TARGET_INCLUDE_DIRECTORIES(x64-transpose-bench PRIVATE . include src)
-- TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark pthreadpool)
-+ TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark)
- TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
- ENDIF()
diff --git a/gnu/packages/patches/xnnpack-remove-broken-tests.patch b/gnu/packages/patches/xnnpack-remove-broken-tests.patch
new file mode 100644
index 0000000000..91b7ca9998
--- /dev/null
+++ b/gnu/packages/patches/xnnpack-remove-broken-tests.patch
@@ -0,0 +1,337 @@
+These tests fail to build because we are building a shared library.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95df99eae..ab57d5efa 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -978,16 +978,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
+ ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test)
+
+- ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc)
+- TARGET_INCLUDE_DIRECTORIES(argmax-pooling-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(argmax-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+- ADD_TEST(NAME argmax-pooling-nhwc-test COMMAND argmax-pooling-nhwc-test)
+-
+- ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc)
+- TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+- ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test)
+-
+ ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+@@ -1066,11 +1056,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(copy-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME copy-nc-eager-test COMMAND copy-nc-eager-test)
+
+- ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc)
+- TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+- ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test)
+-
+ ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(depth-to-space-nchw2nhwc-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(depth-to-space-nchw2nhwc-test PRIVATE XNNPACK gtest gtest_main)
+@@ -1116,11 +1101,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
+ ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test)
+
+- ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc)
+- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+- ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test)
+-
+ ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main)
+@@ -1146,11 +1126,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
+ ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test)
+
+- ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc)
+- TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+- ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test)
+-
+ ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
+@@ -1191,11 +1166,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
+ ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test)
+
+- ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc)
+- TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+- ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test)
+-
+ ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
+@@ -1312,16 +1282,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_LINK_LIBRARIES(fusion-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME fusion-test COMMAND fusion-test)
+
+- ADD_EXECUTABLE(memory-planner-test test/memory-planner-test.cc)
+- TARGET_INCLUDE_DIRECTORIES(memory-planner-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(memory-planner-test PRIVATE XNNPACK gtest gtest_main)
+- ADD_TEST(NAME memory-planner-test COMMAND memory-planner-test)
+-
+- ADD_EXECUTABLE(subgraph-fp16-test test/subgraph-fp16.cc)
+- TARGET_INCLUDE_DIRECTORIES(subgraph-fp16-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(subgraph-fp16-test PRIVATE XNNPACK gtest gtest_main)
+- ADD_TEST(NAME subgraph-fp16-test COMMAND subgraph-fp16-test)
+-
+ ADD_EXECUTABLE(subgraph-nchw-test test/subgraph-nchw.cc)
+ TARGET_INCLUDE_DIRECTORIES(subgraph-nchw-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(subgraph-nchw-test PRIVATE XNNPACK gtest gtest_main)
+@@ -1347,226 +1307,6 @@ IF(XNNPACK_BUILD_TESTS)
+ TARGET_INCLUDE_DIRECTORIES(argmax-pooling-2d-test PRIVATE src test)
+ TARGET_LINK_LIBRARIES(argmax-pooling-2d-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME argmax-pooling-2d-test COMMAND argmax-pooling-2d-test)
+-
+- ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test)
+-
+- ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc)
+- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test)
+-
+- ADD_EXECUTABLE(ceiling-test test/ceiling.cc)
+- TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME ceiling-test COMMAND ceiling-test)
+-
+- ADD_EXECUTABLE(clamp-test test/clamp.cc)
+- TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME clamp-test COMMAND clamp-test)
+-
+- ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc)
+- TARGET_INCLUDE_DIRECTORIES(concatenate2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(concatenate2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+- ADD_TEST(NAME concatenate2-test COMMAND concatenate2-test)
+-
+- ADD_EXECUTABLE(concatenate3-test test/concatenate3.cc)
+- TARGET_INCLUDE_DIRECTORIES(concatenate3-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(concatenate3-test PRIVATE XNNPACK gtest gtest_main subgraph)
+- ADD_TEST(NAME concatenate3-test COMMAND concatenate3-test)
+-
+- ADD_EXECUTABLE(concatenate4-test test/concatenate4.cc)
+- TARGET_INCLUDE_DIRECTORIES(concatenate4-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(concatenate4-test PRIVATE XNNPACK gtest gtest_main subgraph)
+- ADD_TEST(NAME concatenate4-test COMMAND concatenate4-test)
+-
+- ADD_EXECUTABLE(convert-test test/convert.cc)
+- TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME convert-test COMMAND convert-test)
+-
+- ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc)
+- SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+- TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
+- ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test)
+-
+- ADD_EXECUTABLE(copy-test test/copy.cc)
+- TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME copy-test COMMAND copy-test)
+-
+- ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc)
+- SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+- TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
+- ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test)
+-
+- ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc)
+- TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test)
+-
+- ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc)
+- SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+- TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
+- ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test)
+-
+- ADD_EXECUTABLE(divide2-test test/divide2.cc)
+- TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME divide2-test COMMAND divide2-test)
+-
+- ADD_EXECUTABLE(elu-test test/elu.cc)
+- TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME elu-test COMMAND elu-test)
+-
+- ADD_EXECUTABLE(even-split2-test test/even-split2.cc)
+- TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME even-split2-test COMMAND even-split2-test)
+-
+- ADD_EXECUTABLE(even-split3-test test/even-split3.cc)
+- TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME even-split3-test COMMAND even-split3-test)
+-
+- ADD_EXECUTABLE(even-split4-test test/even-split4.cc)
+- TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME even-split4-test COMMAND even-split4-test)
+-
+- ADD_EXECUTABLE(floor-test test/floor.cc)
+- TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME floor-test COMMAND floor-test)
+-
+- ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc)
+- TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test)
+-
+- ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc)
+- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test)
+-
+- ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test)
+-
+- ADD_EXECUTABLE(hardswish-test test/hardswish.cc)
+- TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME hardswish-test COMMAND hardswish-test)
+-
+- ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc)
+- TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test)
+-
+- ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test)
+-
+- ADD_EXECUTABLE(maximum2-test test/maximum2.cc)
+- TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME maximum2-test COMMAND maximum2-test)
+-
+- ADD_EXECUTABLE(minimum2-test test/minimum2.cc)
+- TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME minimum2-test COMMAND minimum2-test)
+-
+- ADD_EXECUTABLE(multiply2-test test/multiply2.cc)
+- TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME multiply2-test COMMAND multiply2-test)
+-
+- ADD_EXECUTABLE(negate-test test/negate.cc)
+- TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME negate-test COMMAND negate-test)
+-
+- ADD_EXECUTABLE(prelu-test test/prelu.cc)
+- TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME prelu-test COMMAND prelu-test)
+-
+- ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc)
+- SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES)
+- TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test)
+-
+- ADD_EXECUTABLE(static-slice-test test/static-slice.cc)
+- SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES)
+- TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph)
+- ADD_TEST(NAME static-slice-test COMMAND static-slice-test)
+-
+- ADD_EXECUTABLE(softmax-test test/softmax.cc)
+- TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME softmax-test COMMAND softmax-test)
+-
+- ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test)
+-
+- ADD_EXECUTABLE(square-test test/square.cc)
+- TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME square-test COMMAND square-test)
+-
+- ADD_EXECUTABLE(square-root-test test/square.cc)
+- TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME square-root-test COMMAND square-root-test)
+-
+- ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc)
+- TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test)
+-
+- ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc)
+- TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test)
+-
+- ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc)
+- TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test)
+-
+- ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test)
+-
+- ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc)
+- TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test)
+-
+- ADD_EXECUTABLE(subtract2-test test/subtract2.cc)
+- TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME subtract2-test COMMAND subtract2-test)
+-
+- ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc)
+- TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
+- ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test)
+ ENDIF()
+
+ # ---[ Normalization unit tests
+@@ -2834,21 +2574,7 @@ IF(XNNPACK_BUILD_TESTS)
+ ADD_EXECUTABLE(microkernel-utils-test test/microkernel-utils.cc)
+ TARGET_INCLUDE_DIRECTORIES(microkernel-utils-test PRIVATE include src)
+ TARGET_LINK_LIBRARIES(microkernel-utils-test PRIVATE microkernel-utils gtest gtest_main pthreadpool)
+-
+- ADD_EXECUTABLE(operator-utils-test test/operator-utils.cc)
+- TARGET_INCLUDE_DIRECTORIES(operator-utils-test PRIVATE include src)
+- TARGET_LINK_LIBRARIES(operator-utils-test PRIVATE XNNPACK gtest gtest_main pthreadpool)
+ ENDIF()
+-
+- ADD_EXECUTABLE(packing-test test/packing.cc)
+- TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src)
+- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool)
+- TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing)
+-
+- ADD_EXECUTABLE(indirection-test test/indirection.cc)
+- TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src)
+- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool)
+- TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection)
+ ENDIF()
+
+ # ---[ XNNPACK microbenchmarks
diff --git a/gnu/packages/patches/xnnpack-system-libraries.patch b/gnu/packages/patches/xnnpack-system-libraries.patch
index bc9225e927..a711aa0d6c 100644
--- a/gnu/packages/patches/xnnpack-system-libraries.patch
+++ b/gnu/packages/patches/xnnpack-system-libraries.patch
@@ -2,1794 +2,2659 @@ This patch allows the build process to use the provided dependencies instead
of adding their source as CMake sub-directories (in which case "make install"
would install googletest's and googlebenchmark's libraries and headers).
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 177b98d5..937385c3 100755
---- CMakeLists.txt 2022-07-06 22:35:09.748104656 +0200
-+++ CMakeLists.txt 2022-07-06 22:47:34.504666953 +0200
-@@ -6608,10 +6608,6 @@
+diff a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt 2023-12-27 13:29:04.608138355 +0100
+@@ -850,25 +850,8 @@
+ SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}")
ENDIF()
ENDIF()
- TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(hardware-config PRIVATE pthreadpool)
-TARGET_LINK_LIBRARIES(indirection PRIVATE pthreadpool)
-TARGET_LINK_LIBRARIES(jit PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(logging PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool)
+-TARGET_LINK_LIBRARIES(normalization PRIVATE pthreadpool)
-TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool)
+ IF(XNNPACK_BUILD_LIBRARY)
+ TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool)
+- TARGET_LINK_LIBRARIES(allocator PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(cache PRIVATE memory pthreadpool)
+- TARGET_LINK_LIBRARIES(subgraph PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(operators PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(operator-run PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(operator-utils PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(mutex PRIVATE pthreadpool)
+- TARGET_LINK_LIBRARIES(memory PRIVATE pthreadpool)
+ TARGET_LINK_LIBRARIES(post-operation PUBLIC pthreadpool allocator)
+ ENDIF()
- # ---[ Configure FXdiv
- IF(NOT TARGET fxdiv)
-@@ -6630,9 +6626,6 @@
+@@ -889,12 +872,6 @@
SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
ENDIF()
ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE fxdiv)
+-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fxdiv)
+-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fxdiv)
-TARGET_LINK_LIBRARIES(indirection PRIVATE fxdiv)
+-IF(XNNPACK_BUILD_LIBRARY)
+- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv)
+-ENDIF()
# ---[ Configure FP16
IF(NOT TARGET fp16)
-@@ -6651,10 +6644,6 @@
+@@ -913,17 +890,7 @@
SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C)
ENDIF()
ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE fp16)
+-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fp16)
+-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fp16)
+-TARGET_LINK_LIBRARIES(microparams-init PRIVATE fp16)
-TARGET_LINK_LIBRARIES(packing PRIVATE fp16)
-TARGET_LINK_LIBRARIES(indirection PRIVATE fp16)
+ IF(XNNPACK_BUILD_LIBRARY)
+- TARGET_LINK_LIBRARIES(subgraph PRIVATE fp16)
+- TARGET_LINK_LIBRARIES(operators PRIVATE fp16)
+- TARGET_LINK_LIBRARIES(operator-run PRIVATE fp16)
+-
+- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16)
+ INSTALL(TARGETS XNNPACK
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -943,7 +910,7 @@
+ # Helper libraries
+ ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc)
+ TARGET_INCLUDE_DIRECTORIES(gemm-microkernel-tester PRIVATE . include src test)
+- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE fp16 pthreadpool gtest)
++ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE gtest)
+ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE jit packing)
+ IF(XNNPACK_BUILD_LIBRARY)
+ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE XNNPACK post-operation)
+@@ -960,22 +927,22 @@
+ # ---[ Build operator-level unit tests
+ ADD_EXECUTABLE(abs-nc-test test/abs-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(abs-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME abs-nc-test COMMAND abs-nc-test)
+
+ ADD_EXECUTABLE(abs-nc-eager-test test/abs-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(abs-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME abs-nc-eager-test COMMAND abs-nc-eager-test)
+
+ ADD_EXECUTABLE(add-nd-test test/add-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(add-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME add-nd-test COMMAND add-nd-test)
+
+ ADD_EXECUTABLE(add-nd-eager-test test/add-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(add-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test)
+
+ ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc)
+@@ -985,27 +952,27 @@
+
+ ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test)
+
+ ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME bankers-rounding-nc-test COMMAND bankers-rounding-nc-test)
+
+ ADD_EXECUTABLE(bankers-rounding-nc-eager-test test/bankers-rounding-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME bankers-rounding-nc-eager-test COMMAND bankers-rounding-nc-eager-test)
+
+ ADD_EXECUTABLE(ceiling-nc-test test/ceiling-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(ceiling-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME ceiling-nc-test COMMAND ceiling-nc-test)
+
+ ADD_EXECUTABLE(ceiling-nc-eager-test test/ceiling-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(ceiling-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME ceiling-nc-eager-test COMMAND ceiling-nc-eager-test)
+
+ ADD_EXECUTABLE(channel-shuffle-nc-test test/channel-shuffle-nc.cc)
+@@ -1015,12 +982,12 @@
+
+ ADD_EXECUTABLE(clamp-nc-test test/clamp-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(clamp-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME clamp-nc-test COMMAND clamp-nc-test)
+
+ ADD_EXECUTABLE(clamp-nc-eager-test test/clamp-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(clamp-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME clamp-nc-eager-test COMMAND clamp-nc-eager-test)
+
+ ADD_EXECUTABLE(constant-pad-nd-test test/constant-pad-nd.cc)
+@@ -1035,25 +1002,25 @@
+
+ ADD_EXECUTABLE(convert-nc-test test/convert-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(convert-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME convert-nc-test COMMAND convert-nc-test)
+
+ ADD_EXECUTABLE(convert-nc-eager-test test/convert-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(convert-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME convert-nc-eager-test COMMAND convert-nc-eager-test)
+
+ ADD_EXECUTABLE(convolution-nhwc-test test/convolution-nhwc.cc)
+ SET_TARGET_PROPERTIES(convolution-nhwc-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(convolution-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE convolution-test-helpers)
+ ADD_TEST(NAME convolution-nhwc-test COMMAND convolution-nhwc-test)
+
+ ADD_EXECUTABLE(convolution-nchw-test test/convolution-nchw.cc)
+ SET_TARGET_PROPERTIES(convolution-nchw-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(convolution-nchw-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME convolution-nchw-test COMMAND convolution-nchw-test)
+
+ ADD_EXECUTABLE(copy-nc-test test/copy-nc.cc)
+@@ -1068,7 +1035,7 @@
+
+ ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test)
+
+ ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc)
+@@ -1083,197 +1050,197 @@
+
+ ADD_EXECUTABLE(divide-nd-test test/divide-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(divide-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME divide-nd-test COMMAND divide-nd-test)
+
+ ADD_EXECUTABLE(divide-nd-eager-test test/divide-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(divide-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME divide-nd-eager-test COMMAND divide-nd-eager-test)
+
+ ADD_EXECUTABLE(elu-nc-test test/elu-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(elu-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME elu-nc-test COMMAND elu-nc-test)
+
+ ADD_EXECUTABLE(elu-nc-eager-test test/elu-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(elu-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME elu-nc-eager-test COMMAND elu-nc-eager-test)
+
+ ADD_EXECUTABLE(fully-connected-nc-test test/fully-connected-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(fully-connected-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME fully-connected-nc-test COMMAND fully-connected-nc-test)
+
+ ADD_EXECUTABLE(floor-nc-test test/floor-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(floor-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME floor-nc-test COMMAND floor-nc-test)
+
+ ADD_EXECUTABLE(floor-nc-eager-test test/floor-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(floor-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test)
+
+ ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test)
+
+ ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME global-average-pooling-ncw-test COMMAND global-average-pooling-ncw-test)
+
+ ADD_EXECUTABLE(hardswish-nc-test test/hardswish-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(hardswish-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME hardswish-nc-test COMMAND hardswish-nc-test)
+
+ ADD_EXECUTABLE(hardswish-nc-eager-test test/hardswish-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(hardswish-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME hardswish-nc-eager-test COMMAND hardswish-nc-eager-test)
+
+ ADD_EXECUTABLE(leaky-relu-nc-test test/leaky-relu-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME leaky-relu-nc-test COMMAND leaky-relu-nc-test)
+
+ ADD_EXECUTABLE(leaky-relu-nc-eager-test test/leaky-relu-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test)
+
+ ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test)
+
+ ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME maximum-nd-test COMMAND maximum-nd-test)
+
+ ADD_EXECUTABLE(maximum-nd-eager-test test/maximum-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(maximum-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME maximum-nd-eager-test COMMAND maximum-nd-eager-test)
+
+ ADD_EXECUTABLE(minimum-nd-test test/minimum-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(minimum-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME minimum-nd-test COMMAND minimum-nd-test)
+
+ ADD_EXECUTABLE(minimum-nd-eager-test test/minimum-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(minimum-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME minimum-nd-eager-test COMMAND minimum-nd-eager-test)
+
+ ADD_EXECUTABLE(multiply-nd-test test/multiply-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(multiply-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME multiply-nd-test COMMAND multiply-nd-test)
+
+ ADD_EXECUTABLE(multiply-nd-eager-test test/multiply-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(multiply-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME multiply-nd-eager-test COMMAND multiply-nd-eager-test)
+
+ ADD_EXECUTABLE(negate-nc-test test/negate-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(negate-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME negate-nc-test COMMAND negate-nc-test)
+
+ ADD_EXECUTABLE(negate-nc-eager-test test/negate-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(negate-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test)
+
+ ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test)
+
+ ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME resize-bilinear-nhwc-test COMMAND resize-bilinear-nhwc-test)
+
+ ADD_EXECUTABLE(resize-bilinear-nchw-test test/resize-bilinear-nchw.cc)
+ TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nchw-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME resize-bilinear-nchw-test COMMAND resize-bilinear-nchw-test)
+
+ ADD_EXECUTABLE(sigmoid-nc-test test/sigmoid-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME sigmoid-nc-test COMMAND sigmoid-nc-test)
+
+ ADD_EXECUTABLE(sigmoid-nc-eager-test test/sigmoid-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME sigmoid-nc-eager-test COMMAND sigmoid-nc-eager-test)
+
+ ADD_EXECUTABLE(slice-nd-test test/slice-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(slice-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME slice-nd-test COMMAND slice-nd-test)
+
+ ADD_EXECUTABLE(slice-nd-eager-test test/slice-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(slice-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME slice-nd-eager-test COMMAND slice-nd-eager-test)
+
+ ADD_EXECUTABLE(softmax-nc-test test/softmax-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(softmax-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME softmax-nc-test COMMAND softmax-nc-test)
+
+ ADD_EXECUTABLE(space-to-depth-nhwc-test test/space-to-depth-nhwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(space-to-depth-nhwc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME space-to-depth-nhwc-test COMMAND space-to-depth-nhwc-test)
+
+ ADD_EXECUTABLE(square-nc-test test/square-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME square-nc-test COMMAND square-nc-test)
+
+ ADD_EXECUTABLE(square-nc-eager-test test/square-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME square-nc-eager-test COMMAND square-nc-eager-test)
+
+ ADD_EXECUTABLE(square-root-nc-test test/square-root-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-root-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME square-root-nc-test COMMAND square-root-nc-test)
+
+ ADD_EXECUTABLE(square-root-nc-eager-test test/square-root-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-root-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME square-root-nc-eager-test COMMAND square-root-nc-eager-test)
+
+ ADD_EXECUTABLE(squared-difference-nd-test test/squared-difference-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME squared-difference-nd-test COMMAND squared-difference-nd-test)
+
+ ADD_EXECUTABLE(squared-difference-nd-eager-test test/squared-difference-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME squared-difference-nd-eager-test COMMAND squared-difference-nd-eager-test)
+
+ ADD_EXECUTABLE(subtract-nd-test test/subtract-nd.cc)
+ TARGET_INCLUDE_DIRECTORIES(subtract-nd-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME subtract-nd-test COMMAND subtract-nd-test)
+
+ ADD_EXECUTABLE(subtract-nd-eager-test test/subtract-nd-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(subtract-nd-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME subtract-nd-eager-test COMMAND subtract-nd-eager-test)
+
+ ADD_EXECUTABLE(tanh-nc-test test/tanh-nc.cc)
+@@ -1293,12 +1260,12 @@
+
+ ADD_EXECUTABLE(truncation-nc-test test/truncation-nc.cc)
+ TARGET_INCLUDE_DIRECTORIES(truncation-nc-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME truncation-nc-test COMMAND truncation-nc-test)
+
+ ADD_EXECUTABLE(truncation-nc-eager-test test/truncation-nc-eager.cc)
+ TARGET_INCLUDE_DIRECTORIES(truncation-nc-eager-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main)
++ TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK gtest gtest_main)
+ ADD_TEST(NAME truncation-nc-eager-test COMMAND truncation-nc-eager-test)
+
+ ADD_EXECUTABLE(unpooling-nhwc-test test/unpooling-nhwc.cc)
+@@ -1350,22 +1317,22 @@
+
+ ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test)
+
+ ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc)
+ TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test)
+
+ ADD_EXECUTABLE(ceiling-test test/ceiling.cc)
+ TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME ceiling-test COMMAND ceiling-test)
+
+ ADD_EXECUTABLE(clamp-test test/clamp.cc)
+ TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME clamp-test COMMAND clamp-test)
+
+ ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc)
+@@ -1385,187 +1352,187 @@
+
+ ADD_EXECUTABLE(convert-test test/convert.cc)
+ TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME convert-test COMMAND convert-test)
+
+ ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc)
+ SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
++ TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
+ ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test)
+
+ ADD_EXECUTABLE(copy-test test/copy.cc)
+ TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME copy-test COMMAND copy-test)
+
+ ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc)
+ SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
++ TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
+ ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test)
+
+ ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc)
+ TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test)
+
+ ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc)
+ SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers)
++ TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers)
+ ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test)
+
+ ADD_EXECUTABLE(divide2-test test/divide2.cc)
+ TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME divide2-test COMMAND divide2-test)
+
+ ADD_EXECUTABLE(elu-test test/elu.cc)
+ TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME elu-test COMMAND elu-test)
+
+ ADD_EXECUTABLE(even-split2-test test/even-split2.cc)
+ TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME even-split2-test COMMAND even-split2-test)
+
+ ADD_EXECUTABLE(even-split3-test test/even-split3.cc)
+ TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME even-split3-test COMMAND even-split3-test)
+
+ ADD_EXECUTABLE(even-split4-test test/even-split4.cc)
+ TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME even-split4-test COMMAND even-split4-test)
+
+ ADD_EXECUTABLE(floor-test test/floor.cc)
+ TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME floor-test COMMAND floor-test)
+
+ ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc)
+ TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test)
+
+ ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test)
+
+ ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test)
+
+ ADD_EXECUTABLE(hardswish-test test/hardswish.cc)
+ TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME hardswish-test COMMAND hardswish-test)
+
+ ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc)
+ TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test)
+
+ ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test)
+
+ ADD_EXECUTABLE(maximum2-test test/maximum2.cc)
+ TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME maximum2-test COMMAND maximum2-test)
+
+ ADD_EXECUTABLE(minimum2-test test/minimum2.cc)
+ TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME minimum2-test COMMAND minimum2-test)
+
+ ADD_EXECUTABLE(multiply2-test test/multiply2.cc)
+ TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME multiply2-test COMMAND multiply2-test)
+
+ ADD_EXECUTABLE(negate-test test/negate.cc)
+ TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME negate-test COMMAND negate-test)
+
+ ADD_EXECUTABLE(prelu-test test/prelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME prelu-test COMMAND prelu-test)
+
+ ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc)
+ SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test)
+
+ ADD_EXECUTABLE(static-slice-test test/static-slice.cc)
+ SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK gmock gtest gtest_main subgraph)
+ ADD_TEST(NAME static-slice-test COMMAND static-slice-test)
+
+ ADD_EXECUTABLE(softmax-test test/softmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME softmax-test COMMAND softmax-test)
+
+ ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test)
+
+ ADD_EXECUTABLE(square-test test/square.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME square-test COMMAND square-test)
+
+ ADD_EXECUTABLE(square-root-test test/square.cc)
+ TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME square-root-test COMMAND square-root-test)
+
+ ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc)
+ TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test)
+
+ ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc)
+ TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test)
+
+ ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc)
+ TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test)
+
+ ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test)
+
+ ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test)
+
+ ADD_EXECUTABLE(subtract2-test test/subtract2.cc)
+ TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME subtract2-test COMMAND subtract2-test)
+
+ ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc)
+ TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test)
+- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph)
++ TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph)
+ ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test)
+ ENDIF()
+
+@@ -1591,355 +1558,355 @@
- INSTALL(TARGETS XNNPACK
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -6705,7 +6694,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(add-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(add-nd-test add-nd-test)
-
- ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc)
-@@ -6759,7 +6748,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(clamp-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(clamp-nc-test clamp-nc-test)
-
- ADD_EXECUTABLE(constant-pad-nd-test test/constant-pad-nd.cc)
-@@ -6777,7 +6766,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convert-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(convert-nc-test convert-nc-test)
-
- ADD_EXECUTABLE(convolution-nhwc-test test/convolution-nhwc.cc)
-@@ -6786,7 +6775,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convolution-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(convolution-nhwc-test convolution-nhwc-test)
-
- ADD_EXECUTABLE(convolution-nchw-test test/convolution-nchw.cc)
-@@ -6795,7 +6784,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(convolution-nchw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(convolution-nchw-test convolution-nchw-test)
-
- ADD_EXECUTABLE(copy-nc-test test/copy-nc.cc)
-@@ -6813,7 +6802,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(deconvolution-nhwc-test deconvolution-nhwc-test)
-
- ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc)
-@@ -6840,7 +6829,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(divide-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(divide-nd-test divide-nd-test)
-
- ADD_EXECUTABLE(elu-nc-test test/elu-nc.cc)
-@@ -6858,7 +6847,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(fully-connected-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(fully-connected-nc-test fully-connected-nc-test)
-
- ADD_EXECUTABLE(floor-nc-test test/floor-nc.cc)
-@@ -6876,7 +6865,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(global-average-pooling-nwc-test global-average-pooling-nwc-test)
-
- ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc)
-@@ -6885,7 +6874,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(global-average-pooling-ncw-test global-average-pooling-ncw-test)
-
- ADD_EXECUTABLE(hardswish-nc-test test/hardswish-nc.cc)
-@@ -6894,7 +6883,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(hardswish-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(hardswish-nc-test hardswish-nc-test)
-
- ADD_EXECUTABLE(leaky-relu-nc-test test/leaky-relu-nc.cc)
-@@ -6903,7 +6892,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(leaky-relu-nc-test leaky-relu-nc-test)
-
- ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc)
-@@ -6912,7 +6901,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(max-pooling-nhwc-test max-pooling-nhwc-test)
-
- ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc)
-@@ -6921,7 +6910,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(maximum-nd-test maximum-nd-test)
-
- ADD_EXECUTABLE(minimum-nd-test test/minimum-nd.cc)
-@@ -6930,7 +6919,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(minimum-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(minimum-nd-test minimum-nd-test)
-
- ADD_EXECUTABLE(multiply-nd-test test/multiply-nd.cc)
-@@ -6939,7 +6928,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(multiply-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(multiply-nd-test multiply-nd-test)
-
- ADD_EXECUTABLE(negate-nc-test test/negate-nc.cc)
-@@ -6957,7 +6946,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(prelu-nc-test prelu-nc-test)
-
- ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc)
-@@ -6966,7 +6955,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(resize-bilinear-nhwc-test resize-bilinear-nhwc-test)
-
- ADD_EXECUTABLE(resize-bilinear-nchw-test test/resize-bilinear-nchw.cc)
-@@ -6975,7 +6964,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nchw-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(resize-bilinear-nchw-test resize-bilinear-nchw-test)
-
- ADD_EXECUTABLE(sigmoid-nc-test test/sigmoid-nc.cc)
-@@ -7029,7 +7018,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(subtract-nd-test PRIVATE src test)
-- TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK fp16 gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK gtest gtest_main)
- ADD_TEST(subtract-nd-test subtract-nd-test)
-
- ADD_EXECUTABLE(tanh-nc-test test/tanh-nc.cc)
-@@ -7084,7 +7073,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+ ADD_EXECUTABLE(f16-f32-vcvt-test test/f16-f32-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-f32-vcvt-test f16-f32-vcvt-test)
-
- ADD_EXECUTABLE(f16-dwconv-minmax-test test/f16-dwconv-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7093,7 +7082,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f16-dwconv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-dwconv-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-dwconv-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-dwconv-minmax-test f16-dwconv-minmax-test)
-
- ADD_EXECUTABLE(f16-gavgpool-minmax-test test/f16-gavgpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7102,7 +7091,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-f32-vcvt-test COMMAND f16-f32-vcvt-test)
+
+ ADD_EXECUTABLE(f16-gavgpool-cw-test test/f16-gavgpool-cw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-gavgpool-cw-test COMMAND f16-gavgpool-cw-test)
+
+ ADD_EXECUTABLE(f16-avgpool-minmax-test test/f16-avgpool-minmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-avgpool-minmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-avgpool-minmax-test COMMAND f16-avgpool-minmax-test)
+
+ ADD_EXECUTABLE(f16-conv-hwc2chw-test test/f16-conv-hwc2chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f16-conv-hwc2chw-test COMMAND f16-conv-hwc2chw-test)
+
+ ADD_EXECUTABLE(f16-dwconv-unipass-minmax-test test/f16-dwconv-unipass-minmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-dwconv-unipass-minmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f16-dwconv-unipass-minmax-test COMMAND f16-dwconv-unipass-minmax-test)
+
+ ADD_EXECUTABLE(f16-dwconv2d-chw-test test/f16-dwconv2d-chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f16-dwconv2d-chw-test COMMAND f16-dwconv2d-chw-test)
+
+ ADD_EXECUTABLE(f16-gavgpool-minmax-test test/f16-gavgpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-gavgpool-minmax-test f16-gavgpool-minmax-test)
-
- ADD_EXECUTABLE(f16-gemm-minmax-test test/f16-gemm-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7111,7 +7100,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-gavgpool-minmax-test COMMAND f16-gavgpool-minmax-test)
+
+ ADD_EXECUTABLE(f16-gemm-minmax-test test/f16-gemm-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-gemm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f16-gemm-minmax-test f16-gemm-minmax-test)
-
- ADD_EXECUTABLE(f16-ibilinear-test test/f16-ibilinear.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7120,7 +7109,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-gemm-minmax-test COMMAND f16-gemm-minmax-test)
+
+ ADD_EXECUTABLE(f16-ibilinear-chw-test test/f16-ibilinear-chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-chw-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-ibilinear-chw-test COMMAND f16-ibilinear-chw-test)
+
+ ADD_EXECUTABLE(f16-ibilinear-test test/f16-ibilinear.cc)
TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-ibilinear-test f16-ibilinear-test)
-
- ADD_EXECUTABLE(f16-igemm-minmax-test test/f16-igemm-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7129,7 +7118,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-ibilinear-test COMMAND f16-ibilinear-test)
+
+ ADD_EXECUTABLE(f16-igemm-minmax-test test/f16-igemm-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-igemm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f16-igemm-minmax-test f16-igemm-minmax-test)
-
- ADD_EXECUTABLE(f16-maxpool-minmax-test test/f16-maxpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7138,7 +7127,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-igemm-minmax-test COMMAND f16-igemm-minmax-test)
+
+ ADD_EXECUTABLE(f16-maxpool-minmax-test test/f16-maxpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-maxpool-minmax-test f16-maxpool-minmax-test)
-
- ADD_EXECUTABLE(f16-spmm-minmax-test test/f16-spmm-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7147,7 +7136,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-maxpool-minmax-test COMMAND f16-maxpool-minmax-test)
+
+ ADD_EXECUTABLE(f16-spmm-minmax-test test/f16-spmm-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-spmm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-spmm-minmax-test f16-spmm-minmax-test)
-
- ADD_EXECUTABLE(f16-vadd-minmax-test test/f16-vadd-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7156,7 +7145,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-spmm-minmax-test COMMAND f16-spmm-minmax-test)
+
+ ADD_EXECUTABLE(f16-rmax-test test/f16-rmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-rmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-rmax-test COMMAND f16-rmax-test)
+
+ ADD_EXECUTABLE(f16-vabs-test test/f16-vabs.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vabs-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vabs-test COMMAND f16-vabs-test)
+
+ ADD_EXECUTABLE(f16-vadd-minmax-test test/f16-vadd-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vadd-minmax-test f16-vadd-minmax-test)
-
- ADD_EXECUTABLE(f16-vaddc-minmax-test test/f16-vaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7165,7 +7154,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vadd-minmax-test COMMAND f16-vadd-minmax-test)
+
+ ADD_EXECUTABLE(f16-vaddc-minmax-test test/f16-vaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vaddc-minmax-test f16-vaddc-minmax-test)
-
- ADD_EXECUTABLE(f16-vclamp-test test/f16-vclamp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7174,7 +7163,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vaddc-minmax-test COMMAND f16-vaddc-minmax-test)
+
+ ADD_EXECUTABLE(f16-vclamp-test test/f16-vclamp.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vclamp-test f16-vclamp-test)
-
- ADD_EXECUTABLE(f16-vdiv-minmax-test test/f16-vdiv-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7183,7 +7172,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vclamp-test COMMAND f16-vclamp-test)
+
+ ADD_EXECUTABLE(f16-vdiv-minmax-test test/f16-vdiv-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vdiv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vdiv-minmax-test f16-vdiv-minmax-test)
-
- ADD_EXECUTABLE(f16-vdivc-minmax-test test/f16-vdivc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7192,7 +7181,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vdiv-minmax-test COMMAND f16-vdiv-minmax-test)
+
+ ADD_EXECUTABLE(f16-vdivc-minmax-test test/f16-vdivc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vdivc-minmax-test f16-vdivc-minmax-test)
-
- ADD_EXECUTABLE(f16-vrdivc-minmax-test test/f16-vrdivc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7201,7 +7190,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vdivc-minmax-test COMMAND f16-vdivc-minmax-test)
+
+ ADD_EXECUTABLE(f16-vrdivc-minmax-test test/f16-vrdivc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vrdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vrdivc-minmax-test f16-vrdivc-minmax-test)
-
- ADD_EXECUTABLE(f16-vhswish-test test/f16-vhswish.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7210,7 +7199,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vrdivc-minmax-test COMMAND f16-vrdivc-minmax-test)
+
+ ADD_EXECUTABLE(f16-velu-test test/f16-velu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-velu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-velu-test COMMAND f16-velu-test)
+
+ ADD_EXECUTABLE(f16-vhswish-test test/f16-vhswish.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vhswish-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vhswish-test f16-vhswish-test)
-
- ADD_EXECUTABLE(f16-vlrelu-test test/f16-vlrelu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7219,7 +7208,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vhswish-test COMMAND f16-vhswish-test)
+
+ ADD_EXECUTABLE(f16-vlrelu-test test/f16-vlrelu.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vlrelu-test f16-vlrelu-test)
-
- ADD_EXECUTABLE(f16-vmax-test test/f16-vmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7228,7 +7217,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vlrelu-test COMMAND f16-vlrelu-test)
+
+ ADD_EXECUTABLE(f16-vmax-test test/f16-vmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmax-test f16-vmax-test)
-
- ADD_EXECUTABLE(f16-vmaxc-test test/f16-vmaxc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7237,7 +7226,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vmax-test COMMAND f16-vmax-test)
+
+ ADD_EXECUTABLE(f16-vmaxc-test test/f16-vmaxc.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmaxc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmaxc-test f16-vmaxc-test)
-
- ADD_EXECUTABLE(f16-vmin-test test/f16-vmin.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7246,7 +7235,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vmaxc-test COMMAND f16-vmaxc-test)
+
+ ADD_EXECUTABLE(f16-vmin-test test/f16-vmin.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmin-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmin-test f16-vmin-test)
-
- ADD_EXECUTABLE(f16-vminc-test test/f16-vminc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7255,7 +7244,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vmin-test COMMAND f16-vmin-test)
+
+ ADD_EXECUTABLE(f16-vminc-test test/f16-vminc.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vminc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vminc-test f16-vminc-test)
-
- ADD_EXECUTABLE(f16-vmul-minmax-test test/f16-vmul-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7264,7 +7253,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vminc-test COMMAND f16-vminc-test)
+
+ ADD_EXECUTABLE(f16-vmul-minmax-test test/f16-vmul-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmul-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmul-minmax-test f16-vmul-minmax-test)
-
- ADD_EXECUTABLE(f16-vmulc-minmax-test test/f16-vmulc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7273,7 +7262,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vmul-minmax-test COMMAND f16-vmul-minmax-test)
+
+ ADD_EXECUTABLE(f16-vmulc-minmax-test test/f16-vmulc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmulc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmulc-minmax-test f16-vmulc-minmax-test)
-
- ADD_EXECUTABLE(f16-vmulcaddc-minmax-test test/f16-vmulcaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7282,7 +7271,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vmulc-minmax-test COMMAND f16-vmulc-minmax-test)
+
+ ADD_EXECUTABLE(f16-vmulcaddc-minmax-test test/f16-vmulcaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vmulcaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vmulcaddc-minmax-test f16-vmulcaddc-minmax-test)
-
- ADD_EXECUTABLE(f16-prelu-test test/f16-prelu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7291,7 +7280,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f16-vmulcaddc-minmax-test COMMAND f16-vmulcaddc-minmax-test)
+
+ ADD_EXECUTABLE(f16-vneg-test test/f16-vneg.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vneg-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vneg-test COMMAND f16-vneg-test)
+
+ ADD_EXECUTABLE(f16-pavgpool-minmax-test test/f16-pavgpool-minmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-pavgpool-minmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-pavgpool-minmax-test COMMAND f16-pavgpool-minmax-test)
+
+ ADD_EXECUTABLE(f16-prelu-test test/f16-prelu.cc)
TARGET_INCLUDE_DIRECTORIES(f16-prelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-prelu-test f16-prelu-test)
-
- ADD_EXECUTABLE(f16-vsub-minmax-test test/f16-vsub-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7300,7 +7289,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-prelu-test COMMAND f16-prelu-test)
+
+ ADD_EXECUTABLE(f16-raddstoreexpminusmax-test test/f16-raddstoreexpminusmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-raddstoreexpminusmax-test COMMAND f16-raddstoreexpminusmax-test)
+
+ ADD_EXECUTABLE(f16-vrndne-test test/f16-vrndne.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vrndne-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vrndne-test COMMAND f16-vrndne-test)
+
+ ADD_EXECUTABLE(f16-vrndz-test test/f16-vrndz.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vrndz-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vrndz-test COMMAND f16-vrndz-test)
+
+ ADD_EXECUTABLE(f16-vrndu-test test/f16-vrndu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vrndu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vrndu-test COMMAND f16-vrndu-test)
+
+ ADD_EXECUTABLE(f16-vrndd-test test/f16-vrndd.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vrndd-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vrndd-test COMMAND f16-vrndd-test)
+
+ ADD_EXECUTABLE(f16-vsigmoid-test test/f16-vsigmoid.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vsigmoid-test COMMAND f16-vsigmoid-test)
+
+ ADD_EXECUTABLE(f16-vsqr-test test/f16-vsqr.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vsqr-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vsqr-test COMMAND f16-vsqr-test)
+
+ ADD_EXECUTABLE(f16-vsqrt-test test/f16-vsqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f16-vsqrt-test COMMAND f16-vsqrt-test)
+
+ ADD_EXECUTABLE(f16-vsub-minmax-test test/f16-vsub-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vsub-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vsub-minmax-test f16-vsub-minmax-test)
-
- ADD_EXECUTABLE(f16-vsubc-minmax-test test/f16-vsubc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7309,7 +7298,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vsub-minmax-test COMMAND f16-vsub-minmax-test)
+
+ ADD_EXECUTABLE(f16-vsubc-minmax-test test/f16-vsubc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vsubc-minmax-test f16-vsubc-minmax-test)
-
- ADD_EXECUTABLE(f16-vrsubc-minmax-test test/f16-vrsubc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7318,7 +7307,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vsubc-minmax-test COMMAND f16-vsubc-minmax-test)
+
+ ADD_EXECUTABLE(f16-vrsubc-minmax-test test/f16-vrsubc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f16-vrsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f16-vrsubc-minmax-test f16-vrsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-argmaxpool-test test/f32-argmaxpool.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7327,7 +7316,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f16-vrsubc-minmax-test COMMAND f16-vrsubc-minmax-test)
+
+ ADD_EXECUTABLE(f32-argmaxpool-test test/f32-argmaxpool.cc)
TARGET_INCLUDE_DIRECTORIES(f32-argmaxpool-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-argmaxpool-test f32-argmaxpool-test)
-
- ADD_EXECUTABLE(f32-avgpool-minmax-test test/f32-avgpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7336,7 +7325,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-argmaxpool-test COMMAND f32-argmaxpool-test)
+
+ ADD_EXECUTABLE(f32-avgpool-minmax-test test/f32-avgpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-avgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-avgpool-minmax-test f32-avgpool-minmax-test)
-
- ADD_EXECUTABLE(f32-conv-hwc-test test/f32-conv-hwc.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7345,7 +7334,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-avgpool-minmax-test COMMAND f32-avgpool-minmax-test)
+
+ ADD_EXECUTABLE(f32-conv-hwc-test test/f32-conv-hwc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-conv-hwc-test f32-conv-hwc-test)
-
- ADD_EXECUTABLE(f32-conv-hwc2chw-test test/f32-conv-hwc2chw.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7354,7 +7343,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-conv-hwc-test COMMAND f32-conv-hwc-test)
+
+ ADD_EXECUTABLE(f32-conv-hwc2chw-test test/f32-conv-hwc2chw.cc)
TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-conv-hwc2chw-test f32-conv-hwc2chw-test)
-
- ADD_EXECUTABLE(f32-dwconv-test test/f32-dwconv.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7363,7 +7352,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-dwconv-test f32-dwconv-test)
-
- ADD_EXECUTABLE(f32-dwconv2d-chw-test test/f32-dwconv2d-chw.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7372,7 +7361,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-conv-hwc2chw-test COMMAND f32-conv-hwc2chw-test)
+
+ ADD_EXECUTABLE(f32-dwconv2d-chw-test test/f32-dwconv2d-chw.cc)
TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-dwconv2d-chw-test f32-dwconv2d-chw-test)
-
- ADD_EXECUTABLE(f32-dwconv-minmax-test test/f32-dwconv-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7381,7 +7370,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-dwconv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-dwconv-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-dwconv-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-dwconv-minmax-test f32-dwconv-minmax-test)
-
- ADD_EXECUTABLE(f32-f16-vcvt-test test/f32-f16-vcvt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7390,7 +7379,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-dwconv2d-chw-test COMMAND f32-dwconv2d-chw-test)
+
+ ADD_EXECUTABLE(f32-dwconv-multipass-test test/f32-dwconv-multipass.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-dwconv-multipass-test COMMAND f32-dwconv-multipass-test)
+
+ ADD_EXECUTABLE(f32-dwconv-multipass-minmax-test test/f32-dwconv-multipass-minmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-minmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-dwconv-multipass-minmax-test COMMAND f32-dwconv-multipass-minmax-test)
+
+ ADD_EXECUTABLE(f32-dwconv-unipass-test test/f32-dwconv-unipass.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-dwconv-unipass-test COMMAND f32-dwconv-unipass-test)
+
+ ADD_EXECUTABLE(f32-dwconv-unipass-minmax-test test/f32-dwconv-unipass-minmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-minmax-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-dwconv-unipass-minmax-test COMMAND f32-dwconv-unipass-minmax-test)
+
+ ADD_EXECUTABLE(f32-f16-vcvt-test test/f32-f16-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-f16-vcvt-test f32-f16-vcvt-test)
-
- ADD_EXECUTABLE(f32-qs8-vcvt-test test/f32-f16-vcvt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7399,7 +7388,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-f16-vcvt-test COMMAND f32-f16-vcvt-test)
+
+ ADD_EXECUTABLE(f32-qs8-vcvt-test test/f32-qs8-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-qs8-vcvt-test f32-qs8-vcvt-test)
-
- ADD_EXECUTABLE(f32-qu8-vcvt-test test/f32-f16-vcvt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7408,7 +7397,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-qs8-vcvt-test COMMAND f32-qs8-vcvt-test)
+
+ ADD_EXECUTABLE(f32-qu8-vcvt-test test/f32-qu8-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-qu8-vcvt-test f32-qu8-vcvt-test)
-
- ADD_EXECUTABLE(f32-gavgpool-cw-test test/f32-gavgpool-cw.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7417,7 +7406,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-qu8-vcvt-test COMMAND f32-qu8-vcvt-test)
+
+ ADD_EXECUTABLE(f32-gavgpool-cw-test test/f32-gavgpool-cw.cc)
TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-gavgpool-cw-test f32-gavgpool-cw-test)
-
- ADD_EXECUTABLE(f32-gavgpool-minmax-test test/f32-gavgpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7426,7 +7415,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-gavgpool-cw-test COMMAND f32-gavgpool-cw-test)
+
+ ADD_EXECUTABLE(f32-gavgpool-minmax-test test/f32-gavgpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-gavgpool-minmax-test f32-gavgpool-minmax-test)
-
- ADD_EXECUTABLE(f32-gemm-test test/f32-gemm.cc test/f32-gemm-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7435,7 +7424,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-gemm-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gemm-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-gemm-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-gemm-test f32-gemm-test)
-
- ADD_EXECUTABLE(f32-gemm-relu-test test/f32-gemm-relu.cc test/f32-gemm-relu-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7444,7 +7433,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-gemm-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gemm-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-gemm-relu-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-gemm-relu-test f32-gemm-relu-test)
-
- ADD_EXECUTABLE(f32-gemm-minmax-test test/f32-gemm-minmax.cc test/f32-gemm-minmax-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7453,7 +7442,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-gemm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gemm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-gemm-minmax-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(f32-gemm-minmax-test f32-gemm-minmax-test)
-
- ADD_EXECUTABLE(f32-gemminc-minmax-test test/f32-gemminc-minmax.cc test/f32-gemminc-minmax-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7462,7 +7451,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-gemminc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-gemminc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-gemminc-minmax-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-gemminc-minmax-test f32-gemminc-minmax-test)
-
- ADD_EXECUTABLE(f32-ibilinear-test test/f32-ibilinear.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7471,7 +7460,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-gavgpool-minmax-test COMMAND f32-gavgpool-minmax-test)
+
+@@ -1975,13 +1942,13 @@
+
+ ADD_EXECUTABLE(f32-ibilinear-test test/f32-ibilinear.cc)
TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-ibilinear-test f32-ibilinear-test)
-
- ADD_EXECUTABLE(f32-ibilinear-chw-test test/f32-ibilinear-chw.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7480,7 +7469,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-ibilinear-test COMMAND f32-ibilinear-test)
+
+ ADD_EXECUTABLE(f32-ibilinear-chw-test test/f32-ibilinear-chw.cc)
TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-chw-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-ibilinear-chw-test f32-ibilinear-chw-test)
-
- ADD_EXECUTABLE(f32-igemm-test test/f32-igemm.cc test/f32-igemm-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7489,7 +7478,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-igemm-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-igemm-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-igemm-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-igemm-test f32-igemm-test)
-
- ADD_EXECUTABLE(f32-igemm-relu-test test/f32-igemm-relu.cc test/f32-igemm-relu-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7498,7 +7487,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-igemm-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-igemm-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-igemm-relu-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-igemm-relu-test f32-igemm-relu-test)
-
- ADD_EXECUTABLE(f32-igemm-minmax-test test/f32-igemm-minmax.cc test/f32-igemm-minmax-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7511,7 +7500,7 @@
- # Work-around for "too many sections" error
- TARGET_COMPILE_OPTIONS(f32-igemm-minmax-test PRIVATE "$<$<NOT:$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>>>:-Wa,-mbig-obj>")
- ENDIF()
-- TARGET_LINK_LIBRARIES(f32-igemm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-igemm-minmax-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(f32-igemm-minmax-test f32-igemm-minmax-test)
-
- ADD_EXECUTABLE(f32-maxpool-minmax-test test/f32-maxpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7520,7 +7509,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-ibilinear-chw-test COMMAND f32-ibilinear-chw-test)
+
+@@ -2016,13 +1983,13 @@
+
+ ADD_EXECUTABLE(f32-maxpool-minmax-test test/f32-maxpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-maxpool-minmax-test f32-maxpool-minmax-test)
-
- ADD_EXECUTABLE(f32-pavgpool-minmax-test test/f32-pavgpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7529,7 +7518,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-maxpool-minmax-test COMMAND f32-maxpool-minmax-test)
+
+ ADD_EXECUTABLE(f32-pavgpool-minmax-test test/f32-pavgpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-pavgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-pavgpool-minmax-test f32-pavgpool-minmax-test)
-
- ADD_EXECUTABLE(f32-ppmm-minmax-test test/f32-ppmm-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7538,7 +7527,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-ppmm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-ppmm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(f32-ppmm-minmax-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(f32-ppmm-minmax-test f32-ppmm-minmax-test)
-
- ADD_EXECUTABLE(f32-prelu-test test/f32-prelu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7547,7 +7536,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-pavgpool-minmax-test COMMAND f32-pavgpool-minmax-test)
+
+@@ -2034,259 +2001,259 @@
+
+ ADD_EXECUTABLE(f32-prelu-test test/f32-prelu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-prelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-prelu-test f32-prelu-test)
-
- ADD_EXECUTABLE(f32-raddexpminusmax-test test/f32-raddexpminusmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7556,7 +7545,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-prelu-test COMMAND f32-prelu-test)
+
+ ADD_EXECUTABLE(f32-raddexpminusmax-test test/f32-raddexpminusmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-raddexpminusmax-test f32-raddexpminusmax-test)
-
- ADD_EXECUTABLE(f32-raddextexp-test test/f32-raddextexp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7565,7 +7554,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-raddexpminusmax-test COMMAND f32-raddexpminusmax-test)
+
+ ADD_EXECUTABLE(f32-raddextexp-test test/f32-raddextexp.cc)
TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-raddextexp-test f32-raddextexp-test)
-
- ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7574,7 +7563,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-raddextexp-test COMMAND f32-raddextexp-test)
+
+ ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-raddstoreexpminusmax-test f32-raddstoreexpminusmax-test)
-
- ADD_EXECUTABLE(f32-rmax-test test/f32-rmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7583,7 +7572,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-raddstoreexpminusmax-test COMMAND f32-raddstoreexpminusmax-test)
+
+ ADD_EXECUTABLE(f32-rmax-test test/f32-rmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-rmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-rmax-test f32-rmax-test)
-
- ADD_EXECUTABLE(f32-spmm-minmax-test test/f32-spmm-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7592,7 +7581,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-rmax-test COMMAND f32-rmax-test)
+
+ ADD_EXECUTABLE(f32-spmm-minmax-test test/f32-spmm-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-spmm-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-spmm-minmax-test f32-spmm-minmax-test)
-
- ADD_EXECUTABLE(f32-vabs-test test/f32-vabs.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7601,7 +7590,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-spmm-minmax-test COMMAND f32-spmm-minmax-test)
+
+ ADD_EXECUTABLE(f32-vabs-test test/f32-vabs.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vabs-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vabs-test f32-vabs-test)
-
- ADD_EXECUTABLE(f32-vadd-test test/f32-vadd.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7610,7 +7599,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vabs-test COMMAND f32-vabs-test)
+
+ ADD_EXECUTABLE(f32-vadd-test test/f32-vadd.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vadd-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vadd-test f32-vadd-test)
-
- ADD_EXECUTABLE(f32-vadd-minmax-test test/f32-vadd-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7619,7 +7608,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vadd-test COMMAND f32-vadd-test)
+
+ ADD_EXECUTABLE(f32-vadd-minmax-test test/f32-vadd-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vadd-minmax-test f32-vadd-minmax-test)
-
- ADD_EXECUTABLE(f32-vadd-relu-test test/f32-vadd-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7628,7 +7617,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vadd-minmax-test COMMAND f32-vadd-minmax-test)
+
+ ADD_EXECUTABLE(f32-vadd-relu-test test/f32-vadd-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vadd-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vadd-relu-test f32-vadd-relu-test)
-
- ADD_EXECUTABLE(f32-vaddc-test test/f32-vaddc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7637,7 +7626,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vadd-relu-test COMMAND f32-vadd-relu-test)
+
+ ADD_EXECUTABLE(f32-vaddc-test test/f32-vaddc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vaddc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vaddc-test f32-vaddc-test)
-
- ADD_EXECUTABLE(f32-vaddc-minmax-test test/f32-vaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7646,7 +7635,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vaddc-test COMMAND f32-vaddc-test)
+
+ ADD_EXECUTABLE(f32-vaddc-minmax-test test/f32-vaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vaddc-minmax-test f32-vaddc-minmax-test)
-
- ADD_EXECUTABLE(f32-vaddc-relu-test test/f32-vaddc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7655,7 +7644,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vaddc-minmax-test COMMAND f32-vaddc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vaddc-relu-test test/f32-vaddc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vaddc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vaddc-relu-test f32-vaddc-relu-test)
-
- ADD_EXECUTABLE(f32-vclamp-test test/f32-vclamp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7664,7 +7653,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vaddc-relu-test COMMAND f32-vaddc-relu-test)
+
+ ADD_EXECUTABLE(f32-vclamp-test test/f32-vclamp.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vclamp-test f32-vclamp-test)
-
- ADD_EXECUTABLE(f32-vhswish-test test/f32-vhswish.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7673,7 +7662,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE test gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vclamp-test COMMAND f32-vclamp-test)
+
+ ADD_EXECUTABLE(f32-vhswish-test test/f32-vhswish.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vhswish-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vhswish-test f32-vhswish-test)
-
- ADD_EXECUTABLE(f32-vdiv-test test/f32-vdiv.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7682,7 +7671,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vhswish-test COMMAND f32-vhswish-test)
+
+ ADD_EXECUTABLE(f32-vdiv-test test/f32-vdiv.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdiv-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdiv-test f32-vdiv-test)
-
- ADD_EXECUTABLE(f32-vdiv-minmax-test test/f32-vdiv-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7691,7 +7680,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vdiv-test COMMAND f32-vdiv-test)
+
+ ADD_EXECUTABLE(f32-vdiv-minmax-test test/f32-vdiv-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdiv-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdiv-minmax-test f32-vdiv-minmax-test)
-
- ADD_EXECUTABLE(f32-vdiv-relu-test test/f32-vdiv-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7700,7 +7689,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vdiv-minmax-test COMMAND f32-vdiv-minmax-test)
+
+ ADD_EXECUTABLE(f32-vdiv-relu-test test/f32-vdiv-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdiv-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdiv-relu-test f32-vdiv-relu-test)
-
- ADD_EXECUTABLE(f32-vdivc-test test/f32-vdivc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7709,7 +7698,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vdiv-relu-test COMMAND f32-vdiv-relu-test)
+
+ ADD_EXECUTABLE(f32-vdivc-test test/f32-vdivc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdivc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdivc-test f32-vdivc-test)
-
- ADD_EXECUTABLE(f32-vdivc-minmax-test test/f32-vdivc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7718,7 +7707,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vdivc-test COMMAND f32-vdivc-test)
+
+ ADD_EXECUTABLE(f32-vdivc-minmax-test test/f32-vdivc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdivc-minmax-test f32-vdivc-minmax-test)
-
- ADD_EXECUTABLE(f32-vdivc-relu-test test/f32-vdivc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7727,7 +7716,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vdivc-minmax-test COMMAND f32-vdivc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vdivc-relu-test test/f32-vdivc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vdivc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vdivc-relu-test f32-vdivc-relu-test)
-
- ADD_EXECUTABLE(f32-vrdivc-test test/f32-vrdivc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7736,7 +7725,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vdivc-relu-test COMMAND f32-vdivc-relu-test)
+
+ ADD_EXECUTABLE(f32-vrdivc-test test/f32-vrdivc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrdivc-test f32-vrdivc-test)
-
- ADD_EXECUTABLE(f32-vrdivc-minmax-test test/f32-vrdivc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7745,7 +7734,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vrdivc-test COMMAND f32-vrdivc-test)
+
+ ADD_EXECUTABLE(f32-vrdivc-minmax-test test/f32-vrdivc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrdivc-minmax-test f32-vrdivc-minmax-test)
-
- ADD_EXECUTABLE(f32-vrdivc-relu-test test/f32-vrdivc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7754,7 +7743,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrdivc-minmax-test COMMAND f32-vrdivc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vrdivc-relu-test test/f32-vrdivc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrdivc-relu-test f32-vrdivc-relu-test)
-
- ADD_EXECUTABLE(f32-velu-test test/f32-velu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7763,7 +7752,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vrdivc-relu-test COMMAND f32-vrdivc-relu-test)
+
+ ADD_EXECUTABLE(f32-velu-test test/f32-velu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-velu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-velu-test f32-velu-test)
-
- ADD_EXECUTABLE(f32-vlrelu-test test/f32-vlrelu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7772,7 +7761,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-velu-test COMMAND f32-velu-test)
+
+ ADD_EXECUTABLE(f32-vlrelu-test test/f32-vlrelu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vlrelu-test f32-vlrelu-test)
-
- ADD_EXECUTABLE(f32-vmax-test test/f32-vmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7781,7 +7770,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vlrelu-test COMMAND f32-vlrelu-test)
+
+ ADD_EXECUTABLE(f32-vmax-test test/f32-vmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmax-test f32-vmax-test)
-
- ADD_EXECUTABLE(f32-vmaxc-test test/f32-vmaxc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7790,7 +7779,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmax-test COMMAND f32-vmax-test)
+
+ ADD_EXECUTABLE(f32-vmaxc-test test/f32-vmaxc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmaxc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmaxc-test f32-vmaxc-test)
-
- ADD_EXECUTABLE(f32-vmin-test test/f32-vmin.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7799,7 +7788,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmaxc-test COMMAND f32-vmaxc-test)
+
+ ADD_EXECUTABLE(f32-vmin-test test/f32-vmin.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmin-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmin-test f32-vmin-test)
-
- ADD_EXECUTABLE(f32-vminc-test test/f32-vminc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7808,7 +7797,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmin-test COMMAND f32-vmin-test)
+
+ ADD_EXECUTABLE(f32-vminc-test test/f32-vminc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vminc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vminc-test f32-vminc-test)
-
- ADD_EXECUTABLE(f32-vmul-test test/f32-vmul.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7817,7 +7806,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vminc-test COMMAND f32-vminc-test)
+
+ ADD_EXECUTABLE(f32-vmul-test test/f32-vmul.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmul-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmul-test f32-vmul-test)
-
- ADD_EXECUTABLE(f32-vmul-minmax-test test/f32-vmul-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7826,7 +7815,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmul-test COMMAND f32-vmul-test)
+
+ ADD_EXECUTABLE(f32-vmul-minmax-test test/f32-vmul-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmul-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmul-minmax-test f32-vmul-minmax-test)
-
- ADD_EXECUTABLE(f32-vmul-relu-test test/f32-vmul-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7835,7 +7824,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmul-minmax-test COMMAND f32-vmul-minmax-test microparams-init)
+
+ ADD_EXECUTABLE(f32-vmul-relu-test test/f32-vmul-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmul-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmul-relu-test f32-vmul-relu-test)
-
- ADD_EXECUTABLE(f32-vmulc-test test/f32-vmulc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7844,7 +7833,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmul-relu-test COMMAND f32-vmul-relu-test)
+
+ ADD_EXECUTABLE(f32-vmulc-test test/f32-vmulc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmulc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmulc-test f32-vmulc-test)
-
- ADD_EXECUTABLE(f32-vmulc-minmax-test test/f32-vmulc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7853,7 +7842,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmulc-test COMMAND f32-vmulc-test)
+
+ ADD_EXECUTABLE(f32-vmulc-minmax-test test/f32-vmulc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmulc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmulc-minmax-test f32-vmulc-minmax-test)
-
- ADD_EXECUTABLE(f32-vmulc-relu-test test/f32-vmulc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7862,7 +7851,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmulc-minmax-test COMMAND f32-vmulc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vmulc-relu-test test/f32-vmulc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmulc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmulc-relu-test f32-vmulc-relu-test)
-
- ADD_EXECUTABLE(f32-vmulcaddc-minmax-test test/f32-vmulcaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -7871,7 +7860,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vmulc-relu-test COMMAND f32-vmulc-relu-test)
+
+ ADD_EXECUTABLE(f32-vmulcaddc-minmax-test test/f32-vmulcaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vmulcaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vmulcaddc-minmax-test f32-vmulcaddc-minmax-test)
-
- ADD_EXECUTABLE(f32-vneg-test test/f32-vneg.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7880,7 +7869,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME f32-vmulcaddc-minmax-test COMMAND f32-vmulcaddc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vneg-test test/f32-vneg.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vneg-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vneg-test f32-vneg-test)
-
- ADD_EXECUTABLE(f32-vrelu-test test/f32-vrelu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7889,7 +7878,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vneg-test COMMAND f32-vneg-test)
+
+ ADD_EXECUTABLE(f32-vrelu-test test/f32-vrelu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrelu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrelu-test f32-vrelu-test)
-
- ADD_EXECUTABLE(f32-vrndne-test test/f32-vrndne.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7898,7 +7887,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vrelu-test COMMAND f32-vrelu-test)
+
+ ADD_EXECUTABLE(f32-vrndne-test test/f32-vrndne.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrndne-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrndne-test f32-vrndne-test)
-
- ADD_EXECUTABLE(f32-vrndz-test test/f32-vrndz.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7907,7 +7896,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrndne-test COMMAND f32-vrndne-test)
+
+ ADD_EXECUTABLE(f32-vrndz-test test/f32-vrndz.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrndz-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrndz-test f32-vrndz-test)
-
- ADD_EXECUTABLE(f32-vrndu-test test/f32-vrndu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7916,7 +7905,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrndz-test COMMAND f32-vrndz-test)
+
+ ADD_EXECUTABLE(f32-vrndu-test test/f32-vrndu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrndu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrndu-test f32-vrndu-test)
-
- ADD_EXECUTABLE(f32-vrndd-test test/f32-vrndd.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7925,7 +7914,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrndu-test COMMAND f32-vrndu-test)
+
+ ADD_EXECUTABLE(f32-vrndd-test test/f32-vrndd.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrndd-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrndd-test f32-vrndd-test)
-
- ADD_EXECUTABLE(f32-vscaleexpminusmax-test test/f32-vscaleexpminusmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7934,7 +7923,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-vscaleexpminusmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vscaleexpminusmax-test f32-vscaleexpminusmax-test)
-
- ADD_EXECUTABLE(f32-vscaleextexp-test test/f32-vscaleextexp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7943,7 +7932,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vscaleextexp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vscaleextexp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vscaleextexp-test f32-vscaleextexp-test)
-
- ADD_EXECUTABLE(f32-vsigmoid-test test/f32-vsigmoid.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7952,7 +7941,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrndd-test COMMAND f32-vrndd-test)
+
+@@ -2304,91 +2271,91 @@
+
+ ADD_EXECUTABLE(f32-vsigmoid-test test/f32-vsigmoid.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsigmoid-test f32-vsigmoid-test)
-
- ADD_EXECUTABLE(f32-vsqr-test test/f32-vsqr.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7961,7 +7950,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsigmoid-test COMMAND f32-vsigmoid-test)
+
+ ADD_EXECUTABLE(f32-vsqr-test test/f32-vsqr.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsqr-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsqr-test f32-vsqr-test)
-
- ADD_EXECUTABLE(f32-vsqrdiff-test test/f32-vsqrdiff.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7970,7 +7959,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsqr-test COMMAND f32-vsqr-test)
+
+ ADD_EXECUTABLE(f32-vsqrdiff-test test/f32-vsqrdiff.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiff-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsqrdiff-test f32-vsqrdiff-test)
-
- ADD_EXECUTABLE(f32-vsqrdiffc-test test/f32-vsqrdiffc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7979,7 +7968,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsqrdiff-test COMMAND f32-vsqrdiff-test)
+
+ ADD_EXECUTABLE(f32-vsqrdiffc-test test/f32-vsqrdiffc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiffc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsqrdiffc-test f32-vsqrdiffc-test)
-
- ADD_EXECUTABLE(f32-vsqrt-test test/f32-vsqrt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7988,7 +7977,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsqrdiffc-test COMMAND f32-vsqrdiffc-test)
+
+ ADD_EXECUTABLE(f32-vsqrt-test test/f32-vsqrt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsqrt-test f32-vsqrt-test)
-
- ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -7997,7 +7986,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsqrt-test COMMAND f32-vsqrt-test)
+
+ ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsub-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsub-test f32-vsub-test)
-
- ADD_EXECUTABLE(f32-vsub-minmax-test test/f32-vsub-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8006,7 +7995,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vsub-test COMMAND f32-vsub-test)
+
+ ADD_EXECUTABLE(f32-vsub-minmax-test test/f32-vsub-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsub-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsub-minmax-test f32-vsub-minmax-test)
-
- ADD_EXECUTABLE(f32-vsub-relu-test test/f32-vsub-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8015,7 +8004,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsub-minmax-test COMMAND f32-vsub-minmax-test)
+
+ ADD_EXECUTABLE(f32-vsub-relu-test test/f32-vsub-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsub-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsub-relu-test f32-vsub-relu-test)
-
- ADD_EXECUTABLE(f32-vsubc-test test/f32-vsubc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8024,7 +8013,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vsub-relu-test COMMAND f32-vsub-relu-test)
+
+ ADD_EXECUTABLE(f32-vsubc-test test/f32-vsubc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsubc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsubc-test f32-vsubc-test)
-
- ADD_EXECUTABLE(f32-vsubc-minmax-test test/f32-vsubc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8033,7 +8022,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vsubc-test COMMAND f32-vsubc-test)
+
+ ADD_EXECUTABLE(f32-vsubc-minmax-test test/f32-vsubc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsubc-minmax-test f32-vsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-vsubc-relu-test test/f32-vsubc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8042,7 +8031,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vsubc-minmax-test COMMAND f32-vsubc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vsubc-relu-test test/f32-vsubc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vsubc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vsubc-relu-test f32-vsubc-relu-test)
-
- ADD_EXECUTABLE(f32-vrsubc-test test/f32-vrsubc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8051,7 +8040,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vsubc-relu-test COMMAND f32-vsubc-relu-test)
+
+ ADD_EXECUTABLE(f32-vrsubc-test test/f32-vrsubc.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrsubc-test f32-vrsubc-test)
-
- ADD_EXECUTABLE(f32-vrsubc-minmax-test test/f32-vrsubc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8060,7 +8049,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vrsubc-test COMMAND f32-vrsubc-test)
+
+ ADD_EXECUTABLE(f32-vrsubc-minmax-test test/f32-vrsubc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrsubc-minmax-test f32-vrsubc-minmax-test)
-
- ADD_EXECUTABLE(f32-vrsubc-relu-test test/f32-vrsubc-relu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8069,7 +8058,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME f32-vrsubc-minmax-test COMMAND f32-vrsubc-minmax-test)
+
+ ADD_EXECUTABLE(f32-vrsubc-relu-test test/f32-vrsubc-relu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-relu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(f32-vrsubc-relu-test f32-vrsubc-relu-test)
-
- ADD_EXECUTABLE(qc8-dwconv-minmax-fp32-test test/qc8-dwconv-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8078,7 +8067,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qc8-dwconv-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qc8-dwconv-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qc8-dwconv-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qc8-dwconv-minmax-fp32-test qc8-dwconv-minmax-fp32-test)
-
- ADD_EXECUTABLE(qc8-gemm-minmax-fp32-test test/qc8-gemm-minmax-fp32.cc test/qc8-gemm-minmax-fp32-2.cc test/qc8-gemm-minmax-fp32-3.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8087,7 +8076,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qc8-gemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qc8-gemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qc8-gemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(qc8-gemm-minmax-fp32-test qc8-gemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qc8-igemm-minmax-fp32-test test/qc8-igemm-minmax-fp32.cc test/qc8-igemm-minmax-fp32-2.cc test/qc8-igemm-minmax-fp32-3.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8096,7 +8085,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qc8-igemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qc8-igemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qc8-igemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(qc8-igemm-minmax-fp32-test qc8-igemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-dwconv-minmax-fp32-test test/qs8-dwconv-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8105,7 +8094,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-dwconv-minmax-fp32-test qs8-dwconv-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-dwconv-minmax-rndnu-test test/qs8-dwconv-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8114,7 +8103,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-dwconv-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-dwconv-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-dwconv-minmax-rndnu-test qs8-dwconv-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qs8-f32-vcvt-test test/f32-f16-vcvt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8123,7 +8112,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME f32-vrsubc-relu-test COMMAND f32-vrsubc-relu-test)
+
+ ADD_EXECUTABLE(qc8-dwconv-unipass-minmax-fp32-test test/qc8-dwconv-unipass-minmax-fp32.cc)
+ TARGET_INCLUDE_DIRECTORIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME qc8-dwconv-unipass-minmax-fp32-test COMMAND qc8-dwconv-unipass-minmax-fp32-test)
+
+@@ -2406,31 +2373,31 @@
+
+ ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-fp32-test test/qs8-dwconv-unipass-minmax-fp32.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME qs8-dwconv-unipass-minmax-fp32-test COMMAND qs8-dwconv-unipass-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-rndnu-test test/qs8-dwconv-unipass-minmax-rndnu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME qs8-dwconv-unipass-minmax-rndnu-test COMMAND qs8-dwconv-unipass-minmax-rndnu-test)
+
+ ADD_EXECUTABLE(qs8-f32-vcvt-test test/f32-f16-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-f32-vcvt-test qs8-f32-vcvt-test)
-
- ADD_EXECUTABLE(qs8-gavgpool-minmax-fp32-test test/qs8-gavgpool-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8132,7 +8121,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-f32-vcvt-test COMMAND qs8-f32-vcvt-test)
+
+ ADD_EXECUTABLE(qs8-gavgpool-minmax-fp32-test test/qs8-gavgpool-minmax-fp32.cc)
TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-gavgpool-minmax-fp32-test qs8-gavgpool-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-gavgpool-minmax-rndnu-test test/qs8-gavgpool-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8141,7 +8130,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-gavgpool-minmax-fp32-test COMMAND qs8-gavgpool-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qs8-gavgpool-minmax-rndnu-test test/qs8-gavgpool-minmax-rndnu.cc)
TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-gavgpool-minmax-rndnu-test qs8-gavgpool-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qs8-gemm-minmax-fp32-test test/qs8-gemm-minmax-fp32.cc test/qs8-gemm-minmax-fp32-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8150,7 +8139,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-gemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qs8-gemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qs8-gemm-minmax-fp32-test qs8-gemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-gemm-minmax-rndnu-test test/qs8-gemm-minmax-rndnu.cc test/qs8-gemm-minmax-rndnu-2.cc test/qs8-gemm-minmax-rndnu-3.cc test/qs8-gemm-minmax-rndnu-4.cc test/qs8-gemm-minmax-rndnu-5.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8159,7 +8148,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-gemm-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-gemm-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qs8-gemm-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(qs8-gemm-minmax-rndnu-test qs8-gemm-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qs8-igemm-minmax-fp32-test test/qs8-igemm-minmax-fp32.cc test/qs8-igemm-minmax-fp32-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8168,7 +8157,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-igemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-igemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qs8-igemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qs8-igemm-minmax-fp32-test qs8-igemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-igemm-minmax-rndnu-test test/qs8-igemm-minmax-rndnu.cc test/qs8-igemm-minmax-rndnu-2.cc test/qs8-igemm-minmax-rndnu-3.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8177,7 +8166,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qs8-igemm-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-igemm-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main jit gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qs8-igemm-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main jit gemm-microkernel-tester)
- ADD_TEST(qs8-igemm-minmax-rndnu-test qs8-igemm-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qs8-requantization-test test/qs8-requantization.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8186,7 +8175,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-gavgpool-minmax-rndnu-test COMMAND qs8-gavgpool-minmax-rndnu-test)
+
+@@ -2461,81 +2428,81 @@
+ ADD_EXECUTABLE(qs8-requantization-test test/qs8-requantization.cc)
+ SET_TARGET_PROPERTIES(qs8-requantization-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qs8-requantization-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-requantization-test qs8-requantization-test)
-
- ADD_EXECUTABLE(qs8-vadd-minmax-test test/qs8-vadd-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8195,7 +8184,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME qs8-requantization-test COMMAND qs8-requantization-test)
+
+ ADD_EXECUTABLE(qs8-vadd-minmax-test test/qs8-vadd-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(qs8-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-vadd-minmax-test qs8-vadd-minmax-test)
-
- ADD_EXECUTABLE(qs8-vaddc-minmax-test test/qs8-vaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8204,7 +8193,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vadd-minmax-test COMMAND qs8-vadd-minmax-test)
+
+ ADD_EXECUTABLE(qs8-vaddc-minmax-test test/qs8-vaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-vaddc-minmax-test qs8-vaddc-minmax-test)
-
- ADD_EXECUTABLE(qs8-vmul-minmax-fp32-test test/qs8-vmul-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8213,7 +8202,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vaddc-minmax-test COMMAND qs8-vaddc-minmax-test)
+
+ ADD_EXECUTABLE(qs8-vcvt-test test/qs8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vcvt-test COMMAND qs8-vcvt-test)
+
+ ADD_EXECUTABLE(qs8-vlrelu-test test/qs8-vlrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vlrelu-test COMMAND qs8-vlrelu-test)
+
+ ADD_EXECUTABLE(qs8-vmul-minmax-fp32-test test/qs8-vmul-minmax-fp32.cc)
+ SET_TARGET_PROPERTIES(qs8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qs8-vmul-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-vmul-minmax-fp32-test qs8-vmul-minmax-fp32-test)
-
- ADD_EXECUTABLE(qs8-vmulc-minmax-fp32-test test/qs8-vmulc-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8222,7 +8211,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vmul-minmax-fp32-test COMMAND qs8-vmul-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qs8-vmulc-minmax-fp32-test test/qs8-vmulc-minmax-fp32.cc)
+ SET_TARGET_PROPERTIES(qs8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qs8-vmulc-minmax-fp32-test qs8-vmulc-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-avgpool-minmax-test test/qu8-avgpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8231,7 +8220,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-avgpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-avgpool-minmax-test qu8-avgpool-minmax-test)
-
- ADD_EXECUTABLE(qu8-dwconv-minmax-fp32-test test/qu8-dwconv-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8240,7 +8229,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-dwconv-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-dwconv-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-dwconv-minmax-fp32-test qu8-dwconv-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-dwconv-minmax-rndnu-test test/qu8-dwconv-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8249,7 +8238,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-dwconv-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-dwconv-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-dwconv-minmax-rndnu-test qu8-dwconv-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-f32-vcvt-test test/f32-f16-vcvt.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8258,7 +8247,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qs8-vmulc-minmax-fp32-test COMMAND qs8-vmulc-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-avgpool-minmax-fp32-test test/qu8-avgpool-minmax-fp32.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-avgpool-minmax-fp32-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-avgpool-minmax-fp32-test COMMAND qu8-avgpool-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-fp32-test test/qu8-dwconv-unipass-minmax-fp32.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME qu8-dwconv-unipass-minmax-fp32-test COMMAND qu8-dwconv-unipass-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-rndnu-test test/qu8-dwconv-unipass-minmax-rndnu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing)
+ ADD_TEST(NAME qu8-dwconv-unipass-minmax-rndnu-test COMMAND qu8-dwconv-unipass-minmax-rndnu-test)
+
+ ADD_EXECUTABLE(qu8-f32-vcvt-test test/f32-f16-vcvt.cc)
TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-f32-vcvt-test qu8-f32-vcvt-test)
-
- ADD_EXECUTABLE(qu8-gavgpool-minmax-fp32-test test/qu8-gavgpool-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8267,7 +8256,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-f32-vcvt-test COMMAND qu8-f32-vcvt-test)
+
+ ADD_EXECUTABLE(qu8-gavgpool-minmax-fp32-test test/qu8-gavgpool-minmax-fp32.cc)
TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-gavgpool-minmax-fp32-test qu8-gavgpool-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-gavgpool-minmax-rndnu-test test/qu8-gavgpool-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8276,7 +8265,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-gavgpool-minmax-fp32-test COMMAND qu8-gavgpool-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-gavgpool-minmax-rndnu-test test/qu8-gavgpool-minmax-rndnu.cc)
TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-gavgpool-minmax-rndnu-test qu8-gavgpool-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-gemm-minmax-fp32-test test/qu8-gemm-minmax-fp32.cc test/qu8-gemm-minmax-fp32-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8285,7 +8274,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-gemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qu8-gemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qu8-gemm-minmax-fp32-test qu8-gemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-gemm-minmax-rndnu-test test/qu8-gemm-minmax-rndnu.cc test/qu8-gemm-minmax-rndnu-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8294,7 +8283,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-gemm-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-gemm-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qu8-gemm-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qu8-gemm-minmax-rndnu-test qu8-gemm-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-igemm-minmax-fp32-test test/qu8-igemm-minmax-fp32.cc test/qu8-igemm-minmax-fp32-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8303,7 +8292,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-igemm-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-igemm-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qu8-igemm-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qu8-igemm-minmax-fp32-test qu8-igemm-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-igemm-minmax-rndnu-test test/qu8-igemm-minmax-rndnu.cc test/qu8-igemm-minmax-rndnu-2.cc $<TARGET_OBJECTS:all_microkernels> $<TARGET_OBJECTS:packing>)
-@@ -8312,7 +8301,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(qu8-igemm-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-igemm-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main gemm-microkernel-tester)
-+ TARGET_LINK_LIBRARIES(qu8-igemm-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main gemm-microkernel-tester)
- ADD_TEST(qu8-igemm-minmax-rndnu-test qu8-igemm-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-requantization-test test/qu8-requantization.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8321,7 +8310,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-gavgpool-minmax-rndnu-test COMMAND qu8-gavgpool-minmax-rndnu-test)
+
+@@ -2566,161 +2533,161 @@
+ ADD_EXECUTABLE(qu8-requantization-test test/qu8-requantization.cc)
+ SET_TARGET_PROPERTIES(qu8-requantization-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qu8-requantization-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-requantization-test qu8-requantization-test)
-
- ADD_EXECUTABLE(qu8-vadd-minmax-test test/qu8-vadd-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8330,7 +8319,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME qu8-requantization-test COMMAND qu8-requantization-test)
+
+ ADD_EXECUTABLE(qu8-vadd-minmax-test test/qu8-vadd-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(qu8-vadd-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vadd-minmax-test qu8-vadd-minmax-test)
-
- ADD_EXECUTABLE(qu8-vaddc-minmax-test test/qu8-vaddc-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8339,7 +8328,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vadd-minmax-test COMMAND qu8-vadd-minmax-test)
+
+ ADD_EXECUTABLE(qu8-vaddc-minmax-test test/qu8-vaddc-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vaddc-minmax-test qu8-vaddc-minmax-test)
-
- ADD_EXECUTABLE(qu8-vmul-minmax-fp32-test test/qu8-vmul-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8348,7 +8337,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vaddc-minmax-test COMMAND qu8-vaddc-minmax-test)
+
+ ADD_EXECUTABLE(qu8-vcvt-test test/qu8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vcvt-test COMMAND qu8-vcvt-test)
+
+ ADD_EXECUTABLE(qu8-vlrelu-test test/qu8-vlrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vlrelu-test COMMAND qu8-vlrelu-test)
+
+ ADD_EXECUTABLE(qu8-vmul-minmax-fp32-test test/qu8-vmul-minmax-fp32.cc)
+ SET_TARGET_PROPERTIES(qu8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vmul-minmax-fp32-test qu8-vmul-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-vmul-minmax-rndnu-test test/qu8-vmul-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8357,7 +8346,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vmul-minmax-fp32-test COMMAND qu8-vmul-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-vmul-minmax-rndnu-test test/qu8-vmul-minmax-rndnu.cc)
+ SET_TARGET_PROPERTIES(qu8-vmul-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vmul-minmax-rndnu-test qu8-vmul-minmax-rndnu-test)
-
- ADD_EXECUTABLE(qu8-vmulc-minmax-fp32-test test/qu8-vmulc-minmax-fp32.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8366,7 +8355,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vmul-minmax-rndnu-test COMMAND qu8-vmul-minmax-rndnu-test)
+
+ ADD_EXECUTABLE(qu8-vmulc-minmax-fp32-test test/qu8-vmulc-minmax-fp32.cc)
+ SET_TARGET_PROPERTIES(qu8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-fp32-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vmulc-minmax-fp32-test qu8-vmulc-minmax-fp32-test)
-
- ADD_EXECUTABLE(qu8-vmulc-minmax-rndnu-test test/qu8-vmulc-minmax-rndnu.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8375,7 +8364,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vmulc-minmax-fp32-test COMMAND qu8-vmulc-minmax-fp32-test)
+
+ ADD_EXECUTABLE(qu8-vmulc-minmax-rndnu-test test/qu8-vmulc-minmax-rndnu.cc)
+ SET_TARGET_PROPERTIES(qu8-vmulc-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES)
TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-rndnu-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(qu8-vmulc-minmax-rndnu-test qu8-vmulc-minmax-rndnu-test)
-
- ADD_EXECUTABLE(s8-ibilinear-test test/s8-ibilinear.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8384,7 +8373,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME qu8-vmulc-minmax-rndnu-test COMMAND qu8-vmulc-minmax-rndnu-test)
+
+ ADD_EXECUTABLE(s16-rmaxabs-test test/s16-rmaxabs.cc)
+ TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME s16-rmaxabs-test COMMAND s16-rmaxabs-test)
+
+ ADD_EXECUTABLE(s16-window-test test/s16-window.cc)
+ TARGET_INCLUDE_DIRECTORIES(s16-window-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(s16-window-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(s16-window-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(s16-window-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME s16-window-test COMMAND s16-window-test)
+
+ ADD_EXECUTABLE(u32-filterbank-accumulate-test test/u32-filterbank-accumulate.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u32-filterbank-accumulate-test COMMAND u32-filterbank-accumulate-test)
+
+ ADD_EXECUTABLE(u32-filterbank-subtract-test test/u32-filterbank-subtract.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u32-filterbank-subtract-test COMMAND u32-filterbank-subtract-test)
+
+ ADD_EXECUTABLE(u32-vlog-test test/u32-vlog.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-vlog-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u32-vlog-test COMMAND u32-vlog-test)
+
+ ADD_EXECUTABLE(i16-vlshift-test test/i16-vlshift.cc)
+ TARGET_INCLUDE_DIRECTORIES(i16-vlshift-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME i16-vlshift-test COMMAND i16-vlshift-test)
+
+ ADD_EXECUTABLE(cs16-vsquareabs-test test/cs16-vsquareabs.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME cs16-vsquareabs-test COMMAND cs16-vsquareabs-test)
+
+ ADD_EXECUTABLE(cs16-bfly4-test test/cs16-bfly4.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME cs16-bfly4-test COMMAND cs16-bfly4-test)
+
+ ADD_EXECUTABLE(cs16-fftr-test test/cs16-fftr.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-fftr-test PRIVATE include src test)
+- TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME cs16-fftr-test COMMAND cs16-fftr-test)
+
+ ADD_EXECUTABLE(s8-ibilinear-test test/s8-ibilinear.cc)
TARGET_INCLUDE_DIRECTORIES(s8-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(s8-ibilinear-test s8-ibilinear-test)
-
- ADD_EXECUTABLE(s8-maxpool-minmax-test test/s8-maxpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8393,7 +8382,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME s8-ibilinear-test COMMAND s8-ibilinear-test)
+
+ ADD_EXECUTABLE(s8-maxpool-minmax-test test/s8-maxpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(s8-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(s8-maxpool-minmax-test s8-maxpool-minmax-test)
-
- ADD_EXECUTABLE(s8-vclamp-test test/s8-vclamp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8402,7 +8391,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME s8-maxpool-minmax-test COMMAND s8-maxpool-minmax-test)
+
+ ADD_EXECUTABLE(s8-vclamp-test test/s8-vclamp.cc)
TARGET_INCLUDE_DIRECTORIES(s8-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(s8-vclamp-test s8-vclamp-test)
-
- ADD_EXECUTABLE(u8-lut32norm-test test/u8-lut32norm.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8411,7 +8400,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME s8-vclamp-test COMMAND s8-vclamp-test)
+
+ ADD_EXECUTABLE(u8-lut32norm-test test/u8-lut32norm.cc)
TARGET_INCLUDE_DIRECTORIES(u8-lut32norm-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(u8-lut32norm-test u8-lut32norm-test)
-
- ADD_EXECUTABLE(u8-ibilinear-test test/u8-ibilinear.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8420,7 +8409,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u8-lut32norm-test COMMAND u8-lut32norm-test)
+
+ ADD_EXECUTABLE(u8-ibilinear-test test/u8-ibilinear.cc)
TARGET_INCLUDE_DIRECTORIES(u8-ibilinear-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(u8-ibilinear-test u8-ibilinear-test)
-
- ADD_EXECUTABLE(u8-maxpool-minmax-test test/u8-maxpool-minmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8429,7 +8418,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u8-ibilinear-test COMMAND u8-ibilinear-test)
+
+ ADD_EXECUTABLE(u8-maxpool-minmax-test test/u8-maxpool-minmax.cc)
TARGET_INCLUDE_DIRECTORIES(u8-maxpool-minmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(u8-maxpool-minmax-test u8-maxpool-minmax-test)
-
- ADD_EXECUTABLE(u8-rmax-test test/u8-rmax.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8438,7 +8427,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init)
++ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE gtest gtest_main microparams-init)
+ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME u8-maxpool-minmax-test COMMAND u8-maxpool-minmax-test)
+
+ ADD_EXECUTABLE(u8-rmax-test test/u8-rmax.cc)
TARGET_INCLUDE_DIRECTORIES(u8-rmax-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(u8-rmax-test u8-rmax-test)
-
- ADD_EXECUTABLE(u8-vclamp-test test/u8-vclamp.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8447,7 +8436,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME u8-rmax-test COMMAND u8-rmax-test)
+
+ ADD_EXECUTABLE(u8-vclamp-test test/u8-vclamp.cc)
TARGET_INCLUDE_DIRECTORIES(u8-vclamp-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(u8-vclamp-test u8-vclamp-test)
-
- ADD_EXECUTABLE(x8-transpose-test test/x8-transpose.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8456,7 +8445,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x8-transpose-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x8-transpose-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x8-transpose-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x8-transpose-test x8-transpose-test)
-
- ADD_EXECUTABLE(x16-transpose-test test/x16-transpose.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8465,7 +8454,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x16-transpose-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x16-transpose-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x16-transpose-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x16-transpose-test x16-transpose-test)
-
- ADD_EXECUTABLE(x32-packx-test test/x32-packx.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8474,7 +8463,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x32-packx-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-packx-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-packx-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x32-packx-test x32-packx-test)
-
- ADD_EXECUTABLE(x32-unpool-test test/x32-unpool.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8483,7 +8472,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x32-unpool-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-unpool-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-unpool-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x32-unpool-test x32-unpool-test)
-
- ADD_EXECUTABLE(x32-depthtospace2d-chw2hwc-test test/x32-depthtospace2d-chw2hwc.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8492,7 +8481,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x32-depthtospace2d-chw2hwc-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-depthtospace2d-chw2hwc-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-depthtospace2d-chw2hwc-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x32-depthtospace2d-chw2hwc-test x32-depthtospace2d-chw2hwc-test)
-
- ADD_EXECUTABLE(x32-transpose-test test/x32-transpose.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8501,7 +8490,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(x32-transpose-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-transpose-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-transpose-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x32-transpose-test x32-transpose-test)
-
- ADD_EXECUTABLE(x32-zip-test test/x32-zip.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8510,7 +8499,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME u8-vclamp-test COMMAND u8-vclamp-test)
+
+@@ -2762,25 +2729,25 @@
+
+ ADD_EXECUTABLE(x32-zip-test test/x32-zip.cc)
TARGET_INCLUDE_DIRECTORIES(x32-zip-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x32-zip-test x32-zip-test)
-
- ADD_EXECUTABLE(x64-transpose-test test/x64-transpose.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8519,7 +8508,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME x32-zip-test COMMAND x32-zip-test)
+
+ ADD_EXECUTABLE(x64-transpose-test test/x64-transpose.cc)
TARGET_INCLUDE_DIRECTORIES(x64-transpose-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x64-transpose-test x64-transpose-test)
-
- ADD_EXECUTABLE(x8-lut-test test/x8-lut.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8528,7 +8517,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE hardware-config logging microkernels-all microparams-init)
+ ADD_TEST(NAME x64-transpose-test COMMAND x64-transpose-test)
+
+ ADD_EXECUTABLE(x8-lut-test test/x8-lut.cc)
TARGET_INCLUDE_DIRECTORIES(x8-lut-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x8-lut-test x8-lut-test)
-
- ADD_EXECUTABLE(x8-zip-test test/x8-zip.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8537,7 +8526,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
+- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME x8-lut-test COMMAND x8-lut-test)
+
+ ADD_EXECUTABLE(x8-zip-test test/x8-zip.cc)
TARGET_INCLUDE_DIRECTORIES(x8-zip-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(x8-zip-test x8-zip-test)
-
- ADD_EXECUTABLE(xx-fill-test test/xx-fill.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8546,7 +8535,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(xx-fill-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(xx-fill-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(xx-fill-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(xx-fill-test xx-fill-test)
-
- ADD_EXECUTABLE(xx-pad-test test/xx-pad.cc $<TARGET_OBJECTS:all_microkernels>)
-@@ -8555,7 +8544,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS YES)
- TARGET_INCLUDE_DIRECTORIES(xx-pad-test PRIVATE include src test)
-- TARGET_LINK_LIBRARIES(xx-pad-test PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(xx-pad-test PRIVATE cpuinfo gtest gtest_main)
- ADD_TEST(xx-pad-test xx-pad-test)
-
- ADD_EXECUTABLE(jit-test test/jit.cc)
-@@ -8682,7 +8671,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE hardware-config logging microkernels-all)
+ ADD_TEST(NAME x8-zip-test COMMAND x8-zip-test)
+
+@@ -2842,12 +2809,12 @@
+
+ ADD_EXECUTABLE(packing-test test/packing.cc)
+ TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src)
+- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool)
++ TARGET_LINK_LIBRARIES(packing-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing)
+
+ ADD_EXECUTABLE(indirection-test test/indirection.cc)
+ TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src)
+- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool)
++ TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection)
+ ENDIF()
+
+@@ -2864,7 +2831,7 @@
+ ADD_LIBRARY(bench-utils STATIC bench/utils.cc)
+ TARGET_INCLUDE_DIRECTORIES(bench-utils PRIVATE .)
+ TARGET_INCLUDE_DIRECTORIES(bench-utils PUBLIC include src)
+- TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo pthreadpool)
++ TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(bench-utils PRIVATE hardware-config)
+ IF(XNNPACK_BUILD_LIBRARY)
+ TARGET_LINK_LIBRARIES(bench-utils PRIVATE logging memory)
+@@ -2873,134 +2840,134 @@
+ # ---[ Build accuracy microbenchmarks
+ ADD_EXECUTABLE(f16-exp-ulp-eval eval/f16-exp-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-exp-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f16-expminus-ulp-eval eval/f16-expminus-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-expminus-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f16-expm1minus-ulp-eval eval/f16-expm1minus-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-expm1minus-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f16-sigmoid-ulp-eval eval/f16-sigmoid-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-sigmoid-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f16-sqrt-ulp-eval eval/f16-sqrt-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-sqrt-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-exp-ulp-eval eval/f32-exp-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-exp-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-expminus-ulp-eval eval/f32-expminus-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-expminus-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-expm1minus-ulp-eval eval/f32-expm1minus-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-extexp-ulp-eval eval/f32-extexp-ulp.cc)
+ SET_TARGET_PROPERTIES(f32-extexp-ulp-eval PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(f32-extexp-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-sigmoid-ulp-eval eval/f32-sigmoid-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-sigmoid-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-sqrt-ulp-eval eval/f32-sqrt-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-sqrt-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f32-tanh-ulp-eval eval/f32-tanh-ulp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-tanh-ulp-eval PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE bench-utils microkernels-all)
+
+ # ---[ Build accuracy tests
+ ADD_EXECUTABLE(f16-sqrt-eval eval/f16-sqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-sqrt-eval PRIVATE include src)
+- TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f16-f32-cvt-eval eval/f16-f32-cvt.cc)
TARGET_INCLUDE_DIRECTORIES(f16-f32-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-f16-cvt-eval eval/f32-f16-cvt.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-f16-cvt-eval PROPERTIES
-@@ -8690,7 +8679,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-f16-cvt-eval eval/f32-f16-cvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-f16-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-qs8-cvt-eval eval/f32-qs8-cvt.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-qs8-cvt-eval PROPERTIES
-@@ -8698,7 +8687,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-qs8-cvt-eval eval/f32-qs8-cvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-qs8-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-qu8-cvt-eval eval/f32-qu8-cvt.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-qu8-cvt-eval PROPERTIES
-@@ -8706,7 +8695,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-qu8-cvt-eval eval/f32-qu8-cvt.cc)
TARGET_INCLUDE_DIRECTORIES(f32-qu8-cvt-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-exp-eval eval/f32-exp.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-exp-eval PROPERTIES
-@@ -8714,7 +8703,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-exp-eval eval/f32-exp.cc)
TARGET_INCLUDE_DIRECTORIES(f32-exp-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-expm1minus-eval eval/f32-expm1minus.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-expm1minus-eval PROPERTIES
-@@ -8722,7 +8711,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-expm1minus-eval eval/f32-expm1minus.cc)
TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-expminus-eval eval/f32-expminus.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-expminus-eval PROPERTIES
-@@ -8730,7 +8719,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-expminus-eval eval/f32-expminus.cc)
TARGET_INCLUDE_DIRECTORIES(f32-expminus-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-roundne-eval eval/f32-roundne.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-roundne-eval PROPERTIES
-@@ -8738,7 +8727,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-roundne-eval eval/f32-roundne.cc)
TARGET_INCLUDE_DIRECTORIES(f32-roundne-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-roundd-eval eval/f32-roundd.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-roundd-eval PROPERTIES
-@@ -8746,7 +8735,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-roundd-eval eval/f32-roundd.cc)
TARGET_INCLUDE_DIRECTORIES(f32-roundd-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-roundu-eval eval/f32-roundu.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-roundu-eval PROPERTIES
-@@ -8754,7 +8743,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
+- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(f32-roundu-eval eval/f32-roundu.cc)
TARGET_INCLUDE_DIRECTORIES(f32-roundu-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE cpuinfo gtest gtest_main)
-
- ADD_EXECUTABLE(f32-roundz-eval eval/f32-roundz.cc $<TARGET_OBJECTS:all_microkernels>)
- SET_TARGET_PROPERTIES(f32-roundz-eval PROPERTIES
-@@ -8762,7 +8751,7 @@
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
- TARGET_INCLUDE_DIRECTORIES(f32-roundz-eval PRIVATE include src)
-- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE cpuinfo fp16 pthreadpool gtest gtest_main)
-+ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE cpuinfo gtest gtest_main)
+- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE hardware-config logging microkernels-all)
- # ---[ Build end-to-end microbenchmarks
- ADD_LIBRARY(bench-models STATIC
+ ADD_EXECUTABLE(f32-roundz-eval eval/f32-roundz.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-roundz-eval PRIVATE include src)
+- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE fp16 pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(u32-sqrt-eval eval/u32-sqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-sqrt-eval PRIVATE include src)
+- TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE hardware-config logging microkernels-all)
+
+ ADD_EXECUTABLE(u64-sqrt-eval eval/u64-sqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(u64-sqrt-eval PRIVATE include src)
+- TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE pthreadpool gtest gtest_main)
++ TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE gtest gtest_main)
+ TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE hardware-config logging microkernels-all)
+
+ IF(XNNPACK_BUILD_LIBRARY)
+@@ -3030,7 +2997,7 @@
+ models/qu8-mobilenet-v2.cc)
+ SET_TARGET_PROPERTIES(bench-models PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(bench-models PRIVATE .)
+- TARGET_LINK_LIBRARIES(bench-models PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(bench-models PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(bench-models PRIVATE XNNPACK bench-utils)
+
+ ADD_EXECUTABLE(end2end-bench bench/end2end.cc)
+@@ -3039,7 +3006,7 @@
+
+ ADD_EXECUTABLE(f16-gemm-e2e-bench bench/f16-gemm-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-gemm-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-dwconv-e2e-bench bench/f32-dwconv-e2e.cc)
+@@ -3049,33 +3016,33 @@
+
+ ADD_EXECUTABLE(f32-gemm-e2e-bench bench/f32-gemm-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-gemm-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-dwconv-e2e-bench bench/qs8-dwconv-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-gemm-e2e-bench bench/qs8-gemm-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-gemm-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-gemm-e2e-bench bench/qu8-gemm-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-gemm-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-dwconv-e2e-bench bench/qu8-dwconv-e2e.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-e2e-bench PRIVATE . src)
+- TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE fp16 benchmark)
++ TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init)
+
+ # ---[ Build operator-level microbenchmarks
+ ADD_EXECUTABLE(abs-bench bench/abs.cc)
+ TARGET_INCLUDE_DIRECTORIES(abs-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(average-pooling-bench bench/average-pooling.cc)
+ TARGET_INCLUDE_DIRECTORIES(average-pooling-bench PRIVATE .)
+@@ -3083,11 +3050,11 @@
+
+ ADD_EXECUTABLE(bankers-rounding-bench bench/bankers-rounding.cc)
+ TARGET_INCLUDE_DIRECTORIES(bankers-rounding-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(ceiling-bench bench/ceiling.cc)
+ TARGET_INCLUDE_DIRECTORIES(ceiling-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(channel-shuffle-bench bench/channel-shuffle.cc)
+ TARGET_INCLUDE_DIRECTORIES(channel-shuffle-bench PRIVATE .)
+@@ -3095,11 +3062,11 @@
+
+ ADD_EXECUTABLE(convert-bench bench/convert.cc)
+ TARGET_INCLUDE_DIRECTORIES(convert-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(convolution-bench bench/convolution.cc)
+ TARGET_INCLUDE_DIRECTORIES(convolution-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(deconvolution-bench bench/deconvolution.cc)
+ TARGET_INCLUDE_DIRECTORIES(deconvolution-bench PRIVATE .)
+@@ -3107,23 +3074,23 @@
+
+ ADD_EXECUTABLE(elu-bench bench/elu.cc)
+ TARGET_INCLUDE_DIRECTORIES(elu-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(floor-bench bench/floor.cc)
+ TARGET_INCLUDE_DIRECTORIES(floor-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(global-average-pooling-bench bench/global-average-pooling.cc)
+ TARGET_INCLUDE_DIRECTORIES(global-average-pooling-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(hardswish-bench bench/hardswish.cc)
+ TARGET_INCLUDE_DIRECTORIES(hardswish-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(leaky-relu-bench bench/leaky-relu.cc)
+ TARGET_INCLUDE_DIRECTORIES(leaky-relu-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(max-pooling-bench bench/max-pooling.cc)
+ TARGET_INCLUDE_DIRECTORIES(max-pooling-bench PRIVATE .)
+@@ -3139,7 +3106,7 @@
+
+ ADD_EXECUTABLE(sigmoid-bench bench/sigmoid.cc)
+ TARGET_INCLUDE_DIRECTORIES(sigmoid-bench PRIVATE .)
+- TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK fp16 benchmark bench-utils)
++ TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK benchmark bench-utils)
+
+ ADD_EXECUTABLE(softmax-bench bench/softmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(softmax-bench PRIVATE .)
+@@ -3161,378 +3128,378 @@
+ # ---[ Build microkernel-level microbenchmarks
+ ADD_EXECUTABLE(bf16-gemm-bench bench/bf16-gemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(bf16-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-conv-hwc2chw-bench bench/f16-conv-hwc2chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-dwconv-bench bench/f16-dwconv.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-dwconv-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-dwconv2d-chw-bench bench/f16-dwconv2d-chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-gavgpool-cw-bench bench/f16-gavgpool-cw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f16-gemm-bench bench/f16-gemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-igemm-bench bench/f16-igemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-igemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f16-raddstoreexpminusmax-bench bench/f16-raddstoreexpminusmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f16-spmm-bench bench/f16-spmm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-spmm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f16-velu-bench bench/f16-velu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-velu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f16-vsigmoid-bench bench/f16-vsigmoid.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f16-vsqrt-bench bench/f16-vsqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(f16-f32-vcvt-bench bench/f16-f32-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark fp16 pthreadpool)
++ TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-conv-hwc-bench bench/f32-conv-hwc.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-conv-hwc2chw-bench bench/f32-conv-hwc2chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-dwconv-bench bench/f32-dwconv.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernel-utils microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-dwconv2d-chw-bench bench/f32-dwconv2d-chw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-f16-vcvt-bench bench/f32-f16-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-gavgpool-cw-bench bench/f32-gavgpool-cw.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-gemm-bench bench/f32-gemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE jit bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-igemm-bench bench/f32-igemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-igemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE jit bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-im2col-gemm-bench bench/f32-im2col-gemm.cc src/im2col.c)
+ TARGET_INCLUDE_DIRECTORIES(f32-im2col-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(f32-qs8-vcvt-bench bench/f32-qs8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-qu8-vcvt-bench bench/f32-qu8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-raddstoreexpminusmax-bench bench/f32-raddstoreexpminusmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-raddexpminusmax-bench bench/f32-raddexpminusmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-raddextexp-bench bench/f32-raddextexp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vscaleexpminusmax-bench bench/f32-vscaleexpminusmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vscaleexpminusmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vscaleextexp-bench bench/f32-vscaleextexp.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-rmax-bench bench/f32-rmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-rmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-spmm-bench bench/f32-spmm.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-spmm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-softmax-bench bench/f32-softmax.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-softmax-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-velu-bench bench/f32-velu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-velu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vhswish-bench bench/f32-vhswish.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vhswish-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vlrelu-bench bench/f32-vlrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vrelu-bench bench/f32-vrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vrelu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vsigmoid-bench bench/f32-vsigmoid.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(f32-vsqrt-bench bench/f32-vsqrt.cc)
+ TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-dwconv-bench bench/qs8-dwconv.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(qs8-f32-vcvt-bench bench/qs8-f32-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-gemm-bench bench/qs8-gemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark pthreadpool jit microparams-init)
++ TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark jit microparams-init)
+ TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE bench-utils jit hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(qs8-requantization-bench bench/qs8-requantization.cc)
+ SET_TARGET_PROPERTIES(qs8-requantization-bench PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(qs8-requantization-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(qs8-vadd-bench bench/qs8-vadd.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vadd-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-vaddc-bench bench/qs8-vaddc.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-vcvt-bench bench/qs8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-vlrelu-bench bench/qs8-vlrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-vmul-bench bench/qs8-vmul.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vmul-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qs8-vmulc-bench bench/qs8-vmulc.cc)
+ TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-f32-vcvt-bench bench/qu8-f32-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-gemm-bench bench/qu8-gemm.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-gemm-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing)
+
+ ADD_EXECUTABLE(qu8-requantization-bench bench/qu8-requantization.cc)
+ SET_TARGET_PROPERTIES(qu8-requantization-bench PROPERTIES CXX_EXTENSIONS YES)
+ TARGET_INCLUDE_DIRECTORIES(qu8-requantization-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(qu8-vadd-bench bench/qu8-vadd.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vadd-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-vaddc-bench bench/qu8-vaddc.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-vcvt-bench bench/qu8-vcvt.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-vlrelu-bench bench/qu8-vlrelu.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-vmul-bench bench/qu8-vmul.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vmul-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(qu8-vmulc-bench bench/qu8-vmulc.cc)
+ TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(rounding-bench bench/rounding.cc)
+ TARGET_INCLUDE_DIRECTORIES(rounding-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo pthreadpool)
++ TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo)
+ TARGET_LINK_LIBRARIES(rounding-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(s16-rmaxabs-bench bench/s16-rmaxabs.cc)
+ TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(s16-window-bench bench/s16-window.cc)
+ TARGET_INCLUDE_DIRECTORIES(s16-window-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(u32-filterbank-accumulate-bench bench/u32-filterbank-accumulate.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(u32-filterbank-subtract-bench bench/u32-filterbank-subtract.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(u32-vlog-bench bench/u32-vlog.cc)
+ TARGET_INCLUDE_DIRECTORIES(u32-vlog-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(u64-u32-vsqrtshift-bench bench/u64-u32-vsqrtshift.cc)
+ TARGET_INCLUDE_DIRECTORIES(u64-u32-vsqrtshift-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(i16-vlshift-bench bench/i16-vlshift.cc)
+ TARGET_INCLUDE_DIRECTORIES(i16-vlshift-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(cs16-vsquareabs-bench bench/cs16-vsquareabs.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(cs16-bfly4-bench bench/cs16-bfly4.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(cs16-fftr-bench bench/cs16-fftr.cc)
+ TARGET_INCLUDE_DIRECTORIES(cs16-fftr-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(xx-transpose-bench bench/xx-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(xx-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(x8-lut-bench bench/x8-lut.cc)
+ TARGET_INCLUDE_DIRECTORIES(x8-lut-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE bench-utils microkernels-all)
+
+ ADD_EXECUTABLE(x8-transpose-bench bench/x32-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(x8-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(x16-transpose-bench bench/x16-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(x16-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(x24-transpose-bench bench/x16-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(x24-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(x32-transpose-bench bench/x32-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(x32-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+
+ ADD_EXECUTABLE(x64-transpose-bench bench/x64-transpose.cc)
+ TARGET_INCLUDE_DIRECTORIES(x64-transpose-bench PRIVATE . include src)
+- TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark pthreadpool)
++ TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark)
+ TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init)
+ ENDIF()
diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch
index 437a8cc37f..2d60c29423 100644
--- a/gnu/packages/patches/xpra-5.0-systemd-run.patch
+++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch
@@ -3,12 +3,12 @@ Distriction specific patch, not going upstream
Disable systemd-run if the command is not found.
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
-index 3813331a5..46e2c83a6 100755
+index 1c5e8ddaad..084aabe792 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
-@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool:
+@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool:
cmd = ["systemd-run", "--quiet"]
- if getuid()!=0:
+ if getuid() != 0:
cmd += ["--user"]
- cmd += ["--scope", "--", "true"]
- proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
@@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755
+ r = proc.returncode
except TimeoutExpired: # pragma: no cover
r = None
-- return r==0
+- return r == 0
+ if r is None:
+ try:
+ proc.terminate()
@@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755
+ return r==0
+ except FileNotFoundError:
+ return False
-
+
+
def verify_gir():
- try:
diff --git a/gnu/packages/patches/xpra-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.1-install_libs.patch
index 4d40bf1f79..0ec2aee288 100644
--- a/gnu/packages/patches/xpra-5.0-install_libs.patch
+++ b/gnu/packages/patches/xpra-6.1-install_libs.patch
@@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during
the 'install stage.
diff --git a/setup.py b/setup.py
-index e254bf99c..90db55c3f 100755
+index be7a3758e8..28dc1be191 100755
--- a/setup.py
+++ b/setup.py
-@@ -663,8 +663,6 @@ if modules_ENABLED:
+@@ -953,8 +953,6 @@ if modules_ENABLED:
# Utility methods for building with Cython
-
- def add_cython_ext(*args, **kwargs):
+
+ def do_add_cython_ext(*args, **kwargs) -> None:
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
if not cython_ENABLED:
raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
-@@ -1809,9 +1807,6 @@ else:
+@@ -2175,9 +2173,6 @@ else:
if root_prefix.endswith("/usr"):
- #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/"
+ # ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/"
root_prefix = root_prefix[:-4]
- for x in sys.argv:
- if x.startswith("--root="):
- root_prefix = x[len("--root="):]
- print(f"install_data_override.run() root_prefix={root_prefix}")
+ print(f" root_prefix={root_prefix!r}")
build_xpra_conf(root_prefix)
-
-@@ -1955,13 +1950,6 @@ else:
+
+@@ -2320,13 +2315,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
-
-- #gentoo does weird things, calls --no-compile with build *and* install
-- #then expects to find the cython modules!? ie:
+
+- # gentoo does weird things, calls --no-compile with build *and* install
+- # then expects to find the cython modules!? ie:
- #> python2.7 setup.py build -b build-2.7 install --no-compile \
- # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
-- #otherwise we use the flags to skip pkgconfig
-- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv):
+- # otherwise we use the flags to skip pkgconfig
+- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501
- pkgconfig = no_pkgconfig
-
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
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/patches/zig-do-not-link-against-librt.patch b/gnu/packages/patches/zig-do-not-link-against-librt.patch
deleted file mode 100644
index 3239efbdd4..0000000000
--- a/gnu/packages/patches/zig-do-not-link-against-librt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/target.zig 2023-04-22 11:44:47.917416658 +0200
-+++ b/src/target.zig 2023-04-22 11:45:04.577465352 +0200
-@@ -478,7 +478,6 @@
- "-lpthread",
- "-lc",
- "-ldl",
-- "-lrt",
- "-lutil",
- },
- },
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index cdefa48583..eb1066e4b6 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -132,7 +132,7 @@ specifying desired matches and transformations in the C code.")
"1va5pzmxbzpi87vdnbjm9qdf9bvzps9xfv0gi4mycgg3bybb0xc8"))))
(build-system gnu-build-system)
(inputs
- (list perl python))
+ (list bash-minimal perl python))
(arguments
'(#:parallel-tests? #f
#:phases
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 140bbd0e90..d2a352eb6b 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -39,7 +39,7 @@
(define-public hwdata
(package
(name "hwdata")
- (version "0.365") ;updated monthly
+ (version "0.374") ;updated monthly
(source (origin
(method git-fetch)
(uri (git-reference
@@ -48,25 +48,15 @@
(file-name (git-file-name name version))
(sha256
(base32
- "00gqx24dyy9l98ygnvx8i087xq8pl9d2393h4d2cm4d5nnvr51d4"))))
+ "1fcmg06lfzqrpq4z4gp12qpk7rd3s0phz4qyhq39ks43r1vxiy26"))))
(build-system gnu-build-system)
- (outputs '("out" "iab" "oui" "pci" "pnp" "usb"))
(arguments
;; Tests require pciutils, python, podman. Disable to avoid recursive dep.
(list
#:tests? #f
;; Do not cross-compile, since the package only contains data.
#:target #f
- #:configure-flags #~(list (string-append "--datadir=" #$output "/share"))
- #:phases
- #~(modify-phases %standard-phases
- (replace 'install
- (lambda _
- (install-file "iab.txt" (string-append #$output:iab "/share/hwdata"))
- (install-file "oui.txt" (string-append #$output:oui "/share/hwdata"))
- (install-file "pci.ids" (string-append #$output:pci "/share/hwdata"))
- (install-file "pnp.ids" (string-append #$output:pnp "/share/hwdata"))
- (install-file "usb.ids" (string-append #$output:usb "/share/hwdata")))))))
+ #:configure-flags #~(list (string-append "--datadir=" #$output "/share"))))
(home-page "https://github.com/vcrhonek/hwdata")
(synopsis "Hardware identification and configuration data")
(description "@code{hwdata} contains various hardware identification and
@@ -159,7 +149,7 @@ Each database is contained in a specific package output, such as the
;; No test suite.
#:tests? #f))
(native-inputs
- (list `(,hwdata "pci") pkg-config which))
+ (list hwdata pkg-config which))
(inputs
`(,@(if (not (target-hurd?))
`(("kmod" ,kmod))
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index c7471169d9..6f31d3c1d7 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -92,7 +92,7 @@ POSIX regular expression API.")
(define-public pcre2
(package
(name "pcre2")
- (version "10.40")
+ (version "10.42")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/PCRE2Project/pcre2"
@@ -100,7 +100,7 @@ POSIX regular expression API.")
"/pcre2-" version ".tar.bz2"))
(sha256
(base32
- "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l"))))
+ "0h78np8h3dxlmvqvpnj558x67267n08n9zsqncmlqapans6csdld"))))
(build-system gnu-build-system)
(outputs '("out" "static"))
(inputs (list bzip2 readline zlib))
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4e260d614d..c59b450935 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -20,13 +20,14 @@
;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2024 Timotej Lazar <timotej.lazar@araneo.si>
-;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2024 dan <i@dan.games>
;;; Copyright © 2023 Benjamin Slade <slade@lambda-y.net>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -133,8 +134,7 @@
(base32 "0kp1dcww5zl04wnbqbi8vjzpc5qgr8gr8rcx0s6s4xbjnzvqqw8d"))))
(build-system meson-build-system)
(arguments
- (list #:meson meson/newer
- #:configure-flags #~(list "-Dcpp_std=c++23")
+ (list #:configure-flags #~(list "-Dcpp_std=c++23")
#:test-options '(list "plainc")
#:phases
#~(modify-phases %standard-phases
@@ -265,10 +265,10 @@ information.")
`("QT_PLUGIN_PATH" ":" =
(,(string-append qtbase "/lib/qt5/plugins")))
`("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
- (,(string-append qtbase "/lib/qt5/plugins/platforms"))))
- #t))))))
+ (,(string-append qtbase "/lib/qt5/plugins/platforms"))))))))))
(inputs
- (list python-poppler-qt5
+ (list bash-minimal
+ python-poppler-qt5
python-pypdf2
python-pyqt
qtbase-5))
@@ -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")
@@ -495,13 +502,13 @@ reading and editing of existing PDF files.")
(define-public xpdf
(package
(name "xpdf")
- (version "4.04")
+ (version "4.05")
(source
(origin
(method url-fetch)
(uri (string-append "https://dl.xpdfreader.com/xpdf-" version ".tar.gz"))
(sha256
- (base32 "1pmsark94xza8q31wvfvp8n7l3c4qfd4ggj09i98y13npzy27kk3"))))
+ (base32 "1sjw5b7j404py1rblc8zxm6nar8km7yr2h7kffylyn5nmkapww4j"))))
(build-system cmake-build-system)
(inputs (list cups freetype libpng qtbase-5 zlib))
(arguments
@@ -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))
@@ -918,14 +916,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
(define-public qpdf
(package
(name "qpdf")
- (version "11.1.0")
+ (version "11.8.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
"/qpdf-" version ".tar.gz"))
(sha256
(base32
- "0bg2d4585nxss2zakq105ibhzzsa1bhwpmr0k8752fg2qqxcz9rl"))))
+ "0n8jfk4yf0m36rs9lg82pj9lv6pdqpfh8mhacc1ih9ahpigiycnr"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~'("-DBUILD_STATIC_LIBS=OFF")))
@@ -944,7 +942,7 @@ program capable of converting PDF into other formats.")
;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0.
;; Users can still choose to use the old license at their option.
(license (list license:asl2.0 license:clarified-artistic))
- (home-page "https://qpdf.sourceforge.net/")))
+ (home-page "https://qpdf.sourceforge.io/")))
(define-public qpdfview
(package
@@ -1200,7 +1198,7 @@ vector formats.")
(,(search-input-file inputs "bin/xpdf"))))
(install-file "impressive.1" man1)))))))
;; TODO: Add dependency on pdftk.
- (inputs (list python-pygame python-pillow sdl xpdf))
+ (inputs (list bash-minimal python-pygame python-pillow sdl xpdf))
(home-page "https://impressive.sourceforge.net")
(synopsis "PDF presentation tool with visual effects")
(description
@@ -1443,7 +1441,7 @@ manage or manipulate PDFs.")
(native-inputs
(list intltool python-distutils-extra))
(inputs
- (list gtk+ poppler))
+ (list bash-minimal gtk+ poppler))
(propagated-inputs
(list img2pdf
python-dateutil
@@ -1491,7 +1489,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.")
(define-public pdfgrep
(package
(name "pdfgrep")
- (version "2.1.2")
+ (version "2.2.0")
(source
(origin
(method url-fetch)
@@ -1499,7 +1497,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.")
name "-" version ".tar.gz"))
(sha256
(base32
- "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf"))))
+ "1jr0qqvkcb3xz0ps111cqwwxp1b5g5rrf75ab5whkvy0whqyaq86"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 57a06f836b..bded618a3f 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -32,12 +32,13 @@
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2022, 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
-;;; Copyright © 2022, 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2023 Evgeny Pisemsky <mail@pisemsky.site>
+;;; Copyright © 2022, 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2020, 2023 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -599,14 +600,7 @@ requires only 10MB of RAM.")
(list libxslt))
(propagated-inputs
(list perl-class-xsaccessor perl-test-trap))
- (native-search-paths
- ;; xsltproc's search paths, to avoid propagating libxslt.
- (list (search-path-specification
- (variable "XML_CATALOG_FILES")
- (separator " ")
- (files '("xml"))
- (file-pattern "^catalog\\.xml$")
- (file-type 'regular))))
+ (native-search-paths %libxslt-search-paths)
(home-page "https://www.shlomifish.org/open-source/projects/docmake/")
(synopsis "Translate DocBook/XML documentation into other file formats")
(description
@@ -4093,6 +4087,26 @@ input a message of arbitrary length and produces as output a
128-bit \"fingerprint\" or \"message digest\" of the input.")
(license (package-license perl))))
+(define-public perl-digest-perl-md5
+ (package
+ (name "perl-digest-perl-md5")
+ (version "1.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "1cfrxkzazxdg4prdfcfd9b33bvyav1xim2vxj07gni8gf6hwn03i"))))
+ (build-system perl-build-system)
+ (home-page "https://metacpan.org/release/Digest-Perl-MD5")
+ (synopsis "Perl Implementation of Rivest's MD5 algorithm")
+ (description "This @code{Digest::Perl::MD5} has the same interface as the
+much faster @code{Digest::MD5}, but it's a pure Perl implementation of MD5.
+Because of this it is slow but it works without C code.")
+ (license license:perl-license)))
+
(define-public perl-digest-sha
(package
(name "perl-digest-sha")
@@ -4384,6 +4398,8 @@ errors are rethrown automatically.")
(,(getenv "PERL5LIB")
,(string-append out "/lib/perl5/site_perl"))))
#t))))))
+ (inputs
+ `(("bash" ,bash-minimal))) ; for wrap-program
(propagated-inputs
(list perl-moo perl-strictures))
(home-page "https://metacpan.org/release/Eval-WithLexicals")
@@ -5688,16 +5704,16 @@ for immediate access from Perl.")
(define-public perl-inline-c
(package
(name "perl-inline-c")
- (version "0.81")
+ (version "0.82_001")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://cpan/authors/id/T/TI/TINITA/Inline-C-"
+ "mirror://cpan/authors/id/E/ET/ETJ/Inline-C-"
version ".tar.gz"))
(sha256
(base32
- "1b3sr39813di3j1kwbgn1xq2z726rhjjdw809ydzgmshj26jb1gi"))))
+ "1njzhvid1g08yhqynv26hpw8d0gpb99m7v96zqk0rwxlywy61hc3"))))
(build-system perl-build-system)
(arguments
`(#:phases
@@ -6856,6 +6872,46 @@ from various sources. For instance, it contains all IANA types and the
knowledge of Apache.")
(license (package-license perl))))
+(define-public perl-minimumversion
+ (package
+ (name "perl-minimumversion")
+ (version "1.40")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "145yl4qv14xcrr74w1qvdb6s0h5lj8smnfawfnj0rmv0rdwab2bm"))))
+ (build-system perl-build-system)
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-programs
+ (lambda _
+ (wrap-program (string-append #$output "/bin/perlver")
+ (list "PERL5LIB" ":"
+ 'prefix
+ (list (string-append (getenv "PERL5LIB") ":"
+ #$output
+ "/lib/perl5/site_perl")))))))))
+ (inputs (list bash-minimal))
+ (propagated-inputs (list perl-file-find-rule
+ perl-file-find-rule-perl
+ perl-params-util
+ perl-ppi
+ perl-ppix-regexp
+ perl-ppix-utils))
+ (home-page "https://metacpan.org/release/Perl-MinimumVersion")
+ (synopsis "Find a minimum required version of perl for Perl code")
+ (description
+ "@samp{Perl::MinimumVersion} takes Perl source code and calculates the minimum
+version of perl required to be able to run it. Because it is based on the @samp{PPI}
+(Perl Parsing Interface), it can do this without loading the code. The distribution
+comes with a script called @samp{perlver}.")
+ (license license:perl-license)))
+
(define-public perl-mixin-linewise
(package
(name "perl-mixin-linewise")
@@ -9127,6 +9183,28 @@ replacing the \"@code{PPI}\" at the front of the module name with
in @code{PPIx::Utilities::Node}.")
(license license:perl-license)))
+(define-public perl-ppix-utils
+ (package
+ (name "perl-ppix-utils")
+ (version "0.003")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "04dszlp7yas3yi7gm1l2g47h88i52n7gwj3jnq0vw0xdivycr6ra"))))
+ (build-system perl-build-system)
+ (propagated-inputs (list perl-b-keywords perl-ppi))
+ (home-page "https://metacpan.org/release/PPIx-Utils")
+ (synopsis "Utility functions for Perl PPI")
+ (description
+ "@samp{PPIx::Utils} is a collection of utility functions for working
+with @samp{PPI} documents. The functions are organized into
+submodules, and may be imported from the appropriate submodules or via
+this module.")
+ (license license:perl-license)))
+
(define-public perl-probe-perl
(package
(name "perl-probe-perl")
@@ -9618,6 +9696,50 @@ straightforward and (perhaps someday) standard way. Spiffy borrows ideas from
other OO languages like Python, Ruby, Java and Perl 6.")
(license (package-license perl))))
+(define-public perl-spreadsheet-parseexcel
+ (package
+ (name "perl-spreadsheet-parseexcel")
+ (version "0.66")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0nzn8n928720lyv61nbd02d87xi5pfs77nhv0pf031lqpb7nmmxz"))))
+ (build-system perl-build-system)
+ (propagated-inputs (list perl-crypt-rc4
+ perl-digest-perl-md5
+ perl-io-stringy
+ perl-ole-storage-lite
+ perl-scalar-list-utils))
+ (home-page "https://metacpan.org/release/Spreadsheet-ParseExcel")
+ (synopsis "Read information from an Excel file")
+ (description "This @code{Spreadsheet::ParseExcel} module parses Microsoft
+Excel95, 97 and 2000 format files.")
+ (license license:perl-license)))
+
+(define-public perl-spreadsheet-xlsx
+ (package
+ (name "perl-spreadsheet-xlsx")
+ (version "0.17")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://cpan/authors/id/A/AS/ASB/Spreadsheet-XLSX-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0xp9rqm0j1a6pr2zxk9c1mk720vbd72bhkmpcn8305pzgj97idrk"))))
+ (build-system perl-build-system)
+ (native-inputs (list perl-test-nowarnings perl-test-warnings))
+ (propagated-inputs (list perl-archive-zip perl-spreadsheet-parseexcel))
+ (home-page "https://metacpan.org/release/Spreadsheet-XLSX")
+ (synopsis "Perl extension for reading MS Excel 2007 files")
+ (description "This module implements @code{Spreadsheet::XLSX} parsing
+Microsoft Excel 2007 xlsx files.")
+ (license license:perl-license)))
+
(define-public perl-want
(package
(name "perl-want")
@@ -9967,6 +10089,26 @@ that they won't be changed.")
a functional interface.")
(license (package-license perl))))
+(define-public perl-string-util
+ (package
+ (name "perl-string-util")
+ (version "1.34")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "0sf44mky5kawj9jnf0zpv688wchr5ab5s5gs45jyahakcv6yi71i"))))
+ (build-system perl-build-system)
+ (native-inputs (list perl-module-build-tiny))
+ (home-page "https://metacpan.org/release/String-Util")
+ (synopsis "String processing utility functions")
+ (description "A @code{String::Util} module of small, handy functions for
+processing strings in various ways.")
+ (license license:perl-license)))
+
(define-public perl-sub-exporter
(package
(name "perl-sub-exporter")
@@ -10098,6 +10240,26 @@ specification is omitted in the name, then the current package is used. The
return value is the sub.")
(license (package-license perl))))
+(define-public perl-sub-override
+ (package
+ (name "perl-sub-override")
+ (version "0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://cpan.metacpan.org/authors/id/O/OV/OVID/Sub-Override-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0ixbaxhnicx90483rqhcz5dzqzxfwjxf2crghw3lgmasairwr3bd"))))
+ (native-inputs `(("perl-test-fatal" ,perl-test-fatal)))
+ (build-system perl-build-system)
+ (home-page "https://metacpan.org/release/Sub-Override")
+ (synopsis "Perl extension to override a subroutine")
+ (description "A @code{Sub::Override}} module that makes it easy to override
++subroutines. Particularly useful for mocking in tests.")
+ (license (package-license perl))))
+
(define-public perl-sub-quote
(package
(name "perl-sub-quote")
@@ -12197,6 +12359,8 @@ spirit of both the SDL and Perl.")
(wrap-program "bin/sgmlspl"
`("PERL5LIB" suffix (,site))))
#t))))))
+ (inputs
+ `(("bash" ,bash-minimal))) ; for wrap-program
(native-inputs
(list perl-module-build))
(home-page "https://metacpan.org/release/RAAB/SGMLSpm-1.1")
diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm
index df9b369506..d6c0f03d01 100644
--- a/gnu/packages/phabricator.scm
+++ b/gnu/packages/phabricator.scm
@@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages phabricator)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages php)
#:use-module (gnu packages version-control)
#:use-module (guix build-system gnu)
@@ -64,7 +65,7 @@
(string-append (assoc-ref %build-inputs i) "/bin"))
'("php" "git" "mercurial" "subversion")))))))))))
(inputs
- (list php git mercurial subversion))
+ (list bash-minimal php git mercurial subversion))
(home-page "https://github.com/phacility/arcanist")
(synopsis "Command-line interface for Phabricator")
(description
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 1018d2e801..96f5bbec50 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -2,16 +2,18 @@
;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016-2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2019, 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020. 2021, 2022, 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; 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.
;;;
@@ -116,7 +118,8 @@
(native-inputs
(list file intltool gobject-introspection))
(inputs
- `(("gdk-pixbuf" ,gdk-pixbuf)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("gdk-pixbuf" ,gdk-pixbuf)
("gexiv2" ,gexiv2)
("gst-libav" ,gst-libav)
("gst-plugins-base" ,gst-plugins-base)
@@ -186,14 +189,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))
@@ -330,6 +333,7 @@ MTP, and much more.")
(lib (dirname (dirname (car pm)))))
(wrap-program (string-append #$output "/bin/exiftool")
`("PERL5LIB" prefix (,lib)))))))))
+ (inputs (list bash-minimal))
(home-page "https://metacpan.org/release/Image-ExifTool")
(synopsis "Program and Perl library to manipulate EXIF and other metadata")
(description "This package provides the @code{exiftool} command and the
@@ -398,7 +402,7 @@ overlapping images, as well as some command line tools.")
graphviz-minimal ; for 'dot'
font-ghostscript
imagemagick/stable
- librsvg
+ (librsvg-for-system)
m4
perl-readonly
texlive-texloganalyser
@@ -530,7 +534,7 @@ photographic equipment.")
(define-public darktable
(package
(name "darktable")
- (version "4.6.1")
+ (version "4.8.1")
(source
(origin
(method url-fetch)
@@ -538,7 +542,7 @@ photographic equipment.")
"https://github.com/darktable-org/darktable/releases/"
"download/release-" version "/darktable-" version ".tar.xz"))
(sha256
- (base32 "1zbsrx5cfyifzbi657izw8rfkgd9pm4hx8afv8y2sgi9f2hc1v8n"))))
+ (base32 "14armww5rmbgqssm8c3xji5i6ccdzgnn0k6zkxhvhvykmqn0w6wh"))))
(build-system cmake-build-system)
(arguments
(list
@@ -720,13 +724,14 @@ such as Batch image processing.")
gettext-minimal
`(,glib "bin")
gobject-introspection
- gtk-doc
+ gtk-doc/stable
itstool
libxml2
perl
pkg-config))
(inputs
- (list gdk-pixbuf
+ (list bash-minimal
+ gdk-pixbuf
gexiv2
gst-plugins-base
gstreamer
@@ -818,14 +823,14 @@ a complete panorama and stitch any series of overlapping pictures.")
(define-public rawtherapee
(package
(name "rawtherapee")
- (version "5.9")
+ (version "5.10")
(source (origin
(method url-fetch)
(uri (string-append "https://rawtherapee.com/shared/source/"
"rawtherapee-" version ".tar.xz"))
(sha256
(base32
- "08s81mxnrj183bss2rb0hac1qyn7bmcnk3x2ymg1cp0q5322ibwf"))))
+ "1nnjxc6xyfn1biys5hynsd21rny5r7zl5qvr2hhlmfjdslybb6d7"))))
(build-system cmake-build-system)
(arguments
(list
@@ -848,6 +853,7 @@ a complete panorama and stitch any series of overlapping pictures.")
(list pkg-config))
(inputs
(list expat
+ exiv2
fftwf
glib
glibmm
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 72201770c7..8f879dbdca 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -62,7 +62,7 @@
(define-public php
(package
(name "php")
- (version "8.3.6")
+ (version "8.3.10")
(home-page "https://www.php.net/")
(source (origin
(method url-fetch)
@@ -70,7 +70,7 @@
"php-" version ".tar.xz"))
(sha256
(base32
- "1bjygxjaqmvccyk4ic3lrca5j34f0pjb6f1ldmi9gbr345mkij2k"))
+ "13cpl7983wss2462cr75kzcs7349ix1c7jqj39iyf7wk02figwm0"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "ext"
diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm
index 0b16299482..326520adf3 100644
--- a/gnu/packages/piet.scm
+++ b/gnu/packages/piet.scm
@@ -25,6 +25,7 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages gd)
#:use-module (gnu packages groff)
#:use-module (gnu packages image)
@@ -56,8 +57,7 @@
(,(dirname
(search-input-file
inputs "bin/wish")))))))))))
- (inputs
- (list gd giflib libpng tk))
+ (inputs (list bash-minimal gd giflib libpng tk))
(native-inputs (list groff))
(synopsis "Piet interpreter")
(description
@@ -94,8 +94,7 @@ an Algol-like language
(snippet
'(begin
;; Remove a bundled fork of Marc Majcher's Piet interpreter.
- (delete-file-recursively "interpreter")
- #t))))
+ (delete-file-recursively "interpreter")))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -126,8 +125,7 @@ an Algol-like language
(string-append doc "/" file)))
(list "assembler-samples"
"compiler-samples"
- "README.md")) ; includes the licence grant
- #t)))
+ "README.md"))))) ;includes the licence grant
(add-after 'install 'check
(lambda* (#:key outputs tests? #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -149,13 +147,9 @@ an Algol-like language
;; Don't run the interactive one.
(delete-file "assembler-samples/quest.piet.png")
(for-each (cut invoke "npiet" <>)
- (find-files "." "\\.png$"))
- #t)))))))
- (native-inputs
- ;; For our tests.
- (list netpbm npiet))
- (inputs
- (list perl perl-parse-recdescent))
+ (find-files "." "\\.png$")))))))))
+ (native-inputs (list netpbm npiet)) ;for tests
+ (inputs (list bash-minimal perl perl-parse-recdescent))
(home-page "https://www.toothycat.net/wiki/wiki.pl?MoonShadow/Piet")
(synopsis "Piet compiler and assembler")
(description
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index 6292fb05e2..d5655bd893 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
@@ -29,6 +29,13 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages bash)
+
+ ;; Note: Because this module defines the 'pkg-config' macro, it cannot be
+ ;; caught in a cycle with other package modules or the macro wouldn't be
+ ;; visible at the time those other modules are compiled. To fulfill that
+ ;; constraint, load (gnu packages check) lazily.
+ #:autoload (gnu packages check) (atf kyua)
+
#:use-module (guix memoization)
#:export (pkg-config))
@@ -172,16 +179,23 @@ exec ~a \"$@\""
(define-public pkgconf
(package
(name "pkgconf")
- (version "2.0.2")
+ (version "2.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://distfiles.dereferenced.org/"
name "/" name "-" version ".tar.xz"))
(sha256
(base32
- "00a4cv1f8cxsb4jhpgxxrwrl92b1zdsirqn0gqvva7i5izpjanpa"))))
+ "0qbpczwrrsq2981mdv3iil26vq9ac8v1sfi9233jpiaixrhmhv96"))))
(build-system gnu-build-system)
- (arguments (list #:tests? #f)) ;TODO: package kyua
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-HOME
+ (lambda _
+ ;; Kyua requires a writable HOME.
+ (setenv "HOME" "/tmp"))))))
+ (native-inputs (list atf kyua))
+ (native-search-paths (list $PKG_CONFIG_PATH))
(home-page "http://pkgconf.org/")
(synopsis "Package compiler and linker metadata toolkit")
(description "@command{pkgconf} is a program which helps to configure
diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm
index b2d8d75471..cb170c76ac 100644
--- a/gnu/packages/plan9.scm
+++ b/gnu/packages/plan9.scm
@@ -26,17 +26,20 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages base)
#: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 +48,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 +74,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")
@@ -162,7 +179,9 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.")
fontconfig libx11 libxext libxt))
;; Propagate gcc-toolchain because some programs, like the 9c compiler,
;; are just aliased scripts to gcc equivalents.
- (propagated-inputs (list gcc-toolchain))
+ (propagated-inputs (list (module-ref (resolve-interface
+ '(gnu packages commencement))
+ 'gcc-toolchain)))
(home-page "https://9fans.github.io/plan9port/")
(synopsis "Port of many Plan 9 libraries and programs")
(description
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index c7d4b15c4a..d5b2f0d9fa 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -67,14 +67,14 @@
(define-public asymptote
(package
(name "asymptote")
- (version "2.89")
+ (version "2.91")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz"))
(sha256
- (base32 "0nvzlnabxjn74ybv3jns9vsr33prlvlg3i20hskz31agxss64kpn"))
+ (base32 "0562lfkh9i9zkqyizl6qzggrxhylnihi30lwadkbggplrdgb48za"))
(modules '((guix build utils)))
(snippet
;; Remove bundled RapidJSON.
@@ -108,7 +108,8 @@
texlive-ocgx2
texlive-parskip
texlive-pdftexcmds
- texlive-texinfo))))
+ texlive-texinfo
+ texlive-type1cm))))
(inputs
(list bash-minimal
eigen
@@ -131,7 +132,7 @@
(guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-utils))
#:configure-flags
#~(list (string-append "--enable-gc=" #$(this-package-input "libgc"))
@@ -262,7 +263,7 @@ using the Cairo drawing library.")
(build-system gnu-build-system)
(arguments
`(#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
(guix build gnu-build-system)
@@ -342,8 +343,7 @@ went to university in the 1990s, this is the library for you.")
;; Allow them to be found.
(wrap-program (string-append bin "/pl")
`("PLOTICUS_PREFABS" ":" = (,dir)))))))))
- (inputs
- (list libpng libx11 zlib))
+ (inputs (list bash-minimal libpng libx11 zlib))
(home-page "https://ploticus.sourceforge.net/")
(synopsis "Command-line tool for producing plots and charts")
(description
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 337d9b9a73..883688a7af 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -153,7 +153,6 @@
`(,glib "bin") ;for glib-mkenums
docbook-xsl ;for man page generation
gobject-introspection
- libxml2 ;for XML_CATALOG_FILES
libxslt ;for man page generation
perl
pkg-config
@@ -171,30 +170,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 +200,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 43d9ea6647..9f6b48f890 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
@@ -444,6 +430,64 @@ Python code.")))
as a theory to clingo from Python code. It also supports running clingo-dl
directly from the python command line.")))
+(define-public python-clingox
+ (package
+ (name "python-clingox")
+ (version "1.2.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/potassco/python-clingox")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ji0sdqlv0byxmdipwk60afsb82r0rr1j73r7j2508hsfk94m2i8"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-clingo))
+ (home-page "https://potassco.org/clingo")
+ (synopsis "Auxiliary functions for Clingo")
+ (description "This package provides additional functions to go along with
+the Python bindings for Clingo.")
+ (license license:expat)))
+
+(define-public python-asprin
+ (let ((revision "1")
+ (commit "bc5a0cf7d9ba346cf91cba66282b5946dbf1331c"))
+ (package
+ (name "python-asprin")
+ (version (git-version "3.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/potassco/asprin")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0rf8yjdlpkvzp9917fvhfrrzag47vvfm7j2k5g44w1ggqyrz8fps"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-source
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "asprin/src/solver/metasp/reify.py"
+ (("\"clingo\"")
+ (string-append "\""
+ (search-input-file inputs "bin/clingo")
+ "\""))))))))
+ (inputs (list clingo))
+ (propagated-inputs (list python-clingo))
+ (home-page "https://potassco.org/")
+ (synopsis "Optimization in Answer Set Programming")
+ (description "@command{asprin} is a general framework for optimization in
+@acronym{ASP, Answer Set Programming}, that allows for computing optimal
+stable models of logic programs by means of preferences. Some preference types
+are already predefined, but more can be added as logic programs.")
+ (license license:expat))))
+
(define-public python-clorm
(package
(name "python-clorm")
@@ -465,10 +509,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")
@@ -612,3 +653,28 @@ as logic programs.")
(description "Clinguin is a graphical user interface toolkit for clingo,
which allows user interfaces to be specified entirely as a logic program.")
(license license:expat)))
+
+(define-public python-clintest
+ (package
+ (name "python-clintest")
+ (version "0.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/potassco/clintest")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xzbby9ram55h87ykm652kgm45b8rlhbjc8gjkz308h1jnjllmmy"))))
+ (build-system pyproject-build-system)
+ (inputs (list python-clingo))
+ (native-inputs (list python-pytest))
+ (home-page "https://potassco.org/clintest/")
+ (synopsis "Test framework for clingo programs")
+ (description "Clintest is a framework for unit testing clingo programs.
+It provides various components to assemble the most commonly used tests quickly,
+but also works fine along custom-built test. Clintest monitors the test
+outcome while solving to abort the search for solutions once the outcome is
+certain.")
+ (license license:expat)))
diff --git a/gnu/packages/presentation.scm b/gnu/packages/presentation.scm
index 1472a2fcc1..cc02a7eac9 100644
--- a/gnu/packages/presentation.scm
+++ b/gnu/packages/presentation.scm
@@ -21,6 +21,7 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system python)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages figlet)
#:use-module (gnu packages games)
#:use-module (gnu packages image)
@@ -77,7 +78,8 @@
;; XXX: console import test fails to find palette.py from the lib?
(delete 'sanity-check))))
(inputs
- (list cowsay
+ (list bash-minimal
+ cowsay
figlet
jp2a
python-docutils
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 7eae40a220..d8ff1664b4 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2024 chris <chris@bumblehead.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -304,7 +305,7 @@ a fast alternative to @code{IOStreams}.")
;; The ctags that comes with emacs does not support the --excmd options,
;; so can't be used
(inputs
- (list boost))
+ (list boost-for-source-highlight))
(native-inputs
(list bison flex))
(arguments
@@ -352,93 +353,93 @@ seen in a terminal.")
(define-public highlight
(package
(name "highlight")
- (version "4.8")
+ (version "4.11")
(outputs (list "out" "gui"))
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.andre-simon.de/zip/highlight-"
- version ".tar.bz2"))
- (sha256
- (base32
- "1iggdw4c8pfz1z1c51fyd6x79y1mnc82b6lfkg3vbb44739m5cjs"))
- (patches (search-patches "highlight-gui-data-dir.patch"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/saalen/highlight")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xb9jm7249qnbain4l94nakgxsmia4w4x246dagr669fkmffcdmg"))
+ (patches (search-patches "highlight-gui-data-dir.patch"))))
(build-system gnu-build-system)
(arguments
- (list #:tests? #f ;no tests
- #:make-flags #~(let ((confdir (string-append %output
- "/share/highlight/config/")))
- (list (string-append "PREFIX=" %output)
- (string-append "HL_CONFIG_DIR=" confdir)
- (string-append "conf_dir=" confdir)))
- #:phases #~(modify-phases %standard-phases
- (delete 'configure) ;no configure script
- (add-after 'unpack 'fix-search-for-lua
- (lambda _
- (let ((ver #$(version-major+minor (package-version
- lua))))
- (substitute* "src/makefile"
- (("(LUA_PKG_NAME=).*" _ assignment)
- (string-append assignment "lua-" ver "\n")))
- (substitute* "src/gui-qt/highlight.pro"
- (("(PKGCONFIG \\+= lua)" _ assignment)
- (string-append assignment "-" ver)))
- (substitute* "extras/swig/makefile"
- (("lua")
- (string-append "lua-" ver))))))
- (add-after 'build 'build-gui
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (data (string-append out
- "/share/highlight/"))
- (conf (string-append out "/etc/highlight/"))
- (doc (string-append out
- "/share/doc/highlight/"))
- (gui (assoc-ref outputs "gui"))
- (gui-data (string-append gui
- "/share/highlight/")))
- ;; modified version of gui task in makefile
- (invoke "make"
- "-C"
- "./src"
- "-f"
- "./makefile"
- (string-append "HL_DATA_DIR=" data)
- (string-append "HL_CONFIG_DIR=" conf)
- (string-append "HL_DOC_DIR=" doc)
- (string-append "GUI_DATA_DIR=" gui-data)
- "gui-qt"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "make" "install"
- (string-append "PREFIX=" out)))))
- (add-after 'install 'install-perl-bindings
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (data (string-append out
- "/share/highlight/"))
- (conf (string-append out "/etc/highlight/"))
- (perldir (string-append out
- "/lib/perl5/site_perl/"
- #$(package-version perl)))
- (autodir (string-append perldir
- "/auto/highlight")))
- (with-directory-excursion "extras/swig"
- (invoke "make" "perl"
- (string-append "hl_data_dir=" data)
- (string-append "hl_conf_dir=" conf))
- (invoke "perl" "-I" "." "testmod.pl")
- (install-file "highlight.pm" perldir)
- (install-file "highlight.so" autodir)))))
- (add-after 'install 'install-gui
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((gui (assoc-ref outputs "gui")))
- (mkdir-p (string-append gui "/bin"))
- (invoke "make" "install-gui"
- (string-append "PREFIX=" gui))))))))
+ (list
+ #:tests? #f ;no tests
+ #:make-flags #~(let ((confdir (string-append #$output
+ "/share/highlight/config/")))
+ (list (string-append "PREFIX=" #$output)
+ (string-append "HL_CONFIG_DIR=" confdir)
+ (string-append "conf_dir=" confdir)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'fix-search-for-lua
+ (lambda _
+ (let ((ver #$(version-major+minor
+ (package-version (this-package-input "lua")))))
+ (substitute* "src/makefile"
+ (("(LUA_PKG_NAME=).*" _ assignment)
+ (string-append assignment "lua-" ver "\n")))
+ (substitute* "src/gui-qt/highlight.pro"
+ (("(PKGCONFIG \\+= lua)" _ assignment)
+ (string-append assignment "-" ver)))
+ (substitute* "extras/swig/makefile"
+ (("lua")
+ (string-append "lua-" ver))))))
+ (add-after 'build 'build-gui
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (data (string-append out "/share/highlight/"))
+ (conf (string-append out "/etc/highlight/"))
+ (doc (string-append out "/share/doc/highlight/"))
+ (gui (assoc-ref outputs "gui"))
+ (gui-data (string-append gui "/share/highlight/")))
+ ;; modified version of gui task in makefile
+ (invoke "make"
+ "-C"
+ "./src"
+ "-f"
+ "./makefile"
+ (string-append "HL_DATA_DIR=" data)
+ (string-append "HL_CONFIG_DIR=" conf)
+ (string-append "HL_DOC_DIR=" doc)
+ (string-append "GUI_DATA_DIR=" gui-data)
+ "gui-qt"))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "make" "install"
+ (string-append "PREFIX=" out)))))
+ (add-after 'install 'install-perl-bindings
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (data (string-append out "/share/highlight/"))
+ (conf (string-append out "/etc/highlight/"))
+ (perldir (string-append out
+ "/lib/perl5/site_perl/"
+ #$(package-version
+ (this-package-input "perl"))))
+ (autodir (string-append perldir
+ "/auto/highlight")))
+ (with-directory-excursion "extras/swig"
+ (invoke "make" "perl"
+ (string-append "hl_data_dir=" data)
+ (string-append "hl_conf_dir=" conf))
+ (invoke "perl" "-I" "." "testmod.pl")
+ (install-file "highlight.pm" perldir)
+ (install-file "highlight.so" autodir)))))
+ (add-after 'install 'install-gui
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((gui (assoc-ref outputs "gui")))
+ (mkdir-p (string-append gui "/bin"))
+ (invoke "make" "install-gui"
+ (string-append "PREFIX=" gui))))))))
(inputs (list lua boost perl qtbase-5))
(native-inputs (list pkg-config swig))
- (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php")
+ (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.html")
(synopsis "Convert code to documents with syntax highlighting")
(description
"Highlight converts source code to HTML, XHTML, RTF, LaTeX,
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index a969823374..ef796dc0b8 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -2,8 +2,9 @@
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2024 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,8 +33,10 @@
#:use-module (gnu packages backup)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages image)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages perl)
@@ -41,6 +44,9 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages valgrind)
+ #:use-module (gnu packages version-control)
+ #:use-module (gnu packages vim)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
@@ -87,7 +93,7 @@ manner. It also features an interactive interpreter.")
(define-public swi-prolog
(package
(name "swi-prolog")
- (version "8.5.20")
+ (version "9.3.8")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -97,7 +103,7 @@ manner. It also features an interactive interpreter.")
(file-name (git-file-name name version))
(sha256
(base32
- "0vwxk5fy2mxj6538knkqvqhwy1674xh2zkdqdmbzkxf6mj969d7m"))))
+ "1q2dg7n3vf0qc9nxppbcqgbzj4rcjw8sv2vbg9s6i4ixxlsxr5y3"))))
(build-system cmake-build-system)
(arguments
`(#:parallel-build? #t
@@ -161,6 +167,7 @@ the same word size"))
("libarchive" ,libarchive)
("libunwind" ,libunwind)
("libjpeg" ,libjpeg-turbo)
+ ("libxcrypt" ,libxcrypt)
("libxft" ,libxft)
("fontconfig" ,fontconfig)
("openssl" ,openssl)))
@@ -172,16 +179,62 @@ small environment which enables substantial applications to be developed with
it.")
(license license:bsd-2)))
+(define-public trealla
+ (package
+ (name "trealla")
+ (version "2.55.32")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/trealla-prolog/trealla")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0mx87i03x8qxsrlsvxpazpn28jna48sgjla78sgjl3lr04pw9z1j"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (append
+ (if (supported-package? valgrind)
+ (list valgrind)
+ '())
+ (list xxd)))
+ (inputs
+ (list libffi openssl readline))
+ (arguments
+ (list
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
+ #:test-target (if (this-package-native-input "valgrind")
+ "check"
+ "test")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Upstream does not use a configure script.
+ (delete 'configure)
+ (replace 'install
+ ;; Upstream does not provide an install target.
+ (lambda _
+ (install-file "tpl" (string-append #$output "/bin")))))))
+ (home-page "https://trealla-prolog.org/")
+ (synopsis "Compact and efficient Prolog interpreter")
+ (description "This package provides a compact and efficient Prolog
+interpreter with ISO Prolog aspirations.")
+ (license
+ (list license:expat
+ ;; The tiny-regex-c library uses the Unlicense license.
+ license:unlicense))))
+
(define-public logtalk
(package
(name "logtalk")
- (version "3.75.0")
+ (version "3.80.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://logtalk.org/files/logtalk-"
version ".tar.bz2"))
- (sha256 (base32 "0w35br03l307wk2fwh67rybqjgvjlwpy9j5r4c3pkrywd7lhrc54"))))
+ (sha256 (base32 "0g4cc0qv921234548k3rkv1sdayicaa6zzh15vgn82ri9apwm3nh"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no tests
diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm
new file mode 100644
index 0000000000..71b4646f6a
--- /dev/null
+++ b/gnu/packages/prometheus.scm
@@ -0,0 +1,519 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2024 Dominic Martinez <dom@dominicm.dev>
+;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.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 packages prometheus)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
+ #:use-module (gnu packages golang-web)
+ #:use-module (gnu packages golang-xyz))
+
+;;; Commentary:
+;;;
+;;; Libraries and commands related to, or provided by Prometheus project
+;;; <https://prometheus.io>.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; Libraries:
+;;;
+
+(define-public go-github-com-mwitkow-go-conntrack
+ (package
+ (name "go-github-com-mwitkow-go-conntrack")
+ (version "0.0.0-20190716064945-2f068394615f")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mwitkow/go-conntrack")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ymjmy12ks7smgwmrwsa5kf07d9w5kpk1dn650azlzr61b561aw7"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:import-path "github.com/mwitkow/go-conntrack"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Breaking cycle:
+ ;; go-github-com-prometheus-common ->
+ ;; go-github-com-prometheus-client-golang ->
+ ;; go-github-com-mwitkow-go-conntrack ->
+ ;; go-github-com-prometheus-common
+ (delete 'build))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-jpillora-backoff
+ go-github-com-munnerz-goautoneg
+ ;; go-github-com-prometheus-client-golang
+ go-golang-org-x-net))
+ (home-page "https://github.com/mwitkow/go-conntrack")
+ (synopsis "Go middleware for @code{net.Conn} tracking")
+ (description
+ "@url{https://prometheus.io/,Prometheus} monitoring and
+@url{https://godoc.org/golang.org/x/net/trace#@code{EventLog,(code}
+x/net/trace)} tracing wrappers @code{net.Conn}, both inbound
+(@@code{net.Listener}) and outbound (@@code{net.Dialer}).")
+ (license license:asl2.0)))
+
+(define-public go-github-com-nbrownus-go-metrics-prometheus
+ (package
+ (name "go-github-com-nbrownus-go-metrics-prometheus")
+ (version "0.0.0-20210712211119-974a6260965f")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nbrownus/go-metrics-prometheus")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; The project looks abandoned, tests failed with a new go-metrics, see
+ ;; <https://github.com/nbrownus/go-metrics-prometheus/pull/2>.
+ #:tests? #f
+ #:import-path "github.com/nbrownus/go-metrics-prometheus"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-prometheus-client-golang
+ go-github-com-rcrowley-go-metrics))
+ (home-page "https://github.com/nbrownus/go-metrics-prometheus")
+ (synopsis "Prometheus support for go-metrics")
+ (description
+ "This package provides a reporter for the @code{go-metrics} library which
+posts the metrics to the Prometheus client registry and just updates the
+registry.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-client-golang
+ (package
+ (name "go-github-com-prometheus-client-golang")
+ (version "1.19.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/client_golang")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: Check if the most of the tests may be enabled:
+ ;; api/prometheus/v1/api_test.go:1063:23: cannot use 1634644800304
+ ;; (untyped int constant) as int value in map literal (overflows)
+ #:tests? (target-64bit?)
+ #:import-path "github.com/prometheus/client_golang"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples-and-tutorials
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (for-each delete-file-recursively
+ (list "api/prometheus/v1/example_test.go"
+ "examples"
+ "tutorial")))))
+ ;; 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-beorn7-perks
+ go-github-com-cespare-xxhash-v2
+ go-github-com-davecgh-go-spew
+ go-github-com-json-iterator-go
+ go-github-com-prometheus-client-model
+ go-github-com-prometheus-common
+ go-github-com-prometheus-procfs
+ go-golang-org-x-sys
+ go-google-golang-org-protobuf))
+ (home-page "https://github.com/prometheus/client_golang")
+ (synopsis "HTTP server and client tools for Prometheus")
+ (description
+ "This package @code{promhttp} provides HTTP client and server tools for
+Prometheus metrics.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-client-model
+ (package
+ (name "go-github-com-prometheus-client-model")
+ (version "0.6.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/client_model")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g1q2szzwp4rwkvayi2mnq2nwj6hj4ja7j43vwyi1iaz6d9z505c"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/client_model"
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (propagated-inputs
+ (list go-github-com-golang-protobuf))
+ (home-page "https://github.com/prometheus/client_model")
+ (synopsis "Data model artifacts for Prometheus")
+ (description
+ "This package provides data model artifacts for Prometheus.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-common
+ (package
+ (name "go-github-com-prometheus-common")
+ (version "0.55.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/common")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Submodules with their own go.mod files and packed as
+ ;; separated packages:
+ ;;
+ ;; - github.com/prometheus/common/assets
+ ;; - github.com/prometheus/common/sigv4
+ (for-each delete-file-recursively
+ (list "assets" "sigv4"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/common"
+ #: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"
+ ;; Skipp, as it requires
+ ;; <github.com/prometheus/client_golang/prometheus>,
+ ;; which introduces cycle.
+ ;; "./config/..."
+
+ ;; Some tests fail on non x86_64 architecture:
+ ;; Cannot use 9223372036 (untyped int constant) as int
+ ;; value in ;; struct literal (overflows).
+ ;; Cannot use math.MaxInt64
+ ;; (untyped int constant 9223372036854775807) as int value
+ ;; in argument to HumanizeTimestamp (overflows)
+ #$@(if (target-x86-64?)
+ '("./helpers/...")
+ '())
+ "./expfmt/..."
+ "./model/..."
+ "./promlog/..."
+ "./route/..."
+ "./server/..."))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-alecthomas-kingpin-v2
+ go-github-com-go-kit-log
+ go-github-com-google-go-cmp
+ go-github-com-julienschmidt-httprouter
+ go-github-com-munnerz-goautoneg
+ go-github-com-mwitkow-go-conntrack
+ go-github-com-prometheus-client-model
+ go-golang-org-x-net
+ go-golang-org-x-oauth2
+ go-google-golang-org-protobuf
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/prometheus/common")
+ (synopsis "Prometheus metrics")
+ (description
+ "This package provides tools for reading and writing Prometheus
+metrics.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-common-assets
+ (package
+ (name "go-github-com-prometheus-common-assets")
+ (version "0.55.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/common")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/common/assets"
+ #:unpack-path "github.com/prometheus/common"))
+ (home-page "https://github.com/prometheus/common")
+ (synopsis "Prometheus assets")
+ (description
+ "This package provides Prometheus assets.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-common-sigv4
+ (package
+ (name "go-github-com-prometheus-common-sigv4")
+ (version "0.55.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/common")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/common/sigv4"
+ #:unpack-path "github.com/prometheus/common"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'unpack 'override-prometheus-common
+ (lambda _
+ (delete-file-recursively "src/github.com/prometheus/common"))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (propagated-inputs
+ (list go-github-com-aws-aws-sdk-go
+ go-github-com-prometheus-client-golang
+ go-github-com-prometheus-common
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/prometheus/common")
+ (synopsis "HTTP signed requests with Amazon's Signature Verification V4")
+ (description
+ "This package provides a @code{http.RoundTripper} that will sign requests
+using Amazon's Signature Verification V4 signing procedure, using credentials
+from the default AWS credential chain.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-exporter-toolkit
+ (package
+ (name "go-github-com-prometheus-exporter-toolkit")
+ (version "0.11.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/exporter-toolkit")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1n46jw3b13g355iv8phxxnnci7a877y5dscc1rlj3rpz4vy6yfzx"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/exporter-toolkit"
+ #:phases
+ #~(modify-phases %standard-phases
+ (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 "." "\\_test.go$")
+ ;; Some tests require network set up.
+ (("TestServerBehaviour") "OffTestServerBehaviour")
+ (("TestConfigReloading") "OffTestConfigReloading")))))
+ ;; 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-alecthomas-kingpin-v2
+ go-github-com-coreos-go-systemd-v22
+ go-github-com-go-kit-log
+ ; Imported for go-github-com-prometheus-common to break the cycle.
+ go-github-com-prometheus-client-golang
+ go-github-com-prometheus-common
+ go-golang-org-x-crypto
+ go-golang-org-x-sync
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/prometheus/exporter-toolkit")
+ (synopsis "Utility package to build Prometheus exporters")
+ (description
+ "This package provides tooling to build Prometheus exporters")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-procfs
+ (package
+ (name "go-github-com-prometheus-procfs")
+ (version "0.15.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/procfs")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ ;; XXX: Check if the most of the tests may be enabled on non x86_64
+ ;; architectures, disable for now: ./proc_stat_test.go:98:49: cannot use
+ ;; math.MinInt64 (untyped int constant -9223372036854775808) as int
+ ;; value in struct literal (overflows).
+ #:tests? (target-x86-64?)
+ #:import-path "github.com/prometheus/procfs"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'unpack-testdata
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "./ttar" "-C" "testdata/" "-x" "-f" "testdata/fixtures.ttar"))))
+ ;; 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 'check 'remove-testdata
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (delete-file-recursively "testdata")))))))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp
+ go-golang-org-x-sync
+ go-golang-org-x-sys))
+ (synopsis "Go library for reading @file{/proc}")
+ (home-page "https://github.com/prometheus/procfs")
+ (description
+ "The @code{procfs} Go package provides functions to retrieve system,
+kernel, and process metrics from the @file{/proc} pseudo file system.")
+ (license license:asl2.0)))
+
+(define-public go-github-com-prometheus-statsd-exporter
+ (package
+ (name "go-github-com-prometheus-statsd-exporter")
+ (version "0.27.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/prometheus/statsd_exporter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y8n02h46q22wkcm2yy62bzsi9hxrarmvjamfpn2sygqhbb1pv38"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/prometheus/statsd_exporter"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; FIXME: pattern landing_page.css: cannot embed irregular file
+ ;; landing_page.css
+ ;;
+ ;; 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-prometheus-exporter-toolkit")
+ "/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-stvp-go-udp-testing))
+ (propagated-inputs
+ (list go-github-com-alecthomas-kingpin-v2
+ go-github-com-go-kit-log
+ go-github-com-golang-groupcache
+ go-github-com-prometheus-client-golang
+ go-github-com-prometheus-client-model
+ go-github-com-prometheus-common
+ go-github-com-prometheus-exporter-toolkit
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/prometheus/statsd_exporter")
+ (synopsis "StatsD to Prometheus metrics exporter")
+ (description
+ "The StatsD exporter is a drop-in replacement for
+@url{https://github.com/statsd/statsd,StatsD}. The exporter translates StatsD
+metrics to Prometheus metrics via configured mapping rules. This package
+provdies a Golang module and @code{statsd_exporter} executable command.")
+ (license license:asl2.0)))
+
+;;;
+;;; Executables:
+;;;
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetic order.
+;;;
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index d47b67fa61..b8679eff25 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -262,7 +262,17 @@ internal RPC protocols and file formats.")
"17rk42r3gcc46c2svd1mxs542wnl4mi77a6klkhg6wl1a36zmi2c"))))
(build-system gnu-build-system)
(inputs (list protobuf))
- (native-inputs (list pkg-config))
+ (native-inputs (append (if (%current-target-system)
+ (list protobuf)
+ '())
+ (list pkg-config)))
+ (arguments (if (%current-target-system)
+ (list #:configure-flags
+ #~(list
+ (string-append
+ "PROTOC="
+ (search-input-file %build-inputs "bin/protoc"))))
+ (list)))
(home-page "https://github.com/protobuf-c/protobuf-c")
(synopsis "Protocol Buffers implementation in C")
(description
diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm
index ef58ecbf82..245d6ca79c 100644
--- a/gnu/packages/purescript.scm
+++ b/gnu/packages/purescript.scm
@@ -109,7 +109,8 @@
(lambda _
(substitute* "purescript.cabal"
(("\\b(language-javascript|process)\\s+[^,]+" all dep)
- dep))))
+ dep)
+ (("happy:happy ==1.20.0") "happy:happy"))))
(add-after 'register 'remove-libraries
(lambda _
(delete-file-recursively
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 76e29b6c90..aeb088e75a 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Garek Dyszel <garekdyszel@disroot.org>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
-
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -87,6 +87,18 @@ Pytest but stripped of Pytest specific details.")
(home-page "https://pypi.org/project/pluggy/")
(license license:expat)))
+(define-public python-pluggy-next
+ (package/inherit python-pluggy
+ (name "python-pluggy")
+ (version "1.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pluggy" version))
+ (sha256
+ (base32 "1w8c3mpliqm9biqw75ci8cfj1x5pb6g5zwblqp27ijgxjj7aizrc"))))
+ (build-system pyproject-build-system)))
+
(define-public python-toml
(package
(name "python-toml")
@@ -252,6 +264,18 @@ Included are implementations of:
@end enumerate\n")
(license license:psfl)))
+(define-public python-typing-extensions-4.10
+ (package
+ (inherit python-typing-extensions)
+ (version "4.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "typing_extensions" version))
+ (sha256
+ (base32
+ "1jxkj4pni8pdyrn79sq441lsp40xzw363n0qvfc6zfcgkv4dgaxh"))))))
+
;;;
;;; Python builder packages.
@@ -260,36 +284,20 @@ Included are implementations of:
(package
(name "python-pip")
(version "23.1")
- (replacement python-pip/fixed)
(source
(origin
(method url-fetch)
(uri (pypi-uri "pip" version))
(sha256
(base32
- "0jnk639v9h7ghslm4jnlic6rj3v29nygflx1hgxxndg5gs4kk1a0"))))
- (build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; there are no tests in the pypi archive.
- (home-page "https://pip.pypa.io/")
- (synopsis "Package manager for Python software")
- (description
- "Pip is a package manager for Python software, that finds packages on the
-Python Package Index (PyPI).")
- (license license:expat)))
-
-(define python-pip/fixed
- (package
- (inherit python-pip)
- (source (origin
- (inherit (package-source python-pip))
- (snippet
- #~(begin
- (delete-file "src/pip/_vendor/certifi/cacert.pem")
- (delete-file "src/pip/_vendor/certifi/core.py")
- (with-output-to-file "src/pip/_vendor/certifi/core.py"
- (lambda _
- (display "\"\"\"
+ "0jnk639v9h7ghslm4jnlic6rj3v29nygflx1hgxxndg5gs4kk1a0"))
+ (snippet
+ #~(begin
+ (delete-file "src/pip/_vendor/certifi/cacert.pem")
+ (delete-file "src/pip/_vendor/certifi/core.py")
+ (with-output-to-file "src/pip/_vendor/certifi/core.py"
+ (lambda _
+ (display "\"\"\"
certifi.py
~~~~~~~~~~
This file is a Guix-specific version of core.py.
@@ -311,7 +319,16 @@ def where() -> str:
def contents() -> str:
with open(where(), \"r\", encoding=\"ascii\") as data:
- return data.read()")))))))))
+ return data.read()")))))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f)) ; there are no tests in the pypi archive.
+ (home-page "https://pip.pypa.io/")
+ (synopsis "Package manager for Python software")
+ (description
+ "Pip is a package manager for Python software, that finds packages on the
+Python Package Index (PyPI).")
+ (license license:expat)))
(define-public python-setuptools
(package
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 6fdfaad6fb..88729df594 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -13,12 +13,14 @@
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2021 Sebastian Gibb <mail@sebastiangibb.de>
;;; Copyright © 2022 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -43,6 +45,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages django)
#:use-module (gnu packages docker)
+ #:use-module (gnu packages jupyter)
#:use-module (gnu packages openstack)
#:use-module (gnu packages perl)
#:use-module (gnu packages python-build)
@@ -224,6 +227,48 @@ CSV output mode for Pytest. It can be enabled via the @option{--csv} option
it adds to the Pytest command line interface (CLI).")
(license license:gpl3+)))
+(define-public python-pytest-flakefinder
+ (package
+ (name "python-pytest-flakefinder")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-flakefinder" version))
+ (sha256
+ (base32 "03iy80xlkpgzjs2kxa9rrj8dbnp9awyhpcl3hy8fgf5x40cjlhg2"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-pytest))
+ (home-page "https://github.com/dropbox/pytest-flakefinder")
+ (synopsis "Pytest plugin for finding flaky tests")
+ (description "This package provides a Pytest plugin to run tests multiple
+times and detect flakyness.")
+ (license license:asl2.0)))
+
+(define-public python-pytest-shard
+ (let ((commit "64610a08dac6b0511b6d51cf895d0e1040d162ad")
+ (revision "0"))
+ (package
+ (name "python-pytest-shard")
+ (version (git-version "0.1.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AdamGleave/pytest-shard")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h31m68igz670bzl307hazjrfbr8pk14mxflllar18ydmlrnl677"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-pytest))
+ (home-page "https://github.com/AdamGleave/pytest-shard")
+ (synopsis "Pytest plugin for sharding tests")
+ (description "This package provides a Pytest extension for sharding
+tests at the granularity of individual test cases, which can be run in
+parallel and on multiple machines.")
+ (license license:expat))))
+
(define-public python-testfixtures
(package
(name "python-testfixtures")
@@ -654,6 +699,29 @@ your template is working as expected and takes care of cleaning up after
running the tests.")
(license license:expat)))
+(define-public python-pytest-datafiles
+ (package
+ (name "python-pytest-datafiles")
+ (version "3.0.0")
+ (source
+ (origin
+ (method git-fetch) ; no tests in the PyPI tarball
+ (uri (git-reference
+ (url "https://github.com/omarkohl/pytest-datafiles")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wbgfsn4pcdm0bw61pwaaq707mlfnixlff3x8m5mpsf6jhrzql30"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-pytest))
+ (home-page "https://github.com/omarkohl/pytest-datafiles")
+ (synopsis "Pytest plugin to create a tmpdir")
+ (description
+ "A pytest plugin to create a tmpdir containing a preconfigured set of
+files and/or directories.")
+ (license license:expat)))
+
(define-public python-pytest-doctestplus
(package
(name "python-pytest-doctestplus")
@@ -796,22 +864,14 @@ access to test session metadata.")
(define-public python-pytest-openfiles
(package
(name "python-pytest-openfiles")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "pytest-openfiles" version))
+ (uri (pypi-uri "pytest_openfiles" version))
(sha256
- (base32 "0n0a7fdc9m86360y96l23fvdmd6rw04bl6h5xqgl9qxfv08jk70p"))))
- (build-system python-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make the installed plugin discoverable by Pytest.
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "-vv"))))))
+ (base32 "14x9f1l9a5ghf527i5qfcfa003mkrky1dhx2hfwq5nma9v1n0lgz"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm python-pytest))
(propagated-inputs
@@ -1181,22 +1241,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
@@ -1265,16 +1320,19 @@ isort.")
(sha256
(base32
"0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list
+ #:test-flags
+ ;; This test is sensitive to generated terminal escape codes.
+ '(list "-k" "not test_pretty_formatter")
+ #:phases
+ '(modify-phases %standard-phases
(add-after 'unpack 'use-path-instead-of-path.py
;; path.py is obsolete.
(lambda _
(substitute* "setup.py"
- (("'path.py'")
- "'path'"))))
+ (("'path.py'") "'path'"))))
(add-after 'unpack 'patch-tests
(lambda _
(mkdir "/tmp/bin")
@@ -1515,6 +1573,39 @@ new fixtures, new methods and new comparison objects.")
(description "This package provides a pytest plugin for aiohttp support.")
(license license:asl2.0)))
+(define-public python-nbmake
+ (package
+ (name "python-nbmake")
+ (version "1.5.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/treebeardtech/nbmake")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06syl819kwqhmjwp34lri31f0pypwnxs9j03s5lbk12w42mihzdi"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'set-HOME
+ (lambda _ (setenv "HOME" "/tmp"))))))
+ (propagated-inputs
+ (list python-ipykernel python-nbclient python-nbformat python-pygments))
+ (native-inputs
+ (list python-poetry-core
+ python-pytest
+ python-pytest-xdist
+ python-pyyaml))
+ (home-page "https://github.com/treebeardtech/nbmake")
+ (synopsis "Pytest plugin for testing notebooks")
+ (description "This package provides a Pytest plugin for testing Jupyter
+notebooks.")
+ (license license:asl2.0)))
+
(define-public python-nbval
(package
(name "python-nbval")
@@ -2113,6 +2204,41 @@ from Python files. It does this by detecting block comments that contain
valid Python syntax that are likely to be commented out code.")
(license license:expat)))
+(define-public python-expecttest
+ (let ((commit "683b09a352cc426851adc2e3a9f46e0ab25e4dee")
+ (revision "0"))
+ (package
+ (name "python-expecttest")
+ (version (git-version "0.2.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ezyang/expecttest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1djwxp9x1hczzxbimv1b1bmd083am88v27l82nmlkhvzyg2cmpvv"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; The test runs tests expected to fail, so the output is
+ ;; confusing
+ (invoke "python3" "test_expecttest.py")))))))
+ (native-inputs (list python-hypothesis poetry))
+ (home-page "https://github.com/ezyang/expecttest")
+ (synopsis "Python module for expect tests")
+ (description "@code{expecttest} is a Python module for expect tests, where
+the initial expected value of a test can be automatically set by running the
+test itself.")
+ (license license:expat))))
+
(define-public python-robber
(package
(name "python-robber")
@@ -2195,6 +2321,35 @@ execution of a test suite. It will also store a history of all test runs to
help in debugging failures and optimizing the scheduler to improve speed.")
(license license:asl2.0)))
+(define-public python-pytest-subprocess
+ (package
+ (name "python-pytest-subprocess")
+ (version "1.5.0")
+ (source
+ (origin
+ (method git-fetch) ;no tests in PyPI archive
+ (uri (git-reference
+ (url "https://github.com/aklajnert/pytest-subprocess")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "103nxv37sjvxlwmw87hxsrphkxkryv4dgb65kjjfr4722r37vmxv"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-anyio
+ python-coverage
+ python-docutils
+ python-nox
+ python-pygments
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-rerunfailures))
+ (home-page "https://github.com/aklajnert/pytest-subprocess")
+ (synopsis "Fake subprocess for Pytest")
+ (description
+ "This package provides a plugin to fake subprocess for Pytest.")
+ (license license:expat)))
+
;; This is only used by python-sanic
(define-public python-pytest-sanic
(package
@@ -2219,7 +2374,7 @@ help in debugging failures and optimizing the scheduler to improve speed.")
(lambda _
(substitute* "setup.py"
(("websockets.*<11.0")
- "websockets<12.0")))))))
+ "websockets<13.0")))))))
(propagated-inputs
(list python-httpx python-async-generator python-pytest
python-websockets))
@@ -2464,6 +2619,17 @@ in an opinionated way.")
eliminate flaky failures.")
(license license:mpl2.0)))
+(define-public python-pytest-rerunfailures-13
+ (package
+ (inherit python-pytest-rerunfailures)
+ (version "13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-rerunfailures" version))
+ (sha256
+ (base32 "16cin0chv59w4rvnd6r0fisp0s8avmp07rwn9da6yixw43jdncp1"))))))
+
(define-public python-xunitparser
(package
(name "python-xunitparser")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 947dd189d3..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
@@ -200,13 +202,13 @@ following algorithms are available:
(define-public python-ewah-bool-utils
(package
(name "python-ewah-bool-utils")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ewah_bool_utils" version))
(sha256
- (base32 "11z9vv9m19370j762z100dqhy2ndjzkxk3w9z02lzwadbyibal3h"))))
+ (base32 "1bff3cv5m4n5pwqz0q90dy42vpyrrhylnrkcd49g1dlf3fs6r0pp"))))
(build-system pyproject-build-system)
(arguments
(list
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index d25059c86b..3a7f53abee 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>
@@ -29,6 +29,7 @@
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -90,12 +91,14 @@
(sha256
(base32
"1317ly0db7nnjg5k58f6nqa0svfcvn446xd5bpiyi0bfbczwpl65"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests? (invoke "pytest" "-vv")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? (invoke "pytest" "-vv")))))))
(native-inputs
(list python-pyhamcrest python-pytest python-pytest-benchmark))
(home-page "https://github.com/keis/base58")
@@ -469,27 +472,12 @@ for example, for recording or replaying web content.")
(package
(name "python-certifi")
(version "2022.6.15")
- (replacement python-certifi/fixed)
(source (origin
(method url-fetch)
(uri (pypi-uri "certifi" version))
(sha256
(base32
- "03c2l11lgljx0kz17cvdc4hlc3p1594ajdih9zq0a4dig285mj44"))))
- (build-system python-build-system)
- (arguments '(#:tests? #f)) ;no tests
- (home-page "https://certifi.io/")
- (synopsis "Python CA certificate bundle")
- (description
- "Certifi is a Python library that contains a CA certificate bundle, which
-is used by the Requests library to verify HTTPS requests.")
- (license license:asl2.0)))
-
-(define python-certifi/fixed
- (package
- (inherit python-certifi)
- (source (origin
- (inherit (package-source python-certifi))
+ "03c2l11lgljx0kz17cvdc4hlc3p1594ajdih9zq0a4dig285mj44"))
(snippet
#~(begin
(delete-file "certifi/cacert.pem")
@@ -518,21 +506,31 @@ def where() -> str:
def contents() -> str:
with open(where(), \"r\", encoding=\"ascii\") as data:
- return data.read()")))))))))
+ return data.read()")))))))
+ (build-system python-build-system)
+ (arguments '(#:tests? #f)) ;no tests
+ (home-page "https://certifi.io/")
+ (synopsis "Python CA certificate bundle")
+ (description
+ "Certifi is a Python library that contains a CA certificate bundle, which
+is used by the Requests library to verify HTTPS requests.")
+ (license license:asl2.0)))
(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 +541,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 +559,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 +569,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 +628,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 +647,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 +666,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-science.scm b/gnu/packages/python-science.scm
index e1e6ba90f1..fe146717ce 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Marco Baggio <marco.baggio@mdc-berlin.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,7 +50,9 @@
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages chemistry)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages cpp)
+ #:use-module (gnu packages crates-io)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages digest)
@@ -69,6 +72,7 @@
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages rust-apps)
#:use-module (gnu packages simulation)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages statistics)
@@ -81,9 +85,160 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject))
+(define-public python-cvxpy
+ (package
+ (name "python-cvxpy")
+ (version "1.4.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cvxpy" version))
+ (sha256
+ (base32 "0lyri9j5gyg6m1bvfy1a4q2sqdy3w45lp0bxiq9as8srq347ic5i"))))
+ (build-system pyproject-build-system)
+ ;; It's odd but cvxpy appears to need pybind11 at runtime according to its
+ ;; specification. Moving pybind11 to native-inputs would break downstream
+ ;; packages using cvxpy.
+ (propagated-inputs (list pybind11
+ python-clarabel
+ python-ecos
+ python-numpy
+ python-osqp
+ python-scipy
+ python-scs))
+ (native-inputs (list python-pytest python-setuptools))
+ (home-page "https://github.com/cvxpy/cvxpy")
+ (synopsis "DSL for modeling convex optimization problems")
+ (description
+ "This package provides a domain-specific language for modeling convex
+optimization problems in Python.")
+ (license license:asl2.0)))
+
+(define-public python-ecos
+ (package
+ (name "python-ecos")
+ (version "2.0.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/embotech/ecos-python")
+ (commit (string-append "v" version))
+ (recursive? #true)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16ljq8maflfkgbw16rldg6cy14vgz2pb3b2iga60i7yzkq2ikmyw"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-numpy python-scipy))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
+ (home-page "https://github.com/embotech/ecos")
+ (synopsis "Embedded Cone Solver")
+ (description
+ "This is the Python package for ECOS: Embedded Cone Solver. ECOS is
+numerical software for solving convex second-order cone programs (SOCPs).")
+ (license license:gpl3)))
+
+(define-public python-formulaic
+ (package
+ (name "python-formulaic")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "formulaic" version))
+ (sha256
+ (base32 "18gvd3f2x358jj0df8vx5fhhnvzw047rsrs03vmvqnxaly97kpb4"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-astor
+ python-cached-property
+ python-interface-meta
+ python-numpy
+ python-pandas
+ python-scipy
+ python-typing-extensions
+ python-wrapt))
+ (native-inputs (list python-hatchling python-hatch-vcs python-pytest))
+ (home-page "https://github.com/matthewwardrop/formulaic")
+ (synopsis "Implementation of Wilkinson formulas")
+ (description "Formulaic is a high-performance implementation of Wilkinson
+formulas for Python.")
+ (license license:expat)))
+
+(define-public python-osqp
+ (package
+ (name "python-osqp")
+ (version "0.6.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/osqp/osqp-python")
+ (commit (string-append "v" version))
+ (recursive? #true)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s1nbzkfsi2h4ji3v0k14pfcrvinakrwy4xdbz320lbaq3yb0b65"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; Some of these test failures are explained by
+ ;; https://github.com/osqp/osqp-python/issues/121.
+ ;; These tests require the module "vec_emosqp", which we don't have.
+ '(list "--ignore=src/osqp/tests/codegen_vectors_test.py"
+ ;; These tests need "mat_emosqp".
+ "--ignore=src/osqp/tests/codegen_matrices_test.py"
+ ;; These fail with accuracy differences
+ "--ignore=src/osqp/tests/update_matrices_test.py"
+ "--ignore=src/osqp/tests/feasibility_test.py"
+ "--ignore=src/osqp/tests/polishing_test.py"
+ ;; This requires the nonfree MKL.
+ "--ignore=src/osqp/tests/mkl_pardiso_test.py")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; It looks like the upgrade to scipy 1.12.0 only broke the test
+ ;; suite, not the features of this library. See
+ ;; https://github.com/osqp/osqp-python/issues/121.
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "requirements.txt"
+ (("scipy.*1.12.0") "scipy <= 1.12.0"))))
+ (add-before 'build 'set-version
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
+ (propagated-inputs (list python-numpy python-qdldl python-scipy))
+ ;; We need setuptools-scm only for the version number. Without it the
+ ;; version number will be "0.0.0" and downstream packages will complain.
+ (native-inputs (list cmake-minimal python-pytest python-setuptools-scm))
+ (home-page "https://osqp.org/")
+ (synopsis "OSQP: operator splitting QP solver")
+ (description "The OSQP (Operator Splitting Quadratic Program) solver is a
+numerical optimization package.")
+ (license license:asl2.0)))
+
+(define-public python-qdldl
+ (package
+ (name "python-qdldl")
+ (version "0.1.7.post2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "qdldl" version))
+ (sha256
+ (base32 "1lspam0k8gnw1yglqxvdv350fq00nkgdfmkizmx7bk0hxjjkj5ab"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list cmake-minimal pybind11))
+ (propagated-inputs (list python-numpy python-scipy))
+ (home-page "https://github.com/oxfordcontrol/qdldl-python/")
+ (synopsis "QDLDL LDL factorization routine")
+ (description "This package provides a Python interface to the QDLDL LDL
+factorization routine for quasi-definite linear system.")
+ (license license:asl2.0)))
+
(define-public python-scipy
(package
(name "python-scipy")
@@ -231,6 +386,52 @@ routines such as routines for numerical integration and optimization.")
genetic variation data.")
(license license:expat)))
+(define-public python-scikit-build-core
+ (package
+ (name "python-scikit-build-core")
+ (version "0.9.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "scikit_build_core" version))
+ (sha256
+ (base32 "146k3w3kcamyyqassmsmp6h4f5lb3cdqnbjjcbf0jm1s8wz1279l"))))
+ (build-system pyproject-build-system)
+ ;; Tests are aborted with the admonition: "setup.py install is
+ ;; deprecated. Use build and pip and other standards-based tools."
+ (arguments (list #:tests? #false))
+ (propagated-inputs (list python-exceptiongroup
+ python-importlib-metadata
+ python-importlib-resources
+ python-packaging
+ python-pathspec
+ python-tomli
+ python-typing-extensions))
+ (native-inputs (list pybind11
+ python-pypa-build
+ python-cattrs
+ python-fastjsonschema
+ python-hatch-fancy-pypi-readme
+ python-hatch-vcs
+ python-hatchling
+ python-numpy
+ python-pip
+ python-pytest
+ python-rich
+ python-setuptools
+ python-setuptools-scm
+ python-virtualenv
+ python-wheel))
+ (home-page "https://github.com/scikit-build/scikit-build-core")
+ (synopsis "Build backend for CMake based projects")
+ (description "Scikit-build-core is a build backend for Python that uses
+CMake to build extension modules. It has a simple yet powerful static
+configuration system in pyproject.toml, and supports almost unlimited
+flexibility via CMake. It was initially developed to support the demanding
+needs of scientific users, but can build any sort of package that uses
+CMake.")
+ (license license:asl2.0)))
+
(define-public python-scikit-fem
(package
(name "python-scikit-fem")
@@ -262,17 +463,19 @@ and linear forms into vectors.")
(define-public python-scikit-fuzzy
(package
(name "python-scikit-fuzzy")
- (version "0.4.2")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "scikit-fuzzy" version))
+ (uri (pypi-uri "scikit_fuzzy" version))
(sha256
- (base32 "0bp1n771fj44kdp7a00bcvfwirvv2rc803b7g6yf3va7v0j29c8s"))))
- (build-system python-build-system)
- (arguments '(#:tests? #f)) ;XXX: not compatible with newer numpy.testing
+ (base32 "0zsfyd8cpd2l82fwh3smxbwhb3bkqwlq17cbav53axma4c2k9r9f"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags #~(list "--pyargs" "skfuzzy")))
(native-inputs
- (list python-nose))
+ (list python-pytest))
(propagated-inputs
(list python-networkx python-numpy python-scipy))
(home-page "https://github.com/scikit-fuzzy/scikit-fuzzy")
@@ -285,7 +488,7 @@ logic, also known as grey logic.")
(define-public python-scikit-image
(package
(name "python-scikit-image")
- (version "0.22.0")
+ (version "0.23.2")
(source
(origin
(method git-fetch)
@@ -294,10 +497,12 @@ logic, also known as grey logic.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10fzyq2w1ldvfkmj374l375yrx33xrlw39xc9kmk8fxfi77jpykd"))))
+ (base32 "1bc8i57sjk44vd9k1ilr6fpvfq1zbq9yfi22lz22k26mzrlisym3"))))
(build-system pyproject-build-system)
(arguments
(list
+ ;; Disable flaky test
+ #:test-flags #~(list "-k" "not test_ellipse_parameter_stability")
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'change-home-dir
@@ -351,7 +556,7 @@ logic, also known as grey logic.")
(sha256
(base32 "0ycqizgsj7q57asc1bphzhf1fx9zqn0vx5rli7q541bas64hfqiy"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-numpy python-scipy))
+ (propagated-inputs (list python-numpy python-pytorch python-scipy))
(home-page "https://github.com/guofei9987/scikit-opt")
(synopsis "Swarm intelligence algorithms in Python")
(description
@@ -364,29 +569,16 @@ swarm algorithm.")
(define-public python-scikit-optimize
(package
(name "python-scikit-optimize")
- (version "0.9.0")
+ (version "0.10.2")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/scikit-optimize/scikit-optimize")
+ (url "https://github.com/holgern/scikit-optimize")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1"))
- (patches
- ;; These are for compatibility with more recent versions of
- ;; numpy and scikit-learn.
- (search-patches "python-scikit-optimize-1148.patch"
- "python-scikit-optimize-1150.patch"))
- (modules '((guix build utils)))
- (snippet
- ;; Since scikit-learn 1.3 max_features no longer supports
- ;; 'auto', which is identical to 'sqrt'
- '(substitute* '("skopt/learning/forest.py"
- "skopt/learning/tests/test_forest.py")
- (("max_features=['\"]auto['\"]")
- "max_features='sqrt'")))))
+ "0pc6avzxz8l32km5jvv3maih0a5x2akxybvxl2hdg04qz2l0kz8b"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-joblib
@@ -405,6 +597,63 @@ implements several methods for sequential model-based optimization.
@code{skopt} aims to be accessible and easy to use in many contexts.")
(license license:bsd-3)))
+(define-public python-scikit-survival
+ (let ((revision "1")
+ ;; We need a later commit for support of a more recent sklearn and
+ ;; numpy 2.
+ (commit "bceb53ebb8306f959c70fae2be9d552f33dd3f21"))
+ (package
+ (name "python-scikit-survival")
+ (version (git-version "0.22.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sebp/scikit-survival")
+ (commit commit)
+ ;; This package contains a copy of Eigen. It would be good to
+ ;; figure out how to use our own Eigen package.
+ (recursive? #true)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m3z64nv4sgay0mdrrw4q4z5ylx63a9w2x43w1r4g8kpg7z9rdfc"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-version
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
+ #$(version-major+minor version)))))))
+ (propagated-inputs
+ (list python-ecos
+ python-importlib-resources
+ python-joblib
+ python-numexpr
+ python-numpy
+ python-osqp
+ python-pandas
+ python-scikit-learn
+ python-scipy))
+ (native-inputs
+ (list python-black
+ python-pypa-build
+ python-coverage
+ python-cython-3
+ python-packaging
+ python-pytest
+ python-setuptools-scm
+ python-tomli
+ python-tox))
+ (home-page "https://github.com/sebp/scikit-survival")
+ (synopsis "Survival analysis built on top of scikit-learn")
+ (description "Scikit-survival is a Python module for survival analysis
+built on top of scikit-learn. It allows doing survival analysis while
+utilizing the power of scikit-learn, e.g., for pre-processing or doing
+cross-validation.")
+ (license license:gpl3+))))
+
(define-public python-tdda
(package
(name "python-tdda")
@@ -532,6 +781,37 @@ volume computations for simple domains like regular polygons, disks,
spheres, cubes, etc.")
(license license:gpl3+)))
+(define-public python-mpl-scatter-density
+ (package
+ (name "python-mpl-scatter-density")
+ (version "0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "mpl-scatter-density" version))
+ (sha256
+ (base32 "083n4xkwjmxvij9i1xhfnxz8vk39ay0baam4nf0khvcihw47bkna"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; See <https://github.com/astrofrog/mpl-scatter-density/issues/42>.
+ #:test-flags #~(list "-k" "not test_default_dpi")))
+ (propagated-inputs
+ (list python-fast-histogram
+ python-matplotlib
+ python-numpy))
+ (native-inputs
+ (list python-pytest
+ python-pytest-cov
+ python-pytest-mpl
+ python-setuptools-scm))
+ (home-page "https://github.com/astrofrog/mpl-scatter-density")
+ (synopsis "Matplotlib helpers to make density scatter plots")
+ (description
+ "This package provides functionality to make it easy to make scatter
+density maps, both for interactive and non-interactive use.")
+ (license license:bsd-2)))
+
(define-public python-pyamg
(package
(name "python-pyamg")
@@ -619,7 +899,7 @@ spheres, cubes, etc.")
tissue-specificity metrics for gene expression.")
(license license:gpl3+)))
-(define-public python-pandas
+(define-public python-pandas-1
(package
(name "python-pandas")
(version "1.5.3")
@@ -760,7 +1040,7 @@ doing practical, real world data analysis in Python.")
#~(modify-phases %standard-phases
(add-after 'unpack 'version-set-by-guix
(lambda _
- (with-output-to-file "_version_meson.py"
+ (with-output-to-file "_version.py"
(lambda _
(display
(string-append "__version__ = \""
@@ -803,7 +1083,7 @@ doing practical, real world data analysis in Python.")
(inputs
(list which xclip xsel))
(native-inputs
- (list meson-python/newer
+ (list meson-python
python-beautifulsoup4
python-cython-0.29.35
python-html5lib
@@ -828,13 +1108,14 @@ and intuitive. It aims to be the fundamental high-level building block for
doing practical, real world data analysis in Python.")
(license license:bsd-3)))
+(define-public python-pandas python-pandas-2)
+
(define-public python-pandas-stubs
(package
(name "python-pandas-stubs")
;; The versioning follows that of Pandas and uses the date of the
- ;; python-pandas-stubs release. This is the latest version of
- ;; python-pandas-stubs for python-pandas 1.5.3.
- (version "1.5.3.230321")
+ ;; python-pandas-stubs release.
+ (version "2.1.1.230928")
(source
(origin
;; No tests in the PyPI tarball.
@@ -844,28 +1125,45 @@ doing practical, real world data analysis in Python.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1blwlq5053pxnmx721zdd6v8njiybz4azribx2ygq33jcpmknda6"))))
+ (base32 "13b6wcwf9ybxf492w1l8qqf2bcgch21xds5r88pfkmrvqhxwfpyr"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags #~(list "-k"
(string-append
- ;; The python-pyarrow package in Guix is not built
- ;; with ORC integration, causing these tests to
- ;; fail.
+ ;; The python-pyarrow package in Guix is built
+ ;; with ORC integration, but these tests fail with
+ ;; an abort in ORC because a timezone file is not
+ ;; in the expected location:
+ ;; https://github.com/apache/arrow/issues/40633
"not test_orc"
" and not test_orc_path"
" and not test_orc_buffer"
" and not test_orc_columns"
- " and not test_orc_bytes"))
- #:phases '(modify-phases %standard-phases
- (add-before 'check 'prepare-x
- (lambda _
- (system "Xvfb &")
- (setenv "DISPLAY" ":0")
- ;; xsel needs to write a log file.
- (setenv "HOME"
- (getcwd)))))))
+ " and not test_orc_bytes"
+ " and not test_all_read_without_lxml_dtype_backend"
+
+ ;; Apparently "numpy.bool_" is not the same as the
+ ;; expected "bool".
+ " and not test_timedelta_cmp"
+ " and not test_timedelta_cmp_rhs"
+ " and not test_timestamp_cmp"
+ " and not test_timestamp_eq_ne_rhs"))
+ #:phases
+ '(modify-phases %standard-phases
+ ;; We cannot yet upgrade numpy to 1.26 because numba needs numpy
+ ;; >1.24.
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("numpy = \\{ version = \">=1.26.0\", python = \"<3.13\" \\}")
+ "numpy = { version = \">=1.23.0\", python = \"<3.13\" }"))))
+ (add-before 'check 'prepare-x
+ (lambda _
+ (system "Xvfb &")
+ (setenv "DISPLAY" ":0")
+ ;; xsel needs to write a log file.
+ (setenv "HOME" (getcwd)))))))
(propagated-inputs (list python-types-pytz))
;; Add python-fastparquet to native inputs once it has been packaged. Its
;; tests will be skipped for now.
@@ -938,7 +1236,7 @@ idea of the remaining amount of computation to be done.")
(define-public python-pandera
(package
(name "python-pandera")
- (version "0.17.2")
+ (version "0.18.0")
(source
(origin
;; No tests in the PyPI tarball.
@@ -948,7 +1246,7 @@ idea of the remaining amount of computation to be done.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1mnqk583z90k1n0z3lfa4rd0ng40v7hqfk7phz5gjmxlzfjbxa1x"))
+ (base32 "14b5aij5zjkwvsimg0v00qvp59mhhq7ljim4qghcn432vkg9gh47"))
(modules '((guix build utils)))
;; These tests require PySpark and Modin. We need to remove the entire
;; directory, since the conftest.py in these directories contain
@@ -966,7 +1264,8 @@ idea of the remaining amount of computation to be done.")
;; positives. These tests currently fail.
"not test_python_std_list_dict_generics"
" and not test_python_std_list_dict_empty_and_none"
- " and not test_pandas_modules_importable"))))
+ " and not test_pandas_modules_importable"
+ " and not test_check_groups"))))
;; Pandera comes with a lot of extras. We test as many as possible, but do
;; not include all of them in the propagated-inputs. Currently, we have to
;; skip the pyspark and io tests due to missing packages python-pyspark
@@ -1016,7 +1315,7 @@ production-critical data pipelines or reproducible research settings. With
(define-public python-pyjanitor
(package
(name "python-pyjanitor")
- (version "0.26.0")
+ (version "0.27.0")
(source
(origin
;; The build requires the mkdocs directory for the description in
@@ -1027,7 +1326,7 @@ production-critical data pipelines or reproducible research settings. With
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1f8xbl1k9l2z56bapp7v6bd3016zrk48igcaz6hb553r6yfl7vfx"))))
+ (base32 "04vsg189msv8frx4zhpcg61djl7wsfvibmz0zmiih4rvkgly2cdr"))))
(build-system pyproject-build-system)
;; Pyjanitor has an extensive test suite. For quick debugging, the tests
;; marked turtle can be skipped using "-m" "not turtle".
@@ -1036,16 +1335,29 @@ production-critical data pipelines or reproducible research settings. With
#:test-flags '(list
"-n" (number->string (parallel-job-count))
;; Tries to connect to the internet.
- "-k" "not test_is_connected"
+ "-k" (string-append "not test_is_connected"
+ ;; Test files are not included
+ " and not test_read_commandline_bad_cmd"
+ ;; This fails due to differences in accuracy
+ " and not test_jitter_results")
+ ;; Test files are not included
+ "--ignore=tests/io/test_read_csvs.py"
;; PySpark has not been packaged yet.
"--ignore=tests/spark/functions/test_clean_names_spark.py"
"--ignore=tests/spark/functions/test_update_where_spark.py")
- #:phases #~(modify-phases %standard-phases
- (add-before 'check 'set-env-ci
- (lambda _
- ;; Some tests are skipped if the JANITOR_CI_MACHINE
- ;; variable is not set.
- (setenv "JANITOR_CI_MACHINE" "1"))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Pandas 2.1.1 does not offer the BME frequency.
+ (add-after 'unpack 'pandas-compat
+ (lambda _
+ (substitute* '("tests/functions/test_select_rows.py"
+ "tests/functions/test_select_columns.py")
+ (("freq=\"BME\"") "freq=\"BM\""))))
+ (add-before 'check 'set-env-ci
+ (lambda _
+ ;; Some tests are skipped if the JANITOR_CI_MACHINE
+ ;; variable is not set.
+ (setenv "JANITOR_CI_MACHINE" "1"))))))
(propagated-inputs (list python-multipledispatch
python-natsort
python-pandas-flavor
@@ -1203,6 +1515,32 @@ evaluating arrays of polynomials based on @code{numpy.ndarray objects}.")
(supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"))
(license license:bsd-2)))
+(define-public python-spin
+ (package
+ (name "python-spin")
+ (version "0.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "spin" version))
+ (sha256
+ (base32 "0ff48nagfaai3j26g1db4zq2bwdv6kj5l7xhcs2l9kzg7qzrmhr7"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-click python-colorama python-tomli))
+ (native-inputs (list python-pytest))
+ (home-page "https://github.com/scientific-python/spin")
+ (synopsis "Developer tool for scientific Python libraries")
+ (description "@code{spin} is a simple interface for common development
+tasks. It comes with a few common build commands out the box, but can
+easily be customized per project.
+
+The impetus behind developing the tool was the mass migration of scientific
+Python libraries (SciPy, scikit-image, and NumPy, etc.) to Meson, after
+distutils was deprecated. When many of the build and installation commands
+changed, it made sense to abstract away the nuisance of having to re-learn
+them.")
+ (license license:bsd-3)))
+
(define-public python-baycomp
(package
(name "python-baycomp")
@@ -1227,6 +1565,61 @@ region of practical equivalence (rope), or that the second classifier has
higher scores.")
(license license:expat)))
+(define-public python-fast-histogram
+ (package
+ (name "python-fast-histogram")
+ (version "0.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "fast_histogram" version))
+ (sha256
+ (base32 "1sk9xa85cgm4sylzblwv3qr2dmm0ic06zkwxqa2xlazjiawp629r"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'build-extensions
+ (lambda _
+ (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (propagated-inputs (list python-numpy))
+ (native-inputs
+ (list python-hypothesis
+ python-pytest
+ python-setuptools-scm))
+ (home-page "https://github.com/astrofrog/fast-histogram")
+ (synopsis "Fast simple 1D and 2D histograms")
+ (description
+ "The fast-histogram mini-package aims to provide simple and fast
+histogram functions for regular bins that don't compromise on performance. It
+doesn't do anything complicated - it just implements a simple histogram
+algorithm in C and keeps it simple. The aim is to have functions that are
+fast but also robust and reliable. The result is a 1D histogram function here
+that is 7-15x faster than @code{numpy.histogram}, and a 2D histogram function
+that is 20-25x faster than @code{numpy.histogram2d}.")
+ (license license:bsd-3)))
+
+(define-public python-fastcluster
+ (package
+ (name "python-fastcluster")
+ (version "1.2.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "fastcluster" version))
+ (sha256
+ (base32 "19labbgnq85p4r4jbli2p045lgh57larhi2g2anagfxnlzpqdf5a"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-numpy))
+ (native-inputs (list python-scipy))
+ (home-page "https://danifold.net/fastcluster.html")
+ (synopsis "Fast hierarchical clustering routines for R and Python")
+ (description "The fastcluster package implements seven common hierarchical
+clustering schemes efficiently. The package is made with two interfaces to
+standard software: R and Python.")
+ (license license:bsd-2)))
+
(define-public python-fbpca
(package
(name "python-fbpca")
@@ -1316,8 +1709,14 @@ multiple deep learning frameworks.")
"0cyldwchcrmbm1y7l1ry70kk8zdh7frxci3c6iwf4iyyj34dnra5"))))
(build-system pyproject-build-system)
(arguments
- ;; This needs a more recent version of python-hypothesis
- (list #:test-flags '(list "--ignore=xarray/tests/test_strategies.py")))
+ (list
+ #:test-flags
+ ;; This needs a more recent version of python-hypothesis
+ '(list "--ignore=xarray/tests/test_strategies.py"
+ ;; These are known to fail with Pandas 2
+ "-k"
+ (string-append "not test_datetime_conversion_warning"
+ " and not test_timedelta_conversion_warning"))))
(native-inputs
(list python-setuptools-scm python-pytest))
(propagated-inputs
@@ -1373,7 +1772,8 @@ name) using the Python's @code{dataclass}.")
(base32 "1x1s25s6dp1f2hck9qw8vl8hgkyy23rcwag2a9vd3w0dbgrrl5i6"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-packaging python-xarray))
- (native-inputs (list python-pytest python-zarr))
+ ;; We need setuptools-scm to correctly record the version string.
+ (native-inputs (list python-pytest python-setuptools-scm python-zarr))
(home-page "https://github.com/xarray-contrib/datatree")
(synopsis "Hierarchical tree-like data structures for xarray")
(description "Datatree is a prototype implementation of a tree-like
@@ -1405,6 +1805,25 @@ being merged upstream into @code{xarray}.")
functions and around einops with an API and features adapted to xarray.")
(license license:asl2.0)))
+(define-public python-xarray-schema
+ (package
+ (name "python-xarray-schema")
+ (version "0.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "xarray-schema" version))
+ (sha256
+ (base32 "08194629696z98dkc74i6c9zmy1jicvd2ajb75q0lsf0i427cv4w"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-numpy python-xarray))
+ (native-inputs (list python-pytest python-setuptools-scm))
+ (home-page "https://github.com/carbonplan/xarray-schema")
+ (synopsis "Schema validation for Xarray objects")
+ (description "This package implements schema validation for Xarray
+objects.")
+ (license license:expat)))
+
(define-public python-pytensor
(package
(name "python-pytensor")
@@ -1540,6 +1959,33 @@ Python's native complex data types is also supported.")
automated with the minimum of fuss and the least effort.")
(license license:expat)))
+(define-public python-scs
+ (package
+ (name "python-scs")
+ (version "3.2.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bodono/scs-python")
+ (commit "3.2.4")
+ (recursive? #true)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06wd8m3ri0gaddl7qq6243g25zjlnh3da915b73jnrfh7sg1nqsj"))))
+ (build-system pyproject-build-system)
+ (inputs (list meson-python openblas))
+ (propagated-inputs (list python-numpy python-scipy))
+ (native-inputs
+ (list pkg-config
+ python-meson-python
+ python-pytest))
+ (home-page "https://github.com/bodono/scs-python")
+ (synopsis "Splitting conic solver")
+ (description "This package provides a Python interface for the
+SCS (Splitting conic solver) library.")
+ (license license:expat)))
+
(define-public python-statannot
(package
(name "python-statannot")
@@ -1581,7 +2027,7 @@ annotations on an existing boxplots and barplots generated by seaborn.")
python-numpy
python-sympy))
;; Pint is optional, but we do not propagate it due to its size.
- (native-inputs (list python-pint python-pytest))
+ (native-inputs (list python-pint python-pytest python-setuptools-scm))
(home-page "https://unyt.readthedocs.io")
(synopsis "Library for working with data that has physical units")
(description
@@ -1712,7 +2158,7 @@ of Pandas
(define-public python-pingouin
(package
(name "python-pingouin")
- (version "0.5.2")
+ (version "0.5.4")
(source
;; The PyPI tarball does not contain the tests.
(origin
@@ -1723,11 +2169,15 @@ of Pandas
(file-name (git-file-name name version))
(sha256
(base32
- "0czy7cpn6xx9fs6wbz6rq2lpkb1a89bzxj1anf2f9in1m5qyrh83"))))
- (build-system python-build-system)
+ "1j3qkgvyc31604ddl952h4hwza7schg8kwkycmxvpvx7xjj7nn68"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list
+ #:test-flags
+ ;; This one fails due to minor differences in accuracy
+ '(list "-k" "not test_logistic_regression")
+ #:phases
+ '(modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* '("requirements.txt" "setup.py")
@@ -1745,10 +2195,11 @@ of Pandas
(substitute* "pingouin/__init__.py"
(("^from outdated[^\n]*") "")
(("^warn_if_outdated[^\n]*") ""))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest")))))))
+ (add-after 'unpack 'sklearn-compatibility
+ (lambda _
+ (substitute* "pingouin/regression.py"
+ (("kwargs\\[\"penalty\"\\] = \"none\"")
+ "kwargs[\"penalty\"] = None")))))))
(native-inputs
(list python-pytest python-pytest-cov))
(propagated-inputs
@@ -1812,10 +2263,61 @@ and more
Mathematics (GLM) library to Python.")
(license license:zlib)))
+(define-public python-dask-expr
+ (package
+ (name "python-dask-expr")
+ (version "1.0.14")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dask/dask-expr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0c2q8w8wl5d2hycbjp9vavkl5f36kaz390wxlis2d8d43jnqhf0d"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:tests? #false ;need python-distributed, which needs dask-expr.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'versioneer
+ (lambda _
+ ;; Our version of versioneer needs setup.cfg. This is adapted
+ ;; from pyproject.toml.
+ (with-output-to-file "setup.cfg"
+ (lambda ()
+ (display "\
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = dask_expr/_version.py
+versionfile_build = dask_expr/_version.py
+tag_prefix =
+parentdir_prefix = dask_expr-
+")))
+ (invoke "versioneer" "install")
+ (substitute* "setup.py"
+ (("versioneer.get_version\\(\\)")
+ (string-append "\"" #$version "\""))))))))
+ (propagated-inputs (list python-pandas python-pyarrow))
+ (native-inputs
+ ;; We use python-dask/bootstrap so that python-dask can propagate this
+ ;; package without creating a mutually recursive dependency.
+ (list python-dask/bootstrap
+ python-pytest
+ python-versioneer))
+ (home-page "https://github.com/dask/dask-expr")
+ (synopsis "Dask DataFrames with query optimization")
+ (description "This is a rewrite of Dask DataFrame that includes query
+optimization and generally improved organization.")
+ (license license:bsd-3)))
+
(define-public python-distributed
(package
(name "python-distributed")
- (version "2023.7.0")
+ (version "2024.4.2")
(source
(origin
;; The test files are not included in the archive on pypi
@@ -1826,12 +2328,12 @@ Mathematics (GLM) library to Python.")
(file-name (git-file-name name version))
(sha256
(base32
- "0b93fpwz7kw31pkzfyihpkw8mzbqshzd6rw5vcwld7n3z2aaaxxb"))))
+ "0sy9mqa8qlxsagbz8xn304csrlxhxj4b6k84yrjxdcmkp9pkx166"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
- '(list "-x" "-m"
+ '(list "-m"
(string-append "not slow"
" and not flaky"
" and not gpu"
@@ -1886,6 +2388,8 @@ Mathematics (GLM) library to Python.")
"test_locked_comm_drop_in_replacement"
"test_locked_comm_intercept_read"
"test_locked_comm_intercept_write"
+ "test_messages_are_ordered_bsend"
+ "test_messages_are_ordered_raw"
"test_mixing_clients_different_scheduler"
"test_multiple_listeners"
"test_no_dangling_asyncio_tasks"
@@ -1894,6 +2398,7 @@ Mathematics (GLM) library to Python.")
"test_plugin_multiple_exceptions"
"test_ports"
"test_preload_import_time"
+ "test_preload_manager_sequence"
"test_queue_in_task"
"test_quiet_client_close"
"test_rebalance_sync"
@@ -1933,9 +2438,12 @@ Mathematics (GLM) library to Python.")
"test_variable_in_task"
"test_worker_preload_text"
"test_worker_uses_same_host_as_nanny"
- "test_nanny_timeout") ; access to 127.0.0.1
+ "test_nanny_timeout") ; access to 127.0.0.1
" and not ")
+ ;; This seems to want to use 64GB of memory.
+ " and not test_computation_object_code_dask_compute"
+
;; These fail because it doesn't find dask[distributed]
" and not test_quiet_close_process"
@@ -2004,6 +2512,10 @@ parentdir_prefix = distributed-
(add-before 'check 'pre-check
(lambda _
(setenv "DISABLE_IPV6" "1")
+ ;; Disable job queueing
+ (setenv "DASK_DISTRIBUTED__SCHEDULER__WORKER_SATURATION" "inf")
+ ;; Do not use dask-expr
+ (setenv "DASK_DATAFRAME__QUERY_PLANNING" "False")
;; The integration tests are all problematic to some
;; degree. They either require network access or some
;; other setup. We only run the tests in
@@ -2024,6 +2536,7 @@ parentdir_prefix = distributed-
python-cloudpickle
python-cryptography
python-dask
+ python-dask-expr
python-msgpack
python-psutil
python-pyyaml
@@ -2196,6 +2709,10 @@ aggregated sum and more.")
"test_stack_non_linear_scale"
"test_uneven_num_of_lines"
+ ;; This triggers an unexpected but harmless
+ ;; warning.
+ "test_save_method"
+
;; Missing optional modules
"test_non_linear_smooth"
"test_non_linear_smooth_no_ci")
@@ -2228,6 +2745,7 @@ aggregated sum and more.")
python-pandas
python-pytest
python-pytest-cov
+ python-setuptools-scm
tzdata-for-tests))
(home-page "https://github.com/has2k1/plotnine")
(synopsis "Grammar of Graphics for Python")
@@ -2358,6 +2876,62 @@ build applications with traitlets in combination with the scipy stack.")
specification and test suite in Python.")
(license license:expat)))
+(define-public python-clarabel
+ (package
+ (name "python-clarabel")
+ (version "0.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "clarabel" version))
+ (sha256
+ (base32 "15k32ynvh45n9q905bxwamh5w5cia9bxzmwz69wbribmyhsv22m3"))
+ (patches
+ (search-patches "python-clarabel-blas.patch"))))
+ (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
+ (add-after 'build 'build-python-module
+ (assoc-ref py:%standard-phases 'build))
+ (add-after 'build-python-module 'install-python-module
+ (assoc-ref py:%standard-phases 'install)))
+ #:cargo-inputs
+ `(("rust-amd" ,rust-amd-0.2)
+ ("rust-blas" ,rust-blas-0.22)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-derive-builder" ,rust-derive-builder-0.11)
+ ("rust-enum-dispatch" ,rust-enum-dispatch-0.3) ;0.3.8
+ ("rust-itertools" ,rust-itertools-0.11)
+ ("rust-lapack" ,rust-lapack-0.19)
+ ("rust-lazy-static" ,rust-lazy-static-1) ;1.4
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-num-derive" ,rust-num-derive-0.2)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-pyo3" ,rust-pyo3-0.20)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-thiserror" ,rust-thiserror-1))
+ #:features '(list "python")
+ #:install-source? #false))
+ (inputs
+ (list maturin))
+ (native-inputs
+ (list python-wrapper))
+ (propagated-inputs (list python-numpy python-scipy))
+ (home-page "https://github.com/oxfordcontrol/Clarabel.rs")
+ (synopsis "Interior-point solver for convex conic optimisation problems")
+ (description "Clarabel.rs is a Rust implementation of an interior point
+numerical solver for convex optimization problems using a novel homogeneous
+embedding.")
+ (license license:asl2.0)))
+
(define-public python-climin
(package
(name "python-climin")
@@ -2379,19 +2953,80 @@ heavily biased to machine learning scenarios. It works on top of
@command{numpy} and (partially) @command{gnumpy}.")
(license license:bsd-3)))
+(define-public python-corner
+ (package
+ (name "python-corner")
+ (version "2.2.2")
+ (source
+ (origin
+ (method git-fetch) ;no tests in PyPi archive
+ (uri (git-reference
+ (url "https://github.com/dfm/corner.py")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1i4dk4jxh0saysya2cnsfwlxwpldbdl174i9pwi4qj82av9jr2ii"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list
+ ;; XXX: Disable tests which failed with mismatched images, check why.
+ "-k" (string-append "not test_labels[png]"
+ " and not test_title_quantiles[png]"
+ " and not test_title_quantiles_default[png]"
+ " and not test_title_quantiles_raises[png]"
+ " and not test_bins[png]"
+ " and not test_bins_log[png]"
+ " and not test_titles1[png]"
+ " and not test_titles2[png]"
+ " and not test_pandas[png]"
+ " and not test_tight[png]"
+ " and not test_extended_overplotting[png]"
+ " and not test_reverse_overplotting[png]"
+ " and not test_arviz[png]"
+ " and not test_range_fig_arg[png]"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; XXX: Make sure you're either building from a fully intact git
+ ;; repository or PyPI tarballs. Most other sources (such as GitHub's
+ ;; tarballs, a git checkout without the .git folder) don't contain
+ ;; the necessary metadata and will not work.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
+ (propagated-inputs
+ (list python-matplotlib))
+ (native-inputs
+ (list python-arviz python-pytest python-scipy python-setuptools-scm))
+ (home-page "http://corner.readthedocs.io/")
+ (synopsis "Make some beautiful corner plots")
+ (description
+ "This Python module uses @code{matplotlib} to visualize multidimensional
+samples using a scatterplot matrix. In these visualizations, each one- and
+two-dimensional projection of the sample is plotted to reveal covariances.
+corner was originally conceived to display the results of Markov Chain Monte
+Carlo simulations and the defaults are chosen with this application in mind but
+it can be used for displaying many qualitatively different samples.")
+ (license license:bsd-2)))
+
(define-public python-paramz
(package
(name "python-paramz")
- (version "0.9.5")
+ (version "0.9.6")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "paramz" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sods/paramz")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "16hbh97kj6b1c2gw22rqnr3w3nqkszh9gj8vgx738gq81wf225q9"))))
- (build-system python-build-system)
+ "1ywc2jzj40m6wmq227j3snxvp4434s0m1xk1abg6v6mr87pv2sa9"))))
+ (build-system pyproject-build-system)
(propagated-inputs (list python-decorator python-numpy python-scipy
python-six))
+ (native-inputs (list python-nose))
(home-page "https://github.com/sods/paramz")
(synopsis "The Parameterization Framework")
(description
@@ -2416,27 +3051,35 @@ for parameterized model creation and handling. Its features include:
(define-public python-gpy
(package
(name "python-gpy")
- (version "1.10.0")
+ (version "1.13.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "GPy" version))
(sha256
(base32
- "1yx65ajrmqp02ykclhlb0n8s3bx5r0xj075swwwigiqaippr7dx2"))
- (snippet
- #~(begin (use-modules (guix build utils))
- (substitute* "GPy/models/state_space_main.py"
- (("collections\\.Iterable") "collections.abc.Iterable"))))))
- (build-system python-build-system)
+ "05d1ry4jpp0srsrmp3qd6s0p2bjc4c0z99450pzdr79vagbfvlk4"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'check 'remove-plotting-tests
- ;; These fail
- (lambda _
- (delete-file "GPy/testing/plotting_tests.py"))))))
- (native-inputs (list python-cython python-nose python-climin))
- (propagated-inputs (list python-numpy python-paramz python-scipy
- python-six))
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'compatibility
+ (lambda _
+ ;; This file uses Python 2 statements
+ (delete-file "GPy/testing/mpi_test__.py")
+ (substitute* "setup.py"
+ (("scipy>=1.3.0,<1.12.0")
+ "scipy>=1.3.0,<=1.13.0"))
+ ;; Use numpy.exp because scipy.ext no longer exists
+ (substitute* "GPy/kern/src/sde_standard_periodic.py"
+ (("sp\\.exp") "np.exp"))
+ (substitute* "GPy/kern/src/sde_stationary.py"
+ (("sp\\.poly1d") "np.poly1d")
+ (("sp\\.roots") "np.roots")))))))
+ (native-inputs
+ (list python-cython python-matplotlib python-pods python-pytest))
+ (propagated-inputs
+ (list python-numpy python-paramz python-scipy python-six))
(home-page "https://sheffieldml.github.io/GPy/")
(synopsis "The Gaussian Process Toolbox")
(description
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index affa2f52f4..24fea79bf7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
-;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge <andreas@enge.fr>
@@ -45,7 +45,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Pradana Aumars <paumars@courrier.dev>
;;; Copyright © 2021, 2022, 2024 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2021, 2022, 2024 jgart <jgart@dismail.de>
;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -65,6 +65,11 @@
;;; 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 Wojtek Kosior <koszko@koszko.org>
+;;; Additions and modifications by Wojtek Kosior are additionally
+;;; dual-licensed under the Creative Commons Zero v1.0.
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -83,6 +88,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)
@@ -94,8 +100,11 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages certs)
#: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)
@@ -104,12 +113,14 @@
#:use-module (gnu packages gnupg)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
+ #:use-module (gnu packages imagemagick)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages node)
#:use-module (gnu packages openstack)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
@@ -122,6 +133,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)
@@ -826,6 +838,24 @@ ASGI server.")
way around. It depends only on the Python standard library.")
(license license:asl2.0)))
+(define-public python-httpauth
+ (package
+ (name "python-httpauth")
+ (version "0.4.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "httpauth" version))
+ (sha256
+ (base32
+ "1m6rwvivg61l3h34hf6p6gkqmr69sb1c4k5ha379nxq0p8bfgahb"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest))
+ (home-page "https://github.com/jonashaag/httpauth")
+ (synopsis "WSGI HTTP Digest Authentication middleware")
+ (description "@code{python-httpauth} is WSGI middleware that secures some/all
+routes using HTTP Digest Authentication.")
+ (license license:bsd-2)))
+
(define-public python-css-html-js-minify
(package
(name "python-css-html-js-minify")
@@ -1524,30 +1554,44 @@ CSS3 that adds programming capabilities and some other syntactic sugar.")
(define-public python-jsonpickle
(package
(name "python-jsonpickle")
- (version "1.5.2")
+ (version "3.0.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "jsonpickle" version))
(sha256
(base32
- "0n93h9b9ad58lxdfbvgsh4b25mkg146qikzcgghyc75vjk7rp2cy"))))
- (build-system python-build-system)
+ "0ay6r1bhcw7qy8k5n4xxgy9dqzhxx8syg5ra9wwqzk91ca6lrcd1"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "pytest" "-vv"
- ;; Prevent running the flake8 and black
- ;; pytest plugins, which only tests style
- ;; and frequently causes harmless failures.
- "-o" "addopts=''"))))))
- (native-inputs
- (list python-setuptools-scm
- python-toml ;XXX: for setuptools_scm[toml]
- ;; For tests.
- python-numpy
- python-pandas
- python-pytest))
+ (list
+ #:test-flags
+ ;; Prevent running the flake8 and black pytest plugins, which only tests
+ ;; style and frequently causes harmless failures.
+ '(list "-o" "addopts=''" "tests")
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "TZ" "UTC")
+ (setenv "TZDIR"
+ (search-input-directory inputs "share/zoneinfo")))))))
+ (propagated-inputs
+ (list python-importlib-metadata))
+ (native-inputs
+ (list python-bson
+ python-ecdsa
+ python-feedparser
+ python-pymongo
+ python-pytest
+ python-pytest-benchmark
+ python-pytest-cov
+ python-pytest-enabler
+ python-setuptools
+ python-setuptools-scm
+ python-simplejson
+ python-sqlalchemy
+ python-ujson
+ tzdata-for-tests))
(home-page "https://jsonpickle.github.io/")
(synopsis "Serialize object graphs into JSON")
(description
@@ -2070,16 +2114,19 @@ is Python’s.")
(define-public python-omnipath
(package
(name "python-omnipath")
- (version "1.0.6")
+ (version "1.0.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "omnipath" version))
(sha256
(base32
- "01hmcp1202g5drs8dkxnyyb5v14g503dj4zfiqypghmigi9ipw86"))))
+ "0krr4wzfwa6fs550cs0lcqwjj90p1inyncj9kvzi4x4m26xbj89q"))))
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags
+ ;; These require internet access
+ '(list "-k" "not test_download_homologene and not test_complex_genes")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'relax
@@ -2106,6 +2153,7 @@ is Python’s.")
python-pre-commit
python-pytest
python-pytest-mock
+ python-pytest-socket
python-requests-mock
python-setuptools-scm
python-tox))
@@ -3424,6 +3472,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")
@@ -3585,6 +3673,34 @@ APIs.")
than Python’s urllib2 library.")
(license license:asl2.0)))
+(define-public python-requests-next
+ (package
+ (name "python-requests")
+ (version "2.32.3")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "0q5742pnibwy74169kacin3dmqg9jzmzk7qab5aq5caffcbm8djm"))))
+ (build-system python-build-system)
+ (native-inputs
+ (list nss-certs-for-test))
+ (propagated-inputs
+ (list python-certifi
+ python-charset-normalizer
+ python-idna
+ python-urllib3))
+ (arguments
+ ;; FIXME: Some tests require network access.
+ '(#:tests? #f))
+ (home-page "http://python-requests.org/")
+ (synopsis "Python HTTP library")
+ (description
+ "Requests is a Python HTTP client library. It aims to be easier to use
+than Python’s urllib2 library.")
+ (license license:asl2.0)))
+
(define-public python-requests-kerberos
(package
(name "python-requests-kerberos")
@@ -3980,6 +4096,41 @@ can reuse the same socket connection for multiple requests, it can POST files,
supports url redirection and retries, and also gzip and deflate decoding.")
(license license:expat)))
+(define-public python-urllib3-next
+ (package
+ (name "python-urllib3")
+ (version "1.26.17")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "urllib3" version))
+ (sha256
+ (base32
+ "08fzhaf77kbjj5abpl9xag6fpfxkdp1k5s7sqd3ayacdq91a5mi4"))))
+ (build-system python-build-system)
+ (arguments `(#:tests? #f))
+ (propagated-inputs
+ (append
+ ;; These 5 inputs are used to build urrlib3[secure]
+ (list python-certifi)
+ (if (member (%current-system)
+ (package-transitive-supported-systems python-cryptography))
+ (list python-cryptography)
+ '())
+ (list python-idna)
+ (if (member (%current-system)
+ (package-transitive-supported-systems python-pyopenssl))
+ (list python-pyopenssl)
+ '())
+ (list python-pysocks)))
+ (home-page "https://urllib3.readthedocs.io/")
+ (synopsis "HTTP library with thread-safe connection pooling")
+ (description
+ "Urllib3 supports features left out of urllib and urllib2 libraries. It
+can reuse the same socket connection for multiple requests, it can POST files,
+supports url redirection and retries, and also gzip and deflate decoding.")
+ (license license:expat)))
+
(define-public awscli
(package
;; Note: updating awscli typically requires updating botocore as well.
@@ -4396,7 +4547,7 @@ for the basic TCP/IP protocols.")
;; Append the test modules to sys.path to avoid
;; namespace conflict which breaks SSL tests.
"--import-mode=append")))))))
- (native-inputs (list python-dpkt python-pytest))
+ (native-inputs (list nss-certs-for-test python-dpkt python-pytest))
(propagated-inputs (list python-brotli python-certifi python-gevent
python-six python-urllib3))
(home-page "https://github.com/geventhttpclient/geventhttpclient")
@@ -4995,6 +5146,165 @@ this it tries to be opinion-free and very extendable.")
server.")
(license license:expat)))
+(define-public epicyon
+ ;; The software is still in development but stopped making official releases
+ ;; after 1.3.0.
+ (let ((revision "0")
+ (commit "1b984f9a30d1e83c068bab357b3a08b409634341"))
+ (package
+ (name "epicyon")
+ (version (git-version "1.3.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bashrc2/epicyon")
+ (commit commit)))
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32
+ "0ki2290rsc432cba30pmiv63iakdnz15ayy05sj9xgj9brjmxdqi"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+
+ (add-after 'unpack 'fix-requirements
+ (lambda _
+ (substitute* '("setup.cfg")
+ ;; Loosen version requirements.
+ (("^(\\s+(cryptography|idna|pillow))([^\\S].*)?\n$"
+ _ dep)
+ (string-append dep "\n"))
+ ;; Fix name: `socks' -> `python-socks'.
+ (("^(\\s+)socks([^\\S].*)?\n$" _ ind)
+ (string-append ind "python-socks\n")))))
+
+ (add-after 'unpack 'add-missing-package-data
+ (lambda _
+ (substitute* '("setup.cfg")
+ (("^(\\s)+\\*\\.txt\n$" all ind)
+ (string-append
+ ;; Epicyon's setup.cfg is outdated and the
+ ;; `[options.package_data]' section doesn't list some
+ ;; necessary data files/directories. We add the
+ ;; required missing ones here while omitting the ones
+ ;; not used by the daemon (`README*` files,
+ ;; directories `architecture/', `deploy/', `gemini/'
+ ;; and `scripts/', etc.).
+ all
+ ind "default_about.md\n"
+ ind "default_tos.md\n"
+ ind "cwlists/**\n"
+ ind "data/**\n"
+ ind "defaultwelcome/**\n"
+ ind "manual/**\n"
+ ind "ontology/**\n"
+ ind "specification/**\n")))))
+
+ (add-after 'unpack 'patch-program-names
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((exiftool (assoc-ref inputs "perl-image-exiftool"))
+ (imagemagick (assoc-ref inputs "imagemagick")))
+ (substitute* '("media.py" "person.py")
+ (("'(/usr/bin/)?(exiftool|convert|mogrify)" _ _ tool)
+ (format #f "'~a/bin/~a"
+ (if (string= tool "exiftool")
+ exiftool
+ imagemagick)
+ tool))))))
+
+ (add-after 'unpack 'add-epicyon-entry-point
+ (lambda _
+ (define (append-to-file filename text)
+ (let ((port (open-file filename "a")))
+ (display text port)
+ (close-port port)))
+
+ (append-to-file "setup.cfg" "
+
+[options.entry_points]
+console_scripts =
+ epicyon = epicyon:_guix_main
+")
+
+ (substitute* "epicyon.py"
+ (("^if __name__ == .__main__.:\n$")
+ "def _guix_main():\n"))
+
+ ;; Some of the tests check if there are no unused
+ ;; functions, we need _guix_main() to be used somewhere
+ ;; besides the entry point.
+ (append-to-file "epicyon.py" "
+if __name__ == '__main__': _guix_main()
+")))
+
+ (add-after 'unpack 'skip-networked-test-during-build
+ (lambda _
+ (substitute* "tests.py"
+ (("^(\\s+)print\\(.test_site_is_active.\\)\n$" all ind)
+ (string-append
+ all
+ ind "if os.environ['HOME'] == '/homeless-shelter':\n"
+ ind ind "print('...skipped...')\n"
+ ind ind "return\n")))))
+
+ (add-after 'install 'remove-useless-scripts
+ ;; Those are used for hosting through tor or i2p under a
+ ;; systemd-based distro.
+ (lambda _
+ (for-each (lambda (script)
+ (delete-file (format #f "~a/bin/~a"
+ #$output script)))
+ '("i2p" "onion"))))
+
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke (format #f "~a/bin/epicyon" #$output)
+ "--tests")))))))
+ (inputs (list imagemagick
+ perl-image-exiftool
+ python-cryptography
+ python-dateutil
+ python-django-timezone-field
+ python-idna
+ python-numpy
+ python-pillow
+ python-pypng
+ python-pyqrcode
+ python-requests
+ python-socks))
+ (home-page "https://github.com/bashrc2/epicyon")
+ (synopsis
+ "A modern ActivityPub compliant server implementing both S2S and C2S
+protocols.")
+ (description
+ "Epicyon is a Fediverse server suitable for self-hosting a small number
+of accounts on low power systems.
+
+Key features:
+
+@itemize
+@item Open standards: HTML, CSS, ActivityPub S2S and C2S, RSS, CalDAV.
+@item Supports common web browsers and shell browsers.
+@item Will not drain your mobile or laptop battery.
+@item Customisable themes. It doesn't have to look bland.
+@item Emoji reactions.
+@item Geospatial hashtags.
+@item Does not require much RAM, either on server or client.
+@item Suitable for installation on single board computers.
+@item No timeline algorithms.
+@item No javascript.
+@item No database. Data stored as ordinary files.
+@item No fashionable web frameworks. \"Boring by design\".
+@item No blockchain garbage.
+@item Written in Python, with few dependencies.
+@item AGPL license, which big tech hates.
+@end itemize
+")
+ (license license:agpl3+))))
+
(define-public python-flask-migrate
(package
(name "python-flask-migrate")
@@ -5250,35 +5560,18 @@ addon modules.")
(define-public python-wtforms
(package
(name "python-wtforms")
- (version "2.3.3")
+ (version "3.1.2")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "WTForms" version))
+ (uri (pypi-uri "wtforms" version))
(sha256
- (base32
- "17427m7p9nn9byzva697dkykykwcp2br3bxvi8vciywlmkh5s6c1"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-bundled-test
- (lambda _
- ;; Delete test copied from a third party package that fails
- ;; with newer SQLAlchemy. This can be removed for 3.0.
- ;; See <https://github.com/wtforms/wtforms/issues/696>.
- (delete-file "tests/ext_sqlalchemy.py")))
- (replace 'check
- (lambda* (#:key inputs outputs tests? #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (invoke "python" "setup.py" "compile_catalog")
- (invoke "python" "tests/runtests.py")))))))
- (native-inputs
- (list python-dateutil python-sqlalchemy))
- (propagated-inputs
- (list python-babel python-email-validator python-markupsafe))
- (home-page "http://wtforms.simplecodes.com/")
+ (base32 "1fblnkzvs6339glwx8bskdjy7nhn2ap90y9g6b399713sy063mzq"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-hatchling python-pytest))
+ (propagated-inputs (list python-babel python-email-validator
+ python-markupsafe))
+ (home-page "https://wtforms.readthedocs.io/")
(synopsis
"Form validation and rendering library for Python web development")
(description
@@ -5287,6 +5580,28 @@ for Python web development. It is very similar to the web form API
available in Django, but is a standalone package.")
(license license:bsd-3)))
+(define-public python-wtforms-sqlalchemy
+ (package
+ (name "python-wtforms-sqlalchemy")
+ (version "0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "WTForms-SQLAlchemy" version))
+ (sha256
+ (base32 "1nx4x0ifanlbrzh3f9ns8ihnchlkzf54ilvqmgcgcz2j72vm43rp"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest))
+ (propagated-inputs (list python-sqlalchemy python-wtforms))
+ (home-page "https://github.com/wtforms/wtforms-sqlalchemy/")
+ (synopsis "SQLAlchemy tools for WTForms")
+ (description
+ "WTForms-SQLAlchemy is a fork of the @code{wtforms.ext.sqlalchemy}
+package from WTForms. The package has been renamed to
+@code{wtforms_sqlalchemy} but otherwise should function the same as
+@code{wtforms.ext.sqlalchemy} did.")
+ (license license:bsd-3)))
+
(define-public python-paste
(package
(name "python-paste")
@@ -5805,22 +6120,37 @@ library to create slugs from unicode strings while keeping it DRY.")
(define-public python-branca
(package
(name "python-branca")
- (version "0.3.1")
+ (version "0.7.2")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "branca" version))
+ (method git-fetch) ; no tests in PyPI
+ (uri (git-reference
+ (url "https://github.com/python-visualization/branca")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0pmigd521j2228xf8x34vbx0niwvms7xl7za0lymywj0vydjqxiy"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-jinja2 python-six))
- (native-inputs
- (list python-pytest))
+ (base32 "1vs94nqa7r6iwm8mj3m29hg090gmgz4ywnayxh8qiz9ij8jv96wa"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; This file requires Selenium.
+ (list #:test-flags #~(list "--ignore" "tests/test_iframe.py"
+ ;; This test passes but is very slow.
+ "-k" "not test_color_brewer_extendability")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; The version string is usually derived via setuptools-scm,
+ ;; but without the git metadata available, the version string
+ ;; is set to '0.0.0'.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
+ #$(package-version this-package)))))))
+ (propagated-inputs (list python-jinja2))
+ (native-inputs (list python-numpy python-pytest python-setuptools-scm))
(home-page "https://github.com/python-visualization/branca")
(synopsis "Generate complex HTML+JS pages with Python")
- (description "Generate complex HTML+JS pages with Python")
+ (description "This library is a spinoff from @code{folium} that would host
+the non-map-specific features. It can be used to generate HTML + JS.")
(license license:expat)))
(define-public python-tinycss
@@ -6015,7 +6345,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
@@ -6065,6 +6395,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
@@ -6082,6 +6413,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
@@ -6422,7 +6768,8 @@ and serve updated contents upon changes to the directory.")
"test_extra_info")
" and not "))))
(native-inputs
- (list python-pytest
+ (list nss-certs-for-test
+ python-pytest
python-pytest-asyncio
python-pytest-cov
python-pytest-httpbin
@@ -6497,7 +6844,8 @@ Some things HTTP Core does do:
;; 'function' object has no attribute 'name'".
" and not test_main"))))
(native-inputs
- (list python-cryptography
+ (list nss-certs-for-test
+ python-cryptography
python-hatchling
python-hatch-fancy-pypi-readme
python-pytest
@@ -6655,7 +7003,7 @@ files.")
(define-public python-websockets
(package
(name "python-websockets")
- (version "11.0.3")
+ (version "12.0")
(source
(origin
(method git-fetch)
@@ -6665,7 +7013,7 @@ files.")
(file-name (git-file-name name version))
(sha256
(base32
- "1hn1qzpk1fvhi5j5nz4xlvzwkj9y16c9gryrb4n4dza84qi1pna5"))))
+ "1a587a1knjsy9zmgab9v2yncx0803pg2hfcvf7kz6vs8ixaggqmh"))))
(build-system python-build-system)
(arguments
(list #:phases
@@ -6882,15 +7230,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
@@ -7300,7 +7657,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)
@@ -7309,7 +7666,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
@@ -7323,6 +7680,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.
@@ -7331,11 +7689,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
@@ -7968,13 +8334,13 @@ of the CRC32C hashing algorithm.")
(define-public python-google-auth
(package
(name "python-google-auth")
- (version "2.17.3")
+ (version "2.34.0")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "google-auth" version))
+ (uri (pypi-uri "google_auth" version))
(sha256
- (base32 "1z2f0vj374rscvlivhvf9xxjlg4lng4mgpqnygfhy4wbqlmiwcff"))))
+ (base32 "1k04kkg5n3pi4awjxxsa50ail68wwf2gklmb686v46aw8fb77f4f"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -7990,7 +8356,8 @@ of the CRC32C hashing algorithm.")
python-rsa
python-six))
(native-inputs
- (list python-flask
+ (list nss-certs-for-test
+ python-flask
python-freezegun
python-mock
python-oauth2client
@@ -8825,6 +9192,14 @@ possible, supporting most common functionality.")
(use-modules (guix build utils))
(delete-file "tests/profile.py")))))
(build-system python-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ ;; The test expects the copyright to be updated each year.
+ (substitute* "tests/test_daterange.py"
+ (("time\\.strftime\\(\"%Y\"\\)") "2022")))))))
(synopsis "HTTP REST client for Python")
(description
"This package provides access to any RESTful or RESTful-like API.")
@@ -9183,6 +9558,39 @@ list, create, update, or delete resources (e.g. Order, Product, Collection).")
"This package provides a library to parse and apply patches.")
(license license:expat)))
+(define-public python-pybadges
+ (package
+ (name "python-pybadges")
+ (version "3.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/pybadges")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ "1zgb9idz7m3mzf8wvik0gwmyrxp753axqjv2pab326cr5myj1s4b")))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~'("-k"
+ ;; Disable network dependent tests.
+ "not test_changes and not test_not_image_url and not test_http_url")))
+ (propagated-inputs (list python-jinja2 python-requests))
+ (native-inputs (list python-flask
+ python-fonttools
+ python-nox
+ python-pillow
+ python-pytest
+ python-xmldiff))
+ (home-page "https://github.com/google/pybadges")
+ (synopsis "Generate Github-style badges on the command-line")
+ (description
+ "This package provides @code{python-pybadges}: a library and command-line
+tool for generating Github-style badges as SVG images.")
+ (license license:asl2.0)))
+
(define-public python-grid5000
(package
(name "python-grid5000")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 38f5d73c5b..650220b71c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2023 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017, 2021, 2022 Eric Bavier <bavier@posteo.net>
@@ -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>
@@ -116,12 +116,12 @@
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
-;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2022 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2022 drozdov <drozdov@portalenergy.tech>
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2022, 2023 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
@@ -144,7 +144,7 @@
;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © c4droid <c4droid@foxmail.com>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
@@ -152,6 +152,8 @@
;;; Copyright © 2024 Adriel Dumas--Jondeau <leirda@disroot.org>
;;; 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.
;;;
@@ -176,10 +178,12 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages astronomy)
#:use-module (gnu packages attr)
+ #:use-module (gnu packages audio)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages bioinformatics)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@@ -196,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)
@@ -247,6 +252,7 @@
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
+ #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
@@ -342,18 +348,122 @@ range of notification services, such as Telegram, Discord, Slack, Amazon SNS,
Gotify, etc.")
(license license:bsd-2)))
+(define-public python-archspec
+ (package
+ (name "python-archspec")
+ (version "0.2.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/archspec/archspec")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03yfn4b9xg41pd7vls2cils77wkkb9si1h2qqvnkds661fdankqj"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'build 'set-numba-cache-dir
+ (lambda _
+ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+ (propagated-inputs (list python-boltons
+ python-cooler
+ python-ctxcore
+ python-interlap
+ python-intervaltree
+ python-jsonschema
+ python-networkx
+ python-numba
+ python-poetry-core
+ pyscenic
+ python-scikit-learn
+ python-tables
+ python-typing-extensions))
+ (native-inputs (list python-black
+ python-flake8
+ python-isort
+ python-poetry-core
+ python-pylint
+ python-pytest
+ python-pytest-cov))
+ (home-page "https://github.com/archspec/archspec")
+ (synopsis "Library to query system architecture")
+ (description
+ "Archspec offers human-readable labels for system architecture aspects.
+These aspects include CPU, network fabrics, etc. In addition, it offers
+APIs to detect, query, and compare them.")
+ (license license:expat)))
+
+(define-public python-awkward-cpp
+ (package
+ (name "python-awkward-cpp")
+ (version "32")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "awkward-cpp" version))
+ (sha256
+ (base32 "1w11fjkwrian3vll7jhnisl1b6m6rk2rqx0n9d1hzyq6cbw5m35d"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-importlib-resources python-numpy))
+ (native-inputs
+ (list cmake pybind11 python-pytest python-scikit-build-core))
+ (home-page "https://github.com/scikit-hep/awkward-1.0")
+ (synopsis "CPU kernels and compiled extensions for Awkward Array")
+ (description "Awkward CPP provides precompiled routines for the awkward
+package. It is not useful on its own, only as a dependency for awkward.")
+ (license license:bsd-3)))
+
+(define-public python-awkward
+ (package
+ (name "python-awkward")
+ (version "2.6.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "awkward" version))
+ (sha256
+ (base32 "1s280ndr4r2q9qn9c0slan5zw37p41cx8q5z6k6p988afr01c6j8"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; CUDA is and requires proprietary software.
+ '(list "--ignore-glob=tests-cuda**")))
+ (propagated-inputs (list python-awkward-cpp
+ python-fsspec
+ python-importlib-metadata
+ python-numpy
+ python-packaging
+ python-typing-extensions))
+ (native-inputs
+ (list python-hatch-fancy-pypi-readme
+ python-hatchling
+ python-pytest))
+ (home-page "https://github.com/scikit-hep/awkward-1.0")
+ (synopsis "Manipulate JSON-like data with NumPy-like idioms")
+ (description "Awkward Array is a library for nested, variable-sized data,
+including arbitrary-length lists, records, mixed types, and missing data,
+using NumPy-like idioms.")
+ (license license:bsd-3)))
+
(define-public python-xmldiff
(package
(name "python-xmldiff")
- (version "2.4")
+ (version "2.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "xmldiff" version))
(sha256
- (base32 "0qygxi3z1jwb0471k7bh5gcqf7wqm4xhrkmwhf36gjgjw46a5gh5"))))
+ (base32 "18k8kiml9wpl4wf9lmi0j6ys21lbdv8fa8r9qrzdsrh3h0ghp4f0"))))
(build-system python-build-system)
- (propagated-inputs (list python-lxml python-six))
+ (propagated-inputs (list python-lxml))
(home-page "https://github.com/Shoobx/xmldiff")
(synopsis "Creates diffs of XML files")
(description "This Python tool figures out the differences between two
@@ -778,14 +888,14 @@ documentation of programming languages.")
(define-public python-fire
(package
(name "python-fire")
- (version "0.5.0")
+ (version "0.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fire" version))
(sha256
(base32
- "1imc9ais15dz3gmphawql86l9av5dykbp4hz0883k5n8k2gd9c56"))))
+ "0rmaw26xjndr7makpiqv4h9aav9xf2h280w0khqc1lyddscmpv2l"))))
(build-system python-build-system)
(arguments
'(#:phases
@@ -984,6 +1094,27 @@ transformation of the plane.")
from a docstring rather than the other way around.")
(license license:mpl2.0)))
+(define-public python-array-api-compat
+ (package
+ (name "python-array-api-compat")
+ (version "1.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "array_api_compat" version))
+ (sha256
+ (base32 "1bvn92v52h8p2zpinwv5bl1314kdjw3msalj91nczfdbrmay78bl"))))
+ (build-system pyproject-build-system)
+ ;; Tests would require all supported array libraries, including pytorch
+ (arguments (list #:tests? #false))
+ (propagated-inputs (list python-numpy))
+ (home-page "https://data-apis.org/array-api-compat/")
+ (synopsis "Array API compatibility wrapper for NumPy et al")
+ (description
+ "This package provides a wrapper around @code{NumPy} and other array
+libraries to make them compatible with the Array API standard")
+ (license license:expat)))
+
(define-public python-cachetools
(package
(name "python-cachetools")
@@ -1033,6 +1164,29 @@ It uses a plain-text database, a location-independent library, and features
git integration, command-line support, and a curses-based TUI.")
(license license:expat)))
+(define-public python-colorcet
+ (package
+ (name "python-colorcet")
+ (version "3.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "colorcet" version))
+ (sha256
+ (base32 "1sx4m5xbz1k8bm8cr2f3x21dip167k7c1nv35npqla52h76v6899"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-nbval
+ python-packaging
+ python-pytest
+ python-pytest-cov
+ python-pytest-mpl))
+ (home-page "https://colorcet.holoviz.org/")
+ (synopsis "Collection of perceptually uniform colormaps")
+ (description "Colorcet is a collection of perceptually accurate 256-color
+colormaps for use with Python plotting programs like Bokeh, Matplotlib,
+HoloViews, and Datashader.")
+ (license license:cc-by4.0)))
+
(define-public python-colored
(package
(name "python-colored")
@@ -1142,7 +1296,7 @@ into dataclasses.")
(list python-numpy))
(native-inputs
(list cmake
- meson-python/newer
+ meson-python
pkg-config
pybind11
python-pytest
@@ -1611,6 +1765,46 @@ different units.")
scatter plots, histograms and heatmaps in the terminal using braille dots.")
(license license:expat)))
+(define-public python-poetry-dynamic-versioning
+ (package
+ (name "python-poetry-dynamic-versioning")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "poetry_dynamic_versioning" version))
+ (sha256
+ (base32 "19v9jrawbx1nwnwrd6giyzwfq50y2mjzkrsx0ga2sbx2a2yphlbj"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "--ignore=tests/test_integration.py"
+ ;; E RuntimeError: Unable to detect version control system. Not
+ ;; installed: Git, Mercurial, Darcs, Subversion, Bazaar, Fossil,
+ ;; Pijul.
+ "-k"
+ (string-append
+ "not test__get_version__defaults"
+ " and not test__get_version__format_jinja"
+ " and not test__get_version__format_jinja_with_enforced_style"
+ " and not test__get_version__format_jinja_imports_with_module_only"
+ " and not test__get_version__format_jinja_imports_with_module_and_item"))))
+ (native-inputs
+ (list python-poetry-core
+ python-pytest))
+ (propagated-inputs
+ (list poetry
+ python-dunamai
+ python-jinja2
+ python-tomlkit))
+ (home-page "https://github.com/mtkennerly/poetry-dynamic-versioning")
+ (synopsis "Poetry plugin enabling VCS tags dynamic versioning")
+ (description
+ "This package provides a build backend that patches Poetry Core to enable
+the versioning system in PEP 517 build frontends.")
+ (license license:expat)))
+
(define-public python-portpicker
(package
(name "python-portpicker")
@@ -1918,7 +2112,7 @@ task of adding retry behavior to just about anything.")
(define-public python-pytelegrambotapi
(package
(name "python-pytelegrambotapi")
- (version "3.7.4")
+ (version "4.22.0")
(source
(origin
(method git-fetch)
@@ -1927,21 +2121,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 "0mic9wk6xg7p2ca7b03fc19l86yc9bkciq7kp8l9xvzzzmg4rzw4"))))
+ (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
@@ -1960,13 +2154,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")
@@ -2009,7 +2204,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
@@ -2024,7 +2219,7 @@ Python library and command line interface.")
(define-public python-glymur
(package
(name "python-glymur")
- (version "0.12.9")
+ (version "0.13.5")
(source
(origin
(method git-fetch) ; no tests data in PyPi package
@@ -2033,7 +2228,7 @@ Python library and command line interface.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0awyav7071nn9z2g4mmpg33y0y0nfandfr6nr3j5vyb8hnprcmns"))))
+ (base32 "1n2n7bj5w29w5y2gcl4hxhqf85n0j2crkln9i0mprq3xw8finxpx"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2187,6 +2382,42 @@ EasyGUI is NOT event-driven. Instead, all GUI interactions are invoked by
simple function calls.")
(license license:bsd-3)))
+(define-public python-echo
+ (package
+ (name "python-echo")
+ (version "0.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "echo" version))
+ (sha256
+ (base32 "1hr2kgjmf5gcjbg1mry03ca1dayfwy8mi8as42jfg0apsa3bfvvj"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'start-xorg-server
+ (lambda _
+ ;; The test suite requires a running X server.
+ (system "Xvfb :99 -screen 0 1024x768x24 &")
+ (setenv "DISPLAY" ":99.0"))))))
+ (propagated-inputs
+ (list python-numpy
+ python-qtpy
+ python-pyqt-6))
+ (native-inputs
+ (list python-pytest
+ python-pytest-cov
+ python-setuptools-scm
+ xorg-server-for-tests))
+ (home-page "https://github.com/glue-viz/echo")
+ (synopsis "Callback Properties in Python")
+ (description
+ "Echo is a small library for attaching callback functions to property
+state changes.")
+ (license license:expat)))
+
(define-public python-pymd4c
(package
(name "python-pymd4c")
@@ -2376,13 +2607,13 @@ with Numpy and SciPy.")
(define-public python-shapely
(package
(name "python-shapely")
- (version "2.0.2")
+ (version "2.0.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "shapely" version))
(sha256
- (base32 "1rs90q4ys5cav0hz1dq72wq2mk4aqlqqbfjrnb2zzfkiq42cq4qp"))))
+ (base32 "0cpyziixzdj7xqkya4k6fwr0qmrw8k84fsrx6p5sdgw6qxmkdwmz"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2398,7 +2629,7 @@ with Numpy and SciPy.")
(list geos))
(propagated-inputs
(list python-numpy))
- (home-page "https://github.com/Toblerity/Shapely")
+ (home-page "https://github.com/shapely/shapely")
(synopsis "Library for the manipulation and analysis of geometric objects")
(description "Shapely is a Python package for manipulation and analysis of
planar geometric objects. It is based on the @code{GEOS} library.")
@@ -3580,7 +3811,7 @@ help formatter.")
(guix build utils))
#:phases
#~(modify-phases %standard-phases
- (add-after 'prepare-python-module 'build-python-module
+ (add-after 'build 'build-python-module
(assoc-ref py:%standard-phases 'build))
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install)))
@@ -4270,6 +4501,36 @@ videos in a notebook.")
audio playback capability for Python 3 on OSX, Windows, and Linux.")
(license license:expat))) ; MIT license
+(define-public python-wavefile
+ (package
+ (name "python-wavefile")
+ (version "1.6.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "wavefile" version))
+ (sha256
+ (base32
+ "04mdcxq7n1vnwb9y65j0cwpy91ik5rh9vki1f45xqnh4ygz91n75"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-libsndfile-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "wavefile/libsndfile.py"
+ (("'libsndfile")
+ (string-append "'" (assoc-ref inputs "libsndfile")
+ "/lib/libsndfile"))))))))
+ (inputs
+ (list libsndfile portaudio))
+ (propagated-inputs (list python-numpy python-pyaudio))
+ (home-page "https://github.com/vokimon/python-wavefile")
+ (synopsis "Pythonic audio file reader and writer")
+ (description
+ "This package provides pythonic libsndfile wrapper to read and write audio
+files.")
+ (license license:gpl3+)))
+
(define-public python-jsonalias
(package
(name "python-jsonalias")
@@ -4336,6 +4597,30 @@ type hints and parse from command line, config files and environment
variables.")
(license license:expat)))
+(define-public python-pymarshal
+ (package
+ (name "python-pymarshal")
+ (version "2.2.3")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "pymarshal" version))
+ (sha256
+ (base32
+ "1lhb7yim60pvclbd440zd4n50xs1d2rvmnrhhvib3hyv0dxil5j3"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; Test fails with this error:
+ ;; "CovReportWarning: Failed to generate report: No data to report."
+ (list #:tests? #f))
+ (native-inputs
+ (list python-pytest python-pytest-cov))
+ (propagated-inputs (list python-bson python-pyyaml))
+ (home-page "https://gitlab.com/d3v-t00lz/pymarshal")
+ (synopsis "Pythonic implementation of Golang struct (un)marshalling")
+ (description "PyMarshal replicates the feature of (un)marshalling structs
+in Golang.")
+ (license license:bsd-2)))
+
(define-public python-simplejson
(package
(name "python-simplejson")
@@ -4836,33 +5121,51 @@ and is not compatible with JSON.")
(license license:expat)))
(define-public python-extension-helpers
-(package
- (name "python-extension-helpers")
- (version "1.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "extension-helpers" version))
- (sha256
- (base32 "1rjha07ds633fb81hn3i2yzk3v2flbi6qa091ix4mkvrgk3gl6ya"))))
- (build-system pyproject-build-system)
- ;; FIXME: pytest failed to load test suit, find out why.
- ;; - _pytest.pathlib.ImportPathMismatchError: ('extension_helpers.conftes
- (arguments (list #:tests? #f))
- (native-inputs
- (list python-coverage
- python-pytest
- python-pytest-astropy
- python-pytest-cov
- python-setuptools-scm))
- (home-page "https://extension-helpers.readthedocs.io")
- (synopsis "Astropy ecosystem utilities for building and installing packages")
- (description
- "The extension-helpers package includes convenience helpers to assist with
+ (package
+ (name "python-extension-helpers")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch) ; no tests in the PyPI tarball
+ (uri (git-reference
+ (url "https://github.com/astropy/extension-helpers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1lkhypg21ydx03z03dppbf05zff40dyl0kn6nichzfdfpqnr5055"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; It tries to install it via pip: E ModuleNotFoundError: No module named
+ ;; 'helpers_test_package_fd9cc3a9_11fa_4a1a_b80e_c5b043949604'
+ #:test-flags #~(list "-k" "not test_only_pyproject[True]")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; LookupError: setuptools-scm was unable to detect version for
+ ;; /tmp/guix-build-python-extension-helpers-1.1.1.drv-0/source.
+ (add-before 'build 'set-version
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))
+ (replace 'check
+ (lambda* (#:key tests? test-flags #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" "/tmp")
+ (with-directory-excursion "/tmp"
+ (apply invoke "pytest" "-v" test-flags))))))))
+ (native-inputs
+ (list python-pytest
+ python-pytest-astropy
+ python-pytest-cov
+ python-setuptools-scm
+ python-tomli))
+ (home-page "https://extension-helpers.readthedocs.io")
+ (synopsis "Astropy ecosystem utilities for building and installing packages")
+ (description
+ "The extension-helpers package includes convenience helpers to assist with
building Python packages with compiled C/Cython extensions. It is developed by
the Astropy project but is intended to be general and usable by any Python
package.")
- (license license:bsd-3)))
+ (license license:bsd-3)))
(define-public python-extras
(package
@@ -5206,18 +5509,19 @@ files.")
(define-public python-pyld
(package
(name "python-pyld")
- (version "1.0.5")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "PyLD" version))
- (sha256
- (base32
- "1ywbdbsrkg533qh8xn9ifjh2mvam6v5msrjyqq73jfpvcp89qvff"))))
+ (version "2.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "PyLD" version))
+ (sha256
+ (base32 "1k7ars8n6kramkvadxgy0qfsi5g1hipyha4wqw8l75mw1l7ka7ii"))))
(build-system python-build-system)
+ (native-inputs (list python-lxml))
+ (propagated-inputs (list python-cachetools python-frozendict))
(home-page "https://github.com/digitalbazaar/pyld")
(synopsis "Python implementation of the JSON-LD specification")
- (description
- "PyLD is an implementation of the JSON-LD specification.")
+ (description "PyLD is an implementation of the JSON-LD specification.")
(license license:bsd-3)))
(define-public python-cli-helpers
@@ -5830,14 +6134,14 @@ environments and back.")
(define-public python-pyyaml
(package
(name "python-pyyaml")
- (version "6.0")
+ (version "6.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyYAML" version))
(sha256
(base32
- "18imkjacvpxfgg1lbpraqywx3j7hr5dv99d242byqvrh2jf53yv8"))))
+ "0hsa7g6ddynifrwdgadqcx80khhblfy94slzpbr7birn2w5ldpxz"))))
(build-system python-build-system)
(inputs
(list libyaml python-cython))
@@ -6689,22 +6993,22 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
(define-public python-docx
(package
(name "python-docx")
- (version "0.8.11")
+ (version "1.1.2")
(source (origin
(method url-fetch)
- (uri (pypi-uri "python-docx" version))
+ (uri (pypi-uri "python_docx" version))
(sha256
(base32
- "1i7bxghb7knlyjain101qg1jmmz2b6qj03bi3vfxhvcml0rx418i"))))
+ "1z9ffsvksaaxr90ijzq4k3adzb6p5ipy2j3rrbfjl05rjlpg5w8c"))))
(build-system pyproject-build-system)
(native-inputs
(list behave
- python-flake8
- python-mock
python-pyparsing
- python-pytest))
+ python-pytest
+ python-pytest-cov
+ python-pytest-xdist))
(propagated-inputs
- (list python-lxml))
+ (list python-lxml python-typing-extensions))
(home-page "https://github.com/python-openxml/python-docx/")
(synopsis "Python library to create and modify Microsoft Word documents")
(description "This Python library can be used to create and update
@@ -6809,6 +7113,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")
@@ -6830,6 +7151,24 @@ text styles of documentation.")
"Pygments is a syntax highlighting package written in Python.")
(license license:bsd-2)))
+(define-public python-vdf
+ (package
+ (name "python-vdf")
+ (version "3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "vdf" version))
+ (sha256
+ (base32
+ "1bz2gn04pl6rj2mawlzlirz1ygg4rdypq0pxbyg018873vs1jm7x"))))
+ (build-system pyproject-build-system)
+ (home-page "https://github.com/ValvePython/vdf")
+ (synopsis "Work with Valve's VDF text format")
+ (description "This package provides @code{python-vdf}, a library for
+working with Valve's VDF text format.")
+ (license license:expat)))
+
(define-public python-pygments-github-lexers
(package
(name "python-pygments-github-lexers")
@@ -7649,7 +7988,7 @@ errors when data is invalid.")
(guix build utils))
#:phases
#~(modify-phases %standard-phases
- (add-after 'prepare-python-module 'build-python-module
+ (add-after 'build 'build-python-module
(assoc-ref py:%standard-phases 'build))
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install)))
@@ -8072,6 +8411,9 @@ provides additional functionality on the produced Mallard documents.")
;; because we need libpython3.3m.so
(inputs
(list python))
+ (native-inputs
+ ;; Needed for some tests that link against it.
+ (list libxcrypt))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -8127,13 +8469,13 @@ writing C extensions for Python as easy as Python itself.")
;; Cython 3 is not officially released yet, so distinguish the name
;; for now.
(name "python-cython-next")
- (version "3.0.0b2")
+ (version "3.0.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "Cython" version))
(sha256
(base32
- "0mb7gpavs87am29sbk6yqznsybxj9dk4fwj4370j9sbrcmjq0hkc"))))
+ "1rlxscrn4bgdlbhjjikknbz5s2hyvn2rjfparry5wxnmiwyl4cw3"))))
(properties '())))
;; NOTE: when upgrading numpy please make sure that python-numba,
@@ -8442,6 +8784,47 @@ easily generalized like @dfn{compressed sparse row/column}(CSR/CSC) and
depends on @code{scipy.sparse} for some computations.")
(license license:bsd-3)))
+(define-public python-multiscale-spatial-image
+ (package
+ (name "python-multiscale-spatial-image")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "multiscale_spatial_image" version))
+ (sha256
+ (base32 "01kcagjy797hbz5an9cp8wcl5krgp21yb7ibfimvpidb3jp5lfhb"))))
+ (build-system pyproject-build-system)
+ ;; All interesting tests require file downloads over IPFS.
+ (arguments (list #:tests? #false))
+ (propagated-inputs
+ (list `(,insight-toolkit "python")
+ python-dask
+ python-dask-image
+ python-numpy
+ python-spatial-image
+ python-xarray
+ python-xarray-datatree))
+ (native-inputs
+ (list python-fsspec
+ python-hatchling
+ python-ipfsspec
+ python-jsonschema
+ python-nbmake
+ python-pooch
+ python-pytest
+ python-pytest-mypy
+ python-urllib3
+ python-zarr))
+ (home-page "https://github.com/spatial-image/multiscale-spatial-image")
+ (synopsis "Multi-dimensional spatial image data structure")
+ (description
+ "This package lets you generate a multiscale, chunked, multi-dimensional
+spatial image data structure that can serialized to OME-NGFF. Each scale is a
+scientific Python Xarray spatial-image Dataset, organized into nodes of an
+Xarray Datatree.")
+ (license license:asl2.0)))
+
(define-public python-spectra
(package
(name "python-spectra")
@@ -8653,59 +9036,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")
@@ -8976,7 +9306,8 @@ comparison.
(method url-fetch)
(uri (pypi-uri "matplotlib" version))
(sha256
- (base32 "18amhxyxa6yzy1nwky4ggdgvvxnbl3qz2lki05vfx0dqf6w7ia81"))))
+ (base32 "18amhxyxa6yzy1nwky4ggdgvvxnbl3qz2lki05vfx0dqf6w7ia81"))
+ (patches (search-patches "python-matplotlib-fix-legend-loc-best-test.patch"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -9512,6 +9843,35 @@ Python code against some of the style conventions in
@url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.")
(license license:expat)))
+(define-public python-pyct
+ (package
+ (name "python-pyct")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pyct" version))
+ (sha256
+ (base32 "1856dbrcpc0nxxhlfh3dqzz7xxn5sdi600q45hsprqyqrg2lm7yx"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; These tests want to download example data from the internet.
+ '(list "-k" (string-append
+ "not test_examples_with_use_test_data"
+ " and not test_examples_using_test_data_and_force_with_prexisting_content_in_target"
+ " and not test_fetch_data_using_test_data_with_no_file_in_data_copies_from_stubs"
+ " and not test_fetch_data_using_test_data_and_force_with_file_in_data_over_writes"))))
+ (propagated-inputs (list python-param python-pyyaml))
+ (native-inputs (list python-flake8 python-pytest))
+ (home-page "https://github.com/holoviz-dev/pyct")
+ (synopsis "Common packaging tasks")
+ (description
+ "This Python package provides utilities to run common packaging tasks,
+e.g. copy examples, fetch data, etc.")
+ (license license:bsd-3)))
+
(define-public python-multidict
(package
(name "python-multidict")
@@ -9766,6 +10126,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")
@@ -9871,7 +10253,9 @@ Python list with elements of type @code{PIL.Image} (from the
(snippet '(begin
(delete-file-recursively "src/thirdparty")))
(patches
- (search-patches "python-pillow-CVE-2022-45199.patch"))))
+ (search-patches "python-pillow-CVE-2022-45199.patch"
+ ;; Included in 10.1.0.
+ "python-pillow-use-zlib-1.3.patch"))))
(build-system python-build-system)
(native-inputs (list python-pytest))
(inputs (list freetype
@@ -10637,16 +11021,19 @@ your favourite programs.")
(define-public python-click-didyoumean
(package
(name "python-click-didyoumean")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "click-didyoumean" version))
+ (method git-fetch) ;no tests in PyPI archive
+ (uri (git-reference
+ (url "https://github.com/click-contrib/click-didyoumean")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0dc0xrmqbw0idpx843ahzzvivmvx3fcfsm3k54lnssyra7cg117i"))))
- (build-system python-build-system)
- (arguments
- `(#:tests? #f)) ; no tests in PyPI and no setup.py in github
+ (base32 "1byfqs3m87zfpvssm1al9dvq94gjd0iddpwrzk6205n18wjsphqb"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-poetry-core python-pytest))
(propagated-inputs
(list python-click))
(home-page "https://github.com/timofurrer/click-didyoumean")
@@ -11335,6 +11722,26 @@ finding unresolved symbols in Python code and their corresponding imports.")
"@code{inotify-simple} is a simple wrapper around inotify library.")
(license license:bsd-3)))
+(define-public python-interface-meta
+ (package
+ (name "python-interface-meta")
+ (version "1.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "interface_meta" version))
+ (sha256
+ (base32 "18brkmz2ssjikkrkb23cwccp683yi6y1alfdbmjvjgxpppw96i4a"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-poetry-core python-pytest))
+ (home-page "https://github.com/matthewwardrop/interface_meta")
+ (synopsis
+ "API for enforced method signatures and consistent documentation")
+ (description
+ "This package provides a convenient way to expose an extensible API with
+enforced method signatures and consistent documentation.")
+ (license license:expat)))
+
(define-public python-jaraco-classes
(package
(name "python-jaraco-classes")
@@ -11884,21 +12291,50 @@ without using the configuration machinery.")
(define-public python-treelib
(package
(name "python-treelib")
- (version "1.6.1")
+ (version "1.7.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "treelib" version))
(sha256
(base32
- "1247rv9fbb8pw3xbkbz04q3vnvvva3hcw002gp1clp5psargzgqw"))))
+ "0qgv61g1p06kzf5fd2hcim5s49nzbv8k210frnk45rmr2vs1mzwv"))))
(build-system python-build-system)
- (propagated-inputs (list python-future))
+ (propagated-inputs (list python-six))
(home-page "https://github.com/caesar0301/treelib")
(synopsis "Implementation of a tree structure in Python")
(description
"This package provides a Python implementation of a tree structure.")
(license license:asl2.0)))
+(define-public python-optree
+ (package
+ (name "python-optree")
+ (version "0.10.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/metaopt/optree")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1q3wljk7cyl5rsam02sfsj8zjrqx4c3x9vic8j6xx13p8czpsisg"))
+ (patches (search-patches "python-optree-fix-32-bit.patch"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-typing-extensions))
+ (native-inputs
+ (list python-pytest
+ python-pytest-cov
+ python-pytest-xdist
+ cmake
+ pybind11))
+ (home-page "https://github.com/metaopt/optree")
+ (synopsis "Optimized PyTree Utilities")
+ (description "This package contains operations on PyTrees (a tree made of
+container data structures in Python).")
+ (license license:asl2.0)))
+
(define-public python-jupyter-core
(package
(name "python-jupyter-core")
@@ -12468,24 +12904,31 @@ computing.")
(define-public python-urwid
(package
(name "python-urwid")
- (version "2.1.2")
+ (version "2.6.15")
(source
(origin
(method url-fetch)
(uri (pypi-uri "urwid" version))
(sha256
(base32
- "1bky2bra6673xx8jy0826znw6cmxs89wcwwzda8d025j3jffx2sq"))))
- (build-system python-build-system)
+ "06v7m5xayyglzv630qsbg7zh6k37h6k94w7x7xkdkj481lrmgk4y"))))
+ (build-system pyproject-build-system)
(arguments
(list
+ ;; XXX The test suite requires python-tornado but fails to find it
+ ;; whether or not it is available in the build environment.
+ #:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'remove-vterm-tests
;; According to Debian these tests are cursed.
;; https://salsa.debian.org/python-team/packages/urwid/-/blob/debian/2.1.2-2/debian/changelog#L141
(lambda _
- (delete-file "urwid/tests/test_vterm.py"))))))
+ (delete-file "tests/test_vterm.py"))))))
+ (propagated-inputs
+ (list python-typing-extensions python-wcwidth))
+ (native-inputs
+ (list python-setuptools-scm))
(home-page "https://urwid.org")
(synopsis "Console user interface library for Python")
(description
@@ -12699,6 +13142,7 @@ implementation of D-Bus.")
(package/inherit python-dbus
(name "python2-dbus")
(inputs `(("python" ,python-2)
+ ("libxcrypt" ,libxcrypt) ;required by Python.h
,@(alist-delete "python"
(package-inputs python-dbus))))
(arguments
@@ -13032,17 +13476,41 @@ approach.")
(version "5.32.2")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "snakemake" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snakemake/snakemake")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "13013gdavwvyj1qr9xfi9fpwhb3km8c3z53bja5b7ic3sb2z6dgz"))))
- (build-system python-build-system)
+ (base32 "0nxp4z81vykv07kv2b6zrwk7ns8s10zqsb7vcignp8695yq3nlcm"))))
+ (build-system pyproject-build-system)
(arguments
- ;; TODO: Package missing test dependencies.
(list
- #:tests? #f
+ #:test-flags
+ '(list
+ ;; We have no TES support.
+ "--ignore=tests/test_tes.py"
+ ;; This test attempts to change S3 buckets on AWS and fails
+ ;; because there are no AWS credentials.
+ "--ignore=tests/test_tibanna.py"
+ ;; It's a similar story with this test, which requires access
+ ;; to the Google Storage service.
+ "--ignore=tests/test_google_lifesciences.py")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'tabulate-compatibility
+ (lambda _
+ (substitute* "snakemake/dag.py"
+ (("\"job\": rule,")
+ "\"job\": rule.name,"))))
+ (add-after 'unpack 'patch-version
+ (lambda _
+ (substitute* "setup.py"
+ (("version=versioneer.get_version\\(\\)")
+ (format #f "version=~s" #$version)))
+ (substitute* '("snakemake/_version.py"
+ "versioneer.py")
+ (("0\\+unknown") #$version))))
;; For cluster execution Snakemake will call Python. Since there is
;; no suitable PYTHONPATH set, cluster execution will fail. We fix
;; this by calling the snakemake wrapper instead.
@@ -13050,7 +13518,9 @@ approach.")
(lambda _
(substitute* "snakemake/executors/__init__.py"
(("\\{sys.executable\\} -m snakemake")
- (string-append #$output "/bin/snakemake"))))))))
+ (string-append #$output "/bin/snakemake")))))
+ (add-before 'check 'pre-check
+ (lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
(list python-appdirs
python-configargparse
@@ -13068,6 +13538,12 @@ approach.")
python-requests
python-toposort
python-wrapt))
+ (native-inputs
+ (list git-minimal
+ python-wrapper
+ python-pytest
+ python-pandas
+ python-requests-mock))
(home-page "https://snakemake.readthedocs.io")
(synopsis "Python-based execution environment for make-like workflows")
(description
@@ -13106,6 +13582,11 @@ Python style, together with a fast and comfortable execution environment.")
(substitute* "snakemake/executors/__init__.py"
(("\\{sys.executable\\} -m snakemake")
(string-append #$output "/bin/snakemake")))))
+ (add-after 'unpack 'tabulate-compatibility
+ (lambda _
+ (substitute* "snakemake/dag.py"
+ (("\"job\": rule,")
+ "\"job\": rule.name,"))))
(add-after 'unpack 'patch-version
(lambda _
(substitute* "setup.py"
@@ -13197,6 +13678,12 @@ Python style, together with a fast and comfortable execution environment.")
(string-append
"tibanna_args.command = command.replace('"
#$output "/bin/snakemake', 'python3 -m snakemake')")))))
+ ;; No longer needed with 7.15.2+
+ (add-after 'unpack 'tabulate-compatibility
+ (lambda _
+ (substitute* "snakemake/dag.py"
+ (("\"job\": rule,")
+ "\"job\": rule.name,"))))
(add-after 'unpack 'patch-version
(lambda _
(substitute* "setup.py"
@@ -13763,30 +14250,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")
@@ -14026,22 +14523,6 @@ validate this input and generate a PEP 643-compliant metadata
file (e.g. @file{PKG-INFO}).")
(license license:expat)))
-(define-public python-pyproject-metadata-0.7
- (package
- (inherit python-pyproject-metadata)
- (name "python-pyproject-metadata")
- (version "0.7.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/FFY00/python-pyproject-metadata")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0yvs59ymz5gdix34a95wxlxvk9bnvjgrzsnmnc3ws7whpfv3yasm"))))))
-
;; pep621 was renamed to pyproject-metadata.
(define-public python-pep621
(deprecated-package "python-pep621" python-pyproject-metadata))
@@ -15502,14 +15983,14 @@ tasks, sockets, files, locks, and queues.")
(define-public python-tables
(package
(name "python-tables")
- (version "3.6.1")
+ (version "3.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tables" version))
(sha256
(base32
- "0j8vnxh2m5n0cyk9z3ndcj5n1zj5rdxgc1gb78bqlyn2lyw75aa9"))
+ "1zp1qmas4pgcag9sn0gwd40c6ibn9bg056d6ckjq7agjsrx8hap9"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -15566,7 +16047,8 @@ tasks, sockets, files, locks, and queues.")
(string-append "--hdf5="
(assoc-ref inputs "hdf5"))))))))
(propagated-inputs
- (list python-numexpr python-numpy))
+ (list python-numexpr python-numpy python-packaging
+ python-py-cpuinfo))
(native-inputs
(list python-cython pkg-config))
(inputs
@@ -15669,17 +16151,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
@@ -15688,9 +16167,24 @@ 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"))
+ (revision "2"))
(package
(name "wfetch")
(version (git-version "0.1-pre" revision commit))
@@ -15718,7 +16212,10 @@ structures.")
(mkdir-p share)
(substitute* "wfetch/wfetch.py"
(("os.sep, 'opt', 'wfetch'") (string-append "'" share "'")))
- (install-file "wfetch/wfetch.py" bin)
+ ; The documentation expects the executable to be named
+ ; 'wfetch', not 'wfetch.py'.
+ (rename-file "wfetch/wfetch.py" "wfetch/wfetch")
+ (install-file "wfetch/wfetch" bin)
(copy-recursively "wfetch/icons" share)))))))
(inputs (list python-pyowm python-fire python-termcolor python-requests))
(synopsis "Command-line tool to display weather info")
@@ -15765,13 +16262,13 @@ your package is installed, via @code{pkg_resources} (part of
(define-public python-filetype
(package
(name "python-filetype")
- (version "1.0.8")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "filetype" version))
(sha256
- (base32 "05mkinkcn36v1cnb5hzay3zxmv7jmmflckxxp08rgzbkkf3i9pvp"))))
+ (base32 "1nxa91szfbhhbhvdwj06jz8zghzwgb9lf0v6aj61vx2b8zb6rdb6"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -16281,24 +16778,49 @@ a hash value.")
(define-public python-termcolor
(package
(name "python-termcolor")
- (version "1.1.0")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "termcolor" version))
(sha256
(base32
- "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x"))))
- (build-system python-build-system)
+ "0ykvmjrsjr5w4h63x7qmx6rsdb1p5a4nv8wgg7nl3b688xhfbfda"))))
+ (build-system pyproject-build-system)
(arguments
- ;; There are no tests.
- `(#:tests? #f))
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'fix-pyproject
+ (lambda _
+ ;; The build system doesn't like to hear of Python 3.13.
+ (substitute* "pyproject.toml"
+ ((" \"Programming Language .*") "")))))))
+ (native-inputs
+ (list python-hatch-vcs
+ python-hatchling
+ python-pytest
+ python-pytest-cov))
(home-page "https://pypi.org/project/termcolor/")
(synopsis "ANSII Color formatting for terminal output")
(description
"This package provides ANSII Color formatting for output in terminals.")
(license license:expat)))
+(define-public python-termcolor-1
+ (package
+ (inherit python-termcolor)
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "termcolor" version))
+ (sha256
+ (base32
+ "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x"))))
+ ;; There are no tests
+ (arguments (list #:tests? #false))))
+
(define-public python-terminaltables
(package
(name "python-terminaltables")
@@ -16651,7 +17173,7 @@ JSON Reference and JSON Pointer.")
(define-public python-fastbencode
(package
(name "python-fastbencode")
- (version "0.0.7")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
@@ -16660,7 +17182,7 @@ JSON Reference and JSON Pointer.")
;; Delete pre-generated Cython C files.
(snippet '(for-each delete-file (find-files "." "\\.c$")))
(sha256
- (base32 "1r66w3vpmvfmssshjpgqaj2m14c8p94nymr96mwn61idajz9mg5n"))))
+ (base32 "15x1in22gwam7wwga5lbj1pd8hc9jk741pia3pv1m29n2xywpq2z"))))
(build-system python-build-system)
(native-inputs (list python-cython))
(home-page "https://github.com/breezy-team/fastbencode")
@@ -17636,15 +18158,17 @@ connection pool.")
(define-public python-argparse-manpage
(package
(name "python-argparse-manpage")
- (version "1.1")
+ (version "4.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "argparse-manpage" version))
(sha256
(base32
- "0blh31zns68anina9lba5wh81d1414s97p60zw5l0d0shhh0wj5p"))))
- (build-system python-build-system)
+ "1nq4sq1zk1xzdsqq61hd27jhj978ys136aba1zjg02x1g0c0cg11"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-pytest python-tomli))
(home-page "https://github.com/praiskup/argparse-manpage")
(synopsis "Build manual page from Python's ArgumentParser object")
(description
@@ -17743,7 +18267,7 @@ for atomic file system operations.")
(define-public python-qstylizer
(package
(name "python-qstylizer")
- (version "0.1.10")
+ (version "0.2.3")
(source
(origin
(method git-fetch)
@@ -17752,25 +18276,22 @@ for atomic file system operations.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0zvkn6g1dn51kkw33v8qrlnwlmf5h6sw1ay3bh14ifjr8b9xsjjz"))))
- (build-system python-build-system)
+ (base32 "1n11f63pbqzmb7sj9cj0jq9kv8sfinjqhg7fs0mnfsrici8435br"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:test-target "pytest"
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'set-pbr-version
- (lambda _
- (setenv "PBR_VERSION" "3.0.1"))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-pbr-version
+ (lambda _
+ (setenv "PBR_VERSION" "3.0.1"))))))
(native-inputs
(list python-pbr
python-pytest
python-pytest-catchlog
- python-pytest-cov
- python-pytest-mock
- python-pytest-runner
- python-pytest-xdist))
+ python-pytest-mock))
(propagated-inputs
- (list python-inflection python-tinycss))
+ (list python-inflection python-tinycss2))
(home-page "https://github.com/blambright/qstylizer")
(synopsis "Qt stylesheet generation utility for PyQt/PySide")
(description "@code{qstylizer} is a Python package designed to help with
@@ -17819,14 +18340,16 @@ applications.")
(package
(name "python-click-default-group")
(version "1.2.4")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "click_default_group" version))
- (sha256
- (base32
- "07i5w47lbihcb3cvs08vynz725z9skvhhzrarnk6qi8dxjckqgzb"))))
+ (source
+ (origin
+ (method git-fetch) ; no tests in PyPI release
+ (uri (git-reference
+ (url "https://github.com/click-contrib/click-default-group")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06h12qwg0lhvxlgfm9768afibwp8j6r3r440v630a30bv0nkhngm"))))
(build-system pyproject-build-system)
- (arguments (list #:tests? #false)) ;there are none
(propagated-inputs
(list python-click))
(native-inputs
@@ -18056,45 +18579,24 @@ with a new public API, and RPython support.")
(define-public python-hy
(package
(name "python-hy")
- (version "0.26.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 "1czhh7s81sg0nrnf4zv0ydqi4f7s6sywf4ks4fd59vpx441ca39v"))))
- (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 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
@@ -18866,16 +19368,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
@@ -18906,13 +19411,13 @@ designed to work across multiple versions of Python.")
(define-public python-cookiecutter
(package
(name "python-cookiecutter")
- (version "2.5.0")
+ (version "2.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cookiecutter" version))
(sha256
- (base32 "1v1iafk8j2f5cciw9mf4263v91070c6z049cpnw42gwffhs907p6"))))
+ (base32 "0762882zrvf3sslr9r7v8wkdwjckhm2clj4d831gvx54kqbgh8fv"))))
(build-system python-build-system)
(arguments
(list
@@ -19109,13 +19614,13 @@ applications.")
(define-public python-kombu
(package
(name "python-kombu")
- (version "5.3.6")
+ (version "5.3.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "kombu" version))
(sha256
- (base32 "1n9i4hj1h3aivgy82l7accyjh1rqn20am00152l5syhl19bmpnpk"))))
+ (base32 "1gwp3b7w7jhsas40655pa9nlblm12irjapfkx0flmhamlgclq701"))))
(build-system pyproject-build-system)
(arguments
(list #:test-flags
@@ -19172,13 +19677,13 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
(define-public python-celery
(package
(name "python-celery")
- (version "5.3.6")
+ (version "5.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "celery" version))
(sha256
- (base32 "1fdacw13ij94s59l6lspl09iv6fc8h1p6399jz1h00kwfcfwf347"))))
+ (base32 "01p7lyydhqk7fna5zn49qxj3yk0xah63725dmkajjc4d1qa1jjjh"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -19200,6 +19705,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
(list python-case
python-dnspython
python-flaky
+ python-google-cloud-storage
python-iniconfig
python-moto
python-msgpack
@@ -19619,7 +20125,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
@@ -19629,23 +20135,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
@@ -19845,7 +20347,12 @@ for Python inspired by modern web development.")
(file-name (git-file-name name version))
(sha256
(base32
- "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx"))))
+ "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx"))
+ (modules '((guix build utils)))
+ ;; Adjust expected output for file@5.45.
+ (snippet #~(substitute* "test/libmagic_test.py"
+ (("PDF document, version 1\\.2, 2 pages")
+ "PDF document, version 1.2, 2 page(s)")))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@@ -19864,7 +20371,7 @@ for Python inspired by modern web development.")
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
;; The test suite mandates this variable.
- (setenv "LC_ALL" "en_US.UTF-8")
+ (setenv "LC_ALL" "C.UTF-8")
(if tests?
(with-directory-excursion "test"
(invoke "python" "./libmagic_test.py"))
@@ -20486,18 +20993,15 @@ It uses LR parsing and does extensive error checking.")
(define-public python-tabulate
(package
(name "python-tabulate")
- (version "0.8.9")
+ (version "0.9.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "tabulate" version))
(sha256
(base32
- "19qkdz8xwk5jxa5xn53mnk76qnh4ysm81vzj664jw1b0azr167gb"))))
- (build-system python-build-system)
- (arguments
- ;; FIXME: The pypi release tarball is missing a 'test/common.py'
- ;; and the latest release is not tagged in the upstream repository.
- '(#:tests? #f))
+ "0g4b0qnbw55igbpxfxzciqvb6w8ncw4gmcgyq0lyavcnylmv3580"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-setuptools-scm))
(home-page "https://bitbucket.org/astanin/python-tabulate")
(synopsis "Pretty-print tabular data")
(description
@@ -21194,18 +21698,16 @@ inspection of types defined in the Python standard typing module.")
(define-public python-lazy-loader
(package
(name "python-lazy-loader")
- (version "0.3")
+ (version "0.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "lazy_loader" version))
(sha256
(base32
- "0dwghffnsjjf4pi4gwbl43rx04jmap375hdamafs5cpm6j78js1v"))))
+ "1lacaz292qxpgw6kxiirkx6sv9c5883nq4ssm3hs94cvb2153is7"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pre-commit
- python-pytest
- python-pytest-cov))
+ (list python-numpy python-pytest))
(propagated-inputs
(list python-flit-core))
(home-page "https://scientific-python.org/specs/spec-0001/")
@@ -22388,7 +22890,10 @@ implementation of your Python package and its public API surface.")
(when tests?
(invoke "pytest" "-v")))))))
(native-inputs
- (list python-hypothesis python-pytest-cov python-pytest-mock
+ (list glibc-utf8-locales ;; Tests want en_US.UTF-8
+ python-hypothesis
+ python-pytest-cov
+ python-pytest-mock
python-pytest))
(propagated-inputs ; TODO: Add python-fastnumbers.
(list python-pyicu))
@@ -22408,13 +22913,13 @@ numbers, real numbers, mixed types and more, and comes with a shell command
(define-public glances
(package
(name "glances")
- (version "3.4.0.3")
+ (version "4.1.1")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "Glances" version))
+ (uri (pypi-uri "glances" version))
(sha256
- (base32 "0pf8hxbgwkhv8l5frg61b073vscz5a7bz1al7xhn36fvh10xbcg7"))
+ (base32 "10yjwbmwv2x4x1n3hr1631m8l6l9w8fa7rnvfz1vmzkjs199ihib"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -22428,7 +22933,7 @@ numbers, real numbers, mixed types and more, and comes with a shell command
#t))))
(build-system python-build-system)
(propagated-inputs
- (list python-defusedxml python-future python-packaging python-psutil python-ujson))
+ (list python-defusedxml python-orjson python-packaging python-psutil))
(home-page "https://github.com/nicolargo/glances")
(synopsis "Cross-platform curses-based monitoring tool")
(description
@@ -22621,7 +23126,7 @@ OpenSSH Server for example.")
(define-public python-pyelftools
(package
(name "python-pyelftools")
- (version "0.29")
+ (version "0.30")
(home-page "https://github.com/eliben/pyelftools")
(source
(origin
@@ -22630,7 +23135,7 @@ OpenSSH Server for example.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1mi7i9zlhkkap4q50ciak57ia46mj2jzq0713m3dh0x8j05k9xml"))
+ (base32 "0gk47mq5cqv6qz35aydn67wma5m70gv5f9f6pg38zny6vsfavmq3"))
(snippet
;; Delete bundled readelf executable.
'(delete-file "test/external_tools/readelf"))))
@@ -22647,9 +23152,9 @@ OpenSSH Server for example.")
(synopsis
"Analyze binary and library file information")
(description "This Python library provides interfaces for parsing and
- analyzing two binary and library file formats ; the Executable and Linking
- Format (ELF), and debugging information in the Debugging With Attributed
- Record Format (DWARF).")
+analyzing two binary and library file formats ; the Executable and Linking
+Format (ELF), and debugging information in the Debugging With Attributed
+Record Format (DWARF).")
(license license:public-domain)))
(define-public python-pefile
@@ -22938,23 +23443,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
@@ -22973,11 +23487,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
@@ -23028,6 +23543,47 @@ system.")
;; Can be used with either license.
(license (list license:asl2.0 license:gpl2+))))
+(define-public python-dunamai
+ (package
+ (name "python-dunamai")
+ (version "1.21.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "dunamai" version))
+ (sha256
+ (base32 "1i35i8ym6n8mpgrq31hivrvfciy12gv26jwlzimmkx9jy2spz0h5"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "-k" "not test__version__from_git__shallow")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; These steps are taked from NixOS package definition:
+ ;; nixpkgs/pkgs/development/python-modules/dunamai/default.nix
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "PATH" (string-append #$output "/bin:" (getenv "PATH")))
+ (setenv "HOME" "/tmp")
+ (invoke "git" "config" "--global" "user.email" "nobody@example.com")
+ (invoke "git" "config" "--global" "user.name" "Nobody"))))))
+ (propagated-inputs
+ (list python-packaging))
+ (native-inputs
+ (list git-minimal
+ python-poetry-core
+ python-pytest))
+ (home-page "https://github.com/mtkennerly/dunamai")
+ (synopsis "Dynamic version generation")
+ (description
+ "Dunamai is Python library and command line tool for producing dynamic,
+standards-compliant version strings, derived from tags in your version control
+system. This facilitates uniquely identifying nightly or per-commit builds in
+continuous integration and releasing new versions of your software simply by
+creating a tag.")
+ (license license:expat)))
+
(define-public python-pbkdf2
(package
(name "python-pbkdf2")
@@ -24343,6 +24899,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")
@@ -25476,14 +26061,14 @@ objects on other machines, also known as remote procedure calls (RPC).")
(define-public python-phonenumbers
(package
(name "python-phonenumbers")
- (version "8.9.1")
+ (version "8.13.37")
(source
(origin
(method url-fetch)
(uri (pypi-uri "phonenumbers" version))
(sha256
(base32
- "03fmrgb4r8x3ykmddjs9i3zhs703in8smikj3a6447blqpimwyh1"))))
+ "1whw3p0p90x1iyw5cqf2pval90zy20c26ry3ywb0bsls2pnmycdx"))))
(build-system python-build-system)
(home-page
"https://github.com/daviddrysdale/python-phonenumbers")
@@ -25923,6 +26508,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")
@@ -25938,11 +26524,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")
@@ -26160,6 +26747,41 @@ and SML. @code{more-itertools} includes additional building blocks for
working with iterables.")
(license license:expat)))
+;; Needed for python-yt, older version fails with exception: E ImportError:
+;; cannot import name 'mark_ends' from 'more_itertools'
+;; (<...>more_itertools/__init__.py)
+(define-public python-more-itertools-next
+ (package
+ (inherit python-more-itertools)
+ (name "python-more-itertools")
+ (version "10.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "more-itertools" version))
+ (sha256
+ (base32
+ "1q9rq9g026m4wl6ki2q8pw7xbc02vl34qqw702h9jgixqj0b9k4g"))
+ (snippet
+ ;; distutils.errors.DistutilsOptionError: No configuration found for
+ ;; dynamic 'description'. Some dynamic fields need to be specified via
+ ;; `tool.setuptools.dynamic`others must be specified via the equivalent
+ ;; attribute in `setup.py`.
+ '(delete-file "setup.py"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python" "-m" "unittest")))))))
+ (native-inputs
+ (list python-flit-core))
+ (propagated-inputs
+ (list python-six))))
+
(define-public python-latexcodec
(package
(name "python-latexcodec")
@@ -26833,18 +27455,52 @@ inferring type information using compile-time introspection.")
(define-public python-pooch
(package
(name "python-pooch")
- (version "1.3.0")
+ (version "1.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pooch" version))
(sha256
- (base32 "1618adsg9r8fsv422sv35z1i723q3a1iir5v7dv2sklh4pl4im1h"))))
- (build-system python-build-system)
+ (base32 "0w32fhfp67k0ip0gxjpw8kxdx9ghybxmqkv9sbwy99nrgl4n7vr7"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:tests? #f)) ;requires online data
- (propagated-inputs
- (list python-appdirs python-packaging python-requests))
+ (list
+ #:test-flags
+ '(list "-k"
+ (string-append
+ ;; We don't have the test archives
+ "not test_decompress"
+ " and not test_multiple_unpacking"
+ " and not test_unpack_members_with_leading_dot"
+ " and not test_unpacking"
+ " and not test_unpacking_members_then_no_members"
+ " and not test_unpacking_wrong_members_then_no_members"
+ ;; These all require access to the internet
+ " and not test_check_availability"
+ " and not test_check_availability_invalid_downloader"
+ " and not test_check_availability_on_ftp"
+ " and not test_create_and_fetch"
+ " and not test_downloader_arbitrary_progressbar"
+ " and not test_fetch_with_downloader"
+ " and not test_figshare_data_repository_versions"
+ " and not test_load_registry_from_doi"
+ " and not test_pooch_corrupted"
+ " and not test_pooch_custom_url"
+ " and not test_pooch_download"
+ " and not test_pooch_download_retry"
+ " and not test_pooch_download_retry_fails_eventually"
+ " and not test_pooch_download_retry_off_by_default"
+ " and not test_pooch_logging_level"
+ " and not test_pooch_update"
+ " and not test_retrieve"
+ " and not test_retrieve_default_path"
+ " and not test_retrieve_fname"
+ " and not test_stream_download")
+ "--ignore=pooch/tests/test_downloaders.py")))
+ (propagated-inputs
+ (list python-packaging python-platformdirs python-requests))
+ (native-inputs
+ (list python-pytest python-setuptools-scm))
(home-page "https://github.com/fatiando/pooch")
(synopsis "Manage your Python library's sample data files")
(description
@@ -27200,7 +27856,37 @@ validation testing and application logic.")
;; This one test fails because a deprecation warning is printed.
(substitute* "numba/tests/test_import.py"
(("def test_no_accidental_warnings")
- "def disabled_test_no_accidental_warnings"))))
+ "def disabled_test_no_accidental_warnings"))
+ ;; Some tests timeout or crash on some architectures.
+ ,@(cond
+ ((target-aarch64?)
+ `((substitute* "numba/tests/test_sets.py"
+ (("def test_add_discard")
+ "def disabled_test_add_discard")
+ (("def test_isdisjoint")
+ "def disabled_test_isdisjoint")
+ (("def test_issubset")
+ "def disabled_test_issubset")
+ (("def test_issuperset")
+ "def disabled_test_issuperset")
+ (("def test_remove_error")
+ "def disabled_test_remove_error"))))
+ ((target-ppc64le?)
+ `((substitute* "numba/tests/test_mathlib.py"
+ (("def test_ldexp")
+ "def disabled_test_ldexp"))))
+ ((target-arm32?)
+ ;; Armhf emulation on aarch64 using armv8 machines returns
+ ;; 'armv8l' from platform.machine() and won't skip some tests.
+ ;; Fix borrowed from an upstream bug report:
+ ;; https://github.com/numba/numba/issues/6345#issuecomment-764993001
+ `((substitute* '("numba/tests/support.py"
+ "numba/tests/test_dispatcher.py")
+ (("platform\\.machine\\(\\) == 'armv7l'")
+ (string-append
+ "platform.machine().startswith('armv') and "
+ "int(platform.machine()[len('armv'):-1]) >= 7")))))
+ (#t '()))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
@@ -27365,7 +28051,7 @@ N-dimensional arrays for Python.")
(define-public python-anndata
(package
(name "python-anndata")
- (version "0.8.0")
+ (version "0.10.7")
(source
(origin
;; The tarball from PyPi doesn't include tests.
@@ -27376,29 +28062,39 @@ N-dimensional arrays for Python.")
(file-name (git-file-name name version))
(sha256
(base32
- "0v7npqrg1rdm8jzw22a45c0mqrmsv05r3k88i3lhzi0pzzxca1i1"))))
+ "1i08rm1xnsnq12rjv4virgdx61bra1gsfagjdq0kcpz8npxqa0as"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
- '(list "-k" "not concatenation.rst")
+ '(list "-k" (string-append "not concatenation.rst"
+ ;; fixture 'mocker' not found
+ " and not test_consecutive_bool"))
#:phases
#~(modify-phases %standard-phases
;; Doctests require scanpy from (gnu packages bioinformatics)
(add-after 'unpack 'disable-doctests
(lambda _
+ (substitute* "conftest.py"
+ (("import pytest")
+ (string-append "import pytest\nimport _pytest\n"))
+ (("pytest.DoctestItem")
+ "_pytest.doctest.DoctestItem"))
(substitute* "pyproject.toml"
(("--doctest-modules") ""))))
(add-before 'build 'set-version
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)
- (substitute* "anndata/_metadata.py"
- (("__version__ =.*")
- (string-append "__version__ = \"" #$version "\"\n")))
;; ZIP does not support timestamps before 1980.
- (setenv "SOURCE_DATE_EPOCH" "315532800"))))))
+ (setenv "SOURCE_DATE_EPOCH" "315532800")))
+ ;; Numba needs a writable dir to cache functions.
+ (add-before 'check 'set-numba-cache-dir
+ (lambda _
+ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
(propagated-inputs
- (list python-h5py
+ (list python-array-api-compat
+ python-exceptiongroup ;only for Python <3.11
+ python-h5py
python-importlib-metadata
python-natsort
python-numcodecs
@@ -27408,9 +28104,18 @@ N-dimensional arrays for Python.")
python-scikit-learn
python-zarr))
(native-inputs
- (list python-boltons
+ (list python-awkward
+ python-boltons
+ python-dask
+ python-distributed
+ python-hatchling
+ python-hatch-vcs
python-joblib
+ python-loompy
+ python-matplotlib
python-pytest
+ python-pytest-doctestplus
+ python-pytest-xdist
python-toml
python-flit
python-setuptools-scm))
@@ -27756,22 +28461,17 @@ they use the same path.")
(define-public python-partd
(package
(name "python-partd")
- (version "1.2.0")
+ (version "1.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "partd" version))
(sha256
(base32
- "1sy3vdfyyx3bc5590zb7gwpsmimqz8m992x9hsydq8nmhixqjrxa"))))
+ "0rvz2si6lbyhk7hj804gilq2y2bfdi33q81iwwkmgskgkva5vhjn"))))
(build-system pyproject-build-system)
(propagated-inputs
- (list python-blosc
- python-locket
- python-numpy
- python-pandas
- python-pyzmq
- python-toolz))
+ (list python-locket python-numpy python-pandas python-pyzmq python-toolz))
(home-page "https://github.com/dask/partd/")
(synopsis "Appendable key-value storage")
(description "Partd stores key-value pairs. Values are raw bytes. We
@@ -27826,16 +28526,16 @@ decisions with any given backend.")
(define-public python-dask
(package
(name "python-dask")
- (version "2023.7.0")
+ (version "2024.4.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dask/dask/")
- (commit "8523b3bae2ec0183d9d92cc536a3405f15189b7e")))
+ (commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1x617m0jlc63v938kqga9mhflhac3aj1ylq5mkpf2g9pd9x2hcbz"))))
+ (base32 "1kaxlvqd5hknlb0awck5vcw9b18nl8rpxx4j78js8p9d0y5rsgw8"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -27843,9 +28543,24 @@ decisions with any given backend.")
#:test-flags
#~(list "-n" "auto"
"-m" "not gpu and not slow and not network"
+ ;; These all fail with different hashes. Doesn't seem
+ ;; problematic.
+ "--ignore-glob=**/test_tokenize.py"
+ ;; ORC tests crash Python with a failure to find the global
+ ;; localtime file. See also
+ ;; https://github.com/apache/arrow/issues/40633.
+ "--ignore-glob=**/test_orc.py"
"-k" (string-append
;; This one cannot be interrupted.
"not test_interrupt"
+ ;; This one fails with "local variable 'ctx' referenced
+ ;; before assignment". Maybe enable this in later
+ ;; versions (or when pandas has been upgraded.
+ " and not test_dt_accessor"
+ ;; This fails when dask-expr is among the inputs.
+ " and not test_groupby_internal_repr"
+ ;; This fails with different job ids.
+ " and not test_to_delayed_optimize_graph"
;; This one expects a deprecation warning that never
;; comes.
" and not test_RandomState_only_funcs")
@@ -27880,11 +28595,17 @@ parentdir_prefix = dask-
;; This option is not supported by our version of pytest.
(substitute* "pyproject.toml"
(("--cov-config=pyproject.toml") ""))))
+ (add-after 'unpack 'patch-pyproject
+ (lambda _
+ ;; We use pyarrow > 14
+ (substitute* "pyproject.toml"
+ (("\"pyarrow_hotfix\",") ""))))
(add-before 'check 'pre-check
(lambda _ (chdir "/tmp"))))))
(propagated-inputs
(list python-click ;needed at runtime
python-cloudpickle
+ python-dask-expr
python-fsspec
python-importlib-metadata ;needed at runtime for dask/_compatibility.py
python-numpy
@@ -27911,6 +28632,66 @@ larger-than-memory or distributed environments. These parallel collections
run on top of the dynamic task schedulers.")
(license license:bsd-3)))
+(define-public python-dask/bootstrap
+ (package
+ (inherit python-dask)
+ (properties '((hidden? . #true)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-dask)
+ ((#:tests? _ #t) #f)))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-dask)
+ (delete "python-dask-expr")))))
+
+(define-public python-dask-image
+ (package
+ (name "python-dask-image")
+ (version "2023.8.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "dask-image" version))
+ (sha256
+ (base32 "1dh49lvirf5fbgq5hw1c4972czg5w12fg9y689cinyjjn22qk6jy"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; Flake8 attribute errors.
+ '(list "--ignore=dask_image/ndfilters/_threshold.py"
+ "--ignore=dask_image/ndfourier/_utils.py"
+ "--ignore=dask_image/ndinterp/__init__.py"
+ "--ignore=dask_image/ndmeasure/__init__.py"
+ "--ignore=dask_image/ndmeasure/_utils/_find_objects.py"
+ "--ignore=dask_image/ndmeasure/_utils/_label.py"
+ "--ignore=tests/test_dask_image/test_ndfilters/test__conv.py"
+ "--ignore=tests/test_dask_image/test_ndfourier/test_core.py"
+ "--ignore=tests/test_dask_image/test_ndinterp/test_spline_filter.py"
+ "--ignore=tests/test_dask_image/test_ndmeasure/test_core.py"
+ "--ignore=tests/test_dask_image/test_ndmeasure/test_find_objects.py")))
+ (propagated-inputs (list python-dask
+ python-numpy
+ python-pandas-2
+ python-pims
+ python-scipy
+ python-tifffile))
+ (native-inputs
+ (list python-pytest-flake8 python-pytest))
+ (home-page "https://github.com/dask/dask-image")
+ (synopsis "Distributed image processing")
+ (description "This is a package for image processing with Dask arrays.
+Features:
+
+@itemize
+@item Provides support for loading image files.
+@item Implements commonly used N-D filters.
+@item Includes a few N-D Fourier filters.
+@item Provides some functions for working with N-D label images.
+@item Supports a few N-D morphological operators.
+@end itemize
+")
+ (license license:bsd-3)))
+
(define-public python-ilinkedlist
(package
(name "python-ilinkedlist")
@@ -28743,7 +29524,7 @@ time-or-computationally-expensive properties quick and easy and works in Python
(define-public python-folium
(package
(name "python-folium")
- (version "0.13.0")
+ (version "0.16.0")
(source
(origin
;; PyPI has a ".whl" file but not a proper source release.
@@ -28754,12 +29535,46 @@ time-or-computationally-expensive properties quick and easy and works in Python
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "00adpdi1890zzzg7ffp04hmx59igdcdpyqa129vnmwqh54b5a006"))))
- (build-system python-build-system)
+ (base32 "1dbndpqpd7c5pmc58yxz7m6bsll377fz7xqpzh58wm0hjn6ylc00"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags
+ ;; This file requires Selenium.
+ #~(list "--ignore" "tests/selenium/test_selenium.py"
+ "-k" (string-append
+ ;; The tests below also require Selenium.
+ "not test__repr_png_is_bytes"
+ " and not test_valid_png"
+ " and not test_valid_png_size"
+ " and not test_geojson"
+ " and not test_heat_map_with_weights"
+ ;; This performs an online request.
+ " and not test_json_request"
+ ;; AssertionError.
+ " and not test_minimap"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; The version string is usually derived via setuptools-scm,
+ ;; but without the git metadata available, the version string
+ ;; is set to '0.0.0'.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
+ #$(package-version this-package)))))))
(propagated-inputs
- (list python-branca python-jinja2 python-numpy python-requests))
+ (list python-branca
+ python-jinja2
+ python-numpy
+ python-requests
+ python-xyzservices))
(native-inputs
- (list python-pytest))
+ (list python-geopandas
+ python-nbconvert
+ python-pandas
+ python-pillow
+ python-pytest
+ python-selenium
+ python-setuptools-scm))
(home-page "https://github.com/python-visualization/folium")
(synopsis "Make beautiful maps with Leaflet.js & Python")
(description "@code{folium} makes it easy to visualize data that’s been
@@ -29927,14 +30742,14 @@ an upload option to send your work back to the platform.")
(define-public python-titlecase
(package
(name "python-titlecase")
- (version "2.4")
+ (version "2.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "titlecase" version))
(sha256
(base32
- "00h92jdpj108z4sb6dpayfblpax20698290jnbyi5z5iwk5974i6"))))
+ "1x9myq3rlbw6wh946ncch8px7wyabhzacy2fjji13nmvrivs50vx"))))
(build-system python-build-system)
(home-page "https://github.com/ppannuto/python-titlecase")
(synopsis "Capitalize strings similar to book titles")
@@ -30862,7 +31677,7 @@ accessor layer.")
(define-public pyzo
(package
(name "pyzo")
- (version "4.15.0")
+ (version "4.16.0")
(source
(origin
(method git-fetch)
@@ -30872,7 +31687,7 @@ accessor layer.")
(file-name (git-file-name name version))
(sha256
(base32
- "0m2sp65q21hhlfkvyby4sjc8cmwv3l0avw42xsna8za8ax9xadxr"))))
+ "18775dhd5z7l505khrh1vsv5w1x1icshv34av8bbhfj8dz8nvgx5"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -31680,6 +32495,106 @@ a console. It provides a collection of ‘print’ functions that allow you to
cleanly print different types of messages.")
(license license:gpl3+)))
+(define-public python-userpath
+ (package
+ (name "python-userpath")
+ (version "1.9.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "userpath" version))
+ (sha256
+ (base32 "05fqxzdi27vqm5lywxs6bm2j4d8k91fx2ihqhg65g4h6mf6jhlkc"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; See https://github.com/ofek/userpath/issues/43.
+ ;; In Guix, tests try to find the temporary build directory in PATH, but
+ ;; only the store output is present.
+ (list #:tests? #f))
+ (native-inputs (list python-hatchling python-pytest))
+ (propagated-inputs (list python-click))
+ (home-page "https://github.com/ofek/userpath")
+ (synopsis "Add locations to the user's PATH")
+ (description "This package provides a tool for modifying a user's PATH.")
+ (license license:expat)))
+
+(define-public hatch
+ (package
+ (name "hatch")
+ (version "1.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "hatch" version))
+ (sha256
+ (base32 "0ipvj1pxdb6wb1sblh22h9gnh6byjnwcl7hfcnk88dmkslgp1z3s"))
+ (modules '((guix build utils)))
+ (snippet '(substitute* "pyproject.toml"
+ ;; We have virtualenv 20.3.1.
+ (("virtualenv>=20.16.2")
+ "virtualenv>=20.3.1")))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; XXX: tests below fail due to zipfile reporting incorrect zip dates.
+ #~(list "-k"
+ (string-append
+ "not "
+ (string-join
+ (list "test_default"
+ "test_explicit_path"
+ "test_editable_default"
+ "test_editable_default_dependencies"
+ "test_editable_default_force_include"
+ "test_editable_default_force_include_option"
+ "test_editable_exact"
+ "test_editable_exact_extra_dependencies"
+ "test_editable_exact_force_include"
+ "test_editable_exact_force_include_option"
+ "test_editable_exact_force_include_build_data_precedence"
+ "test_editable_pth")
+ " and not ")))
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
+ (native-inputs (list git-minimal
+ python-pytest
+ python-pytest-mock
+ python-pytest-xdist))
+ (propagated-inputs (list python-click
+ python-hatchling
+ python-httpx
+ python-hyperlink
+ python-keyring
+ python-packaging
+ python-pexpect
+ python-platformdirs
+ python-pyperclip
+ python-rich
+ python-shellingham
+ python-tomli-w
+ python-tomlkit
+ python-userpath
+ python-virtualenv))
+ (home-page "https://hatch.pypa.io/latest/")
+ (synopsis "Python project management")
+ (description "Hatch is a modern, extensible Python project manager.
+
+Features
+
+@itemize
+@item Standardized build system with reproducible builds by default
+@item Robust environment management with support for custom scripts
+@item Configurable Python distribution management
+@item Easy publishing to PyPI or other indexes
+@item Version management
+@item Configurable project generation with sane defaults
+@item Responsive CLI, ~2-3x faster than equivalent tools
+@end itemize")
+ (license license:expat)))
+
(define-public python-nestedtext
(package
(name "python-nestedtext")
@@ -31790,6 +32705,48 @@ heterogeneous and multi-platform clusters (including clusters running other
applications with variable CPU loads).")
(license license:bsd-3)))
+(define-public python-param
+ (package
+ (name "python-param")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "param" version))
+ (sha256
+ (base32 "07z7az7xg8pzjrmaf928is7n6siw9v9nxfmf0a5vgqj7nl40pcx7"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-cloudpickle
+ python-coverage
+ python-hatchling
+ python-hatch-vcs
+ python-ipython
+ python-jsonschema
+ python-nbval
+ python-nest-asyncio
+ python-numpy
+ python-odfpy
+ python-openpyxl
+ python-pandas
+ python-pyarrow
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-xdist
+ python-tables
+ python-xlrd))
+ (home-page "https://param.holoviz.org/")
+ (synopsis
+ "Make your Python code clearer and more reliable by declaring Parameters")
+ (description
+ "Param is a library for handling all the user-modifiable parameters,
+arguments, and attributes that control your code. It provides automatic,
+robust error-checking while dramatically reducing boilerplate code, letting
+you focus on what you want your code to do rather than on checking for all the
+possible ways users could supply inappropriate values to a function or
+class.")
+ (license license:bsd-3)))
+
(define-public python-djitellopy
(package
(name "python-djitellopy")
@@ -32417,7 +33374,7 @@ used to retry a function a given number of times.")
(define-public python-pivy
(package
(name "python-pivy")
- (version "0.6.5")
+ (version "0.6.8")
(source
(origin
(method git-fetch)
@@ -32426,20 +33383,20 @@ used to retry a function a given number of times.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
+ (base32 "00l4r06dwmgn8h29nrl3g3yv33cfyizyylk28x1j95qyj36sggfb"))))
(build-system python-build-system)
(arguments
- `(;; The test suite fails due to an import cycle between 'pivy' and '_coin'
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
+ (list
+ ;; The test suite fails due to an import cycle between 'pivy' and '_coin'
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
(add-after 'unpack 'patch-cmake-include-dirs
- (lambda _
- ;; Patch buildsystem to respect Coin3D include directory
- (substitute* "CMakeLists.txt"
- (("\\$\\{SoQt_INCLUDE_DIRS}")
- "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))
- #t)))))
+ (lambda _
+ ;; Patch buildsystem to respect Coin3D include directory
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{SoQt_INCLUDE_DIRS}")
+ "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
(native-inputs
(list cmake swig))
(inputs
@@ -32447,7 +33404,6 @@ used to retry a function a given number of times.")
qtbase-5
libxi
libice
- soqt
glew
coin3d))
(home-page "https://github.com/coin3d/pivy")
@@ -32622,8 +33578,7 @@ CMake.")
(string-append x11 "/lib/libX11.so.6")))
(substitute* "Screenkey/xlib.py"
(("libXtst.so.6")
- (string-append xtst "/lib/libXtst.so.6")))
- #t)))
+ (string-append xtst "/lib/libXtst.so.6"))))))
(add-after 'install 'wrap-screenkey
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program
@@ -32632,7 +33587,8 @@ CMake.")
`("GI_TYPELIB_PATH"
":" prefix (,(getenv "GI_TYPELIB_PATH")))))))))
(inputs
- (list python-distutils-extra
+ (list bash-minimal
+ python-distutils-extra
python-tokenize-rt
libx11
libxtst
@@ -33042,6 +33998,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")
@@ -33080,6 +34412,7 @@ PeachPy can generate ELF, MS-COFF, Mach-O object files, and assembly listings
for the Go language tool chain; it adapts to different calling conventions and
application binary interfaces (ABIs); it takes care of register allocation; it
supports x86_64 instructions up to AVX-512 and SHA.")
+ (supported-systems '("x86_64-linux"))
(license license:bsd-2))))
(define-public python-sgmllib3k
@@ -33233,6 +34566,34 @@ needed and registers the function with its annotations.")
symbolic expressions in pure Python using the technique of logical unification.")
(license license:bsd-3)))
+(define-public python-looseversion
+ (package
+ (name "python-looseversion")
+ (version "1.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "looseversion" version))
+ (sha256
+ (base32 "17k625ws83lwksa7yyy4mn0i39lmxgrzxihn22l335dvyvrnbppb"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; No tests provided.
+ #:tests? #f))
+ (native-inputs
+ (list python-hatchling))
+ (home-page "https://github.com/effigies/looseversion")
+ (synopsis "Version numbering for anarchists and software realists")
+ (description
+ "This package provides a drop-in replacement for the original
+@code{LooseVersion}. It implements an identical interface and comparison
+logic to @code{LooseVersion}. The only major change is that a
+@code{looseversion.LooseVersion} is comparable to a
+@code{distutils.version.LooseVersion}, which means tools should not need to
+worry whether all dependencies that use LooseVersion have migrated.")
+ (license license:psfl)))
+
(define-public python-cons
(package
(name "python-cons")
@@ -34744,14 +36105,14 @@ adapted from the @code{packaging} package.")
(define-public python-shtab
(package
(name "python-shtab")
- (version "1.5.3")
+ (version "1.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "shtab" version))
(sha256
- (base32 "127mymfm7r0hddk2vknqq34fj6dirj6ip990i3g4isx0lsd7pnsc"))))
- (build-system python-build-system)
+ (base32 "0g14778c5zgiq6b92k40n9irp75c5vcsvl5541cw8bmqxq1cnjsf"))))
+ (build-system pyproject-build-system)
(native-inputs
(list bash
python-pytest
@@ -34759,15 +36120,6 @@ adapted from the @code{packaging} package.")
python-pytest-timeout
python-setuptools-scm
python-wheel))
- (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")))))))
(home-page "https://github.com/iterative/shtab")
(synopsis "Automagic shell tab completion for Python CLI applications")
(description
@@ -35580,6 +36932,33 @@ terminal. It has red, blue, green, yellow, purple and black/white (default)
colors.")
(license license:expat)))
+(define-public python-mido
+ (package
+ (name "python-mido")
+ (version "1.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "mido" version))
+ (sha256
+ (base32
+ "0j63cydiinfyrvlhydzsb00cb7dyvrw3bnhjbdyp63vkxnv2isis"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; This package requires python-packaging~=23.1 which is not yet
+ ;; updated to. As per pyproject.toml, it is required to provide
+ ;; a nice version_info opbject.
+ ;; TODO: After updating python-packaging, fix this.
+ (delete 'sanity-check))))
+ (propagated-inputs (list python-importlib-metadata python-packaging))
+ (native-inputs (list python-pytest))
+ (home-page "https://mido.readthedocs.io/en/stable/")
+ (synopsis "MIDI Objects for Python")
+ (description "This library is for working with MIDI 1.0 ports, messages and
+files.")
+ (license license:expat)))
+
(define-public python-musical-scales
(package
(name "python-musical-scales")
@@ -35692,7 +37071,7 @@ and @code{bspatch4}.")
(define-public python-mpv
(package
(name "python-mpv")
- (version "1.0.1")
+ (version "1.0.7")
(source
(origin
;; python-mpv from pypi does not include the tests directory.
@@ -35702,28 +37081,14 @@ and @code{bspatch4}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "10w6j3n62ap45sf6q487kz8z6g58sha37i14fa2hhng794z7a8jh"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; One of the tests never completes, so neutering it using
- ;; early return allows other test to run without issue.
- (substitute* "tests/test_mpv.py"
- ;; Note the typo in "prooperty" - this was fixed later in
- ;; upstream but has no effect on whether the tests hangs or not.
- (("test_wait_for_prooperty_event_overflow.*" line)
- ;; The long whitespace between \n and return is to match the
- ;; identation level, which is significant in python.
- (string-append line "\n return\n")))))))
- (build-system python-build-system)
+ (base32 "102fajzrcgxapsanh0phlqmk9q2v95bvix6mrkg8rypv717idins"))))
+ (build-system pyproject-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-before 'build 'patch-reference-to-mpv
(lambda* (#:key inputs #:allow-other-keys)
- ;; Without an absolute path it is not able find and
- ;; load the libmpv library.
+ ;; Without an absolute path it is not able find and load libmpv.
(substitute* "mpv.py"
(("sofile = .*")
(string-append "sofile = \""
@@ -35734,11 +37099,16 @@ and @code{bspatch4}.")
;; Fontconfig throws errors when it has no cache dir to use.
(setenv "XDG_CACHE_HOME" (getcwd))
;; Some tests fail without a writable and readable HOME.
- (setenv "HOME" (getcwd)))))))
+ (setenv "HOME" (getcwd))
+ (setenv "PY_MPV_SKIP_TESTS"
+ "test_wait_for_property_event_overflow"))))))
(native-inputs
- (list python-xvfbwrapper)) ; needed for tests only
+ ;; For tests.
+ (list python-pytest
+ python-pyvirtualdisplay
+ python-xvfbwrapper))
(inputs (list mpv))
- (propagated-inputs (list python-pillow)) ; for raw screenshots
+ (propagated-inputs (list python-pillow)) ;for raw screenshots
(home-page "https://github.com/jaseg/python-mpv")
(synopsis "Python interface to the mpv media player")
(description
@@ -35914,7 +37284,7 @@ etc. to check code that uses @code{orjson}.")
(guix build utils))
#:phases
#~(modify-phases %standard-phases
- (add-after 'prepare-python-module 'build-python-module
+ (add-after 'build 'build-python-module
(assoc-ref py:%standard-phases 'build))
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install)))
@@ -36318,6 +37688,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/python.scm b/gnu/packages/python.scm
index b2757c651e..c5f98c3a46 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -84,6 +84,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
@@ -211,7 +212,20 @@
"CFLAGS=-fno-semantic-interposition"
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"
- " -fno-semantic-interposition"))
+ " -fno-semantic-interposition")
+ ;; Add a reference to libxcrypt in LIBS so that the sysconfigdata
+ ;; file records it and propagates it to programs linking against
+ ;; Python.
+ (let ((libxcrypt
+ (false-if-exception
+ (dirname
+ (search-input-file %build-inputs
+ "lib/libcrypt.so.1")))))
+ (string-append
+ "LIBS="
+ (if libxcrypt
+ (string-append "-L" libxcrypt)
+ ""))))
;; With no -j argument tests use all available cpus, so provide one.
#:make-flags
(list (string-append
@@ -312,6 +326,18 @@
'("email/test" "ctypes/test" "unittest/test" "tkinter/test"
"sqlite3/test" "bsddb/test" "lib-tk/test" "json/tests"
"distutils/tests"))))))))
+ (add-after 'install 'add-libxcrypt-reference-pkgconfig
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (define out (assoc-ref outputs "out"))
+ (define libxcrypt
+ (false-if-exception
+ (dirname (search-input-file inputs "lib/libcrypt.so.1"))))
+ (when libxcrypt
+ (substitute*
+ (find-files (string-append out "/lib/pkgconfig")
+ ".*\\.pc")
+ (("-lcrypt")
+ (string-append "-L" libxcrypt " -lcrypt"))))))
(add-after 'remove-tests 'move-tk-inter
(lambda* (#:key outputs #:allow-other-keys)
;; When Tkinter support is built move it to a separate output so
@@ -387,6 +413,8 @@
expat
gdbm
libffi ; for ctypes
+ libxcrypt ; crypto module slated for removal in 3.13, re-enable
+ ; python tests of libxcrypt when that happens
sqlite ; for sqlite extension
openssl-1.1
readline
@@ -425,7 +453,6 @@ data types.")
(inherit python-2)
(name "python")
(version "3.10.7")
- (replacement python-3.10/fixed)
(source (origin
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
@@ -435,6 +462,7 @@ data types.")
"python-3-deterministic-build-info.patch"
"python-3-fix-tests.patch"
"python-3-hurd-configure.patch"
+ "python-3-reproducible-build.patch"
"python-3-search-paths.patch"))
(sha256
(base32
@@ -517,7 +545,7 @@ data types.")
(substitute* "Makefile.pre.in"
(("-j0") "-j1")))))
'())
- (add-after 'unpack 'remove-windows-binaries
+ (add-after 'unpack 'remove-vendored-wheel-content
(lambda _
;; Delete .exe from embedded .whl (zip) files
(for-each
@@ -531,6 +559,40 @@ data types.")
(for-each delete-file
(find-files "." "\\.exe$"))
(delete-file whl)
+
+ ;; Search for cacert.pem, delete it, and rewrite the
+ ;; file which directs python to look for it.
+ (let ((cacert (find-files "." "cacert\\.pem")))
+ (unless (null? cacert)
+ (let ((certifi (dirname (car cacert))))
+ (delete-file (string-append certifi "/cacert.pem"))
+ (delete-file (string-append certifi "/core.py"))
+ (with-output-to-file (string-append certifi "/core.py")
+ (lambda _
+ (display "\"\"\"
+certifi.py
+~~~~~~~~~~
+This file is a Guix-specific version of core.py.
+
+This module returns the installation location of SSL_CERT_FILE or
+/etc/ssl/certs/ca-certificates.crt, or its contents.
+\"\"\"
+import os
+
+_CA_CERTS = None
+
+try:
+ _CA_CERTS = os.environ [\"SSL_CERT_FILE\"]
+except:
+ _CA_CERTS = os.path.join(\"/etc\", \"ssl\", \"certs\", \"ca-certificates.crt\")
+
+def where() -> str:
+ return _CA_CERTS
+
+def contents() -> str:
+ with open(where(), \"r\", encoding=\"ascii\") as data:
+ return data.read()"))))))
+
;; Reset timestamps to prevent them from ending
;; up in the Zip archive.
(ftw "." (lambda (file stat flag)
@@ -985,81 +1047,6 @@ data types.")
(properties '((cpe-name . "python")))
(license license:psfl)))
-(define python-3.10/fixed
- (package
- (inherit python-3.10)
- (arguments
- (substitute-keyword-arguments (package-arguments python-3.10)
- ((#:phases phases)
- #~(modify-phases #$phases
- ;; Also remove the bundled CA certificates.
- ;; TODO: Rename this phase when merging back into python.
- (replace 'remove-windows-binaries
- (lambda _
- ;; Delete .exe from embedded .whl (zip) files
- (for-each
- (lambda (whl)
- (let ((dir "whl-content")
- (circa-1980 (* 10 366 24 60 60)))
- (mkdir-p dir)
- (with-directory-excursion dir
- (let ((whl (string-append "../" whl)))
- (invoke "unzip" whl)
- (for-each delete-file
- (find-files "." "\\.exe$"))
- (delete-file whl)
-
- ;; Search for cacert.pem, delete it, and rewrite the
- ;; file which directs python to look for it.
- (let ((cacert (find-files "." "cacert\\.pem")))
- (unless (null? cacert)
- (let ((certifi (dirname (car cacert))))
- (delete-file (string-append certifi "/cacert.pem"))
- (delete-file (string-append certifi "/core.py"))
- (with-output-to-file (string-append certifi "/core.py")
- (lambda _
- (display "\"\"\"
-certifi.py
-~~~~~~~~~~
-This file is a Guix-specific version of core.py.
-
-This module returns the installation location of SSL_CERT_FILE or
-/etc/ssl/certs/ca-certificates.crt, or its contents.
-\"\"\"
-import os
-
-_CA_CERTS = None
-
-try:
- _CA_CERTS = os.environ [\"SSL_CERT_FILE\"]
-except:
- _CA_CERTS = os.path.join(\"/etc\", \"ssl\", \"certs\", \"ca-certificates.crt\")
-
-def where() -> str:
- return _CA_CERTS
-
-def contents() -> str:
- with open(where(), \"r\", encoding=\"ascii\") as data:
- return data.read()"))))))
-
- ;; Reset timestamps to prevent them from ending
- ;; up in the Zip archive.
- (ftw "." (lambda (file stat flag)
- (utime file circa-1980 circa-1980)
- #t))
- (apply invoke "zip" "-X" whl
- (find-files "." #:directories? #t))))
- (delete-file-recursively dir)))
- (find-files "Lib/ensurepip" "\\.whl$"))))))))
- (native-search-paths
- (list (guix-pythonpath-search-path (package-version python-3.10))
- $SSL_CERT_FILE
- ;; Used to locate tzdata by the zoneinfo module introduced in
- ;; Python 3.9.
- (search-path-specification
- (variable "PYTHONTZPATH")
- (files (list "share/zoneinfo")))))))
-
;; Next 3.x version.
(define-public python-next python-3.12)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 13aadc8190..b99ce365d7 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
@@ -299,19 +313,21 @@ Qt. Some of its features include:
(define-public kvantum
(package
(name "kvantum")
- (version "1.0.7")
+ (version "1.1.2")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/tsujan/Kvantum/releases/download/V"
- version "/Kvantum-" version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tsujan/Kvantum")
+ (commit (string-append "V" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0zwxswbgd3wc7al3fhrl5qc0fmmb6mkygywjh1spbqpl7s8jw5s3"))))
+ "1prlv2fqwbxj9fqs4xf925qh9m9ginh0mcc618yg3h23vxq9g9ym"))))
(build-system qt-build-system)
(arguments
(list
#:tests? #f ;no tests
+ #:qtbase qtbase
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
@@ -322,15 +338,11 @@ Qt. Some of its features include:
(substitute* "style/CMakeLists.txt"
(("\\$\\{KVANTUM_STYLE_DIR\\}")
(string-append #$output
- "/lib/qt5/plugins/styles"))))))))
- (native-inputs (list qttools-5))
+ "/lib/qt6/plugins/styles"))))))))
+ (native-inputs (list qttools))
(inputs (list
kwindowsystem
- libx11
- libxext
- qtbase-5
- qtsvg-5
- qtx11extras))
+ qtsvg))
(synopsis "SVG-based theme engine for Qt")
(description
"Kvantum is an SVG-based theme engine for Qt,
@@ -398,7 +410,8 @@ applications on Wayland.")
(file-name (git-file-name name version))
(sha256
(base32 "1ipnkdi8wgv519mvwa5zxlz20wipbypyfixjv2qdfd9vl1pznwvs"))
- (patches (search-patches "grantlee-fix-i586-precision.patch"))))
+ (patches (search-patches "grantlee-fix-i586-precision.patch"
+ "grantlee-register-metaenumvariable.patch"))))
(native-inputs
;; Optional: lcov and cccc, both are for code coverage
(list doxygen))
@@ -898,6 +911,9 @@ tst_qt_cmake_create.cpp"
;; TODO: when core-updates is merged, check again.
"tst_selftests"
+ ;; The 'tst_qsqlthread' test sometimes fails.
+ "tst_qsqlthread"
+
;; The 'tst_qsystemsemaphore' test sometimes fails.
"tst_qsystemsemaphore"
;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
@@ -2257,7 +2273,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")
@@ -2282,6 +2298,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")
@@ -2601,8 +2643,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
@@ -3884,10 +3936,10 @@ module provides support functions to the automatically generated code.")
(arguments
`(#:tests? #f ; no check target
#:imported-modules ((guix build python-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -3934,7 +3986,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)
@@ -4314,17 +4366,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))
@@ -4337,15 +4389,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"))
@@ -4387,7 +4462,7 @@ securely. It will not store any data unencrypted unless explicitly requested.")
`(#:tests? #f ; No target
#:imported-modules
((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules
(((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system)
@@ -4771,7 +4846,7 @@ color-related widgets.")
(list qtbase-5
qtdatavis3d
qtdeclarative-5
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtquickcontrols-5
qtquickcontrols2-5
@@ -5137,10 +5212,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)
@@ -5148,18 +5249,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
@@ -5167,10 +5268,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
@@ -5179,7 +5290,7 @@ web server.")
(file-name (git-file-name name version))
(sha256
(base32
- "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"))))
+ "0859nsksgfrj6ynj74awj1fr6slwcjavs989xc7mbgpvi87n1xlq"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;TODO
@@ -5208,6 +5319,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")
@@ -5257,16 +5377,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))
@@ -5278,6 +5398,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")
@@ -5324,6 +5458,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")
@@ -5412,6 +5571,7 @@ including @i{fix-its} for automatic refactoring.")
(sha256
(base32
"1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
+ (outputs '("out" "debug"))
(build-system qt-build-system)
(arguments
(list
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 2b20353159..1016915b47 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.14") ; 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 "0hg113fnd4nkvisf0ia9b367h02xfww9kysnb6fc6iac059lpard"))
(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"))
@@ -583,7 +582,7 @@ used to build the name of the resulting store item."
(guix build union)
(ice-9 match))
#:imported-modules `((guix build union)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
(delete 'unpack)
@@ -703,22 +702,22 @@ DrRacket IDE, are not included.")
"class-iop" (base32 "08z57q83cr7wnh6g8ah3hdhmsmf9zp1jfs7yvxv188l3hzvygy5l")
'("class-iop-lib"))
(simple-racket-origin
- "compatibility" (base32 "0ydx9alrpqg03xcl7zm5qcpx017i554q9ramz69vpwlfy3zdqmdm")
+ "compatibility" (base32 "1fwssnz6himnkb45ngd48ngkh01xl940y0ivdk7kpkpi0qla7glp")
'("compatibility" "compatibility-doc" "compatibility-lib"))
(simple-racket-origin
"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")
'(("datalog" ".")))
(simple-racket-origin
- "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5")
+ "db" (base32 "16jyl0snw2f52mbpzf5rlccwl5cm7bfsiy8mbqlr1slmli84z5yx")
'("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 "1r0yjwlv4rb2npc7dprgnfym7l5fn3q0cgfy64115dq43g97hvjq")
'("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 "0hzz5ywmf6hm8sdffj508lf767akdbnv9z4fbzy6q0zy2cgbdsjq")
'("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 "0qrj8dk5vmhlvg7w5g6jy0zxsjsm7mz1shkdh01nf4m9x9rwlxhn")
'("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 "0nldjgzn4aw8n5pw8cj5q3y1ycr9g4vzsxzkyjvd86v9whnyzhcm")
'("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,16 +825,16 @@ 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")
+ "parser-tools" (base32 "0i822p7ik6q03l7mrlf0qb63xdxvx06yl5lg1g1qri5wmi5xj0pb")
'("parser-tools" "parser-tools-doc" "parser-tools-lib"))
(simple-racket-origin
"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 "1h6734l8bfnh8ipfzad5zdclffq643fh4mw4z28ina93kmw2h9gz")
'("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 "0g8ynsh0xp0nqikygh99azv2ajyccfzm3cq82ywlylqxrrwdaviw")
'("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 "0ag34rq2xfcvx5yz5nq3razfaci0qyi6pd62mxqj2141vwiz6p99")
'("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 "1jpy5728w9bszgsjczlzrjjxsvqlcn4ah6gd3rp0plp8zzk9mq0s")
'("snip" "snip-lib"))
(simple-racket-origin
- "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f")
+ "typed-racket" (base32 "04kq9iwrqvlbd4v52zqdzdhfb4vn7agvllrd227ih6zzw8bxvhz9")
'("source-syntax"
"typed-racket"
"typed-racket-compatibility"
@@ -960,10 +959,10 @@ 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")
+ "string-constants" (base32 "1fr55s6rmkzzvam33cqnf1hv24v6k3694695p40vf8d77czmiz83")
'("string-constants" "string-constants-doc" "string-constants-lib"))
(simple-racket-origin
"swindle" (base32 "1q8vdxpzczzwdw2mys2caab45yvadmqkixsr29k8pl03n8dsg8j9")
@@ -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 "0ry5vwjd06ml9hmspgrwci8c99syx7zhp9sgldmhwwfvf5m1g29d")
'("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 56e674a8ed..0da65736e1 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages assembly)
#:use-module (gnu packages astronomy)
#:use-module (gnu packages audio)
#:use-module (gnu packages avahi)
@@ -793,7 +795,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(define-public gnuradio
(package
(name "gnuradio")
- (version "3.10.8.0")
+ (version "3.10.10.0")
(source
(origin
(method git-fetch)
@@ -802,7 +804,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11p08qrbfh5dz6l5n4c2g8c2gv1qq8aiydq91ryzfzgp49r0j6p0"))))
+ (base32 "1jq94nycccpgw2cc39hgixjq7cqdw836bnz0fvmynfg3f22mcid4"))))
(build-system cmake-build-system)
(native-inputs
(list doxygen
@@ -820,6 +822,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
xorg-server-for-tests))
(inputs
(list alsa-lib
+ bash-minimal
boost
cairo
codec2
@@ -2668,7 +2671,7 @@ voice formats.")
qtcharts
qtdeclarative-5
qtgamepad
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtquickcontrols2-5
qtserialport-5
@@ -3043,10 +3046,43 @@ protocol investigation with native support for many common Software Defined
Radios.")
(license license:gpl3+)))
+(define-public volk-gnsssdr
+ (package
+ (name "volk-gnsssdr")
+ (version "0.0.19")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gnss-sdr/gnss-sdr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0l1hqfqh8ffgy6nxqdk390vmnmhv66x7m8323mz2izczqc5acy1p"))))
+ (build-system cmake-build-system)
+ (native-inputs (list python python-mako))
+ (inputs (list cpu-features))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr"))))))
+ (home-page "https://github.com/gnss-sdr/gnss-sdr/blob/main/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/")
+ (synopsis "Extra VOLK kernels for GNSS-SDR")
+ (description
+ "This library contains VOLK kernels of hand-written SIMD code for
+different mathematical operations used by GNSS-SDR, mainly with 8-bit and
+16-bit real and complex data types, offering a platform/architecture agnostic
+version that will run in all machines, plus other versions for different SIMD
+instruction sets.")
+ (license license:gpl3+)))
+
(define-public gnss-sdr
(package
(name "gnss-sdr")
- (version "0.0.17")
+ (version "0.0.19")
(source
(origin
(method git-fetch)
@@ -3055,7 +3091,7 @@ Radios.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0kxn98vmrsd2a157cf3hsmivi6p4k4a3907j5w8hmcs0nn92786i"))))
+ (base32 "0l1hqfqh8ffgy6nxqdk390vmnmhv66x7m8323mz2izczqc5acy1p"))))
(build-system cmake-build-system)
(native-inputs
`(("googletest-source" ,(package-source googletest))
@@ -3066,11 +3102,14 @@ Radios.")
(inputs
(list armadillo
boost
+ cpu-features
fmt
gflags
glog
gmp
gnuradio
+ gnuplot
+ gnutls
gr-osmosdr
libpcap
log4cpp
@@ -3080,11 +3119,14 @@ Radios.")
protobuf
pugixml
spdlog
- volk))
+ volk
+ volk-gnsssdr))
(arguments
`(#:configure-flags
(list "-DENABLE_GENERIC_ARCH=ON"
"-DENABLE_OSMOSDR=ON"
+
+ "-DENABLE_UNIT_TESTING=FALSE" ; many tests needing data download
"-DBLA_VENDOR=OpenBLAS"
(string-append "-DGFLAGS_ROOT="
(assoc-ref %build-inputs "gflags"))
@@ -3219,7 +3261,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/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm
index c4f03c3ed9..216c74cb9c 100644
--- a/gnu/packages/raspberry-pi.scm
+++ b/gnu/packages/raspberry-pi.scm
@@ -28,7 +28,6 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bootloaders)
- #:use-module (gnu packages commencement)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
@@ -196,7 +195,9 @@ Raspberry Pi. Note: It does not work on Raspberry Pi 1.")
("binutils" ,binutils)
("coreutils" ,coreutils)
("file" ,file)
- ("ld-wrapper" ,ld-wrapper)
+ ("ld-wrapper" ,(module-ref (resolve-interface
+ '(gnu packages commencement))
+ 'ld-wrapper))
("make" ,gnu-make)
("gcc" ,gcc-6)
("locales" ,(libc-utf8-locales-for-target))))
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 14933da5a8..6c8915f06e 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -48,7 +48,7 @@
(arguments
(list
#:modules `((ice-9 format)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
;; Specify the absolute location of xterm, as the user experience sucks
;; when no terminal is available (can't consult help with 'C-t ?', for
;; example).
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/rdf.scm b/gnu/packages/rdf.scm
index cc6b009f14..f10b530861 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Pjotr Prins <pjotr.guix@thebird.nl>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -49,8 +49,10 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages kerberos)
#:use-module (gnu packages linux)
#:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages nettle)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -203,9 +205,7 @@ Lucene library, a high-performance, full-featured text search engine.")
(replace 'bootstrap
(lambda _ (invoke "autoreconf" "-vif") #t)))))
(inputs
- `(("raptor" ,raptor2)
- ("cyrus-sasl" ,cyrus-sasl)
- ("zlib" ,zlib)))
+ (list cyrus-sasl mit-krb5 nettle raptor2 zlib))
(native-inputs
(list autoconf automake libtool pkg-config))
(home-page "https://github.com/swh/LRDF")
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm
index a5dcc26efd..6d61fa1391 100644
--- a/gnu/packages/rednotebook.scm
+++ b/gnu/packages/rednotebook.scm
@@ -22,6 +22,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages python)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
@@ -64,14 +65,17 @@
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(webkitgtk-path (string-append
- (assoc-ref inputs "webkitgtk")
+ (assoc-ref inputs "webkitgtk-for-gtk3")
"/lib")))
(wrap-program (string-append out "/bin/rednotebook")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path)))
- #t))))))
+ `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path)))))))))
(inputs
- (list gtk+ gtksourceview-3 python-pyyaml python-pygobject
+ (list bash-minimal
+ gtk+
+ gtksourceview-3
+ python-pyyaml
+ python-pygobject
webkitgtk-for-gtk3))
;; TODO: package the following for python3 (if possible), add them as
;; dependencies, and remove them from rednotebook source:
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index a88c79f8b9..b70214fa79 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -65,55 +65,56 @@
"1fs407hnlnm0b8sncjwys9rc7ia5nb7wxrpx39nq3pzzfs1lv3vq"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; no test target
- #:configure-flags
- (list "-DgRPC_ZLIB_PROVIDER=package"
- "-DgRPC_ABSL_PROVIDER=package"
- "-DgRPC_CARES_PROVIDER=package"
- "-DgRPC_SSL_PROVIDER=package"
- "-DgRPC_PROTOBUF_PROVIDER=package"
- "-DgRPC_RE2_PROVIDER=package"
- (string-append "-DCMAKE_INSTALL_PREFIX="
- (assoc-ref %outputs "out"))
- "-DCMAKE_INSTALL_LIBDIR=lib"
- (string-append "-DCMAKE_INSTALL_RPATH="
- (assoc-ref %outputs "out") "/lib")
- "-DCMAKE_VERBOSE_MAKEFILE=ON")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'configure-shared
- (lambda* (#:key (configure-flags '()) #:allow-other-keys)
- (mkdir "../build-shared")
- (with-directory-excursion "../build-shared"
- (apply invoke
- "cmake" "../source"
- "-DBUILD_SHARED_LIBS=ON"
- configure-flags)
- (apply invoke "make"
- `("-j" ,(number->string (parallel-job-count)))))))
- (add-after 'install 'install-shared-libraries
- (lambda _
- (with-directory-excursion "../build-shared"
- (invoke "make" "install"))))
- (add-before 'strip 'move-static-libs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (static (assoc-ref outputs "static")))
- (mkdir-p (string-append static "/lib"))
- (with-directory-excursion
- (string-append out "/lib")
- (for-each
+ (list
+ #:tests? #f ; no test target
+ #:configure-flags
+ #~(list "-DgRPC_ZLIB_PROVIDER=package"
+ "-DgRPC_ABSL_PROVIDER=package"
+ "-DgRPC_CARES_PROVIDER=package"
+ "-DgRPC_SSL_PROVIDER=package"
+ "-DgRPC_PROTOBUF_PROVIDER=package"
+ "-DgRPC_RE2_PROVIDER=package"
+ (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ (string-append "-DCMAKE_INSTALL_RPATH=" #$output "/lib")
+ "-DCMAKE_VERBOSE_MAKEFILE=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'configure-shared
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (mkdir "../build-shared")
+ (with-directory-excursion "../build-shared"
+ (apply invoke "cmake" "../source"
+ "-DBUILD_SHARED_LIBS=ON"
+ configure-flags)
+ (apply invoke "make"
+ (list "-j" (number->string (parallel-job-count)))))))
+ (add-after 'install 'install-shared-libraries
+ (lambda _
+ (with-directory-excursion "../build-shared"
+ (invoke "make" "install"))))
+ (add-before 'strip 'move-static-libs
+ (lambda _
+ (let ((static #$output:static))
+ (mkdir-p (string-append static "/lib"))
+ (with-directory-excursion (string-append #$output "/lib")
+ (for-each
(lambda (file)
- (rename-file file
- (string-append static "/lib/" file)))
- (find-files "." "\\.a$"))))
- #t)))))
- (inputs
- (list abseil-cpp-cxxstd11 c-ares/cmake openssl re2 zlib))
+ (rename-file file (string-append static "/lib/" file)))
+ (find-files "." "\\.a$")))))))))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("protobuf" ,protobuf)
- ("python" ,python-wrapper)))
+ (list pkg-config
+ protobuf
+ python-wrapper))
+ (inputs
+ (list c-ares/cmake
+ openssl
+ re2
+ zlib))
+ (propagated-inputs
+ ;; Abseil libraries are in the 'Requires' field of the various gRPC
+ ;; pkg-config files.
+ (list abseil-cpp-cxxstd11))
(home-page "https://grpc.io")
(synopsis "High performance universal RPC framework")
(description "gRPC is a modern high performance @dfn{Remote Procedure Call}
@@ -159,18 +160,18 @@ browsers to backend services.")
(arguments
(substitute-keyword-arguments (package-arguments grpc)
((#:phases phases)
- `(modify-phases ,phases
- ;; Note: This would be nicer as a snippet, but that creates a tarball
- ;; instead of a checkout and breaks assumptions made by the builder.
- (add-after 'unpack 'rename-gettid
- (lambda _
- ;; Rename custom gettid() syscall wrapper to avoid conflict
- ;; with gettid() from glibc 2.30.
- (substitute* '("src/core/lib/gpr/log_linux.cc"
- "src/core/lib/gpr/log_posix.cc"
- "src/core/lib/iomgr/ev_epollex_linux.cc")
- (("gettid\\(")
- "sys_gettid("))))))))
+ #~(modify-phases #$phases
+ ;; Note: This would be nicer as a snippet, but that creates a tarball
+ ;; instead of a checkout and breaks assumptions made by the builder.
+ (add-after 'unpack 'rename-gettid
+ (lambda _
+ ;; Rename custom gettid() syscall wrapper to avoid conflict
+ ;; with gettid() from glibc 2.30.
+ (substitute* '("src/core/lib/gpr/log_linux.cc"
+ "src/core/lib/gpr/log_posix.cc"
+ "src/core/lib/iomgr/ev_epollex_linux.cc")
+ (("gettid\\(")
+ "sys_gettid("))))))))
(inputs
(modify-inputs (package-inputs grpc)
(replace "abseil-cpp" abseil-cpp-20200923.3)))
diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm
index 2c0d971377..21568f40df 100644
--- a/gnu/packages/rpm.scm
+++ b/gnu/packages/rpm.scm
@@ -116,9 +116,8 @@ applying deltarpms, compatible with the original deltarpm packages.")
`(,glib "bin")
`(,glib-with-documentation "doc")
gobject-introspection ;for g-ir-scanner
- gtk-doc
+ gtk-doc/stable
help2man
- libxml2 ;for XML_CATALOG_FILES
pkg-config
python)) ;for 'site-packages' call
(inputs
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 0541bb9562..5af1bb1cef 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Pjotr Prins <pjotr.guix@thebird.nl>
-;;; Copyright © 2014-2017, 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2017, 2021-2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2019 Ricardo Wurmus <rekado@elephly.net>
@@ -32,7 +32,7 @@
;;; Copyright © 2022-2024 Remco van 't Veer <remco@remworks.net>
;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -179,8 +179,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.7
(package
(inherit ruby-2.6)
- (version "2.7.6")
- (replacement ruby-2.7-fixed) ; security fixes
+ (version "2.7.8")
(source
(origin
(inherit (package-source ruby-2.6))
@@ -189,7 +188,7 @@ a focus on simplicity and productivity.")
"/ruby-" version ".tar.gz"))
(sha256
(base32
- "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"))))
+ "182vni66djmiqagwzfsd0za7x9k3zag43b88c590aalgphybdnn2"))))
(arguments
`(#:test-target "test"
#:configure-flags
@@ -230,20 +229,6 @@ a focus on simplicity and productivity.")
'())
(list autoconf)))))
-(define ruby-2.7-fixed
- (package
- (inherit ruby-2.7)
- (version "2.7.8")
- (source
- (origin
- (inherit (package-source ruby-2.7))
- (uri (string-append "https://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.gz"))
- (sha256
- (base32
- "182vni66djmiqagwzfsd0za7x9k3zag43b88c590aalgphybdnn2"))))))
-
(define-public ruby-3.0
(package
(inherit ruby-2.7)
@@ -292,6 +277,20 @@ a focus on simplicity and productivity.")
(modify-inputs (package-inputs ruby-3.1)
(prepend libyaml)))))
+(define-public ruby-3.3
+ (package
+ (inherit ruby-3.2)
+ (version "3.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (version-major+minor version)
+ "/ruby-" version ".tar.xz"))
+ (sha256
+ (base32
+ "07pwf3zkf7idl95agfjbv2lvamcp0spp0znqp9arb71ri19rkh43"))))))
+
(define-public ruby ruby-3.1)
(define-public mruby
@@ -7796,6 +7795,26 @@ documentation for Ruby code.")
(home-page "https://github.com/flori/tins")
(license license:expat)))
+(define-public ruby-gemtext
+ (package
+ (name "ruby-gemtext")
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (rubygems-uri "gemtext" version))
+ (sha256
+ (base32 "1z559f5z0zvwnqgnny0zf4mppiary020ljxwpw3bdxi2hr9aj3gp"))))
+ (build-system ruby-build-system)
+ (synopsis "Gemtext parser for Ruby")
+ (description
+ "This package is a Ruby parser library for Gemtext (hypertext format
+which is intended to serve as the native response format of the Gemini
+file transfer protocol) and produces a document object of various
+nodes.")
+ (home-page "https://github.com/exastencil/gemtext")
+ (license license:expat)))
+
(define-public ruby-gem-hadar
(package
(name "ruby-gem-hadar")
@@ -7817,7 +7836,7 @@ documentation for Ruby code.")
(lambda _
(invoke "gem" "build" "gem_hadar.gemspec"))))))
(propagated-inputs
- (list git ruby-tins ruby-yard))
+ (list git-minimal/pinned ruby-tins ruby-yard))
(synopsis "Library for the development of Ruby gems")
(description
"This library contains some useful functionality to support the
@@ -10114,7 +10133,7 @@ Profiling multiple threads simultaneously is supported.
(("%x\\(git ls-files -z)")
"`git ls-files -z`")))))))
(native-inputs (list ruby-rake-compiler ruby-rspec))
- (inputs (list valgrind/interactive))
+ (inputs (list valgrind))
(propagated-inputs (list ruby-nokogiri))
(synopsis "Valgrind memcheck tool for Ruby")
(description "The @code{ruby_memcheck} gem provides a sane way to use
@@ -13504,7 +13523,7 @@ technique.")
(define-public ruby-rdoc
(package
(name "ruby-rdoc")
- (version "6.5.0")
+ (version "6.7.0")
(source
(origin
(method git-fetch)
@@ -13514,25 +13533,18 @@ technique.")
(file-name (git-file-name name version))
(sha256
(base32
- "06dcjs4s2phvg9bq42mlfqv4c4zpdr8w7aq107lm2q0qqqw7xjlr"))))
+ "0dy997zi7k17c2yjlq1y7zl9yaiym1f4jgfh84qqzhwl1qm6v41j"))))
(build-system ruby-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-gemspec
- ;; TODO: Remove after next release is tagged.
- (lambda _
- (substitute* "rdoc.gemspec"
- (("\"lib/rdoc/generator/template/darkfish/js/\
-jquery\\.js\", ") ""))
- #t))
(add-before 'build 'generate
;; 'gem build' doesn't honor Rakefile dependencies (see:
;; https://github.com/ruby/rdoc/issues/432#issuecomment-650808977).
(lambda _
(invoke "rake" "generate"))))))
- (native-inputs
- (list bundler ruby-kpeg ruby-racc ruby-rubocop))
+ (native-inputs (list bundler ruby-kpeg ruby-racc ruby-rubocop
+ ruby-test-unit-ruby-core))
(home-page "https://ruby.github.io/rdoc/")
(synopsis "HTML and command-line documentation utility")
(description "RDoc produces HTML and command-line documentation for Ruby
diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm
index fac00ee760..393c2941d5 100644
--- a/gnu/packages/rush.scm
+++ b/gnu/packages/rush.scm
@@ -27,14 +27,14 @@
(define-public rush
(package
(name "rush")
- (version "2.2")
+ (version "2.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/rush/rush-"
version ".tar.gz"))
(sha256
(base32
- "1kcqilbcvxsh89196ryh3p9zh4b266517q9681mjmckvj5v57plm"))))
+ "1nqjjbamdn4lcysc2hji3i73jjl1ghivb24h12zh79xnka438vr6"))))
(build-system gnu-build-system)
(home-page "https://www.gnu.org/software/rush/")
(synopsis "Restricted user (login) shell")
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d73bd1a030..88458238a3 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>
@@ -50,6 +50,7 @@
(define-module (gnu packages rust-apps)
#:use-module (guix build-system cargo)
#:use-module (guix build-system pyproject)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix deprecation)
#:use-module (guix download)
#:use-module (guix gexp)
@@ -66,6 +67,7 @@
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-gtk)
#:use-module (gnu packages crates-tls)
#:use-module (gnu packages crates-vcs)
#:use-module (gnu packages crates-web)
@@ -77,6 +79,7 @@
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages ibus)
#:use-module (gnu packages icu4c)
@@ -112,7 +115,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 +147,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 +168,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,33 +365,78 @@ 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")
(description "@code{cargo-machete} finds unused dependencies in Cargo.toml.")
(license (list license:expat license:asl2.0))))
+(define-public complgen
+ (package
+ (name "complgen")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/adaszko/complgen")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "026bv2cync6qgdkn1ifhspy6z9v25plziqhnn58rlgffx2a0dqn2"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1)
+ ("rust-bumpalo" ,rust-bumpalo-3)
+ ("rust-chic" ,rust-chic-1)
+ ("rust-clap" ,rust-clap-4)
+ ("rust-env-logger" ,rust-env-logger-0.10)
+ ("rust-hashbrown" ,rust-hashbrown-0.13)
+ ("rust-itertools" ,rust-itertools-0.10)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nom" ,rust-nom-7)
+ ("rust-nom-locate" ,rust-nom-locate-4)
+ ("rust-railroad" ,rust-railroad-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-roaring" ,rust-roaring-0.10)
+ ("rust-slice-group-by" ,rust-slice-group-by-0.3)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-ustr" ,rust-ustr-0.9))
+ #:cargo-development-inputs `(("rust-proptest" ,rust-proptest-1))))
+ (native-inputs (list git))
+ (home-page "https://github.com/adaszko/complgen")
+ (synopsis "Declarative bash/fish/zsh completions without writing shell
+scripts")
+ (description
+ "@command{complgen} is a tool that allows you to generate
+completion scripts for all major shells (@code{bash}, @code{fish}, @code{zsh})
+from a single, concise, @code{EBNF}-like grammar.")
+ (license license:asl2.0)))
+
(define-public diffr
(package
(name "diffr")
@@ -542,22 +593,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 +657,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 +686,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 +705,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 +819,171 @@ 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 helvum
+ (package
+ (name "helvum")
+ (version "0.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/pipewire/helvum")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q8gkx7djrfdl8fykppsqkxiadsq47v0xhj612nxlrvjz8n77ygn"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-glib" ,rust-glib-0.18)
+ ("rust-libadwaita" ,rust-libadwaita-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pipewire" ,rust-pipewire-0.7))
+ #:imported-modules (,@%glib-or-gtk-build-system-modules
+ ,@%cargo-build-system-modules)
+ #:modules ((guix build cargo-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'install-extra
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (source (assoc-ref inputs "source"))
+ (share (string-append out "/share"))
+ (hicolor (string-append share "/icons/hicolor")))
+ (mkdir-p hicolor)
+ (with-directory-excursion hicolor
+ (mkdir-p "scalable/apps")
+ (install-file
+ (string-append source "/data/icons/org.pipewire.Helvum.svg")
+ "scalable/apps")
+ (mkdir-p "symbolic/apps")
+ (install-file
+ (string-append
+ source "/data/icons/org.pipewire.Helvum-symbolic.svg")
+ "symbolic/apps"))
+ (with-directory-excursion share
+ (mkdir-p "applications")
+ (with-directory-excursion "applications"
+ (install-file
+ (string-append
+ source "/data/org.pipewire.Helvum.desktop.in") ".")
+ (substitute* "org.pipewire.Helvum.desktop.in"
+ (("@icon@") "org.pipewire.Helvum")
+ (("Exec=helvum")
+ (string-append "Exec="
+ (string-append out "/bin/helvum"))))
+ (rename-file "org.pipewire.Helvum.desktop.in"
+ "org.pipewire.Helvum.desktop"))
+ (mkdir-p "metainfo")
+ (with-directory-excursion "metainfo"
+ (install-file
+ (string-append
+ source
+ "/data/org.pipewire.Helvum.metainfo.xml.in") ".")
+ (substitute* "org.pipewire.Helvum.metainfo.xml.in"
+ (("@app-id@") "org.pipewire.Helvum"))
+ (rename-file "org.pipewire.Helvum.metainfo.xml.in"
+ "org.pipewire.Helvum.metainfo.xml"))))))
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs (list pkg-config clang))
+ (inputs (list glib gtk libadwaita pipewire))
+ (home-page "https://gitlab.freedesktop.org/pipewire/helvum")
+ (synopsis "GTK patchbay for pipewire")
+ (description "This package provides a GTK patchbay for pipewire.")
+ (license license:gpl3)))
+
(define-public hexyl
(package
(name "hexyl")
@@ -1366,7 +1627,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 +2309,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 +2336,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 +2673,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 +2697,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 +2718,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 +2729,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 +2768,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 +2793,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 +3293,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 +3301,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 +3314,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 +3323,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 +3337,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 +3364,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 +3372,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 60aa9b1ea0..cb58a4b4b3 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -36,6 +36,7 @@
(define-module (gnu packages rust)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages cmake)
@@ -73,7 +74,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.
@@ -183,7 +186,8 @@
(max-silent-time . 18000))) ;5 hours (for armel)
(build-system gnu-build-system)
(inputs
- `(,@(if (or (target-ppc64le?)
+ `(("bash-minimal" ,bash-minimal)
+ ,@(if (or (target-ppc64le?)
(target-riscv64?))
`(("clang" ,clang-13))
`())
@@ -442,7 +446,7 @@ safety and thread safety guarantees.")
(lambda _
(substitute* (find-files "." "^linker.rs$")
(("linker.env\\(\"LC_ALL\", \"C\"\\);")
- "linker.env(\"LC_ALL\", \"en_US.UTF-8\");"))))
+ "linker.env(\"LC_ALL\", \"C.UTF-8\");"))))
(add-after 'unpack 'add-cc-shim-to-path
(lambda _
(mkdir-p "/tmp/bin")
@@ -537,7 +541,8 @@ ar = \"" binutils "/bin/ar" "\"
("rustc-bootstrap" ,rust-bootstrap)
("cargo-bootstrap" ,rust-bootstrap "cargo")))
(inputs
- `(("llvm" ,llvm-13)
+ `(("bash" ,bash-minimal)
+ ("llvm" ,llvm-13)
("openssl" ,openssl)))
;; rustc invokes gcc, so we need to set its search paths accordingly.
(native-search-paths
@@ -948,6 +953,69 @@ safety and thread safety guarantees.")
(inherit (package-source base-rust))
(patches '()))))))
+(define-public rust-1.76
+ (let ((base-rust (rust-bootstrapped-package rust-1.75 "1.76.0"
+ "08f06shp6l72qrv5fwg1is7yzr6kwj8av0l9h5k243bz781zyp4y")))
+ (package
+ (inherit base-rust)
+ ;; Need llvm >= 16.0
+ (inputs (modify-inputs (package-inputs base-rust)
+ (replace "llvm" llvm-17))))))
+
+(define-public rust-1.77
+ (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.1"
+ "18d4ncdzp0nfimmw029xdf7vv1hgh82v30mjnnixnllzar66w47f")))
+ (package
+ (inherit base-rust)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'configure 'no-optimized-compiler-builtins
+ (lambda _
+ ;; Pre-1.77, the behavior was equivalent to this flag being
+ ;; "false" if the llvm-project submodule wasn't checked out.
+ ;;
+ ;; Now there's an explicit check, so the build fails if we don't
+ ;; manually disable this (given that we don't have the submodule checked out).
+ ;; Thus making the build behave the same as it did in 1.76 and earlier.
+ ;;
+ ;; TODO - make the build system depend on system llvm for this, so we
+ ;; can get the performance benefits of setting this to true?
+ (substitute* "config.toml"
+ (("\\[build\\]")
+ "[build]\noptimized-compiler-builtins = false")))))))))))
+
+(define-public rust-1.78
+ (rust-bootstrapped-package
+ rust-1.77 "1.78.0" "1afmj5g3bz7439w4i8zjhd68zvh0gqg7ymr8h5rz49ybllilhm7z"))
+
+(define-public rust-1.79
+ (let ((base-rust (rust-bootstrapped-package rust-1.78 "1.79.0"
+ "1h282jb1yxc69999w4nhvqb08rw2jy32i9njdjqrz78zglycybhp")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ (snippet
+ '(begin
+ (for-each delete-file-recursively
+ '("src/llvm-project"
+ "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
+ "vendor/openssl-src-111.28.1+1.1.1w/openssl"
+ "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"))
+ ;; Remove vendored dynamically linked libraries.
+ ;; find . -not -type d -executable -exec file {} \+ | grep ELF
+ ;; Also remove the bundled (mostly Windows) libraries.
+ (for-each delete-file
+ (find-files "vendor" "\\.(a|dll|exe|lib)$"))
+ ;; Adjust vendored dependency to explicitly use rustix with libc backend.
+ (substitute* '("vendor/tempfile-3.7.1/Cargo.toml"
+ "vendor/tempfile-3.10.1/Cargo.toml")
+ (("features = \\[\"fs\"" all)
+ (string-append all ", \"use-libc\""))))))))))
+
(define (make-ignore-test-list strs)
"Function to make creating a list to ignore tests a bit easier."
(map (lambda (str)
@@ -962,12 +1030,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
@@ -976,6 +1044,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
@@ -984,7 +1053,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"
@@ -1075,7 +1145,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 _
@@ -1128,7 +1203,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)
@@ -1150,11 +1225,25 @@ safety and thread safety guarantees.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "src/bootstrap/src/core/builder.rs"
- ((" = rpath.*" all)
- (string-append all
- " "
- "rustflags.arg(\"-Clink-args=-Wl,-rpath="
- out "/lib\");\n"))))))
+ ((" = rpath.*" all)
+ (string-append all
+ " "
+ "rustflags.arg(\"-Clink-args=-Wl,-rpath="
+ out "/lib\");\n"))))))
+ (add-after 'unpack 'unpack-profiler-rt
+ ;; Copy compiler-rt sources to where libprofiler_builtins looks
+ ;; for its vendored copy.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir-p "src/llvm-project/compiler-rt")
+ (copy-recursively
+ (string-append (assoc-ref inputs "clang-source")
+ "/compiler-rt")
+ "src/llvm-project/compiler-rt")))
+ (add-after 'configure 'enable-profiling
+ (lambda _
+ (substitute* "config.toml"
+ (("^profiler =.*$") "")
+ (("\\[build\\]") "\n[build]\nprofiler = true\n"))))
(add-after 'configure 'add-gdb-to-config
(lambda* (#:key inputs #:allow-other-keys)
(let ((gdb (assoc-ref inputs "gdb")))
@@ -1170,7 +1259,7 @@ safety and thread safety guarantees.")
(number->string (parallel-job-count))
"1"))))
(invoke "./x.py" job-spec "build"
- "library/std" ;rustc
+ "library/std" ;rustc
"src/tools/cargo"
"src/tools/clippy"
"src/tools/rust-analyzer"
@@ -1236,100 +1325,110 @@ exec -a \"$0\" \"~a\" \"$@\""
(inputs
(modify-inputs (package-inputs base-rust)
(prepend curl libffi `(,nghttp2 "lib") zlib)))
- ;; Add test inputs.
- (native-inputs (cons* `("gdb" ,gdb/pinned)
- `("procps" ,procps)
- (package-native-inputs base-rust))))))
+ (native-inputs (cons*
+ ;; Keep in sync with the llvm used to build rust.
+ `("clang-source" ,(package-source clang-runtime-15))
+ ;; Add test inputs.
+ `("gdb" ,gdb/pinned)
+ `("procps" ,procps)
+ (package-native-inputs base-rust))))))
(define*-public (make-rust-sysroot target)
(make-rust-sysroot/implementation target rust))
(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))
(outputs '("out"))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
- ((#:tests? _ #f) #f) ; This package for cross-building.
+ ((#:tests? _ #f) #f) ; This package for cross-building.
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'unbundle-xz
- (lambda _
- (delete-file-recursively "vendor/lzma-sys/xz-5.2")
- ;; Remove the option of using the static library.
- ;; This is necessary for building the sysroot.
- (substitute* "vendor/lzma-sys/build.rs"
- (("!want_static && ") ""))))
- ,@(if (target-mingw? target)
- `((add-after 'set-env 'patch-for-mingw
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "LIBRARY_PATH"
- (string-join
- (delete
- (string-append
- (or (assoc-ref inputs "mingw-w64-i686-winpthreads")
- (assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
- "/lib")
- (string-split (getenv "LIBRARY_PATH") #\:))
- ":"))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-join
- (delete
- (string-append
- (or (assoc-ref inputs "mingw-w64-i686-winpthreads")
- (assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
- "/include")
- (string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
- ":"))
- ;; When building a rust-sysroot this crate is only used for
- ;; the rust-installer.
- (substitute* "vendor/num_cpus/src/linux.rs"
- (("\\.ceil\\(\\)") ""))
- ;; gcc doesn't recognize this flag.
- (substitute*
- "compiler/rustc_target/src/spec/base/windows_gnullvm.rs"
- ((", \"--unwindlib=none\"") "")))))
- `())
- (replace 'set-env
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "SHELL" (which "sh"))
- (setenv "CONFIG_SHELL" (which "sh"))
- (setenv "CC" (which "gcc"))
- ;; The Guix LLVM package installs only shared libraries.
- (setenv "LLVM_LINK_SHARED" "1")
+ #~(modify-phases #$phases
+ (add-after 'unpack 'unbundle-xz
+ (lambda _
+ (delete-file-recursively "vendor/lzma-sys/xz-5.2")
+ ;; Remove the option of using the static library.
+ ;; This is necessary for building the sysroot.
+ (substitute* "vendor/lzma-sys/build.rs"
+ (("!want_static && ") ""))))
+ #$@(if (target-mingw? target)
+ `((add-after 'set-env 'patch-for-mingw
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "LIBRARY_PATH"
+ (string-join
+ (delete
+ (string-append
+ (or (assoc-ref inputs "mingw-w64-i686-winpthreads")
+ (assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
+ "/lib")
+ (string-split (getenv "LIBRARY_PATH") #\:))
+ ":"))
+ (setenv "CPLUS_INCLUDE_PATH"
+ (string-join
+ (delete
+ (string-append
+ (or (assoc-ref inputs "mingw-w64-i686-winpthreads")
+ (assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
+ "/include")
+ (string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
+ ":"))
+ ;; When building a rust-sysroot this crate is only used for
+ ;; the rust-installer.
+ (substitute* "vendor/num_cpus/src/linux.rs"
+ (("\\.ceil\\(\\)") ""))
+ ;; gcc doesn't recognize this flag.
+ (substitute*
+ "compiler/rustc_target/src/spec/base/windows_gnullvm.rs"
+ ((", \"--unwindlib=none\"") "")))))
+ `())
+ (replace 'set-env
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (setenv "CC" (which "gcc"))
+ ;; The Guix LLVM package installs only shared libraries.
+ (setenv "LLVM_LINK_SHARED" "1")
- (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
- (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
- (when (assoc-ref inputs (string-append "glibc-cross-" ,target))
- (setenv "LIBRARY_PATH"
- (string-join
+ (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
+ (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
+ (when (assoc-ref inputs (string-append "glibc-cross-" #$target))
+ (setenv "LIBRARY_PATH"
+ (string-join
(delete
- (string-append
- (assoc-ref inputs
- (string-append "glibc-cross-" ,target))
- "/lib")
- (string-split (getenv "LIBRARY_PATH") #\:))
+ (string-append
+ (assoc-ref inputs
+ (string-append "glibc-cross-" #$target))
+ "/lib")
+ (string-split (getenv "LIBRARY_PATH") #\:))
":"))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-join
+ (setenv "CPLUS_INCLUDE_PATH"
+ (string-join
(delete
- (string-append
- (assoc-ref inputs
- (string-append "glibc-cross-" ,target))
- "/include")
- (string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
+ (string-append
+ (assoc-ref inputs
+ (string-append "glibc-cross-" #$target))
+ "/include")
+ (string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
":")))))
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (target-cc
- (search-input-file
- inputs (string-append "/bin/" ,(cc-for-target target)))))
- (call-with-output-file "config.toml"
- (lambda (port)
- (display (string-append "
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (target-cc
+ (search-input-file
+ inputs (string-append "/bin/" #$(cc-for-target target)))))
+ (call-with-output-file "config.toml"
+ (lambda (port)
+ (display (string-append "
[llvm]
[build]
cargo = \"" (search-input-file inputs "/bin/cargo") "\"
@@ -1338,7 +1437,7 @@ docs = false
python = \"" (which "python") "\"
vendor = true
submodules = false
-target = [\"" ,(platform-rust-target (lookup-platform-by-target target)) "\"]
+target = [\"" #$(platform-rust-target (lookup-platform-by-target target)) "\"]
[install]
prefix = \"" out "\"
sysconfdir = \"etc\"
@@ -1347,65 +1446,64 @@ debug = false
jemalloc = false
default-linker = \"" target-cc "\"
channel = \"stable\"
-[target." ,(platform-rust-target (lookup-platform-by-system (%current-system))) "]
+[target." #$(platform-rust-target (lookup-platform-by-system (%current-system))) "]
# These are all native tools
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
linker = \"" (which "gcc") "\"
cc = \"" (which "gcc") "\"
cxx = \"" (which "g++") "\"
ar = \"" (which "ar") "\"
-[target." ,(platform-rust-target (lookup-platform-by-target target)) "]
+[target." #$(platform-rust-target (lookup-platform-by-target target)) "]
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
linker = \"" target-cc "\"
cc = \"" target-cc "\"
-cxx = \"" (search-input-file inputs (string-append "/bin/" ,(cxx-for-target target))) "\"
-ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target))) "\"
+cxx = \"" (search-input-file inputs (string-append "/bin/" #$(cxx-for-target target))) "\"
+ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target target))) "\"
[dist]
") port))))))
- (replace 'build
- ;; Phase overridden to build the necessary directories.
- (lambda* (#:key parallel-build? #:allow-other-keys)
- (let ((job-spec (string-append
- "-j" (if parallel-build?
- (number->string (parallel-job-count))
- "1"))))
- ;; This works for us with the --sysroot flag
- ;; and then we can build ONLY library/std
- (invoke "./x.py" job-spec "build" "library/std"))))
- (replace 'install
- (lambda _
- (invoke "./x.py" "install" "library/std")))
- (delete 'install-rust-src)
- (delete 'wrap-rust-analyzer)
- (delete 'wrap-rustc)))))
+ (replace 'build
+ ;; Phase overridden to build the necessary directories.
+ (lambda* (#:key parallel-build? #:allow-other-keys)
+ (let ((job-spec (string-append
+ "-j" (if parallel-build?
+ (number->string (parallel-job-count))
+ "1"))))
+ ;; This works for us with the --sysroot flag
+ ;; and then we can build ONLY library/std
+ (invoke "./x.py" job-spec "build" "library/std"))))
+ (replace 'install
+ (lambda _
+ (invoke "./x.py" "install" "library/std")))
+ (delete 'install-rust-src)
+ (delete 'wrap-rust-analyzer)
+ (delete 'wrap-rustc)))))
(inputs
(modify-inputs (package-inputs base-rust)
- (prepend xz))) ; for lzma-sys
+ (prepend xz))) ; for lzma-sys
(propagated-inputs
(if (target-mingw? target)
- (modify-inputs (package-propagated-inputs base-rust)
- (prepend
- (if (string=? "i686-w64-mingw32" target)
- mingw-w64-i686-winpthreads
- mingw-w64-x86_64-winpthreads)))
- (package-propagated-inputs base-rust)))
+ (modify-inputs (package-propagated-inputs base-rust)
+ (prepend
+ (if (string=? "i686-w64-mingw32" target)
+ mingw-w64-i686-winpthreads
+ mingw-w64-x86_64-winpthreads)))
+ (package-propagated-inputs base-rust)))
(native-inputs
(if (target-mingw? target)
- (modify-inputs (package-native-inputs base-rust)
- (prepend (cross-gcc target
- #:libc (cross-libc target))
- (cross-binutils target)
- (if (string=? "i686-w64-mingw32" target)
- mingw-w64-i686-winpthreads
- mingw-w64-x86_64-winpthreads)))
- (modify-inputs (package-native-inputs base-rust)
- (prepend (cross-gcc target
- #:libc (cross-libc target))
- (cross-libc target)
- (cross-binutils target)))))
+ (modify-inputs (package-native-inputs base-rust)
+ (prepend (cross-gcc target
+ #:libc (cross-libc target))
+ (cross-binutils target)
+ (if (string=? "i686-w64-mingw32" target)
+ mingw-w64-i686-winpthreads
+ mingw-w64-x86_64-winpthreads)))
+ (modify-inputs (package-native-inputs base-rust)
+ (prepend (cross-gcc target
+ #:libc (cross-libc target))
+ (cross-libc target)
+ (cross-binutils target)))))
(properties
- `((hidden? . #t)
- ,(package-properties base-rust))))))
+ `((hidden? . #t) ,(package-properties base-rust))))))
(define-public rust-analyzer
(package
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index f52b86e1ed..1c139a7671 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -246,6 +246,7 @@ external dependencies.")
jansson
libarchive
libtirpc
+ libxcrypt
linux-pam
lmdb
mit-krb5
@@ -278,8 +279,7 @@ external dependencies.")
;; For generating man pages.
docbook-xml-4.2
docbook-xsl
- libxslt
- libxml2))) ;for XML_CATALOG_FILES
+ libxslt)))
(home-page "https://www.samba.org/")
(synopsis
"The standard Windows interoperability suite of programs for GNU and Unix")
@@ -322,6 +322,14 @@ Desktops into Active Directory environments using the winbind daemon.")
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-crypt-reference
+ ;; The following is needed because Python.h propagates
+ ;; HAVE_CRYPT_H, which is then seen from lib/replace/ but talloc
+ ;; doesn't need it at all.
+ (lambda _
+ (substitute* "lib/replace/replace.h"
+ (("#include <crypt.h>")
+ ""))))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
;; talloc uses a custom configuration script that runs a Python
@@ -389,6 +397,14 @@ destructors. It is the core memory allocator used in Samba.")
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-crypt-reference
+ ;; The following is needed because Python.h propagates
+ ;; HAVE_CRYPT_H, which is then seen from lib/replace/ but talloc
+ ;; doesn't need it at all.
+ (lambda _
+ (substitute* "lib/replace/replace.h"
+ (("#include <crypt.h>")
+ ""))))
(replace 'configure
;; tevent uses a custom configuration script that runs waf.
(lambda* (#:key outputs #:allow-other-keys)
@@ -435,6 +451,14 @@ many event types, including timers, signals, and the classic file descriptor eve
#:tests? (assoc-ref %build-inputs "lmdb")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-crypt-reference
+ ;; The following is needed because Python.h propagates
+ ;; HAVE_CRYPT_H, which is then seen from lib/replace/ but talloc
+ ;; doesn't need it at all.
+ (lambda _
+ (substitute* "lib/replace/replace.h"
+ (("#include <crypt.h>")
+ ""))))
(replace 'configure
;; ldb use a custom configuration script that runs waf.
(lambda* (#:key outputs #:allow-other-keys)
@@ -492,7 +516,7 @@ key-value pair databases and a real LDAP database.")
(native-inputs
(list autoconf automake libtool))
(inputs
- (list libpcap openssl))
+ (list libpcap libxcrypt openssl))
(synopsis "Implementation of the Point-to-Point Protocol")
(home-page "https://ppp.samba.org/")
(description
diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm
index 1870a2950c..a58be20f4a 100644
--- a/gnu/packages/sawfish.scm
+++ b/gnu/packages/sawfish.scm
@@ -27,6 +27,8 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
@@ -167,9 +169,11 @@ backend of Sawfish.")
pkg-config
which))
(inputs
- (list gdk-pixbuf-xlib
+ (list bash-minimal
+ gdk-pixbuf-xlib
gmp
libsm
+ libxcrypt
libxft
libxinerama
libxrandr
diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index e26c8a5429..a2faaa2728 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -106,7 +106,7 @@ WSD and eSCL.")
(define-public sane-backends-minimal
(package
(name "sane-backends-minimal")
- (version "1.2.1")
+ (version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -114,7 +114,7 @@ WSD and eSCL.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1dyipgfn8b8g38iqipy9y1p32p8xyf5sllh4dzhpx54schc4j3hm"))
+ (base32 "1fb6shx9bz0svcyasmyqs93rbbwq7kzg6l0h1zh3kjvcwhchyv72"))
(modules '((guix build utils)))
(snippet
;; Generated HTML files and udev rules normally embed a
@@ -393,55 +393,50 @@ provided the driver also exposes the buttons.")
"xsane-tighten-default-umask.patch"))
(modules '((guix build utils)))
(snippet
- '(begin
- ;; Remove ancient bundled lprng code under a non-free licence. See
- ;; <https://trisquel.info/en/issues/10713>, which solves the problem
- ;; by replacing it with a newer (free) copy. We let the build fall
- ;; back to the system version instead, which appears to work fine.
- (delete-file "lib/snprintf.c")
- (substitute* "lib/Makefile.in"
- (("snprintf\\.o ") ""))
- #t))))
+ #~(begin
+ ;; Remove ancient bundled lprng code under a non-free licence. See
+ ;; <https://trisquel.info/en/issues/10713>, which solves the problem
+ ;; by replacing it with a newer (free) copy. We let the build fall
+ ;; back to the system version instead, which appears to work fine.
+ (delete-file "lib/snprintf.c")
+ (substitute* "lib/Makefile.in"
+ (("snprintf\\.o ") ""))))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
- (list (string-append "xsanedocdir=" (assoc-ref %outputs "out")
- "/share/doc/" ,name "-" ,version))
- #:tests? #f ; no test suite
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-invalid-dereference
- ;; Fix the following compilation error with libpng:
- ;; xsane-save.c: In function ‘xsane_save_png’:
- ;; xsane-save.c:4913:21: error: dereferencing pointer to
- ;; incomplete type ‘png_struct {aka struct png_struct_def}’
- ;; if (setjmp(png_ptr->jmpbuf))
- ;; ^
- (lambda _
- (substitute* "src/xsane-save.c"
- (("png_ptr->jmpbuf") "png_jmpbuf(png_ptr)"))
- #t))
- (add-after 'unpack 'use-sane-help-browser
- (lambda _
- (substitute* "src/xsane.h"
- (("netscape") (which "xdg-open")))
- #t))
- (add-after 'install 'delete-empty-/sbin
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (rmdir (string-append out "/sbin"))
- #t))))))
+ (list
+ #:make-flags
+ #~(list (string-append "xsanedocdir=" #$output
+ "/share/doc/" #$name "-" #$version))
+ #:tests? #f ; no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-invalid-dereference
+ ;; Fix the following compilation error with libpng:
+ ;; xsane-save.c: In function ‘xsane_save_png’:
+ ;; xsane-save.c:4913:21: error: dereferencing pointer to
+ ;; incomplete type ‘png_struct {aka struct png_struct_def}’
+ ;; if (setjmp(png_ptr->jmpbuf))
+ ;; ^
+ (lambda _
+ (substitute* "src/xsane-save.c"
+ (("png_ptr->jmpbuf") "png_jmpbuf(png_ptr)"))))
+ (add-after 'unpack 'use-sane-help-browser
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/xsane.h"
+ (("netscape") (search-input-file inputs "bin/xdg-open")))))
+ (add-after 'install 'delete-empty-/sbin
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (rmdir (string-append out "/sbin"))))))))
(native-inputs
(list pkg-config))
(inputs
- `(("gtk+" ,gtk+-2)
- ("lcms" ,lcms)
- ("libjpeg" ,libjpeg-turbo)
- ("libtiff" ,libtiff)
- ("sane-backends" ,sane-backends)
-
- ;; To open the manual from the Help menu.
- ("xdg-utils" ,xdg-utils)))
+ (list gtk+-2
+ lcms
+ libjpeg-turbo
+ libtiff
+ sane-backends
+ xdg-utils)) ;to open the manual from the Help menu
(home-page "https://gitlab.com/sane-project/frontend/xsane")
(synopsis "Featureful graphical interface for document and image scanners")
(description
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index a91a2d693d..647f7e71d2 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -590,7 +590,7 @@ mixed.")
(define-public chibi-scheme
(package
(name "chibi-scheme")
- (version "0.10")
+ (version "0.11")
(home-page "https://github.com/ashinn/chibi-scheme")
(source
(origin
@@ -598,7 +598,7 @@ mixed.")
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0yhmj0lws3r3bl4ivs31dhlzxqc7f0dinixi904mraz1fmrg3w7f"))))
+ (base32 "02zq35hdbi03rmmamx6ml4ihsigdl4mmbf6d9ysazv8ciiln5v4b"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -739,7 +739,7 @@ utility functions for all standard Scheme implementations.")
(define-public scm
(package
(name "scm")
- (version "5f3")
+ (version "5f4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -747,7 +747,7 @@ utility functions for all standard Scheme implementations.")
version ".zip"))
(sha256
(base32
- "1jxxlhmgal26mpcl97kz37djkn97rfy9h5pvw0hah6f3f6w49j97"))))
+ "17i6shvh2caqmksm7z130f9fz0qinaxg7xz9yadv904xh3znshnk"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -1085,7 +1085,7 @@ The core is 12 builtin special forms and 33 builtin functions.")
(define-public gauche
(package
(name "gauche")
- (version "0.9.12")
+ (version "0.9.15")
(home-page "https://practical-scheme.net/gauche/index.html")
(source
(origin
@@ -1095,7 +1095,7 @@ The core is 12 builtin special forms and 33 builtin functions.")
(string-replace-substring version "." "_")
"/Gauche-" version ".tgz"))
(sha256
- (base32 "05xnym1phg8i14bacip5d0d3v0gc1nn5mgayd5hnda873f969bml"))))
+ (base32 "10zpbbikkcpdzk6c52wkckiyhn7nhnqjv2djdzyjr0n8qxxy4hrn"))))
(build-system gnu-build-system)
(inputs
(list libatomic-ops slib zlib))
@@ -1116,24 +1116,20 @@ The core is 12 builtin special forms and 33 builtin functions.")
"ext/tls/test.scm"
"lib/gauche/package/util.scm"
"libsrc/gauche/process.scm")
- (("/bin/sh") (which "sh")))
- #t))
+ (("/bin/sh") (which "sh")))))
(add-after 'build 'build-doc
(lambda _
(with-directory-excursion "doc"
- (invoke "make" "info"))
- #t))
+ (invoke "make" "info"))))
(add-before 'check 'patch-network-tests
;; Remove net checks.
(lambda _
(delete-file "test/net.scm")
- (invoke "touch" "test/net.scm")
- #t))
+ (invoke "touch" "test/net.scm")))
(add-after 'install 'install-docs
(lambda _
(with-directory-excursion "doc"
- (invoke "make" "install"))
- #t)))))
+ (invoke "make" "install")))))))
(synopsis "Scheme scripting engine")
(description "Gauche is a R7RS Scheme scripting engine aiming at being a
handy tool that helps programmers and system administrators to write small to
@@ -1290,7 +1286,7 @@ Gerbil code within Emacs.")))
(arguments
(list
#:modules `((ice-9 ftw)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-sh-references
@@ -1314,3 +1310,48 @@ as well as light. The implementation is based on an ad-hoc Virtual
Machine. STklos can also be compiled as a library and embedded in an
application.")
(license gpl2+)))
+
+(define-public r7rs-small-texinfo
+ (let ((commit "38a703976ea6353e32b52a5187dbdaf77fb2f050")
+ (revision "3"))
+ (package
+ (name "r7rs-small-texinfo")
+ (version (git-version "0.1.0" revision commit))
+ (home-page "https://codeberg.org/Zipheir/r7rs-small-texinfo/")
+ (source
+ (origin
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fr02fyhiwd364jkfy1n5w31pq3kx1rl5w634421g05702yb47x3"))))
+ (native-inputs (list bash texinfo))
+ (inputs '())
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan #~'(("r7rs-small.info" "share/info/"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'compile-the-files
+ (lambda _
+ (let* ((source-directory-path (string-append (getcwd)
+ "/doc/r7rs-small"))
+ (build-script-path (string-append
+ source-directory-path
+ "/build.sh"))
+ (info-directory-path (string-append #$output
+ "/share/info")))
+ (chdir source-directory-path)
+ (system* "bash" build-script-path "info")
+ (mkdir-p info-directory-path)
+ (copy-file (string-append source-directory-path
+ "/r7rs-small.info")
+ (string-append info-directory-path
+ "/r7rs-small.info"))))))))
+ (synopsis
+ "R7RS Small standard of the Scheme programming language in Info format")
+ (description
+ "Revised^7 Report of the Algorithmic Language Scheme adapted to Texinfo format.")
+ (license (non-copyleft "file://COPYING")))))
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 7c16ee239a..095f18d85e 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,8 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages hurd)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
@@ -55,7 +58,7 @@
(native-inputs
(list autoconf automake texinfo))
(inputs
- (list ncurses perl))
+ (list libxcrypt ncurses perl))
(arguments
`(#:configure-flags
;; By default, screen supports 16 colors, but we want 256 when
@@ -119,7 +122,8 @@ controlling terminal and attach to it later.")
(patches (search-patches "byobu-writable-status.patch"))))
(build-system gnu-build-system)
(inputs
- `(("python" ,python-wrapper) ; for config and session GUIs
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("python" ,python-wrapper) ; for config and session GUIs
("python-newt" ,newt "python")))
(arguments
`(#:phases
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 02dd0e3c6e..2fb2da24df 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2018, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017, 2018, 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -50,14 +50,14 @@
(define-public scribus
(package
(name "scribus")
- (version "1.6.1")
+ (version "1.6.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scribus/scribus/"
version "/scribus-" version ".tar.gz"))
(sha256
- (base32 "1kqqffx5xz35mwd422s4i110794zzx9sc2bn2mg77rz02hrxdhxg"))))
+ (base32 "066p0a9jp676qid5hf1cilrks70xchpzfck9db79rhqhk84ja355"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no test target
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index d3a0e33b19..4ae128a41c 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2023 Evgeny Pisemsky <mail@pisemsky.site>
;;; Copyright © 2023, 2024 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
@@ -43,6 +43,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
@@ -67,35 +68,47 @@
#:use-module (gnu packages xorg)
#:export (sdl-union))
-(define-public sdl
+(define-public sdl2
(package
- (name "sdl")
- (version "1.2.15")
+ (name "sdl2")
+ (version "2.30.1")
(source (origin
- (method url-fetch)
- (uri
- (string-append "https://libsdl.org/release/SDL-"
- version ".tar.gz"))
- (sha256
- (base32
- "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"))
- (patches (search-patches "sdl-libx11-1.6.patch"))))
+ (method url-fetch)
+ (uri
+ (string-append "https://libsdl.org/release/SDL2-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0fj7gxc7rlzzrafnx9nmf7ws3paxy583fmx7bcbavi6gr3xmy881"))))
(build-system gnu-build-system)
(arguments
- '(;; Explicitly link against shared libraries instead of dlopening them.
- ;; For X11, ALSA, and PulseAudio.
- ;; OpenGL library is still dlopened at runtime.
- #:configure-flags '("--disable-alsa-shared"
- "--disable-pulseaudio-shared"
- "--disable-x11-shared"
- ;; Explicitly link with mesa.
- ;; This add mesa to libsdl's RUNPATH, to make dlopen
- ;; finding the libGL from mesa at runtime.
- "LDFLAGS=-lGL")
-
- #:make-flags '("V=1") ;build verbosely
-
- #:tests? #f)) ; no check target
+ (list
+ #:tests? #f ;no check target
+ ;; Explicitly link against shared libraries instead of dlopening them.
+ ;; For X11, ALSA, and PulseAudio.
+ ;; OpenGL library is still dlopened at runtime.
+ #:configure-flags
+ #~(append
+ '("--disable-wayland-shared"
+ "--enable-video-kmsdrm"
+ "--disable-kmsdrm-shared")
+ '("--disable-alsa-shared"
+ "--disable-pulseaudio-shared"
+ "--disable-x11-shared"
+ ;; Explicitly link with mesa.
+ ;; This add mesa to libsdl's RUNPATH, to make dlopen
+ ;; finding the libGL from mesa at runtime.
+ "LDFLAGS=-lGL"))
+ #:make-flags
+ #~(cons*
+ ;; SDL dlopens libudev and libvulkan, so make sure they are in
+ ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags,
+ ;; which isn’t necessary as sdl2 includes Mesa by default.
+ (string-append "LDFLAGS=-Wl,-rpath,"
+ #$(this-package-input "eudev") "/lib"
+ ",-rpath,"
+ #$(this-package-input "vulkan-loader") "/lib")
+ '("V=1")))) ;build verbosely
(propagated-inputs
;; SDL headers include X11 headers.
(list libx11
@@ -105,60 +118,82 @@
;; change in pkg-config.
mesa))
(native-inputs (list pkg-config))
- (inputs (list libxrandr glu alsa-lib pulseaudio))
+ (inputs
+ ;; SDL2 needs to be built with ibus support otherwise some systems
+ ;; experience a bug where input events are doubled.
+ ;;
+ ;; For more information, see: https://dev.solus-project.com/T1721
+ (list
+ libxrandr
+ glu
+ alsa-lib
+ pulseaudio
+ dbus
+ eudev ;for discovering input devices
+ glib
+ ibus-minimal
+ libxkbcommon
+ libxcursor ;enables X11 cursor support
+ vulkan-loader
+ wayland
+ wayland-protocols))
(outputs '("out" "debug"))
(synopsis "Cross platform game development library")
- (description "Simple DirectMedia Layer is a cross-platform development
-library designed to provide low level access to audio, keyboard, mouse,
-joystick, and graphics hardware.")
+ (description
+ "Simple DirectMedia Layer is a cross-platform development library designed to
+provide low level access to audio, keyboard, mouse, joystick, and graphics
+hardware.")
(home-page "https://libsdl.org/")
- (license license:lgpl2.1)))
+ (license license:bsd-3)))
-(define-public sdl2
+(define-public sdl12-compat
(package
- (inherit sdl)
- (name "sdl2")
- (version "2.30.1")
+ (name "sdl12-compat")
+ (version "1.2.68")
(source (origin
- (method url-fetch)
- (uri
- (string-append "https://libsdl.org/release/SDL2-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libsdl-org/sdl12-compat")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0fj7gxc7rlzzrafnx9nmf7ws3paxy583fmx7bcbavi6gr3xmy881"))))
+ "0qsjlzi1wqszi6k4pc3k9xdvzid5cx6ql8wbjw6qdapzpvf6arvz"))))
+ (build-system cmake-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments sdl)
- ((#:configure-flags flags)
- #~(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
- "--disable-kmsdrm-shared")
- #$flags))
- ((#:make-flags flags ''())
- #~(cons*
- ;; SDL dlopens libudev and libvulkan, so make sure they are in
- ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags,
- ;; which isn’t necessary as sdl2 includes Mesa by default.
- (string-append "LDFLAGS=-Wl,-rpath,"
- #$(this-package-input "eudev") "/lib"
- ",-rpath,"
- #$(this-package-input "vulkan-loader") "/lib")
- #$flags))))
- (inputs
- ;; SDL2 needs to be built with ibus support otherwise some systems
- ;; experience a bug where input events are doubled.
- ;;
- ;; For more information, see: https://dev.solus-project.com/T1721
- (modify-inputs (package-inputs sdl)
- (append dbus
- eudev ;for discovering input devices
- glib
- ibus-minimal
- libxkbcommon
- libxcursor ;enables X11 cursor support
- vulkan-loader
- wayland
- wayland-protocols)))
- (license license:bsd-3)))
+ (list #:tests? #f ;no check target
+ #:configure-flags
+ ;; This add SDL2 to sdl12-compat's RUNPATH, to make dlopen finding the
+ ;; libSDL2 at runtime.
+ #~'("-DCMAKE_SHARED_LINKER_FLAGS=-lSDL2")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-sdl-config
+ (lambda _
+ ;; Keep the old behaviour to honour "--prefix" option for
+ ;; "--cflags" and "--libs", required by 'perl-alien-sdl'.
+ (substitute* "sdl-config.in"
+ (("echo -I[$][{]includedir[}]") "echo -I${prefix}/include")
+ (("echo -L[$][{]libdir[}]") "echo -L${prefix}/lib"))))
+ (add-after 'install 'install-sdl.pc
+ (lambda _
+ (let ((pcdir (string-append #$output
+ "/lib/pkgconfig")))
+ (symlink (string-append pcdir "/sdl12_compat.pc")
+ (string-append pcdir "/sdl.pc"))))))))
+ (inputs (list sdl2))
+ (propagated-inputs (list glu)) ;required by SDL_opengl.h
+ (synopsis "Cross platform game development library")
+ (description "Simple DirectMedia Layer is a cross-platform development library
+designed to provide low level access to audio, keyboard, mouse, joystick, and
+graphics hardware. This package is a compatibility layer; it provides a binary and
+source compatible API for programs written against SDL 1.2, but it uses SDL 2.0
+behind the scenes.")
+ (home-page "https://libsdl.org/")
+ ;; dr_mp3 code are under public domain.
+ (license (list license:zlib license:public-domain))))
+
+(define-public sdl sdl12-compat)
(define-public sdl2-2.0
(package
@@ -452,6 +487,8 @@ directory.")
(map (match-lambda
(("sdl" _)
`("sdl2" ,sdl2))
+ (("sdl12-compat" _)
+ `("sdl2" ,sdl2))
(other other))
(package-propagated-inputs package)))
@@ -571,8 +608,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 +621,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/search.scm b/gnu/packages/search.scm
index 8d21a082cb..8722d528c1 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
;;; Copyright © 2023 David Pflug <david@pflug.io>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -46,6 +47,7 @@
#:use-module (gnu packages aspell)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
@@ -630,7 +632,7 @@ suitable as a default locate on your system.")
;; building: xpdf, catdoc, MP3::Tag, Spreadsheet::ParseExcel,
;; HTML::Entities.
(inputs
- (list perl perl-uri perl-html-parser perl-html-tagset
+ (list bash-minimal perl perl-uri perl-html-parser perl-html-tagset
perl-mime-types))
(arguments
`(;; XXX: This fails to build with zlib (API mismatch) and tests fail
@@ -737,19 +739,20 @@ bibliographic data and simple document and bibtex retrieval.")
(define-public ugrep
(package
(name "ugrep")
- (version "3.11.2")
+ (version "6.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Genivia/ugrep")
(commit (string-append "v" version))))
(sha256
- (base32 "0k0dzdyif9lpk0avjk02xkd6bjg9km4spr3p4hzls88y9hwgcc9l"))
+ (base32 "0a8ni1klqfpd00m5fks0q6ngwx64nvrh41r4azxc1fcxz4glfv90"))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
#~(begin
- (delete-file-recursively "bin") ; pre-built executables
+ (delete-file-recursively "bin/win32") ; pre-built
+ (delete-file-recursively "bin/win64") ; pre-built
(for-each (lambda (regexp)
(for-each delete-file
(find-files "tests" regexp)))
@@ -762,6 +765,7 @@ bibliographic data and simple document and bibtex retrieval.")
lzip ;; lzma
pcre2
zlib
+ brotli
`(,zstd "lib")))
(arguments
(list
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 35a8d4e216..5abb461c0c 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
@@ -134,7 +135,7 @@ readers and is needed to communicate with such devices through the
(define-public eid-mw
(package
(name "eid-mw")
- (version "5.1.11")
+ (version "5.1.19")
(source
(origin
(method git-fetch)
@@ -143,7 +144,7 @@ readers and is needed to communicate with such devices through the
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "09mhpwvqsr3pd2by3jm5jzjhyfx0f80bii35zd81vbzy85z26igg"))))
+ (base32 "12hhr5v4shsg47wg10p7l03xhzpc1yk46h4bfxq5c224cbf4qrs8"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list autoconf
@@ -240,14 +241,14 @@ with a PKCS #11 Cryptographic Token Interface.")
(define-public pcsc-lite
(package
(name "pcsc-lite")
- (version "1.9.8")
+ (version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://pcsclite.apdu.fr/files/"
"pcsc-lite-" version ".tar.bz2"))
(sha256
(base32
- "12923c6l5qzga1xlcxvm0vzbqrxnxq1qgzlrxf2y5gpcaz2q0bah"))))
+ "0mlk32gpzmzjf5v8qn56lpyyba625jzzw8rkrmpyvr8h8nvf5hyn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers"
@@ -355,7 +356,7 @@ website for more information about Yubico and the YubiKey.")
(define-public opensc
(package
(name "opensc")
- (version "0.25.0")
+ (version "0.25.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -363,23 +364,22 @@ website for more information about Yubico and the YubiKey.")
version "/opensc-" version ".tar.gz"))
(sha256
(base32
- "0bv2sq3k8bl712yi1gi7f8km8g2x09is8ynnr5x3g2jh59pbdmz6"))))
+ "0yxk97aj29pybvya6r9ix9xh00hdzcfrc2lcns4vb3kwpplamjr3"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; By setting an absolute path here, we arrange for OpenSC to
- ;; successfully dlopen libpcsclite.so.1 by default. The user can
- ;; still override this if they want to, by specifying a custom OpenSC
- ;; configuration file at runtime.
- (add-after 'unpack 'set-default-libpcsclite.so.1-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((libpcsclite (search-input-file inputs
- "/lib/libpcsclite.so.1")))
- (substitute* "configure"
- (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"")
- (string-append
- "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\"")))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; By setting an absolute path here, we arrange for OpenSC to
+ ;; successfully dlopen libpcsclite.so.1 by default. The user can
+ ;; still override this if they want to, by specifying a custom OpenSC
+ ;; configuration file at runtime.
+ (add-after 'unpack 'set-default-libpcsclite.so.1-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libpcsclite (search-input-file inputs "/lib/libpcsclite.so.1")))
+ (substitute* "configure"
+ (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"")
+ (string-append "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\"")))))))))
(inputs
(list readline openssl-1.1 pcsc-lite ccid))
(native-inputs
@@ -394,6 +394,31 @@ authentication, encryption and digital signatures. OpenSC implements the PKCS
#15 standard and the PKCS #11 API.")
(license license:lgpl2.1+)))
+
+(define-public pkcs11-helper
+ (package
+ (name "pkcs11-helper")
+ (version "1.30.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-"
+ version "/pkcs11-helper-" version ".tar.bz2"))
+ (sha256
+ (base32 "1ac86jfj4qfwzbvsg6l9r4w4bbwxj2i9qi4dy1nz5aqcj6x1an2c"))))
+ (build-system gnu-build-system)
+ (inputs (list openssl pcsc-lite))
+ (native-inputs (list pkg-config))
+ (home-page "https://github.com/OpenSC/pkcs11-helper")
+ (synopsis "Library that simplifies the interaction with PKCS#11 providers")
+ (description
+ "Pkcs11-helper is a library that simplifies the interaction with
+PKCS#11 providers for end-user applications. PKCS#11 is published standard.
+PKCS#11 is the de-facto standard to access cryptographic devices")
+ (license (list license:gpl2 license:bsd-3))))
+
+
(define-public yubico-piv-tool
(package
(name "yubico-piv-tool")
@@ -598,10 +623,9 @@ Notable features:
(list help2man
gengetopt
pkg-config
- gtk-doc
+ gtk-doc/stable
docbook-xml-4.3
- eudev
- libxml2)) ;for XML_CATALOG_FILES
+ eudev))
(home-page "https://developers.yubico.com/libu2f-host/")
;; TRANSLATORS: The U2F protocol has a "server side" and a "host side".
(synopsis "U2F host-side C library and tool")
@@ -642,7 +666,7 @@ operations.")
gengetopt
help2man
pkg-config
- gtk-doc
+ gtk-doc/stable
which))
(home-page "https://developers.yubico.com/libu2f-server/")
;; TRANSLATORS: The U2F protocol has a "server side" and a "host side".
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index c45570744a..c72dfa007b 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages docbook)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
@@ -60,7 +61,8 @@
(file-name (git-file-name "selinux" version))
(sha256
(base32
- "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0"))))
+ "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0"))
+ (patches (search-patches "libsepol-versioned-docbook.patch"))))
(build-system gnu-build-system)
(arguments
(list
@@ -231,14 +233,6 @@ binary policies.")
(name "secilc")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
- ((#:make-flags flags)
- #~(let ((xsl (search-input-directory %build-inputs "xml/xsl")))
- (cons (string-append "XMLTO=xmlto --skip-validation -x "
- xsl "/docbook-xsl-"
- #$(package-version
- (this-package-native-input "docbook-xsl"))
- "/manpages/docbook.xsl")
- #$flags)))
((#:phases phases)
#~(modify-phases #$phases
(delete 'portability)
@@ -247,7 +241,7 @@ binary policies.")
(inputs
(list libsepol))
(native-inputs
- (list xmlto docbook-xsl))
+ (list docbook-xml-4.2 docbook-xsl xmlto))
(synopsis "SELinux common intermediate language (CIL) compiler")
(description "The SELinux CIL compiler is a compiler that converts the
@dfn{common intermediate language} (CIL) into a kernel binary policy file.")
@@ -258,7 +252,7 @@ binary policies.")
(name "python-sepolgen")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
- ((#:modules _ #~%gnu-build-system-modules)
+ ((#:modules _ #~%default-gnu-modules)
'((srfi srfi-1)
(guix build gnu-build-system)
(guix build utils)))
@@ -402,7 +396,8 @@ tools, and libraries designed to facilitate SELinux policy analysis.")
linux-pam
libsepol
libselinux
- libsemanage))
+ libsemanage
+ libxcrypt))
(native-inputs
(list gettext-minimal))
(synopsis "SELinux core utilities")
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 331fae80cf..31d3ed9feb 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -15,10 +15,12 @@
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Vinicius Monego <monego@posteo.net>
-;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -420,6 +422,28 @@ that implements both the msgpack and msgpack-rpc specifications.")
(inputs
`(("lua" ,lua-5.2)))))
+(define-public libscfg
+ (package
+ (name "libscfg")
+ (version "0.1.1")
+ (home-page "https://git.sr.ht/~emersion/libscfg")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~emersion/libscfg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b1ps7wba4anm3x1yndnd730dwl6rdz3zwjgxmsyq31fnjrjydv9"))))
+ (build-system meson-build-system)
+ (synopsis "Scfg library written in C")
+ (description
+ "This package provides a C library for to parse
+@uref{https://git.sr.ht/~emersion/scfg, scfg}, a simple configuration file
+format with one directive per line.")
+ (license license:expat)))
+
(define-public libyaml
(package
(name "libyaml")
@@ -832,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
@@ -875,7 +899,8 @@ C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for
game development and other performance-critical applications.")
(license license:asl2.0)))
-(define-public flatbuffers-next
+(define-public flatbuffers-23.1
+ ;; needed explicitly by tensorflow-lite 2.13.1
(package
(inherit flatbuffers)
(version "23.1.21")
@@ -887,18 +912,25 @@ game development and other performance-critical applications.")
(file-name (git-file-name "flatbuffers" version))
(sha256
(base32
- "1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz"))))))
+ "1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments flatbuffers)
+ ((#:configure-flags flags #~'())
+ #~(append #$flags '("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")))))))
-(define-public flatbuffers-next-shared
+(define-public flatbuffers-next
(package
- (inherit flatbuffers-next)
- (name "flatbuffers-shared")
- (version "23.1.21")
- (arguments
- (substitute-keyword-arguments (package-arguments flatbuffers-next)
- ((#:configure-flags flags)
- ;; Compile with -fPIC, needed for shared lib.
- #~(cons "-DFLATBUFFERS_CXX_FLAGS=-fPIC" #$flags))))))
+ (inherit flatbuffers)
+ (version "23.5.26")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/flatbuffers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "flatbuffers" version))
+ (sha256
+ (base32
+ "0cd12dvkzqdafz46q4302mzgpzbz589zmmiga7bq07f2sqy4vrvv"))))))
(define-public python-flatbuffers
(package
@@ -936,3 +968,65 @@ format for Python.")
(description "This package provides a Python wrapper library to the
Apache Arrow-based Feather binary columnar serialization data frame format.")
(license license:asl2.0)))
+
+(define-public libnop
+ (let ((commit "35e800d81f28c632956c5a592e3cbe8085ecd430")
+ (revision "0"))
+ (package
+ (name "libnop")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/libnop")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qqbaljq54qiq0dky9nj47igfcs065ry526jg9a0aafbfl9krpy2"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "out/test"))))
+ (replace 'install
+ (lambda _
+ (copy-recursively
+ "include" (string-append #$output "/include")))))))
+ (native-inputs (list googletest))
+ (home-page "https://github.com/google/libnop")
+ (synopsis "C++ Native Object Protocols")
+ (description "@code{libnop} is a header-only library for serializing and
+deserializing C++ data types without external code generators or runtime
+support libraries.")
+ (license license:asl2.0))))
+
+(define-public valijson
+ (package
+ (name "valijson")
+ (version "1.0.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tristanpenman/valijson")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ai6bj6mxd12mpvf1xwlad2vic5lsqy44adilp17wa7dq275vwf2"))))
+ (build-system cmake-build-system)
+ ;; The test suite is disabled as it requires Boost, Qt 5, Poco as well as
+ ;; other bundled libraries.
+ (arguments (list #:tests? #f))
+ (home-page "https://github.com/tristanpenman/valijson")
+ (synopsis "JSON schema validation C++ header-only library")
+ (description "Valijson is a header-only JSON Schema validation library for
+C++11. It provides a simple validation API that allows loading JSON Schemas,
+and validate documents loaded by one of several supported parser libraries.")
+ (license license:bsd-2)))
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index ae4e73956e..ec15f9d21f 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,12 +47,17 @@
#: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 crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages groff)
@@ -65,11 +71,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 +88,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)
@@ -409,7 +419,7 @@ written by Paul Haahr and Byron Rakitzis.")
'())
(list autoconf perl)))
(inputs
- (list ncurses))
+ (list libxcrypt ncurses))
(arguments
(list
#:phases
@@ -547,47 +557,87 @@ ksh, and tcsh.")
(define-public xonsh
(package
(name "xonsh")
- (version "0.15.1")
+ (version "0.18.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "xonsh" version))
(sha256
(base32
- "0427mimr4k75myg5mnig564kq7xbb5f5hws2ly3gxxl6g8mk79il"))
+ "0pvra253inzlw3rsplifqk953vvb92zh453m30v0hzp7yz9k0xp5"))
(modules '((guix build utils)))
(snippet
#~(begin
- (substitute* "setup.py"
- (("\"xonsh\\.ply\\.ply\",") ""))
+ (substitute* "pyproject.toml"
+ (("\"xonsh\\.parsers\\.ply\",") ""))
;; Use our properly packaged PLY instead.
(substitute* (list "setup.py"
- "tests/test_lexer.py"
- "xonsh/lexer.py"
+ "tests/parsers/test_lexer.py"
"xonsh/parsers/base.py"
"xonsh/parsers/completion_context.py"
+ "xonsh/parsers/lexer.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\\.parsers\\.ply") "from ply")
+ (("from xonsh\\.parsers import ply") "import ply"))
+ (delete-file-recursively "xonsh/parsers/ply")))))
+ (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_ptk_prompt"
+ "test_quote_handling"
+ "test_script"
+ "test_shebang_cr"
+ "test_skipper_command"
+ "test_sourcefile"
+ "test_spec_decorator_alias_output_format"
+ "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 +1017,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 +1137,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 +1173,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 +1223,802 @@ 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"))))
- (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"))))
+ (base32 "1v7xz13n5gzhwkn4d8wq1v22zbdvfqd2zxnqf2q3k8cnnj51ql63"))))
(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/shellutils.scm b/gnu/packages/shellutils.scm
index e58e9e61fc..7e9f85a5f2 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -18,6 +18,8 @@
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Brian Kubisiak <brian@kubisiak.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,11 +52,12 @@
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
- #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@@ -69,29 +72,30 @@
(define-public ascii
(package
(name "ascii")
- (version "3.18")
+ (version "3.30")
(source (origin
(method url-fetch)
(uri (string-append "http://www.catb.org/~esr/ascii/"
"ascii-" version ".tar.gz"))
(sha256
(base32
- "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j"))))
+ "0hr4k4mvnq4zpjxdjkvbbyzz7c1iwxhfal1hz0mdm1qv7sbxqbzd"))))
(build-system gnu-build-system)
- (arguments `(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'install 'create-directories
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (man1 (string-append out "/share/man/man1")))
- (mkdir-p bin)
- (mkdir-p man1)))))
- #:tests? #f))
+ (arguments
+ (list #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'create-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (man1 (string-append out "/share/man/man1")))
+ (mkdir-p bin)
+ (mkdir-p man1)))))
+ #:tests? #f))
(home-page "http://www.catb.org/~esr/ascii/")
(synopsis "ASCII name and synonym chart")
(description
@@ -125,7 +129,7 @@ chart.")
"/etc/boxes-config"))
#:modules
((ice-9 match)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -399,6 +403,66 @@ all of the regexes given on the command line in order.")
(home-page "https://github.com/rupa/z")
(license license:expat)))
+(define-public shfmt
+ (package
+ (name "shfmt")
+ (version "3.9.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mvdan/sh")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qqrggliwicmrqzwv9ivg7w1chy1b97w8p7ifpvqfsbal0qcr1xi"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "mvdan.cc/sh/v3/cmd/shfmt"
+ #:unpack-path "mvdan.cc/sh/v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-version
+ (lambda* (#:key unpack-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" unpack-path)
+ (let ((fixed-version (string-append #$version " (GNU Guix)")))
+ ;; shfmt uses modules to look up the version at runtime;
+ ;; since our build system does not yet support modules,
+ ;; inject the version string here instead
+ (substitute* "cmd/shfmt/main.go"
+ (("version = \"\\(devel\\)\"")
+ (format #f "version = \"~a\"" fixed-version)))
+ (substitute* "cmd/shfmt/testdata/script/flags.txtar"
+ (("devel\\|v3") #$version))))))
+ ;; 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-creack-pty
+ go-github-com-go-quicktest-qt
+ go-github-com-google-go-cmp
+ go-github-com-google-renameio-v2
+ go-github-com-muesli-cancelreader
+ go-github-com-rogpeppe-go-internal
+ go-golang-org-x-sync
+ go-golang-org-x-sys
+ go-golang-org-x-term
+ go-mvdan-cc-editorconfig))
+ (home-page "https://github.com/mvdan/sh")
+ (synopsis "Shell formatter with bash support")
+ (description
+ "This package provides a shell formatter. Supports
+@url{https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html,POSIX
+Shell}, @url{https://www.gnu.org/software/bash/,Bash}, and
+@url{http://www.mirbsd.org/mksh.htm,mksh}.")
+ (license license:bsd-3)))
+
+
(define-public envstore
(package
(name "envstore")
@@ -483,10 +547,59 @@ environments. It can move files to the trash, and remove or list files that
are already there.")
(license license:gpl2+)))
+(define-public tran
+ ;; There is no new release yet, but there are some changes in master brunch,
+ ;; see <https://github.com/kilobyte/tran/issues/4>.
+ (let ((commit "039df9529d5dfb8283edfb3c8b3cc16c01f0bfce")
+ (revision "0"))
+ (package
+ (name "tran")
+ ;; The latest upstream version seems to be "v5".
+ (version (git-version "5.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kilobyte/tran")
+ (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32 "1kzr3lfhi5f8wpwjzrzlwkxjv9rasdr9ndjdns9kd16vsh0gl2rd"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure provided
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* "tran"
+ (("my \\$DATA=\"data\"")
+ (format #f "my $DATA=\"~a/share/tran/data\"" #$output)))))
+ (replace 'build
+ (lambda _
+ (invoke "make")))
+ (delete 'strip)
+ (replace 'install
+ (lambda _
+ (install-file "tran" (string-append #$output "/bin/"))
+ (install-file "tran.1" (string-append
+ #$output "/share/man/man1/"))
+ (copy-recursively "data" (string-append
+ #$output "/share/tran/data/")))))))
+ (inputs (list perl))
+ (home-page "https://github.com/kilobyte/tran")
+ (synopsis "Transcription between character scripts")
+ (description
+ "This tool can transliterate/transcribe text both ways between the
+Latin script and other languages.")
+ (license license:expat))))
+
(define-public direnv
(package
(name "direnv")
- (version "2.32.3")
+ (version "2.34.0")
(source
(origin (method git-fetch)
(uri (git-reference
@@ -495,7 +608,7 @@ are already there.")
(file-name (git-file-name name version))
(sha256
(base32
- "1hyl67n7na19zm3ksiiyva4228alx0jfh9l3v1mxszn9prwgcfjc"))))
+ "0g04yxsj78v664dhkfa6fhm0vi2gzx1agr3h47dnm2f55wnymz0j"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/direnv/direnv"
@@ -525,8 +638,10 @@ are already there.")
;; direnv executable that's generated is removed.
(invoke "make" "clean"))))))))
(native-inputs
- (list go-github-com-burntsushi-toml go-github-com-direnv-go-dotenv
- go-github-com-mattn-go-isatty go-golang-org-x-mod which))
+ (list go-github-com-burntsushi-toml
+ go-github-com-mattn-go-isatty
+ go-golang-org-x-mod
+ which))
(home-page "https://direnv.net/")
(synopsis "Environment switcher for the shell")
(description
@@ -860,3 +975,30 @@ with Guix Home:
\"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\"))))))
@end example\n")
(license license:agpl3+)))
+
+(define-public fzf-tab
+ (package
+ (name "fzf-tab")
+ (version "1.1.2")
+ (home-page "https://github.com/Aloxaf/fzf-tab")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Aloxaf/fzf-tab")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "061jjpgghn8d5q2m2cd2qdjwbz38qrcarldj16xvxbid4c137zs2"))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan '(("lib" "/share/zsh/plugins/fzf-tab/")
+ ("modules" "/share/zsh/plugins/fzf-tab/")
+ ("fzf-tab.plugin.zsh" "/share/zsh/plugins/fzf-tab/")
+ ("fzf-tab.zsh" "/share/zsh/plugins/fzf-tab/")
+ ("README.md" "/share/doc/fzf-tab/"))))
+ (synopsis "Replace the zsh default completion menu with fzf")
+ (description
+ "The fzf-tab package replaces the default completion menu of the zsh
+shell with fzf, enabling fuzzy finding and multi-selection.")
+ (license license:expat)))
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 9f5c04d8fb..b3ded715d8 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -53,7 +53,7 @@
#:make-flags
#~(list (string-append "GCC=" #$(cc-for-target) " -fcommon"))
#:modules `((ice-9 string-fun)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index d5fc1e3d17..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.
;;;
@@ -495,15 +496,14 @@ functions in virtual scenarios.")
(define-public esmini
(package
(name "esmini")
- (version "2.27.1")
+ (version "2.37.11")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/esmini/esmini")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
- (patches (search-patches "esmini-use-pkgconfig.patch"
- "esmini-no-clutter-log.patch"))
+ (patches (search-patches "esmini-use-pkgconfig.patch"))
(modules '((guix build utils) (ice-9 ftw)))
(snippet
#~(with-directory-excursion "externals"
@@ -513,29 +513,21 @@ functions in virtual scenarios.")
(scandir "."))))
(sha256
(base32
- "07ccydz7kxy5jc52f8fmxg4nkr1spshfnpzcv0wgd5lqz9ghjahz"))))
+ "07pwa34nf0b4ihb9fn1pvfi0b39hd8r630nfa6v3a17dsy66a730"))))
(build-system cmake-build-system)
(arguments
(list
- #:configure-flags #~(list "-DDYN_PROTOBUF=TRUE")
+ #:configure-flags
+ #~(list "-DDYN_PROTOBUF=TRUE"
+ ;; Missing implot package
+ "-DUSE_IMPLOT=FALSE")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-cmake
(lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{CMAKE_HOME_DIRECTORY\\}/bin")
- (string-append (assoc-ref outputs "out") "/bin")))
- (substitute* "EnvironmentSimulator/CMakeLists.txt"
- (("\\$\\{OSI_DIR\\}/(include|lib)(-dyn)?" all what)
- (search-input-directory
- inputs
- (string-append what "/osi"
- #$(version-major
- (package-version
- (this-package-input
- "open-simulation-interface"))))))
- (("\\$\\{SUMO_BASE_DIR\\}/\\$\\{EXT_DIR_NAME\\}")
- #$(this-package-input "sumo")))))
+ (substitute* "support/cmake/common/locations.cmake"
+ (("\\$\\{CMAKE_SOURCE_DIR\\}/bin")
+ (string-append (assoc-ref outputs "out") "/bin")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "EnvironmentSimulator/Unittest/"
@@ -549,7 +541,7 @@ functions in virtual scenarios.")
(lambda (f)
(rename-file f (string-append out "/lib/"
(basename f))))
- (find-files "." "\\.so$")))))))))
+ (find-files "." "\\.(a|so)$")))))))))
(inputs (list mesa
openscenegraph `(,openscenegraph "pluginlib")
open-simulation-interface
@@ -1189,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
@@ -1223,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/skarnet.scm b/gnu/packages/skarnet.scm
index d5a5af2af3..3428866700 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -22,6 +22,7 @@
(define-module (gnu packages skarnet)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
@@ -74,7 +75,7 @@ and file system operations. It is used by all skarnet.org software.")
(sha256
(base32 "1393xka069n3rvc3dlg6c3ckzl1qgqkhvhlcxv6igl9216kpy0n8"))))
(build-system gnu-build-system)
- (inputs (list skalibs))
+ (inputs (list bash-minimal skalibs))
(arguments
'(#:configure-flags (list
(string-append "--with-lib="
diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm
index 885fcf8c15..8d60f931b3 100644
--- a/gnu/packages/slang.scm
+++ b/gnu/packages/slang.scm
@@ -38,14 +38,14 @@
(define-public slang
(package
(name "slang")
- (version "2.3.2")
+ (version "2.3.3")
(source (origin
(method url-fetch)
(uri (string-append "http://www.jedsoft.org/releases/slang/slang-"
version ".tar.bz2"))
(sha256
(base32
- "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"))
+ "062siwy785q699y3plnsbhy0xlaxdm485sh82b37668kmra5057r"))
(modules '((guix build utils)))
(snippet
#~(begin
diff --git a/gnu/packages/solidity.scm b/gnu/packages/solidity.scm
index 3cce3abcf2..c3111a22fd 100644
--- a/gnu/packages/solidity.scm
+++ b/gnu/packages/solidity.scm
@@ -1,5 +1,6 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +35,7 @@
(define-public solidity
(package
(name "solidity")
- (version "0.8.15")
+ (version "0.8.25")
(source
(origin
(method url-fetch)
@@ -42,10 +43,12 @@
(string-append "https://github.com/ethereum/solidity/releases/download/v"
version "/solidity_" version ".tar.gz"))
(sha256
- (base32 "0j9a8y5fizarl9yhbnwvd0x1nm6qsbskqb7j1fwsyqx47w5sa82p"))))
+ (base32 "0gr7mcrng7lkqx968n48js77kwz7fk8230yj0bhp1vw5hdglpxfy"))))
(build-system cmake-build-system)
(arguments
(list
+ #:configure-flags
+ #~(list "-DSTRICT_Z3_VERSION=OFF")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unbundle-3rd-party-dependencies
@@ -56,9 +59,13 @@
(("include\\(range-v3\\)")
"find_package(range-v3)")
(("include\\(jsoncpp\\)")
- "find_package(jsoncpp)")))))))
+ "find_package(jsoncpp)"))))
+ (add-after 'unpack 'allow-newer-version-of-jsoncpp
+ (lambda _
+ (substitute* "libsolutil/JSON.cpp"
+ (("JSONCPP_VERSION_PATCH ==") "JSONCPP_VERSION_PATCH >=")))))))
(inputs
- (list boost-static fmt-8.0 jsoncpp range-v3 z3))
+ (list boost-static fmt jsoncpp range-v3 z3))
(native-inputs
(list python ncurses findutils))
(home-page "https://solidity.readthedocs.io")
diff --git a/gnu/packages/specifications.scm b/gnu/packages/specifications.scm
index 125d794932..6b5e1e6fbe 100644
--- a/gnu/packages/specifications.scm
+++ b/gnu/packages/specifications.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,6 +26,36 @@
#:use-module (guix packages)
#:use-module (guix build-system copy))
+(define-public specification-ipld
+ (let ((commit "84a5cc6c168314a26be0d447c26fe76e46ce2a42")
+ (revision "0"))
+ (package
+ (name "specification-ipld")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ipld/ipld")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0avgjp4hjkh4jmsxx09vnwi74rax6409k28h29jwfl95v42h6yyl"))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan '(("./specs/schemas" "share/ipld/specs/"))
+ #:phases (modify-phases %standard-phases
+ (delete 'strip))))
+ (home-page "https://ipld.io/")
+ (synopsis "InterPlanetary Linked Data")
+ (description
+ "This package provides specification schemas of
+@acronym{InterPlanetary Linked Data, IPLD} which may be used for the test
+suites of application implementing the standard.")
+ ;; This library is dual-licensed under either of Apache 2.0 or MIT
+ ;; terms.
+ (license (list license:expat license:asl2.0)))))
+
(define-public specification-multibase
(let ((commit "4c8344e37852773de155f587dcf5897771b3fc19")
(revision "1"))
@@ -107,3 +138,31 @@ CID}).")
well-established cryptographic hash functions, addressing size + encoding
considerations.")
(license (list license:expat license:cc-by-sa3.0)))))
+
+(define-public specification-specreduce-data
+ (let ((commit "dcba1c601348ee3a5797ae2d84a068d83393058e")
+ (revision "0"))
+ (package
+ (name "specification-specreduce-data")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/astropy/specreduce-data")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1c6mrjfykkfbbyg489h7czr65nz6bcb3gszz5xa2cg2ccs00m8ii"))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan '(("specreduce_data/" "share/specreduce_data//"))
+ #:phases (modify-phases %standard-phases
+ (delete 'strip))))
+ (home-page "https://specreduce.readthedocs.io/")
+ (synopsis "Reference and calibration data for the reducing optical/IR spectra")
+ (description
+ "This package provides a general reference and calibration data for
+spectroscopic data reduction (e.g. standard star spectra, atmospheric
+extinction curves, line lists for calibration lamps).")
+ (license license:bsd-3))))
diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 36b67ccd93..097aa885f8 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -76,6 +76,7 @@
;; There numerous issues with the testsuite.
;; Enable all of them once they are fixed in upstream.
`(#:tests? #f
+ #:parallel-build? #f
#:configure-flags
(list
"--enable-shared"
@@ -356,7 +357,7 @@ be used by the sighted.")
#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules (,@%gnu-build-system-modules
+ #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index e280c06f2b..31f53cf377 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages check)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
@@ -75,7 +78,10 @@
"12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms"))))
(build-system python-build-system)
(arguments
- '(#:phases
+ `(;; Make sure it is safe to use 'imagemagick' instead of
+ ;; 'imagemagick/stable' (see the comment for the "imagemagick" input).
+ #:disallowed-references (,imagemagick/stable)
+ #:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
@@ -107,38 +113,43 @@
;; The Sphinx LaTeX library '\RequirePackage' or \\usepackage
;; these:
- texlive-amsfonts ;amsmath, amssymb, amstext
- texlive-amsmath
+ texlive-scheme-basic ;for a valid TeX Live tree
+ texlive-anyfontsize
texlive-capt-of
- texlive-carlisle ;remreset
+ texlive-cm-super
texlive-cmap
texlive-etoolbox
- texlive-fancyhdr
texlive-fancyvrb
texlive-float
texlive-fncychap
+ texlive-fontspec
texlive-framed
- texlive-geometry
- texlive-hyperref
- texlive-kvoptions
- texlive-latex-bin
- texlive-ltxcmds
+ texlive-luatex85
+ texlive-luatexbase
texlive-needspace
- texlive-oberdiek ;hypcap
texlive-parskip
+ texlive-polyglossia
texlive-preview
texlive-tabulary
+ texlive-tex-gyre
texlive-titlesec
- texlive-tools ;multicol, longtable
texlive-upquote
texlive-varwidth
texlive-wrapfig
texlive-xcolor))
(native-inputs
- (list imagemagick ;for "convert"
+ (list fontconfig
+ font-gnu-freefont
+ ;; imagemagick is added for "convert". The store item does not
+ ;; retain a reference to imagemagick, so it should be safe to use
+ ;; 'imagemagick/stable' instead of 'imagemagick'. This is enforced
+ ;; by the '#:disallowed-references' above.
+ imagemagick/stable
python-cython
python-html5lib
- python-pytest))
+ python-pytest
+ (texlive-updmap.cfg
+ (list texlive-cm-super texlive-tex-gyre))))
(home-page "https://www.sphinx-doc.org")
(synopsis "Python documentation generator")
(description "Sphinx is a tool that makes it easy to create documentation
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 860b77cf5d..d85e7737fd 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -172,7 +172,7 @@ which allows users to view a desktop computing environment.")
;; variable.
(substitute* "src/usb-acl-helper.c"
(("ACL_HELPER_PATH\"/spice-client-glib-usb-acl-helper\"")
- "\"/run/setuid-programs/spice-client-glib-usb-acl-helper\""))))
+ "\"/run/privileged/bin/spice-client-glib-usb-acl-helper\""))))
(add-before 'configure 'correct-polkit-dir
(lambda _
(substitute* "meson.build"
@@ -194,7 +194,8 @@ which allows users to view a desktop computing environment.")
python-six
vala))
(inputs
- (list cyrus-sasl
+ (list bash-minimal
+ cyrus-sasl
glib-networking
gobject-introspection
json-glib
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/sqlite.scm b/gnu/packages/sqlite.scm
index c51837d410..dd21db0921 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -116,10 +116,10 @@ is in the public domain.")
(define-public sqlite-next
(package
(inherit sqlite)
- (version "3.45.1")
+ (version "3.46.0")
(source (origin
(method url-fetch)
(uri (sqlite-uri version 2024))
(sha256
(base32
- "02lssjiwyvsrr80rp62n0msds0f7hq5y4lbni74k4nbs3f22g76d"))))))
+ "0zbs853s8ly693qdg0l7vs4shwn3plmvdczr2s478wsj6dxnm3kg"))))))
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index ff39aea9ba..92a3e201e5 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -18,6 +18,10 @@
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Wojtek Kosior <koszko@koszko.org>
+;;; Additions and modifications by Wojtek Kosior are additionally
+;;; dual-licensed under the Creative Commons Zero v1.0.
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +44,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -57,6 +62,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages nettle)
#:use-module (gnu packages kerberos)
+ #:use-module (gnu packages libevent)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
@@ -68,6 +74,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
#:use-module (gnu packages security-token)
+ #:use-module (gnu packages serialization)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages xorg)
@@ -198,7 +205,7 @@ a server that supports the SSH-2 protocol.")
(define-public openssh
(package
(name "openssh")
- (version "9.7p1")
+ (version "9.8p1")
(source
(origin
(method url-fetch)
@@ -206,7 +213,7 @@ a server that supports the SSH-2 protocol.")
"openssh-" version ".tar.gz"))
(patches (search-patches "openssh-trust-guix-store-directory.patch"))
(sha256
- (base32 "1z9zfw7ndibxwprazlkv1isrh1yplczdin5cziijfanqcvvjc129"))))
+ (base32 "1wrrb8zrfj9wa9nbpx310kl2k05gm4gxsl5hvycx9dbrlc1d12yx"))))
(build-system gnu-build-system)
(arguments
(list
@@ -490,7 +497,8 @@ with optional @acronym{TLS, Transport-Level Security} to protect credentials.")
(native-inputs
(list pkg-config))
(inputs
- (list boost
+ (list bash-minimal
+ boost
ncurses
openssl
perl
@@ -509,7 +517,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
(define-public dropbear
(package
(name "dropbear")
- (version "2022.83")
+ (version "2024.85")
(source
(origin
(method url-fetch)
@@ -517,7 +525,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
"https://matt.ucc.asn.au/dropbear/releases/"
"dropbear-" version ".tar.bz2"))
(sha256
- (base32 "0fs495ks354qcfj4k5bwg6m50vbl8az03gjymmqm2jy9zcgi4nmw"))
+ (base32 "00m5dmajx0za1zmya4qdz763hxy4cmfk7bpba778k7d66g23dc46"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -535,10 +543,10 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'enable-x11-forwarding
(lambda _
- (substitute* "default_options.h"
+ (substitute* "src/default_options.h"
(("#define DROPBEAR_X11FWD 0")
"#define DROPBEAR_X11FWD 1")))))))
- (inputs (list libtomcrypt libtommath zlib))
+ (inputs (list libtomcrypt libtommath libxcrypt zlib))
(synopsis "Small SSH server and client")
(description "Dropbear is a relatively small SSH server and
client. It runs on a variety of POSIX-based platforms. Dropbear is
@@ -619,7 +627,8 @@ basis for almost any application.")
;; The server (lshd) invokes xauth when X11 forwarding is requested.
;; This adds 24 MiB (or 27%) to the closure of lsh.
xauth
- libxau)) ;also required for x11-forwarding
+ libxau ;also required for x11-forwarding
+ libxcrypt))
(arguments
'(;; Skip the `configure' test that checks whether /dev/ptmx &
;; co. work as expected, because it relies on impurities (for
@@ -942,6 +951,39 @@ Ed25519 keys.
@end itemize")
(license license:expat)))
+(define-public tmate-ssh-server
+ (let ((ver "2.3.0")
+ (rev "0")
+ (commit-id "d7334ee4c3c8036c27fb35c7a24df3a88a15676b"))
+ (package
+ (name "tmate-ssh-server")
+ (version (git-version ver rev commit-id))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tmate-io/tmate-ssh-server")
+ (commit commit-id)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vf9b0hlsi7wj5zqnbqph6f467mpkasaaspp80ipdmrdm2yp8yjp"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-msgpack-pkg-config-dependency
+ (lambda _
+ (substitute* "configure.ac"
+ (("msgpack >= ")
+ "msgpack-c >= ")))))))
+ (native-inputs (list autoconf automake pkg-config))
+ (inputs (list libevent libite libssh msgpack-c ncurses))
+ (home-page "https://tmate.io/")
+ (synopsis "The server side part of tmate")
+ (description "This package allows users to host their own tmate
+servers.")
+ (license license:expat))))
+
(define-public x11-ssh-askpass
(package
(name "x11-ssh-askpass")
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index 44817d0232..6fb43195e7 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -92,7 +92,6 @@
docbook-xml-4.3
docbook-xsl
libtool
- libxml2 ;for XML_CATALOG_FILES
libxslt
util-linux ;For `rev` command used in tests.
xmlto))
@@ -163,10 +162,7 @@ fundamental object types for C.")
#$(this-package-native-input "docbook-xsl")
"/xml/xsl/docbook-xsl-"
#$(package-version (this-package-native-input "docbook-xsl"))
- "/manpages/docbook.xsl")
- ;; Remove "--postvalid" option, because that requires access to
- ;; online DTDs.
- "XMLLINT_FLAGS = --catalogs --nonet --noent --xinclude --noout")
+ "/manpages/docbook.xsl"))
#:configure-flags
#~(list "--localstatedir=/var" ; for /var/lib/sss, /var/run/sssd.pid, etc.
"--sysconfdir=/etc" ; /etc/sssd
@@ -283,7 +279,7 @@ fundamental object types for C.")
bc ; for tests
check ; for tests
cmocka ; for tests
- docbook-xml
+ docbook-xml-4.4
docbook-xsl
doxygen
gettext-minimal
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 89bed30916..af64cbd99d 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.3.3")
+ (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
- "0c03abq3kqg6d2yhrijy9j3fsl77har3k7pffwwbz19v74qi51c0"))))
+ "0kfrn8v8l555n5xrpf753jar5wa3vs622p967ffjkdxfx9fngjxl"))))
(build-system gnu-build-system)
(arguments
(list
@@ -410,7 +411,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
pkg-config
texinfo ; for building HTML manuals
(texlive-updmap.cfg
- (list texlive-fancyvrb
+ (list texlive-etoolbox
+ texlive-fancyvrb
texlive-inconsolata
texlive-upquote
texlive-xkeyval))
@@ -539,14 +541,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.0.1")
+ (version "7.3-61")
(source
(origin
(method url-fetch)
(uri (cran-uri "MASS" version))
(sha256
(base32
- "1gdd2gyqngvgnm0bxc3a33nykrx2rbfmxj82i7bh7f1961cr7pvl"))))
+ "140ah1719zad8gd0glvy9qlkxxakgz12i5r5gk2bgmwxayzwhi1i"))))
(properties `((upstream-name . "MASS")))
(build-system r-build-system)
(home-page "https://www.stats.ox.ac.uk/pub/MASS4/")
@@ -623,14 +625,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 +645,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
@@ -687,14 +689,14 @@ also flexible enough to handle most nonstandard requirements.")
(define-public r-matrix
(package
(name "r-matrix")
- (version "1.6-5")
+ (version "1.7-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "Matrix" version))
(sha256
(base32
- "0zdrrss4q0g7jify9bp1vvzrdpy62fc6fx3awzbd2wvfc938sv3j"))))
+ "0dxd13y6x6pz54ccbcalw2sm646h9pls4bby9zmj40ipvyhbp5zv"))))
(properties `((upstream-name . "Matrix")))
(build-system r-build-system)
(propagated-inputs
@@ -709,13 +711,13 @@ and operations on them using LAPACK and SuiteSparse.")
(define-public r-nlme
(package
(name "r-nlme")
- (version "3.1-164")
+ (version "3.1-166")
(source
(origin
(method url-fetch)
(uri (cran-uri "nlme" version))
(sha256
- (base32 "1s6lpp4hpjhyn7ygfngw2f60a40kbbikd0y2wqzbhdvhrqha19br"))))
+ (base32 "0qlpj3hjnlvd7x3ayjhvvpxlc2z4bfwk9qpglw8mnxbqipp18yi3"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice))
@@ -811,14 +813,14 @@ analysis.")
(define-public r-survival
(package
(name "r-survival")
- (version "3.5-8")
+ (version "3.7-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "survival" version))
(sha256
(base32
- "1d0qvw4200mjldna9n0acis0fk8xj28wwzqb8c3d4537l92zivbi"))))
+ "1vzy8kg159yqnvg733air11la2qrirwcqhn9d67h5c18r67b15nd"))))
(build-system r-build-system)
(propagated-inputs
(list r-matrix))
@@ -976,13 +978,13 @@ effects of different types of color-blindness.")
(define-public r-digest
(package
(name "r-digest")
- (version "0.6.35")
+ (version "0.6.37")
(source
(origin
(method url-fetch)
(uri (cran-uri "digest" version))
(sha256
- (base32 "07vqv2mnf8ppan2a3gydh4yr84n8489hypfas1rlk7050nxkycyc"))))
+ (base32 "0883iyjbd50f0gwz6hgdmcsrk0i0fkjaix9hz6d4m2jbk54x3i42"))))
(build-system r-build-system)
;; Vignettes require r-knitr, which requires r-digest, so we have to
;; disable them and the tests.
@@ -1007,13 +1009,13 @@ OpenSSL should be used.")
(define-public r-estimability
(package
(name "r-estimability")
- (version "1.5")
+ (version "1.5.1")
(source (origin
(method url-fetch)
(uri (cran-uri "estimability" version))
(sha256
(base32
- "0s6w8vnq0jc136d2mpf6pgg45rbxccrlsgdy89pgksnbaxhmyb5k"))))
+ "1sa42rczhzfj0dkn8v1pq6b752rh6h7x553gcgl7g27x75mbk9iw"))))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://cran.r-project.org/web/packages/estimability")
@@ -1194,14 +1196,14 @@ solution for sending email, including attachments, from within R.")
(define-public r-stringi
(package
(name "r-stringi")
- (version "1.8.3")
+ (version "1.8.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "stringi" version))
(sha256
(base32
- "09a964g8q3iphq24ln9c9g5158ynr75pfh3ghddarn0xvn7bw0hn"))))
+ "1wv9qqxl84l44kpvkx0lmyciinrh9pa5512jm56gsaqs9pvgh6f2"))))
(build-system r-build-system)
(inputs (list icu4c))
(native-inputs (list pkg-config))
@@ -1268,13 +1270,13 @@ using just two functions: melt and dcast (or acast).")
(define-public r-ggplot2
(package
(name "r-ggplot2")
- (version "3.5.0")
+ (version "3.5.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggplot2" version))
(sha256
- (base32 "1qlh231dwsa7j0pzlw6xdm68d7r0v64916p66bg9lh1dw3a1ryh7"))))
+ (base32 "08a72kizg42mdm35170fnpn8l6r4n3j1yvbgiq1k8dlvz4jb8n3w"))))
(build-system r-build-system)
(propagated-inputs
(list r-cli
@@ -1424,13 +1426,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 +1466,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 +1508,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 +1582,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
@@ -1606,13 +1608,13 @@ syntax that can be converted to XHTML or other formats.")
(define-public r-yaml
(package
(name "r-yaml")
- (version "2.3.8")
+ (version "2.3.10")
(source (origin
(method url-fetch)
(uri (cran-uri "yaml" version))
(sha256
(base32
- "1n1zlbnq3ldipnnm08whpvm8r21vxg4c9jzg7x7j3blw2pi7kl4y"))))
+ "0v9al1fh82vpjhml91j73sim7gfyc0154kxaam41sdkf6qnx8dp2"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/yaml/")
(synopsis "Methods to convert R data to YAML and back")
@@ -1624,13 +1626,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.")
(define-public r-knitr
(package
(name "r-knitr")
- (version "1.46")
+ (version "1.48")
(source (origin
(method url-fetch)
(uri (cran-uri "knitr" version))
(sha256
(base32
- "0ng8kw79csvcg46lsm3yf147jh6rf91jbj8qlryaihd8jcyc6lcg"))))
+ "15zipywk2ayrmy0p7q4d18512c2cgr9kk1lmc7gyi8bxv8k5j6sh"))))
(build-system r-build-system)
(propagated-inputs
(list r-evaluate r-highr r-xfun r-yaml))
@@ -1728,13 +1730,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 +1830,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 +2000,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))
@@ -2037,13 +2039,13 @@ times.")
(define-public r-data-table
(package
(name "r-data-table")
- (version "1.15.4")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (cran-uri "data.table" version))
(sha256
(base32
- "0lyb82kl2bn70l9ag5xdr8q7rh4majbimygaynmfqnbdjkznb05b"))))
+ "1kgrdv2iijn7qd39prwvcrglcp992xf2jl5a9zc81plr032sxy2q"))))
(properties `((upstream-name . "data.table")))
(build-system r-build-system)
(inputs
@@ -2180,7 +2182,7 @@ machine learning, computer vision, and high-dimensional statistics.")
(define-public python-arviz
(package
(name "python-arviz")
- (version "0.17.1")
+ (version "0.19.0")
(source (origin
(method git-fetch) ; PyPI misses some test files
(uri (git-reference
@@ -2189,7 +2191,7 @@ machine learning, computer vision, and high-dimensional statistics.")
(file-name (git-file-name name version))
(sha256
(base32
- "1rpm2a9swzhnqn84dfsbc8kvz6qnn8w2icr3p08gwax9h9pg4ksp"))))
+ "0wj1yxr6as368vkr4mk9fz4584nyy12gq2v20l7542lnaabw403z"))))
(build-system pyproject-build-system)
(arguments
;; FIXME: matplotlib tests fail because of the "--save" test flag.
@@ -2208,7 +2210,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
@@ -2348,17 +2351,58 @@ building design matrices.")
;; and is covered by the PSFL.
(license (list license:bsd-2 license:psfl))))
+(define-public python-lifelines
+ (package
+ (name "python-lifelines")
+ (version "0.28.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lifelines" version))
+ (sha256
+ (base32 "0pmjb3z1rw1ia64gw87r6y9x1g4kwpw239gqzsa9qh7xadj75kzf"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; This accuracy test fails because 0.012 is not < 0.01.
+ '(list "-k" "not test_weibull_with_delayed_entries")))
+ (propagated-inputs (list python-autograd
+ python-autograd-gamma
+ python-formulaic
+ python-matplotlib
+ python-numpy
+ python-pandas
+ python-scipy))
+ (native-inputs (list python-dill
+ python-flaky
+ python-joblib
+ python-pytest))
+ (home-page "https://github.com/CamDavidsonPilon/lifelines")
+ (synopsis
+ "Survival analysis including Kaplan Meier, Nelson Aalen and regression")
+ (description
+ "This package enables survival analysis in Python, including Kaplan
+Meier, Nelson Aalen and regression.")
+ (license license:expat)))
+
(define-public python-mapie
(package
(name "python-mapie")
- (version "0.8.3")
+ (version "0.8.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "MAPIE" version))
(sha256
(base32
- "13kgyqk1hp603n9zym835kp1pqs83k0j7ymayw4fk0zx4z1nmvdx"))))
+ "013ljcjjl3k9yb3166fnvr6nsb9ph4rhidpdjjks78qw0w1j7faa"))))
(build-system pyproject-build-system)
+ ;; See https://github.com/scikit-learn-contrib/MAPIE/issues/432
+ (arguments
+ (list
+ #:test-flags
+ '(list "-k" (string-append "not test_correct_results"
+ " and not test_correct_results_binary"))))
(native-inputs (list python-pandas python-pytest))
(propagated-inputs (list python-numpy python-scikit-learn))
(home-page "https://github.com/scikit-learn-contrib/MAPIE")
@@ -2375,13 +2419,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
@@ -2673,14 +2717,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")
@@ -2696,14 +2740,14 @@ R version.")
(define-public r-checkmate
(package
(name "r-checkmate")
- (version "2.3.1")
+ (version "2.3.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "checkmate" version))
(sha256
(base32
- "1xl4313kav3fy32ff9mdlm03za1mrwlym6d5abrkf0a0r86bmrp7"))))
+ "1qw81bs3lhwr1m6wlbs0l0j669051n60x4ca2821599ddhnp6mbj"))))
(build-system r-build-system)
(propagated-inputs
(list r-backports))
@@ -2859,13 +2903,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
@@ -2894,14 +2938,14 @@ collation, and NAMESPACE files.")
(define-public r-openssl
(package
(name "r-openssl")
- (version "2.1.2")
+ (version "2.2.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "openssl" version))
(sha256
(base32
- "0mm0rlf3m6wkvz5p8prxwjr37rn30lmhddsdi4ffnsmrysfl3rbp"))))
+ "13gp6q8s0pdjvnd7mnmdqhmmsb0mf4m3snq99j6js8c4sll27895"))))
(properties
`((upstream-name . "openssl")
(updater-extra-inputs . ("openssl"))))
@@ -3047,13 +3091,13 @@ tools to simplify the devolpment of R packages.")
(define-public r-withr
(package
(name "r-withr")
- (version "3.0.0")
+ (version "3.0.1")
(source (origin
(method url-fetch)
(uri (cran-uri "withr" version))
(sha256
(base32
- "1rz0pgm1bg3cnc09s8q8yyg83lmf8bv9arlasciqqr0fdpgfwy4c"))))
+ "0h9qbaa4i63awk176i3pm7bia7wgssav9zk9jvc7sg3k5yng2wym"))))
(build-system r-build-system)
(native-inputs
(list r-knitr))
@@ -3184,13 +3228,13 @@ well as additional utilities such as panel and axis annotation functions.")
(define-public r-rcpparmadillo
(package
(name "r-rcpparmadillo")
- (version "0.12.8.2.1")
+ (version "14.0.0-1")
(source (origin
(method url-fetch)
(uri (cran-uri "RcppArmadillo" version))
(sha256
(base32
- "11w92xjjwfhb3sv3g0m6hdhm27nnx73ahb404zm79a29ihwrj55w"))))
+ "145sci5fkwzrngqx2ykpxvvy3wn5wjfjfl7wmw92gn9yvkxd9i40"))))
(properties `((upstream-name . "RcppArmadillo")))
(build-system r-build-system)
(propagated-inputs
@@ -3212,13 +3256,13 @@ the header files from the templated Armadillo library.")
(define-public r-bitops
(package
(name "r-bitops")
- (version "1.0-7")
+ (version "1.0-8")
(source (origin
(method url-fetch)
(uri (cran-uri "bitops" version))
(sha256
(base32
- "1i0phmq5yynla5x0frqll1gbf5ww59p3sgz1s06a354zqf9grdg9"))))
+ "0f1744pi3qb1av41man6xp2xalwcjslz3qbk35gccpb4d6glp8bq"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/bitops")
(synopsis "Bitwise operations")
@@ -3276,13 +3320,13 @@ certain criterion, e.g., it contains a certain regular file.")
(define-public r-rmarkdown
(package
(name "r-rmarkdown")
- (version "2.26")
+ (version "2.28")
(source
(origin
(method url-fetch)
(uri (cran-uri "rmarkdown" version))
(sha256
- (base32 "1q6z2j1y6pjdz4nzw44srv9j62irnxqhkvrsi46ma7xrzq6ig34g"))))
+ (base32 "11d0fpzcwgi84dfbvjpg33gn155g3m2pa1jsih1h6hidm41sa0m1"))))
(properties
`((upstream-name . "rmarkdown")
(updater-extra-propagated-inputs . ("pandoc"))))
@@ -3311,13 +3355,13 @@ variety of formats.")
(define-public r-gtable
(package
(name "r-gtable")
- (version "0.3.4")
+ (version "0.3.5")
(source (origin
(method url-fetch)
(uri (cran-uri "gtable" version))
(sha256
(base32
- "0xvrkhcv1896mf3n43mva2mrmk0d8np7sjrykpg1pv54f69h6ckh"))))
+ "0wpavsypw2yp0pklmqw0qcwsh8smx5gr2kkxmgdmm52r0fiw37xi"))))
(properties `((upstream-name . "gtable")))
(build-system r-build-system)
(propagated-inputs
@@ -3397,13 +3441,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
@@ -3428,13 +3472,13 @@ engine (version 3.8.8.2) is included.")
(define-public r-rcurl
(package
(name "r-rcurl")
- (version "1.98-1.14")
+ (version "1.98-1.16")
(source (origin
(method url-fetch)
(uri (cran-uri "RCurl" version))
(sha256
(base32
- "1kq3ydvm7hvy8pxk9iy13pkq5mxyxqlx4mpjsadzl7a7jj32gbgf"))))
+ "19qddkyasfwa61mj0r0m4wk2xhpsqxf2dikih0s1fdjr207c938s"))))
(properties `((upstream-name . "RCurl")))
(build-system r-build-system)
(arguments
@@ -3468,13 +3512,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)
@@ -3589,14 +3633,14 @@ statements.")
(define-public r-segmented
(package
(name "r-segmented")
- (version "2.0-4")
+ (version "2.1-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "segmented" version))
(sha256
(base32
- "0a7qfs83kgn7g98kiwlk8zm2q9pzgkvmms9l15sgc5y952yig926"))))
+ "1p83g6qj8y4xblggm12bhr9zpsqbrrc7lbbigxcafhhi9c8v08v7"))))
(build-system r-build-system)
(propagated-inputs (list r-mass r-nlme))
(home-page "https://cran.r-project.org/web/packages/segmented")
@@ -3631,17 +3675,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-2")
(source (origin
(method url-fetch)
(uri (cran-uri "SparseM" version))
(sha256
(base32
- "0csbqd9wm6r4162mday1iaigzf9wv2rp1zq8hnihys6f38w8z0xx"))))
+ "0rc6x466jhalb6baxxhffmmcpi03nndvvighp696rrvrhsxzv015"))))
(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")
@@ -4437,13 +4481,13 @@ vignettes.")
(define-public r-mvtnorm
(package
(name "r-mvtnorm")
- (version "1.2-4")
+ (version "1.2-6")
(source (origin
(method url-fetch)
(uri (cran-uri "mvtnorm" version))
(sha256
(base32
- "1zws7myh61622v46gir6bs0dpyp6siz0hx7lrsvymshn02xqg0l4"))))
+ "0cfdd8l58yn48vc4zf4n5vfs3g02wdnvmkdf5zyybn3f54ydrpn4"))))
(build-system r-build-system)
(native-inputs
(list gfortran))
@@ -4770,14 +4814,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/")
@@ -4957,13 +5001,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
@@ -5064,14 +5108,14 @@ existing packages provide.")
(define-public r-sfsmisc
(package
(name "r-sfsmisc")
- (version "1.1-17")
+ (version "1.1-19")
(source
(origin
(method url-fetch)
(uri (cran-uri "sfsmisc" version))
(sha256
(base32
- "06ih8zljs57scy7jfnv32yxijgv1i60vggmlyyblwnff6mr2fm60"))))
+ "0fzjbicaa3x16skxgil84b4h6ylbcfi6vf30z7r8rqfj6pfk36c6"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/sfsmisc")
(synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich")
@@ -5376,13 +5420,13 @@ dispersion modeling and Tweedie power-law families.")
(define-public r-rann
(package
(name "r-rann")
- (version "2.6.1")
+ (version "2.6.2")
(source (origin
(method url-fetch)
(uri (cran-uri "RANN" version))
(sha256
(base32
- "10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj"))))
+ "0wlpkf6vilw871ac2bxy5nr790cfs6sax5k8m0fhasxbansxbxvf"))))
(properties
`((upstream-name . "RANN")))
(build-system r-build-system)
@@ -5516,14 +5560,14 @@ regression.")
(define-public r-fastica
(package
(name "r-fastica")
- (version "1.2-4")
+ (version "1.2-5.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "fastICA" version))
(sha256
(base32
- "0bszvwsfal83phwsk81vwcbs8q56qp5fs9a99yzpa6hd87m8hsgd"))))
+ "11frycqqv4hsky2yaf2rb850wwqizgjnvna31kasb625lklnx4b5"))))
(properties `((upstream-name . "fastICA")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/fastICA")
@@ -5623,14 +5667,14 @@ models, generalized linear models and model-based clustering.")
(define-public r-mclust
(package
(name "r-mclust")
- (version "6.1")
+ (version "6.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "mclust" version))
(sha256
(base32
- "0mchdxkc3y0v6dw8fzjnlqd6f3zrafm3xf1c53s6ps529b66kx2x"))))
+ "0xb726ssy224mzfg37nq5hffkdwi2hwjp1y9gwngk9vfbs703myx"))))
(build-system r-build-system)
(native-inputs
(list gfortran r-knitr))
@@ -5692,14 +5736,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-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "robustbase" version))
(sha256
(base32
- "0i6dzri3bfkpmp7h0h5nyzigs9rjzdd3c4ilapmvadmfywl9d9mn"))))
+ "1g0cykxx5glq0sljjwl6f3cs872apfd5xw59px77mvjbrm7x0y59"))))
(build-system r-build-system)
(native-inputs
(list gfortran))
@@ -5715,14 +5759,14 @@ regression methodology including model selections and multivariate statistics.")
(define-public r-pcapp
(package
(name "r-pcapp")
- (version "2.0-4")
+ (version "2.0-5")
(source
(origin
(method url-fetch)
(uri (cran-uri "pcaPP" version))
(sha256
(base32
- "0cw18pcbpsr5rc8fxbwnzfag5g76j4hscij7j08zlbyr2436gifn"))))
+ "043w3g3f57j2d0irnrxm58mzzisg7xmnsl17v7wijsh1czcswkv7"))))
(properties `((upstream-name . "pcaPP")))
(build-system r-build-system)
(propagated-inputs
@@ -5737,14 +5781,14 @@ analysis} (PCA) by projection pursuit.")
(define-public r-rrcov
(package
(name "r-rrcov")
- (version "1.7-5")
+ (version "1.7-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "rrcov" version))
(sha256
(base32
- "0cxhs0plbd8b01hmnpaphshhk34rw1bwg56rackb2pmngw3rbifz"))))
+ "1pj8w4w4yd730qy7bl8h3z7d5xj05avnq0fbj2gnxrz489yc18mq"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice r-mvtnorm r-pcapp r-robustbase))
@@ -5788,14 +5832,14 @@ generally.")
(define-public r-robust
(package
(name "r-robust")
- (version "0.7-4")
+ (version "0.7-5")
(source
(origin
(method url-fetch)
(uri (cran-uri "robust" version))
(sha256
(base32
- "0qh816ha18v0n021cccjan1kplmyj0xyb7jmkmrnb6gxf8kma3b3"))))
+ "1k0s5i9r0lyz3qsw76dd514qclggqj9k2axmgj86df81j6f2mh53"))))
(build-system r-build-system)
(propagated-inputs
(list r-fit-models r-lattice r-mass r-robustbase r-rrcov))
@@ -5833,14 +5877,14 @@ of the points.")
(define-public r-fpc
(package
(name "r-fpc")
- (version "2.2-11")
+ (version "2.2-12")
(source
(origin
(method url-fetch)
(uri (cran-uri "fpc" version))
(sha256
(base32
- "06j1dzlf96qcaiqg8m5iah9rmwdppky04xjhs8k4rh0k12wr0mc2"))))
+ "11s7211mnb9c72061mrcdfdwfph6nmbwcnpjgl32i2p7qys9cnam"))))
(build-system r-build-system)
(propagated-inputs
(list r-class
@@ -5865,13 +5909,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
@@ -5909,14 +5953,14 @@ showing the progress is useful e.g. bootstrap.")
(define-public r-minqa
(package
(name "r-minqa")
- (version "1.2.6")
+ (version "1.2.8")
(source
(origin
(method url-fetch)
(uri (cran-uri "minqa" version))
(sha256
(base32
- "0421b4ysslaqmdgwlz080abis8m4xkcvjq7lx1wywbsz1s2vi9si"))))
+ "0rslvg4imaijzb5z6vzsx4zqhrna1jk6qkp2kxnzqy0rn2wy8har"))))
(build-system r-build-system)
(propagated-inputs
(list r-rcpp))
@@ -5932,14 +5976,14 @@ based on an interface to Fortran implementations by M. J. D. Powell.")
(define-public r-rcppeigen
(package
(name "r-rcppeigen")
- (version "0.3.4.0.0")
+ (version "0.3.4.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppEigen" version))
(sha256
(base32
- "0djiyimgka7g3kfakb6mfaq7cxna9kn6kgib59x9p7qj24ha1m18"))))
+ "1fs2wmsq2s6nzhkrx59li4x1zvcjhk9mhmc2pdz8pm4z2ai7pbgc"))))
(properties `((upstream-name . "RcppEigen")))
(build-system r-build-system)
(propagated-inputs
@@ -6000,13 +6044,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
@@ -6032,21 +6076,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
@@ -6060,14 +6101,14 @@ algorithms.")
(define-public r-lme4
(package
(name "r-lme4")
- (version "1.1-35.3")
+ (version "1.1-35.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "lme4" version))
(sha256
(base32
- "0ij37wly0d28x143xdkjry5jsj4chlbli2fl9zbp8fkcgh95r1xl"))))
+ "0w2i2d3q19kbx3scd7p7dyfpfpcqb3d5h47y5rb2jr59gvdn8rkx"))))
(build-system r-build-system)
(propagated-inputs
(list r-boot
@@ -6093,17 +6134,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
@@ -6290,14 +6332,14 @@ multivariate case.")
(define-public r-tclust
(package
(name "r-tclust")
- (version "2.0-3")
+ (version "2.0-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "tclust" version))
(sha256
(base32
- "0l0m77a4r7izzw8akx7cz1qcxpvbjgg364yjapazji290741rfs6"))))
+ "0y05aqpmal7ky33hs8n1phai94d7f48ich43jvy4m5wbfxkp2rm6"))))
(build-system r-build-system)
;; These are all suggested packages, not build dependencies.
(propagated-inputs
@@ -6415,14 +6457,14 @@ easy and fun.")
(define-public r-fdrtool
(package
(name "r-fdrtool")
- (version "1.2.17")
+ (version "1.2.18")
(source
(origin
(method url-fetch)
(uri (cran-uri "fdrtool" version))
(sha256
(base32
- "1pf554vb902vavgqc4c0kgghywbgcvr3lkkr414bxngavcd60lil"))))
+ "1vxswr56c63vvl2q6m0j0a5psdw724vspf6zxlr1k9zsdfcnd6b4"))))
(build-system r-build-system)
(home-page "https://strimmerlab.org/software/fdrtool/")
(synopsis "Estimation of false discovery rates and higher criticism")
@@ -6865,7 +6907,7 @@ Java package that provides routines for various statistical distributions.")
#:modules '((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules `(,@%gnu-build-system-modules
+ #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:make-flags
@@ -6881,32 +6923,33 @@ Java package that provides routines for various statistical distributions.")
(let-syntax
((disable-tests
(syntax-rules ()
- ((_ file ())
+ ((_ ())
(syntax-error "test names list must not be empty"))
- ((_ file (test-name ...))
- (substitute* file
+ ((_ (test-name ...))
+ (substitute* (find-files "test" "\\.el$")
(((string-append "^\\(ert-deftest " test-name ".*")
all)
(string-append all "(skip-unless nil)\n"))
...))))
(disable-etests ;different test syntax
(syntax-rules ()
- ((_ file ())
+ ((_ ())
(syntax-error "test names list must not be empty"))
- ((_ file (test-name ...))
- (emacs-batch-edit-file file
- '(progn
- (mapc (lambda (test)
- (goto-char (point-min))
- (search-forward
- (format "etest-deftest %s " test))
- (beginning-of-line)
- (kill-sexp))
- (list test-name ...))
- (basic-save-buffer)))))))
- (disable-tests (list "test/ess-test-inf.el"
- "test/ess-test-r.el")
- ("ess--derive-connection-path"
+ ((_ (test-name ...))
+ (for-each
+ (lambda (file)
+ (emacs-batch-edit-file file
+ '(progn
+ (dolist (test (list test-name ...))
+ (goto-char (point-min))
+ (let ((s (format "etest-deftest %s "
+ test)))
+ (when (search-forward s nil t)
+ (beginning-of-line)
+ (kill-sexp))))
+ (basic-save-buffer))))
+ (find-files "test" "\\.el$"))))))
+ (disable-tests ("ess--derive-connection-path"
"ess-eval-line-test"
"ess-eval-region-test"
"ess-mock-remote-process"
@@ -6914,9 +6957,10 @@ Java package that provides routines for various statistical distributions.")
"ess-r-load-ESSR-github-fetch-yes"
"ess-set-working-directory-test"
"ess-test-r-startup-directory"))
- (disable-etests "test/ess-test-r-eval.el"
- ("ess-r-eval-ns-env-roxy-tracebug-test"
- "ess-r-eval-sink-freeze-test")))))
+ (disable-etests ("ess-r-eval-ns-env-roxy-tracebug-test"
+ "ess-r-eval-sink-freeze-test"
+ ;; Looks like an off-by-one error.
+ "ess--command-browser-unscoped-essr")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "make" "test"))))))))
@@ -7052,18 +7096,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
@@ -7201,14 +7245,14 @@ or eta squared effect size.")
(define-public r-logspline
(package
(name "r-logspline")
- (version "2.1.21")
+ (version "2.1.22")
(source
(origin
(method url-fetch)
(uri (cran-uri "logspline" version))
(sha256
(base32
- "0xqbk3h28gkx3haj7hdg314616x673cmg9ia148g0q9j3zqkqflf"))))
+ "00pdcfj1hmafxzs7gqw3n072p6pxp9hvsdm062n0xkiby6igffkp"))))
(properties `((upstream-name . "logspline")))
(build-system r-build-system)
(native-inputs (list gfortran))
@@ -7465,13 +7509,13 @@ L-Moments and Distributional Least Absolutes.")
(define-public r-exact
(package
(name "r-exact")
- (version "3.2")
+ (version "3.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "Exact" version))
(sha256
- (base32 "0a33gbhzd580i31xxsjxigg0nl8ag1x4xz3jqmq5jqappc6f5d2k"))))
+ (base32 "0hikz8f19blywxs66xj6zf4krwyivsy3w165qvrnb0m2l6dx1l7v"))))
(properties `((upstream-name . "Exact")))
(build-system r-build-system)
(propagated-inputs (list r-rootsolve))
@@ -7494,29 +7538,35 @@ Calculates confidence intervals for the difference in proportion.")
(define-public r-desctools
(package
(name "r-desctools")
- (version "0.99.54")
+ (version "0.99.56")
(source
(origin
(method url-fetch)
(uri (cran-uri "DescTools" version))
(sha256
- (base32 "16qbm1l1281yj1cg6fp8xgd8xdshpz9a09f0b9cyimsjbm01c2j7"))))
+ (base32 "1lvh19q3f4yidcxilba6bw2l2lllm6zc0aiqjgh8bvz01rq19f09"))))
(properties `((upstream-name . "DescTools")))
(build-system r-build-system)
+ (arguments
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
- (list r-boot
- r-cli
- r-data-table
- r-exact
- r-expm
- r-gld
- r-httr
- r-mass
- r-mvtnorm
- r-rcpp
- r-readxl
- r-rstudioapi
- r-withr))
+ (list r-boot
+ r-cli
+ r-data-table
+ r-exact
+ r-expm
+ r-gld
+ r-httr
+ r-mass
+ r-mvtnorm
+ r-rcpp
+ r-readxl
+ r-rstudioapi
+ r-withr))
(native-inputs (list gfortran r-r-rsp))
(home-page "https://andrisignorell.github.io/DescTools/")
(synopsis "Tools for Descriptive Statistics")
@@ -7695,12 +7745,11 @@ models, using simulation. It was designed to work with models fit using the
(synopsis
"Pilotdata based simulations for estimating power in linear mixed models")
(description
- "Implementation of a simulation based aproach to power analysis.
-Mixedpower uses lotdata and a linear mixed model fitted with lme4 to
-simulate new data sets. wer is computed separate for every effect in the
-model output as the relation significant simulations to all simulations.
-More conservative simulations as protection against a bias in the
-pilotdata are available aswell as methods for otting the results.")
+ "Mixedpower uses pilotdata and a linear mixed model fitted with lme4 to
+simulate new data sets. Power is computed seperate for every effect in the
+model output as the relation of significant simulations to all simulations.
+More conservative simulations as a protection against a bias in the pilotdata
+are available as well as methods for plotting the results.")
(license license:gpl3))))
(define-public r-colorway
@@ -7753,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/stb.scm b/gnu/packages/stb.scm
index 9286bcd87d..5101ed3bd9 100644
--- a/gnu/packages/stb.scm
+++ b/gnu/packages/stb.scm
@@ -47,7 +47,7 @@
`(#:modules ((ice-9 ftw)
(ice-9 regex)
(srfi srfi-26)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:phases (modify-phases %standard-phases
(delete 'configure)
(delete 'build)
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 0dadd0914a..ab7eb6102c 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -30,6 +30,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages assembly)
#:use-module (gnu packages authentication)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
@@ -215,6 +216,7 @@
(list `(,apache-thrift "lib")
`(,apache-thrift "include")
`(,apache-arrow-for-ceph "lib")
+ bash-minimal
boost
curl
cryptsetup
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 346784fd73..30b02a451e 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages crates-io)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
#:use-module (gnu packages fonts)
@@ -228,13 +229,13 @@ a custom raw video format with a simple container.")
(define-public dwm
(package
(name "dwm")
- (version "6.3")
+ (version "6.5")
(source (origin
(method url-fetch)
(uri (string-append "https://dl.suckless.org/dwm/dwm-"
version ".tar.gz"))
(sha256
- (base32 "1387lg370yrg7ssi3045di3904gkchxlza7rswgvl7wva8la1nms"))))
+ (base32 "0acpl05rg6rg6nrg3rv4kp388iqzp1n6dhin30a97yzjm6zrxmr1"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -284,14 +285,14 @@ optimising the environment for the application in use and the task performed.")
(define-public dmenu
(package
(name "dmenu")
- (version "5.2")
+ (version "5.3")
(source (origin
(method url-fetch)
(uri (string-append "https://dl.suckless.org/tools/dmenu-"
version ".tar.gz"))
(sha256
(base32
- "14ipsirsfqbyqlnna0k8yla5j6mrbgh3gd9d4xrg4h4inmvwmm6l"))))
+ "0pvr6da1v7hmbnacpgxcxv1sakg1nckmw347xhwrhx1dzpk573qs"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -358,7 +359,7 @@ numbers of user-defined menu items efficiently.")
#:phases #~(modify-phases %standard-phases
(delete 'configure))))
(inputs
- (list libx11 libxext libxinerama libxrandr))
+ (list libx11 libxcrypt libxext libxinerama libxrandr))
(home-page "https://tools.suckless.org/slock/")
(synopsis "Simple X session lock")
(description
@@ -368,14 +369,14 @@ numbers of user-defined menu items efficiently.")
(define-public st
(package
(name "st")
- (version "0.8.5")
+ (version "0.9.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://dl.suckless.org/st/st-"
version ".tar.gz"))
(sha256
- (base32 "0dxb8ksy4rcnhp5k54p7i7wwhm64ksmavf5wh90zfbyh7qh34s7a"))))
+ (base32 "0js9z5kn8hmpxzfmb2g6zsy28zkpg88j3wih5wixc89b8x7ms8bb"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 5db070a72d..2e9e28aa21 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -23,6 +23,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gettext)
@@ -329,6 +330,23 @@ and metadata, and the journal with querying and full text search.")
(substitute* "autogen.sh"
(("^\"\\$srcdir/configure" m)
(string-append "#" m)))))
+ (add-after 'unpack 'patch-references
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/sugar3/eggsmclient-xsmp.c"
+ (("/bin/rm") (search-input-file inputs "/bin/rm")))
+ (substitute* "src/sugar3/mime.py"
+ (("'/usr/local/share/'" m)
+ (string-append m ", '/run/current-system/profile/share'")))
+ (substitute* "src/sugar3/bundle/activitybundle.py"
+ (("'update-mime-database', mime_dir")
+ (string-append "'"
+ (search-input-file inputs "/bin/update-mime-database")
+ "', mime_dir")))
+ (substitute* "src/sugar3/bundle/bundle.py"
+ (("'unzip', '-o'")
+ (string-append "'"
+ (search-input-file inputs "/bin/unzip")
+ "', '-o'")))))
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/sugar-activity3")
@@ -345,7 +363,9 @@ and metadata, and the journal with querying and full text search.")
libx11
libxfixes
libxi
- python))
+ python
+ shared-mime-info
+ unzip))
(propagated-inputs
;; The gi typelib files are needed by users of this library.
(list gdk-pixbuf
@@ -483,6 +503,64 @@ a Tetris-like game.")
license:gpl2+
license:gpl3+))))
+(define-public sugar-cellgame-activity
+ (let ((commit "4a22fd177af224d2df588590eb835affacd5ca72")
+ (revision "1"))
+ (package
+ (name "sugar-cellgame-activity")
+ (version (git-version "5" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sugarlabs/cellgame")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09dxq06dr43i3g8im4j1xffl19rzr1pwbixwgb0kipnmbx8pln5c"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-launcher
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "activity/activity.info"
+ (("exec = sugar-activity3")
+ (string-append "exec = "
+ (search-input-file inputs "/bin/sugar-activity3"))))))
+ (add-after 'unpack 'inject-load-path
+ (lambda _
+ (substitute* "activity.py"
+ (("^import pygame")
+ (string-append "\
+import sys
+for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"):
+ try:
+ sys.path.index(directory)
+ except ValueError:
+ sys.path.insert(1, directory)
+import pygame
+")))))
+ (replace 'install
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "install"
+ (string-append "--prefix=" #$output)))))))
+ ;; All these libraries are accessed via gobject introspection.
+ (propagated-inputs
+ (list gtk+
+ sugar-toolkit-gtk3))
+ (inputs (list python-pygame))
+ (native-inputs
+ (list gettext-minimal))
+ (home-page "https://github.com/sugarlabs/cellgame")
+ (synopsis "Cell game for Sugar")
+ (description "This game for the Sugar desktop is based on the mechanisms
+present in gene regulatory networks.")
+ (license license:gpl3+))))
+
(define-public sugar-chat-activity
;; The last release was in 2019 and since then commits have been published
;; that include build fixes and translation updates.
@@ -535,6 +613,119 @@ a Tetris-like game.")
or classmates.")
(license license:gpl2+))))
+(define-public sugar-classify-cats-activity
+ (let ((commit "83aa89788c65bfdd3f77e24ac5a32b37f9518e54")
+ (revision "1"))
+ (package
+ (name "sugar-classify-cats-activity")
+ (version (git-version "2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sugarlabs/classify-cats")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "101drh1dqgr9qsz3r1fzkcn5h6z720zskaqnz2aixzp2ybvh17wk"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-launcher
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "activity/activity.info"
+ (("exec = sugar-activity3")
+ (string-append "exec = "
+ (search-input-file inputs "/bin/sugar-activity3"))))))
+ (replace 'install
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "install"
+ (string-append "--prefix=" #$output)))))))
+ ;; All these libraries are accessed via gobject introspection.
+ (propagated-inputs
+ (list gdk-pixbuf
+ gobject-introspection
+ gtk+
+ python-pygobject
+ sugar-toolkit-gtk3))
+ (native-inputs
+ (list gettext-minimal))
+ (home-page "https://github.com/sugarlabs/classify-cats")
+ (synopsis "Classify cats based on various criteria")
+ (description "This is a Sugar activity where players classify cats based
+on various criteria.")
+ (license license:gpl3+))))
+
+(define-public sugar-commander-activity
+ (let ((commit "a018652903e1c52c86ebf23e3250e7b68327427f")
+ (revision "1"))
+ (package
+ (name "sugar-commander-activity")
+ (version (git-version "11" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sugarlabs/sugar-commander")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "02n5wqh9cwr3jnjaxyd9kxcls4h3fdhhxdcyvvxmya08h20idvgd"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-launcher
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "activity/activity.info"
+ (("exec = sugar-activity3")
+ (string-append "exec = "
+ (search-input-file inputs "/bin/sugar-activity3"))))))
+ (add-after 'unpack 'inject-load-path
+ (lambda _
+ (substitute* "sugarcommander.py"
+ (("^import logging")
+ (string-append "\
+import sys
+for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"):
+ try:
+ sys.path.index(directory)
+ except ValueError:
+ sys.path.insert(1, directory)
+import logging
+")))))
+ (replace 'install
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "install"
+ (string-append "--prefix=" #$output)))))))
+ ;; All these libraries are accessed via gobject introspection.
+ (propagated-inputs
+ (list cairo
+ gdk-pixbuf
+ gobject-introspection
+ gtk+
+ python-pygobject
+ sugar-toolkit-gtk3))
+ (inputs (list python-pygame))
+ (native-inputs
+ (list gettext-minimal))
+ (home-page "https://github.com/sugarlabs/sugar-commander")
+ (synopsis "Manage your Sugar journal")
+ (description "Sugar-commander lets you import items from removeable
+devices like USB drives and SD cards using a familiar hierarchical view of
+files on these devices, as opposed to the flattened Journal view that the
+Sugar Journal gives to these devices. It also enables you to see how much
+disk space each Journal entry uses, generates thumbnails, and does other
+things to enhance your use of the Journal.")
+ (license license:gpl2+))))
+
(define-public sugar-help-activity
(let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3")
(revision "1"))
@@ -839,6 +1030,66 @@ handheld mode, with extremely low power consumption and simple navigation
controls.")
(license license:gpl2+))))
+(define-public sugar-river-crossing-activity
+ (let ((commit "0abbeb455363672ed29d734e6e48f50ef78ec48b")
+ (revision "1"))
+ (package
+ (name "sugar-river-crossing-activity")
+ (version (git-version "1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sugarlabs/river-crossing-activity")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0h7c3i288vwz249figw3jwyylwhlh9qlgjhlbs902ldpmib0k237"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-launcher
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "activity/activity.info"
+ (("exec = sugar-activity3")
+ (string-append "exec = "
+ (search-input-file inputs "/bin/sugar-activity3"))))))
+ (add-after 'unpack 'inject-load-path
+ (lambda _
+ (substitute* "activity.py"
+ (("^import pygame")
+ (string-append "\
+import sys
+for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"):
+ try:
+ sys.path.index(directory)
+ except ValueError:
+ sys.path.insert(1, directory)
+import pygame
+")))))
+ (replace 'install
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "install"
+ (string-append "--prefix=" #$output)))))))
+ ;; These libraries are accessed via gobject introspection.
+ (propagated-inputs
+ (list gtk+))
+ (inputs
+ (list python-pygame
+ sugar-toolkit-gtk3
+ gettext-minimal))
+ (home-page "https://github.com/sugarlabs/river-crossing-activity")
+ (synopsis "Puzzle game for Sugar desktop")
+ (description "A farmer is to ferry across a river a goat, a cabbage, and
+a wolf. The boat allows the farmer to carry only one of the three at a time.
+Without supervision, the goat will gobble the cabbage whereas the wolf will
+not hesitate to feast on the goat.")
+ (license license:gpl3+))))
+
(define-public sugar-terminal-activity
(let ((commit "a1f92b9da6121bc9a6fbba2c3f3b885dd26d4617")
(revision "1"))
@@ -970,6 +1221,68 @@ mathematics, and Computer Science features which will challenge the more
adventurous student.")
(license license:expat))))
+(define-public sugar-turtlepond-activity
+ (let ((commit "e460fc472d2f900c4c71659dbec07a715a3847a7")
+ (revision "1"))
+ (package
+ (name "sugar-turtlepond-activity")
+ (version (git-version "10" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sugarlabs/turtlepond")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0j7jzbwi2aph312f5dazmwgxqzh458b4yzz8mvrdxpr91ksxd4h4"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-launcher
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "activity/activity.info"
+ (("exec = sugar-activity3")
+ (string-append "exec = "
+ (search-input-file inputs "/bin/sugar-activity3"))))))
+ #;
+ (add-after 'unpack 'inject-load-path
+ (lambda _
+ (substitute* "TurtlePondActivity.py"
+ (("^import logging")
+ (string-append "\
+import sys
+for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"):
+ try:
+ sys.path.index(directory)
+ except ValueError:
+ sys.path.insert(1, directory)
+import logging
+")))))
+ (replace 'install
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "python" "setup.py" "install"
+ (string-append "--prefix=" #$output)))))))
+ ;; All these libraries are accessed via gobject introspection.
+ (propagated-inputs
+ (list cairo
+ gdk-pixbuf
+ gobject-introspection
+ gtk+
+ python-pygobject
+ sugar-toolkit-gtk3))
+ (native-inputs
+ (list gettext-minimal))
+ (home-page "https://github.com/sugarlabs/turtlepond")
+ (synopsis "Turtle-based strategy game")
+ (description "Turtle in a Pond is a strategy game. The goal is to
+surround the turtle before it runs off the screen.")
+ (license license:gpl2+))))
+
(define-public sugar-typing-turtle-activity
(package
(name "sugar-typing-turtle-activity")
diff --git a/gnu/packages/sycl.scm b/gnu/packages/sycl.scm
index d8454cff35..520d87f626 100644
--- a/gnu/packages/sycl.scm
+++ b/gnu/packages/sycl.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2023 Andy Tai <atai@atai.org>
+;;; Copyright © 2023, 2024 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,19 +34,19 @@
;; tests that require such devices are all disabled.
;; Check https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00293.html
-(define-public opensycl
+(define-public adaptivecpp
(package
- (name "opensycl")
- (version "0.9.4")
+ (name "adaptivecpp")
+ (version "24.02.0")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/OpenSYCL/OpenSYCL/")
+ (url "https://github.com/AdaptiveCpp/AdaptiveCpp/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0nynb93b68ghn1i1bsjvbbxpnh5b1yiw9jhhww1q1gi7w182x2g5"))))
+ "0gfr0mr9shgf33bj5sfy6nv2vh7wdky333ryy2n5ikvhfvjmqc7m"))))
(build-system cmake-build-system)
(native-inputs (list clang-15 llvm-15 python spirv-tools))
(inputs (list boost rocm-opencl-runtime spirv-headers))
@@ -54,6 +54,10 @@
(home-page "https://github.com/OpenSYCL/OpenSYCL")
(synopsis "Implementation of the SYCL programming language for accelerators")
(description
- "Open SYCL is a modern SYCL implementation targeting CPUs and GPUs from all
-major vendors that supports many use cases and approaches for implementing SYCL")
+ "AdaptiveCpp is aImplementation of SYCL and C++ standard parallelism
+for CPUs and GPUs from all vendors, with independent, community-driven
+compiler for C++-based heterogeneous programming models")
(license license:bsd-2)))
+
+(define-public opensycl
+ (deprecated-package "opensycl" adaptivecpp))
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 43199d4ad6..71a1eb3326 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -34,6 +34,7 @@
#:use-module (guix git-download)
#:use-module (guix licenses)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@@ -66,7 +67,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
@@ -187,7 +187,8 @@ Protocol.")
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH"))))))))))
(inputs
- (list gtk+
+ (list bash-minimal
+ gtk+
libappindicator
libnotify
python-bcrypt
@@ -213,354 +214,6 @@ notification area icon for Syncthing. Supported Syncthing features:
(define-public qsyncthingtray
(deprecated-package "qsyncthingtray" syncthing-gtk))
-(define-public go-github-com-audriusbutkevicius-recli
- (package
- (name "go-github-com-audriusbutkevicius-recli")
- (version "0.0.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/AudriusButkevicius/recli")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"))))
- (build-system go-build-system)
- (inputs
- (list go-github-com-pkg-errors go-github-com-urfave-cli))
- (arguments
- `(#:import-path "github.com/AudriusButkevicius/recli"))
- (synopsis "Reflection-based CLI generator")
- (description "For a given struct, @code{recli} builds a set of
-@code{urfave/cli} commands which allows you to modify it from the command line.
-It is useful for generating command line clients for your application
-configuration that is stored in a Go struct.")
- (home-page "https://github.com/AudriusButkevicius/recli")
- (license mpl2.0)))
-
-(define-public go-github-com-bkaradzic-go-lz4
- (let ((commit "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a")
- (revision "0"))
- (package
- (name "go-github-com-bkaradzic-go-lz4")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bkaradzic/go-lz4")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/bkaradzic/go-lz4"))
- (synopsis "LZ4 compression algorithm")
- (description "This package provides @code{go-lz4}, a Go implementation of
-the LZ4 compression algorithm.")
- (home-page "https://github.com/bkaradzic/go-lz4")
- (license bsd-2))))
-
-(define-public go-github-com-calmh-du
- (package
- (name "go-github-com-calmh-du")
- (version "1.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/calmh/du")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/calmh/du"))
- (synopsis "Get total and available disk space of a given volume")
- (description "This is a Go implementation of `du`. It provides disk usage
-information, such as how much storage space is available, free, and used.")
- (home-page "https://github.com/calmh/du")
- (license public-domain)))
-
-(define-public go-github-com-calmh-xdr
- (package
- (name "go-github-com-calmh-xdr")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/calmh/xdr")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/calmh/xdr"))
- (synopsis "XDR marshalling and unmarshalling")
- (description "XDR is an External Data Representation (XDR)
-marshalling and unmarshalling library in Go. It uses code generation and not
-reflection.")
- (home-page "https://github.com/calmh/xdr")
- (license expat)))
-
-(define-public go-github-com-d4l3k-messagediff
- (package
- (name "go-github-com-d4l3k-messagediff")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/d4l3k/messagediff")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/d4l3k/messagediff"))
- (synopsis "Diff arbitrary Go structs")
- (description "Messagediff is a library for calculating diffs of arbitrary
-structs in the Go programming language.")
- (home-page "https://github.com/d4l3k/messagediff")
- (license expat)))
-
-(define-public go-github-com-jackpal-gateway
- (package
- (name "go-github-com-jackpal-gateway")
- (version "1.0.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jackpal/gateway")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1yms2dw4dnz4cvj9vhwh6193d50jhvn5awsp2g3a4lcc3sjrgd6m"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/jackpal/gateway"))
- (synopsis "Discover the address of a LAN gateway")
- (description "@code{gateway} is a Go library for discovering the IP
-address of the default LAN gateway.")
- (home-page "https://github.com/jackpal/gateway")
- (license bsd-3)))
-
-(define-public go-github-com-oschwald-geoip2-golang
- (package
- (name "go-github-com-oschwald-geoip2-golang")
- (version "1.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/oschwald/geoip2-golang")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1jj4rbdpy87rbl79czg5hs5dyn6xlbnk0bnvyzi71dsxan57nixw"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-oschwald-maxminddb-golang go-golang-org-x-sys))
- (arguments
- `(#:import-path "github.com/oschwald/geoip2-golang"
- #:tests? #f)) ; Requires some unpackaged software and test data
- (synopsis "MaxMind GeoIP2 reader")
- (description "This package provides a library for reading MaxMind
-GeoLite2 and GeoIP2 databases in Go.")
- (home-page "https://github.com/oschwald/geoip2-golang")
- (license isc)))
-
-(define-public go-github-com-oschwald-maxminddb-golang
- (package
- (name "go-github-com-oschwald-maxminddb-golang")
- (version "1.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/oschwald/maxminddb-golang")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-golang-org-x-sys))
- (arguments
- `(#:import-path "github.com/oschwald/maxminddb-golang"
- #:tests? #f)) ; Requires some unpackaged software and test data
- (synopsis "MaxMind DB Reader for Go")
- (description "This is a Go reader for the MaxMind DB format. Although
-this can be used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a
-higher-level API for doing so.")
- (home-page "https://github.com/oschwald/maxminddb-golang")
- (license isc)))
-
-(define-public go-github-com-sasha-s-go-deadlock
- (package
- (name "go-github-com-sasha-s-go-deadlock")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/sasha-s/go-deadlock")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/sasha-s/go-deadlock"))
- (propagated-inputs
- (list go-github-com-petermattis-goid))
- (synopsis "Deadlock detection in go")
- (description "This package provides tools for detecting deadlocks at
-run-time in Go.")
- (home-page "https://github.com/sasha-s/go-deadlock")
- (license asl2.0)))
-
-(define-public go-github-com-syndtr-goleveldb
- (let ((commit "758128399b1df3a87e92df6c26c1d2063da8fabe")
- (revision "4"))
- (package
- (name "go-github-com-syndtr-goleveldb")
- (version (git-version "1.0.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/syndtr/goleveldb")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0mnkzrz4di13g6ggd54my7bkb9nwk8f5k672dyasn467wsg7bf8f"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-golang-snappy))
- (arguments
- `(#:import-path "github.com/syndtr/goleveldb/leveldb"
- #:unpack-path "github.com/syndtr/goleveldb"
- #:tests? #f)) ; XXX needs 'github.com/onsi/gomega' package
- (synopsis "LevelDB key/value database")
- (description "This is an implementation of the LevelDB key / value
-database in Go.")
- (home-page "https://github.com/syndtr/goleveldb")
- (license bsd-2))))
-
-(define-public go-github-com-thejerf-suture
- (package
- (name "go-github-com-thejerf-suture")
- (version "3.0.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/thejerf/suture")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/thejerf/suture"))
- (synopsis "Supervisor trees for Go")
- (description "Suture provides Erlang-ish supervisor trees for Go.
-\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together
-when it's trying to die.
-
-It is intended to deal gracefully with the real failure cases that can occur
-with supervision trees (such as burning all your CPU time endlessly restarting
-dead services), while also making no unnecessary demands on the \"service\"
-code, and providing hooks to perform adequate logging with in a production
-environment")
- (home-page "https://github.com/thejerf/suture")
- (license expat)))
-
-(define-public go-github-com-vitrun-qart
- (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa")
- (revision "0"))
- (package
- (name "go-github-com-vitrun-qart")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vitrun/qart")
- (commit commit)))
- (file-name (string-append "go-github-com-vitrun-qart-"
- version "-checkout"))
- (sha256
- (base32
- "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/vitrun/qart"))
- (synopsis "Create QR codes with an embedded image")
- (description "This package provides a library for embedding
-human-meaningful graphics in QR codes. However, instead of scribbling on
-redundant pieces and relying on error correction to preserve the meaning,
-@code{qart} engineers the encoded values to create the picture in a code with no
-inherent errors.")
- (home-page "https://github.com/vitrun/qart")
- (license bsd-3))))
-
-(define-public go-github-com-chmduquesne-rollinghash
- (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81")
- (revision "0"))
- (package
- (name "go-github-com-chmduquesne-rollinghash")
- (version (git-version "4.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/chmduquesne/rollinghash")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/chmduquesne/rollinghash/"))
- (synopsis "Rolling hashes in Go")
- (description "This package provides a Go implementation of several rolling
-hashes.")
- (home-page "https://github.com/chmduquesne/rollinghash")
- (license expat))))
-
-(define-public go-github-com-petermattis-goid
- (let ((commit "b0b1615b78e5ee59739545bb38426383b2cda4c9")
- (revision "1"))
- (package
- (name "go-github-com-petermattis-goid")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/petermattis/goid")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ghfxn045r0bbn2vszw897lxzmhnm4k59aypjvpxl0pbzsw9ab2c"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/petermattis/goid"))
- (synopsis "Identify the running goroutine")
- (description "This package offers a method of programmatically retrieving
-the current goroutine's ID.")
- (home-page "https://github.com/petermattis/goid")
- (license asl2.0))))
-
(define-public go-github-com-syncthing-notify
(let ((commit "69c7a957d3e261f9744f46b3dd4d608d8480ad90")
(revision "5"))
@@ -586,175 +239,3 @@ the current goroutine's ID.")
notification library in Go.")
(home-page "https://github.com/syncthing/notify")
(license expat))))
-
-(define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil
- (let ((commit "c12348ce28de40eed0136aa2b644d0ee0650e56c")
- (revision "0"))
- (package
- (name "go-github-com-matttproud-golang-protobuf-extensions-pbutil")
- (version (git-version "1.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/matttproud/golang_protobuf_extensions")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil"
- #:unpack-path "github.com/matttproud/golang_protobuf_extensions"))
- (propagated-inputs
- (list go-github-com-golang-protobuf-proto))
- (synopsis "Streaming Protocol Buffers in Go")
- (description "This package provides various Protocol Buffer
-extensions for the Go language, namely support for record length-delimited
-message streaming.")
- (home-page "https://github.com/matttproud/golang_protobuf_extensions")
- (license asl2.0))))
-
-(define-public go-github-com-go-asn1-ber-asn1-ber
- (package
- (name "go-github-com-go-asn1-ber-asn1-ber")
- (version "1.5.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-asn1-ber/asn1-ber")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15ygmfmdwwjda9xdq58rx6gnmsfc14m1qqhcj7cn7rm0mx4wk2vb"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-asn1-ber/asn1-ber"))
- (synopsis "ASN.1 BER encoding and decoding in Go")
- (description "This package provides ASN.1 BER encoding and decoding in the
-Go language.")
- (home-page "https://github.com/go-asn1-ber/asn1-ber")
- (license expat)))
-
-(define-public go-github-com-go-ldap-ldap
- (package
- (name "go-github-com-go-ldap-ldap")
- (version "3.4.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-ldap/ldap")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1xf2jrwhgr06jy4liba48hrz4b7j27r7m9dnl7fj95vazsx2n5br"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-ldap/ldap/v3"
- #:tests? #f)) ; test suite requires internet access
- (propagated-inputs
- (list go-github-com-go-asn1-ber-asn1-ber
- go-github-com-azure-go-ntlmssp))
- (home-page "https://github.com/go-ldap/ldap")
- (synopsis "LDAP v3 functionality for Go")
- (description "This package provides basic LDAP v3 functionality in the Go
-language.")
- (license expat)))
-
-(define-public go-github-com-azure-go-ntlmssp
- (package
- (name "go-github-com-azure-go-ntlmssp")
- (version "0.0.0-20211209120228-48547f28849e")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Azure/go-ntlmssp")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0im28kp9p6ncdmh7qq5qwl85nmiwmp8jka2qgrjiqzc5n36q56np"))))
- (build-system go-build-system)
- (arguments '(#:import-path "github.com/Azure/go-ntlmssp"))
- (propagated-inputs
- (list go-golang-org-x-crypto))
- (home-page "https://github.com/Azure/go-ntlmssp")
- (synopsis "NTLM negotiation in Go")
- (description
- "This package provides NTLM/Negotiate authentication over HTTP.")
- (license expat)))
-
-(define-public go-github-com-flynn-archive-go-shlex
- (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff")
- (revision "0"))
- (package
- (name "go-github-com-flynn-archive-go-shlex")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/flynn-archive/go-shlex")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/flynn-archive/go-shlex"))
- (synopsis "Go lexer")
- (description "Shlex is a simple lexer for go that supports shell-style
-quoting, commenting, and escaping.")
- (home-page "https://github.com/flynn-archive/go-shlex")
- (license asl2.0))))
-
-(define-public go-github-com-audriusbutkevicius-pfilter
- (package
- (name "go-github-com-audriusbutkevicius-pfilter")
- (version "0.0.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/AudriusButkevicius/pfilter")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/AudriusButkevicius/pfilter"))
- (synopsis "Filter packets into multiple virtual connections")
- (description "Pfilter is a Go package for filtering packets into multiple
-virtual connections from a single physical connection.")
- (home-page "https://github.com/AudriusButkevicius/pfilter")
- (license expat)))
-
-(define-public go-github-com-ccding-go-stun
- (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6")
- (revision "2"))
- (package
- (name "go-github-com-ccding-go-stun")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ccding/go-stun")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/ccding/go-stun"))
- (synopsis "STUN client implementation")
- (description "Go-stun is a go implementation of the STUN client (RFC 3489
-and RFC 5389).")
- (home-page "https://github.com/ccding/go-stun")
- (license asl2.0))))
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 18d3df5b6e..ed284be26b 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>
@@ -137,7 +137,8 @@
("xmllint" ,libxml2)
("xorg-server" ,xorg-server-for-tests)))
(inputs
- `(("glib" ,glib)
+ `(("bash" ,bash-minimal) ; for wrap-program
+ ("glib" ,glib)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gspell" ,gspell)
("gstreamer" ,gstreamer)
@@ -201,7 +202,8 @@ cards.")
(list gtk "bin")
pkg-config))
(inputs
- (list blueprint-compiler-0.4
+ (list bash-minimal
+ blueprint-compiler-0.4
glib
gtk
gtksourceview
@@ -224,14 +226,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)
@@ -379,7 +381,8 @@ file system, and many more features.")
pkg-config
which))
(inputs
- (list glib
+ (list bash-minimal
+ glib
glib-networking
gnome-keyring
gsettings-desktop-schemas
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index 96df50d747..d472a65174 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2021 Sebastian Gibb <mail@sebastiangibb.de>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org>
@@ -30,6 +31,7 @@
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -44,6 +46,8 @@
#: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 qt)
#:use-module (gnu packages readline)
@@ -58,6 +62,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system qt))
@@ -290,8 +295,8 @@ time to a logfile.")
(replace 'build
(lambda* (#:key import-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
- (invoke "go" "build" "-o" "dstask" "cmd/dstask/main.go")
- (invoke "go" "build" "-o" "dstask-import"
+ (invoke "go" "build" "-trimpath" "-o" "dstask" "cmd/dstask/main.go")
+ (invoke "go" "build" "-trimpath" "-o" "dstask-import"
"cmd/dstask-import/main.go"))))
(replace 'install
(lambda* (#:key import-path outputs #:allow-other-keys)
@@ -330,7 +335,7 @@ a task.")
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
- #:tests? #f ;the "Validate appstream file" test fails
+ #:tests? #f ;the "Validate appstream file" test fails
#:phases
(modify-phases %standard-phases
(add-after 'wrap 'wrap-libs
@@ -342,20 +347,20 @@ a task.")
(wrap-program (string-append out "/bin/blanket")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
- `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
- #t)))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
(native-inputs
- `(("desktop-file-utils" ,desktop-file-utils)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk+:bin" ,gtk+ "bin")
- ("pkg-config" ,pkg-config)))
+ (list desktop-file-utils
+ gettext-minimal
+ `(,glib "bin")
+ gobject-introspection
+ `(,gtk+ "bin")
+ pkg-config))
(inputs
(list appstream-glib
+ bash-minimal
gsettings-desktop-schemas
gst-plugins-bad
- gst-plugins-good ;for ScaleTempo plugin
+ gst-plugins-good ;for ScaleTempo plugin
gtk+
libhandy
python
@@ -482,3 +487,34 @@ manager. Todos are stored into icalendar files, which means you can sync
them via CalDAV using, for example, @code{vdirsyncer}.")
(license license:isc)))
+(define-public watson
+ (package
+ (name "watson")
+ (version "2.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tailordev/watson")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j0gqnxf0smjs0sy7ipryj1sk0s59wrh4qwr7h55zdr4wdhi407w"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-mock
+ python-pytest
+ python-pytest-datafiles
+ python-pytest-mock))
+ (propagated-inputs
+ (list python-arrow
+ python-click
+ python-click-didyoumean
+ python-colorama
+ python-requests))
+ (home-page "https://tailordev.github.io/Watson/")
+ (synopsis "Command-line time tracker")
+ (description
+ "Watson is command-line interface to manage your time. It supports
+projects, tagging and reports.")
+ (license license:expat)))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 358374a5bb..432d6f79a1 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
@@ -618,7 +618,7 @@ formerly a part of telegram-cli, but now being maintained separately.")
#:tests? #f ; No target
#:imported-modules
`((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules
'(((guix build copy-build-system)
#:prefix copy:)
@@ -691,7 +691,7 @@ formerly a part of telegram-cli, but now being maintained separately.")
#:tests? #f ; No target
#:imported-modules
`((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:modules
'(((guix build copy-build-system)
#:prefix copy:)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 1e0da5cd3c..a08e6cf031 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -858,8 +858,8 @@ Initiation Protocol (SIP) and a multimedia framework.")
(license license:gpl2+)))
(define-public pjproject-jami
- (let ((commit "e12ea3bfa81cc4f46031599f80707e81133f1353")
- (revision "1"))
+ (let ((commit "797f1a38cc1066acc4adc9561aa1288afabe72d5")
+ (revision "2"))
(package
(inherit pjproject)
(name "pjproject-jami")
@@ -880,7 +880,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
(file-name (git-file-name name version))
(sha256
(base32
- "0270qh7sxi7vpdlcfss72z6la3g0ipfrv9mm6ypg45k14h3bs9zq"))))
+ "1ssiffc48qg43c45fbpx86i1gbi969b8y34922z62irxbljdnc4m"))))
(arguments
(substitute-keyword-arguments (package-arguments pjproject)
((#:configure-flags _ ''())
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d18a042785..99a39a3f5f 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -25,7 +25,7 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 luhux <luhux@outlook.com>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
-;;; Copyright © 2021, 2022 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021, 2022, 2024 Raphaël Mélotte <raphael.melotte@mind.be>
;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
@@ -36,10 +36,11 @@
;;; Copyright © 2022, 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Suhail <suhail@bayesians.ca>
;;; Copyright © 2024 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -102,6 +103,7 @@
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
@@ -347,7 +349,6 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
automake
libtool
libxslt ;to build the man page
- libxml2 ;for XML_CATALOG_FILES
docbook-xsl))
(inputs
`(("libdrm" ,libdrm)
@@ -847,7 +848,7 @@ eye-candy, customizable, and reasonably lightweight.")
(define-public foot
(package
(name "foot")
- (version "1.17.2")
+ (version "1.18.1")
(home-page "https://codeberg.org/dnkl/foot")
(source
(origin
@@ -857,7 +858,7 @@ eye-candy, customizable, and reasonably lightweight.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1gi2c3zxyyf3l3wp702yfwxk512yz83rk06wljc7wlkbf1c9msm7"))))
+ (base32 "15s7fbkibvq53flf5yy9ad37y53pl83rcnjwlnfh96a4s5mj6v5d"))))
(build-system meson-build-system)
(arguments
(list
@@ -865,16 +866,23 @@ eye-candy, customizable, and reasonably lightweight.")
;; also to address a GCC 10 issue when doing PGO builds.
#:build-type "release"
;; Enable LTO as recommended by INSTALL.md.
- #:configure-flags #~'("-Db_lto=true")))
- (native-inputs (list ncurses ;for 'tic'
- pkg-config scdoc wayland-protocols))
+ ;; when cross-compilation, enable lto will fail.
+ #:configure-flags (if (%current-target-system)
+ #~'()
+ #~'("-Db_lto=true"))))
+ (native-inputs (append
+ (if (%current-target-system)
+ (list wayland pkg-config-for-build)
+ '())
+ (list ncurses ;for 'tic'
+ pkg-config scdoc wayland-protocols)))
(native-search-paths
;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
;; provided for usability reasons. See <https://bugs.gnu.org/22138>.
(list (search-path-specification
(variable "TERMINFO_DIRS")
(files '("share/terminfo")))))
- (inputs (list fcft libxkbcommon wayland))
+ (inputs (list fcft libxkbcommon wayland wayland-protocols))
(synopsis "Wayland-native terminal emulator")
(description
"@command{foot} is a terminal emulator for systems using the Wayland
@@ -1010,30 +1018,28 @@ programmer to write text-based user interfaces.")
(define-public go-github-com-junegunn-fzf
(package
(name "go-github-com-junegunn-fzf")
- (version "0.41.0")
+ (version "0.54.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/junegunn/fzf")
- (commit version)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "1l9nsvziip3azyvg8wi4g3x606fh6w9vpfcbcgjdzdnp2ywqciim"))))
+ "0mdj3z7w2igkvy8r304k9rcr2l6xm459ifshdm55iy6mazd8cmci"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/junegunn/fzf"))
(inputs
- (list go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-shellwords
+ (list go-github-com-charlievieth-fastwalk
+ go-github-com-gdamore-tcell-v2
go-github-com-mattn-go-isatty
- go-github-com-gdamore-tcell
+ go-github-com-mattn-go-shellwords
go-github-com-rivo-uniseg
- go-github-com-saracen-walker
- go-golang.org-x-sync-errgroup
- go-golang-org-x-term
- go-golang-org-x-crypto))
+ go-golang-org-x-sys
+ go-golang-org-x-term))
(home-page "https://github.com/junegunn/fzf")
(synopsis "Command-line fuzzy-finder")
(description "This package provides an interactive command-line filter
@@ -1085,6 +1091,7 @@ usable with any list--including files, command history, processes and more.")
(string-append zsh-completion "/_fzf"))))))))))
(inputs
`(,@(package-inputs go-github-com-junegunn-fzf)
+ ("bash" ,bash-minimal) ; for wrap-program
("findutils" ,findutils)
("ncurses" ,ncurses)))))
@@ -1491,18 +1498,22 @@ terminal are replicated to the others.
(define-public tio
(package
(name "tio")
- (version "2.7")
+ (version "3.6")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/tio/tio/releases/download/v"
- version "/tio-" version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tio/tio")
+ (commit (string-append "v" version))))
(sha256
- (base32 "19fswmyiwlify269h6nwdlbnhq4q7i8442xg81jinb4chhsf93xz"))))
+ (base32 "050zm7nh9niag1amjql859cj3xc9gbidk3zz546h6fhhh3vykmfl"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
- (inputs (list libinih))
+ (inputs (list glib lua))
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "-Dbashcompletiondir=share/bash-completion/completions")))
(home-page "https://tio.github.io/")
(synopsis "Simple TTY terminal I/O application")
(description "tio is a simple TTY terminal application which features a
@@ -1747,8 +1758,9 @@ and the ability to read and write via stdin and stdout.")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/realh/roxterm.git")
+ (url "https://github.com/realh/roxterm")
(commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
"19y4lxwj18pr231597rnyyk6f5hwvsajjv7w21wb5c62jjjyfrws"))))
@@ -1763,6 +1775,6 @@ and the ability to read and write via stdin and stdout.")
(synopsis "ROXTerm terminal emulator")
(description "This package provides a terminal emulator with hyperlink
support. It's based on VTE and aimed at power users.")
- (home-page "https://realh.github.io/roxterm/")
+ (home-page "https://realh.github.io/roxterm/en/index.html")
;; src/gresources.c is under LGPL 2.1+
(license (list license:gpl2+ license:lgpl2.1+))))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e46c1a898..324b8eeeee 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
@@ -99,6 +99,7 @@
#:use-module (gnu packages ruby)
#:use-module (gnu packages shells)
#:use-module (gnu packages tcl)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages base)
#:use-module (gnu packages gawk)
#:use-module (gnu packages web)
@@ -112,36 +113,36 @@
;;; Commentary:
;;;
-;;; This module aims at being as faithful as possible to TeX Live
-;;; distribution. Yet, some of the packages in this module are Guix specific.
-;;; The following paragraphs describe them.
-;;;
;;; Guix provides two different TeX Live systems: one monolithic, the TEXLIVE
-;;; package, and the other modular. Both are built from TEXLIVE-LIBKPATHSEA,
-;;; which is therefore the starting of any TeX Live update. Both also rely on
-;;; TEXLIVE-SCRIPTS, which contains core scripts and related files---although
-;;; monolithic TeX Live only makes use of its source. At that point, both
-;;; systems diverge.
+;;; package, and the other modular. This module is about the latter. It aims
+;;; at being as faithful as possible to TeX Live distribution. Yet, some of
+;;; the packages defined here are Guix specific. The following paragraphs
+;;; describe them.
;;;
-;;; On the one hand, the monolithic TeX Live merges TEXLIVE-BIN-FULL and
-;;; TEXLIVE-TEXMF in order to create TEXLIVE.
+;;; Source for all TeX Live binaries is located in TEXLIVE-SOURCE, which is
+;;; therefore the starting point of any TeX Live update. This is first used
+;;; to build TEXLIVE-LIBKPATHSEA and TEXLIVE-LIBPTEXENC.
;;;
-;;; On the other hand, modular TeX Live relies on TEXLIVE-BIN, which is
-;;; provided as a mandatory native input in the texlive build system. Unlike
-;;; TEXLIVE-BIN-FULL, it doesn't provide any script (but still include all the
-;;; binaries; this might change in the future). Then the system builds its
-;;; way towards regular `texlive-latex-bin' package, which is a convenient
-;;; native input (that can be ignored) for most TeX Live packages. Those
-;;; earlier in the build chain need the TEXLIVE-DOCSTRIP package to still be
-;;; able to generate their runfiles.
+;;; Both TEXLIVE-SOURCE and TEXLIVE-LIBKPATHSEA---which takes care of creating
+;;; a search path for GUIX_TEXMF environment variable---are used to compile
+;;; TEXLIVE-BIN. In turn, TEXLIVE-BIN propagates TEXLIVE-SCRIPTS, which
+;;; contains core scripts and related files, including "texlive.tldb"
+;;; database. TEXLIVE-BIN is a mandatory native input in the `texlive' build
+;;; system.
;;;
-;;; Default font map files are updated in a profile hook (see
-;;; `texlive-font-maps' in "profiles.scm"). However, this option is not
-;;; available when building documentation for a package. Consequently, this
-;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
-;;; tree with font map files updates. It should be used exclusively for
-;;; package definitions, as a native input. It is possible to augment that
-;;; tree, in particular with additional font packages.
+;;; Then, the system builds its way towards regular TEXLIVE-LATEX-BIN package,
+;;; which is a convenient native input---that can be ignored using
+;;; `texlive-latex-bin?' keyword argument---for most TeX Live packages. For
+;;; obvious reasons, packages used to build TEXLIVE-LATEX-BIN must be set it
+;;; to `#f'.
+;;;
+;;; The TEXLIVE-BIN package provides a few Web2C tools, Metafont and some TeX
+;;; engines---i.e, TeX, pdfLaTeX, LuaTeX and LuaHBTeX. The rest of the
+;;; binaries are built in separate packages, from TEXLIVE-SOURCE, and possibly
+;;; with the help of TEXLIVE-LIBKPATHSEA and TEXLIVE-LIBPTEXENC. Those
+;;; packages inherit their phases from TEXLIVE-BIN. As a convention, the
+;;; package named "texlive-NAME-bin" provides binaries for "texlive-NAME",
+;;; TEXLIVE-LATEX-BIN being the obvious exception to this scheme.
;;;
;;; Unlike font map files, TeX formats are not built from a profile hook, as
;;; the process would be too time-consuming, e.g., when invoking "guix shell".
@@ -152,8 +153,95 @@
;;; TEXLIVE-HYPHEN-COMPLETE, and all formats, being built with it, include all
;;; rules right from the start.
;;;
-;;; Any other "texlive-name" package matches the "name" TeX Live package, as
-;;; defined in the "texlive.tlpdb" file.
+;;; Any other "texlive-NAME" package matches "NAME" TeX Live package, as
+;;; defined in the "texlive.tlpdb" database.
+;;;
+;;; The following piece of art illustrates the bootstrap process of the
+;;; modular Guix TeX Live distribution. All "texlive-" prefixes have been
+;;; dropped for brevity.
+;;;
+;;;
+;;; ,-- libptexenc-----------------------.
+;;; | |
+;;; | |
+;;; source --| ,-- all "*-bin" minus latex-bin
+;;; | | | ___________________________
+;;; | | | |
+;;; | `-- libkpathsea --. | |
+;;; | |--| (inherit phases from bin)
+;;; `------------------------’ |
+;;; |
+;;; |
+;;; `-- bin -- hyphen-complete, etc. -- latex-bin
+;;; | _____________________
+;;; scripts --------(propagated)-------’ |
+;;; |
+;;; (#:texlive-latex-bin? #f)
+;;;
+;;;
+;;; Default font map files are updated in a profile hook (see
+;;; `texlive-font-maps' in "profiles.scm"). However, this option is not
+;;; available when building documentation for a package. Consequently, this
+;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
+;;; tree with font map files updates. It should be used exclusively for
+;;; package definitions, as a native input. It is possible to augment that
+;;; tree, in particular with additional font packages.
+;;;
+;;;
+;;; Notes about updating TeX Live distribution:
+;;; -------------------------------------------
+;;;
+;;; Thanks to the `texlive' updater, the more tedious part of that task, i.e.,
+;;; refreshing version strings, hashes, possibly locations and inputs, is
+;;; automated. Yet, the following additional steps are required, and they can
+;;; keep one busy for a while:
+;;;
+;;; 1. First and foremost, run the updater:
+;;;
+;;; ./pre-inst-env guix refresh -t texlive -u
+;;;
+;;; This takes care of updating all binaries and all TeX Live packages,
+;;; barring "collections" and "schemes", in a single run.
+;;;
+;;; 2. Then delete packages absent from the new TeX Live version. Those are
+;;; usually indicated by a failed update, or, more obviously, by their
+;;; outdated version in the module.
+;;;
+;;; Since "collections" and "schemes" are not updated automatically, all
+;;; references to deleted packages must also be cleared from their
+;;; propagated inputs.
+;;;
+;;; 3. Conversely, import newly integrated packages with, e.g.,
+;;;
+;;; ./pre-inst-env guix import texlive -r scheme-full
+;;;
+;;; Those must be added to their respective "collections", too.
+;;;
+;;; 4. Handle inputs issues. No updater is allowed to create an input field
+;;; in a package if it didn't exist beforehand. `texlive' updater is no
+;;; exception; it cannot update, e.g., propagated inputs if the relative
+;;; package didn't propagate some inputs already. Double check updater's
+;;; output, such issues are mentioned, and resolve them manually.
+;;;
+;;; Likewise, look for `(list)' artefacts the updater may have scattered
+;;; throughout this module. They usually appear when all elements have
+;;; been removed from an input field. In this situation, for aesthetics,
+;;; the whole field can be suppressed.
+;;;
+;;; 5. Last, but not least, test and fix the new packages, progressively. For
+;;; example, it is possible to consider the following packages as
+;;; milestones:
+;;;
+;;; libkpathsea > bin > latex-bin > scheme-basic > scheme-small
+;;;
+;;; Also, for good measure, it is advisable to check some common
+;;; "collections" such as "pictures" and (gulp!) "latexextra".
+;;;
+;;; At this point, if all is fine, send the update to the ML and let the CI
+;;; sort the rest out.
+;;;
+;;; Don't forget to pat yourself on the back!
+;;;
;;;
;;; Code:
@@ -162,38 +250,56 @@
(define-deprecated/public old-name name
(deprecated-package (symbol->string 'old-name) name)))
-(define-public texlive-libkpathsea
+(define-public texlive-source
(package
- (name "texlive-libkpathsea")
- (version "20230313")
+ (name "texlive-source")
+ (version "2024.2")
(source
(origin
- (method url-fetch)
- (uri (string-append "ftp://tug.org/historic/systems/texlive/"
- (string-take version 4)
- "/texlive-" version "-source.tar.xz"))
+ ;; This could be written as a SVN reference, but with a multi-reference
+ ;; the package can benefit from the `texlive' updater.
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (string-append %texlive-repository
+ "tags/texlive-" version "/Build/source"))
+ (revision 70951)
+ (locations (list "./"))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1fbrkv7g9j6ipmwjx27l8l9l974rmply8bhf7c2iqc6h3q7aly1q"))
+ "1qrbdghbi0r43l4yparr3wld98pgb3fmbdwx7yb1hv8cx6wlwl9l"))))
+ (build-system trivial-build-system)
+ (arguments (list #:builder #~(mkdir #$output)))
+ (home-page "https://www.tug.org/texlive/")
+ (synopsis "Source code for all TeX Live programs")
+ (description
+ "This package fetches the source for all TeX Live programs provided by
+the TeX Live repository. It is meant to be used as a source-only package; it
+should not be installed in a profile.")
+ (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-libkpathsea
+ (package
+ (name "texlive-libkpathsea")
+ (version (package-version texlive-source))
+ (source
+ (origin
+ (inherit (package-source texlive-source))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
- #~(begin
- (with-directory-excursion "libs"
- (for-each
- delete-file-recursively
- (scandir "."
- (lambda (file)
- (and (not (member file '("." "..")))
- (eq? 'directory (stat:type (stat file))))))))
- (with-directory-excursion "texk"
- (let ((preserved-directories '("." ".." "kpathsea")))
- (for-each
- delete-file-recursively
- (scandir "."
- (lambda (file)
- (and (not (member file preserved-directories))
- (eq? 'directory (stat:type (stat file)))))))))))))
+ #~(let ((delete-other-directories
+ (lambda (root dirs)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (file)
+ (and (not (member file (append '("." "..") dirs)))
+ (eq? 'directory (stat:type (stat file)))))))))))
+ (delete-other-directories "libs" '())
+ (delete-other-directories "utils" '())
+ (delete-other-directories "texk" '("kpathsea"))))))
(build-system gnu-build-system)
(arguments
(list
@@ -213,17 +319,31 @@
;; environment variable defined via a search path below.
;;
;; This phase must happen before the `configure' phase, because
- ;; the value of the TEXMFCNF variable (modified along with the
- ;; SELFAUTOLOC reference below) is used at compile time to
+ ;; the value of the TEXMFCNF variable is used at compile time to
;; generate "paths.h" file.
(lambda _
(substitute* "texk/kpathsea/texmf.cnf"
- (("^TEXMFROOT = .*")
- "TEXMFROOT = {$GUIX_TEXMF}/..\n")
+ (("^TEXMFROOT = .*") "TEXMFROOT = {$GUIX_TEXMF}/..\n")
+ (("^TEXMFDIST = .*") "TEXMFDIST = {$GUIX_TEXMF}\n")
+ ;; "ls-R" files are to be expected only in the TEXMFDIST
+ ;; directories. However, those are not always present, e.g.,
+ ;; when building a package with `texlive-build-system' or when
+ ;; generating a profile. Since both situations need to be
+ ;; handled, drop the "!!" prefixes.
(("^TEXMF = .*")
- "TEXMF = {$GUIX_TEXMF}\n")
- (("\\$SELFAUTOLOC(/share/texmf-dist/web2c)" _ suffix)
- (string-append #$output suffix))
+ "TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,$TEXMFSYSVAR,$TEXMFDIST}\n")
+ (("^TEXMFDBS = .*") "TEXMFDBS = {$TEXMFDIST}\n")
+ ;; Ignore system-wide cache, which is not writable. Use local
+ ;; one instead, i.e. "$HOME/.texliveYYYY/texmf-var/".
+ (("^TEXMFCACHE = .*") "TEXMFCACHE = $TEXMFVAR\n")
+ ;; Set TEXMFCNF. Since earlier values of variables have
+ ;; precedence over later ones, insert the desired value first.
+ (("^TEXMFCNF =")
+ (string-append
+ "TEXMFCNF = " #$output "/share/texmf-dist/web2c\n"
+ "TEXMFCNF ="))
+ ;; Help TeX finding fonts installed on the system.
+ (("^OSFONTDIR = .*") "OSFONTDIR = {$XDG_DATA_DIRS}\n")
;; Don't truncate lines.
(("^error_line = .*$") "error_line = 254\n")
(("^half_error_line = .*$") "half_error_line = 238\n")
@@ -231,16 +351,23 @@
(add-after 'unpack 'patch-directory-traversal
;; When ST_NLINK_TRICK is set, kpathsea attempts to avoid work
;; when searching files by assuming that a directory with exactly
- ;; two links has no subdirectories. This assumption does not hold
- ;; in our case, so some directories with symlinked sub-directories
- ;; would not be traversed.
+ ;; two links has no sub-directories. This assumption does not
+ ;; hold in our case, so some directories with symlinked
+ ;; sub-directories would not be traversed.
(lambda _
(substitute* "texk/kpathsea/config.h"
(("#define ST_NLINK_TRICK") ""))))
- (add-after 'install 'post-install
+ (replace 'install
(lambda _
(with-directory-excursion "texk/kpathsea"
- (invoke "make" "install")))))))
+ (invoke "make" "install"))))
+ (add-after 'install 'remove-documentation
+ ;; Documentation is provided by TEXLIVE-KPATHSEA, in a dedicated
+ ;; "doc" output. Remove duplicates.
+ (lambda _
+ (with-directory-excursion #$output
+ (for-each delete-file-recursively
+ '("share/info" "share/man"))))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_TEXMF")
@@ -252,18 +379,91 @@
of user-specified directories similar to how shells look up executables.")
(license license:lgpl2.1)))
+(define-public texlive-libptexenc
+ (package
+ (name "texlive-libptexenc")
+ (version (package-version texlive-source))
+ (source
+ (origin
+ (inherit (package-source texlive-source))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ #~(let ((delete-other-directories
+ (lambda (root dirs with-files?)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir
+ "."
+ (lambda (file)
+ (and (not (member file (append '("." "..") dirs)))
+ (or with-files?
+ (eq? 'directory (stat:type (stat file))))))))))))
+ (delete-other-directories "libs" '() #f)
+ (delete-other-directories "utils" '() #f)
+ ;; Tests require "texmf.cnf" to be present in the tree. Also test
+ ;; data is spread across multiple directories, which need to be
+ ;; preserved.
+ (delete-other-directories "texk"
+ '("bibtex-x" "ptexenc" "kpathsea" "tests"
+ "web2c")
+ #f)
+ (delete-other-directories "texk/web2c" '("tests") #t)
+ (delete-other-directories "texk/bibtex-x" '("tests") #t)
+ (with-directory-excursion "texk/kpathsea"
+ (for-each
+ delete-file-recursively
+ (scandir "." (lambda (f)
+ (not (member f '("." ".." "texmf.cnf")))))))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:out-of-source? #t
+ #:configure-flags
+ #~(list "--disable-static"
+ "--disable-native-texlive-build"
+ "--enable-shared"
+ "--with-banner-add=/GNU Guix"
+ "--disable-all-pkgs")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'install-missing-files
+ ;; These two files are not installed (on purpose, see ChangeLog),
+ ;; but are required nonetheless if this library is meant to be
+ ;; used externally.
+ (lambda _
+ (with-directory-excursion "texk/ptexenc/ptexenc"
+ (let ((inc (string-append #$output "/include/ptexenc")))
+ (for-each (lambda (f) (install-file f inc))
+ '("kanjicnv.h" "unicode-jp.h"))))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "texk/ptexenc"
+ (invoke "make" "check")))))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "texk/ptexenc"
+ (invoke "make" "install")))))))
+ (native-inputs (list pkg-config texlive-libkpathsea))
+ (inputs (list libiconv))
+ (home-page "http://tutimura.ath.cx/ptexlive/?ptexenc%2FDetails")
+ (synopsis "Library for Japanese pTeX")
+ (description
+ "This package provides a library for Japanese pTeX and its surrounding tools.")
+ (license license:gpl2)))
+
(define-public texlive-scripts
(package
(name "texlive-scripts")
- (version (number->string %texlive-revision))
- ;; We cannot use `texlive-origin' because its locations start out in
- ;; "texmf-dist" directory which is one level below "tlpkg" that we also
- ;; need to pull here.
+ (version "2024.2")
(source (origin
(method svn-multi-fetch)
(uri (svn-multi-reference
- (url (string-append "svn://www.tug.org/texlive/tags/"
- %texlive-tag "/Master/"))
+ (url (string-append %texlive-repository
+ "tags/texlive-" version "/Master/"))
+ (revision 70951)
(locations
(list "texmf-dist/doc/man/man1/fmtutil-sys.1"
"texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf"
@@ -314,15 +514,16 @@ of user-specified directories similar to how shells look up executables.")
"texmf-dist/web2c/fmtutil-hdr.cnf"
"texmf-dist/web2c/updmap-hdr.cfg"
"texmf-dist/web2c/updmap.cfg"
+ "tlpkg/TeXLive/"
"tlpkg/gpg/"
"tlpkg/installer/config.guess"
"tlpkg/installer/curl/curl-ca-bundle.crt"
- "tlpkg/TeXLive/"
- "tlpkg/texlive.tlpdb"))
- (revision %texlive-revision)))
+ "tlpkg/texlive.tlpdb"))))
+ (file-name (git-file-name name version))
(sha256
- "0sqbg5kjpzkpm1fq2c9hpf4f21bvjs3xas944dlbqp44lsqhcmsk")))
+ "0ld5nsns6ms639pig2l5989997n1hg0afs1wh8z9yi7mdhn2ak0p")))
(outputs '("out" "doc"))
+ (properties '((updater-extra-inputs "perl")))
(build-system copy-build-system)
(arguments
(list
@@ -367,11 +568,6 @@ of user-specified directories similar to how shells look up executables.")
(format #f " $Master = ~s;~%~a"
(string-append #$output "/share")
all)))))
- (add-after 'unpack 'fix-fmtutil
- ;; The line below generates an error when running "fmtutil".
- (lambda _
- (substitute* "texmf-dist/scripts/texlive/fmtutil.pl"
- (("require TeXLive::TLWinGoo if .*") ""))))
(add-after 'install 'install-doc
(lambda _
(let ((doc (string-append #$output:doc "/share/texmf-dist/doc")))
@@ -383,41 +579,48 @@ of user-specified directories similar to how shells look up executables.")
(apply (assoc-ref tex:%standard-phases 'link-scripts)
(list #:outputs outputs
#:link-scripts
- (find-files "scripts")))))))))
+ (find-files "scripts"))))
+ (with-directory-excursion (string-append #$output "/bin")
+ (symlink "fmtutil" "mktexfmt")))))))
(inputs (list perl))
(home-page "https://www.tug.org/texlive/")
(synopsis "TeX Live infrastructure programs")
(description
"This package provides core TeX Live scripts such as @code{updmap},
-@code{fmtutil}, and @code{tlmgr}. It is is automatically installed alongside
+@code{fmtutil}, and @code{tlmgr}. It is automatically installed alongside
@code{texlive-bin}.")
(license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
(define-public texlive-hyphen-complete
(package
(name "texlive-hyphen-complete")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/dehyph-exptl/"
- "doc/generic/elhyphen"
- "doc/generic/huhyphen"
- "doc/generic/hyph-utf8/"
- "doc/luatex/hyph-utf8/"
- "doc/generic/ukrhyph/"
- "source/generic/hyph-utf8/"
- "source/luatex/hyph-utf8/"
- "source/generic/ruhyphen/"
- "tex/generic/config/"
- "tex/generic/dehyph/"
- "tex/generic/dehyph-exptl/"
- "tex/generic/hyph-utf8/"
- "tex/generic/hyphen/"
- "tex/generic/ruhyphen/"
- "tex/generic/ukrhyph/"
- "tex/luatex/hyph-utf8/")
- (base32
- "1vzv92jvmnnga1xz5vrv8i6cy0dvrrly5x9nfrfzshlkm9bi3g4c")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/dehyph-exptl/"
+ "doc/generic/elhyphen/"
+ "doc/generic/huhyphen/"
+ "doc/generic/hyph-utf8/"
+ "doc/generic/ukrhyph/"
+ "doc/luatex/hyph-utf8/"
+ "source/generic/hyph-utf8/"
+ "source/generic/ruhyphen/"
+ "source/luatex/hyph-utf8/"
+ "tex/generic/config/"
+ "tex/generic/dehyph-exptl/"
+ "tex/generic/dehyph/"
+ "tex/generic/hyph-utf8/"
+ "tex/generic/hyphen/"
+ "tex/generic/ruhyphen/"
+ "tex/generic/ukrhyph/"
+ "tex/luatex/hyph-utf8/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18i12gzlss0myj3c0lb5i0xwpmcffanj1lwyq7pk59ss6mcax2y9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -432,6 +635,13 @@ of user-specified directories similar to how shells look up executables.")
(lambda _
(substitute* "source/generic/hyph-utf8/lib/tex/hyphen/language.rb"
(("require 'byebug'") ""))))
+ (add-before 'build 'include-docstrip.tex
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((docstrip.tex
+ (search-input-file (or native-inputs inputs)
+ "tex/latex/base/docstrip.tex")))
+ (setenv "TEXINPUTS"
+ (string-append (dirname docstrip.tex) ":")))))
(add-before 'build 'regenerate-converters
(lambda _
(let ((root (getcwd)))
@@ -498,7 +708,11 @@ of user-specified directories similar to how shells look up executables.")
(native-inputs
(list ruby-2.7
ruby-hydra-minimal/pinned
- texlive-docstrip
+ ;; Build phase requires "docstrip.tex" from TEXLIVE-LATEX.
+ ;; However, adding this package to native inputs would initiate
+ ;; a circular dependency. To work around this, use TEXLIVE-LATEX
+ ;; source, then add "docstrip.tex" to TEXINPUTS before build.
+ (package-source texlive-latex)
texlive-tex))
(home-page "https://ctan.org/pkg/hyph-utf8")
(synopsis "Hyphenation patterns expressed in UTF-8")
@@ -618,33 +832,45 @@ and should be preferred to it whenever a package would otherwise depend on
(define-deprecated-package texlive-ukrhyph texlive-hyphen-complete)
(define-public texlive-bin
- (package/inherit texlive-libkpathsea
+ (package
(name "texlive-bin")
+ (version (package-version texlive-source))
(source
(origin
- (inherit (package-source texlive-libkpathsea))
+ (inherit (package-source texlive-source))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
(snippet
- ;; TODO: Unbundle stuff in texk/dvisvgm/dvisvgm-src/libs too.
- #~(with-directory-excursion "libs"
- (let ((preserved-directories '("." ".." "lua53" "luajit" "pplib" "xpdf")))
- ;; Delete bundled software, except Lua which cannot easily be
- ;; used as an external dependency, pplib and xpdf which aren't
- ;; supported as system libraries (see m4/kpse-xpdf-flags.m4).
- (for-each delete-file-recursively
- (scandir "."
- (lambda (file)
- (and (not (member file preserved-directories))
- (eq? 'directory
- (stat:type (stat file))))))))))))
+ #~(let ((delete-other-directories
+ (lambda (root dirs)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (file)
+ (and (not (member file
+ (append '("." "..") dirs)))
+ (eq? 'directory
+ (stat:type (stat file)))))))))))
+ ;; Delete bundled software, except Lua which cannot easily be used
+ ;; as an external dependency, pplib and xpdf which aren't
+ ;; supported as system libraries (see m4/kpse-xpdf-flags.m4).
+ (delete-other-directories "libs" '("lua53" "luajit" "pplib" "xpdf"))
+ ;; Remove all packages: they are installed through their
+ ;; respective regular TeX Live package.
+ (delete-other-directories "utils" '())
+ (delete-other-directories "texk" '("kpathsea" "tests" "web2c"))
+ ;; Tests require the "texmf.cnf" file to still be present in the
+ ;; tree.
+ (with-directory-excursion "texk/kpathsea"
+ (for-each
+ delete-file-recursively
+ (scandir "." (lambda (f)
+ (not (member f '("." ".." "texmf.cnf")))))))))))
+ (build-system gnu-build-system)
(arguments
(list
- #:modules '((guix build gnu-build-system)
- (guix build utils)
- (ice-9 ftw)
- (srfi srfi-1)
- (srfi srfi-26))
#:out-of-source? #t
- #:parallel-tests? #f ;bibtex8.test fails otherwise
#:configure-flags
#~(let ((kpathsea #$(this-package-input "texlive-libkpathsea")))
(list "--with-banner-add=/GNU Guix"
@@ -652,158 +878,96 @@ and should be preferred to it whenever a package would otherwise depend on
"--disable-native-texlive-build"
"--disable-static"
"--disable-linked-scripts"
- "--disable-kpathsea"
- "--with-system-cairo"
- "--with-system-freetype2"
- "--with-system-gd"
- "--with-system-gmp"
- "--with-system-graphite2"
- "--with-system-harfbuzz"
- "--with-system-icu"
- "--with-system-libgs"
- "--with-system-libpaper"
- "--with-system-libpng"
- "--with-system-mpfr"
- "--with-system-pixman"
- "--with-system-potrace"
- "--with-system-teckit"
- "--with-system-zlib"
- "--with-system-zziplib"
+ "--disable-all-pkgs"
;; Help locating external kpathsea. For some reason
;; PKG-CONFIG is unable to find it.
"--with-system-kpathsea"
(format #f "--with-kpathsea-includes=~a/include" kpathsea)
- (format #f "--with-kpathsea-lib=~a/lib" kpathsea)
- ;; LuaJIT is not ported to some architectures yet.
- #$@(if (or (target-ppc64le?)
- (target-riscv64?))
- '("--disable-luajittex"
- "--disable-luajithbtex"
- "--disable-mfluajit")
- '())))
- ;; Disable tests on some architectures to cope with a failure of
- ;; luajiterr.test.
- ;;
- ;; XXX FIXME fix luajit properly on these architectures.
- #:tests? (let ((s (or (%current-target-system)
- (%current-system))))
- (not (or (string-prefix? "aarch64" s)
- (string-prefix? "mips64" s)
- (string-prefix? "powerpc64le" s))))
+ (format #f "--with-kpathsea-libdir=~a/lib" kpathsea)
+ "--enable-web2c"
+ ;; Disable web2c parts provided in their own packages. See
+ ;; "texk/web2c/ac/web2c.ac" in source.
+ "--disable-aleph"
+ "--disable-eptex"
+ "--disable-euptex"
+ "--disable-hitex"
+ "--disable-luajithbtex"
+ "--disable-luajittex"
+ "--disable-mflua"
+ "--disable-mfluajit"
+ "--disable-mp"
+ "--disable-pmp"
+ "--disable-ptex"
+ "--disable-upmp"
+ "--disable-uptex"
+ "--disable-web-progs"
+ "--disable-xetex"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'locate-external-kpathsea
- ;; Despite our best efforts, the configure scripts below is not
- ;; able to find external kpathsea.
- (lambda _
- (substitute* "texk/web2c/configure"
- (("/usr/include /usr/local/include")
- (string-append #$(this-package-input "texlive-libkpathsea")
- "/include")))))
- (add-after 'unpack 'patch-psutils-test
- (lambda _
- ;; This test fails due to a rounding difference with libpaper
- ;; 1.2: <https://github.com/rrthomas/libpaper/issues/23>.
- ;;
- ;; Adjust the expected outcome to account for the minute
- ;; difference.
- (substitute* "texk/psutils/tests/playres.ps"
- (("844\\.647799") "844.647797"))))
- (add-after 'unpack 'configure-ghostscript-executable
- ;; ps2eps.pl uses the "gswin32c" ghostscript executable on
- ;; Windows, and the "gs" ghostscript executable on Unix. It
- ;; detects Unix by checking for the existence of the /usr/bin
- ;; directory. Since Guix System does not have /usr/bin, it is
- ;; also detected as Windows.
+ ;; Despite our best efforts, the configure script below is not
+ ;; able to find an external Kpathsea library. Set include
+ ;; directory when appropriate.
(lambda _
- (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
- (("gswin32c") "gs"))))
- (add-after 'unpack 'patch-dvisvgm-build-files
+ (when (file-exists? "texk/web2c/configure")
+ (substitute* "texk/web2c/configure"
+ (("/usr/include /usr/local/include")
+ (string-append #$(this-package-input "texlive-libkpathsea")
+ "/include"))))))
+ ;; XXX: Fix a failing test where "kpsewhich" location is hard-coded
+ ;; in the source tree.
+ (add-after 'unpack 'fix-failing-test
(lambda _
- ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
- ;; the appropriate linker flags are not added.
- (substitute* "texk/dvisvgm/configure"
- (("^have_libgs=yes" all)
- (string-append all "\nHAVE_LIBGS=1")))))
- (add-after 'unpack 'disable-failing-test
+ (substitute* (find-files "texk/" "wcfname\\.test$")
+ (("_kpsewhich=.*")
+ (format #f "_kpsewhich=~a/bin/kpsewhich\n"
+ #$(this-package-input "texlive-libkpathsea"))))))
+ (add-after 'install 'maybe-clear-symlinks
+ ;; XXX: No matter the combination of configure flags, process
+ ;; insists on creating those dangling links, resulting in an error
+ ;; during `validate-runpath' phase.
+ ;;
+ ;; Make it specific to TEXLIVE-BIN package by verifying the
+ ;; existence of "tex" binary so that packages inheriting from this
+ ;; one do not need to remove the phase.
(lambda _
- ;; FIXME: This test fails on 32-bit architectures since Glibc
- ;; 2.28: <https://bugzilla.redhat.com/show_bug.cgi?id=1631847>.
- (substitute* "texk/web2c/omegafonts/check.test"
- (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck \\|\\| exit 1")
- "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77"))))
- #$@(if (or (target-ppc32?)
- (target-riscv64?))
- ;; Some mendex tests fail on some architectures.
- `((add-after 'unpack 'skip-mendex-tests
- (lambda _
- (substitute* '("texk/mendexk/tests/mendex.test"
- "texk/upmendex/tests/upmendex.test")
- (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1")
- "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77")))))
- '())
- #$@(if (or (target-arm32?)
- (target-ppc32?))
- `((add-after 'unpack 'skip-faulty-test
- (lambda _
- ;; Skip this faulty test on armhf-linux:
- ;; https://issues.guix.gnu.org/54055
- (substitute* '("texk/mendexk/tests/mendex.test"
- "texk/upmendex/tests/upmendex.test")
- (("^TEXMFCNF=" all)
- (string-append "exit 77 # skip\n" all))))))
- '())
- (add-after 'install 'post-install
+ (let ((bin (string-append #$output "/bin/")))
+ (when (file-exists? (string-append bin "tex"))
+ (with-directory-excursion bin
+ (for-each delete-file
+ '("pbibtex" "pdvitype" "ppltotf" "ptftopl")))))))
+ (add-after 'install 'remove-documentation
+ ;; Documentation is provided by specific TeX Live packages, in
+ ;; a dedicated "doc" output. Ignore documentation generated when
+ ;; building TEXLIVE-BIN and its derivatives.
(lambda _
- ;; Create symbolic links for the latex variants. We link
- ;; lualatex to luahbtex; see issue #51252 for details.
- (with-directory-excursion (string-append #$output "/bin/")
- (for-each symlink
- '("pdftex" "pdftex" "xetex" "luahbtex")
- '("latex" "pdflatex" "xelatex" "lualatex")))
- ;; texlua shebangs are not patched by the patch-source-shebangs
- ;; phase because the texlua executable does not exist at that
- ;; time.
- (setenv "PATH"
- (string-append (getenv "PATH") ":" #$output "/bin"))
(with-directory-excursion #$output
- (assoc-ref %standard-phases 'patch-source-shebangs)))))))
- (native-inputs (list groff-minimal pkg-config))
+ (for-each (lambda (d)
+ (when (file-exists? d)
+ (delete-file-recursively d)))
+ '("share/info"
+ "share/man"
+ "share/texmf-dist/doc"))))))))
+ (native-inputs (list perl pkg-config))
(inputs
- (list cairo
- config
- fontconfig
- fontforge
- freetype
- gd
- ghostscript
- gmp
- graphite2
+ (list fontconfig
harfbuzz
icu4c
- libpaper
libpng
- libxaw
libxt
- mpfr
- perl
- pixman
- potrace
- python
- ruby-2.7
- tcsh
- teckit
zlib
zziplib))
(propagated-inputs (list texlive-libkpathsea texlive-scripts))
(synopsis "TeX Live, a package of the TeX typesetting system")
(description
"TeX Live provides a comprehensive TeX document production system.
-It includes all the major TeX-related programs, macro packages, and fonts
-that are free software, including support for many languages around the
-world.
+It includes all the major TeX-related programs, macro packages, and fonts that
+are free software, including support for many languages around the world.
-This package contains the binaries.")
+This package contains some Web2C binaries and Metafont. TeX engines, in
+addition to TeX itself, are limited to LuaHBTeX, LuaTeX and pdfTeX. For
+a self-sufficient TeX installation, users are advised to add at least a TeX
+Live collection or scheme package to their profile instead of this package.")
(license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
(home-page "https://www.tug.org/texlive/")))
@@ -811,7 +975,7 @@ This package contains the binaries.")
(define-public texlive-scheme-basic
(package
(name "texlive-scheme-basic")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -830,7 +994,7 @@ Computer Modern fonts. This scheme corresponds to @code{collection-basic} and
(define-public texlive-scheme-bookpub
(package
(name "texlive-scheme-bookpub")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -874,7 +1038,7 @@ mathematical or other technical packages.")
(define-public texlive-scheme-context
(package
(name "texlive-scheme-context")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -908,7 +1072,7 @@ mathematical or other technical packages.")
(define-public texlive-scheme-full
(package
(name "texlive-scheme-full")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -961,7 +1125,7 @@ mathematical or other technical packages.")
(define-public texlive-scheme-gust
(package
(name "texlive-scheme-gust")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -1008,7 +1172,7 @@ typeset Polish plain TeX, LaTeX and ConTeXt documents in PostScript or PDF.")
(define-public texlive-scheme-medium
(package
(name "texlive-scheme-medium")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -1044,7 +1208,7 @@ LaTeX, many recommended packages, and support for most European languages.")
(define-public texlive-scheme-minimal
(package
(name "texlive-scheme-minimal")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -1061,7 +1225,7 @@ Live infrastructure. This scheme corresponds exactly to
(define-public texlive-scheme-small
(package
(name "texlive-scheme-small")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -1111,7 +1275,7 @@ variant. It adds XeTeX, MetaPost, and some recommended packages to
(define-public texlive-scheme-tetex
(package
(name "texlive-scheme-tetex")
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source #f)
(build-system trivial-build-system)
(arguments (list #:builder #~(mkdir #$output)))
@@ -1187,11 +1351,15 @@ teTeX distribution that was maintained by Thomas Esser.")
;; inputs.
(define-public texlive-updmap.cfg
(lambda* (#:optional (packages '()))
- "Return a 'texlive-updmap.cfg' package which contains the fonts map
-configuration of a base set of packages plus PACKAGES."
+ "Return a 'texlive-updmap.cfg' package which contains the fonts map and
+mktex scripts configuration, along with a base set of packages plus additional
+PACKAGES.
+
+This function is meant to be used in packages as a native input, to build
+documentation in the TeX format."
(let ((default-packages (list texlive-scheme-basic)))
(package
- (version (number->string %texlive-revision))
+ (version (package-version texlive-source))
(source (package-source texlive-scripts))
(name "texlive-updmap.cfg")
(build-system copy-build-system)
@@ -1203,9 +1371,18 @@ configuration of a base set of packages plus PACKAGES."
(ice-9 textual-ports))
#:install-plan
#~'(("texmf-dist/web2c/updmap.cfg" "share/texmf-config/web2c/")
- ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
+ ("texmf-dist/web2c/mktex.cnf" "share/texmf-config/web2c/")
+ ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'generate-mktex.cnf
+ ;; When building a package, mktex programs try to create files
+ ;; in TEXMFVAR, which is unavailable. Force creating those
+ ;; files in the working directory instead.
+ (lambda _
+ (with-directory-excursion "texmf-dist/web2c"
+ (with-output-to-file "mktex.cnf"
+ (lambda _ (display ": ${MT_DESTROOT=''}"))))))
(add-before 'install 'regenerate-updmap.cfg
(lambda _
(with-directory-excursion "texmf-dist/web2c"
@@ -1220,8 +1397,8 @@ configuration of a base set of packages plus PACKAGES."
(when (not (zero? (status:exit-val (close-pipe port))))
(error "failed to filter updmap.cfg")))
- ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
- ;; if it cannot create its log file there.
+ ;; Set TEXMFSYSVAR to a sane and writable value; updmap
+ ;; fails if it cannot create its log file.
(setenv "TEXMFSYSVAR" (getcwd))
;; Generate maps.
@@ -1256,13 +1433,18 @@ ones.")
(define-public texlive-12many
(package
(name "texlive-12many")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/12many/" "source/latex/12many/"
- "tex/latex/12many/")
- (base32
- "104vqgl5kqdbwfa5wxj7gpxfrqa3k4ky4806mg6zscd6palf2gi5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/12many/" "source/latex/12many/"
+ "tex/latex/12many/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "104vqgl5kqdbwfa5wxj7gpxfrqa3k4ky4806mg6zscd6palf2gi5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/one2many")
@@ -1279,14 +1461,19 @@ that makes changing from one to another a one-line change.")
(define-public texlive-a2ping
(package
(name "texlive-a2ping")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/man/man1/a2ping.1"
- "doc/man/man1/a2ping.man1.pdf"
- "doc/support/a2ping/" "scripts/a2ping/")
- (base32
- "1lhmh1rnykmi6i5mklj7fwhndw1xxmwy2xsy8j1px8ishf5czhvq")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/a2ping.1"
+ "doc/man/man1/a2ping.man1.pdf"
+ "doc/support/a2ping/" "scripts/a2ping/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lhmh1rnykmi6i5mklj7fwhndw1xxmwy2xsy8j1px8ishf5czhvq"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "a2ping.pl")))
@@ -1305,12 +1492,17 @@ markedEPS, markedPS, PNG, XWD, BMP, TIFF, JPEG, GIF, XPM.")
(define-public texlive-aaai-named
(package
(name "texlive-aaai-named")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aaai-named/")
- (base32
- "1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aaai-named/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aaai-named")
(synopsis "BibTeX style for AAAI")
@@ -1322,13 +1514,18 @@ presumably for use with the @code{aaai} package.")
(define-public texlive-aalok
(package
(name "texlive-aalok")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aalok/" "source/latex/aalok/"
- "tex/latex/aalok/")
- (base32
- "0vpvqv60p5v3frdqa5r8k9k4zxk0icma5blw9dr6jhqfzf6lc3jy")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aalok/" "source/latex/aalok/"
+ "tex/latex/aalok/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0vpvqv60p5v3frdqa5r8k9k4zxk0icma5blw9dr6jhqfzf6lc3jy"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aalok")
@@ -1344,13 +1541,18 @@ a Marathi journal, with LaTeX.")
(define-public texlive-aastex
(package
(name "texlive-aastex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aastex/" "doc/latex/aastex/"
- "tex/latex/aastex/")
- (base32
- "07kbrv0vhlpdaxqkiwn2q4psldn5p2x5mmpaw70g6pgcbhk7r74h")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aastex/" "doc/latex/aastex/"
+ "tex/latex/aastex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07kbrv0vhlpdaxqkiwn2q4psldn5p2x5mmpaw70g6pgcbhk7r74h"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aastex")
@@ -1365,13 +1567,18 @@ preference to any of the alternatives available.")
(define-public texlive-abc
(package
(name "texlive-abc")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/abc/" "source/latex/abc/"
- "tex/latex/abc/")
- (base32
- "1vywrv35h65gkxipc7d26k32r04fk61kfkkk9bj3zsmxsw1v3r8d")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/abc/" "source/latex/abc/"
+ "tex/latex/abc/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vywrv35h65gkxipc7d26k32r04fk61kfkkk9bj3zsmxsw1v3r8d"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abc")
@@ -1387,12 +1594,17 @@ document.")
(define-public texlive-abnt
(package
(name "texlive-abnt")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/abnt/" "tex/latex/abnt/")
- (base32
- "1zjsvp6ng6vf87mmnv18q435h6p3ygs512pk0m05yd8gyrmhmrxr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/abnt/" "tex/latex/abnt/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1zjsvp6ng6vf87mmnv18q435h6p3ygs512pk0m05yd8gyrmhmrxr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abnt")
@@ -1406,13 +1618,18 @@ texts.")
(define-public texlive-abntex2
(package
(name "texlive-abntex2")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bib/abntex2/" "bibtex/bst/abntex2/"
- "doc/latex/abntex2/" "tex/latex/abntex2/")
- (base32
- "07752n6s2nl4h8j1wg7hjx2wisn505asb1r1i38z7qjbzg7lwqq5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bib/abntex2/" "bibtex/bst/abntex2/"
+ "doc/latex/abntex2/" "tex/latex/abntex2/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07752n6s2nl4h8j1wg7hjx2wisn505asb1r1i38z7qjbzg7lwqq5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abntex2")
@@ -1428,12 +1645,17 @@ Tecnicas} rules. It replaces the old @code{abntex}.")
(define-public texlive-abntexto
(package
(name "texlive-abntexto")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/abntexto/" "tex/latex/abntexto/")
- (base32
- "1c560h2555hx1pcq70yg9qdgqp1bkxidabp53fd0gyvb141s3d79")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/abntexto/" "tex/latex/abntexto/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0p5fkcgcfxqdznigj947dxgpy6vw52ahpqs5j58li0dlgp01k8l9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abntexto")
@@ -1447,14 +1669,19 @@ Tecnicas} in academic works like TCCs, dissertations, theses.")
(define-public texlive-aboensis
(package
(name "texlive-aboensis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/aboensis/"
- "fonts/opentype/public/aboensis/"
- "tex/latex/aboensis/")
- (base32
- "14333k6bkfywdka3h2a2yd2nw0521q0lwl3x38612j7cb82izyi3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/aboensis/"
+ "fonts/opentype/public/aboensis/"
+ "tex/latex/aboensis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14333k6bkfywdka3h2a2yd2nw0521q0lwl3x38612j7cb82izyi3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aboensis")
@@ -1483,14 +1710,19 @@ line spacing.")
(define-public texlive-academicons
(package
(name "texlive-academicons")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/academicons/"
- "fonts/truetype/public/academicons/"
- "tex/latex/academicons/")
- (base32
- "1gxgj0ppyrf6pj9qvhk02ybwf68yzlh2110r41iwsai5by2iczhm")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/academicons/"
+ "fonts/truetype/public/academicons/"
+ "tex/latex/academicons/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gxgj0ppyrf6pj9qvhk02ybwf68yzlh2110r41iwsai5by2iczhm"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/academicons")
@@ -1508,19 +1740,24 @@ commands for each specific icon.")
(define-public texlive-accanthis
(package
(name "texlive-accanthis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/accanthis/"
- "fonts/enc/dvips/accanthis/"
- "fonts/map/dvips/accanthis/"
- "fonts/opentype/arkandis/accanthis/"
- "fonts/tfm/arkandis/accanthis/"
- "fonts/type1/arkandis/accanthis/"
- "fonts/vf/arkandis/accanthis/"
- "tex/latex/accanthis/")
- (base32
- "1xpy3bs8wwb6ncw4c8kc5vvddl77rmjwfjq66xw12sc8mgg9grmv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/accanthis/"
+ "fonts/enc/dvips/accanthis/"
+ "fonts/map/dvips/accanthis/"
+ "fonts/opentype/arkandis/accanthis/"
+ "fonts/tfm/arkandis/accanthis/"
+ "fonts/type1/arkandis/accanthis/"
+ "fonts/vf/arkandis/accanthis/"
+ "tex/latex/accanthis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xpy3bs8wwb6ncw4c8kc5vvddl77rmjwfjq66xw12sc8mgg9grmv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/accanthis")
@@ -1534,12 +1771,17 @@ Bembo. The package provides support files for use with all LaTeX engines.")
(define-public texlive-accents
(package
(name "texlive-accents")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/accents/" "tex/latex/accents/")
- (base32
- "0p8g86xbfladz52dwbssmw3w9mbl987d1b740d25miphvj4ia9y9")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/accents/" "tex/latex/accents/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0p8g86xbfladz52dwbssmw3w9mbl987d1b740d25miphvj4ia9y9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/accents")
@@ -1553,14 +1795,20 @@ scripts.")
(define-public texlive-accfonts
(package
(name "texlive-accfonts")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/accfonts/" "scripts/accfonts/"
- "tex/latex/accfonts/")
- (base32
- "0kja24rh0ysljwgkyg9mf47h64ayi2kmb1jb3dmvb42ywvg0w9i7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/accfonts/" "scripts/accfonts/"
+ "tex/latex/accfonts/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0kja24rh0ysljwgkyg9mf47h64ayi2kmb1jb3dmvb42ywvg0w9i7"))))
(outputs '("out" "doc"))
+ (properties '((updater-extra-inputs "perl")))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "mkt1font" "vpl2ovp" "vpl2vpl")))
(inputs (list perl))
@@ -1577,13 +1825,18 @@ Omega one.")
(define-public texlive-accsupp
(package
(name "texlive-accsupp")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/accsupp/" "source/latex/accsupp/"
- "tex/latex/accsupp/")
- (base32
- "10xdg3gk5madpb131lhc9x2sxzby4rvqycbfzb5kl2zkwr1qw5v7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/accsupp/" "source/latex/accsupp/"
+ "tex/latex/accsupp/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10xdg3gk5madpb131lhc9x2sxzby4rvqycbfzb5kl2zkwr1qw5v7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/accsupp")
@@ -1598,12 +1851,17 @@ for programmers; its status is experimental.")
(define-public texlive-abbr
(package
(name "texlive-abbr")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/abbr/" "tex/generic/abbr/")
- (base32
- "0zi5qkgr2nnb3jp5adv42d84w7yav1dw0lgg2vdxfsz03j1bmlsb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/abbr/" "tex/generic/abbr/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zi5qkgr2nnb3jp5adv42d84w7yav1dw0lgg2vdxfsz03j1bmlsb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abbr")
@@ -1618,15 +1876,20 @@ parameterless macros.")
(define-public texlive-abstyles
(package
(name "texlive-abstyles")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bib/abstyles/"
- "bibtex/bst/abstyles/"
- "doc/bibtex/abstyles/"
- "tex/generic/abstyles/")
- (base32
- "1ij4cp3pydfs4lch0f93gi2q7msafxyqfvv44whw1ppczidicnn2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bib/abstyles/"
+ "bibtex/bst/abstyles/"
+ "doc/bibtex/abstyles/"
+ "tex/generic/abstyles/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ij4cp3pydfs4lch0f93gi2q7msafxyqfvv44whw1ppczidicnn2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/abstyles-orig")
@@ -1644,13 +1907,18 @@ adaptation for working with Babel.")
(define-public texlive-acmconf
(package
(name "texlive-acmconf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/acmconf/" "source/latex/acmconf/"
- "tex/latex/acmconf/")
- (base32
- "0j30krvxzps7ka3xzv0qifrzxhxzkr3b3f9gska6najp1dvygs3a")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/acmconf/" "source/latex/acmconf/"
+ "tex/latex/acmconf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0j30krvxzps7ka3xzv0qifrzxhxzkr3b3f9gska6najp1dvygs3a"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/acmconf")
@@ -1665,14 +1933,19 @@ the ACM's own specification.")
(define-public texlive-active-conf
(package
(name "texlive-active-conf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/active-conf/"
- "source/latex/active-conf/"
- "tex/latex/active-conf/")
- (base32
- "12krmwspwkhcwk5q0qf2hldnsk44vd2jfssfdiwm97alicc3cpj1")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/active-conf/"
+ "source/latex/active-conf/"
+ "tex/latex/active-conf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12krmwspwkhcwk5q0qf2hldnsk44vd2jfssfdiwm97alicc3cpj1"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/active-conf")
@@ -1687,15 +1960,20 @@ years with a header file.")
(define-public texlive-adfathesis
(package
(name "texlive-adfathesis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/adfathesis/"
- "doc/latex/adfathesis/"
- "source/latex/adfathesis/"
- "tex/latex/adfathesis/")
- (base32
- "0zi91xc3sbdjvp87zgrb7g3l5hxqig33fchlhg2i8gjya9ij67p6")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/adfathesis/"
+ "doc/latex/adfathesis/"
+ "source/latex/adfathesis/"
+ "tex/latex/adfathesis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zi91xc3sbdjvp87zgrb7g3l5hxqig33fchlhg2i8gjya9ij67p6"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/adfathesis")
@@ -1707,18 +1985,23 @@ thesis format. The bundle also includes a BibTeX style file.")
(define-public texlive-adforn
(package
(name "texlive-adforn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/adforn/"
- "fonts/afm/arkandis/adforn/"
- "fonts/enc/dvips/adforn/"
- "fonts/map/dvips/adforn/"
- "fonts/tfm/arkandis/adforn/"
- "fonts/type1/arkandis/adforn/"
- "tex/latex/adforn/")
- (base32
- "0dpdbqlc7p3mwm1bj1m5sbkwi5qjsvsfzfb0wnq4flvz1gc09245")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/adforn/"
+ "fonts/afm/arkandis/adforn/"
+ "fonts/enc/dvips/adforn/"
+ "fonts/map/dvips/adforn/"
+ "fonts/tfm/arkandis/adforn/"
+ "fonts/type1/arkandis/adforn/"
+ "tex/latex/adforn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dpdbqlc7p3mwm1bj1m5sbkwi5qjsvsfzfb0wnq4flvz1gc09245"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/adforn")
@@ -1731,18 +2014,23 @@ with TeX and LaTeX support files.")
(define-public texlive-adfsymbols
(package
(name "texlive-adfsymbols")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/adfsymbols/"
- "fonts/afm/arkandis/adfsymbols/"
- "fonts/enc/dvips/adfsymbols/"
- "fonts/map/dvips/adfsymbols/"
- "fonts/tfm/arkandis/adfsymbols/"
- "fonts/type1/arkandis/adfsymbols/"
- "tex/latex/adfsymbols/")
- (base32
- "188is31d2zcd8kk339x4wvhhm98gbfkvq6pi25d9mva4vz3w1vf5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/adfsymbols/"
+ "fonts/afm/arkandis/adfsymbols/"
+ "fonts/enc/dvips/adfsymbols/"
+ "fonts/map/dvips/adfsymbols/"
+ "fonts/tfm/arkandis/adfsymbols/"
+ "fonts/type1/arkandis/adfsymbols/"
+ "tex/latex/adfsymbols/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "188is31d2zcd8kk339x4wvhhm98gbfkvq6pi25d9mva4vz3w1vf5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/adfsymbols")
@@ -1755,15 +2043,20 @@ in Adobe Type 1 format, together with TeX and LaTeX support files.")
(define-public texlive-adhocfilelist
(package
(name "texlive-adhocfilelist")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/support/adhocfilelist/"
- "scripts/adhocfilelist/"
- "source/support/adhocfilelist/"
- "tex/support/adhocfilelist/")
- (base32
- "097yy38571fa2hzp4s3p125xknqgjmkhv1vgi0q9vz83b6175hc4")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/support/adhocfilelist/"
+ "scripts/adhocfilelist/"
+ "source/support/adhocfilelist/"
+ "tex/support/adhocfilelist/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "097yy38571fa2hzp4s3p125xknqgjmkhv1vgi0q9vz83b6175hc4"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "adhocfilelist.sh")))
@@ -1778,12 +2071,17 @@ controlling the searches that the package does.")
(define-public texlive-adtrees
(package
(name "texlive-adtrees")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/adtrees/" "tex/latex/adtrees/")
- (base32
- "0ypb609wvw3mvs7bf2mwa7r7v4frxjhfll8d1sqfry3dv3kr13pq")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/adtrees/" "tex/latex/adtrees/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ypb609wvw3mvs7bf2mwa7r7v4frxjhfll8d1sqfry3dv3kr13pq"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/adtrees")
@@ -1796,12 +2094,17 @@ devoted to representing natural language expressions.")
(define-public texlive-adobemapping
(package
(name "texlive-adobemapping")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "fonts/cmap/adobemapping/")
- (base32
- "1yvf74mlmxmnq9m0wvda9xcna8xnn382bbrzizzjm5w7bk8c4g98")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "fonts/cmap/adobemapping/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yvf74mlmxmnq9m0wvda9xcna8xnn382bbrzizzjm5w7bk8c4g98"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/adobemapping")
(synopsis "Adobe CMap and PDF mapping files")
@@ -1813,19 +2116,24 @@ available for distribution by Adobe.")
(define-public texlive-aesupp
(package
(name "texlive-aesupp")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/aesupp/"
- "fonts/enc/dvips/aesupp/"
- "fonts/map/dvips/aesupp/"
- "fonts/opentype/public/aesupp/"
- "fonts/tfm/public/aesupp/"
- "fonts/type1/public/aesupp/"
- "source/fonts/aesupp/"
- "tex/latex/aesupp/")
- (base32
- "1sx5802d1ib72i0ssjpr0c54pgq1s980wg3q1685pjniw68ns1vj")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/aesupp/"
+ "fonts/enc/dvips/aesupp/"
+ "fonts/map/dvips/aesupp/"
+ "fonts/opentype/public/aesupp/"
+ "fonts/tfm/public/aesupp/"
+ "fonts/type1/public/aesupp/"
+ "source/fonts/aesupp/"
+ "tex/latex/aesupp/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sx5802d1ib72i0ssjpr0c54pgq1s980wg3q1685pjniw68ns1vj"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aesupp")
@@ -1841,17 +2149,23 @@ the TeX Gyre bundle do not need this support.")
(define-public texlive-afm2pl
(package
(name "texlive-afm2pl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/man/man1/afm2pl.1"
- "doc/man/man1/afm2pl.man1.pdf"
- "fonts/enc/dvips/afm2pl/"
- "fonts/lig/afm2pl/" "tex/fontinst/afm2pl/")
- (base32
- "19llzzr4kmmyf7l18ngx1rhaqaqvgm3md924m4dxcv7nmrvga2b2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/afm2pl.1"
+ "doc/man/man1/afm2pl.man1.pdf"
+ "fonts/enc/dvips/afm2pl/"
+ "fonts/lig/afm2pl/" "tex/fontinst/afm2pl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19llzzr4kmmyf7l18ngx1rhaqaqvgm3md924m4dxcv7nmrvga2b2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
+ (propagated-inputs (list texlive-afm2pl-bin))
(home-page "https://ctan.org/pkg/afm2pl")
(synopsis "Convert AFM to TeX property list (@file{.pl}) metrics")
(description
@@ -1861,17 +2175,67 @@ a @file{.tfm} (TeX Font Metric) file. It normally preserves kerns and
ligatures, but also offers additional control over them.")
(license license:gpl2)))
+(define-public texlive-afm2pl-bin
+ (package
+ (inherit texlive-bin)
+ (name "texlive-afm2pl-bin")
+ (source
+ (origin
+ (inherit (package-source texlive-source))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ #~(let ((delete-other-directories
+ (lambda (root dirs)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (file)
+ (and (not (member file (append '("." "..") dirs)))
+ (eq? 'directory (stat:type (stat file)))))))))))
+ (delete-other-directories "libs" '())
+ (delete-other-directories "utils" '())
+ (delete-other-directories "texk" '("afm2pl"))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments texlive-bin)
+ ((#:configure-flags flags)
+ #~(cons "--enable-afm2pl" (delete "--enable-web2c" #$flags)))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "texk/afm2pl"
+ (invoke "make" "check")))))
+ (replace 'install
+ (lambda _
+ (with-directory-excursion "texk/afm2pl"
+ (invoke "make" "install"))))))))
+ (native-inputs (list pkg-config))
+ (inputs (list texlive-libkpathsea))
+ (propagated-inputs '())
+ (synopsis "Binary for @code{texlive-afm2pl}")
+ (description
+ "This package provides the binary for @code{texlive-afm2pl}.")
+ (license (package-license texlive-afm2pl))))
+
(define-public texlive-afparticle
(package
(name "texlive-afparticle")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/afparticle/"
- "source/latex/afparticle/"
- "tex/latex/afparticle/")
- (base32
- "1g7dk32la2zlspdsw1pz15bf90jjycblgpg91m24bx70svdv67kv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/afparticle/"
+ "source/latex/afparticle/"
+ "tex/latex/afparticle/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1g7dk32la2zlspdsw1pz15bf90jjycblgpg91m24bx70svdv67kv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/afparticle")
@@ -1884,13 +2248,18 @@ access journal @emph{Archives of Forensic Psychology}.")
(define-public texlive-afthesis
(package
(name "texlive-afthesis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/afthesis/" "doc/latex/afthesis/"
- "tex/latex/afthesis/")
- (base32
- "1db9fzs4rf1d86n2gcn0zs255nlwc8i1yl5n9qzsn6xf5as7zz1i")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/afthesis/" "doc/latex/afthesis/"
+ "tex/latex/afthesis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1db9fzs4rf1d86n2gcn0zs255nlwc8i1yl5n9qzsn6xf5as7zz1i"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/afthesis")
@@ -1903,13 +2272,18 @@ Of Technology.")
(define-public texlive-aguplus
(package
(name "texlive-aguplus")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aguplus/" "doc/latex/aguplus/"
- "tex/latex/aguplus/")
- (base32
- "0qpi5r4y70cmxinr9y46rw6dfd337l5xhnqfvbkz27nw98j87fi3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aguplus/" "doc/latex/aguplus/"
+ "tex/latex/aguplus/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qpi5r4y70cmxinr9y46rw6dfd337l5xhnqfvbkz27nw98j87fi3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aguplus")
@@ -1924,13 +2298,18 @@ own; it is recommended to switch to the official distribution.")
(define-public texlive-aiaa
(package
(name "texlive-aiaa")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aiaa/" "doc/latex/aiaa/"
- "source/latex/aiaa/" "tex/latex/aiaa/")
- (base32
- "0l6sp7q53nr1ppxaynfc0q3kf1hg5v22yxyvzjdg028rf1nvbhww")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aiaa/" "doc/latex/aiaa/"
+ "source/latex/aiaa/" "tex/latex/aiaa/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0l6sp7q53nr1ppxaynfc0q3kf1hg5v22yxyvzjdg028rf1nvbhww"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aiaa")
@@ -1945,12 +2324,17 @@ Astronautics}.")
(define-public texlive-aichej
(package
(name "texlive-aichej")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aichej/")
- (base32
- "1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aichej/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aichej")
(synopsis "Bibliography style file for the AIChE Journal")
@@ -1963,12 +2347,17 @@ or @code{AIChE} J or @code{AIChEJ).}")
(define-public texlive-ajl
(package
(name "texlive-ajl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/ajl/")
- (base32
- "1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/ajl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/ajl")
(synopsis "BibTeX style for AJL")
@@ -1980,13 +2369,18 @@ Australian Journal of Linguistics.")
(define-public texlive-akshar
(package
(name "texlive-akshar")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/akshar/" "source/latex/akshar/"
- "tex/latex/akshar/")
- (base32
- "17xiqalqpw64pgvmpsa41qf6y5fhg720rpbr57kv8ipvvm1fn3n5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/akshar/" "source/latex/akshar/"
+ "tex/latex/akshar/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17xiqalqpw64pgvmpsa41qf6y5fhg720rpbr57kv8ipvvm1fn3n5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/akshar")
@@ -1999,16 +2393,21 @@ Devanagari characters and syllables in a more correct way.")
(define-public texlive-albatross
(package
(name "texlive-albatross")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/man/man1/albatross.1"
- "doc/man/man1/albatross.man1.pdf"
- "doc/support/albatross/"
- "scripts/albatross/"
- "source/support/albatross/")
- (base32
- "147cdqiyapmhs6s5cp4f0vhc71d3w9kvxk8ylbrhsp5h97r8y6w9")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/albatross.1"
+ "doc/man/man1/albatross.man1.pdf"
+ "doc/support/albatross/"
+ "scripts/albatross/"
+ "source/support/albatross/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0gg7abaixfxmwhdj3z84sg1vkglh8a8q2p3ql1hy74f5rpkyf3yg"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "albatross.sh")))
@@ -2022,19 +2421,24 @@ a given (Unicode) glyph. It relies on Fontconfig.")
(define-public texlive-alegreya
(package
(name "texlive-alegreya")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/alegreya/"
- "fonts/enc/dvips/alegreya/"
- "fonts/map/dvips/alegreya/"
- "fonts/opentype/huerta/alegreya/"
- "fonts/tfm/huerta/alegreya/"
- "fonts/type1/huerta/alegreya/"
- "fonts/vf/huerta/alegreya/"
- "tex/latex/alegreya/")
- (base32
- "1n09fq89nxw3jaglmvjfl7ysflqi0rh6mmp6q0zn57m72sza9rra")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/alegreya/"
+ "fonts/enc/dvips/alegreya/"
+ "fonts/map/dvips/alegreya/"
+ "fonts/opentype/huerta/alegreya/"
+ "fonts/tfm/huerta/alegreya/"
+ "fonts/type1/huerta/alegreya/"
+ "fonts/vf/huerta/alegreya/"
+ "tex/latex/alegreya/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1n09fq89nxw3jaglmvjfl7ysflqi0rh6mmp6q0zn57m72sza9rra"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/alegreya")
@@ -2049,18 +2453,24 @@ number styles are available.")
(define-public texlive-aleph
(package
(name "texlive-aleph")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/aleph/base/" "doc/man/man1/aleph.1"
- "doc/man/man1/aleph.man1.pdf")
- (base32
- "0b7dihilh2v8qcp4m8fblyc10jc5i4fhpj3pspzinag0pk66b7nb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/aleph/base/" "doc/man/man1/aleph.1"
+ "doc/man/man1/aleph.man1.pdf"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "096p2kcfmdvf09xpijwsrhkhmaggvd04jxrs2abag45wsrj75h0s"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:create-formats #~(list "aleph")))
(propagated-inputs
- (list texlive-cm
+ (list texlive-aleph-bin
+ texlive-cm
texlive-hyphen-base
texlive-knuth-lib
texlive-lambda
@@ -2073,22 +2483,52 @@ number styles are available.")
extensions of TeX, itself developed for e-TeX.")
(license license:gpl3+)))
+(define-public texlive-aleph-bin
+ (package
+ (inherit texlive-bin)
+ (name "texlive-aleph-bin")
+ (arguments
+ (substitute-keyword-arguments (package-arguments texlive-bin)
+ ((#:configure-flags flags)
+ #~(cons* "--disable-web2c"
+ "--enable-aleph"
+ (delete "--disable-aleph"
+ (delete "--enable-web2c" #$flags))))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'install
+ (lambda _
+ (with-directory-excursion "texk/web2c"
+ (invoke "make" "aleph")
+ (install-file "aleph" (string-append #$output "/bin")))))))))
+ (native-inputs (list pkg-config))
+ (home-page (package-home-page texlive-aleph))
+ (synopsis "Binary for @code{texlive-aleph}")
+ (description
+ "This package provides the binary for @code{texlive-aleph}.")
+ (license (package-license texlive-aleph))))
+
(define-public texlive-alfaslabone
(package
(name "texlive-alfaslabone")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/alfaslabone/"
- "fonts/enc/dvips/alfaslabone/"
- "fonts/map/dvips/alfaslabone/"
- "fonts/opentype/public/alfaslabone/"
- "fonts/tfm/public/alfaslabone/"
- "fonts/type1/public/alfaslabone/"
- "fonts/vf/public/alfaslabone/"
- "tex/latex/alfaslabone/")
- (base32
- "1wpn96dd1rca52dqwngvyyvnmvak32sjz2id6lcra2jnz5jhk01g")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/alfaslabone/"
+ "fonts/enc/dvips/alfaslabone/"
+ "fonts/map/dvips/alfaslabone/"
+ "fonts/opentype/public/alfaslabone/"
+ "fonts/tfm/public/alfaslabone/"
+ "fonts/type1/public/alfaslabone/"
+ "fonts/vf/public/alfaslabone/"
+ "tex/latex/alfaslabone/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wpn96dd1rca52dqwngvyyvnmvak32sjz2id6lcra2jnz5jhk01g"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/alfaslabone")
@@ -2102,13 +2542,18 @@ headlines.")
(define-public texlive-alg
(package
(name "texlive-alg")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/alg/" "source/latex/alg/"
- "tex/latex/alg/")
- (base32
- "0jqk9sgw2m4c6hssfc5c3qfxqvpyppvcmy8i5crm7fsmkv0y6wkg")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/alg/" "source/latex/alg/"
+ "tex/latex/alg/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jqk9sgw2m4c6hssfc5c3qfxqvpyppvcmy8i5crm7fsmkv0y6wkg"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/alg")
@@ -2125,13 +2570,18 @@ defined.")
(define-public texlive-algobox
(package
(name "texlive-algobox")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algobox/" "source/latex/algobox/"
- "tex/latex/algobox/")
- (base32
- "03z5s4v1asfp6rm51wfkmax69rlggfdyb3p1acdy8cx1gwd10f2w")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algobox/" "source/latex/algobox/"
+ "tex/latex/algobox/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "03z5s4v1asfp6rm51wfkmax69rlggfdyb3p1acdy8cx1gwd10f2w"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algobox")
@@ -2148,19 +2598,24 @@ inconsistent differences between the input syntax and the program text.")
(define-public texlive-algolrevived
(package
(name "texlive-algolrevived")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/algolrevived/"
- "fonts/enc/dvips/algolrevived/"
- "fonts/map/dvips/algolrevived/"
- "fonts/opentype/public/algolrevived/"
- "fonts/tfm/public/algolrevived/"
- "fonts/type1/public/algolrevived/"
- "fonts/vf/public/algolrevived/"
- "tex/latex/algolrevived/")
- (base32
- "0709ijp5jqajwdc9ryhjp4jky0pqynj9wj3rryxk9z6sm63pbq1k")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/algolrevived/"
+ "fonts/enc/dvips/algolrevived/"
+ "fonts/map/dvips/algolrevived/"
+ "fonts/opentype/public/algolrevived/"
+ "fonts/tfm/public/algolrevived/"
+ "fonts/type1/public/algolrevived/"
+ "fonts/vf/public/algolrevived/"
+ "tex/latex/algolrevived/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0709ijp5jqajwdc9ryhjp4jky0pqynj9wj3rryxk9z6sm63pbq1k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algolrevived")
@@ -2176,13 +2631,18 @@ specific columns. It also makes a passable but limited text font.")
(define-public texlive-algorithm2e
(package
(name "texlive-algorithm2e")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algorithm2e/"
- "tex/latex/algorithm2e/")
- (base32
- "0bf4fc9p84zy2zdl0hiklcbbxn17j3qyl02kyj5ya00lrf6sv93n")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algorithm2e/"
+ "tex/latex/algorithm2e/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0bf4fc9p84zy2zdl0hiklcbbxn17j3qyl02kyj5ya00lrf6sv93n"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algorithm2e")
@@ -2201,13 +2661,18 @@ in other algorithms.")
(define-public texlive-algorithmicx
(package
(name "texlive-algorithmicx")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algorithmicx/"
- "tex/latex/algorithmicx/")
- (base32
- "0q0qkzc88479y5dqifnpfxhclk48gf1c4shxi1xhgqbvjp2gqgza")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algorithmicx/"
+ "tex/latex/algorithmicx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q0qkzc88479y5dqifnpfxhclk48gf1c4shxi1xhgqbvjp2gqgza"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algorithmicx")
@@ -2223,14 +2688,19 @@ style to his native language.")
(define-public texlive-algorithms
(package
(name "texlive-algorithms")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algorithms/"
- "source/latex/algorithms/"
- "tex/latex/algorithms/")
- (base32
- "0yw0alkigq77a2ha4hdrvpagqvyy0cv61ddhvf227wlwmvw5ch2w")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algorithms/"
+ "source/latex/algorithms/"
+ "tex/latex/algorithms/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0yw0alkigq77a2ha4hdrvpagqvyy0cv61ddhvf227wlwmvw5ch2w"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algorithms")
@@ -2246,13 +2716,18 @@ typesetting popular algorithmic constructs are available.")
(define-public texlive-algpseudocodex
(package
(name "texlive-algpseudocodex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algpseudocodex/"
- "tex/latex/algpseudocodex/")
- (base32
- "1gjcdmzijiagzxwjwygqpbjjapzk9dfljv5d94iabzr8032l9rsh")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algpseudocodex/"
+ "tex/latex/algpseudocodex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "03k0ynz63gqgmm6ylikpaq28cd70qfq3advv8n1nbi8bjgz7xrd4"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algpseudocodex")
@@ -2269,13 +2744,18 @@ support for long code lines spanning several lines and improved comments.")
(define-public texlive-algxpar
(package
(name "texlive-algxpar")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/algxpar/" "source/latex/algxpar/"
- "tex/latex/algxpar/")
- (base32
- "1d4g8wl29k85x2liwab86fw1yvns68c4ms6v7mvviavcvml4d3mx")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/algxpar/"
+ "tex/latex/algxpar/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14hspzx0bd2p2aahfa54jz0f97nz1wbjykjrgb5l8ncmr11hr09h"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/algxpar")
@@ -2288,14 +2768,19 @@ text which spans over multiple lines.")
(define-public texlive-aligned-overset
(package
(name "texlive-aligned-overset")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aligned-overset/"
- "source/latex/aligned-overset/"
- "tex/latex/aligned-overset/")
- (base32
- "1awawz0ypq15r16mx949g7r7pp9a60xhi8hciy1xsa6dvvj47h5x")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aligned-overset/"
+ "source/latex/aligned-overset/"
+ "tex/latex/aligned-overset/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1awawz0ypq15r16mx949g7r7pp9a60xhi8hciy1xsa6dvvj47h5x"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aligned-overset")
@@ -2309,13 +2794,18 @@ math environments.")
(define-public texlive-alkalami
(package
(name "texlive-alkalami")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/alkalami/"
- "fonts/truetype/public/alkalami/")
- (base32
- "0979xhsjar0gwjp9yqp0kaf4gp4z715gr2kdb8dkqg8zzlkqhgzk")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/alkalami/"
+ "fonts/truetype/public/alkalami/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0979xhsjar0gwjp9yqp0kaf4gp4z715gr2kdb8dkqg8zzlkqhgzk"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/alkalami")
@@ -2328,17 +2818,22 @@ region of Nigeria and Niger.")
(define-public texlive-allrunes
(package
(name "texlive-allrunes")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/allrunes/"
- "fonts/map/dvips/allrunes/"
- "fonts/source/public/allrunes/"
- "fonts/type1/public/allrunes/"
- "source/fonts/allrunes/"
- "tex/latex/allrunes/")
- (base32
- "14a1qaa30s4dzmg4dlrjd3faa3bcrl2gdpp700i8pghj3pjk7gp4")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/allrunes/"
+ "fonts/map/dvips/allrunes/"
+ "fonts/source/public/allrunes/"
+ "fonts/type1/public/allrunes/"
+ "source/fonts/allrunes/"
+ "tex/latex/allrunes/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14a1qaa30s4dzmg4dlrjd3faa3bcrl2gdpp700i8pghj3pjk7gp4"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/allrunes")
@@ -2352,19 +2847,24 @@ covers not only the main forms but also a lot of varieties.")
(define-public texlive-almendra
(package
(name "texlive-almendra")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/almendra/"
- "fonts/enc/dvips/almendra/"
- "fonts/map/dvips/almendra/"
- "fonts/tfm/public/almendra/"
- "fonts/truetype/public/almendra/"
- "fonts/type1/public/almendra/"
- "fonts/vf/public/almendra/"
- "tex/latex/almendra/")
- (base32
- "1mkj0cjpry0hdynlpf719haczm1csv0yvla6nhlgp3dq5k28hvp2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/almendra/"
+ "fonts/enc/dvips/almendra/"
+ "fonts/map/dvips/almendra/"
+ "fonts/tfm/public/almendra/"
+ "fonts/truetype/public/almendra/"
+ "fonts/type1/public/almendra/"
+ "fonts/vf/public/almendra/"
+ "tex/latex/almendra/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mkj0cjpry0hdynlpf719haczm1csv0yvla6nhlgp3dq5k28hvp2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/almendra")
@@ -2380,14 +2880,19 @@ There is also a regular-weight small-caps.")
(define-public texlive-almfixed
(package
(name "texlive-almfixed")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/almfixed/"
- "fonts/opentype/public/almfixed/"
- "fonts/truetype/public/almfixed/")
- (base32
- "1ihyldbdz89swj8lm75kb3n3nqqgzkydwlppsndfpib74pvp6s97")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/almfixed/"
+ "fonts/opentype/public/almfixed/"
+ "fonts/truetype/public/almfixed/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ihyldbdz89swj8lm75kb3n3nqqgzkydwlppsndfpib74pvp6s97"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/almfixed")
@@ -2408,13 +2913,18 @@ proofread.")
(define-public texlive-alpha-persian
(package
(name "texlive-alpha-persian")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/alpha-persian/"
- "doc/bibtex/alpha-persian/")
- (base32
- "15ynmgh3fp6s40c200kgr6v0q84bkzp9cv45yg90mr9d7mq72djv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/alpha-persian/"
+ "doc/bibtex/alpha-persian/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "15ynmgh3fp6s40c200kgr6v0q84bkzp9cv45yg90mr9d7mq72djv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/alpha-persian")
@@ -2428,13 +2938,18 @@ offers several enhancements. It is compatible with the @code{hyperref},
(define-public texlive-amscdx
(package
(name "texlive-amscdx")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amscdx/" "source/latex/amscdx/"
- "tex/latex/amscdx/")
- (base32
- "13gxllncd46w4kscb7isivw6x82pw9yfamcv3sq6wnx68z03n2q3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amscdx/" "source/latex/amscdx/"
+ "tex/latex/amscdx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13gxllncd46w4kscb7isivw6x82pw9yfamcv3sq6wnx68z03n2q3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amscdx")
@@ -2453,12 +2968,17 @@ class of commutative diagrams and alike.")
(define-public texlive-amscls-doc
(package
(name "texlive-amscls-doc")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amscls-doc/")
- (base32
- "0allim05cp20zhn480df2mivd3p9gnc069d7hbjlzv660bw7mapx")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amscls-doc/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0allim05cp20zhn480df2mivd3p9gnc069d7hbjlzv660bw7mapx"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amscls-doc")
@@ -2480,12 +3000,17 @@ various components.")
(define-public texlive-amslatex-primer
(package
(name "texlive-amslatex-primer")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amslatex-primer/")
- (base32
- "1kzayyh1bycmq43s2xn81jf05r18azidbk3gv6igf2vaq37fmxil")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amslatex-primer/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1kzayyh1bycmq43s2xn81jf05r18azidbk3gv6igf2vaq37fmxil"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amslatex-primer")
@@ -2503,12 +3028,17 @@ create a bibliography.")
(define-public texlive-amsldoc-it
(package
(name "texlive-amsldoc-it")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amsldoc-it/")
- (base32
- "0d4hwb7hywy56d6934448lcr6fdx7qchkfzs806dr7wfzfy36yix")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amsldoc-it/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d4hwb7hywy56d6934448lcr6fdx7qchkfzs806dr7wfzfy36yix"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amsldoc-it")
@@ -2521,12 +3051,17 @@ create a bibliography.")
(define-public texlive-amsldoc-vn
(package
(name "texlive-amsldoc-vn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amsldoc-vn/")
- (base32
- "1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amsldoc-vn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amslatexdoc-vietnamese")
@@ -2539,22 +3074,38 @@ create a bibliography.")
(define-public texlive-amstex
(package
(name "texlive-amstex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/amstex/base/" "doc/man/man1/amstex.1"
- "doc/man/man1/amstex.man1.pdf"
- "tex/amstex/base/" "tex/amstex/config/")
- (base32
- "01yh10g2wwa58q151aqg246bsclks25qvd8axc1v799v37wlgqn3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/amstex/base/" "doc/man/man1/amstex.1"
+ "doc/man/man1/amstex.man1.pdf"
+ "tex/amstex/base/" "tex/amstex/config/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19wmfij3g3kaqnhypczpda7i2c3nhin1h6fjwjb5raimr9g5qyql"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
- (arguments (list #:create-formats #~(list "amstex")))
+ (arguments
+ (list #:create-formats #~(list "amstex")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'symlink-binaries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((pdftex (search-input-file inputs "bin/pdftex"))
+ (bin (string-append #$output "/bin")))
+ (mkdir-p bin)
+ (with-directory-excursion bin
+ (symlink pdftex "amstex"))))))))
(propagated-inputs
(list texlive-amsfonts
texlive-cm
texlive-hyphen-base
texlive-knuth-lib
+ texlive-pdftex
texlive-plain
texlive-tex))
(home-page "https://ctan.org/pkg/amstex")
@@ -2577,12 +3128,17 @@ prepare submissions for the AMS.")
(define-public texlive-amsthdoc-it
(package
(name "texlive-amsthdoc-it")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/amsthdoc-it/")
- (base32
- "0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/amsthdoc-it/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/amsthdoc-it")
@@ -2595,19 +3151,24 @@ prepare submissions for the AMS.")
(define-public texlive-andika
(package
(name "texlive-andika")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/andika/"
- "fonts/enc/dvips/andika/"
- "fonts/map/dvips/andika/"
- "fonts/tfm/SIL/andika/"
- "fonts/truetype/SIL/andika/"
- "fonts/type1/SIL/andika/"
- "fonts/vf/SIL/andika/"
- "tex/latex/andika/")
- (base32
- "1gjahg3xwzwrj9cp6l0zmhfqxwzl4m89vvngmpq4ym0f6rg5pb4i")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/andika/"
+ "fonts/enc/dvips/andika/"
+ "fonts/map/dvips/andika/"
+ "fonts/tfm/SIL/andika/"
+ "fonts/truetype/SIL/andika/"
+ "fonts/type1/SIL/andika/"
+ "fonts/vf/SIL/andika/"
+ "tex/latex/andika/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gjahg3xwzwrj9cp6l0zmhfqxwzl4m89vvngmpq4ym0f6rg5pb4i"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/andika")
@@ -2623,14 +3184,19 @@ with one another.")
(define-public texlive-annee-scolaire
(package
(name "texlive-annee-scolaire")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/annee-scolaire/"
- "source/latex/annee-scolaire/"
- "tex/latex/annee-scolaire/")
- (base32
- "1nwm67p4s822d7r4kr3rbvnm9vlkvzjbikqy8hq2fqsc9bdx34ib")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/annee-scolaire/"
+ "source/latex/annee-scolaire/"
+ "tex/latex/annee-scolaire/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1nwm67p4s822d7r4kr3rbvnm9vlkvzjbikqy8hq2fqsc9bdx34ib"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/annee-scolaire")
@@ -2646,12 +3212,17 @@ the years.")
(define-public texlive-annotate
(package
(name "texlive-annotate")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/annotate/")
- (base32
- "12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/annotate/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/annotate")
(synopsis "Bibliography style with annotations")
@@ -2666,13 +3237,18 @@ processes an entry's annotate field as part of the printed output.")
(define-public texlive-annotate-equations
(package
(name "texlive-annotate-equations")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/annotate-equations/"
- "tex/latex/annotate-equations/")
- (base32
- "1jk08yxwyijspa74k0a79wvh7q0s0xd7ji5m13qb48gw0czwjcxs")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/annotate-equations/"
+ "tex/latex/annotate-equations/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07cdj0sqx796gsjmrpq8bzkmiqbli24593y4axcmrr8kngfki9f2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/annotate-equations")
@@ -2686,13 +3262,18 @@ as well as LuaLaTeX.")
(define-public texlive-anonymous-acm
(package
(name "texlive-anonymous-acm")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/anonymous-acm/"
- "tex/latex/anonymous-acm/")
- (base32
- "05csmx485sjky64d2hwlb5f7mrkixhw1gn3nl7p7lng9sd8qh25k")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/anonymous-acm/"
+ "tex/latex/anonymous-acm/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05csmx485sjky64d2hwlb5f7mrkixhw1gn3nl7p7lng9sd8qh25k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/anonymous-acm")
@@ -2711,21 +3292,26 @@ simply changing one option and recompiling.")
(define-public texlive-anonymouspro
(package
(name "texlive-anonymouspro")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/anonymouspro/"
- "fonts/afm/public/anonymouspro/"
- "fonts/enc/dvips/anonymouspro/"
- "fonts/map/dvips/anonymouspro/"
- "fonts/tfm/public/anonymouspro/"
- "fonts/truetype/public/anonymouspro/"
- "fonts/type1/public/anonymouspro/"
- "fonts/vf/public/anonymouspro/"
- "source/fonts/anonymouspro/"
- "tex/latex/anonymouspro/")
- (base32
- "1qfhsbq3ab72k9d023pa70vs1807djijg84l888nwsf3ylfwg7mf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/anonymouspro/"
+ "fonts/afm/public/anonymouspro/"
+ "fonts/enc/dvips/anonymouspro/"
+ "fonts/map/dvips/anonymouspro/"
+ "fonts/tfm/public/anonymouspro/"
+ "fonts/truetype/public/anonymouspro/"
+ "fonts/type1/public/anonymouspro/"
+ "fonts/vf/public/anonymouspro/"
+ "source/fonts/anonymouspro/"
+ "tex/latex/anonymouspro/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1qfhsbq3ab72k9d023pa70vs1807djijg84l888nwsf3ylfwg7mf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/anonymouspro")
@@ -2739,14 +3325,19 @@ also provided.")
(define-public texlive-antanilipsum
(package
(name "texlive-antanilipsum")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/antanilipsum/"
- "source/latex/antanilipsum/"
- "tex/latex/antanilipsum/")
- (base32
- "1yighrv3nxb266949m8sqvvl5yp8bhjq478h2abfrs1z0r65gpjr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/antanilipsum/"
+ "source/latex/antanilipsum/"
+ "tex/latex/antanilipsum/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yighrv3nxb266949m8sqvvl5yp8bhjq478h2abfrs1z0r65gpjr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/antanilipsum")
@@ -2760,19 +3351,24 @@ friends'', in English), directed by Mario Monicelli.")
(define-public texlive-antiqua
(package
(name "texlive-antiqua")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/antiqua/"
- "fonts/afm/urw/antiqua/"
- "fonts/map/dvips/antiqua/"
- "fonts/map/vtex/antiqua/"
- "fonts/tfm/urw/antiqua/"
- "fonts/type1/urw/antiqua/"
- "fonts/vf/urw/antiqua/"
- "tex/latex/antiqua/")
- (base32
- "0agnibj98zx2f2r40gqcfm2f1x06389wd2qrlf6b4pl8pgay42z2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/antiqua/"
+ "fonts/afm/urw/antiqua/"
+ "fonts/map/dvips/antiqua/"
+ "fonts/map/vtex/antiqua/"
+ "fonts/tfm/urw/antiqua/"
+ "fonts/type1/urw/antiqua/"
+ "fonts/vf/urw/antiqua/"
+ "tex/latex/antiqua/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0agnibj98zx2f2r40gqcfm2f1x06389wd2qrlf6b4pl8pgay42z2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/urw-antiqua")
@@ -2785,15 +3381,20 @@ Condensed, with supporting files for use with (La)TeX.")
(define-public texlive-antomega
(package
(name "texlive-antomega")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/omega/antomega/" "omega/ocp/antomega/"
- "omega/otp/antomega/"
- "source/lambda/antomega/"
- "tex/lambda/antomega/")
- (base32
- "02pfjm9y33mjggn9w2lrk1fxfz3m72xgbvyvrq2iri9yf0hk33pf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/omega/antomega/" "omega/ocp/antomega/"
+ "omega/otp/antomega/"
+ "source/lambda/antomega/"
+ "tex/lambda/antomega/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "02pfjm9y33mjggn9w2lrk1fxfz3m72xgbvyvrq2iri9yf0hk33pf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -2821,12 +3422,17 @@ of LaTeX documents to Lambda).")
(define-public texlive-anufinalexam
(package
(name "texlive-anufinalexam")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/anufinalexam/")
- (base32
- "1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/anufinalexam/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/anufinalexam")
@@ -2839,13 +3445,18 @@ final exams in the @acronym{ANU, Australian National University}.")
(define-public texlive-anyfontsize
(package
(name "texlive-anyfontsize")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/anyfontsize/"
- "tex/latex/anyfontsize/")
- (base32
- "0wr4brhggmkb1rwzmcc2r5ygzqp6090z0bp3sfbarwvwz903wpdn")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/anyfontsize/"
+ "tex/latex/anyfontsize/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wr4brhggmkb1rwzmcc2r5ygzqp6090z0bp3sfbarwvwz903wpdn"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/anyfontsize")
@@ -2862,13 +3473,18 @@ Computer Modern encoding; the present package generalises the facility.")
(define-public texlive-aomart
(package
(name "texlive-aomart")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/aomart/" "doc/latex/aomart/"
- "source/latex/aomart/" "tex/latex/aomart/")
- (base32
- "0gdi54qi0m96pwwn59r9qjlkw0986z9ra57g1vf11h67zwmrgrv9")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/aomart/" "doc/latex/aomart/"
+ "source/latex/aomart/" "tex/latex/aomart/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0gdi54qi0m96pwwn59r9qjlkw0986z9ra57g1vf11h67zwmrgrv9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aomart")
@@ -2881,12 +3497,17 @@ Computer Modern encoding; the present package generalises the facility.")
(define-public texlive-apa
(package
(name "texlive-apa")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/apa/" "tex/latex/apa/")
- (base32
- "0slrvw7awva4d2zf7a6qyvh85qhrp8ml4ncdzjfizr5xz4ki6gs2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/apa/" "tex/latex/apa/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0slrvw7awva4d2zf7a6qyvh85qhrp8ml4ncdzjfizr5xz4ki6gs2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apa")
@@ -2907,13 +3528,18 @@ Apacite, which used to work with this class, has been updated for use with
(define-public texlive-apa6e
(package
(name "texlive-apa6e")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/apa6e/" "source/latex/apa6e/"
- "tex/latex/apa6e/")
- (base32
- "1dksjpdywwvyj9mfhaghsrf935p061gsnx4lf5s6pkv5nxn2pbln")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/apa6e/" "source/latex/apa6e/"
+ "tex/latex/apa6e/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dksjpdywwvyj9mfhaghsrf935p061gsnx4lf5s6pkv5nxn2pbln"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apa6e")
@@ -2928,13 +3554,18 @@ requirements.")
(define-public texlive-apa7
(package
(name "texlive-apa7")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/apa7/" "source/latex/apa7/"
- "tex/latex/apa7/")
- (base32
- "0kifjg61s16cn7zvmix2yqdz26spr7f9gsxkiv822qs3y337l6ry")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/apa7/" "source/latex/apa7/"
+ "tex/latex/apa7/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0kifjg61s16cn7zvmix2yqdz26spr7f9gsxkiv822qs3y337l6ry"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -2959,13 +3590,18 @@ a development of the @code{apa6} class.")
(define-public texlive-apalike-ejor
(package
(name "texlive-apalike-ejor")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/apalike-ejor/"
- "doc/bibtex/apalike-ejor/")
- (base32
- "0qq7c81hqi46596zw322w1qd8z341zksi5720f9s75nj1hmjj12g")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/apalike-ejor/"
+ "doc/bibtex/apalike-ejor/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qq7c81hqi46596zw322w1qd8z341zksi5720f9s75nj1hmjj12g"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apalike-ejor")
@@ -2980,12 +3616,17 @@ guidelines.")
(define-public texlive-apalike2
(package
(name "texlive-apalike2")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/apalike2/")
- (base32
- "0mn84ahwjg8gvw5lifvcrnch11q79d4bgw3nmhrh4v8slwgip5l7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/apalike2/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0mn84ahwjg8gvw5lifvcrnch11q79d4bgw3nmhrh4v8slwgip5l7"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apalike2")
(synopsis "Bibliography style that approaches APA requirements")
@@ -2997,12 +3638,17 @@ base BibTeX distribution.")
(define-public texlive-apnum
(package
(name "texlive-apnum")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/apnum/" "tex/generic/apnum/")
- (base32
- "0s6nklimzbqc1z1vhgffzp76d1kl2shz1xkf119bck482rvn3x61")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/apnum/" "tex/generic/apnum/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0s6nklimzbqc1z1vhgffzp76d1kl2shz1xkf119bck482rvn3x61"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apnum")
@@ -3017,12 +3663,17 @@ is allowed. The expression scanner is also provided.")
(define-public texlive-apprendre-a-programmer-en-tex
(package
(name "texlive-apprendre-a-programmer-en-tex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/plain/apprendre-a-programmer-en-tex/")
- (base32
- "05779lk9v849k712wfjv0mhyzahwpl4n892ydamfdc5yg05bsnyv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/plain/apprendre-a-programmer-en-tex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05779lk9v849k712wfjv0mhyzahwpl4n892ydamfdc5yg05bsnyv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apprendre-a-programmer-en-tex")
@@ -3037,12 +3688,17 @@ to everyone.")
(define-public texlive-apprends-latex
(package
(name "texlive-apprends-latex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/apprends-latex/")
- (base32
- "1xzy7svb2xz6bdfg0f1r3whwda118pl7qdwygx1l7h4d1vqm2rcq")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/apprends-latex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xzy7svb2xz6bdfg0f1r3whwda118pl7qdwygx1l7h4d1vqm2rcq"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apprends-latex")
@@ -3055,14 +3711,19 @@ documentation for LaTeX beginners.")
(define-public texlive-apxproof
(package
(name "texlive-apxproof")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/apxproof/"
- "source/latex/apxproof/"
- "tex/latex/apxproof/")
- (base32
- "1m4nvqxvnsllh25qmms6szcqqpb8wffk1z0v2p507fkgsdjz9jln")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/apxproof/"
+ "source/latex/apxproof/"
+ "tex/latex/apxproof/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1m4nvqxvnsllh25qmms6szcqqpb8wffk1z0v2p507fkgsdjz9jln"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/apxproof")
@@ -3081,20 +3742,25 @@ material.")
(define-public texlive-arabi
(package
(name "texlive-arabi")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/arabi/"
- "fonts/afm/arabi/arabeyes/"
- "fonts/enc/dvips/arabi/"
- "fonts/map/dvips/arabi/"
- "fonts/tfm/arabi/arabeyes/"
- "fonts/tfm/arabi/farsiweb/"
- "fonts/type1/arabi/arabeyes/"
- "fonts/type1/arabi/farsiweb/"
- "tex/latex/arabi/")
- (base32
- "19js5lw5r51n97gnf7ggvnvdkaamd0aagx73hnpyfzgzj9nb8pjr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/arabi/"
+ "fonts/afm/arabi/arabeyes/"
+ "fonts/enc/dvips/arabi/"
+ "fonts/map/dvips/arabi/"
+ "fonts/tfm/arabi/arabeyes/"
+ "fonts/tfm/arabi/farsiweb/"
+ "fonts/type1/arabi/arabeyes/"
+ "fonts/type1/arabi/farsiweb/"
+ "tex/latex/arabi/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19js5lw5r51n97gnf7ggvnvdkaamd0aagx73hnpyfzgzj9nb8pjr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arabi")
@@ -3115,13 +3781,18 @@ copied from them and pasted elsewhere.")
(define-public texlive-arabi-add
(package
(name "texlive-arabi-add")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/arabi-add/"
- "tex/latex/arabi-add/")
- (base32
- "1lrr3vr9sv554bvad70rc32x0jgsam2jaflgxw0nid0629rmigdj")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/arabi-add/"
+ "tex/latex/arabi-add/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lrr3vr9sv554bvad70rc32x0jgsam2jaflgxw0nid0629rmigdj"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arabi-add")
@@ -3136,13 +3807,18 @@ contents for Arabic texts created by the @code{arabi} package.")
(define-public texlive-arabic-book
(package
(name "texlive-arabic-book")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/xelatex/arabic-book/"
- "tex/xelatex/arabic-book/")
- (base32
- "070agzwpgdfvjqn2klxw2m1bavy0l9b9pqqikc7il3wx107m4ni1")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/xelatex/arabic-book/"
+ "tex/xelatex/arabic-book/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "070agzwpgdfvjqn2klxw2m1bavy0l9b9pqqikc7il3wx107m4ni1"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arabic-book")
@@ -3162,14 +3838,19 @@ elsewhere.")
(define-public texlive-arabluatex
(package
(name "texlive-arabluatex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/lualatex/arabluatex/"
- "source/lualatex/arabluatex/"
- "tex/lualatex/arabluatex/")
- (base32
- "1g1ai0inai3jniq49avfswyaysxlk1yp6n97l94pq8v3vszx0k8i")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/lualatex/arabluatex/"
+ "source/lualatex/arabluatex/"
+ "tex/lualatex/arabluatex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1g1ai0inai3jniq49avfswyaysxlk1yp6n97l94pq8v3vszx0k8i"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arabluatex")
@@ -3191,17 +3872,22 @@ correlated in various ways.")
(define-public texlive-arabtex
(package
(name "texlive-arabtex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/arabtex/"
- "fonts/map/dvips/arabtex/"
- "fonts/source/public/arabtex/"
- "fonts/tfm/public/arabtex/"
- "fonts/type1/public/arabtex/"
- "tex/latex/arabtex/")
- (base32
- "1z1iaj59lawilydp31d3zxbd5jbny4szpdnkbwl6lrnki4c0s51c")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/arabtex/"
+ "fonts/map/dvips/arabtex/"
+ "fonts/source/public/arabtex/"
+ "fonts/tfm/public/arabtex/"
+ "fonts/type1/public/arabtex/"
+ "tex/latex/arabtex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z1iaj59lawilydp31d3zxbd5jbny4szpdnkbwl6lrnki4c0s51c"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3220,16 +3906,22 @@ style. ArabTeX will run with Plain TeX and also with LaTeX.")
(define-public texlive-arara
(package
(name "texlive-arara")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/man/man1/arara.1"
- "doc/man/man1/arara.man1.pdf"
- "doc/support/arara/" "scripts/arara/"
- "source/support/arara/")
- (base32
- "0sshjaxz1ar24mr7dny0lp9l0bggyfsb0868s4b1k00w6jyzh1i8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/arara.1"
+ "doc/man/man1/arara.man1.pdf"
+ "doc/support/arara/" "scripts/arara/"
+ "source/support/arara/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13wqpc586vmk2c3fj2w1ykixrgfkjnwiplb1ra5mia9m53g6s7wz"))))
(outputs '("out" "doc"))
+ (properties '((updater-extra-inputs "icedtea")))
(build-system texlive-build-system)
(arguments
(list
@@ -3254,18 +3946,23 @@ virtual machine.")
(define-public texlive-aramaic-serto
(package
(name "texlive-aramaic-serto")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aramaic-serto/"
- "fonts/afm/public/aramaic-serto/"
- "fonts/map/dvips/aramaic-serto/"
- "fonts/source/public/aramaic-serto/"
- "fonts/tfm/public/aramaic-serto/"
- "fonts/type1/public/aramaic-serto/"
- "tex/latex/aramaic-serto/")
- (base32
- "154bicknhsj8nypnyzr999wj34xli0kfpic9vym805abxbpwrmsw")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aramaic-serto/"
+ "fonts/afm/public/aramaic-serto/"
+ "fonts/map/dvips/aramaic-serto/"
+ "fonts/source/public/aramaic-serto/"
+ "fonts/tfm/public/aramaic-serto/"
+ "fonts/type1/public/aramaic-serto/"
+ "tex/latex/aramaic-serto/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "154bicknhsj8nypnyzr999wj34xli0kfpic9vym805abxbpwrmsw"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3283,15 +3980,20 @@ form).")
(define-public texlive-archaeologie
(package
(name "texlive-archaeologie")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bib/archaeologie/"
- "doc/latex/archaeologie/"
- "source/latex/archaeologie/"
- "tex/latex/archaeologie/")
- (base32
- "0w8r9z0k0rxdgxa2p16rqyh7rm83sy0410p5lz5k23h805q5qsmy")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bib/archaeologie/"
+ "doc/latex/archaeologie/"
+ "source/latex/archaeologie/"
+ "tex/latex/archaeologie/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17wffhg034ja4iy6sikyhfh97gvjhk2020bpk3zqmh13wkh2p6cg"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/archaeologie")
@@ -3305,19 +4007,24 @@ change and adjust the outcome according to one's own preferences.")
(define-public texlive-archaic
(package
(name "texlive-archaic")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/archaic/"
- "fonts/afm/public/archaic/"
- "fonts/map/dvips/archaic/"
- "fonts/source/public/archaic/"
- "fonts/tfm/public/archaic/"
- "fonts/type1/public/archaic/"
- "source/fonts/archaic/"
- "tex/latex/archaic/")
- (base32
- "0a6lp4w9b76q1w30a58205b1n7jf61n58ps2hdxrhpg9nxqwy1w0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/archaic/"
+ "fonts/afm/public/archaic/"
+ "fonts/map/dvips/archaic/"
+ "fonts/source/public/archaic/"
+ "fonts/tfm/public/archaic/"
+ "fonts/type1/public/archaic/"
+ "source/fonts/archaic/"
+ "tex/latex/archaic/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a6lp4w9b76q1w30a58205b1n7jf61n58ps2hdxrhpg9nxqwy1w0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3335,19 +4042,24 @@ writings.")
(define-public texlive-archivo
(package
(name "texlive-archivo")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/archivo/"
- "fonts/enc/dvips/archivo/"
- "fonts/map/dvips/archivo/"
- "fonts/opentype/public/archivo/"
- "fonts/tfm/public/archivo/"
- "fonts/type1/public/archivo/"
- "fonts/vf/public/archivo/"
- "tex/latex/archivo/")
- (base32
- "1wdvr7ch2ydj41yd0xniwppb5wh1m9w97d839fhmp21lgyhss0jl")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/archivo/"
+ "fonts/enc/dvips/archivo/"
+ "fonts/map/dvips/archivo/"
+ "fonts/opentype/public/archivo/"
+ "fonts/tfm/public/archivo/"
+ "fonts/type1/public/archivo/"
+ "fonts/vf/public/archivo/"
+ "tex/latex/archivo/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wdvr7ch2ydj41yd0xniwppb5wh1m9w97d839fhmp21lgyhss0jl"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/archivo")
@@ -3360,19 +4072,24 @@ Omnibus-Type, with support for LaTeX and pdfLaTeX.")
(define-public texlive-arimo
(package
(name "texlive-arimo")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/arimo/"
- "fonts/enc/dvips/arimo/"
- "fonts/map/dvips/arimo/"
- "fonts/tfm/google/arimo/"
- "fonts/truetype/google/arimo/"
- "fonts/type1/google/arimo/"
- "fonts/vf/google/arimo/"
- "tex/latex/arimo/")
- (base32
- "06m23slsvcp0pm2ds2rxmgj0qrrvy8qknda4yjhvcz9almwb4syx")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/arimo/"
+ "fonts/enc/dvips/arimo/"
+ "fonts/map/dvips/arimo/"
+ "fonts/tfm/google/arimo/"
+ "fonts/truetype/google/arimo/"
+ "fonts/type1/google/arimo/"
+ "fonts/vf/google/arimo/"
+ "tex/latex/arimo/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06m23slsvcp0pm2ds2rxmgj0qrrvy8qknda4yjhvcz9almwb4syx"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arimo")
@@ -3385,19 +4102,24 @@ design which is metrically compatible with Arial.")
(define-public texlive-armtex
(package
(name "texlive-armtex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/armenian/"
- "fonts/afm/public/armenian/"
- "fonts/map/dvips/armenian/"
- "fonts/source/public/armenian/"
- "fonts/tfm/public/armenian/"
- "fonts/type1/public/armenian/"
- "tex/latex/armenian/"
- "tex/plain/armenian/")
- (base32
- "161c66av2zkxp9r32dr449sa9crmyjkjijrvx5a56avkyyr1s0kp")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/armenian/"
+ "fonts/afm/public/armenian/"
+ "fonts/map/dvips/armenian/"
+ "fonts/source/public/armenian/"
+ "fonts/tfm/public/armenian/"
+ "fonts/type1/public/armenian/"
+ "tex/latex/armenian/"
+ "tex/plain/armenian/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00y0kb6kmfa8d2sqsya93b312170p3vgcd0q9b9l96vys45npx8n"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3415,12 +4137,17 @@ Armenian keyboard using UTF-8 encoding.")
(define-public texlive-around-the-bend
(package
(name "texlive-around-the-bend")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/around-the-bend/")
- (base32
- "00nc6kx4ylz9g6vmjlgyjvmy1ls86pjblbcpm5z40wh5xl7l184f")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/around-the-bend/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00nc6kx4ylz9g6vmjlgyjvmy1ls86pjblbcpm5z40wh5xl7l184f"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/around-the-bend")
@@ -3434,34 +4161,39 @@ to get onto CTAN.")
(define-public texlive-arphic
(package
(name "texlive-arphic")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/arphic/"
- "dvips/arphic/"
- "fonts/afm/arphic/bkaiu/"
- "fonts/afm/arphic/bsmiu/"
- "fonts/afm/arphic/gbsnu/"
- "fonts/afm/arphic/gkaiu/"
- "fonts/map/dvips/arphic/"
- "fonts/tfm/arphic/bkaimp/"
- "fonts/tfm/arphic/bkaiu/"
- "fonts/tfm/arphic/bsmilp/"
- "fonts/tfm/arphic/bsmiu/"
- "fonts/tfm/arphic/gbsnlp/"
- "fonts/tfm/arphic/gbsnu/"
- "fonts/tfm/arphic/gkaimp/"
- "fonts/tfm/arphic/gkaiu/"
- "fonts/type1/arphic/bkaiu/"
- "fonts/type1/arphic/bsmiu/"
- "fonts/type1/arphic/gbsnu/"
- "fonts/type1/arphic/gkaiu/"
- "fonts/vf/arphic/bkaimp/"
- "fonts/vf/arphic/bsmilp/"
- "fonts/vf/arphic/gbsnlp/"
- "fonts/vf/arphic/gkaimp/")
- (base32
- "1sqsgw9xjgd3ss2q7hwnb3vv38sg7l9i8bvsy79m5hyg29wn973x")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/arphic/"
+ "dvips/arphic/"
+ "fonts/afm/arphic/bkaiu/"
+ "fonts/afm/arphic/bsmiu/"
+ "fonts/afm/arphic/gbsnu/"
+ "fonts/afm/arphic/gkaiu/"
+ "fonts/map/dvips/arphic/"
+ "fonts/tfm/arphic/bkaimp/"
+ "fonts/tfm/arphic/bkaiu/"
+ "fonts/tfm/arphic/bsmilp/"
+ "fonts/tfm/arphic/bsmiu/"
+ "fonts/tfm/arphic/gbsnlp/"
+ "fonts/tfm/arphic/gbsnu/"
+ "fonts/tfm/arphic/gkaimp/"
+ "fonts/tfm/arphic/gkaiu/"
+ "fonts/type1/arphic/bkaiu/"
+ "fonts/type1/arphic/bsmiu/"
+ "fonts/type1/arphic/gbsnu/"
+ "fonts/type1/arphic/gkaiu/"
+ "fonts/vf/arphic/bkaimp/"
+ "fonts/vf/arphic/bsmilp/"
+ "fonts/vf/arphic/gbsnlp/"
+ "fonts/vf/arphic/gkaimp/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sqsgw9xjgd3ss2q7hwnb3vv38sg7l9i8bvsy79m5hyg29wn973x"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arphic")
@@ -3477,13 +4209,18 @@ LuaLaTeX are provided by the @code{arphic-ttf} package.")
(define-public texlive-arphic-ttf
(package
(name "texlive-arphic-ttf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/arphic-ttf/"
- "fonts/truetype/public/arphic-ttf/")
- (base32
- "141hsz7lhqpbz3k10kl57bg21yslrb562alk1a6q129i56zb7jby")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/arphic-ttf/"
+ "fonts/truetype/public/arphic-ttf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "141hsz7lhqpbz3k10kl57bg21yslrb562alk1a6q129i56zb7jby"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arphic-ttf")
@@ -3498,13 +4235,18 @@ package.")
(define-public texlive-arsclassica
(package
(name "texlive-arsclassica")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/arsclassica/"
- "tex/latex/arsclassica/")
- (base32
- "0cxmp68na3ww565r7ixqbhsy2mp063wwq5p6gwvq5fdrk34ci2a5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/arsclassica/"
+ "tex/latex/arsclassica/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0cxmp68na3ww565r7ixqbhsy2mp063wwq5p6gwvq5fdrk34ci2a5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arsclassica")
@@ -3518,14 +4260,19 @@ of writing with LaTeX} (the web page is in Italian).")
(define-public texlive-articleingud
(package
(name "texlive-articleingud")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/articleingud/"
- "source/latex/articleingud/"
- "tex/latex/articleingud/")
- (base32
- "1iprjpjr3yav8afmgirrfmdipxb1fmdwa3b0ss5y8l7wspijmmp8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/articleingud/"
+ "source/latex/articleingud/"
+ "tex/latex/articleingud/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1iprjpjr3yav8afmgirrfmdipxb1fmdwa3b0ss5y8l7wspijmmp8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/articleingud")
@@ -3538,18 +4285,23 @@ review. This class is derived from the standard LaTeX class @code{article}.")
(define-public texlive-arvo
(package
(name "texlive-arvo")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/arvo/"
- "fonts/enc/dvips/arvo/"
- "fonts/map/dvips/arvo/"
- "fonts/tfm/public/arvo/"
- "fonts/truetype/public/arvo/"
- "fonts/vf/public/arvo/"
- "tex/latex/arvo/")
- (base32
- "1dc52n81wxz06vfbxzmfdp9j6a217v8yf8bczqlnx5vgzy8wlmi3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/arvo/"
+ "fonts/enc/dvips/arvo/"
+ "fonts/map/dvips/arvo/"
+ "fonts/tfm/public/arvo/"
+ "fonts/truetype/public/arvo/"
+ "fonts/vf/public/arvo/"
+ "tex/latex/arvo/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dc52n81wxz06vfbxzmfdp9j6a217v8yf8bczqlnx5vgzy8wlmi3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/arvo")
@@ -3562,13 +4314,18 @@ Koovit, with support for LaTeX and pdfLaTeX.")
(define-public texlive-asaetr
(package
(name "texlive-asaetr")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/asaetr/" "doc/latex/asaetr/"
- "tex/latex/asaetr/")
- (base32
- "1yms34l9nx151vgjrjsa94801q0bgp2khjgk933iy1bpkmm7jf2d")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/asaetr/" "doc/latex/asaetr/"
+ "tex/latex/asaetr/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yms34l9nx151vgjrjsa94801q0bgp2khjgk933iy1bpkmm7jf2d"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asaetr")
@@ -3583,17 +4340,22 @@ Caps font.")
(define-public texlive-asapsym
(package
(name "texlive-asapsym")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/asapsym/"
- "fonts/opentype/omnibus-type/asapsym/"
- "source/fonts/asapsym/"
- "tex/generic/asapsym/"
- "tex/latex/asapsym/"
- "tex/plain/asapsym/")
- (base32
- "038adcagkzy1bj5y9i5a4i5kbyr3wg7w0lfhbbg9z7glqmivilic")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/asapsym/"
+ "fonts/opentype/omnibus-type/asapsym/"
+ "source/fonts/asapsym/"
+ "tex/generic/asapsym/"
+ "tex/latex/asapsym/"
+ "tex/plain/asapsym/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "038adcagkzy1bj5y9i5a4i5kbyr3wg7w0lfhbbg9z7glqmivilic"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asapsym")
@@ -3608,13 +4370,18 @@ this time, only XeTeX and LuaTeX are supported.")
(define-public texlive-ascelike
(package
(name "texlive-ascelike")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/ascelike/" "doc/latex/ascelike/"
- "tex/latex/ascelike/")
- (base32
- "14n4z4agsnnvms51r142q0r5bv9yqp4gchrr7zvakkp2r3232dai")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/ascelike/" "doc/latex/ascelike/"
+ "tex/latex/ascelike/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14n4z4agsnnvms51r142q0r5bv9yqp4gchrr7zvakkp2r3232dai"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/ascelike")
@@ -3629,12 +4396,17 @@ that organization.")
(define-public texlive-ascii-chart
(package
(name "texlive-ascii-chart")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/support/ascii-chart/")
- (base32
- "1m2x7iwz80plq6hbhp9xia6bp8wbi03iifs0pkr7ji3gn8hqgh1r")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/support/ascii-chart/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1m2x7iwz80plq6hbhp9xia6bp8wbi03iifs0pkr7ji3gn8hqgh1r"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/ascii-chart")
@@ -3647,17 +4419,22 @@ converted between Plain TeX and LaTeX by a simple editing action.")
(define-public texlive-ascii-font
(package
(name "texlive-ascii-font")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/ascii-font/"
- "fonts/map/dvips/ascii-font/"
- "fonts/tfm/public/ascii-font/"
- "fonts/type1/public/ascii-font/"
- "source/fonts/ascii-font/"
- "tex/latex/ascii-font/")
- (base32
- "0cbzvbszxyv552z1274m3bf5k40xr8w12da17db0w2w02y47nyq5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/ascii-font/"
+ "fonts/map/dvips/ascii-font/"
+ "fonts/tfm/public/ascii-font/"
+ "fonts/type1/public/ascii-font/"
+ "source/fonts/ascii-font/"
+ "tex/latex/ascii-font/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0cbzvbszxyv552z1274m3bf5k40xr8w12da17db0w2w02y47nyq5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/ascii-font")
@@ -3671,18 +4448,23 @@ according to the IBM PC Code Page 437 C0 Graphics.")
(define-public texlive-ascmac
(package
(name "texlive-ascmac")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/ascmac/"
- "fonts/map/dvips/ascmac/"
- "fonts/source/public/ascmac/"
- "fonts/tfm/public/ascmac/"
- "fonts/type1/public/ascmac/"
- "source/latex/ascmac/"
- "tex/latex/ascmac/")
- (base32
- "1d388nqyjipqsgd0pd4zrskaf3wddacg6rrmy3q1n8pvmna4gmz1")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/ascmac/"
+ "fonts/map/dvips/ascmac/"
+ "fonts/source/public/ascmac/"
+ "fonts/tfm/public/ascmac/"
+ "fonts/type1/public/ascmac/"
+ "source/latex/ascmac/"
+ "tex/latex/ascmac/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1d388nqyjipqsgd0pd4zrskaf3wddacg6rrmy3q1n8pvmna4gmz1"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3697,13 +4479,18 @@ boxes and is thus driver independent.")
(define-public texlive-asmeconf
(package
(name "texlive-asmeconf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/asmeconf/" "doc/latex/asmeconf/"
- "tex/latex/asmeconf/")
- (base32
- "05wic7mb1flxdnl27lbhkjnbalnc8bqy4xj1w2rk5kzxmw525288")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/asmeconf/" "doc/latex/asmeconf/"
+ "tex/latex/asmeconf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sgpm9avf7s81xzq80ny0d0i2zvhgjz3iqnbx5xpwkrk82gi3qsv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asmeconf")
@@ -3721,13 +4508,18 @@ This LaTeX template is not a publication of ASME.")
(define-public texlive-asmejour
(package
(name "texlive-asmejour")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/asmejour/" "doc/latex/asmejour/"
- "tex/latex/asmejour/")
- (base32
- "09zncjbvdrqkr8g131mx0m73km4d270sn9782knl5qj6gxh98940")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/asmejour/" "doc/latex/asmejour/"
+ "tex/latex/asmejour/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13znp2mmizab1993f00f2pq3wg104z5vndnqgszbnia2yxr9g18f"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asmejour")
@@ -3745,17 +4537,22 @@ This package is not a publication of ASME.")
(define-public texlive-aspectratio
(package
(name "texlive-aspectratio")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aspectratio/"
- "fonts/map/dvips/aspectratio/"
- "fonts/source/public/aspectratio/"
- "fonts/tfm/public/aspectratio/"
- "fonts/type1/public/aspectratio/"
- "tex/latex/aspectratio/")
- (base32
- "1vm1aj4mm2rn2p032nakg16gmyzv43149h2v1l18dw72sayqqg2s")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aspectratio/"
+ "fonts/map/dvips/aspectratio/"
+ "fonts/source/public/aspectratio/"
+ "fonts/tfm/public/aspectratio/"
+ "fonts/type1/public/aspectratio/"
+ "tex/latex/aspectratio/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vm1aj4mm2rn2p032nakg16gmyzv43149h2v1l18dw72sayqqg2s"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3770,13 +4567,18 @@ and engineers. Note that the package supersedes the package @code{ar}.")
(define-public texlive-asternote
(package
(name "texlive-asternote")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/asternote/"
- "tex/latex/asternote/")
- (base32
- "1a53pmw237lm1yjx55qwq3fq6jq34vlw03w62vrq3ksw9346dg5r")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/asternote/"
+ "tex/latex/asternote/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1a53pmw237lm1yjx55qwq3fq6jq34vlw03w62vrq3ksw9346dg5r"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asternote")
@@ -3789,14 +4591,19 @@ brackets and marked with an asterisk.")
(define-public texlive-astro
(package
(name "texlive-astro")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/astro/"
- "fonts/source/public/astro/"
- "fonts/tfm/public/astro/")
- (base32
- "1pdmn93wiarwplha6r59ap9nvhdm9ir4aa4az93w3b189g316g2c")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/astro/"
+ "fonts/source/public/astro/"
+ "fonts/tfm/public/astro/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pdmn93wiarwplha6r59ap9nvhdm9ir4aa4az93w3b189g316g2c"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -3812,12 +4619,17 @@ source.")
(define-public texlive-asymptote-by-example-zh-cn
(package
(name "texlive-asymptote-by-example-zh-cn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/support/asymptote-by-example-zh-cn/")
- (base32
- "0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/support/asymptote-by-example-zh-cn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asymptote-by-example-zh-cn")
@@ -3829,12 +4641,17 @@ Chinese.")
(define-public texlive-asymptote-faq-zh-cn
(package
(name "texlive-asymptote-faq-zh-cn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/support/asymptote-faq-zh-cn/")
- (base32
- "0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/support/asymptote-faq-zh-cn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asymptote-faq-zh-cn")
@@ -3845,12 +4662,17 @@ Chinese.")
(define-public texlive-asymptote-manual-zh-cn
(package
(name "texlive-asymptote-manual-zh-cn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/support/asymptote-manual-zh-cn/")
- (base32
- "047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/support/asymptote-manual-zh-cn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/asymptote-manual-zh-cn")
@@ -3863,19 +4685,24 @@ manual.")
(define-public texlive-atkinson
(package
(name "texlive-atkinson")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/atkinson/"
- "fonts/enc/dvips/atkinson/"
- "fonts/map/dvips/atkinson/"
- "fonts/opentype/public/atkinson/"
- "fonts/tfm/public/atkinson/"
- "fonts/type1/public/atkinson/"
- "fonts/vf/public/atkinson/"
- "tex/latex/atkinson/")
- (base32
- "00wg21v7jiaw3qajdxp2jih5xjpv7h8d0n1d6zjnzkxzk0p8zcj0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/atkinson/"
+ "fonts/enc/dvips/atkinson/"
+ "fonts/map/dvips/atkinson/"
+ "fonts/opentype/public/atkinson/"
+ "fonts/tfm/public/atkinson/"
+ "fonts/type1/public/atkinson/"
+ "fonts/vf/public/atkinson/"
+ "tex/latex/atkinson/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00wg21v7jiaw3qajdxp2jih5xjpv7h8d0n1d6zjnzkxzk0p8zcj0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/atkinson")
@@ -3893,13 +4720,18 @@ increase character recognition, ultimately improving readability.")
(define-public texlive-aucklandthesis
(package
(name "texlive-aucklandthesis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aucklandthesis/"
- "tex/latex/aucklandthesis/")
- (base32
- "1bdm6crn17a0rrszx28r6bn8v9w6z4rwfz2r8avd5fc3byl5dix8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aucklandthesis/"
+ "tex/latex/aucklandthesis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1bdm6crn17a0rrszx28r6bn8v9w6z4rwfz2r8avd5fc3byl5dix8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aucklandthesis")
@@ -3914,18 +4746,23 @@ diplomas.")
(define-public texlive-augie
(package
(name "texlive-augie")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/augie/"
- "fonts/afm/public/augie/"
- "fonts/map/dvips/augie/"
- "fonts/tfm/public/augie/"
- "fonts/type1/public/augie/"
- "fonts/vf/public/augie/"
- "tex/latex/augie/")
- (base32
- "1fvl04lcvi4vsx547gx349dbld4hf7k2j08adqlnszs23p95yj3f")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/augie/"
+ "fonts/afm/public/augie/"
+ "fonts/map/dvips/augie/"
+ "fonts/tfm/public/augie/"
+ "fonts/type1/public/augie/"
+ "fonts/vf/public/augie/"
+ "tex/latex/augie/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fvl04lcvi4vsx547gx349dbld4hf7k2j08adqlnszs23p95yj3f"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/augie")
@@ -3938,18 +4775,23 @@ informal handwriting. The font is distributed in Adobe Type 1 format.")
(define-public texlive-auncial-new
(package
(name "texlive-auncial-new")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/auncial-new/"
- "fonts/afm/public/auncial-new/"
- "fonts/map/dvips/auncial-new/"
- "fonts/tfm/public/auncial-new/"
- "fonts/type1/public/auncial-new/"
- "source/fonts/auncial-new/"
- "tex/latex/auncial-new/")
- (base32
- "1644ank81l1qlijmld88k1qq3qk4x6an0qvyqz1da2dgwdhjap00")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/auncial-new/"
+ "fonts/afm/public/auncial-new/"
+ "fonts/map/dvips/auncial-new/"
+ "fonts/tfm/public/auncial-new/"
+ "fonts/type1/public/auncial-new/"
+ "source/fonts/auncial-new/"
+ "tex/latex/auncial-new/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1644ank81l1qlijmld88k1qq3qk4x6an0qvyqz1da2dgwdhjap00"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/auncial-new")
@@ -3965,18 +4807,23 @@ provided, and the font is distributed in Adobe Type 1 format.")
(define-public texlive-aurical
(package
(name "texlive-aurical")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/aurical/"
- "fonts/afm/public/aurical/"
- "fonts/map/dvips/aurical/"
- "fonts/source/public/aurical/"
- "fonts/tfm/public/aurical/"
- "fonts/type1/public/aurical/"
- "tex/latex/aurical/")
- (base32
- "1jaqr4gdywnjn7hclinjyydndxsa1f2j7382ygl0jnj35kxz0pkr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/aurical/"
+ "fonts/afm/public/aurical/"
+ "fonts/map/dvips/aurical/"
+ "fonts/source/public/aurical/"
+ "fonts/tfm/public/aurical/"
+ "fonts/type1/public/aurical/"
+ "tex/latex/aurical/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jaqr4gdywnjn7hclinjyydndxsa1f2j7382ygl0jnj35kxz0pkr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/aurical")
@@ -3993,14 +4840,19 @@ Svatba offers a long @samp{s}.")
(define-public texlive-authordate
(package
(name "texlive-authordate")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/authordate/"
- "doc/bibtex/authordate/"
- "tex/latex/authordate/")
- (base32
- "0d3cd63b80vfd8vzbpn6dnhy47fpq5rxm95i52id2j6606gi1skf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/authordate/"
+ "doc/bibtex/authordate/"
+ "tex/latex/authordate/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d3cd63b80vfd8vzbpn6dnhy47fpq5rxm95i52id2j6606gi1skf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/authordate")
@@ -4015,14 +4867,19 @@ necessary for the LaTeX package to work.")
(define-public texlive-auto-pst-pdf
(package
(name "texlive-auto-pst-pdf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/auto-pst-pdf/"
- "source/latex/auto-pst-pdf/"
- "tex/latex/auto-pst-pdf/")
- (base32
- "1lpjwqd0rhdzz3kywl54pjlpj1qsj7kflj0336vj2zb20rxl0hqp")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/auto-pst-pdf/"
+ "source/latex/auto-pst-pdf/"
+ "tex/latex/auto-pst-pdf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lpjwqd0rhdzz3kywl54pjlpj1qsj7kflj0336vj2zb20rxl0hqp"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(propagated-inputs (list texlive-ifplatform texlive-iftex texlive-xkeyval))
@@ -4038,13 +4895,18 @@ PSfrag figures can all be input consistently and easily.")
(define-public texlive-autoaligne
(package
(name "texlive-autoaligne")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/autoaligne/"
- "tex/generic/autoaligne/")
- (base32
- "138d030zgzpdwqxx55gjw35y0c3v794fpa3c6znc9kv1vj8cs9d3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/autoaligne/"
+ "tex/generic/autoaligne/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "138d030zgzpdwqxx55gjw35y0c3v794fpa3c6znc9kv1vj8cs9d3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/autoaligne")
@@ -4057,14 +4919,19 @@ math expressions.")
(define-public texlive-autobreak
(package
(name "texlive-autobreak")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/autobreak/"
- "source/latex/autobreak/"
- "tex/latex/autobreak/")
- (base32
- "1xw4m1wyv17xi6yjfcamb1gjdwzbhrjjdpyc8fydq1qbki1yvv1k")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/autobreak/"
+ "source/latex/autobreak/"
+ "tex/latex/autobreak/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xw4m1wyv17xi6yjfcamb1gjdwzbhrjjdpyc8fydq1qbki1yvv1k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/autobreak")
@@ -4080,18 +4947,24 @@ computer-generated long formulae with many terms.")
(define-public texlive-autosp
(package
(name "texlive-autosp")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/autosp/"
- "doc/man/man1/autosp.1"
- "doc/man/man1/autosp.man1.pdf"
- "doc/man/man1/tex2aspc.1"
- "doc/man/man1/tex2aspc.man1.pdf")
- (base32
- "16szmbffp9pwzv7zq3l4yvnsfk4m7w57wib7pqpgv1v5fzhlaahs")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/autosp/"
+ "doc/man/man1/autosp.1"
+ "doc/man/man1/autosp.man1.pdf"
+ "doc/man/man1/tex2aspc.1"
+ "doc/man/man1/tex2aspc.man1.pdf"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1n9vpb0cmi0b9gbi3f70zafvhj9znvfhd9614xcn49jwss2bwdk9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
+ (propagated-inputs (list texlive-autosp-bin))
(home-page "https://ctan.org/pkg/autosp")
(synopsis
"Preprocessor generating note-spacing commands for MusiXTeX scores")
@@ -4105,48 +4978,73 @@ concern for note-spacing changes within the part or spacing requirements of
other parts.")
(license license:gpl2+)))
+(define-public texlive-autosp-bin
+ (package
+ (inherit texlive-bin)
+ (name "texlive-autosp-bin")
+ (source
+ (origin
+ (inherit (package-source texlive-source))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ #~(let ((delete-other-directories
+ (lambda (root dirs)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (file)
+ (and (not (member file (append '("." "..") dirs)))
+ (eq? 'directory (stat:type (stat file)))))))))))
+ (delete-other-directories "libs" '())
+ (delete-other-directories "utils" '("autosp"))
+ (delete-other-directories "texk" '())))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments texlive-bin)
+ ((#:configure-flags flags)
+ #~(cons "--enable-autosp" (delete "--enable-web2c" #$flags)))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "utils/autosp"
+ (invoke "make" "check")))))
+ (replace 'install
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (with-directory-excursion "utils/autosp"
+ (invoke "make" "install"))))))))
+ (native-inputs '())
+ (inputs '())
+ (propagated-inputs '())
+ (home-page (package-home-page texlive-autosp))
+ (synopsis "Binaries for @code{texlive-autosp}")
+ (description
+ "This package provides binaries for @code{texlive-autosp}.")
+ (license (package-license texlive-autosp))))
+
(define-public texlive-axodraw2
(package
(name "texlive-axodraw2")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/axodraw2/"
- "doc/man/man1/axohelp.1"
- "doc/man/man1/axohelp.man1.pdf"
- "source/latex/axodraw2/"
- "tex/latex/axodraw2/")
- (base32
- "0x1cskdm3kmf08gdrvgasd1b3l0dri9mdmk13880dz4g2rdgbvi2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/axodraw2/"
+ "doc/man/man1/axohelp.1"
+ "doc/man/man1/axohelp.man1.pdf"
+ "source/latex/axodraw2/"
+ "tex/latex/axodraw2/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0x1cskdm3kmf08gdrvgasd1b3l0dri9mdmk13880dz4g2rdgbvi2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
- (arguments
- (list
- #:tests? #true
- #:phases
- #~(modify-phases %standard-phases
- ;; TODO: Since we're building "axohelp" from source here, it can be
- ;; removed from `texlive-bin' (world rebuild).
- (add-after 'unpack 'build-axohelp
- (lambda* (#:key tests? #:allow-other-keys)
- (with-directory-excursion "source/latex/axodraw2"
- ;; Autoreconf.
- (invoke "autoreconf" "-vfi")
- ;; Configure.
- (let ((sh (which "sh")))
- (setenv "CONFIG_SHELL" sh)
- (setenv "SHELL" sh)
- (invoke sh "configure" (string-append "--prefix=" #$output)))
- ;; Build.
- (invoke "make")
- ;; Tests.
- (when tests?
- (patch-shebang "axohelp.test") ;Bash script
- (invoke "make" "check"))
- ;; Install.
- (invoke "make" "install")))))))
- (native-inputs (list autoconf automake pkg-config))
- (inputs (list openlibm))
+ (propagated-inputs (list texlive-axodraw2-bin))
(home-page "https://ctan.org/pkg/axodraw2")
(synopsis "Feynman diagrams in a LaTeX document")
(description
@@ -4164,18 +5062,70 @@ the pdf code inserted in the output file. The processing involves a run of
@command{pdflatex}.")
(license license:gpl3+)))
+(define-public texlive-axodraw2-bin
+ (package
+ (inherit texlive-bin)
+ (name "texlive-axodraw2-bin")
+ (source
+ (origin
+ (inherit (package-source texlive-source))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ #~(let ((delete-other-directories
+ (lambda (root keep)
+ (with-directory-excursion root
+ (for-each
+ delete-file-recursively
+ (scandir
+ "."
+ (lambda (file)
+ (and (not (member file (append keep '("." ".."))))
+ (eq? 'directory (stat:type (stat file)))))))))))
+ (delete-other-directories "libs" '())
+ (delete-other-directories "utils" '("axodraw2"))
+ (delete-other-directories "texk" '())))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments texlive-bin)
+ ((#:configure-flags flags)
+ #~(cons "--enable-axodraw2" (delete "--enable-web2c" #$flags)))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "utils/axodraw2"
+ (invoke "make" "check")))))
+ (replace 'install
+ (lambda _
+ (with-directory-excursion "utils/axodraw2"
+ (invoke "make" "install"))))))))
+ (native-inputs '())
+ (inputs '())
+ (propagated-inputs '())
+ (home-page (package-home-page texlive-axodraw2))
+ (synopsis "Binary for @code{texlive-axodraw2}")
+ (description
+ "This package provides the binary for @code{texlive-axodraw2}.")
+ (license (package-license texlive-axodraw2))))
+
(define-public texlive-b1encoding
(package
(name "texlive-b1encoding")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/b1encoding/"
- "fonts/enc/dvips/b1encoding/"
- "source/latex/b1encoding/"
- "tex/latex/b1encoding/")
- (base32
- "1lzsa0k5rr0n50d31dh4ghww329qjpg39w843zmh05z0jir6rg79")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/b1encoding/"
+ "fonts/enc/dvips/b1encoding/"
+ "source/latex/b1encoding/"
+ "tex/latex/b1encoding/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lzsa0k5rr0n50d31dh4ghww329qjpg39w843zmh05z0jir6rg79"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/b1encoding")
@@ -4188,14 +5138,19 @@ with LaTeX when typesetting things using his Bookhands fonts.")
(define-public texlive-backnaur
(package
(name "texlive-backnaur")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/backnaur/"
- "source/latex/backnaur/"
- "tex/latex/backnaur/")
- (base32
- "168ng265vdl74l9c2jmp34ba6ir5i6c1jb7jpyzc31g9snqmyr09")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/backnaur/"
+ "source/latex/backnaur/"
+ "tex/latex/backnaur/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "168ng265vdl74l9c2jmp34ba6ir5i6c1jb7jpyzc31g9snqmyr09"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/backnaur")
@@ -4209,13 +5164,18 @@ in-line BNF expressions using math mode.")
(define-public texlive-baekmuk
(package
(name "texlive-baekmuk")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/baekmuk/"
- "fonts/truetype/public/baekmuk/")
- (base32
- "0nc6sfjbimh1g8zhcl58ag6kqskhwd3h0m68y7k2v3v5i9n5g5yr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/baekmuk/"
+ "fonts/truetype/public/baekmuk/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0nc6sfjbimh1g8zhcl58ag6kqskhwd3h0m68y7k2v3v5i9n5g5yr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/baekmuk")
@@ -4229,13 +5189,18 @@ in-line BNF expressions using math mode.")
(define-public texlive-bagpipe
(package
(name "texlive-bagpipe")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/bagpipe/"
- "tex/generic/bagpipe/")
- (base32
- "0zybnikkj00hmlzfaaljcq1ml5vi6qfhl1hfrjq9vjc409vzzvka")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/bagpipe/"
+ "tex/generic/bagpipe/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zybnikkj00hmlzfaaljcq1ml5vi6qfhl1hfrjq9vjc409vzzvka"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bagpipe")
@@ -4248,14 +5213,19 @@ package provides specialized and re-defined macros to simplify this task.")
(define-public texlive-bangla
(package
(name "texlive-bangla")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bangla/"
- "fonts/truetype/public/bangla/"
- "tex/latex/bangla/")
- (base32
- "0basibrsbns9s2ny6ny95hl6dj4rjf6q4z9bqn2kc9945akxg8af")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bangla/"
+ "fonts/truetype/public/bangla/"
+ "tex/latex/bangla/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0basibrsbns9s2ny6ny95hl6dj4rjf6q4z9bqn2kc9945akxg8af"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(propagated-inputs (list texlive-charissil texlive-doulossil))
@@ -4269,14 +5239,19 @@ language and comes with some fonts of its own.")
(define-public texlive-bangorcsthesis
(package
(name "texlive-bangorcsthesis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bangorcsthesis/"
- "source/latex/bangorcsthesis/"
- "tex/latex/bangorcsthesis/")
- (base32
- "138h5q8060z7frb6krrzcx49pd0ifqh1lizi465gs6x7q7cdagz8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bangorcsthesis/"
+ "source/latex/bangorcsthesis/"
+ "tex/latex/bangorcsthesis/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "138h5q8060z7frb6krrzcx49pd0ifqh1lizi465gs6x7q7cdagz8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bangorcsthesis")
@@ -4290,14 +5265,19 @@ also provides macros designed to optimise the process of producing a thesis.")
(define-public texlive-bangorexam
(package
(name "texlive-bangorexam")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bangorexam/"
- "source/latex/bangorexam/"
- "tex/latex/bangorexam/")
- (base32
- "09pp88415mba65icf6cx4vqn3an54hrgkd8s677ndlf2ml7n0lhs")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bangorexam/"
+ "source/latex/bangorexam/"
+ "tex/latex/bangorexam/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09pp88415mba65icf6cx4vqn3an54hrgkd8s677ndlf2ml7n0lhs"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bangorexam")
@@ -4311,15 +5291,20 @@ styles. Marks are totalled and checked automatically.")
(define-public texlive-bangtex
(package
(name "texlive-bangtex")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bangtex/"
- "fonts/source/public/bangtex/"
- "fonts/tfm/public/bangtex/"
- "tex/latex/bangtex/")
- (base32
- "1hmv27wpnwv70gipvfvxs1rwfjqbcy0lgn09hs2ah6ayqgr740im")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bangtex/"
+ "fonts/source/public/bangtex/"
+ "fonts/tfm/public/bangtex/"
+ "tex/latex/bangtex/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hmv27wpnwv70gipvfvxs1rwfjqbcy0lgn09hs2ah6ayqgr740im"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -4333,12 +5318,17 @@ and Metafont sources for fonts.")
(define-public texlive-barr
(package
(name "texlive-barr")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/barr/" "tex/generic/barr/")
- (base32
- "1l532g0nxigbllv2lf74bwx78sf4jsfr1cad0hpq7i7kq820wbii")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/barr/" "tex/generic/barr/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1l532g0nxigbllv2lf74bwx78sf4jsfr1cad0hpq7i7kq820wbii"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/diagxy")
@@ -4351,14 +5341,19 @@ of mathematical disciplines.")
(define-public texlive-bartel-chess-fonts
(package
(name "texlive-bartel-chess-fonts")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bartel-chess-fonts/"
- "fonts/source/public/bartel-chess-fonts/"
- "fonts/tfm/public/bartel-chess-fonts/")
- (base32
- "1gg7g2gb5j0g0ig4190260zlpnyfmdzcqn7dsw5kp9p5pbn5hbhf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bartel-chess-fonts/"
+ "fonts/source/public/bartel-chess-fonts/"
+ "fonts/tfm/public/bartel-chess-fonts/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gg7g2gb5j0g0ig4190260zlpnyfmdzcqn7dsw5kp9p5pbn5hbhf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
;; FIXME: Font metrics generation fails with "! Strange path (turning
@@ -4376,20 +5371,25 @@ of mathematical disciplines.")
(define-public texlive-baskervald
(package
(name "texlive-baskervald")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/baskervald/"
- "fonts/afm/arkandis/baskervald/"
- "fonts/enc/dvips/baskervald/"
- "fonts/map/dvips/baskervald/"
- "fonts/tfm/arkandis/baskervald/"
- "fonts/type1/arkandis/baskervald/"
- "fonts/vf/arkandis/baskervald/"
- "source/fonts/baskervald/"
- "tex/latex/baskervald/")
- (base32
- "1alny6nsxm43mn84w16vp2whlhnmqkr7pfx8jsmgkz8bkxzh9pg9")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/baskervald/"
+ "fonts/afm/arkandis/baskervald/"
+ "fonts/enc/dvips/baskervald/"
+ "fonts/map/dvips/baskervald/"
+ "fonts/tfm/arkandis/baskervald/"
+ "fonts/type1/arkandis/baskervald/"
+ "fonts/vf/arkandis/baskervald/"
+ "source/fonts/baskervald/"
+ "tex/latex/baskervald/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1alny6nsxm43mn84w16vp2whlhnmqkr7pfx8jsmgkz8bkxzh9pg9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/baskervaldadf")
@@ -4404,20 +5404,25 @@ fonts include the slashed zero and additional non-standard ligatures.")
(define-public texlive-baskervaldx
(package
(name "texlive-baskervaldx")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/baskervaldx/"
- "fonts/afm/public/baskervaldx/"
- "fonts/enc/dvips/baskervaldx/"
- "fonts/map/dvips/baskervaldx/"
- "fonts/opentype/public/baskervaldx/"
- "fonts/tfm/public/baskervaldx/"
- "fonts/type1/public/baskervaldx/"
- "fonts/vf/public/baskervaldx/"
- "tex/latex/baskervaldx/")
- (base32
- "1qszqzpy9bdqajd1h7cha0xm0kgy21q9yzsrrgwygchkz9zv6r66")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/baskervaldx/"
+ "fonts/afm/public/baskervaldx/"
+ "fonts/enc/dvips/baskervaldx/"
+ "fonts/map/dvips/baskervaldx/"
+ "fonts/opentype/public/baskervaldx/"
+ "fonts/tfm/public/baskervaldx/"
+ "fonts/type1/public/baskervaldx/"
+ "fonts/vf/public/baskervaldx/"
+ "tex/latex/baskervaldx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1h3959cxlbjxyw4kf4j3rpjar389kfq1kn9wq89xaifhvcmvll1a"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/baskervaldx")
@@ -4432,19 +5437,24 @@ support files.")
(define-public texlive-baskervillef
(package
(name "texlive-baskervillef")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/baskervillef/"
- "fonts/enc/dvips/baskervillef/"
- "fonts/map/dvips/baskervillef/"
- "fonts/opentype/public/baskervillef/"
- "fonts/tfm/public/baskervillef/"
- "fonts/type1/public/baskervillef/"
- "fonts/vf/public/baskervillef/"
- "tex/latex/baskervillef/")
- (base32
- "107lqn684kgr7fk3zh1lgi6q7hqz9gs18kkg3fbbrg9qjva1j4xv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/baskervillef/"
+ "fonts/enc/dvips/baskervillef/"
+ "fonts/map/dvips/baskervillef/"
+ "fonts/opentype/public/baskervillef/"
+ "fonts/tfm/public/baskervillef/"
+ "fonts/type1/public/baskervillef/"
+ "fonts/vf/public/baskervillef/"
+ "tex/latex/baskervillef/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "107lqn684kgr7fk3zh1lgi6q7hqz9gs18kkg3fbbrg9qjva1j4xv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/baskervillef")
@@ -4460,14 +5470,19 @@ an option to @code{newtxmath}.")
(define-public texlive-basque-book
(package
(name "texlive-basque-book")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/basque-book/"
- "source/latex/basque-book/"
- "tex/latex/basque-book/")
- (base32
- "16jgn4pxqbmq2dx5gfyy4p04ykaijkjyy9banp3l3a6ykm2xn8w7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/basque-book/"
+ "source/latex/basque-book/"
+ "tex/latex/basque-book/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16jgn4pxqbmq2dx5gfyy4p04ykaijkjyy9banp3l3a6ykm2xn8w7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/basque-book")
@@ -4482,14 +5497,19 @@ Theses, etc., in Basque.")
(define-public texlive-basque-date
(package
(name "texlive-basque-date")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/basque-date/"
- "source/latex/basque-date/"
- "tex/latex/basque-date/")
- (base32
- "0n1nc2nrwl3ajk1n7xbnf49mvg8dlqlyndsyywgs46dnv55b7gs5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/basque-date/"
+ "source/latex/basque-date/"
+ "tex/latex/basque-date/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0n1nc2nrwl3ajk1n7xbnf49mvg8dlqlyndsyywgs46dnv55b7gs5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/basque-date")
@@ -4504,14 +5524,19 @@ issues of numbers in Basque.")
(define-public texlive-bath-bst
(package
(name "texlive-bath-bst")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bath-bst/"
- "doc/bibtex/bath-bst/"
- "source/bibtex/bath-bst/")
- (base32
- "06v5icy6537d69g5in7ps322wgnkf0imd93gnmh2y7fladsmvp06")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bath-bst/"
+ "doc/bibtex/bath-bst/"
+ "source/bibtex/bath-bst/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06v5icy6537d69g5in7ps322wgnkf0imd93gnmh2y7fladsmvp06"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bath-bst")
@@ -4526,15 +5551,20 @@ used in conjunction with @code{natbib} for citations.")
(define-public texlive-bbding
(package
(name "texlive-bbding")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bbding/"
- "fonts/source/public/bbding/"
- "fonts/tfm/public/bbding/"
- "source/latex/bbding/" "tex/latex/bbding/")
- (base32
- "0l507nxnnh880h5kg8q0ww6sl93k441l0lsplr5ldrngxvx1vrsc")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bbding/"
+ "fonts/source/public/bbding/"
+ "fonts/tfm/public/bbding/"
+ "source/latex/bbding/" "tex/latex/bbding/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0l507nxnnh880h5kg8q0ww6sl93k441l0lsplr5ldrngxvx1vrsc"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -4550,15 +5580,20 @@ available in the @code{niceframe} fonts bundle.")
(define-public texlive-bbold-type1
(package
(name "texlive-bbold-type1")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bbold-type1/"
- "fonts/afm/public/bbold-type1/"
- "fonts/map/dvips/bbold-type1/"
- "fonts/type1/public/bbold-type1/")
- (base32
- "1flccfh58w977j9w62mcn7xzspmg68gb6h5nwh2mfbz7l0015fsz")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bbold-type1/"
+ "fonts/afm/public/bbold-type1/"
+ "fonts/map/dvips/bbold-type1/"
+ "fonts/type1/public/bbold-type1/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1flccfh58w977j9w62mcn7xzspmg68gb6h5nwh2mfbz7l0015fsz"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bbold-type1")
@@ -4573,18 +5608,23 @@ versions of the @code{bbold} fonts.")
(define-public texlive-bboldx
(package
(name "texlive-bboldx")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bboldx/"
- "fonts/afm/public/bboldx/"
- "fonts/enc/dvips/bboldx/"
- "fonts/map/dvips/bboldx/"
- "fonts/tfm/public/bboldx/"
- "fonts/type1/public/bboldx/"
- "tex/latex/bboldx/")
- (base32
- "1r4s3yyah0iqwhzss52wjv3wml5r4bywp3fbanjzkv16f2pk51yb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bboldx/"
+ "fonts/afm/public/bboldx/"
+ "fonts/enc/dvips/bboldx/"
+ "fonts/map/dvips/bboldx/"
+ "fonts/tfm/public/bboldx/"
+ "fonts/type1/public/bboldx/"
+ "tex/latex/bboldx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1r4s3yyah0iqwhzss52wjv3wml5r4bywp3fbanjzkv16f2pk51yb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bboldx")
@@ -4600,13 +5640,18 @@ bold.")
(define-public texlive-bclogo
(package
(name "texlive-bclogo")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bclogo/" "metapost/bclogo/"
- "tex/latex/bclogo/")
- (base32
- "1hdg99xkmdca23s7i63099r9jvgw2larv8aawjllj9mw18195jr9")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bclogo/" "metapost/bclogo/"
+ "tex/latex/bclogo/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "087d4cgv42vf8hh1d5n09zjbd0rl7rs961gzqmp1ha8n8fymadi2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bclogo")
@@ -4619,13 +5664,18 @@ It may use either TikZ or PSTricks as graphics engine.")
(define-public texlive-beamer-fuberlin
(package
(name "texlive-beamer-fuberlin")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/beamer-fuberlin/"
- "tex/latex/beamer-fuberlin/")
- (base32
- "03zp6gpzilcfgrbz1lh8lpldvkf9g98f45fhsb72ikgjnka6211c")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/beamer-fuberlin/"
+ "tex/latex/beamer-fuberlin/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "03zp6gpzilcfgrbz1lh8lpldvkf9g98f45fhsb72ikgjnka6211c"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/beamer-fuberlin")
@@ -4640,13 +5690,18 @@ class itself (FUbeamer) or use the theme in the usual way with
(define-public texlive-beamer-verona
(package
(name "texlive-beamer-verona")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/beamer-verona/"
- "tex/latex/beamer-verona/")
- (base32
- "0q79bdsc98a3y5h0yb3qwpsd0yyfyaxfjfhn4xkxf2qzyfp1mgd5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/beamer-verona/"
+ "tex/latex/beamer-verona/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q79bdsc98a3y5h0yb3qwpsd0yyfyaxfjfhn4xkxf2qzyfp1mgd5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/beamer-verona")
@@ -4658,12 +5713,17 @@ class itself (FUbeamer) or use the theme in the usual way with
(define-public texlive-beebe
(package
(name "texlive-beebe")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bib/beebe/" "tex/generic/beebe/")
- (base32
- "060v67ma1r6n9fmg4v4zl2pgxz6gmd4qrazyss9hwq6z4206pqc0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bib/beebe/" "tex/generic/beebe/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1w6n6112mq82gz8mmyfjs1wgqfpy1dln2s49r8dmxzqjakws1486"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblio")
(synopsis "Collection of bibliographies")
@@ -4676,14 +5736,19 @@ includes a LaTeX wrapper file to typeset the bibliography.")
(define-public texlive-begingreek
(package
(name "texlive-begingreek")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/begingreek/"
- "source/latex/begingreek/"
- "tex/latex/begingreek/")
- (base32
- "1amzzc96pqxjicrgl4fnl2j7b65vvpxl32ckl308nbwfhd56fz6l")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/begingreek/"
+ "source/latex/begingreek/"
+ "tex/latex/begingreek/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1amzzc96pqxjicrgl4fnl2j7b65vvpxl32ckl308nbwfhd56fz6l"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/begingreek")
@@ -4698,15 +5763,20 @@ texts.")
(define-public texlive-beilstein
(package
(name "texlive-beilstein")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/beilstein/"
- "doc/latex/beilstein/"
- "source/latex/beilstein/"
- "tex/latex/beilstein/")
- (base32
- "0gr4fb0g3449jx6mbwfl2g00anss6xbj9xiak83hkc7797jzmg2b")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/beilstein/"
+ "doc/latex/beilstein/"
+ "source/latex/beilstein/"
+ "tex/latex/beilstein/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0gr4fb0g3449jx6mbwfl2g00anss6xbj9xiak83hkc7797jzmg2b"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/beilstein")
@@ -4721,16 +5791,21 @@ of Nanotechnology}.")
(define-public texlive-belleek
(package
(name "texlive-belleek")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/belleek/"
- "fonts/map/dvips/belleek/"
- "fonts/truetype/public/belleek/"
- "fonts/type1/public/belleek/"
- "source/latex/belleek/")
- (base32
- "12jigkk2xlnfllwaj6qsisgvl5b2kcwnv5j921cvm7gjn9x1i941")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/belleek/"
+ "fonts/map/dvips/belleek/"
+ "fonts/truetype/public/belleek/"
+ "fonts/type1/public/belleek/"
+ "source/latex/belleek/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12jigkk2xlnfllwaj6qsisgvl5b2kcwnv5j921cvm7gjn9x1i941"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/belleek")
@@ -4741,12 +5816,17 @@ of Nanotechnology}.")
(define-public texlive-begriff
(package
(name "texlive-begriff")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/begriff/" "tex/latex/begriff/")
- (base32
- "0vi7i35fqi32y26crk5aj93mivix61ppgmpz0djshizwrd9pn9xy")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/begriff/" "tex/latex/begriff/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0vi7i35fqi32y26crk5aj93mivix61ppgmpz0djshizwrd9pn9xy"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/begriff")
@@ -4759,15 +5839,20 @@ of Nanotechnology}.")
(define-public texlive-bengali
(package
(name "texlive-bengali")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bengali/"
- "fonts/source/public/bengali/"
- "fonts/tfm/public/bengali/"
- "source/latex/bengali/" "tex/latex/bengali/")
- (base32
- "077rs7rcx592g5m53hy73w6jd39qgb83z5sg2jbymjfwkk7y593h")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bengali/"
+ "fonts/source/public/bengali/"
+ "fonts/tfm/public/bengali/"
+ "source/latex/bengali/" "tex/latex/bengali/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "077rs7rcx592g5m53hy73w6jd39qgb83z5sg2jbymjfwkk7y593h"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -4782,19 +5867,24 @@ supports Assamese.")
(define-public texlive-berenisadf
(package
(name "texlive-berenisadf")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/berenisadf/"
- "fonts/afm/arkandis/berenisadf/"
- "fonts/enc/dvips/berenisadf/"
- "fonts/map/dvips/berenisadf/"
- "fonts/opentype/arkandis/berenisadf/"
- "fonts/tfm/arkandis/berenisadf/"
- "fonts/type1/arkandis/berenisadf/"
- "tex/latex/berenisadf/")
- (base32
- "11daizsls1zhwdfy78s2rjk76zwkziv33xrvrqbxybs2hdbg261d")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/berenisadf/"
+ "fonts/afm/arkandis/berenisadf/"
+ "fonts/enc/dvips/berenisadf/"
+ "fonts/map/dvips/berenisadf/"
+ "fonts/opentype/arkandis/berenisadf/"
+ "fonts/tfm/arkandis/berenisadf/"
+ "fonts/type1/arkandis/berenisadf/"
+ "tex/latex/berenisadf/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "11daizsls1zhwdfy78s2rjk76zwkziv33xrvrqbxybs2hdbg261d"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/berenisadf")
@@ -4810,13 +5900,18 @@ TeXnANSI (LY1) and LaTeX standard T1 and TS1 encodings.")
(define-public texlive-besjournals
(package
(name "texlive-besjournals")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/besjournals/"
- "doc/bibtex/besjournals/")
- (base32
- "1mcc5xa56j17h6wv9b111qypw6ff4mg0skapa4wq79lb8p3l1cmv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/besjournals/"
+ "doc/bibtex/besjournals/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mcc5xa56j17h6wv9b111qypw6ff4mg0skapa4wq79lb8p3l1cmv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/besjournals-bst")
@@ -4831,13 +5926,18 @@ Society, and has no formal approval by the BES.")
(define-public texlive-bestpapers
(package
(name "texlive-bestpapers")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bestpapers/"
- "doc/bibtex/bestpapers/")
- (base32
- "0c0lp51z5z2707r1hig993gbx78v7zb84wmk3z9iyw08m3bbq34s")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bestpapers/"
+ "doc/bibtex/bestpapers/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0c0lp51z5z2707r1hig993gbx78v7zb84wmk3z9iyw08m3bbq34s"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bestpapers")
@@ -4856,13 +5956,18 @@ and then let the computer select the papers with highest scores.")
(define-public texlive-betababel
(package
(name "texlive-betababel")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/betababel/"
- "tex/latex/betababel/")
- (base32
- "1lck0wighndd3qrhcks6amc6gm5y50f6a61nfcz31j087r3a7liv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/betababel/"
+ "tex/latex/betababel/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lck0wighndd3qrhcks6amc6gm5y50f6a61nfcz31j087r3a7liv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/betababel")
@@ -4877,18 +5982,23 @@ transliteration.")
(define-public texlive-beuron
(package
(name "texlive-beuron")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/beuron/"
- "fonts/map/dvips/beuron/"
- "fonts/opentype/public/beuron/"
- "fonts/source/public/beuron/"
- "fonts/tfm/public/beuron/"
- "fonts/type1/public/beuron/"
- "tex/latex/beuron/")
- (base32
- "06hk60z0s2rdbj1iard10zxw7zvvm2xds755r4mqh0p70qhkpjzx")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/beuron/"
+ "fonts/map/dvips/beuron/"
+ "fonts/opentype/public/beuron/"
+ "fonts/source/public/beuron/"
+ "fonts/tfm/public/beuron/"
+ "fonts/type1/public/beuron/"
+ "tex/latex/beuron/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06hk60z0s2rdbj1iard10zxw7zvvm2xds755r4mqh0p70qhkpjzx"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -4905,14 +6015,45 @@ selection commands for use with LaTeX.")
(define-public texlive-bfh-ci
(package
(name "texlive-bfh-ci")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bfh-ci/" "tex/latex/bfh-ci/")
- (base32
- "198r2xwki70hij36l596p9jldpzc1acna97mlszbbim2w6xj3qy8")))
- (outputs '("out" "doc"))
- (build-system texlive-build-system)
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bfh-ci/" "tex/latex/bfh-ci/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "175mb10mcj7yq3ncg2bgm1c9i7rgkmrwbfbw3vdm9m7z526k9g34"))))
+ (outputs '("out" "doc"))
+ (build-system texlive-build-system)
+ (propagated-inputs (list texlive-adjustbox
+ texlive-amsfonts
+ texlive-amsmath
+ texlive-anyfontsize
+ texlive-beamer
+ texlive-fontawesome
+ texlive-fontspec
+ texlive-geometry
+ texlive-graphics
+ texlive-handoutwithnotes
+ texlive-hyperref
+ texlive-iftex
+ texlive-koma-script
+ texlive-l3kernel
+ texlive-l3packages
+ texlive-listings
+ texlive-nunito
+ texlive-pgf
+ texlive-qrcode
+ texlive-sourceserifpro
+ texlive-tcolorbox
+ texlive-tools
+ texlive-translations
+ texlive-url
+ texlive-xcolor
+ texlive-zref))
(home-page "https://ctan.org/pkg/bfh-ci")
(synopsis "Corporate design for Bern University of Applied Sciences")
(description
@@ -4924,16 +6065,21 @@ classes as well as some helper packages and config files.")
(define-public texlive-bgteubner
(package
(name "texlive-bgteubner")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bgteubner/"
- "doc/latex/bgteubner/"
- "makeindex/bgteubner/"
- "source/latex/bgteubner/"
- "tex/latex/bgteubner/")
- (base32
- "1plc42glcq2pxyns6lm6fygicjm8whrls1qlfw00fccsw9v1hgxv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bgteubner/"
+ "doc/latex/bgteubner/"
+ "makeindex/bgteubner/"
+ "source/latex/bgteubner/"
+ "tex/latex/bgteubner/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1plc42glcq2pxyns6lm6fygicjm8whrls1qlfw00fccsw9v1hgxv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -4962,18 +6108,23 @@ the user.")
(define-public texlive-bguq
(package
(name "texlive-bguq")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bguq/"
- "fonts/map/dvips/bguq/"
- "fonts/source/public/bguq/"
- "fonts/tfm/public/bguq/"
- "fonts/type1/public/bguq/"
- "source/fonts/bguq/"
- "tex/latex/bguq/")
- (base32
- "0d87ihzwq3lxhr28yaj1wpkvl4jgcfw8859g9mamrprkm7klm2rb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bguq/"
+ "fonts/map/dvips/bguq/"
+ "fonts/source/public/bguq/"
+ "fonts/tfm/public/bguq/"
+ "fonts/type1/public/bguq/"
+ "source/fonts/bguq/"
+ "tex/latex/bguq/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d87ihzwq3lxhr28yaj1wpkvl4jgcfw8859g9mamrprkm7klm2rb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-metafont))
@@ -4989,12 +6140,17 @@ will be used by other packages which implement the Begriffsschrift.")
(define-public texlive-bib-fr
(package
(name "texlive-bib-fr")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bib-fr/" "doc/bibtex/bib-fr/")
- (base32
- "11af1p52vr16l5gf69ql2zz0328yqd75nbcvik7b0g05pbqc12nv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bib-fr/" "doc/bibtex/bib-fr/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "11af1p52vr16l5gf69ql2zz0328yqd75nbcvik7b0g05pbqc12nv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bib-fr")
@@ -5007,18 +6163,23 @@ files.")
(define-public texlive-bib2gls
(package
(name "texlive-bib2gls")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/man/man1/bib2gls.1"
- "doc/man/man1/bib2gls.man1.pdf"
- "doc/man/man1/convertgls2bib.1"
- "doc/man/man1/convertgls2bib.man1.pdf"
- "doc/support/bib2gls/"
- "scripts/bib2gls/"
- "source/support/bib2gls/src/")
- (base32
- "11a3wvyg5anm9hkmlpb6yvls1bmhypyswj55q332ziac6hpi2wd5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/bib2gls.1"
+ "doc/man/man1/bib2gls.man1.pdf"
+ "doc/man/man1/convertgls2bib.1"
+ "doc/man/man1/convertgls2bib.man1.pdf"
+ "doc/support/bib2gls/"
+ "scripts/bib2gls/"
+ "source/support/bib2gls/src/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06jylyhgj53dc424j7ahlxng5wwa2ihf4azx9851h68rylv4i6fh"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "bib2gls.sh" "convertgls2bib.sh")))
@@ -5045,13 +6206,18 @@ etc.)#: to the @file{.bib} format required by @command{bib2gls}.")
(define-public texlive-bibarts
(package
(name "texlive-bibarts")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibarts/" "source/latex/bibarts/"
- "tex/latex/bibarts/")
- (base32
- "18jms4i9y9ngzr5cf74j6xhxkas4yg7hm1yfgim6iakshhdhy964")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibarts/" "source/latex/bibarts/"
+ "tex/latex/bibarts/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "130qdf75225zz1g2cr0rw0kz4pylyif5nz98wnqjsnly5kdxkz6k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -5083,17 +6249,22 @@ bibliography without using MakeIndex or BibTeX.")
(define-public texlive-bibcop
(package
(name "texlive-bibcop")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/bibtex/bibcop/"
- "doc/man/man1/bibcop.1"
- "doc/man/man1/bibcop.man1.pdf"
- "scripts/bibcop/"
- "source/bibtex/bibcop/"
- "tex/latex/bibcop/")
- (base32
- "0w8n51ksff3b4nfx0ggnh00jhsdh1zg25hijxmpsq0z0wgazai9b")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/bibtex/bibcop/"
+ "doc/man/man1/bibcop.1"
+ "doc/man/man1/bibcop.man1.pdf"
+ "scripts/bibcop/"
+ "source/bibtex/bibcop/"
+ "tex/latex/bibcop/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16w1iwiq7wfz7q4rfrv9pkf71m9yxrpxq70c8asy2vh73sh90szn"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:link-scripts #~(list "bibcop.pl")))
@@ -5111,13 +6282,18 @@ as a standalone command line tool.")
(define-public texlive-biber-ms
(package
(name "texlive-biber-ms")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/bibtex/biber-ms/"
- "source/bibtex/biber-ms/")
- (base32
- "10r9jgarrbvqrz9nkjfkzsy3niggg5w6sjr7zi7bqy8zhkwf3hsf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/bibtex/biber-ms/"
+ "source/bibtex/biber-ms/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10r9jgarrbvqrz9nkjfkzsy3niggg5w6sjr7zi7bqy8zhkwf3hsf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biber-ms")
@@ -5131,14 +6307,19 @@ multiscript version of @code{biblatex-ms}.")
(define-public texlive-bibexport
(package
(name "texlive-bibexport")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bibexport/"
- "doc/bibtex/bibexport/" "scripts/bibexport/"
- "source/bibtex/bibexport/")
- (base32
- "161056627w1lazfpld3lyjwfrl8j8gc4b6dzml46bzwf7mk9ifln")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bibexport/"
+ "doc/bibtex/bibexport/" "scripts/bibexport/"
+ "source/bibtex/bibexport/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "161056627w1lazfpld3lyjwfrl8j8gc4b6dzml46bzwf7mk9ifln"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
@@ -5162,12 +6343,17 @@ ones like month names) and following the cross-references.")
(define-public texlive-bibhtml
(package
(name "texlive-bibhtml")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/bibhtml/" "doc/bibtex/bibhtml/")
- (base32
- "0fjpipxc885hk9pvjf3f0wsp84lr1d7flvs5c56jmlvryvc6mv0w")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/bibhtml/" "doc/bibtex/bibhtml/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fjpipxc885hk9pvjf3f0wsp84lr1d7flvs5c56jmlvryvc6mv0w"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibhtml")
@@ -5186,13 +6372,18 @@ package provides three different style files derived from each of the standard
(define-public texlive-biblatex-abnt
(package
(name "texlive-biblatex-abnt")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-abnt/"
- "tex/latex/biblatex-abnt/")
- (base32
- "14j3yn8ijwaa547gzyw7ql8q871w5r9rprc6l1s5dhp7vz3kzk6z")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-abnt/"
+ "tex/latex/biblatex-abnt/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14j3yn8ijwaa547gzyw7ql8q871w5r9rprc6l1s5dhp7vz3kzk6z"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-abnt")
@@ -5205,13 +6396,18 @@ Association of Technical Norms) rules.")
(define-public texlive-biblatex-ajc2020unofficial
(package
(name "texlive-biblatex-ajc2020unofficial")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-ajc2020unofficial/"
- "tex/latex/biblatex-ajc2020unofficial/")
- (base32
- "1ngh68a7ihhvpdfz09c087pfqnnpj3mnm8c4jmw8krq52b79fr87")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-ajc2020unofficial/"
+ "tex/latex/biblatex-ajc2020unofficial/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ngh68a7ihhvpdfz09c087pfqnnpj3mnm8c4jmw8krq52b79fr87"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-ajc2020unofficial")
@@ -5225,13 +6421,18 @@ BibLaTeX, so you probably want to use @code{biblatex2bibitem}.")
(define-public texlive-biblatex-anonymous
(package
(name "texlive-biblatex-anonymous")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-anonymous/"
- "tex/latex/biblatex-anonymous/")
- (base32
- "1q24xrr80i6xsq65gfvvi1s5qsp78g52qgn2nf2523gjnnzp4p7n")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-anonymous/"
+ "tex/latex/biblatex-anonymous/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1q24xrr80i6xsq65gfvvi1s5qsp78g52qgn2nf2523gjnnzp4p7n"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-anonymous")
@@ -5244,13 +6445,18 @@ It will be useful, for example, in history or classical philology.")
(define-public texlive-biblatex-apa6
(package
(name "texlive-biblatex-apa6")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-apa6/"
- "tex/latex/biblatex-apa6/")
- (base32
- "14xkqca4l4sb8jwlz6k28hmlya4m9474sv79icyzzq1v0vbqmgbq")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-apa6/"
+ "tex/latex/biblatex-apa6/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14xkqca4l4sb8jwlz6k28hmlya4m9474sv79icyzzq1v0vbqmgbq"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-apa6")
@@ -5268,14 +6474,19 @@ the BibLaTeX-apa style package for the latest APA edition conformance.")
(define-public texlive-biblatex-archaeology
(package
(name "texlive-biblatex-archaeology")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-archaeology/"
- "source/latex/biblatex-archaeology/"
- "tex/latex/biblatex-archaeology/")
- (base32
- "059mp6c1wgxkdjqrpwyx9yafw8dma75c3653rjc3sp66xx3akr8k")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-archaeology/"
+ "source/latex/biblatex-archaeology/"
+ "tex/latex/biblatex-archaeology/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "059mp6c1wgxkdjqrpwyx9yafw8dma75c3653rjc3sp66xx3akr8k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-archaeology")
@@ -5295,13 +6506,18 @@ catalogues.")
(define-public texlive-biblatex-arthistory-bonn
(package
(name "texlive-biblatex-arthistory-bonn")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-arthistory-bonn/"
- "tex/latex/biblatex-arthistory-bonn/")
- (base32
- "0iwms7w1xqghdf3s0m91xzw4y7d20lvpv69ibl92cpjj5fggp0x8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-arthistory-bonn/"
+ "tex/latex/biblatex-arthistory-bonn/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0iwms7w1xqghdf3s0m91xzw4y7d20lvpv69ibl92cpjj5fggp0x8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-arthistory-bonn")
@@ -5318,14 +6534,19 @@ compatible with English and German.")
(define-public texlive-biblatex-bath
(package
(name "texlive-biblatex-bath")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-bath/"
- "source/latex/biblatex-bath/"
- "tex/latex/biblatex-bath/")
- (base32
- "1c640csqvq0f9fd5d7xx4apllbwvr4cmi2x38863wlrvlnxa9kd7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-bath/"
+ "source/latex/biblatex-bath/"
+ "tex/latex/biblatex-bath/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1c640csqvq0f9fd5d7xx4apllbwvr4cmi2x38863wlrvlnxa9kd7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-bath")
@@ -5338,13 +6559,18 @@ Harvard style recommended by the University of Bath Library.")
(define-public texlive-biblatex-bookinarticle
(package
(name "texlive-biblatex-bookinarticle")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-bookinarticle/"
- "tex/latex/biblatex-bookinarticle/")
- (base32
- "0mhj3adqlirylhjqj8y0m8pinmark07zqvx00zl9rrdpagj6q4y8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-bookinarticle/"
+ "tex/latex/biblatex-bookinarticle/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0mhj3adqlirylhjqj8y0m8pinmark07zqvx00zl9rrdpagj6q4y8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-bookinarticle")
@@ -5360,13 +6586,18 @@ package is now superseded by @code{biblatex-bookinother}.")
(define-public texlive-biblatex-bookinother
(package
(name "texlive-biblatex-bookinother")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-bookinother/"
- "tex/latex/biblatex-bookinother/")
- (base32
- "062ri08pwr5fh8v500dbgrc7nbxgi0jd864xfmvf601lwpwqn9c7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-bookinother/"
+ "tex/latex/biblatex-bookinother/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "062ri08pwr5fh8v500dbgrc7nbxgi0jd864xfmvf601lwpwqn9c7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-bookinother")
@@ -5381,13 +6612,18 @@ supersedes.")
(define-public texlive-biblatex-bwl
(package
(name "texlive-biblatex-bwl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-bwl/"
- "tex/latex/biblatex-bwl/")
- (base32
- "122qz05rc7c3pys6adg38xq0r123f4hspc3yyw8l2mzlpbbwm9y5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-bwl/"
+ "tex/latex/biblatex-bwl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "122qz05rc7c3pys6adg38xq0r123f4hspc3yyw8l2mzlpbbwm9y5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-bwl")
@@ -5401,13 +6637,18 @@ University of Berlin.")
(define-public texlive-biblatex-caspervector
(package
(name "texlive-biblatex-caspervector")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-caspervector/"
- "tex/latex/biblatex-caspervector/")
- (base32
- "0drch06w3kp5ygc3jad70iixylgaivhxnnibglnih89yg4wq90y4")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-caspervector/"
+ "tex/latex/biblatex-caspervector/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m1x3r52i6z06gy3jqlhaqnc876mi0qwjywmwyapvm8kfa2my0p3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-caspervector")
@@ -5420,13 +6661,18 @@ style for Chinese LaTeX users, using BibLaTeX.")
(define-public texlive-biblatex-chem
(package
(name "texlive-biblatex-chem")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-chem/"
- "tex/latex/biblatex-chem/")
- (base32
- "0y4fgnykh5x48cnbgyhgj04iqz05mvnzqvjn84vbr3mqmwjrndbl")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-chem/"
+ "tex/latex/biblatex-chem/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0y4fgnykh5x48cnbgyhgj04iqz05mvnzqvjn84vbr3mqmwjrndbl"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-chem")
@@ -5442,13 +6688,18 @@ a wide range of journals).")
(define-public texlive-biblatex-chicago
(package
(name "texlive-biblatex-chicago")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-chicago/"
- "tex/latex/biblatex-chicago/")
- (base32
- "00y8h4hvmz17bn46936xfi1cy0rsh5y33pyc1hrkrrldabq8rxys")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-chicago/"
+ "tex/latex/biblatex-chicago/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00y8h4hvmz17bn46936xfi1cy0rsh5y33pyc1hrkrrldabq8rxys"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-chicago")
@@ -5464,13 +6715,18 @@ others.")
(define-public texlive-biblatex-claves
(package
(name "texlive-biblatex-claves")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-claves/"
- "tex/latex/biblatex-claves/")
- (base32
- "08ydcv7qlbxaysh7jm3d4glrhp1fyd4fvvxc3jc4k50ga77ksqj0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-claves/"
+ "tex/latex/biblatex-claves/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "08ydcv7qlbxaysh7jm3d4glrhp1fyd4fvvxc3jc4k50ga77ksqj0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-claves")
@@ -5491,13 +6747,18 @@ way.")
(define-public texlive-biblatex-cv
(package
(name "texlive-biblatex-cv")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-cv/"
- "tex/latex/biblatex-cv/")
- (base32
- "17m6lqnr35y6vcfrrhlhxjf55b85py9miksswhkipyiaj3kphhb8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-cv/"
+ "tex/latex/biblatex-cv/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17m6lqnr35y6vcfrrhlhxjf55b85py9miksswhkipyiaj3kphhb8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-cv")
@@ -5511,15 +6772,20 @@ automatically format, group, and sort the entries on a CV.")
(define-public texlive-biblatex-dw
(package
(name "texlive-biblatex-dw")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-dw/"
- "tex/latex/biblatex-dw/bbx/"
- "tex/latex/biblatex-dw/cbx/"
- "tex/latex/biblatex-dw/lbx/")
- (base32
- "1vw008djg535hdwbmk5dqvaw0v6cm3lqmlvk8sfzybpqffw1crlr")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-dw/"
+ "tex/latex/biblatex-dw/bbx/"
+ "tex/latex/biblatex-dw/cbx/"
+ "tex/latex/biblatex-dw/lbx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vw008djg535hdwbmk5dqvaw0v6cm3lqmlvk8sfzybpqffw1crlr"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-dw")
@@ -5534,13 +6800,18 @@ are dependent on BibLaTeX and cannot be used without it.")
(define-public texlive-biblatex-enc
(package
(name "texlive-biblatex-enc")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-enc/"
- "tex/latex/biblatex-enc/")
- (base32
- "0k9sais0dknydcdy1a7fkkrb5grqap3q2jn8qk36x658nkjjb9ln")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-enc/"
+ "tex/latex/biblatex-enc/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0k9sais0dknydcdy1a7fkkrb5grqap3q2jn8qk36x658nkjjb9ln"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-enc")
@@ -5555,13 +6826,18 @@ historical and philological works.")
(define-public texlive-biblatex-ext
(package
(name "texlive-biblatex-ext")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-ext/"
- "tex/latex/biblatex-ext/")
- (base32
- "09adm378m9laxxb9bs6lqhfprrq0d3l1c627fxp1vcnxqqwd99xc")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-ext/"
+ "tex/latex/biblatex-ext/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0al97virwph44bmjhya9xq4y8kj7f4d2v7f2jahvfz2j00j78rr7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-ext")
@@ -5578,13 +6854,18 @@ here as well.")
(define-public texlive-biblatex-fiwi
(package
(name "texlive-biblatex-fiwi")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-fiwi/"
- "tex/latex/biblatex-fiwi/")
- (base32
- "080m1xj1g8v6aavp2i0hipjk3iikjqd2i36by2fiq0ys5vl5vhnq")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-fiwi/"
+ "tex/latex/biblatex-fiwi/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "080m1xj1g8v6aavp2i0hipjk3iikjqd2i36by2fiq0ys5vl5vhnq"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-fiwi")
@@ -5600,13 +6881,18 @@ documentation is only available in German.")
(define-public texlive-biblatex-gb7714-2015
(package
(name "texlive-biblatex-gb7714-2015")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-gb7714-2015/"
- "tex/latex/biblatex-gb7714-2015/")
- (base32
- "061gp5xwh2dkckb8dn9b7xhf76cqsq908dniwkp6hg531dzyn525")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-gb7714-2015/"
+ "tex/latex/biblatex-gb7714-2015/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1zhh9mwbywqbx0966amdngqpk7ayknklk2j11zc10rq7z68pjzb1"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-gb7714-2015")
@@ -5622,13 +6908,18 @@ by simply loading BibLaTeX with the appropriate option.")
(define-public texlive-biblatex-german-legal
(package
(name "texlive-biblatex-german-legal")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-german-legal/"
- "tex/latex/biblatex-german-legal/")
- (base32
- "14njaba2gvz338f8z4w3vi1qyf7yxx3l9c9nla6ggrw4rnicjpzs")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-german-legal/"
+ "tex/latex/biblatex-german-legal/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14njaba2gvz338f8z4w3vi1qyf7yxx3l9c9nla6ggrw4rnicjpzs"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-german-legal")
@@ -5643,13 +6934,18 @@ the future.")
(define-public texlive-biblatex-gost
(package
(name "texlive-biblatex-gost")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-gost/"
- "tex/latex/biblatex-gost/")
- (base32
- "0k4fdvhj8ki05arcimxlj3fm2216cijaj5jk5yy95754j3z6byj3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-gost/"
+ "tex/latex/biblatex-gost/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "08zrbh6ipqg4r0bnjgh9sd5z7aismyi7s8fhkbgdmniw99c4qdc5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-gost")
@@ -5662,13 +6958,18 @@ GOST 7.0.5-2008")
(define-public texlive-biblatex-historian
(package
(name "texlive-biblatex-historian")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-historian/"
- "tex/latex/biblatex-historian/")
- (base32
- "0y9jvjyji39ly5pf72qhnnlsrixaxjxdx529lyav8bhd2zz3c5s7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-historian/"
+ "tex/latex/biblatex-historian/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0y9jvjyji39ly5pf72qhnnlsrixaxjxdx529lyav8bhd2zz3c5s7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-historian")
@@ -5681,13 +6982,18 @@ Manual} (a version of Chicago).")
(define-public texlive-biblatex-ieee
(package
(name "texlive-biblatex-ieee")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-ieee/"
- "tex/latex/biblatex-ieee/")
- (base32
- "0a3r2lvp4nr53gxpa40qa7zdgj2qpyygvcgcbprnvfxlqrk8lfm0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-ieee/"
+ "tex/latex/biblatex-ieee/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a3r2lvp4nr53gxpa40qa7zdgj2qpyygvcgcbprnvfxlqrk8lfm0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-ieee")
@@ -5702,13 +7008,18 @@ option.")
(define-public texlive-biblatex-ijsra
(package
(name "texlive-biblatex-ijsra")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-ijsra/"
- "tex/latex/biblatex-ijsra/")
- (base32
- "0phgbrp47f6pgayws29acsacm7dcb5w3asvwswx5a2rg30wj2fln")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-ijsra/"
+ "tex/latex/biblatex-ijsra/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0phgbrp47f6pgayws29acsacm7dcb5w3asvwswx5a2rg30wj2fln"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-ijsra")
@@ -5723,13 +7034,18 @@ Student Research in Archaeology.")
(define-public texlive-biblatex-iso690
(package
(name "texlive-biblatex-iso690")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-iso690/"
- "tex/latex/biblatex-iso690/")
- (base32
- "07h16m8n8lydph2n567fnx2hzdw15mwyrcgs30x8anv9qxh0z6jf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-iso690/"
+ "tex/latex/biblatex-iso690/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07h16m8n8lydph2n567fnx2hzdw15mwyrcgs30x8anv9qxh0z6jf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-iso690")
@@ -5742,13 +7058,18 @@ the latest revision of the international standard ISO 690:2010.")
(define-public texlive-biblatex-jura2
(package
(name "texlive-biblatex-jura2")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-jura2/"
- "tex/latex/biblatex-jura2/")
- (base32
- "1cnsmk46j98z7wk7qs6v9f5m42x124v2nxrnq8n1jcs1jd03q6ry")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-jura2/"
+ "tex/latex/biblatex-jura2/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1cnsmk46j98z7wk7qs6v9f5m42x124v2nxrnq8n1jcs1jd03q6ry"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-jura2")
@@ -5760,13 +7081,18 @@ the latest revision of the international standard ISO 690:2010.")
(define-public texlive-biblatex-juradiss
(package
(name "texlive-biblatex-juradiss")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-juradiss/"
- "tex/latex/biblatex-juradiss/")
- (base32
- "13rwvj1ibhj0c46xr13wjyh68abkrvh2jcg2ccichh33crrxaql0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-juradiss/"
+ "tex/latex/biblatex-juradiss/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13rwvj1ibhj0c46xr13wjyh68abkrvh2jcg2ccichh33crrxaql0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-juradiss")
@@ -5779,13 +7105,18 @@ law thesis with LaTeX.")
(define-public texlive-biblatex-license
(package
(name "texlive-biblatex-license")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-license/"
- "tex/latex/biblatex-license/")
- (base32
- "1xz6zms984v5r8hq01f7ap245lfhqj577rc9ww57ccv4kgvgicqd")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-license/"
+ "tex/latex/biblatex-license/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xz6zms984v5r8hq01f7ap245lfhqj577rc9ww57ccv4kgvgicqd"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-license")
@@ -5799,13 +7130,18 @@ via BibLaTeX's built-in related mechanism. It provides a new related type
(define-public texlive-biblatex-lncs
(package
(name "texlive-biblatex-lncs")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-lncs/"
- "tex/latex/biblatex-lncs/")
- (base32
- "0fxhwvkgk3y2d1w6h2sldgzwbwng97bqqgny2slaajhk9wlbcs3k")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-lncs/"
+ "tex/latex/biblatex-lncs/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0agr8dnyfyclj2h3yw8z23jqpvrh8jrm3bdxr9fwvb3l7fazq4mv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-lncs")
@@ -5818,13 +7154,18 @@ via BibLaTeX's built-in related mechanism. It provides a new related type
(define-public texlive-biblatex-lni
(package
(name "texlive-biblatex-lni")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-lni/"
- "tex/latex/biblatex-lni/")
- (base32
- "1532swanj6p4pq7a4gqkmqjsdby20ls04ghkvdjg4066z1mizjp4")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-lni/"
+ "tex/latex/biblatex-lni/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "08vpynqkg22gs869yagh6v4drh0dnkdghqd1nvcq6gh3c56dlpni"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-lni")
@@ -5837,15 +7178,20 @@ by the Gesellschaft fur Informatik (GI e.V.).")
(define-public texlive-biblatex-luh-ipw
(package
(name "texlive-biblatex-luh-ipw")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-luh-ipw/"
- "tex/latex/biblatex-luh-ipw/bbx/"
- "tex/latex/biblatex-luh-ipw/cbx/"
- "tex/latex/biblatex-luh-ipw/lbx/")
- (base32
- "18fnq2xjwsp5lq7vywbgzppbijqn4xarqga0g1rpj89g9q0zjs30")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-luh-ipw/"
+ "tex/latex/biblatex-luh-ipw/bbx/"
+ "tex/latex/biblatex-luh-ipw/cbx/"
+ "tex/latex/biblatex-luh-ipw/lbx/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18fnq2xjwsp5lq7vywbgzppbijqn4xarqga0g1rpj89g9q0zjs30"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-luh-ipw")
@@ -5860,13 +7206,18 @@ the institutes for the social sciences of the Leibniz University Hannover/LUH
(define-public texlive-biblatex-manuscripts-philology
(package
(name "texlive-biblatex-manuscripts-philology")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-manuscripts-philology/"
- "tex/latex/biblatex-manuscripts-philology/")
- (base32
- "1q0rqqh6gqs930bzay5cq5hghxk28xs2321y8h7awif0akq03rhm")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-manuscripts-philology/"
+ "tex/latex/biblatex-manuscripts-philology/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05d2z1w7wdzdinfw1j72y2d8f0nid0a6wsrvkwqkryl3nykyh4z5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-manuscripts-philology")
@@ -5880,13 +7231,18 @@ edition.")
(define-public texlive-biblatex-mla
(package
(name "texlive-biblatex-mla")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-mla/"
- "tex/latex/biblatex-mla/")
- (base32
- "09qlx067vhc4aflx9rjdbyq99xh3nzwlxj81cxp07mm2mykhxf39")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-mla/"
+ "tex/latex/biblatex-mla/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09qlx067vhc4aflx9rjdbyq99xh3nzwlxj81cxp07mm2mykhxf39"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-mla")
@@ -5899,13 +7255,18 @@ specified by the MLA handbook.")
(define-public texlive-biblatex-morenames
(package
(name "texlive-biblatex-morenames")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-morenames/"
- "tex/latex/biblatex-morenames/")
- (base32
- "1gwzxz1yqnq3q2fjrb4nf0370a90fbi6b20zvplj3lfiqmdkaiak")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-morenames/"
+ "tex/latex/biblatex-morenames/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gwzxz1yqnq3q2fjrb4nf0370a90fbi6b20zvplj3lfiqmdkaiak"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-morenames")
@@ -5920,15 +7281,20 @@ means the editor of @code{@@mvcollection}, and not the editor of the
(define-public texlive-biblatex-ms
(package
(name "texlive-biblatex-ms")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bib/biblatex-ms/biblatex/"
- "bibtex/bst/biblatex-ms/"
- "doc/latex/biblatex-ms/"
- "tex/latex/biblatex-ms/")
- (base32
- "00xib8xvxl78qzxs66qmfyp4jdkcs3qx4ray2nwv1fffhj69aw3n")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bib/biblatex-ms/biblatex/"
+ "bibtex/bst/biblatex-ms/"
+ "doc/latex/biblatex-ms/"
+ "tex/latex/biblatex-ms/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00xib8xvxl78qzxs66qmfyp4jdkcs3qx4ray2nwv1fffhj69aw3n"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(propagated-inputs (list texlive-etoolbox texlive-kvoptions texlive-logreq
@@ -5947,13 +7313,18 @@ It requires the use of the multiscript version of Biber (biber-ms).")
(define-public texlive-biblatex-multiple-dm
(package
(name "texlive-biblatex-multiple-dm")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-multiple-dm/"
- "tex/latex/biblatex-multiple-dm/")
- (base32
- "07dp3ppz8kma5gh0bs98jnk7gvqqcp4l1ag60941myjvfsyqplxv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-multiple-dm/"
+ "tex/latex/biblatex-multiple-dm/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07dp3ppz8kma5gh0bs98jnk7gvqqcp4l1ag60941myjvfsyqplxv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-multiple-dm")
@@ -5966,13 +7337,18 @@ multiple sources.")
(define-public texlive-biblatex-musuos
(package
(name "texlive-biblatex-musuos")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-musuos/"
- "tex/latex/biblatex-musuos/")
- (base32
- "0iqp02yk8b9s18k8v78q2y5g507fsh2zk68dj0yc77gwa6gsmrmh")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-musuos/"
+ "tex/latex/biblatex-musuos/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0iqp02yk8b9s18k8v78q2y5g507fsh2zk68dj0yc77gwa6gsmrmh"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-musuos")
@@ -5985,13 +7361,18 @@ usable with other classes, too.")
(define-public texlive-biblatex-nature
(package
(name "texlive-biblatex-nature")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-nature/"
- "tex/latex/biblatex-nature/")
- (base32
- "1bpgcwpd8sw28dn7q8bkxpnpqb741216gaasvqdpah9kj53zfypg")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-nature/"
+ "tex/latex/biblatex-nature/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1bpgcwpd8sw28dn7q8bkxpnpqb741216gaasvqdpah9kj53zfypg"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-nature")
@@ -6004,14 +7385,19 @@ preparing papers for submission to the journal @emph{Nature}.")
(define-public texlive-biblatex-nejm
(package
(name "texlive-biblatex-nejm")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-nejm/"
- "source/latex/biblatex-nejm/"
- "tex/latex/biblatex-nejm/")
- (base32
- "1fa12hbzrqd7brz90zhn3lklbqvvn5sw5l3y8pnm5xx604dkdiiw")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-nejm/"
+ "source/latex/biblatex-nejm/"
+ "tex/latex/biblatex-nejm/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fa12hbzrqd7brz90zhn3lklbqvvn5sw5l3y8pnm5xx604dkdiiw"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-nejm")
@@ -6024,13 +7410,18 @@ Journal of Medicine (NEJM).")
(define-public texlive-biblatex-nottsclassic
(package
(name "texlive-biblatex-nottsclassic")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-nottsclassic/"
- "tex/latex/biblatex-nottsclassic/")
- (base32
- "13rvxykjyah5vn44sfagf1ggqhh1hd1qhz9m6jb87yhwz5snkrxh")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-nottsclassic/"
+ "tex/latex/biblatex-nottsclassic/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13rvxykjyah5vn44sfagf1ggqhh1hd1qhz9m6jb87yhwz5snkrxh"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-nottsclassic")
@@ -6043,13 +7434,18 @@ University of Nottingham.")
(define-public texlive-biblatex-opcit-booktitle
(package
(name "texlive-biblatex-opcit-booktitle")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-opcit-booktitle/"
- "tex/latex/biblatex-opcit-booktitle/")
- (base32
- "078fzk4i7sknaxkgn2lr54bcslqbjjsr1nb0z7y46v7kpg2lpcrf")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-opcit-booktitle/"
+ "tex/latex/biblatex-opcit-booktitle/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "078fzk4i7sknaxkgn2lr54bcslqbjjsr1nb0z7y46v7kpg2lpcrf"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-opcit-booktitle")
@@ -6064,14 +7460,19 @@ the @samp{op.@: cit.}@: mechanism does not work. This package fixes this.")
(define-public texlive-biblatex-oxref
(package
(name "texlive-biblatex-oxref")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-oxref/"
- "source/latex/biblatex-oxref/"
- "tex/latex/biblatex-oxref/")
- (base32
- "0jzmb28h0s2nji23mkj5ich7z5kaifv3snj20rm0dpjk20a087h3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-oxref/"
+ "source/latex/biblatex-oxref/"
+ "tex/latex/biblatex-oxref/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0hhl331vxsffm7wnxpx846xzbs66pjbpqhgiblds7gmz5zz6ng1k"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-oxref")
@@ -6103,15 +7504,21 @@ manuscripts, audiovisual resources, social media and legal references.")
(define-public texlive-biblatex-philosophy
(package
(name "texlive-biblatex-philosophy")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-philosophy/"
- "source/latex/biblatex-philosophy/"
- "tex/latex/biblatex-philosophy/")
- (base32
- "05fapyb6wwyv4mwjhgg3gasvqkwpwd6jxv095hird9011n6drrzm")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-philosophy/"
+ "source/latex/biblatex-philosophy/"
+ "tex/latex/biblatex-philosophy/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05fapyb6wwyv4mwjhgg3gasvqkwpwd6jxv095hird9011n6drrzm"))))
(outputs '("out" "doc"))
+ (properties '((updater-extra-native-inputs "texlive-updmap.cfg")))
(build-system texlive-build-system)
(arguments (list #:tex-format "latex"))
(native-inputs
@@ -6158,13 +7565,18 @@ language recognized by Babel, possibly with some simple redefinitions.")
(define-public texlive-biblatex-phys
(package
(name "texlive-biblatex-phys")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-phys/"
- "tex/latex/biblatex-phys/")
- (base32
- "1q9l7ma3zpybx142adbiall4y5x4hc5kc536wpmiwkz29zi6w7ka")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-phys/"
+ "tex/latex/biblatex-phys/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1q9l7ma3zpybx142adbiall4y5x4hc5kc536wpmiwkz29zi6w7ka"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-phys")
@@ -6180,13 +7592,18 @@ appropriate option: @samp{\\usepackage[style=phys]@{biblatex@}}.")
(define-public texlive-biblatex-publist
(package
(name "texlive-biblatex-publist")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-publist/"
- "tex/latex/biblatex-publist/")
- (base32
- "0s43idph9n9klrxy34lnplrrwy3wy4z87iiif5l9japi1j51vz6c")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-publist/"
+ "tex/latex/biblatex-publist/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xk80agsawp8amphpnk1s55kbp8rx5npphsadqi0nmclqi920f38"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-publist")
@@ -6201,13 +7618,18 @@ such as the omission of the author's own name from author or editor data.")
(define-public texlive-biblatex-readbbl
(package
(name "texlive-biblatex-readbbl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-readbbl/"
- "tex/latex/biblatex-readbbl/")
- (base32
- "0fr0p5c2v66vy86qx2m8i4p3p75d6qm506gv8xbfqckzyfzi9x6z")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-readbbl/"
+ "tex/latex/biblatex-readbbl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fr0p5c2v66vy86qx2m8i4p3p75d6qm506gv8xbfqckzyfzi9x6z"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-readbbl")
@@ -6223,13 +7645,18 @@ changes one has to create a new @file{.bbl} file.")
(define-public texlive-biblatex-realauthor
(package
(name "texlive-biblatex-realauthor")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-realauthor/"
- "tex/latex/biblatex-realauthor/")
- (base32
- "1av0vd7lwg5yad75b9fbi09s4bcaqd8bdz43kzyj2r7cimj8dpl0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-realauthor/"
+ "tex/latex/biblatex-realauthor/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1av0vd7lwg5yad75b9fbi09s4bcaqd8bdz43kzyj2r7cimj8dpl0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-realauthor")
@@ -6243,14 +7670,19 @@ name.")
(define-public texlive-biblatex-sbl
(package
(name "texlive-biblatex-sbl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-sbl/"
- "makeindex/biblatex-sbl/"
- "tex/latex/biblatex-sbl/")
- (base32
- "1b04lwzmsgapf2x1y83jdmzsc0h59dwy35lglxwvmlwlv8czpx9s")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-sbl/"
+ "makeindex/biblatex-sbl/"
+ "tex/latex/biblatex-sbl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1b04lwzmsgapf2x1y83jdmzsc0h59dwy35lglxwvmlwlv8czpx9s"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-sbl")
@@ -6265,13 +7697,18 @@ included.")
(define-public texlive-biblatex-science
(package
(name "texlive-biblatex-science")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-science/"
- "tex/latex/biblatex-science/")
- (base32
- "0sw2bzhbgbfg5gajbm61x4243qrfna1ifbp9bl1swdmvw9g3hycd")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-science/"
+ "tex/latex/biblatex-science/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0sw2bzhbgbfg5gajbm61x4243qrfna1ifbp9bl1swdmvw9g3hycd"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-science")
@@ -6284,13 +7721,18 @@ preparing papers for submission to the journal @emph{Science}.")
(define-public texlive-biblatex-shortfields
(package
(name "texlive-biblatex-shortfields")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-shortfields/"
- "tex/latex/biblatex-shortfields/")
- (base32
- "14s6ykbnb6b2i811rjn44chv8f73yhnnywczn78zwbij5z6jgcjv")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-shortfields/"
+ "tex/latex/biblatex-shortfields/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "14s6ykbnb6b2i811rjn44chv8f73yhnnywczn78zwbij5z6jgcjv"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-shortfields")
@@ -6315,13 +7757,18 @@ the fields. This list also includes the claves defined with the
(define-public texlive-biblatex-socialscienceshuberlin
(package
(name "texlive-biblatex-socialscienceshuberlin")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-socialscienceshuberlin/"
- "tex/latex/biblatex-socialscienceshuberlin/")
- (base32
- "1klcvjf8vz3bg0q7pmci6hhih52ph0z0hhkbv3iippyy33jhijrc")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-socialscienceshuberlin/"
+ "tex/latex/biblatex-socialscienceshuberlin/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1klcvjf8vz3bg0q7pmci6hhih52ph0z0hhkbv3iippyy33jhijrc"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-socialscienceshuberlin")
@@ -6334,14 +7781,19 @@ Humboldt-Universitat zu Berlin.")
(define-public texlive-biblatex-software
(package
(name "texlive-biblatex-software")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-software/"
- "source/latex/biblatex-software/"
- "tex/latex/biblatex-software/")
- (base32
- "0dlinydsrlcw898ccynx76mdv9jsvr4ninsqv2aggmj3g9xripn0")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-software/"
+ "source/latex/biblatex-software/"
+ "tex/latex/biblatex-software/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dlinydsrlcw898ccynx76mdv9jsvr4ninsqv2aggmj3g9xripn0"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-software")
@@ -6354,13 +7806,18 @@ a bibliography style extension. It requires the Biber backend.")
(define-public texlive-biblatex-source-division
(package
(name "texlive-biblatex-source-division")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-source-division/"
- "tex/latex/biblatex-source-division/")
- (base32
- "07y25624fpmx9hfmyyga8wh5cmvl14lqbmflglpl60jqsy622mgi")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-source-division/"
+ "tex/latex/biblatex-source-division/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07y25624fpmx9hfmyyga8wh5cmvl14lqbmflglpl60jqsy622mgi"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-source-division")
@@ -6376,13 +7833,18 @@ square brackets may include the division specification.")
(define-public texlive-biblatex-spbasic
(package
(name "texlive-biblatex-spbasic")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-spbasic/"
- "tex/latex/biblatex-spbasic/")
- (base32
- "071d1iqy1scz3wncsfv1backp5b7ly28rn5k0wy67wwz1vxa0d17")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-spbasic/"
+ "tex/latex/biblatex-spbasic/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "071d1iqy1scz3wncsfv1backp5b7ly28rn5k0wy67wwz1vxa0d17"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-spbasic")
@@ -6396,13 +7858,18 @@ old BibTeX style @file{spbasic.bst}.")
(define-public texlive-biblatex-subseries
(package
(name "texlive-biblatex-subseries")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-subseries/"
- "tex/latex/biblatex-subseries/")
- (base32
- "09kqqccn8dlaydz1v2szllryaxrj0c36z63ynhrv9dvd1sk0vdhd")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-subseries/"
+ "tex/latex/biblatex-subseries/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09kqqccn8dlaydz1v2szllryaxrj0c36z63ynhrv9dvd1sk0vdhd"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-subseries")
@@ -6417,13 +7884,18 @@ system.")
(define-public texlive-biblatex-swiss-legal
(package
(name "texlive-biblatex-swiss-legal")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-swiss-legal/"
- "tex/latex/biblatex-swiss-legal/")
- (base32
- "1x4dy1vxrbx0xkw3vysvcds0s1jz9w1pwri5ypiidj517sdsnff4")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-swiss-legal/"
+ "tex/latex/biblatex-swiss-legal/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1x4dy1vxrbx0xkw3vysvcds0s1jz9w1pwri5ypiidj517sdsnff4"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-swiss-legal")
@@ -6439,13 +7911,18 @@ work properly with newer versions of BibLaTeX.")
(define-public texlive-biblatex-trad
(package
(name "texlive-biblatex-trad")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-trad/"
- "tex/latex/biblatex-trad/")
- (base32
- "19ma61dsdpsm52zm7wnkqccmx54g9gvh05d10c59q86ffv1dnlmx")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-trad/"
+ "tex/latex/biblatex-trad/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19ma61dsdpsm52zm7wnkqccmx54g9gvh05d10c59q86ffv1dnlmx"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-trad")
@@ -6458,13 +7935,18 @@ work properly with newer versions of BibLaTeX.")
(define-public texlive-biblatex-true-citepages-omit
(package
(name "texlive-biblatex-true-citepages-omit")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-true-citepages-omit/"
- "tex/latex/biblatex-true-citepages-omit/")
- (base32
- "1mfkmn5g6r61mlyf3vx98q18a042yjkmh3drid9vs0kaj66di4n5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-true-citepages-omit/"
+ "tex/latex/biblatex-true-citepages-omit/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mfkmn5g6r61mlyf3vx98q18a042yjkmh3drid9vs0kaj66di4n5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-true-citepages-omit")
@@ -6480,13 +7962,18 @@ text]@{key@}}. The package corrects this problem.")
(define-public texlive-biblatex-unified
(package
(name "texlive-biblatex-unified")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-unified/"
- "tex/latex/biblatex-unified/")
- (base32
- "0d9b20m10dlkii2zxj00xgascqarf8qv1vfz28v7hnm9vd54h3rw")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-unified/"
+ "tex/latex/biblatex-unified/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d9b20m10dlkii2zxj00xgascqarf8qv1vfz28v7hnm9vd54h3rw"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-unified")
@@ -6499,13 +7986,18 @@ Unified Stylesheet for Linguistics Journals.")
(define-public texlive-biblatex-vancouver
(package
(name "texlive-biblatex-vancouver")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex-vancouver/"
- "tex/latex/biblatex-vancouver/")
- (base32
- "1sji214mi5garp5h3if1fh1rvck573cxg61rgdlyy543883nrxv7")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex-vancouver/"
+ "tex/latex/biblatex-vancouver/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sji214mi5garp5h3if1fh1rvck573cxg61rgdlyy543883nrxv7"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex-vancouver")
@@ -6518,13 +8010,18 @@ based on the @code{numeric} style and requires Biber.")
(define-public texlive-biblatex2bibitem
(package
(name "texlive-biblatex2bibitem")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblatex2bibitem/"
- "tex/latex/biblatex2bibitem/")
- (base32
- "1cd9b7vhmlx2clqr2gpwqs4hjga9mjqlxj7m74kq555rn5ppkyyn")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblatex2bibitem/"
+ "tex/latex/biblatex2bibitem/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1cd9b7vhmlx2clqr2gpwqs4hjga9mjqlxj7m74kq555rn5ppkyyn"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblatex2bibitem")
@@ -6542,14 +8039,19 @@ problem.")
(define-public texlive-bibleref
(package
(name "texlive-bibleref")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref/"
- "source/latex/bibleref/"
- "tex/latex/bibleref/")
- (base32
- "1fgb6lljdsdvkbs4i7yvwvgjbpbc8vnki0wv3gdi9yq6s5j6lzv5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref/"
+ "source/latex/bibleref/"
+ "tex/latex/bibleref/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fgb6lljdsdvkbs4i7yvwvgjbpbc8vnki0wv3gdi9yq6s5j6lzv5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref")
@@ -6562,14 +8064,19 @@ of the Christian @emph{Bible}, in a number of well-defined formats.")
(define-public texlive-bibleref-french
(package
(name "texlive-bibleref-french")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref-french/"
- "source/latex/bibleref-french/"
- "tex/latex/bibleref-french/")
- (base32
- "12y9xdsz0swh3rndmzk7ch9fbszbhcp0ixb21jyy36xnb3x80wa5")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref-french/"
+ "source/latex/bibleref-french/"
+ "tex/latex/bibleref-french/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12y9xdsz0swh3rndmzk7ch9fbszbhcp0ixb21jyy36xnb3x80wa5"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref-french")
@@ -6582,13 +8089,18 @@ conventions for use of @code{bibleref} in French.")
(define-public texlive-bibleref-german
(package
(name "texlive-bibleref-german")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref-german/"
- "tex/latex/bibleref-german/")
- (base32
- "0nqky0x9j6w3xg2vaj29db7l0zjw88d7bl6vs8864hqz2i6h2pcw")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref-german/"
+ "tex/latex/bibleref-german/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0nqky0x9j6w3xg2vaj29db7l0zjw88d7bl6vs8864hqz2i6h2pcw"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref-german")
@@ -6603,14 +8115,19 @@ addition, the Vulgate (Latin Bible) is supported.")
(define-public texlive-bibleref-lds
(package
(name "texlive-bibleref-lds")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref-lds/"
- "source/latex/bibleref-lds/"
- "tex/latex/bibleref-lds/")
- (base32
- "0wqmpzml3yyhzv7bx5wkfl2ni0qinz0kjzdanh6rx0bczp29dlfh")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref-lds/"
+ "source/latex/bibleref-lds/"
+ "tex/latex/bibleref-lds/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wqmpzml3yyhzv7bx5wkfl2ni0qinz0kjzdanh6rx0bczp29dlfh"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref-lds")
@@ -6626,14 +8143,19 @@ Saints (LDS).")
(define-public texlive-bibleref-mouth
(package
(name "texlive-bibleref-mouth")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref-mouth/"
- "source/latex/bibleref-mouth/"
- "tex/latex/bibleref-mouth/")
- (base32
- "0dakbx8rnjs9yjnn1xal9y0bmh165lqhbjj3bns974vkyb7nla4m")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref-mouth/"
+ "source/latex/bibleref-mouth/"
+ "tex/latex/bibleref-mouth/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dakbx8rnjs9yjnn1xal9y0bmh165lqhbjj3bns974vkyb7nla4m"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref-mouth")
@@ -6649,13 +8171,18 @@ expandable context, such as an argument to a @code{\\url} command.")
(define-public texlive-bibleref-parse
(package
(name "texlive-bibleref-parse")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibleref-parse/"
- "tex/latex/bibleref-parse/")
- (base32
- "01jhic1idgjgv9hsx5gih4230krfqm8pc3j7f4kn22w2jnw7fs68")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibleref-parse/"
+ "tex/latex/bibleref-parse/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "01jhic1idgjgv9hsx5gih4230krfqm8pc3j7f4kn22w2jnw7fs68"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibleref-parse")
@@ -6670,12 +8197,17 @@ a simpler and more convenient interface to the functionality of the
(define-public texlive-biblist
(package
(name "texlive-biblist")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biblist/" "tex/latex/biblist/")
- (base32
- "1r7cd68yr8pnmqnr39qzp42kxqcx89cqzz81ig9y7qgicznji0i8")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biblist/" "tex/latex/biblist/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1r7cd68yr8pnmqnr39qzp42kxqcx89cqzz81ig9y7qgicznji0i8"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biblist")
@@ -6689,12 +8221,17 @@ avoiding the potentially large (macro) impact associated with
(define-public texlive-bidihl
(package
(name "texlive-bidihl")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/xelatex/bidihl/" "tex/xelatex/bidihl/")
- (base32
- "021q2qhfl2ww95nbp63p3j7lv9wjj5s9wvn2sj5zyj1pcw75l8ir")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/xelatex/bidihl/" "tex/xelatex/bidihl/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "021q2qhfl2ww95nbp63p3j7lv9wjj5s9wvn2sj5zyj1pcw75l8ir"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bidihl")
@@ -6706,14 +8243,20 @@ avoiding the potentially large (macro) impact associated with
(define-public texlive-bibtexperllibs
(package
(name "texlive-bibtexperllibs")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "scripts/bibtexperllibs/BibTeX/"
- "scripts/bibtexperllibs/LaTeX/"
- "source/support/bibtexperllibs/")
- (base32
- "1p99pg9rvkzi3rqm4kp43zf5sk28q7a2m8ikfckg10ybaws5d3zg")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/man/man1/ltx2unitxt.1"
+ "doc/man/man1/ltx2unitxt.man1.pdf"
+ "scripts/bibtexperllibs/"
+ "source/support/bibtexperllibs/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07frlvg53m6ps8gyh04kwwhsmyyvycqj72s31h4z82y9gxxajxc6"))))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibtexperllibs")
(synopsis "BibTeX Perl Libraries")
@@ -6727,14 +8270,19 @@ avoiding the potentially large (macro) impact associated with
(define-public texlive-bibtopic
(package
(name "texlive-bibtopic")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibtopic/"
- "source/latex/bibtopic/"
- "tex/latex/bibtopic/")
- (base32
- "1b4lhlw29y37c7pxmqvy4ahgb85bmxrgnr2jhzvdhzdm5y9md7a3")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibtopic/"
+ "source/latex/bibtopic/"
+ "tex/latex/bibtopic/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1b4lhlw29y37c7pxmqvy4ahgb85bmxrgnr2jhzvdhzdm5y9md7a3"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (list #:tex-format "latex"))
@@ -6755,14 +8303,19 @@ have bibliographies specific to one part of a document, see the packages
(define-public texlive-bibtopicprefix
(package
(name "texlive-bibtopicprefix")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibtopicprefix/"
- "source/latex/bibtopicprefix/"
- "tex/latex/bibtopicprefix/")
- (base32
- "1fadq51adii1453v31xj7p328h4rvans1ynmxjcmnwhlj4hdjp5n")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibtopicprefix/"
+ "source/latex/bibtopicprefix/"
+ "tex/latex/bibtopicprefix/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fadq51adii1453v31xj7p328h4rvans1ynmxjcmnwhlj4hdjp5n"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibtopicprefix")
@@ -6777,14 +8330,19 @@ package.")
(define-public texlive-bibunits
(package
(name "texlive-bibunits")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bibunits/"
- "source/latex/bibunits/"
- "tex/latex/bibunits/")
- (base32
- "0hlz277lskhcs5xr0qn2rram957himj67hkwqqsjjap8khf7fz6v")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bibunits/"
+ "source/latex/bibunits/"
+ "tex/latex/bibunits/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0hlz277lskhcs5xr0qn2rram957himj67hkwqqsjjap8khf7fz6v"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bibunits")
@@ -6801,14 +8359,19 @@ and the global bibliographies at the same time.")
(define-public texlive-binomexp
(package
(name "texlive-binomexp")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/binomexp/"
- "source/latex/binomexp/"
- "tex/latex/binomexp/")
- (base32
- "1wmhsqqz2hy75x20srs1237yba4s00yrdhr52hkrh3nldzqwhqcc")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/binomexp/"
+ "source/latex/binomexp/"
+ "tex/latex/binomexp/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wmhsqqz2hy75x20srs1237yba4s00yrdhr52hkrh3nldzqwhqcc"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/binomexp")
@@ -6822,12 +8385,17 @@ used to print successive rows of the triangle, or to print the rows inside an
(define-public texlive-biocon
(package
(name "texlive-biocon")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/biocon/" "tex/latex/biocon/")
- (base32
- "0m3qqrl5z071w4zs8fs3wv0b4ix0s6cqh4ixzqj28d74aaf9r1y1")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/biocon/" "tex/latex/biocon/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m3qqrl5z071w4zs8fs3wv0b4ix0s6cqh4ixzqj28d74aaf9r1y1"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biocon")
@@ -6844,13 +8412,18 @@ Different default styles are used in different situations.")
(define-public texlive-biolett-bst
(package
(name "texlive-biolett-bst")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "bibtex/bst/biolett-bst/"
- "doc/bibtex/biolett-bst/")
- (base32
- "1xfr79xw0ih61s5qapx2adiyjj0d149nslpmkd1fw29g1v4zrjd2")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "bibtex/bst/biolett-bst/"
+ "doc/bibtex/biolett-bst/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xfr79xw0ih61s5qapx2adiyjj0d149nslpmkd1fw29g1v4zrjd2"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/biolett-bst")
@@ -6863,14 +8436,19 @@ Different default styles are used in different situations.")
(define-public texlive-bitelist
(package
(name "texlive-bitelist")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/generic/bitelist/"
- "source/generic/bitelist/"
- "tex/generic/bitelist/")
- (base32
- "1jv9w2jgx8q2k9xx0n4azlngsh26zs37ihavq0xy4n62ajf64ps6")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/generic/bitelist/"
+ "source/generic/bitelist/"
+ "tex/generic/bitelist/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jv9w2jgx8q2k9xx0n4azlngsh26zs37ihavq0xy4n62ajf64ps6"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bitelist")
@@ -6888,14 +8466,19 @@ retains outer braces.")
(define-public texlive-bitpattern
(package
(name "texlive-bitpattern")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/latex/bitpattern/"
- "source/latex/bitpattern/"
- "tex/latex/bitpattern/")
- (base32
- "00f423jran7qqg9fwy3p7w1lhi20cxzlvn4hzsrz5pwd87bmvxxb")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/latex/bitpattern/"
+ "source/latex/bitpattern/"
+ "tex/latex/bitpattern/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00f423jran7qqg9fwy3p7w1lhi20cxzlvn4hzsrz5pwd87bmvxxb"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bitpattern")
@@ -6908,19 +8491,24 @@ used to describe hardware, data format or protocols.")
(define-public texlive-bitter
(package
(name "texlive-bitter")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version
- (list "doc/fonts/bitter/"
- "fonts/enc/dvips/bitter/"
- "fonts/map/dvips/bitter/"
- "fonts/tfm/huerta/bitter/"
- "fonts/truetype/huerta/bitter/"
- "fonts/type1/huerta/bitter/"
- "fonts/vf/huerta/bitter/"
- "tex/latex/bitter/")
- (base32
- "07fb0dw1g1faz05naf53rinjrk0pngpfpcq4fxd1fy6580h7446f")))
+ (version "2024.2")
+ (source (origin
+ (method svn-multi-fetch)
+ (uri (svn-multi-reference
+ (url (texlive-packages-repository version))
+ (revision 70951)
+ (locations (list "doc/fonts/bitter/"
+ "fonts/enc/dvips/bitter/"
+ "fonts/map/dvips/bitter/"
+ "fonts/tfm/huerta/bitter/"
+ "fonts/truetype/huerta/bitter/"
+ "fonts/type1/huerta/bitter/"
+ "fonts/vf/huerta/bitter/"
+ "tex/latex/bitter/"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xh3vssfrfkdrwzsmid7frm4n9gjb8x7czh8zyybdcvv9vb8n3d9"))))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(home-page "https://ctan.org/pkg/bitter")
@@ -6934,13 +8522,18 @@ text. There are regular and bold weights and an italic, but no bold italic.")
(define-public texlive-bjfuthesis
(package
(name "texlive-bjfuthesis")
- (version (number->string %texlive-revision))
- (source (texlive-origin
- name version