From a63c1a930f5fc68ea0713e259bcc0ae03940baa5 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 3 Dec 2020 11:00:03 +0100 Subject: [PATCH] kafka: remove old versions --- nixos/tests/kafka.nix | 9 ------ pkgs/servers/apache-kafka/default.nix | 45 --------------------------- pkgs/top-level/aliases.nix | 9 ++++++ pkgs/top-level/all-packages.nix | 9 ------ 4 files changed, 9 insertions(+), 63 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 88e30b62baa2d..373e939c00d0a 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -80,15 +80,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_0_9 = makeKafkaTest "kafka_0_9" apacheKafka_0_9; - kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10; - kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11; - kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0; - kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1; - kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0; - kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1; - kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2; - kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3; kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 6daf3251102b5..9ab14140c67f7 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,51 +3,6 @@ let versionMap = { - "0.9" = { - kafkaVersion = "0.9.0.1"; - scalaVersion = "2.11"; - sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; - }; - "0.10" = { - kafkaVersion = "0.10.2.2"; - scalaVersion = "2.12"; - sha256 = "13wibnz7n7znv2g13jlpkz1r0y73qy5b02pdqhsq7cl72h9s6wms"; - }; - "0.11" = { - kafkaVersion = "0.11.0.3"; - scalaVersion = "2.12"; - sha256 = "0zkzp9a8lcfcpavks131119v10hpn90sc0pw4f90jc4zn2yw3rgd"; - }; - "1.0" = { - kafkaVersion = "1.0.2"; - scalaVersion = "2.12"; - sha256 = "0cmq8ww1lbkp3ipy9d1q8c1yz4kfwj0v4ynnhsk1i48sqlmvwybj"; - }; - "1.1" = { - kafkaVersion = "1.1.1"; - scalaVersion = "2.12"; - sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2"; - }; - "2.0" = { - kafkaVersion = "2.0.1"; - scalaVersion = "2.12"; - sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl"; - }; - "2.1" = { - kafkaVersion = "2.1.1"; - scalaVersion = "2.12"; - sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0"; - }; - "2.2" = { - kafkaVersion = "2.2.1"; - scalaVersion = "2.12"; - sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv"; - }; - "2.3" = { - kafkaVersion = "2.3.1"; - scalaVersion = "2.12"; - sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas"; - }; "2.4" = { kafkaVersion = "2.4.1"; scalaVersion = "2.12"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28b5614a80cbe..4008d8ee82d0e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -45,6 +45,15 @@ mapAliases ({ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3c3330ae3768..1ad8cfa257467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10905,15 +10905,6 @@ in ant = apacheAnt; apacheKafka = apacheKafka_2_5; - apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; - apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; - apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; - apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; - apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; - apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; - apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; - apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; - apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };