From a41d007383293f5eb25e026edc8cfdca4681a618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Fri, 20 Dec 2024 18:38:03 +0100 Subject: [PATCH] frankenphp: 1.2.5 -> 1.4.0 --- pkgs/by-name/fr/frankenphp/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index d4ad0287e797..22ee2678e321 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, php, brotli, + watcher, testers, frankenphp, cctools, @@ -30,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.2.5"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; - rev = "v${version}"; - hash = "sha256-X6lWbxgqj0wis/cljoNSh7AsH1zY30GTjSOAGXzUIek="; + tag = "v${version}"; + hash = "sha256-DxKNem7U5DD2l34vIwE6s3TIM1PSixq2J/5jufk1JUc="; }; sourceRoot = "${src.name}/caddy"; @@ -44,11 +45,12 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-U2B0ok6TgqUPMwlnkzpPkJLG22S3VpoU80bWwZAeaJo="; + vendorHash = "sha256-KlWRyQz//sR24IJj9RvRtPQG0N0FjVSL6Yrq0Nhgi/A="; buildInputs = [ phpUnwrapped brotli + watcher ] ++ phpUnwrapped.buildInputs; nativeBuildInputs = [ makeBinaryWrapper ] @@ -65,6 +67,9 @@ buildGoModule rec { "netgo" "ousergo" "static_build" + "nobadger" + "nomysql" + "nopgx" ]; ldflags = [