iwlegacy: Remove since it is already in linux-firmware-nonfree

wip/yesman
William A. Kennington III 9 years ago
parent 8e62c497ca
commit 69a277e2cc
  1. 1
      nixos/modules/hardware/all-firmware.nix
  2. 47
      pkgs/os-specific/linux/firmware/iwlegacy/default.nix
  3. 2
      pkgs/top-level/all-packages.nix

@ -24,7 +24,6 @@ with lib;
config = mkIf config.hardware.enableAllFirmware {
hardware.firmware = [
"${pkgs.firmwareLinuxNonfree}/lib/firmware"
"${pkgs.iwlegacy}/lib/firmware"
];
};

@ -1,47 +0,0 @@
{ stdenv, fetchurl }:
let
packages = [
# Kernel 2.6.28+
{ name = "4965-ucode-228.61.2.24"; sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m"; }
# Kernel 2.6.29+
{ name = "3945-ucode-15.32.2.9"; sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk"; }
];
fetchPackage =
{ name, sha256 }: fetchurl {
name = "iwlwifi-${name}.tgz";
url = "https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-${name}.tgz";
inherit sha256;
};
srcs = map fetchPackage packages;
in stdenv.mkDerivation {
name = "iwlegacy";
inherit srcs;
unpackPhase = ''
mkdir -p ./firmware
'';
buildPhase = ''
for src in $srcs; do
tar zxf $src
done
'';
installPhase = ''
mkdir -p $out/lib/firmware
cp -r iwlwifi-*/*.ucode "$out/lib/firmware/"
'';
meta = {
description = "Binary firmware collection from intel";
homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
license = stdenv.lib.licenses.unfreeRedistributableFirmware;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

@ -8583,8 +8583,6 @@ let
iw = callPackage ../os-specific/linux/iw { };
iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { };
jfbview = callPackage ../os-specific/linux/jfbview { };
jujuutils = callPackage ../os-specific/linux/jujuutils { };

Loading…
Cancel
Save