From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/os-specific/linux/rtl8821au/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/rtl8821au') diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index f3d68cf7919..908220a1f28 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; homepage = "https://github.com/zebulon2/rtl8812au"; license = licenses.gpl2; -- cgit 1.4.1 From f49504d95fdd76d0e01e96574cf8a652e14129d7 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 19 May 2021 16:40:12 +0800 Subject: linuxPackages.rtl8821au: switch to a more maintained fork --- pkgs/os-specific/linux/rtl8821au/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/os-specific/linux/rtl8821au') diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 908220a1f28..08e097b0d5f 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - name = "rtl8821au-${kernel.version}-${version}"; - version = "5.1.5+41"; + pname = "rtl8821au"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au"; - rev = "ecd3494c327c54110d21346ca335ef9e351cb0be"; - sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; + owner = "morrownr"; + repo = "8821au"; + rev = "6f6a9d5772bb2b75f18374c01c82c6b3e8e3244d"; + sha256 = "sha256-RqtLR3sNcLXhUrNloSTRKubL1SVwzbVe73AsBYYSXNE="; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; - homepage = "https://github.com/zebulon2/rtl8812au"; - license = licenses.gpl2; + description = "rtl8821AU and rtl8812AU chipset driver with firmware"; + homepage = "https://github.com/morrownr/8821au"; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ plchldr ]; }; -- cgit 1.4.1