diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix deleted file mode 100644 index 859fab5755adb..0000000000000 --- 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 3f5229549c8d2..d86a66ca71b43 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, graylogPackage }: let inherit (lib) @@ -22,7 +22,7 @@ let dontUnpack = true; nativeBuildInputs = [ unzip ]; meta = a.meta // { - platforms = graylog-5_1.meta.platforms; + platforms = graylogPackage.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 4efab55ea5335..4df3dfd23afce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -507,6 +507,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 7543000e79611..1406d3c1cabcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3669,14 +3669,12 @@ 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 { }; graylogPlugins = recurseIntoAttrs ( - callPackage ../tools/misc/graylog/plugins.nix { } + callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; } ); graphviz = callPackage ../tools/graphics/graphviz {