Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-15 18:30:28 +00:00
committed by GitHub
43 changed files with 928 additions and 316 deletions
+2
View File
@@ -5352,6 +5352,8 @@ in
gtkperf = callPackage ../development/tools/misc/gtkperf { };
gtk-frdp = callPackage ../development/libraries/gtk-frdp {};
gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
+1
View File
@@ -141,6 +141,7 @@ rec {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
erlangR24 = packagesWith interpreters.erlangR24;
erlangR23 = packagesWith interpreters.erlangR23;
erlangR22 = packagesWith interpreters.erlangR22;
erlangR21 = packagesWith interpreters.erlangR21;