about summary refs log tree commit diff
path: root/users/grfn/keyboard
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-02-18T20·04+0100
committersterni <sternenseemann@systemli.org>2023-03-02T14·35+0000
commit0b64577702ca7e412bb2af4af7af9e33efc5c0f5 (patch)
treef73b1e92647aeb0456c53e8d6f5534770886ac95 /users/grfn/keyboard
parentde3eedff9be7e8bd1f6cc28ab51c7d54e0d59e9f (diff)
chore(3p/sources): Bump channels & overlays r/5866
* //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 <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn/keyboard')
-rw-r--r--users/grfn/keyboard/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/users/grfn/keyboard/default.nix b/users/grfn/keyboard/default.nix
index 39b21b876692..929ec7d6289e 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;