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>2022-07-23 06:02:03 +0000
committerGitHub <noreply@github.com>2022-07-23 06:02:03 +0000
commitf0365462869b14a3b4c188e5cd7f8caaa6702e03 (patch)
treef8d874c8d8f399731f466e852b6bcb6670e3f2f4 /nixos
parent981d9c09262a474fb172c0518f37a693d3935e5f (diff)
parent1ce437589af410e15104c382839828b7bd531482 (diff)
downloadnixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar.gz
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar.bz2
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar.lz
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar.xz
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.tar.zst
nixpkgs-f0365462869b14a3b4c188e5cd7f8caaa6702e03.zip
Merge staging-next into staging
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2211.section.xml7
-rw-r--r--nixos/doc/manual/release-notes/rl-2211.section.md2
2 files changed, 9 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 864b6e47db2..be3adc4d3be 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -269,6 +269,13 @@
       </listitem>
       <listitem>
         <para>
+          The <literal>meta.mainProgram</literal> attribute of packages
+          in <literal>wineWowPackages</literal> now defaults to
+          <literal>&quot;wine64&quot;</literal>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           (Neo)Vim can not be configured with
           <literal>configure.pathogen</literal> anymore to reduce
           maintainance burden. Use <literal>configure.packages</literal>
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index d4059e73932..3f9afe13f1d 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -104,6 +104,8 @@ In addition to numerous new and upgraded packages, this release has the followin
   `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
   maintenance.
 
+- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.
+
 - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
 Use `configure.packages` instead.