diff options
author | Liliana Marie Prikler <[email protected]> | 2024-02-03 14:39:49 +0100 |
---|---|---|
committer | Liliana Marie Prikler <[email protected]> | 2024-02-03 14:39:49 +0100 |
commit | e6c847defb6cb25c65172dec46a322e5d3d45088 (patch) | |
tree | 3d249dce1a1f58fcb3c83a41eaf9e1525d7b112e /gnu/local.mk | |
parent | 3aef72ec5bf1027bc557daab7010848d80711a28 (diff) | |
parent | 179bb57d2532ee6b81791e078b0f782cbf88cb84 (diff) |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3f06372b91..f6ea8c4154 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012-2024 Ludovic Courtès <[email protected]> -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge <[email protected]> +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <[email protected]> # Copyright © 2016 Mathieu Lirzin <[email protected]> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <[email protected]> # Copyright © 2016 Chris Marusich <[email protected]> @@ -13,14 +13,14 @@ # Copyright © 2016-2023 Efraim Flashner <[email protected]> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <[email protected]> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]> -# Copyright © 2017, 2018, 2023 Clément Lassieur <[email protected]> +# Copyright © 2017, 2018, 2023, 2024 Clément Lassieur <[email protected]> # Copyright © 2017, 2020 Mathieu Othacehe <[email protected]> # Copyright © 2017, 2018, 2019 Gábor Boskovits <[email protected]> # Copyright © 2018 Amirouche Boubekki <[email protected]> # Copyright © 2018, 2019, 2020, 2021, 2022 Oleg Pykhalov <[email protected]> # Copyright © 2018 Stefan Stefanović <[email protected]> -# Copyright © 2018, 2020, 2021, 2022, 2023 Maxim Cournoyer <[email protected]> -# Copyright © 2019, 2020, 2021, 2022, 2044 Guillaume Le Vaillant <[email protected]> +# Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <[email protected]> +# Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <[email protected]> # Copyright © 2019, 2020 John Soo <[email protected]> # Copyright © 2019 Jonathan Brielmaier <[email protected]> # Copyright © 2019 Evan Straw <[email protected]> @@ -97,6 +97,7 @@ GNU_SYSTEM_MODULES = \ %D%/home/services.scm \ %D%/home/services/desktop.scm \ %D%/home/services/dict.scm \ + %D%/home/services/dotfiles.scm \ %D%/home/services/symlink-manager.scm \ %D%/home/services/fontutils.scm \ %D%/home/services/gnupg.scm \ @@ -308,7 +309,9 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ %D%/packages/golang-check.scm \ + %D%/packages/golang-crypto.scm \ %D%/packages/golang-web.scm \ + %D%/packages/golang-xyz.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ %D%/packages/gps.scm \ @@ -544,6 +547,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ + %D%/packages/quantum.scm \ %D%/packages/racket.scm \ %D%/packages/radio.scm \ %D%/packages/ragel.scm \ @@ -630,6 +634,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tls.scm \ %D%/packages/tmux.scm \ %D%/packages/toolkits.scm \ + %D%/packages/tor-browsers.scm \ %D%/packages/tor.scm \ %D%/packages/tree-sitter.scm \ %D%/packages/tv.scm \ @@ -1118,25 +1123,25 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ %D%/packages/patches/emacs-exec-path.patch \ - %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ + %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ + %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ + %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ + %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ + %D%/packages/patches/emacs-shx-byte-compilation-test.patch \ %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-yasnippet-fix-empty-snippet-next.patch \ - %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ - %D%/packages/patches/emacs-kv-fix-tests.patch \ - %D%/packages/patches/emacs-pgtk-super-key-fix.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 \ @@ -1652,6 +1657,7 @@ dist_patch_DATA = \ %D%/packages/patches/lua-liblua-so.patch \ %D%/packages/patches/lua-5.4-pkgconfig.patch \ %D%/packages/patches/lua-5.4-liblua-so.patch \ + %D%/packages/patches/lugaru-fix-sound.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ @@ -1719,7 +1725,6 @@ dist_patch_DATA = \ %D%/packages/patches/network-manager-meson.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nnpack-system-libraries.patch \ - %D%/packages/patches/notmuch-emacs-test-output.patch \ %D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ @@ -1761,6 +1766,7 @@ dist_patch_DATA = \ %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-gcc-13-ppc64le-fzero-call-used-regs.patch \ %D%/packages/patches/openssh-trust-guix-store-directory.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openrgb-unbundle-hueplusplus.patch \ @@ -1802,6 +1808,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.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 \ @@ -1916,7 +1923,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch \ %D%/packages/patches/python-pillow-CVE-2022-45199.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ - %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ @@ -1932,6 +1938,7 @@ dist_patch_DATA = \ %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 \ @@ -1962,7 +1969,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ %D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ - %D%/packages/patches/range-v3-build-with-gcc10.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoison-shell.patch \ @@ -1972,6 +1978,7 @@ dist_patch_DATA = \ %D%/packages/patches/renpy-use-system-fribidi.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch \ + %D%/packages/patches/r-sapa-lapack.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ @@ -2009,6 +2016,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \ + %D%/packages/patches/s7-flint-3.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ @@ -2101,8 +2109,8 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ - %D%/packages/patches/u-boot-patman-change-id.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ |