From 4555a9c05b3f0da5abf3ad58e2472033fe4edbed Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Mon, 25 Mar 2024 12:06:53 -0400
Subject: [PATCH] jhovold: 6.8.0 -> 6.9.0-rc1

---
 npins/sources.json   | 34 +++++++++++++++++++++++++++++-----
 packages/default.nix |  6 ++++--
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 67545b9..b3ea91b 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -7,11 +7,35 @@
         "owner": "jhovold",
         "repo": "linux"
       },
-      "branch": "wip/sc8280xp-v6.8",
-      "revision": "5fbfdc8826150355307394e193c168b45adfa316",
-      "url": "https://github.com/jhovold/linux/archive/5fbfdc8826150355307394e193c168b45adfa316.tar.gz",
-      "hash": "1crapwv9fbyffpc8mh8hniawvidhphdxdvx1nssylxk3zr9gcbw4"
+      "branch": "wip/sc8280xp-6.9-rc1",
+      "revision": "ee2ccfe6dccbd8e7599e23c2992d471c4e3da58d",
+      "url": "https://github.com/jhovold/linux/archive/ee2ccfe6dccbd8e7599e23c2992d471c4e3da58d.tar.gz",
+      "hash": "0yybngki79wx1kg6qa2ph1p6gwzicl8cdm5yyzbih484jylg56m8"
+    },
+    "linux-jhovold-6_7": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "jhovold",
+        "repo": "linux"
+      },
+      "branch": "wip/sc8280xp-v6.7",
+      "revision": "b929f8eed9ad1f156cae932dea741bc4383e6367",
+      "url": "https://github.com/jhovold/linux/archive/b929f8eed9ad1f156cae932dea741bc4383e6367.tar.gz",
+      "hash": "12j92hns95rviajyxpj57hgdr1k9lrd6rzxng87m4v4m7pi8v51l"
+    },
+    "linux-steev": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "steev",
+        "repo": "linux"
+      },
+      "branch": "lenovo-x13s-linux-6.7.y",
+      "revision": "5e9c982da90e7546586b56ff92e785c8d9edd14b",
+      "url": "https://github.com/steev/linux/archive/5e9c982da90e7546586b56ff92e785c8d9edd14b.tar.gz",
+      "hash": "1ig1rrgq93gwv7jj21hwdcpkdw0v4ba3v2k3j3jj5z6r97z6xcag"
     }
   },
   "version": 3
-}
\ No newline at end of file
+}
diff --git a/packages/default.nix b/packages/default.nix
index c80a4cd..dc75c57 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -15,9 +15,11 @@ let
     );
 in
 rec {
-  linux_jhovold = pkgs.callPackage linux_x13s_pkg {
+  linux_jhovold = linux_jhovold_6_9;
+
+  linux_jhovold_6_9 = pkgs.callPackage linux_x13s_pkg {
     src = sources.linux-jhovold;
-    version = "6.8.0";
+    version = "6.9.0-rc1";
     defconfig = "johan_defconfig";
   };