Merge pull request #95 from replit/cad/fix-prybar-3.8-invocation

fix prybar invocation for python 3.8

modules.json

@@ -390,5 +390,9 @@
   "python-3.8:v1-20230829-e1c0916": {
     "commit": "e1c0916e9629e64e596aa4730df2da68363ddeeb",
     "path": "/nix/store/rsycf8rjpznldnf51h83yl0mx3v3ddij-replit-module-python-3.8"
+  },
+  "python-3.8:v2-20230907-3d66d15": {
+    "commit": "3d66d15671a634f2b4f03f45e90d6fcda6424214",
+    "path": "/nix/store/2xn16m801sl1fmqf691ba7alv19l2r67-replit-module-python-3.8"
   }
 }

pkgs/modules/python/default.nix

@@ -75,11 +75,6 @@ let
     '';
   };
 
-  prybar-python =
-    if pythonVersion == "3.8"
-    then pkgs.prybar.prybar-python3
-    else pkgs.prybar.prybar-python310;
-
   stderred = pkgs.callPackage ../../stderred { };
 
   dapPython = pkgs.callPackage ../../dapPython {
@@ -139,8 +134,10 @@ let
 
   python3-wrapper = pythonWrapper { bin = "${python}/bin/python3"; name = "python3"; aliases = [ "python" "python${pythonVersion}" ]; };
 
+  prybar-python-version = if pythonVersion == "3.8" then "3" else "310";
+
   run-prybar-bin = pkgs.writeShellScriptBin "run-prybar" ''
-    ${stderred}/bin/stderred -- ${prybar-python}/bin/prybar-python310 -q --ps1 "''$(printf '\u0001\u001b[33m\u0002\u0001\u001b[00m\u0002 ')" -i ''$1
+    ${stderred}/bin/stderred -- ${pkgs.prybar."prybar-python${prybar-python-version}"}/bin/prybar-python${prybar-python-version} -q --ps1 "''$(printf '\u0001\u001b[33m\u0002\u0001\u001b[00m\u0002 ')" -i ''$1
   '';
 
   run-prybar = pythonWrapper { bin = "${run-prybar-bin}/bin/run-prybar"; name = "run-prybar"; };

pkgs/upgrade-maps/default.nix

@@ -36,6 +36,8 @@ let
     "nodejs-20:v1-20230623-0b7a606" = { to = "nodejs-20:v2-20230706-ccb32c4"; auto = true; };
     "nodejs-20:v2-20230706-ccb32c4" = { to = "nodejs-20:v3-20230711-6807d41"; auto = true; };
 
+    "python-3.8:v1-20230829-e1c0916" = { to = "python-3.8:v2-20230907-3d66d15"; auto = true; };
+
     "python-3.10:v5-20230613-622effa" = { to = "python-3.10:v6-20230614-6eb09f7"; auto = true; };
     "python-3.10:v6-20230614-6eb09f7" = { to = "python-3.10:v7-20230623-0b7a606"; auto = true; };
     "python-3.10:v7-20230623-0b7a606" = { to = "python-3.10:v8-20230629-218abef"; auto = true; };