git.iko.soy/typeable/nixpkgs
on master help sign in
ocaml 4.00 – 4.09: make compatible with glibc-2.34
commitd8d21367180ba7a3d21db6fb04196adfcd0421ab authorVincent Laporte <Vincent.Laporte@gmail.com> dateTue 5 Apr 2022, 20:53 (5 years ago) parenta649873
10 files changed+63−3
compare with master
unifiedsplit
pkgs/development/compilers/ocaml/4.00.1.nix+7−1 pkgs/development/compilers/ocaml/4.01.0.nix+7−1 pkgs/development/compilers/ocaml/4.02.nix+7−1 pkgs/development/compilers/ocaml/4.03.nix+6 pkgs/development/compilers/ocaml/4.04.nix+6 pkgs/development/compilers/ocaml/4.05.nix+6 pkgs/development/compilers/ocaml/4.06.nix+6 pkgs/development/compilers/ocaml/4.07.nix+6 pkgs/development/compilers/ocaml/4.08.nix+6 pkgs/development/compilers/ocaml/4.09.nix+6
pkgs/development/compilers/ocaml/4.00.1.nix+7−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }:
1+{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }:
22
33let
44 useX11 = !stdenv.isAarch32 && !stdenv.isMips;
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
1515 sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
1616 };
1717
18+ # Compatibility with Glibc 2.34
19+ patches = [ (fetchpatch {
20+ url = "https://github.com/ocaml/ocaml/commit/60b0cdaf2519d881947af4175ac4c6ff68901be3.patch";
21+ sha256 = "sha256:07g9q9sjk4xsbqix7jxggfp36v15pmqw4bms80g5car0hfbszirn";
22+ })];
23+
1824 prefixKey = "-prefix ";
1925 configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
2026 buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
pkgs/development/compilers/ocaml/4.01.0.nix+7−1
@@ -2,6 +2,12 @@ import ./generic.nix {
22 major_version = "4";
33 minor_version = "01";
44 patch_version = "0";
5− patches = [ ./fix-clang-build-on-osx.diff ];
5+ patches = [
6+ ./fix-clang-build-on-osx.diff
7+
8+ # Compatibility with Glibc 2.34
9+ { url = "https://github.com/ocaml/ocaml/commit/d111407bf4ff71171598d30825c8e59ed5f75fd6.patch";
10+ sha256 = "sha256:08mpy7lsiwv8m5qrqc4xzyiv2hri5713gz2qs1nfz02hz1bd79mc"; }
11+ ];
612 sha256 = "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7";
713}
pkgs/development/compilers/ocaml/4.02.nix+7−1
@@ -2,6 +2,12 @@ import ./generic.nix {
22 major_version = "4";
33 minor_version = "02";
44 patch_version = "3";
5− patches = [ ./ocamlbuild.patch ];
5+ patches = [
6+ ./ocamlbuild.patch
7+
8+ # Compatibility with Glibc 2.34
9+ { url = "https://github.com/ocaml/ocaml/commit/9de2b77472aee18a94b41cff70caee27fb901225.patch";
10+ sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; }
11+ ];
612 sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";
713}
pkgs/development/compilers/ocaml/4.03.nix+6
@@ -3,4 +3,10 @@ import ./generic.nix {
33 minor_version = "03";
44 patch_version = "0";
55 sha256 = "09p3iwwi55r6rbrpyp8f0wmkb0ppcgw67yxw6yfky60524wayp39";
6+
7+ patches = [
8+ # Compatibility with Glibc 2.34
9+ { url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch";
10+ sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; }
11+ ];
612}
pkgs/development/compilers/ocaml/4.04.nix+6
@@ -6,4 +6,10 @@ import ./generic.nix {
66
77 # If the executable is stipped it does not work
88 dontStrip = true;
9+
10+ patches = [
11+ # Compatibility with Glibc 2.34
12+ { url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch";
13+ sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; }
14+ ];
915}
pkgs/development/compilers/ocaml/4.05.nix+6
@@ -6,4 +6,10 @@ import ./generic.nix {
66
77 # If the executable is stipped it does not work
88 dontStrip = true;
9+
10+ patches = [
11+ # Compatibility with Glibc 2.34
12+ { url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch";
13+ sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; }
14+ ];
915}
pkgs/development/compilers/ocaml/4.06.nix+6
@@ -6,4 +6,10 @@ import ./generic.nix {
66
77 # If the executable is stipped it does not work
88 dontStrip = true;
9+
10+ patches = [
11+ # Compatibility with Glibc 2.34
12+ { url = "https://github.com/ocaml/ocaml/commit/137a4ad167f25fe1bee792977ed89f30d19bcd74.patch";
13+ sha256 = "sha256:0izsf6rm3677vbbx0snkmn9pkfcsayrdwz3ipiml5wjiaysnchjz"; }
14+ ];
915}
pkgs/development/compilers/ocaml/4.07.nix+6
@@ -6,4 +6,10 @@ import ./generic.nix {
66
77 # If the executable is stripped it does not work
88 dontStrip = true;
9+
10+ patches = [
11+ # Compatibility with Glibc 2.34
12+ { url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
13+ sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; }
14+ ];
915}
pkgs/development/compilers/ocaml/4.08.nix+6
@@ -9,4 +9,10 @@ import ./generic.nix {
99
1010 # Breaks build with Clang
1111 hardeningDisable = [ "strictoverflow" ];
12+
13+ patches = [
14+ # Compatibility with Glibc 2.34
15+ { url = "https://github.com/ocaml/ocaml/commit/17df117b4939486d3285031900587afce5262c8c.patch";
16+ sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
17+ ];
1218}
pkgs/development/compilers/ocaml/4.09.nix+6
@@ -6,4 +6,10 @@ import ./generic.nix {
66
77 # Breaks build with Clang
88 hardeningDisable = [ "strictoverflow" ];
9+
10+ patches = [
11+ # Compatibility with Glibc 2.34
12+ { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch";
13+ sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
14+ ];
915}