From 33ed2e9e548a001af545d8d9dabf16b34b3cd3b5 Mon Sep 17 00:00:00 2001 From: Hongchang Wu Date: Mon, 28 Sep 2020 09:06:44 -0400 Subject: [PATCH] ocamlPackages.result: 1.2 -> 1.5 --- .../ocaml-modules/ocaml-result/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index df442009922a..2814c6c52806 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchurl }: -let version = "1.2"; in +buildDunePackage rec { + pname = "result"; + version = "1.5"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-result-${version}"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "result"; - rev = version; - sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0"; + src = fetchurl { + url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz"; + sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; }; - buildInputs = [ ocaml findlib ]; - - createFindlibDestdir = true; - meta = { homepage = "https://github.com/janestreet/result"; description = "Compatibility Result module"; @@ -24,7 +17,6 @@ stdenv.mkDerivation { while staying compatible with older version of OCaml should use the Result module defined in this library. ''; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.bsd3; }; }