Merge pull request #201889 from BeneSim/photoprism-change-tests

photoprism: add valid passthru test

authored by Andreas Rammhold and committed by GitHub bf337d21 fa703b93

+19 -15
+2 -2
pkgs/servers/photoprism/default.nix
··· 1 - { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, nixosTests, makeWrapper }: 1 + { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, makeWrapper, testers }: 2 2 3 3 let 4 4 version = "221102-905925b4d"; ··· 74 74 runHook postInstall 75 75 ''; 76 76 77 - passthru.tests.photoprism = nixosTests.photoprism; 77 + passthru.tests.version = testers.testVersion { package = pkgs.photoprism; }; 78 78 79 79 meta = with lib; { 80 80 homepage = "https://photoprism.app";
+17 -13
pkgs/servers/photoprism/libtensorflow.nix
··· 15 15 aarch64-linux = "sha256-qnj4vhSWgrk8SIjzIH1/4waMxMsxMUvqdYZPaSaUJRk="; 16 16 }.${system}; 17 17 18 - url = let 19 - systemName = { 20 - x86_64-linux = "amd64"; 21 - aarch64-linux = "arm64"; 22 - }.${system}; 23 - in "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; 18 + url = 19 + let 20 + systemName = { 21 + x86_64-linux = "amd64"; 22 + aarch64-linux = "arm64"; 23 + }.${system}; 24 + in 25 + "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; 24 26 }) 25 27 # Upstream tensorflow tarball (with .h's photoprism's tarball is missing) 26 28 (fetchurl { ··· 49 51 ''; 50 52 51 53 # Patch library to use our libc, libstdc++ and others 52 - patchPhase = let 53 - rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; 54 - in '' 55 - chmod -R +w lib 56 - patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so 57 - patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so 58 - ''; 54 + patchPhase = 55 + let 56 + rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; 57 + in 58 + '' 59 + chmod -R +w lib 60 + patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so 61 + patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so 62 + ''; 59 63 60 64 buildPhase = '' 61 65 # Write pkg-config file.