lol

Merge pull request #12992 from lukasepple/master

intel2200BGFirmware: init at 3.1

+39 -2
+1
lib/maintainers.nix
··· 185 185 lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>"; 186 186 lsix = "Lancelot SIX <lsix@lancelotsix.com>"; 187 187 ludo = "Ludovic Courtès <ludo@gnu.org>"; 188 + lukasepple = "Lukas Epple <post@lukasepple.de>"; 188 189 lukego = "Luke Gorrie <luke@snabb.co>"; 189 190 luispedro = "Luis Pedro Coelho <luis@luispedro.org>"; 190 191 lw = "Sergey Sofeychuk <lw@fmap.me>";
+1 -1
nixos/modules/hardware/all-firmware.nix
··· 22 22 ###### implementation 23 23 24 24 config = mkIf config.hardware.enableAllFirmware { 25 - hardware.firmware = [ pkgs.firmwareLinuxNonfree ]; 25 + hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ]; 26 26 }; 27 27 28 28 }
+1 -1
nixos/modules/hardware/network/intel-2200bg.nix
··· 23 23 24 24 config = lib.mkIf config.networking.enableIntel2200BGFirmware { 25 25 26 - hardware.enableAllFirmware = true; 26 + hardware.firmware = [ pkgs.intel2200BGFirmware ]; 27 27 28 28 }; 29 29
+34
pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
··· 1 + { stdenv, fetchurl }: 2 + 3 + let version = "3.1"; in 4 + 5 + stdenv.mkDerivation { 6 + name = "intel2200BGFirmware-${version}"; 7 + 8 + src = fetchurl { 9 + url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; 10 + sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; 11 + }; 12 + 13 + phases = [ "unpackPhase" "installPhase" ]; 14 + 15 + installPhase = '' 16 + mkdir -p $out/lib/firmware 17 + for fw in \ 18 + ipw2200-bss.fw \ 19 + ipw2200-ibss.fw \ 20 + ipw2200-sniffer.fw 21 + do 22 + cp -f $fw $out/lib/firmware/$fw 23 + done 24 + mkdir -p $out/share/doc/intel2200BGFirmware 25 + cp -f LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE 26 + ''; 27 + 28 + meta = with stdenv.lib; { 29 + description = "Firmware for Intel 2200BG cards"; 30 + homepage = http://ipw2200.sourceforge.net/firmware.php; 31 + license = stdenv.lib.licenses.unfreeRedistributableFirmware; 32 + maintainers = with maintainers; [ lukasepple ]; 33 + }; 34 + }
+2
pkgs/top-level/all-packages.nix
··· 10087 10087 10088 10088 ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; 10089 10089 10090 + intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; 10091 + 10090 10092 iomelt = callPackage ../os-specific/linux/iomelt { }; 10091 10093 10092 10094 iotop = callPackage ../os-specific/linux/iotop { };