x86info: 1.30 -> unstable-2021-08-07

+29 -16
+29 -16
pkgs/os-specific/linux/x86info/default.nix
··· 1 - {lib, stdenv, fetchurl, pciutils, python2}: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , pciutils 5 + , pkg-config 6 + , python3 7 + }: 2 8 3 9 stdenv.mkDerivation rec { 4 - version = "1.30"; 5 10 pname = "x86info"; 11 + version = "unstable-2021-08-07"; 6 12 7 - src = fetchurl { 8 - url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz"; 9 - sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; 13 + src = fetchFromGitHub { 14 + owner = "kernelslacker"; 15 + repo = pname; 16 + rev = "061ea35ecb0697761b6260998fa2045b8bb0be68"; 17 + hash = "sha256-/qWioC4dV1bQkU4SiTR8duYqoGIMIH7s8vuAXi75juo="; 10 18 }; 11 19 12 - preConfigure = '' 13 - patchShebangs . 20 + nativeBuildInputs = [ 21 + pkg-config 22 + python3 23 + ]; 24 + 25 + buildInputs = [ 26 + pciutils 27 + ]; 14 28 15 - # ignore warnings 16 - sed -i 's/-Werror -Wall//' Makefile 29 + postBuild = '' 30 + patchShebangs lsmsr/createheader.py 31 + make -C lsmsr 17 32 ''; 18 33 19 - buildInputs = [ pciutils python2 ]; 20 - 21 34 installPhase = '' 22 35 mkdir -p $out/bin 23 - cp x86info lsmsr $out/bin 36 + cp x86info $out/bin 37 + cp lsmsr/lsmsr $out/bin 24 38 ''; 25 39 26 40 meta = { 27 41 description = "Identification utility for the x86 series of processors"; 28 - longDescription = 29 - '' 42 + longDescription = '' 30 43 x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages 31 44 the cpuid kernel module where possible. it supports parsing model specific 32 45 registers (MSRs) via the msr kernel module. it will approximate processor ··· 34 47 ''; 35 48 platforms = [ "i686-linux" "x86_64-linux" ]; 36 49 license = lib.licenses.gpl2; 37 - homepage = "http://codemonkey.org.uk/projects/x86info/"; 38 - maintainers = with lib.maintainers; [jcumming]; 50 + homepage = "https://github.com/kernelslacker/x86info"; 51 + maintainers = with lib.maintainers; [ jcumming ]; 39 52 }; 40 53 }