From 27a0aff4a2e5c924b8a288a0402c7d1141932596 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 1 Sep 2017 10:45:52 +0200 Subject: ma pkgs.u3_tool: init at 0.3 --- makefu/5pkgs/u3_tool/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 makefu/5pkgs/u3_tool/default.nix (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/u3_tool/default.nix b/makefu/5pkgs/u3_tool/default.nix new file mode 100644 index 000000000..e8c5573a8 --- /dev/null +++ b/makefu/5pkgs/u3_tool/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + proj = "u3-tool"; + name = "${proj}-${version}"; + version = "0.3"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${proj}/${name}.tar.gz"; + sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; + }; + + meta = { + description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk."; + homepage = https://sourceforge.net/projects/u3-tool/ ; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} -- cgit v1.2.3 From f2b8e1f5f1ca45205c49ad9d8a6ef4dd23885b00 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Sep 2017 17:48:12 +0200 Subject: ma gen-oath-safe: fix typo --- makefu/5pkgs/gen-oath-safe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/gen-oath-safe/default.nix b/makefu/5pkgs/gen-oath-safe/default.nix index 245e65174..bad4b08a8 100644 --- a/makefu/5pkgs/gen-oath-safe/default.nix +++ b/makefu/5pkgs/gen-oath-safe/default.nix @@ -1,7 +1,7 @@ { coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, ... }: stdenv.mkDerivation { - name = "geno-oath-safe-2017-06-30"; + name = "gen-oath-safe-2017-06-30"; src = fetchFromGitHub { owner = "mcepl"; repo = "gen-oath-safe"; -- cgit v1.2.3 From a9d06f940196fa38145414a58860b171c4754751 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Sep 2017 17:08:59 +0200 Subject: ma gen-oath-safe: do not build with yubikey-manager --- makefu/5pkgs/gen-oath-safe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/gen-oath-safe/default.nix b/makefu/5pkgs/gen-oath-safe/default.nix index bad4b08a8..344dc1a02 100644 --- a/makefu/5pkgs/gen-oath-safe/default.nix +++ b/makefu/5pkgs/gen-oath-safe/default.nix @@ -1,6 +1,7 @@ { coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, ... }: -stdenv.mkDerivation { +builtins.trace "Warning: HTOP mode of gen-oath-safe is currently broken" + stdenv.mkDerivation { name = "gen-oath-safe-2017-06-30"; src = fetchFromGitHub { owner = "mcepl"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { coreutils openssl qrencode - yubikey-manager + #yubikey-manager libcaca python ]; -- cgit v1.2.3 From f094ccbdd08f1c3b2413678c530986f665a1440a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 5 Sep 2017 00:01:10 +0200 Subject: ma drozer: re-enable with protbuf3_2 --- makefu/5pkgs/drozer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/drozer/default.nix b/makefu/5pkgs/drozer/default.nix index c63f1d0d8..f91d5b984 100644 --- a/makefu/5pkgs/drozer/default.nix +++ b/makefu/5pkgs/drozer/default.nix @@ -5,9 +5,10 @@ pythonPackages.buildPythonApplication rec { version = "2.4.3"; buildInputs = [ jdk7 ]; propagatedBuildInputs = with pythonPackages; [ - protobuf + protobuf3_2 pyopenssl pyyaml + ] ++ [ jre7 twisted ]; -- cgit v1.2.3