Commit Graph

4 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Thomas Tuegel
c93c57b8ac
plasma5: 5.8.6 -> 5.9.3 2017-03-04 15:08:47 -06:00
Thomas Tuegel
164cdd38a6
startkde: inherit NixOS system font settings 2017-03-04 14:59:11 -06:00
Thomas Tuegel
7f84ad5f4c
plasma5: Move to desktops/plasma-5 2017-02-27 11:49:12 -06:00