From 2e16d7034a6d90bb6b153859d043623cabbbe605 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:07:09 -0400 Subject: [PATCH 1/4] homebox: 0.19.0 -> 0.20.0 changelog: https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/ho/homebox/package.nix | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index dcb6c6555c15..c9a247070be7 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -56,6 +56,8 @@ - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes. +- [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. + - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively. - `gramps` has been updated to 6.0.0 diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index d3f0be14dfa1..8b3dfa3f00b7 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -1,34 +1,34 @@ { lib, - buildGo123Module, + buildGo124Module, fetchFromGitHub, pnpm_9, nodejs, - go_1_23, + go_1_24, git, cacert, nixosTests, }: let pname = "homebox"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; rev = "v${version}"; - hash = "sha256-98V2JnxHnMkW8YD8QekNgKeh9aPp0mcosmGh07GAFaU="; + hash = "sha256-QP9Tp9/ooRDVuP228cOqR8LAaSkrr9dumrw7Y9wZ51s="; }; in -buildGo123Module { +buildGo124Module { inherit pname version src; - vendorHash = "sha256-SkfYNOyRlcUSfga0g8o7yIvxgdL9SMxgVgRjIcPru0A="; + vendorHash = "sha256-GTSFpfql0ebXtZC3LeIZo8VbCZdsbemNK5EarDTRAf0="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases # Since we do pnpm thing in those it fails if we don't explicitly remove them overrideModAttrs = _: { nativeBuildInputs = [ - go_1_23 + go_1_24 git cacert ]; @@ -39,7 +39,7 @@ buildGo123Module { inherit pname version; src = "${src}/frontend"; fetcherVersion = 1; - hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8="; + hash = "sha256-gHQ8Evo31SFmnBHtLDY5j5zZwwVS4fmkT+9VHZJWhfs="; }; pnpmRoot = "../frontend"; @@ -65,6 +65,10 @@ buildGo123Module { env.CGO_ENABLED = 0; doCheck = false; + tags = [ + "nodynamic" + ]; + ldflags = [ "-s" "-w" From 0903c1205787e0699523eef288a41cea15d3e3a1 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 1 Jul 2025 21:10:17 -0400 Subject: [PATCH 2/4] homebox: 0.20.1 -> 0.20.2 changelog: https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.2 --- pkgs/by-name/ho/homebox/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 8b3dfa3f00b7..6d39ee150f5c 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -1,6 +1,6 @@ { lib, - buildGo124Module, + buildGoModule, fetchFromGitHub, pnpm_9, nodejs, @@ -11,15 +11,15 @@ }: let pname = "homebox"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; - rev = "v${version}"; - hash = "sha256-QP9Tp9/ooRDVuP228cOqR8LAaSkrr9dumrw7Y9wZ51s="; + tag = "v${version}"; + hash = "sha256-6AJYC5SIITLBgYOq8TdwxAvRcyg8MOoA7WUDar9jSxM="; }; in -buildGo124Module { +buildGoModule { inherit pname version src; vendorHash = "sha256-GTSFpfql0ebXtZC3LeIZo8VbCZdsbemNK5EarDTRAf0="; From b7e9deef02bb5ed3db614d42263da3bb1fcd1eac Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 1 Jul 2025 21:20:12 -0400 Subject: [PATCH 3/4] homebox: bugfix -> version expects v as it is actually a tag --- pkgs/by-name/ho/homebox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 6d39ee150f5c..fe2efd8e1f1f 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -73,8 +73,8 @@ buildGoModule { "-s" "-w" "-extldflags=-static" - "-X main.version=${version}" - "-X main.commit=${version}" + "-X main.version=${src.tag}" + "-X main.commit=${src.tag}" ]; installPhase = '' runHook preInstall From c90112d30421d5037860f61567a1d3781ca3f936 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 1 Jul 2025 21:20:38 -0400 Subject: [PATCH 4/4] homebox: add tebriel as maintainer --- pkgs/by-name/ho/homebox/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index fe2efd8e1f1f..5cdacc8b1a81 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -95,7 +95,10 @@ buildGoModule { mainProgram = "api"; homepage = "https://homebox.software/"; description = "Inventory and organization system built for the Home User"; - maintainers = with lib.maintainers; [ patrickdag ]; + maintainers = with lib.maintainers; [ + patrickdag + tebriel + ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.linux; };