From e03bf84d3a87251edf43488306f052b30921f811 Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Sat, 7 Oct 2023 22:27:23 +0200
Subject: [PATCH] =?UTF-8?q?mattermost:=20jump=20ESR=20versions=207.8.x=20?=
 =?UTF-8?q?=E2=86=92=208.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

package definition adjusted by comparing to the current version in
Nixpkgs.
---
 flake.lock                  | 14 +++++++-------
 flake.nix                   |  4 ++--
 pkgs/mattermost/default.nix | 22 +++++++++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index cdab323..7a61558 100644
--- a/flake.lock
+++ b/flake.lock
@@ -399,16 +399,16 @@
     "mattermost-server": {
       "flake": false,
       "locked": {
-        "lastModified": 1696262281,
-        "narHash": "sha256-VEEm4G0867NzavjdpCP5bDJEnp4NdnUPHCcAS0cox5Q=",
+        "lastModified": 1696335118,
+        "narHash": "sha256-Xcg24hnQqrq/hW+tlzpdNUmvrC/3zIXzyi2ZkU1a96U=",
         "owner": "mattermost",
         "repo": "mattermost-server",
-        "rev": "b69ff7d1038609a4a29a7db104679d21da10ad09",
+        "rev": "4fe1024a51f22f239c19c33838dbdcf7589b7b94",
         "type": "github"
       },
       "original": {
         "owner": "mattermost",
-        "ref": "v7.8.12",
+        "ref": "v8.1.3",
         "repo": "mattermost-server",
         "type": "github"
       }
@@ -416,13 +416,13 @@
     "mattermost-webapp": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-66kCatGNaRi0HrPHteDdu8+hQp4BLql75+f6jqO6MBg=",
+        "narHash": "sha256-OZQ5owWT6lBqloSFs7fViAim7zTHd8YVcXmQJadg4wU=",
         "type": "tarball",
-        "url": "https://releases.mattermost.com/7.8.12/mattermost-7.8.12-linux-amd64.tar.gz"
+        "url": "https://releases.mattermost.com/8.1.3/mattermost-8.1.3-linux-amd64.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://releases.mattermost.com/7.8.12/mattermost-7.8.12-linux-amd64.tar.gz"
+        "url": "https://releases.mattermost.com/8.1.3/mattermost-8.1.3-linux-amd64.tar.gz"
       }
     },
     "nix-doom-emacs": {
diff --git a/flake.nix b/flake.nix
index 706b2c1..42eb74b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "hacc infra stuff";
 
   inputs = {
-    mattermost-webapp.url = "https://releases.mattermost.com/7.8.12/mattermost-7.8.12-linux-amd64.tar.gz";
+    mattermost-webapp.url = "https://releases.mattermost.com/8.1.3/mattermost-8.1.3-linux-amd64.tar.gz";
     mattermost-webapp.flake = false;
-    mattermost-server.url = "github:mattermost/mattermost-server?ref=v7.8.12";
+    mattermost-server.url = "github:mattermost/mattermost-server?ref=v8.1.3";
     mattermost-server.flake = false;
 
     nixpkgs.url = "nixpkgs/nixos-23.05";
diff --git a/pkgs/mattermost/default.nix b/pkgs/mattermost/default.nix
index 95bd62c..1a5a515 100644
--- a/pkgs/mattermost/default.nix
+++ b/pkgs/mattermost/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, fetchFromGitHub, buildGo118Module, buildEnv, lib, sources }:
+{ stdenv, fetchurl, fetchFromGitHub, buildGoModule, buildEnv, lib, sources }:
 
 let
-  version = "7.8.12";
+  version = "8.1.3";
 
-  mattermost-server = buildGo118Module rec {
+  mattermost-server = buildGoModule rec {
     pname = "mattermost-server";
     inherit version;
 
-    src = sources.mattermost-server.outPath;
+    src = "${sources.mattermost-server}/server";
 
-    vendorSha256 = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk=";
+    vendorSha256 = "sha256-uHKd8shLDVd+zjRhEJcxAn+H9e9jqEM8XXqYx7B4hiQ=";
 
     subPackages = [ "cmd/mattermost" ];
 
     ldflags = [
-	"-s"
-	"-w"
-        "-X github.com/mattermost/mattermost-server/model.BuildNumber=nixpkgs-${version}"
+      "-s"
+      "-w"
+      "-X github.com/mattermost/mattermost/server/public/model.Version=${version}"
+      "-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${version}-haccfiles"
+      "-X github.com/mattermost/mattermost/server/public/model.BuildDate=1970-01-01"
+      "-X github.com/mattermost/mattermost/server/public/model.BuildHash=v${version}"
+      "-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=v${version}"
+      "-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false"
     ];
-
   };
 
   mattermost-webapp = stdenv.mkDerivation {