diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix deleted file mode 100644 index fb43c7d67e18..000000000000 --- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl }: - -let - src1 = fetchurl { - url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; - sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3"; - name = "bcm43xx_hdr-0.fw"; - }; - - src2 = fetchurl { - url = "https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; - sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797"; - name = "bcm43xx-0.fw"; - }; -in -stdenv.mkDerivation { - name = "bcm43xx-firmware-610.811"; - - unpackPhase = "true"; - - buildPhase = "true"; - - installPhase = '' - mkdir -p $out/brcm - cp ${src1} $out/brcm/${src1.name} - cp ${src2} $out/brcm/${src2.name} - ''; - - meta = { - description = "Firmware for the Broadcom 43xx 802.11 wireless cards"; - homepage = http://linuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix deleted file mode 100644 index 53e0fb235a52..000000000000 --- a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-juniper-firmware-2010-04-08"; - - srcPfp = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin"; - sha256 = "1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz"; - }; - srcMe = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_me.bin"; - sha256 = "1869dhay3f75hhnsvdjhlrjd4fhdi8d6c3lhk45vp7fhjiw4741q"; - }; - srcRlc = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin"; - sha256 = "0hglq8ab1f3d81mvcb4aikkfdwh6i4a93ps0f9czq1qz5h0q6wlk"; - }; - - unpackPhase = "true"; - installPhase = '' - install -D $srcPfp $out/radeon/JUNIPER_pfp.bin - install -D $srcMe $out/radeon/JUNIPER_me.bin - install -D $srcRlc $out/radeon/JUNIPER_rlc.bin - ''; - - meta = { - description = "Juniper firmware for the RADEON chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix b/pkgs/os-specific/linux/firmware/radeon-r600/default.nix deleted file mode 100644 index 9a298ab96d4a..000000000000 --- a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-r600-firmware-2009-12-09"; - - src = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R600_rlc.bin"; - sha256 = "11bxpivxycigv0ffbck33y9czgira3g8py33840zxzwcwbi59yps"; - }; - - unpackPhase = "true"; - installPhase = "install -D $src $out/radeon/R600_rlc.bin"; - - meta = { - description = "Firmware for the RADEON r600 chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix deleted file mode 100644 index 79b16b1dceaa..000000000000 --- a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-r700-firmware-2009-12-09"; - - src = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin"; - sha256 = "1sbpq39cvjnpfp1iamhq9k9266jkaaywnm8d2pw95ayw56a77976"; - }; - - unpackPhase = "true"; - installPhase = "install -D $src $out/radeon/R700_rlc.bin"; - - meta = { - description = "Firmware for the RADEON r700 chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix deleted file mode 100644 index abf12fd672b7..000000000000 --- a/pkgs/os-specific/linux/firmware/ralink/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchsvn }: - -# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git - -stdenv.mkDerivation { - name = "ralink-fw-r17279"; - - src = fetchsvn { - url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; - rev = 17279; - sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; - }; - - unpackPhase = "true"; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = '' - mkdir -p $out - cp $src/*.bin $out - cp $src/LICENSE $out/ralink.LICENSE - ''; - - meta = { - description = "Firmware for the Ralink wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix deleted file mode 100644 index 0a1cb6555726..000000000000 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchsvn }: - -# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git - -stdenv.mkDerivation { - name = "rt2860-fw-26"; - - src = fetchsvn { - url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; - rev = 17279; - sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; - }; - - unpackPhase = "true"; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = '' - mkdir -p $out - cp $src/rt2860.bin $out - cp $src/LICENSE $out/rt2860.LICENSE - ''; - - meta = { - description = "Firmware for the Ralink RT2860 wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix deleted file mode 100644 index 15de7c30586b..000000000000 --- a/pkgs/os-specific/linux/firmware/rt2870/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - name = "rt2870-fw-22"; - src = fetchurl { - url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D"; - name = "RT2870_Firmware_V22.zip"; - sha256 = "d24591a8529b0a609cc3c626ecee96484bb29b2c020260b82f6025459c11f263"; - }; - - buildInputs = [ unzip ]; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; - - meta = { - description = "Firmware for the Ralink RT2870 wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix deleted file mode 100644 index dbd2fa45b7b8..000000000000 --- a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl }: - -# http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git -let - src = fetchurl { - url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw"; - sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a"; - name = "rtl8168e-2.fw"; - }; -in -stdenv.mkDerivation { - name = "rtl8168e-2-firmware-2012.01.10"; - - unpackPhase = "true"; - - buildPhase = "true"; - - installPhase = "install -v -D ${src} $out/rtl_nic/${src.name}"; - - meta = { - description = "Firmware for the Realtek Gigabit Ethernet controllers"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix deleted file mode 100644 index f06fcb149e86..000000000000 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, firmwareLinuxNonfree}: -stdenv.mkDerivation { - name = "rtl8192c-fw"; - src = firmwareLinuxNonfree; - - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/rtlwifi - cp "$src/rtlwifi/rtl8192cfw.bin" "$out/rtlwifi/rtl8192cfw.bin" - ''; - - meta = { - description = "Firmware for the Realtek RTL8192c wireless cards"; - homepage = "http://www.realtek.com"; - license = "non-free"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d09c4810ace0..bfd70ea17e73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6205,8 +6205,6 @@ let batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; - bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez4 = callPackage ../os-specific/linux/bluez { pygobject = pygobject3; }; @@ -6706,10 +6704,6 @@ let radeontools = callPackage ../os-specific/linux/radeontools { }; - radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; - radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; - radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -6718,18 +6712,8 @@ let rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; - - rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; - - rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; - rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; - - rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { }; - sdparm = callPackage ../os-specific/linux/sdparm { }; sepolgen = callPackage ../os-specific/linux/sepolgen { };