From 7edb6a99674d33ae060fe5b522ef2acc3b45e591 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 22 May 2026 23:30:06 -0700 Subject: [PATCH] mattermost, mattermostLatest: 10.11.17/11.7.0 -> 10.11.18/11.7.1 Not-cherry-picked-because: unstable has already gone onto 11.7.0 --- pkgs/by-name/ma/mattermost/package.nix | 11 ++--------- pkgs/by-name/ma/mattermostLatest/package.nix | 8 ++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index bd0da5b91cfd..d9035b09bf85 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -26,8 +26,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.11\\.[0-9]+)$"; - version = "10.11.17"; - srcHash = "sha256-RS/Q3Q2UJjUuQQ8PaaLkVe00ixhZML2jBHeAq0/n/aA="; + version = "10.11.18"; + srcHash = "sha256-oHBuC31mvWiPbL6iOBg7yTxCXQbXmnfsCvSTGdmz+xk="; vendorHash = "sha256-zngDxO3UCuB53PMpaE+ga8v2FL5l78BD2NmJsu+zZ00="; npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A="; lockfileOverlay = '' @@ -176,13 +176,6 @@ buildMattermost rec { }) ]; - postPatch = '' - if [ "$version" == 10.11.17 ]; then - # 25.11 only: tagged and released as 10.11.17 but prints the wrong version - substituteInPlace server/public/model/version.go --replace-fail "10.11.16" "10.11.17" - fi - ''; - modRoot = "./server"; preBuild = '' make setup-go-work diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 45685a9cfc8a..d304cd80ff02 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.7.0"; - srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg="; - vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4="; - npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc="; + version = "11.7.1"; + srcHash = "sha256-9eI9tX6qHEEzm7aro7ky2JORfAmqbjmrmxABFVTZzW8="; + vendorHash = "sha256-xu399pAtIJUIns+GhKFlDR0crWV+8HiN9Wf38EMu5q8="; + npmDepsHash = "sha256-M+yoCLR4yT30n3rhqZu1z8zeWas+5VniP4aaIJPz6VU="; autoUpdate = ./package.nix; }; }