diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/os-specific/linux/microcode | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/os-specific/linux/microcode')
-rw-r--r-- | pkgs/os-specific/linux/microcode/amd.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/microcode/intel.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/microcode/iucode-tool.nix | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index a1a37db9dd6..72f413f9cb6 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,4 +1,4 @@ -{ stdenv, firmwareLinuxNonfree, libarchive }: +{ lib, stdenv, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation { name = "amd-ucode-${firmwareLinuxNonfree.version}"; @@ -20,9 +20,9 @@ stdenv.mkDerivation { echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > $out/amd-ucode.img ''; - meta = with stdenv.lib; { + meta = with lib; { description = "AMD Processor microcode patch"; - homepage = "http://www.amd64.org/support/microcode.html"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 475288a0b6f..f8bb7c67d8e 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libarchive, iucode-tool }: +{ lib, stdenv, fetchFromGitHub, libarchive, iucode-tool }: stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200616"; + version = "20210608"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563"; + sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3"; }; nativeBuildInputs = [ iucode-tool libarchive ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.intel.com/"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index 65cb01c84a5..e38dd83e0db 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook }: stdenv.mkDerivation rec { pname = "iucode-tool"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "IntelĀ® 64 and IA-32 processor microcode tool"; homepage = "https://gitlab.com/iucode-tool/iucode-tool"; license = licenses.gpl2; |