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

ocamlPackages.tyxml: 4.2.0 -> 4.3.0

Browse Source 
ocamlPackages.eliom: 6.4.0 -> 6.7.0
ocamlPackages.js_of_ocaml: 3.2.1 -> 3.3.0
This commit is contained in:
Vincent Laporte 2019-04-19 14:14:47 +00:00 committed by Vincent Laporte
parent 61b53f4071
commit 2406c06ae0
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
lwt_react, cryptokit,
ipaddr, ocamlnet, ocaml_pcre,
opaline, ppx_tools, ppx_deriving, findlib
@ -11,12 +11,12 @@
stdenv.mkDerivation rec
{
pname = "eliom";
version = "6.4.0";
version = "6.7.0";
name = "${pname}-${version}";
src = fetchurl {
src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh";
sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k";
};
patches = [ ./camlp4.patch ];

28
pkgs/development/ocaml-modules/tyxml/default.nix
View File

@ -1,34 +1,20 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
, withP4 ? true
, camlp4 ? null
}:
{ lib, buildDunePackage, fetchurl, re, uutf }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
buildDunePackage rec {
pname = "tyxml";
version = "4.2.0";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "4.3.0";
src = fetchzip {
url = "https://github.com/ocsigen/tyxml/archive/${version}.tar.gz";
sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8";
src = fetchurl {
url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf";
};
buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ]
++ stdenv.lib.optional withP4 camlp4;
propagatedBuildInputs = [ uutf re ];
createFindlibDestdir = true;
configureFlags = stdenv.lib.optional withP4 "--enable-syntax";
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://ocsigen.org/tyxml/;
description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing";
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
gal_bolle vbgl
];

12
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View File

@ -1,11 +1,19 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
stdenv.mkDerivation rec {
version = "3.2.1";
name = "js_of_ocaml-camlp4-${version}";
inherit (js_of_ocaml-compiler) version src installPhase meta;
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
inherit (js_of_ocaml-compiler) installPhase meta;
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];

4
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -8,13 +8,13 @@ else
stdenv.mkDerivation rec {
name = "js_of_ocaml-compiler-${version}";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8";
};
buildInputs = [ ocaml findlib dune cmdliner cppo ];