its time to merge to master... its too big now xD #76

Open
gortium wants to merge 160 commits from uconsole-cm5-incremental into master
25 changed files with 1611 additions and 181 deletions
Showing only changes of commit b072e2052f - Show all commits

View File

@@ -82,14 +82,6 @@
'';
});
emacs-pgtk = prev.emacs-pgtk.override { withMailutils = false; };
# qtquick3d: Qt::Quick not in aarch64 cross-compile qtdeclarative
# cmake skips building when Qt::Quick missing, then install fails
qtquick3d = prev.qtquick3d.overrideAttrs (old: {
dontUseCmakeInstall = true;
installPhase = ''
mkdir -p "$out"
'';
});
# perl-ldap fails cross-compile (Module::Install needs dynamic loading)
# Strip it from john deps -- the perl scripts that need it are not critical
john = prev.john.overrideAttrs (old: {

View File

@@ -86,7 +86,6 @@
neovim
# ===== HAM Radio =====
js8call
wsjtx
fldigi
pat # Winlink client
@@ -112,7 +111,7 @@
aircrack-ng
kismet # Wi-Fi monitor / IDS
bettercap # MITM/network attack framework
wireshark # Packet analyzer
wireshark-cli # Packet analyzer
hashcat # GPU password cracker
john # John the Ripper
sqlmap # SQL injection tool