Unverified Commit 548a86b3 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #288154 from ShamrockLee/linux-kernel-passthru 

buildLinux: Fix result derivation overriding with `passthru` via `stdenv.mkDerivation` instead of `lib.extendDerivation`
parents 99681318 f10331cf

pkgs/os-specific/linux/kernel/generic.nix

+6 −5
Original line number Diff line number Diff line
@@ -212,7 +212,10 @@ let 
    config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; } // lib.optionalAttrs withRust { CONFIG_RUST = "y"; };

  } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; });



  passthru = basicArgs // {

in

kernel.overrideAttrs (finalAttrs: previousAttrs: {



  passthru = previousAttrs.passthru or { } // basicArgs // {

    features = kernelFeatures;

    inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre;

    isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
@@ -225,9 +228,8 @@ let 
      ]);

    });



    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);

    tests = let

      overridableKernel = finalKernel // {

      overridableKernel = finalAttrs.finalPackage // {

        override = args:

          lib.warn (

            "override is stubbed for NixOS kernel tests, not applying changes these arguments: "
@@ -237,5 +239,4 @@ let 
    in [ (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) ] ++ kernelTests;

  };



  finalKernel = lib.extendDerivation true passthru kernel;

in finalKernel
 
})