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: 95a3c8d151b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a9ca5ad1ca8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 3, 2019

  1. kafka: Fix stop script in pure environments

    @phile314 @NeQuissimus
    phile314 authored and NeQuissimus committed Oct 3, 2019
    Copy the full SHA
    7a9ca5a View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/servers/apache-kafka/default.nix
7 changes: 5 additions & 2 deletions pkgs/servers/apache-kafka/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused,
{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
majorVersion ? "1.0" }:

let
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};

buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ];
buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ps ];

installPhase = ''
mkdir -p $out
@@ -76,6 +76,9 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/kafka-run-class.sh \
--replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"'
substituteInPlace $out/bin/kafka-server-stop.sh \
--replace 'ps' '${ps}/bin/ps'
for p in $out/bin\/*.sh; do
wrapProgram $p \
--set JAVA_HOME "${jre}" \