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

Merge pull request #66467 from vbgl/ocaml-ocsigen-start-1.8.0

Browse Source 
ocsigen-start: 1.5.0 -> 1.8.0; ocsigen-toolkit: 2.0.0 -> 2.2.0
This commit is contained in:
Vincent Laporte
2019-08-18 09:24:39 +00:00
committed by GitHub
parent de8c33e705 08f438fe50
commit 7d4c8fb9f7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/ocsigen-start/default.nix
+10 -8
View File
@@ -1,14 +1,13 @@
{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server { stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
, js_of_ocaml-camlp4 , js_of_ocaml-camlp4
, resource-pooling , resource-pooling
}: }:
buildOcaml rec stdenv.mkDerivation rec {
{ name = "ocaml${ocaml.version}-ocsigen-start-${version}";
name = "ocsigen-start"; version = "1.8.0";
version = "1.5.0";
buildInputs = [ eliom js_of_ocaml-camlp4 ]; buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
patches = [ ./templates-dir.patch ]; patches = [ ./templates-dir.patch ];
@@ -17,11 +16,13 @@ buildOcaml rec
substituteInPlace "src/os_db.ml" --replace "citext" "text" substituteInPlace "src/os_db.ml" --replace "citext" "text"
''; '';
createFindlibDestdir = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocsigen"; owner = "ocsigen";
repo = name; repo = "ocsigen-start";
rev = version; rev = version;
sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s";
}; };
meta = { meta = {
@@ -31,6 +32,7 @@ buildOcaml rec
An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
''; '';
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
inherit (ocaml.meta) platforms;
maintainers = [ stdenv.lib.maintainers.gal_bolle ]; maintainers = [ stdenv.lib.maintainers.gal_bolle ];
}; };
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocsigen-toolkit"; pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.0.0"; version = "2.2.0";
propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
buildInputs = [ ocaml findlib opaline ]; buildInputs = [ ocaml findlib opaline ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen"; owner = "ocsigen";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s";
}; };
createFindlibDestdir = true; createFindlibDestdir = true;