From ef45e1161ed164eb477d9d46968e46f3c4e2e996 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Oct 2020 07:19:58 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ezjsonm:=200.6.0=20=E2=86=92=201.?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/cow/default.nix | 1 + pkgs/development/ocaml-modules/ezjsonm/default.nix | 14 ++++++++------ .../development/ocaml-modules/mustache/default.nix | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 787854f8e41..13ee99804d8 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -2,6 +2,7 @@ , uri, xmlm, omd, ezjsonm }: buildDunePackage rec { + useDune2 = true; minimumOCamlVersion = "4.02.3"; version = "2.4.0"; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 781af8a4c98..269288ef3cd 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchzip, buildDunePackage, jsonm, hex, sexplib }: +{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; - version = "0.6.0"; + version = "1.2.0"; - src = fetchzip { - url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz"; - sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-v${version}.tbz"; + sha256 = "1q6cf63cc614lr141rzhm2w4rhi1snfqai6fmkhvfjs84hfbw2w7"; }; - propagatedBuildInputs = [ jsonm hex sexplib ]; + propagatedBuildInputs = [ jsonm hex sexplib0 ]; meta = { description = "An easy interface on top of the Jsonm library"; diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix index 267aa17e9e4..005e26926d1 100644 --- a/pkgs/development/ocaml-modules/mustache/default.nix +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "mustache"; version = "3.1.0"; + useDune2 = true; src = fetchFromGitHub { owner = "rgrinberg"; repo = "ocaml-mustache";