Merge pull request #17051 from RamKromberg/fix/vis
vis: 2016-04-15 -> 2016-07-15
This commit is contained in:
commit
55c74889eb
@ -1,12 +1,18 @@
|
|||||||
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses, libtermkey, lpeg, lua }:
|
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper
|
||||||
|
, ncurses, libtermkey, lpeg, lua
|
||||||
|
, acl ? null, libselinux ? null
|
||||||
|
, version ? "2016-07-15"
|
||||||
|
, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08"
|
||||||
|
, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd"
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vis-nightly-${version}";
|
name = "vis-nightly-${version}";
|
||||||
version = "2016-04-15";
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
sha256 = "0a4gpwniy5r9dpfq51fxjxxnxavdjv8x76w9bbjnbnh8n63p3sj7";
|
inherit sha256;
|
||||||
rev = "472c559a273d3c7b0f5ee92260c5544bc3d74576";
|
inherit rev;
|
||||||
repo = "vis";
|
repo = "vis";
|
||||||
owner = "martanne";
|
owner = "martanne";
|
||||||
};
|
};
|
||||||
@ -14,12 +20,14 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
unzip
|
unzip pkgconfig
|
||||||
pkgconfig
|
ncurses
|
||||||
ncurses
|
libtermkey
|
||||||
libtermkey
|
lua
|
||||||
lua
|
lpeg
|
||||||
lpeg
|
] ++ stdenv.lib.optional stdenv.isLinux [
|
||||||
|
acl
|
||||||
|
libselinux
|
||||||
];
|
];
|
||||||
|
|
||||||
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
|
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
|
||||||
@ -33,11 +41,10 @@ stdenv.mkDerivation rec {
|
|||||||
--prefix VIS_PATH : "$out/share/vis"
|
--prefix VIS_PATH : "$out/share/vis"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A vim like editor";
|
description = "A vim like editor";
|
||||||
homepage = http://github.com/martanne/vis;
|
homepage = http://github.com/martanne/vis;
|
||||||
license = stdenv.lib.licenses.isc;
|
license = licenses.isc;
|
||||||
maintainers = [ stdenv.lib.maintainers.vrthra ];
|
maintainers = [ maintainers.vrthra ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user