cleanup whitespace and commas

* [] is now [ ]
* {} is now { }
* commas in arglists go at end of line not beginning

In short, I ran the whole thing through nixfmt-rfc-style but only
accepted about 30% of its changes. I might grow accustomed to more
of it over time

bordervm-configuration.nix

@@ -6,7 +6,7 @@ in {
   options.bordervm = {
     keys = mkOption {
       type = types.listOf types.str;
-      default = [];
+      default = [ ];
     };
     l2tp = {
       host = mkOption {
@@ -55,18 +55,17 @@ in {
     <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
   ];
   config = {
-    boot.kernelParams = [
+    boot.kernelParams = [ "loglevel=9" ];
-      "loglevel=9"
-    ];
     systemd.services.pppoe =
-      let conf = pkgs.writeText "kpppoed.toml"
+      let
-        ''
+        conf = pkgs.writeText "kpppoed.toml" ''
-      interface_name = "eth1"
+          interface_name = "eth1"
-      services = [ "myservice" ]
+          services = [ "myservice" ]
-      lns_ipaddr = "${cfg.l2tp.host}:${builtins.toString cfg.l2tp.port}"
+          lns_ipaddr = "${cfg.l2tp.host}:${builtins.toString cfg.l2tp.port}"
-      ac_name = "kpppoed-1.0"
+          ac_name = "kpppoed-1.0"
-    '';
+        '';
-      in  {
+      in
+      {
         wantedBy = [ "multi-user.target" ];
         after = [ "network-online.target" ];
         serviceConfig = {
@@ -83,7 +82,7 @@ in {
     services.dnsmasq = {
       enable = true;
       resolveLocalQueries = false;
-      settings =  {
+      settings = {
         # domain-needed = true;
         dhcp-range = [ "10.0.0.10,10.0.0.240" ];
         interface = "eth1";
@@ -92,17 +91,17 @@ in {
 
     systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
 
-
     virtualisation = {
       qemu = {
-        networkingOptions = [];
+        networkingOptions = [ ];
-        options = [] ++
+        options =
-          optional cfg.ethernet.pci.enable
+          [ ]
-            "-device vfio-pci,host=${cfg.ethernet.pci.id}" ++
+          ++ optional cfg.ethernet.pci.enable "-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"
           ];
@@ -136,13 +135,13 @@ in {
       nat = {
         enable = true;
         internalInterfaces = [ "eth1" ];
-        externalInterface ="eth0";
+        externalInterface = "eth0";
       };
     };
     users.users.liminix = {
       isNormalUser = true;
       uid = 1000;
-      extraGroups = [ "wheel"];
+      extraGroups = [ "wheel" ];
       openssh.authorizedKeys.keys = cfg.keys;
     };
     services.getty.autologinUser = "liminix";

bordervm.conf-example.nix

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

ci.nix

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

default.nix

@@ -1,24 +1,27 @@
 {
-  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 (device.system // {
+  pkgs = import nixpkgs (
-    overlays = [overlay];
+    device.system
-    config = {
+    // {
-      allowUnsupportedSystem = true; # mipsel
+      overlays = [ overlay ];
-      permittedInsecurePackages = [
+      config = {
-        "python-2.7.18.6"       # kernel backports needs python <3
+        allowUnsupportedSystem = true; # mipsel
-        "python-2.7.18.7"
+        permittedInsecurePackages = [
-      ];
+          "python-2.7.18.6" # kernel backports needs python <3
-    };
+          "python-2.7.18.7"
-  });
+        ];
+      };
+    }
+  );
 
   eval = pkgs.lib.evalModules {
     specialArgs = {

doc/extract-options.nix

@@ -2,9 +2,8 @@
 let
   conf = eval.config;
   rootDir = builtins.toPath ./..;
-  stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix)
+  stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) [ "${rootDir}/" ];
-    ["${rootDir}/"];
+  optToDoc = name: opt: {
-  optToDoc = name: opt : {
     inherit name;
     description = opt.description or null;
     default = opt.default or null;
@@ -25,7 +24,6 @@ let
           let x = lib.mapAttrsToList optToDoc sd.parameters; in x;
       }
     else
-      item // { declarations =  map stripAnyPrefixes item.declarations; };
+      item // { declarations = map stripAnyPrefixes item.declarations; };
 in
-builtins.map spliceServiceDefn
+builtins.map spliceServiceDefn (pkgs.lib.optionAttrSetToDocList eval.options)
-  (pkgs.lib.optionAttrSetToDocList eval.options)

doc/hardware.nix

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

examples/arhcive.nix

@@ -119,7 +119,7 @@ in rec {
         secrets_file
         services.mount_external_disk
         config.hardware.networkInterfaces.lan
-      ] ;
+      ];
     };
 
   users.root = {
@@ -128,18 +128,22 @@ in rec {
   };
 
   users.backup = {
-    uid=500; gid=500; gecos="Storage owner"; dir="/srv";
+    uid = 500;
-    shell="/dev/null";
+    gid = 500;
+    gecos = "Storage owner";
+    dir = "/srv";
+    shell = "/dev/null";
   };
   groups.backup = {
-    gid=500; usernames = ["backup"];
+    gid = 500;
+    usernames = [ "backup" ];
   };
 
   defaultProfile.packages = with pkgs; [
     e2fsprogs
     mtdutils
     (levitate.override {
-      config  = {
+      config = {
         services = {
           inherit (config.services) dhcpc sshd watchdog;
         };

examples/demo.nix

@@ -5,7 +5,7 @@
 # wherever the text "EDIT" appears - please consult the tutorial
 # documentation for details.
 
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 let
   inherit (pkgs.liminix.services) bundle oneshot;
   inherit (pkgs) serviceFns;
@@ -49,31 +49,40 @@ in rec {
       country_code = "GB";
       wpa_passphrase = "not a real wifi password";
 
-      hw_mode="g";
+      hw_mode = "g";
       ieee80211n = 1;
       auth_algs = 1; # 1=wpa2, 2=wep, 3=both
-      wpa = 2;       # 1=wpa, 2=wpa2, 3=both
+      wpa = 2; # 1=wpa, 2=wpa2, 3=both
       wpa_key_mgmt = "WPA-PSK";
-      wpa_pairwise = "TKIP CCMP";   # auth for wpa (may not need this?)
+      wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?)
-      rsn_pairwise = "CCMP";        # auth for wpa2
+      rsn_pairwise = "CCMP"; # auth for wpa2
       wmm_enabled = 1;
     };
   };
 
   services.int = svc.network.address.build {
     interface = svc.bridge.primary.build { ifname = "int"; };
-    family = "inet"; address = "${ipv4LocalNet}.1"; prefixLength = 16;
+    family = "inet";
+    address = "${ipv4LocalNet}.1";
+    prefixLength = 16;
   };
 
-  services.bridge =  svc.bridge.members.build {
+  services.bridge = svc.bridge.members.build {
     primary = services.int;
-    members = with config.hardware.networkInterfaces;
+    members = with config.hardware.networkInterfaces; [
-      [ wlan lan ];
+      wlan
+      lan
+    ];
   };
 
   services.ntp = svc.ntp.build {
-    pools = { "pool.ntp.org" = ["iburst"]; };
+    pools = {
-    makestep = { threshold = 1.0; limit = 3; };
+      "pool.ntp.org" = [ "iburst" ];
+    };
+    makestep = {
+      threshold = 1.0;
+      limit = 3;
+    };
   };
 
   services.sshd = svc.ssh.build { };
@@ -157,8 +166,7 @@ in rec {
     interface = services.wan;
   };
 
-  services.firewall = svc.firewall.build {
+  services.firewall = svc.firewall.build { };
-  };
 
   services.packet_forwarding = svc.network.forward.build { };
 
@@ -195,7 +203,5 @@ in rec {
       ];
     };
 
-  defaultProfile.packages = with pkgs; [
+  defaultProfile.packages = with pkgs; [ min-collect-garbage ];
-    min-collect-garbage
-  ];
 }

examples/recovery.nix

@@ -4,7 +4,7 @@ let
   svc = config.system.service;
   inherit (pkgs.pseudofile) dir symlink;
   inherit (pkgs.liminix.services) oneshot target;
-  some-util-linux = pkgs.runCommand "some-util-linux" {} ''
+  some-util-linux = pkgs.runCommand "some-util-linux" { } ''
     mkdir -p $out/bin
     cd ${pkgs.util-linux-small}/bin
     cp fdisk sfdisk mkswap $out/bin
@@ -53,7 +53,7 @@ in rec {
   services.defaultroute4 = svc.network.route.build {
     via = "$(output ${services.dhcpc} router)";
     target = "default";
-    dependencies = [services.dhcpc];
+    dependencies = [ services.dhcpc ];
   };
 
   services.resolvconf = oneshot rec {

examples/rotuer-secrets.example.nix

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

examples/rotuer.nix

@@ -10,10 +10,10 @@
 let
   secrets = {
     domainName = "fake.liminix.org";
-    firewallRules = {};
+    firewallRules = { };
   } // (import ./rotuer-secrets.nix);
   svc = config.system.service;
-  wirelessConfig =  {
+  wirelessConfig = {
     country_code = "GB";
     inherit (secrets) wpa_passphrase;
     wmm_enabled = 1;
@@ -70,13 +70,13 @@ in rec {
     wireless.networks = {
       "${secrets.ssid}" = {
         interface = config.hardware.networkInterfaces.wlan;
-        hw_mode="g";
+        hw_mode = "g";
         channel = "2";
         ieee80211n = 1;
       } // wirelessConfig;
       "${secrets.ssid}5" = rec {
         interface = config.hardware.networkInterfaces.wlan5;
-        hw_mode="a";
+        hw_mode = "a";
         channel = 36;
         ht_capab = "[HT40+]";
         vht_oper_chwidth = 1;

modules/base.nix

@@ -4,7 +4,7 @@
 
 { lib, pkgs, config, ...}:
 let
-  inherit (lib) mkOption types ;
+  inherit (lib) mkOption types;
   inherit (pkgs.pseudofile) dir symlink;
 
   type_service = pkgs.liminix.lib.types.service;
@@ -36,7 +36,7 @@ in {
       '';
       # internal = true;  # probably a good case to make this internal
     };
-    rootfsType =  mkOption {
+    rootfsType = mkOption {
       default = "squashfs";
       type = types.enum [
         "btrfs"
@@ -46,7 +46,7 @@ in {
         "ubifs"
       ];
     };
-    rootOptions =  mkOption {
+    rootOptions = mkOption {
       type = types.nullOr types.str;
       default = null;
     };
@@ -54,20 +54,29 @@ in {
     boot = {
       commandLine = mkOption {
         type = types.listOf types.nonEmptyStr;
-        default = [];
+        default = [ ];
         description = "Kernel command line";
       };
       commandLineDtbNode = mkOption {
-        type = types.enum [ "bootargs" "bootargs-override" ];
+        type = types.enum [
+          "bootargs"
+          "bootargs-override"
+        ];
         default = "bootargs";
         description = "Kernel command line's devicetree node";
       };
       imageType = mkOption {
-        type = types.enum [ "primary" "secondary" ];
+        type = types.enum [
+          "primary"
+          "secondary"
+        ];
         default = "primary";
       };
       imageFormat = mkOption {
-        type = types.enum ["fit" "uimage"];
+        type = types.enum [
+          "fit"
+          "uimage"
+        ];
         default = "uimage";
       };
       tftp = {
@@ -83,7 +92,7 @@ in {
         };
         # These names match the uboot environment variables. I reserve
         # the right to change them if I think of better ones.
-        ipaddr =  mkOption {
+        ipaddr = mkOption {
           type = types.str;
           description = ''
             Our IP address to use when creating scripts to

modules/busybox.nix

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

modules/hardware.nix

@@ -5,14 +5,13 @@
 ## you want to run on it, and would usually be set in the "device" file:
 ## :file:`devices/manuf-model/default.nix`
 
-
+{ lib, ... }:
-{ lib, ...}:
 let
-  inherit (lib) mkOption types ;
+  inherit (lib) mkOption types;
-in {
+in
+{
   options = {
-    boot = {
+    boot = { };
-    };
     hardware = {
       dts = {
         src = mkOption {
@@ -26,7 +25,7 @@ in {
           '';
         };
         includes = mkOption {
-          default = [];
+          default = [ ];
           description = "List of directories to search for DTS includes (.dtsi files)";
           type = types.listOf types.path;
         };

modules/mdevd.nix

@@ -14,13 +14,16 @@ in {
         run = "exec ${pkgs.devout}/bin/devout /run/devout.sock 4";
       };
       coldplug = oneshot {
-        name ="coldplug";
+        name = "coldplug";
         # would love to know what mdevd-coldplug/udevadm trigger does
         # that this doesn't
         up = ''
           for i in $(find /sys -name uevent); do ( echo change > $i ) ; done
         '';
-        dependencies = [devout mdevd];
+        dependencies = [
+          devout
+          mdevd
+        ];
       };
     };
   };

modules/outputs.nix

@@ -1,8 +1,8 @@
 {
-  config
+  config,
-, pkgs
+  pkgs,
-, lib
+  lib,
-, ...
+  ...
 }:
 let
   inherit (lib) mkOption types concatStringsSep;
@@ -22,7 +22,7 @@ in
       # but only part of one.
       kernel = mkOption {
         type = types.package;
-        internal  = true;
+        internal = true;
         description = ''
           kernel
           ******
@@ -42,7 +42,7 @@ in
       };
       dtb = mkOption {
         type = types.package;
-        internal  = true;
+        internal = true;
         description = ''
           dtb
           ***
@@ -52,7 +52,7 @@ in
       };
       uimage = mkOption {
         type = types.package;
-        internal  = true;
+        internal = true;
         description = ''
           uimage
           ******
@@ -68,7 +68,7 @@ in
       };
       manifest = mkOption {
         type = types.package;
-        internal  = true;
+        internal = true;
         description = ''
           Debugging aid. JSON rendition of config.filesystem, on
           which can run "nix-store -q --tree" on it and find

modules/ramdisk.nix

@@ -1,8 +1,4 @@
-{
+{ 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,8 +24,6 @@
       EXT4_FS = "y";
       EXT4_USE_FOR_EXT2 = "y";
       FS_ENCRYPTION = "y";
-
-
     };
   };
 }

modules/users.nix

@@ -17,10 +17,16 @@ let
     concatStrings concatStringsSep mapAttrsToList mkOption types;
   inherit (builtins) toString;
   inherit (pkgs.pseudofile) dir;
-  passwd-file  =
+  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" )
+    let
-      config.users;
+      lines = mapAttrsToList (
-    in concatStrings lines;
+        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;
+    in
+    concatStrings lines;
   group-file =
     let lines = mapAttrsToList
       (name: {gid, usernames ? []}:

modules/wlan.nix

@@ -4,7 +4,7 @@ let
   inherit (pkgs) stdenv wireless-regdb;
   regulatory = stdenv.mkDerivation {
     name = "regulatory.db";
-    phases = ["installPhase"];
+    phases = [ "installPhase" ];
     installPhase = ''
       mkdir -p $out
       cp ${wireless-regdb}/lib/firmware/regulatory.db $out/

overlay.nix

@@ -46,7 +46,7 @@ in
 extraPkgs // {
   # liminix library functions
   lim = {
-    parseInt = s : (builtins.fromTOML "r=${s}").r;
+    parseInt = s: (builtins.fromTOML "r=${s}").r;
   };
 
   # keep these alphabetical
@@ -74,7 +74,6 @@ extraPkgs // {
       # should texinfo be in nativeBuildInputs instead of
       # buildInputs?
       texinfo = null;
-
     };
 
   # luarocks wants a cross-compiled cmake (which seems like a bug,
@@ -186,9 +185,12 @@ extraPkgs // {
     # done. Do it the ugly way..
     postPatch =
       o.postPatch
-      + (with final;
+      + (
-        lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
+        with final;
-          "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n");
+        lib.optionalString (
+          stdenv.buildPlatform != stdenv.hostPlatform
+        ) "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n"
+      );
   });
 
   pppBuild = prev.ppp;
@@ -200,13 +202,12 @@ extraPkgs // {
   }); in q.override { nixosTestRunner = true; sdlSupport = false; };
 
   rsyncSmall =
-    let r = prev.rsync.overrideAttrs(o: {
+    let
-          configureFlags = o.configureFlags ++ [
+      r = prev.rsync.overrideAttrs (o: {
-            "--disable-openssl"
+        configureFlags = o.configureFlags ++ [ "--disable-openssl" ];
-          ];
+      });
-        });
+    in
-    in r.override { openssl = null; };
+    r.override { openssl = null; };
-
 
   inherit s6;
   s6-linux-init = prev.s6-linux-init.override {
@@ -224,14 +225,14 @@ extraPkgs // {
 
   ubootQemuAarch64 = final.buildUBoot {
     defconfig = "qemu_arm64_defconfig";
-    extraMeta.platforms = ["aarch64-linux"];
+    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = ["u-boot.bin"];
+    filesToInstall = [ "u-boot.bin" ];
   };
 
   ubootQemuArm = final.buildUBoot {
     defconfig = "qemu_arm_defconfig";
-    extraMeta.platforms = ["armv7l-linux"];
+    extraMeta.platforms = [ "armv7l-linux" ];
-    filesToInstall = ["u-boot.bin"];
+    filesToInstall = [ "u-boot.bin" ];
     extraConfig = ''
       CONFIG_CMD_UBI=y
       CONFIG_CMD_UBIFS=y
@@ -245,8 +246,8 @@ extraPkgs // {
 
   ubootQemuMips = final.buildUBoot {
     defconfig = "malta_defconfig";
-    extraMeta.platforms = ["mips-linux"];
+    extraMeta.platforms = [ "mips-linux" ];
-    filesToInstall = ["u-boot.bin"];
+    filesToInstall = [ "u-boot.bin" ];
     # define the prompt to be the same as arm{32,64} so
     # we can use the same expect script for both
     extraPatches = [ ./pkgs/u-boot/0002-virtio-init-for-malta.patch ];
@@ -268,7 +269,7 @@ extraPkgs // {
       CONFIG_MIPS_BOOT_FDT=y
       CONFIG_OF_LIBFDT=y
       CONFIG_OF_STDOUT_VIA_ALIAS=y
-   '';
+    '';
   };
 
   libusb1 = prev.libusb1.override {
@@ -283,5 +284,4 @@ 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,7 +1,4 @@
-{
+{ callPackage, lib }:
-  callPackage
-, lib
-}:
 let
   typeChecked = caller: type: value:
     let
@@ -11,11 +8,11 @@ let
     in (mergeDefinitions [] type' defs).mergedValue;
 in {
   liminix = {
-    builders =  {
+    builders = {
-      squashfs = callPackage ./liminix-tools/builders/squashfs.nix {};
+      squashfs = callPackage ./liminix-tools/builders/squashfs.nix { };
-      dtb = callPackage ./kernel/dtb.nix {};
+      dtb = callPackage ./kernel/dtb.nix { };
-      uimage = callPackage ./kernel/uimage.nix {};
+      uimage = callPackage ./kernel/uimage.nix { };
-      kernel = callPackage ./kernel {};
+      kernel = callPackage ./kernel { };
     };
     callService = path : parameters :
       let pkg = callPackage path {};
@@ -49,71 +46,71 @@ in {
         };
       inherit typeChecked;
     };
-    networking =  callPackage ./liminix-tools/networking {};
+    networking = callPackage ./liminix-tools/networking { };
-    services = callPackage ./liminix-tools/services {};
+    services = callPackage ./liminix-tools/services { };
   };
 
   # please keep the rest of this list alphabetised :-)
 
-  anoia = callPackage ./anoia {};
+  anoia = callPackage ./anoia { };
-  devout = callPackage ./devout {};
+  devout = callPackage ./devout { };
-  fennel = callPackage ./fennel {};
+  fennel = callPackage ./fennel { };
-  fennelrepl = callPackage ./fennelrepl {};
+  fennelrepl = callPackage ./fennelrepl { };
-  firewallgen = callPackage ./firewallgen {};
+  firewallgen = callPackage ./firewallgen { };
-  firmware-utils = callPackage ./firmware-utils {};
+  firmware-utils = callPackage ./firmware-utils { };
-  gen_init_cpio = callPackage ./gen_init_cpio {};
+  gen_init_cpio = callPackage ./gen_init_cpio { };
-  go-l2tp = callPackage ./go-l2tp {};
+  go-l2tp = callPackage ./go-l2tp { };
-  hi = callPackage ./hi {};
+  hi = callPackage ./hi { };
-  ifwait = callPackage ./ifwait {};
+  ifwait = callPackage ./ifwait { };
-  initramfs-peek = callPackage ./initramfs-peek {};
+  initramfs-peek = callPackage ./initramfs-peek { };
-  kernel-backport = callPackage ./kernel-backport {};
+  kernel-backport = callPackage ./kernel-backport { };
-  kmodloader = callPackage ./kmodloader {};
+  kmodloader = callPackage ./kmodloader { };
-  levitate = callPackage ./levitate {};
+  levitate = callPackage ./levitate { };
-  libubootenv = callPackage ./libubootenv {};
+  libubootenv = callPackage ./libubootenv { };
-  linotify = callPackage ./linotify {};
+  linotify = callPackage ./linotify { };
-  lualinux = callPackage ./lualinux {};
+  lualinux = callPackage ./lualinux { };
 
   # we need to build real lzma instead of using xz, because the lzma
   # decoder in u-boot doesn't understand streaming lzma archives
   # ("Stream with EOS marker is not supported") and xz can't create
   # non-streaming ones.  See
   # https://sourceforge.net/p/squashfs/mailman/message/26599379/
-  lzma = callPackage ./lzma {};
+  lzma = callPackage ./lzma { };
 
-  mac80211 = callPackage ./mac80211 {};
+  mac80211 = callPackage ./mac80211 { };
-  zyxel-bootconfig = callPackage ./zyxel-bootconfig {};
+  zyxel-bootconfig = callPackage ./zyxel-bootconfig { };
-  min-collect-garbage = callPackage ./min-collect-garbage {};
+  min-collect-garbage = callPackage ./min-collect-garbage { };
-  min-copy-closure = callPackage ./min-copy-closure {};
+  min-copy-closure = callPackage ./min-copy-closure { };
-  minisock = callPackage ./minisock {};
+  minisock = callPackage ./minisock { };
-  nellie = callPackage ./nellie {};
+  nellie = callPackage ./nellie { };
-  netlink-lua = callPackage ./netlink-lua {};
+  netlink-lua = callPackage ./netlink-lua { };
-  odhcp-script = callPackage ./odhcp-script {};
+  odhcp-script = callPackage ./odhcp-script { };
-  odhcp6c = callPackage ./odhcp6c {};
+  odhcp6c = callPackage ./odhcp6c { };
-  openwrt = callPackage ./openwrt {};
+  openwrt = callPackage ./openwrt { };
-  ppp = callPackage ./ppp {};
+  ppp = callPackage ./ppp { };
-  pppoe = callPackage ./pppoe {};
+  pppoe = callPackage ./pppoe { };
-  preinit = callPackage ./preinit {};
+  preinit = callPackage ./preinit { };
-  pseudofile = callPackage ./pseudofile {};
+  pseudofile = callPackage ./pseudofile { };
-  routeros = callPackage ./routeros {};
+  routeros = callPackage ./routeros { };
-  run-liminix-vm = callPackage ./run-liminix-vm {};
+  run-liminix-vm = callPackage ./run-liminix-vm { };
-  s6-init-bin =  callPackage ./s6-init-bin {};
+  s6-init-bin = callPackage ./s6-init-bin { };
-  s6-rc-database = callPackage ./s6-rc-database {};
+  s6-rc-database = callPackage ./s6-rc-database { };
-  s6-rc-up-tree = callPackage ./s6-rc-up-tree {};
+  s6-rc-up-tree = callPackage ./s6-rc-up-tree { };
 
   # schnapps is written by Turris and provides a high-level interface
   # to btrfs snapshots. It may be useful on the Turris Omnia to
   # install Liminix while retaining the ability to rollback to the
   # vendor OS, or even to derisk Liminix updates on that device
-  schnapps = callPackage ./schnapps {};
+  schnapps = callPackage ./schnapps { };
 
-  serviceFns = callPackage ./service-fns {};
+  serviceFns = callPackage ./service-fns { };
-  swconfig = callPackage ./swconfig {};
+  swconfig = callPackage ./swconfig { };
-  systemconfig = callPackage ./systemconfig {};
+  systemconfig = callPackage ./systemconfig { };
-  tufted = callPackage ./tufted {};
+  tufted = callPackage ./tufted { };
-  uevent-watch = callPackage ./uevent-watch {};
+  uevent-watch = callPackage ./uevent-watch { };
-  usb-modeswitch = callPackage ./usb-modeswitch {};
+  usb-modeswitch = callPackage ./usb-modeswitch { };
-  writeAshScript = callPackage ./write-ash-script {};
+  writeAshScript = callPackage ./write-ash-script { };
-  writeAshScriptBin = callPackage ./write-ash-script/bin.nix {};
+  writeAshScriptBin = callPackage ./write-ash-script/bin.nix { };
-  writeFennel = callPackage ./write-fennel {};
+  writeFennel = callPackage ./write-fennel { };
-  writeFennelScript = callPackage ./write-fennel-script {};
+  writeFennelScript = callPackage ./write-fennel-script { };
 }

pkgs/devout/default.nix

@@ -1,10 +1,11 @@
-{ nellie
+{
-, writeFennel
+  nellie,
-, anoia
+  writeFennel,
-, fennel
+  anoia,
-, stdenv
+  fennel,
-, fennelrepl
+  stdenv,
-, lualinux
+  fennelrepl,
+  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 {
@@ -12,7 +12,7 @@ buildGoModule rec {
     repo = "go-l2tp";
     owner = "katalix";
     rev = "570d763";
-    hash= "sha256-R8ImKPkPBC+FvzKOBEZ3VxQ12dEjtfRa7AH94xMsAGA=";
+    hash = "sha256-R8ImKPkPBC+FvzKOBEZ3VxQ12dEjtfRa7AH94xMsAGA=";
   };
 
   patchPhase = ''
@@ -23,5 +23,4 @@ buildGoModule rec {
 
   doCheck = false;
   vendorHash = "sha256-hOkhJhToN/VJwjQmnQJSPGz26/YDR2Ch+1yeW51OF+U=";
-
 }

pkgs/ifwait/default.nix

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

pkgs/initramfs-peek/default.nix

@@ -1,14 +1,14 @@
 {
-  busybox
+  busybox,
-, pkgsBuildBuild
+  pkgsBuildBuild,
-, runCommand
+  runCommand,
-, cpio
+  cpio,
-, writeReferencesToFile
+  writeReferencesToFile,
-, writeScript
+  writeScript,
-} :
+}:
 let
   inherit (pkgsBuildBuild) gen_init_cpio;
-  script =  writeScript "init" ''
+  script = writeScript "init" ''
     #!/bin/sh
     exec >/dev/console
     echo Running in initramfs

pkgs/kernel-backport/default.nix

@@ -1,17 +1,18 @@
-{ stdenv
+{
-, git
+  stdenv,
-, python2
+  git,
-, which
+  python2,
-, fetchgit
+  which,
-, fetchFromGitHub
+  fetchgit,
-, coccinelle
+  fetchFromGitHub,
+  coccinelle,
 }:
 let
   donorTree = fetchFromGitHub {
     owner = "torvalds";
     repo = "linux";
-    rev = 	"e2c1a934fd8e4288e7a32f4088ceaccf469eb74c"; # 5.15.94
+    rev = "e2c1a934fd8e4288e7a32f4088ceaccf469eb74c"; # 5.15.94
-    hash= "sha256-Jg3EgL86CseuzYMAlUG3CDWPCo8glMSIZs10l7EuhWI=";
+    hash = "sha256-Jg3EgL86CseuzYMAlUG3CDWPCo8glMSIZs10l7EuhWI=";
   };
   backports = stdenv.mkDerivation {
     name = "linux-backports";

pkgs/kernel/default.nix

@@ -1,29 +1,38 @@
-{  stdenv
+{
- , buildPackages
+  stdenv,
- , writeText
+  buildPackages,
- , lib
+  writeText,
+  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;
+  targetNames = map baseNameOf targets;
-  inherit lib; in
+  inherit lib;
+in
 stdenv.mkDerivation rec {
   name = "kernel";
   inherit src extraPatchPhase;
-  hardeningDisable = ["all"];
+  hardeningDisable = [ "all" ];
-  nativeBuildInputs = [buildPackages.stdenv.cc] ++
+  nativeBuildInputs =
-                      (with buildPackages.pkgs; [
+    [ buildPackages.stdenv.cc ]
-                        rsync bc bison flex pkg-config
+    ++ (with buildPackages.pkgs; [
-                        openssl ncurses.all perl
+      rsync
-                      ]);
+      bc
+      bison
+      flex
+      pkg-config
+      openssl
+      ncurses.all
+      perl
+    ]);
   CC = "${stdenv.cc.bintools.targetPrefix}gcc";
   HOSTCC = with buildPackages.pkgs;
     "gcc -I${openssl}/include -I${ncurses}/include";

pkgs/kmodloader/default.nix

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

pkgs/levitate/default.nix

@@ -1,14 +1,14 @@
 {
-  writeScriptBin
+  writeScriptBin,
-, writeScript
+  writeScript,
-, systemconfig
+  systemconfig,
-, execline
+  execline,
-, lib
+  lib,
-, config ? {}
+  config ? { },
-, liminix
+  liminix,
-, pseudofile
+  pseudofile,
-, pkgs
+  pkgs,
-} :
+}:
 let
   inherit (pseudofile) dir symlink;
   inherit (liminix.services) oneshot;
@@ -16,7 +16,7 @@ let
   newRoot = "/run/maintenance";
   sysconfig =
     let
-      doChroot =  writeScript "exec" ''
+      doChroot = writeScript "exec" ''
         #!${execline}/bin/execlineb -P
         cd ${newRoot}
         foreground { mount --move ${newRoot} / }

pkgs/libubootenv/default.nix

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

pkgs/linotify/default.nix

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

pkgs/lualinux/default.nix

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

pkgs/lzma/default.nix

@@ -1,7 +1,4 @@
-{
+{ 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,9 +1,10 @@
 {
-  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,7 +1,9 @@
-{ stdenv
+{
-, cmake
+  stdenv,
-, fetchFromGitHub
+  cmake,
-, ...} :
+  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,7 +1,4 @@
-{
+{ fetchFromGitHub, pkgsBuildBuild }:
-  fetchFromGitHub
-, pkgsBuildBuild
-}:
 let
   src = fetchFromGitHub {
     name = "openwrt-source";
@@ -10,7 +7,7 @@ let
     rev = "refs/tags/v23.05.2";
     hash = "sha256-kP+cSOB6LiOMWs7g+ji7P7ehiDYDwRdmT4R5jSzw6K4=";
   };
-  doPatch = family : ''
+  doPatch = family: ''
     cp -av ${src}/target/linux/generic/files/* .
     chmod -R u+w .
     cp -av ${src}/target/linux/${family}/files/* .

pkgs/ppp/default.nix

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

pkgs/pppoe/default.nix

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

pkgs/preinit/default.nix

@@ -1,12 +1,9 @@
-{
+{ stdenv, gdb }:
-  stdenv
-, gdb
- }:
 stdenv.mkDerivation {
   name = "preinit";
   src = ./.;
 
-#  NIX_DEBUG=2;
+  #  NIX_DEBUG=2;
   hardeningDisable = [ "all" ];
 
   postBuild = ''
@@ -14,8 +11,8 @@ stdenv.mkDerivation {
     ls -l preinit
   '';
 
-  makeFlags = ["preinit"];
+  makeFlags = [ "preinit" ];
-  stripAllList = ["bin"];
+  stripAllList = [ "bin" ];
   installPhase = ''
     mkdir -p $out/bin
     cp preinit $out/bin

pkgs/pseudofile/default.nix

@@ -1,7 +1,4 @@
-{
+{ 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 {
@@ -14,7 +14,7 @@ let
   ros-exec-script = stdenv.mkDerivation {
     name = "ros-exec-script";
     src = ./.;
-    buildInputs = [python3];
+    buildInputs = [ python3 ];
     buildPhase = ":";
     installPhase = ''
       mkdir -p $out/bin

pkgs/run-liminix-vm/default.nix

@@ -1,18 +1,19 @@
 {
-  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;
   connect = writeShellScript "connect-vm" ''
-    export PATH="${lib.makeBinPath [socat]}:$PATH"
+    export PATH="${lib.makeBinPath [ socat ]}:$PATH"
     socat -,raw,echo=0,icanon=0,isig=0,icrnl=0,escape=0x0f unix-connect:$1
   '';
 in runCommand "vm" {} ''

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,17 +1,17 @@
 {
-  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 {
   pname = "schnapps";
   version = "2.13.0";
 
-  src =fetchFromGitLab {
+  src = fetchFromGitLab {
     domain = "gitlab.nic.cz";
     owner = "turris";
     repo = "schnapps";

pkgs/service-fns/default.nix

@@ -1,4 +1,4 @@
-{writeText}:
+{ writeText }:
 writeText "service-fns.sh" ''
   output() { cat $1/.outputs/$2; }
   output_word() {

pkgs/swconfig/default.nix

@@ -14,8 +14,8 @@ in stdenv.mkDerivation {
   name = "swconfig";
   buildInputs = [ buildPackages.pkg-config ];
   nativeBuildInputs = [ libnl ];
-  CFLAGS="-O2 -Ifrom_kernel -I${libnl.dev}/include/libnl3";
+  CFLAGS = "-O2 -Ifrom_kernel -I${libnl.dev}/include/libnl3";
-  LDFLAGS="-L${libnl.out}/lib";
+  LDFLAGS = "-L${libnl.out}/lib";
 
   patchPhase = ''
     mkdir -p from_kernel/linux

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,8 +1,8 @@
 {
-  lua5_3
+  lua5_3,
-, stdenv
+  stdenv,
-, makeWrapper
+  makeWrapper,
-} :
+}:
 let
   lua = lua5_3.withPackages (ps: with ps; [
     luasocket luaposix fennel

pkgs/uevent-watch/default.nix

@@ -1,11 +1,12 @@
-{ nellie
+{
-, lualinux
+  nellie,
-, writeFennel
+  lualinux,
-, anoia
+  writeFennel,
-, fennel
+  anoia,
-, stdenv
+  fennel,
-, fennelrepl
+  stdenv,
-, s6-rc-up-tree
+  fennelrepl,
+  s6-rc-up-tree,
 }:
 stdenv.mkDerivation {
   name = "uevent-watch";

pkgs/usb-modeswitch/default.nix

@@ -1,9 +1,10 @@
 # usb modeswitch without udev, tcl, coreutils, bash dependencies
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchurl
+  lib,
-, pkg-config
+  fetchurl,
-, libusb1
+  pkg-config,
+  libusb1,
 }:
 let
   pname = "usb-modeswitch";
@@ -12,7 +13,7 @@ in stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
-    url    = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
+    url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
     sha256 = "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2";
   };
 
@@ -34,6 +35,6 @@ in stdenv.mkDerivation {
 
   meta = {
     license = lib.licenses.gpl2;
-    maintainers = [];
+    maintainers = [ ];
   };
 }

pkgs/write-ash-script/default.nix

@@ -1,13 +1,15 @@
+{ writeScript, lib }:
+name:
 {
-  writeScript
+  runtimeInputs ? [ ],
-, lib
+}:
-}
+text:
-: name : { runtimeInputs ? [] } : text : writeScript name ''
+writeScript name ''
-#!/bin/sh
+  #!/bin/sh
-set -o errexit
+  set -o errexit
-set -o nounset
+  set -o nounset
-set -o pipefail
+  set -o pipefail
 
-export PATH="${lib.makeBinPath runtimeInputs}:$PATH"
+  export PATH="${lib.makeBinPath runtimeInputs}:$PATH"
-${text}
+  ${text}
 ''

pkgs/write-fennel-script/default.nix

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

pkgs/write-fennel/default.nix

@@ -1,38 +1,38 @@
 {
-  lua
+  lua,
-, lib
+  lib,
-, fennel
+  fennel,
-, stdenv
+  stdenv,
 }:
-name :
+name:
 {
-  packages ? [],
+  packages ? [ ],
   correlate ? false,
-  mainFunction ? null
+  mainFunction ? null,
-} : source :
+}:
-  let
+source:
-    luapath = builtins.map
+let
-      (f:
+  luapath = builtins.map (
-        "${f}/share/lua/${lua.luaversion}/?.lua;" +
+    f: "${f}/share/lua/${lua.luaversion}/?.lua;" + "${f}/share/lua/${lua.luaversion}/?/init.lua;"
-        "${f}/share/lua/${lua.luaversion}/?/init.lua;")
+  ) packages;
-      packages;
+  luacpath = builtins.map (f: "${f}/lib/lua/${lua.luaversion}/?.so;") packages;
-    luacpath = builtins.map (f: "${f}/lib/lua/${lua.luaversion}/?.so;") packages;
+  luaFlags = lib.optionalString (mainFunction != null) "-e dofile(arg[0]).${mainFunction}()";
-    luaFlags = lib.optionalString (mainFunction !=null) "-e dofile(arg[0]).${mainFunction}()";
+in
-  in stdenv.mkDerivation {
+stdenv.mkDerivation {
-    inherit name;
+  inherit name;
-    src = ./.;
+  src = ./.;
-    nativeBuildInputs = [ fennel ];
+  nativeBuildInputs = [ fennel ];
-    buildPhase = ''
+  buildPhase = ''
-      (
+    (
-       echo "#!${lua}/bin/lua ${luaFlags}"
+     echo "#!${lua}/bin/lua ${luaFlags}"
-       echo "package.path = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luapath)} .. package.path"
+     echo "package.path = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luapath)} .. package.path"
-       echo "package.cpath = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luacpath)} .. package.cpath"
+     echo "package.cpath = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luacpath)} .. package.cpath"
-       echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
+     echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
-       fennel ${if correlate then "--correlate" else ""} --compile ${source}
+     fennel ${if correlate then "--correlate" else ""} --compile ${source}
-      ) >  ${name}.lua
+    ) >  ${name}.lua
-    '';
+  '';
-    installPhase = ''
+  installPhase = ''
-      cp ${name}.lua $out
+    cp ${name}.lua $out
-      chmod +x $out
+    chmod +x $out
-    '';
+  '';
-  }
+}

pkgs/zyxel-bootconfig/default.nix

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

tests/ci.nix

@@ -5,7 +5,7 @@
   pppoe = import ./pppoe/test.nix;
   jffs2 = import ./jffs2/test.nix;
   ext4 = import ./ext4/test.nix;
-  min-copy-closure =  import ./min-copy-closure/test.nix;
+  min-copy-closure = import ./min-copy-closure/test.nix;
   fennel = import ./fennel/test.nix;
   tftpboot = import ./tftpboot/test.nix;
   updown = import ./updown/test.nix;

vanilla-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 let
   inherit (pkgs.liminix.services) target;
   svc = config.system.service;
@@ -31,5 +31,5 @@ in rec {
     ipaddr = "192.168.8.251";
   };
 
-  defaultProfile.packages = [ pkgs.hello ] ;
+  defaultProfile.packages = [ pkgs.hello ];
 }