From 62f3c646c11fb9668739732f15d638303534b760 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 16 Oct 2024 13:52:35 +0200 Subject: [PATCH 1/4] graylog-6_0: 6.0.4 -> 6.0.7 --- pkgs/tools/misc/graylog/6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/6.0.nix b/pkgs/tools/misc/graylog/6.0.nix index eab48ab27be89e..b12ba65626eb8b 100644 --- a/pkgs/tools/misc/graylog/6.0.nix +++ b/pkgs/tools/misc/graylog/6.0.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "6.0.4"; - hash = "sha256-PU7AepIRwx7FibBkZaQUWUy3v2MeM7cS77FH28aj8I8="; + version = "6.0.7"; + hash = "sha256-whLU1d0wmmdSiMESpzmCTHe5U7GXVHefsonTPO7d7rY="; maintainers = with lib.maintainers; [ bbenno ]; license = lib.licenses.sspl; } From 00b19f76311fa6d52424e81849a517e0a2666f1a Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 16 Oct 2024 14:41:35 +0200 Subject: [PATCH 2/4] graylog-5_2: 5.2.9 -> 5.2.12 --- pkgs/tools/misc/graylog/5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/5.2.nix b/pkgs/tools/misc/graylog/5.2.nix index 09533496d59f7f..b93603c1366cdb 100644 --- a/pkgs/tools/misc/graylog/5.2.nix +++ b/pkgs/tools/misc/graylog/5.2.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.2.9"; - hash = "sha256-xvKFHAWUb1cqARWH57AOEdRzj5W7n0AgIUkEOBuRumo="; + version = "5.2.12"; + hash = "sha256-VF6eLOYfnIROPj1pvyV1G3TKGj/rAa2spc/oel4LFwk="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } From 844512f9494a2f19f4441fcad7fdfd1e3ad622fa Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 16 Oct 2024 14:59:39 +0200 Subject: [PATCH 3/4] nixos/graylog: set default version to 6.0 --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/modules/services/logging/graylog.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index df940e90ff9431..f9c03a6fb578aa 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -641,6 +641,9 @@ - `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12. Please switch to `pytest` or another test runner/framework. +- `services.graylog.package` now defaults to `graylog-6_0` as previous default `graylog-5_1` is EOL and therefore removed. + Check the migration guides on [5.1→5.2](https://go2docs.graylog.org/5-2/upgrading_graylog/upgrading_to_graylog_5.2.x.htm) and [5.2→6.0](https://go2docs.graylog.org/6-0/upgrading_graylog/upgrading_to_graylog_6.0.x.html) for breaking changes. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index ff1860e99a7575..3382f5e2953722 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -35,8 +35,8 @@ in package = lib.mkOption { type = lib.types.package; - default = if lib.versionOlder config.system.stateVersion "23.05" then pkgs.graylog-3_3 else pkgs.graylog-5_1; - defaultText = lib.literalExpression (if lib.versionOlder config.system.stateVersion "23.05" then "pkgs.graylog-3_3" else "pkgs.graylog-5_1"); + default = pkgs.graylog-6_0; + defaultText = lib.literalExpression "pkgs.graylog-6_0"; description = "Graylog package to use."; }; From 03d1a21db736d542accffd1b626186dcba03f3bf Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 16 Oct 2024 15:06:54 +0200 Subject: [PATCH 4/4] graylog-5_1: remove Graylog 5.1 was discontinued in May 2024. https://endoflife.date/graylog --- pkgs/tools/misc/graylog/5.1.nix | 9 --------- pkgs/tools/misc/graylog/plugins.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 pkgs/tools/misc/graylog/5.1.nix diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix deleted file mode 100644 index 859fab5755adb9..00000000000000 --- a/pkgs/tools/misc/graylog/5.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib, ...}: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "5.1.13"; - hash = "sha256-qjNJ51EbPjtDR5h4DElpSblj/c8WarXxPfcLTuTx5AQ="; - 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 3f5229549c8d2b..e6b885df8e1e47 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_1 }: +{ lib, stdenv, fetchurl, unzip, graylog-5_2 }: let inherit (lib) @@ -22,7 +22,7 @@ let dontUnpack = true; nativeBuildInputs = [ unzip ]; meta = a.meta // { - platforms = graylog-5_1.meta.platforms; + platforms = graylog-5_2.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0bf4a938d95ffc..6036063739f200 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -474,6 +474,7 @@ mapAliases { graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 + graylog-5_1 = throw "graylog 5.1.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.1.x to latest series."; # Added 2024-10-16 gringo = clingo; # added 2022-11-27 grub2_full = grub2; # Added 2022-11-18 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc47d2ca4b0f07..147e93a664d2e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8117,8 +8117,6 @@ with pkgs; grails = callPackage ../development/web/grails { jdk = null; }; - graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; - graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { }; graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { };