1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00

Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Matthieu Coudron 2021-09-12 01:20:30 +02:00 committed by Matthieu Coudron
parent 88842910b5
commit 496b8abf78
5 changed files with 7 additions and 6 deletions

View file

@ -4,7 +4,7 @@
}:
let
luaEnv = lua.withPackages(ps: [ps.lpeg]);
luaEnv = lua.withPackages(ps: [ ps.lpeg ]);
in
stdenv.mkDerivation rec {
pname = "vis";

View file

@ -12,7 +12,8 @@
}:
let
luaPackages = callPackage ../../lua-modules {
lua=self; overrides=packageOverrides;
lua = self;
overrides = packageOverrides;
};
plat = if stdenv.isLinux then "linux"

View file

@ -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;
};

View file

@ -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

View file

@ -107,7 +107,7 @@ in
};
};
vicious = toLuaModule( stdenv.mkDerivation rec {
vicious = luaLib.toLuaModule( stdenv.mkDerivation rec {
pname = "vicious";
version = "2.5.0";