liminix

commit ca9efc4b26cbbdedb56eeb8a934fb066d1514cab
parent 336fc7e4951cbecfe35dbc8ac04eed0b1958b6e8
Author: Daniel Barlow <dan@telent.net>
Date:   Sun,  6 Oct 2024 15:55:01 +0100

simplify CI

* I didn't know what I was doing when I set up Hydra

* it's not certain that I do now either, but hey ho

Diffstat:
M
ci.nix
 | 
23
++++++-----------------
M
default.nix
 | 
3
+--
M
tests/ext4/test.nix
 | 
8
++------
M
tests/fennel/test.nix
 | 
6
+-----
M
tests/inout/test.nix
 | 
8
++------
M
tests/jffs2/test.nix
 | 
8
++------
M
tests/min-copy-closure/test.nix
 | 
8
++------
M
tests/pppoe/test.nix
 | 
8
++------
M
tests/pseudofiles/test.nix
 | 
8
++------
M
tests/smoke/test.nix
 | 
10
+++-------
M
tests/tftpboot/test.nix
 | 
7
++-----
M
tests/updown/test.nix
 | 
8
++------
M
tests/wlan/test.nix
 | 
8
++------

13 files changed, 29 insertions(+), 84 deletions(-)
diff --git a/ci.nix b/ci.nix
@@ -1,11 +1,6 @@
-{
-  nixpkgs,
-  unstable,
-  liminix,
-  ...
-}:
 let
-  pkgs = (import nixpkgs { });
+  pkgs = import <nixpkgs> { };
+  liminix = <liminix>;
   borderVmConf = ./bordervm.conf-example.nix;
   inherit (pkgs.lib.attrsets) genAttrs;
   devices = [
@@ -21,7 +16,7 @@ let
   vanilla = ./vanilla-configuration.nix;
   for-device = name:
     (import liminix {
-      inherit nixpkgs borderVmConf;
+      inherit borderVmConf;
       device = import (liminix + "/devices/${name}");
       liminix-config = vanilla;
     }).outputs.default;
@@ -32,7 +27,7 @@ let
     // {
       buildEnv =
         (import liminix {
-          inherit nixpkgs borderVmConf;
+          inherit borderVmConf;
           device = import (liminix + "/devices/qemu");
           liminix-config = vanilla;
         }).buildEnv;
@@ -40,7 +35,7 @@ let
         let
           json =
             (import liminix {
-              inherit nixpkgs borderVmConf;
+              inherit borderVmConf;
               device = import (liminix + "/devices/qemu");
               liminix-config =
                 { ... }:
@@ -74,11 +69,5 @@ let
                 > $out/nix-support/hydra-build-products
           '';
       };
-      with-unstable = (import liminix {
-        nixpkgs = unstable;
-        inherit borderVmConf;
-        device = import (liminix + "/devices/qemu");
-        liminix-config = vanilla;
-      }).outputs.default;
     };
-in jobs
+in  (genAttrs devices for-device) # tests # jobs
diff --git a/default.nix b/default.nix
@@ -2,14 +2,13 @@
   deviceName ? null,
   device ? (import ./devices/${deviceName}),
   liminix-config ? <liminix-config>,
-  nixpkgs ? <nixpkgs>,
   borderVmConf ? ./bordervm.conf.nix,
   imageType ? "primary",
 }:
 
 let
   overlay = import ./overlay.nix;
-  pkgs = import nixpkgs (
+  pkgs = import <nixpkgs> (
     device.system
     // {
       overlays = [ overlay ];
diff --git a/tests/ext4/test.nix b/tests/ext4/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu/";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
diff --git a/tests/fennel/test.nix b/tests/fennel/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
 let
-  overlay = import "${liminix}/overlay.nix";
+  overlay = import <liminix/overlay.nix>;
   pkgs = import <nixpkgs> { overlays = [overlay]; };
   script = pkgs.writeFennel "foo" {} ./hello.fnl;
   inherit (pkgs.lua.pkgs) fifo;
diff --git a/tests/inout/test.nix b/tests/inout/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu/";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
diff --git a/tests/jffs2/test.nix b/tests/jffs2/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu/";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
diff --git a/tests/min-copy-closure/test.nix b/tests/min-copy-closure/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let lmx = (import liminix {
-      device = import "${liminix}/devices/qemu/";
+let lmx = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     });
     rogue = lmx.pkgs.rogue;
diff --git a/tests/pppoe/test.nix b/tests/pppoe/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     }).outputs.default;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
diff --git a/tests/pseudofiles/test.nix b/tests/pseudofiles/test.nix
@@ -1,13 +1,9 @@
-{
-  liminix
-, nixpkgs
-}:
 let
-  overlay = import "${liminix}/overlay.nix";
+  overlay = import <liminix/overlay.nix>;
   nixpkgs = import <nixpkgs> { overlays = [overlay]; };
   fixture = nixpkgs.callPackage ./fixture.nix {};
 in nixpkgs.runCommand "check" {
-    nativeBuildInputs = with nixpkgs; [ squashfsTools qprint ] ;
+    nativeBuildInputs = with <nixpkgs>; [ squashfsTools qprint ] ;
   } ''
 set -e
 diff ${fixture} ${./result.expected}
diff --git a/tests/smoke/test.nix b/tests/smoke/test.nix
@@ -1,10 +1,6 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu/";
-      liminix-config = "${liminix}/vanilla-configuration.nix";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
+      liminix-config = <liminix/vanilla-configuration.nix>;
     }).outputs.rootfs;
     pkgs = import <nixpkgs> {};
 in pkgs.runCommand "check" {
diff --git a/tests/tftpboot/test.nix b/tests/tftpboot/test.nix
@@ -1,9 +1,6 @@
-{
-  liminix
-}:
 let check = deviceName  : config :
-let derivation = (import liminix {
-      device = import "${liminix}/devices/${deviceName}/";
+let derivation = (import <liminix> {
+      device = import (<liminix/devices> + "/${deviceName}");
       liminix-config = { ... } : {
         imports = [./configuration.nix];
         inherit config;
diff --git a/tests/updown/test.nix b/tests/updown/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu/";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu>;
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
@@ -1,9 +1,5 @@
-{
-  liminix
-, nixpkgs
-}:
-let img = (import liminix {
-      device = import "${liminix}/devices/qemu-armv7l/";
+let img = (import <liminix> {
+      device = import <liminix/devices/qemu-armv7l>;
       liminix-config = ./configuration.nix;
     }).outputs.default;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };