dotnet: 9.0.0-preview.6 -> 9.0.0-preview.7

NixOS · Aug 20, 2024 · 39db502 · 39db502
1 parent f5cb52f
commit 39db502
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 121 deletions.
diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-9MfRifCL91p9TWgIL5qlKxcn2Hgq4gY7cleQyRvx+Vw=",
-  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.6.24312.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-I0vw3uDV7xze3p/JutImAvoHw3pH74p+xahCdnEWTWM="
+  "tarballHash": "sha256-DOBRHD6WnvLoCCm9PwtWqfL5CHR8xK3bU3zHsgmuDAM=",
+  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.7.24380.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-G1gMBCUMO3BiluShVu4sjLc6nLE9V/taXwIIlSOqhJc="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.0-preview.6",
+  "release": "9.0.0-preview.7",
   "channel": "9.0",
-  "tag": "v9.0.0-preview.6.24327.7",
-  "sdkVersion": "9.0.100-preview.6.24328.1",
-  "runtimeVersion": "9.0.0-preview.6.24327.7",
-  "aspNetCoreVersion": "9.0.0-preview.6.24328.4",
+  "tag": "v9.0.0-preview.7.24405.7",
+  "sdkVersion": "9.0.100-preview.7.24407.1",
+  "runtimeVersion": "9.0.0-preview.7.24405.7",
+  "aspNetCoreVersion": "9.0.0-preview.7.24406.2",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "df2bf85c5dd6f3b834db7ee91d53c5d0b9469ca6"
+  "sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4"
 }
diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix
@@ -34,6 +34,7 @@ in writeShellScriptBin "patch-nupkgs" (''
       if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi
   }
   cd "$1"
+'' + lib.optionalString stdenv.isLinux ''
   for x in */* */*; do
     # .nupkg.metadata is written last, so we know the packages is complete
     [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \

diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
@@ -42,10 +42,9 @@ let
 
     nativeBuildInputs =
       old.nativeBuildInputs or []
-      ++ [ xmlstarlet ]
-      ++ lib.optional stdenv.isLinux patchNupkgs;
+      ++ [ xmlstarlet patchNupkgs ];
 
-    postPatch = old.postPatch or "" + lib.optionalString stdenv.isLinux ''
+    postPatch = old.postPatch or "" + ''
       xmlstarlet ed \
         --inplace \
         -s //Project -t elem -n Import \