From 70444d67055901304d7214c343ccb2dded727756 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 16 Mar 2025 17:15:24 +0100
Subject: [PATCH 1/3] glance: fix version in footer

---
 nixos/tests/glance.nix             | 14 +++++++++++++-
 pkgs/by-name/gl/glance/package.nix |  8 +++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

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..0b11a83299f0 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -13,12 +13,18 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kQ4XVO6sotsIjIhkECn6FYik3ITYOZcDKyzk3I8JvkU=";
   };
 
   vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q=";
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/glanceapp/glance/internal/glance.buildVersion=${version}"
+  ];
+
   excludedPackages = [ "scripts/build-and-ship" ];
 
   passthru = {

From aa64ff81f4f6ebc52576f02a470cbb822962b856 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 16 Mar 2025 17:16:36 +0100
Subject: [PATCH 2/3] glance: add defelo as maintainer

---
 pkgs/by-name/gl/glance/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index 0b11a83299f0..f7e93f6e34e8 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -40,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
+    ];
   };
 }

From 10d93ab05df9c492308c95f0a8298c76b00b3db5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 16 Mar 2025 16:34:24 +0000
Subject: [PATCH 3/3] glance: 0.7.3 -> 0.7.6

---
 pkgs/by-name/gl/glance/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index f7e93f6e34e8..df958bd10155 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "glance";
-  version = "0.7.3";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
     tag = "v${version}";
-    hash = "sha256-kQ4XVO6sotsIjIhkECn6FYik3ITYOZcDKyzk3I8JvkU=";
+    hash = "sha256-1DIngje7UT86eI3ZJWd71BkbAvHJ2JC0LUHAQXz0rfc=";
   };
 
   vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q=";