From 26b78cddf0fed026d0f2cce3b641fdcbc4f2173e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 10 Jan 2024 06:39:06 +0100 Subject: [PATCH] spark2014: use OCaml 4.14 --- pkgs/development/libraries/ada/spark2014/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/spark2014/default.nix index b89a56a397b9..a52a5ac63f71 100644 --- a/pkgs/development/libraries/ada/spark2014/default.nix +++ b/pkgs/development/libraries/ada/spark2014/default.nix @@ -5,7 +5,6 @@ , gnatcoll-core , gprbuild , python3 -, ocaml , ocamlPackages , makeWrapper }: @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { gnat12 gprbuild python3 - ocaml + ocamlPackages.ocaml makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0827c6fc10e..57ca57dd4e00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18033,7 +18033,9 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spark2014 = callPackage ../development/libraries/ada/spark2014 { }; + spark2014 = callPackage ../development/libraries/ada/spark2014 { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc;