cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #210117 from wegank/ocaml-aarch64-linux

Browse source 
ocaml-ng.ocamlPackages_4_0[2-5].ocaml: unbreak on aarch64-linux
This commit is contained in:
Sandro 2023-01-18 14:34:52 +01:00 committed by GitHub
commit 76645347bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/ocaml/4.02.nix
View file

@ -8,6 +8,9 @@ import ./generic.nix {
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/9de2b77472aee18a94b41cff70caee27fb901225.patch";
sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; }
# Compatibility with Binutils 2.29
{ url = "https://github.com/ocaml/ocaml/commit/bcc7a767279ff70518b3f4219cc0b9bffec7dd43.patch";
sha256 = "sha256-z3xrqN6bh/EW9dkPg6Hz8mT79DFm26yGRoPbE+RMYi0="; }
];
sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";

3
pkgs/development/compilers/ocaml/4.03.nix
View file

@ -8,6 +8,9 @@ import ./generic.nix {
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch";
sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; }
# Compatibility with Binutils 2.29
{ url = "https://github.com/ocaml/ocaml/commit/c204f07bfb20174f9e1c9ff586fb7b2f42b8bf18.patch";
sha256 = "sha256-AAXyMZ7ujO67SGz+tGXKZkVcINAwvccHlFHmKnUt848="; }
];
# Workaround build failure on -fno-common toolchains like upstream

3
pkgs/development/compilers/ocaml/4.04.nix
View file

@ -11,6 +11,9 @@ import ./generic.nix {
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch";
sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; }
# Compatibility with Binutils 2.29
{ url = "https://github.com/ocaml/ocaml/commit/db11f141a0e35c7fbaec419a33c4c39d199e2635.patch";
sha256 = "sha256-oIwmbXOCzDGyASpbQ7hd7SCs4YHjd9hBBksJ74V3GiY="; }
];
# Workaround build failure on -fno-common toolchains like upstream

3
pkgs/development/compilers/ocaml/4.05.nix
View file

@ -11,6 +11,9 @@ import ./generic.nix {
# Compatibility with Glibc 2.34
{ url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch";
sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; }
# Compatibility with Binutils 2.29
{ url = "https://github.com/ocaml/ocaml/commit/b00000c6679804731692362b0baac27fa3fddfd5.patch";
sha256 = "sha256-CuEXGK3EsOevyUrc9TmSZo9DVBwjunQX7mKnDVHFpkY="; }
];
# Workaround build failure on -fno-common toolchains like upstream

2
pkgs/development/compilers/ocaml/generic.nix
View file

@ -138,7 +138,7 @@ stdenv.mkDerivation (args // {
'';
platforms = with platforms; linux ++ darwin;
broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.06");
broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.02");
};
})