Skip to content

Commit 4e22e88

Browse files
committedSep 28, 2017
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents 95b706f + 82667fe commit 4e22e88

File tree

63 files changed

+832
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+832
-694
lines changed
 

‎lib/licenses.nix

+5
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
281281
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
282282
};
283283

284+
hpnd = spdx {
285+
spdxId = "HPND";
286+
fullName = "Historic Permission Notice and Disclaimer";
287+
};
288+
284289
# Intel's license, seems free
285290
iasl = {
286291
fullName = "iASL";

‎nixos/doc/manual/release-notes/rl-1709.xml

+17
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,13 @@ FLUSH PRIVILEGES;
335335
was removed and should not be needed anymore.</para>
336336
</listitem>
337337

338+
<listitem>
339+
<para>
340+
Redis has been updated to version 4 which mandates a cluster
341+
mass-restart, due to changes in the network handling, in order
342+
to ensure compatibility with networks NATing traffic.
343+
</para>
344+
</listitem>
338345
</itemizedlist>
339346

340347
<para>Other notable improvements:</para>
@@ -432,6 +439,16 @@ FLUSH PRIVILEGES;
432439
version, kernel version and build date of all bootable generations.
433440
</para>
434441
</listitem>
442+
<listitem>
443+
<para>
444+
The dnscrypt-proxy service now defaults to using a random upstream resolver,
445+
selected from the list of public non-logging resolvers with DNSSEC support.
446+
Existing configurations can be migrated to this mode of operation by
447+
omitting the <option>services.dnscrypt-proxy.resolverName</option> option
448+
or setting it to <literal>"random"</literal>.
449+
</para>
450+
</listitem>
451+
435452
</itemizedlist>
436453

437454
</section>

0 commit comments

Comments
 (0)
Please sign in to comment.