From 7e591f949ecabda439f8b9a52ba764274a706412 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 15 Oct 2022 16:41:15 +0200 Subject: ocaml-ng.ocamlPackages_5_0.ocaml: init at 5.0.0-β1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/5.0.nix | 9 +++++++++ pkgs/development/compilers/ocaml/generic.nix | 1 + 2 files changed, 10 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/5.0.nix (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ocaml/5.0.nix b/pkgs/development/compilers/ocaml/5.0.nix new file mode 100644 index 000000000000..a36b3e31a427 --- /dev/null +++ b/pkgs/development/compilers/ocaml/5.0.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "5"; + minor_version = "0"; + patch_version = "0-beta1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta1.tar.xz"; + sha256 = "sha256:1kwb53ra5qbwiiyrx5da7l5mqkjf0fr3rqgkrm3wr83l25scimj4"; + }; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 2c6045c13a62..7db0eca0ee4d 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation (args // { configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" + ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; # Older versions have some race: -- cgit 1.4.1