diff options
| author | Stanisław Pitucha <git@viraptor.info> | 2022-10-10 13:37:01 +1100 |
|---|---|---|
| committer | Stanisław Pitucha <git@viraptor.info> | 2022-10-15 14:39:51 +1100 |
| commit | 7f3ecd1f1e8a981db1be8b43e612a944cd33929f (patch) | |
| tree | cc35a92435014b3707d96a810a20ab2d1f319c16 /pkgs/tools/misc/libcpuid | |
| parent | e1ffebe73e38162377fdbfe78747a6e2530cae37 (diff) | |
libcpuid: 0.5.1 -> 0.6.0
Diffstat (limited to 'pkgs/tools/misc/libcpuid')
| -rw-r--r-- | pkgs/tools/misc/libcpuid/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/misc/libcpuid/stdint.patch | 5 |
2 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 5abe5673bf298..e7fb2b4da7996 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 beb8890c5a280..0000000000000 --- 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> |