Unverified Commit 6e3d6574 authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

Merge pull request #247776 from f2k1de/graylog-5.1 

graylog-5_1: init at 5.1.4
parents 837267e6 bd50b5fc

nixos/modules/services/logging/graylog.nix

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ in 


      package = mkOption {

        type = types.package;

        default = if versionOlder config.system.stateVersion "23.05" then pkgs.graylog-3_3 else pkgs.graylog-5_0;

        defaultText = literalExpression (if versionOlder config.system.stateVersion "23.05" then "pkgs.graylog-3_3" else "pkgs.graylog-5_0");

        default = if versionOlder config.system.stateVersion "23.05" then pkgs.graylog-3_3 else pkgs.graylog-5_1;

        defaultText = literalExpression (if versionOlder config.system.stateVersion "23.05" then "pkgs.graylog-3_3" else "pkgs.graylog-5_1");

        description = lib.mdDoc "Graylog package to use.";

      };

pkgs/tools/misc/graylog/5.1.nix

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{ callPackage, lib, ...}:

let

  buildGraylog = callPackage ./graylog.nix {};

in buildGraylog {

  version = "5.1.4";

  sha256 = "sha256-ZuzmNbc+qB6oYCnR5iAsSEQGTB+pk+ghF0/+O3BTLkA=";

  maintainers = [ lib.maintainers.f2k1de ];

  license = lib.licenses.sspl;

}

pkgs/tools/misc/graylog/plugins.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, unzip, graylog-5_0 }:

{ lib, stdenv, fetchurl, unzip, graylog-5_1 }:



with lib;
@@ -17,7 +17,7 @@ let 
      dontUnpack = true;

      nativeBuildInputs = [ unzip ];

      meta = a.meta // {

        platforms = graylog-5_0.meta.platforms;

        platforms = graylog-5_1.meta.platforms;

        maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];

        sourceProvenance = with sourceTypes; [ binaryBytecode ];

      };

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -8687,6 +8687,8 @@ with pkgs; 














  graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { };



























  graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { };



























  graylogPlugins = recurseIntoAttrs (















    callPackage ../tools/misc/graylog/plugins.nix { }















  );