b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lua5_{sec,1_sockets,expat}: convert to aliases

Browse source 
There's nothing better in these expressions than what we have in
lua-packages.nix
This commit is contained in:
Vladimír Čunát 2017-05-02 12:44:00 +02:00
parent de48ca0466
commit 9ad1aaae53
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 3 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/interpreters/lua-5/expat.nix
View file

@ -1,26 +0,0 @@
{ stdenv, fetchurl, lua5, expat }:
stdenv.mkDerivation rec {
version = "1.3.0";
name = "lua-expat-${version}";
isLibrary = true;
src = fetchurl {
url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz";
sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
};
buildInputs = [ lua5 expat ];
preBuild = ''
makeFlagsArray=(
LUA_LDIR="$out/share/lua/${lua5.luaversion}"
LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"
EXPAT_INC="-I${expat.dev}/include");
'';
meta = {
homepage = "http://matthewwild.co.uk/projects/luaexpat";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.flosse ];
};
}

29
pkgs/development/interpreters/lua-5/sec.nix
View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, lua5, openssl }:
stdenv.mkDerivation rec {
version = "0.5";
name = "lua-sec-${version}";
src = fetchurl {
url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034";
};
buildInputs = [ lua5 openssl ];
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
preBuild = ''
makeFlagsArray=(
linux
LUAPATH="$out/lib/lua/${lua5.luaversion}"
LUACPATH="$out/lib/lua/${lua5.luaversion}"
INC_PATH="-I${lua5}/include"
LIB_PATH="-L$out/lib");
'';
meta = {
homepage = "https://github.com/brunoos/luasec";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.flosse ];
};
}

3
pkgs/top-level/aliases.nix
View file

@ -82,6 +82,9 @@ doNotDisplayTwice rec {
links = links2; # added 2016-01-31
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
lua5_sec = luaPackages.luasec; # added 2017-05-02
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
lua5_expat = luaPackages.luaexpat; # added 2017-05-02
m3d-linux = m33-linux; # added 2016-08-13
manpages = man-pages; # added 2015-12-06
man_db = man-db; # added 2016-05

5
pkgs/top-level/all-packages.nix
View file

@ -5970,11 +5970,6 @@ with pkgs;
luaPackages = lua52Packages;
lua5_1_sockets = lua51Packages.luasocket;
lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { };
luajit = callPackage ../development/interpreters/luajit {};
luarocks = luaPackages.luarocks;