diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
| commit | 25c14c893f05019d746321285acf55d1aa65b943 (patch) | |
| tree | 9c0a728b3c723fd171668713e0755a79a2034098 /gnu/local.mk | |
| parent | 71a3dca25cd25f63c8fc17498a9a729e545f1890 (diff) | |
| parent | 4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff) | |
| download | guix-25c14c893f05019d746321285acf55d1aa65b943.tar guix-25c14c893f05019d746321285acf55d1aa65b943.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index e42c3c815c..dcd320fec4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -56,7 +56,7 @@ # Copyright © 2022 Alex Griffin <a@ajgrf.com> # Copyright © 2022 ( <paren@disroot.org> # Copyright © 2022 jgart <jgart@dismail.de> -# Copyright © 2023 Zheng Junjie <873216071@qq.com> +# Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com> # Copyright © 2023 Andy Tai <atai@atai.org> # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> @@ -202,9 +202,15 @@ GNU_SYSTEM_MODULES = \ %D%/packages/cpp.scm \ %D%/packages/cppi.scm \ %D%/packages/cran.scm \ + %D%/packages/crates-apple.scm \ + %D%/packages/crates-crypto.scm \ %D%/packages/crates-io.scm \ %D%/packages/crates-graphics.scm \ %D%/packages/crates-gtk.scm \ + %D%/packages/crates-tls.scm \ + %D%/packages/crates-vcs.scm \ + %D%/packages/crates-web.scm \ + %D%/packages/crates-windows.scm \ %D%/packages/cross-base.scm \ %D%/packages/cross-toolchain.scm \ %D%/packages/crypto.scm \ @@ -975,7 +981,6 @@ 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/bind-re-add-attr-constructor-priority.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 \ @@ -1411,7 +1416,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fibers-libevent-timeout.patch \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ - %D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ @@ -1523,7 +1527,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ - %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/lightdm-arguments-ordering.patch \ @@ -1816,7 +1819,6 @@ dist_patch_DATA = \ %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 \ - %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-uqbar-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ @@ -2009,13 +2011,14 @@ dist_patch_DATA = \ %D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ - %D%/packages/patches/rust-ring-0.16-missing-files.patch \ - %D%/packages/patches/rust-ring-0.16-test-files.patch \ - %D%/packages/patches/i3status-rust-enable-unstable-features.patch \ + %D%/packages/patches/rust-cargo-edit-remove-ureq.patch \ + %D%/packages/patches/rust-ring-0.17-ring-core.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %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-rspec-1-remove-clippy.patch \ + %D%/packages/patches/rust-trash-2-update-windows.patch \ %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ |