lol

neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4

+19 -7
+5 -7
pkgs/applications/editors/neovim/qt.nix
··· 3 3 }: 4 4 5 5 let # not very usable ATM 6 - version = "0pre-2015-10-18"; 6 + version = "0.2.1"; 7 7 in 8 8 stdenv.mkDerivation { 9 9 name = "neovim-qt-${version}"; ··· 11 11 src = fetchFromGitHub { 12 12 repo = "neovim-qt"; 13 13 owner = "equalsraf"; 14 - rev = "03236e2"; 15 - sha256 = "0hhwpnj7yfqdk7yiwrq0x6n4xx30brj9clxmxx796421rlcrxypq"; 14 + rev = "v${version}"; 15 + sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n"; 16 16 }; 17 17 18 18 # It tries to download libmsgpack; let's use ours. ··· 22 22 23 23 # Similar enough to FindMsgpack 24 24 set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE) 25 - set(MSGPACK_LIBRARIES msgpack PARENT_SCOPE) 25 + set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE) 26 26 ''; 27 27 in "echo '${use-msgpack}' > third-party/CMakeLists.txt"; 28 28 ··· 34 34 35 35 enableParallelBuilding = true; 36 36 37 - installPhase = '' 38 - mkdir -p "$out/bin" 39 - mv ./bin/nvim-qt "$out/bin/" 37 + postInstall = '' 40 38 wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin" 41 39 ''; 42 40
+12
pkgs/development/libraries/libmsgpack/1.4.nix
··· 1 + { callPackage, fetchFromGitHub, ... } @ args: 2 + 3 + callPackage ./generic.nix (args // rec { 4 + version = "1.4.2"; 5 + 6 + src = fetchFromGitHub { 7 + owner = "msgpack"; 8 + repo = "msgpack-c"; 9 + rev = "cpp-${version}"; 10 + sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa"; 11 + }; 12 + })
+2
pkgs/top-level/all-packages.nix
··· 8168 8168 8169 8169 libmsgpack = callPackage ../development/libraries/libmsgpack { }; 8170 8170 libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; 8171 + libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; 8171 8172 8172 8173 libnatspec = callPackage ../development/libraries/libnatspec ( 8173 8174 stdenv.lib.optionalAttrs stdenv.isDarwin { ··· 14984 14985 14985 14986 neovim-qt = callPackage ../applications/editors/neovim/qt.nix { 14986 14987 qt5 = qt55; 14988 + libmsgpack = libmsgpack_1_4; 14987 14989 }; 14988 14990 14989 14991 neovim-pygui = pythonPackages.neovim_gui;