steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(router0-dmz0): use (forked) nixos-sbc and bump to nixos-24.05 / linux-6.9

Browse source
This commit is contained in:
steveej 2024-06-02 23:27:14 +02:00
parent ce20251ad6
commit 47e03a7a5d
3 changed files with 95 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

51
nix/os/devices/router0-dmz0/flake.nix
View file

@ -1,10 +1,11 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
get-flake.url = "github:ursi/get-flake";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko";
@ -19,6 +20,9 @@
bpir3.inputs.nixpkgs.follows = "nixpkgs";
nixos-sbc.url = "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile";
nixos-sbc.inputs.nixpkgs.follows = "nixpkgs";
nixos-nftables-firewall.url = "github:thelegy/nixos-nftables-firewall";
nixos-nftables-firewall.inputs.nixpkgs.follows = "nixpkgs";
@ -40,7 +44,7 @@
self,
get-flake,
nixpkgs,
bpir3,
nixos-sbc,
...
}: let
nativeSystem = "aarch64-linux";
@ -77,23 +81,9 @@
# flake registry
{
nixpkgs.overlays = builtins.attrValues self.overlays;
nix.registry.nixpkgs.flake = nixpkgs;
}
{
nixpkgs.overlays = [
(final: previous: let
bpir3Pkgs = previous.callPackage "${bpir3}/pkgs" {};
in {
inherit
(bpir3Pkgs)
linuxPackages_bpir3
linuxPackages_bpir3_6_6
linuxPackages_bpir3_latest
;
})
];
}
]
++ extraModules;
}
@ -114,23 +104,14 @@
};
};
packages = let
mkPatchedHostapd = pkgs:
pkgs.hostapd.overrideDerivation (attrs: {
patches =
attrs.patches
++ [
"${self.inputs.openwrt}/package/network/services/hostapd/patches/710-vlan_no_bridge.patch"
];
});
in {
"${nativeSystem}" = {
hostapd_patched = mkPatchedHostapd pkgs;
};
cross = {
hostapd_patched = mkPatchedHostapd pkgsCross;
};
overlays.default = final: previous: {
hostapd = previous.hostapd.overrideDerivation (attrs: {
patches =
attrs.patches
++ [
"${self.inputs.openwrt}/package/network/services/hostapd/patches/710-vlan_no_bridge.patch"
];
});
};
};
}