Merge master into staging-next

2021-05-08 00:46:50 +00:00
parent 4756e8716d 088da8735f
commit b4416b52c5
101 changed files with 7603 additions and 6456 deletions
@@ -975,6 +975,12 @@ mapAliases ({

  posix_man_pages = man-pages-posix; # Added 2021-04-15

+  /* Cleanup before 21.11, Added 2021-05-07 */
+  avian = throw ''
+    The package doesn't compile anymore on NixOS and both development
+    & maintenance is abandoned by upstream.
+  '';
+
  /* If these are in the scope of all-packages.nix, they cause collisions
  between mixed versions of qt. See:
  https://github.com/NixOS/nixpkgs/pull/101369 */