bordervm-configuration.nix

@@ -55,17 +55,18 @@ in {
     <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
   ];
   config = {
-    boot.kernelParams = [ "loglevel=9" ];
+    boot.kernelParams = [
+      "loglevel=9"
+    ];
     systemd.services.pppoe =
-      let
+      let conf = pkgs.writeText "kpppoed.toml"
-        conf = pkgs.writeText "kpppoed.toml" ''
+        ''
       interface_name = "eth1"
       services = [ "myservice" ]
       lns_ipaddr = "${cfg.l2tp.host}:${builtins.toString cfg.l2tp.port}"
       ac_name = "kpppoed-1.0"
     '';
-      in
+      in  {
-      {
         wantedBy = [ "multi-user.target" ];
         after = [ "network-online.target" ];
         serviceConfig = {
@@ -91,17 +92,17 @@ in {
 
     systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
 
+
     virtualisation = {
       qemu = {
         networkingOptions = [];
-        options =
+        options = [] ++
-          [ ]
+          optional cfg.ethernet.pci.enable
-          ++ optional cfg.ethernet.pci.enable "-device vfio-pci,host=${cfg.ethernet.pci.id}"
+            "-device vfio-pci,host=${cfg.ethernet.pci.id}" ++
-          ++ optionals cfg.ethernet.usb.enable [
+          optionals cfg.ethernet.usb.enable [
             "-device usb-ehci,id=ehci"
             "-device usb-host,bus=ehci.0,vendorid=${cfg.ethernet.usb.vendor},productid=${cfg.ethernet.usb.product}"
-          ]
+          ] ++ [
-          ++ [
             "-nographic"
             "-serial mon:stdio"
           ];

bordervm.conf-example.nix

@@ -2,11 +2,7 @@
 {
   bordervm = {
     # ethernet.pci = { id = "01:00.0"; enable = true; };
-    ethernet.usb = {
+    ethernet.usb = { vendor = "0x0bda"; product = "0x8153"; enable = true; };
-      vendor = "0x0bda";
-      product = "0x8153";
-      enable = true;
-    };
     l2tp = {
       host = "l2tp.aa.net.uk";
     };

ci.nix

@@ -1,9 +1,8 @@
 {
-  nixpkgs,
+  nixpkgs
-  unstable,
+, unstable
-  liminix,
+, liminix
-  ...
+, ... }:
-}:
 let
   pkgs = (import nixpkgs {});
   borderVmConf =  ./bordervm.conf-example.nix;
@@ -27,35 +26,27 @@ let
     }).outputs.default;
   tests = import ./tests/ci.nix;
   jobs =
-    (genAttrs devices for-device)
+    (genAttrs devices for-device) //
-    // tests
+    tests //
-    // {
+    {
-      buildEnv =
+      buildEnv = (import liminix {
-        (import liminix {
         inherit nixpkgs borderVmConf;
         device = import (liminix + "/devices/qemu");
         liminix-config = vanilla;
       }).buildEnv;
       doc =
-        let
+        let json =
-          json =
               (import liminix {
                 inherit nixpkgs borderVmConf;
                 device = import (liminix + "/devices/qemu");
-              liminix-config =
+                liminix-config = {...} : {
-                { ... }:
-                {
                   imports = [ ./modules/all-modules.nix ];
                 };
               }).outputs.optionsJson;
-        in
+        in pkgs.stdenv.mkDerivation {
-        pkgs.stdenv.mkDerivation {
           name = "liminix-doc";
           nativeBuildInputs = with pkgs; [
-            gnumake
+            gnumake sphinx fennel luaPackages.lyaml
-            sphinx
-            fennel
-            luaPackages.lyaml
           ];
           src = ./.;
           buildPhase = ''

default.nix

@@ -1,17 +1,15 @@
 {
-  deviceName ? null,
+  deviceName ? null
-  device ? (import ./devices/${deviceName}),
+, device ? (import ./devices/${deviceName} )
-  liminix-config ? <liminix-config>,
+, liminix-config ? <liminix-config>
-  nixpkgs ? <nixpkgs>,
+, nixpkgs ? <nixpkgs>
-  borderVmConf ? ./bordervm.conf.nix,
+, borderVmConf ? ./bordervm.conf.nix
-  imageType ? "primary",
+, imageType ? "primary"
 }:
 
 let
   overlay = import ./overlay.nix;
-  pkgs = import nixpkgs (
+  pkgs = import nixpkgs (device.system // {
-    device.system
-    // {
     overlays = [overlay];
     config = {
       allowUnsupportedSystem = true; # mipsel
@@ -20,8 +18,7 @@ let
         "python-2.7.18.7"
       ];
     };
-    }
+  });
-  );
 
   eval = pkgs.lib.evalModules {
     specialArgs = {

doc/extract-options.nix

@@ -2,7 +2,8 @@
 let
   conf = eval.config;
   rootDir = builtins.toPath ./..;
-  stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) [ "${rootDir}/" ];
+  stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix)
+    ["${rootDir}/"];
   optToDoc = name: opt : {
     inherit name;
     description = opt.description or null;
@@ -26,4 +27,5 @@ let
     else
       item // { declarations =  map stripAnyPrefixes item.declarations; };
 in
-builtins.map spliceServiceDefn (pkgs.lib.optionAttrSetToDocList eval.options)
+builtins.map spliceServiceDefn
+  (pkgs.lib.optionAttrSetToDocList eval.options)

doc/hardware.nix

@@ -2,17 +2,15 @@ with import <nixpkgs> { };
 
 let
   inherit (builtins) stringLength readDir filter;
-  devices = filter (n: n != "families") (lib.mapAttrsToList (n: t: n) (readDir ../devices));
+  devices = filter (n: n != "families")
-  texts = map (
+    (lib.mapAttrsToList (n: t: n) (readDir ../devices));
-    n:
+  texts = map (n:
-    let
+    let d = import  ../devices/${n}/default.nix;
-      d = import ../devices/${n}/default.nix;
         d' = {
           description = "${n}\n${substring 0 (stringLength n) "********************************"}\n";
         } // d;
-    in
+    in d'.description)
-    d'.description
+    devices;
-  ) devices;
 in
 writeText "hwdoc" ''
   Supported hardware

examples/arhcive.nix

@@ -128,15 +128,11 @@ in rec {
   };
 
   users.backup = {
-    uid = 500;
+    uid=500; gid=500; gecos="Storage owner"; dir="/srv";
-    gid = 500;
-    gecos = "Storage owner";
-    dir = "/srv";
     shell="/dev/null";
   };
   groups.backup = {
-    gid = 500;
+    gid=500; usernames = ["backup"];
-    usernames = [ "backup" ];
   };
 
   defaultProfile.packages = with pkgs; [

examples/demo.nix

@@ -62,27 +62,18 @@ in rec {
 
   services.int = svc.network.address.build {
     interface = svc.bridge.primary.build { ifname = "int"; };
-    family = "inet";
+    family = "inet"; address = "${ipv4LocalNet}.1"; prefixLength = 16;
-    address = "${ipv4LocalNet}.1";
-    prefixLength = 16;
   };
 
   services.bridge =  svc.bridge.members.build {
     primary = services.int;
-    members = with config.hardware.networkInterfaces; [
+    members = with config.hardware.networkInterfaces;
-      wlan
+      [ wlan lan ];
-      lan
-    ];
   };
 
   services.ntp = svc.ntp.build {
-    pools = {
+    pools = { "pool.ntp.org" = ["iburst"]; };
-      "pool.ntp.org" = [ "iburst" ];
+    makestep = { threshold = 1.0; limit = 3; };
-    };
-    makestep = {
-      threshold = 1.0;
-      limit = 3;
-    };
   };
 
   services.sshd = svc.ssh.build { };
@@ -166,7 +157,8 @@ in rec {
     interface = services.wan;
   };
 
-  services.firewall = svc.firewall.build { };
+  services.firewall = svc.firewall.build {
+  };
 
   services.packet_forwarding = svc.network.forward.build { };
 
@@ -203,5 +195,7 @@ in rec {
       ];
     };
 
-  defaultProfile.packages = with pkgs; [ min-collect-garbage ];
+  defaultProfile.packages = with pkgs; [
+    min-collect-garbage
+  ];
 }

examples/rotuer-secrets.example.nix

@@ -8,10 +8,12 @@
   root = {
     #  mkpasswd -m sha512crypt
     passwd = "$6$6pt0mpbgcB7kC2RJ$kSBoCYGyi1.qxt7dqmexLj1l8E6oTZJZmfGyJSsMYMW.jlsETxdgQSdv6ptOYDM7DHAwf6vLG0pz3UD31XBfC1";
-    openssh.authorizedKeys.keys = [ ];
+    openssh.authorizedKeys.keys = [
+    ];
   };
 
   lan = {
     prefix = "10.8.0";
   };
+
 }

modules/base.nix

@@ -58,25 +58,16 @@ in {
         description = "Kernel command line";
       };
       commandLineDtbNode = mkOption {
-        type = types.enum [
+        type = types.enum [ "bootargs" "bootargs-override" ];
-          "bootargs"
-          "bootargs-override"
-        ];
         default = "bootargs";
         description = "Kernel command line's devicetree node";
       };
       imageType = mkOption {
-        type = types.enum [
+        type = types.enum [ "primary" "secondary" ];
-          "primary"
-          "secondary"
-        ];
         default = "primary";
       };
       imageFormat = mkOption {
-        type = types.enum [
+        type = types.enum ["fit" "uimage"];
-          "fit"
-          "uimage"
-        ];
         default = "uimage";
       };
       tftp = {

modules/busybox.nix

@@ -85,13 +85,10 @@ in {
       };
     };
     filesystem = dir {
-      bin = dir (
+      bin = dir ({
-        {
         busybox = symlink "${busybox}/bin/busybox";
         sh = symlink "${busybox}/bin/busybox";
-        }
+      } // makeLinks);
-        // makeLinks
-      );
     };
   };
 }

modules/hardware.nix

@@ -5,13 +5,14 @@
 ## you want to run on it, and would usually be set in the "device" file:
 ## :file:`devices/manuf-model/default.nix`
 
+
 { lib, ...}:
 let
   inherit (lib) mkOption types ;
-in
+in {
-{
   options = {
-    boot = { };
+    boot = {
+    };
     hardware = {
       dts = {
         src = mkOption {

modules/mdevd.nix

@@ -20,10 +20,7 @@ in {
         up = ''
           for i in $(find /sys -name uevent); do ( echo change > $i ) ; done
         '';
-        dependencies = [
+        dependencies = [devout mdevd];
-          devout
-          mdevd
-        ];
       };
     };
   };

modules/outputs.nix

@@ -1,8 +1,8 @@
 {
-  config,
+  config
-  pkgs,
+, pkgs
-  lib,
+, lib
-  ...
+, ...
 }:
 let
   inherit (lib) mkOption types concatStringsSep;

modules/ramdisk.nix

@@ -1,4 +1,8 @@
-{ config, lib, ... }:
+{
+  config
+, lib
+, ...
+}:
 let
   inherit (lib) mkIf mkEnableOption; # types concatStringsSep;
 in {

modules/squashfs.nix

@@ -1,8 +1,8 @@
 {
-  config,
+  config
-  pkgs,
+, pkgs
-  lib,
+, lib
-  ...
+, ...
 }:
 let
   inherit (pkgs) liminix;

modules/usb.nix

@@ -24,6 +24,8 @@
       EXT4_FS = "y";
       EXT4_USE_FOR_EXT2 = "y";
       FS_ENCRYPTION = "y";
+
+
     };
   };
 }

modules/users.nix

@@ -18,15 +18,9 @@ let
   inherit (builtins) toString;
   inherit (pkgs.pseudofile) dir;
   passwd-file  =
-    let
+    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" )
-      lines = mapAttrsToList (
+      config.users;
-        name: u:
+    in concatStrings lines;
-        "${name}:${
-          if u ? passwd then u.passwd else "!!"
-        }:${toString u.uid}:${toString u.gid}:${u.gecos}:${u.dir}:${u.shell}\n"
-      ) config.users;
-    in
-    concatStrings lines;
   group-file =
     let lines = mapAttrsToList
       (name: {gid, usernames ? []}:

overlay.nix

@@ -74,6 +74,7 @@ extraPkgs // {
       # should texinfo be in nativeBuildInputs instead of
       # buildInputs?
       texinfo = null;
+
     };
 
   # luarocks wants a cross-compiled cmake (which seems like a bug,
@@ -185,12 +186,9 @@ extraPkgs // {
     # done. Do it the ugly way..
     postPatch =
       o.postPatch
-      + (
+      + (with final;
-        with final;
+        lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
-        lib.optionalString (
+          "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n");
-          stdenv.buildPlatform != stdenv.hostPlatform
-        ) "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n"
-      );
   });
 
   pppBuild = prev.ppp;
@@ -202,12 +200,13 @@ extraPkgs // {
   }); in q.override { nixosTestRunner = true; sdlSupport = false; };
 
   rsyncSmall =
-    let
+    let r = prev.rsync.overrideAttrs(o: {
-      r = prev.rsync.overrideAttrs (o: {
+          configureFlags = o.configureFlags ++ [
-        configureFlags = o.configureFlags ++ [ "--disable-openssl" ];
+            "--disable-openssl"
+          ];
         });
-    in
+    in r.override { openssl = null; };
-    r.override { openssl = null; };
+
 
   inherit s6;
   s6-linux-init = prev.s6-linux-init.override {
@@ -284,4 +283,5 @@ extraPkgs // {
     translateManpages = false;
     capabilitiesSupport = false;
   };
+
 }

pkgs/anoia/default.nix

@@ -1,10 +1,10 @@
 {
-  fennel,
+  fennel
-  stdenv,
+, stdenv
-  linotify,
+, linotify
-  lua,
+, lua
-  lualinux,
+, lualinux
-  cpio,
+, cpio
 }:
 let pname =  "anoia";
 in stdenv.mkDerivation {

pkgs/default.nix

@@ -1,4 +1,7 @@
-{ callPackage, lib }:
+{
+  callPackage
+, lib
+}:
 let
   typeChecked = caller: type: value:
     let

pkgs/devout/default.nix

@@ -1,11 +1,10 @@
-{
+{ nellie
-  nellie,
+, writeFennel
-  writeFennel,
+, anoia
-  anoia,
+, fennel
-  fennel,
+, stdenv
-  stdenv,
+, fennelrepl
-  fennelrepl,
+, lualinux
-  lualinux,
 }:
 stdenv.mkDerivation {
   name = "devout";

pkgs/fennel/default.nix

@@ -1,7 +1,7 @@
 {
-  stdenv,
+  stdenv
-  lua,
+, lua
-  fetchFromSourcehut,
+, fetchFromSourcehut
 }:
 let pname =  "fennel";
 in stdenv.mkDerivation {

pkgs/go-l2tp/default.nix

@@ -1,7 +1,7 @@
 {
-  buildGoModule,
+  buildGoModule
-  fetchFromGitHub,
+, fetchFromGitHub
-  ppp,
+, ppp
 }:
 
 buildGoModule rec {
@@ -23,4 +23,5 @@ buildGoModule rec {
 
   doCheck = false;
   vendorHash = "sha256-hOkhJhToN/VJwjQmnQJSPGz26/YDR2Ch+1yeW51OF+U=";
+
 }

pkgs/ifwait/default.nix

@@ -1,15 +1,9 @@
-{
+{ netlink-lua
-  netlink-lua,
+, writeFennelScript
-  writeFennelScript,
+, runCommand
-  runCommand,
+, anoia
-  anoia,
 }:
 runCommand "ifwait" {} ''
   mkdir -p $out/bin
-  cp -p ${
+  cp -p ${writeFennelScript "ifwait" [anoia netlink-lua] ./ifwait.fnl} $out/bin/ifwait
-    writeFennelScript "ifwait" [
-      anoia
-      netlink-lua
-    ] ./ifwait.fnl
-  } $out/bin/ifwait
 ''

pkgs/initramfs-peek/default.nix

@@ -1,10 +1,10 @@
 {
-  busybox,
+  busybox
-  pkgsBuildBuild,
+, pkgsBuildBuild
-  runCommand,
+, runCommand
-  cpio,
+, cpio
-  writeReferencesToFile,
+, writeReferencesToFile
-  writeScript,
+, writeScript
 } :
 let
   inherit (pkgsBuildBuild) gen_init_cpio;

pkgs/kernel-backport/default.nix

@@ -1,11 +1,10 @@
-{
+{ stdenv
-  stdenv,
+, git
-  git,
+, python2
-  python2,
+, which
-  which,
+, fetchgit
-  fetchgit,
+, fetchFromGitHub
-  fetchFromGitHub,
+, coccinelle
-  coccinelle,
 }:
 let
   donorTree = fetchFromGitHub {

pkgs/kernel/default.nix

@@ -1,37 +1,28 @@
-{
+{  stdenv
-  stdenv,
+ , buildPackages
-  buildPackages,
+ , writeText
-  writeText,
+ , lib
-  lib,
 
-  config,
+ , config
-  src,
+ , src
-  version ? "0",
+ , version ? "0"
-  extraPatchPhase ? "echo",
+ , extraPatchPhase ? "echo"
-  targets ? [ "vmlinux" ],
+ , targets ? ["vmlinux"]
 } :
 let
   writeConfig = import ./write-kconfig.nix { inherit lib writeText; };
   kconfigFile = writeConfig "kconfig" config;
   arch = stdenv.hostPlatform.linuxArch;
   targetNames =  map baseNameOf targets;
-  inherit lib;
+  inherit lib; in
-in
 stdenv.mkDerivation rec {
   name = "kernel";
   inherit src extraPatchPhase;
   hardeningDisable = ["all"];
-  nativeBuildInputs =
+  nativeBuildInputs = [buildPackages.stdenv.cc] ++
-    [ buildPackages.stdenv.cc ]
+                      (with buildPackages.pkgs; [
-    ++ (with buildPackages.pkgs; [
+                        rsync bc bison flex pkg-config
-      rsync
+                        openssl ncurses.all perl
-      bc
-      bison
-      flex
-      pkg-config
-      openssl
-      ncurses.all
-      perl
                       ]);
   CC = "${stdenv.cc.bintools.targetPrefix}gcc";
   HOSTCC = with buildPackages.pkgs;

pkgs/kmodloader/default.nix

@@ -1,11 +1,11 @@
 {
-  liminix,
+  liminix
-  lib,
+, lib
-  targets ? [ ],
+, targets ? []
-  kernel ? null,
+, kernel ? null
-  runCommand,
+, runCommand
-  pkgsBuildBuild,
+, pkgsBuildBuild
-  dependencies ? [ ],
+, dependencies ? []
 } :
 let
   inherit (liminix.services) oneshot;

pkgs/levitate/default.nix

@@ -1,13 +1,13 @@
 {
-  writeScriptBin,
+  writeScriptBin
-  writeScript,
+, writeScript
-  systemconfig,
+, systemconfig
-  execline,
+, execline
-  lib,
+, lib
-  config ? { },
+, config ? {}
-  liminix,
+, liminix
-  pseudofile,
+, pseudofile
-  pkgs,
+, pkgs
 } :
 let
   inherit (pseudofile) dir symlink;

pkgs/libubootenv/default.nix

@@ -1,9 +1,8 @@
-{
+{ stdenv
-  stdenv,
+, cmake
-  cmake,
+, zlib
-  zlib,
+, libyaml
-  libyaml,
+, fetchFromGitHub
-  fetchFromGitHub,
 } :
 stdenv.mkDerivation {
   name = "libubootenv";

pkgs/linotify/default.nix

@@ -15,4 +15,5 @@ in lua.pkgs.buildLuaPackage {
     mkdir -p "$out/lib/lua/${lua.luaversion}"
     cp inotify.so "$out/lib/lua/${lua.luaversion}/"
   '';
+
 }

pkgs/lualinux/default.nix

@@ -21,4 +21,5 @@ in lua.pkgs.buildLuaPackage {
     mkdir -p "$out/lib/lua/${lua.luaversion}"
     cp ${pname}.so "$out/lib/lua/${lua.luaversion}/"
   '';
+
 }

pkgs/lzma/default.nix

@@ -1,4 +1,7 @@
-{ stdenv, fetchurl }:
+{
+  stdenv
+, fetchurl
+}:
 stdenv.mkDerivation {
   pname = "lzma";
   version = "4.32.7";

pkgs/mac80211/default.nix

@@ -1,17 +1,17 @@
 # make out-of-tree modules given a backported kernel source tree
 
 {
-  extraConfig ? { },
+  extraConfig ? {}
-  drivers ? [ ],
+, drivers ? [ ]
-  kernel-backport,
+, kernel-backport
-  stdenv,
+, stdenv
-  writeText,
+, writeText
-  klibBuild ? null,
+, klibBuild ? null
-  buildPackages,
+, buildPackages
-  fetchFromGitHub,
+, fetchFromGitHub
 
-  liminix,
+, liminix
-  lib,
+, lib
 }:
 let
   arch = stdenv.hostPlatform.linuxArch;

pkgs/min-copy-closure/default.nix

@@ -1,10 +1,9 @@
 {
-  stdenv,
+  stdenv
-  nix,
+, nix
-  cpio,
+, cpio
-  openssh,
+, openssh
-}:
+}: stdenv.mkDerivation {
-stdenv.mkDerivation {
   name = "min-copy-closure";
   buildInputs = [ ];
   propagatedBuildInputs = [ cpio openssh nix ];

pkgs/odhcp-script/default.nix

@@ -1,6 +1,6 @@
 {
-  writeFennelScript,
+  writeFennelScript
-  anoia,
+, anoia
-  lualinux,
+, lualinux
 }:
 writeFennelScript  "odhcpc-script" [anoia lualinux] ./odhcp6-script.fnl

pkgs/odhcp6c/default.nix

@@ -1,9 +1,7 @@
-{
+{ stdenv
-  stdenv,
+, cmake
-  cmake,
+, fetchFromGitHub
-  fetchFromGitHub,
+, ...} :
-  ...
-}:
 # let switchDotH = buildPackages.fetchurl {
 #   url = "https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob_plain;f=target/linux/generic/files/include/uapi/linux/switch.h;hb=99a188828713d6ff9c541590b08d4e63ef52f6d7";
 #   sha256 = "15kmhhcpd84y4f45rf8zai98c61jyvkc37p90pcxirna01x33wi8";

pkgs/openwrt/default.nix

@@ -1,4 +1,7 @@
-{ fetchFromGitHub, pkgsBuildBuild }:
+{
+  fetchFromGitHub
+, pkgsBuildBuild
+}:
 let
   src = fetchFromGitHub {
     name = "openwrt-source";

pkgs/ppp/default.nix

@@ -1,8 +1,8 @@
 {
-  fetchFromGitHub,
+  fetchFromGitHub
-  stdenv,
+, stdenv
-  autoreconfHook,
+, autoreconfHook
-  substituteAll,
+, substituteAll
 # , openssl
 }: stdenv.mkDerivation {
   pname  = "ppp";
@@ -35,4 +35,6 @@
     "man"
     "dev"
   ];
+
+
 }

pkgs/pppoe/default.nix

@@ -1,9 +1,7 @@
-{
+{ lib
-  lib,
+, stdenv
-  stdenv,
+, fetchFromGitHub
-  fetchFromGitHub,
+, ppp } :
-  ppp,
-}:
 stdenv.mkDerivation rec {
   pname = "rp-pppoe";
   version = "3.15";
@@ -22,9 +20,7 @@ stdenv.mkDerivation rec {
     export PPPD=${ppp}/sbin/pppd
   '';
 
-  configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+  configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ];
-    "rpppoe_cv_pack_bitfields=rev"
-  ];
 
   postConfigure = ''
     sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@'

pkgs/preinit/default.nix

@@ -1,4 +1,7 @@
-{ stdenv, gdb }:
+{
+  stdenv
+, gdb
+ }:
 stdenv.mkDerivation {
   name = "preinit";
   src = ./.;

pkgs/pseudofile/default.nix

@@ -1,4 +1,7 @@
-{ writeText, lib }:
+{
+  writeText
+, lib
+}:
 let
   inherit (lib.attrsets) mapAttrsToList;
   visit = prefix: attrset:

pkgs/routeros/default.nix

@@ -1,9 +1,9 @@
 {
-  stdenv,
+  stdenv
-  python3,
+, python3
-  qemu,
+, qemu
-  fetchzip,
+, fetchzip
-  writeShellApplication,
+, writeShellApplication
 }:
 let
   chr-image = fetchzip {

pkgs/run-liminix-vm/default.nix

@@ -1,14 +1,13 @@
 {
-  qemuLim,
+  qemuLim
-  socat,
+, socat
-  writeShellScript,
+, writeShellScript
-  writeFennel,
+, writeFennel
-  runCommand,
+, runCommand
-  lib,
+, lib
-  lua,
+, lua
-  pkgsBuildBuild,
+, pkgsBuildBuild
-}:
+}: let
-let
   run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" {
     packages = [ qemuLim lua.pkgs.luaposix lua.pkgs.fennel ];
   } ./run-liminix-vm.fnl;

pkgs/s6-init-bin/default.nix

@@ -1,10 +1,10 @@
 {
-  s6-linux-init,
+  s6-linux-init
-  execline,
+, execline
-  writeScript,
+, writeScript
-  stdenvNoCC,
+, stdenvNoCC
-  lib,
+, lib
-  s6-rc,
+, s6-rc
 }:
 let
   hpr = name: arg: writeScript name ''

pkgs/s6-rc-database/default.nix

@@ -2,11 +2,11 @@
 # config.services and calling s6-rc-compile on them
 
 {
-  stdenvNoCC,
+  stdenvNoCC
-  buildPackages,
+, buildPackages
-  closureInfo,
+, closureInfo
-  writeText,
+, writeText
-  services ? [ ],
+, services ? []
 }:
 let closure-info = closureInfo { rootPaths = services; };
 in stdenvNoCC.mkDerivation  {

pkgs/schnapps/default.nix

@@ -1,10 +1,10 @@
 {
-  stdenv,
+  stdenv
-  fetchFromGitLab,
+, fetchFromGitLab
-  makeWrapper,
+, makeWrapper
-  btrfs-progs,
+, btrfs-progs
-  util-linux-small,
+, util-linux-small
-  lib,
+, lib
 }:
 let search_path = lib.makeBinPath [btrfs-progs util-linux-small];
 in stdenv.mkDerivation {

pkgs/systemconfig/default.nix

@@ -5,12 +5,12 @@
 # they should contain
 
 {
-  writeText,
+  writeText
-  writeFennelScript,
+, writeFennelScript
-  lib,
+, lib
-  s6-init-bin,
+, s6-init-bin
-  closureInfo,
+, closureInfo
-  stdenv,
+, stdenv
 }:
 let
   inherit (lib.attrsets) mapAttrsToList;

pkgs/tufted/default.nix

@@ -1,7 +1,7 @@
 {
-  lua5_3,
+  lua5_3
-  stdenv,
+, stdenv
-  makeWrapper,
+, makeWrapper
 } :
 let
   lua = lua5_3.withPackages (ps: with ps; [

pkgs/uevent-watch/default.nix

@@ -1,17 +1,16 @@
-{
+{ nellie
-  nellie,
+, lualinux
-  lualinux,
+, writeFennel
-  writeFennel,
+, anoia
-  anoia,
+, fennel
-  fennel,
+, stdenv
-  stdenv,
+, fennelrepl
-  fennelrepl,
+, s6-rc-up-tree
-  s6-rc-up-tree,
 }:
 stdenv.mkDerivation {
   name = "uevent-watch";
   src = ./.;
-  nativeBuildInputs = [ fennelrepl ];
+  nativeBuildInputs = [ fennelrepl makeWrapper ];
   propagatedBuildInputs = [ s6-rc-up-tree ];
   installPhase = ''
     mkdir -p $out/bin

pkgs/usb-modeswitch/default.nix

@@ -1,10 +1,9 @@
 # usb modeswitch without udev, tcl, coreutils, bash dependencies
-{
+{ stdenv
-  stdenv,
+, lib
-  lib,
+, fetchurl
-  fetchurl,
+, pkg-config
-  pkg-config,
+, libusb1
-  libusb1,
 }:
 let
   pname = "usb-modeswitch";

pkgs/write-ash-script/default.nix

@@ -1,10 +1,8 @@
-{ writeScript, lib }:
-name:
 {
-  runtimeInputs ? [ ],
+  writeScript
-}:
+, lib
-text:
+}
-writeScript name ''
+: name : { runtimeInputs ? [] } : text : writeScript name ''
 #!/bin/sh
 set -o errexit
 set -o nounset

pkgs/write-fennel-script/default.nix

@@ -1,3 +1,5 @@
-{ writeFennel, stdenv }:
+{ writeFennel
+, stdenv
+}:
 name : packages : source :
 writeFennel name { inherit packages; } source

pkgs/write-fennel/default.nix

@@ -1,24 +1,24 @@
 {
-  lua,
+  lua
-  lib,
+, lib
-  fennel,
+, fennel
-  stdenv,
+, stdenv
 }:
 name :
 {
   packages ? [],
   correlate ? false,
-  mainFunction ? null,
+  mainFunction ? null
-}:
+} : source :
-source:
   let
-  luapath = builtins.map (
+    luapath = builtins.map
-    f: "${f}/share/lua/${lua.luaversion}/?.lua;" + "${f}/share/lua/${lua.luaversion}/?/init.lua;"
+      (f:
-  ) packages;
+        "${f}/share/lua/${lua.luaversion}/?.lua;" +
+        "${f}/share/lua/${lua.luaversion}/?/init.lua;")
+      packages;
     luacpath = builtins.map (f: "${f}/lib/lua/${lua.luaversion}/?.so;") packages;
     luaFlags = lib.optionalString (mainFunction !=null) "-e dofile(arg[0]).${mainFunction}()";
-in
+  in stdenv.mkDerivation {
-stdenv.mkDerivation {
     inherit name;
     src = ./.;
     nativeBuildInputs = [ fennel ];

pkgs/zyxel-bootconfig/default.nix

@@ -1,4 +1,7 @@
-{ stdenv, openwrt }:
+{
+  stdenv
+, openwrt
+}:
 stdenv.mkDerivation {
   name = "zyxel-bootconfig";
   inherit (openwrt) src;