diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
| commit | c45e9d0fac5158d90f8c951a2899755181e97dc7 (patch) | |
| tree | 87cdea30c650739a0ef20c6342deb39e77f1e07b /pkgs/os-specific | |
| parent | 4c5a5dc6270d0552f71937d5d73cc36a7f3a2326 (diff) | |
| parent | 996d14a00489c5a20258229d7837649e91e9b2fc (diff) | |
| download | nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.gz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.bz2 nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.lz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.xz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.zst nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.20.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 4 |
3 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix new file mode 100644 index 000000000000..838ef4a5b805 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.20"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0f14l6mb5c4rwpqjbcb2yrvk1bmmiyh0mpw24fbl7rr26lc2625d"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 104dc457d6c5..fa9b41b928e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/"; - + # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "15715"; - sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh"; + rev = "15814"; + sha256 = "10y2nh9sqd5kw1331apq50ikd8585gsja8hbjzyiskl3x5ak5xzh"; } , ... }: diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1a89ff57491c..2a614e22c9a6 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w"; + sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a"; }; nativeBuildInputs = [ cmake perl ]; |