From e269cab294ce6649ba9042c1caecde4f5a6eb46d Mon Sep 17 00:00:00 2001 From: jose Date: Mon, 6 Jul 2026 11:23:21 +0800 Subject: [PATCH 1/2] mattermost: update patches --- .../mattermost-remove-free-banner.patch | 19 ++++++++++++++++--- .../mattermost-remove-user-limit.patch | 19 +++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch index 0b31bb032b51..800693802578 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch @@ -11,7 +11,7 @@ index 93cb8ab263..3d12cd5e54 100644 ); }; diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss -index c2e6fbd187..828955cc79 100644 +index c2e6fbd187..bc1cedcff1 100644 --- a/channels/src/components/header_footer_route/header.scss +++ b/channels/src/components/header_footer_route/header.scss @@ -47,20 +47,7 @@ @@ -36,6 +36,19 @@ index c2e6fbd187..828955cc79 100644 } } } +@@ -83,12 +70,6 @@ + margin-top: 12px; + } + } +- +- &.has-free-banner.has-custom-site-name { +- .header-back-button { +- bottom: -20px; +- } +- } + } + + @media screen and (max-width: 699px) { diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss index dee9b57f8c..8ef4aa073a 100644 --- a/channels/src/components/widgets/menu/menu_items/menu_item.scss @@ -57,14 +70,14 @@ index dee9b57f8c..8ef4aa073a 100644 button { padding: 3px 0; diff --git a/channels/webpack.config.js b/channels/webpack.config.js -index 852046de70..cf28fdcbd6 100644 +index 852046de70..a310da48f4 100644 --- a/channels/webpack.config.js +++ b/channels/webpack.config.js @@ -470,6 +470,9 @@ if (targetIsDevServer) { historyApiFallback: { index: '/static/root.html', }, -+ client: { ++ client { + overlay: false, + }, }, diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch index 574d7f012fbf..1ae8c819b72a 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch @@ -1,8 +1,19 @@ diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go -index 4c88c1f049..fb7d84ef05 100644 +index 45448e4b2b..6125c02baf 100644 --- a/server/channels/app/limits.go +++ b/server/channels/app/limits.go -@@ -18,23 +18,8 @@ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) { +@@ -10,8 +10,8 @@ import ( + ) + + const ( +- maxUsersLimit = 200 +- maxUsersHardLimit = 250 ++ maxUsersLimit = 10000000 ++ maxUsersHardLimit = 10000000 + ) + + // GetServerLimits returns the server's seat/post-history limits. The license-derived +@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod limits := &model.ServerLimits{} license := a.License() @@ -28,11 +39,11 @@ index 4c88c1f049..fb7d84ef05 100644 // Check if license has post history limits and get the calculated timestamp if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 { -@@ -99,14 +84,5 @@ func (a *App) GetPostHistoryLimit() int64 { +@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 { } func (a *App) isAtUserLimit() (bool, *model.AppError) { -- userLimits, appErr := a.GetServerLimits() +- userLimits, appErr := a.GetServerLimits(true) - if appErr != nil { - return false, appErr - } From c8dc6e9f55660a86ee85537c15e34a4ee0a5cfe3 Mon Sep 17 00:00:00 2001 From: jose Date: Wed, 8 Jul 2026 13:10:48 +0800 Subject: [PATCH 2/2] mattermost: 11.7.4 -> 11.7.6 --- .../ma/mattermost/mattermost-remove-free-banner.patch | 2 +- pkgs/by-name/ma/mattermost/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch index 800693802578..d413cf2f7849 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch @@ -77,7 +77,7 @@ index 852046de70..a310da48f4 100644 historyApiFallback: { index: '/static/root.html', }, -+ client { ++ client: { + overlay: false, + }, }, diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 077e35239ed7..80bb78aae6aa 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -27,10 +27,10 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(11\\.7\\.[0-9]+)$"; - version = "11.7.4"; - srcHash = "sha256-kO4ntGffvMis7JFZLMpnPdjotPiZ/kJcxeKoMjXAZ3U="; + version = "11.7.6"; + srcHash = "sha256-oMjfSX45+sEQwNpNVDTOlCBUK7OSBCCKpaUMMrRzdQM="; vendorHash = "sha256-XaXqQN20c3DhW2/L0zhTA8dLeRp4MyBxUKpiMVwp/7s="; - npmDepsHash = "sha256-lqgYZAGCjChGwBKACKKiMRzI2WP0ByanMMIVxo/h8t8="; + npmDepsHash = "sha256-F7o+AVM1WiuHKDQaqHbxDjWT1vAiddh4/D8EktxncAs="; }, ... }: