From 97c5dfc55efc6307a091ea70a03b1495c1f193fd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 06:18:32 +0000 Subject: ocamlPackages.yojson: 1.2.3 -> 1.3.3 --- pkgs/development/ocaml-modules/yojson/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ab949f4f1f22..2ce2faa7e8d6 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,15 +1,22 @@ { stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: let pname = "yojson"; - version = "1.2.3"; + param = + if stdenv.lib.versionAtLeast ocaml.version "4.01" then { + version = "1.3.3"; + sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7"; + } else { + version = "1.2.3"; + sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + }; in stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${param.version}"; src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + url = "https://github.com/mjambon/${pname}/archive/v${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; -- cgit 1.4.1