diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-05 16:11:47 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-09-15 19:32:32 +0000 |
| commit | fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4 (patch) | |
| tree | 752fb6ac7c0edf9a82887fa6943dc47db2ecdaf1 /pkgs/development/ocaml-modules/sqlexpr | |
| parent | eb429c7c545e4759b170402796a8a4e7d22a0dda (diff) | |
| download | nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.gz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.bz2 nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.lz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.xz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.zst nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.zip | |
jbuilder: 1.0.1 -> dune: 1.1.1
Diffstat (limited to 'pkgs/development/ocaml-modules/sqlexpr')
| -rw-r--r-- | pkgs/development/ocaml-modules/sqlexpr/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/sqlexpr/ppx.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix index c7ed72dc523c..cad4dcafb642 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt +{ stdenv, fetchurl, ocaml, findlib, dune, ocaml_lwt , lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd"; }; - buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ocaml findlib dune lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "dune runtest -p sqlexpr"; - inherit (jbuilder) installPhase; + inherit (dune) installPhase; meta = { description = "Type-safe, convenient SQLite database access"; diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index c15378e8240a..b908e173257c 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit +{ stdenv, ocaml, findlib, dune, sqlexpr, ounit , ppx_core, ppx_tools_versioned, re, lwt_ppx }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}"; inherit (sqlexpr) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; + buildInputs = [ ocaml findlib dune sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; buildPhase = "dune build -p ppx_sqlexpr"; |