From f7a781d0e8bd591a4efad3dcca965a7ac5d8da3e Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 24 Apr 2022 08:21:59 +0200 Subject: [PATCH v2 15/25] gnu: Add rust-wayland-protocols-0.29. * gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.29): New variable. (rust-wayland-protocols-0.23): Inherit from above. (rust-wayland-protocols-0.28): Remove variable. * gnu/packages/crates-io.scm: Update comment. diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index f2eaedf624..8fdd64bb1a 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2608,25 +2608,30 @@ (define-public rust-wayland-egl-0.28 initializing an OpenGL or Vulkan context.") (license license:expat))) -(define-public rust-wayland-protocols-0.28 +(define-public rust-wayland-protocols-0.29 (package (name "rust-wayland-protocols") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-protocols" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii")))) + (base32 "0hap8vky2fwsq05c98c8xs00gb9m5kxp8kq3zr0jwh036gi7l530")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1)))) + (("rust-bitflags" ,rust-bitflags-1)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-cfg-if" ,rust-cfg-if-1)))) (inputs - (list rust-bitflags-1 rust-wayland-client-0.28 - rust-wayland-commons-0.28 rust-wayland-scanner-0.28 - rust-wayland-server-0.28)) + (list rust-bitflags-1.2 + rust-wayland-client-0.29 + rust-wayland-commons-0.29 + rust-wayland-scanner-0.29 + rust-wayland-server-0.29)) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generated API for the officials Wayland protocol extensions") (description @@ -2636,7 +2641,7 @@ (define-public rust-wayland-protocols-0.28 (define-public rust-wayland-protocols-0.23 (package - (inherit rust-wayland-protocols-0.28) + (inherit rust-wayland-protocols-0.29) (name "rust-wayland-protocols") (version "0.23.6") (source diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 957f30329f..7984daf84f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7128,9 +7128,10 @@ (define-public rust-bitflags-1 (license (list license:asl2.0 license:expat)))) -;; XXX: The package below is meant to fix rust-nix-0.22, which has the -;; following requirements for bitflags version: ">=1.1.0 <1.3.0", and every -;; package using the latter as a dependency (e.g., nushell 0.43). +;; XXX: The package below is meant to fix rust-nix-0.22 and +;; rust-wayland-protocols, which has the following requirements for bitflags +;; version: ">=1.1.0 <1.3.0", and every package using the latter as a dependency +;; (e.g., nushell 0.43). (define-public rust-bitflags-1.2 (package (inherit rust-bitflags-1) -- 2.35.1