Merge branch 'master.upstream' into staging.upstream

4 files changed, 40 insertions, 6 deletions

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 0018a2762e78..bcd27d68ce02 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
 , dbus, acl, gmp, xdg_utils
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
     ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
 
-  propagatedBuildInputs = [ openssl gmp ];
+  propagatedBuildInputs = [ gmp ];
 
   configureFlags = [
     "--localstatedir=/var"
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index a2338f376a74..04976a2bb839 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -4,15 +4,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "stella-${version}";
-  version = "4.6";
+  version = "4.6.1";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
-    sha256 = "03vg8cxr0hn99vrr2dcwhv610xi9vhlw08ypazpm0nny522a9j4d";
+    sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
-  buildInputs = with stdenv.lib;
-  [ pkgconfig SDL2 ];
+  buildInputs = [ pkgconfig SDL2 ];
 
   meta = {
     description = "An open-source Atari 2600 VCS emulator";
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index fe86577bb7bd..81c70504d800 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
     mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
+
+    rm -r $out/lib/cups/filter/{gstopxl,gstoraster}
   '';
 
   meta = {
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
new file mode 100644
index 000000000000..d1c81e0af483
--- /dev/null
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "theme-vertex-${version}";
+  version = "20150718";
+
+  src = fetchFromGitHub {
+    owner = "horst3180";
+    repo = "Vertex-theme";
+    rev = version;
+    sha256 = "19mmybfkx3mrbm9vr78c7xiyazmyzji1n6669466svjr3jy87546";
+  };
+
+  buildInputs = [ autoreconfHook gtk3 pkgconfig ];
+
+  configureFlags = "--disable-unity";
+
+  postInstall = ''
+    mkdir -p $out/share/doc/theme-vertex
+    cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/
+
+    mkdir -p $out/share/doc/theme-vertex/extra
+    cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
+    license = licenses.gpl3;
+    maintainer = [ maintainers.rycee ];
+    platforms = platforms.unix;
+  };
+}