From 8d0678457e36b36521388ca2aa99599680e494a4 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 22 Sep 2023 09:33:05 +0000
Subject: [PATCH] patch broken NFS mounting

---
 hosts/common/hardware/default.nix | 11 +++++++++++
 nixpatches/list.nix               |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/hosts/common/hardware/default.nix b/hosts/common/hardware/default.nix
index 8950e39c..85c248ea 100644
--- a/hosts/common/hardware/default.nix
+++ b/hosts/common/hardware/default.nix
@@ -16,6 +16,17 @@
   #   "systemd.log_level=debug"
   #   "systemd.log_target=console"
 
+  # TODO: remove once it no longer applies
+  # this fixes /mnt/servo-nfs mount failures
+  # <https://github.com/NixOS/nixpkgs/issues/255803>
+  boot.kernelPatches = [{
+    name = "nfs4-patch";
+    patch = pkgs.fetchpatch {
+      url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
+      hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";
+    };
+  }];
+
   # hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
   boot.initrd.preFailCommands = "allowShell=1";
 
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index c722f089..d363a3a8 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -19,6 +19,13 @@ let
       // (if title != null then { name = title; } else {})
     );
 in [
+  # (fetchpatch' {
+  #   # fixes /mnt/servo-nfs mount failures
+  #   # 2023/09/21: doesn't apply
+  #   title = "linux_6_1,linux_6_5: backport patch from 6.6 for NFS fix";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/256526";
+  #   hash = "sha256-vOQ4lgnccHxEs7bTrgkzGqh49h/Gr6BQr+H4rxa5zfQ=";
+  # })
 
   # (fetchpatch' {
   #   # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`.