diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-12 18:01:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-12 18:01:09 +0000 |
commit | a55c80886c93da0d1db569bf34c95a8639267c64 (patch) | |
tree | eaaebef0f5136b421fd6f3e1adb1f053921cda06 /pkgs/servers | |
parent | 87f957b5e23490bda6e86bbe1f2e61e4358bfeff (diff) | |
parent | d1801a813d5a3dfb2c32fab0e3b1be0906f51348 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/imaginary/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix index cfab6e2e9030e..f4b12941f5b4e 100644 --- a/pkgs/servers/imaginary/default.nix +++ b/pkgs/servers/imaginary/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, vips +}: buildGoModule rec { pname = "imaginary"; @@ -11,6 +17,16 @@ buildGoModule rec { hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA="; }; + patches = [ + # add -return-size flag recommend by Nextcloud + # https://github.com/h2non/imaginary/pull/382 + (fetchpatch { + name = "return-width-and-height-of-generated-images.patch"; + url = "https://github.com/h2non/imaginary/commit/cfbf8d724cd326e835dfcb01e7224397c46037d3.patch"; + hash = "sha256-TwZ5WU5g9LXrenpfY52jYsc6KsEt2fjDq7cPz6ILlhA="; + }) + ]; + vendorHash = "sha256-BluY6Fz4yAKJ/A9aFuPPsgQN9N/5yd8g8rDfIZeYz5U="; buildInputs = [ vips ]; @@ -28,6 +44,6 @@ buildGoModule rec { changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}"; description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ dotlambda urandom ]; }; } |