diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-05-08 22:17:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-08 22:17:44 +0100 |
| commit | 0f45b143d7782461f5f1400ebfb16dafd06fd83d (patch) | |
| tree | c50074d3216778cdd532d3a4718067533df01aa2 | |
| parent | Merge pull request #310119 from zeme-wana/backport-308783-to-release-23.11 (diff) | |
| parent | psitransfer: 2.1.2 -> 2.2.0 (diff) | |
| download | nixpkgs-0f45b143d7782461f5f1400ebfb16dafd06fd83d.tar.gz | |
Merge pull request #309946 from NixOS/backport-307185-to-release-23.11
[Backport release-23.11] psitransfer: 2.1.2 -> 2.2.0
| -rw-r--r-- | pkgs/servers/psitransfer/default.nix | 15 |
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 |