Merge pull request #260517 from ajs124/upd/photoprism
photoprism: 230719-73fa7bbe8 -> 231011-63f708417
This commit is contained in:
commit
fdd10eafcd
3 changed files with 9 additions and 9 deletions
|
@ -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" ];
|
||||
|
||||
|
|
|
@ -1,40 +1,40 @@
|
|||
{ 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}";
|
||||
|
|
|
@ -8,7 +8,7 @@ buildNpmPackage {
|
|||
cd frontend
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-tFO6gdERlljGJfMHvv6gMahZ6FgrXQOC/RQOsg1WAVk=";
|
||||
npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
Loading…
Reference in a new issue