From 4e5d84a1c8df6d0a3814abb54e697dd63ac8082b Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 31 Mar 2026 20:41:14 +0200
Subject: [PATCH 1/4] cassandra: use python3Packages

---
 pkgs/servers/nosql/cassandra/generic.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index df6c9eb3e08a..c540952e45b6 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  python311Packages,
+  python3Packages,
   makeWrapper,
   gawk,
   bash,
@@ -41,11 +41,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

From 966b542c68e7e0d5f28d2f5450ca953b792479ff Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 31 Mar 2026 20:42:18 +0200
Subject: [PATCH 2/4] all-packages: Drop unused cassandra python argument

and drop the ... so that this doesn't happen again.
---
 pkgs/servers/nosql/cassandra/generic.nix | 1 -
 pkgs/top-level/all-packages.nix          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index c540952e45b6..ba4d32e2750f 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -17,7 +17,6 @@
   sha256,
   extraMeta ? { },
   callPackage,
-  ...
 }:
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb5759dcc792..fa1a452e7985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8078,7 +8078,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;
 

From ab2aa9915c2373a646a912cdf499b4bd6967d013 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 31 Mar 2026 20:44:07 +0200
Subject: [PATCH 3/4] cassandra: Use correct nixosTests attribute

---
 pkgs/servers/nosql/cassandra/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index ba4d32e2750f..816b97f4c2c8 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
   passthru = {
     tests =
       let
-        test = nixosTests."cassandra_${generation}";
+        test = nixosTests.cassandra;
       in
       {
         nixos =

From b376c14b43fa39add20d58adf7bf0d34f06f1754 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 31 Mar 2026 20:50:13 +0200
Subject: [PATCH 4/4] cassandra: Use our cassandra-driver for cqlsh

... instead of bundled `cassandra-driver-internal-only-*.zip`.
This way it's more up to date, and follows our best practices.
"internal" plainly confirms that this is better.
---
 pkgs/servers/nosql/cassandra/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 816b97f4c2c8..fa8cf79f4950 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -111,6 +111,8 @@ 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
   '';