diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2019-06-16 08:57:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-16 08:57:48 +0200 |
commit | e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0 (patch) | |
tree | bd64065d8c24767552fd39c971a06a0990b72de7 | |
parent | 0bc377d47debcae6394f47149fc9194338c4cc8f (diff) | |
parent | f25550e840438355a83b87f62f813fc7c03f71d9 (diff) | |
download | nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar.gz nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar.bz2 nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar.lz nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar.xz nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.tar.zst nixpkgs-e2d07d2cc7e880d6c1dbff211a8b9b4f503ca7a0.zip |
Merge pull request #61983 from nikuda/master
confluent-platform: Rename confluent package and update to 5.2.1
-rw-r--r-- | pkgs/servers/confluent-platform/default.nix (renamed from pkgs/servers/confluent/default.nix) | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/servers/confluent/default.nix b/pkgs/servers/confluent-platform/default.nix index dd42f38f62a..34950228920 100644 --- a/pkgs/servers/confluent/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -1,18 +1,15 @@ { stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: -with lib; - -let - confluentVersion = "4.1.1"; - scalaVersion = "2.11"; - sha256 = "e00eb4c6c7445ad7a43c9cd237778d1cd184322aebf5ff64a8e9806ba2cc27aa"; -in stdenv.mkDerivation rec { - name = "confluent-${version}"; - version = "${confluentVersion}-${scalaVersion}"; +let + scalaVersion = "2.12"; +in +stdenv.mkDerivation rec { + name = "confluent-platform-${version}"; + version = "5.2.1"; src = fetchurl { - url = "http://packages.confluent.io/archive/${versions.majorMinor confluentVersion}/confluent-oss-${version}.tar.gz"; - inherit sha256; + url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; + sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1"; }; buildInputs = [ jre makeWrapper bash ]; @@ -41,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.confluent.io/; - description = "Confluent platform"; + description = "Confluent event streaming platform based on Apache Kafka"; license = licenses.asl20; maintainers = [ maintainers.offline ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd4ed92b45e..9ab395f091b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8982,7 +8982,7 @@ in corundum = callPackage ../development/tools/corundum { }; - confluent = callPackage ../servers/confluent {}; + confluent-platform = callPackage ../servers/confluent-platform {}; ctags = callPackage ../development/tools/misc/ctags { }; |