mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
firmwareLinuxNonfree -> linux-firmware
This renames our `firmwareLinuxNonfree` package to `linux-firmware`. There is prior art for this in multiple other distros[1][2][3]. Besides making the package more discoverable by those searching for the usual name, this also brings it in-line with the `kebab-case` we normally see in `nixpkgs` pnames, and removes the `Nonfree` information from the name, which I consider redundant given it's present in `meta.license`. The corresponding alias has been added, so this shouldn't break anything. [1]: https://archlinux.org/packages/core/any/linux-firmware/ [2]: https://src.fedoraproject.org/rpms/linux-firmware [3]: https://packages.gentoo.org/packages/sys-kernel/linux-firmware
This commit is contained in:
parent
bbb703f8cf
commit
d72a2e7baf
@ -374,6 +374,12 @@
|
||||
<literal>pkgs.theLoungePlugins.themes</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>firmwareLinuxNonfree</literal> package has been
|
||||
renamed to <literal>linux-firmware</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
@ -134,3 +134,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
is set to `true`.
|
||||
|
||||
- The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.
|
||||
|
||||
- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.
|
||||
|
@ -31,7 +31,6 @@ in {
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Turn on this option if you want to enable all the firmware with a license allowing redistribution.
|
||||
(i.e. free firmware and <literal>firmware-linux-nonfree</literal>)
|
||||
'';
|
||||
};
|
||||
|
||||
@ -51,7 +50,7 @@ in {
|
||||
config = mkMerge [
|
||||
(mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) {
|
||||
hardware.firmware = with pkgs; [
|
||||
firmwareLinuxNonfree
|
||||
linux-firmware
|
||||
intel2200BGFirmware
|
||||
rtl8192su-firmware
|
||||
rt5677-firmware
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenvNoCC, fetchgit, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "firmware-linux-nonfree";
|
||||
pname = "linux-firmware";
|
||||
version = "20211216";
|
||||
|
||||
src = fetchgit {
|
@ -1,9 +1,9 @@
|
||||
{ lib, stdenv, firmwareLinuxNonfree, libarchive }:
|
||||
{ lib, stdenv, linux-firmware, libarchive }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "amd-ucode-${firmwareLinuxNonfree.version}";
|
||||
name = "amd-ucode-${linux-firmware.version}";
|
||||
|
||||
src = firmwareLinuxNonfree;
|
||||
src = linux-firmware;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p kernel/x86/microcode
|
||||
find ${firmwareLinuxNonfree}/lib/firmware/amd-ucode -name \*.bin \
|
||||
find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin \
|
||||
-exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \;
|
||||
'';
|
||||
|
||||
|
@ -262,6 +262,7 @@ mapAliases ({
|
||||
firefoxWrapper = firefox; # 2015-09
|
||||
|
||||
firestr = throw "firestr has been removed."; # added 2019-12-08
|
||||
firmwareLinuxNonfree = linux-firmware; # added 2022-01-09
|
||||
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
|
||||
flameGraph = flamegraph; # added 2018-04-25
|
||||
flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
|
||||
|
@ -22786,7 +22786,7 @@ with pkgs;
|
||||
|
||||
qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
|
||||
|
||||
firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
|
||||
linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { };
|
||||
|
||||
qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user