Move files around...

- "kernel" and "repos.nix" --> "common/"
- "firmware/surface-go/ath10k" --> "surface-go/firmware/ath10k"
- Update where "kernel", "firmware/surface-go" and "repos.nix" can be found
This commit is contained in:
mexisme 2023-01-10 15:22:06 +13:00
parent ca29e25c39
commit 03df3d2d53
11 changed files with 18 additions and 7 deletions

View file

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./kernel
];
}

View file

@ -111,8 +111,12 @@
name = "ms-surface/0009-cameras"; name = "ms-surface/0009-cameras";
patch = patchDir + "/0009-cameras.patch"; patch = patchDir + "/0009-cameras.patch";
} }
# { {
# name = "ms-surface/0010-amd-gpio"; name = "ms-surface/0010-amd-gpio";
# patch = patchDir + "/0010-amd-gpio.patch"; patch = patchDir + "/0010-amd-gpio.patch";
# } }
{
name = "ms-surface/0011-rtc";
patch = patchDir + "/0011-rtc.patch";
}
] ]

View file

@ -5,8 +5,8 @@ let
in { in {
imports = [ imports = [
./kernel ./common
./firmware/surface-go/ath10k ./surface-go/firmware/ath10k
]; ];
microsoft-surface.kernelVersion = mkDefault "6.0.11"; microsoft-surface.kernelVersion = mkDefault "6.0.11";

View file

@ -1,7 +1,7 @@
{ stdenv, lib, pkgs, firmwareLinuxNonfree, ... }: { stdenv, lib, pkgs, firmwareLinuxNonfree, ... }:
let let
repos = pkgs.callPackage ../../../repos.nix {}; repos = pkgs.callPackage ../../../common/repos.nix {};
killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian"; killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian";
in stdenv.mkDerivation { in stdenv.mkDerivation {