From cc4169d737e092ef877cf8b8d9b940df849a7312 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:03:44 +0200 Subject: [PATCH] glsurf: migrate to OCaml 4.14 --- pkgs/applications/science/math/glsurf/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 808d89ef9636..bfc1998238e2 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ] ++ (with ocamlPackages; [ camlp4 lablgl - camlimages_4_2_4 + camlimages + num ]); postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..50c76dfb8ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20169,7 +20169,9 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { + unsafeStringSupport = true; + }); }; glui = callPackage ../development/libraries/glui {};