diff --git a/buildOpenwrt.nix b/buildOpenwrt.nix index 65d697e..65f9754 100644 --- a/buildOpenwrt.nix +++ b/buildOpenwrt.nix @@ -45,7 +45,7 @@ pkgs.mkShell { export WORKING_FOLDER=$(realpath ${workingFolder}) mkdir -p $WORKING_FOLDER 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 } diff --git a/devices/my-router-img.nix b/devices/my-router-img.nix index 884a850..9851261 100644 --- a/devices/my-router-img.nix +++ b/devices/my-router-img.nix @@ -2,16 +2,17 @@ pkgs.callPackage ../buildOpenwrt.nix { target = "mvebu"; arch = "cortexa9"; - version= "23.05.5"; + version= "24.10.0"; profile = "linksys_wrt1200ac"; packages = [ "adblock" "luci-ssl" "luci-proto-wireguard" - "luci-app-wireguard" "luci-app-adblock" "luci-app-openvpn" "openvpn-openssl" "tcpdump-mini" + "usteer" + "luci-app-usteer" ]; } diff --git a/devices/pi-img.nix b/devices/pi-img.nix index 539d951..2e8d6f6 100644 --- a/devices/pi-img.nix +++ b/devices/pi-img.nix @@ -2,7 +2,7 @@ pkgs.callPackage ../buildOpenwrt.nix { target = "bcm27xx"; arch = "bcm2708"; - version= "23.05.5"; + version= "24.10.0"; profile = "rpi"; packages = ["luci-ssl"]; } diff --git a/flake.lock b/flake.lock index 0cdaa94..bd86a2d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index c7f9f9f..4e1ce09 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "NOIBW - Nix-Openwrt-ImageBuilder-Wrapper"; - inputs.nixpkgs.url = "nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-24.11"; outputs = { self, nixpkgs }: let @@ -32,7 +32,7 @@ apps = forAllSystems (system: let 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 ''; in