From 37eb705a65b487046b7200dd960d549b9493cf2b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Oct 2020 07:35:35 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.opium=5Fkernel:=200.17.1=20?= =?UTF-8?q?=E2=86=92=200.18.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/opium_kernel/default.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix index 8388e108fef..c7bfe1e7306 100644 --- a/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ b/pkgs/development/ocaml-modules/opium_kernel/default.nix @@ -1,6 +1,6 @@ { lib , buildDunePackage -, fetchFromGitHub +, fetchurl , ppx_fields_conv , ppx_sexp_conv @@ -8,35 +8,36 @@ , cohttp-lwt , ezjsonm , hmap +, sexplib }: buildDunePackage rec { - pname = "opium_kernel"; - version = "0.17.1"; + pname = "opium_kernel"; + version = "0.18.0"; + + useDune2 = true; minimumOCamlVersion = "4.04.1"; - - src = fetchFromGitHub { - owner = "rgrinberg"; - repo = "opium"; - rev = "v${version}"; - sha256 = "03xzh0ik6k3c0yn1w1avph667vdagwclzimwwrlf9qdxnzxvcnp3"; - }; + + src = fetchurl { + url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; + sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q"; + }; doCheck = true; - buildInputs = [ + buildInputs = [ ppx_sexp_conv ppx_fields_conv ]; - propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm + propagatedBuildInputs = [ + hmap cohttp-lwt ezjsonm sexplib ]; meta = { - description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; + description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; homepage = "https://github.com/rgrinberg/opium"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.pmahoney ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmahoney ]; }; }