Merge #150514: libbpf: 0.6.0 -> 0.6.1

This commit is contained in:
Vladimír Čunát 2021-12-25 19:17:42 +01:00
commit 671a70d31b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -1,19 +1,23 @@
{ lib, stdenv, fetchFromGitHub, pkg-config
, libelf, zlib
{ fetchFromGitHub
, fetchpatch
, libelf
, pkg-config
, stdenv
, zlib
, lib
}:
with builtins;
stdenv.mkDerivation rec {
pname = "libbpf";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-p9wUDC7r6+ElbheNkTkZW4eMNAvPbvpUyQjTjCE34ck=";
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ=";
};
nativeBuildInputs = [ pkg-config ];
@ -23,6 +27,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" ];
passthru.tests = {
bpf = nixosTests.bpf;
};
postInstall = ''
# install linux's libbpf-compatible linux/btf.h
install -Dm444 ../include/uapi/linux/btf.h -t $out/include/linux
@ -36,9 +44,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Upstream mirror of libbpf";
homepage = "https://github.com/libbpf/libbpf";
license = with licenses; [ lgpl21 /* or */ bsd2 ];
homepage = "https://github.com/libbpf/libbpf";
license = with licenses; [ lgpl21 /* or */ bsd2 ];
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ];
platforms = platforms.linux;
platforms = platforms.linux;
};
}