From c26f00141b4b7e4011a1848640a2ca2c119c8fff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Dec 2022 06:18:40 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.inotify:=202.3=20=E2=86=92=202.4.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/inotify/default.nix | 34 +++++-------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index d1c6dc376164..85afd3345740 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,42 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild -, ocaml_lwt # optional lwt support -, ounit, fileutils # only for tests +{ lib, fetchFromGitHub, buildDunePackage +, lwt # optional lwt support +, ounit2, fileutils # only for tests }: -stdenv.mkDerivation rec { - version = "2.3"; - pname = "ocaml${ocaml.version}-inotify"; +buildDunePackage rec { + version = "2.4.1"; + pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; + hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8="; }; - patches = [ (fetchpatch { - url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; - sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; - }) ]; - - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ ocaml_lwt ]; - checkInputs = [ ounit fileutils ]; + buildInputs = [ lwt ]; + checkInputs = [ ounit2 fileutils ]; # Otherwise checkInputs can't be found strictDeps = false; - configureFlags = [ "--enable-lwt" - (lib.optionalString doCheck "--enable-tests") ]; - - postConfigure = lib.optionalString doCheck '' - echo ': pkg_threads' | tee -a _tags - ''; - doCheck = true; - checkTarget = "test"; - - createFindlibDestdir = true; meta = { description = "Bindings for Linux’s filesystem monitoring interface, inotify";