plasma: 5.11.5 -> 5.12.1 #34726

adisbladis · 2018-02-08T06:07:06Z

Motivation for this change

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

Tests are passing but have not had the time to actually try things out.

bkchr

Nice. I also started with this yesterday, but you was faster! :) I added two comments. I will compile it later and will report back.

bkchr · 2018-02-08T06:57:37Z

pkgs/desktops/plasma-5/kde-gtk-config/default.nix

 }:

 mkDerivation {
  name = "kde-gtk-config";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
-    knewstuff
+    knewstuff gsettings_desktop_schemas gsettings_desktop_schemas


Why did you add it twice?

Just a mistake. Fixed!

bkchr · 2018-02-08T06:58:25Z

pkgs/desktops/plasma-5/kwin/default.nix

  CXXFLAGS = [
    ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
+    "-I${lib.getDev kwayland}/include/KF5"


I created a patch upstream for this: https://phabricator.kde.org/D10373

This is a much better fix. Changed to your patch :)

bkchr · 2018-02-08T09:41:38Z

pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch

 +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 +unset DYLD_FORCE_FLAT_NAMESPACE
 +
 +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-+@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
+_MKDIR@ -p "$XDG_CONFIG_HOME"


_MKDIR needs to be NIXPKGS_MKDIR

bkchr · 2018-02-08T09:46:18Z

pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch

 -mkdir -p $configDir
 +# Set the default GTK 3 theme
-+gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
+_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"


Also looks not good.

bkchr · 2018-02-08T11:46:24Z

@adisbladis, I applied the following changes:

index f3aa4743bb2..e012537e402 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -828,7 +828,7 @@ index 8ac47aa..49970ef 100644
 +unset DYLD_FORCE_FLAT_NAMESPACE
 +
 +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-+_MKDIR@ -p "$XDG_CONFIG_HOME"
++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
 +
 +# The KDE icon cache is supposed to update itself
 +# automatically, but it uses the timestamp on the icon
@@ -880,7 +880,7 @@ index 8ac47aa..49970ef 100644
 -# We need to create config folder so we can write startupconfigkeys
 -mkdir -p $configDir
 +# Set the default GTK 3 theme
-+_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
++gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
 +breeze_gtk3="/run/current-system/sw/share/themes/Breeze/gtk-3.0"
 +if ! [ -e "$gtk3_settings" ] && [ -e "$breeze_gtk" ]; then
 +    mkdir -p $(dirname "$gtk3_settings")
@@ -1033,7 +1033,7 @@ index 8ac47aa..49970ef 100644
 -        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
 -        export XCURSOR_THEME
 +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
-+    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
++    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 +    if [ $? -eq 10 ]; then
 +        export XCURSOR_THEME=breeze_cursors
 +    elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
@@ -1106,7 +1106,7 @@ index 8ac47aa..49970ef 100644
 -
  # Make sure that D-Bus is running
 -if qdbus >/dev/null 2>/dev/null; then
-+if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then
++if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then
      : # ok
  else
      echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?'  1>&2

After applying these changes, I can start the wayland session :)

Besides that, everything seems to be working for me.

coreyoconnor · 2018-02-09T03:42:39Z

xf86 input libinput is now required by plasma-desktop. Otherwise the "mouse" system settings is not present:

coreyoconnor@d868986

adisbladis · 2018-02-09T04:19:28Z

@bkchr Thanks! Applied and rebased.

@coreyoconnor

xf86 input libinput is now required by plasma-desktop. Otherwise the "mouse" system settings is not present

Perfect! Applied your patch.

adisbladis · 2018-02-09T07:45:30Z

Now I have actually been running on this for a few hours and things seem to work as expected! :)

bkchr · 2018-02-09T11:29:06Z

pkgs/desktops/plasma-5/kwin/default.nix

-    ;
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [
+    (fetchpatch {
+      url = "https://phabricator.kde.org/file/data/ojbvgljuhqxztrdcicoy/PHID-FILE-6wvjkli2blrgw7jei3qg/D26720.diff";


The url does not work for me.
The following works for me:
https://phabricator.kde.org/file/data/5bu6h2c2ksaqctyy275b/PHID-FILE-jtbgqz2heluxsovlqyv3/D10373.diff

Suspicious, that your url also has a different filename?

Strange. That was working at some point.

How stable are phabricator urls?

I don't know :(

@adisbladis if you want to be on the save side, the patch got merged: KDE/kwin@6e5f5d9

Perfect! I'll use the github link.

etu · 2018-02-09T11:50:31Z

This also just became security related with CVE-2018-6791.

ttuegel · 2018-02-09T14:55:50Z

We should implement this; I think a few users are testing Plasma on Wayland, although we don't have it enabled by default yet: https://mail.kde.org/pipermail/distributions/2017-December/000260.html

adisbladis · 2018-02-10T03:58:01Z

@ttuegel Started implementing:
https://github.com/NixOS/nixpkgs/pull/34726/files#diff-ea6923168f021d53db143439baafd2e1R68
https://github.com/NixOS/nixpkgs/pull/34726/files#diff-caf7da1731d1ad19541463201ca275caR14

Applied a patch not to run setcap at build time and instead use security.wrappers on NixOS.

Not sure what to do about the absolute paths in https://github.com/adisbladis/nixpkgs/blob/b323fe38530fa0bc69ab0070743d5c8bb235c0b2/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch though.
Any ideas?

peterhoeg · 2018-02-12T01:41:36Z

pkgs/desktops/plasma-5/kwin/default.nix

-        sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5";
-    })]
-    ;
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [


Please add in a comment mentioning when we can drop this patch again.

adisbladis · 2018-02-14T09:26:10Z

Plasma 5.12.1 was released. Bumped PR and rebased on current master.

Unless there is any feedback on this within the next day or two I plan to merge it.

peterhoeg · 2018-02-14T09:32:19Z

Do you mind testing this together with #34936?

adisbladis · 2018-02-14T09:48:49Z

@peterhoeg My desktop has already been running on both of these PRs for a day :)

peterhoeg · 2018-02-14T09:58:26Z

Then LGTM!

bkchr · 2018-02-14T09:58:27Z

I also have Plasma 5.12 and frameworks 5.43 running on my Laptop and everything seems to be fine :)

adisbladis requested a review from ttuegel as a code owner February 8, 2018 06:07

GrahamcOfBorg added 6.topic: qt/kde 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Feb 8, 2018

bkchr reviewed Feb 8, 2018

View reviewed changes

adisbladis force-pushed the plasma-5_12_0 branch from 9596f59 to c75d15b Compare February 8, 2018 07:54

bkchr reviewed Feb 8, 2018

View reviewed changes

adisbladis force-pushed the plasma-5_12_0 branch from c75d15b to 0783c5f Compare February 9, 2018 04:18

coreyoconnor approved these changes Feb 9, 2018

View reviewed changes

bkchr reviewed Feb 9, 2018

View reviewed changes

adisbladis force-pushed the plasma-5_12_0 branch from 0783c5f to 5708382 Compare February 10, 2018 03:56

GrahamcOfBorg added 6.topic: nixos 8.has: module (update) labels Feb 10, 2018

adisbladis force-pushed the plasma-5_12_0 branch 2 times, most recently from b323fe3 to c253f16 Compare February 10, 2018 10:05

adisbladis added the 1.severity: security label Feb 10, 2018

adisbladis force-pushed the plasma-5_12_0 branch from c253f16 to f972ad8 Compare February 10, 2018 10:12

peterhoeg reviewed Feb 12, 2018

View reviewed changes

plasma: 5.11.5 -> 5.12.1

1de98e8

adisbladis force-pushed the plasma-5_12_0 branch from f972ad8 to 1de98e8 Compare February 14, 2018 09:25

adisbladis changed the title ~~plasma: 5.11.5 -> 5.12.0~~ plasma: 5.11.5 -> 5.12.1 Feb 14, 2018

peterhoeg merged commit dabcccc into NixOS:master Feb 14, 2018

mspaulding06 mentioned this pull request Feb 15, 2018

Black Screen on SDDM start since Plasma 5.12 #35013

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

plasma: 5.11.5 -> 5.12.1 #34726

plasma: 5.11.5 -> 5.12.1 #34726

adisbladis commented Feb 8, 2018 •

edited

bkchr left a comment

bkchr Feb 8, 2018

adisbladis Feb 8, 2018

bkchr Feb 8, 2018

adisbladis Feb 8, 2018

bkchr Feb 8, 2018

bkchr Feb 8, 2018

bkchr commented Feb 8, 2018

coreyoconnor commented Feb 9, 2018

adisbladis commented Feb 9, 2018 •

edited

adisbladis commented Feb 9, 2018

bkchr Feb 9, 2018

adisbladis Feb 9, 2018

bkchr Feb 9, 2018

bkchr Feb 9, 2018

adisbladis Feb 10, 2018

etu commented Feb 9, 2018

ttuegel commented Feb 9, 2018

adisbladis commented Feb 10, 2018 •

edited

peterhoeg Feb 12, 2018

adisbladis Feb 14, 2018

adisbladis commented Feb 14, 2018 •

edited

peterhoeg commented Feb 14, 2018

adisbladis commented Feb 14, 2018

peterhoeg commented Feb 14, 2018

bkchr commented Feb 14, 2018

plasma: 5.11.5 -> 5.12.1 #34726

plasma: 5.11.5 -> 5.12.1 #34726

Conversation

adisbladis commented Feb 8, 2018 • edited

Motivation for this change

Things done

bkchr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkchr commented Feb 8, 2018

coreyoconnor commented Feb 9, 2018

adisbladis commented Feb 9, 2018 • edited

adisbladis commented Feb 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

etu commented Feb 9, 2018

ttuegel commented Feb 9, 2018

adisbladis commented Feb 10, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adisbladis commented Feb 14, 2018 • edited

peterhoeg commented Feb 14, 2018

adisbladis commented Feb 14, 2018

peterhoeg commented Feb 14, 2018

bkchr commented Feb 14, 2018

adisbladis commented Feb 8, 2018 •

edited

adisbladis commented Feb 9, 2018 •

edited

adisbladis commented Feb 10, 2018 •

edited

adisbladis commented Feb 14, 2018 •

edited