Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 547c51a2a249
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b0a2e67656b
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 8, 2017

  1. mattermost service: PrivateTmp broken with local postgresql

    @fpletz
    fpletz committed May 8, 2017
    Copy the full SHA
    cce8aab View commit details

  2. mattermost: 3.6.2 -> 3.8.2

    @fpletz
    fpletz committed May 8, 2017
    Copy the full SHA
    77f500f View commit details

  3. matterircd: 0.11.2 -> 0.11.3

    @fpletz
    fpletz committed May 8, 2017
    Copy the full SHA
    2b0a2e6 View commit details
Showing with 4 additions and 5 deletions.
  1. +0 −1 nixos/modules/services/web-apps/mattermost.nix
  2. +2 −2 pkgs/servers/mattermost/default.nix
  3. +2 −2 pkgs/servers/mattermost/matterircd.nix
1 change: 0 additions & 1 deletion nixos/modules/services/web-apps/mattermost.nix
View file
Original file line number Diff line number Diff line change
@@ -201,7 +201,6 @@ in
Group = cfg.group;
ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
WorkingDirectory = "${cfg.statePath}";
PrivateTmp = true;
JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
Restart = "always";
RestartSec = "10";
4 changes: 2 additions & 2 deletions pkgs/servers/mattermost/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "mattermost-${version}";
version = "3.6.2";
version = "3.8.2";

src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb";
sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/mattermost/matterircd.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
name = "matterircd-${version}";
version = "0.11.2";
version = "0.11.3";

src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja";
sha256 = "10fmn6midfzmn6ylhrk00bvykn0zijypiqp5hjqn642kcdkrjc6i";
};

goPackagePath = "github.com/42vim/matterircd";