Unverified Commit 46ad1987 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #278698 from bachp/photoprism-update 

photoprism: 231011-63f708417 -> 231128-f48ff16ef
parents 551c2767 1e5f255c

nixos/modules/services/web-apps/photoprism.nix

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ in 
        StateDirectory = "photoprism";

        WorkingDirectory = "/var/lib/photoprism";

        RuntimeDirectory = "photoprism";

        ReadWritePaths = [ cfg.originalsPath cfg.importPath cfg.storagePath ];



        LoadCredential = lib.optionalString (cfg.passwordFile != null)

          "PHOTOPRISM_ADMIN_PASSWORD:${cfg.passwordFile}";

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"

  '';



  vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c=";

  vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA=";



  subPackages = [ "cmd/photoprism" ];

pkgs/servers/photoprism/default.nix

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



let

  version = "231011-63f708417";

  version = "231128-f48ff16ef";

  pname = "photoprism";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    hash = "sha256-g/j+L++vb+wiE23d/lm6lga0MeaPrCotEojD9Sajkmg=";

    hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ=";

  };



  libtensorflow = pkgs.callPackage ./libtensorflow.nix { };

pkgs/servers/photoprism/frontend.nix

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

  '';



  npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo=";

  npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw=";



  installPhase = ''

    runHook preInstall