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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-19 12:26:52 +00:00
committed by GitHub
parent dac047cef4 24d3016208
commit c804f22a81
30 changed files with 231 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/matterbridge/default.nix
View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "matterbridge";
version = "1.21.0";
version = "1.22.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchurl {
url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
sha256 = "sha256-ehn6KdPpDpfdyWCVfLuZLq2dDmZXc6InlnovqNsdG6Y=";
sha256 = "sha256-jwatqxQh4t4tgNiOEjS9vxIM+9XtnH8QNch887+xDnI=";
};
meta = with lib; {

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

@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
let
version = "5.25.3";
version = "5.32.1";
mattermost-server = buildGoPackage rec {
pname = "mattermost-server";
@@ -11,7 +11,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
sha256 = "03xcwlbb9ff5whsdn2m3kqskxpwpfciikjjndbhksc8k8963z07j";
sha256 = "BssrTfkIxUbXYXIfz9i+5b4rEYSzBim+/riK78m8Bxo=";
};
goPackagePath = "github.com/mattermost/mattermost-server";
@@ -29,7 +29,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "1p1qxzrd6rj1i43vj18ysknrw2v02s7llx94nrdd5lk10ayzmg63";
sha256 = "kRerl3fYRTrotj86AIFSor3GpjhABkCmego1ms9HmkQ=";
};
installPhase = ''

8
pkgs/servers/monitoring/grafana/default.nix
View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.4.3";
version = "7.4.5";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-FPQa6q1ks9Lpod5sI29YBnGZvVRU12hTiw6GR85/mEs=";
sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-idbG+K9NVnNhEB0f7DfP7iaEnHMf59ieQtYnmT6CvVM=";
sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz";
};
vendorSha256 = "sha256-LL+EkDZbbaNo/fPMGlPsB8jgBYHoe6SdkBbQoW5y4EU=";
vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \