swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.resource-pooling: 0.6 → 1.1

Browse source 
ocamlPackages.ocsigen-start: 1.8.0 → 2.7.0
This commit is contained in:
Vincent Laporte 2020-02-11 17:45:17 +01:00 committed by Vincent Laporte
parent a1d8399ff1
commit c589de98e2
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/ocaml-modules/ocsigen-start/default.nix
View file

@ -1,14 +1,15 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocsigen-toolkit, pgocaml, macaque, safepass, yojson
, js_of_ocaml-camlp4, lwt_camlp4
, cohttp-lwt-unix
, resource-pooling
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "1.8.0";
version = "2.7.0";
buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 lwt_camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
buildInputs = [ ocaml findlib js_of_ocaml-camlp4 lwt_camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix camlp4 ];
patches = [ ./templates-dir.patch ];
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = "ocsigen-start";
rev = version;
sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s";
sha256 = "1kp9g679xnff2ybwsicnc9c203hi9ri1ijbpp6221b2sj6zxf2wc";
};
meta = {

27
pkgs/development/ocaml-modules/resource-pooling/default.nix
View file

@ -1,35 +1,26 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, lwt_log }:
{ lib, fetchFromGitHub, buildDunePackage, lwt_log }:
let pname = "resource-pooling"; in
buildDunePackage rec {
version = "1.1";
pname = "resource-pooling";
if !stdenv.lib.versionAtLeast ocaml.version "4.06"
then throw "${pname} is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "0.6";
name = "ocaml${ocaml.version}-${pname}-${version}";
minimumOCamlVersion = "4.06";
src = fetchFromGitHub {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "1hw98a4pndq6ms4vfsyz0ynfz8g21fm73fc7s1gx824fhdx4ywgd";
sha256 = "0wsbnwszafdv3gsiiaslgf6m6pfx74h7h19i0gp2c4ivdiv3wck9";
};
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ lwt_log ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
createFindlibDestdir = true;
installPhase = "ocaml setup.ml -install";
doCheck = true;
meta = {
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
description = "A library for pooling resources like connections, threads, or similar";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}