diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-05-28 21:03:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 21:03:45 +0100 |
| commit | 5c4c61ee71c7fa71a31c56a0f4e01ccd97e7b18c (patch) | |
| tree | c4d9450ba5b1edcb69b7389f4aee6d3a0ef97444 /pkgs/servers | |
| parent | c3369161d441cc14ee6ab0760ca7d87cb76142c1 (diff) | |
| parent | c4252653c15285a13d6550dd8d17e966e0812365 (diff) | |
Merge pull request #315283 from TomaSajt/photofield
photofield: add patch for Go 1.22 support
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/photofield/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index ffb647c03be53..3c9cf8245022a 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildGoModule , buildNpmPackage , makeWrapper @@ -10,7 +11,6 @@ }: let - pname = "photofield-ui"; version = "0.13.0"; src = fetchFromGitHub { @@ -35,11 +35,20 @@ let }; in -buildGoModule rec { +buildGoModule { pname = "photofield"; inherit version src; - vendorHash = "sha256-4JFP3vs/Z8iSKgcwfxpdnQpO9kTF68XQArFHYP8IoDQ="; + patches = [ + # Needed for Go 1.22 build support + (fetchpatch { + name = "upgrade-pyroscope-go.patch"; + url = "https://github.com/SmilyOrg/photofield/commit/681dcd48ab4113b0e99fe1a0d3638f0dfe985c05.patch"; + hash = "sha256-JGb5KAI/SmR1kiiaPoSsAF7G4YWDFXj0K3Gjw0zA3Ro="; + }) + ]; + + vendorHash = "sha256-BnImE4wK2MDO21N5tT9Q9w+NkDpdBCEqUwzuH/xb6fg="; preBuild = '' cp -r ${webui}/share/photofield-ui ui/dist |