Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aw-watcher-window-wayland: fix version of rustc-serialize #310125

Merged
merged 2 commits into from
May 10, 2024
Merged

aw-watcher-window-wayland: fix version of rustc-serialize #310125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feceab5
aw-watcher-window-wayland: fix version of rustc-serialize
jmpunkt May 8, 2024
9832e46
aw-watcher-window-wayland: restrict platforms
wegank May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of the things proposed in ActivityWatch/aw-watcher-window-wayland#36.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkgs/tools/wayland/aw-watcher-window-wayland/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-xl9+k6xJp5/t1QPOYfnBLyYprhhrzjzByDKkT3dtVVQ=";
};

cargoPatches = [ ./rustc-serialize-fix.patch ];

cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
Expand All @@ -36,5 +38,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.mpl20;
maintainers = with maintainers; [ esau79p ];
mainProgram = "aw-watcher-window-wayland";
platforms = platforms.linux;
};
}
16 changes: 16 additions & 0 deletions pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/Cargo.lock b/Cargo.lock
index b1cc23695b30..ffdeb1c90618 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -996,9 +996,9 @@ dependencies = [

[[package]]
name = "rustc-serialize"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"

[[package]]
name = "rustix"