lua-packages.nix: run nixpkgs-fmt

1 files changed, 150 insertions, 134 deletions

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 012a4d1e0c7..2598fd314fe 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -1,141 +1,157 @@
 /* This file defines the composition for Lua packages.  It has
-   been factored out of all-packages.nix because there are many of
-   them.  Also, because most Nix expressions for Lua packages are
-   trivial, most are actually defined here.  I.e. there's no function
-   for each package in a separate file: the call to the function would
-   be almost as must code as the function itself. */
-
-{ fetchurl, stdenv, lua, unzip, pkg-config
-, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
-, autoreconfHook, gnum4
-, postgresql, cyrus_sasl
-, fetchFromGitHub, which, writeText
+  been factored out of all-packages.nix because there are many of
+  them.  Also, because most Nix expressions for Lua packages are
+  trivial, most are actually defined here.  I.e. there's no function
+  for each package in a separate file: the call to the function would
+  be almost as must code as the function itself. */
+
+{ fetchurl
+, stdenv
+, lua
+, unzip
+, pkg-config
+, pcre
+, oniguruma
+, gnulib
+, tre
+, glibc
+, sqlite
+, openssl
+, expat
+, autoreconfHook
+, gnum4
+, postgresql
+, cyrus_sasl
+, fetchFromGitHub
+, which
+, writeText
 , pkgs
 , lib
 }@args:
 
 let
-  packages = ( self:
-
-let
-  callPackage = pkgs.newScope self;
-
-  buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args );
-
-  buildLuarocksPackage = lib.makeOverridable(callPackage ../development/interpreters/lua-5/build-lua-package.nix {
-    inherit lua;
-    inherit (pkgs) lib;
-    inherit (luaLib) toLuaModule;
-  });
-
-  luaLib = import ../development/lua-modules/lib.nix {
-    inherit (pkgs) lib;
-    inherit pkgs lua;
-  };
-
-  #define build lua package function
-  buildLuaPackage = callPackage ../development/lua-modules/generic {
-    inherit writeText;
-  };
-
-  getPath = drv: pathListForVersion:
-    lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion;
-
+  packages = (self:
+
+    let
+      callPackage = pkgs.newScope self;
+
+      buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args);
+
+      buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix {
+        inherit lua;
+        inherit (pkgs) lib;
+        inherit (luaLib) toLuaModule;
+      });
+
+      luaLib = import ../development/lua-modules/lib.nix {
+        inherit (pkgs) lib;
+        inherit pkgs lua;
+      };
+
+      #define build lua package function
+      buildLuaPackage = callPackage ../development/lua-modules/generic {
+        inherit writeText;
+      };
+
+      getPath = drv: pathListForVersion:
+        lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion;
+
+    in
+    {
+      # helper functions for dealing with LUA_PATH and LUA_CPATH
+      lib = luaLib;
+
+      getLuaPath = drv: getPath drv luaLib.luaPathList;
+      getLuaCPath = drv: getPath drv luaLib.luaCPathList;
+
+      inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib; })
+        luarocksMoveDataFolder luarocksCheckHook lua-setup-hook;
+
+      inherit lua callPackage;
+      inherit buildLuaPackage buildLuarocksPackage buildLuaApplication;
+      inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT
+        requiredLuaModules toLuaModule hasLuaModule;
+
+      # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
+      wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
+        inherit lua lib;
+        inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
+      };
+
+      luarocks = callPackage ../development/tools/misc/luarocks/default.nix {
+        inherit lua lib;
+      };
+
+      # a fork of luarocks used to generate nix lua derivations from rockspecs
+      luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { };
+
+      luxio = buildLuaPackage {
+        pname = "luxio";
+        version = "13";
+
+        src = fetchurl {
+          url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
+          sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
+        };
+
+        nativeBuildInputs = [ which pkg-config ];
+
+        postPatch = ''
+          patchShebangs .
+        '';
+
+        preBuild = ''
+          makeFlagsArray=(
+            INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
+            INST_LUADIR="$out/share/lua/${lua.luaversion}"
+            LUA_BINDIR="$out/bin"
+            INSTALL=install
+            );
+        '';
+
+        meta = with lib; {
+          broken = stdenv.isDarwin;
+          description = "Lightweight UNIX I/O and POSIX binding for Lua";
+          homepage = "https://www.gitano.org.uk/luxio/";
+          license = licenses.mit;
+          maintainers = with maintainers; [ richardipsum ];
+          platforms = platforms.unix;
+        };
+      };
+
+      nfd = callPackage ../development/lua-modules/nfd {
+        inherit (lib) maintainers;
+        inherit (pkgs.gnome) zenity;
+      };
+
+      vicious = luaLib.toLuaModule (stdenv.mkDerivation rec {
+        pname = "vicious";
+        version = "2.5.1";
+
+        src = fetchFromGitHub {
+          owner = "vicious-widgets";
+          repo = "vicious";
+          rev = "v${version}";
+          sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI=";
+        };
+
+        buildInputs = [ lua ];
+
+        installPhase = ''
+          mkdir -p $out/lib/lua/${lua.luaversion}/
+          cp -r . $out/lib/lua/${lua.luaversion}/vicious/
+          printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
+        '';
+
+        meta = with lib; {
+          description = "A modular widget library for the awesome window manager";
+          homepage = "https://vicious.rtfd.io";
+          license = licenses.gpl2Plus;
+          maintainers = with maintainers; [ makefu mic92 McSinyx ];
+          platforms = platforms.linux;
+        };
+      });
+
+    });
 in
-{
-  # helper functions for dealing with LUA_PATH and LUA_CPATH
-  lib = luaLib;
-
-  getLuaPath = drv: getPath drv luaLib.luaPathList;
-  getLuaCPath = drv: getPath drv luaLib.luaCPathList;
-
-  inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;})
-    luarocksMoveDataFolder luarocksCheckHook lua-setup-hook;
-
-  inherit lua callPackage;
-  inherit buildLuaPackage buildLuarocksPackage buildLuaApplication;
-  inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT
-    requiredLuaModules toLuaModule hasLuaModule;
-
-  # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
-  wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
-    inherit lua lib;
-    inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
-  };
-
-  luarocks = callPackage ../development/tools/misc/luarocks/default.nix {
-    inherit lua lib;
-  };
-
-  # a fork of luarocks used to generate nix lua derivations from rockspecs
-  luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { };
-
-  luxio = buildLuaPackage {
-    pname = "luxio";
-    version = "13";
-
-    src = fetchurl {
-      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
-      sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
-    };
-
-    nativeBuildInputs = [ which pkg-config ];
-
-    postPatch = ''
-      patchShebangs .
-    '';
-
-    preBuild = ''
-      makeFlagsArray=(
-        INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
-        INST_LUADIR="$out/share/lua/${lua.luaversion}"
-        LUA_BINDIR="$out/bin"
-        INSTALL=install
-        );
-    '';
-
-    meta = with lib; {
-      broken = stdenv.isDarwin;
-      description = "Lightweight UNIX I/O and POSIX binding for Lua";
-      homepage = "https://www.gitano.org.uk/luxio/";
-      license = licenses.mit;
-      maintainers = with maintainers; [ richardipsum ];
-      platforms = platforms.unix;
-    };
-  };
-
-  nfd = callPackage ../development/lua-modules/nfd {
-    inherit (lib) maintainers;
-    inherit (pkgs.gnome) zenity;
-  };
-
-  vicious = luaLib.toLuaModule( stdenv.mkDerivation rec {
-    pname = "vicious";
-    version = "2.5.1";
-
-    src = fetchFromGitHub {
-      owner = "vicious-widgets";
-      repo = "vicious";
-      rev = "v${version}";
-      sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI=";
-    };
-
-    buildInputs = [ lua ];
-
-    installPhase = ''
-      mkdir -p $out/lib/lua/${lua.luaversion}/
-      cp -r . $out/lib/lua/${lua.luaversion}/vicious/
-      printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
-    '';
-
-    meta = with lib; {
-      description = "A modular widget library for the awesome window manager";
-      homepage    = "https://vicious.rtfd.io";
-      license     = licenses.gpl2Plus;
-      maintainers = with maintainers; [ makefu mic92 McSinyx ];
-      platforms   = platforms.linux;
-    };
-  });
-
-});
-in packages
+packages