diff options
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/rtl8821au/default.nix | 18 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtl88x2bu/default.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sd-switch/default.nix | 6 |
4 files changed, 36 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 908220a1f28d0..08e097b0d5f3e 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 ]; }; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index cc37ef13d50e1..4b194bb2f3359 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { - name = "rtl88x2bu-${kernel.version}-${version}"; - version = "unstable-2021-01-21"; + pname = "rtl88x2bu"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "cilynx"; - repo = "rtl88x2BU"; - rev = "48e7c19c92a77554403e1347447f8e2cfd780228"; - sha256 = "0nw2kgblpq6qlr43gbfxqvq0c83664f4czfwzsyfjr47rj00iyq7"; + owner = "morrownr"; + repo = "88x2bu"; + rev = "80b03962e33f86f99e898305d8d597140503de03"; + sha256 = "sha256-C7XOpKgwxM9UbfW3wHteInTmAUM3FFqN1MHMKxP8gBA="; }; hardeningDisable = [ "pic" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bc ]; buildInputs = kernel.moduleBuildDependencies; - prePatch = '' + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/cilynx/rtl88x2bu"; + homepage = "https://github.com/morrownr/88x2bu"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 3371a2263dffe..d65a601fd9e29 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: +let + rev = "3a64331a1c809bbbc21eca63b825970f213ec5ac"; +in stdenv.mkDerivation rec { - name = "rtl88xxau-aircrack-${kernel.version}-${version}"; - rev = "c0ce81745eb3471a639f0efd4d556975153c666e"; - version = "${builtins.substring 0 6 rev}"; + pname = "rtl88xxau-aircrack"; + version = "${kernel.version}-${builtins.substring 0 6 rev}"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "131cwwg3czq0i1xray20j71n836g93ac064nvf8wi13c2wr36ppc"; + sha256 = "sha256-goaN80imfCeUwiHokJd10CFKskE3iL5BO/xOQk6PtHE="; }; buildInputs = kernel.moduleBuildDependencies; @@ -18,6 +20,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + # Fix build for 5.12 kernels + patches = [ + (fetchpatch { + url = "https://github.com/aircrack-ng/rtl8812au/commit/9b4c60a89c2a55f36454b950a86246b6b86a9681.patch"; + sha256 = "sha256-HPhTLstqAePF3H6WeM9Fu4/8UjNL+9xl4L8xq3NOWuM="; + }) + ]; + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -33,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; homepage = "https://github.com/aircrack-ng/rtl8812au"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index faa766ecd9797..d4b3d9116b9ea 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sd-switch"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { owner = "rycee"; repo = pname; rev = version; - sha256 = "0sg1y8lb2pnll3408fbqp65acys31mrlzsqfrwm4nvbkayf0jcv3"; + sha256 = "0vqvwly1vidzl3d89s7jysd5lc29d6skd52pf5ibxfwhrir50sw0"; }; - cargoSha256 = "16yb61wihg06i2h9vjqcsjqkjjpmxyv4df22i25034gkcgb20xcn"; + cargoSha256 = "1m08qrz2qhf71d1fxw08wc93gfyj0hrh2hp3s17g4g1cw0jvcmm5"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; |