Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ff6fda61600c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ab537f115e1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 11, 2020

  1. graylog: 3.3.6 -> 3.3.7 

    Bumps Graylog and integration plugins to version 3.3.7.

(cherry picked from commit 4115906)
    @fadenb
    fadenb committed Oct 11, 2020
    Copy the full SHA
    b206b2d View commit details

  2. Merge pull request #100221 from fadenb/graylog_3.3.7_20.03 

    [20.03] graylog: 3.3.6 -> 3.3.7
    @marsam
    marsam authored Oct 11, 2020
    Copy the full SHA
    9ab537f View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/tools/misc/graylog/default.nix
  2. +4 −4 pkgs/tools/misc/graylog/plugins.nix
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.6";
version = "3.3.7";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "0yqs5zllaj7v4j9kzfkqxd4n9jdy2656pgai7v05a8wpri4b6sf5";
sha256 = "198j1gfw4cw8pi7bzpijd61165a2n4nawp071yhfcyslviv1wmqr";
};

dontBuild = true;
8 changes: 4 additions & 4 deletions pkgs/tools/misc/graylog/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -64,10 +64,10 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
sha256 = "15sx53ikc49d7a7qlcac9jyx9amrcqqqpk8hwj5lc8iv7d1wnxf9";
sha256 = "0m560wrkxdrfa9hrx3lii1vc4z9zp4gy6lgzi2i4igcfhs4drnlk";
};
installPhase = ''
mkdir -p $out/bin
@@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
sha256 = "11cg0rn10sc1gzip88pm2yzyxighiaafw1vznr3ips307ia0c7hm";
sha256 = "1w21ka34y2kdjjf4fd725han8b87vp6mpjnb7pyl2m4wy6srdlvr";
};
installPhase = ''
mkdir -p $out/bin