From 3876bf529f9fa6c0a9e0c4ad294c635da195eb97 Mon Sep 17 00:00:00 2001
From: Pierre Allix <pierre.allix.work@gmail.com>
Date: Fri, 16 Aug 2024 13:03:23 +0200
Subject: [PATCH 1/2] cassandra: fix cqlsh not working

Fixes #329864
---
 pkgs/servers/nosql/cassandra/generic.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 51ab6ac13326..4b44bdf2a697 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, python
+, python3Packages
 , makeWrapper
 , gawk
 , bash
@@ -40,7 +40,11 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  pythonPath = with python3Packages; [ cassandra-driver ];
+
+  nativeBuildInputs = [ python3Packages.wrapPython ];
+
+  buildInputs = [ python3Packages.python ] ++ pythonPath;
 
   installPhase = ''
     runHook preInstall
@@ -98,11 +102,18 @@ stdenv.mkDerivation rec {
       fi
     done
 
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-
     runHook postInstall
   '';
 
+  postFixup = ''
+    # Remove cassandra bash script wrapper.
+    # The wrapper searches for a suitable python version and is not necessary with Nix.
+    rm $out/bin/cqlsh
+    # Make "cqlsh.py" accessible by invoking "cqlsh"
+    ln -s $out/bin/cqlsh.py $out/bin/cqlsh
+    wrapPythonPrograms
+  '';
+
   passthru = {
     tests =
       let

From ed4a1c2451deb8199317803d6668d575d0513681 Mon Sep 17 00:00:00 2001
From: Pierre Allix <pierre.allix.work@gmail.com>
Date: Mon, 16 Sep 2024 13:34:02 +0200
Subject: [PATCH 2/2] cassandra: try using python311 packages to fix failing
 tests

---
 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 4b44bdf2a697..a954345dbb0f 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, python3Packages
+, python311Packages
 , makeWrapper
 , gawk
 , bash
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
   };
 
-  pythonPath = with python3Packages; [ cassandra-driver ];
+  pythonPath = with python311Packages; [ cassandra-driver ];
 
-  nativeBuildInputs = [ python3Packages.wrapPython ];
+  nativeBuildInputs = [ python311Packages.wrapPython ];
 
-  buildInputs = [ python3Packages.python ] ++ pythonPath;
+  buildInputs = [ python311Packages.python ] ++ pythonPath;
 
   installPhase = ''
     runHook preInstall