summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-07-08 10:17:04 +0200
committerThomas Gerbet <thomas@gerbet.me>2023-07-08 10:52:32 +0200
commita3f5a65f9458f130488fc6f2e6e4302b6a83e69e (patch)
tree28e3a30814520fe7edab603b9d4e5bac617e9981
parent1f2bcab6dd907452fad8bf2af054b3191047993e (diff)
downloadnixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar.gz
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar.bz2
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar.lz
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar.xz
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.tar.zst
nixpkgs-a3f5a65f9458f130488fc6f2e6e4302b6a83e69e.zip
mattermost: 7.10.2 -> 7.10.3
Fixes security issues MMSA-2023-00190, MMSA-2023-00175, MMSA-2023-00202, MMSA-2023-00174,
MMSA-2023-00169, MMSA-2023-00186, MMSA-2023-00200, MMSA-2023-00178, MMSA-2023-00185, MMSA-2023-00176,
MMSA-2023-00147 and MMSA-2023-00168.

Release announcement:
https://mattermost.com/blog/mattermost-security-updates-7-10-3-7-9-5-7-8-7-esr-released/
-rw-r--r--pkgs/servers/mattermost/default.nix19
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 489f015c5b4..136cf1c755f 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,28 +1,39 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
+, fetchpatch
 , fetchurl
 , nixosTests
 }:
 
 buildGoModule rec {
   pname = "mattermost";
-  version = "7.10.2";
+  version = "7.10.3";
 
   src = fetchFromGitHub {
     owner = "mattermost";
-    repo = "mattermost-server";
+    repo = "mattermost";
     rev = "v${version}";
-    hash = "sha256-gccWFcG+Jc/77nN9hiV/2gUcY5w0IzOktykbGgafBD0=";
+    hash = "sha256-nzQUkcCFEZYvqMLRv1d81pfoz/MDYjWetGLtFXf8H/Q=";
   };
 
   webapp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    hash = "sha256-T2lyg4BtArx813kk6edQ7AX3ZmA7cTsrJuWs7k6WYPU=";
+    hash = "sha256-oD67sTyTvB0DVcw3e6x79Y4K8xlX75YreRwnc9olTy4=";
   };
 
   vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw=";
 
+  patches = [
+    (fetchpatch {
+      # Current version was set to 7.10.4 in the v7.10.3 tag, reverting it so `mattermost version` exposes the correct version
+      # and to make smoke tests happy
+      url = "https://github.com/mattermost/mattermost/commit/fbdadeacc85ae47145f69ffb766d4105aede69d5.patch";
+      hash = "sha256-9BNEc5VefRuPKb3/rQNiekNbAIBRsjAtdCKUVrh9BuY=";
+      revert = true;
+    })
+  ];
+
   subPackages = [ "cmd/mattermost" ];
 
   ldflags = [