Merge remote-tracking branch 'gum/master'

5 files changed, 58 insertions, 8 deletions

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 718b23c9e..6598f5d3f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -5,20 +5,22 @@ let
 in
 {
   nixpkgs.config.packageOverrides = rec {
-    alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
+    alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     awesomecfg = callPackage ./awesomecfg {};
     bintray-upload = callPackage ./bintray-upload {};
+    inherit (callPackage ./devpi {}) devpi-web devpi-server;
+    f3 = callPackage ./f3 {};
+    farpd = callPackage ./farpd {};
     git-xlsx-textconv = callPackage ./git-xlsx-textconv {};
     mergerfs = callPackage ./mergerfs {};
     mycube-flask = callPackage ./mycube-flask {};
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
+    ps3netsrv = callPackage ./ps3netsrv {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
-    inherit (callPackage ./devpi {}) devpi-web devpi-server;
     skytraq-logger = callPackage ./skytraq-logger {};
     taskserver = callPackage ./taskserver {};
-    ps3netsrv = callPackage ./ps3netsrv {};
-    farpd = callPackage ./farpd {};
+    wol = callPackage ./wol {};
   };
 }
diff --git a/makefu/5pkgs/f3/default.nix b/makefu/5pkgs/f3/default.nix
new file mode 100644
index 000000000..e7f20b1e6
--- /dev/null
+++ b/makefu/5pkgs/f3/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "f3-${version}";
+  version = "6.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchFromGitHub {
+    owner = "AltraMayor";
+    repo = "f3";
+    rev = "v${version}";
+    sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  patchPhase = "sed -i 's/-oroot -groot//' Makefile";
+
+  meta = {
+    description = "Fight Flash Fraud";
+    homepage = http://oss.digirati.com.br/f3/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}
diff --git a/makefu/5pkgs/git-xlsx-textconv/default.nix b/makefu/5pkgs/git-xlsx-textconv/default.nix
index 1f631f020..66dde76ef 100644
--- a/makefu/5pkgs/git-xlsx-textconv/default.nix
+++ b/makefu/5pkgs/git-xlsx-textconv/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 let
-  go-xlsx = goPackages.buildGoPackage rec {
+  go-xlsx = buildGoPackage rec {
   name = "go-xlsx-${version}";
   version = "46e6e472d";
 
@@ -13,7 +13,7 @@ let
   };
 };
 in
-(goPackages.buildGoPackage rec {
+(buildGoPackage rec {
   name = "git-xlsx-textconv-${version}";
   version = "70685e7f8";
 
diff --git a/makefu/5pkgs/ps3netsrv/default.nix b/makefu/5pkgs/ps3netsrv/default.nix
index 904185934..f62ee0c9a 100644
--- a/makefu/5pkgs/ps3netsrv/default.nix
+++ b/makefu/5pkgs/ps3netsrv/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/dirkvdb/ps3netsrv--";
     fetchSubmodules = true;
     rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; # latest @ 2016-05-24
-    sha256 = "0l7bp18cs3xr2qgsmcf18diccski49mj9whngxm9isi8wd4r9inj";
+    sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa";
   };
 
   nativeBuildInputs = [ gnugrep ];
diff --git a/makefu/5pkgs/wol/default.nix b/makefu/5pkgs/wol/default.nix
new file mode 100644
index 000000000..a6d54b8a2
--- /dev/null
+++ b/makefu/5pkgs/wol/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  proj = "wake-on-lan";
+  name = "wol-${version}";
+  version = "0.7.1";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${proj}/${name}.tar.gz";
+    sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270";
+  };
+
+  meta = {
+    description = "simple wake-on-lan client";
+    homepage = https://sourceforge.net/projects/wake-on-lan/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}