public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110782 from dotlambda/flink-1.12.1

This commit is contained in:
Sandro 2021-01-25 21:18:28 +01:00 committed by GitHub
parent 8da624e231 8573814f46
commit 41adb8acc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/networking/cluster/flink/default.nix
View File

@ -1,27 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre { lib, stdenv, fetchurl, makeWrapper, jre }:
, version ? "1.6" }:
let
versionMap = {
"1.5" = {
flinkVersion = "1.5.5";
sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z";
};
"1.6" = {
flinkVersion = "1.11.1";
sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0";
};
};
in
with versionMap.${version};
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flink-${flinkVersion}"; pname = "flink";
version = "1.12.1";
src = fetchurl { src = fetchurl {
url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz"; url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
inherit sha256; sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

1
pkgs/top-level/aliases.nix
View File

@ -168,6 +168,7 @@ mapAliases ({
firestr = throw "firestr has been removed."; # added 2019-12-08 firestr = throw "firestr has been removed."; # added 2019-12-08
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
flameGraph = flamegraph; # added 2018-04-25 flameGraph = flamegraph; # added 2018-04-25
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
foldingathome = fahclient; # added 2020-09-03 foldingathome = fahclient; # added 2020-09-03
font-awesome-ttf = font-awesome; # 2018-02-25 font-awesome-ttf = font-awesome; # 2018-02-25

1
pkgs/top-level/all-packages.nix
View File

@ -21798,7 +21798,6 @@ in
fldigi = callPackage ../applications/radio/fldigi { }; fldigi = callPackage ../applications/radio/fldigi { };
flink = callPackage ../applications/networking/cluster/flink { }; flink = callPackage ../applications/networking/cluster/flink { };
flink_1_5 = flink.override { version = "1.5"; };
fllog = callPackage ../applications/radio/fllog { }; fllog = callPackage ../applications/radio/fllog { };