summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2021-08-22 14:45:17 +0200
committerAndreas Rammhold <andreas@rammhold.de>2021-09-12 23:44:14 +0200
commit1bfa488b1cd55db5cee714a320375a02d33f5279 (patch)
tree6ac451f3f33003e3ce4c5927c091a6a849014ba0
parent8d63fae087ff391db5b108d5f6d92eb8fb6c5876 (diff)
downloadnixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar.gz
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar.bz2
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar.lz
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar.xz
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.tar.zst
nixpkgs-1bfa488b1cd55db5cee714a320375a02d33f5279.zip
libbpf: 0.1.1 -> 0.4.0
-rw-r--r--pkgs/os-specific/linux/libbpf/default.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 2e497584fab..649ad88a3d1 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -7,30 +7,15 @@ with builtins;
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "0.1.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner  = "libbpf";
     repo   = "libbpf";
     rev    = "v${version}";
-    sha256 = "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv";
+    sha256 = "1by5w7g3i2fc10bi6f0j8jqi2nq0x8r973j2qx7qlfryjxr7b2v3";
   };
 
-  patches = [
-    (fetchpatch { # included upstream for > 0.1.0
-      name = "link-zlib.patch";
-      url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff";
-      sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z";
-    })
-  ];
-  patchFlags = "-p2";
-  # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740
-  postPatch = ''
-    substituteInPlace ../scripts/check-reallocarray.sh \
-      --replace 'mktemp /tmp/' 'mktemp ' \
-      --replace '/bin/rm' 'rm'
-  '';
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libelf zlib ];