diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-25 01:22:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 01:22:49 +0100 |
commit | 32e44ef1828a4378d0336e97ca1eb2681cec5fa3 (patch) | |
tree | baa37fe312904f618495c5204e38cca38ef6698b /pkgs/top-level | |
parent | 057017ee8673a217da3b7530b298fbd0b974000f (diff) | |
parent | d935afe655831c56321d48a22b037ecaabaf5d06 (diff) | |
download | nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar.gz nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar.bz2 nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar.lz nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar.xz nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.tar.zst nixlib-32e44ef1828a4378d0336e97ca1eb2681cec5fa3.zip |
Merge pull request #110575 from nyanotech/aahjlgahldd
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e8c8c6ee4d8..50e9d94b1502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7133,6 +7133,8 @@ in inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) proxmark3 proxmark3-unstable; + proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxify = callPackage ../tools/networking/proxify { }; |