diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
44 files changed, 430 insertions, 204 deletions
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index d678c129188c9..980c68298adcc 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -16,6 +16,7 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M="; release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix new file mode 100644 index 0000000000000..f8bc6224cf70d --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + uri, + cohttp-lwt, + atdgen, + yojson, + iso8601, + stringext, +}: + +buildDunePackage rec { + pname = "gitlab"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "tmcgilchrist"; + repo = "ocaml-gitlab"; + rev = version; + hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k="; + }; + + minimalOCamlVersion = "4.08"; + + buildInputs = [ stringext ]; + + nativeBuildInputs = [ atdgen ]; + + propagatedBuildInputs = [ + uri + cohttp-lwt + atdgen + yojson + iso8601 + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/tmcgilchrist/ocaml-gitlab"; + description = "Native OCaml bindings to Gitlab REST API v4"; + license = licenses.bsd3; + changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${version}"; + maintainers = with maintainers; [ zazedd ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gitlab/jsoo.nix b/pkgs/development/ocaml-modules/gitlab/jsoo.nix new file mode 100644 index 0000000000000..60929f60b3b20 --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/jsoo.nix @@ -0,0 +1,28 @@ +{ + lib, + buildDunePackage, + gitlab, + cohttp, + cohttp-lwt-jsoo, + js_of_ocaml-lwt, +}: + +buildDunePackage { + pname = "gitlab-jsoo"; + inherit (gitlab) version src; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + gitlab + cohttp + cohttp-lwt-jsoo + js_of_ocaml-lwt + ]; + + doCheck = true; + + meta = gitlab.meta // { + description = "Gitlab APIv4 JavaScript library"; + }; +} diff --git a/pkgs/development/ocaml-modules/gitlab/unix.nix b/pkgs/development/ocaml-modules/gitlab/unix.nix new file mode 100644 index 0000000000000..b914e67b54c91 --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/unix.nix @@ -0,0 +1,44 @@ +{ + lib, + buildDunePackage, + gitlab, + cmdliner, + cohttp, + cohttp-lwt-unix, + tls, + lwt, + stringext, + alcotest, +}: + +buildDunePackage { + pname = "gitlab-unix"; + inherit (gitlab) version src; + + minimalOCamlVersion = "4.08"; + + postPatch = '' + substituteInPlace unix/dune --replace-fail "gitlab bytes" "gitlab" + ''; + + buildInputs = [ + cohttp + tls + stringext + ]; + + propagatedBuildInputs = [ + gitlab + cmdliner + cohttp-lwt-unix + lwt + ]; + + checkInputs = [ alcotest ]; + + doCheck = true; + + meta = gitlab.meta // { + description = "Gitlab APIv4 Unix library"; + }; +} diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b47c153a4974a..49f92b87e015e 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "hidapi"; - version = "1.1.2"; + version = "1.2.1"; duneVersion = "3"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "vbmithr"; repo = "ocaml-hidapi"; rev = version; - hash = "sha256-SNQ1/i5wJJgcslIUBe+z5QgHns/waHnILyMUJ46cUwg="; + hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix index 6666d58cfb1f1..2ea64493f948e 100644 --- a/pkgs/development/ocaml-modules/kqueue/default.nix +++ b/pkgs/development/ocaml-modules/kqueue/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "kqueue"; - version = "0.3.0"; + version = "0.4.0"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz"; - hash = "sha256-MKRCyN6q9euTEgHIhldGGH8FwuLblWYNG+SiCMWBP6Y="; + hash = "sha256-fJHhmAp0EFzR9JH93a+EHy1auwSBKZV/XcBQLCedJLc="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch deleted file mode 100644 index 3d880c00947e0..0000000000000 --- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config ---- lablGL.ori/Makefile.config 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/Makefile.config 2013-06-02 08:13:10.000000000 +0200 -@@ -0,0 +1,63 @@ -+# LablGL and Togl configuration file -+# -+# Please have a look at the config/Makefile in the Objective Caml distribution, -+# or at the labltklink script to get the information needed here -+# -+ -+##### Adjust these always -+ -+# Uncomment if you have the fast ".opt" compilers -+#CAMLC = ocamlc.opt -+#CAMLOPT = ocamlopt.opt -+ -+# Where to put the lablgl script -+BINDIR = @BINDIR@ -+ -+# Where to find X headers -+XINCLUDES = @XINCLUDES@ -+# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -+#XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXi -+ -+# Where to find Tcl/Tk headers -+# This must the same version as for LablTk -+TKINCLUDES = @TKINCLUDES@ -+# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -+#TKLIBS = -L/usr/local/lib -ltk84 -ltcl84 -+ -+# Where to find OpenGL/Mesa/Glut headers and libraries -+GLINCLUDES = -+GLLIBS = -lGL -lGLU -+GLUTLIBS = -lglut -+# The following libraries may be required (try to add them one at a time) -+#GLLIBS = -lGL -lGLU -lXmu -lXext -lXi -lcipher -lpthread -+ -+# How to index a library after installing (ranlib required on MacOSX) -+RANLIB = : -+#RANLIB = ranlib -+ -+##### Uncomment these for windows -+#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -+#GLLIBS = opengl32.lib glu32.lib -+#TOOLCHAIN = msvc -+#XA = .lib -+#XB = .bat -+#XE = .exe -+#XO = .obj -+#XS = .dll -+ -+##### Adjust these if non standard -+ -+# The Objective Caml library directory -+#LIBDIR = `ocamlc -where` -+ -+# Where to put dlls (if dynamic loading available) -+DLLDIR = @DLLDIR@ -+ -+# Where to put LablGL (standard) -+INSTALLDIR = @INSTALLDIR@ -+ -+# Where is Togl (default) -+#TOGLDIR = Togl -+ -+# C Compiler options -+#COPTS = -c -O diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index abe1649e0094c..64ace7c449637 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, camlp-streams, darwin } : +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libglut, camlp-streams } : if lib.versionOlder ocaml.version "4.06" then throw "lablgl is not available for OCaml ${ocaml.version}" @@ -18,28 +18,30 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ freeglut camlp-streams ]; + buildInputs = [ libglut camlp-streams ]; propagatedBuildInputs = [ libGLU - libGL - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.GLUT - darwin.apple_sdk.libs.Xplugin ]; - patches = [ ./Makefile.config.patch ./META.patch ]; + patches = [ ./META.patch ]; preConfigure = '' mkdir -p $out/bin mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - substituteInPlace Makefile.config \ - --subst-var-by BINDIR $out/bin/ \ - --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl/ \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/stublibs/ \ - --subst-var-by TKINCLUDES "" \ - --subst-var-by XINCLUDES "" + cp \ + Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \ + Makefile.config ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin/" + "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/" + "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" + "XINCLUDES=" + "TKINCLUDES=" + "TKLIBS=" + ]; + buildFlags = [ "lib" "libopt" "glut" "glutopt" ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 4c405f2fff835..905426bf53b23 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.5.0"; + version = "5.6.0"; minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; - hash = "sha256-YokLMW4DV5KtKa8a2XFFbRDe/VJbdLU9sbZ/pCN1wXg="; + hash = "sha256-njBDP9tMpDemqo/7RHuspeunYV+4jnsM2KS0FsMggTM="; }; checkInputs = [ ppx_sexp_conv ounit2 ]; diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 8a2f195c9445f..dbd55b2c599d2 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+13"; + version = "1.1+17"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - sha256 = "sha256-K249E9qkWNK4BC+ynaR3bVEyu9Tk8iCE7GptKk/aVJc="; + hash = "sha256-0NZF2W/eWwZRXnMJh9LmOdbE/CRDYeLUUx6ty4irP6U="; }; - useDune2 = true; - propagatedBuildInputs = [ cudf ]; diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 909bf019cda7c..7dd83aaae3775 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "miou"; - version = "0.1.0"; + version = "0.2.0"; minimalOCamlVersion = "5.0.0"; src = fetchurl { url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; - hash = "sha256-WTs6L9j4z1/0wKcGIZVwaNrATRGCTN5A6RwO7tY2phE="; + hash = "sha256-hxYCG1NkDEbVyDvN8eS/Fj6s10YyS7NRGlyNOkLy6sA="; }; meta = { diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index be9592fb374bd..ef842ec7318f2 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,23 +1,23 @@ { lib, fetchurl, buildDunePackage -, logs, lwt, mirage-clock, ptime -, alcotest +, logs, fmt, ptime, mirage-clock, cmdliner +, lwt, alcotest }: buildDunePackage rec { pname = "mirage-logs"; - version = "1.3.0"; + version = "2.1.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; - hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA="; + hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs="; }; - propagatedBuildInputs = [ logs lwt mirage-clock ptime ]; + propagatedBuildInputs = [ logs fmt ptime mirage-clock cmdliner ]; doCheck = true; - checkInputs = [ alcotest ]; + checkInputs = [ lwt alcotest ]; meta = { description = "Reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 8607a2a50344d..c34fb91f5e73b 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs9"; + version = "2.7.1_cvs11"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; rev = "v${version}"; - hash = "sha256-cOObHUAYiI2mN1qjsxcK6kHAmawuaGQOUNHqWioIvjM="; + hash = "sha256-D/Gn+02Kq4mqEpNZrYYw/NXSJce2joGhl3wUZDhVDYo="; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b770c0d7d5d7a..c475ebdecd26a 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -17,7 +17,7 @@ let caml_ld_library_path = ; in buildDunePackage rec { - version = "5.1.0"; + version = "5.1.2"; pname = "ocsigenserver"; minimalOCamlVersion = "4.08"; @@ -26,7 +26,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "ocsigenserver"; rev = "refs/tags/${version}"; - hash = "sha256-6xO+4eYSp6rlgPT09L7cvlaz6kYYuUPRa3K/TgZmaqE="; + hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU="; }; nativeBuildInputs = [ makeWrapper which ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 5fd645b52113a..18308734b164a 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.2.2"; + version = "0.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - hash = "sha256-9xy43jaCpKo/On5sTTt8f0Mytyjj1JN2QuFMcoWYTBY="; + hash = "sha256-HLY0ozmy6zY0KjXkwP3drTdz857PvLS/buN1nB+xf1s="; }; propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 13fad457e2aee..fe7e655ba60c3 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "printbox"; - version = "0.6.1"; + version = "0.11"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; + sha256 = "sha256-f5iTesEakULlLdDGtX+5i3vesUIbFLjcV3kJ7ZPia0Y="; }; nativeCheckInputs = [ mdx.bin ]; diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix index ee5e7d2774d22..c6c5abfb7f9a3 100644 --- a/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -1,7 +1,10 @@ -{ re, reason, pastel, ... }: +{ lib, buildDunePackage, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "cli"; + version = "0.0.1-alpha-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -11,4 +14,11 @@ re pastel ]; + + meta = { + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; } diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix index a39ba9a7e3ec3..38d95a0c0f396 100644 --- a/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -1,21 +1,24 @@ -{ buildDunePackage, callPackage, reason, console, ... }: +{ lib, buildDunePackage, callPackage, reason, console, src }: + +buildDunePackage { + inherit src; -{ pname = "console"; + version = "0.1.0-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; passthru.tests = { - console = callPackage ./tests/console { - inherit buildDunePackage reason console; - }; + console = callPackage ./tests/console { }; }; meta = { description = "Library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; homepage = "https://reason-native.com/docs/console/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix index 024783cf61845..b44e63080e5c5 100644 --- a/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -1,43 +1,47 @@ -{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }: +{ + lib, + newScope, + fetchFromGitHub, + atdgen, + buildDunePackage, + junit, + ppxlib, + qcheck-core, + re, + reason, +}: -let - generic = (somePath: - let - prepkg = import somePath { - inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch; - inherit (reason-native) console file-context-printer fp pastel rely; - }; - in - buildDunePackage - ({ - version = "2022-08-31-a0ddab6"; - src = fetchFromGitHub { - owner = "reasonml"; - repo = "reason-native"; - rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a"; - hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8="; - }; - duneVersion = "3"; - meta = with lib; { - description = "Libraries for building and testing native Reason programs"; - downloadPage = "https://github.com/reasonml/reason-native"; - homepage = "https://reason-native.com/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - } // (prepkg.meta or {}); - } // prepkg) - ); - cli = generic ./cli.nix; # Used only by Rely. -in - lib.makeScope newScope (self: with self; { - console = generic ./console.nix; - dir = generic ./dir.nix; - file-context-printer = generic ./file-context-printer.nix; - fp = generic ./fp.nix; - pastel = generic ./pastel.nix; - pastel-console = generic ./pastel-console.nix; - qcheck-rely = generic ./qcheck-rely.nix; - refmterr = generic ./refmterr.nix; - rely = generic ./rely.nix; - rely-junit-reporter = generic ./rely-junit-reporter.nix; - }) +lib.makeScope newScope (self: { + inherit lib buildDunePackage re reason ppxlib; + + # Upstream doesn't use tags, releases, or branches. + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; + hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + }; + + cli = self.callPackage ./cli.nix { }; + console = self.callPackage ./console.nix { }; + dir = self.callPackage ./dir.nix { }; + file-context-printer = self.callPackage ./file-context-printer.nix { }; + frame = self.callPackage ./frame.nix { }; + fp = self.callPackage ./fp.nix { }; + fs = self.callPackage ./fs.nix { }; + pastel = self.callPackage ./pastel.nix { }; + pastel-console = self.callPackage ./pastel-console.nix { }; + qcheck-rely = self.callPackage ./qcheck-rely.nix { + inherit qcheck-core; + }; + refmterr = self.callPackage ./refmterr.nix { + inherit atdgen; + }; + rely = self.callPackage ./rely.nix { }; + rely-junit-reporter = self.callPackage ./rely-junit-reporter.nix { + inherit atdgen junit; + }; + unicode-config = self.callPackage ./unicode-config.nix { }; + unicode = self.callPackage ./unicode.nix { }; + utf8 = self.callPackage ./utf8.nix { }; +}) diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix index 8b09eafc36965..6cd04ece01f6b 100644 --- a/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -1,7 +1,10 @@ -{ reason, fp, ... }: +{ lib, buildDunePackage, reason, fp, src }: + +buildDunePackage { + inherit src; -{ pname = "dir"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -14,5 +17,7 @@ meta = { description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index a7c663493ef55..462b667921c1b 100644 --- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -1,7 +1,10 @@ -{ reason, re, pastel, ... }: +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "file-context-printer"; + version = "0.0.3-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Utility for displaying snippets of files on the command line"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; homepage = "https://reason-native.com/docs/file-context-printer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix index 7df1c84e55cf9..35a099771dc64 100644 --- a/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -1,7 +1,10 @@ -{ reason, ... }: +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; -{ pname = "fp"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -10,5 +13,7 @@ meta = { description = "Library for creating and operating on file paths consistently on multiple platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/frame.nix b/pkgs/development/ocaml-modules/reason-native/frame.nix new file mode 100644 index 0000000000000..dc845db552498 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/frame.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; + + pname = "frame"; + version = "0.0.1-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + pastel + re + ]; + + meta = { + description = "Reason Native text layout library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/fs.nix b/pkgs/development/ocaml-modules/reason-native/fs.nix new file mode 100644 index 0000000000000..c553f6a6ad989 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/fs.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fp, reason, src }: + +buildDunePackage { + inherit src; + + pname = "fs"; + version = "0.0.2-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "Reason Native file system API"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index 968b9f88af91a..1a424fad5401a 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -1,7 +1,10 @@ -{ reason, console, pastel, ... }: +{ lib, buildDunePackage, reason, console, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel-console"; + version = "0.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Small library for pretty coloring to Console output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; homepage = "https://reason-native.com/docs/pastel/console"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix index 6d08243638cab..d8a4d7e0f9ca5 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -1,13 +1,17 @@ -{ reason, re, ... }: +{ lib, buildDunePackage, reason, re, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel"; + version = "0.3.0-unstable-2024-05-07"; minimalOCamlVersion = "4.05"; nativeBuildInputs = [ reason ]; + propagatedBuildInputs = [ re ]; @@ -16,5 +20,7 @@ description = "Text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; homepage = "https://reason-native.com/docs/pastel/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index ac645791f46c2..4006df5d90c8b 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -1,23 +1,15 @@ -{ qcheck-core, reason, console, rely, fetchpatch, ... }: +{ lib, buildDunePackage, qcheck-core, reason, console, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "qcheck-rely"; + version = "1.0.2-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; - patches = [ - (fetchpatch { - url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch"; - hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4="; - includes = [ - "src/qcheck-rely/QCheckRely.re" - "src/qcheck-rely/QCheckRely.rei" - ]; - }) - ]; - propagatedBuildInputs = [ qcheck-core console @@ -27,5 +19,7 @@ meta = { description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 17c595d9e107d..3f320fd2364d6 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -1,7 +1,10 @@ -{ atdgen, re, reason, pastel, ... }: +{ lib, buildDunePackage, atdgen, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "refmterr"; + version = "3.3.0-unstable-2024-05-07"; nativeBuildInputs = [ atdgen @@ -18,5 +21,7 @@ description = "Error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; homepage = "https://reason-native.com/docs/refmterr/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 25d9cc2c5f70f..46097c45ebdf9 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -1,7 +1,10 @@ -{ atdgen, junit, re, reason, pastel, rely, ... }: +{ lib, buildDunePackage, atdgen, junit, re, reason, pastel, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "rely-junit-reporter"; + version = "1.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -22,5 +25,7 @@ description = "Tool providing JUnit Reporter for Rely Testing Framework"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix index 40315a668ba90..e3ca4b9ad5e9c 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -1,7 +1,10 @@ -{ re, reason, cli, file-context-printer, pastel, ... }: +{ lib, buildDunePackage, re, reason, cli, file-context-printer, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "rely"; + version = "4.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -18,5 +21,7 @@ description = "Jest-inspired testing framework for native OCaml/Reason"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam index e69de29bb2d1d..e69de29bb2d1d 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re index 15685205e1bca..15685205e1bca 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix index fc7f1891339b5..b2bc31565f04a 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -1,20 +1,34 @@ -{ lib, buildDunePackage, reason, console }: +{ lib, buildDunePackage, reason, console, ppxlib }: -buildDunePackage rec { - pname = "console-test"; +buildDunePackage { + pname = "console_test"; version = "1"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./console_test.opam + ./console_test.re + ./dune + ./dune-project + ]; + }; duneVersion = "3"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ reason console + ppxlib ]; doInstallCheck = true; + postInstallCheck = '' - $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + $out/bin/console_test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null ''; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/pkgs/development/ocaml-modules/reason-native/tests/console/dune index 49f2121385e28..3bf2eefb27dbd 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/dune +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -1,4 +1,4 @@ (executable - (name console-test) - (public_name console-test) + (name console_test) + (public_name console_test) (libraries reason console.lib)) diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project new file mode 100644 index 0000000000000..a26d6e273960e --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project @@ -0,0 +1 @@ +(lang dune 1.6) diff --git a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix new file mode 100644 index 0000000000000..1b80ae2a71fd3 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode-config"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Configuration used to generate the @reason-native/unicode library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/unicode.nix b/pkgs/development/ocaml-modules/reason-native/unicode.nix new file mode 100644 index 0000000000000..544367424d0b7 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Easy to use and well documented Unicode symbols"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/utf8.nix b/pkgs/development/ocaml-modules/reason-native/utf8.nix new file mode 100644 index 0000000000000..40c874b5b41f7 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/utf8.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "utf8"; + version = "0.1.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Utf8 logic with minimal dependencies"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 17dee792007bd..331eff1c1027a 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -9,13 +9,13 @@ buildDunePackage rec { pname = "shared-memory-ring"; - version = "3.1.1"; + version = "3.2.1"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; - hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; + hash = "sha256-qSdntsPQo0/8JlbOoO6NAYtoa86HJy5yWHUsWi/PGDM="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 4dc40da9dac67..4dcf81d965213 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "tdigest"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "SGrondin"; repo = pname; rev = version; - sha256 = "sha256-pkJRJeEbBbAR1STb6v3Zu11twvHkAKAO0YjifRBFTDw="; + sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix index 8daf53abdb502..1e43b2f8ee2a2 100644 --- a/pkgs/development/ocaml-modules/terminal/default.nix +++ b/pkgs/development/ocaml-modules/terminal/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "terminal"; - version = "0.2.2"; + version = "0.4.0"; minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; - hash = "sha256-M0HCGSOiHNa1tc+p7DmB9ZVyw2eUD+XgJFBTPftBELU="; + hash = "sha256-i+RJVTN5uy3F6LeYBcgER2kKA9yj6a7pWf7PRtgnj7c="; }; propagatedBuildInputs = [ stdlib-shims uutf uucp ]; diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index a5b364312d417..8db9abd3630b5 100644 --- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "unisim_archisec"; - version = "0.0.5"; + version = "0.0.8"; src = fetchurl { - url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.5/unisim_archisec-0.0.5.tbz"; - sha256 = "sha256-94Ky7rtR8oFTtWshTYaY6gyJdqrY3QKMF7qTkZQweXQ="; + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.8/unisim_archisec-0.0.8.tbz"; + sha256 = "sha256-D8DumHaQnLsMaVHoUL7w8KgGRTh9Rk+22NNSa0a/qII="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 093ca1ffe9025..acbf1c270ffa0 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "xenstore"; - version = "2.2.0"; + version = "2.3.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; - hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; + hash = "sha256-1jxrvLLTwpd2fYPAoPbdRs7P1OaR8c9cW2VURF7Bs/Q="; }; buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ddf8ca5f6d63b..6c75916c69f59 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-zTwdlPaViZoCbf9yaWmJvbENwWMpNLucvm9FmNSvptQ="; + hash = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU="; }; propagatedBuildInputs = [ seq ]; |