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

ocamlPackages.merlin: 2.5.4 -> 3.0.2 (#29337)

This commit is contained in:
Jake Waksbaum 2017-09-21 14:39:36 -04:00 committed by Jörg Thalheim
parent 7d3d276a16
commit a3ba600366
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/ocaml/merlin/default.nix
View File

@ -4,15 +4,7 @@
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
let let
version = if lib.versionOlder (lib.getVersion ocaml) "4.02.0" version = "3.0.2";
then
"2.3.1"
else
"2.5.4";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
"2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -20,8 +12,8 @@ stdenv.mkDerivation {
name = "merlin-${version}"; name = "merlin-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
sha256 = hashes."${version}"; sha256 = "0lcgafs5ip8vhvrp1d7yv6mzjsirmayd83cj4wwq6zxcrl7yv4x8";
}; };
buildInputs = [ ocaml findlib yojson ] buildInputs = [ ocaml findlib yojson ]