Commit 614af05b authored by ajs124's avatar ajs124 Committed by Pascal Bach
Browse files

photoprism: 240420-ef5f14bc4 -> 240711-2197af848 

https://github.com/photoprism/photoprism/releases/tag/240523-923ee0cf7
https://github.com/photoprism/photoprism/releases/tag/240528-977d6c0de
https://github.com/photoprism/photoprism/releases/tag/240531-60b3a4628
https://github.com/photoprism/photoprism/releases/tag/240711-2197af848
parent 41d395c8

pkgs/servers/photoprism/backend.nix

+10 −2
Original line number Diff line number Diff line 
{ lib, buildGoModule, coreutils, libtensorflow, src, version, ... }:

{ lib, buildGoModule, coreutils, libtensorflow, src, version

, pkg-config

, vips

}:



buildGoModule rec {

  inherit src version;

  pname = "photoprism-backend";



  nativeBuildInputs = [

    pkg-config

  ];



  buildInputs = [

    coreutils

    libtensorflow

    vips

  ];



  ldflags = [
@@ -19,7 +27,7 @@ buildGoModule rec { 
    substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"

  '';



  vendorHash = "sha256-ogJ/FwWJt1L0NGKX29tqWmHo4WslzC7ck5r7vn5PEuY=";

  vendorHash = "sha256-6xE1j/Vh9ltE6TpBkvjK4rzLyXv8OJzy84vf9Iqw3yU=";



  subPackages = [ "cmd/photoprism" ];

pkgs/servers/photoprism/default.nix

+6 −4
Original line number Diff line number Diff line 
{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }:

{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers

, librsvg }:



let

  version = "240420-ef5f14bc4";

  version = "240711-2197af848";

  pname = "photoprism";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    hash = "sha256-oJRd4eTwoTYKAJAsG9y0mnG+zF+eeLlSXNgaKLcb43w=";

    hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8=";

  };



  libtensorflow = pkgs.callPackage ./libtensorflow.nix { };
@@ -61,7 +62,8 @@ stdenv.mkDerivation { 
      --set PHOTOPRISM_DARKTABLE_BIN ${darktable}/bin/darktable-cli \

      --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_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \

      --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg_7}/bin/ffmpeg \

      --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \

      --set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert

pkgs/servers/photoprism/frontend.nix

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

  '';



  npmDepsHash = "sha256-mgDg6awsEHkZyMzvFLwlfXGjdvjtwkNJiiNcnRBSJVo=";

  npmDepsHash = "sha256-y2Mj0sJP2urTDrsVPReVFi7G9fLjuKz76vDPLvkaMFA=";



  installPhase = ''

    runHook preInstall