From 8274fec3507d55c99070fecf0d4a8b3db0a974f9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Dec 2020 21:49:50 +0100 Subject: [PATCH] ocamlPackages.sqlexpr: remove at 0.9.0 --- .../ocaml-modules/sqlexpr/default.nix | 26 ------------------- .../development/ocaml-modules/sqlexpr/ppx.nix | 17 ------------ pkgs/top-level/ocaml-packages.nix | 6 ----- 3 files changed, 49 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sqlexpr/default.nix delete mode 100644 pkgs/development/ocaml-modules/sqlexpr/ppx.nix diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix deleted file mode 100644 index df6b6f0854d4..000000000000 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, buildDunePackage, ocaml_lwt -, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3 -}: - -buildDunePackage rec { - pname = "sqlexpr"; - version = "0.9.0"; - - src = fetchurl { - url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz"; - sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd"; - }; - - buildInputs = [ lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; - doCheck = true; - - preBuild = "rm META.sqlexpr"; - - meta = { - description = "Type-safe, convenient SQLite database access"; - homepage = "https://github.com/mfp/ocaml-sqlexpr"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix deleted file mode 100644 index 572ff5936154..000000000000 --- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ buildDunePackage, sqlexpr, ounit -, ppxlib, ppx_tools_versioned, re, lwt_ppx -}: - -buildDunePackage { - pname = "ppx_sqlexpr"; - inherit (sqlexpr) version src meta; - - minimumOCamlVersion = "4.06"; - - postPatch = '' - substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib - ''; - - buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ]; - doCheck = true; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6fe157d2ea2b..e8c43d1ac7d7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -826,10 +826,6 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; - }; - tsort = callPackage ../development/ocaml-modules/tsort { }; tuntap = callPackage ../development/ocaml-modules/tuntap { }; @@ -901,8 +897,6 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; - ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; - ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {}