diff options
| author | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
| commit | 428a5f037ef8a5d6b0ef5bc0ea74dcd458fd5b16 (patch) | |
| tree | 0bcc67e7d0f4ff22ca7e4840608f72015a49fbdd /makefu/5pkgs | |
| parent | 6218a259a9880368c71ecacddcf1e7c641bd5278 (diff) | |
| parent | a46564bf986829cd7372020ed4962af15a5c5983 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs')
| -rw-r--r-- | makefu/5pkgs/drozer/default.nix | 3 | ||||
| -rw-r--r-- | makefu/5pkgs/gen-oath-safe/default.nix | 7 | ||||
| -rw-r--r-- | makefu/5pkgs/u3_tool/default.nix | 22 |
3 files changed, 28 insertions, 4 deletions
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 ]; diff --git a/makefu/5pkgs/gen-oath-safe/default.nix b/makefu/5pkgs/gen-oath-safe/default.nix index 245e65174..344dc1a02 100644 --- a/makefu/5pkgs/gen-oath-safe/default.nix +++ b/makefu/5pkgs/gen-oath-safe/default.nix @@ -1,7 +1,8 @@ { coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, ... }: -stdenv.mkDerivation { - name = "geno-oath-safe-2017-06-30"; +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"; repo = "gen-oath-safe"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { coreutils openssl qrencode - yubikey-manager + #yubikey-manager libcaca python ]; 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 ]; + }; +} |