nixos-config/noibw
1
0
Fork 0
Code Issues Pull Requests Projects Releases 7 Wiki Activity

update to 24.10

Browse Source
This commit is contained in:
stubbfel
2025-03-15 12:16:24 +01:00
parent fb42ccefaa
commit 995033f526
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildOpenwrt.nix
View File

@@ -45,7 +45,7 @@ pkgs.mkShell {
export WORKING_FOLDER=$(realpath ${workingFolder}) export WORKING_FOLDER=$(realpath ${workingFolder})
mkdir -p $WORKING_FOLDER mkdir -p $WORKING_FOLDER
function loadBuilder() { function loadBuilder() {
curl -s https://downloads.openwrt.org/releases/${builderVersion}/targets/${target}/${arch}/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64.tar.xz | tar xvJ -C $WORKING_FOLDER curl -s https://downloads.openwrt.org/releases/${builderVersion}/targets/${target}/${arch}/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64.tar.zst | tar -I zstd -xv -C $WORKING_FOLDER
curl -s https://downloads.openwrt.org/releases/${version}/targets/${target}/${arch}/openwrt-${version}-${target}-${arch}.manifest | cut -f 1 -d ' ' | tr '\n' ' ' > $WORKING_FOLDER/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64/manifest_packages curl -s https://downloads.openwrt.org/releases/${version}/targets/${target}/${arch}/openwrt-${version}-${target}-${arch}.manifest | cut -f 1 -d ' ' | tr '\n' ' ' > $WORKING_FOLDER/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64/manifest_packages
} }

5
devices/my-router-img.nix
View File

@@ -2,16 +2,17 @@
pkgs.callPackage ../buildOpenwrt.nix { pkgs.callPackage ../buildOpenwrt.nix {
target = "mvebu"; target = "mvebu";
arch = "cortexa9"; arch = "cortexa9";
version= "23.05.5"; version= "24.10.0";
profile = "linksys_wrt1200ac"; profile = "linksys_wrt1200ac";
packages = [ packages = [
"adblock" "adblock"
"luci-ssl" "luci-ssl"
"luci-proto-wireguard" "luci-proto-wireguard"
"luci-app-wireguard"
"luci-app-adblock" "luci-app-adblock"
"luci-app-openvpn" "luci-app-openvpn"
"openvpn-openssl" "openvpn-openssl"
"tcpdump-mini" "tcpdump-mini"
"usteer"
"luci-app-usteer"
]; ];
} }

2
devices/pi-img.nix
View File

@@ -2,7 +2,7 @@
pkgs.callPackage ../buildOpenwrt.nix { pkgs.callPackage ../buildOpenwrt.nix {
target = "bcm27xx"; target = "bcm27xx";
arch = "bcm2708"; arch = "bcm2708";
version= "23.05.5"; version= "24.10.0";
profile = "rpi"; profile = "rpi";
packages = ["luci-ssl"]; packages = ["luci-ssl"];
} }

8
flake.lock generated
View File

@@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727672256, "lastModified": 1741862977,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"type": "indirect" "type": "indirect"
} }
}, },

4
flake.nix
View File

@@ -1,6 +1,6 @@
{ {
description = "NOIBW - Nix-Openwrt-ImageBuilder-Wrapper"; description = "NOIBW - Nix-Openwrt-ImageBuilder-Wrapper";
inputs.nixpkgs.url = "nixpkgs/nixos-24.05"; inputs.nixpkgs.url = "nixpkgs/nixos-24.11";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
@@ -32,7 +32,7 @@
apps = forAllSystems (system: apps = forAllSystems (system:
let let
updateLockScript = nixpkgsFor.${system}.writeShellScriptBin "update_flake_lock.sh" '' updateLockScript = nixpkgsFor.${system}.writeShellScriptBin "update_flake_lock.sh" ''
nix --experimental-features 'nix-command flakes' flake lock --update-input nixpkgs nix --experimental-features 'nix-command flakes' flake update
nix --experimental-features 'nix-command flakes' build nix --experimental-features 'nix-command flakes' build
''; '';
in in