public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53703 from vbgl/ocaml-ocp-indent-1.7.0

Browse Source 
ocamlPackages.ocp-indent: 1.6.1 -> 1.7.0
This commit is contained in:
Vladyslav M 2019-01-16 00:54:27 +02:00 committed by GitHub
commit 805e2bbced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -6,13 +6,23 @@ in
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
version = "1.0.3";
sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
} else {
version = "1.0.2";
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
}
; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";
version = "1.0.3"; inherit (param) version;
src = fetchurl { src = fetchurl {
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"; inherit (param) sha256;
}; };
nativeBuildInputs = [ ocamlbuild topkg ]; nativeBuildInputs = [ ocamlbuild topkg ];

25
pkgs/development/tools/ocaml/ocp-indent/default.nix
View File

@ -1,31 +1,22 @@
{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }: { lib, fetchzip, buildDunePackage, cmdliner }:
let inherit (stdenv.lib) getVersion versionAtLeast; in buildDunePackage rec {
version = "1.7.0";
assert versionAtLeast (getVersion ocaml) "3.12.1"; pname = "ocp-indent";
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";
src = fetchzip { src = fetchzip {
url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; sha256 = "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc";
}; };
nativeBuildInputs = [ ocp-build ]; minimumOCamlVersion = "4.02";
buildInputs = [ ocaml findlib cmdliner ];
inherit (dune) installPhase; buildInputs = [ cmdliner ];
meta = with stdenv.lib; { meta = with lib; {
homepage = http://typerex.ocamlpro.com/ocp-indent.html; homepage = http://typerex.ocamlpro.com/ocp-indent.html;
description = "A customizable tool to indent OCaml code"; description = "A customizable tool to indent OCaml code";
license = licenses.gpl3; license = licenses.gpl3;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.jirkamarsik ]; maintainers = [ maintainers.jirkamarsik ];
}; };
} }