[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sat, 9 Dec 2023 16:37:24 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 190eff1d201a099542cc1d3406bcc1eda6a980da
Merge: 5cf6c96ad9 61f2d84e75
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Dec 9 22:06:53 2023 +0100
Merge branch 'master' into core-updates
Change-Id: Iea8f10db98256f1c6cfac8bfcc82e2d44695ef3d
.dir-locals.el | 2 +-
.gitignore | 1 -
.patman | 1 +
Makefile.am | 31 +-
configure.ac | 1 -
doc/contributing.texi | 212 +-
doc/guix-cookbook.texi | 702 +-
doc/guix.texi | 853 +-
etc/completion/fish/guix.fish | 4 +-
etc/disarchive-manifest.scm | 61 +-
etc/git/commit-msg | 94 +
etc/git/gitconfig | 7 +
etc/snippets/tempel/scheme-mode | 22 +-
etc/snippets/yas/scheme-mode/guix-package | 5 +-
etc/{teams.scm.in => teams.scm} | 46 +-
gnu/bootloader.scm | 5 +-
gnu/build/accounts.scm | 12 +-
gnu/build/icecat-extension.scm | 70 +
gnu/build/linux-modules.scm | 3 +-
gnu/home/services.scm | 23 +-
gnu/home/services/desktop.scm | 109 +-
gnu/home/services/ssh.scm | 8 +-
gnu/installer.scm | 7 +-
gnu/local.mk | 59 +-
gnu/packages/admin.scm | 131 +-
gnu/packages/agda.scm | 38 +-
gnu/packages/algebra.scm | 8 +-
gnu/packages/apl.scm | 86 +
gnu/packages/apple.scm | 59 +
gnu/packages/aspell.scm | 4 +-
gnu/packages/astronomy.scm | 900 +-
gnu/packages/audio.scm | 117 +-
gnu/packages/aux-files/guix.vim | 11 +-
.../linux-libre/{6.4-arm.conf => 6.6-arm.conf} | 258 +-
.../linux-libre/{6.4-arm64.conf => 6.6-arm64.conf} | 439 +-
.../linux-libre/{6.4-i686.conf => 6.6-i686.conf} | 341 +-
.../{6.4-x86_64.conf => 6.6-x86_64.conf} | 383 +-
gnu/packages/avr-xyz.scm | 83 +
gnu/packages/avr.scm | 212 +-
gnu/packages/backup.scm | 103 +-
gnu/packages/base.scm | 30 +-
gnu/packages/benchmark.scm | 8 +-
gnu/packages/bioconductor.scm | 3427 +-
gnu/packages/bioinformatics.scm | 307 +-
gnu/packages/bittorrent.scm | 138 +-
gnu/packages/books.scm | 6 +-
gnu/packages/boost.scm | 20 +-
gnu/packages/bootloaders.scm | 70 +-
gnu/packages/browser-extensions.scm | 101 +-
gnu/packages/c.scm | 66 +-
gnu/packages/ccache.scm | 8 +-
gnu/packages/cdrom.scm | 8 +-
gnu/packages/check.scm | 51 +-
gnu/packages/chromium.scm | 2 +-
gnu/packages/ci.scm | 128 +-
gnu/packages/clifm.scm | 62 +
gnu/packages/cluster.scm | 42 +-
gnu/packages/cmake.scm | 1 +
gnu/packages/code.scm | 5 +-
gnu/packages/commencement.scm | 22 +-
gnu/packages/conky.scm | 6 +-
gnu/packages/connman.scm | 9 +-
gnu/packages/containers.scm | 7 +-
gnu/packages/coq.scm | 27 +
gnu/packages/cpp.scm | 214 +-
gnu/packages/cran.scm | 1233 +-
gnu/packages/crates-graphics.scm | 286 +-
gnu/packages/crates-gtk.scm | 607 +-
gnu/packages/crates-io.scm | 6893 +++-
gnu/packages/crypto.scm | 147 +-
gnu/packages/cups.scm | 22 +-
gnu/packages/curl.scm | 50 +-
gnu/packages/databases.scm | 106 +-
gnu/packages/datastructures.scm | 45 +-
gnu/packages/dav.scm | 10 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/dezyne.scm | 4 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 71 +-
gnu/packages/display-managers.scm | 52 +
gnu/packages/dlang.scm | 47 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/docker.scm | 7 +-
gnu/packages/dunst.scm | 89 -
gnu/packages/education.scm | 1 +
gnu/packages/emacs-xyz.scm | 1375 +-
gnu/packages/emacs.scm | 7 +-
gnu/packages/embedded.scm | 12 +-
gnu/packages/emulators.scm | 85 +-
gnu/packages/engineering.scm | 284 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/fabric-management.scm | 34 +-
gnu/packages/fcitx5.scm | 37 +-
gnu/packages/file-systems.scm | 1 +
gnu/packages/finance.scm | 28 +-
gnu/packages/firmware.scm | 410 +-
gnu/packages/flashing-tools.scm | 71 +-
gnu/packages/fonts.scm | 67 +-
gnu/packages/fontutils.scm | 93 +
gnu/packages/forth.scm | 60 +-
gnu/packages/freedesktop.scm | 14 +
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 342 +-
gnu/packages/gcc.scm | 19 +-
gnu/packages/geo.scm | 27 +-
gnu/packages/gl.scm | 14 +-
gnu/packages/gnome-xyz.scm | 23 +
gnu/packages/gnome.scm | 148 +-
gnu/packages/gnuzilla.scm | 53 +-
gnu/packages/golang-check.scm | 555 +
gnu/packages/golang.scm | 754 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 114 +-
gnu/packages/graphics.scm | 163 +-
gnu/packages/gtk.scm | 39 +-
gnu/packages/guile-xyz.scm | 155 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 20 +-
gnu/packages/haskell-apps.scm | 52 +-
gnu/packages/haskell-xyz.scm | 139 +-
gnu/packages/image-processing.scm | 15 +-
gnu/packages/image.scm | 10 +-
gnu/packages/instrumentation.scm | 25 +-
gnu/packages/ipfs.scm | 20 +-
gnu/packages/irc.scm | 5 +-
gnu/packages/java.scm | 185 +-
gnu/packages/javascript.scm | 2 +-
gnu/packages/julia-xyz.scm | 22 +
gnu/packages/jupyter.scm | 48 +
gnu/packages/kde-frameworks.scm | 3 +
gnu/packages/kde.scm | 4 +-
gnu/packages/language.scm | 4 +-
gnu/packages/libreoffice.scm | 66 +-
gnu/packages/linux.scm | 339 +-
gnu/packages/lisp-check.scm | 43 +-
gnu/packages/lisp-xyz.scm | 718 +-
gnu/packages/lisp.scm | 17 +-
gnu/packages/llvm.scm | 264 +-
gnu/packages/lua.scm | 33 +
gnu/packages/machine-learning.scm | 206 +-
gnu/packages/mail.scm | 175 +-
gnu/packages/markup.scm | 100 +-
gnu/packages/mastodon.scm | 64 +-
gnu/packages/maths.scm | 2103 +-
gnu/packages/mes.scm | 57 +-
gnu/packages/messaging.scm | 77 +-
gnu/packages/mold.scm | 24 +-
gnu/packages/moreutils.scm | 4 +-
gnu/packages/mpd.scm | 37 +-
gnu/packages/mpi.scm | 8 +-
gnu/packages/multiprecision.scm | 32 +-
gnu/packages/music.scm | 34 +-
gnu/packages/ncdu.scm | 14 +-
gnu/packages/ncurses.scm | 2 +-
gnu/packages/networking.scm | 194 +-
gnu/packages/node.scm | 25 +-
gnu/packages/ocaml.scm | 50 +-
gnu/packages/package-management.scm | 22 +-
gnu/packages/parallel.scm | 28 +-
gnu/packages/password-utils.scm | 3 +-
.../patches/agda-categories-use-stdlib-1.7.3.patch | 28 +
gnu/packages/patches/agda-use-sphinx-5.patch | 51 +
gnu/packages/patches/aria2-unbundle-wslay.patch | 54 +
.../patches/clang-16.0-libc-search-path.patch | 95 +
.../patches/clang-17.0-libc-search-path.patch | 90 +
gnu/packages/patches/connman-CVE-2022-32292.patch | 34 -
.../patches/connman-CVE-2022-32293-pt1.patch | 140 -
.../patches/connman-CVE-2022-32293-pt2.patch | 173 -
.../connman-add-missing-libppp-compat.h.patch | 140 +
.../patches/converseen-hide-updates-checks.patch | 24 +-
.../patches/emacs-debbugs-keep-patch-subject.patch | 29 -
gnu/packages/patches/emacs-next-exec-path.patch | 18 +
.../emacs-next-native-comp-driver-options.patch | 18 +
.../patches/ergodox-firmware-fix-json-target.patch | 1405 +
.../patches/ergodox-firmware-fix-numpad.patch | 18 +
gnu/packages/patches/ghc-basement-fix-32bit.patch | 177 +
gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch | 303 -
gnu/packages/patches/ghc-memory-fix-32bit.patch | 40 +
.../patches/ghc-persistent-fix-32bit.patch | 25 +
gnu/packages/patches/gklib-suitesparse.patch | 65 +
.../patches/glibc-2.35-CVE-2023-4911.patch | 160 +
.../patches/go-gopkg-in-yaml-v3-32bit.patch | 50 +
gnu/packages/patches/hplip-usb-timeout.patch | 24 +
gnu/packages/patches/icecat-compare-paths.patch | 21 +
.../patches/icecat-use-system-wide-dir.patch | 36 +
...-fix-TestHebrewCalendarInTemporalLeapYear.patch | 33 +
.../patches/igraph-fix-varargs-integer-size.patch | 39 +
.../patches/igt-gpu-tools-Use-libproc2.patch | 505 -
gnu/packages/patches/online-judge-tools.patch | 62 +
.../patches/php-fix-streams-copy-length.patch | 52 -
gnu/packages/patches/plasp-fix-normalization.patch | 51 +
gnu/packages/patches/plasp-include-iostream.patch | 26 +
.../python-accupy-fix-use-of-perfplot.patch | 48 +
.../patches/python-accupy-use-matplotx.patch | 113 +
.../python-online-judge-api-client-tests.patch | 429 +
.../patches/python-pycrypto-CVE-2013-7459.patch | 97 -
.../patches/python-pycrypto-time-clock.patch | 23 -
.../python-sphinx-prompt-docutils-0.19.patch | 35 +
.../patches/qmk-firmware-fix-hacker-dvorak.patch | 15 +
...se-use-TZDIR.patch => qtbase-5-use-TZDIR.patch} | 0
gnu/packages/patches/qtbase-use-TZDIR.patch | 162 +-
.../patches/rust-1.70-fix-rustix-build.patch | 21 +
.../patches/rust-openssl-sys-no-vendor.patch | 32 -
gnu/packages/patches/scilab-hdf5-1.8-api.patch | 71 -
.../patches/teuchos-remove-duplicate-using.patch | 34 +
.../patches/tootle-glib-object-naming.patch | 66 -
gnu/packages/patches/tootle-reason-phrase.patch | 48 -
.../patches/tpetra-remove-duplicate-using.patch | 18 +
gnu/packages/patches/u-boot-patman-change-id.patch | 232 +
gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 105 +-
gnu/packages/patches/unison-fix-ocaml-4.08.patch | 81 -
gnu/packages/patches/yggdrasil-extra-config.patch | 134 +-
.../patches/zig-use-baseline-cpu-by-default.patch | 36 +
gnu/packages/pdf.scm | 23 +-
gnu/packages/php.scm | 194 +-
gnu/packages/polkit.scm | 35 +-
gnu/packages/potassco.scm | 54 +
gnu/packages/protobuf.scm | 8 +-
gnu/packages/python-check.scm | 32 +-
gnu/packages/python-crypto.scm | 48 +-
gnu/packages/python-science.scm | 138 +-
gnu/packages/python-web.scm | 167 +-
gnu/packages/python-xyz.scm | 730 +-
gnu/packages/qt.scm | 295 +-
gnu/packages/radio.scm | 170 +-
gnu/packages/raspberry-pi.scm | 2 +-
gnu/packages/rdesktop.scm | 4 +-
gnu/packages/ruby.scm | 25 +-
gnu/packages/rust-apps.scm | 347 +-
gnu/packages/rust.scm | 246 +-
gnu/packages/samba.scm | 66 +-
gnu/packages/sdl.scm | 44 +-
gnu/packages/serialization.scm | 19 +-
gnu/packages/shells.scm | 18 +-
gnu/packages/sphinx.scm | 50 +-
gnu/packages/ssh.scm | 50 +-
gnu/packages/statistics.scm | 319 +-
gnu/packages/suckless.scm | 2 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/syndication.scm | 7 +-
gnu/packages/tbb.scm | 27 +-
gnu/packages/telephony.scm | 6 +-
gnu/packages/terminals.scm | 157 +-
gnu/packages/tex.scm | 3 +-
gnu/packages/text-editors.scm | 4 +-
gnu/packages/textutils.scm | 31 +-
gnu/packages/tls.scm | 34 +-
gnu/packages/toolkits.scm | 11 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/toys.scm | 2 +
gnu/packages/tree-sitter.scm | 124 +-
gnu/packages/upnp.scm | 56 +
gnu/packages/version-control.scm | 56 +-
gnu/packages/video.scm | 249 +-
gnu/packages/vim.scm | 489 +-
gnu/packages/virtualization.scm | 162 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 33 +
gnu/packages/web-browsers.scm | 21 +-
gnu/packages/web.scm | 122 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 5 +-
gnu/packages/wm.scm | 67 +-
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xdisorg.scm | 62 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xorg.scm | 58 +-
gnu/packages/zig-xyz.scm | 72 +-
gnu/packages/zig.scm | 221 +-
gnu/services.scm | 4 +-
gnu/services/admin.scm | 24 +-
gnu/services/audio.scm | 7 +-
gnu/services/base.scm | 141 +-
gnu/services/configuration.scm | 81 +-
gnu/services/cuirass.scm | 7 +-
gnu/services/docker.scm | 260 +-
gnu/services/guix.scm | 23 +-
gnu/services/linux.scm | 11 +-
gnu/services/mcron.scm | 2 +-
gnu/services/networking.scm | 12 +-
gnu/services/rsync.scm | 1 +
gnu/services/telephony.scm | 49 +-
gnu/services/virtualization.scm | 22 +-
gnu/services/vnc.scm | 2 +-
gnu/services/web.scm | 8 +-
gnu/system/accounts.scm | 3 +-
gnu/system/examples/bare-bones.tmpl | 9 +-
gnu/system/file-systems.scm | 2 +-
gnu/system/image.scm | 13 +-
gnu/system/install.scm | 2 +-
gnu/system/shadow.scm | 3 +-
gnu/system/vm.scm | 6 +
gnu/tests.scm | 9 +-
gnu/tests/networking.scm | 156 +-
gnu/tests/virtualization.scm | 19 +-
guix/build-system/android-ndk.scm | 1 -
guix/build-system/ant.scm | 3 +-
guix/build-system/clojure.scm | 4 +-
guix/build-system/dub.scm | 1 -
guix/build-system/go.scm | 11 +-
guix/build-system/guile.scm | 8 +-
guix/build-system/meson.scm | 2 +
guix/build-system/minify.scm | 12 +-
guix/build-system/r.scm | 2 +-
guix/build-system/vim.scm | 170 +
guix/build-system/{dub.scm => zig.scm} | 85 +-
guix/build/ant-build-system.scm | 31 +-
guix/build/cargo-build-system.scm | 41 +-
guix/build/git.scm | 19 +-
guix/build/guile-build-system.scm | 13 +-
guix/build/minetest-build-system.scm | 3 +-
guix/build/minify-build-system.scm | 14 +-
guix/build/syscalls.scm | 34 +-
guix/build/vim-build-system.scm | 119 +
guix/build/zig-build-system.scm | 100 +
guix/channels.scm | 3 +-
guix/download.scm | 2 +-
guix/git-download.scm | 97 +-
guix/git.scm | 43 +-
guix/grafts.scm | 49 +-
guix/import/cabal.scm | 53 +-
guix/import/cran.scm | 4 +-
guix/import/crate.scm | 9 +-
guix/import/hackage.scm | 2 +-
guix/import/opam.scm | 6 +-
guix/import/stackage.scm | 2 +-
guix/inferior.scm | 60 +-
guix/lint.scm | 3 +-
guix/monad-repl.scm | 74 +-
guix/packages.scm | 21 +-
guix/profiles.scm | 86 +-
guix/progress.scm | 3 +-
guix/read-print.scm | 1 +
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 2 +-
guix/scripts/challenge.scm | 2 +-
guix/scripts/container.scm | 2 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/deploy.scm | 2 +-
guix/scripts/describe.scm | 2 +-
guix/scripts/discover.scm | 2 +-
guix/scripts/download.scm | 2 +-
guix/scripts/edit.scm | 8 +-
guix/scripts/environment.scm | 45 +-
guix/scripts/gc.scm | 2 +-
guix/scripts/git.scm | 2 +-
guix/scripts/graph.scm | 2 +-
guix/scripts/hash.scm | 2 +-
guix/scripts/home.scm | 2 +-
guix/scripts/import.scm | 2 +-
guix/scripts/install.scm | 2 +-
guix/scripts/lint.scm | 2 +-
guix/scripts/locate.scm | 50 +-
guix/scripts/offload.scm | 5 +-
guix/scripts/pack.scm | 80 +-
guix/scripts/package.scm | 2 +-
guix/scripts/perform-download.scm | 6 +
guix/scripts/processes.scm | 2 +-
guix/scripts/publish.scm | 2 +-
guix/scripts/pull.scm | 2 +-
guix/scripts/refresh.scm | 2 +-
guix/scripts/remove.scm | 2 +-
guix/scripts/repl.scm | 2 +-
guix/scripts/search.scm | 2 +-
guix/scripts/shell.scm | 12 +-
guix/scripts/show.scm | 2 +-
guix/scripts/size.scm | 2 +-
guix/scripts/style.scm | 4 +-
guix/scripts/substitute.scm | 7 +-
guix/scripts/system.scm | 2 +-
guix/scripts/time-machine.scm | 93 +-
guix/scripts/upgrade.scm | 2 +-
guix/scripts/weather.scm | 2 +-
guix/self.scm | 5 +-
guix/transformations.scm | 25 +-
guix/ui.scm | 21 +-
guix/utils.scm | 7 +
m4/guix.m4 | 6 +-
nix/libstore/build.cc | 4 +-
po/doc/guix-cookbook.de.po | 6321 ++--
po/doc/guix-cookbook.fr.po | 3277 +-
po/doc/guix-manual.de.po | 31622 +++++++++---------
po/doc/guix-manual.es.po | 4 +-
po/doc/guix-manual.fr.po | 30784 +++++++++---------
po/doc/guix-manual.pt_BR.po | 2 +-
po/doc/guix-manual.ru.po | 4 +-
po/doc/guix-manual.zh_CN.po | 31749 ++++++++++---------
po/guix/LINGUAS | 1 +
po/guix/{zh_CN.po => ca.po} | 1561 +-
po/guix/es.po | 11 +-
po/guix/it.po | 13 +-
po/guix/zh_CN.po | 85 +-
po/packages/zh_CN.po | 15 +-
tests/crate.scm | 40 +-
tests/gexp.scm | 59 +-
tests/grafts.scm | 50 +-
tests/guix-environment-container.sh | 2 +-
tests/guix-locate.sh | 6 +
tests/guix-pack.sh | 4 +-
tests/guix-shell.sh | 33 +-
tests/guix-system.sh | 4 +
tests/guix-time-machine.sh | 26 +-
tests/hackage.scm | 47 +-
tests/pack.scm | 35 +-
tests/profiles.scm | 28 +-
tests/read-print.scm | 5 +
tests/services/configuration.scm | 6 +-
tests/substitute.scm | 47 +-
tests/syscalls.scm | 8 +
tests/transformations.scm | 5 +
410 files changed, 88343 insertions(+), 61240 deletions(-)
diff --cc gnu/packages/apl.scm
index 6a8d97848b,afe02736ad..6f4555d96f
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@@ -120,3 -123,86 +123,86 @@@ single line drawing characters, as wel
including both uppercase and lowercase underscored alphabets, as-of-yet unused
symbols, and almost all Latin-1 accented letters.")
(license license:unlicense))))
+
+ (define-public dzaima-apl
+ (package
+ (name "dzaima-apl")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dzaima/APL.git";)
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1hnrq0mlff6b9c9129afphcnmzd05wdyyfs905n421diyd5xa0il"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (inputs (list bash-minimal openjdk18))
+ (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:)
+ (guix build utils)
+ (ice-9 ftw)
+ (ice-9 regex)
+ (srfi srfi-26))
+ #:phases
+ `(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((javac (search-input-file inputs "/bin/javac"))
+ (jar (search-input-file inputs "/bin/jar")))
+ (mkdir-p "src/build")
+ (apply invoke javac "-encoding" "UTF-8" "-d" "src/build"
+ (let ((files '()))
+ (ftw "src/APL/"
+ (lambda (filename statinfo flags)
+ (if (string-match ".*\\.java" filename)
+ (set! files (cons filename files)))
+ #t))
+ files))
+ (with-directory-excursion "src/build"
+ (invoke jar "--create" "--verbose"
+ "--file=dzaima-apl.jar"
+ "--main-class=APL.Main"
+ "APL")))))
+ (delete 'check) ;; Upstream implements no tests
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (share (string-append out "/share/java"))
+ (wrapper (string-append bin "/dzaima-apl")))
+ (mkdir-p share)
+ (mkdir-p bin)
+ (install-file "src/build/dzaima-apl.jar" share)
+ (with-output-to-file wrapper
+ (lambda _
+ (display (string-append
+ "#!" (search-input-file inputs "/bin/sh") "\n"
+ (search-input-file inputs "/bin/java")
+ " -jar " share "/dzaima-apl.jar \"$@\""))))
+ (chmod wrapper #o555))))
+ (add-after 'install 'reorder-jar-content
+ (lambda* (#:key outputs #:allow-other-keys)
+ (apply (assoc-ref ant:%standard-phases 'reorder-jar-content)
+ #:outputs (list outputs))))
+ (add-after 'reorder-jar-content 'generate-jar-indices
+ (lambda* (#:key outputs #:allow-other-keys)
+ (apply (assoc-ref ant:%standard-phases 'generate-jar-indices)
+ #:outputs (list outputs))))
+ (add-after 'generate-jar-indices 'reorder-jar-content
+ (lambda* (#:key outputs #:allow-other-keys)
+ (apply (assoc-ref ant:%standard-phases 'reorder-jar-content)
+ #:outputs (list outputs)))))))
+ (home-page "https://github.com/dzaima/APL";)
+ (synopsis "Implementation of the APL programming language in Java")
+ (description
+ "This package provides an implementation of APL in Java, extended from
+ Dyalog APL.")
+ (license license:expat)))
diff --cc gnu/packages/base.scm
index 311d598c8e,ea6fdc3b88..235ad7fecc
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -1100,41 -1091,9 +1102,42 @@@ 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-ldd-powerpc.patch"
++ (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)
+ ((#: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
diff --cc gnu/packages/ci.scm
index 3ba3ea6f2c,a367a5778b..4b1254932c
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@@ -73,76 -73,68 +74,69 @@@
(file-name (git-file-name name version))
(sha256
(base32
- "10hs9nxl9xlnswm7qv8mw5s3rf65q4ip8ikqvgq5rprcv1lf26ad"))))
+ "031vv3rk7vzal611iq8sgq5yackp78kdpz8qn78j561pl9bip80n"))))
(build-system gnu-build-system)
(arguments
- `(#:modules ((guix build utils)
- (guix build gnu-build-system)
- (ice-9 rdelim)
- (ice-9 popen))
- #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
- ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them
- ;; on that architecture for now.
- #:tests? ,(let ((s (or (%current-target-system)
- (%current-system))))
- (not (string-prefix? "aarch64" s)))
- #:parallel-tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'bootstrap 'fix-version-gen
- (lambda _
- (patch-shebang "build-aux/git-version-gen")
+ (list #:modules `((guix build utils)
+ (guix build gnu-build-system)
+ (ice-9 match)
+ (ice-9 rdelim)
+ (ice-9 popen)
+ (srfi srfi-1))
+ #:configure-flags #~'("--localstatedir=/var") ;for
/var/log/cuirass
+ ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable
them
+ ;; on that architecture for now.
+ #:tests? (let ((s (or (%current-target-system)
+ (%current-system))))
+ (not (string-prefix? "aarch64" s)))
+ #:parallel-tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'bootstrap 'fix-version-gen
+ (lambda _
+ (patch-shebang "build-aux/git-version-gen")
- (call-with-output-file ".tarball-version"
- (lambda (port)
- (display ,version port)))))
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Wrap the 'cuirass' command to refer to the right modules.
- (let* ((out (assoc-ref outputs "out"))
- (avahi (assoc-ref inputs "guile-avahi"))
- (gcrypt (assoc-ref inputs "guile-gcrypt"))
- (json (assoc-ref inputs "guile-json"))
- (zmq (assoc-ref inputs "guile-simple-zmq"))
- (squee (assoc-ref inputs "guile-squee"))
- (git (assoc-ref inputs "guile-git"))
- (bytes (assoc-ref inputs "guile-bytestructures"))
- (fibers (assoc-ref inputs "guile-fibers"))
- (zlib (assoc-ref inputs "guile-zlib"))
- (matd (assoc-ref inputs "guile-mastodon"))
- (tls (assoc-ref inputs "guile-gnutls"))
- (mail (assoc-ref inputs "mailutils"))
- (guix (assoc-ref inputs "guix"))
- (deps (list avahi gcrypt json zmq squee git bytes
- fibers zlib matd tls mail guix))
- (guile (assoc-ref inputs "guile"))
- (effective
- (read-line
- (open-pipe* OPEN_READ
- (string-append guile "/bin/guile")
- "-c" "(display (effective-version))")))
- (mods
- (string-drop-right ;drop trailing colon
- (string-join deps
- (string-append "/share/guile/site/"
- effective ":")
- 'suffix)
- 1))
- (objs
- (string-drop-right
- (string-join deps
- (string-append "/lib/guile/" effective
- "/site-ccache:")
- 'suffix)
- 1)))
- ;; Make sure 'cuirass' can find the relevant Guile modules.
- (wrap-program (string-append out "/bin/cuirass")
- `("PATH" ":" prefix (,(string-append out "/bin")))
- `("GUILE_LOAD_PATH" ":" prefix (,mods))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))))))))
+ (call-with-output-file ".tarball-version"
+ (lambda (port)
+ (display #$(package-version this-package) port)))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Wrap the 'cuirass' command to refer to the right
modules.
+ ;; Do so by collecting the subset of INPUTS that
provides Guile
+ ;; modules. This includes direct inputs as well as their
+ ;; propagated inputs--e.g., 'guix' propagates
'guile-zstd'.
+ (define (sub-directory suffix)
+ (match-lambda
+ ((label . directory)
+ (let ((directory (string-append directory suffix)))
+ (and (directory-exists? directory)
+ directory)))))
+
+ (let* ((out (assoc-ref outputs "out"))
+ (effective
+ (read-line
+ (open-pipe* OPEN_READ (which "guile") "-c"
+ "(display (effective-version))")))
+ (mods (filter-map (sub-directory
+ (string-append
+ "/share/guile/site/"
+ effective))
+ inputs))
+ (objs (filter-map (sub-directory
+ (string-append
+ "/lib/guile/" effective
+ "/site-ccache"))
+ inputs)))
+ (wrap-program (string-append out "/bin/cuirass")
+ `("PATH" ":" prefix
+ (,(string-append out "/bin")))
+ `("GUILE_LOAD_PATH" ":" prefix
+ ,mods)
+ `("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
diff --cc gnu/packages/cups.scm
index a2bf9b70bb,3b86b7f610..d5eacd2442
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -207,21 -205,20 +208,24 @@@ driver is known to work with these prin
(find-files (string-append #$output
"/lib/cups/filter"))))))))
(native-inputs
- (list `(,glib "bin") ;for gdbus-codegen
- pkg-config))
+ (append (if (%current-target-system)
+ (list cups-minimal)
+ '())
+ (list `(,glib "bin") ; for gdbus-codegen
+ 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
libjpeg-turbo
libpng
diff --cc gnu/packages/engineering.scm
index f2953068ca,0351967a64..e4e302e2a4
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@@ -3179,18 -3258,21 +3255,21 @@@ program that can perform mesh processin
(delete-file "libpoke/pvm-vm1.c")
(delete-file "libpoke/pvm-vm2.c")))))
(build-system gnu-build-system)
- ;; The GUI, which we elide, requires tcl and tk.
(native-inputs (list bison dejagnu flex libtool pkg-config))
;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged).
- (inputs (list json-c libgc readline libtextstyle))
+ (inputs (list libgc readline libtextstyle))
(arguments
- ;; To build the GUI, add the `--enable-gui' configure flag.
- ;; To enable the "hyperlink server", add the `--enable-hserver' flag.
- `(#:configure-flags
- '("--enable-mi"
- "--disable-static"
- ;; The emacs files are provided in emacs-poke.
- "--with-lispdir=/tmp/share/emacs")))
+ (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))
+ #:configure-flags
+ #~(list "--disable-static"
+ (string-append "--with-lispdir="
+ (emacs:elpa-directory #$output)))))
(home-page "https://www.gnu.org/software/poke/#documentation";)
(synopsis "Editing of arbitrary binary data")
(description "GNU poke is an interactive, extensible editor for binary
data.
diff --cc gnu/packages/fontutils.scm
index d933382ede,5bfdea1b27..1f4204fb94
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -18,7 -18,7 +18,8 @@@
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+ ;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gcc.scm
index 313a92d8aa,e352cff5f9..96e0d81d98
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -1044,10 -1058,9 +1043,9 @@@ as the 'native-search-paths' field.
(package-outputs gcc)
(delete "lib" (package-outputs gcc))))
(native-search-paths search-paths)
- (properties (alist-delete 'hidden? (package-properties gcc)))
(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)
diff --cc gnu/packages/guile-xyz.scm
index 29da60fdbb,f3fc131aaa..c4b64a9100
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@@ -753,10 -755,11 +755,11 @@@ 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
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
diff --cc gnu/packages/java.scm
index 490492f68f,d73550c042..93f4fabecb
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -878,7 -880,14 +880,14 @@@ new Date();")
(build-system gnu-build-system)
(outputs '("out" "jdk" "doc"))
(arguments
- `(#:tests? #f; require jtreg
+ `(#: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
#:make-flags '("all")
#:disallowed-references ,(list (gexp-input icedtea-8)
(gexp-input icedtea-8 "jdk"))
diff --cc gnu/packages/linux.scm
index 692844c7da,4df8135a78..430645e4ad
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -5188,31 -5230,30 +5219,31 @@@ thanks to the use of namespaces."
(find-files "libexec" "functions")
(find-files "libexec/bootstrap-scripts" ".*sh$")
(find-files "libexec/cli" ".*exec$"))
- (("\\| grep ")
- (string-append "| " (which "grep") " "))
- (("egrep ")
- (string-append (which "egrep") " "))
- ((" sed ")
- (string-append " " (which "sed") " ")))
- #t))
- (add-after 'install 'set-PATH
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Have the 'singularity' and 'run-singularity' self-sufficient.
- (let ((out (assoc-ref outputs "out"))
- (coreutils (assoc-ref inputs "coreutils")))
- (wrap-program (string-append out "/bin/singularity")
- `("PATH" ":" = (,(string-append coreutils "/bin"))))
- (substitute* (string-append out "/bin/run-singularity")
- (("/usr/bin/env singularity")
- (string-append (which "env") " "
- out "/bin/singularity")))
- #t))))))
+ (("\\| grep ")
+ (string-append "| " (which "grep") " "))
+ (("egrep ")
+ (string-append (which "egrep") " "))
+ ((" sed ")
+ (string-append " " (which "sed") " ")))))
+ (add-after 'install 'set-PATH
+ (lambda _
+ ;; Have the 'singularity' and 'run-singularity' self-sufficient.
+ ;; But don't override PATH, so that other tools like zcat and
+ ;; tar can still be found if they are available.
+ (let ((coreutils #$(this-package-input "coreutils")))
+ (wrap-program (string-append #$output "/bin/singularity")
+ `("PATH" prefix (,(string-append coreutils "/bin"))))
+ (substitute* (string-append #$output "/bin/run-singularity")
+ (("/usr/bin/env singularity")
+ (string-append (which "env") " "
+ #$output "/bin/singularity")))))))))
(inputs
- `(("bash" ,bash-minimal) ; for wrap-program
- ("libarchive" ,libarchive)
- ("python" ,python-wrapper)
- ("zlib" ,zlib)
- ("squashfs-tools" ,squashfs-tools)))
- (list coreutils
++ (list bash-minimal ;for 'wrap-program'
++ coreutils
+ libarchive
+ python-wrapper
+ squashfs-tools
+ zlib))
(home-page "https://singularity.lbl.gov/";)
(synopsis "Container platform")
(description "Singularity is a container platform supporting a number of
diff --cc gnu/packages/password-utils.scm
index 62f7377555,385bd64985..754ea035ce
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@@ -696,7 -699,7 +696,8 @@@ any X11 window."
(separator #f) ;single entry
(files '("lib/password-store/extensions")))))
(inputs
- (list coreutils
+ (list bash-minimal
++ coreutils
dmenu
util-linux
git
diff --cc gnu/packages/ssh.scm
index f4ba512873,47089b197d..31f7b54641
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@@ -493,14 -490,13 +491,14 @@@ with optional @acronym{TLS, Transport-L
(native-inputs
(list pkg-config))
(inputs
- `(("bash" ,bash-minimal) ; for wrap-program
- ("openssl" ,openssl)
- ("perl" ,perl)
- ("perl-io-tty" ,perl-io-tty)
- ("zlib" ,zlib)
- ("ncurses" ,ncurses)
- ("protobuf" ,protobuf)
- ("boost-headers" ,boost)))
- (list boost
++ (list bash-minimal ;for 'wrap-program'
++ boost
+ ncurses
+ openssl
+ perl
+ perl-io-tty
+ protobuf
+ zlib))
(home-page "https://mosh.org/";)
(synopsis "Remote shell tolerant to intermittent connectivity")
(description
diff --cc gnu/packages/video.scm
index 1a24bdc86c,270bb9b4fe..afc93ad169
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1820,10 -1895,10 +1896,10 @@@ audio/video codec library."
version ".tar.xz"))
(sha256
(base32
- "1rijdvcx8xjqwh084qchwz91vcj8wsvb4diax0g8miywpir00ccw"))))
+ "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv"))))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-4)
- ((#:modules modules %gnu-build-system-modules)
+ ((#:modules modules %default-gnu-modules)
`((srfi srfi-1)
,@modules))
((#:configure-flags flags)
diff --cc gnu/packages/xdisorg.scm
index c4606d1eb3,485d55a8d3..4b5d03836d
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -517,8 -517,7 +517,8 @@@ avoiding password prompts when X11 forw
version ".tar.xz"))
(sha256
(base32
- "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l"))))
+ "0awwz5pg9x5bj0d7dpg4a7bd4gl6k55mlpxwb12534fkrpn19p0f"))))
+ (outputs '("out" "doc"))
(build-system meson-build-system)
(inputs
(list libx11
diff --cc guix/build-system/android-ndk.scm
index 23e14c7801,aa7cc06279..b8cd56b871
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@@ -31,8 -31,7 +31,7 @@@
(define %android-ndk-build-system-modules
;; Build-side modules imported by default.
`((guix build android-ndk-build-system)
- (guix build syscalls)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
(define* (android-ndk-build name inputs
#:key
diff --cc guix/build-system/ant.scm
index c8beea010c,84bf951fab..9816cc061c
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@@ -43,8 -43,7 +43,7 @@@
(guix build maven plugin)
(guix build maven pom)
(guix build java-utils)
- (guix build syscalls)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
(define (default-jdk)
"Return the default JDK package."
diff --cc guix/build-system/dub.scm
index d53acd96e5,951c084398..831a34af0d
--- a/guix/build-system/dub.scm
+++ b/guix/build-system/dub.scm
@@@ -59,8 -59,7 +59,7 @@@
(define %dub-build-system-modules
;; Build-side modules imported by default.
`((guix build dub-build-system)
- (guix build syscalls)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
(define* (dub-build name inputs
#:key
diff --cc guix/build-system/minify.scm
index 21c17d1eb1,b377b506b5..98c6e75980
--- a/guix/build-system/minify.scm
+++ b/guix/build-system/minify.scm
@@@ -39,13 -39,13 +39,13 @@@
(define %minify-build-system-modules
;; Build-side modules imported by default.
`((guix build minify-build-system)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
- (define (default-uglify-js)
+ (define (default-esbuild)
"Return the default package to minify JavaScript source files."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((mod (resolve-interface '(gnu packages uglifyjs))))
- (module-ref mod 'uglifyjs)))
+ (let ((mod (resolve-interface '(gnu packages web))))
+ (module-ref mod 'esbuild)))
(define* (lower name
#:key source inputs native-inputs outputs system
diff --cc guix/build-system/zig.scm
index d53acd96e5,16b8a712cc..41751f9116
--- a/guix/build-system/zig.scm
+++ b/guix/build-system/zig.scm
@@@ -29,40 -25,24 +25,24 @@@
#:use-module (guix packages)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
- #:export (dub-build-system))
+ #:use-module (ice-9 match)
+ #:use-module (srfi srfi-26)
+ #:export (zig-build-system))
- (define (default-ldc)
- "Return the default ldc package."
- ;; Lazily resolve the binding to avoid a circular dependency.
- (let ((ldc (resolve-interface '(gnu packages dlang))))
- (module-ref ldc 'ldc)))
-
- (define (default-dub)
- "Return the default dub package."
- ;; Lazily resolve the binding to avoid a circular dependency.
- (let ((ldc (resolve-interface '(gnu packages dlang))))
- (module-ref ldc 'dub)))
-
- (define (default-pkg-config)
- "Return the default pkg-config package."
- ;; Lazily resolve the binding to avoid a circular dependency.
- (let ((pkg-config (resolve-interface '(gnu packages pkg-config))))
- (module-ref pkg-config 'pkg-config)))
- (define (default-ld-gold-wrapper)
- "Return the default ld-gold-wrapper package."
- ;; LDC doesn't work with Guix's default (BFD) linker.
+ (define (default-zig)
+ "Return the default zig package."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((commencement (resolve-interface '(gnu packages commencement))))
- (module-ref commencement 'ld-gold-wrapper)))
+ (let ((zig (resolve-interface '(gnu packages zig))))
+ (module-ref zig 'zig)))
- (define %dub-build-system-modules
+ (define %zig-build-system-modules
;; Build-side modules imported by default.
- `((guix build dub-build-system)
+ `((guix build zig-build-system)
(guix build syscalls)
- ,@%gnu-build-system-modules))
+ ,@%default-gnu-imported-modules))
- (define* (dub-build name inputs
+ (define* (zig-build name inputs
#:key
source
(tests? #t)