Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 442f53fc010a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 979e2c252ac5
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Nov 26, 2020

  1. logstash: fix missing package hooks 

    logstash packages were failing to run the pre/postInstall hooks, despite
running the install phase.
    @ivanbakel @teto
    ivanbakel authored and teto committed Nov 26, 2020
    Copy the full SHA
    979e2c2 View commit details
Showing with 7 additions and 1 deletion.
  1. +2 −0 pkgs/tools/misc/logstash/6.x.nix
  2. +2 −0 pkgs/tools/misc/logstash/7.x.nix
  3. +3 −1 pkgs/tools/misc/logstash/contrib.nix
2 changes: 2 additions & 0 deletions pkgs/tools/misc/logstash/6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {
2 changes: 2 additions & 0 deletions pkgs/tools/misc/logstash/7.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {
4 changes: 3 additions & 1 deletion pkgs/tools/misc/logstash/contrib.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {