Unverified Commit ce19e23b authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #281076 from vbgl/ocaml-ocsigen-start-6.1.2 

ocamlPackages.ocsigen-start: 6.1.0 → 6.1.2; ocsigen-toolkit: 3.2.0 → 3.3.4
parents 7ec60593 8e1b04d1

pkgs/development/ocaml-modules/eliom/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
, js_of_ocaml-lwt

, js_of_ocaml-tyxml

, lwt_ppx

, ocamlnet

, ocsipersist

}:
@@ -33,7 +32,6 @@ buildDunePackage rec { 
  buildInputs = [

    js_of_ocaml-ocamlbuild

    js_of_ocaml-ppx_deriving_json

    ocamlnet

    ppx_optcomp

  ];

pkgs/development/ocaml-modules/ocsigen-start/default.nix

+3 −4
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson

, cohttp-lwt-unix, eliom

, resource-pooling

, ocamlnet

, ocsigen-ppx-rpc

}:



stdenv.mkDerivation rec {

  pname = "ocaml${ocaml.version}-ocsigen-start";

  version = "6.1.0";

  version = "6.1.2";



  nativeBuildInputs = [ ocaml findlib eliom ];

  buildInputs = [ ocsigen-ppx-rpc ];

  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];

  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];



  strictDeps = true;
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec { 
    owner = "ocsigen";

    repo = "ocsigen-start";

    rev = version;

    hash = "sha256-gHFPutoPYKTDsFninwBTc2WOIFd3+ghRYW2hi1y5MUs=";

    hash = "sha256-GhuH3rNdauJztEhygct6jCf+EmAtbSeyYP45stMzGFU=";

  };



  preInstall = ''

pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix

+3 −9
Original line number Diff line number Diff line
@@ -5,17 +5,11 @@ 
stdenv.mkDerivation rec {

 pname = "ocsigen-toolkit";

 name = "ocaml${ocaml.version}-${pname}-${version}";

 version = "3.2.0";

 version = "3.3.4";



 propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];

 nativeBuildInputs = [ ocaml findlib opaline eliom ];



 # Remove widgets not compatible with jsoo 4.1.0

 # https://github.com/ocsigen/ocsigen-toolkit/issues/221

 preConfigure = ''

   rm src/widgets/ot_{carousel,drawer,swipe,tongue}.eliom{,i}

 '';



 strictDeps = true;



 installPhase = ''
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec { 
    owner = "ocsigen";

    repo = pname;

    rev = version;

    sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7";

    hash = "sha256-6ccu8WJxUwpR5YyB4j1jQPWba8GhQDxuw+IDHswQpSA=";

  };



  meta = {