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

dune: 1.9.2 -> 1.10.0 (#62256)

Browse Source 
* dune: 1.9.2 -> 1.10.0

* ocamlPackages.camomile: use jbuilder executable

* ocamlPackages.sqlexpr: fix build

* ocamlPackages.lwt_camlp4: fix build
This commit is contained in:
Mario Rodas 2019-07-05 07:28:06 -05:00 committed by Vincent Laporte
parent c5273fae16
commit 88c2586958
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: { stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
buildDunePackage rec { stdenv.mkDerivation rec {
pname = "camomile"; pname = "camomile";
version = "1.0.1"; version = "1.0.1";
@ -11,10 +11,18 @@ buildDunePackage rec {
sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn"; sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
}; };
buildInputs = [ cppo ]; buildInputs = [ ocaml dune findlib cppo ];
configurePhase = "ocaml configure.ml --share $out/share/camomile"; configurePhase = "ocaml configure.ml --share $out/share/camomile";
# Use jbuilder executable because it breaks on dune>=1.10
# https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944
buildPhase = ''
jbuilder build -p ${pname}
'';
inherit (dune) installPhase;
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ stdenv.lib.maintainers.vbgl ];

2
pkgs/development/ocaml-modules/lwt/camlp4.nix
View File

@ -15,6 +15,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ camlp4 ]; propagatedBuildInputs = [ camlp4 ];
preBuild = "rm META.lwt_camlp4";
meta = { meta = {
description = "Camlp4 syntax extension for Lwt (deprecated)"; description = "Camlp4 syntax extension for Lwt (deprecated)";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;

2
pkgs/development/ocaml-modules/sqlexpr/default.nix
View File

@ -15,6 +15,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
doCheck = true; doCheck = true;
preBuild = "rm META.sqlexpr";
meta = { meta = {
description = "Type-safe, convenient SQLite database access"; description = "Type-safe, convenient SQLite database access";
homepage = "https://github.com/mfp/ocaml-sqlexpr"; homepage = "https://github.com/mfp/ocaml-sqlexpr";

8
pkgs/development/tools/ocaml/dune/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, opaline }: { stdenv, fetchurl, ocaml, findlib, opaline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dune-${version}"; pname = "dune";
version = "1.9.2"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2"; sha256 = "15fx9rg16g7ig43rg4sdq0wp0br5h1mjxxgv8b15s317vqlfc5pd";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
homepage = https://github.com/ocaml/dune; homepage = "https://dune.build/";
description = "A composable build system"; description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;