Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dc2f24796eb7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be3f40bb99c5
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 20, 2019

  1. ocamlPackages.eliom: 6.7.0 → 6.8.0 

    Ensures compatibility with OCaml 4.08
    @vbgl
    vbgl committed Oct 20, 2019
    Copy the full SHA
    be3f40b View commit details
12 changes: 0 additions & 12 deletions pkgs/development/ocaml-modules/eliom/camlp4.patch
View file

This file was deleted.

18 changes: 10 additions & 8 deletions pkgs/development/ocaml-modules/eliom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
{ stdenv, fetchzip, which, ocsigen_server, ocaml,
lwt_react,
opaline, ppx_tools, ppx_deriving, findlib
, ppx_tools_versioned
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
, js_of_ocaml-tyxml
, lwt_ppx
}:

if !stdenv.lib.versionAtLeast ocaml.version "4.07"
then throw "eliom is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec
{
pname = "eliom";
version = "6.7.0";
version = "6.8.0";

src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k";
sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif";
};

patches = [ ./camlp4.patch ];

buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
ocsigen_deriving
ppx_tools_versioned
];

propagatedBuildInputs = [
js_of_ocaml-lwt
js_of_ocaml-ppx
js_of_ocaml-tyxml
lwt_camlp4
lwt_ppx
lwt_react
ocsigen_server
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec

meta = {
homepage = http://ocsigen.org/eliom/;
description = "Ocaml Framework for programming Web sites and client/server Web applications";
description = "OCaml Framework for programming Web sites and client/server Web applications";

longDescription =''Eliom is a framework for programming Web sites
and client/server Web applications. It introduces new concepts to
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/ocsigen-start/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ 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, lwt_camlp4
, resource-pooling
}:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "1.8.0";

buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ];
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 ];

patches = [ ./templates-dir.patch ];