Skip to content

Commit

Permalink
feat: remove grpc from module list
Browse files Browse the repository at this point in the history
  • Loading branch information
Jochen Manz committed Dec 4, 2023
1 parent 3e6b8a8 commit 0607b8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions modules/php.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ let

phpPackage = package.buildEnv {
extensions = { all, enabled }: with all; enabled
++ [ grpc ]
++ (lib.optional config.services.redis.enable redis)
++ (lib.optional config.services.blackfire.enable blackfire)
++ (lib.optional config.services.rabbitmq.enable amqp)
Expand All @@ -50,7 +49,7 @@ let

phpXdebug = package.buildEnv {
extensions = { all, enabled }: with all; enabled
++ [ xdebug grpc ]
++ [ xdebug ]
++ (lib.optional config.services.redis.enable redis)
++ (lib.optional config.services.rabbitmq.enable amqp)
++ lib.attrsets.attrValues (lib.attrsets.getAttrs cfg.additionalPhpExtensions package.extensions);
Expand Down
4 changes: 3 additions & 1 deletion modules/scripts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ in {
'';

# Processes
processes.entryscript.exec = "${entryScript}";
processes.entryscript.exec = ''
${entryScript}
'';

scripts.caddy-trust.exec = ''
${config.services.caddy.package}/bin/caddy trust
Expand Down

0 comments on commit 0607b8b

Please sign in to comment.