dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ocaml 4.00 – 4.09: make compatible with glibc-2.34

Browse Source
This commit is contained in:
Vincent Laporte 2022-04-05 20:53:07 +02:00 committed by Vincent Laporte
parent a64987375f
commit d8d2136718
10 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }:
{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }:
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
# Compatibility with Glibc 2.34
patches = [ (fetchpatch {
url = "https://github.com/ocaml/ocaml/commit/60b0cdaf2519d881947af4175ac4c6ff68901be3.patch";
sha256 = "sha256:07g9q9sjk4xsbqix7jxggfp36v15pmqw4bms80g5car0hfbszirn";
})];
prefixKey = "-prefix ";
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];

8
pkgs/development/compilers/ocaml/4.01.0.nix
View File

@ -2,6 +2,12 @@ import ./generic.nix {
major_version = "4";
minor_version = "01";
patch_version = "0";
patches = [ ./fix-clang-build-on-osx.diff ];
patches = [
./fix-clang-build-on-osx.diff
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/d111407bf4ff71171598d30825c8e59ed5f75fd6.patch";
sha256 = "sha256:08mpy7lsiwv8m5qrqc4xzyiv2hri5713gz2qs1nfz02hz1bd79mc"; }
];
sha256 = "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7";
}

8
pkgs/development/compilers/ocaml/4.02.nix
View File

@ -2,6 +2,12 @@ import ./generic.nix {
major_version = "4";
minor_version = "02";
patch_version = "3";
patches = [ ./ocamlbuild.patch ];
patches = [
./ocamlbuild.patch
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/9de2b77472aee18a94b41cff70caee27fb901225.patch";
sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; }
];
sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";
}

6
pkgs/development/compilers/ocaml/4.03.nix
View File

@ -3,4 +3,10 @@ import ./generic.nix {
minor_version = "03";
patch_version = "0";
sha256 = "09p3iwwi55r6rbrpyp8f0wmkb0ppcgw67yxw6yfky60524wayp39";
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch";
sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; }
];
}

6
pkgs/development/compilers/ocaml/4.04.nix
View File

@ -6,4 +6,10 @@ import ./generic.nix {
# If the executable is stipped it does not work
dontStrip = true;
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch";
sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; }
];
}

6
pkgs/development/compilers/ocaml/4.05.nix
View File

@ -6,4 +6,10 @@ import ./generic.nix {
# If the executable is stipped it does not work
dontStrip = true;
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch";
sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; }
];
}

6
pkgs/development/compilers/ocaml/4.06.nix
View File

@ -6,4 +6,10 @@ import ./generic.nix {
# If the executable is stipped it does not work
dontStrip = true;
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/137a4ad167f25fe1bee792977ed89f30d19bcd74.patch";
sha256 = "sha256:0izsf6rm3677vbbx0snkmn9pkfcsayrdwz3ipiml5wjiaysnchjz"; }
];
}

6
pkgs/development/compilers/ocaml/4.07.nix
View File

@ -6,4 +6,10 @@ import ./generic.nix {
# If the executable is stripped it does not work
dontStrip = true;
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; }
];
}

6
pkgs/development/compilers/ocaml/4.08.nix
View File

@ -9,4 +9,10 @@ import ./generic.nix {
# Breaks build with Clang
hardeningDisable = [ "strictoverflow" ];
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/17df117b4939486d3285031900587afce5262c8c.patch";
sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
];
}

6
pkgs/development/compilers/ocaml/4.09.nix
View File

@ -6,4 +6,10 @@ import ./generic.nix {
# Breaks build with Clang
hardeningDisable = [ "strictoverflow" ];
patches = [
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch";
sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
];
}