From 8b1db5a869bfb14e186de3abf6315138559662ca Mon Sep 17 00:00:00 2001
From: masad-frost <faris@repl.it>
Date: Thu, 19 Mar 2026 15:41:58 -0700
Subject: [PATCH] Update nixpkgs-unstable for latest pnpm, pin removed packages
 to pkgs-25_05

Update the nixpkgs-unstable input to get the latest pnpm version.
Pin python310, python311, and replit-rtld-loader to pkgs-25_05 since
python310 was removed and python311's pip is broken (sphinx 9.1.0
incompatibility) in the latest unstable. Add dart-3.10 -> dart-3.11
upgrade mapping for the dart version bump.
---
 flake.lock                   |  8 ++++----
 flake.nix                    |  2 +-
 pkgs/modules/default.nix     | 12 ++++++------
 pkgs/upgrade-map/default.nix |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index d285dc6e..95b50221 100644
--- a/flake.lock
+++ b/flake.lock
@@ -184,11 +184,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768364046,
-        "narHash": "sha256-PDFfpswLiuG/DcadTBb7dEfO3jX1fcGlCD4ZKSkC0M8=",
+        "lastModified": 1773628058,
+        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ea30586ee015f37f38783006a9bc9e4aa64d7d61",
+        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
         "type": "github"
       },
       "original": {
@@ -302,7 +302,7 @@
     "replit-rtld-loader": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-25_05"
         ]
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index e4b0a2b3..e52a5c68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
   inputs.ztoc-rs.url = "github:replit/ztoc-rs";
   inputs.ztoc-rs.inputs.nixpkgs.follows = "nixpkgs";
   inputs.replit-rtld-loader.url = "github:replit/replit_rtld_loader";
-  inputs.replit-rtld-loader.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.replit-rtld-loader.inputs.nixpkgs.follows = "nixpkgs-25_05";
 
   outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, nixpkgs-25_05, nixpkgs-master, nixpkgs-staging, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }:
     let
diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix
index d9a08f13..e45f8732 100644
--- a/pkgs/modules/default.nix
+++ b/pkgs/modules/default.nix
@@ -30,20 +30,20 @@ let
       pypkgs = pkgs-24_11.python39Packages;
     })
     (import ./python {
-      python = pkgs.python310;
-      pypkgs = pkgs.python310Packages;
+      python = pkgs-25_05.python310;
+      pypkgs = pkgs-25_05.python310Packages;
     })
     (import ./python {
-      python = pkgs.python311;
-      pypkgs = pkgs.python311Packages;
+      python = pkgs-25_05.python311;
+      pypkgs = pkgs-25_05.python311Packages;
     })
     (import ./python {
       python = pkgs.python312;
       pypkgs = pkgs.python312Packages;
     })
     (import ./python-base {
-      python = pkgs.python311;
-      pypkgs = pkgs.python311Packages;
+      python = pkgs-25_05.python311;
+      pypkgs = pkgs-25_05.python311Packages;
     })
     (import ./python-base {
       python = pkgs.python312;
diff --git a/pkgs/upgrade-map/default.nix b/pkgs/upgrade-map/default.nix
index 445f6b40..fc51f61a 100644
--- a/pkgs/upgrade-map/default.nix
+++ b/pkgs/upgrade-map/default.nix
@@ -20,6 +20,7 @@ let
     "dart-3.4" = "dart-3.5";
     "dart-3.5" = "dart-3.8";
     "dart-3.8" = "dart-3.10";
+    "dart-3.10" = "dart-3.11";
     "elixir-1_16" = "elixir-1_17";
     "elixir-1_17" = "elixir-1_18";
     "go" = "go-1.19";