From 4f5b4924ff1842a4bdd0e304b9d68a979992fe5a Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 20 Feb 2023 17:46:07 +0000 Subject: [PATCH] fix bordervm in hydra --- bordervm-configuration.nix | 1 - ci.nix | 6 ++++-- default.nix | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bordervm-configuration.nix b/bordervm-configuration.nix index 773b874..6803dea 100644 --- a/bordervm-configuration.nix +++ b/bordervm-configuration.nix @@ -35,7 +35,6 @@ in { }; imports = [ - ./bordervm.conf.nix ]; config = { boot.kernelParams = [ diff --git a/ci.nix b/ci.nix index ba80528..7017e9c 100644 --- a/ci.nix +++ b/ci.nix @@ -6,12 +6,13 @@ let inherit (builtins) map; pkgs = (import nixpkgs {}); + borderVmConf = ./bordervm.conf-example.nix; inherit (pkgs.lib.attrsets) genAttrs; devices = [ "qemu" "gl-ar750" "gl-mt300n-v2" "gl-mt300a" ]; vanilla = ./vanilla-configuration.nix; for-device = name: (import liminix { - inherit nixpkgs; + inherit nixpkgs borderVmConf; device = import (liminix + "/devices/${name}"); liminix-config = vanilla; }).outputs.default; @@ -19,12 +20,13 @@ let jobs = (genAttrs devices (name: for-device name)) // tests // { buildEnv = (import liminix { - inherit nixpkgs; + inherit nixpkgs borderVmConf; device = import (liminix + "/devices/qemu"); liminix-config = vanilla; }).buildEnv; with-unstable = (import liminix { nixpkgs = unstable; + inherit borderVmConf; device = import (liminix + "/devices/qemu"); liminix-config = vanilla; }).outputs.default; diff --git a/default.nix b/default.nix index 9034eeb..b679f57 100644 --- a/default.nix +++ b/default.nix @@ -2,13 +2,19 @@ device , liminix-config ? , nixpkgs ? +, borderVmConf ? ./bordervm.conf.nix }: let overlay = import ./overlay.nix; pkgs = import nixpkgs (device.system // { overlays = [overlay]; - config = {allowUnsupportedSystem = true; }; + config = { + allowUnsupportedSystem = true; # mipsel + permittedInsecurePackages = [ + "python-2.7.18.6" # kernel backports needs python <3 + ]; + }; }); config = (pkgs.lib.evalModules { @@ -28,6 +34,7 @@ let modules = [ ({ ... } : { nixpkgs.overlays = [ overlay ]; }) (import ./bordervm-configuration.nix) + borderVmConf ]; }).config.system; in {