From c7c4f6654648c8d3e45d7dce481469e1a4685ef7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Oct 2022 17:42:14 +0200 Subject: [PATCH] cassandra_2_1, cassandra_2_2: drop Cassandra 2.x is no more supported upstream and is affected by some vulnerabilities (CVE-2020-13946, CVE-2020-17516). --- .../manual/from_md/release-notes/rl-2211.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ nixos/tests/all-tests.nix | 2 -- pkgs/servers/nosql/cassandra/2.1.json | 4 ---- pkgs/servers/nosql/cassandra/2.1.nix | 12 ------------ pkgs/servers/nosql/cassandra/2.2.json | 4 ---- pkgs/servers/nosql/cassandra/2.2.nix | 12 ------------ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ------ 9 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 pkgs/servers/nosql/cassandra/2.1.json delete mode 100644 pkgs/servers/nosql/cassandra/2.1.nix delete mode 100644 pkgs/servers/nosql/cassandra/2.2.json delete mode 100644 pkgs/servers/nosql/cassandra/2.2.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index f6cf4b50c3be..bd3dd4b97bc0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -800,6 +800,16 @@ due to upstream dropping support. + + + cassandra_2_1 and + cassandra_2_2 have been removed. Please + update to cassandra_3_11 or + cassandra_3_0. See the + changelog + for more information about the upgrade process. + + mysql57 has been removed. Please update to diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 8f2430fb34b4..b74cd3d69b4d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -252,6 +252,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `k3s` no longer supports docker as runtime due to upstream dropping support. +- `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process. + - `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information. - Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b1694768104f..81a5d81fac0c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -110,8 +110,6 @@ in { cage = handleTest ./cage.nix {}; cagebreak = handleTest ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; - cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; - cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; diff --git a/pkgs/servers/nosql/cassandra/2.1.json b/pkgs/servers/nosql/cassandra/2.1.json deleted file mode 100644 index d1af24106b69..000000000000 --- a/pkgs/servers/nosql/cassandra/2.1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "2.1.22", - "sha256": "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3" -} diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix deleted file mode 100644 index 02f954ebd1fe..000000000000 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix ( - args - // builtins.fromJSON (builtins.readFile ./2.1.json) - // { - generation = "2_1"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; - }) diff --git a/pkgs/servers/nosql/cassandra/2.2.json b/pkgs/servers/nosql/cassandra/2.2.json deleted file mode 100644 index 694e66f4f463..000000000000 --- a/pkgs/servers/nosql/cassandra/2.2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "2.2.14", - "sha256": "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q" -} diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix deleted file mode 100644 index bcb2eaec123c..000000000000 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix ( - args - // builtins.fromJSON (builtins.readFile ./2.2.json) - // { - generation = "2_2"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; - }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f892c5de4af0..405861cf3dad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -173,6 +173,8 @@ mapAliases ({ cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; + cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 + cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 catfish = xfce.catfish; # Added 2019-12-22 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc456b3848e5..250a032b37be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23293,12 +23293,6 @@ with pkgs; cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 };