From 39cf9758631cc4773c9ef045ac5fd8fcc9c8b96e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 23 Dec 2024 14:10:46 +0100 Subject: [PATCH] feat(flake): remove ath11k firmware from top-levle --- flake.lock | 17 ----------------- flake.nix | 11 ----------- 2 files changed, 28 deletions(-) diff --git a/flake.lock b/flake.lock index e08285d..be310a5 100644 --- a/flake.lock +++ b/flake.lock @@ -17,22 +17,6 @@ "type": "github" } }, - "ath11k-firmware": { - "flake": false, - "locked": { - "lastModified": 1733258345, - "narHash": "sha256-th2svNLc74sVI/P+y1/Yck1IW+RIUnxL+NF2HLrsSxI=", - "ref": "refs/heads/main", - "rev": "ff9dd08208c5705a3867fc132dcedb5d31c901e2", - "revCount": 163, - "type": "git", - "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" - }, - "original": { - "type": "git", - "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" - } - }, "colmena": { "inputs": { "flake-compat": "flake-compat", @@ -1249,7 +1233,6 @@ "root": { "inputs": { "aphorme_launcher": "aphorme_launcher", - "ath11k-firmware": "ath11k-firmware", "colmena": "colmena", "crane": "crane", "disko": [ diff --git a/flake.nix b/flake.nix index d0761cf..17c8f97 100644 --- a/flake.nix +++ b/flake.nix @@ -88,11 +88,6 @@ url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b"; }; - ath11k-firmware = { - url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"; - flake = false; - }; - nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm"; nix4vscode = { url = "github:nix-community/nix4vscode"; @@ -325,12 +320,6 @@ nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ ]; }; - - x13s-ath11k-firmware = pkgs.runCommand "x13s-ath11k-firmware-before" { } '' - mkdir -p $out/lib/firmware/ath11k/WCN6855/hw2.1/ - cp -v ${inputs.ath11k-firmware}/WCN6855/hw2.1/{board-2,regdb}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/ - cp -v ${inputs.ath11k-firmware}/WCN6855/hw2.1/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41/{amss,m3}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/ - ''; }; formatter =