Merge staging-next-21.05 into staging-21.05

nixos/modules/services/web-apps/nextcloud.xml

@@ -84,28 +84,31 @@
 </para>
 
  </section>
- <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
-  <title>Pitfalls</title>
 
+ <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
+  <title>Common problems</title>
+  <itemizedlist>
+   <listitem>
+    <formalpara>
+     <title>General notes</title>
      <para>
       Unfortunately Nextcloud appears to be very stateful when it comes to
       managing its own configuration. The config file lives in the home directory
       of the <literal>nextcloud</literal> user (by default
       <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
-   track several states of the application (e.g. whether installed or not).
+      track several states of the application (e.g., whether installed or not).
      </para>
-
+    </formalpara>
     <para>
      All configuration parameters are also stored in
-   <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by
+     <filename>/var/lib/nextcloud/config/override.config.php</filename> which is generated by
-   the module and linked from the store to ensure that all values from <literal>config.php</literal>
+     the module and linked from the store to ensure that all values from
-   can be modified by the module.
+     <filename>config.php</filename> can be modified by the module.
-   However <literal>config.php</literal> manages the application's state and shouldn't be touched
+     However <filename>config.php</filename> manages the application's state and shouldn't be
-   manually because of that.
+     touched manually because of that.
     </para>
-
     <warning>
-   <para>Don't delete <literal>config.php</literal>! This file
+     <para>Don't delete <filename>config.php</filename>! This file
      tracks the application's state and a deletion can cause unwanted
      side-effects!</para>
     </warning>
@@ -115,9 +118,12 @@
      maintenance:install</literal>! This command tries to install the application
      and can cause unwanted side-effects!</para>
     </warning>
-
+   </listitem>
+   <listitem>
+    <formalpara>
+     <title>Multiple version upgrades</title>
      <para>
-   Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on
+      Nextcloud doesn't allow to move more than one major-version forward. E.g., if you're on
       <literal>v16</literal>, you cannot upgrade to <literal>v18</literal>, you need to upgrade to
       <literal>v17</literal> first. This is ensured automatically as long as the
       <link linkend="opt-system.stateVersion">stateVersion</link> is declared properly. In that case
@@ -125,6 +131,46 @@
       release) will be selected by default and the module will generate a warning that reminds
       the user to upgrade to latest Nextcloud <emphasis>after</emphasis> that deploy.
      </para>
+    </formalpara>
+   </listitem>
+   <listitem>
+    <formalpara>
+     <title><literal>Error: Command "upgrade" is not defined.</literal></title>
+     <para>
+      This error usually occurs if the initial installation
+      (<command>nextcloud-occ maintenance:install</command>) has failed. After that, the application
+      is not installed, but the upgrade is attempted to be executed. Further context can
+      be found in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/111175">NixOS/nixpkgs#111175</link>.
+     </para>
+    </formalpara>
+    <para>
+     First of all, it makes sense to find out what went wrong by looking at the logs
+     of the installation via <command>journalctl -u nextcloud-setup</command> and try to fix
+     the underlying issue.
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       If this occurs on an <emphasis>existing</emphasis> setup, this is most likely because
+       the maintenance mode is active. It can be deactivated by running
+       <command>nextcloud-occ maintenance:mode --off</command>. It's advisable though to
+       check the logs first on why the maintenance mode was activated.
+      </para>
+     </listitem>
+     <listitem>
+      <warning><para>Only perform the following measures on
+      <emphasis>freshly installed instances!</emphasis></para></warning>
+      <para>
+       A re-run of the installer can be forced by <emphasis>deleting</emphasis>
+       <filename>/var/lib/nextcloud/config/config.php</filename>. This is the only time
+       advisable because the fresh install doesn't have any state that can be lost.
+       In case that doesn't help, an entire re-creation can be forced via
+       <command>rm -rf ~nextcloud/</command>.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+  </itemizedlist>
  </section>
 
  <section xml:id="module-services-nextcloud-httpd">

pkgs/development/libraries/grilo/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
+{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }:
 
@@ -16,6 +16,14 @@ in stdenv.mkDerivation rec {
     sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2021-39365.patch";
+      url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch";
+      sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm";
+    })
+  ];
+
   setupHook = ./setup-hook.sh;
 
   mesonFlags = [