BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
ocamlPackages.ocsigen-start: 6.1.0 → 6.1.2; ocsigen-toolkit: 3.2.0 → 3.3.4
This commit is contained in:
Ulrik Strid 2024-01-17 09:14:50 +01:00 committed by GitHub
commit ce19e23bc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/ocaml-modules/eliom/default.nix
View file

@ -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
];

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

@ -1,17 +1,16 @@
{ 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 = ''

12
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
View file

@ -5,18 +5,12 @@
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;
strictDeps = true;
installPhase = ''
runHook preInstall
@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7";
hash = "sha256-6ccu8WJxUwpR5YyB4j1jQPWba8GhQDxuw+IDHswQpSA=";
};
meta = {