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

Merge pull request #59131 from vbgl/ocaml-uri-2.2

Browse Source 
ocamlPackages.uri: 1.9.6 -> 2.2.0; ocamlPackages.cohttp: 1.1.1 -> 2.0.0
This commit is contained in:
Vincent Laporte 2019-04-22 21:16:33 +02:00 committed by GitHub
commit b387dced20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,27 +1,27 @@
{ stdenv, fetchFromGitHub, buildDunePackage
{ lib, fetchFromGitHub, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv, ppx_deriving
, base64, fieldslib, jsonm, re, stringext, uri
}:
buildDunePackage rec {
pname = "cohttp";
version = "1.1.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-cohttp";
rev = "v${version}";
sha256 = "1dzd6vy43b7p9xplzg2whylz5br59zxaqywa14b4l377f31gnwq1";
sha256 = "0nz9y7l5s9a2rq5sb1m5705h99wvf4dk3fhcgragwhy5nwwzcya8";
};
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri ];
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}

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

@ -1,4 +1,4 @@
{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv }:
{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp
@ -10,5 +10,5 @@ buildDunePackage rec {
buildInputs = [ uri ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp ocaml_lwt ];
propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
}

31
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -1,24 +1,39 @@
{ stdenv, fetchurl, buildDunePackage, ppx_sexp_conv, ounit
, re, sexplib, stringext
{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit
, re, sexplib0, sexplib, stringext
, legacy ? false
}:
let params =
if legacy then rec {
version = "1.9.6";
archive = version;
sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0";
inherit sexplib;
} else rec {
version = "2.2.0";
archive = "v${version}";
sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi";
sexplib = sexplib0;
}
; in
buildDunePackage rec {
pname = "uri";
version = "1.9.6";
inherit (params) version;
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0";
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${params.archive}.tbz";
inherit (params) sha256;
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ];
propagatedBuildInputs = [ ppx_sexp_conv re params.sexplib stringext ];
doCheck = true;
meta = {
homepage = "https://github.com/mirage/ocaml-uri";
description = "RFC3986 URI parsing library for OCaml";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}

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

@ -67,7 +67,7 @@ let
};
};
};
uri = uri.override {
uri = uri_1_9.override {
inherit (janeStreet_0_9_0) ppx_sexp_conv sexplib;
};
};
@ -152,9 +152,7 @@ let
cohttp =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/cohttp {
base64 = base64_2;
}
then callPackage ../development/ocaml-modules/cohttp { }
else cohttp_p4;
cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };
@ -757,6 +755,10 @@ let
then callPackage ../development/ocaml-modules/uri { }
else callPackage ../development/ocaml-modules/uri/legacy.nix { };
uri_1_9 = callPackage ../development/ocaml-modules/uri {
legacy = true;
};
uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix {
legacyVersion = true;
};