diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix deleted file mode 100644 index ef5d04ee4765..000000000000 --- a/pkgs/tools/misc/logstash/6.x.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, lib, stdenv -, fetchurl -, makeWrapper -, nixosTests -, jre -}: - -let this = stdenv.mkDerivation rec { - version = elk6Version; - pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; - sha256 = - if enableUnfree - then "0hij1byw5b3xmk3vshr9p7gxwbjrywr7ylps05ydc2dmnz8q2a79" - else "1fa236pvhj7spys54nqi3k64rwzf6zi6gaccmqg4p4sh92jzsybv"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - jre - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; - - meta = with lib; { - description = "A data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = "https://www.elastic.co/products/logstash"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - binaryNativeCode # bundled jruby includes native code - ]; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; - }; - passthru.tests = - lib.optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; - { - elk = nixosTests.elk.ELK-6; - } - ); -}; -in this diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 967426b95a74..463584a5b8dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -957,6 +957,8 @@ mapAliases ({ loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 lobster-two = google-fonts; # Added 2021-07-22 + logstash6 = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 + logstash6-oss = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e459e2930c9e..cb99c75d8d80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9101,15 +9101,6 @@ with pkgs; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { - # https://www.elastic.co/support/matrix#logstash-and-jvm - jre = jdk11_headless; - }; - logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { - enableUnfree = false; - # https://www.elastic.co/support/matrix#logstash-and-jvm - jre = jdk11_headless; - }; logstash7 = callPackage ../tools/misc/logstash/7.x.nix { # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; @@ -9119,7 +9110,7 @@ with pkgs; # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; }; - logstash = logstash6; + logstash = logstash7; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };