lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

add routeros to overlay

Browse source
This commit is contained in:
Daniel Barlow 2023-02-08 18:10:11 +00:00
parent f356e475d6
commit cc7daeabb3
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -97,11 +97,9 @@ in {
# cross-compiling nix-shell for any package we're customizing # cross-compiling nix-shell for any package we're customizing
inherit pkgs; inherit pkgs;
buildEnv = buildEnv = pkgs.mkShell {
let routeros = pkgs.pkgsBuildBuild.callPackage ./tests/support/ppp-server {}; packages = with pkgs.pkgsBuildBuild; [
in pkgs.mkShell { tufted
packages = [
pkgs.pkgsBuildBuild.tufted
routeros.routeros routeros.routeros
routeros.ros-exec-script routeros.ros-exec-script
]; ];

9
overlay.nix
View file

@ -25,9 +25,6 @@ final: prev: {
nettle = null; nettle = null;
}; };
tufted = final.callPackage ./pkgs/tufted {};
pppoe = final.callPackage ./pkgs/pppoe {}; pppoe = final.callPackage ./pkgs/pppoe {};
ppp = ppp =
(prev.ppp.override { (prev.ppp.override {
@ -83,4 +80,10 @@ final: prev: {
sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz"; sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz";
}; };
}; };
# these are packages for the build system not the host/target
tufted = final.callPackage ./pkgs/tufted {};
routeros = final.callPackage ./pkgs/routeros {};
} }

0
tests/support/ppp-server/README.md → pkgs/routeros/README.md
View file

0
tests/support/ppp-server/default.nix → pkgs/routeros/default.nix
View file

0
tests/support/ppp-server/ros-exec-script.py → pkgs/routeros/ros-exec-script.py
View file

0
tests/support/ppp-server/routeros.config → pkgs/routeros/routeros.config
View file

4
tests/pppoe/test.nix
View file

@ -6,8 +6,8 @@ let img = (import liminix {
device = import "${liminix}/devices/qemu/"; device = import "${liminix}/devices/qemu/";
liminix-config = ./configuration.nix; liminix-config = ./configuration.nix;
}).outputs.default; }).outputs.default;
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
ros = pkgs.callPackage ../support/ppp-server {}; ros = pkgs.pkgsBuildBuild.routeros;
run-qemu = pkgs.writeShellScriptBin "run-qemu" '' run-qemu = pkgs.writeShellScriptBin "run-qemu" ''
export PATH="${pkgs.lib.makeBinPath [pkgs.qemu]}:$PATH" export PATH="${pkgs.lib.makeBinPath [pkgs.qemu]}:$PATH"
${builtins.readFile ../../scripts/run-qemu.sh} ${builtins.readFile ../../scripts/run-qemu.sh}