summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2024-04-27 11:51:59 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-05-07 21:33:24 +0000
commita2a8b1ee8df5ae1ed98e6ba0cfe1552bf039fd18 (patch)
tree717b2cf61b33f17ae8afa10b09e529c9e971e392
parentMerge pull request #309940 from NixOS/backport-309144-to-release-23.11 (diff)
downloadnixpkgs-a2a8b1ee8df5ae1ed98e6ba0cfe1552bf039fd18.tar.gz
psitransfer: 2.1.2 -> 2.2.0
(cherry picked from commit d2ca701f821885478cea9795d5ed06e7ec320e57)
-rw-r--r--pkgs/servers/psitransfer/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix
index e39ae107217e..621ad70184a6 100644
--- a/pkgs/servers/psitransfer/default.nix
+++ b/pkgs/servers/psitransfer/default.nix
@@ -1,22 +1,24 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
+, pkg-config
+, vips
}:
let
pname = "psitransfer";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "psi-4ward";
repo = "psitransfer";
rev = "v${version}";
- hash = "sha256-dBAieXIwCEstR9m+6+2/OLPKo2qHynZ1t372Il0mkXk=";
+ hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
};
app = buildNpmPackage {
pname = "${pname}-app";
inherit version src;
- npmDepsHash = "sha256-iCd+I/aTMwQqAMRHan3T191XNz4S3Cy6CDxSLIYY7IA=";
+ npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY=";
postPatch = ''
# https://github.com/psi-4ward/psitransfer/pull/284
@@ -31,7 +33,12 @@ let
in buildNpmPackage {
inherit pname version src;
- npmDepsHash = "sha256-H22T5IU8bjbsWhwhchDqppvYfcatbXSWqp6gdoek1Z8=";
+ npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ vips # for 'sharp' dependency
+ ];
postPatch = ''
rm -r public/app