diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/misc/logstash | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/misc/logstash')
3 files changed, 8 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index ec8106e922ae..b8008864bccf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out @@ -41,10 +42,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/logstash-plugin \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + 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"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index e7872b0c4061..cd554167dda8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/logstash-plugin \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix index d03e031b7aee..d4fb6532ef59 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip }: # Note that plugins are supposed to be installed as: -# $path/logstash/{inputs,codecs,filters,outputs}/*.rb +# $path/logstash/{inputs,codecs,filters,outputs}/*.rb stdenv.mkDerivation rec { version = "1.4.2"; pname = "logstash-contrib"; @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; installPhase = '' + runHook preInstall mkdir -p $out/logstash cp -r lib/* $out + runHook postInstall ''; meta = with lib; { |