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

Merge pull request #4215 from vbgl/camlp4

Browse Source 
Adds camlp4
This commit is contained in:
Mateusz Kowalczyk 2014-09-23 22:28:54 +01:00
commit f0dae64cf3
15 changed files with 82 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/camomile/0.8.2.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, minimal ? true}: {stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48"; sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/javalib/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}: {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
let let
pname = "javalib"; pname = "javalib";
version = "2.3"; version = "2.3";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
}; };
buildInputs = [ which ocaml findlib camlzip extlib ]; buildInputs = [ which ocaml findlib camlp4 ];
patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];

4
pkgs/development/ocaml-modules/lablgtk/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}: {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f";
}; };
buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview]; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world"; buildFlags = "world";

2
pkgs/development/ocaml-modules/ocamlgraph/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi"; sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
}; };
buildInputs = [ ocaml findlib ocamlPackages.lablgtk ]; buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
patches = ./destdir.patch; patches = ./destdir.patch;

4
pkgs/development/ocaml-modules/ounit/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76"; sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib camlp4];
dontAddPrefix = true; dontAddPrefix = true;

4
pkgs/development/ocaml-modules/sawja/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }: {stdenv, fetchurl, which, perl, ocaml, findlib, javalib, camlp4 }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
}; };
buildInputs = [ which perl ocaml findlib javalib ]; buildInputs = [ which perl ocaml findlib camlp4 ];
patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];

4
pkgs/development/ocaml-modules/typeconv/108.08.00.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/typeconv/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, fetchurl, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx";
}; };
buildInputs = [ocaml findlib ]; buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;

2
pkgs/development/tools/misc/coccinelle/default.nix
View File

@ -14,7 +14,7 @@ in stdenv.mkDerivation {
}; };
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
ocaml findlib menhir ocaml findlib menhir ocamlPackages.camlp4
ocaml_pcre pycaml ocaml_pcre pycaml
python ncurses pkgconfig python ncurses pkgconfig
makeWrapper makeWrapper

46
pkgs/development/tools/ocaml/camlp4/default.nix Normal file
View File

@ -0,0 +1,46 @@
{stdenv, fetchurl, which, ocaml}:
let
ocaml_version = (stdenv.lib.getVersion ocaml);
in
assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation {
name = "camlp4-4.02.0+1";
src = fetchurl {
url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz;
sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn";
};
buildInputs = [ which ocaml ];
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
substituteInPlace camlp4/config/Camlp4_config.ml \
--replace \
"Filename.concat ocaml_standard_library" \
"Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
'';
makePhase = "make 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;
};
}

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ounit}: {stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocamlify-0.0.2"; name = "ocamlify-0.0.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
}; };
buildInputs = [ocaml findlib ounit]; buildInputs = [ocaml findlib];
configurePhase = "ocaml setup.ml -configure --prefix $out"; configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build"; buildPhase = "ocaml setup.ml -build";

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ounit}: {stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocamlmod-0.0.7"; name = "ocamlmod-0.0.7";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3"; sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3";
}; };
buildInputs = [ocaml findlib ounit]; buildInputs = [ocaml findlib];
configurePhase = "ocaml setup.ml -configure --prefix $out"; configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build"; buildPhase = "ocaml setup.ml -build";

17
pkgs/top-level/all-packages.nix
View File

@ -3351,6 +3351,11 @@ let
camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp4 =
if lib.versionOlder "4.02" ocaml_version
then callPackage ../development/tools/ocaml/camlp4 { }
else null;
camlp5_old_strict = camlp5_old_strict =
if lib.versionOlder "4.00" ocaml_version if lib.versionOlder "4.00" ocaml_version
then camlp5_6_strict then camlp5_6_strict
@ -3566,7 +3571,9 @@ let
opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix {
inherit (ocamlPackages_4_01_0) ocaml;
};
opam = opam_1_1; opam = opam_1_1;
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
@ -11385,8 +11392,8 @@ let
alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
coq = callPackage ../applications/science/logic/coq { coq = callPackage ../applications/science/logic/coq {
inherit (ocamlPackages) findlib lablgtk; inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
}; };
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
@ -11459,8 +11466,8 @@ let
picosat = callPackage ../applications/science/logic/picosat {}; picosat = callPackage ../applications/science/logic/picosat {};
prooftree = callPackage ../applications/science/logic/prooftree { prooftree = callPackage ../applications/science/logic/prooftree {
inherit (ocamlPackages) findlib lablgtk; inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
}; };
prover9 = callPackage ../applications/science/logic/prover9 { }; prover9 = callPackage ../applications/science/logic/prover9 { };