swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157567 from dtzWill/update/numatop-2.2-fix-platforms

Browse source 
numatop: 2.1 -> 2.2, fix build, string ops, meta.platforms
This commit is contained in:
markuskowa 2022-01-31 23:19:43 +01:00 committed by GitHub
parent 67cc0b103a 8673391cb7
commit ddc93d61c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/os-specific/linux/numatop/default.nix
View file

@ -1,17 +1,32 @@
{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "numatop"; pname = "numatop";
version = "2.1"; version = "2.2";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; owner = "intel";
sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; repo = "numatop";
rev = "v${version}";
sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ numactl ncurses ]; buildInputs = [ numactl ncurses ];
checkInputs = [ check ]; checkInputs = [ check ];
patches = [
(fetchpatch {
url = "https://github.com/intel/numatop/pull/54.patch";
sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM=";
name = "fix-string-operations.patch";
})
(fetchpatch {
url = "https://github.com/intel/numatop/pull/64.patch";
sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM=";
name = "fix-format-strings-mvwprintw.patch";
})
];
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {
@ -20,8 +35,8 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];
platforms = [ platforms = [
{ kernel.name = "linux"; cpu.family = "x86"; } "i686-linux" "x86_64-linux"
{ kernel.name = "linux"; cpu.family = "power"; } "powerpc64-linux" "powerpc64le-linux"
]; ];
}; };
} }