lua: add withPackages function (#54460)

* lua: add withPackages function

First step towards more automation similar to the haskell backend.
Follow up of https://github.com/NixOS/nixpkgs/pull/33903
This commit is contained in:
Matthieu Coudron
2019-01-30 23:13:15 +09:00
committed by Michael Raskin
parent 16ab34c37b
commit c4519cf8a6
16 changed files with 381 additions and 82 deletions

View File

@@ -1,4 +1,8 @@
{ stdenv, fetchurl, readline }:
{ stdenv, fetchurl, readline
, self
, callPackage
, packageOverrides ? (self: super: {})
}:
let
dsoPatch = fetchurl {
@@ -6,6 +10,7 @@ let
sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
name = "lua-arch.patch";
};
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
in
stdenv.mkDerivation rec {
name = "lua-${version}";
@@ -17,6 +22,10 @@ stdenv.mkDerivation rec {
sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
};
LuaPathSearchPaths = luaPackages.getLuaPathList luaversion;
LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion;
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
buildInputs = [ readline ];
patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
@@ -39,6 +48,16 @@ stdenv.mkDerivation rec {
rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
'';
passthru = rec {
buildEnv = callPackage ./wrapper.nix {
lua=self;
inherit (luaPackages) requiredLuaModules;
};
withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
pkgs = luaPackages;
interpreter = "${self}/bin/lua";
};
meta = {
homepage = http://www.lua.org;
description = "Powerful, fast, lightweight, embeddable scripting language";
@@ -51,6 +70,7 @@ stdenv.mkDerivation rec {
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = with stdenv.lib.platforms; linux ++ darwin;
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -1,4 +1,10 @@
{ stdenv, fetchurl, readline, compat ? false }:
{ stdenv, fetchurl, readline
# compiles compatibility layer with lua5.1
, compat ? false
, callPackage
, self
, packageOverrides ? (self: super: {})
}:
let
dsoPatch = fetchurl {
@@ -6,12 +12,17 @@ let
sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
name = "lua-arch.patch";
};
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
in
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.2";
version = "${luaversion}.4";
LuaPathSearchPaths = luaPackages.getLuaPathList luaversion;
LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion;
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz";
sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
@@ -21,6 +32,19 @@ stdenv.mkDerivation rec {
patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ];
passthru = rec {
buildEnv = callPackage ./wrapper.nix {
lua = self;
inherit (luaPackages) requiredLuaModules;
};
withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
pkgs = luaPackages;
interpreter = "${self}/bin/lua";
};
enableParallelBuilding = true;
configurePhase =
if stdenv.isDarwin
then ''

View File

@@ -1,5 +1,11 @@
{ stdenv, fetchurl, readline, compat ? false }:
{ stdenv, fetchurl, readline, compat ? false
, callPackage
, self
, packageOverrides ? (self: super: {})
}:
let
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
in
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.3";
@@ -10,6 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
};
LuaPathSearchPaths = luaPackages.getLuaPathList luaversion;
LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion;
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
buildInputs = [ readline ];
patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [];
@@ -54,6 +64,16 @@ stdenv.mkDerivation rec {
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
'';
passthru = rec {
buildEnv = callPackage ./wrapper.nix {
lua = self;
inherit (luaPackages) requiredLuaModules;
};
withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
pkgs = luaPackages;
interpreter = "${self}/bin/lua";
};
meta = {
homepage = http://www.lua.org;
description = "Powerful, fast, lightweight, embeddable scripting language";

View File

@@ -0,0 +1,15 @@
{ runCommand, lib, }:
LuaPathSearchPaths: LuaCPathSearchPaths:
let
hook = ./setup-hook.sh;
in runCommand "lua-setup-hook.sh" {
# hum doesn't seem to like caps !! BUG ?
luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;
luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;
} ''
cp ${hook} hook.sh
substituteAllInPlace hook.sh
mv hook.sh $out
''

View File

@@ -0,0 +1,47 @@
# set -e
nix_print() {
if (( "${NIX_DEBUG:-0}" >= $1 )); then
echo "$2"
fi
}
nix_debug() {
nix_print 3 "$1"
}
addToLuaSearchPathWithCustomDelimiter() {
local varName="$1"
local absPattern="$2"
# delete longest match starting from the lua placeholder '?'
local topDir="${absPattern%%\?*}"
# export only if the folder exists else LUA_PATH grows too big
if [ ! -d "$topDir" ]; then return; fi
export "${varName}=${!varName:+${!varName};}${absPattern}"
}
addToLuaPath() {
local dir="$1"
if [[ ! -d "$dir" ]]; then
nix_debug "$dir not a directory abort"
return 0
fi
cd "$dir"
for pattern in @luapathsearchpaths@;
do
addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"
done
# LUA_CPATH
for pattern in @luacpathsearchpaths@;
do
addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"
done
cd -
}
addEnvHooks "$hostOffset" addToLuaPath

View File

@@ -0,0 +1,4 @@
{ buildEnv, luaPackages }:
# this is a function that returns a function that returns an environment
f: let packages = f luaPackages; in buildEnv.override { extraLibs = packages; }

View File

@@ -0,0 +1,73 @@
{ stdenv, lua, buildEnv, makeWrapper
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
, lib
, requiredLuaModules
, makeWrapperArgs ? []
}:
# Create a lua executable that knows about additional packages.
let
env = let
paths = requiredLuaModules (extraLibs ++ [ lua ] );
in buildEnv {
name = "${lua.name}-env";
inherit paths;
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
# we create wrapper for the binaries in the different packages
postBuild = ''
. "${makeWrapper}/nix-support/setup-hook"
# get access to lua functions
. ${lua}/nix-support/setup-hook
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
mkdir -p "$out/bin"
addToLuaPath "$out"
# take every binary from lua packages and put them into the env
for path in ${stdenv.lib.concatStringsSep " " paths}; do
nix_debug "looking for binaries in path = $path"
if [ -d "$path/bin" ]; then
cd "$path/bin"
for prg in *; do
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
nix_debug "Making wrapper $prg"
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
fi
done
'' + postBuild;
inherit (lua) meta;
passthru = lua.passthru // {
interpreter = "${env}/bin/lua";
inherit lua;
env = stdenv.mkDerivation {
name = "interactive-${lua.name}-environment";
nativeBuildInputs = [ env ];
buildCommand = ''
echo >&2 ""
echo >&2 "*** lua 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
echo >&2 ""
exit 1
'';
};
};
};
in env