From 426fbcb5a6f110b4bc76a5cd2818e5254dbef8ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 4 Oct 2022 15:32:16 +0200 Subject: [PATCH] *beat6: remove --- pkgs/misc/logging/beats/6.x.nix | 54 --------------------------------- pkgs/top-level/aliases.nix | 7 ++++- pkgs/top-level/all-packages.nix | 14 +++------ 3 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 pkgs/misc/logging/beats/6.x.nix diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix deleted file mode 100644 index 1c3e4adccf82..000000000000 --- a/pkgs/misc/logging/beats/6.x.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: - -let beat = package : extraArgs : buildGoPackage (rec { - name = "${package}-${version}"; - version = elk6Version; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "1vnw9clsc10cfpjf6vxvc6m507b2q17sgsl079iwqbp4v0286il7"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ package ]; - - patches = [ - (fetchpatch { - # Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493 - url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff"; - sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2"; - }) - ]; - - meta = with lib; { - homepage = "https://www.elastic.co/products/beats"; - license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk dfithian ]; - platforms = platforms.linux; - }; - } // extraArgs); -in rec { - filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat6 = beat "metricbeat" { - meta.description = "Lightweight shipper for metrics"; - passthru.tests = - assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath; - { - elk = nixosTests.elk.ELK-6; - }; - }; - journalbeat6 = beat "journalbeat" { - meta.description = '' - Journalbeat is an open source data collector to read and forward - journal entries from Linuxes with systemd. - ''; - buildInputs = [ systemd.dev ]; - postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' - patchelf --set-rpath ${libPath} "$out/bin/journalbeat" - ''; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 463584a5b8dc..15414418637a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -474,6 +474,7 @@ mapAliases ({ ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 + filebeat6 = throw "filebeat6 has been removed because it reached end of life"; # Added 2022-10-04 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; @@ -662,6 +663,7 @@ mapAliases ({ haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 + heartbeat6 = throw "heartbeat6 has been removed because it reached end of life"; # Added 2022-10-04 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 @@ -732,7 +734,9 @@ mapAliases ({ jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 - journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; + journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 + journalbeat6 = throw "journalbeat6 has been removed because it reached end of life"; # Added 2022-10-04 + journalbeat7 = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 # Julia julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 @@ -997,6 +1001,7 @@ mapAliases ({ mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 metal = throw "metal has been removed due to lack of maintainers"; + metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb99c75d8d80..1e40b662ff91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3777,22 +3777,16 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) - filebeat6 - heartbeat6 - metricbeat6 - journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 packetbeat7; - filebeat = filebeat6; - heartbeat = heartbeat6; - metricbeat = metricbeat6; - journalbeat = journalbeat6; + filebeat = filebeat7; + heartbeat = heartbeat7; + metricbeat = metricbeat7; + packetbeat = packetbeat7; bfr = callPackage ../tools/misc/bfr { };