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

Merge pull request #311389 from vbgl/ocaml-5.2.0

Browse Source 
ocaml-ng.ocamlPackages_5_2.ocaml: 5.2.0-β2 → 5.2.0
This commit is contained in:
Ulrik Strid 2024-05-13 22:08:35 +02:00 committed by GitHub
commit c802669245
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/ocaml/5.2.nix
View File

@ -1,9 +1,6 @@
import ./generic.nix { import ./generic.nix {
major_version = "5"; major_version = "5";
minor_version = "2"; minor_version = "2";
patch_version = "0-beta2"; patch_version = "0";
src = fetchTarball { sha256 = "sha256-L0v0efUUefm/jH8WlKbqcza793T0rW2mtZ0a1JOd2Kc=";
url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta2.tar.xz";
sha256 = "sha256:1cyw0w79j7kyr3x0ivsqm1si704b29ic33yj621dq7f125jabk00";
};
} }

12
pkgs/development/ocaml-modules/janestreet/0.16.nix
View File

@ -569,13 +569,17 @@ with self;
propagatedBuildInputs = [ base ppx_jane ]; propagatedBuildInputs = [ base ppx_jane ];
}; };
ocaml-compiler-libs = janePackage { ocaml-compiler-libs = janePackage ({
pname = "ocaml-compiler-libs"; pname = "ocaml-compiler-libs";
version = "0.12.4";
hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv";
minimalOCamlVersion = "4.04.1"; minimalOCamlVersion = "4.04.1";
meta.description = "OCaml compiler libraries repackaged"; meta.description = "OCaml compiler libraries repackaged";
}; } // (if lib.versionAtLeast ocaml.version "5.2" then {
version = "0.17.0";
hash = "sha256-QaC6BWrpFblra6X1+TrlK+J3vZxLvLJZ2b0427DiQzM=";
} else {
version = "0.12.4";
hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv";
}));
ocaml-embed-file = janePackage { ocaml-embed-file = janePackage {
pname = "ocaml-embed-file"; pname = "ocaml-embed-file";

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

@ -2010,7 +2010,7 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { }); ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { });
ocamlPackages_latest = ocamlPackages_5_1; ocamlPackages_latest = ocamlPackages_5_2;
ocamlPackages = ocamlPackages_5_1; ocamlPackages = ocamlPackages_5_1;