From 0b64577702ca7e412bb2af4af7af9e33efc5c0f5 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 18 Feb 2023 21:04:06 +0100 Subject: chore(3p/sources): Bump channels & overlays * //3p/sources: temporarily switch to nixos-unstable-small, since it includes: - evans update we are interested in, allowing us to drop our evans patches. - awscli2 update that unbreaks //users/grfn * //3p/overlays/tvl: - drop evans patches - update tdlib to 1.8.11 to make tazjin's emacs happy - drop obsolete mullvad workaround * //users/grfn/keyboard: disable -Werror for array-bounds warnings. Seems like a non-trivial job to resolve the warning properly, hopefully GCC 12 still generates the same working code as GCC 11 used to. * //users/grfn/system/home: remove yubikey-manager-qt. Yubico can't seem to keep that on pace with yubikey-manager. It requires a <5 version of the latter which is incompatible with the recently released cryptography >= 39. * //3p/gerrit: update changed FOD hash for the fetch step Change-Id: I590ab996247e69b0ab5059cd173840ef4ebfe939 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8133 Tested-by: BuildkiteCI Reviewed-by: flokli Reviewed-by: tazjin Autosubmit: sterni Reviewed-by: grfn --- users/grfn/keyboard/default.nix | 10 ++++++++++ users/grfn/system/home/platforms/linux.nix | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'users/grfn') diff --git a/users/grfn/keyboard/default.nix b/users/grfn/keyboard/default.nix index 39b21b8766..929ec7d628 100644 --- a/users/grfn/keyboard/default.nix +++ b/users/grfn/keyboard/default.nix @@ -32,6 +32,16 @@ rec { AVR_CFLAGS = [ "-isystem ${avrlibc}/avr/include" "-L${avrlibc}/avr/lib/avr5" + # GCC 12 has improved array-bounds warnings, failing the build of QMK. + # Newer versions of the firmware would work probably, but they heavily + # altered the build system, so it is non-trivial. Backporting the patch + # that fixes it seems difficult – the next change to the offending matrix.c + # after the pinned qmkSource commit is + # https://github.com/qmk/qmk_firmware/commit/11c308d436180974b7719ce78cdffdd83a1302c0 + # which heavily changes the way the code works. + # + # TODO(grfn): address this properly + "-Wno-error=array-bounds" ]; AVR_ASFLAGS = AVR_CFLAGS; diff --git a/users/grfn/system/home/platforms/linux.nix b/users/grfn/system/home/platforms/linux.nix index f677a631e6..5429f3e094 100644 --- a/users/grfn/system/home/platforms/linux.nix +++ b/users/grfn/system/home/platforms/linux.nix @@ -57,7 +57,8 @@ in keybase openssl yubikey-manager - yubikey-manager-qt + # TODO(grfn): lagging behind yubikey-manager and doesn't support cryptography >= 39 + # yubikey-manager-qt # Spotify...etc spotify -- cgit 1.4.1