diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
index bf3df815af8a5..fb349679e5796 100644
--- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
@@ -5,6 +5,7 @@
   lib,
   substituteAll,
   nuget-to-nix,
+  nixfmt-rfc-style,
   cacert,
   fetchNupkg,
   callPackage,
@@ -67,6 +68,7 @@ attrs
             isExecutable = true;
             inherit cacert;
             nugetToNix = nuget-to-nix;
+            nixfmt = nixfmt-rfc-style;
           };
 
           defaultDepsFile =
diff --git a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
index af560b96fcd53..4ffba47836778 100644
--- a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
+++ b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
@@ -7,5 +7,7 @@ genericBuild
     @nugetToNix@/bin/nuget-to-nix "${NUGET_PACKAGES%/}"
 ) > deps.nix
 
+@nixfmt@/bin/nixfmt deps.nix
+
 mv deps.nix "$1"
 echo "Succesfully wrote lockfile to $1"
diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix
index dac80b14f84f8..ea0ca5ca0ad3d 100644
--- a/pkgs/by-name/sc/scarab/package.nix
+++ b/pkgs/by-name/sc/scarab/package.nix
@@ -31,6 +31,12 @@ buildDotnetModule rec {
       --replace-fail 'net6.0' 'net8.0'
   '';
 
+  preConfigureNuGet = ''
+    # This should really be in the upstream nuget.config
+    dotnet nuget add source https://api.nuget.org/v3/index.json \
+      -n nuget.org --configfile NuGet.Config
+  '';
+
   runtimeDeps = [
     bc
   ];
diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix
index d7310cd81994e..a660ac97f84a8 100644
--- a/pkgs/development/compilers/dotnet/8/default.nix
+++ b/pkgs/development/compilers/dotnet/8/default.nix
@@ -5,4 +5,5 @@
   releaseInfoFile = ./release-info.json;
   bootstrapSdkFile = ./bootstrap-sdk.nix;
   depsFile = ./deps.nix;
+  fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages;
 }
diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix
index 55cb65f495031..c641543ad521a 100644
--- a/pkgs/development/compilers/dotnet/9/default.nix
+++ b/pkgs/development/compilers/dotnet/9/default.nix
@@ -6,4 +6,5 @@
   bootstrapSdkFile = ./bootstrap-sdk.nix;
   allowPrerelease = true;
   depsFile = ./deps.nix;
+  fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages;
 }
diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix
index 2a61a5cb01ed9..cf5a0bca0782c 100644
--- a/pkgs/development/compilers/dotnet/dotnet.nix
+++ b/pkgs/development/compilers/dotnet/dotnet.nix
@@ -8,6 +8,7 @@
   bootstrapSdkFile,
   allowPrerelease ? false,
   depsFile,
+  fallbackTargetPackages,
   pkgsBuildHost,
   buildDotnetSdk,
 }:
@@ -25,6 +26,7 @@ let
       releaseManifestFile
       tarballHash
       depsFile
+      fallbackTargetPackages
       ;
     bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.unwrapped.overrideAttrs (old: {
       passthru = old.passthru or { } // {
diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index e8be69d1f0386..4e1000e4a9687 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -7,6 +7,7 @@
   nix,
   cacert,
   nuget-to-nix,
+  nixfmt-rfc-style,
   dotnetCorePackages,
   xmlstarlet,
   patchNupkgs,
@@ -16,6 +17,7 @@
   releaseManifestFile,
   tarballHash,
   depsFile,
+  fallbackTargetPackages,
   bootstrapSdk,
 }:
 
@@ -94,6 +96,7 @@ let
                   nix
                   cacert
                   nuget-to-nix
+                  nixfmt-rfc-style
                 ];
                 postPatch =
                   old.postPatch or ""
@@ -138,7 +141,10 @@ let
                 --arg list "[ ''${depsFiles[*]} ]" \
                 --argstr baseRid ${targetRid} \
                 --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \
-                ) > "${toString prebuiltPackages.sourceFile}"
+                ) > deps.nix
+              nixfmt deps.nix
+
+              mv deps.nix "${toString prebuiltPackages.sourceFile}"
               EOF
             '';
         };
diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix
index 729ff7866a759..6954fc6ca8c1a 100644
--- a/pkgs/development/compilers/dotnet/stage1.nix
+++ b/pkgs/development/compilers/dotnet/stage1.nix
@@ -7,6 +7,7 @@
   tarballHash,
   depsFile,
   bootstrapSdk,
+  fallbackTargetPackages,
 }@args:
 
 let
@@ -33,8 +34,7 @@ let
 
 in
 mkPackages {
-  inherit vmr;
-  fallbackTargetPackages = bootstrapSdk.targetPackages;
+  inherit vmr fallbackTargetPackages;
 }
 // {
   stage0 = lib.dontRecurseIntoAttrs stage0;
diff --git a/pkgs/development/tools/godot/3/mono/make-deps.nix b/pkgs/development/tools/godot/3/mono/make-deps.nix
index 553b125dc6356..b654576daced4 100644
--- a/pkgs/development/tools/godot/3/mono/make-deps.nix
+++ b/pkgs/development/tools/godot/3/mono/make-deps.nix
@@ -1,9 +1,9 @@
-{ godot3-mono, nuget-to-nix }:
+{ godot3-mono, nuget-to-nix, nixfmt-rfc-style }:
 
 godot3-mono.overrideAttrs (self: base: {
   pname = "godot3-mono-make-deps";
 
-  nativeBuildInputs = base.nativeBuildInputs ++ [ nuget-to-nix ];
+  nativeBuildInputs = base.nativeBuildInputs ++ [ nuget-to-nix nixfmt-rfc-style ];
 
   nugetDeps = null;
   nugetSource = null;
@@ -50,6 +50,7 @@ godot3-mono.overrideAttrs (self: base: {
       nugetRestore modules/mono/editor/GodotTools/GodotTools.sln
 
       nuget-to-nix nugetPackages > "$outdir"/deps.nix
+      nixfmt "$outdir"/deps.nix
     popd > /dev/null
   '';