From 67f1f541476d9c4451133fa0f5b6404da11f7b86 Mon Sep 17 00:00:00 2001 From: asonix Date: Wed, 28 Jun 2023 13:26:43 -0500 Subject: [PATCH] Use 6.3.9 branch --- flake.lock | 25 +++++++++++++------------ flake.nix | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d99c3dd..0494030 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686736559, - "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", + "lastModified": 1687829761, + "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", + "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1686592866, - "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", + "lastModified": 1687898314, + "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", + "rev": "e18dc963075ed115afb3e312b64643bf8fd4b474", "type": "github" }, "original": { @@ -63,15 +63,16 @@ ] }, "locked": { - "lastModified": 1686593470, - "narHash": "sha256-FTQghUZb1jzXj0d/OoTWaB3cfRs9WAH33upOBPfDnEw=", + "lastModified": 1687974837, + "narHash": "sha256-TGkAg50PeoA98+bun94kcSRw5AYJWW7iUDotkx3fsYI=", "owner": "asonix", "repo": "nixos-rockchip", - "rev": "3178bfeab801013238f8aeab352d10c78001c2a9", + "rev": "ea23191b3dbc14be78bf5b62b4e32f32c812188a", "type": "github" }, "original": { "owner": "asonix", + "ref": "asonix/pinetab2-linux-6.3.9", "repo": "nixos-rockchip", "type": "github" } diff --git a/flake.nix b/flake.nix index 62ce6a1..3c8374e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixpkgsUnstable.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; rockchip = { - url = "github:asonix/nixos-rockchip"; + url = "github:asonix/nixos-rockchip/asonix/pinetab2-linux-6.3.9"; inputs.nixpkgsStable.follows = "nixpkgs"; inputs.nixpkgsUnstable.follows = "nixpkgsUnstable"; inputs.utils.follows = "flake-utils"; @@ -145,6 +145,7 @@ "${board}" = rec { modules = buildModules { inherit uBoot fdt kernel extraModules; }; image = (osConfig modules).config.system.build.sdImage; + linux = kernel.kernel; }; }) { }