Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e316a8d6c7d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: faee35ae82cc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 2, 2020

  1. kernel/linuxManualConfig: add variant metadata 

    (cherry picked from commit 613adb0)
    Jonathan Ringer committed Nov 2, 2020
    Copy the full SHA
    52f1618 View commit details

  2. anbox: kernel.features can be null 

    (cherry picked from commit c6afa88)
    Jonathan Ringer committed Nov 2, 2020
    Copy the full SHA
    faee35a View commit details
Showing with 11 additions and 1 deletion.
  1. +1 −1 pkgs/os-specific/linux/anbox/kmod.nix
  2. +10 −0 pkgs/os-specific/linux/kernel/manual-config.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/anbox/kmod.nix
View file
Original file line number Diff line number Diff line change
@@ -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) || versionAtLeast kernel.version "5.8";
broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false) || versionAtLeast kernel.version "5.8";
maintainers = with maintainers; [ edwtjo ];
};

10 changes: 10 additions & 0 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Original file line number Diff line number Diff line change
@@ -35,6 +35,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
@@ -87,6 +94,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;