From ca75a5e4388b22f97bb267d377596f4d1f58b06f Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 8 Aug 2024 14:33:02 +0200 Subject: [PATCH] router0-dmz0: bump inputs /w kernel 6.10, mtk --- nix/os/devices/router0-dmz0/flake.lock | 47 +++++++++++++------------- nix/os/devices/router0-dmz0/flake.nix | 5 ++- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/nix/os/devices/router0-dmz0/flake.lock b/nix/os/devices/router0-dmz0/flake.lock index ac9c8e0..769e9a9 100644 --- a/nix/os/devices/router0-dmz0/flake.lock +++ b/nix/os/devices/router0-dmz0/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "hostapd": { "flake": false, "locked": { - "lastModified": 1720791870, - "narHash": "sha256-8dEM8oXfFngxdumug+soQqeXefej3WC/kgv8aLmGvNk=", + "lastModified": 1723046327, + "narHash": "sha256-803SwotTiTX3eXZ70sTi51oGufgDsLDvUPiJrsECXVo=", "ref": "refs/heads/main", - "rev": "7b8517d1974fa728e07dabcbd788c6ef6a8a96dd", - "revCount": 19652, + "rev": "c6faa8936604a5a24b36600ab893725350d894bd", + "revCount": 19755, "type": "git", "url": "git://w1.fi/hostap.git?branch=main" }, @@ -121,26 +121,27 @@ ] }, "locked": { - "lastModified": 1720165368, - "narHash": "sha256-gTTaQoMeD9s0X/qvzkfnQ6IyYP7qam406sXQ8sbq1P0=", - "owner": "nakato", - "repo": "nixos-sbc", - "rev": "ddb8f1a16f1b6ebb32cb7b13125e45d65673905e", + "lastModified": 1723112495, + "narHash": "sha256-1nt+81yKDAWsHt2v8yYHceZ9mmIon2RcJC3lP1NIQJQ=", + "owner": "steveej-forks", + "repo": "nakato_nixos-sbc", + "rev": "f0c85455056dcbfdf8a8cc985db490e7bfb75f36", "type": "github" }, "original": { - "owner": "nakato", - "repo": "nixos-sbc", + "owner": "steveej-forks", + "ref": "kernel-6.10_and_cross-compile_mtkbump", + "repo": "nakato_nixos-sbc", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { @@ -152,11 +153,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -205,11 +206,11 @@ ] }, "locked": { - "lastModified": 1720691926, - "narHash": "sha256-VE9ZfWRbyBjps5GV8KXiF8XodAykmwRpcJtPiVWCu8M=", + "lastModified": 1723077922, + "narHash": "sha256-FY5UMtlBCcbMxk+ykmZzYYtm7l/uUKwiMNYbFgqG5yg=", "owner": "numtide", "repo": "srvos", - "rev": "e3e8ff545ef14f13c69a0f743078637fde952018", + "rev": "f389064525b8330f20106231762f52854490654e", "type": "github" }, "original": { diff --git a/nix/os/devices/router0-dmz0/flake.nix b/nix/os/devices/router0-dmz0/flake.nix index c177972..41f2f35 100644 --- a/nix/os/devices/router0-dmz0/flake.nix +++ b/nix/os/devices/router0-dmz0/flake.nix @@ -14,8 +14,11 @@ srvos.inputs.nixpkgs.follows = "nixpkgs"; nixos-sbc.url = - "github:nakato/nixos-sbc" + # "github:nakato/nixos-sbc" # "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile" + # "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile" + "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile_mtkbump" + # "git+file:///home/steveej/src/others/nakato_nixos-sbc/" ; nixos-sbc.inputs.nixpkgs.follows = "nixpkgs";