From 92e2e18fbb3348f52c7ecb27b221142d3b088671 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Oct 2015 19:26:38 +0200 Subject: [PATCH] ocaml-ocp-indent: 1.4.2b -> 1.5.2 --- .../development/tools/ocaml/ocp-indent/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 9ad2976adbfc..224ce57808f9 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocpBuild) "1.99.3-beta"; +assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation { - name = "ocp-indent-1.4.2b"; + name = "ocp-indent-1.5.2"; - src = fetchurl { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.4.2b.tar.gz"; - sha256 = "1p0n2zcl5kf543x2xlqrz1aa51f0dqal8l392sa41j6wx82j0gpb"; + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; + sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; buildInputs = [ ocaml findlib ocpBuild opam cmdliner ]; createFindlibDestdir = true; + preConfigure = "patchShebangs ./install.sh"; + postInstall = '' mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} '';