From ab823e3a1170b1fc2ef461fc026bfd220013b4bd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Apr 2022 13:03:07 +0200 Subject: [PATCH] cassandra_4: init --- nixos/tests/all-tests.nix | 1 + pkgs/servers/nosql/cassandra/4.json | 4 ++++ pkgs/servers/nosql/cassandra/4.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 pkgs/servers/nosql/cassandra/4.json create mode 100644 pkgs/servers/nosql/cassandra/4.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 895cbe4290dc..4d652210baae 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -113,6 +113,7 @@ in { calibre-web = handleTest ./calibre-web.nix {}; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; + cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json new file mode 100644 index 000000000000..5a85b4a322b4 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/4.json @@ -0,0 +1,4 @@ +{ + "version": "4.0.3", + "sha256": "03gmwmwsldv58shz6sl1l0khxr2kni2ssl9v7k3pb77kpq036qik" +} diff --git a/pkgs/servers/nosql/cassandra/4.nix b/pkgs/servers/nosql/cassandra/4.nix new file mode 100644 index 000000000000..0a96e2579035 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/4.nix @@ -0,0 +1,8 @@ +# GENERATED BY update.sh +{ callPackage, ... } @ args: +callPackage ./generic.nix ( + args + // builtins.fromJSON (builtins.readFile ./4.json) + // { + generation = "4"; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71e2f653fc32..54de60646995 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23615,6 +23615,11 @@ with pkgs; cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix { + # Effective Cassandra 4.0.2 there is full Java 11 support + # -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html + jre = pkgs.jdk11_headless; + }; cassandra = cassandra_3_11; cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { };