diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-16 12:33:54 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-16 12:33:54 +0200 |
| commit | 3b24a8306d0bb57924fcc64ec28c5b1aa3a4ac74 (patch) | |
| tree | cbb9a36c1aa94eec48b6ce13c14e5c994df0f546 /makefu/2configs/tools | |
| parent | f8c0bcf1e9e4d4dd660e6fe82017e28dbbfd6024 (diff) | |
| parent | a795766f3a881d43f92dcafcf26eeb765e993ed7 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
| -rw-r--r-- | makefu/2configs/tools/android-pentest.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/tools/dev.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 1 |
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 ]; } |