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

14 files changed, 412 insertions, 26 deletions

diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
index 6e0184e134e2..cd401962c99c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
   buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
+                  gnome3.gsettings_desktop_schemas
                   intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/default.nix b/pkgs/desktops/gnome-3/3.24/default.nix
index e3d53d3a24ec..7be1f79be4c5 100644
--- a/pkgs/desktops/gnome-3/3.24/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/default.nix
@@ -220,6 +220,10 @@ let
     inherit gnome3;
   };
 
+  networkmanager_iodine = pkgs.networkmanager_iodine.override {
+    inherit gnome3;
+  };
+
   networkmanagerapplet = pkgs.networkmanagerapplet.override {
     inherit gnome3 gsettings_desktop_schemas glib_networking;
   };
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index fd326b6bbbbb..3cac721c0eb3 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,18 +1,62 @@
-{ callPackage, pkgs }:
-rec {
-  atril = callPackage ./atril { };
-  caja = callPackage ./caja { };
-  caja-extensions = callPackage ./caja-extensions { };
-  cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
-    extensions = [ caja-extensions ];
+{ pkgs, newScope }:
+
+let
+  callPackage = newScope self;
+
+  self = rec {
+
+    atril = callPackage ./atril { };
+    caja = callPackage ./caja { };
+    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-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-menus = callPackage ./mate-menus { };
+    mate-panel = callPackage ./mate-panel { };
+    mate-session-manager = callPackage ./mate-session-manager { };
+    mate-settings-daemon = callPackage ./mate-settings-daemon { };
+    mate-terminal = callPackage ./mate-terminal { };
+    mate-themes = callPackage ./mate-themes { };
+    pluma = callPackage ./pluma { };
+
+    basePackages = [
+      caja
+      libmatekbd
+      libmatemixer
+      libmateweather
+      marco
+      mate-common
+      mate-control-center
+      mate-desktop
+      mate-icon-theme
+      mate-menus
+      mate-panel
+      mate-session-manager
+      mate-settings-daemon
+      mate-themes
+    ];
+
+    extraPackages = [
+      atril
+      cajaWithExtensions
+      engrampa
+      eom
+      mate-icon-theme-faenza
+      mate-terminal
+      pluma
+    ];
+  
   };
-  engrampa = callPackage ./engrampa { };
-  eom = callPackage ./eom { };
-  pluma = callPackage ./pluma { };
-  mate-common = callPackage ./mate-common { };
-  mate-desktop = callPackage ./mate-desktop { };
-  mate-icon-theme = callPackage ./mate-icon-theme { };
-  mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
-  mate-terminal = callPackage ./mate-terminal { };
-  mate-themes = callPackage ./mate-themes { };
-}
+
+in self
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
new file mode 100644
index 000000000000..a02f605b470c
--- /dev/null
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
+
+stdenv.mkDerivation rec {
+  name = "libmatekbd-${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 = "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk3 libxklavier ];
+
+  meta = with stdenv.lib; {
+    description = "Keyboard management library for MATE";
+    homepage = https://github.com/mate-desktop/libmatekbd;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
new file mode 100644
index 000000000000..614124f8a0c5
--- /dev/null
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib
+, alsaSupport ? stdenv.isLinux, alsaLib
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
+, ossSupport ? false
+ }:
+
+stdenv.mkDerivation rec {
+  name = "libmatemixer-${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 = "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ glib ]
+    ++ stdenv.lib.optional alsaSupport alsaLib
+    ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
+
+  configureFlags = stdenv.lib.optional ossSupport "--enable-oss";
+
+  meta = with stdenv.lib; {
+    description = "Mixer library for MATE";
+    homepage = https://github.com/mate-desktop/libmatemixer;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
new file mode 100644
index 000000000000..aafc0fa9ceba
--- /dev/null
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
+
+stdenv.mkDerivation rec {
+  name = "libmateweather-${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 = "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk3 libsoup tzdata ];
+
+  configureFlags = [
+    "--with-zoneinfo-dir=${tzdata}/share/zoneinfo"
+    "--enable-locations-compression"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Library to access weather information from online services for MATE";
+    homepage = https://github.com/mate-desktop/libmateweather;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
new file mode 100644
index 000000000000..1846bccacefb
--- /dev/null
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "marco-${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 = "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    libxml2
+    libcanberra_gtk3
+    libgtop
+    gnome2.startup_notification
+    gnome3.gtk
+    gnome3.zenity
+  ];
+  
+  meta = with stdenv.lib; {
+    description = "MATE default window manager";
+    homepage = https://github.com/mate-desktop/marco;
+    license = [ licenses.gpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
new file mode 100644
index 000000000000..ad91069356f1
--- /dev/null
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-control-center-${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 = "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    desktop_file_utils
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    libxml2
+    dbus_glib
+    libxklavier
+    libcanberra_gtk3
+    gnome3.gtk
+    gnome3.dconf
+    mate.mate-desktop
+    mate.libmatekbd
+    mate.mate-menus
+    mate.marco
+    mate.mate-settings-daemon
+  ];
+
+  configureFlags = "--disable-update-mimedb";
+
+  meta = with stdenv.lib; {
+    description = "Utilities to configure the MATE desktop";
+    homepage = https://github.com/mate-desktop/mate-control-center;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 8854580a7cab..eb247efe0525 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
   };
 
-  propagatedUserEnvPkgs = [
-    gnome3.gnome_themes_standard
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -21,10 +23,8 @@ stdenv.mkDerivation rec {
     gnome3.defaultIconTheme
   ];
 
-  nativeBuildInputs = [
-    pkgconfig
-    intltool
-    wrapGAppsHook
+  propagatedUserEnvPkgs = [
+    gnome3.gnome_themes_standard
   ];
 
   meta = with stdenv.lib; {
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://mate-desktop.org;
     license = licenses.gpl2;
     platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 239a01c759af..b1c5e82da995 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, hicolor_icon_theme }:
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
@@ -13,8 +13,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
 
-  buildInputs = [ hicolor_icon_theme ];
-
+  buildInputs = [ librsvg hicolor_icon_theme ];
+  
+  postInstall = ''
+    for theme in "$out"/share/icons/*; do
+      "${gtk3.out}/bin/gtk-update-icon-cache" "$theme"
+    done
+  '';
+  
   meta = {
     description = "Icon themes from MATE";
     homepage = http://mate-desktop.org;
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
new file mode 100644
index 000000000000..a3da557f2a21
--- /dev/null
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python }:
+
+stdenv.mkDerivation rec {
+  name = "mate-menus-${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 = "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ glib gobjectIntrospection python ];
+
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Menu system for MATE";
+    homepage = https://github.com/mate-desktop/mate-menus;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
new file mode 100644
index 000000000000..cc6fd6c363c4
--- /dev/null
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-panel-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "4";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    dbus_glib
+    libwnck3
+    librsvg
+    libxml2
+    gnome3.gtk
+    gnome3.dconf
+    mate.libmateweather
+    mate.mate-desktop
+    mate.mate-menus
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The MATE panel";
+    homepage = https://github.com/mate-desktop/mate-panel;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
new file mode 100644
index 000000000000..316104334ac8
--- /dev/null
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-session-manager-${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 = "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    systemd
+    xtrans
+    xorg.libSM
+    gnome3.gtk3
+    gnome3.gsettings_desktop_schemas
+    mate.mate-desktop
+  ];
+
+  meta = with stdenv.lib; {
+    description = "MATE Desktop session manager";
+    homepage = https://github.com/mate-desktop/mate-session-manager;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
new file mode 100644
index 000000000000..ffa01d1dba88
--- /dev/null
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
+}:
+
+stdenv.mkDerivation rec {
+  name = "mate-settings-daemon-${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 = "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    libxklavier
+    libcanberra_gtk3
+    libnotify
+    nss
+    polkit
+    gnome3.gtk
+    gnome3.dconf
+    mate.mate-desktop
+    mate.libmatekbd
+    mate.libmatemixer
+  ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
+
+  configureFlags = stdenv.lib.optional pulseaudioSupport "--enable-pulse";
+
+  meta = with stdenv.lib; {
+    description = "MATE settings daemon";
+    homepage = https://github.com/mate-desktop/mate-settings-daemon;
+    license = with licenses; [ gpl2 lgpl21 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}