Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1279790

13 files changed, 199 insertions, 19 deletions

diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
new file mode 100644
index 000000000000..e205129db194
--- /dev/null
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl, python, zip, fop }:
+
+stdenv.mkDerivation rec {
+  name = "bgnet-${version}";
+  version = "3.0.21";
+
+  src = fetchurl {
+    url = https://beej.us/guide/bgnet/bgnet.tgz;
+    sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv";
+  };
+
+  buildInputs = [ python zip fop ];
+
+  preBuild = ''
+    sed -i "s/#disable=1/disable=1/" bin/bgvalidate
+    # build scripts need some love
+    patchShebangs .
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out/
+  '';
+
+  meta = {
+    description = "Beej’s Guide to Network Programming";
+    homepage = https://beej.us/guide/bgnet/;
+    license = lib.licenses.unfree;
+
+    maintainers = with lib.maintainers; [ profpatsch ];
+  };
+}
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 3b89f3db36dd..c69cc7ae34de 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     for i in *.sfd; do
-      fontforge -c \
+      fontforge -lang=ff -c \
         'Open($1);
         ScaleToEm(1000);
         Reencode("unicode");
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix
new file mode 100644
index 000000000000..fe429fe1df8b
--- /dev/null
+++ b/pkgs/data/fonts/mononoki/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "mononoki-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
+    sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg";
+  };
+
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" ];
+
+  unpackPhase = ''
+    mkdir -p $out/share/fonts/mononoki
+    unzip $src -d $out/share/fonts/mononoki
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/madmalik/mononoki;
+    description = "A font for programming and code review";
+    license = licenses.ofl;
+    maintainers = [ maintainers.hiberno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix
new file mode 100644
index 000000000000..07900eebeefa
--- /dev/null
+++ b/pkgs/data/icons/arc-icon-theme/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "arc-icon-theme";
+  version = "2016-06-06";
+
+  src = fetchFromGitHub {
+    owner = "horst3180";
+    repo = package-name;
+    rev = "69da5eed0761237fd287ea2fc95c708353ccc332";
+    sha256 = "04ym3ix2cpjh1q7lwvhl578pv41mn9zsadlsygl0nck8yd22widq";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ moka-icon-theme ];
+
+  meta = with stdenv.lib; {
+    description = "Arc icon theme";
+    homepage = https://github.com/horst3180/arc-icon-theme;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix
new file mode 100644
index 000000000000..b83abbe7e80c
--- /dev/null
+++ b/pkgs/data/icons/faba-icon-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "faba-icon-theme";
+  version = "2016-06-02";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "e50649d0171fd8cce42404c7c5002d77710ffcfc";
+    sha256 = "1fn969a6l58asnl9181c2z1fsj4dybl2mgbcpwig20bri6q7yz20";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ elementary-icon-theme ];
+
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sexy and modern icon theme with Tango influences";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
new file mode 100644
index 000000000000..16fa63c5424c
--- /dev/null
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme  }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "faba-mono-icons";
+  version = "2016-04-30";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "2006c5281eb988c799068734f289a85443800cda";
+    sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ moka-icon-theme ];
+
+  meta = with stdenv.lib; {
+    description = "The full set of Faba monochrome panel icons";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
new file mode 100644
index 000000000000..4d98a50c0c4b
--- /dev/null
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "moka-icon-theme";
+  version = "2016-06-07";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "a03d14e30dbdf05e8ea904994b8081ad0824e155";
+    sha256 = "1j1cnrrg0gfr4vfzxlabrv8090fg4yni99g61s82vnyszkiy1rcm";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ faba-icon-theme ];
+
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index ace58a4d703e..414360f2d7a4 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, numix-icon-theme }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-06-10";
 
   package-name = "numix-icon-theme-circle";
   
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "e2d2fe68e34e1650584f798c3cdb7e91ef62e6d3";
-    sha256 = "0fah812ymc6kczjhjsz0ai57ih6d8r6pknhvc54i7r3xqxshryc8";
+    rev = "577b8a2a8dd6429f7d3df37b15d9fd7fcbb58d56";
+    sha256 = "1zx26ng6z45j1yff2m0cng4nffk8swdq1pya1l2dm7841mx5ram4";
   };
 
+  buildInputs = [ numix-icon-theme ];
+
   dontBuild = true;
 
   installPhase = ''
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 45f5d2f5ae76..735d1544cf55 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-18";
+  version = "2016-06-10";
 
   package-name = "numix-icon-theme";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "d571e845b9db0e5cc5a50e6d4423d25fc0d613bd";
-    sha256 = "0d9ajh12n1ms7wbgaa3nsdhlwsjwj4flm67cxzsb3dwhpql75z0c";
+    rev = "8196e9eaa5a60b5c02a9e37a4ca768b07966b41f";
+    sha256 = "0cyv0r66vil54y6w317msddq2fjs9zhrdx17m3bx85xpqz67zq5i";
   };
 
   dontBuild = true;
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 93c39b9eddd5..4baaca194bf3 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "paper-icon-theme";
-  version = "2016-05-25";
+  version = "2016-06-08";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = package-name;
-    rev = "f221537532181a71938faaa1f695c762defe2626";
-    sha256 = "0knsdhgssh1wyhcrbk6lddqy7zn24528lnajqij467mpgiliabfy";
+    rev = "6aa0a2c8d802199d0a9f71579f136bd6476d5d8e";
+    sha256 = "07ak1lnvd0gwaclkcvccjbxikh701vfi07gmjp4zcqi6b5crl7f5";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 0b125485fd45..3ce6dc81a396 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nss, curl, perl, perlPackages }:
+{ stdenv, nss, curl, perl }:
 
 stdenv.mkDerivation rec {
   name = "nss-cacert-${nss.version}";
@@ -7,9 +7,16 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     unpackFile ${curl.src};
+
+    # Remove dependency on LWP, curl is enough. Also, since curl here
+    # is working on a local file it will not actually get a 200 OK, so
+    # remove that expectation.
+    substituteInPlace curl-*/lib/mk-ca-bundle.pl \
+      --replace 'use LWP::UserAgent;' "" \
+      --replace ' && $out[0] == 200' ""
   '';
 
-  nativeBuildInputs = [ perl perlPackages.LWP ];
+  nativeBuildInputs = [ curl perl ];
 
   buildPhase = ''
     perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 33a38f609b6a..724a88ce8e46 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-06-08";
+  version = "2016-06-13";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0isimfb0as6hblsbi0zlpj0zyyr6g3y7n1q7sic748hdf7a1zphn";
+    "156mkrizbnjs90lg2gqdlx1zzvpn81c83jiyprv12638zfgvqc7z";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1klh5s7z0z1mipi92q1kf5k9zznvxs9ma69q704vpblfah3km3cc";
+    "1wd838achh7wayl6bxmj0yywp5m2zbqk4xghng4mwmmnda6pa0f5";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 9adbbcb7d7f8..a633b9abe830 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016d";
+  version = "2016e";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1d51y1cmp2mhfmk51pagw7p15vrnf269xn1bb19n1mzgl3xlsmfr";
+        sha256 = "10dxnv6mwpm1rbv0dp7fhih4jd7lvqgmw7x2gy6h9i4dy6czh05s";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1jp06jd3vpsh38549xnx0wnxadrnwvvcg7vnwh4y3xxfhxpkvwx8";
+        sha256 = "17j5z894cfnid3dhh8y934hn86pvxz2ym672s1bhdag8spyc9n2p";
       })
     ];