diff options
| author | Matthieu Coudron <teto@users.noreply.github.com> | 2021-09-12 01:20:30 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mcoudron@hotmail.com> | 2021-09-12 03:03:56 +0200 |
| commit | 496b8abf789b891f5355ea2265416e5121855308 (patch) | |
| tree | 277bd544dd1f72fab78584fb2630100a0ea31def /pkgs | |
| parent | 88842910b52c146bc5ef9c78eed34e5e570ef76c (diff) | |
| download | nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar.gz nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar.bz2 nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar.lz nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar.xz nixpkgs-496b8abf789b891f5355ea2265416e5121855308.tar.zst nixpkgs-496b8abf789b891f5355ea2265416e5121855308.zip | |
Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/vis/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/interpreter.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/lib.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 2bafbce8be5..a658f95ac01 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -4,7 +4,7 @@ }: let - luaEnv = lua.withPackages(ps: [ps.lpeg]); + luaEnv = lua.withPackages(ps: [ ps.lpeg ]); in stdenv.mkDerivation rec { pname = "vis"; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index c6b4f478f63..a780e6ba49f 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -12,7 +12,8 @@ }: let luaPackages = callPackage ../../lua-modules { - lua=self; overrides=packageOverrides; + lua = self; + overrides = packageOverrides; }; plat = if stdenv.isLinux then "linux" diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 0180897f77a..9c31f9a5c53 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -55,7 +55,7 @@ rec { toLuaModule = drv: drv.overrideAttrs( oldAttrs: { # Use passthru in order to prevent rebuilds when possible. - passthru = (oldAttrs.passthru or {})// { + passthru = (oldAttrs.passthru or {}) // { luaModule = lua; requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs; }; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index ac4939c1499..773632328a0 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -2,7 +2,7 @@ , lua , nixosTests , withLibevent ? true -, withDBI ? true, luadbi ? null +, withDBI ? true # use withExtraLibs to add additional dependencies of community modules , withExtraLibs ? [ ] , withOnlyInstalledCommunityModules ? [ ] @@ -12,7 +12,7 @@ with lib; let - luaEnv = lua.withPackages(p: with p;[ + luaEnv = lua.withPackages(p: with p; [ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 ] ++ lib.optional withLibevent p.luaevent diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 359c8980e73..80f71dc1942 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -107,7 +107,7 @@ in }; }; - vicious = toLuaModule( stdenv.mkDerivation rec { + vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { pname = "vicious"; version = "2.5.0"; |