diff options
author | adisbladis <adisbladis@gmail.com> | 2019-09-06 14:02:56 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-09-06 14:22:15 +0100 |
commit | 4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba (patch) | |
tree | eee93bfaec742e7de3b0e06d975e79d3f3b0c677 | |
parent | 1b64fd7f53bd655651b5c1ad881f5392b1b49073 (diff) | |
download | nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar.gz nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar.bz2 nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar.lz nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar.xz nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.tar.zst nixlib-4e30b30a6540e7d8a324b6d5a172520ff5f6f2ba.zip |
logstash5: Remove EOL package
-rw-r--r-- | nixos/modules/services/logging/logstash.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/5.x.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 42 deletions
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 9b707e9deb58..4943e8d7db3a 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -53,7 +53,7 @@ in type = types.package; default = pkgs.logstash; defaultText = "pkgs.logstash"; - example = literalExample "pkgs.logstash5"; + example = literalExample "pkgs.logstash"; description = "Logstash package to use."; }; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix deleted file mode 100644 index 2545dd1e6bc0..000000000000 --- a/pkgs/tools/misc/logstash/5.x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre }: - -stdenv.mkDerivation rec { - version = elk5Version; - pname = "logstash"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; - sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - buildInputs = [ - makeWrapper jre - ]; - - installPhase = '' - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - ''; - - meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.wjlroe maintainers.offline ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d7366865cba..d2610687d2c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4207,7 +4207,6 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -4309,7 +4308,6 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; |