diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/applications/editors/neovim | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/neovim/qt.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index c13ad738ffee2..19678d241e67a 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -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; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 778c1cc644570..10522f449ae56 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -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"; }; |