Commit Graph

8 Commits

Author SHA1 Message Date
Alyssa Ross
d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
Vincent Laporte
6107d3894b ocaml-ng.ocamlPackages_4_12.ocaml: 4.12.0 → 4.12.1 2022-03-12 09:34:07 +01:00
Maximilian Bosch
917b7e5fd2
ocaml: fix build w/glibc-2.34
ChangeLog: https://hydra.nixos.org/build/154122673
2022-02-27 10:25:39 +01:00
Antonio Nuno Monteiro
98cefe1d6b OCaml 4.12.--beta1 -> 4.12.0 2021-02-25 21:25:10 +01:00
Antonio Nuno Monteiro
29954335b7 ocamlPackages_4_12.ocaml: alpha3 -> beta1 2021-01-21 21:59:09 +01:00
Vincent Laporte
75d69a0a27 ocaml-ng.ocamlPackages_4_12.ocaml: 4.12.0~α2 → 4.12.0~α3 2020-12-26 08:12:49 +01:00
Vincent Laporte
e4a7c4268b ocaml-ng.ocamlPackages_4_12.ocaml: 4.12.0~α1 → 4.12.0~α2 2020-12-08 16:37:41 +01:00
Vincent Laporte
254f2bad97 ocaml-ng.ocamlPackages_4_12.ocaml: init at 4.12.0-α1 2020-11-25 07:55:44 +01:00