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

Jump to bottom

adwaita-qt: 1.0 -> 1.1.0 #65913

Merged
merged 2 commits into from
Aug 9, 2019
Merged

adwaita-qt: 1.0 -> 1.1.0 #65913

merged 2 commits into from
Aug 9, 2019
+9 −11

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Updates adwaita-qt and adds an option adwaita-qt.enable so users of GNOME etc. could possibly make use of this.
There's probably a better option name for that though.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 @

Sorry, something went wrong.

@worldofpeace worldofpeace requested a review from infinisil as a code owner August 4, 2019 08:15
@worldofpeace worldofpeace requested a review from jtojnar August 4, 2019 08:15
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Aug 4, 2019
@worldofpeace
adwaita-qt: 1.0 -> 1.1.0

Verified

This commit was signed with the committer’s verified signature.
delroth Pierre Bourdon
GPG key ID: 6FB80DCD84DA0F1C
Verified
Learn about vigilant mode
e62be3e 
Adds support for the new refreshed Adwaita theme.

https://github.com/FedoraQt/adwaita-qt/releases/tag/1.1.0
@worldofpeace
qgnomeplatform: correct qt packaging

Verified

This commit was signed with the committer’s verified signature.
vcunat Vladimír Čunát
GPG key ID: E747DF1F9575A3AA
Verified
Learn about vigilant mode
327a4d5
infinisil
infinisil reviewed Aug 9, 2019
View reviewed changes
nixos/modules/config/adwaita-qt.nix Outdated
with lib;
{
options = {
adwaita-qt.enable = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

Yeah not sure about having this option path. Maybe somewhere in services.xserver would be a better place

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could think of it as a theme, though not completely. But I don't think services.xserver would make sense because it's not a service.

programs.adwaita-qt isn't right either, I think I might have to stick with it like this.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe we could introduce a misc grouping for misc.adwaita-qt.enable

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But then it would mirror the kinda messy hierarchy we have for packages.
Maybe it doesn't have to be namespaced?

Copy link
Member

Choose a reason for hiding this comment

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

Well with something like misc at least the mess won't be interleaved with the structured parts.

Maybe theming.adwaita-qt.enable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've just realized that the correct module is in home-manager

This just needs a new option style so we can set the Qt style to adwaita-qt.

so

  • qt.platformTheme
  • qt.style

@worldofpeace
Copy link
Contributor Author

For now I'm going to drop the adwaita-qt module commit so I can merge the updates.

@worldofpeace worldofpeace changed the title adwaita-qt: 1.0 -> 1.1.0, nixos/adwaita-qt: init adwaita-qt: 1.0 -> 1.1.0 Aug 9, 2019
@worldofpeace worldofpeace merged commit 4b7ee55 into NixOS:master Aug 9, 2019
@worldofpeace worldofpeace deleted the adwaita-qt/bump branch August 9, 2019 14:59
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-linux: 1-10 labels Aug 9, 2019
@worldofpeace worldofpeace mentioned this pull request Aug 9, 2019
Merged
10 tasks
@jtojnar jtojnar mentioned this pull request Aug 12, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil

@jtojnar jtojnar

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @infinisil