diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
| commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
| tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/rtl8814au/default.nix | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
| download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/rtl8814au/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/rtl8814au/default.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 99d22e2f999..2b0fb9622a4 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: -stdenv.mkDerivation rec { - name = "rtl8814au-${kernel.version}-${version}"; - version = "4.3.21"; +stdenv.mkDerivation { + pname = "rtl8814au"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8814au"; - rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f"; - sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q"; + owner = "morrownr"; + repo = "8814au"; + rev = "388786c864f9b1437fc4d934b1eccf6d7f1e1355"; + sha256 = "sha256-2EnheODPFWTGN/fz45LWRSOGeV6pTENEUrehahj+PJ4="; }; buildInputs = kernel.moduleBuildDependencies; @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtek 8814AU USB WiFi driver"; - homepage = "https://github.com/zebulon2/rtl8814au"; - license = licenses.gpl2; + homepage = "https://github.com/morrownr/8814au"; + license = licenses.gpl2Only; maintainers = [ maintainers.lassulus ]; - platforms = [ "x86_64-linux" "i686-linux" ]; }; } |