Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79b173c35832
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16e34d25fd5b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 22, 2020

  1. Copy the full SHA
    82d0986 View commit details

Commits on Nov 5, 2020

  1. Merge pull request #93620 from lovesegfault/fix-r8168

    kernelPackages.r8168: 8.047.04 -> 8.048.03
    timokau authored Nov 5, 2020
    Copy the full SHA
    16e34d2 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/os-specific/linux/r8168/default.nix
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/r8168/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ 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.047.04";
version = "8.048.03";

# This is a mirror. The original website[1] doesn't allow non-interactive
# downloads, instead emailing you a download link.
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
owner = "mtorromeo";
repo = "r8168";
rev = version;
sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg";
sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4";
};

hardeningDisable = [ "pic" ];
@@ -29,8 +29,8 @@ in stdenv.mkDerivation rec {
# based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
preBuild = ''
makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")
makeFlagsArray+=("SUBDIRS=$PWD/src")
makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN")
makeFlagsArray+=("M=$PWD/src")
makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE")
makeFlagsArray+=("modules")
'';