diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-07-29 19:18:09 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-29 21:18:09 +0200 |
| commit | 5bc007bbea779db5bd9e6cffd3fb09ca06847e13 (patch) | |
| tree | 206311e227b9ec651dab8f0f800d61352b7c104a /pkgs | |
| parent | 09d25d7d65044bb8acbf5be42474a969bb6f1a64 (diff) | |
| download | nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar.gz nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar.bz2 nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar.lz nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar.xz nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.tar.zst nixlib-5bc007bbea779db5bd9e6cffd3fb09ca06847e13.zip | |
ocamlPackages.jingoo: 1.2.7 -> 1.2.18 (#44106)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/jingoo/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index 4f42f51c16e6..0ef3cf167341 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,18 +1,24 @@ -{stdenv, buildOcaml, fetchurl, batteries, pcre}: +{ stdenv, fetchFromGitHub, ocaml, findlib, ounit, pcre, uutf }: -buildOcaml rec { - name = "jingoo"; - version = "1.2.7"; +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "jingoo is not available for OCaml ${ocaml.version}" +else - src = fetchurl { - url = "https://github.com/tategakibunko/jingoo/archive/v${version}.tar.gz"; - sha256 = "8ffc5723d77b323a12761981d048c046af77db47543a4b1076573aa5f4003009"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-jingoo-${version}"; + version = "1.2.18"; + + src = fetchFromGitHub { + owner = "tategakibunko"; + repo = "jingoo"; + rev = "v${version}"; + sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn"; }; - propagatedBuildInputs = [ batteries pcre ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ pcre uutf ]; - preInstall = "mkdir -p $out/bin"; - installFlags = "BINDIR=$(out)/bin"; + createFindlibDestdir = true; meta = with stdenv.lib; { homepage = https://github.com/tategakibunko/jingoo; |