diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix deleted file mode 100644 index f602ef7d1d41..000000000000 --- a/pkgs/os-specific/linux/firmware/radeon-juniper-pfp/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-juniper-pfp-firmware-2010-04-08"; - - src = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin"; - sha256 = "1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz"; - }; - - unpackPhase = "true"; - installPhase = "install -D $src $out/radeon/JUNIPER_pfp.bin"; - - meta = { - description = "Juniper-pfp firmware for the RADEON chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix new file mode 100644 index 000000000000..ad277ac8ddae --- /dev/null +++ b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix @@ -0,0 +1,31 @@ +{ 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 = "1y3xr7qc7cvszgw0bh66vzy36pn4m1sj17bzy5dc9kfw01kq3n0y"; + }; + + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a53c5c377b..ed2ab36ad364 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5781,7 +5781,7 @@ let radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; - radeonJuniperPfp = callPackage ../os-specific/linux/firmware/radeon-juniper-pfp { }; + radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; rfkill = callPackage ../os-specific/linux/rfkill { };