From 345f4639d66a0c7f4163bf4f5123d00889a5e3eb Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 21 May 2018 00:50:08 +0000 Subject: [PATCH] odp-dpdk, ofp, pktgen: move from linuxPackages These packages do not depend on the kernel. ofp is not aliased because it is marked as broken. --- pkgs/top-level/all-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe6e71d83d..5e5e294064c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13585,6 +13585,9 @@ with pkgs; inherit kernel; inherit (kernel) stdenv; # in particular, use the same compiler by default + # Obsolete aliases (these packages do not depend on the kernel). + inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + acpi_call = callPackage ../os-specific/linux/acpi-call {}; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; @@ -13611,14 +13614,8 @@ with pkgs; evdi = callPackage ../os-specific/linux/evdi { }; - pktgen = callPackage ../os-specific/linux/pktgen { }; - hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; - - ofp = callPackage ../os-specific/linux/ofp { }; - e1000e = callPackage ../os-specific/linux/e1000e {}; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -13966,8 +13963,12 @@ with pkgs; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; + odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + ofp = callPackage ../os-specific/linux/ofp { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -14013,6 +14014,8 @@ with pkgs; pipework = callPackage ../os-specific/linux/pipework { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { };