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

Add the system-monitor applet #626

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Conversation

ziguana
Copy link

@ziguana ziguana commented Jan 28, 2025

Closes #625

TODO:

  • resolve the duplicate dependency issue
  • cosmic-client-toolkit depends on registry+https://github.com/rust-lang/crates.io-index#smithay-client-toolkit@0.19.2
  • cosmic-panel-config depends on git+https://github.com/Smithay/client-toolkit#smithay-client-toolkit@0.19.2
    • why git?
  • buildRustPackage fails because the same version of a crate is added twice. same error as here.
  • previous relevant issue: cosmic-panel-config has transitive dependency on smithay pop-os/cosmic-panel#4
  • test that the applet is present and functional when built with this flake

Copy link
Owner

@lilyinstarlight lilyinstarlight left a comment

Choose a reason for hiding this comment

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

Thank you so much for this contribution! There's a few minor nits, but otherwise this looks great :)

resolve the duplicate dependency issue

This will be fixed in Nixpkgs via NixOS/nixpkgs#282798 but you can also bug upstream to add a line like this to their Cargo.toml to fix it: https://github.com/cosmic-utils/tasks/blob/406ffac6a2263cdc1006f3578b3f9be64761d6ea/Cargo.toml#L50-L51

pkgs/cosmic-ext-applet-system-monitor/Cargo.lock Outdated Show resolved Hide resolved
pkgs/cosmic-ext-applet-system-monitor/package.nix Outdated Show resolved Hide resolved
pkgs/cosmic-ext-applet-system-monitor/package.nix Outdated Show resolved Hide resolved
pkgs/cosmic-ext-applet-system-monitor/package.nix Outdated Show resolved Hide resolved
pkgs/cosmic-ext-applet-system-monitor/package.nix Outdated Show resolved Hide resolved
@ziguana
Copy link
Author

ziguana commented Jan 31, 2025

Thanks for the review! Sorry for blindly copying some useless stuff from another applet. I pushed a non-working WIP branch, as I still don't understand where to get Cargo.lock from.

ziguana and others added 8 commits February 3, 2025 18:02
Co-authored-by: Lily Foster <lily@lily.flowers>
Co-authored-by: Lily Foster <lily@lily.flowers>
Co-authored-by: Lily Foster <lily@lily.flowers>
Co-authored-by: Lily Foster <lily@lily.flowers>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package cosmic-ext-applet-system-monitor.
3 participants