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

ocamlPackages.react: 1.2.0 -> 1.2.1

Browse Source
This commit is contained in:
Vincent Laporte 2017-10-05 05:57:03 +00:00
parent 184f80aeb8
commit c06e5a8d64
11 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam, ppx_tools, ppx_deriving, findlib reactivedata, opam, ppx_tools, ppx_deriving, findlib
, ocamlbuild , ocamlbuild
@ -24,7 +24,7 @@ stdenv.mkDerivation rec
propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
ocsigen_deriving js_of_ocaml ocsigen_deriving js_of_ocaml
calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";

4
pkgs/development/ocaml-modules/lambda-term/1.6.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
}; };
buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; buildInputs = [ libev ocaml findlib ocamlbuild lwt react ];
propagatedBuildInputs = [ camlp4 zed ]; propagatedBuildInputs = [ camlp4 zed ];

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

@ -1,5 +1,5 @@
{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
, ppx_tools, result, cppo , ppx_tools, result, cppo
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
@ -30,7 +30,7 @@ buildOcaml rec {
++ stdenv.lib.optional ppxSupport ppx_tools; ++ stdenv.lib.optional ppxSupport ppx_tools;
propagatedBuildInputs = [ result ] propagatedBuildInputs = [ result ]
++ optionals [ ocaml_react ocaml_ssl ] ++ optionals [ react ocaml_ssl ]
++ [ libev ]; ++ [ libev ];
configureScript = "ocaml setup.ml -configure"; configureScript = "ocaml setup.ml -configure";

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.1"; version = "1.0.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ lwt ocaml_react ]; propagatedBuildInputs = [ lwt react ];
createFindlibDestdir = true; createFindlibDestdir = true;

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, {stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
, camlzip, pgocaml , camlzip, pgocaml
@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
}; };
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt buildInputs = [ocaml which findlib react ocaml_ssl lwt
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }: { stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1"; version = "0.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ]; propagatedBuildInputs = [ js_of_ocaml lwt3 react ];
createFindlibDestdir = true; createFindlibDestdir = true;

22
pkgs/development/ocaml-modules/react/default.nix
View File

@ -1,29 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: { stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-react-1.2.0"; name = "ocaml-react-1.2.1";
src = fetchurl { src = fetchurl {
url = http://erratique.ch/software/react/releases/react-1.2.0.tbz; url = http://erratique.ch/software/react/releases/react-1.2.1.tbz;
sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8"; sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v";
}; };
unpackCmd = "tar xjf $src"; unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild opam ]; buildInputs = [ ocaml findlib topkg ocamlbuild opam ];
createFindlibDestdir = true; createFindlibDestdir = true;
configurePhase = "ocaml pkg/git.ml"; inherit (topkg) buildPhase installPhase;
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase =
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in
''
opam-installer --script --prefix=$out react.install > install.sh
sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh
sh install.sh
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://erratique.ch/software/react; homepage = http://erratique.ch/software/react;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }:
assert stdenv.lib.versionAtLeast ocaml.version "3.11"; assert stdenv.lib.versionAtLeast ocaml.version "3.11";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ ocaml findlib ocamlbuild opam ]; buildInputs = [ ocaml findlib ocamlbuild opam ];
propagatedBuildInputs = [ocaml_react]; propagatedBuildInputs = [ react ];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4"; version = "1.4";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
}; };
buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; buildInputs = [ ocaml findlib ocamlbuild react ];
propagatedBuildInputs = [ camomile ]; propagatedBuildInputs = [ camomile ];

2
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react { stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4
, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper
}: }:

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

@ -433,9 +433,6 @@ let
pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
ocaml_react = callPackage ../development/ocaml-modules/react { };
reactivedata = callPackage ../development/ocaml-modules/reactivedata {};
ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };
ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
@ -593,6 +590,10 @@ let
re = callPackage ../development/ocaml-modules/re { }; re = callPackage ../development/ocaml-modules/re { };
react = callPackage ../development/ocaml-modules/react { };
reactivedata = callPackage ../development/ocaml-modules/reactivedata {};
reason = callPackage ../development/compilers/reason { }; reason = callPackage ../development/compilers/reason { };
rope = callPackage ../development/ocaml-modules/rope { }; rope = callPackage ../development/ocaml-modules/rope { };