diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-28 08:01:03 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-01-04 17:52:56 +0100 |
commit | 83110ac0be3eb0d58f1b9f8cd61a3186df5d8151 (patch) | |
tree | e3dbbe825d89eed9070ad89a34b299b1e2eb7615 /pkgs/development/ocaml-modules/notty | |
parent | a3cb76cf487f9c846d42300a531f1699a7fc5d3a (diff) | |
download | nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar.gz nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar.bz2 nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar.lz nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar.xz nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.tar.zst nixlib-83110ac0be3eb0d58f1b9f8cd61a3186df5d8151.zip |
ocamlPackages.notty: 0.1.1a -> 0.2.1
jackline: 2017-08-17 -> 2017-12-24
Diffstat (limited to 'pkgs/development/ocaml-modules/notty')
-rw-r--r-- | pkgs/development/ocaml-modules/notty/default.nix | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index dcc57fddaf68..2dffb472f3e8 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,30 +1,27 @@ -{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, ocb-stubblr +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: with stdenv.lib; -let withLwt = lwt != null; in +if !versionAtLeast ocaml.version "4.03" +then throw "notty is not available for OCaml ${ocaml.version}" +else -buildOcaml rec { - version = "0.1.1a"; - name = "notty"; +let withLwt = lwt != null; in - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "ocaml${ocaml.version}-notty-${version}"; - src = fetchFromGitHub { - owner = "pqwy"; - repo = "notty"; - rev = "53f5946653490fce980dc5d8cadf8b122cff4f19"; - sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf"; + src = fetchurl { + url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; + sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch; - sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6"; - })]; + unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ findlib topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; @@ -34,7 +31,8 @@ buildOcaml rec { inherit (topkg) installPhase; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/pqwy/notty"; + inherit (ocaml.meta) platforms; description = "Declarative terminal graphics for OCaml"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; |