From 7ac8906e82a2ef6da5ed7d6895aae39460ed755f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Aug 2019 16:49:22 -0700 Subject: [PATCH 1/3] confluent-platform: 5.2.1 -> 5.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/confluent-platform/versions --- pkgs/servers/confluent-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 349502289207..b29f6eba12e5 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "confluent-platform-${version}"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; - sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1"; + sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp"; }; buildInputs = [ jre makeWrapper bash ]; From 1ac4c0f2463a856cb95a5ad66d54ff91168b4d9e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 4 Aug 2019 13:05:30 +0200 Subject: [PATCH 2/3] confluent-platform: add jre to PATH --- pkgs/servers/confluent-platform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index b29f6eba12e5..4d2b9a0b1fba 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $p \ --set JAVA_HOME "${jre}" \ --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin:${gnused}/bin" + --prefix PATH : "${jre}/bin:${bash}/bin:${gnused}/bin" done ''; From b8d3548a560790163ffa735aa621b814edc710b3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 4 Aug 2019 13:05:59 +0200 Subject: [PATCH 3/3] confluent-platform: add confluent-cli tool --- pkgs/servers/confluent-platform/default.nix | 23 +++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 4d2b9a0b1fba..84985b8f0eb3 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -1,20 +1,35 @@ -{ stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: +{ stdenv, lib, fetchurl, fetchFromGitHub +, jre, makeWrapper, bash, gnused }: -let - scalaVersion = "2.12"; -in stdenv.mkDerivation rec { name = "confluent-platform-${version}"; version = "5.3.0"; + scalaVersion = "2.12"; src = fetchurl { url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp"; }; + confluentCli = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-cli"; + rev = "v${version}"; + sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j"; + }; + buildInputs = [ jre makeWrapper bash ]; installPhase = '' + cp -R $confluentCli confluent-cli + chmod -R +w confluent-cli + + ( + export CONFLUENT_HOME=$PWD + cd confluent-cli + make install + ) + mkdir -p $out cp -R bin etc share src $out rm -rf $out/bin/windows