swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

ocaml-ng.ocamlPackages_5_0.ocaml: init at 5.0.0-β1

Browse source
This commit is contained in:
Vincent Laporte 2022-10-15 16:41:15 +02:00 committed by Vincent Laporte
parent eb569423a7
commit 7e591f949e
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/ocaml/5.0.nix Normal file
View file

@ -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";
};
}

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

@ -73,6 +73,7 @@ stdenv.mkDerivation (args // {
configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; 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 # 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" 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; ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
# Older versions have some race: # Older versions have some race:

2
pkgs/top-level/ocaml-packages.nix
View file

@ -1663,6 +1663,8 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { }); ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { });
ocamlPackages_5_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.0.nix { });
ocamlPackages_latest = ocamlPackages_4_14; ocamlPackages_latest = ocamlPackages_4_14;
ocamlPackages = ocamlPackages_4_14; ocamlPackages = ocamlPackages_4_14;