Merge master into staging-next

2021-02-09 06:16:02 +00:00
parent e95bf38429 50d34017c2
commit 30dddce5e8
101 changed files with 477 additions and 686 deletions
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -138,11 +138,11 @@
 </programlisting>
    </para>
    <para>
-     For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code:
+     For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code:
 <programlisting>
 {
  allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "flashplayer"
+    "roon-server"
    "vscode"
  ];
 }