Merge branch 'staging' into staging-next

This commit has already been partially rebuilt in https://hydra.nixos.org/eval/1592635 In particular, the severe security fix for gnutls is contained.
2020-06-10 16:18:40 +02:00
parent bbe71613b6 16024fcaec
commit 34d58cb839
152 changed files with 972 additions and 529 deletions
@@ -727,6 +727,7 @@ let
      PSI = whenAtLeast "4.20" yes;

      MODVERSIONS        = whenOlder "4.9" yes;
+      MOUSE_ELAN_I2C_SMBUS = yes;
      MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
      MTRR_SANITIZER     = yes;
      NET_FC             = yes; # Fibre Channel driver support