summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-21 18:01:08 +0000
committerGitHub <noreply@github.com>2021-07-21 18:01:08 +0000
commit41adc8c8ded99eec7834826445ec96deff2b1908 (patch)
treecc86f9a021fba85a1ed1e4c1b522500167ae207b /nixos
parentde72454d43afd149a93a207b41fe0ae90895b158 (diff)
parent077b2825cd3328f83dbc1774ce62751dae4cb719 (diff)
downloadnixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar.gz
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar.bz2
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar.lz
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar.xz
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.tar.zst
nixpkgs-41adc8c8ded99eec7834826445ec96deff2b1908.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml6
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 68eeb85cddd..ae9f97c139b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -544,6 +544,12 @@
           2020 to 2021
         </para>
       </listitem>
+      <listitem>
+        <para>
+          the <literal>mingw-64</literal> package has been upgraded from
+          6.0.0 to 9.0.0
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 54ea22e3bfc..172fe9bbcad 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -138,6 +138,8 @@ pt-services.clipcat.enable).
 
 - The `isabelle` package has been upgraded from 2020 to 2021
 
+- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}
 
 - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.