From 4eee53690d3e6759d999426ee3de983ae462e4d9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 28 Mar 2026 16:08:39 -0300
Subject: [PATCH] dotnet: combine binary and source release directories

---
 .../dotnet/{10_0_2xx => 10.0.2xx}/default.nix |  0
 .../dotnet/{10_0_2xx => 10.0.2xx}/deps.json   |  0
 .../{10_0_2xx => 10.0.2xx}/release-info.json  |  0
 .../{10_0_2xx => 10.0.2xx}/release.json       |  0
 .../dotnet/{10 => 10.0}/bootstrap-sdk.nix     |  0
 .../compilers/dotnet/{10 => 10.0}/default.nix |  0
 .../compilers/dotnet/{10 => 10.0}/deps.json   |  0
 .../dotnet/{10 => 10.0}/release-info.json     |  0
 .../dotnet/{10 => 10.0}/release.json          |  0
 .../{versions/10.0.nix => 10.0/releases.nix}  |  0
 .../dotnet/{11 => 11.0}/bootstrap-sdk.nix     |  0
 .../compilers/dotnet/{11 => 11.0}/default.nix |  0
 .../compilers/dotnet/{11 => 11.0}/deps.json   |  0
 .../dotnet/{11 => 11.0}/release-info.json     |  0
 .../dotnet/{11 => 11.0}/release.json          |  0
 .../{versions/11.0.nix => 11.0/releases.nix}  |  0
 .../{versions/6.0.nix => 6.0/releases.nix}    |  0
 .../{versions/7.0.nix => 7.0/releases.nix}    |  0
 .../dotnet/{8 => 8.0}/bootstrap-sdk.nix       |  0
 .../compilers/dotnet/{8 => 8.0}/default.nix   |  0
 .../compilers/dotnet/{8 => 8.0}/deps.json     |  0
 .../dotnet/{8 => 8.0}/release-info.json       |  0
 .../compilers/dotnet/{8 => 8.0}/release.json  |  0
 .../{versions/8.0.nix => 8.0/releases.nix}    |  0
 .../dotnet/{9 => 9.0}/bootstrap-sdk.nix       |  0
 .../compilers/dotnet/{9 => 9.0}/default.nix   |  0
 .../compilers/dotnet/{9 => 9.0}/deps.json     |  0
 .../dotnet/{9 => 9.0}/release-info.json       |  0
 .../compilers/dotnet/{9 => 9.0}/release.json  |  0
 .../{versions/9.0.nix => 9.0/releases.nix}    |  0
 pkgs/development/compilers/dotnet/default.nix | 23 +++++++++----------
 pkgs/development/compilers/dotnet/update.sh   |  2 +-
 32 files changed, 12 insertions(+), 13 deletions(-)
 rename pkgs/development/compilers/dotnet/{10_0_2xx => 10.0.2xx}/default.nix (100%)
 rename pkgs/development/compilers/dotnet/{10_0_2xx => 10.0.2xx}/deps.json (100%)
 rename pkgs/development/compilers/dotnet/{10_0_2xx => 10.0.2xx}/release-info.json (100%)
 rename pkgs/development/compilers/dotnet/{10_0_2xx => 10.0.2xx}/release.json (100%)
 rename pkgs/development/compilers/dotnet/{10 => 10.0}/bootstrap-sdk.nix (100%)
 rename pkgs/development/compilers/dotnet/{10 => 10.0}/default.nix (100%)
 rename pkgs/development/compilers/dotnet/{10 => 10.0}/deps.json (100%)
 rename pkgs/development/compilers/dotnet/{10 => 10.0}/release-info.json (100%)
 rename pkgs/development/compilers/dotnet/{10 => 10.0}/release.json (100%)
 rename pkgs/development/compilers/dotnet/{versions/10.0.nix => 10.0/releases.nix} (100%)
 rename pkgs/development/compilers/dotnet/{11 => 11.0}/bootstrap-sdk.nix (100%)
 rename pkgs/development/compilers/dotnet/{11 => 11.0}/default.nix (100%)
 rename pkgs/development/compilers/dotnet/{11 => 11.0}/deps.json (100%)
 rename pkgs/development/compilers/dotnet/{11 => 11.0}/release-info.json (100%)
 rename pkgs/development/compilers/dotnet/{11 => 11.0}/release.json (100%)
 rename pkgs/development/compilers/dotnet/{versions/11.0.nix => 11.0/releases.nix} (100%)
 rename pkgs/development/compilers/dotnet/{versions/6.0.nix => 6.0/releases.nix} (100%)
 rename pkgs/development/compilers/dotnet/{versions/7.0.nix => 7.0/releases.nix} (100%)
 rename pkgs/development/compilers/dotnet/{8 => 8.0}/bootstrap-sdk.nix (100%)
 rename pkgs/development/compilers/dotnet/{8 => 8.0}/default.nix (100%)
 rename pkgs/development/compilers/dotnet/{8 => 8.0}/deps.json (100%)
 rename pkgs/development/compilers/dotnet/{8 => 8.0}/release-info.json (100%)
 rename pkgs/development/compilers/dotnet/{8 => 8.0}/release.json (100%)
 rename pkgs/development/compilers/dotnet/{versions/8.0.nix => 8.0/releases.nix} (100%)
 rename pkgs/development/compilers/dotnet/{9 => 9.0}/bootstrap-sdk.nix (100%)
 rename pkgs/development/compilers/dotnet/{9 => 9.0}/default.nix (100%)
 rename pkgs/development/compilers/dotnet/{9 => 9.0}/deps.json (100%)
 rename pkgs/development/compilers/dotnet/{9 => 9.0}/release-info.json (100%)
 rename pkgs/development/compilers/dotnet/{9 => 9.0}/release.json (100%)
 rename pkgs/development/compilers/dotnet/{versions/9.0.nix => 9.0/releases.nix} (100%)

diff --git a/pkgs/development/compilers/dotnet/10_0_2xx/default.nix b/pkgs/development/compilers/dotnet/10.0.2xx/default.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/10_0_2xx/default.nix
rename to pkgs/development/compilers/dotnet/10.0.2xx/default.nix
diff --git a/pkgs/development/compilers/dotnet/10_0_2xx/deps.json b/pkgs/development/compilers/dotnet/10.0.2xx/deps.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10_0_2xx/deps.json
rename to pkgs/development/compilers/dotnet/10.0.2xx/deps.json
diff --git a/pkgs/development/compilers/dotnet/10_0_2xx/release-info.json b/pkgs/development/compilers/dotnet/10.0.2xx/release-info.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10_0_2xx/release-info.json
rename to pkgs/development/compilers/dotnet/10.0.2xx/release-info.json
diff --git a/pkgs/development/compilers/dotnet/10_0_2xx/release.json b/pkgs/development/compilers/dotnet/10.0.2xx/release.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10_0_2xx/release.json
rename to pkgs/development/compilers/dotnet/10.0.2xx/release.json
diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
rename to pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix
diff --git a/pkgs/development/compilers/dotnet/10/default.nix b/pkgs/development/compilers/dotnet/10.0/default.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/10/default.nix
rename to pkgs/development/compilers/dotnet/10.0/default.nix
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10.0/deps.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10/deps.json
rename to pkgs/development/compilers/dotnet/10.0/deps.json
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10.0/release-info.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10/release-info.json
rename to pkgs/development/compilers/dotnet/10.0/release-info.json
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10.0/release.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/10/release.json
rename to pkgs/development/compilers/dotnet/10.0/release.json
diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/10.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/10.0.nix
rename to pkgs/development/compilers/dotnet/10.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/11/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/11/bootstrap-sdk.nix
rename to pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix
diff --git a/pkgs/development/compilers/dotnet/11/default.nix b/pkgs/development/compilers/dotnet/11.0/default.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/11/default.nix
rename to pkgs/development/compilers/dotnet/11.0/default.nix
diff --git a/pkgs/development/compilers/dotnet/11/deps.json b/pkgs/development/compilers/dotnet/11.0/deps.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/11/deps.json
rename to pkgs/development/compilers/dotnet/11.0/deps.json
diff --git a/pkgs/development/compilers/dotnet/11/release-info.json b/pkgs/development/compilers/dotnet/11.0/release-info.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/11/release-info.json
rename to pkgs/development/compilers/dotnet/11.0/release-info.json
diff --git a/pkgs/development/compilers/dotnet/11/release.json b/pkgs/development/compilers/dotnet/11.0/release.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/11/release.json
rename to pkgs/development/compilers/dotnet/11.0/release.json
diff --git a/pkgs/development/compilers/dotnet/versions/11.0.nix b/pkgs/development/compilers/dotnet/11.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/11.0.nix
rename to pkgs/development/compilers/dotnet/11.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/6.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/6.0.nix
rename to pkgs/development/compilers/dotnet/6.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/7.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/7.0.nix
rename to pkgs/development/compilers/dotnet/7.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
rename to pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix
diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8.0/default.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/8/default.nix
rename to pkgs/development/compilers/dotnet/8.0/default.nix
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8.0/deps.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/8/deps.json
rename to pkgs/development/compilers/dotnet/8.0/deps.json
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8.0/release-info.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/8/release-info.json
rename to pkgs/development/compilers/dotnet/8.0/release-info.json
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8.0/release.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/8/release.json
rename to pkgs/development/compilers/dotnet/8.0/release.json
diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/8.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/8.0.nix
rename to pkgs/development/compilers/dotnet/8.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
rename to pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix
diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9.0/default.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/9/default.nix
rename to pkgs/development/compilers/dotnet/9.0/default.nix
diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9.0/deps.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/9/deps.json
rename to pkgs/development/compilers/dotnet/9.0/deps.json
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9.0/release-info.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/9/release-info.json
rename to pkgs/development/compilers/dotnet/9.0/release-info.json
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9.0/release.json
similarity index 100%
rename from pkgs/development/compilers/dotnet/9/release.json
rename to pkgs/development/compilers/dotnet/9.0/release.json
diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/9.0/releases.nix
similarity index 100%
rename from pkgs/development/compilers/dotnet/versions/9.0.nix
rename to pkgs/development/compilers/dotnet/9.0/releases.nix
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 1f1d89aefd9f..b700c3bb1ad8 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -33,15 +33,14 @@ let
             buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
           };
 
-        ## Files in versions/ are generated automatically by update.sh ##
         dotnet-bin = lib.mergeAttrsList (
           map buildDotnetSdk [
-            ./versions/6.0.nix
-            ./versions/7.0.nix
-            ./versions/8.0.nix
-            ./versions/9.0.nix
-            ./versions/10.0.nix
-            ./versions/11.0.nix
+            ./6.0/releases.nix
+            ./7.0/releases.nix
+            ./8.0/releases.nix
+            ./9.0/releases.nix
+            ./10.0/releases.nix
+            ./11.0/releases.nix
           ]
         );
 
@@ -92,11 +91,11 @@ let
         mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
         addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { };
 
-        dotnet_8 = lib.recurseIntoAttrs (callPackage ./8 { });
-        dotnet_9 = lib.recurseIntoAttrs (callPackage ./9 { });
-        dotnet_10 = lib.recurseIntoAttrs (callPackage ./10 { });
-        dotnet_10_0_2xx = lib.recurseIntoAttrs (callPackage ./10_0_2xx { });
-        dotnet_11 = lib.recurseIntoAttrs (callPackage ./11 { });
+        dotnet_8 = lib.recurseIntoAttrs (callPackage ./8.0 { });
+        dotnet_9 = lib.recurseIntoAttrs (callPackage ./9.0 { });
+        dotnet_10 = lib.recurseIntoAttrs (callPackage ./10.0 { });
+        dotnet_10_0_2xx = lib.recurseIntoAttrs (callPackage ./10.0.2xx { });
+        dotnet_11 = lib.recurseIntoAttrs (callPackage ./11.0 { });
       }
     );
   };
diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh
index 2be0a8843ba9..aff85a32ecad 100755
--- a/pkgs/development/compilers/dotnet/update.sh
+++ b/pkgs/development/compilers/dotnet/update.sh
@@ -266,7 +266,7 @@ update() {
         return 1
     fi
 
-    : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/versions/$sem_version.nix}
+    : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/$sem_version/releases.nix}
     echo "Generating $output"
 
     # Make sure the x.y version is properly passed to .NET release metadata url.