From de1b2782c95760818dcefc461f73264eb98300c7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:06 +0100 Subject: [PATCH 1/2] ocamlPackages.arg-complete: init at 0.2.1 --- .../ocaml-modules/arg-complete/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/arg-complete/default.nix diff --git a/pkgs/development/ocaml-modules/arg-complete/default.nix b/pkgs/development/ocaml-modules/arg-complete/default.nix new file mode 100644 index 000000000000..341971b35e88 --- /dev/null +++ b/pkgs/development/ocaml-modules/arg-complete/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchurl, + ocaml, + buildDunePackage, + cppo, + ounit2, +}: + +buildDunePackage rec { + pname = "arg-complete"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/sim642/ocaml-arg-complete/releases/download/${version}/arg-complete-${version}.tbz"; + hash = "sha256-SZvLaeeqY3j2LUvqxGs0Vw57JnnpdvAk1jnE3pk27QU="; + }; + + nativeBuildInputs = [ cppo ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit2 ]; + + meta = { + description = "Bash completion support for OCaml Stdlib.Arg"; + homepage = "https://sim642.github.io/ocaml-arg-complete/"; + changelog = "https://raw.githubusercontent.com/sim642/ocaml-arg-complete/refs/tags/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 09bda1d9cebe..10651337cb3e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,6 +38,8 @@ let apron = callPackage ../development/ocaml-modules/apron { }; + arg-complete = callPackage ../development/ocaml-modules/arg-complete { }; + arp = callPackage ../development/ocaml-modules/arp { }; asai = callPackage ../development/ocaml-modules/asai { }; From 9c1f15d84574fbf20cfc4e766523c5a2a9a060a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:26 +0100 Subject: [PATCH 2/2] =?UTF-8?q?ocamlPackages.mopsa:=201.0=20=E2=86=92=201.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mopsa/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 8f084ef9618d..456a7e85a663 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -11,6 +11,7 @@ ocaml, menhir, apron, + arg-complete, camlidl, yojson, zarith, @@ -18,15 +19,15 @@ buildDunePackage rec { pname = "mopsa"; - version = "1.0"; + version = "1.1"; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.13"; src = fetchFromGitLab { owner = "mopsa"; repo = "mopsa-analyzer"; - rev = "v${version}"; - hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4="; + tag = "v${version}"; + hash = "sha256-lO5dtGAl1dq8oJco/hPXrAbN05rKc62Zrci/8CLrQ0c="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildDunePackage rec { ]; buildInputs = [ + arg-complete camlidl flint libclang