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

Merge pull request #18765 from aske/ocaml-move

Browse Source 
Reorganize ocaml packages
This commit is contained in:
Joachim F
2016-09-26 23:17:53 +02:00
committed by GitHub
parent 67baa48161 43d6264f61
commit a5580c9951
28 changed files with 839 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/compcert/default.nix
View File

@@ -1,7 +1,10 @@
{ stdenv, fetchurl, coq, ocamlPackages
{ stdenv, lib, fetchurl
, coq, ocaml, findlib, menhir
, tools ? stdenv.cc
}:
assert lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "compcert-${version}";
version = "2.7.1";
@@ -11,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
};
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
buildInputs = [ coq ocaml findlib menhir ];
enableParallelBuilding = true;

8
pkgs/development/compilers/ocaml/3.08.0.nix
View File

@@ -1,10 +1,12 @@
{ stdenv, fetchurl, xlibsWrapper }:
stdenv.mkDerivation {
name = "ocaml-3.08.0";
stdenv.mkDerivation rec {
name = "ocaml-${version}";
version = "3.08.0";
builder = ./builder.sh;
src = fetchurl {
url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz;
url = "http://tarballs.nixos.org/${name}.tar.gz";
sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
};
configureScript = ./configure-3.08.0;

3
pkgs/development/compilers/ocaml/3.10.0.nix
View File

@@ -2,7 +2,8 @@
stdenv.mkDerivation (rec {
name = "ocaml-3.10.0";
name = "ocaml-${version}";
version = "3.10.0";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";

3
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@@ -8,7 +8,8 @@ in
stdenv.mkDerivation rec {
name = "ocaml-3.11.2";
name = "ocaml-${version}";
version = "3.11.2";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";

3
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@@ -8,7 +8,8 @@ in
stdenv.mkDerivation rec {
name = "ocaml-3.12.1";
name = "ocaml-${version}";
version = "3.12.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";

4
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
name = "ocaml-4.00.1";
name = "ocaml-${version}";
version = "4.00.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";

4
pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
View File

@@ -8,7 +8,8 @@ in
stdenv.mkDerivation rec {
name = "ber-metaocaml-003";
name = "ber-metaocaml-${version}";
version = "003";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2";
@@ -66,5 +67,6 @@ stdenv.mkDerivation rec {
A conservative extension of OCaml with the primitive type of code values,
and three basic multi-stage expression forms: Brackets, Escape, and Run
'';
broken = true;
};
}

1
pkgs/development/compilers/ocaml/generic.nix
View File

@@ -27,6 +27,7 @@ stdenv.mkDerivation (args // rec {
x11inc = x11env + "/include";
inherit name;
inherit version;
src = fetchurl {
url = real_url;

6
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
View File

@@ -2,7 +2,8 @@
stdenv.mkDerivation (rec {
name = "metaocaml-3.09-alpha-30";
name = "metaocaml-${version}";
version = "3.09-alpha-30";
src = fetchurl {
url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
@@ -26,7 +27,8 @@ stdenv.mkDerivation (rec {
meta = {
homepage = http://www.metaocaml.org/;
license = with stdenv.lib.licenses; [ qpl lgpl2 ];
desctiption = "A compiled, type-safe, multi-stage programming language";
description = "A compiled, type-safe, multi-stage programming language";
broken = true;
};
})

1
pkgs/development/libraries/cil-aterm/default.nix
View File

@@ -9,4 +9,5 @@ stdenv.mkDerivation {
patches = [./cil-aterm-1.3.6.patch];
buildInputs = [ ocaml perl ];
inherit ocaml perl;
meta.broken = true;
}

12
pkgs/development/ocaml-modules/ocamlnat/default.nix
View File

@@ -1,10 +1,14 @@
{stdenv, fetchurl, ocaml, findlib, ounit}:
{stdenv, lib, fetchurl, ocaml, findlib, ounit}:
stdenv.mkDerivation {
name = "ocamlnat-0.1.1";
# https://github.com/bmeurer/ocamlnat/issues/3
assert lib.versionOlder ocaml.version "4";
stdenv.mkDerivation rec {
name = "ocamlnat-${version}";
version = "0.1.1";
src = fetchurl {
url = http://benediktmeurer.de/files/source/ocamlnat-0.1.1.tar.bz2;
url = "http://benediktmeurer.de/files/source/${name}.tar.bz2";
sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1";
};

7
pkgs/development/tools/analysis/verasco/default.nix
View File

@@ -1,7 +1,10 @@
{ stdenv, fetchurl, coq, ocamlPackages
{ stdenv, lib, fetchurl
, coq, ocaml, findlib, menhir, zarith
, tools ? stdenv.cc
}:
assert lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "verasco-1.3";
src = fetchurl {
@@ -9,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8";
};
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir zarith ]);
buildInputs = [ coq ocaml findlib menhir zarith ];
preConfigure = ''
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'

11
pkgs/development/tools/misc/trv/default.nix
View File

@@ -1,5 +1,6 @@
{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2,
async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}:
{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
, cohttp, uri, tzdata}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -20,9 +21,9 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ core async async_unix
async_extra sexplib async_shell core_extended
async_find cohttp uri re2 ];
propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
async_extra_p4 sexplib_p4 async_shell core_extended_p4
async_find cohttp uri re2_p4 ];
createFindlibDestdir = true;
dontStrip = true;

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

@@ -1,4 +1,6 @@
{ stdenv, fetchzip, ncurses, ocamlPackages, opam }:
{ stdenv, fetchzip, ncurses
, ocaml, ocpBuild, findlib, lablgtk, ocp-index
, opam }:
stdenv.mkDerivation {
name = "ocaml-top-1.1.2";
@@ -7,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j";
};
buildInputs = [ ncurses opam ]
++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ];
configurePhase = ''
export TERM=xterm
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
homepage = http://www.typerex.org/ocaml-top.html;
license = stdenv.lib.licenses.gpl3;
description = "A simple cross-platform OCaml code editor built for top-level evaluation";
platforms = ocamlPackages.ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}

9
pkgs/development/tools/ocaml/ocamlmod/default.nix
View File

@@ -1,11 +1,12 @@
{stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation {
name = "ocamlmod-0.0.7";
stdenv.mkDerivation rec {
name = "ocamlmod-${version}";
version = "0.0.8";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/1350/ocamlmod-0.0.7.tar.gz;
sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3";
url = "http://forge.ocamlcore.org/frs/download.php/1544/${name}.tar.gz";
sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g";
};
buildInputs = [ocaml findlib];

1
pkgs/development/tools/ocaml/omake/default.nix
View File

@@ -33,5 +33,6 @@ stdenv.mkDerivation {
description = "A build system designed for scalability and portability";
homepage = "${webpage}";
license = "GPL";
broken = true;
};
}

4
pkgs/development/tools/ocaml/opam/1.0.0.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {

4
pkgs/development/tools/ocaml/opam/1.1.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {

4
pkgs/development/tools/ocaml/opam/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchgit, fetchurl, makeWrapper,
{ stdenv, lib, fetchgit, fetchurl, makeWrapper,
ocaml, unzip, ncurses, curl,
aspcudSupport ? !stdenv.isDarwin, aspcud
}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {