diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix index daa3d9a4a816..83cc5fc5bd1d 100644 --- a/nixos/tests/glance.nix +++ b/nixos/tests/glance.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ config, lib, ... }: { name = "glance"; @@ -22,7 +22,15 @@ }; }; + extraPythonPackages = + p: with p; [ + beautifulsoup4 + types-beautifulsoup4 + ]; + testScript = '' + from bs4 import BeautifulSoup + machine_default.start() machine_default.wait_for_unit("glance.service") machine_default.wait_for_open_port(8080) @@ -30,6 +38,10 @@ machine_custom_port.start() machine_custom_port.wait_for_unit("glance.service") machine_custom_port.wait_for_open_port(5678) + + soup = BeautifulSoup(machine_default.succeed("curl http://localhost:8080")) + expected_version = "${config.nodes.machine_default.services.glance.package.version}" + assert any(a.text == expected_version for a in soup.select(".footer a")) ''; meta.maintainers = [ lib.maintainers.drupol ]; diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 7918696593eb..df958bd10155 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,17 +8,23 @@ buildGoModule rec { pname = "glance"; - version = "0.7.3"; + version = "0.7.6"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; - rev = "v${version}"; - hash = "sha256-kQ4XVO6sotsIjIhkECn6FYik3ITYOZcDKyzk3I8JvkU="; + tag = "v${version}"; + hash = "sha256-1DIngje7UT86eI3ZJWd71BkbAvHJ2JC0LUHAQXz0rfc="; }; vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; + ldflags = [ + "-s" + "-w" + "-X github.com/glanceapp/glance/internal/glance.buildVersion=${version}" + ]; + excludedPackages = [ "scripts/build-and-ship" ]; passthru = { @@ -34,6 +40,9 @@ buildGoModule rec { description = "Self-hosted dashboard that puts all your feeds in one place"; mainProgram = "glance"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ dvn0 ]; + maintainers = with lib.maintainers; [ + dvn0 + defelo + ]; }; }