Merge branch 'master.upstream' into staging.upstream

pkgs/data/fonts/terminus-font/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.39";
+  name = "terminus-font-4.40";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
-    sha256 = "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i";
+    sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4";
   };
 
   buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];

pkgs/data/fonts/ubuntu-font-family/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "ubuntu-font-family-0.80";
+  name = "ubuntu-font-family-0.83";
   buildInputs = [unzip];
 
   src = fetchurl {
     url = "http://font.ubuntu.com/download/${name}.zip";
-    sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h";
+    sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5";
   };
 
   installPhase =

pkgs/data/icons/elementary-icon-theme/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "3.2.2";
+
+  package-name = "elementary-icon-theme";
+
+  name = "${package-name}-${version}";
+
+  src = fetchzip {
+    url = "https://launchpad.net/elementaryicons/3.x/${version}/+download/elementary-icon-theme-${version}.tar.xz";
+    sha256 = "0b6sgvkzc5h9zm3la6f0ngs9pfjrsj318qcynxd3yydb50cd3hnf";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/icons
+    cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/
+  '';
+
+  meta = with stdenv.lib; {
+  description = "Elementary icon theme";
+  homepage = "https://launchpad.net/elementaryicons";
+  license = licenses.gpl3;
+  platforms = platforms.all;
+  maintainers = with maintainers; [ simonvandel ];
+  };
+}

pkgs/data/icons/numix-icon-theme-circle/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "4727aa5";
+  version = "129da4d8036c9ea52ba8b94cdfa0148e4c2cff96";
 
   package-name = "numix-icon-theme-circle";
   
-  name = "${package-name}-20151005";
+  name = "${package-name}-20151014";
 
   buildInputs = [ unzip ];
   
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "0khps3il0wyjizzzv8rxznhywp3nqd1hj1zhdvyqzgql3gffylqc";
+    sha256 = "1505j63qh96hy04x3ywc6kspavzgjd848cgdkda23kjdbx0fpij4";
   };
 
   dontBuild = true;

pkgs/data/icons/numix-icon-theme/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "ae57260";
+  version = "0f7641b048a07eb614662c502eb209dad5eb6d97";
 
   package-name = "numix-icon-theme";
 
-  name = "${package-name}-20150910";
+  name = "${package-name}-20151023";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "147a8d9wkhrq4f4154gb0l16rj849lsccxl8npicr6zixvsjgqlq";
+    sha256 = "16kbasgbb5mgiyl9b240215kivdnl8ynpkxhp5gairba9l4jpbih";
   };
 
   dontBuild = true;

pkgs/data/misc/geolite-legacy/default.nix

@@ -8,17 +8,17 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-10-19";
+  version = "2015-10-27";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "066j1mnpzfyd5cp0knvg13v01fdvgv32ggvab0xwyh1pa0c14dv4";
+    "1w0dh8p0zjbrkzm156wy77im4v0yp9d44gygrc10majnyhzkjlff";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
+    "0bs3p76lwlfbawqn0wj2fnnd52bdmkc35rjkpb7wy6sz6x33p79r";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
     "09w7vs13xzji574bykggh8cph992zc4yajvhjh4qrvwrxjmjilw3";