Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream

This is a partial commit from staging in an attempt to make merges smaller.
2015-09-23 14:35:23 -07:00
parent 0d0be13878 2d464f75ed
commit 5cfe893cc4
32 changed files with 3689 additions and 257 deletions
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -129,7 +129,7 @@ let
              modemmanager openconnect openexr pam pango qt4 samba
              socat substituteAll taglib utillinux wayland xapian
              xkeyboard_config xorg;
-      boost = boost156;
+      boost = boost155;
      canberra = libcanberra;
      epub = ebook_tools;
      fontforge_executable = fontforge;