diff options
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/anbox/kmod.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fnotifystat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fwts/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 10 |
4 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 6eb74ca25f6..896beaf3056 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false); maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index f01c96259a8..baa92decd9f 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.06"; + version = "0.02.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1mr2qzh8r8qq7haz4qgci2k5lcrcy493fm0m3ri40a81vaajfniy"; + sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 5de0eea0bea..58d4bdbae85 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.08.00"; + version = "20.09.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; + sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7a91705b617..961bdab12b5 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -34,6 +34,13 @@ in { randstructSeed ? "", # Use defaultMeta // extraMeta extraMeta ? {}, + + # for module compatibility + isXen ? features.xen_dom0 or false, + isZen ? false, + isLibre ? false, + isHardened ? false, + # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, # ignored @@ -86,6 +93,9 @@ let passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; + inherit isXen isZen isHardened isLibre; + kernelOlder = stdenv.lib.versionOlder version; + kernelAtLeast = stdenv.lib.versionAtLeast version; }; inherit src; |