From 69f5448aa38eb024af5f71a3e0484e6a11168293 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 16 Jul 2021 17:12:54 +0200 Subject: [PATCH] =?UTF-8?q?mattermost=205.34.3=20=E2=86=92=205.37.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Among other things, this contains the "collapsable reply threads" feature which makes it behave similar to slack. Also, after spending thirty minutes or so attempting to teach niv that it should really only fetch the tag "5.37.0" from the mattermost-server repository and not any other commit, branch, or similar (there is a "release-5.37" branch, but that seems to be for active development), I have temporarily given up on it and typed in the urls manually. Unfortunately, this means that any kind of `niv update` will now break things. If anyone knows how to use niv correctly for this please patch this; otherwise I guess we can extract mattermost out from niv again. --- hosts/hainich/services/mattermost.nix | 3 +++ nix/sources.json | 15 +++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hosts/hainich/services/mattermost.nix b/hosts/hainich/services/mattermost.nix index 117c667..9271836 100644 --- a/hosts/hainich/services/mattermost.nix +++ b/hosts/hainich/services/mattermost.nix @@ -159,6 +159,9 @@ ClusterSettings.Enable = false; MetricsSettings.Enable = false; GuestAccountsSettings.Enable = false; + # this is just the general allow-this-at-all switch; users + # still have to turn it on for themselves + FeatureFlags.CollapsedThreads = true; }; # turn of the weirder parts of this module (which insist on passwords diff --git a/nix/sources.json b/nix/sources.json index 7ff1634..9627e63 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -18,24 +18,23 @@ "url_template": "https://github.com///archive/.tar.gz" }, "mattermost-server": { - "branch": "release-5.31", "description": "Open source Slack-alternative in Golang and React - Mattermost", "homepage": "https://mattermost.com", "owner": "mattermost", "repo": "mattermost-server", - "rev": "facf75eaecfa62446ba36889c26c1cb852ffff46", - "sha256": "0rp0pq93k6rsf7jhab3lk1bn9ma9pml36hp5wfsmm3qlj3szr8md", + "rev": "f46b068ecf3b20a0d6e529618813e0ef6b85ed72", + "sha256": "1w994j2ckv82h53c7f5mzh7mq2l1jnhx68vmx6sydz8mc8yd4gpa", "type": "tarball", - "url": "https://github.com/mattermost/mattermost-server/archive/facf75eaecfa62446ba36889c26c1cb852ffff46.tar.gz", + "url": "https://github.com/mattermost/mattermost-server/archive/f46b068ecf3b20a0d6e529618813e0ef6b85ed72.tar.gz", "url_template": "https://github.com///archive/.tar.gz", - "version": "5.34.3" + "version": "5.37.0" }, "mattermost-webapp": { - "sha256": "0c1q4s8w7q26xb387k1660fa6prb4n1b06csx90bb206y98ax6hc", + "sha256": "0na9drwnsr5fbrv6qq38dgvd0laj3wjs734ik5s673c0azqlm4kn", "type": "tarball", - "url": "https://releases.mattermost.com/5.34.3/mattermost-5.34.3-linux-amd64.tar.gz", + "url": "https://releases.mattermost.com/5.37.0/mattermost-5.37.0-linux-amd64.tar.gz", "url_template": "https://releases.mattermost.com//mattermost--linux-amd64.tar.gz", - "version": "5.34.3" + "version": "5.37.0" }, "mumble-website": { "branch": "master",