From 4e95dbdff31859df93f0bb57848e6a1664c7ffdd Mon Sep 17 00:00:00 2001
From: Cameron Smith <cameron.ray.smith@gmail.com>
Date: Sun, 28 Jul 2024 23:15:15 -0400
Subject: [PATCH] fix(nix): make 3.11 default python in container images

Signed-off-by: Cameron Smith <cameron.ray.smith@gmail.com>
---
 flake.nix                  | 4 ++--
 nix/containers/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8e168fc90..4b437a85a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -218,14 +218,14 @@
             inherit pkgs devPackages buildMultiUserNixImage;
             sudoImage = inputs'.nixpod.packages.sudoImage;
             homeActivationPackage = inputs'.nixpod.legacyPackages.homeConfigurations.jovyan.activationPackage;
-            pythonPackageEnv = pkgs.pyrovelocityDevEnv310;
+            pythonPackageEnv = pkgs.pyrovelocityDevEnv311;
           };
 
           jupyterImage = import ./nix/containers/jupyter.nix {
             inherit pkgs devPackages buildMultiUserNixImage;
             sudoImage = inputs'.nixpod.packages.sudoImage;
             homeActivationPackage = inputs'.nixpod.legacyPackages.homeConfigurations.jovyan.activationPackage;
-            pythonPackageEnv = pkgs.pyrovelocityDevEnv310;
+            pythonPackageEnv = pkgs.pyrovelocityDevEnv311;
           };
         };
 
diff --git a/nix/containers/default.nix b/nix/containers/default.nix
index aedcbc1fd..77fb28631 100644
--- a/nix/containers/default.nix
+++ b/nix/containers/default.nix
@@ -137,7 +137,7 @@
         "NIX_PAGER=cat"
         "USER=root"
         "HOME=/root"
-        "PYTHONPATH=${packageSrcPath}:${pkgs.lib.strings.makeSearchPathOutput "" "lib/python3.10/site-packages" pythonPackages}"
+        "PYTHONPATH=${packageSrcPath}:${pkgs.lib.strings.makeSearchPathOutput "" "lib/python3.11/site-packages" pythonPackages}"
         "LD_LIBRARY_PATH=${pythonPackageEnv}/lib:/usr/local/nvidia/lib64"
         "NVIDIA_DRIVER_CAPABILITIES='compute,utility'"
         "NVIDIA_VISIBLE_DEVICES=all"
@@ -188,7 +188,7 @@
       containerPackages = sysPackages ++ extraSysPackages ++ devPackages ++ devpythonPackages;
       cmd = devcontainerCmd;
       extraEnv = [
-        "QUARTO_PYTHON=${pkgs.python310}/bin/python"
+        "QUARTO_PYTHON=${pkgs.python311}/bin/python"
       ];
     };
   };
@@ -231,7 +231,7 @@
       containerPackages = sysPackages ++ extraSysPackages ++ devPackages ++ devpythonPackages;
       cmd = devcontainerCmd;
       extraEnv = [
-        "QUARTO_PYTHON=${pkgs.python310}/bin/python"
+        "QUARTO_PYTHON=${pkgs.python311}/bin/python"
         "GIT_REPO_NAME=${builtins.getEnv "GIT_REPO_NAME"}"
         "GIT_REF=${builtins.getEnv "GIT_REF"}"
         "GIT_SHA=${builtins.getEnv "GIT_SHA"}"