Merge release-21.05 into staging-next-21.05

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

@@ -502,8 +502,6 @@ in {
               ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
               ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
               "--database-pass" = dbpass;
-              ${if c.dbtableprefix != null
-                then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
               "--admin-user" = ''"${c.adminuser}"'';
               "--admin-pass" = adminpass;
               "--data-dir" = ''"${cfg.home}/data"'';

nixos/tests/nextcloud/basic.nix

@@ -37,6 +37,7 @@ in {
         config = {
           # Don't inherit adminuser since "root" is supposed to be the default
           inherit adminpass;
+          dbtableprefix = "nixos_";
         };
         autoUpdateApps = {
           enable = true;

pkgs/os-specific/linux/kernel/linux-zen.nix

@@ -1,20 +1,25 @@
 { lib, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.13.9";
-  suffix = "zen1";
+  # having the full version string here makes it easier to update
+  modDirVersion = "5.13.13-zen1";
+  parts = lib.splitString "-" modDirVersion;
+  version = lib.elemAt parts 0;
+  suffix = lib.elemAt parts 1;
+
+  numbers = lib.splitString "." version;
+  branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}";
 in
 
 buildLinux (args // {
-  modDirVersion = "${version}-${suffix}";
-  inherit version;
+  inherit version modDirVersion;
   isZen = true;
 
   src = fetchFromGitHub {
     owner = "zen-kernel";
     repo = "zen-kernel";
-    rev = "v${version}-${suffix}";
-    sha256 = "sha256-RuY6ZIIKU56R+IGMtQDV6mIubGDqonRpsIdlrpAHFXM=";
+    rev = "v${modDirVersion}";
+    sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw=";
   };
 
   structuredExtraConfig = with lib.kernel; {
@@ -22,7 +27,7 @@ buildLinux (args // {
   };
 
   extraMeta = {
-    branch = "5.13";
+    inherit branch;
     maintainers = with lib.maintainers; [ atemu andresilva ];
     description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
   };

pkgs/os-specific/linux/kernel/update-zen.sh

@@ -0,0 +1,21 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl
+set -euo pipefail -x
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs")
+old="${old%\"}"
+old="${old#\"}"
+new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+')
+if [[ "$new" == "$old" ]]; then
+    echo "already up-to-date"
+    exit 0
+fi
+
+path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix"
+
+sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path"
+checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel")
+sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path"
+
+git commit -m "linux_zen: ${old} -> ${new}" $path