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: 6d1dbdcee0cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f58c39a4e64c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 2, 2019

  1. graylogPlugins: update 

    graylog-plugin-aggregates: 2.3.0 -> 2.4.0
graylog-plugin-auth-sso: 2.4.2 -> 3.0.0
(cherry picked from commit 76b3c57)
    @fpletz
    Tristan Helmich (omniIT) authored and fpletz committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9c65b51 View commit details

  2. graylog: 2.5.1 -> 3.0.0 

    (cherry picked from commit 9efddfa)
    @fpletz
    Tristan Helmich (omniIT) authored and fpletz committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f58c39a View commit details
Showing with 12 additions and 7 deletions.
  1. +5 −0 nixos/doc/manual/release-notes/rl-1903.xml
  2. +3 −3 pkgs/tools/misc/graylog/default.nix
  3. +4 −4 pkgs/tools/misc/graylog/plugins.nix
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-1903.xml
View file
Original file line number Diff line number Diff line change
@@ -465,6 +465,11 @@
been removed.
</para>
</listitem>
<listitem>
<para>
<literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some setups making use of extraConfig (especially those exposing Graylog via reverse proxies) need to be updated as upstream removed/replaced some settings. See <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading Graylog</link> for details.
</para>
</listitem>
</itemizedlist>
</section>

6 changes: 3 additions & 3 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:

stdenv.mkDerivation rec {
version = "2.5.1";
version = "3.0.0";
name = "graylog-${version}";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1n7s6j36rs4dj27fz5n7gvxagx6w4lhi1z2xhryc41pz77mjrnkb";
sha256 = "1jcc254z4xqybm1f5r0g4dfyd9ji0z5g45hcnds32w9h8zqk391k";
};

dontBuild = true;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

installPhase = ''
mkdir -p $out
cp -r {graylog.jar,lib,bin,plugin,data} $out
cp -r {graylog.jar,lib,bin,plugin} $out
wrapProgram $out/bin/graylogctl $makeWrapperArgs
'';

8 changes: 4 additions & 4 deletions pkgs/tools/misc/graylog/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -25,10 +25,10 @@ in {
aggregates = glPlugin rec {
name = "graylog-aggregates-${version}";
pluginName = "graylog-plugin-aggregates";
version = "2.3.0";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws";
sha256 = "1c48almnjr0b6nvzagnb9yddqbcjs7yhrd5yc5fx9q7w3vxi50zp";
};
meta = {
homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates;
@@ -38,10 +38,10 @@ in {
auth_sso = glPlugin rec {
name = "graylog-auth-sso-${version}";
pluginName = "graylog-plugin-auth-sso";
version = "2.4.2";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8";
sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5";
};
meta = {
homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;