From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 68819@debbugs.gnu.org
Cc: Herman Rimm <herman@rimm.ee>, Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#68819] [PATCH 40/49] gnu: i3status-rust: Update to 0.32.3.
Date: Tue, 30 Jan 2024 16:25:23 +0100 [thread overview]
Message-ID: <b1730ba48ea063c742604d14c4024d786007f56f.1706619963.git.herman@rimm.ee> (raw)
In-Reply-To: <cover.1706619961.git.herman@rimm.ee>
* gnu/packages/rust-apps.scm (i3status-rust): Update to 0.32.3.
Change-Id: I84e34ee0f60c3c10a013e3b8edc42f157db5732c
---
gnu/local.mk | 1 -
...status-rust-enable-unstable-features.patch | 20 ----
gnu/packages/rust-apps.scm | 100 ++++++++++++------
3 files changed, 65 insertions(+), 56 deletions(-)
delete mode 100644 gnu/packages/patches/i3status-rust-enable-unstable-features.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a215c1e84b..c036dd4894 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2003,7 +2003,6 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.70-fix-rustix-build.patch \
%D%/packages/patches/rust-cargo-edit-remove-ureq.patch \
%D%/packages/patches/rust-ring-0.17-ring-core.patch \
- %D%/packages/patches/i3status-rust-enable-unstable-features.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 \
diff --git a/gnu/packages/patches/i3status-rust-enable-unstable-features.patch b/gnu/packages/patches/i3status-rust-enable-unstable-features.patch
deleted file mode 100644
index 535b45d865..0000000000
--- a/gnu/packages/patches/i3status-rust-enable-unstable-features.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3006390c0058f06c255d9850327163aebcdc3b40 Mon Sep 17 00:00:00 2001
-From: Petr Hodina <phodina@protonmail.com>
-Date: Mon, 11 Oct 2021 22:35:39 +0200
-Subject: [PATCH] Enable unstable features.
-
-
-diff --git a/src/main.rs b/src/main.rs
-index d9e964b..820e22e 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -1,3 +1,6 @@
-+#![feature(bool_to_option)]
-+#![feature(clamp)]
-+
- #[macro_use]
- mod de;
- #[macro_use]
---
-2.33.0
-
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 2d714c4861..8b21080e31 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -768,7 +768,7 @@ (define-public hyperfine
(define-public i3status-rust
(package
(name "i3status-rust")
- (version "0.20.1")
+ (version "0.32.3")
(source
(origin
(method git-fetch)
@@ -776,42 +776,71 @@ (define-public i3status-rust
(url "https://github.com/greshake/i3status-rust")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
- (patches (search-patches "i3status-rust-enable-unstable-features.patch"))
(sha256
- (base32 "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"))))
+ (base32 "11n32kkfwlv38mj9018hp5rbg4w3d1vq9f6x8rhqahs19mm5amqa"))))
(build-system cargo-build-system)
(arguments
- `(#:features '("pulseaudio" "libpulse-binding")
- #:install-source? #f
+ `(#:install-source? #f
#:cargo-inputs
- (("rust-chrono" ,rust-chrono-0.4)
- ("rust-chrono-tz" ,rust-chrono-tz-0.5)
- ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
- ("rust-curl" ,rust-curl-0.4)
- ("rust-dbus" ,rust-dbus-0.9)
- ("rust-dbus-tree" ,rust-dbus-tree-0.9)
- ("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-nix" ,rust-nix-0.20)
- ("rust-nl80211" ,rust-nl80211-0.0.2)
+ (("rust-anyhow" ,rust-anyhow-1) ; Dependency of xtask.
+ ("rust-async-once-cell" ,rust-async-once-cell-0.5)
+ ("rust-async-trait" ,rust-async-trait-0.1)
+ ("rust-backon" ,rust-backon-0.4)
+ ("rust-calibright" ,rust-calibright-0.1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-chrono-tz" ,rust-chrono-tz-0.8)
+ ("rust-clap" ,rust-clap-4) ; Dependency of xtask also.
+ ("rust-dirs" ,rust-dirs-5)
+ ("rust-env-logger" ,rust-env-logger-0.10)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-glob" ,rust-glob-0.3)
+ ("rust-hyper" ,rust-hyper-0.14)
+ ("rust-inotify" ,rust-inotify-0.10)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libpulse-binding" ,rust-libpulse-binding-2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-maildir" ,rust-maildir-0.6)
+ ("rust-neli" ,rust-neli-0.6)
+ ("rust-neli-wifi" ,rust-neli-wifi-0.6)
+ ("rust-nix" ,rust-nix-0.27)
+ ("rust-nom" ,rust-nom-7)
+ ("rust-notmuch" ,rust-notmuch-0.8)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pandoc" ,rust-pandoc-0.8) ; Dependency of xtask.
+ ("rust-regex" ,rust-regex-1)
+ ("rust-reqwest" ,rust-reqwest-0.11)
+ ("rust-sensors" ,rust-sensors-0.2)
("rust-serde" ,rust-serde-1)
- ("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-with" ,rust-serde-with-3)
+ ("rust-shellexpand" ,rust-shellexpand-3)
("rust-signal-hook" ,rust-signal-hook-0.3)
- ("rust-swayipc" ,rust-swayipc-2)
- ("rust-toml" ,rust-toml-0.5)
- ("rust-cpuprofiler" ,rust-cpuprofiler-0.0)
- ("rust-inotify" ,rust-inotify-0.9)
- ("rust-libpulse-binding" ,rust-libpulse-binding-2)
- ("rust-maildir" ,rust-maildir-0.5)
- ("rust-notmuch" ,rust-notmuch-0.6)
- ("rust-progress" ,rust-progress-0.2))
- #:cargo-development-inputs
- (("rust-assert-fs" ,rust-assert-fs-1))
+ ("rust-signal-hook-tokio" ,rust-signal-hook-tokio-0.3)
+ ("rust-smart-default" ,rust-smart-default-0.7)
+ ("rust-swayipc-async" ,rust-swayipc-async-2)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-toml" ,rust-toml-0.8)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-wayrs-client" ,rust-wayrs-client-1)
+ ("rust-wayrs-protocols" ,rust-wayrs-protocols-0.13)
+ ("rust-clap-mangen" ,rust-clap-mangen-0.2) ; Dependency of xtask.
+ ("rust-zbus" ,rust-zbus-3))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'enable-unstable-features
+ (add-after 'unpack 'remove-optional-icu-deps
(lambda _
- (setenv "RUSTC_BOOTSTRAP" "1")))
+ (substitute* "Cargo.toml"
+ (("^icu_calendar.*") "")
+ (("^icu_datetime.*") "")
+ (("^icu_locid.*") ""))))
+ (add-after 'unpack 'fix-wayrs-versions
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("^(wayrs-client = \\{ version = \")0.12\"" all most)
+ (string-append most "1.0\""))
+ (("^(wayrs-protocols = \\{ version = \"0.1)2\"" all most)
+ (string-append most "3\"")))))
(add-after 'unpack 'fix-resources-path
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -827,11 +856,12 @@ (define-public i3status-rust
(let ((out (assoc-ref outputs "out"))
(paths (map
(lambda (input)
- (string-append (assoc-ref inputs input) "/bin"))
- '("alsa-utils" "coreutils" "curl" "dbus" "ibus" "iproute"
- "kdeconnect" "lm-sensors" "pulseaudio"
- "openssl"
- "setxkbmap" "speedtest-cli" "xdg-utils" "xrandr"
+ (string-append
+ (assoc-ref inputs input) "/bin"))
+ '("alsa-utils" "coreutils" "curl" "dbus"
+ "ibus" "iproute" "kdeconnect" "lm-sensors"
+ "pulseaudio" "openssl" "setxkbmap"
+ "speedtest-cli" "xdg-utils" "xrandr"
"zlib"))))
(wrap-program (string-append out "/bin/i3status-rs")
`("PATH" prefix ,paths))))))))
@@ -846,7 +876,7 @@ (define-public i3status-rust
("ibus" ,ibus)
("iproute" ,iproute)
("kdeconnect" ,kdeconnect)
- ("lm-sensors" ,lm-sensors)
+ ("lm-sensors" ,lm-sensors "lib")
("pulseaudio" ,pulseaudio)
("openssl" ,openssl)
("setxkbmap" ,setxkbmap)
@@ -854,8 +884,8 @@ (define-public i3status-rust
("xdg-utils" ,xdg-utils)
("xrandr" ,xrandr)
("zlib" ,zlib)))
- (home-page "https://github.com/greshake/i3status-rust")
- (synopsis "i3status, written in pure Rust")
+ (home-page "https://github.com/greshake/i3status-rust/")
+ (synopsis "Replacement for i3status, written in Rust")
(description "@code{i3status-rs} is a feature-rich and resource-friendly
replacement for i3status, written in pure Rust. It provides a way to display
@code{blocks} of system information (time, battery status, volume, etc) on the i3
--
2.41.0
next prev parent reply other threads:[~2024-01-30 15:52 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 15:03 [bug#68819] [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 01/49] gnu: Add rust-async-once-cell-0.5 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 02/49] gnu: Add rust-backon-0.4 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 03/49] gnu: Add rust-calibright-0.1 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 04/49] gnu: Add rust-neli-proc-macros-0.1 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 05/49] gnu: Add rust-neli-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 06/49] gnu: Add rust-neli-wifi-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 07/49] gnu: Add rust-chrono-tz-build-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 08/49] gnu: Replace rust-chrono-tz-0.6 with rust-chrono-tz-0.8 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 09/49] gnu: Add rust-from-variants-impl-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 10/49] gnu: Add rust-from-variants-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 11/49] gnu: Add rust-notmuch-0.8 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 12/49] gnu: rust-gethostname-0.2: Update to 0.2.3 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 13/49] gnu: Add rust-maildir-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 14/49] gnu: Add rust-libsensors-sys-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 15/49] gnu: Add rust-sensors-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:24 ` [bug#68819] [PATCH 16/49] gnu: Add rust-signal-hook-tokio-0.3 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 17/49] gnu: rust-swayipc-types-1: Update to 1.3.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 18/49] gnu: Add rust-async-pidfd-0.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 19/49] gnu: rust-parking-2: Update to 2.2.0 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 20/49] gnu: Add rust-futures-lite-2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 21/49] gnu: Add rust-swayipc-async-2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 22/49] gnu: Add rust-proc-macro-crate-3 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 23/49] gnu: Add rust-wayrs-proto-parser-2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 24/49] gnu: Add rust-wayrs-scanner-0.13 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 25/49] gnu: Add rust-wayrs-client-1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 26/49] gnu: Add rust-wayrs-protocols-0.13 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 27/49] gnu: Add rust-event-listener-4 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 28/49] gnu: Add rust-event-listener-strategy-0.4 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 29/49] gnu: Add rust-async-channel-2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 30/49] gnu: Add rust-async-lock-3 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 31/49] gnu: Add rust-async-io-2 and rust-async-net-2 cyclical dependency Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 32/49] gnu: Add rust-ordered-stream-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 33/49] gnu: Add rust-xdg-home-1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 34/49] gnu: Add rust-async-signal-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 35/49] gnu: Add rust-event-listener-3 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 36/49] gnu: rust-async-process-1: Update to 1.8.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 37/49] gnu: rust-async-fs-1: Update to 1.6.0 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 38/49] gnu: rust-zbus-3: Update to 3.14.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 39/49] gnu: Add rust-pandoc-0.8 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` Herman Rimm via Guix-patches via [this message]
2024-01-30 15:25 ` [bug#68819] [PATCH 41/49] gnu: Deprecate rust-nl80211-0.0.2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 42/49] gnu: Remove rust-neli-0.4 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 43/49] gnu: Remove rust-notmuch-0.6 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 44/49] gnu: Remove rust-cpuprofiler-0.0 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 45/49] gnu: Remove rust-progress-0.2 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 46/49] gnu: Remove rust-buffering-0.3 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 47/49] gnu: Remove rust-supercow-0.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 48/49] gnu: Remove rust-buffering-nocopy-macro-0.1 Herman Rimm via Guix-patches via
2024-01-30 15:25 ` [bug#68819] [PATCH 49/49] gnu: Remove rust-ordered-stream-0.1 Herman Rimm via Guix-patches via
2024-01-30 16:14 ` [bug#68819] [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3 Herman Rimm via Guix-patches via
2024-02-12 12:44 ` bug#68819: " Efraim Flashner
[not found] <cover.1706630137.git.herman@rimm.ee>
2024-01-30 16:00 ` [bug#68819] [PATCH 40/49] gnu: i3status-rust: Update " Herman Rimm via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b1730ba48ea063c742604d14c4024d786007f56f.1706619963.git.herman@rimm.ee \
--to=guix-patches@gnu.org \
--cc=68819@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
--cc=herman@rimm.ee \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.