Merge pull request #110782 from dotlambda/flink-1.12.1

authored by

Sandro and committed by
GitHub
41adb8ac 8da624e2

+6 -21
+5 -20
pkgs/applications/networking/cluster/flink/default.nix
··· 1 - { lib, stdenv, fetchurl, makeWrapper, jre 2 - , version ? "1.6" }: 3 - 4 - let 5 - versionMap = { 6 - "1.5" = { 7 - flinkVersion = "1.5.5"; 8 - sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; 9 - }; 10 - "1.6" = { 11 - flinkVersion = "1.11.1"; 12 - sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0"; 13 - }; 14 - }; 15 - in 16 - 17 - with versionMap.${version}; 1 + { lib, stdenv, fetchurl, makeWrapper, jre }: 18 2 19 3 stdenv.mkDerivation rec { 20 - name = "flink-${flinkVersion}"; 4 + pname = "flink"; 5 + version = "1.12.1"; 21 6 22 7 src = fetchurl { 23 - url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz"; 24 - inherit sha256; 8 + url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; 9 + sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l"; 25 10 }; 26 11 27 12 nativeBuildInputs = [ makeWrapper ];
+1
pkgs/top-level/aliases.nix
··· 168 168 firestr = throw "firestr has been removed."; # added 2019-12-08 169 169 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 170 170 flameGraph = flamegraph; # added 2018-04-25 171 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 171 172 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 172 173 foldingathome = fahclient; # added 2020-09-03 173 174 font-awesome-ttf = font-awesome; # 2018-02-25
-1
pkgs/top-level/all-packages.nix
··· 21798 21798 fldigi = callPackage ../applications/radio/fldigi { }; 21799 21799 21800 21800 flink = callPackage ../applications/networking/cluster/flink { }; 21801 - flink_1_5 = flink.override { version = "1.5"; }; 21802 21801 21803 21802 fllog = callPackage ../applications/radio/fllog { }; 21804 21803