From d7c39587690f0a2baba3f400e2eb9a963937505f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 17:33:08 +0200 Subject: [PATCH 1/4] ocamlPackages.index: 1.0.1 -> 1.2.0 Note: tests are available, should be added in the future (crowbar is required) --- pkgs/development/ocaml-modules/index/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index b1141f814a8..d0857f7ef0a 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,16 +1,17 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs }: +{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }: buildDunePackage rec { pname = "index"; - version = "1.0.1"; + version = "1.2.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1006wr3g21s4j2vsd73gphhkrh1fy4swh6gqvlsa9c6q7vz9wbvz"; + sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6"; }; + buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ fmt logs ]; meta = { From cdad44ed318d37d53aef0311b5f3b783f84b62a3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 17:22:50 +0200 Subject: [PATCH 2/4] ocamlPackages.ocaml-syntax-shims: init at 1.0.0 --- .../ocaml-syntax-shims/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix new file mode 100644 index 00000000000..706dc913e1e --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildDunePackage, fetchurl }: + +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; + + pname = "ocaml-syntax-shims"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9"; + }; + + useDune2 = true; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims"; + description = "Backport new syntax to older OCaml versions"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fd863e428af..b2012e6686b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -627,6 +627,8 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; + ocaml-syntax-shims = callPackage ../development/ocaml-modules/ocaml-syntax-shims { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; From 5ed10dc9092419bc97ca741d2fb1894ce12ced94 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 17:34:45 +0200 Subject: [PATCH 3/4] ocamlPackages.irmin*: 2.0.0 -> 2.1.0 updated: * irmin * irmin-fs * irmin-git * irmin-graphql * irmin-http * irmin-mem * irmin-pack (also added new dependecy ocaml_lwt) * irmin-test * irmin-unix * irmin-watcher --- pkgs/development/ocaml-modules/irmin/default.nix | 6 +++--- pkgs/development/ocaml-modules/irmin/pack.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 2db57671177..cba67759167 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "irmin"; - version = "2.0.0"; + version = "2.1.0"; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "09qffvgi5yrm3ghiywlbdhjly8xb5x5njnan213q8j033fzmf2dr"; + sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; }; propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 4eacc719cec..c374b1a2275 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,12 +1,13 @@ -{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test }: +{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }: buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; pname = "irmin-pack"; inherit (irmin) version src; - propagatedBuildInputs = [ index irmin ]; + propagatedBuildInputs = [ index irmin ocaml_lwt ]; checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; From 4ef5c64226b2fbc099e2ccd8ff1a079fe3d31c9d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 17:38:32 +0200 Subject: [PATCH 4/4] ocamlPackages.ppx_irmin: init at 2.1.0 --- pkgs/development/ocaml-modules/irmin/ppx.nix | 14 ++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/irmin/ppx.nix diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix new file mode 100644 index 00000000000..c28532b49a9 --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }: + +buildDunePackage { + pname = "ppx_irmin"; + + inherit (irmin) version src minimumOCamlVersion; + + buildInputs = [ ocaml-syntax-shims ]; + propagatedBuildInputs = [ ppxlib ]; + + meta = irmin.meta // { + description = "PPX deriver for Irmin generics"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b2012e6686b..365c1884f09 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -806,6 +806,10 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { + ppxlib = ppxlib.override { version = "0.12.0"; }; + }; + ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; ppx_tools =