Nikolay Amiantov
5c39f28a9f
Merge pull request #15024 from abbradar/xfce-no-desktop
...
xfce service: add noDesktop option
2016-05-14 04:55:27 +03:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Thomas Tuegel
dbe1bb06d9
Merge pull request #14741 from cruegge/dbus-activation-environment
...
xsession: Update DBus activation environment
2016-05-01 06:55:35 -05:00
Thomas Tuegel
370120bd5f
kde5: don't install GStreamer modules system-wide
2016-04-30 12:22:01 -05:00
Nikolay Amiantov
c4440c9c74
Revert "pulseaudio: select correct outputs"
...
This reverts commit 5e2bb0b31c
.
2016-04-28 17:06:09 +03:00
Nikolay Amiantov
5e2bb0b31c
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:45:42 +03:00
Nikolay Amiantov
d619a75da1
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:42:16 +03:00
Nikolay Amiantov
21f984f590
xfce service: add noDesktop option
2016-04-27 14:59:56 +03:00
Thomas Tuegel
522ed7ce76
nixos/kde5: phonon-backend-gstreamer is not optional
2016-04-25 19:04:24 -05:00
Thomas Tuegel
5896befee0
nixos/kde5: install kactivitymanagerd
2016-04-25 19:04:24 -05:00
Christoph Ruegge
769a33bedd
xsession: make updating DBus environment optional
2016-04-25 23:37:18 +02:00
Nikolay Amiantov
5f19542581
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:23 +03:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Thomas Tuegel
b4ff81ffd6
phonon-backend-vlc: init at 0.9.0
2016-04-22 08:11:10 -05:00
Thomas Tuegel
8b585cc9f5
phonon: 4.8.3 -> 4.9.0
...
- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.
2016-04-22 07:56:02 -05:00
Thomas Tuegel
2780894b1b
kde5.startkde: init at 5.5.5
2016-04-20 10:01:06 -05:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502
for nixpkgs
2016-04-10 11:17:52 +02:00
Thomas Tuegel
4ac323d924
kde5: enable libmtp udev rules
2016-04-07 07:44:26 -05:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov
305fa26005
Merge pull request #13850 from abbradar/e20
...
Update Enlightenment, rename e19 -> enlightenment, drop e16
2016-03-14 02:28:58 +03:00
Nikolay Amiantov
7fb2291f55
enlightenment.enlightenment: 0.20.3 -> 0.20.6
2016-03-12 03:10:47 +03:00
Nikolay Amiantov
3f6ad460e7
enlightenment.efl: 1.16.1 -> 1.17.0
2016-03-12 03:10:46 +03:00
Nikolay Amiantov
e358d9498c
e19: rename to enlightenment, drop old one
2016-03-12 03:10:37 +03:00
Thomas Tuegel
d8dceb7077
kde5: install colord-kde when colord is enabled
2016-03-11 08:45:50 -06:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Luca Bruno
aa9576bceb
installer: add graphical GNOME iso
2016-02-29 15:51:38 +01:00
Thomas Tuegel
7bca3cd8dc
kde5: reduce default installation size
2016-02-19 06:21:50 -06:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Nikolay Amiantov
ae662cdb11
display-manager module: load pulseaudio's module-device-manager only for KDE
2016-02-04 13:59:17 +03:00
Thomas Tuegel
4768f41e36
nixos/kde5: use runtime outputs
2016-01-31 21:15:03 -06:00
Ryan Mulligan
8fee229261
desktop manager service: fix and improve default error
...
Before the error if the wrong default desktop was chosen would be:
/nixpkgs-channels/lib/modules.nix:282:11:
Default desktop manager ($(defaultDM)) not found.
which has the string interpolation done incorreclty. Now that is fixed
and it is more user-friendly as:
/nixpkgs-channels/lib/modules.nix:282:11:
Default desktop manager (gnome) not found.
Probably you want to change
services.xserver.desktopManager.default = "gnome";
to one of
services.xserver.desktopManager.default = "gnome3";
services.xserver.desktopManager.default = "none";
2016-01-31 13:00:15 -08:00
Luca Bruno
932ee094e1
gnome3: drop GNOME 3.16
2016-01-31 13:59:48 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Thomas Tuegel
049357bb30
nixos/kde5: install kio-extras
2016-01-08 14:20:07 -06:00
Thomas Tuegel
fa0057be39
nixos/kde5: install kdenetwork-filesharing if Samba enabled
2016-01-08 14:20:05 -06:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Jakob Gillich
db1086f3a1
gnome3: removed duplicate line, fixes #11891
2015-12-23 02:06:30 +01:00
Thomas Tuegel
298c4befda
phonon-backend-vlc: normalize attribute name to upstream
2015-12-20 08:03:26 -06:00
Thomas Tuegel
27c522cc3b
phonon-backend-gstreamer: normalize attribute name to upstream
2015-12-20 08:02:42 -06:00
Thomas Tuegel
cc058eff70
kde5_latest: merge all package sets
...
The three KDE package sets now have circular dependencies between them,
so they can only be built if they are merged into a single package set
during evaluation.
2015-12-16 10:22:43 -06:00
Thomas Tuegel
d6e3a8e921
nixos/kde5: enable SVG icons in GTK programs
...
Fixes #10758 .
2015-12-12 14:35:10 -06:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Thomas Tuegel
b858a32d27
nixos/kde5: enable Breeze SDDM theme
2015-12-11 07:09:08 -06:00
Thomas Tuegel
8a1682ce3f
nixos/kde5: reformat Phonon backend package list
2015-12-11 07:08:33 -06:00
Thomas Tuegel
92a484bdf2
nixos/kde5: install Breeze icons if available
2015-12-11 07:08:33 -06:00
Thomas Tuegel
9b7ae36087
nixos/kde5: only install Orion if Breeze GTK unavailable
2015-12-11 07:08:33 -06:00
Thomas Tuegel
521d9e5064
nixos/kde5: comment on Oxygen icons move
2015-12-11 07:08:33 -06:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00