update to 24.20.2

.devcontainer/devcontainer.json

@@ -3,10 +3,27 @@
 {
 	"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",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"bbenoist.Nix"
+			]
+		}
+	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

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

README.md

@@ -92,8 +92,11 @@ pkgs.callPackage ../buildOpenwrt.nix {
 build an image with:
 
 ```sh
-# nix-shell <path_to_device_file>.nix --run makeCleanImage
-nix-shell devices/pi-img.nix --run makeCleanImage
+# load nixe alias for `nix --experimental-features "nix-command flakes"`
+. alias.sh
+
+# nix run <path_to_device_file>.nix
+nixe run . devices/pi-img.nix 
 ```
 
 For more example see `devices` folder.

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,13 +39,13 @@ pkgs.mkShell {
         gnutar
         curl
         cacert
-    ];
+    ] ++ moreBuildInputs;
     shellHook =
     ''
         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
         }
 

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
+        ];
 }

devices/my-router-img.nix

@@ -2,16 +2,17 @@
 pkgs.callPackage ../buildOpenwrt.nix {
         target = "mvebu";
         arch = "cortexa9";
-        version= "22.03.4";
+        version= "24.10.2";
         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"
         ];
 }

devices/pi-img.nix

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

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682173319,
-        "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
+        "lastModified": 1741862977,
+        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
+        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-22.11-small",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },

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-25.05";
 
   outputs = { self, nixpkgs }:
     let
@@ -18,7 +18,7 @@
         });
       appScripts = forAllSystems (system:
         {
-          makeCleanImageScript = nixpkgsFor.${system}.writeScript "makeCleanImage.sh" ''
+          makeCleanImageScript = nixpkgsFor.${system}.writers.writeBash "makeCleanImage.sh" ''
             nix-shell "$1" --run makeCleanImage
           '';
         });
@@ -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