Merge branch 'staging-next' into staging

2021-03-04 22:16:45 +01:00
parent 9f7ce23482 a992d68671
commit 6d1958ad2d
325 changed files with 4167 additions and 1748 deletions
--- a/pkgs/development/compilers/ocaml/4.11.nix
+++ b/pkgs/development/compilers/ocaml/4.11.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
  major_version = "4";
  minor_version = "11";
-  patch_version = "1";
-  sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
+  patch_version = "2";
+  sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z";
 }