diff --git a/flake.lock b/flake.lock index 1dfba2b..e682747 100644 --- a/flake.lock +++ b/flake.lock @@ -348,16 +348,16 @@ "mattermost-server": { "flake": false, "locked": { - "lastModified": 1655204693, - "narHash": "sha256-cI7QSB/95TVFMpu4l75EQGVZhZj48sCZaMpiT5jFv8w=", + "lastModified": 1665501838, + "narHash": "sha256-7BKpxb8ELV430vm/h7YzB2D5n1qqm6/LGfhJ3zIguVc=", "owner": "mattermost", "repo": "mattermost-server", - "rev": "d565c9595e08fe87d520f4ab2fa55e8f5a065f9c", + "rev": "3341b6c2baaa1dc0981f2b27e4027522066be28c", "type": "github" }, "original": { "owner": "mattermost", - "ref": "v6.7.2", + "ref": "v7.1.4", "repo": "mattermost-server", "type": "github" } @@ -365,13 +365,13 @@ "mattermost-webapp": { "flake": false, "locked": { - "narHash": "sha256-HaKkQxGd+YPdzgbvqSUYpA98S43A2yjU90hgMOl0kl8=", + "narHash": "sha256-l/it3kxwv4EStNEWegXV/5a+CMdYxVU7iTh1rlji1Ws=", "type": "tarball", - "url": "https://releases.mattermost.com/6.7.2/mattermost-6.7.2-linux-amd64.tar.gz" + "url": "https://releases.mattermost.com/7.1.4/mattermost-7.1.4-linux-amd64.tar.gz" }, "original": { "type": "tarball", - "url": "https://releases.mattermost.com/6.7.2/mattermost-6.7.2-linux-amd64.tar.gz" + "url": "https://releases.mattermost.com/7.1.4/mattermost-7.1.4-linux-amd64.tar.gz" } }, "nix-doom-emacs": { diff --git a/flake.nix b/flake.nix index 7582536..9c0c50f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "hacc infra stuff"; inputs = { - mattermost-webapp.url = "https://releases.mattermost.com/6.7.2/mattermost-6.7.2-linux-amd64.tar.gz"; + mattermost-webapp.url = "https://releases.mattermost.com/7.1.4/mattermost-7.1.4-linux-amd64.tar.gz"; mattermost-webapp.flake = false; - mattermost-server.url = "github:mattermost/mattermost-server?ref=v6.7.2"; + mattermost-server.url = "github:mattermost/mattermost-server?ref=v7.1.4"; mattermost-server.flake = false; nixpkgs.url = "nixpkgs/nixos-22.05"; diff --git a/pkgs/mattermost/default.nix b/pkgs/mattermost/default.nix index 2fa86fc..97832c5 100644 --- a/pkgs/mattermost/default.nix +++ b/pkgs/mattermost/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv, lib, sources }: +{ stdenv, fetchurl, fetchFromGitHub, buildGo118Module, buildEnv, lib, sources }: let - version = "6.7.2"; + version = "7.1.4"; - mattermost-server = buildGoPackage rec { + mattermost-server = buildGo118Module rec { pname = "mattermost-server"; inherit version; src = sources.mattermost-server.outPath; - goPackagePath = "github.com/mattermost/mattermost-server"; + vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU="; + + subPackages = [ "cmd/mattermost" ]; ldflags = [ - "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}" + "-s" + "-w" + "-X github.com/mattermost/mattermost-server/model.BuildNumber=nixpkgs-${version}" ]; };