diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-24 18:01:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-24 18:01:21 +0000 |
| commit | 35aa42e19a778e1da77aa44f418fa2e87cc5cc41 (patch) | |
| tree | 36dd927e5bcadce9e13b75379a01a882ea8cf667 /pkgs/os-specific | |
| parent | 8ca81fe6cd0865d031319e8b978b0f82e4774642 (diff) | |
| parent | d6cc5bb41d95eafce820fe82035838312efeb0df (diff) | |
| download | nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar.gz nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar.bz2 nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar.lz nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar.xz nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.tar.zst nixlib-35aa42e19a778e1da77aa44f418fa2e87cc5cc41.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/r8168/default.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a66996b6c143..4b9259d396b3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -290,6 +290,7 @@ let IPW2200_MONITOR = option yes; # support promiscuous mode HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver HOSTAP_FIRMWARE_NVRAM = option yes; + MAC80211_MESH = option yes; # Enable 802.11s (mesh networking) support ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus ATH9K_AHB = option yes; # Ditto, AHB bus # The description of this option makes it sound dangerous or even illegal diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 69e779dfaa66..6eb53ca17f7a 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -6,18 +6,18 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.048.03"; + version = "8.052.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software - # I've verified manually (`diff -r`) that the source code for version 8.046.00 + # I've verified manually (`diff -r`) that the source code for version 8.052.01 # is the same as the one available on the realtek website. src = fetchFromGitHub { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4"; + sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj"; }; hardeningDisable = [ "pic" ]; |