public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-14 01:40:09 +02:00
parent 882b692c4f 39e3f7c2cc
commit ac6a4f7cf5
46 changed files with 274 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/anbox/kmod.nix
+5 -6
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "anbox-modules";
version = "2019-11-15-" + kernel.version;
version = "2020-06-14-${kernel.version}";
src = fetchFromGitHub {
owner = "anbox";
repo = "anbox-modules";
rev = "e0a237e571989987806b32881044c539db25e3e1";
sha256 = "1km1nslp4f5znwskh4bb1b61r1inw1dlbwiyyq3rrh0f0agf8d0v";
rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086";
sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -34,10 +34,9 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Anbox ashmem and binder drivers.";
homepage = "https://github.com/anbox/anbox-modules";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = (versionOlder kernel.version "4.4");
broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5";
maintainers = with maintainers; [ edwtjo ];
};
}
pkgs/os-specific/linux/batman-adv/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, kernel }:
{ lib, stdenv, fetchurl, fetchpatch, kernel }:
let cfg = import ./version.nix; in
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
patches = [
(fetchpatch {
# Fix build with Kernel>=5.12, remove for batman-adv>=2021.1
url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d";
sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg";
})
];
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
pkgs/os-specific/linux/kernel/hardened/patches.json
+9 -9
View File
@@ -13,20 +13,20 @@
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.35-hardened1.patch",
"sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch"
"name": "linux-hardened-5.10.36-hardened1.patch",
"sha256": "0pkci99h0lrxyx5p7ml3m4194bl359m2ihm9izw0b33n35alkvbc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.36-hardened1/linux-hardened-5.10.36-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
"name": "linux-hardened-5.11.19-hardened1.patch",
"sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch"
"name": "linux-hardened-5.11.20-hardened1.patch",
"sha256": "06jf2r9xr8kzybia590x21p20mfags8j1flj0g4ci6r0fsfbmymf",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.20-hardened1/linux-hardened-5.11.20-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.117-hardened1.patch",
"sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch"
"name": "linux-hardened-5.4.118-hardened1.patch",
"sha256": "1zkcdxqysgcidary6nl4c2hrn6r23gi4r8rqhjan22xa3l3lj43b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.118-hardened1/linux-hardened-5.4.118-hardened1.patch"
}
}
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2 -1
View File
@@ -1,8 +1,9 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.268";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -1
View File
@@ -1,8 +1,9 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.268";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
pkgs/os-specific/linux/kernel/linux-5.10.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.35";
version = "5.10.36";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";
sha256 = "0s5jw7y17hnl66iybw6f4pbc5j5rilphqbv3iql22wq053vyg749";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
pkgs/os-specific/linux/kernel/linux-5.11.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.11.19";
version = "5.11.20";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs";
sha256 = "15q7pw1wvl6ndvb6154p6vjr4qa4fa6lpbqpxvwy2kywc2jyxykk";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
pkgs/os-specific/linux/kernel/linux-5.12.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12.2";
version = "5.12.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c";
sha256 = "13c7jbizf254rh4arvlgzk87vx7sz6psba47jnax23lbgal18dqk";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.117";
version = "5.4.118";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f";
sha256 = "06w2vhw6pdy49n3dcnq12bn50glbg9pwaqvs4nlzbljg4yf50w6r";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.30-rt38"; # updated by ./update-rt.sh
version = "5.10.35-rt39"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl";
sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0f8wcs0y1qx3kqsan8g7bh1my2yc77k6d1g3q12nfxvbmlgs766n";
sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;