From 0a0e0a2e49b1b7d05ff5c097d7af33c0dacb3c63 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 21 Dec 2020 16:04:41 +0100 Subject: [PATCH] dell/xps/9360: drop qca6174 firmware This was used because the firmware in linux-firmware was outdated. It should not be after a year. --- dell/xps/13-9360/default.nix | 7 ------- dell/xps/13-9360/qca6174-firmware.nix | 26 -------------------------- 2 files changed, 33 deletions(-) delete mode 100644 dell/xps/13-9360/qca6174-firmware.nix diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix index e264a9f..19fd943 100644 --- a/dell/xps/13-9360/default.nix +++ b/dell/xps/13-9360/default.nix @@ -18,13 +18,6 @@ systemd-boot.enable = lib.mkDefault true; }; - hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; - - # TODO: upstream to NixOS/nixpkgs - nixpkgs.overlays = [(final: previous: { - qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; - })]; - # This will save you money and possibly your life! services.thermald.enable = true; } diff --git a/dell/xps/13-9360/qca6174-firmware.nix b/dell/xps/13-9360/qca6174-firmware.nix deleted file mode 100644 index c5da6c1..0000000 --- a/dell/xps/13-9360/qca6174-firmware.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "${target}-firmware-${version}"; - version = "${branch}-00042"; - - branch = "4.4.1.c1"; - target = "QCA6174"; - - src = fetchurl { - url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; - sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; - }; - - buildCommand = '' - install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin - ''; - - meta = with stdenv.lib; { - description = "Updated firmware for the qca6174 wireless chip"; - homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ yorickvp ]; - platforms = platforms.linux; - }; -}