colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nfs4 patch: fix so moby can still build

Browse Source
This commit is contained in:
Colin
2023-09-22 19:48:51 +00:00
parent 6d7ff7ea86
commit a2f4dc0b6c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/hardware/default.nix
View File

@@ -20,7 +20,7 @@
# this fixes /mnt/servo-nfs mount failures # this fixes /mnt/servo-nfs mount failures
# <https://github.com/NixOS/nixpkgs/issues/255803> # <https://github.com/NixOS/nixpkgs/issues/255803>
boot.kernelPatches = [{ boot.kernelPatches = [{
name = "nfs4-patch"; name = "backport-nfs4-selinux-fix";
patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/"; url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c="; hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";

8
pkgs/additional/linux-megous/default.nix
View File

@@ -184,7 +184,13 @@ in buildLinux (args // {
inherit rev hash; inherit rev hash;
}; };
kernelPatches = (args.kernelPatches or []) ++ extraKernelPatches; kernelPatches = extraKernelPatches ++ (
# this patch only applies to nixpkgs kernel (and is probably not necessary on megi's).
# TODO: remove the patch and this logic here once fixed in nixpkgs: <https://github.com/NixOS/nixpkgs/issues/255803>
lib.filter
(p: p.name != "backport-nfs4-selinux-fix")
(args.kernelPatches or [])
);
structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig; structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig;
}) })