about summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2019-09-24 10:54:25 +0100
committerGitHub <noreply@github.com>2019-09-24 10:54:25 +0100
commit94bd70825288f57a8c90f52471db803ed2a97a25 (patch)
tree27a561e65ca3bafa0e12f5e970d6e58d02964f88 /pkgs/development/tools/ocaml
parent6e8db5d67f1c996b729bedfb96a74175ae064dbb (diff)
parent9c427a0c1e5b0384fe02919c96bc3d3199cbd93e (diff)
downloadnixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar.gz
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar.bz2
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar.lz
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar.xz
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.tar.zst
nixlib-94bd70825288f57a8c90f52471db803ed2a97a25.zip
Merge pull request #69337 from vbgl/ocamlformat-0.11.0
ocamlformat: 0.8 → 0.11.0
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/ocamlformat/default.nix22
1 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix
index 694f4b6e89a0..4eb1cc858ad0 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -1,35 +1,33 @@
-{ stdenv, fetchFromGitHub, ocamlPackages }:
+{ lib, fetchFromGitHub, ocamlPackages }:
 
 with ocamlPackages; buildDunePackage rec {
   pname = "ocamlformat";
-  version = "0.8";
+  version = "0.11.0";
 
-  minimumOCamlVersion = "4.05";
+  minimumOCamlVersion = "4.06";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
     rev = version;
-    sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j";
+    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
   };
 
   buildInputs = [
-    base
     cmdliner
     fpath
     ocaml-migrate-parsetree
+    odoc
+    re
     stdio
+    uuseg
+    uutf
   ];
 
-  configurePhase = ''
-    patchShebangs tools/gen_version.sh
-    tools/gen_version.sh src/Version.ml version
-  '';
-
   meta = {
     inherit (src.meta) homepage;
     description = "Auto-formatter for OCaml code";
-    maintainers = [ stdenv.lib.maintainers.Zimmi48 ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.Zimmi48 ];
+    license = lib.licenses.mit;
   };
 }