diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-20 18:41:15 -0400 |
|---|---|---|
| committer | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-20 18:41:15 -0400 |
| commit | 34aaac6d7c9c173728cad610f3798481d5df94d6 (patch) | |
| tree | 8c3bf1e003592ef94d5b9c7d16f72ce0785e6450 /nixos/doc | |
| parent | 0cc9dd7c16ea3db534274225617c22160eca4311 (diff) | |
| parent | a930a6d7ee5004001f74a8dbd786d5253acbf160 (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/gpu-accel.xml | 7 | ||||
| -rw-r--r-- | nixos/doc/manual/development/writing-nixos-tests.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 251e5c26ba44..95ee13f4796e 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -183,7 +183,12 @@ GPU1: be forced as follows: <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [ - <package>amdvlk</package> + pkgs.<package>amdvlk</package> +]; + +# To enable Vulkan support for 32-bit applications, also add: +<xref linkend="opt-hardware.opengl.extraPackages32"/> = [ + pkgs.driversi686Linux.<package>amdvlk</package> ]; # For amdvlk diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 74ab23605b35..cab4c067e0d3 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -43,7 +43,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"> console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, <filename -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix</filename>, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients. diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0f5df907d882..511276bcaab3 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -27,6 +27,12 @@ <para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para> </listitem> <listitem> + <para> + The Cinnamon desktop environment (v4.6) has been added. <varname>services.xserver.desktopManager.cinnamon.enable = true;</varname> to try it out! + Remember that, with any new feature it's possible you could run into issues, so please send all support requests to <link xlink:href="https://github.com/NixOS/nixpkgs/issues">github.com/NixOS/nixpkgs</link> to notify the maintainers. + </para> + </listitem> + <listitem> <para> Quickly configure a complete, private, self-hosted video conferencing solution with the new Jitsi Meet module. |