diff options
| author | Isa <hi@f2k1.de> | 2023-08-07 19:49:48 +0200 |
|---|---|---|
| committer | Isa <hi@f2k1.de> | 2023-08-07 19:49:48 +0200 |
| commit | bd50b5fcf5bd8b14a58beb96d92efeb3e455a965 (patch) | |
| tree | c7a0cc5da5c53bbf15770058f003c6623f616b69 | |
| parent | 6fca6f9d5b7c8a8bb872445e20a4294a6b025596 (diff) | |
| download | nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar.gz nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar.bz2 nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar.lz nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar.xz nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.tar.zst nixpkgs-bd50b5fcf5bd8b14a58beb96d92efeb3e455a965.zip | |
graylog-5_1: init at 5.1.4
| -rw-r--r-- | nixos/modules/services/logging/graylog.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/graylog/5.1.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/graylog/plugins.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 1eb51c50ff7..673930c4cb5 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -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."; }; diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix new file mode 100644 index 00000000000..3dc849eaeec --- /dev/null +++ b/pkgs/tools/misc/graylog/5.1.nix @@ -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; +} diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 27d555afcf2..8601d2c6e80 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -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 ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a49cf828e..f367feafebe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8622,6 +8622,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 { } ); |