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

jbuilder: 1.0.1 -> dune: 1.1.1

Browse Source
This commit is contained in:
Vincent Laporte
2018-09-05 16:11:47 +00:00
committed by Vincent Laporte
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/ocaml/cppo/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
let
pname = "cppo";
webpage = "http://mjambon.com/${pname}.html";
@@ -9,9 +9,9 @@ let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.6.4";
sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh";
buildInputs = [ jbuilder ];
buildInputs = [ dune ];
extra = {
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
};
} else {
version = "1.5.0";

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

@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
stdenv.mkDerivation rec {
name = "jbuilder-${version}";
version = "1.0.1";
name = "dune-${version}";
version = "1.1.1";
src = fetchFromGitHub {
owner = "ocaml";
repo = "dune";
rev = "${version}";
sha256 = "0k6r9qrbwlnb4rqwqys5fr7khwza7n7d8wpgl9jbb3xpag2zl3q9";
sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw";
};
buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
preFixup = "rm -rf $out/jbuilder";
meta = {
inherit (src.meta) homepage;
description = "Fast, portable and opinionated build system";

6
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
postPatch = "patchShebangs lib/generate_stubs.sh";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "jbuilder build -p js_of_ocaml";
buildPhase = "dune build -p js_of_ocaml";
}

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

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ];
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
buildPhase = "dune build -p js_of_ocaml-camlp4";
}

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

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
{ stdenv, fetchFromGitHub, ocaml, findlib, dune
, cmdliner, cppo, yojson
}:
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
};
buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
buildInputs = [ ocaml findlib dune cmdliner cppo ];
propagatedBuildInputs = [ yojson ];
buildPhase = "jbuilder build -p js_of_ocaml-compiler";
buildPhase = "dune build -p js_of_ocaml-compiler";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
description = "Compiler from OCaml bytecode to Javascript";

6
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "jbuilder build -p js_of_ocaml-lwt";
buildPhase = "dune build -p js_of_ocaml-lwt";
}

6
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocamlbuild
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild";
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
}

6
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml
}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx";
buildPhase = "dune build -p js_of_ocaml-ppx";
}

6
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml, ppx_deriving
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json";
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
}

6
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "jbuilder build -p js_of_ocaml-tyxml";
buildPhase = "dune build -p js_of_ocaml-tyxml";
}

7
pkgs/development/tools/ocaml/ocaml-top/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv, fetchzip, ncurses
, ocamlPackages
, jbuilder }:
, dune
}:
stdenv.mkDerivation rec {
version = "1.1.5";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv";
};
buildInputs = [ ncurses jbuilder ]
buildInputs = [ ncurses dune ]
++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
configurePhase = ''
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
buildPhase = "jbuilder build";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
homepage = https://www.typerex.org/ocaml-top.html;

4
pkgs/development/tools/ocaml/ocp-indent/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }:
{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
let inherit (stdenv.lib) getVersion versionAtLeast; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ocp-build ];
buildInputs = [ ocaml findlib cmdliner ];
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = with stdenv.lib; {
homepage = http://typerex.ocamlpro.com/ocp-indent.html;

8
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, ocp-build, ocp-indent, cmdliner, re }:
stdenv.mkDerivation rec {
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
};
buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
propagatedBuildInputs = [ ocp-indent ];
buildPhase = "jbuilder build -p ocp-index";
buildPhase = "dune build -p ocp-index";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
homepage = http://typerex.ocamlpro.com/ocp-index.html;

6
pkgs/development/tools/ocaml/utop/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
, lambdaTerm, cppo, makeWrapper
}:
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ];
buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
propagatedBuildInputs = [ lambdaTerm ];
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
postFixup =
let

4
pkgs/development/tools/pyre/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
, jbuilder, python3, rsync, fetchpatch }:
, dune, python3, rsync, fetchpatch }:
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
@@ -39,7 +39,7 @@ let
ppx_deriving_yojson
ocamlbuild
ppxlib
jbuilder
dune
ounit
# python36Packages.python36Full # TODO
];