summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-24 17:39:53 +0200
committertv <tv@krebsco.de>2017-08-24 17:39:53 +0200
commitfd69096a27575b9d4d87a10af1492b273dad167c (patch)
treeaa3e7dc121d3188a16a37a6751ec774abcc0df81 /makefu/2configs/tools
parentb9a4e834c06bc32fa38389e13c0ec42467c0fc46 (diff)
parentfd6b42355907de5313ea3576e5d1bfa549433099 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/android-pentest.nix3
-rw-r--r--makefu/2configs/tools/dev.nix3
-rw-r--r--makefu/2configs/tools/extra-gui.nix1
3 files changed, 6 insertions, 1 deletions
diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index 3f65424cc..da8a357ae 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -10,5 +10,8 @@
apktool
jd-gui
android-studio
+ jdk
+ jre
+ openssl
];
}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 42006eb22..6681484fd 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -1,9 +1,10 @@
{ pkgs, ... }:
{
- krebs.per-user.makefu.packages = with pkgs;[
+ users.users.makefu.packages = with pkgs;[
python35Packages.virtualenv
# embedded
+ gi
flashrom
mosquitto
libcoap
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 1e68e935c..b2d616764 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -13,5 +13,6 @@
# Dev
saleae-logic
arduino-user-env
+ gitAndTools.gitFull
];
}