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

Merge pull request #12064 from FlorentBecker/eliom42

Browse Source 
Eliom42
This commit is contained in:
vbgl 2016-01-18 09:32:48 +01:00
commit c23b0856fd
7 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,13 +4,13 @@
buildOcaml rec {
name = "cohttp";
version = "0.17.1";
version = "0.19.3";
minimumSupportedOcamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673";
sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
};
buildInputs = [ alcotest ];

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

@ -8,12 +8,12 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
stdenv.mkDerivation rec
{
pname = "eliom";
version = "4.1.0";
version = "4.2.0";
name = "${pname}-${version}";
src = fetchurl {
url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz;
sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";
url = https://github.com/ocsigen/eliom/archive/4.2.tar.gz;
sha256 = "0gbqzgn6xgpq6irz2sfr92qj3hjcwl45wy0inc4ps5r15nvq1l9h";
};
patches = [ ./camlp4.patch ];

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

@ -1,7 +1,7 @@
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
let
version = "2.4.6";
version = "2.5.0";
inherit (stdenv.lib) optional getVersion versionAtLeast;
ocaml_version = getVersion ocaml;
in
@ -13,16 +13,15 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9";
sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr";
};
buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ];
propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ]
++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]
++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";
configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ];
createFindlibDestdir = true;

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

@ -9,11 +9,11 @@ let mkpath = p: n:
in
stdenv.mkDerivation {
name = "ocsigenserver-2.5";
name = "ocsigenserver-2.6";
src = fetchurl {
url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
url = https://github.com/ocsigen/ocsigenserver/archive/2.6.tar.gz;
sha256 = "0638xvlr0sssvjarmdwhgh7vbgdx8wiyjwq73w1bkjfwl7qm21zp";
};
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt

9
pkgs/development/ocaml-modules/ssl/default.nix
View File

@ -2,15 +2,16 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "0.4.7";
version = "0.5.2";
in
stdenv.mkDerivation {
name = "ocaml-ssl-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz";
sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9";
url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
};
buildInputs = [which ocaml findlib];
@ -19,8 +20,6 @@ stdenv.mkDerivation {
dontAddPrefix = true;
configureFlags = "--disable-ldconf";
createFindlibDestdir = true;
meta = {

11
pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
View File

@ -8,14 +8,3 @@
####
--- old/Makefile 2014-09-30 16:40:37.000000000 +0200
+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200
@@ -52,7 +52,7 @@
install-bin:
install -d -m 755 $(BINDIR)
install $(BIN) $(BINDIR)
- install $(TOOLS) $(BINDIR)
+ install $(TOOLS) $(BINDIR) || true
uninstall: uninstall-lib uninstall-bin

24
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,18 +1,24 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata}:
cmdliner, tyxml, reactivedata, cppo, which, base64}:
stdenv.mkDerivation {
name = "js_of_ocaml-2.5";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
let camlp4_patch = fetchurl {
url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch";
sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39";
};
in
stdenv.mkDerivation {
name = "js_of_ocaml-2.6";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
};
buildInputs = [ocaml findlib menhir ocsigen_deriving
cmdliner tyxml reactivedata];
cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ];
patches = [ ./Makefile.conf.diff ];
patches = [ ./Makefile.conf.diff camlp4_patch ];
createFindlibDestdir = true;