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

kdePackages: Plasma 6.1.5 -> 6.2 #341487

Merged
merged 4 commits into from
Oct 8, 2024
Merged

kdePackages: Plasma 6.1.5 -> 6.2 #341487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20afb45
maintainers/scripts/kde: fix formatting to match nixfmt
K900 Oct 8, 2024
91e8726
kdePackages.pulseaudio-qt: 1.5.0 -> 1.6.0
K900 Sep 13, 2024
0c879e6
kdePackages: Plasma 6.1.5 -> 6.2.0
K900 Sep 20, 2024
bf21bad
nixos/plasma6: adjust for portal config changes
K900 Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions maintainers/scripts/kde/collect-missing-deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
},
"kwin": {
"display-info", # newer versions identify as libdisplay-info
"Libcap", # used to call setcap at build time and nothing else
},
"libksysguard": {
"Libcap", # used to call setcap at build time and nothing else
Expand All @@ -90,6 +91,7 @@
},
"powerdevil": {
"DDCUtil", # cursed, intentionally disabled
"Libcap", # used to call setcap at build time and nothing else
},
"print-manager": {
"PackageKitQt6", # used for auto-installing drivers which does not work for obvious reasons
Expand Down
3 changes: 2 additions & 1 deletion maintainers/scripts/kde/generate-sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
'''.strip())

ROOT_TEMPLATE = jinja2.Template('''
{callPackage}: {
{ callPackage }:
{
{%- for p in packages %}
{{ p }} = callPackage ./{{ p }} { };
{%- endfor %}
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/desktop-managers/plasma6.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,11 @@ in {

xdg.portal.enable = true;
xdg.portal.extraPortals = [
kdePackages.kwallet
kdePackages.xdg-desktop-portal-kde
pkgs.xdg-desktop-portal-gtk
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
pkgs.xdg-desktop-portal-gtk
(pkgs.xdg-desktop-portal-gtk.override { buildPortalsInGnome = false; })

I've done this locally to remove some gnome dependencies. I think all the functionality still works as before.

Copy link
Contributor Author

@K900 K900 Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This no longer exists. See #345979

Copy link
Member

Choose a reason for hiding this comment

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

So Plasma 6 now always needs to depend on half the gnome backend libraries?

Do we really need to increase closure size every other month?

Copy link
Contributor

Choose a reason for hiding this comment

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

Even if this option wasn't removed, setting it would make the gtk portal useless as buildPortalsInGnome was disabling the settings portal.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes someone on Matrix was hitting issues with not having this portal, and specifically the settings portal, just a week or so ago, which is why this was added for Plasma in the first place. Upstream recommends including it.

Copy link
Contributor

Choose a reason for hiding this comment

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

@mjm it was me :)

Copy link
Contributor

Choose a reason for hiding this comment

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

Wasn't not having to depend on components of a DE you don't use the whole point of xdg-desktop-portal existing in the first place?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, it exists because flatpak people are afraid of same connection use in DE D-Bus APIs

];
xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];
xdg.portal.configPackages = mkDefault [kdePackages.plasma-workspace];
services.pipewire.enable = mkDefault true;

# Enable screen reader by default
Expand Down
31 changes: 30 additions & 1 deletion pkgs/kde/generated/licenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LicenseRef-KDE-Accepted-GPL",
"MIT"
],
Expand Down Expand Up @@ -326,6 +327,7 @@
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LGPL-3.0-or-later",
"LicenseRef-KDE-Accepted-GPL",
Expand Down Expand Up @@ -2515,6 +2517,19 @@
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"plasma-dialer": [
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL",
"LicenseRef-KDE-Accepted-LGPL"
],
"plasma-disks": [
"BSD-3-Clause",
"CC0-1.0",
Expand Down Expand Up @@ -2646,6 +2661,7 @@
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"GPL-3.0-or-later",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
Expand All @@ -2662,6 +2678,7 @@
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-or-later"
],
Expand All @@ -2687,18 +2704,21 @@
"LGPL-2.0-or-later"
],
"powerdevil": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"GPL-3.0-or-later",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL",
"LicenseRef-KDE-Accepted-LGPL"
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"poxml": [
"CC0-1.0"
Expand Down Expand Up @@ -2808,6 +2828,15 @@
"LGPL-2.0-or-later",
"LGPL-2.1-or-later"
],
"spacebar": [
"BSD-2-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LicenseRef-KDE-Accepted-GPL"
],
"spectacle": [
"BSD-3-Clause",
"CC0-1.0",
Expand Down
Loading