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

monitor: init at 0.6.1 #75897

Merged
merged 1 commit into from Dec 23, 2019
Merged

monitor: init at 0.6.1 #75897

merged 1 commit into from Dec 23, 2019

Conversation

xiorcale
Copy link
Contributor

Motivation for this change

Add more curated apps from Elementary OS app store for Pantheon Desktop.

Things done

Everything seems to work fine, except for the Wingpanel indicator. As I've understood, there should be one (as far as the option is checked), but unfortunately nothing appears for me.

Note that I haven't tested the app on ElementaryOS to see what the indicator should look like.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@xiorcale xiorcale force-pushed the monitor branch 2 times, most recently from 887da29 to e95e6fa Compare December 19, 2019 14:34
@ofborg ofborg bot requested a review from worldofpeace December 19, 2019 14:43
@worldofpeace
Copy link
Contributor

Building with your patch did eliminate the issue, but I still can't see the the indicator in Wingpanel sweat_smile

I've patched wingpanel for purity, so wingpanel-with-indicators takes a indicators argument so you can configure it.

with import ./. {};

pantheon.wingpanel-with-indicators.override {
  indicators = [
    monitor
  ] ++ pantheon.wingpanelIndicators;
}

I specifically didn't want it so it reads indicators from /run/current-system/sw/* (it makes things harder).

But I haven't added a nixos interface to this because there was no package extra package in nixos that had an extra indicator. I should do this now 👍 .

@worldofpeace
Copy link
Contributor

@kjuvi I don't think the directory structure here is best.
Can we add an applications/system like tools/system? What do you think?

@xiorcale
Copy link
Contributor Author

@kjuvi I don't think the directory structure here is best.
Can we add an applications/system like tools/system? What do you think?

I was actually looking for this specific folder but since it didn't exist I just put it in applications/misc by default.

I'll add this folder and move the expression there 👍

@worldofpeace
Copy link
Contributor

@kjuvi It seems you've changed the package version to the rev of my patches. Can you return to https://github.com/stsdc/monitor/releases/tag/0.6.1, and just fetchpatch https://github.com/stsdc/monitor/commit/07d1984175fcaef2909029a387f830efd647471b.patch and https://github.com/stsdc/monitor/commit/ab2cfed150cd2a6b5c3fcee5297a65c1b429c674.patch. We should be using a released version.

@xiorcale
Copy link
Contributor Author

I've patched wingpanel for purity, so wingpanel-with-indicators takes a indicators argument so you can configure it.

with import ./. {};

pantheon.wingpanel-with-indicators.override {
  indicators = [
    monitor
  ] ++ pantheon.wingpanelIndicators;
}

I specifically didn't want it so it reads indicators from /run/current-system/sw/* (it makes things harder).

But I haven't added a nixos interface to this because there was no package extra package in nixos that had an extra indicator. I should do this now +1 .

Okay so, if I understood correctly, it is the responsibility of the user to override his wingpanel if he wants the indicator ?

@xiorcale
Copy link
Contributor Author

@kjuvi It seems you've changed the package version to the rev of my patches. Can you return to https://github.com/stsdc/monitor/releases/tag/0.6.1, and just fetchpatch https://github.com/stsdc/monitor/commit/07d1984175fcaef2909029a387f830efd647471b.patch and https://github.com/stsdc/monitor/commit/ab2cfed150cd2a6b5c3fcee5297a65c1b429c674.patch. We should be using a released version.

Woops, you're right, I'll revert this...

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 23, 2019

@kjuvi I've added options to configure wingpanel and switchboard plugins #76116.

But you can still build

with import ./. {};

pantheon.wingpanel-with-indicators.override {
  indicators = [ monitor ];
};

Note that without the prior PR it will be the only indicator in wingpanel.

@worldofpeace worldofpeace changed the title [WIP] monitor: init at 0.6.1 monitor: init at 0.6.1 Dec 23, 2019
@worldofpeace
Copy link
Contributor

Looks like there was a little issue with that PR after I merged it 776893e 😄
I tested the indicator, it works LGTM.

In the force push here, I added the updateScript attribute for https://github.com/NixOS/nixpkgs/tree/master/pkgs/desktops/pantheon/nixpkgs_github_update.

@worldofpeace worldofpeace merged commit e8ff8d9 into NixOS:master Dec 23, 2019
@xiorcale xiorcale deleted the monitor branch December 23, 2019 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants