public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42306 from ryantm/mattermost

Browse Source 
mattermost: 4.10.0 -> 5.0.0
This commit is contained in:
Franz Pletz 2018-06-20 20:52:04 +00:00 committed by GitHub
commit 8f4f748810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/web-apps/mattermost.nix
View File

@ -25,7 +25,7 @@ in
{ {
options = { options = {
services.mattermost = { services.mattermost = {
enable = mkEnableOption "Mattermost chat platform"; enable = mkEnableOption "Mattermost chat server";
statePath = mkOption { statePath = mkOption {
type = types.str; type = types.str;
@ -167,7 +167,7 @@ in
''; '';
systemd.services.mattermost = { systemd.services.mattermost = {
description = "Mattermost chat platform service"; description = "Mattermost chat service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" "postgresql.service" ]; after = [ "network.target" "postgresql.service" ];
@ -201,7 +201,7 @@ in
PermissionsStartOnly = true; PermissionsStartOnly = true;
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
ExecStart = "${pkgs.mattermost}/bin/mattermost-platform"; ExecStart = "${pkgs.mattermost}/bin/mattermost";
WorkingDirectory = "${cfg.statePath}"; WorkingDirectory = "${cfg.statePath}";
Restart = "always"; Restart = "always";
RestartSec = "10"; RestartSec = "10";

11
pkgs/servers/mattermost/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
let let
version = "4.10.0"; version = "5.0.0";
mattermost-server = buildGoPackage rec { mattermost-server = buildGoPackage rec {
name = "mattermost-server-${version}"; name = "mattermost-server-${version}";
@ -10,7 +10,7 @@ let
owner = "mattermost"; owner = "mattermost";
repo = "mattermost-server"; repo = "mattermost-server";
rev = "v${version}"; rev = "v${version}";
sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf"; sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
}; };
goPackagePath = "github.com/mattermost/mattermost-server"; goPackagePath = "github.com/mattermost/mattermost-server";
@ -20,11 +20,6 @@ let
-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version} -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
''; '';
postInstall = ''
ln -s $bin/bin/mattermost-server $bin/bin/platform
ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform
'';
}; };
mattermost-webapp = stdenv.mkDerivation { mattermost-webapp = stdenv.mkDerivation {
@ -32,7 +27,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5"; sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
}; };
installPhase = '' installPhase = ''