JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17906 from garbas/neovim-0.1.5-update

Browse Source 
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
This commit is contained in:
Rok Garbas 2016-08-27 17:44:34 +02:00 committed by GitHub
commit 1102352a79
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/neovim/default.nix
View File

@ -23,8 +23,8 @@ let
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c";
sha256 = "090pyf1n5asaw1m2l9bsbdv3zd753aq1plb0w0drbc2k43ds7k3g";
rev = "487f21dbf65f1c28962fef3f064603f415fbaeb2";
sha256 = "1fig6v0qk0ylr7lqqk0d6x5yywb9ymh85vay4spw5b5r5p0ky7yx";
};
buildInputs = [ perl ];
@ -60,13 +60,13 @@ let
neovim = stdenv.mkDerivation rec {
name = "neovim-${version}";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "14c4gydkm2mz22i616190yif1k0i6d7h5hyxa1mf5cmcyqmp3kkp";
sha256 = "1ihlgm2h7147xyd5wrwg61vsnmkqc9j3ghsida4g2ilr7gw9c85y";
};
enableParallelBuilding = true;

2
pkgs/applications/editors/neovim/qt.nix
View File

@ -9,8 +9,8 @@ stdenv.mkDerivation {
name = "neovim-qt-${version}";
src = fetchFromGitHub {
repo = "neovim-qt";
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n";
};

4
pkgs/development/libraries/libmpack/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "libmpack-${version}";
version = "1.0.3-rev${rev}";
rev = "071d944c9ff7b7fbd2c3c19d1fd1a231363ddeea";
rev = "80bd55ea677e70b041f65a4b99438c1f059cce4b";
src = fetchFromGitHub {
owner = "tarruda";
repo = "libmpack";
inherit rev;
sha256 = "1h3pbmykm69gfyi0wz647gz5836a6f3jc4azzll7i3mkpc11gcrd";
sha256 = "1whnbgxd5580h59kvc2xgx6ymw7nk9kz6r4ajgsfv6c6h2xbwbl3";
};
LIBTOOL = "libtool";
buildInputs = [ libtool ];

3
pkgs/top-level/python-packages.nix
View File

@ -27722,12 +27722,13 @@ in modules // {
sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py
sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py
sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py
sed -i -e "s|test_pause_reading|skip_test_pause_reading|" tests/test_subprocess.py
sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|" tests/test_events.py
sed -i -e "s|test_write_pty|skip_test_write_pty|" tests/test_events.py
sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py
sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
sed -i -e "s|test_write_pty|skip_test_write_pty|" tests/test_events.py
'' + optionalString isPy26 ''
sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
'';