Unverified Commit a6c64b2c authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #230373 from gregod/photoprism-230506-9de9a3540 

photoprism: 221118-e58fee0fb -> 230603-378d4746a
parents 4627ee74 4c101ed3

pkgs/servers/photoprism/backend.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildGoModule rec { 
    substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"

  '';



  vendorSha256 = "sha256-59ZwijPCcmhMPeh7v8EdqzraqRx+HhK6VnUk0JvAbbU=";

  vendorSha256 = "sha256-jkBGFO18m5OyyMr8M7qeQHcHc9koLudGU5t8vFUBjuE=";



  subPackages = [ "cmd/photoprism" ];

pkgs/servers/photoprism/default.nix

+5 −4
Original line number Diff line number Diff line 
{ 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 = "230603-378d4746a";

  pname = "photoprism";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    sha256 = "sha256-Bx9SJLK97uZ/k09LIj8dHwmRetg6krI5iO7mtojV3PU=";

    sha256 = "sha256-lywVP4Vvq88g+Yk4BuzOaB+9EbWrxGgIF4lOPW33E1U=";

  };



  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}

pkgs/servers/photoprism/frontend.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ buildNpmPackage { 
    cd frontend

  '';



  npmDepsHash = "sha256-NAtZ85WjiQn9w0B9Y78XL+tSsshHlaXS8+WtojFJmGg";

  npmDepsHash = "sha256-lZpgv3YFF+b9nPJlbG2KdGYC5UMy+VnYqRgz7JLj85g=";



  installPhase = ''

    runHook preInstall