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
This commit is contained in:
Daniel Barlow
2024-10-06 15:55:01 +01:00
parent 336fc7e495
commit ca9efc4b26
13 changed files with 29 additions and 84 deletions

View File

@@ -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)]; };

View File

@@ -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;

View File

@@ -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)]; };

View File

@@ -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)]; };

View File

@@ -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;

View File

@@ -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)]; };

View File

@@ -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}

View File

@@ -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" {

View File

@@ -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;

View File

@@ -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)]; };

View File

@@ -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)]; };