From f12d2f016b6c69b702d89cc29eb50567d1088831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 08:25:17 +0200 Subject: [PATCH 1/2] bpftools: decouple version from linux_latest bpftools causes way too many rebuilds nowadays, so its updates are not suitable for merging directly to nixpkgs master. We want to update linux_latest faster than that. --- pkgs/os-specific/linux/bpftools/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 5a02a1022d59..b042654fede1 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv +{ lib, stdenv, fetchurl , libopcodes, libopcodes_2_38 , libbfd, libbfd_2_38 , elfutils, readline -, linuxPackages_latest, zlib +, zlib , python3, bison, flex }: stdenv.mkDerivation rec { pname = "bpftools"; - inherit (linuxPackages_latest.kernel) version src; + version = "5.19.9"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"; + }; nativeBuildInputs = [ python3 bison flex ]; buildInputs = (if (lib.versionAtLeast version "5.20") From 192b63e2250cf015e3c0cb86f271b9732333fe31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 08:26:51 +0200 Subject: [PATCH 2/2] bpftools: revert version to the one that's fully rebuilt That's before 9f80f6bfa96d (PR #191364). --- pkgs/os-specific/linux/bpftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index b042654fede1..640ab5f76a96 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bpftools"; - version = "5.19.9"; + version = "5.19.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"; + sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"; }; nativeBuildInputs = [ python3 bison flex ];