diff --git a/ci.nix b/ci.nix index ec345dd..1167dbd 100644 --- a/ci.nix +++ b/ci.nix @@ -4,7 +4,6 @@ , liminix , ... }: let - inherit (builtins) map; pkgs = (import nixpkgs {}); borderVmConf = ./bordervm.conf-example.nix; inherit (pkgs.lib.attrsets) genAttrs; @@ -44,12 +43,6 @@ let imports = [ ./modules/all-modules.nix ]; }; }).outputs.optionsJson; - installers = map (f: "system.outputs.${f}") [ - "vmroot" - "mtdimage" - "ubimage" - ]; - inherit (pkgs.lib) concatStringsSep; in pkgs.stdenv.mkDerivation { name = "liminix-doc"; nativeBuildInputs = with pkgs; [ diff --git a/devices/belkin-rt3200/default.nix b/devices/belkin-rt3200/default.nix index 6ccb890..edd6f06 100644 --- a/devices/belkin-rt3200/default.nix +++ b/devices/belkin-rt3200/default.nix @@ -213,7 +213,6 @@ networkInterfaces = let inherit (config.system.service.network) link; - inherit (config.system.service) bridge; in rec { wan = link.build { ifname = "wan"; }; lan1 = link.build { ifname = "lan1"; }; diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index b930ad2..a3acff3 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -92,7 +92,6 @@ ''; }; inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs.liminix.networking) interface; in { imports = [ ../../modules/network diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix index 5dd7b9b..e89723d 100644 --- a/devices/gl-mt300a/default.nix +++ b/devices/gl-mt300a/default.nix @@ -45,7 +45,6 @@ module = { pkgs, config, lib, lim, ...}: let - inherit (pkgs.liminix.networking) interface; inherit (pkgs) openwrt; mac80211 = pkgs.kmodloader.override { targets = ["rt2800soc"]; @@ -90,19 +89,6 @@ let inherit (config.system.service.network) link; inherit (config.system.service) vlan; - inherit (pkgs.liminix.services) oneshot; - swconfig = oneshot { - name = "swconfig"; - up = '' - PATH=${pkgs.swconfig}/bin:$PATH - swconfig dev switch0 set reset - swconfig dev switch0 set enable_vlan 1 - swconfig dev switch0 vlan 1 set ports '1 2 3 4 6t' - swconfig dev switch0 vlan 2 set ports '0 6t' - swconfig dev switch0 set apply - ''; - down = "${pkgs.swconfig}/bin/swconfig dev switch0 set reset"; - }; in rec { eth = link.build { ifname = "eth0"; }; # lan and wan ports are both behind a switch on eth0 diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix index 3392858..9061d4d 100644 --- a/devices/gl-mt300n-v2/default.nix +++ b/devices/gl-mt300n-v2/default.nix @@ -38,7 +38,6 @@ module = { pkgs, config, lib, lim, ...}: let - inherit (pkgs.liminix.networking) interface; inherit (pkgs.liminix.services) oneshot; inherit (pkgs.pseudofile) dir symlink; inherit (pkgs) openwrt; diff --git a/devices/qemu-aarch64/default.nix b/devices/qemu-aarch64/default.nix index e9510b5..3c73b55 100644 --- a/devices/qemu-aarch64/default.nix +++ b/devices/qemu-aarch64/default.nix @@ -26,7 +26,7 @@ # this device is described by the "qemu" device installer = "vmroot"; - module = {pkgs, config, lim, ... }: { + module = { config, lim, ... }: { imports = [ ../../modules/arch/aarch64.nix ../families/qemu.nix diff --git a/devices/qemu-armv7l/default.nix b/devices/qemu-armv7l/default.nix index d0e0ee1..e668a8d 100644 --- a/devices/qemu-armv7l/default.nix +++ b/devices/qemu-armv7l/default.nix @@ -24,7 +24,7 @@ ''; installer = "vmroot"; - module = {pkgs, config, lim, ... }: { + module = { config, lim, ... }: { imports = [ ../../modules/arch/arm.nix ../families/qemu.nix diff --git a/devices/qemu/default.nix b/devices/qemu/default.nix index b6e860d..b0d7472 100644 --- a/devices/qemu/default.nix +++ b/devices/qemu/default.nix @@ -36,7 +36,7 @@ in the Development manual. ''; - module = {pkgs, config, lib, lim, ... }: { + module = { config, lib, lim, ... }: { imports = [ ../../modules/arch/mipseb.nix ../families/qemu.nix diff --git a/devices/tp-archer-ax23/default.nix b/devices/tp-archer-ax23/default.nix index d870c42..93e289f 100644 --- a/devices/tp-archer-ax23/default.nix +++ b/devices/tp-archer-ax23/default.nix @@ -419,7 +419,6 @@ networkInterfaces = let inherit (config.system.service.network) link; - inherit (config.system.service) bridge; in rec { lan1 = link.build { ifname = "lan1"; }; lan2 = link.build { ifname = "lan2"; }; diff --git a/devices/turris-omnia/default.nix b/devices/turris-omnia/default.nix index 27b8ee5..3ea83ec 100644 --- a/devices/turris-omnia/default.nix +++ b/devices/turris-omnia/default.nix @@ -155,8 +155,6 @@ module = {pkgs, config, lib, lim, ... }: let - openwrt = pkgs.openwrt; - inherit (lib) mkOption types; inherit (pkgs.liminix.services) oneshot; inherit (pkgs) liminix; mtd_by_name_links = pkgs.liminix.services.oneshot rec { @@ -358,7 +356,6 @@ networkInterfaces = let inherit (config.system.service.network) link; - inherit (config.system.service) bridge; in rec { en70000 = link.build { # in armada-38x.dtsi this is eth0. diff --git a/devices/zyxel-nwa50ax/default.nix b/devices/zyxel-nwa50ax/default.nix index 23a394a..920acac 100644 --- a/devices/zyxel-nwa50ax/default.nix +++ b/devices/zyxel-nwa50ax/default.nix @@ -103,8 +103,6 @@ module = { pkgs, config, lib, lim, ...}: let - inherit (pkgs.liminix.networking) interface; - inherit (pkgs.liminix.services) oneshot; inherit (pkgs.pseudofile) dir symlink; inherit (pkgs) openwrt; diff --git a/doc/extract-options.nix b/doc/extract-options.nix index 3b08e0a..90fdf2f 100644 --- a/doc/extract-options.nix +++ b/doc/extract-options.nix @@ -1,6 +1,5 @@ { eval, lib, pkgs }: let - inherit (lib) types; conf = eval.config; rootDir = builtins.toPath ./..; stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) diff --git a/doc/hardware.nix b/doc/hardware.nix index 8199e8a..f06dfc5 100644 --- a/doc/hardware.nix +++ b/doc/hardware.nix @@ -9,14 +9,6 @@ let d' = { description = "${n}\n${substring 0 (stringLength n) "********************************"}\n"; } // d; - installer = - if d ? description && d ? installer - then '' - - The default installation route for this device is - :ref:`system-outputs-${d.installer}` - '' - else ""; in d'.description) devices; in diff --git a/examples/arhcive.nix b/examples/arhcive.nix index 3b11428..db0c1b6 100644 --- a/examples/arhcive.nix +++ b/examples/arhcive.nix @@ -11,9 +11,9 @@ ... }: let secrets = import ./extneder-secrets.nix; - inherit (pkgs.liminix.services) oneshot longrun bundle target; + inherit (pkgs.liminix.services) oneshot longrun target; inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs) writeText dropbear ifwait serviceFns; + inherit (pkgs) writeText serviceFns; svc = config.system.service; in rec { boot = { diff --git a/examples/demo.nix b/examples/demo.nix index f341eb8..f5060a9 100644 --- a/examples/demo.nix +++ b/examples/demo.nix @@ -5,9 +5,9 @@ # wherever the text "EDIT" appears - please consult the tutorial # documentation for details. -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.liminix.services) bundle oneshot longrun; + inherit (pkgs.liminix.services) bundle oneshot; inherit (pkgs) serviceFns; # EDIT: you can pick your preferred RFC1918 address space # for NATted connections, if you don't like this one. diff --git a/examples/hello-from-mt300.nix b/examples/hello-from-mt300.nix index a7f3eb1..c6132f1 100644 --- a/examples/hello-from-mt300.nix +++ b/examples/hello-from-mt300.nix @@ -1,6 +1,5 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs) serviceFns; svc = config.system.service; in rec { diff --git a/examples/hello-from-qemu.nix b/examples/hello-from-qemu.nix index 9e56f18..6ee2c10 100644 --- a/examples/hello-from-qemu.nix +++ b/examples/hello-from-qemu.nix @@ -1,6 +1,5 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs) serviceFns; svc = config.system.service; in rec { diff --git a/examples/l2tp.nix b/examples/l2tp.nix index 12441b2..c01ca93 100644 --- a/examples/l2tp.nix +++ b/examples/l2tp.nix @@ -26,9 +26,9 @@ lns = { hostname = "l2tp.aaisp.net.uk"; address = "194.4.172.12"; }; - inherit (pkgs.liminix.services) oneshot longrun bundle target; + inherit (pkgs.liminix.services) oneshot target; inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs) writeText dropbear ifwait serviceFns; + inherit (pkgs) serviceFns; svc = config.system.service; in rec { boot = { diff --git a/examples/nwa50ax-ap.nix b/examples/nwa50ax-ap.nix index 6a3989a..6926724 100644 --- a/examples/nwa50ax-ap.nix +++ b/examples/nwa50ax-ap.nix @@ -1,7 +1,6 @@ { config, pkgs, ... } : let - inherit (pkgs.liminix.services) oneshot longrun bundle target; - inherit (pkgs) writeText; + inherit (pkgs.liminix.services) target; svc = config.system.service; secrets-1 = { ssid = "Zyxel 2G (N)"; diff --git a/examples/recovery.nix b/examples/recovery.nix index 6b899f8..fcd3d07 100644 --- a/examples/recovery.nix +++ b/examples/recovery.nix @@ -3,7 +3,7 @@ let inherit (pkgs) serviceFns; svc = config.system.service; inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs.liminix.services) oneshot longrun bundle target; + inherit (pkgs.liminix.services) oneshot target; some-util-linux = pkgs.runCommand "some-util-linux" {} '' mkdir -p $out/bin cd ${pkgs.util-linux-small}/bin diff --git a/examples/rotuer.nix b/examples/rotuer.nix index 4d89a53..94ca896 100644 --- a/examples/rotuer.nix +++ b/examples/rotuer.nix @@ -12,8 +12,6 @@ let domainName = "fake.liminix.org"; firewallRules = {}; } // (import ./rotuer-secrets.nix); - inherit (pkgs.liminix.services) oneshot bundle; - inherit (pkgs) serviceFns; svc = config.system.service; wirelessConfig = { country_code = "GB"; diff --git a/examples/turris.nix b/examples/turris.nix index 8d0424c..975311a 100644 --- a/examples/turris.nix +++ b/examples/turris.nix @@ -1,6 +1,5 @@ -{ config, pkgs, lib, lim, ... } : +{ config, pkgs, lim, ... } : let - inherit (pkgs) serviceFns; svc = config.system.service; in rec { diff --git a/modules/arch/aarch64.nix b/modules/arch/aarch64.nix index 3a18ffd..2faebe2 100644 --- a/modules/arch/aarch64.nix +++ b/modules/arch/aarch64.nix @@ -1,4 +1,4 @@ -{ lib, lim, pkgs, config, ...}: +{ lim, pkgs, config, ...}: { config = { kernel.config = { diff --git a/modules/arch/arm.nix b/modules/arch/arm.nix index b405bdf..9efd199 100644 --- a/modules/arch/arm.nix +++ b/modules/arch/arm.nix @@ -1,4 +1,4 @@ -{ lib, lim, pkgs, config, ...}: +{ lim, pkgs, config, ...}: { config = { kernel.config = { diff --git a/modules/arch/mips.nix b/modules/arch/mips.nix index 155c147..1570623 100644 --- a/modules/arch/mips.nix +++ b/modules/arch/mips.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, lim, ...}: +{ config, lim, ...}: { config = { kernel.config = { diff --git a/modules/arch/mipseb.nix b/modules/arch/mipseb.nix index 5e7eefa..79ecd6b 100644 --- a/modules/arch/mipseb.nix +++ b/modules/arch/mipseb.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ...}: +{ pkgs, config, ...}: { imports = [ ./mips.nix ]; config = { diff --git a/modules/arch/mipsel.nix b/modules/arch/mipsel.nix index 6f32ddc..11a8d81 100644 --- a/modules/arch/mipsel.nix +++ b/modules/arch/mipsel.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ...}: +{ config, ...}: { imports = [ ./mips.nix ]; config = { diff --git a/modules/base.nix b/modules/base.nix index 241ea45..d9d4514 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -4,10 +4,8 @@ { lib, pkgs, config, ...}: let - inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; + inherit (lib) mkOption types ; inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs.liminix.networking) address interface; - inherit (pkgs.liminix.services) bundle; type_service = pkgs.liminix.lib.types.service; diff --git a/modules/bridge/default.nix b/modules/bridge/default.nix index 32df4a5..7e68a51 100644 --- a/modules/bridge/default.nix +++ b/modules/bridge/default.nix @@ -10,7 +10,6 @@ { lib, pkgs, config, ...}: let inherit (lib) mkOption types; - inherit (pkgs.liminix.services) oneshot; inherit (pkgs) liminix; in { diff --git a/modules/bridge/members.nix b/modules/bridge/members.nix index a278730..dea0baa 100644 --- a/modules/bridge/members.nix +++ b/modules/bridge/members.nix @@ -1,7 +1,6 @@ { liminix , ifwait -, lib , svc }: { members, primary } : @@ -9,7 +8,6 @@ let inherit (liminix.networking) interface; inherit (liminix.services) bundle oneshot; - inherit (lib) mkOption types; addif = member : # how do we get sight of services from here? maybe we need to # implement ifwait as a regualr derivation instead of a diff --git a/modules/bridge/primary.nix b/modules/bridge/primary.nix index c25e5fe..fb357e6 100644 --- a/modules/bridge/primary.nix +++ b/modules/bridge/primary.nix @@ -1,12 +1,10 @@ { liminix -, ifwait , lib }: { ifname } : let - inherit (liminix.services) bundle oneshot; - inherit (lib) mkOption types; + inherit (liminix.services) oneshot; in oneshot rec { name = "${ifname}.link"; up = '' diff --git a/modules/busybox.nix b/modules/busybox.nix index 718cafd..ea30b25 100644 --- a/modules/busybox.nix +++ b/modules/busybox.nix @@ -8,7 +8,7 @@ { lib, pkgs, config, ...}: let - inherit (lib) mkOption mkEnableOption types mapAttrsToList; + inherit (lib) mkOption types mapAttrsToList; inherit (pkgs.pseudofile) dir symlink; inherit (lib.strings) toUpper; diff --git a/modules/cdc-ncm/default.nix b/modules/cdc-ncm/default.nix index c6aff82..7ba8264 100644 --- a/modules/cdc-ncm/default.nix +++ b/modules/cdc-ncm/default.nix @@ -2,7 +2,6 @@ let inherit (pkgs) liminix; inherit (lib) mkOption types; - svc = config.system.service; in { imports = [ ../service-trigger diff --git a/modules/cdc-ncm/wwan.nix b/modules/cdc-ncm/wwan.nix index adf4f4a..d5a6ea6 100644 --- a/modules/cdc-ncm/wwan.nix +++ b/modules/cdc-ncm/wwan.nix @@ -8,7 +8,7 @@ }: { apn, username, password, authType }: let - inherit (liminix.services) bundle longrun oneshot; + inherit (liminix.services) oneshot; authTypeNum = if authType == "pap" then "1" else "2"; chat = lib.escapeShellArgs [ # Your usb modem thing might present as a tty that you run PPP diff --git a/modules/dhcp6c/acquire-delegated-prefix.nix b/modules/dhcp6c/acquire-delegated-prefix.nix index f48db31..7cac901 100644 --- a/modules/dhcp6c/acquire-delegated-prefix.nix +++ b/modules/dhcp6c/acquire-delegated-prefix.nix @@ -2,7 +2,6 @@ writeFennel , linotify , anoia -, lua , lualinux }: writeFennel "acquire-delegated-prefix" { diff --git a/modules/dhcp6c/address.nix b/modules/dhcp6c/address.nix index 6c97003..69ef092 100644 --- a/modules/dhcp6c/address.nix +++ b/modules/dhcp6c/address.nix @@ -1,12 +1,10 @@ { liminix -, lib , callPackage }: { client, interface } : let inherit (liminix.services) longrun; - inherit (lib) mkOption types; name = "dhcp6c.addr.${client.name}.${interface.name}"; script = callPackage ./acquire-wan-address.nix { }; in longrun { diff --git a/modules/dhcp6c/client.nix b/modules/dhcp6c/client.nix index fb662c5..abf24ff 100644 --- a/modules/dhcp6c/client.nix +++ b/modules/dhcp6c/client.nix @@ -1,13 +1,11 @@ { liminix -, lib , odhcp6c , odhcp-script }: { interface } : let inherit (liminix.services) longrun; - inherit (lib) mkOption types; name = "dhcp6c.${interface.name}"; in longrun { inherit name; diff --git a/modules/dhcp6c/default.nix b/modules/dhcp6c/default.nix index d298c85..11b32fd 100644 --- a/modules/dhcp6c/default.nix +++ b/modules/dhcp6c/default.nix @@ -12,7 +12,6 @@ { lib, pkgs, config, ...}: let inherit (lib) mkOption types; - inherit (pkgs.liminix.services) oneshot; inherit (pkgs) liminix; in { diff --git a/modules/dhcp6c/prefix.nix b/modules/dhcp6c/prefix.nix index 2848e5d..485aa07 100644 --- a/modules/dhcp6c/prefix.nix +++ b/modules/dhcp6c/prefix.nix @@ -1,12 +1,10 @@ { liminix -, lib , callPackage }: { client, interface } : let inherit (liminix.services) longrun; - inherit (lib) mkOption types; name = "dhcp6c.prefix.${client.name}.${interface.name}"; script = callPackage ./acquire-delegated-prefix.nix { }; in longrun { diff --git a/modules/dnsmasq/service.nix b/modules/dnsmasq/service.nix index d57275e..3c50596 100644 --- a/modules/dnsmasq/service.nix +++ b/modules/dnsmasq/service.nix @@ -18,7 +18,7 @@ let name = "${interface.name}.dnsmasq"; inherit (liminix.services) longrun; inherit (lib) concatStrings concatStringsSep mapAttrsToList; - hostOpt = name : { mac, v4, v6, leasetime } @ attrs: + hostOpt = name : { mac, v4, v6, leasetime }: let v6s = concatStrings (map (a : ",[${a}]") v6); in "--dhcp-host=${mac},${v4}${v6s},${name},${builtins.toString leasetime}"; in diff --git a/modules/firewall/default.nix b/modules/firewall/default.nix index 17817b9..50f7907 100644 --- a/modules/firewall/default.nix +++ b/modules/firewall/default.nix @@ -8,7 +8,6 @@ let inherit (lib) mkOption types; inherit (pkgs) liminix; - inherit (pkgs.liminix.services) oneshot; kmodules = pkgs.kmodloader.override { inherit (config.system.outputs) kernel; diff --git a/modules/firewall/service.nix b/modules/firewall/service.nix index e9178dc..9bb022f 100644 --- a/modules/firewall/service.nix +++ b/modules/firewall/service.nix @@ -7,8 +7,6 @@ { rules, extraRules }: let inherit (liminix.services) oneshot; - inherit (liminix.lib) typeChecked; - inherit (lib) mkOption types; script = firewallgen "firewall.nft" (lib.recursiveUpdate rules extraRules); in oneshot { name = "firewall"; diff --git a/modules/hardware.nix b/modules/hardware.nix index 819bbb0..006a6e2 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -6,9 +6,9 @@ ## :file:`devices/manuf-model/default.nix` -{ lib, pkgs, config, ...}: +{ lib, ...}: let - inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; + inherit (lib) mkOption types ; in { options = { boot = { diff --git a/modules/hostapd/service.nix b/modules/hostapd/service.nix index 2bd5453..20f7558 100644 --- a/modules/hostapd/service.nix +++ b/modules/hostapd/service.nix @@ -8,8 +8,6 @@ let inherit (liminix.services) longrun; inherit (lib) concatStringsSep mapAttrsToList; - inherit (liminix.lib) typeChecked; - inherit (lib) mkOption types; # This is not a friendly interface to configuring a wireless AP: it # just passes everything straight through to the hostapd config. diff --git a/modules/kernel/default.nix b/modules/kernel/default.nix index 5dcc292..981289a 100644 --- a/modules/kernel/default.nix +++ b/modules/kernel/default.nix @@ -5,14 +5,9 @@ { lib, pkgs, config, ...}: let - inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; - inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs.liminix.networking) address interface; - inherit (pkgs.liminix.services) bundle; + inherit (lib) mkOption types ; inherit (pkgs) liminix; - type_service = pkgs.liminix.lib.types.service; - mergeConditionals = conf : conditions : # for each key in conditions, if it is present in conf # then merge the associated value into conf diff --git a/modules/mdevd.nix b/modules/mdevd.nix index 966c71d..9c546f7 100644 --- a/modules/mdevd.nix +++ b/modules/mdevd.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ...} : +{ config, pkgs, ...} : let inherit (pkgs.liminix.services) oneshot longrun; in { config = { diff --git a/modules/mount/default.nix b/modules/mount/default.nix index 944990a..41e7524 100644 --- a/modules/mount/default.nix +++ b/modules/mount/default.nix @@ -7,11 +7,6 @@ let inherit (lib) mkOption types; inherit (pkgs) liminix; - mkBoolOption = description : mkOption { - type = types.bool; - inherit description; - default = true; - }; in { options = { diff --git a/modules/mount/service.nix b/modules/mount/service.nix index 54cd2c2..a5782de 100644 --- a/modules/mount/service.nix +++ b/modules/mount/service.nix @@ -5,7 +5,7 @@ }: { partlabel, mountpoint, options, fstype }: let - inherit (liminix.services) longrun oneshot; + inherit (liminix.services) oneshot; device = "/dev/disk/by-partlabel/${partlabel}"; name = "mount.${lib.strings.sanitizeDerivationName (lib.escapeURL mountpoint)}"; options_string = diff --git a/modules/network/address.nix b/modules/network/address.nix index 0370f13..ce939f4 100644 --- a/modules/network/address.nix +++ b/modules/network/address.nix @@ -1,6 +1,5 @@ { liminix -, ifwait , serviceFns , lib }: diff --git a/modules/network/forward.nix b/modules/network/forward.nix index e6eaa7e..d0a1a0e 100644 --- a/modules/network/forward.nix +++ b/modules/network/forward.nix @@ -1,7 +1,5 @@ { liminix -, ifwait -, serviceFns , lib }: { enableIPv4, enableIPv6 }: diff --git a/modules/network/link.nix b/modules/network/link.nix index 819d2ec..0d11305 100644 --- a/modules/network/link.nix +++ b/modules/network/link.nix @@ -1,7 +1,5 @@ { liminix -, ifwait -, serviceFns , lib }: { @@ -11,8 +9,7 @@ # if devpath is supplied, we rename the interface at that # path to have the specified name. let - inherit (liminix.services) longrun oneshot; - inherit (lib) concatStringsSep; + inherit (liminix.services) oneshot; name = "${ifname}.link"; rename = if devpath != null then '' diff --git a/modules/network/route.nix b/modules/network/route.nix index 6a6644a..3979261 100644 --- a/modules/network/route.nix +++ b/modules/network/route.nix @@ -1,7 +1,5 @@ { liminix -, ifwait -, serviceFns , lib }: { target, via, interface ? null, metric }: diff --git a/modules/ntp/service.nix b/modules/ntp/service.nix index 6f83a21..76a25ca 100644 --- a/modules/ntp/service.nix +++ b/modules/ntp/service.nix @@ -1,7 +1,6 @@ { liminix , chrony -, serviceFns , lib , writeText }: @@ -9,10 +8,6 @@ params: let inherit (liminix.services) longrun; inherit (lib) concatStringsSep mapAttrsToList; - inherit (liminix.lib) typeChecked; - inherit (lib) mkOption types; - - serverOpts = types.listOf types.str; configFile = p: (mapAttrsToList (name: opts: "server ${name} ${concatStringsSep "" opts}") p.servers) diff --git a/modules/outputs.nix b/modules/outputs.nix index 84199a2..dcad384 100644 --- a/modules/outputs.nix +++ b/modules/outputs.nix @@ -6,7 +6,7 @@ }: let inherit (lib) mkOption types concatStringsSep; - inherit (pkgs) liminix callPackage writeText; + inherit (pkgs) liminix writeText; o = config.system.outputs; in { diff --git a/modules/outputs/btrfs.nix b/modules/outputs/btrfs.nix index 3617724..dbf8a4d 100644 --- a/modules/outputs/btrfs.nix +++ b/modules/outputs/btrfs.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkIf mkOption types; + inherit (lib) mkIf; o = config.system.outputs; in { diff --git a/modules/outputs/ext4fs.nix b/modules/outputs/ext4fs.nix index 6304b87..19955e2 100644 --- a/modules/outputs/ext4fs.nix +++ b/modules/outputs/ext4fs.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkIf mkOption types; + inherit (lib) mkIf; o = config.system.outputs; in { diff --git a/modules/outputs/initramfs.nix b/modules/outputs/initramfs.nix index 89d017f..6599429 100644 --- a/modules/outputs/initramfs.nix +++ b/modules/outputs/initramfs.nix @@ -6,7 +6,7 @@ }: let inherit (lib) mkEnableOption mkOption mkIf types; - inherit (pkgs) runCommand callPackage writeText; + inherit (pkgs) runCommand; in { options = { diff --git a/modules/outputs/jffs2.nix b/modules/outputs/jffs2.nix index 02c7c10..c8dd4d4 100644 --- a/modules/outputs/jffs2.nix +++ b/modules/outputs/jffs2.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkIf mkOption types; + inherit (lib) mkIf; o = config.system.outputs; in { diff --git a/modules/outputs/kexecboot.nix b/modules/outputs/kexecboot.nix index 053644e..f7e0f0e 100644 --- a/modules/outputs/kexecboot.nix +++ b/modules/outputs/kexecboot.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkOption mkForce types concatStringsSep; + inherit (lib) mkOption types concatStringsSep; in { imports = [ ../ramdisk.nix ]; options.system.outputs = { @@ -42,8 +42,7 @@ in { boot-sh = let - inherit (pkgs.lib.trivial) toHexString; - inherit (config.system.outputs) rootfs kernel; + inherit (config.system.outputs) rootfs; cmdline = concatStringsSep " " config.boot.commandLine; in pkgs.buildPackages.runCommand "boot.sh.sh" { diff --git a/modules/outputs/mbrimage.nix b/modules/outputs/mbrimage.nix index 54767f7..b4d9235 100644 --- a/modules/outputs/mbrimage.nix +++ b/modules/outputs/mbrimage.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkOption types concatStringsSep; + inherit (lib) mkOption types; o = config.system.outputs; phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024); in { diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix index f8f0572..63fc4ea 100644 --- a/modules/outputs/tftpboot.nix +++ b/modules/outputs/tftpboot.nix @@ -58,7 +58,6 @@ in { system.outputs = rec { tftpboot = let - inherit (pkgs.lib.trivial) toHexString; o = config.system.outputs; image = let choices = { uimage = o.uimage; diff --git a/modules/outputs/tplink-safeloader.nix b/modules/outputs/tplink-safeloader.nix index 67ab969..028999a 100644 --- a/modules/outputs/tplink-safeloader.nix +++ b/modules/outputs/tplink-safeloader.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkOption types concatStringsSep; + inherit (lib) mkOption types; o = config.system.outputs; cfg = config.tplink-safeloader; in { diff --git a/modules/outputs/ubimage.nix b/modules/outputs/ubimage.nix index 795eb79..c6ab464 100644 --- a/modules/outputs/ubimage.nix +++ b/modules/outputs/ubimage.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkIf mkEnableOption mkOption types concatStringsSep; + inherit (lib) mkIf mkOption types; cfg = config.boot.tftp; instructions = pkgs.writeText "env.scr" '' setenv serverip ${cfg.serverip} diff --git a/modules/outputs/ubivolume.nix b/modules/outputs/ubivolume.nix index 45aa889..71c5231 100644 --- a/modules/outputs/ubivolume.nix +++ b/modules/outputs/ubivolume.nix @@ -5,7 +5,6 @@ , ... }: let - inherit (pkgs) liminix; inherit (lib) mkIf mkOption types concatStringsSep optionalString; in { diff --git a/modules/outputs/zyxel-nwa-fit.nix b/modules/outputs/zyxel-nwa-fit.nix index a68dd39..a6e14b6 100644 --- a/modules/outputs/zyxel-nwa-fit.nix +++ b/modules/outputs/zyxel-nwa-fit.nix @@ -5,7 +5,7 @@ , ... }: let - inherit (lib) mkIf mkEnableOption mkOption types concatStringsSep; + inherit (lib) mkIf mkOption types; models = "6b e1 6f e1 ff ff ff ff ff ff"; in { options.system.outputs = { diff --git a/modules/ppp/l2tp.nix b/modules/ppp/l2tp.nix index 75afc75..1ba0978 100644 --- a/modules/ppp/l2tp.nix +++ b/modules/ppp/l2tp.nix @@ -1,8 +1,5 @@ { liminix -, lib -, ppp -, pppoe , writeAshScript , writeText , serviceFns diff --git a/modules/profiles/gateway.nix b/modules/profiles/gateway.nix index 0f1f51e..1df3c80 100644 --- a/modules/profiles/gateway.nix +++ b/modules/profiles/gateway.nix @@ -2,7 +2,7 @@ let svc = config.system.service; cfg = config.profile.gateway; - inherit (lib) mkOption mkEnableOption mkIf mdDoc types optional optionals; + inherit (lib) mkOption mkEnableOption mkIf types; inherit (pkgs) liminix serviceFns; inherit (liminix.services) bundle oneshot; hostaps = diff --git a/modules/profiles/wap.nix b/modules/profiles/wap.nix index fdb3b41..ccd73bb 100644 --- a/modules/profiles/wap.nix +++ b/modules/profiles/wap.nix @@ -5,9 +5,9 @@ ... }: let inherit (pkgs) liminix; - inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; + inherit (lib) mkOption types ; - inherit (pkgs.liminix.services) oneshot longrun bundle target; + inherit (pkgs.liminix.services) oneshot target; inherit (pkgs.pseudofile) dir symlink; inherit (pkgs) serviceFns; svc = config.system.service; diff --git a/modules/ramdisk.nix b/modules/ramdisk.nix index 49f425f..0863651 100644 --- a/modules/ramdisk.nix +++ b/modules/ramdisk.nix @@ -1,11 +1,10 @@ { config -, pkgs , lib , ... }: let - inherit (lib) mkIf mkEnableOption mkOption; # types concatStringsSep; + inherit (lib) mkIf mkEnableOption; # types concatStringsSep; in { options = { boot = { diff --git a/modules/schnapps/default.nix b/modules/schnapps/default.nix index 5bf0aa8..ce5c7e6 100644 --- a/modules/schnapps/default.nix +++ b/modules/schnapps/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : { config = { programs.busybox = { diff --git a/modules/service-trigger/rule.nix b/modules/service-trigger/rule.nix index 3126c8b..0a97630 100644 --- a/modules/service-trigger/rule.nix +++ b/modules/service-trigger/rule.nix @@ -1,7 +1,6 @@ { liminix , uevent-watch -, serviceFns , lib }: { serviceName, terms, symlink diff --git a/modules/ssh/ssh.nix b/modules/ssh/ssh.nix index f0c297e..94e1162 100644 --- a/modules/ssh/ssh.nix +++ b/modules/ssh/ssh.nix @@ -1,7 +1,6 @@ { liminix , dropbear -, serviceFns , lib }: p : diff --git a/modules/usb.nix b/modules/usb.nix index 93a4506..2ff6e6d 100644 --- a/modules/usb.nix +++ b/modules/usb.nix @@ -1,7 +1,7 @@ # support for USB block devices and the common filesystems # they're likely to provide -{lib, config, ... }: +{ config, ... }: { kernel = { config = { diff --git a/modules/users.nix b/modules/users.nix index cfb2dc0..4ccda9f 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -16,7 +16,7 @@ let inherit (lib) concatStrings concatStringsSep mapAttrsToList mkOption types; inherit (builtins) toString; - inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs.pseudofile) dir; passwd-file = let lines = mapAttrsToList (name: u: "${name}:${if u ? passwd then u.passwd else "!!"}:${toString u.uid}:${toString u.gid}:${u.gecos}:${u.dir}:${u.shell}\n" ) config.users; diff --git a/modules/vlan/default.nix b/modules/vlan/default.nix index 6698630..2884d7a 100644 --- a/modules/vlan/default.nix +++ b/modules/vlan/default.nix @@ -13,7 +13,6 @@ { lib, pkgs, config, ...}: let inherit (lib) mkOption types; - inherit (pkgs.liminix.services) oneshot; inherit (pkgs) liminix; in { diff --git a/modules/wlan.nix b/modules/wlan.nix index 3a3dfe8..f992cb5 100644 --- a/modules/wlan.nix +++ b/modules/wlan.nix @@ -1,6 +1,5 @@ { lib, pkgs, config, ...}: let - inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; inherit (pkgs.pseudofile) dir symlink; inherit (pkgs) stdenv wireless-regdb; regulatory = stdenv.mkDerivation { diff --git a/modules/zyxel-dual-image/service.nix b/modules/zyxel-dual-image/service.nix index 3edd642..b711d1a 100644 --- a/modules/zyxel-dual-image/service.nix +++ b/modules/zyxel-dual-image/service.nix @@ -3,7 +3,7 @@ , lib , zyxel-bootconfig }: -{ ensureActiveImage, primaryMtdPartition, secondaryMtdPartition, bootConfigurationMtdPartition, kernelCommandLineSource }: +{ ensureActiveImage, bootConfigurationMtdPartition, kernelCommandLineSource }: let inherit (liminix.services) oneshot; activeImageIndex = if ensureActiveImage == "primary" then 0 else 1; diff --git a/pkgs/devout/default.nix b/pkgs/devout/default.nix index f2ec1ba..2144b63 100644 --- a/pkgs/devout/default.nix +++ b/pkgs/devout/default.nix @@ -1,6 +1,4 @@ -{ - lua -, nellie +{ nellie , writeFennel , anoia , fennel diff --git a/pkgs/fennelrepl/default.nix b/pkgs/fennelrepl/default.nix index 28f47ca..8320130 100644 --- a/pkgs/fennelrepl/default.nix +++ b/pkgs/fennelrepl/default.nix @@ -1,9 +1,4 @@ -{ - runCommand -, runtimeShell -, fetchurl -, lib -, luaPackages +{ lib , lua , lualinux , writeScriptBin diff --git a/pkgs/firewallgen/default.nix b/pkgs/firewallgen/default.nix index 246f8be..8d139d5 100644 --- a/pkgs/firewallgen/default.nix +++ b/pkgs/firewallgen/default.nix @@ -7,8 +7,8 @@ name : ruleset : let inherit (lib.strings) concatStringsSep splitString hasInfix substring; inherit (lib.lists) groupBy; - inherit (lib.attrsets) mapAttrsToList nameValuePair; - inherit (builtins) map listToAttrs replaceStrings head tail; + inherit (lib.attrsets) mapAttrsToList; + inherit (builtins) map head tail; indentLines = offset : lines : if lines == [] @@ -31,7 +31,7 @@ let indent = text : indentLines 0 (splitString "\n" text); - dochain = { name, type, family, rules, + dochain = { name, type, rules, policy ? null, priority ? "filter", hook ? null } : '' diff --git a/pkgs/ifwait/default.nix b/pkgs/ifwait/default.nix index 19f76d0..f8564f9 100644 --- a/pkgs/ifwait/default.nix +++ b/pkgs/ifwait/default.nix @@ -1,6 +1,4 @@ -{ - lua -, netlink-lua +{ netlink-lua , writeFennelScript , runCommand , anoia diff --git a/pkgs/kernel-backport/default.nix b/pkgs/kernel-backport/default.nix index 19b1bd4..3abfb58 100644 --- a/pkgs/kernel-backport/default.nix +++ b/pkgs/kernel-backport/default.nix @@ -3,9 +3,7 @@ , python2 , which , fetchgit -, fetchpatch , fetchFromGitHub -, autoreconfHook , coccinelle }: let diff --git a/pkgs/kernel/default.nix b/pkgs/kernel/default.nix index 4ddf1dd..de636c3 100644 --- a/pkgs/kernel/default.nix +++ b/pkgs/kernel/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPackages - , runCommand , writeText , lib diff --git a/pkgs/liminix-tools/builders/squashfs.nix b/pkgs/liminix-tools/builders/squashfs.nix index 4ba9a26..5a82c43 100644 --- a/pkgs/liminix-tools/builders/squashfs.nix +++ b/pkgs/liminix-tools/builders/squashfs.nix @@ -1,7 +1,4 @@ -{ - stdenv -, busybox -, buildPackages +{ buildPackages , callPackage , pseudofile , runCommand diff --git a/pkgs/liminix-tools/services/default.nix b/pkgs/liminix-tools/services/default.nix index aedec83..f6603c4 100644 --- a/pkgs/liminix-tools/services/default.nix +++ b/pkgs/liminix-tools/services/default.nix @@ -1,14 +1,11 @@ { stdenvNoCC -, s6-rc , s6 , lib -, callPackage , writeScript , serviceFns }: let - inherit (builtins) concatStringsSep any map; prefix = "/run/services/outputs"; output = service: name: "${prefix}/${service.name}/${name}"; serviceScript = commands : '' @@ -28,7 +25,6 @@ let , up ? null , down ? null , finish ? null - , outputs ? [] , notification-fd ? null , producer-for ? null , consumer-for ? null @@ -40,7 +36,7 @@ let , buildInputs ? [] , restart-on-upgrade ? false , controller ? null - } @ args: + }: stdenvNoCC.mkDerivation { # we use stdenvNoCC to avoid generating derivations with names # like foo.service-mips-linux-musl @@ -55,9 +51,7 @@ let longrun = { name , run - , outputs ? [] , notification-fd ? null - , dependencies ? [] , buildInputs ? [] , ... } @ args: @@ -81,8 +75,6 @@ let name , up , down ? "" - , outputs ? [] - , dependencies ? [] , ... } @ args : service (args // { serviceType = "oneshot"; @@ -91,9 +83,7 @@ let "${name}-down" "${serviceScript down}\n${cleanupScript name}"; }); - bundle = { - name - , contents ? [] + bundle = { contents ? [] , dependencies ? [] , ... } @ args: service (args // { diff --git a/pkgs/linotify/default.nix b/pkgs/linotify/default.nix index eaef17c..b3e3bc2 100644 --- a/pkgs/linotify/default.nix +++ b/pkgs/linotify/default.nix @@ -1,4 +1,4 @@ -{ lua, lib, fetchFromGitHub }: +{ lua, fetchFromGitHub }: let pname = "linotify"; in lua.pkgs.buildLuaPackage { inherit pname; diff --git a/pkgs/lualinux/default.nix b/pkgs/lualinux/default.nix index 1468be8..39e186b 100644 --- a/pkgs/lualinux/default.nix +++ b/pkgs/lualinux/default.nix @@ -1,4 +1,4 @@ -{ lua, lib, fetchFromGitHub }: +{ lua, fetchFromGitHub }: let pname = "lualinux"; src = fetchFromGitHub { diff --git a/pkgs/mac80211/default.nix b/pkgs/mac80211/default.nix index 30e1d01..315d4d1 100644 --- a/pkgs/mac80211/default.nix +++ b/pkgs/mac80211/default.nix @@ -22,7 +22,7 @@ let rev = "a5265497a4f6da158e95d6a450cb2cb6dc085cab"; hash = "sha256-YYi4gkpLjbOK7bM2MGQjAyEBuXJ9JNXoz/JEmYf8xE8="; }; - inherit (liminix.services) oneshot longrun; + inherit (liminix.services) oneshot; inherit (lib.lists) foldl; configs = { ath9k.kconfig = { diff --git a/pkgs/min-collect-garbage/default.nix b/pkgs/min-collect-garbage/default.nix index 3caf62d..c904804 100644 --- a/pkgs/min-collect-garbage/default.nix +++ b/pkgs/min-collect-garbage/default.nix @@ -1,12 +1,8 @@ { stdenv -, nix -, cpio -, openssh }: stdenv.mkDerivation { name = "min-collect-garbage"; buildInputs = [ ]; -# propagatedBuildInputs = [ openssh ]; src = ./.; makeFlags = [ "min-list-garbage" ]; installPhase = '' diff --git a/pkgs/minisock/default.nix b/pkgs/minisock/default.nix index ae4fe03..7f61f0e 100644 --- a/pkgs/minisock/default.nix +++ b/pkgs/minisock/default.nix @@ -1,4 +1,4 @@ -{ lua, lib, fetchFromGitHub }: +{ lua, fetchFromGitHub }: let pname = "minisock"; src = fetchFromGitHub { diff --git a/pkgs/nellie/default.nix b/pkgs/nellie/default.nix index 4594b5b..9db9f62 100644 --- a/pkgs/nellie/default.nix +++ b/pkgs/nellie/default.nix @@ -1,4 +1,4 @@ -{ lua, lib, fetchpatch, fetchFromGitHub, stdenv }: +{ lua, stdenv }: let pname = "nellie"; in lua.pkgs.buildLuaPackage { diff --git a/pkgs/netlink-lua/default.nix b/pkgs/netlink-lua/default.nix index b9ce9fb..3edf390 100644 --- a/pkgs/netlink-lua/default.nix +++ b/pkgs/netlink-lua/default.nix @@ -1,4 +1,4 @@ -{ lua, lib, fetchpatch, fetchFromGitHub, libmnl }: +{ lua, fetchFromGitHub, libmnl }: let pname = "netlink"; in lua.pkgs.buildLuaPackage { inherit pname; diff --git a/pkgs/odhcp-script/default.nix b/pkgs/odhcp-script/default.nix index 8aa081b..9b2f1c1 100644 --- a/pkgs/odhcp-script/default.nix +++ b/pkgs/odhcp-script/default.nix @@ -1,7 +1,6 @@ { writeFennelScript , anoia -, lua , lualinux }: writeFennelScript "odhcpc-script" [anoia lualinux] ./odhcp6-script.fnl diff --git a/pkgs/odhcp6c/default.nix b/pkgs/odhcp6c/default.nix index df8f954..98da0ca 100644 --- a/pkgs/odhcp6c/default.nix +++ b/pkgs/odhcp6c/default.nix @@ -1,5 +1,4 @@ { stdenv -, buildPackages , cmake , fetchFromGitHub , ...} : diff --git a/pkgs/openwrt/default.nix b/pkgs/openwrt/default.nix index 2f05398..086cae4 100644 --- a/pkgs/openwrt/default.nix +++ b/pkgs/openwrt/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub -, writeShellScript , pkgsBuildBuild }: let diff --git a/pkgs/pppoe/default.nix b/pkgs/pppoe/default.nix index e6f7861..39f862d 100644 --- a/pkgs/pppoe/default.nix +++ b/pkgs/pppoe/default.nix @@ -2,8 +2,6 @@ , stdenv , fetchFromGitHub , ppp } : -let -in stdenv.mkDerivation rec { pname = "rp-pppoe"; version = "3.15"; diff --git a/pkgs/preinit/default.nix b/pkgs/preinit/default.nix index 4aab639..c373005 100644 --- a/pkgs/preinit/default.nix +++ b/pkgs/preinit/default.nix @@ -1,14 +1,7 @@ { stdenv -, fetchzip , gdb }: -let kernel = fetchzip { - name = "linux"; - url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.71.tar.gz"; - hash = "sha256-pq6QNa0PJVeheaZkuvAPD0rLuEeKrViKk65dz+y4kqo="; - }; -in stdenv.mkDerivation { name = "preinit"; src = ./.; diff --git a/pkgs/tufted/default.nix b/pkgs/tufted/default.nix index 0486164..861f8fd 100644 --- a/pkgs/tufted/default.nix +++ b/pkgs/tufted/default.nix @@ -1,7 +1,6 @@ { lua5_3 , stdenv -, fetchFromGitHub , makeWrapper } : let diff --git a/pkgs/uevent-watch/default.nix b/pkgs/uevent-watch/default.nix index 87f39ce..150385c 100644 --- a/pkgs/uevent-watch/default.nix +++ b/pkgs/uevent-watch/default.nix @@ -1,9 +1,6 @@ -{ - lua -, nellie +{ nellie , lualinux , writeFennel -, runCommand , anoia , fennel , stdenv diff --git a/pkgs/write-fennel-script/default.nix b/pkgs/write-fennel-script/default.nix index 09e46c4..ff46eb1 100644 --- a/pkgs/write-fennel-script/default.nix +++ b/pkgs/write-fennel-script/default.nix @@ -1,8 +1,4 @@ -{ - lua -, lib -, fennel -, writeFennel +{ writeFennel , stdenv }: name : packages : source : diff --git a/pkgs/write-fennel/default.nix b/pkgs/write-fennel/default.nix index 67d1908..7c6b0e0 100644 --- a/pkgs/write-fennel/default.nix +++ b/pkgs/write-fennel/default.nix @@ -9,7 +9,7 @@ name : packages ? [], correlate ? false, mainFunction ? null -} @ options : source : +} : source : let luapath = builtins.map (f: diff --git a/tests/ext4/configuration.nix b/tests/ext4/configuration.nix index c4d1838..cdb5eed 100644 --- a/tests/ext4/configuration.nix +++ b/tests/ext4/configuration.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs.pseudofile) dir; in { imports = [ ../../modules/outputs/ext4fs.nix diff --git a/tests/inout/configuration.nix b/tests/inout/configuration.nix index 6a326da..864e986 100644 --- a/tests/inout/configuration.nix +++ b/tests/inout/configuration.nix @@ -1,8 +1,6 @@ -{ config, pkgs, lib, modulesPath, ... } : +{ config, pkgs, modulesPath, ... } : let - inherit (pkgs.liminix.services) bundle oneshot longrun; - inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs) serviceFns; + inherit (pkgs.pseudofile) dir; svc = config.system.service; diff --git a/tests/jffs2/configuration.nix b/tests/jffs2/configuration.nix index 2515fbf..11d1f3e 100644 --- a/tests/jffs2/configuration.nix +++ b/tests/jffs2/configuration.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs.pseudofile) dir; in { imports = [ ../../vanilla-configuration.nix diff --git a/tests/min-copy-closure/config-ext4.nix b/tests/min-copy-closure/config-ext4.nix index 696e408..69818f9 100644 --- a/tests/min-copy-closure/config-ext4.nix +++ b/tests/min-copy-closure/config-ext4.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... } : +{ lib, ... } : { imports= [ ./configuration.nix diff --git a/tests/min-copy-closure/configuration.nix b/tests/min-copy-closure/configuration.nix index fe80bf2..f7bb704 100644 --- a/tests/min-copy-closure/configuration.nix +++ b/tests/min-copy-closure/configuration.nix @@ -1,15 +1,7 @@ { config, pkgs, lib, ... } : let inherit (pkgs) dropbear; - inherit (pkgs.pseudofile) dir symlink; - inherit (pkgs.liminix.services) oneshot longrun bundle target; - inherit - (pkgs.liminix.networking) - address - udhcpc - interface - route - ; + inherit (pkgs.liminix.services) longrun; in { imports = [ ../../vanilla-configuration.nix diff --git a/tests/pppoe/configuration.nix b/tests/pppoe/configuration.nix index 03ac42d..4db764b 100644 --- a/tests/pppoe/configuration.nix +++ b/tests/pppoe/configuration.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.liminix.services) oneshot longrun bundle target output; + inherit (pkgs.liminix.services) target; svc = config.system.service; in rec { services.lan4 = svc.network.address.build { diff --git a/tests/tftpboot/configuration.nix b/tests/tftpboot/configuration.nix index 9196037..a10cce2 100644 --- a/tests/tftpboot/configuration.nix +++ b/tests/tftpboot/configuration.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, lim, ... } : let - inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs.pseudofile) dir; dts = pkgs.runCommand "qemu.dts" { nativeBuildInputs = with pkgs.pkgsBuildBuild; [ dtc qemu ]; } '' diff --git a/tests/tftpboot/test.nix b/tests/tftpboot/test.nix index b7a3e87..618abec 100644 --- a/tests/tftpboot/test.nix +++ b/tests/tftpboot/test.nix @@ -4,7 +4,7 @@ let check = deviceName : config : let derivation = (import liminix { device = import "${liminix}/devices/${deviceName}/"; - liminix-config = { pkgs, ... } : { + liminix-config = { ... } : { imports = [./configuration.nix]; inherit config; }; diff --git a/tests/updown/configuration.nix b/tests/updown/configuration.nix index 38e52db..ea9263b 100644 --- a/tests/updown/configuration.nix +++ b/tests/updown/configuration.nix @@ -1,7 +1,5 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.liminix.services) bundle oneshot longrun; - inherit (pkgs) serviceFns; # EDIT: you can pick your preferred RFC1918 address space # for NATted connections, if you don't like this one. ipv4LocalNet = "10.8.0"; diff --git a/tests/wlan/configuration.nix b/tests/wlan/configuration.nix index 6dc4b44..e94f6f6 100644 --- a/tests/wlan/configuration.nix +++ b/tests/wlan/configuration.nix @@ -1,7 +1,6 @@ -{ config, pkgs, lib, ... } : +{ config, pkgs, ... } : let - inherit (pkgs.liminix.networking) interface address hostapd route dnsmasq; - inherit (pkgs.liminix.services) oneshot longrun bundle target; + inherit (pkgs.liminix.networking) interface hostapd; in rec { imports = [ ../../modules/wlan.nix diff --git a/vanilla-configuration.nix b/vanilla-configuration.nix index 5814e8a..d43da17 100644 --- a/vanilla-configuration.nix +++ b/vanilla-configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, ... } : let - inherit (pkgs.liminix.services) oneshot longrun bundle target; - inherit (pkgs) writeText; + inherit (pkgs.liminix.services) target; svc = config.system.service; in rec { imports = [