diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd778deea95d..063e3a576721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11071,7 +11071,6 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_5 libressl_2_6 libressl_2_7; @@ -13653,6 +13652,13 @@ with pkgs; ]; }; + linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -13876,6 +13882,11 @@ with pkgs; linuxPackages_samus_latest = linuxPackages_samus_4_12; linux_samus_latest = linuxPackages_samus_latest.kernel; + # Hardkernel (Odroid) kernels. + linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); + linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -15962,6 +15973,7 @@ with pkgs; wireshark = callPackage ../applications/networking/sniffers/wireshark { withQt = true; + qt5 = qt59; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; |