Merge branch 'master.upstream' into staging.upstream

21 files changed, 513 insertions, 8 deletions

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
new file mode 100644
index 000000000000..0c18f926e6d1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, gjs, gdk_pixbuf, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-characters-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
+    librsvg gnome3.defaultIconTheme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
+    description = "Simple utility application to find and insert unusual characters";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
new file mode 100644
index 000000000000..23c77395a828
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, libxml2, systemd, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-logs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    systemd hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Logs;
+    description = "A log viewer for the systemd journal";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
new file mode 100644
index 000000000000..7ee2275df5ae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
+, gobjectIntrospection, gdk_pixbuf, librsvg
+, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-maps-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz";
+    sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
+                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
+                  gnome3.geocode_glib libchamplain file libsoup
+                  gdk_pixbuf librsvg
+                  gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Maps;
+    description = "A map application for GNOME 3";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
new file mode 100644
index 000000000000..fff9ea5c08b8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
+, libgweather, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-weather-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+    libgweather hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Weather;
+    description = "Access current weather conditions and forecasts";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
new file mode 100644
index 000000000000..21ba8db37d41
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
+, telepathy_glib, gjs, itstool, telepathy_idle
+, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "polari-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx";
+  };
+
+  propagatedUserEnvPkgs = [ telepathy_idle ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
+                  telepathy_glib gjs gdk_pixbuf librsvg ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Polari;
+    description = "IRC chat client designed to integrate with the GNOME desktop";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
index 2bb4364a19e4..b736e1cd812f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -1,22 +1,23 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
+, spidermonkey_24, pango, readline, glib }:
 
 let
-  majorVersion = "1.42";
+  majorVersion = "1.43";
 in
 stdenv.mkDerivation rec {
-  name = "gjs-${majorVersion}.0";
+  name = "gjs-${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
-    sha256 = "0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13";
+    sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
   };
 
-  buildInputs = with gnome3;
-    [ gobjectIntrospection pkgconfig glib pango ];
+  buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
 
   propagatedBuildInputs = [ spidermonkey_24 ];
 
   meta = with stdenv.lib; {
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 8be88e42db92..3f554dbac1cc 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -30,16 +30,21 @@ let
     gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre
+    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
+    gnome-maps gnome-characters
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel
+    tali quadrapassel gnome-sudoku aisleriot five-or-more
+    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
+    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
+    hitori gnome-taquin
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
+  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;
@@ -264,18 +269,28 @@ let
     spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
   };
 
+  gnome-characters = callPackage ./apps/gnome-characters { };
+
   gnome-clocks = callPackage ./apps/gnome-clocks { };
 
   gnome-documents = callPackage ./apps/gnome-documents { };
 
+  gnome-logs = callPackage ./apps/gnome-logs { };
+
+  gnome-maps = callPackage ./apps/gnome-maps { };
+
   gnome-music = callPackage ./apps/gnome-music { };
 
   gnome-photos = callPackage ./apps/gnome-photos {
     gegl = gegl_0_3;
   };
 
+  gnome-weather = callPackage ./apps/gnome-weather { };
+
   nautilus-sendto = callPackage ./apps/nautilus-sendto { };
 
+  polari = callPackage ./apps/polari { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
@@ -289,8 +304,36 @@ let
 
   gdl = callPackage ./devtools/gdl { };
 
+  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
+
 #### Games
 
+  aisleriot = callPackage ./games/aisleriot { };
+
+  five-or-more = callPackage ./games/five-or-more { };
+
+  four-in-a-row = callPackage ./games/four-in-a-row { };
+
+  gnome-chess = callPackage ./games/gnome-chess { };
+
+  gnome-klotski = callPackage ./games/gnome-klotski { };
+
+  gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
+
+  gnome-mines = callPackage ./games/gnome-mines { };
+
+  gnome-nibbles = callPackage ./games/gnome-nibbles { };
+
+  gnome-robots = callPackage ./games/gnome-robots { };
+
+  gnome-sudoku = callPackage ./games/gnome-sudoku { };
+
+  gnome-taquin = callPackage ./games/gnome-taquin { };
+
+  gnome-tetravex = callPackage ./games/gnome-tetravex { };
+
+  hitori = callPackage ./games/hitori { };
+
   iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
new file mode 100644
index 000000000000..0daa0405b699
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-devel-docs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls";
+  };
+
+  buildInputs = [ intltool itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/GNOME/gnome-devel-docs;
+    description = "Developer documentation for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.fdl12;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
new file mode 100644
index 000000000000..94f4e5e4d04b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
+, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
+, guile, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "aisleriot-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl";
+  };
+
+  configureFlags = [ "--with-card-theme-formats=svg" ];
+
+  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
+                  librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Aisleriot;
+    description = "A collection of patience games written in guile scheme";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
new file mode 100644
index 000000000000..26af4d7286a3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "five-or-more-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz";
+    sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Five_or_more;
+    description = "Remove colored balls from the board by forming lines";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
new file mode 100644
index 000000000000..bf15f9f2bbbe
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, libcanberra_gtk3, librsvg, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "four-in-a-row-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
+    libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
+    description = "Make lines of the same color to win";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
new file mode 100644
index 000000000000..7161eb5cdaf3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-chess-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Chess;
+    description = "Play the classic two-player boardgame of chess";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
new file mode 100644
index 000000000000..6afcc63e97f3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-klotski-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Klotski;
+    description = "Slide blocks to solve the puzzle";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
new file mode 100644
index 000000000000..5b5bdae87c0f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-mahjongg-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Mahjongg;
+    description = "Disassemble a pile of tiles by removing matching pairs";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
new file mode 100644
index 000000000000..e9af6c0fe4d8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-mines-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Mines;
+    description = "Clear hidden mines from a minefield";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
new file mode 100644
index 000000000000..8fde848fe1f7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
+, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-nibbles-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Nibbles;
+    description = "Guide a worm around a maze";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
new file mode 100644
index 000000000000..a4f945184253
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-robots-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
+    libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Robots;
+    description = "Avoid the robots and make them crash into each other";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
new file mode 100644
index 000000000000..eda3cf1f84e3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
+, json_glib, qqwing, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-sudoku-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv";
+  };
+
+  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
+                  json_glib qqwing itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Sudoku;
+    description = "Test your logic skills in this number grid puzzle";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
new file mode 100644
index 000000000000..31b74cd285ea
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-taquin-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz";
+    sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
+    intltool itstool libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Taquin;
+    description = "Move tiles so that they reach their places";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
new file mode 100644
index 000000000000..37654f8fa338
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tetravex-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Tetravex;
+    description = "Complete the puzzle by matching numbered tiles";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
new file mode 100644
index 000000000000..d409ac1b3c32
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "hitori-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Hitori;
+    description = "GTK+ application to generate and let you play games of Hitori";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}