about summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2019-01-09 15:14:22 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2019-01-09 16:37:39 +0000
commita18ac72b4a8b69ff625479413160cdb4425c969c (patch)
tree3859ba401495520375dc69ad33c48946f43b6fe8 /pkgs/development/tools/ocaml
parent522148ba4eb3767f1d1beb48a4aba7b6527a147b (diff)
downloadnixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar.gz
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar.bz2
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar.lz
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar.xz
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.tar.zst
nixlib-a18ac72b4a8b69ff625479413160cdb4425c969c.zip
ocamlPackages.ocp-indent: 1.6.1 -> 1.7.0
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/ocp-indent/default.nix25
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 2cffccdbfcdf..7ecc15da2b50 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,31 +1,22 @@
-{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
+{ lib, fetchzip, buildDunePackage, cmdliner }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast; in
-
-assert versionAtLeast (getVersion ocaml) "3.12.1";
-assert versionAtLeast (getVersion cmdliner) "1.0.0";
-assert versionAtLeast (getVersion ocp-build) "1.99.6-beta";
-
-stdenv.mkDerivation rec {
-
-  name = "ocaml${ocaml.version}-ocp-indent-${version}";
-  version = "1.6.1";
+buildDunePackage rec {
+  version = "1.7.0";
+  pname = "ocp-indent";
 
   src = fetchzip {
     url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
-    sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
+    sha256 = "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc";
   };
 
-  nativeBuildInputs = [ ocp-build ];
-  buildInputs = [ ocaml findlib cmdliner ];
+  minimumOCamlVersion = "4.02";
 
-  inherit (dune) installPhase;
+  buildInputs = [ cmdliner ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://typerex.ocamlpro.com/ocp-indent.html;
     description = "A customizable tool to indent OCaml code";
     license = licenses.gpl3;
-    platforms = ocaml.meta.platforms or [];
     maintainers = [ maintainers.jirkamarsik ];
   };
 }