diff options
author | Graham Christensen <graham@grahamc.com> | 2018-10-15 10:33:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-15 10:33:31 -0400 |
commit | 94c6f1ba0ee02b5e322911420bef426618deec0a (patch) | |
tree | 943a2b11429e59f255ef7257af49764d239d3be4 | |
parent | a8a3928a34146b3f6ad6152cf41e936ffb3ec625 (diff) | |
parent | 861b70f4839be610f16fbfdf58a9670a3f8f3296 (diff) | |
download | nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar.gz nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar.bz2 nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar.lz nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar.xz nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.tar.zst nixlib-94c6f1ba0ee02b5e322911420bef426618deec0a.zip |
Merge pull request #48463 from Ekleog/release-notes-license
release-notes/18-09: add licenses marked as unfree
-rw-r--r-- | doc/package-notes.xml | 3 | ||||
-rw-r--r-- | nixos/doc/manual/administration/container-networking.xml | 1 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 42 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1903.xml | 12 |
4 files changed, 51 insertions, 7 deletions
diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0543e06a05d4..dad28d3ec8b2 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -413,7 +413,8 @@ packageOverrides = pkgs: { in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting> if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add + To use the Steam controller or other Steam supported controllers such as + the DualShock 4 or Nintendo Switch Pro, you need to add <programlisting>hardware.steam-hardware.enable = true;</programlisting> to your configuration. </para> diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 8aca329c8f1f..2ee8bfdd50f1 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -52,6 +52,7 @@ $ ping -c1 10.233.4.2 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; </programlisting> </para> + <para> You may need to restart your system for the changes to take effect. </para> diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index c5521735428b..0ddf40acbfcc 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -477,6 +477,48 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> <para> + Some licenses that were incorrectly not marked as unfree now are. This is + the case for: + <itemizedlist> + <listitem> + <para> + cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike + 2.0 + </para> + </listitem> + <listitem> + <para> + cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike + 2.5 + </para> + </listitem> + <listitem> + <para> + cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike + 3.0 + </para> + </listitem> + <listitem> + <para> + cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike + 4.0 + </para> + </listitem> + <listitem> + <para> + cc-by-nd-30: Creative Commons Attribution-No Derivative Works v3.00 + </para> + </listitem> + <listitem> + <para> + msrla: Microsoft Research License Agreement + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + <listitem> + <para> The deprecated <varname>services.cassandra</varname> module has seen a complete rewrite. (See above.) </para> diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index e13770c553f8..163819194ecf 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -106,12 +106,12 @@ </para> </listitem> <listitem> - <para> - The <literal>light</literal> module no longer uses setuid binaries, but - udev rules. As a consequence users of that module have to belong to the - <literal>video</literal> group in order to use the executable - (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>). - </para> + <para> + The <literal>light</literal> module no longer uses setuid binaries, but + udev rules. As a consequence users of that module have to belong to the + <literal>video</literal> group in order to use the executable (i.e. + <literal>users.users.yourusername.extraGroups = ["video"];</literal>). + </para> </listitem> <listitem> <para> |