From f8adf710cb2e298b37649132791c93bebc69954b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 23 Nov 2023 13:10:55 +0100 Subject: [PATCH 1/3] photofield: 0.11.0 -> 0.13.0 https://github.com/SmilyOrg/photofield/compare/v0.11.0...v0.13.0 --- pkgs/servers/photofield/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index 7ac5282fb9787..2ea4738d3e5ae 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -9,13 +9,13 @@ let pname = "photofield-ui"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "SmilyOrg"; repo = "photofield"; - rev = "v${version}"; - hash = "sha256-AqOhagqH0wRKjwcRHFVw0izC0DBv9uY3B5MMDBJoFVE="; + rev = "refs/tags/v${version}"; + hash = "sha256-6pJvOn3sN6zfjt2dVZ/xH6pSXM0WgbG7au9tSVUGYys="; }; webui = buildNpmPackage { @@ -24,7 +24,7 @@ let sourceRoot = "${src.name}/ui"; - npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk="; + npmDepsHash = "sha256-trKcNuhRdiabFKMafOLtPg8x1bQHLOif6Hm4k5bTAYc="; installPhase = '' mkdir -p $out/share @@ -37,7 +37,7 @@ buildGoModule rec { pname = "photofield"; inherit version src; - vendorHash = "sha256-0rrBHkKZfStwzIv5Us/8Db6z3ZSqassCMWQMpScZq7Y="; + vendorHash = "sha256-4JFP3vs/Z8iSKgcwfxpdnQpO9kTF68XQArFHYP8IoDQ="; preBuild = '' cp -r ${webui}/share/photofield-ui ui/dist @@ -50,7 +50,7 @@ buildGoModule rec { "-X main.builtBy=Nix" ]; - tags = [ "embedstatic" ]; + tags = [ "embedui" ]; doCheck = false; # tries to modify filesytem From 469d56aedd90ae57d46b289e7250be122b51f46c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 23 Nov 2023 13:11:19 +0100 Subject: [PATCH 2/3] photofield: add passthru.tests.version --- pkgs/servers/photofield/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index 2ea4738d3e5ae..da28c695db165 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -5,6 +5,8 @@ , makeWrapper , exiftool , ffmpeg +, testers +, photofield }: let @@ -61,6 +63,11 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath [exiftool ffmpeg]}" ''; + passthru.tests.version = testers.testVersion { + package = photofield; + command = "photofield -version"; + }; + meta = with lib; { description = "Experimental fast photo viewer"; homepage = "https://github.com/SmilyOrg/photofield"; From 7e9c976322b8e8045c739b8d1c34b978cee843bb Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 23 Nov 2023 13:11:31 +0100 Subject: [PATCH 3/3] photofield: add meta.mainProgram --- pkgs/servers/photofield/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index da28c695db165..ffb647c03be53 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -72,6 +72,7 @@ buildGoModule rec { description = "Experimental fast photo viewer"; homepage = "https://github.com/SmilyOrg/photofield"; license = licenses.mit; + mainProgram = "photofield"; maintainers = with maintainers; [ dit7ya ]; }; }