public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-29 12:03:03 +00:00 committed by GitHub
commit 557ef93801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-apps/nextcloud.nix
View File

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

1
nixos/tests/nextcloud/basic.nix
View File

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

19
pkgs/os-specific/linux/kernel/linux-zen.nix
View File

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

21
pkgs/os-specific/linux/kernel/update-zen.sh Executable file
View File

@ -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