From 6e515f7988a4dbb539de18c20bc061d17490f37e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 21 Oct 2024 22:58:32 +0200 Subject: [PATCH 1/2] feat: automatically parse jhovold's kernel version --- packages/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/default.nix b/packages/default.nix index 5674e77..ff2fab6 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -26,7 +26,10 @@ in { linux_jhovold = pkgs.callPackage linux_x13s_pkg { src = inputs.linux-jhovold; - version = "6.12.0-rc2"; + version = let + lock = builtins.fromJSON (builtins.readFile ../flake.lock); + in builtins.elemAt (builtins.tail (builtins.split "xp-" lock.nodes.linux-jhovold.original.ref)) 1; + defconfig = "johan_defconfig"; }; From cfbc5046538290682cb0475c52c80329ebc21649 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 21 Oct 2024 22:59:00 +0200 Subject: [PATCH 2/2] feat: bump jhovold to 6.12-rc3 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 422ac12..7d6c499 100644 --- a/flake.lock +++ b/flake.lock @@ -21,16 +21,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1728631036, - "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=", + "lastModified": 1728887054, + "narHash": "sha256-fyXyjrzptxvhG+7xI4ADo6raKRZWzg/Jph1waR2Vc30=", "owner": "jhovold", "repo": "linux", - "rev": "6a97bc22fa36010400b91e6d5979741c391112c3", + "rev": "6bc37da2231cfed860662fa9717d0cf2896e1145", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.12-rc2", + "ref": "wip/sc8280xp-6.12-rc3", "repo": "linux", "type": "github" } diff --git a/flake.nix b/flake.nix index a0a9d0c..449ab28 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.12-rc2"; + linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.12-rc3"; linux-jhovold.flake = false; };