cassandra: fix (#505432)

pkgs/servers/nosql/cassandra/generic.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  python311Packages,
+  python3Packages,
   makeWrapper,
   gawk,
   bash,
@@ -17,7 +17,6 @@
   sha256,
   extraMeta ? { },
   callPackage,
-  ...
 }:
 
 let
@@ -41,11 +40,11 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
   };
 
-  pythonPath = with python311Packages; [ cassandra-driver ];
+  pythonPath = with python3Packages; [ cassandra-driver ];
 
-  nativeBuildInputs = [ python311Packages.wrapPython ];
+  nativeBuildInputs = [ python3Packages.wrapPython ];
 
-  buildInputs = [ python311Packages.python ] ++ pythonPath;
+  buildInputs = [ python3Packages.python ] ++ pythonPath;
 
   installPhase = ''
     runHook preInstall
@@ -112,13 +111,15 @@ stdenv.mkDerivation rec {
     rm $out/bin/cqlsh
     # Make "cqlsh.py" accessible by invoking "cqlsh"
     ln -s $out/bin/cqlsh.py $out/bin/cqlsh
+    # Use nixpkgs Python packages instead of bundled zips
+    makeWrapperArgs+=("--set" "CQLSH_NO_BUNDLED" "1")
     wrapPythonPrograms
   '';
 
   passthru = {
     tests =
       let
-        test = nixosTests."cassandra_${generation}";
+        test = nixosTests.cassandra;
       in
       {
         nixos =

pkgs/top-level/all-packages.nix

@@ -8064,7 +8064,6 @@ with pkgs;
     # 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;
-    python = python3;
   };
   cassandra = cassandra_4;