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

Merge pull request #42630 from vbgl/ocaml-ocp-index-1.1.6

Browse Source 
ocamlPackages.ocp-index: 1.1.5 -> 1.1.6
This commit is contained in:
xeji 2018-06-27 16:58:16 +02:00 committed by GitHub
commit 2a2088acde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/ocaml-modules/cmdliner/0.9.nix
View File

@ -1,34 +0,0 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
let
pname = "cmdliner";
in
assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
version = "0.9.8";
src = fetchurl {
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
};
unpackCmd = "tar xjf $src";
nativeBuildInputs = [ ocamlbuild opaline ];
buildInputs = [ ocaml findlib ];
configurePhase = "ocaml pkg/git.ml";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
meta = with stdenv.lib; {
homepage = http://erratique.ch/software/cmdliner;
description = "An OCaml module for the declarative definition of command line interfaces";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.vbgl ];
};
}

2
pkgs/development/tools/ocaml/ocaml-top/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs = [ ncurses jbuilder ]
++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
configurePhase = ''
export TERM=xterm

9
pkgs/development/tools/ocaml/ocp-build/default.nix
View File

@ -1,11 +1,10 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
let
version = "1.99.19-beta";
in
buildOcaml {
stdenv.mkDerivation rec {
name = "ocp-build";
inherit version;
name = "ocaml${ocaml.version}-ocp-build-${version}";
src = fetchFromGitHub {
owner = "OCamlPro";
@ -14,7 +13,7 @@ buildOcaml {
sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
};
buildInputs = [ ocaml ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
preConfigure = ''

37
pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
View File

@ -1,37 +0,0 @@
{ 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.6-beta";
assert versionAtLeast "0.9.8" (getVersion cmdliner);
stdenv.mkDerivation {
name = "ocp-indent-1.5.2";
src = fetchzip {
url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
};
nativeBuildInputs = [ ocpBuild opam ];
buildInputs = [ ocaml findlib cmdliner ];
createFindlibDestdir = true;
preConfigure = "patchShebangs ./install.sh";
postInstall = ''
mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
'';
meta = with stdenv.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 ];
};
}

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

@ -1,14 +1,14 @@
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, 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 ocpBuild) "1.99.6-beta";
assert versionAtLeast (getVersion ocp-build) "1.99.6-beta";
stdenv.mkDerivation rec {
name = "ocp-indent-${version}";
name = "ocaml${ocaml.version}-ocp-indent-${version}";
version = "1.6.1";
src = fetchzip {
@ -16,16 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
};
nativeBuildInputs = [ ocpBuild opam ];
nativeBuildInputs = [ ocp-build ];
buildInputs = [ ocaml findlib cmdliner ];
createFindlibDestdir = true;
preConfigure = "patchShebangs ./install.sh";
postInstall = ''
mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
'';
inherit (jbuilder) installPhase;
meta = with stdenv.lib; {
homepage = http://typerex.ocamlpro.com/ocp-indent.html;

34
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@ -1,39 +1,23 @@
{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
stdenv.mkDerivation rec {
assert versionAtLeast (getVersion ocaml) "4";
assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta";
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
let
version = "1.1.5";
in
stdenv.mkDerivation {
name = "ocp-index-${version}";
version = "1.1.6";
name = "ocaml${ocaml.version}-ocp-index-${version}";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-index";
rev = version;
sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
};
patches = [ (fetchpatch {
url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
}) ];
buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
propagatedBuildInputs = [ ocp-indent ];
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
propagatedBuildInputs = [ ocpIndent ];
buildPhase = "jbuilder build -p ocp-index";
createFindlibDestdir = true;
preBuild = "export TERM=xterm";
postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}";
inherit (jbuilder) installPhase;
meta = {
homepage = http://typerex.ocamlpro.com/ocp-index.html;

9
pkgs/top-level/ocaml-packages.nix
View File

@ -139,8 +139,6 @@ let
cil = callPackage ../development/ocaml-modules/cil { };
cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { };
cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
@ -494,12 +492,11 @@ let
ocf = callPackage ../development/ocaml-modules/ocf { };
ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; };
ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };
ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { };