From 3de8769c87bd54ff5e61a0cfbe28adeb2c904a37 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 14 Sep 2018 18:35:06 +0200
Subject: [PATCH 1/3] flink: 1.5.0 -> 1.6.0

---
 pkgs/applications/networking/cluster/flink/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix                        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 402a03b77f4a..b23b730a1cab 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, jre
-, version ? "1.5" }:
+, version ? "1.6" }:
 
 let
   versionMap = {
@@ -21,6 +21,12 @@ let
       sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
       hadoopBundle = "";
     };
+    "1.6" = {
+      flinkVersion = "1.6.0";
+      scalaVersion = "2.11";
+      sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
+      hadoopBundle = "";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3295c1258f..01b97588293b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16338,6 +16338,7 @@ with pkgs;
   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;

From c8f602528bd6d505163c35abf79a815b0b3e3afb Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 14 Sep 2018 18:35:39 +0200
Subject: [PATCH 2/3] flink_1_5: 1.5.0 -> 1.5.3

---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index b23b730a1cab..d9c96da70b14 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -16,9 +16,9 @@ let
       hadoopBundle = "";
     };
     "1.5" = {
-      flinkVersion = "1.5.0";
+      flinkVersion = "1.5.3";
       scalaVersion = "2.11";
-      sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
+      sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
       hadoopBundle = "";
     };
     "1.6" = {

From 8125de3b407d5a394aa2527ce66f81df6ae58f2e Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 09:38:30 +0200
Subject: [PATCH 3/3] flink: drop older versions than current and previous
 minor release

This is consistent with the update policy as laid out in https://flink.apache.org/downloads.html#update-policy-for-old-releases.
---
 .../networking/cluster/flink/default.nix       | 18 +-----------------
 pkgs/top-level/all-packages.nix                |  2 --
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index d9c96da70b14..fe7b73a9e9bc 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -3,29 +3,13 @@
 
 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.3";
-      scalaVersion = "2.11";
       sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
-      hadoopBundle = "";
     };
     "1.6" = {
       flinkVersion = "1.6.0";
-      scalaVersion = "2.11";
       sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
-      hadoopBundle = "";
     };
   };
 in
@@ -36,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;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01b97588293b..884b13c55e01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16336,8 +16336,6 @@ 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 {