pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #260517 from ajs124/upd/photoprism

photoprism: 230719-73fa7bbe8 -> 231011-63f708417

authored by Nick Cao and committed by GitHub fdd10eaf 1368a780

+9 -9
unified split
+1 -1
pkgs/servers/photoprism/backend.nix
··· 19 substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" 20 ''; 21 22 - vendorHash = "sha256-gg/vIekHnoABucYqFDfo8574waN4rP7nkT57U3Gil5I="; 23 24 subPackages = [ "cmd/photoprism" ]; 25
··· 19 substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" 20 ''; 21 22 + vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c="; 23 24 subPackages = [ "cmd/photoprism" ]; 25
+7 -7
pkgs/servers/photoprism/default.nix
··· 1 { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: 2 3 let 4 - version = "230719-73fa7bbe8"; 5 pname = "photoprism"; 6 7 src = fetchFromGitHub { 8 owner = pname; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-MRRF+XCk25dGK6A2AdD6/4PdXWoZNHuh/EsYOY0i7y0="; 12 }; 13 14 libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; 15 backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; }; 16 frontend = pkgs.callPackage ./frontend.nix { inherit src version; }; 17 18 - fetchModel = { name, sha256 }: 19 fetchzip { 20 - inherit sha256; 21 url = "https://dl.photoprism.org/tensorflow/${name}.zip"; 22 stripRoot = false; 23 }; 24 25 facenet = fetchModel { 26 name = "facenet"; 27 - sha256 = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo="; 28 }; 29 30 nasnet = fetchModel { 31 name = "nasnet"; 32 - sha256 = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE="; 33 }; 34 35 nsfw = fetchModel { 36 name = "nsfw"; 37 - sha256 = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg="; 38 }; 39 40 assets_path = "$out/share/${pname}";
··· 1 { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: 2 3 let 4 + version = "231011-63f708417"; 5 pname = "photoprism"; 6 7 src = fetchFromGitHub { 8 owner = pname; 9 repo = pname; 10 rev = version; 11 + hash = "sha256-g/j+L++vb+wiE23d/lm6lga0MeaPrCotEojD9Sajkmg="; 12 }; 13 14 libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; 15 backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; }; 16 frontend = pkgs.callPackage ./frontend.nix { inherit src version; }; 17 18 + fetchModel = { name, hash }: 19 fetchzip { 20 + inherit hash; 21 url = "https://dl.photoprism.org/tensorflow/${name}.zip"; 22 stripRoot = false; 23 }; 24 25 facenet = fetchModel { 26 name = "facenet"; 27 + hash = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo="; 28 }; 29 30 nasnet = fetchModel { 31 name = "nasnet"; 32 + hash = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE="; 33 }; 34 35 nsfw = fetchModel { 36 name = "nsfw"; 37 + hash = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg="; 38 }; 39 40 assets_path = "$out/share/${pname}";
+1 -1
pkgs/servers/photoprism/frontend.nix
··· 8 cd frontend 9 ''; 10 11 - npmDepsHash = "sha256-tFO6gdERlljGJfMHvv6gMahZ6FgrXQOC/RQOsg1WAVk="; 12 13 installPhase = '' 14 runHook preInstall
··· 8 cd frontend 9 ''; 10 11 + npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo="; 12 13 installPhase = '' 14 runHook preInstall