From 9f2d78c8dbbcee731761bb9101b262fbaf0989c2 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 11 Oct 2024 22:34:41 +0200
Subject: [PATCH 1/2] Reapply "feat(linux_jhovold): bump to 6.12.0-rc2"

This reverts commit 6b9efe77ca80653354981c720af3c4241ac71490.
---
 flake.lock           | 8 ++++----
 flake.nix            | 2 +-
 packages/default.nix | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 00413f1..422ac12 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,16 +21,16 @@
     "linux-jhovold": {
       "flake": false,
       "locked": {
-        "lastModified": 1726563586,
-        "narHash": "sha256-hZ8yue7OsrXuwoXz09/dmIiKJIQEPixK39l5S/xvJfA=",
+        "lastModified": 1728631036,
+        "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=",
         "owner": "jhovold",
         "repo": "linux",
-        "rev": "c8032fa3062e04cbb68f070959fc746b91abb16e",
+        "rev": "6a97bc22fa36010400b91e6d5979741c391112c3",
         "type": "github"
       },
       "original": {
         "owner": "jhovold",
-        "ref": "wip/sc8280xp-6.11",
+        "ref": "wip/sc8280xp-6.12-rc2",
         "repo": "linux",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index bc90fce..aaa2ed3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
 
-    linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.11";
+    linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.12-rc2";
     linux-jhovold.flake = false;
   };
 
diff --git a/packages/default.nix b/packages/default.nix
index 932b79f..490a0be 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -21,7 +21,7 @@ in
 {
   linux_jhovold = pkgs.callPackage linux_x13s_pkg {
     src = inputs.linux-jhovold;
-    version = "6.11.0";
+    version = "6.12.0-rc2";
     defconfig = "johan_defconfig";
   };
 

From 3a60edd14779b6b1f71465593d75dcdabfecb4b1 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 11 Oct 2024 22:37:09 +0200
Subject: [PATCH 2/2] fix(kernel): compress kernel modules

source:
https://github.com/NixOS/nixpkgs/pull/345534/commits/88746a794398da15142f91d42c829a4336616596#diff-764a10a0418846e85912fafd206b2502db65dbbd8c59adc0532b50d05c438d21R993-R998
---
 packages/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/default.nix b/packages/default.nix
index 490a0be..37397d4 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -13,7 +13,17 @@ let
       // {
         modDirVersion = version;
 
-        kernelPatches = (args.kernelPatches or [ ]) ++ [ ];
+        kernelPatches = (args.kernelPatches or [ ]) ++ [
+          {
+            name = "compress-kernel-modules";
+            patch = null;
+            extraConfig = ''
+              MODULE_COMPRESS y
+              MODULE_COMPRESS_ALL y
+              MODULE_COMPRESS_XZ y
+            '';
+          }
+        ];
         extraMeta.branch = lib.versions.majorMinor version;
       }
     );