From 5252b4bd1b6fa140a5232f36e2b0ddeaba4cd347 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 19 Apr 2021 14:13:28 +0200 Subject: [PATCH] ocamlPackages.ocaml_extlib-1-7-7: init at 1.7.7 Unfortunately there's no way to get Haxe 4.0 and 4.1 to work with extlib 1.7.8 (not even without the minimal install), so we need to package 1.7.7 again, at least until 1.7.9 (?) brings backwards compatibility packages, hopefully. --- pkgs/development/ocaml-modules/extlib/1.7.7.nix | 11 +++++++++++ pkgs/top-level/ocaml-packages.nix | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/ocaml-modules/extlib/1.7.7.nix diff --git a/pkgs/development/ocaml-modules/extlib/1.7.7.nix b/pkgs/development/ocaml-modules/extlib/1.7.7.nix new file mode 100644 index 000000000000..3314ebcb9b5d --- /dev/null +++ b/pkgs/development/ocaml-modules/extlib/1.7.7.nix @@ -0,0 +1,11 @@ +# Older version of extlib for Haxe 4.0 and 4.1. +# May be replaceable by the next extlib + extlib-base64 release. +{ fetchurl, ocaml_extlib }: + +ocaml_extlib.overrideAttrs (_: rec { + version = "1.7.7"; + src = fetchurl { + url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + }; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b8c8b0a9d93c..c5328f378b64 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1018,7 +1018,11 @@ let ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; - ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; + ocaml_extlib = ocaml_extlib-1-7-8; + + ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { }; + + ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { }; ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };