ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.2 → 4.14.3
ocaml-ng.ocamlPackages_4_14.earlybird: mark as broken ocaml-ng.ocamlPackages_4_14.js_of_ocaml-compiler: mark broken versions 5
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "14";
|
||||
patch_version = "2";
|
||||
sha256 = "sha256-eBn2hpPjKUb5M1jfRqjqb1FyImgfzG98uWIUIWz+x2Q=";
|
||||
patch_version = "3";
|
||||
sha256 = "sha256-pdWDuPurnqe/bPly75w45/7ay/9tt6NOMQURXTQ+sGk=";
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildDunePackage,
|
||||
ocaml,
|
||||
cmdliner,
|
||||
dap,
|
||||
fmt,
|
||||
@@ -55,5 +56,6 @@ buildDunePackage (finalAttrs: {
|
||||
description = "OCaml debug adapter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
broken = ocaml.version == "4.14.3";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,6 +16,8 @@ buildDunePackage rec {
|
||||
sha256 = "sha256-RSJ9AgUEmt23QZCk60ETIXmkJhG7knQe+s8wNxxIHm4=";
|
||||
};
|
||||
|
||||
patches = [ ./ocaml-4_14_3.patch ];
|
||||
|
||||
# Otherwise ./configure script will run and create files conflicting with dune.
|
||||
dontConfigure = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
diff --git a/tools/compiler_version.ml b/tools/compiler_version.ml
|
||||
index f675a20..c3e7912 100644
|
||||
--- a/tools/compiler_version.ml
|
||||
+++ b/tools/compiler_version.ml
|
||||
@@ -81,6 +81,7 @@ let v4_13_1 = mk 4 13 1
|
||||
let v4_14_0 = mk 4 14 0
|
||||
let v4_14_1 = mk 4 14 1
|
||||
let v4_14_2 = mk 4 14 2
|
||||
+let v4_14_3 = mk 4 14 3
|
||||
let v5_0_0 = mk 5 0 0
|
||||
let v5_1_0 = mk 5 1 0
|
||||
let v5_1_1 = mk 5 1 1
|
||||
@@ -127,6 +128,7 @@ let known_versions =
|
||||
v4_14_0;
|
||||
v4_14_1;
|
||||
v4_14_2;
|
||||
+ v4_14_3;
|
||||
v5_0_0;
|
||||
v5_1_0;
|
||||
v5_1_1;
|
||||
@@ -22,7 +22,6 @@
|
||||
buildDunePackage {
|
||||
pname = "js_of_ocaml-compiler";
|
||||
inherit version;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||
@@ -56,5 +55,6 @@ buildDunePackage {
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "js_of_ocaml";
|
||||
broken = ocaml.version == "4.14.3" && !lib.versionAtLeast version "6.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
"4.14.0" = "4.19-414";
|
||||
"4.14.1" = "4.19-414";
|
||||
"4.14.2" = "4.19-414";
|
||||
"4.14.3" = "4.19-414";
|
||||
"5.0.0" = "4.14-500";
|
||||
"5.1.0" = "4.17.1-501";
|
||||
"5.1.1" = "4.17.1-501";
|
||||
|
||||
Reference in New Issue
Block a user