Merge pull request #46659 from mbode/flink_1_6

flink: 1.5 -> 1.6
This commit is contained in:
xeji 2018-09-15 12:26:08 +02:00 committed by GitHub
commit b917bb9449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 20 deletions

View file

@ -1,25 +1,15 @@
{ stdenv, fetchurl, makeWrapper, jre
, version ? "1.5" }:
, version ? "1.6" }:
let
versionMap = {
"1.3" = {
flinkVersion = "1.3.3";
scalaVersion = "2.11";
sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy";
hadoopBundle = "-hadoop27";
};
"1.4" = {
flinkVersion = "1.4.2";
scalaVersion = "2.11";
sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
hadoopBundle = "";
};
"1.5" = {
flinkVersion = "1.5.0";
scalaVersion = "2.11";
sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
hadoopBundle = "";
flinkVersion = "1.5.3";
sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
};
"1.6" = {
flinkVersion = "1.6.0";
sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
};
};
in
@ -30,7 +20,7 @@ stdenv.mkDerivation rec {
name = "flink-${flinkVersion}";
src = fetchurl {
url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz";
url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz";
inherit sha256;
};

View file

@ -16347,8 +16347,7 @@ with pkgs;
fldigi = callPackage ../applications/audio/fldigi { };
flink = callPackage ../applications/networking/cluster/flink { };
flink_1_3 = flink.override { version = "1.3"; };
flink_1_4 = flink.override { version = "1.4"; };
flink_1_5 = flink.override { version = "1.5"; };
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;