From fb50abba2e0c8738b3a92142488e57ef3c631495 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 26 Mar 2017 09:09:02 -0700 Subject: [PATCH 1/2] vis: 2016-10-09 -> 0.3 --- pkgs/applications/editors/vis/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f6760895b57..921018531ea 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,18 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-10-09" -, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1" -, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90" }: stdenv.mkDerivation rec { - name = "vis-unstable-${version}"; - inherit version; + name = "vis-${version}"; + version = "0.3"; src = fetchFromGitHub { - inherit sha256; - inherit rev; + rev = "v${version}"; + sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; repo = "vis"; owner = "martanne"; }; From df4b6ae3ba69350f7cc5f66fa55e116958459ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2017 00:18:05 +0200 Subject: [PATCH 2/2] vis: use correct separator for LUA_CPATH/LUA_PATH --- pkgs/applications/editors/vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 921018531ea..291c7b1b412 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { cp $desktopItem/share/applications/* $out/share/applications 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 LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" '';