Merge branch 'master' into staging.

With resolved conflicts in:
	gnu/local.mk
	gnu/packages/crates-io.scm
This commit is contained in:
Maxim Cournoyer 2022-09-27 14:24:37 -04:00
commit 3c6e220d81
No known key found for this signature in database
GPG key ID: 1260E46482E63562
119 changed files with 8473 additions and 2818 deletions

View file

@ -3282,7 +3282,10 @@ crate @code{rust-wayland-client} for usable bindings.")
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-web-sys" ,rust-web-sys-0.3)
("rust-winapi" ,rust-winapi-0.3)
("rust-x11-dl" ,rust-x11-dl-2))))
("rust-x11-dl" ,rust-x11-dl-2))
#:cargo-development-inputs
(("rust-console-log" ,rust-console-log-0.2)
("rust-simple-logger" ,rust-simple-logger-1))))
(inputs
(list rust-wayland-client-0.29 rust-wayland-protocols-0.29))
(home-page "https://github.com/rust-windowing/winit")
@ -3338,7 +3341,10 @@ the platform-specific getters provided by winit, or another library.")
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-web-sys" ,rust-web-sys-0.3)
("rust-winapi" ,rust-winapi-0.3)
("rust-x11-dl" ,rust-x11-dl-2))))
("rust-x11-dl" ,rust-x11-dl-2))
#:cargo-development-inputs
(("rust-console-log" ,rust-console-log-0.2)
("rust-simple-logger" ,rust-simple-logger-1))))
(inputs
(list rust-wayland-client-0.28))))