Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e548d2717ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4338ddd0f95f
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Jul 1, 2017

  1. ocamlPackages.jsonm: 1.0.0 -> 1.0.1

    @vbgl
    vbgl committed Jul 1, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8fd3645 View commit details

  2. ocamlPackages.conduit: 0.8.3 -> 0.10.0

    @vbgl
    vbgl committed Jul 1, 2017
    Copy the full SHA
    352d487 View commit details

  3. ocamlPackages.conduit: 0.10.0 -> 0.15.4 

    Keeping the old version under attribute conduit_p4.
    @vbgl
    vbgl committed Jul 1, 2017
    Copy the full SHA
    fe9147a View commit details

  4. ocamlPackages.cohttp: 0.19.3 -> 0.22.0 

    Keeping the old version under attribute cohttp_p4
    @vbgl
    vbgl committed Jul 1, 2017
    Copy the full SHA
    6875115 View commit details

  5. ocamlPackages.mstruct: init at 1.3.3 

    Mstruct is a thin mutable layer on top of cstruct

Homepage: https://github.com/mirage/ocaml-mstruct
    @vbgl
    vbgl committed Jul 1, 2017
    Copy the full SHA
    4338ddd View commit details
30 changes: 30 additions & 0 deletions pkgs/development/ocaml-modules/cohttp/0.19.3.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4
, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, lwt ? null, async_p4 ? null, async_ssl_p4 ? null
}:

buildOcaml rec {
name = "cohttp";
version = "0.19.3";

minimumSupportedOcamlVersion = "4.01";

src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
};

buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];

buildFlags = "PREFIX=$(out)";

meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cohttp;
description = "Very lightweight HTTP server using Lwt or Async";
license = licenses.mit;
maintainers = [ maintainers.ericbmerritt ];
};
}
49 changes: 27 additions & 22 deletions pkgs/development/ocaml-modules/cohttp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4
, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, lwt ? null, async_p4 ? null, async_ssl_p4 ? null
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
, ppx_fields_conv, ppx_sexp_conv
, base64, fieldslib, uri, conduit
# Optional for async and lwt support:
, async , async_ssl, cmdliner, fmt, magic-mime, ocaml_lwt, tls
}:

buildOcaml rec {
name = "cohttp";
version = "0.19.3";
stdenv.mkDerivation rec {
version = "0.22.0";
name = "ocaml${ocaml.version}-cohttp-${version}";

minimumSupportedOcamlVersion = "4.01";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-cohttp";
rev = "v${version}";
sha256 = "1iy4ynh0yrw8337nsa9zvgcf476im0bhccsbs0vki3c5yxw2x60d";
};

src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
};
buildInputs = [ ocaml findlib ocamlbuild ppx_fields_conv ppx_sexp_conv conduit
async async_ssl cmdliner fmt magic-mime ocaml_lwt tls ];

buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];
propagatedBuildInputs = [ base64 fieldslib uri ];

buildFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];

meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cohttp;
description = "Very lightweight HTTP server using Lwt or Async";
license = licenses.mit;
maintainers = [ maintainers.ericbmerritt ];
};
createFindlibDestdir = true;

meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
26 changes: 26 additions & 0 deletions pkgs/development/ocaml-modules/conduit/0.10.0.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
}:

buildOcaml rec {
name = "conduit";
version = "0.10.0";

src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh";
};

propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ];
buildInputs = stdenv.lib.optional (lwt != null) lwt
++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;

meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-conduit;
description = "Resolve URIs into communication channels for Async or Lwt ";
license = licenses.mit;
maintainers = [ maintainers.ericbmerritt ];
};
}
47 changes: 27 additions & 20 deletions pkgs/development/ocaml-modules/conduit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
, ppx_driver, ppx_sexp_conv
, ipaddr, uri, logs
, ocaml_lwt ? null
, async ? null, async_ssl ? null
, tls ? null
}:

buildOcaml rec {
name = "conduit";
version = "0.8.3";
stdenv.mkDerivation rec {
version = "0.15.4";
name = "ocaml${ocaml.version}-conduit-${version}";

src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
};
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-conduit";
rev = "v${version}";
sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq";
};

propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ];
buildInputs = stdenv.lib.optional (lwt != null) lwt
++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv
ocaml_lwt async async_ssl tls ];
propagatedBuildInputs = [ ipaddr uri logs ];

meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-conduit;
description = "Resolve URIs into communication channels for Async or Lwt ";
license = licenses.mit;
maintainers = [ maintainers.ericbmerritt ];
};
createFindlibDestdir = true;

meta = {
description = "Network connection library for TCP and SSL";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/jsonm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }:

let version = "1.0.0"; in
let version = "1.0.1"; in

stdenv.mkDerivation {
name = "ocaml${ocaml.version}-jsonm-${version}";

src = fetchurl {
url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
sha256 = "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62";
sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
};

buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
33 changes: 33 additions & 0 deletions pkgs/development/ocaml-modules/mstruct/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
, cstruct
}:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "mstruct is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
version = "1.3.3";
name = "ocaml${ocaml.version}-mstruct-${version}";

src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-mstruct";
rev = "v${version}";
sha256 = "1rxjzkg6156vl6yazbk1h0ndqj80wym5aliaapijf60apqqmsp4s";
};

buildInputs = [ ocaml findlib jbuilder opam ];

propagatedBuildInputs = [ cstruct ];

inherit (jbuilder) installPhase;

meta = {
description = "A thin mutable layer on top of cstruct";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
22 changes: 17 additions & 5 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -114,10 +114,6 @@ let
};
camlimages = camlimages_4_1;

conduit = callPackage ../development/ocaml-modules/conduit {
lwt = ocaml_lwt;
};

biniou = callPackage ../development/ocaml-modules/biniou { };

bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
@@ -132,10 +128,24 @@ let

cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { };

cohttp = callPackage ../development/ocaml-modules/cohttp {
cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
lwt = ocaml_lwt;
};

cohttp =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/cohttp { }
else cohttp_p4;

conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix {
lwt = ocaml_lwt;
};

conduit =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/conduit { }
else conduit_p4;

config-file = callPackage ../development/ocaml-modules/config-file { };

containers = callPackage ../development/ocaml-modules/containers { };
@@ -306,6 +316,8 @@ let

mparser = callPackage ../development/ocaml-modules/mparser { };

mstruct = callPackage ../development/ocaml-modules/mstruct { };

mtime = callPackage ../development/ocaml-modules/mtime { };

nocrypto = callPackage ../development/ocaml-modules/nocrypto {