diff --git a/README.md b/README.md index 68a091f..a114fae 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

NixOS Turing RK1

-This flake builds a bootable `nixosSystem` for the [Turing RK1](https://turingpi.com/product/turing-rk1/). It uses u-boot from nixpkgs and the mainline kernel (`6.11.0-rc6`) from upstream. It includes a patch that enables fan curve control (Thanks [@soxrok2212](https://github.com/soxrok2212)). +This flake builds a bootable `nixosSystem` for the [Turing RK1](https://turingpi.com/product/turing-rk1/). It uses u-boot from nixpkgs and the mainline kernel (`6.11.0`) from upstream. It includes a patch that enables fan curve control (Thanks [@soxrok2212](https://github.com/soxrok2212)). ## Building the image As of now, you have to be on an `aarch64-linux` system to build the flake. Adding support for cross-compilation on `x86_64-linux` is planned. diff --git a/flake.lock b/flake.lock index 92fee9a..24ebff3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,27 +3,27 @@ "kernel": { "flake": false, "locked": { - "lastModified": 1725176762, - "narHash": "sha256-NpZ1gNA18M1iWEowRnIAIBatq+LI17Npv1G3SVQznZY=", + "lastModified": 1726412276, + "narHash": "sha256-QIbHTLWI5CaStQmuoJ1k7odQUDRLsWNGY10ek0eKo8M=", "ref": "refs/heads/master", - "rev": "8e7c1c539395e34648d859c20b0f9478eb5901cc", - "revCount": 1296133, + "rev": "fa7818b3a6dd56c7956f515d287ed9f80c7bf59a", + "revCount": 1296649, "type": "git", "url": "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" }, "original": { - "rev": "8e7c1c539395e34648d859c20b0f9478eb5901cc", + "rev": "fa7818b3a6dd56c7956f515d287ed9f80c7bf59a", "type": "git", "url": "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" } }, "nixpkgs": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b853bb..878d2dd 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,10 @@ url = "github:NixOS/nixpkgs/nixos-unstable"; }; - # v6.11-rc6 - # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tag/?h=v6.11-rc6 + # v6.11 + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tag/?h=v6.11 kernel = { - url = "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git?rev=8e7c1c539395e34648d859c20b0f9478eb5901cc"; + url = "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git?rev=fa7818b3a6dd56c7956f515d287ed9f80c7bf59a"; flake = false; }; }; diff --git a/packages/kernel/default.nix b/packages/kernel/default.nix index 746e974..ef1750d 100644 --- a/packages/kernel/default.nix +++ b/packages/kernel/default.nix @@ -13,7 +13,7 @@ in linuxManualConfig { inherit src; - version = "6.11.0-rc6"; + version = "6.11.0"; configfile = stdenv.mkDerivation { inherit src;