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

Merge pull request #44180 from vbgl/ocaml-sqlexpr-0.9.0

Browse Source 
ocamlPackages.sqlexpr: 0.5.5 -> 0.9.0
This commit is contained in:
Jörg Thalheim 2018-07-28 23:22:23 +01:00 committed by GitHub
commit 82f3cd631c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/ocaml-modules/estring/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, buildOcaml, fetchurl }: { stdenv, buildOcaml, ocaml, fetchurl }:
if stdenv.lib.versionAtLeast ocaml.version "4.06"
then throw "estring is not available for OCaml ${ocaml.version}"
else
buildOcaml rec { buildOcaml rec {
name = "estring"; name = "estring";

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

@ -1,19 +1,32 @@
{ stdenv, buildOcaml, fetchurl, batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }: { stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt
, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
}:
buildOcaml rec { stdenv.mkDerivation rec {
name = "sqlexpr"; version = "0.9.0";
version = "0.5.5"; name = "ocaml${ocaml.version}-sqlexpr-${version}";
src = fetchurl { src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/1203/ocaml-sqlexpr-${version}.tar.gz"; url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz";
sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr"; sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
}; };
propagatedBuildInputs = [ batteries csv ocaml_lwt ocaml_sqlite3 estring ]; buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
meta = with stdenv.lib; { propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
homepage = https://github.com/mfp/ocaml-sqlexpr;
buildPhase = "dune build -p sqlexpr";
doCheck = true;
checkPhase = "dune runtest -p sqlexpr";
inherit (jbuilder) installPhase;
meta = {
description = "Type-safe, convenient SQLite database access"; description = "Type-safe, convenient SQLite database access";
license = licenses.lgpl21; homepage = "https://github.com/mfp/ocaml-sqlexpr";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
}; };
} }

15
pkgs/development/ocaml-modules/sqlexpr/ppx.nix Normal file
View File

@ -0,0 +1,15 @@
{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit
, ppx_core, ppx_tools_versioned, re, lwt_ppx
}:
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 ];
buildPhase = "dune build -p ppx_sqlexpr";
doCheck = true;
checkPhase = "dune runtest -p ppx_sqlexpr";
}

2
pkgs/top-level/ocaml-packages.nix
View File

@ -644,6 +644,8 @@ let
ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {};
ppx_tools = ppx_tools =
if lib.versionAtLeast ocaml.version "4.02" if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_tools {} then callPackage ../development/ocaml-modules/ppx_tools {}