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.

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

Conversation

jmpunkt
Copy link
Contributor

@jmpunkt jmpunkt commented May 8, 2024

The bundled version of rustc-serialize can not be compiled with Rust versions starting with 1.76.0.

Description of changes

#309482

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

The bundled version of rustc-serialize can not be compiled with Rust
versions starting with 1.76.0.
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.

Copy link
Contributor

@EsAu79p EsAu79p left a comment

Choose a reason for hiding this comment

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

Looks good to me since it fixes the build issue.

I no longer use this software since it stopped supporting hyprland.
I attempted to test functionality using sway, but it is also dropped. I then quickly attempted to set it up on KDE and Phosh but did not get anything to work.
The project itself has not seen any activity for 7 months and also suggests people to use a different project ActivityWatch/aw-watcher-window-wayland#34.

The program did build and launch but since neither hyprland nor sway expose the idle object that it needs it exits, but that behavior is not related to this PR.

thread 'main' panicked at src/idle.rs:79:10:
Wayland session does not expose a Idle object, this window manager is most likely not supported: Missing

Results of nixpkgs-review is
1 package built:
aw-watcher-window-wayland

@jmpunkt
Copy link
Contributor Author

jmpunkt commented May 9, 2024

I tested the package with Phosh, the only other platform which is supported. I started the 'aw-server-rust'. Under Phosh, '
aw-watcher-window-wayland' runs without a panic. I am guessing it is working properly, but I am neither using Phosh nor aw-watcher to fully verify their correct behavior.

Tested with the configuration

services.xserver.desktopManager.phosh = {
  enable = true;
  user = "jonas";
  group = "users";
};
services.xserver = {
  enable = true;
};

In order to run, disable all other desktop/window and login managers. Phosh will boot itself right away. The passcode is your user password, use your keyboard for that. I could only run Emacs for some reason, but that was enough to start this package without an exception.

@EsAu79p
Copy link
Contributor

EsAu79p commented May 9, 2024

Running Phosh was not the issue but aw-watcher-window-wayland just panicked on my system when running Phosh (basically same setup).

If aw-watcher-window-wayland works then the aw-watcher-window_<hostname> bucket should contain events which are not all unknown.

To check this go to the activitywatch timeline . If you can not start a browser in Phosh you can also try to query with aw-client.

aw-client buckets will list the buckets known to the server. If you query aw-client events aw-watcher-window_<hostname> and get events in return which make sense then the program works like usual.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels May 9, 2024
@ofborg ofborg bot requested a review from EsAu79p May 10, 2024 13:02
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels May 10, 2024
@wegank wegank merged commit 79f6a70 into NixOS:master May 10, 2024
25 of 26 checks passed
pluiedev added a commit to pluiedev/nixpkgs that referenced this pull request May 13, 2024
Contains the same fix as in NixOS#310673 and NixOS#310125 that allows it to build
on Rust >1.76. However, I think this patch might have to be a permanent
one as upstream has been abandoned and unmaintained.

Also removed some spurious `with lib;` and `rec` use, moved to use
`pkgs/by-name` and reformatted using `nixfmt-rfc-style`.
@jmpunkt jmpunkt deleted the aw-watcher-rustc-serialize branch May 29, 2024 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants