summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-06-12 10:27:46 +0100
committerGitHub <noreply@github.com>2018-06-12 10:27:46 +0100
commit552d0797b2b5f03b93a6e6eb06ca10d5a514ec88 (patch)
tree3578307061e6ce0a6445a37db43356d3e8948e5c /pkgs/applications
parentb224bc1d2b75e212531a07c5953f6c978880fc77 (diff)
parentb494ef4db685b7abb3cb4618aa6efdcf341f5ff0 (diff)
downloadnixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar.gz
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar.bz2
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar.lz
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar.xz
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.tar.zst
nixpkgs-552d0797b2b5f03b93a6e6eb06ca10d5a514ec88.zip
Merge pull request #41873 from colemickens/master
neovim: 0.2.2 -> 0.3.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/neovim/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index b090b0c84f9..f47688b8280 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
+{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
 , libtool, libuv, luaPackages, ncurses, perl, pkgconfig
 , unibilium, vimUtils, xsel, gperf, callPackage
 , libvterm-neovim
@@ -11,13 +11,13 @@ let
 
   neovim = stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
-    version = "0.2.2";
+    version = "0.3.0";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4";
+      sha256 = "10c8y309fdwvr3d9n6vm1f2c0k6pzicnhc64l2dvbw1lnabp04vv";
     };
 
     enableParallelBuilding = true;
@@ -32,6 +32,7 @@ let
       luaPackages.lua
       gperf
     ] ++ optional withJemalloc jemalloc
+      ++ optional stdenv.isDarwin libiconv
       ++ lualibs;
 
     nativeBuildInputs = [