Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
This commit is contained in:
@@ -215,6 +215,31 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
lua-iconv = buildLuaPackage rec {
|
||||
name = "lua-iconv-${version}";
|
||||
version = "7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ittner";
|
||||
repo = "lua-iconv";
|
||||
rev = "e8d34024a6b185a759733915f116cc5588550261";
|
||||
sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(
|
||||
INSTALL_PATH="$out/lib/lua/${lua.luaversion}"
|
||||
);
|
||||
'';
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
description = "Lua bindings for POSIX iconv";
|
||||
maintainers = [ maintainers.richardipsum ];
|
||||
homepage = "https://ittner.github.io/lua-iconv/";
|
||||
};
|
||||
};
|
||||
|
||||
luasec = buildLuaPackage rec {
|
||||
name = "sec-0.6";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
Reference in New Issue
Block a user