diff --git a/flake.lock b/flake.lock index 217eb7f..a301d01 100644 --- a/flake.lock +++ b/flake.lock @@ -406,16 +406,16 @@ "mattermost-server": { "flake": false, "locked": { - "lastModified": 1680710455, - "narHash": "sha256-+OIIhoDn8Km4/xoVAUpCBkmu2hJRLpwluYnsPeTH8Qc=", + "lastModified": 1683810279, + "narHash": "sha256-qC6tJcWruiTbWXKuACuhl0kwbRdPVXfUlaFJx4DiQgE=", "owner": "mattermost", "repo": "mattermost-server", - "rev": "8cf21b2ca06ebc4f26bf6ddd892650f370dd2bd3", + "rev": "bcd5477a3f6eebc222b1378059e842b6d33e9eb2", "type": "github" }, "original": { "owner": "mattermost", - "ref": "v7.1.8", + "ref": "v7.8.5", "repo": "mattermost-server", "type": "github" } @@ -423,13 +423,13 @@ "mattermost-webapp": { "flake": false, "locked": { - "narHash": "sha256-Pj7rAxuDulD24kCweydNsVg/vEAQvJPSEWRtX8cxbkg=", + "narHash": "sha256-IkOVU6/wYYqHcpAC23Yz4e2LCSPYvb7LHya6MUCn/+w=", "type": "tarball", - "url": "https://releases.mattermost.com/7.1.8/mattermost-7.1.8-linux-amd64.tar.gz" + "url": "https://releases.mattermost.com/7.8.5/mattermost-7.8.5-linux-amd64.tar.gz" }, "original": { "type": "tarball", - "url": "https://releases.mattermost.com/7.1.8/mattermost-7.1.8-linux-amd64.tar.gz" + "url": "https://releases.mattermost.com/7.8.5/mattermost-7.8.5-linux-amd64.tar.gz" } }, "nix-doom-emacs": { diff --git a/flake.nix b/flake.nix index d910ee2..547c017 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "hacc infra stuff"; inputs = { - mattermost-webapp.url = "https://releases.mattermost.com/7.1.8/mattermost-7.1.8-linux-amd64.tar.gz"; + mattermost-webapp.url = "https://releases.mattermost.com/7.8.5/mattermost-7.8.5-linux-amd64.tar.gz"; mattermost-webapp.flake = false; - mattermost-server.url = "github:mattermost/mattermost-server?ref=v7.1.8"; + mattermost-server.url = "github:mattermost/mattermost-server?ref=v7.8.5"; mattermost-server.flake = false; nixpkgs.url = "nixpkgs/nixos-22.11"; diff --git a/pkgs/mattermost/default.nix b/pkgs/mattermost/default.nix index cdc5ba7..0e4a03f 100644 --- a/pkgs/mattermost/default.nix +++ b/pkgs/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGo118Module, buildEnv, lib, sources }: let - version = "7.1.8"; + version = "7.8.5"; mattermost-server = buildGo118Module rec { pname = "mattermost-server"; @@ -9,7 +9,7 @@ let src = sources.mattermost-server.outPath; - vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU="; + vendorSha256 = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk="; subPackages = [ "cmd/mattermost" ]; diff --git a/services/mattermost.nix b/services/mattermost.nix index b02e613..e4493d9 100644 --- a/services/mattermost.nix +++ b/services/mattermost.nix @@ -128,6 +128,12 @@ in { ShowEmailAddress = false; ShowFullName = true; }; + # to disable the extra landing page advertising the app + NativeAppSettings = { + AppDownloadLink = ""; + AndroidAppDownloadLink = ""; + IosAppDownloadLink = ""; + }; SupportSettings = { TermsOfServiceLink = "https://infra4future.de/nutzungsbedingungen.html"; PrivacyPolicyLink = "https://infra4future.de/nutzungsbedingungen.html";