Merge pull request #386 from replit/dstewart/feat/add-uv

feat/add uv

flake.nix

@@ -39,8 +39,15 @@
         name = "nixpkgs-unstable-patched";
         src = nixpkgs-unstable;
         patches = [
-          # rexml breaks this version of nixpkgs
-          ./patches/rexml.patch
+          # rexml broke solargraph at some point in the past.
+          # Attempting to run:
+          #   echo 'x = (5 + "hey")' > main.rb
+          #   /nix/store/.../ruby /nix/store/.../bin/solargraph typecheck main.rb
+          # curently emits a bunch of "Unrecognized RBS type:" warnings, followed by
+          # "0 problems found."
+          # This patch used to apply, but even when massaged to apply to the
+          # current unstable HEAD, still produces the same result:
+          # ./patches/rexml.patch
         ];
       };
 

pkgs/modules/R/default.nix

@@ -9,6 +9,10 @@ in
     R project for statistical computing.
   '';
 
+  replit.packages = [
+    pkgs.R
+  ];
+
   replit.runners.r = {
     name = "R";
     language = "r";

pkgs/modules/python/default.nix

@@ -113,6 +113,7 @@ in
     python3-wrapper
     pip-wrapper
     poetry-wrapper
+    pkgs.uv
   ];
 
   replit.runners.python = {
@@ -160,6 +161,7 @@ in
     PYTHONUSERBASE = userbase;
     PYTHONPATH = "${sitecustomize}:${pip.pip}/${python.sitePackages}";
     REPLIT_PYTHONPATH = "${userbase}/${python.sitePackages}:${pypkgs.setuptools}/${python.sitePackages}";
+    UV_PROJECT_ENVIRONMENT = "$REPL_HOME/.pythonlibs";
     # Even though it is set-default in the wrapper, add it to the
     # environment too, so that when someone wants to override it,
     # they can keep the defaults if they want to.

pkgs/upgrade-map/default.nix

@@ -12,7 +12,12 @@ let
     "bun-0.7" = "bun-1.0";
     "dart-3.0" = "dart-3.1";
     "dart-3.1" = "dart-3.2";
+    "dart-3.2" = "dart-3.3";
+    "dart-3.3" = "dart-3.4";
+    "dart-3.4" = "dart-3.5";
+    "elixir-1_16" = "elixir-1_17";
     "go" = "go-1.19";
+    "r-4.3" = "r-4.4";
     "rust" = "rust-1.69";
     "rust-1.69" = "rust-1.70";
     "rust-1.70" = "rust-1.72";

scripts/build_changed_modules.py

@@ -5,6 +5,7 @@
 import subprocess
 import argparse
 import re
+from textwrap import dedent
 
 nix_store_path_pattern = re.compile(r'/nix/store/([0-9a-z]+)')
 
@@ -46,7 +47,10 @@ def verify_no_existing_modules_removed(upstream_module_versions, current_module_
   upstream_modules = {version[0] for version in upstream_module_versions}
   modules = {version[0] for version in current_module_versions}
   diff = upstream_modules - modules
-  assert len(diff) == 0, "module(s) deleted: %r" % diff
+  assert len(diff) == 0, dedent(f"""\
+    module(s) deleted: {repr(diff)}
+      You may want to add new entries to ./pkgs/upgrade-map
+    """)
 
 def main():
   parser = argparse.ArgumentParser(

scripts/ci_check.sh

@@ -7,11 +7,14 @@ git grep writeShellScriptBin | grep -v "Please use writeShellApplication" && \
     (echo "Please use writeShellApplication instead of writeShellScriptBin" && \
          exit 1) || true
 
-NIX_FLAGS="--extra-experimental-features nix-command --extra-experimental-features flakes --extra-experimental-features discard-references"
+NIX_FLAGS=(
+    --extra-experimental-features nix-command
+    --extra-experimental-features flakes
+)
 
 echo "Evaluate modules derivations"
-nix eval $NIX_FLAGS .#modules --json
+nix eval "${NIX_FLAGS[@]}" .#modules --json
 
-nix develop $NIX_FLAGS
+nix develop "${NIX_FLAGS[@]}" --command echo Hello, world
 
-python scripts/build_changed_modules.py main
+nix-shell -p python312 --command 'python scripts/build_changed_modules.py main'