From e9531dec25324e179b04f5e763e64566e529a2e2 Mon Sep 17 00:00:00 2001 From: Dominique Martinet <asmadeus@codewreck.org> Date: Fri, 10 May 2024 21:30:53 +0900 Subject: [PATCH] bcc: migrate to by-name The package is left in all-packages to allow setting llvmPackages more easily --- .../linux => by-name/bc}/bcc/absolute-ausyscall.patch | 0 .../linux => by-name/bc}/bcc/fix-deadlock-detector-import.patch | 0 pkgs/{os-specific/linux => by-name/bc}/bcc/libbcc-path.patch | 0 .../linux/bcc/default.nix => by-name/bc/bcc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{os-specific/linux => by-name/bc}/bcc/absolute-ausyscall.patch (100%) rename pkgs/{os-specific/linux => by-name/bc}/bcc/fix-deadlock-detector-import.patch (100%) rename pkgs/{os-specific/linux => by-name/bc}/bcc/libbcc-path.patch (100%) rename pkgs/{os-specific/linux/bcc/default.nix => by-name/bc/bcc/package.nix} (100%) diff --git a/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch b/pkgs/by-name/bc/bcc/absolute-ausyscall.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/absolute-ausyscall.patch rename to pkgs/by-name/bc/bcc/absolute-ausyscall.patch diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch rename to pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch diff --git a/pkgs/os-specific/linux/bcc/libbcc-path.patch b/pkgs/by-name/bc/bcc/libbcc-path.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/libbcc-path.patch rename to pkgs/by-name/bc/bcc/libbcc-path.patch diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/by-name/bc/bcc/package.nix similarity index 100% rename from pkgs/os-specific/linux/bcc/default.nix rename to pkgs/by-name/bc/bcc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f67258286d..9b38e2f0a1a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18318,7 +18318,7 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../os-specific/linux/bcc { + bcc = callPackage ../by-name/bc/bcc/package.nix { llvmPackages = llvmPackages_16; };