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

Merge pull request #17147 from regnat/ocamlUpdates

Browse Source 
ocamlPackages : update some packages
This commit is contained in:
Joachim F
2016-09-23 19:55:10 +02:00
committed by GitHub
parent 057bfdb689 08b85f5f99
commit ac8206e31d
11 changed files with 279 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/development/tools/ocaml/camlp4/4_03.nix Normal file
View File

@@ -0,0 +1,45 @@
{stdenv, fetchzip, which, ocaml, ocamlbuild}:
let
ocaml_version = (stdenv.lib.getVersion ocaml);
version = "4.03+1";
in
assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation {
name = "camlp4-${version}";
src = fetchzip {
url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq";
};
buildInputs = [ which ocaml ocamlbuild ];
dontAddPrefix = true;
preConfigure = ''
configureFlagsArray=(
--bindir=$out/bin
--libdir=$out/lib/ocaml/${ocaml_version}/site-lib
--pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib
)
'';
postConfigure = ''
substituteInPlace camlp4/META.in \
--replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
'';
makeFlags = "all";
installTargets = "install install-META";
meta = with stdenv.lib; {
description = "A software system for writing extensible parsers for programming languages";
homepage = https://github.com/ocaml/camlp4;
platforms = ocaml.meta.platforms or [];
};
}

16
pkgs/development/tools/ocaml/merlin/default.nix
View File

@@ -1,9 +1,19 @@
{ stdenv, fetchzip, ocaml, findlib, yojson, menhir
{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib
, withEmacsMode ? false, emacs }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
let version = "2.3.1"; in
let
version = if lib.versionOlder (lib.getVersion ocaml) "4.02.0"
then
"2.3.1"
else
"2.5.0";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
"2.5.0" = "1q09mnq4qmh6vfn45qxh2v81l364iazcpjs5dyczmlhln8b25bff";
};
in
stdenv.mkDerivation {
@@ -11,7 +21,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
sha256 = hashes."${version}";
};
buildInputs = [ ocaml findlib yojson menhir ]

42
pkgs/development/tools/ocaml/ocamlbuild/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4,
ocamlmod, ocamlify, ounit, expect}:
let
version = "0.9.2";
in
stdenv.mkDerivation {
name = "ocamlbuild";
inherit version;
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocamlbuild";
rev = version;
sha256 = "0q4bvik08v444g1pill9zgwal48xs50jf424lbryfvqghhw5xjjc";
};
createFindlibDestdir = true;
buildInputs = [ ocaml findlib ];
configurePhase = ''
make -f configure.make Makefile.config \
"OCAMLBUILD_PREFIX=$out" \
"OCAMLBUILD_BINDIR=$out/bin" \
"OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
'';
# configurePhase = "ocaml setup.ml -configure --prefix $out";
# buildPhase = "ocaml setup.ml -build";
# installPhase = "ocaml setup.ml -install";
# meta = with stdenv.lib; {
# homepage = http://oasis.forge.ocamlcore.org/;
# description = "Configure, build and install system for OCaml projects";
# license = licenses.lgpl21;
# platforms = ocaml.meta.platforms or [];
# maintainers = with maintainers; [
# vbgl z77z
# ];
# };
}

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

@@ -1,20 +1,25 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
let
version = "1.99.17-beta";
in
buildOcaml {
let version = "1.99.16-beta"; in
stdenv.mkDerivation {
name = "ocp-build-${version}";
name = "ocp-build";
inherit version;
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-build";
rev = version;
sha256 = "1nkd7wlf1vrc4p20bs94vbkd970q2ag23csh9a897ka65rk08gvw";
sha256 = "0k1gi5v9as5l8h5illgl5prsd5z1i14y5j2k920ay1a3rv697b02";
};
buildInputs = [ ocaml findlib ncurses ];
buildInputs = [ ocaml ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
preConfigure = ''
export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR"
'';
meta = with stdenv.lib; {
homepage = http://www.typerex.org/ocp-build.html;

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

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
@@ -7,23 +7,34 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
let
version = "1.1.2";
patch402 = fetchurl {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-index/ocp-index.1.1.2/files/ocaml.4.02.patch;
sha256 = "1wcpn2pv7h8ia3ybmzdlm8v5hfvq1rgmlj02wwj0yh3vqjvxqvsm";
version = "1.1.4";
ocaml_version = getVersion ocaml;
srcs = {
"4.03.0" = {
rev = "${version}-4.03";
sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv";
};
"4.02.3" = {
rev = "${version}-4.02";
sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8";
};
"4.01.0" = {
rev = "${version}";
sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d";
};
};
src = fetchFromGitHub ({
owner = "OCamlPro";
repo = "ocp-index";
} // srcs."${ocaml_version}");
in
stdenv.mkDerivation {
name = "ocp-index-${version}";
src = fetchzip {
url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
sha256 = "0cz0bz5nisc5r23b1w07q2bl489gd09mg8rp9kyq9m6rj669b18l";
};
patches = optional (versionAtLeast (getVersion ocaml) "4.02") patch402;
inherit src;
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;