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

@@ -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"
           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 = {
@@ -92,17 +91,17 @@ in {
 
     systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
 
-
     virtualisation = {
       qemu = {
         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"
           ];

bordervm.conf-example.nix

@@ -2,7 +2,11 @@
 {
   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,8 +1,9 @@
 {
-  nixpkgs
+  nixpkgs,
-, unstable
+  unstable,
-, liminix
+  liminix,
-, ... }:
+  ...
+}:
 let
   pkgs = (import nixpkgs { });
   borderVmConf = ./bordervm.conf-example.nix;
@@ -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 =
+        (import liminix {
           inherit nixpkgs borderVmConf;
           device = import (liminix + "/devices/qemu");
           liminix-config = vanilla;
         }).buildEnv;
       doc =
-        let json =
+        let
+          json =
             (import liminix {
               inherit nixpkgs borderVmConf;
               device = import (liminix + "/devices/qemu");
-                liminix-config = {...} : {
+              liminix-config =
+                { ... }:
+                {
                   imports = [ ./modules/all-modules.nix ];
                 };
             }).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,15 +1,17 @@
 {
-  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 (
+    device.system
+    // {
       overlays = [ overlay ];
       config = {
         allowUnsupportedSystem = true; # mipsel
@@ -18,7 +20,8 @@ let
           "python-2.7.18.7"
         ];
       };
-  });
+    }
+  );
 
   eval = pkgs.lib.evalModules {
     specialArgs = {

doc/extract-options.nix

@@ -2,8 +2,7 @@
 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: {
     inherit name;
     description = opt.description or null;
@@ -27,5 +26,4 @@ let
     else
       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

@@ -2,15 +2,17 @@ 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 = import ../devices/${n}/default.nix;
       d' = {
         description = "${n}\n${substring 0 (stringLength n) "********************************"}\n";
       } // d;
-    in d'.description)
+    in
-    devices;
+    d'.description
+  ) devices;
 in
 writeText "hwdoc" ''
   Supported hardware

examples/arhcive.nix

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

examples/demo.nix

@@ -62,18 +62,27 @@ in rec {
 
   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 {
     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/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";
   };
-
 }

modules/base.nix

@@ -58,16 +58,25 @@ in {
         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 = {

modules/busybox.nix

@@ -85,10 +85,13 @@ in {
       };
     };
     filesystem = dir {
-      bin = dir ({
+      bin = dir (
+        {
           busybox = symlink "${busybox}/bin/busybox";
           sh = symlink "${busybox}/bin/busybox";
-      } // makeLinks);
+        }
+        // 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, ... }:
 let
   inherit (lib) mkOption types;
-in {
+in
+{
   options = {
-    boot = {
+    boot = { };
-    };
     hardware = {
       dts = {
         src = mkOption {

modules/mdevd.nix

@@ -20,7 +20,10 @@ in {
         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;

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

@@ -18,9 +18,15 @@ let
   inherit (builtins) toString;
   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" )
+    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 ? []}:

overlay.nix

@@ -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 r.override { openssl = null; };
+    in
-
+    r.override { openssl = null; };
 
   inherit s6;
   s6-linux-init = prev.s6-linux-init.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

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 {
@@ -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" { } ''
   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,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,10 +1,11 @@
-{ stdenv
+{
-, git
+  stdenv,
-, python2
+  git,
-, which
+  python2,
-, fetchgit
+  which,
-, fetchFromGitHub
+  fetchgit,
-, coccinelle
+  fetchFromGitHub,
+  coccinelle,
 }:
 let
   donorTree = fetchFromGitHub {

pkgs/kernel/default.nix

@@ -1,28 +1,37 @@
-{  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;
-  inherit lib; in
+  inherit lib;
+in
 stdenv.mkDerivation rec {
   name = "kernel";
   inherit src extraPatchPhase;
   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;

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,8 +1,9 @@
-{ stdenv
+{
-, cmake
+  stdenv,
-, zlib
+  cmake,
-, libyaml
+  zlib,
-, fetchFromGitHub
+  libyaml,
+  fetchFromGitHub,
 }:
 stdenv.mkDerivation {
   name = "libubootenv";

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

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,7 +1,4 @@
-{
+{ stdenv, gdb }:
-  stdenv
-, gdb
- }:
 stdenv.mkDerivation {
   name = "preinit";
   src = ./.;

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 {

pkgs/run-liminix-vm/default.nix

@@ -1,13 +1,14 @@
 {
-  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,16 +1,17 @@
-{ 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";
   src = ./.;
-  nativeBuildInputs = [ fennelrepl makeWrapper ];
+  nativeBuildInputs = [ fennelrepl ];
   propagatedBuildInputs = [ s6-rc-up-tree ];
   installPhase = ''
     mkdir -p $out/bin

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

pkgs/write-ash-script/default.nix

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

pkgs/write-fennel-script/default.nix

@@ -1,5 +1,3 @@
-{ writeFennel
+{ writeFennel, stdenv }:
-, 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: "${f}/share/lua/${lua.luaversion}/?.lua;" + "${f}/share/lua/${lua.luaversion}/?/init.lua;"
-        "${f}/share/lua/${lua.luaversion}/?.lua;" +
+  ) packages;
-        "${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 stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   inherit name;
   src = ./.;
   nativeBuildInputs = [ fennel ];

pkgs/zyxel-bootconfig/default.nix

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