diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:35:23 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:35:36 -0700 |
| commit | 5cfe893cc48cef16691facbb2bd01826e34afeaf (patch) | |
| tree | 5ca32af9a38807a4f34ce6bf97fa14e9a80163db /pkgs/desktops | |
| parent | 0d0be1387869f8ddc84a9548fc327015b7745ec4 (diff) | |
| parent | 2d464f75ed46869b5942c4b479772a0367b30608 (diff) | |
| download | nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar.gz nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar.bz2 nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar.lz nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar.xz nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.tar.zst nixlib-5cfe893cc48cef16691facbb2bd01826e34afeaf.zip | |
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges smaller.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5.3/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index 550491731dc8..ec9873390e50 100644 --- 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; |