Merge pull request #14737 from vrthra/vis

vis: init vis at 0.2x (nightly)
This commit is contained in:
joachifm 2016-04-16 03:17:55 +02:00
commit 31841832db
3 changed files with 48 additions and 0 deletions

View File

@ -372,6 +372,7 @@
vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>"; vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
vrthra = "Rahul Gopinath <rahul@gopinath.org>";
wedens = "wedens <kirill.wedens@gmail.com>"; wedens = "wedens <kirill.wedens@gmail.com>";
willtim = "Tim Philip Williams <tim.williams.public@gmail.com>"; willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";

View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses, libtermkey, lpeg, lua }:
stdenv.mkDerivation rec {
name = "vis-nightly-${version}";
version = "2016-04-15";
src = fetchFromGitHub {
sha256 = "0a4gpwniy5r9dpfq51fxjxxnxavdjv8x76w9bbjnbnh8n63p3sj7";
rev = "472c559a273d3c7b0f5ee92260c5544bc3d74576";
repo = "vis";
owner = "martanne";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
unzip
pkgconfig
ncurses
libtermkey
lua
lpeg
];
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
postInstall = ''
echo wrapping $out/bin/vis with runtime environment
wrapProgram $out/bin/vis \
--prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
--prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
--prefix VIS_PATH : "$out/share/vis"
'';
meta = {
description = "A vim like editor";
homepage = http://github.com/martanne/vis;
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vrthra ];
};
}

View File

@ -14154,6 +14154,10 @@ in
neovim-pygui = pythonPackages.neovim_gui; neovim-pygui = pythonPackages.neovim_gui;
vis = callPackage ../applications/editors/vis {
inherit (lua52Packages) lpeg;
};
virt-viewer = callPackage ../applications/virtualization/virt-viewer { virt-viewer = callPackage ../applications/virtualization/virt-viewer {
gtkvnc = gtkvnc.override { enableGTK3 = true; }; gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; };