diff --git a/flake.nix b/flake.nix index 6e1790e..d53e91e 100644 --- a/flake.nix +++ b/flake.nix @@ -99,8 +99,6 @@ Khanda = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = defaultModules ++ [ - # FIXME: Downgrade linux-firmware to fix regression with iwlwifi - (import ./overlays/linux-firmware_20240610.nix) nixos-hardware.nixosModules.microsoft-surface-pro-9 ./hosts/Khanda ]; diff --git a/overlays/linux-firmware_20240610.nix b/overlays/linux-firmware_20240610.nix deleted file mode 100644 index c313102..0000000 --- a/overlays/linux-firmware_20240610.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -{ - nixpkgs.overlays = [ - (self: super: { - linux-firmware = super.callPackage ( - { - stdenvNoCC, - fetchzip, - lib, - rdfind, - which, - }: - - stdenvNoCC.mkDerivation rec { - pname = "linux-firmware"; - version = "20240610"; - - src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - hash = "sha256-tjDqviOMvrBoEG8+Yn+XqdBlIDfQUX0KK2kpW6/jed8="; - }; - - nativeBuildInputs = [ - rdfind - which - ]; - - installFlags = [ "DESTDIR=$(out)" ]; - - # Firmware blobs do not need fixing and should not be modified - dontFixup = true; - - meta = with lib; { - description = "Binary firmware collection packaged by kernel.org"; - homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; - priority = 6; # give precedence to kernel firmware - }; - passthru.updateScript = ./update.sh; - } - ) { }; - }) - ]; -}