From a84c41359e350aa2ed87c1587736dca0483b49c8 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 23 Nov 2025 15:51:47 +0100 Subject: [PATCH 1/3] victoriametrics: relax go version requirement (cherry picked from commit bbc98d1704de23841bbb2a4c1b9e1f0ae9aec70f) --- pkgs/by-name/vi/victoriametrics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index fcb0a0f6e8de..77d19aeeaf63 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -58,9 +58,9 @@ buildGo125Module (finalAttrs: { # This appears to be some kind of test server for development purposes only. rm -f app/vmui/packages/vmui/web/{go.mod,main.go} - # Allow older go versions - sed -i go.mod -e 's/^go .*/go ${finalAttrs.passthru.go.version}/' - sed -i vendor/modules.txt -e 's/## explicit; go .*/## explicit; go ${finalAttrs.passthru.go.version}/' + # Relax go version to major.minor + sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' go.mod + sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' vendor/modules.txt # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ From 40dfe763e428afc457f567209bc6be738d429ee7 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 19 Dec 2025 22:42:41 -0500 Subject: [PATCH 2/3] brave: 1.85.117 -> 1.85.118 https://community.brave.app/t/release-channel-1-85-118/647176 (cherry picked from commit 2e37276cee9d1ec1c2b7131f4f9fd3eda44f96c3) --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 3c87c2efb453..a5283cf85ac1 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.85.117"; + version = "1.85.118"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-cGqxB3dVYraCqf3DoO3Who2RFm+ZnSedUG5jb8D9Mk8="; + hash = "sha256-xn7x6O2JVKu2KlcMXSo7P4oTYfVyC1S4OIemXK82vD0="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-ov0gwAv9tCX45EqZa3SBXIzgczBD1RwNS+N1L2vE3Uc="; + hash = "sha256-I++3Oq+iW4uuccKiSa5FwS652aT+tFQI0D0n4Nq6U1w="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-SFe2qX/BugI9Pumv2me5jfC1FpRUsSbtSm+Jl+gW03U="; + hash = "sha256-Igh0anjOkf+nemi4hi6kOu49+oXL4cQ0z7bxjyAt5AU="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-Z0n+TqcgZXqjS1hBx9uznEC6/LftZfaE7k26RhsWI0I="; + hash = "sha256-NxL7IsFhPIthG8kO1wO6lbxqlghixZvnsgTbLfi2OX4="; }; }; From 8dfef0dc344a521e5332d0fbb18616d0a613477a Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 15 Dec 2025 21:00:54 +0100 Subject: [PATCH 3/3] victoriametrics: fix vendor/modules.txt patching (cherry picked from commit d871e8411c5e8b0b58760e6e2e4ef8a23ff802f1) --- pkgs/by-name/vi/victoriametrics/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 77d19aeeaf63..35aefb04cc36 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -60,7 +60,7 @@ buildGo125Module (finalAttrs: { # Relax go version to major.minor sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' go.mod - sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' vendor/modules.txt + sed -i -E 's/^(## explicit; go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' vendor/modules.txt # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \