diff options
| author | Gregor Godbersen <git@doamo.de> | 2023-05-06 17:16:05 +0200 |
|---|---|---|
| committer | Gregor Godbersen <git@doamo.de> | 2023-05-09 14:34:15 +0200 |
| commit | 804bb25f486e1e8640551532b49045f0d9c43f9e (patch) | |
| tree | e82bb40c4da2b1135a7f0e04d67156fad24f35e0 /pkgs/servers/photoprism | |
| parent | 67486d98ab3942f2a70fcf22797c1c42c82d8101 (diff) | |
photoprism: 221118-e58fee0fb -> 230506-9de9a3540
Diffstat (limited to 'pkgs/servers/photoprism')
| -rw-r--r-- | pkgs/servers/photoprism/backend.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/photoprism/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/photoprism/frontend.nix | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/servers/photoprism/backend.nix index 2a728b058cdec..dd1a78ff9dbd0 100644 --- a/pkgs/servers/photoprism/backend.nix +++ b/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorSha256 = "sha256-59ZwijPCcmhMPeh7v8EdqzraqRx+HhK6VnUk0JvAbbU="; + vendorSha256 = "sha256-OyHescVn73kNF+Ji07Ea+pQC+IRx8/ywb/RjfLHH84k="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 1c9303ff4c539..259f999a0b8fc 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,14 +1,14 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, makeWrapper, testers }: +{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "221118-e58fee0fb"; + version = "230506-9de9a3540"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Bx9SJLK97uZ/k09LIj8dHwmRetg6krI5iO7mtojV3PU="; + sha256 = "sha256-I7ff+AkQaPTyanEpVpQhCe1LDXdoF1LZl4j6jsPsweg="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; @@ -62,7 +62,8 @@ stdenv.mkDerivation { --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \ --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg}/bin/ffmpeg \ - --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool + --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \ + --set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert # install frontend ln -s ${frontend}/assets/* ${assets_path} diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/servers/photoprism/frontend.nix index 9bf0fc57348ce..fa5f559bb5294 100644 --- a/pkgs/servers/photoprism/frontend.nix +++ b/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-NAtZ85WjiQn9w0B9Y78XL+tSsshHlaXS8+WtojFJmGg"; + npmDepsHash = "sha256-gjUt2jdk3EI+VEe10tG76J5FGKFbHwb9g0Uy8ovU99w="; installPhase = '' runHook preInstall |