diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-08-30 16:08:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 16:08:03 +0200 |
| commit | e2575c7de1a3b01a9745a62b26b41f7480a77e39 (patch) | |
| tree | 28a360cf65c52f6f1cdf6d1c3d615f8906d3f607 /pkgs/development/ocaml-modules | |
| parent | dbad333a723f118641f6c55305b5b54027cfa571 (diff) | |
| parent | d874a520155a73111f227744672254de0624aae5 (diff) | |
| download | nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar.gz nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar.bz2 nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar.lz nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar.xz nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.tar.zst nixlib-e2575c7de1a3b01a9745a62b26b41f7480a77e39.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/0.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index e348c5d9325a..5717dd07b423 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -545,8 +545,8 @@ with self; ppx_optcomp = janePackage { pname = "ppx_optcomp"; - version = "0.14.1"; - hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"; + version = "0.14.3"; + hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"; minimumOCamlVersion = "4.04.2"; meta.description = "Optional compilation for OCaml"; propagatedBuildInputs = [ ppxlib ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index eccdcf80d7cc..0e430e2ba291 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,27 +5,27 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.7.0"; + version = "2.12.2"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; - installPhase = - '' + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH make install opaline -prefix $out + runHook postInstall ''; src = fetchFromGitHub { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; + sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy"; }; - createFindlibDestdir = true; - meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; |