From 6b52f88815a5a539e940fdb191c480aded2a400a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:34:17 +0200 Subject: [PATCH 1/6] ocaml-ng.ocamlPackages_4_14_unsafe_string: init --- pkgs/top-level/ocaml-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 967d61aa0a6c..7fb8e255198b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1692,4 +1692,10 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_5_0; ocamlPackages = ocamlPackages_4_14; + + # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. + # Below are aliases for porting them to the latest versions of the OCaml 4 series. + ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { + unsafeStringSupport = true; + }); } From da3dacd0e6c3a2002cf124e9c30f588859aaf1a5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 7 Mar 2023 00:03:36 +0200 Subject: [PATCH 2/6] treewide: use ocaml-ng.ocamlPackages_4_14_unsafe_string --- pkgs/tools/games/weidu/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/tools/games/weidu/default.nix index f63e5d41d3fe..580eea067031 100644 --- a/pkgs/tools/games/weidu/default.nix +++ b/pkgs/tools/games/weidu/default.nix @@ -12,9 +12,7 @@ let # 1. Needs ocaml >= 4.04 and <= 4.11 (patched against 4.14) # 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with # that disabled as weidu is strongly dependent on mutable strings - ocaml' = ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }; + ocaml' = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d7fa20a7195..d86808acf5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20193,9 +20193,7 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }); + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; glui = callPackage ../development/libraries/glui {}; @@ -31564,9 +31562,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }); + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; mlvwm = callPackage ../applications/window-managers/mlvwm { }; @@ -37104,9 +37100,7 @@ with pkgs; drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { - ocaml = ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }; + ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; eprover = callPackage ../applications/science/logic/eprover { }; From 3d70562dfd2253df3c1ae1731af3f8dfba5b88b0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 7 Mar 2023 00:09:56 +0200 Subject: [PATCH 3/6] leo2: add darwin support --- pkgs/applications/science/logic/leo2/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 4087763aa0c5..a72444adbba0 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { buildFlags = [ "opt" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-reserved-user-defined-literal"; + preInstall = "mkdir -p $out/bin"; postInstall = '' @@ -44,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-performance typed higher order prover"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd3; homepage = "http://www.leoprover.org/"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d86808acf5d9..5ea14dcd365c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37168,7 +37168,7 @@ with pkgs; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 - { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; }; + { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; }; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; From 28b5084f40662c15e4d2546dbaa5664876de9298 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:09:11 +0200 Subject: [PATCH 4/6] statverif: add darwin support --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ea14dcd365c..f3683baa6607 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37215,7 +37215,7 @@ with pkgs; }; statverif = callPackage ../applications/science/logic/statverif { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; + ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; tptp = callPackage ../applications/science/logic/tptp {}; From 0d8cfbd06cd277453e48ec44458d41c57c210d24 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:40:11 +0200 Subject: [PATCH 5/6] monotoneViz: migrate to OCaml 4.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3683baa6607..98f9e0a09efc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31622,7 +31622,7 @@ with pkgs; }; monotoneViz = callPackage ../applications/version-management/monotone-viz { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; monitor = callPackage ../applications/system/monitor { From 6185e429a66b5360db976a604cece6cc731dbe36 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:56:48 +0200 Subject: [PATCH 6/6] wyrd: migrate to OCaml 4.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f9e0a09efc..481919357c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13700,7 +13700,7 @@ with pkgs; wvkbd = callPackage ../applications/accessibility/wvkbd { }; wyrd = callPackage ../tools/misc/wyrd { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; x86info = callPackage ../os-specific/linux/x86info { };