Add the system-monitor applet

[ziguana]

Closes #625

TODO:

• resolve the duplicate dependency issue
• cosmic-client-toolkit depends on registry+https://github.com/rust-lang/crates.io-index#[email protected]
• cosmic-panel-config depends on git+https://github.com/Smithay/client-toolkit#[email protected]
  • 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

[lilyinstarlight]

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

[ziguana]

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.

[lilyinstarlight]

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.

No worries, I get it :)

Do you think you could bug upstream to add those two lines to Cargo.toml like https://github.com/cosmic-utils/tasks/blob/406ffac6a2263cdc1006f3578b3f9be64761d6ea/Cargo.toml#L50-L51, to fix the cargo vendor bug so we can get this in?

[ziguana]

I've been coming back to this now and again, and I can't make it work. Could be a skill issue.

My approach has been to try and remove these patch lines, which upstream is obviously not going to accept. However, patching it locally before the build doesn't seem to work. Looking at fetch-cargo-vendor-util.py, this must be because it's parsing Cargo.lock directly.

What do you think is the right approach here?

[ziguana]

Forgot to add that patching Cargo.lock doesn't seem to work either.

[lilyinstarlight]

What do you think is the right approach here?

I guess to be clear, I've been saying to copy those two lines https://github.com/cosmic-utils/tasks/blob/406ffac6a2263cdc1006f3578b3f9be64761d6ea/Cargo.toml#L50-L51 verbatim into https://github.com/D-Brox/cosmic-ext-applet-system-monitor/blob/f29debf726551df521aa26070c8efc54d7c0a714/Cargo.toml#L31, update Cargo.lock with cargo metadata command or something, and then PR the diff upstream

Does that not work?

[ziguana]

Yeah, I tried that first, but thought that patch didn't apply transitively. I pushed the override in case you wanted to take a look. Maybe I'm doing something wrong.

[lilyinstarlight]

I pushed the override in case you wanted to take a look. Maybe I'm doing something wrong.

I pulled from your branch and updated cargoHash (since it didn't look like you updated it when updating src revision) and it seems to fetch cargo deps just fine. When attempting to build, it did also tell me I had to add pkg-config to nativeBuildInputs and fontconfig to buildInputs. After though, it seemed to build just fine too

Does updating that stuff mentioned above work, or if not what error are you getting?

[ziguana]

Oh, y..yeah, it was cargoHash. My bad.

I pushed a version that works, but it depends on my fork of upstream. I really don't think upstream should care about pinning sctk for us, but I was not able to successfully override Cargo.lock with a patch.

[lilyinstarlight]

I really don't think upstream should care about pinning sctk for us

It's not really "for us". Most distros would need it too, since even the cargo vendor command would not work as-is (upstream COSMIC repos and cosmic-utils repos do these patch statements for the same reasons -- their own tooling doesn't even work if cargo vendor doesn't)

Patch for Cargo.lock should work regardless though, so I'll poke at that later

[ziguana]

I just needed to use cargoPatches instead of patches. I pushed the version with patched (instead of forked) upstream. I propose carrying this patch until the issue is fixed in nixpkgs, but it's your call.

Going to make sure system-monitor works next.

[ziguana]

It's not in the output of cosmic-applets, going to look for a way to add it next.