From b7b3692014a770660ebfaa9f456c04955c7b418d Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 24 Apr 2022 14:37:29 +0200 Subject: [PATCH v2 25/25] gnu: Add wl-clipboard-rs-0.6. * gnu/local.mk: Remove patch. * gnu/packages/crates-io.scm (wl-clipboard-rs-0.6): Add new variable. (wl-clipboard-rs-0.4): Remove variable. * gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch: Remove file. diff --git a/gnu/local.mk b/gnu/local.mk index c8efbe4516..79042c65ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1783,7 +1783,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-shell2batch-lint-fix.patch \ %D%/packages/patches/rust-winit-remove-windows-and-ios.patch \ - %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.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 \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6c2bdd003..7d623b0e8d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -69876,38 +69876,34 @@ (define-public rust-watchexec-1 modifications.") (license license:asl2.0))) -(define-public rust-wl-clipboard-rs-0.4 +(define-public rust-wl-clipboard-rs-0.6 (package (name "rust-wl-clipboard-rs") - (version "0.4.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "wl-clipboard-rs" version)) (file-name (string-append name "-" version ".tar.gz")) - (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch")) (sha256 - (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13")))) + (base32 "12ydiayklrls2ys8ig2rljl86z21ixg672zhdsprnaiqpz8s6p5y")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) ("rust-derive-more" ,rust-derive-more-0.99) - ("rust-exitfailure" ,rust-exitfailure-0.5) - ("rust-failure" ,rust-failure-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-mime-guess" ,rust-mime-guess-2) - ("rust-nix" ,rust-nix-0.18) - ("rust-os-pipe" ,rust-os-pipe-0.9) - ("rust-stderrlog" ,rust-stderrlog-0.4) - ("rust-structopt" ,rust-structopt-0.3) + ("rust-nix" ,rust-nix-0.23) + ("rust-os-pipe" ,rust-os-pipe-1) ("rust-tempfile" ,rust-tempfile-3) - ("rust-tree-magic" ,rust-tree-magic-0.2) - ("rust-wayland-client" ,rust-wayland-client-0.28) - ("rust-wayland-commons" ,rust-wayland-commons-0.28) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))) + ("rust-tree-magic-mini" ,rust-tree-magic-mini-3) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) + #:cargo-development-inputs + (("rust-wayland-protocols" ,rust-wayland-protocols-0.29) + ("rust-wayland-server" ,rust-wayland-server-0.29)))) (home-page "https://github.com/YaLTeR/wl-clipboard-rs") (synopsis "Access to the Wayland clipboard") (description "This package provides access to the Wayland clipboard diff --git a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch deleted file mode 100644 index 9fb692e9a6..0000000000 --- a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 7b975e0..313cb63 100644 ---- a/Cargo.toml -+++ b/Cargo.toml.new -@@ -75,17 +75,17 @@ version = "3" - version = "0.2" - - [dependencies.wayland-client] --version = "0.27" -+version = "0.28" - - [dependencies.wayland-protocols] --version = "0.27" -+version = "0.28" - features = ["client", "unstable_protocols"] - [dev-dependencies.wayland-protocols] --version = "0.27" -+version = "0.28" - features = ["server", "unstable_protocols"] - - [dev-dependencies.wayland-server] --version = "0.27" -+version = "0.28" - - [features] - dlopen = ["native_lib", "wayland-client/dlopen", "wayland-server/dlopen"] -- 2.35.1