From 7f3ecd1f1e8a981db1be8b43e612a944cd33929f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Mon, 10 Oct 2022 13:37:01 +1100
Subject: [PATCH] libcpuid: 0.5.1 -> 0.6.0

---
 pkgs/tools/misc/libcpuid/default.nix  | 17 +++--------------
 pkgs/tools/misc/libcpuid/stdint.patch |  5 -----
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/misc/libcpuid/stdint.patch

diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 5abe5673bf29..e7fb2b4da799 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,27 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libcpuid";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "anrieff";
     repo = "libcpuid";
     rev = "v${version}";
-    sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU=";
+    sha256 = "sha256-XX+XFd1ehahIUGONAx2iOxetU0s6vONc7m91zEOWz5o=";
   };
 
-  patches = [
-    # Work around https://github.com/anrieff/libcpuid/pull/102.
-    ./stdint.patch
-    # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1
-    (fetchpatch {
-      name = "use-popcount-from-libc.patch";
-      url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch";
-      sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/pkgs/tools/misc/libcpuid/stdint.patch
deleted file mode 100644
index beb8890c5a28..000000000000
--- a/pkgs/tools/misc/libcpuid/stdint.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/libcpuid/libcpuid.h
-+++ b/libcpuid/libcpuid.h
-@@ -88 +88 @@
--#include "libcpuid_types.h"
-+#include <stdint.h>