summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Jheng <wentworth@outlook.com>2023-01-26 10:10:15 +0000
committerAaron Jheng <wentworth@outlook.com>2023-01-26 11:19:21 +0000
commitc12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f (patch)
treeb030456145935c1ffdb8d4411bbe349ec1dde658
parent7b9a3310ac73d1e5fc7fd9829d34e92799d23bc0 (diff)
downloadnixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar.gz
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar.bz2
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar.lz
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar.xz
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.tar.zst
nixpkgs-c12ccc8c2b5a38c8e05dc5d0ad9f3fb8b713575f.zip
cassandra_4: 4.0.7 -> 4.1.0
-rw-r--r--pkgs/servers/nosql/cassandra/4.json4
-rw-r--r--pkgs/servers/nosql/cassandra/generic.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json
index fd0a4be8f49..cf13954ad86 100644
--- a/pkgs/servers/nosql/cassandra/4.json
+++ b/pkgs/servers/nosql/cassandra/4.json
@@ -1,4 +1,4 @@
 {
-  "version": "4.0.7",
-  "sha256": "03k7mvm5im4lahl8wfafk5ljxd95b6zsmskip4kcpzqi6naf6s4s"
+  "version": "4.1.0",
+  "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4"
 }
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 6a6aa65395c..45bea6fed4c 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, python2
+, python
 , makeWrapper
 , gawk
 , bash
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
       fi
     done
 
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin
+    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
 
     runHook postInstall
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2939e30b01..a0cb98ab2e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24056,6 +24056,7 @@ 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_3_11;