summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Pykhalov <go.wigust@gmail.com>2021-04-15 09:43:21 +0300
committerOleg Pykhalov <go.wigust@gmail.com>2021-04-15 09:43:21 +0300
commitac1c6c9ebf7ed6d718fdc48b79d7e1dbd60b6068 (patch)
tree8dceb15f82c7e2535b82bd5ab9b9cc139793a481
parentMerge pull request #112678 from LeSuisse/sleuthkit-4.10.1-20.09 (diff)
downloadnixpkgs-linux_4_4.tar.gz
pkgs: linux_4_4: Replace with Ubuntu 4.4.0.linux_4_4
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.4.nix6
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f056b98a1ce9..b6b3c1c082b0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -118,8 +118,6 @@ let
CLS_U32_PERF = yes;
CLS_U32_MARK = yes;
BPF_JIT = whenPlatformHasEBPFJit yes;
- BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304
- HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
BPF_STREAM_PARSER = whenAtLeast "4.19" yes;
XDP_SOCKETS = whenAtLeast "4.19" yes;
XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b133904d61b7..da6c4a070b2e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.257";
+ version = "4.4.0";
extraMeta.branch = "4.4";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy";
+ url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/linux/4.4.0-148.174/linux_4.4.0.orig.tar.gz";
+ sha256 = "0mqk49nc80b9lh3ivvm99jcl9pyzmq731jscjfyajc2xkf8pa3kk";
};
} // (args.argsOverride or {}))