Merge branch 'master' into staging-next

Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
parent 8fce6f7625 9839cda8dc
commit 0f1c4558d3
121 changed files with 987 additions and 616 deletions
@@ -133,6 +133,7 @@
  ./programs/file-roller.nix
  ./programs/firejail.nix
  ./programs/fish.nix
+  ./programs/flexoptix-app.nix
  ./programs/freetds.nix
  ./programs/fuse.nix
  ./programs/geary.nix