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.

1 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e77e848bed2c..7798b1bef6c1 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
+}:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.13.3";
+  name = "stellarium-0.14.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
+    sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ];
+  buildInputs = [
+    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
+    qtserialport qttools
+  ];
 
   enableParallelBuilding = true;