Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Adds camlp4

Camlp4 is a software system for writing extensible parsers for
programming languages.

Camlp4 was part of the official OCaml distribution until its version
4.01.0.

Homepage: https://github.com/ocaml/camlp4

+78 -25
+2 -2
pkgs/development/ocaml-modules/camomile/0.8.2.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 13 sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; 14 }; 15 16 - buildInputs = [ocaml findlib]; 17 18 createFindlibDestdir = true; 19
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 13 sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; 14 }; 15 16 + buildInputs = [ocaml findlib camlp4]; 17 18 createFindlibDestdir = true; 19
+2 -2
pkgs/development/ocaml-modules/camomile/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 12 sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; 13 }; 14 15 - buildInputs = [ocaml findlib]; 16 17 createFindlibDestdir = true; 18
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 12 sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; 13 }; 14 15 + buildInputs = [ocaml findlib camlp4]; 16 17 createFindlibDestdir = true; 18
+2 -2
pkgs/development/ocaml-modules/extlib/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib, minimal ? true}: 2 3 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; 4 ··· 10 sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48"; 11 }; 12 13 - buildInputs = [ocaml findlib]; 14 15 createFindlibDestdir = true; 16
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}: 2 3 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; 4 ··· 10 sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48"; 11 }; 12 13 + buildInputs = [ocaml findlib camlp4]; 14 15 createFindlibDestdir = true; 16
+2 -2
pkgs/development/ocaml-modules/javalib/default.nix
··· 1 - {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}: 2 let 3 pname = "javalib"; 4 version = "2.3"; ··· 14 sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; 15 }; 16 17 - buildInputs = [ which ocaml findlib camlzip extlib ]; 18 19 patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; 20
··· 1 + {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: 2 let 3 pname = "javalib"; 4 version = "2.3"; ··· 14 sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; 15 }; 16 17 + buildInputs = [ which ocaml findlib camlp4 ]; 18 19 patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; 20
+2 -2
pkgs/development/ocaml-modules/lablgtk/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 15 sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; 16 }; 17 18 - buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview]; 19 20 configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; 21 buildFlags = "world";
··· 1 + {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 15 sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; 16 }; 17 18 + buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; 19 20 configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; 21 buildFlags = "world";
+2 -2
pkgs/development/ocaml-modules/ounit/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 12 sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76"; 13 }; 14 15 - buildInputs = [ocaml findlib]; 16 17 dontAddPrefix = true; 18
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 12 sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76"; 13 }; 14 15 + buildInputs = [ocaml findlib camlp4]; 16 17 dontAddPrefix = true; 18
+2 -2
pkgs/development/ocaml-modules/sawja/default.nix
··· 1 - {stdenv, fetchurl, which, perl, ocaml, findlib, javalib }: 2 3 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; 4 ··· 16 sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; 17 }; 18 19 - buildInputs = [ which perl ocaml findlib javalib ]; 20 21 patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; 22
··· 1 + {stdenv, fetchurl, which, perl, ocaml, findlib, javalib, camlp4 }: 2 3 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; 4 ··· 16 sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; 17 }; 18 19 + buildInputs = [ which perl ocaml findlib camlp4 ]; 20 21 patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; 22
+2 -2
pkgs/development/ocaml-modules/typeconv/108.08.00.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 14 sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; 15 }; 16 17 - buildInputs = [ocaml findlib]; 18 19 createFindlibDestdir = true; 20
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 14 sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; 15 }; 16 17 + buildInputs = [ocaml findlib camlp4]; 18 19 createFindlibDestdir = true; 20
+2 -2
pkgs/development/ocaml-modules/typeconv/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 14 sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; 15 }; 16 17 - buildInputs = [ocaml findlib ]; 18 19 createFindlibDestdir = true; 20
··· 1 + {stdenv, fetchurl, ocaml, findlib, camlp4}: 2 3 let 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; ··· 14 sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; 15 }; 16 17 + buildInputs = [ocaml findlib camlp4]; 18 19 createFindlibDestdir = true; 20
+46
pkgs/development/tools/ocaml/camlp4/default.nix
···
··· 1 + {stdenv, fetchurl, which, ocaml}: 2 + let 3 + ocaml_version = (stdenv.lib.getVersion ocaml); 4 + in 5 + 6 + assert stdenv.lib.versionAtLeast ocaml_version "4.02"; 7 + 8 + stdenv.mkDerivation { 9 + name = "camlp4-4.02.0+1"; 10 + src = fetchurl { 11 + url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz; 12 + sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn"; 13 + }; 14 + 15 + buildInputs = [ which ocaml ]; 16 + 17 + dontAddPrefix = true; 18 + 19 + preConfigure = '' 20 + configureFlagsArray=( 21 + --bindir=$out/bin 22 + --libdir=$out/lib/ocaml/${ocaml_version}/site-lib 23 + --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib 24 + ) 25 + ''; 26 + 27 + postConfigure = '' 28 + substituteInPlace camlp4/META.in \ 29 + --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 30 + substituteInPlace camlp4/config/Camlp4_config.ml \ 31 + --replace \ 32 + "Filename.concat ocaml_standard_library" \ 33 + "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\"" 34 + ''; 35 + 36 + 37 + makePhase = "make all"; 38 + 39 + installTargets = "install install-META"; 40 + 41 + meta = with stdenv.lib; { 42 + description = "A software system for writing extensible parsers for programming languages"; 43 + homepage = https://github.com/ocaml/camlp4; 44 + platforms = ocaml.meta.platforms; 45 + }; 46 + }
+2 -2
pkgs/development/tools/ocaml/ocamlify/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib, ounit}: 2 3 stdenv.mkDerivation { 4 name = "ocamlify-0.0.2"; ··· 8 sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; 9 }; 10 11 - buildInputs = [ocaml findlib ounit]; 12 13 configurePhase = "ocaml setup.ml -configure --prefix $out"; 14 buildPhase = "ocaml setup.ml -build";
··· 1 + {stdenv, fetchurl, ocaml, findlib}: 2 3 stdenv.mkDerivation { 4 name = "ocamlify-0.0.2"; ··· 8 sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; 9 }; 10 11 + buildInputs = [ocaml findlib]; 12 13 configurePhase = "ocaml setup.ml -configure --prefix $out"; 14 buildPhase = "ocaml setup.ml -build";
+2 -2
pkgs/development/tools/ocaml/ocamlmod/default.nix
··· 1 - {stdenv, fetchurl, ocaml, findlib, ounit}: 2 3 stdenv.mkDerivation { 4 name = "ocamlmod-0.0.7"; ··· 8 sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3"; 9 }; 10 11 - buildInputs = [ocaml findlib ounit]; 12 13 configurePhase = "ocaml setup.ml -configure --prefix $out"; 14 buildPhase = "ocaml setup.ml -build";
··· 1 + {stdenv, fetchurl, ocaml, findlib}: 2 3 stdenv.mkDerivation { 4 name = "ocamlmod-0.0.7"; ··· 8 sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3"; 9 }; 10 11 + buildInputs = [ocaml findlib]; 12 13 configurePhase = "ocaml setup.ml -configure --prefix $out"; 14 buildPhase = "ocaml setup.ml -build";
+10 -3
pkgs/top-level/all-packages.nix
··· 3351 3352 camlidl = callPackage ../development/tools/ocaml/camlidl { }; 3353 3354 camlp5_old_strict = 3355 if lib.versionOlder "4.00" ocaml_version 3356 then camlp5_6_strict ··· 3566 opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; 3567 3568 opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; 3569 - opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; 3570 opam = opam_1_1; 3571 3572 ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; ··· 11372 alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; 11373 11374 coq = callPackage ../applications/science/logic/coq { 11375 - inherit (ocamlPackages) findlib lablgtk; 11376 - camlp5 = ocamlPackages.camlp5_transitional; 11377 }; 11378 11379 coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
··· 3351 3352 camlidl = callPackage ../development/tools/ocaml/camlidl { }; 3353 3354 + camlp4 = 3355 + if lib.versionOlder "4.02" ocaml_version 3356 + then callPackage ../development/tools/ocaml/camlp4 { } 3357 + else null; 3358 + 3359 camlp5_old_strict = 3360 if lib.versionOlder "4.00" ocaml_version 3361 then camlp5_6_strict ··· 3571 opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; 3572 3573 opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; 3574 + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { 3575 + inherit (ocamlPackages_4_01_0) ocaml; 3576 + }; 3577 opam = opam_1_1; 3578 3579 ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; ··· 11379 alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; 11380 11381 coq = callPackage ../applications/science/logic/coq { 11382 + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; 11383 + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; 11384 }; 11385 11386 coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {