cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #193591: libbpf: add libbpf_1 for libbpf 1.0.1

Browse source
This commit is contained in:
Vladimír Čunát 2022-10-04 09:21:38 +02:00
commit 295b093dd9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
pkgs/os-specific/linux/libbpf/0.x.nix Normal file
View file

@ -0,0 +1,49 @@
{ fetchFromGitHub
, elfutils
, pkg-config
, stdenv
, zlib
, lib
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "libbpf";
version = "0.8.1";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ elfutils zlib ];
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" "-C src" ];
passthru.tests = {
bpf = nixosTests.bpf;
};
postInstall = ''
# install linux's libbpf-compatible linux/btf.h
install -Dm444 include/uapi/linux/*.h -t $out/include/linux
'';
# FIXME: Multi-output requires some fixes to the way the pkg-config file is
# constructed (it gets put in $out instead of $dev for some reason, with
# improper paths embedded). Don't enable it for now.
# outputs = [ "out" "dev" ];
meta = with lib; {
description = "Upstream mirror of libbpf";
homepage = "https://github.com/libbpf/libbpf";
license = with licenses; [ lgpl21 /* or */ bsd2 ];
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ];
platforms = platforms.linux;
};
}

4
pkgs/os-specific/linux/libbpf/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libbpf";
version = "0.8.1";
version = "1.0.1";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8=";
sha256 = "sha256-2rzVah+CxCztKnlEWMIQrUS2JJTLiWscfIA1aOBtIzs=";
};
nativeBuildInputs = [ pkg-config ];

5
pkgs/top-level/all-packages.nix
View file

@ -16167,7 +16167,10 @@ with pkgs;
bump = callPackage ../development/tools/github/bump { };
libbpf = callPackage ../os-specific/linux/libbpf { };
libbpf_1 = callPackage ../os-specific/linux/libbpf { };
libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { };
# until more issues are fixed default to libbpf 0.x
libbpf = libbpf_0;
bpftools = callPackage ../os-specific/linux/bpftools { };