From 87d250e6554161db681fef23ff92cbe5879b0092 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 6 Nov 2021 17:45:44 +0100
Subject: [PATCH] cpuid: 20201006 -> 20211031

---
 pkgs/os-specific/linux/cpuid/default.nix | 26 +++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix
index ea9ae06130ec..a434501d5126 100644
--- a/pkgs/os-specific/linux/cpuid/default.nix
+++ b/pkgs/os-specific/linux/cpuid/default.nix
@@ -1,20 +1,27 @@
-{ lib, stdenv, fetchurl, perl }:
+{ lib
+, stdenv
+, fetchurl
+, perl
+}:
 
 stdenv.mkDerivation rec {
   pname = "cpuid";
-  version = "20201006";
+  version = "20211031";
 
   src = fetchurl {
-    name = "${pname}-${version}.src.tar.gz";
     url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
-    sha256 = "19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k";
+    sha256 = "13sxb2ar4gypiv0l87lr7hf3qjccwgsg1r92adv9jvrfxcv36pbn";
   };
 
   # For pod2man during the build process.
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [
+    perl
+  ];
 
   # As runtime dependency for cpuinfo2cpuid.
-  buildInputs = [ perl ];
+  buildInputs = [
+    perl
+  ];
 
   # The Makefile hardcodes $(BUILDROOT)/usr as installation
   # destination. Just nuke all mentions of /usr to get the right
@@ -32,7 +39,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Linux tool to dump x86 CPUID information about the CPU";
     longDescription = ''
       cpuid dumps detailed information about the CPU(s) gathered from the CPUID
@@ -40,11 +47,10 @@ stdenv.mkDerivation rec {
       Intel, AMD, VIA, Hygon, and Zhaoxin CPUs, as well as older Transmeta,
       Cyrix, UMC, NexGen, Rise, and SiS CPUs.
     '';
-
     platforms = [ "i686-linux" "x86_64-linux" ];
-    license = lib.licenses.gpl2;
+    license = licenses.gpl2Plus;
     homepage = "http://etallen.com/cpuid.html";
-    maintainers = with lib.maintainers; [ blitz ];
+    maintainers = with maintainers; [ blitz ];
   };
 
 }