Merge pull request #247776 from f2k1de/graylog-5.1

graylog-5_1: init at 5.1.4
This commit is contained in:
Ilan Joselevich 2023-08-19 16:00:11 +03:00 committed by GitHub
commit 6e3d657482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions

View file

@ -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.";
};

View file

@ -0,0 +1,9 @@
{ 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;
}

View file

@ -1,4 +1,4 @@
{ 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 ];
};

View file

@ -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 { }
);