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

update to 23.05.2

Browse Source
This commit is contained in:
stubbfel
2024-03-11 20:21:18 +00:00
parent f3f4cdeabc
commit 1d5687bbae
8 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.devcontainer/devcontainer.json
View File

@@ -3,10 +3,20 @@
{ {
"name": "Alpine", "name": "Alpine",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile // 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": { "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 to add to the dev container. More info: https://containers.dev/features.
// "features": {}, // "features": {},

2
LICENSE
View File

@@ -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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

5
buildOpenwrt.nix
View File

@@ -7,7 +7,8 @@
packages ? [], packages ? [],
manifestPkgs ? "$(cat manifest_packages)", manifestPkgs ? "$(cat manifest_packages)",
workingFolder ? "$PWD/_builder", workingFolder ? "$PWD/_builder",
builderVersion ? version builderVersion ? version,
moreBuildInputs ? []
}: }:
pkgs.mkShell { pkgs.mkShell {
name = "openwrt-build-${target}-${arch}-${profile}"; name = "openwrt-build-${target}-${arch}-${profile}";
@@ -38,7 +39,7 @@ pkgs.mkShell {
gnutar gnutar
curl curl
cacert cacert
]; ] ++ moreBuildInputs;
shellHook = shellHook =
'' ''
export WORKING_FOLDER=$(realpath ${workingFolder}) export WORKING_FOLDER=$(realpath ${workingFolder})

5
devices/gli-repeater-img.nix
View File

@@ -2,7 +2,7 @@
pkgs.callPackage ../buildOpenwrt.nix { pkgs.callPackage ../buildOpenwrt.nix {
target = "ar71xx"; target = "ar71xx";
arch = "generic"; arch = "generic";
version= "19.07.8"; version= "19.07.10";
profile = "gl-inet-6416A-v1"; profile = "gl-inet-6416A-v1";
packages = [ packages = [
"luci-ssl" "luci-ssl"
@@ -12,4 +12,7 @@ pkgs.callPackage ../buildOpenwrt.nix {
"kmod-ath9k-htc" "kmod-ath9k-htc"
"ath9k-htc-firmware" "ath9k-htc-firmware"
]; ];
moreBuildInputs = with pkgs; [
python2Full
];
} }

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

@@ -2,7 +2,7 @@
pkgs.callPackage ../buildOpenwrt.nix { pkgs.callPackage ../buildOpenwrt.nix {
target = "mvebu"; target = "mvebu";
arch = "cortexa9"; arch = "cortexa9";
version= "22.03.4"; version= "23.05.2";
profile = "linksys_wrt1200ac"; profile = "linksys_wrt1200ac";
packages = [ packages = [
"adblock" "adblock"

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= "22.03.4"; version= "23.05.2";
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": 1682173319, "lastModified": 1708905176,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "narHash": "sha256-pphkt8iO8CV/TugI7bsPOvFzi5mRSifkEQiwqYBK28s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "rev": "227a4c47bef2390a7925693c51489e84169b1957",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11-small", "ref": "nixos-23.11-small",
"type": "indirect" "type": "indirect"
} }
}, },

2
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-22.11-small"; inputs.nixpkgs.url = "nixpkgs/nixos-23.11-small";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let