Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #61983 from nikuda/master

confluent-platform: Rename confluent package and update to 5.2.1

authored by Jaka Hudoklin and committed by GitHub e2d07d2c 0bc377d4

+10 -13
+9 -12
pkgs/servers/confluent/default.nix pkgs/servers/confluent-platform/default.nix
··· 1 { stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: 2 3 - with lib; 4 - 5 - let 6 - confluentVersion = "4.1.1"; 7 - scalaVersion = "2.11"; 8 - sha256 = "e00eb4c6c7445ad7a43c9cd237778d1cd184322aebf5ff64a8e9806ba2cc27aa"; 9 - in stdenv.mkDerivation rec { 10 - name = "confluent-${version}"; 11 - version = "${confluentVersion}-${scalaVersion}"; 12 13 src = fetchurl { 14 - url = "http://packages.confluent.io/archive/${versions.majorMinor confluentVersion}/confluent-oss-${version}.tar.gz"; 15 - inherit sha256; 16 }; 17 18 buildInputs = [ jre makeWrapper bash ]; ··· 41 42 meta = with stdenv.lib; { 43 homepage = https://www.confluent.io/; 44 - description = "Confluent platform"; 45 license = licenses.asl20; 46 maintainers = [ maintainers.offline ]; 47 platforms = platforms.unix;
··· 1 { stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: 2 3 + let 4 + scalaVersion = "2.12"; 5 + in 6 + stdenv.mkDerivation rec { 7 + name = "confluent-platform-${version}"; 8 + version = "5.2.1"; 9 10 src = fetchurl { 11 + url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; 12 + sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1"; 13 }; 14 15 buildInputs = [ jre makeWrapper bash ]; ··· 38 39 meta = with stdenv.lib; { 40 homepage = https://www.confluent.io/; 41 + description = "Confluent event streaming platform based on Apache Kafka"; 42 license = licenses.asl20; 43 maintainers = [ maintainers.offline ]; 44 platforms = platforms.unix;
+1 -1
pkgs/top-level/all-packages.nix
··· 8982 8983 corundum = callPackage ../development/tools/corundum { }; 8984 8985 - confluent = callPackage ../servers/confluent {}; 8986 8987 ctags = callPackage ../development/tools/misc/ctags { }; 8988
··· 8982 8983 corundum = callPackage ../development/tools/corundum { }; 8984 8985 + confluent-platform = callPackage ../servers/confluent-platform {}; 8986 8987 ctags = callPackage ../development/tools/misc/ctags { }; 8988