movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 03:55:44 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-02-12 12:05:57 +00:00 • committed by GitHub
commit 97b9d455ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
381 changed files with 799 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/security/wrappers/default.nix
View file

@ -1,7 +1,9 @@
{ config, lib, pkgs, ... }:
let
inherit (config.security) wrapperDir wrappers;
inherit (config.security) wrapperDir;
wrappers = lib.filterAttrs (name: value: value.enable) config.security.wrappers;
parentWrapperDir = dirOf wrapperDir;
@ -41,6 +43,11 @@ let
// { description = "file mode string"; };
wrapperType = lib.types.submodule ({ name, config, ... }: {
options.enable = lib.mkOption
{ type = lib.types.bool;
default = true;
description = "Whether to enable the wrapper.";
};
options.source = lib.mkOption
{ type = lib.types.path;
description = "The absolute path to the program to be wrapped.";

4
nixos/modules/services/misc/metabase.nix
View file

@ -15,6 +15,8 @@ in {
services.metabase = {
enable = mkEnableOption "Metabase service";
package = lib.mkPackageOption pkgs "metabase" { };
listen = {
ip = mkOption {
type = types.str;
@ -92,7 +94,7 @@ in {
serviceConfig = {
DynamicUser = true;
StateDirectory = baseNameOf dataDir;
ExecStart = "${pkgs.metabase}/bin/metabase";
ExecStart = lib.getExe cfg.package;
};
};

2
nixos/modules/services/web-apps/bookstack.nix
View file

@ -249,7 +249,7 @@ in {
OIDC_NAME = "MyLogin";
OIDC_DISPLAY_NAME_CLAIMS = "name";
OIDC_CLIENT_ID = "bookstack";
OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"};
OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret";};
OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm";
OIDC_ISSUER_DISCOVER = true;
}