From d5e1eeece2f057face74a69859847ee75a357fa9 Mon Sep 17 00:00:00 2001 From: Shota Arakaki Date: Thu, 25 Dec 2025 02:07:34 +0900 Subject: [PATCH] fix: resolve cross-compilation issue for dune and opaline - Inherit ocamlPackages in dune package definition - Add opaline package with proper ocamlPackages inheritance --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb6250777a91..30ed650a7ca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1865,9 +1865,12 @@ with pkgs; dune_2 = callPackage ../by-name/du/dune/package.nix { version = "2.9.3"; + inherit ocamlPackages; }; - dune_3 = callPackage ../by-name/du/dune/package.nix { }; + dune_3 = callPackage ../by-name/du/dune/package.nix { + inherit ocamlPackages; + }; dvc = with python3.pkgs; toPythonApplication dvc; @@ -2069,6 +2072,8 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; + opaline = callPackage ../by-name/op/opaline/package.nix { inherit ocamlPackages; }; + inherit (ocamlPackages) patdiff; patool = with python3Packages; toPythonApplication patool;