From d54760e57f2a259069b4cec399f37a0ed34acd5d Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 5 Nov 2022 10:32:08 +0900 Subject: [PATCH] oci-seccomp-bpf-hook: move out of linuxPackages oci-seccomp-bpf-hook does not depend on kernel and does not need to be a linuxPackage attribute. keep inherited attribute for backwards compability --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c290e863bca..88821c430ec0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5092,6 +5092,8 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; + oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 760e3b1f20bf..166f09f6e49a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -254,6 +254,7 @@ in { # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) bcc bpftrace; # added 2021-12 + inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11 acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -421,8 +422,6 @@ in { netatop = callPackage ../os-specific/linux/netatop { }; - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf { }; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null;