aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix for unexpected recursion error

Browse source 
Might be related to how these packages access "pkgs" ?
This commit is contained in:
mexisme 2022-11-28 22:26:47 +13:00
parent 3de7b6e0c5
commit 50ce82cc84
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
microsoft/surface/kernel/default.nix
View file

@ -1,16 +1,12 @@
{ lib,
buildLinux,
callPackage,
linuxPackagesFor,
...
}:
{ config, lib, pkgs, ... }:
# To test the kernel build:
# nix-build -E "with import <nixpkgs> {}; (pkgs.callPackage ./. {}).boot.kernelPackages.kernel"
let
inherit (lib) kernel recurseIntoAttrs;
repos = callPackage ../repos.nix {};
inherit (pkgs) buildLinux linuxPackagesFor;
repos = pkgs.callPackage ../repos.nix {};
linuxPackage =
{ version,
@ -25,11 +21,11 @@ let
modDirVersion = version;
extraMeta.branch = branch;
};
linuxPackagesFor' = (linuxPackagesFor buildLinux');
linuxPackagesFor' = linuxPackagesFor buildLinux';
in recurseIntoAttrs linuxPackagesFor';
linux-5_16_11 = linuxPackage (
callPackage ./linux-5.16.11.nix { inherit repos; }
pkgs.callPackage ./linux-5.16.11.nix { inherit repos; }
);
in {

2
microsoft/surface/repos.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, fetchFromGitHub, fetchurl }: {
{ fetchFromGitHub, fetchurl }: {
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project:
linux-surface-kernel = { rev, sha256 }:
fetchFromGitHub {