Merge branch 'replit:main' into main

replit · Jul 27, 2024 · d0c3640 · d0c3640
2 parents 380f7ba + 8b972d6
commit d0c3640
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -84,6 +84,27 @@
             '';
           };
         };
+
+      } // rec {
+        python38 = pkgs.python310.override {
+          sourceVersion = {
+            major = "3";
+            minor = "8";
+            patch = "18";
+            suffix = "";
+          };
+          hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8=";
+        };
+
+
+        python38Full = python38.override {
+          self = python38Full;
+          pythonAttr = "python38Full";
+          bluezSupport = true;
+          x11Support = true;
+        };
+
+        python38Packages = python38Full.pkgs;
       };
       formatter.x86_64-linux = pkgs.nixpkgs-fmt;
       packages.x86_64-linux = import ./pkgs {

diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix
@@ -15,8 +15,8 @@ let
 
   modulesList = [
     (import ./python {
-      python = pkgs-23_05.python38Full;
-      pypkgs = pkgs-23_05.python38Packages;
+      python = pkgs.python38Full;
+      pypkgs = pkgs.python38Packages;
     })
     (import ./python {
       python = pkgs.python39Full;

diff --git a/pkgs/modules/nodejs/default.nix b/pkgs/modules/nodejs/default.nix
@@ -170,7 +170,7 @@ in
       language = "javascript";
       extensions = [ ".js" ".jsx" ".ts" ".tsx" ".json" ".html" ];
       start = {
-        args = [ "${run-prettier}/bin/run-prettier" "--stdin-filepath" "-f" "$file" ];
+        args = [ "${run-prettier}/bin/run-prettier" ];
       };
       stdin = true;
       supportsRangeFormatting = true;

diff --git a/pkgs/modules/python/default.nix b/pkgs/modules/python/default.nix
@@ -3,7 +3,7 @@
 let
   pythonVersion = lib.versions.majorMinor python.version;
 
-  pkgs = if pythonVersion == "3.8" then pkgs-23_05 else pkgs-unstable;
+  pkgs = pkgs-unstable;
 
   pylibs-dir = ".pythonlibs";
 

diff --git a/pkgs/modules/python/pip.nix b/pkgs/modules/python/pip.nix
@@ -10,6 +10,12 @@ let
     # and we don't need the docs
     postBuild = "";
     postInstall = "";
+
+    nativeBuildInputs = [
+      pkgs.installShellFiles
+      pypkgs.setuptools
+      pypkgs.wheel
+    ];
   });
 
   config = pkgs.writeTextFile {