diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index de9ce56..52bf9e6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,10 +3,20 @@ { "name": "Alpine", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/base:alpine-3.17", + "image": "mcr.microsoft.com/devcontainers/base:alpine", "features": { - "ghcr.io/devcontainers/features/nix:1": {} - } + "ghcr.io/devcontainers/features/nix:1": { + "packages": "nixpkgs-fmt", + "extraNixConfig": "experimental-features = nix-command flakes" + } + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Configure tool-specific properties. + "runArgs": ["--userns=keep-id"], + "containerUser": "vscode", // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/LICENSE b/LICENSE index 0ac91ba..0fd0d07 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -MIT No Attribution Copyright 2020 stubbfel +MIT No Attribution Copyright 2024 stubbfel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/buildOpenwrt.nix b/buildOpenwrt.nix index 195c93c..65d697e 100644 --- a/buildOpenwrt.nix +++ b/buildOpenwrt.nix @@ -7,7 +7,8 @@ packages ? [], manifestPkgs ? "$(cat manifest_packages)", workingFolder ? "$PWD/_builder", - builderVersion ? version + builderVersion ? version, + moreBuildInputs ? [] }: pkgs.mkShell { name = "openwrt-build-${target}-${arch}-${profile}"; @@ -38,7 +39,7 @@ pkgs.mkShell { gnutar curl cacert - ]; + ] ++ moreBuildInputs; shellHook = '' export WORKING_FOLDER=$(realpath ${workingFolder}) diff --git a/devices/gli-repeater-img.nix b/devices/gli-repeater-img.nix index d209f97..b2b8238 100644 --- a/devices/gli-repeater-img.nix +++ b/devices/gli-repeater-img.nix @@ -2,7 +2,7 @@ pkgs.callPackage ../buildOpenwrt.nix { target = "ar71xx"; arch = "generic"; - version= "19.07.8"; + version= "19.07.10"; profile = "gl-inet-6416A-v1"; packages = [ "luci-ssl" @@ -12,4 +12,7 @@ pkgs.callPackage ../buildOpenwrt.nix { "kmod-ath9k-htc" "ath9k-htc-firmware" ]; + moreBuildInputs = with pkgs; [ + python2Full + ]; } diff --git a/devices/my-router-img.nix b/devices/my-router-img.nix index 7b6d67a..9230f1e 100644 --- a/devices/my-router-img.nix +++ b/devices/my-router-img.nix @@ -2,7 +2,7 @@ pkgs.callPackage ../buildOpenwrt.nix { target = "mvebu"; arch = "cortexa9"; - version= "22.03.4"; + version= "23.05.2"; profile = "linksys_wrt1200ac"; packages = [ "adblock" diff --git a/devices/pi-img.nix b/devices/pi-img.nix index 5c7719a..e96d265 100644 --- a/devices/pi-img.nix +++ b/devices/pi-img.nix @@ -2,7 +2,7 @@ pkgs.callPackage ../buildOpenwrt.nix { target = "bcm27xx"; arch = "bcm2708"; - version= "22.03.4"; + version= "23.05.2"; profile = "rpi"; packages = ["luci-ssl"]; } diff --git a/flake.lock b/flake.lock index 7abe5b0..96f7e9e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1682173319, - "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", + "lastModified": 1708905176, + "narHash": "sha256-pphkt8iO8CV/TugI7bsPOvFzi5mRSifkEQiwqYBK28s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", + "rev": "227a4c47bef2390a7925693c51489e84169b1957", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11-small", + "ref": "nixos-23.11-small", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 6bb1106..ec978cf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "NOIBW - Nix-Openwrt-ImageBuilder-Wrapper"; - inputs.nixpkgs.url = "nixpkgs/nixos-22.11-small"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11-small"; outputs = { self, nixpkgs }: let