Unverified Commit fdd10eaf authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #260517 from ajs124/upd/photoprism 

photoprism: 230719-73fa7bbe8 -> 231011-63f708417
parents 1368a780 f548f734

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-gg/vIekHnoABucYqFDfo8574waN4rP7nkT57U3Gil5I=";

  vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c=";



  subPackages = [ "cmd/photoprism" ];

pkgs/servers/photoprism/default.nix

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



let

  version = "230719-73fa7bbe8";

  version = "231011-63f708417";

  pname = "photoprism";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    sha256 = "sha256-MRRF+XCk25dGK6A2AdD6/4PdXWoZNHuh/EsYOY0i7y0=";

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

  };



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

  backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; };

  frontend = pkgs.callPackage ./frontend.nix { inherit src version; };



  fetchModel = { name, sha256 }:

  fetchModel = { name, hash }:

    fetchzip {

      inherit sha256;

      inherit hash;

      url = "https://dl.photoprism.org/tensorflow/${name}.zip";

      stripRoot = false;

    };



  facenet = fetchModel {

    name = "facenet";

    sha256 = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo=";

    hash = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo=";

  };



  nasnet = fetchModel {

    name = "nasnet";

    sha256 = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE=";

    hash = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE=";

  };



  nsfw = fetchModel {

    name = "nsfw";

    sha256 = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg=";

    hash = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg=";

  };



  assets_path = "$out/share/${pname}";

pkgs/servers/photoprism/frontend.nix

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

  '';



  npmDepsHash = "sha256-tFO6gdERlljGJfMHvv6gMahZ6FgrXQOC/RQOsg1WAVk=";

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



  installPhase = ''

    runHook preInstall