Merge remote-tracking branch 'upstream/master' into staging

Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix

24 files changed, 621 insertions, 35 deletions

diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 04b0cd3e6ac..e09c8bc09d5 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qlipper";
-  version = "5.0.0";
+  version = "5.1.1";
 
   src = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
     rev = version;
-    sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j";
+    sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 5b02c6ad117..ab00cdce671 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, caja, mate-desktop, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "atril-${version}";
@@ -23,12 +23,13 @@ stdenv.mkDerivation rec {
     libsecret
     libxml2
     poppler
+    caja
+    mate-desktop
     hicolor_icon_theme
-    mate.mate-desktop
   ];
-
-  configureFlags = [ "--disable-caja" ];
   
+  makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];
+
   meta = {
     description = "A simple multi-page document viewer for the MATE desktop";
     homepage = http://mate-desktop.org;
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
new file mode 100644
index 00000000000..da5200eb3b3
--- /dev/null
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, caja, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "caja-dropbox-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "18wd8abjaxa68n1yjmvh9az1m8lqa2wing73xdymz0d5gmxmk25g";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    gtk3
+    caja
+    pythonPackages.python
+    pythonPackages.pygtk
+    pythonPackages.docutils
+  ];
+
+  configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
+
+  meta = with stdenv.lib; {
+    description = "Dropbox extension for Caja file manager";
+    homepage = https://github.com/mate-desktop/caja-dropbox;
+    license = with licenses; [ gpl3 cc-by-nd-30 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index d3b2a558bc9..9bd86d962ec 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, caja, mate-desktop, imagemagick, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "caja-extensions-${version}";
@@ -14,14 +14,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     intltool
+    wrapGAppsHook
   ];
 
   buildInputs = [
     gtk3
     dbus_glib
     gupnp
-    mate.caja
-    mate.mate-desktop
+    caja
+    mate-desktop
     imagemagick
   ];
 
diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix
deleted file mode 100644
index cb315d7f09a..00000000000
--- a/pkgs/desktops/mate/caja/cajaWithExtensions.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ buildEnv, makeWrapper, caja, extensions ? [] }:
-
-buildEnv {
-  name = "cajaWithExtensions-${caja.version}";
-  meta = caja.meta // { description = "File manager (including extensions) for the MATE desktop"; };
-  paths = [ caja ] ++ extensions;
-  buildInputs = [ makeWrapper ];
-  postBuild = ''
-    wrapProgram "$out/bin/caja" --set CAJA_EXTENSION_DIRS "$out/lib/caja/extensions-2.0"
-  '';
-}
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index d0383fcc5eb..3c872e72091 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     libexif
     exempi
     mate.mate-desktop
+    hicolor_icon_theme
   ];
 
   patches = [
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index acb3b31e801..0c495fd190e 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -7,31 +7,43 @@ let
 
     atril = callPackage ./atril { };
     caja = callPackage ./caja { };
+    caja-dropbox = callPackage ./caja-dropbox { };
     caja-extensions = callPackage ./caja-extensions { };
-    cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
-      extensions = [ caja-extensions ];
-    };
     engrampa = callPackage ./engrampa { };
     eom = callPackage ./eom { };
     libmatekbd = callPackage ./libmatekbd { };
     libmatemixer = callPackage ./libmatemixer { };
     libmateweather = callPackage ./libmateweather { };
     marco = callPackage ./marco { };
+    mate-applets = callPackage ./mate-applets { };
+    mate-backgrounds = callPackage ./mate-backgrounds { };
+    mate-calc = callPackage ./mate-calc { };
     mate-common = callPackage ./mate-common { };
     mate-control-center = callPackage ./mate-control-center { };
     mate-desktop = callPackage ./mate-desktop { };
     mate-icon-theme = callPackage ./mate-icon-theme { };
     mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+    mate-indicator-applet = callPackage ./mate-indicator-applet { };
     mate-media = callPackage ./mate-media { };
     mate-menus = callPackage ./mate-menus { };
+    mate-netbook = callPackage ./mate-netbook { };
     mate-notification-daemon = callPackage ./mate-notification-daemon { };
     mate-panel = callPackage ./mate-panel { };
+    mate-polkit = callPackage ./mate-polkit { };
     mate-power-manager = callPackage ./mate-power-manager { };
+    mate-sensors-applet = callPackage ./mate-sensors-applet { };
     mate-session-manager = callPackage ./mate-session-manager { };
     mate-settings-daemon = callPackage ./mate-settings-daemon { };
+    mate-screensaver = callPackage ./mate-screensaver { };
+    mate-system-monitor = callPackage ./mate-system-monitor { };
     mate-terminal = callPackage ./mate-terminal { };
     mate-themes = callPackage ./mate-themes { };
+    mate-user-guide = callPackage ./mate-user-guide { };
+    mate-user-share = callPackage ./mate-user-share { };
+    mate-utils = callPackage ./mate-utils { };
+    mozo = callPackage ./mozo { };
     pluma = callPackage ./pluma { };
+    python-caja = callPackage ./python-caja { };
 
     basePackages = [
       caja
@@ -46,6 +58,7 @@ let
       mate-menus
       mate-notification-daemon
       mate-panel
+      mate-polkit
       mate-session-manager
       mate-settings-daemon
       mate-themes
@@ -53,13 +66,25 @@ let
 
     extraPackages = [
       atril
-      cajaWithExtensions
+      caja-extensions
       engrampa
       eom
+      mate-applets
+      mate-backgrounds
+      mate-calc
       mate-icon-theme-faenza
+      mate-indicator-applet
       mate-media
+      mate-netbook
       mate-power-manager
+      mate-screensaver
+      mate-sensors-applet
+      mate-system-monitor
       mate-terminal
+      mate-user-guide
+      #mate-user-share
+      mate-utils
+      mozo
       pluma
     ];
   
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index b7df66d520b..e4d52183ab4 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
     pkgconfig
     intltool
     itstool
-    hicolor_icon_theme
     wrapGAppsHook
   ];
 
@@ -31,6 +30,7 @@ stdenv.mkDerivation rec {
     gnome3.gtk
     gnome3.libpeas
     mate.mate-desktop
+    hicolor_icon_theme
   ];
 
   meta = {
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
new file mode 100644
index 00000000000..ba5ef927fb6
--- /dev/null
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, libmateweather, mate-panel, pythonPackages, hicolor_icon_theme, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-applets-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "045cl62nnfsl14vnfydwqjssdakgdrahh5h0xiz5afmdcbq6cqgw";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gnome3.gtk
+    gnome3.gtksourceview
+    gnome3.gucharmap
+    libwnck3
+    libgtop
+    libxml2
+    libnotify
+    dbus_glib
+    polkit
+    upower
+    wirelesstools
+    libmateweather
+    mate-panel
+    pythonPackages.python
+    pythonPackages.pygobject3
+    hicolor_icon_theme
+  ];
+
+  configureFlags = [ "--enable-suid=no" ];
+  
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+  meta = with stdenv.lib; {
+    description = "Applets for use with the MATE panel";
+    homepage = http://mate-desktop.org;
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
new file mode 100644
index 00000000000..6ce78491d03
--- /dev/null
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "mate-backgrounds-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "06q8ksjisijps2wn959arywsimhzd3j35mqkr048c26ck24d60zi";
+  };
+
+  nativeBuildInputs = [ intltool ];
+
+  meta = with stdenv.lib; {
+    description = "Background images and data for MATE";
+    homepage = http://mate-desktop.org;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
new file mode 100644
index 00000000000..b00bcc27ac5
--- /dev/null
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-calc-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1h6kr9qb1kaw8jvfm7xmqm1wqnxsw2iwha5vl38b986x4zm2b712";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libxml2
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Calculator for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = [ licenses.gpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
new file mode 100644
index 00000000000..7d863a929e7
--- /dev/null
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-indicator-applet-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1h77f1gbz1a8l9xyq5fk75bs58mcwx6pbk6db33v0v1mwq6cidiv";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libindicator-gtk3
+    mate-panel
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mate-desktop/mate-indicator-applet;
+    description = "MATE panel indicator applet";
+    longDescription = ''
+      A small applet to display information from various applications
+      consistently in the panel.
+       
+      The indicator applet exposes Ayatana Indicators in the MATE Panel.
+      Ayatana Indicators are an initiative by Canonical to provide crisp and
+      clean system and application status indication. They take the form of
+      an icon and associated menu, displayed (usually) in the desktop panel.
+      Existing indicators include the Message Menu, Battery Menu and Sound
+      menu.
+    '';
+    license = with licenses; [ gpl3Plus lgpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
new file mode 100644
index 00000000000..0a2a0e47202
--- /dev/null
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate-panel, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-netbook-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0xy5mhkg0xfgyr7gnnjrfzqhmdnhyqscrl2h496p06cflknm17vb";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libwnck3
+    libfakekey
+    libXtst
+    mate-panel
+  ];
+
+  meta = with stdenv.lib; {
+    description = "MATE utilities for netbooks";
+    longDescription = ''
+      MATE utilities for netbooks are an applet and a daemon to maximize
+      windows and move their titles on the panel.
+
+      Installing these utilities is recommended for netbooks and similar
+      devices with low resolution displays.
+    '';
+    homepage = http://mate-desktop.org;
+    license = with licenses; [ gpl3 lgpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 1ca20047fa1..ec934b1fc63 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "6";
+  minor-ver = "7";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0cyfqq7i3qilw6qfxay4j9rl9y03s611nrqy5bh7lkdx1y0l16kx";
+    sha256 = "1m0fxyzbvg239dddmz3ksd8871lhkd7n3fxvdgdf4hv9rlvm1klv";
   };
 
   nativeBuildInputs = [
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
     libwnck3
     librsvg
     libxml2
-    hicolor_icon_theme
     gnome3.gtk
     gnome3.dconf
     mate.libmateweather
     mate.mate-desktop
     mate.mate-menus
+    hicolor_icon_theme
   ];
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
new file mode 100644
index 00000000000..94fb5ef43e8
--- /dev/null
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit }:
+
+stdenv.mkDerivation rec {
+  name = "mate-polkit-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "01mxl7wj1501d3clrwlwa54970vpkahp5968xpaxwfb2zbnqgjbd";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+  ];
+
+  buildInputs = [
+    gtk3
+    gobjectIntrospection
+    libappindicator-gtk3
+    libindicator-gtk3
+    polkit
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Integrates polkit authentication for MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = [ licenses.gpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
new file mode 100644
index 00000000000..dbaebb4c7be
--- /dev/null
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate-desktop, mate-menus, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-screensaver-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "03za7ssww095i49braaq0di5ir9g6wxh1n5hfgy6b3w9nb0j1y2p";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    dbus_glib
+    libXScrnSaver
+    libnotify
+    pam
+    systemd
+    mate-desktop
+    mate-menus
+  ];
+
+  configureFlags = "--without-console-kit";
+
+  makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc";
+
+  meta = with stdenv.lib; {
+    description = "Screen saver and locker for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
new file mode 100644
index 00000000000..ed98ffaa645
--- /dev/null
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-sensors-applet-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "3";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1nm68rhp73kgvs7wwsgs5zbvq3lzaanl5s5nnn28saiknjbz1mcx";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  # maybe add nvidia-settings later on
+  buildInputs = [
+    gtk3
+    libxml2
+    libxslt
+    libatasmart
+    libnotify
+    dbus_glib
+    lm_sensors
+    mate-panel
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mate-desktop/mate-sensors-applet;
+    description = "MATE panel applet for hardware sensors";
+    license = with licenses; [ gpl2Plus ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 6b4abbeff00..f15a78120cb 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd,
+  libSM, libXtst, gtk3, mate-desktop, hicolor_icon_theme,
+  wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
@@ -14,18 +17,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     intltool
+    xtrans
     wrapGAppsHook
   ];
 
   buildInputs = [
     dbus_glib
     systemd
-    xtrans
+    libSM
+    libXtst
+    gtk3
+    mate-desktop
     hicolor_icon_theme
-    xorg.libSM
-    gnome3.gtk3
-    gnome3.gsettings_desktop_schemas
-    mate.mate-desktop
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
new file mode 100644
index 00000000000..1378cc7f3ba
--- /dev/null
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-system-monitor-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1xhz7d9045xfh431rn27kh1sd1clbzkfrw1zkjgfnpad6v3aaaks";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtkmm3
+    libxml2
+    libgtop
+    libwnck3
+    librsvg
+    systemd
+  ];
+
+  configureFlags = "--enable-systemd";
+
+  meta = with stdenv.lib; {
+    description = "System monitor for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = [ licenses.gpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
new file mode 100644
index 00000000000..ce8029fb215
--- /dev/null
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
+
+stdenv.mkDerivation rec {
+  name = "mate-user-guide-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0f3b46r9a3cywm7rpj08xlkfnlfr9db58xfcpix8i33qp50fxqmb";
+  };
+
+  nativeBuildInputs = [ itstool intltool libxml2 ];
+
+  buildInputs = [ yelp ];
+
+  meta = with stdenv.lib; {
+    description = "MATE User Guide";
+    homepage = http://mate-desktop.org;
+    license = with licenses; [ gpl2Plus fdl12 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
new file mode 100644
index 00000000000..afacad52778
--- /dev/null
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-user-share-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    dbus_glib
+    libnotify
+    libcanberra_gtk3
+    libxml2
+    caja
+    hicolor_icon_theme
+    # Should mod_dnssd and apacheHttpd be runtime dependencies?
+    # In gnome-user-share they are not.
+    #mod_dnssd
+    #apacheHttpd
+  ];
+
+  preConfigure = ''
+    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
+      -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
+      -i data/dav_user_2.4.conf
+  '';
+
+  configureFlags = [
+    "--with-httpd=${apacheHttpd.out}/bin/httpd"
+    "--with-modules-path=${apacheHttpd.dev}/modules"
+    "--with-cajadir=$(out)/lib/caja/extensions-2.0"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "User level public file sharing for the MATE desktop";
+    homepage = https://github.com/mate-desktop/mate-user-share;
+    license = with licenses; [ gpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
new file mode 100644
index 00000000000..281fef42e61
--- /dev/null
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-utils-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "3";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1nw8rcq3x67v73cmy44zz6r2ikz46wsx834qzkbq4i2ac96kdkfz";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libgtop
+    libcanberra_gtk3
+    libxml2
+    mate-panel
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Utilities for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
new file mode 100644
index 00000000000..b376736c473
--- /dev/null
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, mate-menus, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "mozo-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "04yn9bw64q5a5kvpmkb7rb3mlp11pmnvkbphficsgb0368fj895b";
+  };
+  
+  pythonPath = [ mate-menus pythonPackages.pygobject3 ];
+
+  nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
+
+  buildInputs = [ pythonPackages.python ] ++ pythonPath;
+
+  preFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    description = "MATE Desktop menu editor";
+    homepage = https://github.com/mate-desktop/mozo;
+    license = with licenses; [ lgpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
new file mode 100644
index 00000000000..4eb9b72b8b5
--- /dev/null
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, caja, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "python-caja-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0n43cvvv29gq31hgrsf9al184cr87c3hzskrh2593rid52kwyz44";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    pythonPackages.wrapPython
+  ];
+
+  buildInputs = [
+    gtk3
+    caja
+    pythonPackages.python
+    pythonPackages.pygobject3
+  ];
+
+  configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
+
+  meta = with stdenv.lib; {
+    description = "Python binding for Caja components";
+    homepage = https://github.com/mate-desktop/python-caja;
+    license = [ licenses.gpl2Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}