diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix index 7ddd7a556d406..d825beea4ca32 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -4,12 +4,10 @@ nix, lib, replaceVarsWith, - nuget-to-nix, - nixfmt-rfc-style, - nuget-to-json, cacert, fetchNupkg, callPackage, + buildPackages, }: { @@ -88,11 +86,11 @@ attrs src = ./fetch-deps.sh; isExecutable = true; replacements = { - binPath = lib.makeBinPath [ + binPath = lib.makeBinPath (with buildPackages; [ nuget-to-nix nixfmt-rfc-style nuget-to-json - ]; + ]); }; }; @@ -108,7 +106,7 @@ attrs ''$(mktemp -t "${finalAttrs.pname or finalPackage.name}-deps-XXXXXX.nix")''; in - writeShellScript "${finalPackage.name}-fetch-deps" '' + buildPackages.writeShellScript "${finalPackage.name}-fetch-deps" '' set -euo pipefail echo 'fetching dependencies for' ${lib.escapeShellArg finalPackage.name} >&2 @@ -129,7 +127,7 @@ attrs cd "$TMPDIR" - NIX_BUILD_SHELL=${lib.escapeShellArg runtimeShell} ${nix}/bin/nix-shell \ + NIX_BUILD_SHELL=${lib.escapeShellArg buildPackages.runtimeShell} ${buildPackages.nix}/bin/nix-shell \ --pure --keep NUGET_HTTP_CACHE_PATH --run 'source '${lib.escapeShellArg innerScript}' '"''${depsFile@Q}" "${drv}" ''; }; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 418e21b36c704..b4628f11b223f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -94,7 +94,7 @@ let platforms = if args ? meta.platforms then - lib.intersectLists args.meta.platforms dotnet-sdk.meta.platforms + args.meta.platforms else dotnet-sdk.meta.platforms; @@ -174,7 +174,7 @@ let ++ (if (lib.length components) < 4 then lib.replicate (4 - (lib.length components)) "0" else [ ]) ); - makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ lib.optionals (!stdenvNoCC.hostPlatform.isWindows) [ "--prefix" "LD_LIBRARY_PATH" ":" diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index a30b1b19fef75..f3f2f57fbf8cb 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -1,12 +1,9 @@ { - lib, stdenv, + lib, which, coreutils, - zlib, - openssl, makeSetupHook, - zip, # Passed from ../default.nix dotnet-sdk, dotnet-runtime, @@ -14,16 +11,6 @@ { dotnetConfigureHook = makeSetupHook { name = "dotnet-configure-hook"; - substitutions = { - dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - stdenv.cc.libc - dotnet-sdk.passthru.icu - zlib - openssl - ]; - }; } ./dotnet-configure-hook.sh; dotnetBuildHook = makeSetupHook { @@ -36,19 +23,18 @@ dotnetInstallHook = makeSetupHook { name = "dotnet-install-hook"; - substitutions = { - inherit zip; - }; } ./dotnet-install-hook.sh; dotnetFixupHook = makeSetupHook { name = "dotnet-fixup-hook"; substitutions = { dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; - wrapperPath = lib.makeBinPath [ - which - coreutils - ]; + wrapperPath = lib.optionals (!stdenv.hostPlatform.isWindows) ( + lib.makeBinPath [ + which + coreutils + ] + ); }; } ./dotnet-fixup-hook.sh; } diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index 542f0af79f63c..17b72a3c75ae0 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -3,9 +3,6 @@ dotnetConfigureHook() { runHook preConfigure - local -r dynamicLinker=@dynamicLinker@ - local -r libPath=@libPath@ - if [[ -n $__structuredAttrs ]]; then local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix index 90bc6f842280b..737dbbfd1e274 100644 --- a/pkgs/build-support/dotnet/fetch-nupkg/default.nix +++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix @@ -8,6 +8,7 @@ nugetPackageHook, callPackage, overrides ? callPackage ./overrides.nix { }, + pkgsCross, }: lib.makeOverridable ( { @@ -81,6 +82,12 @@ lib.makeOverridable ( binaryBytecode binaryNativeCode ]; + + # TODO https://github.com/dotnet/runtime/issues/108905 + license = lib.optionals ( + lib.hasPrefix "Microsoft.NETCore.App.Runtime.win-" pname + || lib.hasPrefix "Microsoft.WindowsDesktop.App.Runtime." pname + ) pkgsCross.mingwW64.dotnet-runtime.meta.license; }; }; in diff --git a/pkgs/by-name/dn/dnspy/deps.json b/pkgs/by-name/dn/dnspy/deps.json new file mode 100644 index 0000000000000..db22c9a715329 --- /dev/null +++ b/pkgs/by-name/dn/dnspy/deps.json @@ -0,0 +1,377 @@ +[ + { + "pname": "dnlib", + "version": "4.4.0", + "hash": "sha256-x8Rha6NSDZFwHH5FcqY+lbkkpBLYlLYwBRU9JLKVD7o=" + }, + { + "pname": "Humanizer.Core", + "version": "2.14.1", + "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" + }, + { + "pname": "Iced", + "version": "1.21.0", + "hash": "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, + { + "pname": "Microsoft.CodeAnalysis", + "version": "4.10.0", + "hash": "sha256-Rj8ZR0bsD6gcwuRr3lrLw1uLwcoL/9vuAkqhOC+0x+0=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities", + "version": "3.3.0", + "hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.10.0", + "hash": "sha256-gtGxb7gPSOWVN2SS5CaHtZO+i6hvBbiXyA2AZ8dOKzY=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.10.0", + "hash": "sha256-HjKeyCBJ+tylS3EaF18Z99Qj2F0eJQvUZo/pYrBcfLI=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Features", + "version": "4.10.0", + "hash": "sha256-Kh5KuxYX9v9K7MsTJufx1R6Rl3ub863mkEP1LrNleMA=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", + "version": "4.10.0", + "hash": "sha256-/fU2kN+aEaNpxnrkuCqmldnYGfChhrmVtpX+yy3fF8s=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", + "version": "4.10.0", + "hash": "sha256-aV/9HDvmZiNzbLVadT2prMuFbVOs3iMbIc0uQpX+ymM=" + }, + { + "pname": "Microsoft.CodeAnalysis.Elfie", + "version": "1.0.0", + "hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg=" + }, + { + "pname": "Microsoft.CodeAnalysis.Features", + "version": "4.10.0", + "hash": "sha256-s7CLO4q0bH7f9kV0QKxPJ8fYUma7QrJvkDRlk7OGx9k=" + }, + { + "pname": "Microsoft.CodeAnalysis.Scripting.Common", + "version": "4.10.0", + "hash": "sha256-mvqF0kxxy3IVYx9zWYTDwl91szvytYxaqYUZ1aiCTUQ=" + }, + { + "pname": "Microsoft.CodeAnalysis.VisualBasic", + "version": "4.10.0", + "hash": "sha256-70YwwVdgGXlBi4CIxFILnMi2Vz7PibxP0ZgNZh2MLok=" + }, + { + "pname": "Microsoft.CodeAnalysis.VisualBasic.Features", + "version": "4.10.0", + "hash": "sha256-ULJ4PUzvINE5tcBwWycuK9h2Ti/sjajaQIcd1slJUxA=" + }, + { + "pname": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", + "version": "4.10.0", + "hash": "sha256-cAAtn1hgYy15zM1nC7PgK9T5Qy2KHMqS9NYIIRr5ZcI=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "4.10.0", + "hash": "sha256-5zaaeBacdeqgEv50mJ9g/YN2yhNKvErXyMZsU7coOUM=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim", + "version": "8.0.510501", + "hash": "sha256-g1QJZvNcCxdS/623XqwkJt3XseTC9sPwWfrQTOjNOxU=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-arm", + "version": "8.0.510501", + "hash": "sha256-Kl27aHMvI2Fyo9iT+SS8N0k+eexd+bf2GjIyxL+2vi4=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-arm64", + "version": "8.0.510501", + "hash": "sha256-2OymQoxpeId2w8YGvrQF+sK3etnl1jItdUv7woBksf4=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm", + "version": "8.0.510501", + "hash": "sha256-3AM+MxPRIeQeTQ3bSXzZ07LtjDTAv45u/6xKWN4INDc=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm64", + "version": "8.0.510501", + "hash": "sha256-ZBwBrOhRCXEBH0LROqq5pk+D+rSLHxNm+yVYONL4qzY=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-x64", + "version": "8.0.510501", + "hash": "sha256-LxkH4k+XKGELuVCwTAQ5Fg6RP0UibI2VAlkDg4/Pnpg=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.linux-x64", + "version": "8.0.510501", + "hash": "sha256-09e/9r22NdwLKrpXQ4KsUkNI2QRn+E9eKUlVVeynfwY=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.osx-arm64", + "version": "8.0.510501", + "hash": "sha256-MR5+zcf0e16SlNxd0HZ6bOYehUZU2lDK5lr1SJY/62g=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.osx-x64", + "version": "8.0.510501", + "hash": "sha256-Lpgn5rwjf+gH6A56Uf7KyUxTcFXg8YXO4zpAZ/Y46Pg=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.win-arm", + "version": "8.0.510501", + "hash": "sha256-d1sTw6L4rrOW0WulyoEKAkH+bLj6wqd1vsHivVdlbO0=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.win-arm64", + "version": "8.0.510501", + "hash": "sha256-jyhrx+x1jKUgNq0zgyte0f8gExiwjgqduj1fLppbaK4=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.win-x64", + "version": "8.0.510501", + "hash": "sha256-2G/AFIR5/P5NFGzYyC4eQNl+9FZnrbxGjVf0VkQn4FU=" + }, + { + "pname": "Microsoft.Diagnostics.DbgShim.win-x86", + "version": "8.0.510501", + "hash": "sha256-t+L9LbwakGnx625hVKunpiyX+jV1abcemP5vHiHGRO4=" + }, + { + "pname": "Microsoft.Diagnostics.Runtime", + "version": "1.1.142101", + "hash": "sha256-6diZT/XBSfF2lpZrmcxvqEm8jRb5uAomoXTFiuZiJc8=" + }, + { + "pname": "Microsoft.DiaSymReader", + "version": "2.0.0", + "hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw=" + }, + { + "pname": "Microsoft.VisualStudio.Composition", + "version": "17.10.37", + "hash": "sha256-Lq0XlMb7eqfMsu+NsptjCZReU3vRH5+JGvPU1VbuyEY=" + }, + { + "pname": "Microsoft.VisualStudio.Composition.Analyzers", + "version": "17.10.37", + "hash": "sha256-pckf7uZKhMSLxGHtrR2P3qdeNTtEDjAJGvagQ0Oocww=" + }, + { + "pname": "Microsoft.VisualStudio.CoreUtility", + "version": "15.5.27130", + "hash": "sha256-mb1Xz+Nc5L2DF/9dQDzExO6VhJbT17jCQMa1QGaLxbM=" + }, + { + "pname": "Microsoft.VisualStudio.Language.Intellisense", + "version": "15.5.27130", + "hash": "sha256-B50voQegMnPUXV4MZKjsQ1svPo+uwYLugtD60qQnO00=" + }, + { + "pname": "Microsoft.VisualStudio.Text.Data", + "version": "15.5.27130", + "hash": "sha256-p19pt6/oiOVcQUJ2vd7uav+ef4E/2L3s/XURCQ6sPNg=" + }, + { + "pname": "Microsoft.VisualStudio.Text.Logic", + "version": "15.5.27130", + "hash": "sha256-O9KvdkpX1ikP5fZKfFGL+fcUFm1qPXv+ZtmmtwmDxaE=" + }, + { + "pname": "Microsoft.VisualStudio.Text.UI", + "version": "15.5.27130", + "hash": "sha256-RNcSVzMflgsTSHBO2qrtymQdsQJ9/1KQ+Ze+qIVXyio=" + }, + { + "pname": "Microsoft.VisualStudio.Text.UI.Wpf", + "version": "15.5.27130", + "hash": "sha256-WxeN3vcQu3mUiB/hTuB1Pm49bUx+FZQ3b4kGKfgdUQE=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "17.8.8", + "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "NuGet.Common", + "version": "6.10.0", + "hash": "sha256-cM3Q7srAykk6KA/FThZkDjs+MIIjiUJSXZjRSqPNP1o=" + }, + { + "pname": "NuGet.Configuration", + "version": "6.10.0", + "hash": "sha256-H/qaaKbyp3oo/w2dBvaXEhG5+Tgcp75tJR1brpSdCqs=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.10.0", + "hash": "sha256-E88PUsK5J0b9c0sN+xNZU+X1MOCfJaIvByr1H4ZHLUM=" + }, + { + "pname": "Ookii.Dialogs.Wpf", + "version": "5.0.1", + "hash": "sha256-vwrvxeQ22nsFtex2gcGyhTi/XqZm2uIV1y/4PyvrdYk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.ComponentModel.Composition", + "version": "8.0.0", + "hash": "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo=" + }, + { + "pname": "System.Composition", + "version": "8.0.0", + "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg=" + }, + { + "pname": "System.Composition.AttributedModel", + "version": "8.0.0", + "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo=" + }, + { + "pname": "System.Composition.Convention", + "version": "8.0.0", + "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE=" + }, + { + "pname": "System.Composition.Hosting", + "version": "8.0.0", + "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0=" + }, + { + "pname": "System.Composition.Runtime", + "version": "8.0.0", + "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go=" + }, + { + "pname": "System.Composition.TypedParts", + "version": "8.0.0", + "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "8.0.0", + "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE=" + }, + { + "pname": "System.Data.DataSetExtensions", + "version": "4.5.0", + "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.0", + "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.4.0", + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.0", + "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + }, + { + "pname": "System.Threading.Channels", + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" + }, + { + "pname": "System.Threading.Tasks.Dataflow", + "version": "7.0.0", + "hash": "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + } +] diff --git a/pkgs/by-name/dn/dnspy/package.nix b/pkgs/by-name/dn/dnspy/package.nix new file mode 100644 index 0000000000000..a5885e71531eb --- /dev/null +++ b/pkgs/by-name/dn/dnspy/package.nix @@ -0,0 +1,87 @@ +{ + lib, + callPackage, + pkgsCross, + stdenvNoCC, + buildDotnetModule, + fetchFromGitHub, + fetchpatch, + dotnetCorePackages, + + is32Bit ? stdenvNoCC.hostPlatform.parsed.cpu.bits == 32, +}: +if (!stdenvNoCC.hostPlatform.isWindows) then + callPackage ./wrapper.nix { + inherit (if is32Bit then pkgsCross.mingw32 else pkgsCross.mingwW64) dnspy; + inherit is32Bit; + } +else + buildDotnetModule rec { + pname = "dnspy${lib.optionalString is32Bit "32"}"; + version = "6.5.1"; + + src = fetchFromGitHub { + owner = "dnSpyEx"; + repo = "dnSpy"; + rev = "v${version}"; + hash = "sha256-ttGQpwFLj7px1z+SZv1eelOkXA9bbG0F5nGUSNCsC6k="; + fetchSubmodules = true; + }; + + patches = [ + # Disable WPF hardware acceleration when running dnSpy under Wine + (fetchpatch { + url = "https://github.com/dnSpyEx/dnSpy/commit/f20c00583c15d91214dee7e97e4f680a48e891a5.patch"; + hash = "sha256-hpSXjm01ohePRmNopb0sm/KQM825gRm5kLznzauB81c="; + }) + + # Add Liberation Mono as monospace font fallback for Wine compatibility + (fetchpatch { + url = "https://github.com/dnSpyEx/dnSpy/commit/5ea1e361a457c7602832be2768655410294c930b.patch"; + hash = "sha256-FgDxqFlPPIWE91O4Ie6tIYIbD3O/U33i+3XtD1kB7is="; + }) + ]; + + projectFile = [ + "dnSpy/dnSpy/dnSpy.csproj" + "dnSpy/dnSpy.Console/dnSpy.Console.csproj" + + "Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy/dnSpy.Decompiler.ILSpy.csproj" + "Extensions/dnSpy.Analyzer/dnSpy.Analyzer.csproj" + "Extensions/dnSpy.AsmEditor/dnSpy.AsmEditor.csproj" + "Extensions/dnSpy.BamlDecompiler/dnSpy.BamlDecompiler.csproj" + "Extensions/dnSpy.Debugger/dnSpy.Debugger/dnSpy.Debugger.csproj" + "Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet/dnSpy.Debugger.DotNet.csproj" + "Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dnSpy.Debugger.DotNet.CorDebug.csproj" + "Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.Mono/dnSpy.Debugger.DotNet.Mono.csproj" + "Extensions/dnSpy.Scripting.Roslyn/dnSpy.Scripting.Roslyn.csproj" + ]; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = + with dotnetCorePackages; + combinePackages [ + runtime_8_0 + windowsdesktop_8_0 + ]; + + dotnetFlags = [ "-p:TargetFramework=net8.0-windows" ]; + + meta = { + description = ".NET debugger and assembly editor"; + homepage = "https://github.com/dnSpyEx/dnSpy"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + binaryNativeCode + ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ js6pak ]; + platforms = [ + "x86_64-windows" + "i686-windows" + ]; + mainProgram = "dnSpy.exe"; + }; + } diff --git a/pkgs/by-name/dn/dnspy/wrapper.nix b/pkgs/by-name/dn/dnspy/wrapper.nix new file mode 100644 index 0000000000000..30e0ea664c653 --- /dev/null +++ b/pkgs/by-name/dn/dnspy/wrapper.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPackages, + stdenvNoCC, + wineWow64Packages, + writeShellScript, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + nix-update, + + dnspy, + is32Bit ? false, + overrideWine ? wineWow64Packages.staging, +}: +let + wine = overrideWine; + + wrapper = writeShellScript "dnspy-wrapper" '' + export WINE="${lib.getExe wine}" + export WINEPREFIX="''${DNSPY_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/dnSpy"}/wine" + export WINEDEBUG=-all + + if [ ! -d "$WINEPREFIX" ]; then + mkdir -p "$WINEPREFIX" + ${lib.getExe' wine "wineboot"} -u + fi + + exec "$WINE" "''${ENTRYPOINT:-${lib.getExe dnspy}}" "$@" + ''; +in +stdenvNoCC.mkDerivation (finalAttrs: { + inherit (dnspy) pname version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + icon_name="dnSpy${lib.optionalString is32Bit "-x86"}" + ${lib.getExe' buildPackages.icoutils "icotool"} -x "${dnspy.src}/dnSpy/dnSpy/Images/$icon_name.ico" + for f in "$icon_name"_*.png; do + res=$(basename "$f" | cut -d "_" -f3 | cut -d "x" -f1-2) + install -vD "$f" "$out/share/icons/hicolor/$res/apps/$pname.png" + done + + install -vD "${wrapper}" "$out/bin/${finalAttrs.meta.mainProgram}" + + runHook postInstall + ''; + + desktopItems = makeDesktopItem { + name = finalAttrs.pname; + desktopName = "dnSpy" + (lib.optionalString is32Bit " (32-bit)"); + comment = finalAttrs.meta.description; + icon = dnspy.pname; + exec = finalAttrs.meta.mainProgram; + categories = [ "Development" ]; + }; + + passthru = { + unwrapped = dnspy; + + updateScript = writeShellScript "update-dnspy" '' + ${lib.getExe nix-update} "dnspy.unwrapped" + "$(nix-build -A "$UPDATE_NIX_ATTR_PATH.unwrapped.fetch-deps" --no-out-link)" + ''; + }; + + meta = dnspy.meta // { + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + mainProgram = "dnSpy" + (lib.optionalString is32Bit "32"); + }; +}) diff --git a/pkgs/by-name/dn/dnspy32/package.nix b/pkgs/by-name/dn/dnspy32/package.nix new file mode 100644 index 0000000000000..19469eb913c9f --- /dev/null +++ b/pkgs/by-name/dn/dnspy32/package.nix @@ -0,0 +1,9 @@ +{ + stdenv, + pkgsCross, + dnspy, +}: +if (stdenv.hostPlatform.isWindows) then + pkgsCross.mingw32.dnspy +else + dnspy.override { is32Bit = true; } diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh index 3948342a36fc9..11bb2a0bf5688 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh +++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh @@ -194,6 +194,31 @@ makeCWrapper() { [ -z "$uses_stdio" ] || printf '%s\n' "#include " [ -z "$uses_string" ] || printf '%s\n' "#include " [ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)" + printf '%s' ' +#ifdef _WIN32 +#include + +int setenv(const char *name, const char *value, int overwrite) { + if (!name || !*name || strchr(name, '\''='\'')) { + return -1; + } + + if (!overwrite && GetEnvironmentVariable(name, NULL, 0)) { + return 0; + } + + if (SetEnvironmentVariable(name, value) == 0) { + return -1; + } + + return 0; +} + +int unsetenv(const char *name) { + return setenv(name, NULL, 1); +} +#endif +' [ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)" [ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)" [ -z "$resolve_argv0" ] || printf '\n%s\n' "$(resolveArgv0Fn)" diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index 3ee645ad91f83..762b57ee37578 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -1,11 +1,24 @@ { + stdenv, targetPackages, lib, makeSetupHook, dieHook, writeShellScript, tests, - cc ? targetPackages.stdenv.cc, + cc ? + if (stdenv.targetPlatform.isMinGW) then + targetPackages.stdenv.cc.override (old: { + cc = old.cc.override { + threadsCross = { + # Disable threading on mingw so we don't have to ship mcfgthreads + model = "single"; + package = null; + }; + }; + }) + else + targetPackages.stdenv.cc, sanitizers ? [ ], }: diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix index aaa4241b8297d..6ea679ced9edb 100644 --- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "8.0.11"; hash = "sha512-0ow+3BClZm2xlEXC7g+vr7vxmBkXnNwxjCSqhxCcPqRHkXYNW1rdHmzrCLmGYRzGFxk7wktqOUkRV0ipgSQXOw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "8.0.11"; + hash = "sha512-lDjPBpLBE7v8HP8GzOvAI9VceGfKghbssPuIuzFuJiU+OZtYAY2JbAJqlkBSQ5YH6eBjcSbbLwnC/TmwyAYSpQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.11"; @@ -504,6 +510,11 @@ let version = "8.0.11"; hash = "sha512-Z1yy2Lm+mF/pNfun1zTI4WcWfkB5J80pRbRY+Bi3zpVcuTYARaCIqqYCcs+RSsdGZyIsyxY5GCVtNnnS/Mr2gw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "8.0.11"; + hash = "sha512-kLO7kbQ6GsBopfTgc2PeRB9xlb8G+19OFfop4T0Ag/4DX+k/rjuT5Hsbo4WfiOj0Lgy2DsV/N+HbIMfydPsctw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.11"; @@ -541,6 +552,11 @@ let version = "8.0.11"; hash = "sha512-VkSu/oOIMPemlIf5ARuFXmmndocYjub5ut3/5JXAz5sSBKrpeWciGnsUDnnshaWHP3jK4JCj3TBds7heldom3Q=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "8.0.11"; + hash = "sha512-5G+jWSlulRZlyFmfMpecNFc92hvmr8Kv5LPlAya57WaRNT8exBk7U69b3EOaB9ukXClfyxIO2dO3G8Fsmp0Txw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.11"; @@ -583,6 +599,11 @@ let version = "8.0.11"; hash = "sha512-OPIUdM0ZFxcAzoVqJIy1qr4X6Tc8jQw8J1rsjrUL5iR24YGPT1kcSyC78G4S5F7kIRykjg8bnMRgLxiJ2B3THA=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "8.0.11"; + hash = "sha512-zD2dKS+Kci3W+e406S8mXplOgovUQFx5URDFBgAJGXwctciWO9+Y2dkNcYy8ettcktFrt7KhwIMO5ADyUaf2yQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.11"; @@ -660,6 +681,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/2e82f0c0-2d31-4fdf-b289-ae4157be0304/c82a8ccd41f2aa7918c7f888df1a40e5/aspnetcore-runtime-8.0.11-osx-x64.tar.gz"; hash = "sha512-k+TxKd3fsVPyQYN1kmbQ0kohMefycjYbwF57G1UHHBxqLgN196ogQicSyFySJgfo4jRC65JB7nNgjS8gFcfcVA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/dad5eee5-7160-4e96-8e87-1513fab74b2e/d2505cc30d29e41cce896b83dd2bb5ea/aspnetcore-runtime-8.0.11-win-arm64.zip"; + hash = "sha512-HHNmSVZSwtiS507tgVQM0dR/cnC+y60AwB7foMlkeh9gx9pJSkk2wlF+rOGXvsfNsy2OtPFWrOqdZbtYcNJgHg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2aced1d1-b3b1-41f7-ac70-20afc83cb373/45c19e7e9126b5deca89cd8bf98ff744/aspnetcore-runtime-8.0.11-win-x64.zip"; + hash = "sha512-o/r829cuOjTGDIpgeiyOQSK++I2PL+pW16h1UlRq38ZGhluZoMr9jvlFsNuRjtGJrRCA6eX4RfEKJfqd9ZYchQ=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d0451d67-9e3d-4c39-9703-e5f0c276bbf5/dfbfa6f8523d701c9da006557cf524b9/aspnetcore-runtime-8.0.11-win-x86.zip"; + hash = "sha512-wDmc9bIXcD8RQvPUSinrRDYh9gOPob9gLDxmG1pVwT8Yp0+QpqvD0cHhtqQjKnq3ubsZun80VDhwl+mPebX90g=="; + }; + }; + }; + + windowsdesktop_8_0 = buildWindowsDesktop { + version = "8.0.11"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0c72c4b0-78b5-45fa-904b-857d7e029127/a3eba9f30f52dc318c1c8481370d7f26/windowsdesktop-runtime-8.0.11-win-arm64.zip"; + hash = "sha512-xSh0W0I0Xwoz26fPySJ7QeXCKzPj1HKuUC94IFnvIBLmzrhMchubVMS4RJQRoTo23JtTXpxKebxOiOI1Yl5h0Q=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b8c2c1ff-9e92-407a-b251-2b722f5cbf1e/55b497c10edf74c53154e41bb644067f/windowsdesktop-runtime-8.0.11-win-x64.zip"; + hash = "sha512-rmoyaxi6FzQjc2Yw2pDC9noU3BvyjhnnVxcgcL6+tjIYdWNUgy+1SJ5UpMAUW3pQszKL4ZzZwpjZkLdgk6hOoA=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/46b2e558-0b8a-4e77-b579-50d938b8a8fc/a5027367c5dbfc43485a57735479ab60/windowsdesktop-runtime-8.0.11-win-x86.zip"; + hash = "sha512-t4EwYNZyqT1yc/EeA7bekjqoU9SniGmTVxmbIz7/1/rygmEOKE1I6Vwf4VAaHzJ5YDU3JlxWyTjE1AGGrmf/jA=="; + }; }; }; @@ -698,6 +749,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/f32ae8ed-e8e3-4d1b-8425-852696e4dbe6/1f67d82ebd50b27574ccc4a06b2500b8/dotnet-runtime-8.0.11-osx-x64.tar.gz"; hash = "sha512-wtAIyscrGZnqka1UDARAKqjCxVuZKoUHadOczq61Y09vfwTR27ylG92eEvBF/uMVtla1hTC1etL2FIDsrcyj0w=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b250d28-7fae-473c-a064-c312c35ca7c8/bc1771d6d4b7dd9dbe6fbb417b9ef1e6/dotnet-runtime-8.0.11-win-arm64.zip"; + hash = "sha512-MKOMJXhwqRLLdmKmD1QUWRDFAlK3lAz0AHJlnfo2GDkdv+0KPhrEwRhD/OPta3axGktiZ6E0AdqpGSIm54QmkA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/92f9abc6-1e19-40cd-82cf-670be98d3533/46e1346503f4b54418bf9d5f861f1d43/dotnet-runtime-8.0.11-win-x64.zip"; + hash = "sha512-oO2SuP/rTvthqTw8t8HtZlKeI8vmC0TWIbSbHLkBWYZqPZIWMEhfwOKxZgsgAfc3Usb6b8ncpAFF70VJ3Sahqw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/34670006-7e69-4750-9012-cf1e15bc83d1/c4c887089dbea784726b26facaae336a/dotnet-runtime-8.0.11-win-x86.zip"; + hash = "sha512-y4CkHqZNsX8swhOQ/v6sc0LpZfuju292jFH9z3Jx+9E5nqrzPsEWK8IG5HvI0pbSjdrSE5yKdw0C5i+pCvSaMg=="; + }; }; }; @@ -736,10 +799,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/2c694b43-e8e5-49b4-a26b-a8d1850d8974/aacd6da4f057a37d12074b076368eda6/dotnet-sdk-8.0.111-osx-x64.tar.gz"; hash = "sha512-QZ8qZeVxRTexhWkcmnFSq9Tl+F9uWAZghuPzQepPFuD1ZL/cZM3B54djqMO4crds7CXL93/PZl19dIGcYf3Jag=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4138ebc4-818c-4b58-b806-e42930a20cce/808bde0fe22f1493b83159caa9ad608b/dotnet-sdk-8.0.111-win-arm64.zip"; + hash = "sha512-DafS7nUK2Off++tqo6nsVvYCpgGtyxzlDfDWXZCM3HyMD/CAa//QY3mfUGSxEwe/f0MuhsoDUiODGkpdwgOVjQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/dcfc3c77-4551-43e1-9ac7-b788f7e9a346/337687756beae1da6ce1bac1a38981c5/dotnet-sdk-8.0.111-win-x64.zip"; + hash = "sha512-roelhQ3LWUmpVL8ywT3tpENyXOhTujJfMBJ6T2//Hs1+uhMsSpZPVy6TTY5riXq8qBJgE06wavN0ogkU6dbAnA=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e35b9d05-a2af-4cfc-b67e-785912a3e05f/dd7f41e3ac9bc224e4dfeb44c3d2e753/dotnet-sdk-8.0.111-win-x86.zip"; + hash = "sha512-YGQBdOpYPeNhMF9J/OUoNnSgFpCRt2Fj/F+1omuv5Ef2I/DXkN9TdYWNC+xDEgo7CoHRebsdWz55TFG/AjRr9w=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_8_0; aspnetcore = aspnetcore_8_0; + windowsdesktop = windowsdesktop_8_0; }; sdk = sdk_8_0; diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix index 76a9dfc9dbc90..77fa2269033b9 100644 --- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "9.0.0"; hash = "sha512-Gw0hOfzWemlJgdGucGfWdU0H7kFmE57x1lFLNJddRzbGi6r5Dv4T9+ySMXHj5MEU09iBRUig6rxsGu0XDsB1ZQ=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "9.0.0"; + hash = "sha512-syb1sET0yJjURRX4nla506UzGVtVttxKn1vOxlvygCPui0fiF7i34r1u0sl3B4k9Z6Yog93E9GWZOIq2OnCtKA=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0"; @@ -339,6 +345,11 @@ let version = "9.0.0"; hash = "sha512-APQNj5uwHVbZ28Zvrx7CLEciJrNMTHOh78lvSNp/gpXgHkD4G5yoQSC7sj/B0AqSshrDs006WaCbp3PuTrKIqw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "9.0.0"; + hash = "sha512-bJcj+A9snPbI2Em76N9K7+B5zdphEUA0s77x+EbEvdeEuACVV6c5w+Roiq5OYxf0WQ47uRcUQzepTXBXcPc8Ug=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0"; @@ -361,6 +372,11 @@ let version = "9.0.0"; hash = "sha512-BSXo3XZLsboJN72at4TMCxsZL5vjW5p3dMVtqedpXkmovGakcW0loYY22aCt40JC18i6QbsqzII+/jtTFqRoJg=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "9.0.0"; + hash = "sha512-3cTYFs/jk4zasZfO+cxcpOFHMC8NG+ofh2fPfrtKLZjZqnppRpPehKI5Mv5Fr2a4g5SJFC0pWUpj0rba8EjRpw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0"; @@ -383,6 +399,11 @@ let version = "9.0.0"; hash = "sha512-eG/2FruILBj/2d1Viu/9gbYuwXIHGL61UKvvRCUGWIgS72E8LQgqSntuGO83LOk+aLUHVn5cXrFkb4bVTCGB7w=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "9.0.0"; + hash = "sha512-8xmGRbuTzMuQr+Gd1qST686O13+30DOOPrUS4mf3B3sEwDL6JSvZSC5KF0KvyFZwYBnYcwJgYl3AwkXO/4xrzg=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0"; @@ -440,6 +461,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/b3d48d74-e9f8-4b6c-9ef7-6f5729873f21/2139bfd7650c0fd8ddce3195ada43ae8/aspnetcore-runtime-9.0.0-osx-x64.tar.gz"; hash = "sha512-6neKeqfuzSxGw4sYcRngr9sCUydDVQpL28VqkSXjKKCJwWr3TD/+ZJJj9FbvJvX8O5MvTR9202pHy0GfIDxlhw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/38471b06-b719-4d02-a866-cd31eadb2d61/11b17d533d2feac0ae65f1a1be13de2f/aspnetcore-runtime-9.0.0-win-arm64.zip"; + hash = "sha512-ZVCr/HoAxQ3JBROjrIQrbfOVudIgTsuCaP3/GM1VXHHKSQtowSbB8tTK9FGeqpE+wM5WATiNPGwiFGOqiiBKSg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6f43674a-fedb-414d-a709-6cd21f295ed3/6d041dd6f1812d804994a7c6c45a23bf/aspnetcore-runtime-9.0.0-win-x64.zip"; + hash = "sha512-nEj4sF+iR2sK/UmD54mqvC6pUQVcYXx+uWF9+S2gEkKHTAyokieUzObWN5n7h1QOx1YOCSb3j/1t73P4r+UI5A=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c1c22ca6-181e-4f44-ad83-5f2664694529/81c3cead48ad0e5aeeee2a83db0a64db/aspnetcore-runtime-9.0.0-win-x86.zip"; + hash = "sha512-wblmVCaZkyo7855IwZqXtdbxUTeC/I08lMXWyHXM8ZlEu4BzdlcOpIXdfwTjZAw0RLqozUSaKvQ9W7oi8KD1Dg=="; + }; + }; + }; + + windowsdesktop_9_0 = buildWindowsDesktop { + version = "9.0.0"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/097ced3a-0b77-4867-b9ff-226d0e4a0a3d/4f21dfcbf0da3e1b127b1eb751c96098/windowsdesktop-runtime-9.0.0-win-arm64.zip"; + hash = "sha512-sCd/5A79lhxoU92G3NVfWVjmxYj92XOdaQkHiY9E7bzmFx1DKT5heSr4F+vk2r8k6AIXQ9Uq5u5D+YAQ9NO5Ww=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d3c1e69d-79e4-4f08-a13a-75c9c36706b9/773a05ecaad2432302fc66f2dad032c2/windowsdesktop-runtime-9.0.0-win-x64.zip"; + hash = "sha512-scSknTPOuu46vOxE0VG6SXhKXyIdqro/wWJJOG+9KFqXvdKRJNwpC1YVBxofRb6bsP2MFzYm3iCgt9LjmYgNEw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4da91bba-fe5a-46e6-b61f-3ff20b0cdb4e/c3e0ae8478071f337668d19bf4c22370/windowsdesktop-runtime-9.0.0-win-x86.zip"; + hash = "sha512-wRu/p7zB3ZsWXIAuumM9yAFa1fOBMLhdGwwb/phUarcybQC5gAiuMkwZvYusqUgm3y7Eg/yH2XZ0nFja021FjQ=="; + }; }; }; @@ -478,6 +529,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/4be484a1-a095-48cf-8407-cae1d3dcc944/9f373dc1d85022e004df3ac1071ace59/dotnet-runtime-9.0.0-osx-x64.tar.gz"; hash = "sha512-Hr1ql6t0T+dSBoY51naxRZYNggUBx5J1FARQfo2CzZJo1+I5xDf53nOwgUHDtpO7JO6zzzuvMOO/M7Rgu5XUsA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cfecd946-5932-496c-a2b6-ba3c99318f24/4a5b2d8e244b4db3db110ff5751ed35b/dotnet-runtime-9.0.0-win-arm64.zip"; + hash = "sha512-TzMEk5c0HoMC/QHs4EP90ZNafb11AH7Fc5zl61wgXKxLwTmVUJB/cfLkshjkApeom/XWBYgvVUTE3uw3+bDQJg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fed1ee33-4574-4d89-85b5-3b8d7762b56a/432725cb9d6d235424768defea5ce6ee/dotnet-runtime-9.0.0-win-x64.zip"; + hash = "sha512-I65s40/hJxpaSGdanLftcor0vkAUp+5KamCoT8I+VbUKXK/X7CAZe9c+5HkB5COeDEzY/Q9d7rNMw9od45YORg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/73b2d717-c521-47cf-857e-e353f05f3b83/db5484cdaef7f85c94b484fbeb42299d/dotnet-runtime-9.0.0-win-x86.zip"; + hash = "sha512-3DReZBdKm+xL+cJ9aoDJRq7DpBinrELi7Zwgc3wBTLCx28470z62zOIR6/YN3LDhPh1gBRAX5MDBG9arT9ocgA=="; + }; }; }; @@ -516,10 +579,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz"; hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b0e6d09-25eb-4e69-a3d7-9da8f20b939a/8b1bec15740a22f5a255d2570376c802/dotnet-sdk-9.0.101-win-arm64.zip"; + hash = "sha512-oU/sZ4bChSN5X5jAdMqNqXKGATTjVJ9b4gwb9BoLi5RvPqElEZbDVtTYaVkaMzIDQB0IMjup5Jj+jmpb3h4wEQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/43fd03f0-72f4-43a9-9f33-15933d232447/d8576131aa13a6eda440cf7217ad2add/dotnet-sdk-9.0.101-win-x64.zip"; + hash = "sha512-U/Fr4gee2F0jCmyY+pIgBGkwyg6q8fkotjz66f2aClrYfGDAeDPuFt7fpYLOXZrmi1tCkq7Fb9RCA/6ee8+6kg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5a5fc9a9-c8b4-43d5-8314-0f757968f1a2/c355d463e19e329572d04514a8116188/dotnet-sdk-9.0.101-win-x86.zip"; + hash = "sha512-wEp8JgHS0hZ48vmDOXO/m2hxVlIARPE9cJLHczH24p/K2AhEPWABrsH3YjOZDlI66vNRawCEYDqEjak08+eNbQ=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_9_0; aspnetcore = aspnetcore_9_0; + windowsdesktop = windowsdesktop_9_0; }; sdk = sdk_9_0; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 5a7418709aec2..429e8d3d679fe 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -7,10 +7,12 @@ targetPackages ? null, runtime ? null, aspnetcore ? null, + windowsdesktop ? null, }: assert builtins.elem type [ "aspnetcore" + "windowsdesktop" "runtime" "sdk" ]; @@ -29,6 +31,7 @@ assert stdenv, fetchurl, writeText, + unzip, autoPatchelfHook, makeWrapper, libunwind, @@ -52,6 +55,8 @@ let pname = if type == "aspnetcore" then "aspnetcore-runtime" + else if type == "windowsdesktop" then + "dotnet-windowsdesktop-runtime" else if type == "runtime" then "dotnet-runtime" else @@ -59,6 +64,7 @@ let descriptions = { aspnetcore = "ASP.NET Core Runtime ${version}"; + windowsdesktop = ".NET Desktop Runtime ${version}"; runtime = ".NET Runtime ${version}"; sdk = ".NET SDK ${version}"; }; @@ -105,21 +111,23 @@ mkWrapper type ( nativeBuildInputs = [ makeWrapper + xmlstarlet ] + ++ lib.optional stdenv.hostPlatform.isWindows unzip ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ - xmlstarlet sigtool ]; - buildInputs = [ - stdenv.cc.cc - zlib - icu - libkrb5 - curl - xmlstarlet - ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; + buildInputs = + lib.optionals (!stdenv.hostPlatform.isWindows) [ + stdenv.cc.cc + zlib + icu + libkrb5 + curl + ] + ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}") @@ -147,21 +155,29 @@ mkWrapper type ( dontPatchELF = true; noDumpEnvVars = true; - installPhase = '' - runHook preInstall + installPhase = + if type == "windowsdesktop" then + '' + # windowsdesktop runtime is special (likely by accident) that it only has the single shared framework, it doesn't have the dotnet muxer binary + mkdir -p $out/share/dotnet + cp -r ./ $out/share/dotnet + '' + else + '' + runHook preInstall - mkdir -p $out/share/doc/$pname/$version - mv LICENSE.txt $out/share/doc/$pname/$version/ - mv ThirdPartyNotices.txt $out/share/doc/$pname/$version/ + mkdir -p $out/share/doc/$pname/$version + mv LICENSE.txt $out/share/doc/$pname/$version/ + mv ThirdPartyNotices.txt $out/share/doc/$pname/$version/ - mkdir -p $out/share/dotnet - cp -r ./ $out/share/dotnet + mkdir -p $out/share/dotnet + cp -r ./ $out/share/dotnet - mkdir -p $out/bin - ln -s $out/share/dotnet/dotnet $out/bin/dotnet + mkdir -p $out/bin + ln -s $out/share/dotnet/dotnet $out/bin/dotnet - runHook postInstall - ''; + runHook postInstall + ''; # Tell autoPatchelf about runtime dependencies. # (postFixup phase is run before autoPatchelfHook.) @@ -205,7 +221,7 @@ mkWrapper type ( commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid} ); targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages; - inherit runtime aspnetcore; + inherit runtime aspnetcore windowsdesktop; updateScript = let @@ -221,13 +237,25 @@ mkWrapper type ( meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; - license = licenses.mit; + license = + if stdenv.hostPlatform.isWindows then + { + # TODO wait for https://github.com/dotnet/runtime/issues/108905 to be resolved + free = false; + url = "https://github.com/dotnet/core/blob/main/license-information-windows.md"; + + # TODO both .NET Library License and Windows SDK License have a lot of restrictions on redistribution + # eg "use the Distributable Code in your applications and not as a standalone distribution" + # so I guess no redistributable = true? + } + else + licenses.mit; maintainers = with maintainers; [ kuznero mdarocha corngood ]; - mainProgram = "dotnet"; + mainProgram = "dotnet${stdenv.hostPlatform.extensions.executable}"; platforms = lib.filter ( platform: let diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 4c9e868dc4f5d..fb9a13f22946f 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,7 +1,6 @@ dotnetPackages: { buildEnv, - makeWrapper, lib, symlinkJoin, callPackage, @@ -32,14 +31,13 @@ mkWrapper "sdk" (buildEnv { "templates" ]; ignoreCollisions = true; - nativeBuildInputs = [ makeWrapper ]; postBuild = '' mkdir -p "$out"/share/dotnet - cp "${cli}"/share/dotnet/dotnet $out/share/dotnet + cp "${cli}"/share/dotnet/${cli.meta.mainProgram} $out/share/dotnet cp -R "${cli}"/nix-support "$out"/ mkdir "$out"/bin - ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet + ln -s "$out"/share/dotnet/${cli.meta.mainProgram} "$out"/bin/${cli.meta.mainProgram} '' + lib.optionalString (cli ? man) '' ln -s ${cli.man} $man diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 2d246642b8f6c..22470901f4761 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -29,6 +29,7 @@ let import version { inherit fetchNupkg; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildWindowsDesktop = attrs: buildDotnet (attrs // { type = "windowsdesktop"; }); buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); }; diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.nix b/pkgs/development/compilers/dotnet/nuget-package-hook.nix index 1d00e1d781a1a..22e4e89528184 100644 --- a/pkgs/development/compilers/dotnet/nuget-package-hook.nix +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.nix @@ -1,14 +1,11 @@ { makeSetupHook, - unzip, - zip, - xmlstarlet, - strip-nondeterminism, + buildPackages, }: makeSetupHook { name = "nuget-package-hook"; substitutions = { - inherit unzip zip xmlstarlet; - stripNondeterminism = strip-nondeterminism; + inherit (buildPackages) unzip zip xmlstarlet; + stripNondeterminism = buildPackages.strip-nondeterminism; }; } ./nuget-package-hook.sh diff --git a/pkgs/development/compilers/dotnet/sign-apphost.proj b/pkgs/development/compilers/dotnet/sign-apphost.proj index e401739bdd70a..e2672bf61b8f7 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.proj +++ b/pkgs/development/compilers/dotnet/sign-apphost.proj @@ -1,11 +1,11 @@ - + - + - + diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix index 04e0d5215098f..e45b36092866d 100644 --- a/pkgs/development/compilers/dotnet/sigtool.nix +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,5 +1,5 @@ { - cctools, + buildPackages, darwin, fetchFromGitHub, makeWrapper, @@ -24,6 +24,6 @@ darwin.sigtool.overrideAttrs (old: { + '' wrapProgram $out/bin/codesign \ --set-default CODESIGN_ALLOCATE \ - "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + "${buildPackages.cctools}/bin/${buildPackages.cctools.targetPrefix}codesign_allocate" ''; }) diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 415efcd13598e..97a3865973489 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -17,7 +17,7 @@ release_files () { local release="$1" local expr="$2" - jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -r '[('"$expr"').files[] | select(.name | (endswith(".tar.gz") or endswith(".zip")))]' <<< "$release" } release_platform_attr () { @@ -138,6 +138,25 @@ aspnetcore_target_packages () { generate_package_list "$version" ' ' "${pkgs[@]}" } +windowsdesktop_packages () { + local version=$1 + local pkgs=( + Microsoft.WindowsDesktop.App.Ref + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +windowsdesktop_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.WindowsDesktop.App.Runtime.$rid" + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + netcore_packages () { local version=$1 local pkgs=( @@ -265,11 +284,12 @@ update() { fi local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version + local release_content aspnetcore_version windowsdesktop_version runtime_version local -a sdk_versions release_content=$(release "$content" "$major_minor_patch") aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + windowsdesktop_version=$(jq -r '."windowsdesktop".version' <<< "$release_content") runtime_version=$(jq -r '.runtime.version' <<< "$release_content") if [[ -n $sdk ]]; then @@ -284,43 +304,51 @@ update() { local -a versions IFS= readarray -d '' versions < <( nix-instantiate --eval --json -E "{ output }: with (import output { - buildAspNetCore = { ... }: {}; + buildAspNetCore = { version, ... }: { inherit version; }; + buildWindowsDesktop = { version, ... }: { inherit version; }; buildNetSdk = { version, ... }: { inherit version; }; buildNetRuntime = { version, ... }: { inherit version; }; fetchNupkg = { ... }: {}; }); (x: builtins.deepSeq x x) [ + release_${major_minor_underscore} runtime_${major_minor_underscore}.version + aspnetcore_${major_minor_underscore}.version + windowsdesktop_${major_minor_underscore}.version sdk_${major_minor_underscore}.version ]" --argstr output "$output" | jq --raw-output0 .[]) - if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then + # TODO we should check all SDK feature bands here, not just the latest + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "$runtime_version" && "${versions[2]}" == "$aspnetcore_version" && "${versions[3]}" == "$windowsdesktop_version" && "${versions[4]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return fi fi - local aspnetcore_files runtime_files + local aspnetcore_files windowsdesktop_files runtime_files aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + windowsdesktop_files="$(release_files "$release_content" .\"windowsdesktop\")" runtime_files="$(release_files "$release_content" .runtime)" local channel_version support_phase channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") - local aspnetcore_sources runtime_sources + local aspnetcore_sources windowsdesktop_sources runtime_sources aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + windowsdesktop_sources="$(platform_sources "$windowsdesktop_files")" runtime_sources="$(platform_sources "$runtime_files")" result=$(mktemp -t dotnet-XXXXXX.nix) trap "rm -f $result" TERM INT EXIT ( - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + echo "{ buildAspNetCore, buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let commonPackages = [" aspnetcore_packages "${aspnetcore_version}" + windowsdesktop_packages "${windowsdesktop_version}" netcore_packages "${runtime_version}" echo " ]; @@ -336,6 +364,9 @@ let for rid in "${rids[@]}"; do echo " $rid = [" aspnetcore_target_packages "${aspnetcore_version}" "$rid" + if [[ "$rid" = win-* ]]; then + windowsdesktop_target_packages "${windowsdesktop_version}" "$rid" + fi netcore_target_packages "${runtime_version}" "$rid" echo " ];" done @@ -349,6 +380,11 @@ in rec { $aspnetcore_sources }; + windowsdesktop_$major_minor_underscore = buildWindowsDesktop { + version = \"${windowsdesktop_version}\"; + $windowsdesktop_sources + }; + runtime_$major_minor_underscore = buildNetRuntime { version = \"${runtime_version}\"; $runtime_sources @@ -376,6 +412,7 @@ in rec { inherit commonPackages hostPackages targetPackages; runtime = runtime_$major_minor_underscore; aspnetcore = aspnetcore_$major_minor_underscore; + windowsdesktop = windowsdesktop_$major_minor_underscore; };" done diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 43a3d7782fe06..92d32327a3d82 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "6.0.36"; hash = "sha512-7hUCPQ2cFc920o+IO1kkTolILrJ1ozLiH1ppUQVFxSQ94z2A8t41KCxUOYxEHwoaDqKWJ0LKjDMSGuU113DVzA=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "6.0.36"; + hash = "sha512-0JRZrVwwDsYQbue5o0tO10sfzjO7UGAjFPTRcKT/QzyPDljnGeiATrADhPoeNCi6tsmEpafmlEIkJiH+SbKMyQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.36"; @@ -454,6 +460,11 @@ let version = "6.0.36"; hash = "sha512-oqI1Ilt03mR/4Y4VDNMeYkr5hP3YafBi0h6piSLMXPTCaOgkMHsU6xSpJW5CMTwOCEwREfMZxr22g/meL0uJmg=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "6.0.36"; + hash = "sha512-+Gokybbp6YExCOIPClS5iK9ogzvNrvQHiRmh+q0IsETjIq9DwtG+E78MxxhYRKzKRK8uCFbvERpVttNfEbFm2Q=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.36"; @@ -491,6 +502,11 @@ let version = "6.0.36"; hash = "sha512-XS0rzgotxL8fojceQ7zeYlmVRqSqRuP3SMJymXpIS45R8dnlpEooDfjjWRMAvyWkscmAmXQRI4f/UItGsTND5g=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "6.0.36"; + hash = "sha512-hHNGpJc4CFbExEdy22WRxvBLmXfTeDAPi2voKp17MbQWvC+qI77Icrf3ijDhlt1//1uPexFwEDli7PlA6vnCfQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.36"; @@ -533,6 +549,11 @@ let version = "6.0.36"; hash = "sha512-YKC7Jv9kh1dVCQkIGfEX4ZVk/DC+6l/X5dtWP2EFDaIJsjVZm9g+BZxL2YuD9rpuKFHevJDqliDtAq95SQxE7A=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "6.0.36"; + hash = "sha512-Nvb3OtaLQQaWMr55G9bMnKUFDBqTJSiBv/4iiVBoErAzFQNgV9azkmji4Id30099/vQH+wUS4XvyXWSxWmS7xQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.36"; @@ -610,6 +631,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/daee4540-b60b-478e-8ffc-37c8798ed6bb/85267ac81195d92e6f1045e84e8a3baa/aspnetcore-runtime-6.0.36-osx-x64.tar.gz"; hash = "sha512-ijtzt1xboD7gJZIWOYJ4Bblbbl5ckgxUT5Z2m8BONvS1xIB7QP7AwdbRqCka+vb14a5ejaiR1a2R+O5IQe+Pgw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f96d692b-fec8-4dfd-8f8c-7721e070469d/7c58650eb778b957c21e9520360ba88b/aspnetcore-runtime-6.0.36-win-arm64.zip"; + hash = "sha512-Stci8SsF5PPldwVxhti0PLQHN64iRlkL7FVDTKQnBKRoIru0pXpyRq1jSpzyiC6Z3W+QnR58vQxrvMO/zr+uGQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7887ade5-0f62-4bed-9d5c-f0e3b109b709/33fb9df0a230e8b3c74394580de26b2b/aspnetcore-runtime-6.0.36-win-x64.zip"; + hash = "sha512-nkO3Cq9qcGiUaCql4NFR1rYOldxpWu/GjNv7hQ3Hes31u2Q4HErMA+mCQEEghwk84m6U5vHDj/AGcOMcH77Qmg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9bea7e5e-e799-45cc-90b6-fdff513d0833/f4048b2a72b59e145b97ed7a363366c7/aspnetcore-runtime-6.0.36-win-x86.zip"; + hash = "sha512-lUeFw2048ZlPyW/to0iJlqxs2HQxmn1BR3KWThICgxOgOwQ1DX3gU/Uk06Ur/EFGwYxsirSAZ8QH52YT3HpY2g=="; + }; + }; + }; + + windowsdesktop_6_0 = buildWindowsDesktop { + version = "6.0.36"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/611e596c-63ca-47ad-9868-f9447a229e40/59f71489d995dbc966febdc9e3f74144/windowsdesktop-runtime-6.0.36-win-arm64.zip"; + hash = "sha512-ETcH9hfh6qWU8C9x8U/s3fGjEn+0dmzpRUY4+1Exg2rOBzBczgMdEbMcAa8DlFRjeSaFIZEoY7jgyvvUHWCJsg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c9af87fe-bd4f-4079-8dc0-a3ee8656a0a8/61ab5ad679746692abfce7719ae150e3/windowsdesktop-runtime-6.0.36-win-x64.zip"; + hash = "sha512-zuiP7wdkPc6z006nG2TuroW4455wQrxNNbw6Hx3yk3NoHcSOMcAcn1k+xBJpn2ditvxYF0Myg8id81onzoiFvw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0aeb9647-4143-48b4-8d8c-3f85381401ee/7ecf1430c34229d9765b33dc72bc82e4/windowsdesktop-runtime-6.0.36-win-x86.zip"; + hash = "sha512-wTfebhl2CTaYb+4CdpbIJOkEtAlNX8iCoiWTgZyNCHFVl9iQBN2XBCuOieTknrEFLF15ywAC8PX9BX8ZhobQyQ=="; + }; }; }; @@ -648,6 +699,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/4aab6108-c6f0-4b7a-b1b0-37f6b0fa621c/122b1b42895150267dbba61df69a2455/dotnet-runtime-6.0.36-osx-x64.tar.gz"; hash = "sha512-gSGpise8k2B0wuuCqkXa4bqHRciAiHD/tAAwKiZ99xv685Tlxic61sei7ECHQKs2mgOsgK/y1JYhrhMfdJCtUA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ae19a108-3cbc-4ca0-a4b8-c150aa1f12bc/b1f69657a656d18b3394802d439944d2/dotnet-runtime-6.0.36-win-arm64.zip"; + hash = "sha512-qOGWEvT7cWZFnH1EqQFCgVBOHebM1uTVTRrRxMr/Zu3gwCmdnMUAuEep7PBjxYPCBdZhyc7tmKoYop9VT9GUJA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/268f4e36-89a9-42bb-905e-777014173306/061b9dfad5c34f7d262ea82c20396b7f/dotnet-runtime-6.0.36-win-x64.zip"; + hash = "sha512-k121xs7hnywBbmcWi/rntJEERzXedsZzq7OxJd0yX9Xnedfv4SuoAXjUZomucKJeVYo/qEZBfUTF9Molbn9L8g=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0cc3f564-be24-4a10-8071-786859e768f9/8d5dd547565a37e93dee27f741c0c847/dotnet-runtime-6.0.36-win-x86.zip"; + hash = "sha512-HX7Mo51NFMJ7BnNYxDPr+Q3ecW5cS9wkSGHccmiyPxctYb+RCk4WtG5NYp8jd0uDEbqNWkUIXZldpO8lt0x16g=="; + }; }; }; @@ -686,6 +749,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/fb84beda-bcd0-4e87-a732-f51c98d58a85/f0e0bea82ed83e307a56f4cf2aa496fa/dotnet-sdk-6.0.428-osx-x64.tar.gz"; hash = "sha512-/9bTQsxwDK1P6P1qKYltVfi9f2h/XC75rmhEnDwc7kiX0jGFBQdbqyqSU44NuGBd8TVZkj2GHZEjulnF+w5b0g=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e4aab3f3-d13f-4d7b-8eba-e6e02ab48090/da5b6989259e6c725b90b84bc2854851/dotnet-sdk-6.0.428-win-arm64.zip"; + hash = "sha512-nzqDow4i7Em4Wq/0s0rHcIYTqS+fuLLZhy9wFHKs5fg1eAZPVVe0dMaqpxnWkgcPaaaBWG6r2a5GZF3J6i23nw=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b2c6cee-abe2-4734-a099-729a346205e7/b5776361ebee2e1eeed9be4aad944652/dotnet-sdk-6.0.428-win-x64.zip"; + hash = "sha512-wCfLR7JkoT5Sn4x/O6M6yRFStWdJyGgf7eHWzUhyOuHl8EpDusEwLugeNaU4Pz4WllTlu3wdMx3BHM5alQUuMg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1d42fb0c-c2b6-4c21-ada8-8ac563c11e91/7a350fb6d0daa3846109dfff5fd26c60/dotnet-sdk-6.0.428-win-x86.zip"; + hash = "sha512-KBiEF1yYNGPUxdQeeuVIpOCiNE/CGTaKPAF+10yLzLgaDrcuyFZdIo3tMPOZUbQ358UpeaWRJeHW948lvOD18A=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_6_0; @@ -727,6 +802,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/ff5a3bd6-c252-48d9-b5d4-184ab0e7f1fb/d62375e8ca68b829724f04809951a478/dotnet-sdk-6.0.136-osx-x64.tar.gz"; hash = "sha512-oPx4hnx69+O37NHTeoWKLfljJ+8AWseGU3oZQD+wElGrERAjGWcLGedrNjaj/Qjl6gEzlkPQagROF1LRPvLK2w=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a75faad6-8406-4f1e-bd5e-eb00066fa3d9/235daaf0c9635aaebb55fef73bff2bf2/dotnet-sdk-6.0.136-win-arm64.zip"; + hash = "sha512-x/IKWkxfwsrTWO4Cy0bOgaGSZtepfdPsxfL3UGPDfHR1kYVK/t3mHfQYxRvAZw+hf+fQUGsDhPkQtIBq/tbADA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4dd4c31d-d00b-46ad-96de-d8c80e9cd7e5/c9c935df4c60f8ae923746e16cc7b4a7/dotnet-sdk-6.0.136-win-x64.zip"; + hash = "sha512-ddtTW0WgeXMXWcDIX/mX4pn6l5NQpETKPaO5CGY5QOp8INaYn11ozfk1JDoAfNgq4I18DHSHRWqF0c2A16vbuw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/dede4f0c-690a-4ca0-8895-df6ef4d52df7/0f709d1ebca1d194fef88a4edb2c3934/dotnet-sdk-6.0.136-win-x86.zip"; + hash = "sha512-LcnWUC4H0drZtwRsY1HmY4w0NDxsP5DUkn96+mzf6TSxxBmNwoPwcrf7+XcAoK68CiiVjDQs3dFYn1ms82XRlw=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_6_0; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 2b3f6dfff4570..06cdd14458736 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "7.0.20"; hash = "sha512-ySX6TZFi1eSJj3c3JIroCLzHbZkLmr+fgeQ78AUYsOUhjKKw7qliqRoMKx9Uqc/qMMkyRpSBcwfJ7X7vWYbPeQ=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "7.0.20"; + hash = "sha512-eCdVf6ia9vPelz62o84/e7D/fIFeBjQ/iEOU9aa/1PYcR0yKuW8J/+6oJ996MrZfnrdS8ml/2cWEwAeJeosydw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; @@ -494,6 +500,11 @@ let version = "7.0.20"; hash = "sha512-tt3EyI0qpyqwaFqtbG9+4BP7sukzjjheZ9/Cb/uO+CXxcep/LrKJW/Wc/wBKmkkIY/NnhJQ+Kwdjs6xcHVVO+w=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "7.0.20"; + hash = "sha512-9/XYKLU2xVEkWQBWp7HcpbjIDJ6dU1cPGA2EN6ZHBF7eUbinWDOYT+H+8nFcTKtvudtir7ouU72UiP6Do6lkKw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; @@ -531,6 +542,11 @@ let version = "7.0.20"; hash = "sha512-H9YZkbflMTqW04B9XpumTZwyNaFgtNnBxCTzM93XYNFPZbE6nbhuCUz7c2bdF9M3cZJzbm/4ITWFqBLoTMrqbg=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "7.0.20"; + hash = "sha512-Q0TcTdqzKzsZ3vdclO5OAEwBzLmdAwfupwIFNYY0amyS1oBwkMYJ/qLEZArMtzcVR0FxZw0jKdn0bW+ADvKIeA=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; @@ -573,6 +589,11 @@ let version = "7.0.20"; hash = "sha512-s9lK1tQca5Qb4aZjEBPSGHZhDSksvfp/aj3xv8q39UqBKGtWdIAdrtcgq8qgM5nWavaCiWWW+CAEgmzFRIRpOw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "7.0.20"; + hash = "sha512-bSrhO6fMuMWnjDFgOsQFgJ+j0mT6+nbHtFENNpjxsPCcUPEffR+afmt3kVhAcJdvO5u9p/nVQcAPukNq5VAavA=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; @@ -650,6 +671,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; hash = "sha512-AGd4GUUNFNmtwrZfJbmgabwrQ/cuTbZR53/g5IMgvo63xVUncoHelo510PsZvvlg1NyycWG4xXvOB27hi7XKmA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b807f90e-8b79-40ed-9878-a06eded4745a/8c4dab5de4d510723b6906f85b1b7f2b/aspnetcore-runtime-7.0.20-win-arm64.zip"; + hash = "sha512-//JAWTKmbYHLPcYgjFB6zhLsOI1B1jKcACIi6X0ez/sHlnUjvtiHANBrdA6r8jQIWjjcJSLyZjc7BlKz2KtOYg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e5424205-fbbb-4c19-a22c-10a7eeb2f918/527b1378927b68e8c6faac6cc40ec5c3/aspnetcore-runtime-7.0.20-win-x64.zip"; + hash = "sha512-8fv1U6CirEdxuhthbUFbw3DzK3xCBhiB9pRfLqjU6sZlxvIJN4zfIh/BSuA+0j/68PNMB+7cxHYXwnKTNJDSYQ=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6f95cda4-166a-4281-ba1f-4963ac5fb958/598e690d7e9d8608b0d60122e127ae1f/aspnetcore-runtime-7.0.20-win-x86.zip"; + hash = "sha512-7FCYN/+qaRjWofjeCwQaW3Xji2WJ2sz43/e3coxx/irs78iThor30kLJfQ3QtO4gpp/9mA0oSeGvcmgxlIrwCg=="; + }; + }; + }; + + windowsdesktop_7_0 = buildWindowsDesktop { + version = "7.0.20"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/db2b2cea-224b-454e-97d5-84ee46db11a4/bc345ec0c9af0855a48ec8630e90bdb0/windowsdesktop-runtime-7.0.20-win-arm64.zip"; + hash = "sha512-EWNdCiJZdNN5cAjrIsQ1bgWjzXAdOE5YPjD/E742jO9hc8oGiwvt3HfgtXLpk61I3ycG+J5vnMizGUS299POjQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1dec4601-40e5-436f-8787-c73850a5a475/e0b9874aae3b945397b62be8242df594/windowsdesktop-runtime-7.0.20-win-x64.zip"; + hash = "sha512-wHPswU2So10NqcWZKRkSJDeYJTzQfIKUG889iULbHWuL3JkYLynD47ZqW5QiGacpCH+C5P25oeBOye25lFqTSw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d40dc6c6-7d20-4141-8f4b-872613248a26/0c8512b118d50b655ed01162b48082cf/windowsdesktop-runtime-7.0.20-win-x86.zip"; + hash = "sha512-OHx8Z4/orcYvcVK6+GFr8aL2kOEd0xmSD1wOHAmX+NbDJWLJth/uvgWKBgjM44+0b3JFV3WU/ZTi2DBYdEdPQg=="; + }; }; }; @@ -688,6 +739,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; hash = "sha512-rNzekvLy5DWE7lm+RH93j0oVLDCJdce9xcI3K1u9MJLrnSIzrsO4J1a6HjUqCHf/wX5MjPsgqd6Rym21TXm1kQ=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/793b861e-249a-4dae-a2a8-0db850367237/59b58f885bcd160c4427232972249acb/dotnet-runtime-7.0.20-win-arm64.zip"; + hash = "sha512-nKp5eYYeeCD2RLKnv4DbU2QeA9OfGx/bHB0wbb3HW0dshpoymMsU9+QZMAzVv5oR2KoRws5PCsmtaTJ6GIQL/A=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/990ff1f7-b5df-4a80-a65e-7cff3a1a263c/f1a2f3cab0d1787618f7d8043e3a6827/dotnet-runtime-7.0.20-win-x64.zip"; + hash = "sha512-SUOGLTPTxIM5atriTJMtJUshiqqkY45HsivdHWHuokj5D1p2ighCuMdD24uWA5UGlBr2OEQR6MiRru/evX20/Q=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f479b75e-9ecb-42ea-8371-c94f411eda8d/0cd700d75f1d04e9108bc4213f8a41ec/dotnet-runtime-7.0.20-win-x86.zip"; + hash = "sha512-9M8FoDt+Vo+XQgI3n2Yr7Nh1a41nVSd8GSRxMNA857UGKmQUkEvcUiVqojc1Ad/GLzYVrqD5K14ZK7jhEAn9+Q=="; + }; }; }; @@ -726,6 +789,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; hash = "sha512-eC4VwZziCqgzNWbyPC08246Jx2Jt5jMN32cMRCbjDMhU5E/zNBV4Yirs8hD6Zt3LY6fSrWKe2Sy1WCq2cPlT0g=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/19704083-a2a1-477b-8baa-ba61839e3c9b/33184cec3b68bd1bf09f75deea79a857/dotnet-sdk-7.0.410-win-arm64.zip"; + hash = "sha512-7XYi7mErArwuhXre16AVRey5sabdZHz8kZcogqyqJHKw/odDKjG59tgPjVVgl+DztoNOS4A6KljBjFmxraKhTA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1c6cf2f4-25f6-4317-94ce-5be9c8ae167d/02364359ad16d626f9dcb55717bd6900/dotnet-sdk-7.0.410-win-x64.zip"; + hash = "sha512-v69aPabIzcfoLHrYbtEoLtBQtongKmXDLFeqZCkig7ynELLx/hurYqt7m/4Sb7qyf6TSxZ+flvSzJpiwa0bd5w=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b1577db-7262-49cf-9bc4-251a7c912392/03727d65e6d327e5c500d81c06356618/dotnet-sdk-7.0.410-win-x86.zip"; + hash = "sha512-mWSXls7X6bbyAsQc+FQDT5LdavjfAYxY7+G0TTSkJz53FTsAsyzBBziTsgZOjU3Ulnn+nwcJqsjWBYgDmi/U3w=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_7_0; @@ -767,6 +842,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; hash = "sha512-09vQ/ny8YjiPFQrbpdgYq+45hoY9dXzmMIj0/qv4AQUsCKYIrNUDb5cZFDX+mSJKyxLHNlvn933vKFU6IxrDyQ=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9747b43e-f44d-40ee-a99e-6fa04bfb6684/ee8115b3f39a102ccb07819c92544e0b/dotnet-sdk-7.0.317-win-arm64.zip"; + hash = "sha512-zx9jV83ONsXz8LsfixlyrdopiHQej9vaF6hPuK6a4tYJIc+8BsoDkHqhvRqWM2B96+tY6pEIOMIyYRd+GKB7fw=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b32a6c70-ddda-4dc3-87ee-66e447c7f255/b598d82272f1d9e42e6736059aef2f2c/dotnet-sdk-7.0.317-win-x64.zip"; + hash = "sha512-8oPi+EDd8XaxaIYdgYhMBqKYnV4Qp4o8jZN/PHFHnOLT7Z8OfErcvQPLzO+80NPs9jrZbOK/ytUovOjrDtQjXw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2e3fcaad-a231-4fad-b794-f3411946d1d1/e0e701961ad28c693a3d459619328b88/dotnet-sdk-7.0.317-win-x86.zip"; + hash = "sha512-TpAc1eIxkhXmCwWwIxMvqGq8yPwl5RQIdg+hiYjBCXIsb6SJuA7amK6l0Lwcz3cx4w6vF27ZNlRIAwFdSe6J6A=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_7_0; @@ -808,6 +895,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; hash = "sha512-lN65mIUJ/L//w1cRTQ9WRfxrb2FWZkBAzVZDoZG+8Qri+6QWiqaJ/32hobb6d5605Tp3p4R77Ot/C6RR0sINVw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/159a33a0-38a3-44ab-94be-91df945e0982/ddee1626ee11b699afa0164682594874/dotnet-sdk-7.0.120-win-arm64.zip"; + hash = "sha512-i29FE//HAcGzAFhdFd5LA/3/fJV18ExUW4eMfmCPjwPe+dES5MwP9hMcpuMj1kl5yI6Q5DdFWb7Yt1BaIhx8Yw=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1b1097f3-4f8a-4171-928e-79ec0b5cb26b/7993b534dadbbd236c34772c1559b675/dotnet-sdk-7.0.120-win-x64.zip"; + hash = "sha512-7w4Y8KrGh1smAtRQKOMAbSol6TNcP1jsqt5yA54dLxvjwcUReORKFOjneS4E7LB6Ie6IQ5RgDKfyIUAkZ1EDug=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e0cfc0cf-13ec-4fde-a906-5cacef7c5a8a/b313a194c8c4a878b73d8d92206aedd3/dotnet-sdk-7.0.120-win-x86.zip"; + hash = "sha512-QbPTkEr41OlBqXANFM1rz3msMbaYUox9uCILDmSvlzKG7T4hQdIQGuL4ngnfZ+dmQFZ78RDdeVaoVpmHvb6B5A=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_7_0; diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index eefa66d5763fd..8a162a46f1d46 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "8.0.12"; hash = "sha512-IU0eI4OrQYkabBlA2WpJTv4ySiWm9d7fnnX99k4m1aEq1XnffJIg+a2YOHwbJRR94GdQMHTb0Ug87OdX10Z+JQ=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "8.0.12"; + hash = "sha512-adMS+apYm20v9qwQ8UMhXjvt+xZOWhQVyeQ4QeafUW4bpSk8XKFoSsGvBfhNTwsJKq+rn4FrMLX4Joz3v4/Fag=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.12"; @@ -504,6 +510,11 @@ let version = "8.0.12"; hash = "sha512-RtGa0QmyL+DxjypnrrfFr9AjPfGVbLOlAqQcIVr3xYOjhlm0+XsKanRycjOiQpY7PYJGIED1nICm610kxTpHzA=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "8.0.12"; + hash = "sha512-p9GyCncpozwxMOHUX+D1MRODoCGLkUUtqo9BKLNh3mRBp5Z5U8TyhGiUL5mzwRhCLB6wK7DPAPzEgOnTaUDVpw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.12"; @@ -541,6 +552,11 @@ let version = "8.0.12"; hash = "sha512-fFUUZcpljb2Z6/Duwtp1RThdOEvEFuI3lYijFTVpu94oRjw5sbtH+5qO1KeqrxCkY+Fnpwe1ABBy91zdoPus1g=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "8.0.12"; + hash = "sha512-t7g0g5XAm2zkp22zmmzeF1DkchlpW7p0tasKzZ3PyMeh1feEid65shnM2PYOnTfYx92Dly4iatvdxiUvtoM/hw=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.12"; @@ -583,6 +599,11 @@ let version = "8.0.12"; hash = "sha512-j+NocH9tAxjaCICEVP3g8YhQm28A7yBg3GnNI0B2aXtba8vlFomvu509icbAp0g10YTGbqlOdmt82pIOyhcBjw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "8.0.12"; + hash = "sha512-zhHYDbWSPFIkDzY33kVWurQenr9fZiSjUXE3Z4xrCuUjCYm3gm0v/CRbrLz8zxzkIcYH4DEricIHpEgK5ZWN4A=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.12"; @@ -660,6 +681,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/2d69b57b-d997-4364-a898-220293f49d9f/c192bee87281e416703f53da103925d3/aspnetcore-runtime-8.0.12-osx-x64.tar.gz"; hash = "sha512-qzE801RZhvMFrxH1SVo5bPXn1mJtDkaRfv7fSveqspy58t4RTJ1SGAgdZzndUvlpiZBrEFNplfVnK3HMhliUpw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/39c91812-45bc-43b1-acf5-0ff7656159b4/65fe28760d44b3032ad372e4460748c0/aspnetcore-runtime-8.0.12-win-arm64.zip"; + hash = "sha512-dAcUcg36GfrYCqpObnQN80YryvBhIsKMzzOrmCHF+Htoh+XPEpbXSjg8eFOJFqzyvWnSVGmmDEJImF1SB6LCig=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d0d7926-8b5c-41fe-b3b3-3b5403463b82/14cf47a4a799dc8de46334359455fbec/aspnetcore-runtime-8.0.12-win-x64.zip"; + hash = "sha512-KKPSzeDVXaPGlD1weydEy/myJb8+ZvjbsYq6UZZyW9cEj0+6WvIZrgp67zGk/34wk5ZRjufcDrKlwqYZVdWxDA=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72c00f36-9fdf-49e7-b9cb-d959a4a296ee/6e20727162ad7d00ef073d35bac759f3/aspnetcore-runtime-8.0.12-win-x86.zip"; + hash = "sha512-zo67PADEX+L9xBiIMiB2cWGvYhf8nPfNTgGp0Yfv9ND3PUXJA3ZoDzqCcPlYeE4pXvZK20gjy43dTL6L6awP2Q=="; + }; + }; + }; + + windowsdesktop_8_0 = buildWindowsDesktop { + version = "8.0.12"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/80f19884-cbf4-4480-8624-65c7daea32d3/5cfeae5f660f35e5f87793f58b2c8fbd/windowsdesktop-runtime-8.0.12-win-arm64.zip"; + hash = "sha512-IIYgkM6gyBVMS+DEmmczQeSptcdJBqHVil0VR87ZkQq6+d35tvSioFvlRTjisnTpH3hbZwrxY1gcN+89p68FXA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/50c8d583-5433-4c69-9301-910c54c21e11/9a07f95ef6bfb572063b3e7f112c01bf/windowsdesktop-runtime-8.0.12-win-x64.zip"; + hash = "sha512-AKPr3TtnbDADOGVTMIBrYJ1FPo0Y8QL7kQ/3uIWLOym+UIRS5HFcyJJuWkF7oyDNN7aDAr/GmbLummrI76U7xw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6dba8a66-f1e1-4666-94b4-577ad5f4af96/e77fbdc4c5095194a87296ca2f133bd4/windowsdesktop-runtime-8.0.12-win-x86.zip"; + hash = "sha512-4s19F+WPHa70dFpcxt+P0O0XiGVFBEkqv0qMM3MIsTdNPAzJ2Pk5dlsuzwnkw+ZiFy5b5G0E3OHtfpEbworeEw=="; + }; }; }; @@ -698,6 +749,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/3458a9c3-f34a-4d61-896c-1551ee66d5fe/bf3c24436ad390578caf1ccf185e3151/dotnet-runtime-8.0.12-osx-x64.tar.gz"; hash = "sha512-sYToXFX9D/0Ue93laVtYbMGHnNqhG4MswxWJk9sphihmFwOe0voPRtq6CgHo7Om+awoWjYc0eB2XTHfI3DbVug=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ad6302ea-b7a6-4b83-8dcc-c932f9b8d037/5379348874d0ab07165734552a050b88/dotnet-runtime-8.0.12-win-arm64.zip"; + hash = "sha512-wvtNe/jIrTfE0WoaVAkAmcppcs2K4TdJmhHYQKxvCUO1zEloGtDCDyOfErA8Kgm3AQJoNFF26gPxHuWBduQWLw=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/463d3b85-bccb-477d-8ecc-7e70dfa250f9/b95b5ffb83a79ede10fcbeb03abafc00/dotnet-runtime-8.0.12-win-x64.zip"; + hash = "sha512-bgj1KQGDVp2u9wtViTkkb7cpMGCOKRyZQYAqNQkYzKD0rjDfC7j7B82PKxiqQXRQbJEYiSNW3ITNDH/mWCwNLQ=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d5320b6-e6af-486b-9b8e-3fb26ce1cc4e/c3db2f45b082b27a511ec25778da0c69/dotnet-runtime-8.0.12-win-x86.zip"; + hash = "sha512-2DxK3B0i4jC8PYDAgL1Vsb2JjvfWgUVtUPmMSbqqrXe1iWPnIVVPsckUE362nk8DWgrRIhzh7khmCiLBx9MNrg=="; + }; }; }; @@ -736,10 +799,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/485c72db-0004-4f65-a37f-1f80bb445fd5/dc59499a684b6c8677ae7f43ff0e0062/dotnet-sdk-8.0.405-osx-x64.tar.gz"; hash = "sha512-kqAW1FMGWGZfknQJXYflfc+C/woiJPOjkq9h0Dwfg25FF5gSHY3e4+TlziCUOvdxIbAxLyepyQDzmzlzgenbZQ=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b6c3b03b-46a0-4822-8dfe-35dee8b461d0/aea7edc5064ecac1169116e78d8d9db0/dotnet-sdk-8.0.405-win-arm64.zip"; + hash = "sha512-oJWr/48YpiANiYx5YtVjoG3+5gOtoBfXhBjvTvQxkZvG9jpU5wH3lQ/p6Wu1T81zXjRcvsRh3PDGrb4jsSbH7Q=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0b9ebc5d-c870-410f-b0f5-763468a0c340/a45cf691a7023cc9ae5e8b7ea9aaae2a/dotnet-sdk-8.0.405-win-x64.zip"; + hash = "sha512-3vCwlHR+YJ0rr9M9xzn+ofsWa3lL/VjTSL9il40fNWBsC9Ma4spZrZR2Qaz9TuySuz/h3Rl6wo8r1gDtEltblg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6a8ea8bf-5aa5-41ef-adce-3a02069286fe/4a3655bdfb5bfd439a00e3002ed5fd3f/dotnet-sdk-8.0.405-win-x86.zip"; + hash = "sha512-SCevenZZ1dzWKDu/VdzSYCaJhcKL+OXhba6LuaCMrX2HTLr+FEPwJQmXUyeOTNIoyHEUGu6vMg8jALgnlHawNg=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_8_0; aspnetcore = aspnetcore_8_0; + windowsdesktop = windowsdesktop_8_0; }; sdk_8_0_3xx = buildNetSdk { @@ -777,10 +853,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/0776860a-7d0e-4e55-94f6-b87f0f219b0a/a0400cc3a044fb101a2dab8616f6ae4a/dotnet-sdk-8.0.308-osx-x64.tar.gz"; hash = "sha512-oWfJHRwDZyLHyv8SYaibVwd00eICCWQlc3fwZOmQ8FSMZo+/K2Kzcn8QEUbAV7AAcQbJfXO+r5i0h2WimpNwRw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/01afb365-9231-457b-9684-741232ed4157/b6636336f498056f9473246a1102d119/dotnet-sdk-8.0.308-win-arm64.zip"; + hash = "sha512-ty8E2xJTNl0o8byr7UtYeMzIazOnp0bSyyU7GTRQqMGw/jlHOR5mpJPeM6O6w8vpoBVYXsJhCrzOl4a7arNLUQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/926f520f-5bb6-4044-b4e0-266c967bf496/c383ff49040ba5ef93c455c6403ccffd/dotnet-sdk-8.0.308-win-x64.zip"; + hash = "sha512-nE7/XgcMJMDEzpwDi3KISpENMur1IWa7S/m61IGHxOexTeQuc64dQQSSMdemC5m7eFRA31HnSFOeXNIqwQymkA=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/189e450f-33e4-479d-8f3d-7f73f693ff57/d406b03319f60ffa4ede21ad7f5ce80a/dotnet-sdk-8.0.308-win-x86.zip"; + hash = "sha512-MP9nwsETRsCBWJNdl/RNg6uEN7T2EHhpb45qvlpWEFFPjdRGbZV90EGEPut6y9YWvI4sAsqplgN2wFwYkD9DAA=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_8_0; aspnetcore = aspnetcore_8_0; + windowsdesktop = windowsdesktop_8_0; }; sdk_8_0_1xx = buildNetSdk { @@ -818,10 +907,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/ce94ae9c-4627-4b7a-8857-eb50cac41a0f/2c8804a1a59de1abcadf19deb68ef59b/dotnet-sdk-8.0.112-osx-x64.tar.gz"; hash = "sha512-KU3LITZvQjGU2tlWqG4K7ZoOPMImX/mxv2HHjxrHg8YUwloG9k5rNXkBNbyJnkFN138dco9Plcla1XuAAVBroA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3eb218f7-d4f8-44a2-82e1-808013fcb7f3/18e32c85da71bb7c15723b4a948b446b/dotnet-sdk-8.0.112-win-arm64.zip"; + hash = "sha512-5CIrhS2DzhJsqotWqoVYN7pzUXhESWC1+7P1x1WxT7LrkCdwOql6/xGd2ZKTOeBYTljnaSZhMUYGAy7tk4UK8w=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d484b7ce-25a7-49a4-8884-20a68bd9ed79/c7a33de199c018f44e710201f2bf055a/dotnet-sdk-8.0.112-win-x64.zip"; + hash = "sha512-ojJnSLbsv5BhhpR7O4jpu5mRjt+ti5wcOerpJDcIcvI7QKM3HgGzHyUrVHjiJ02J5YfDathQWcDNvZu0g3UDTg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/49571945-7fe0-48cd-b4ff-00768fe2cf79/f2ba78c8c49f8db39788277d60391b02/dotnet-sdk-8.0.112-win-x86.zip"; + hash = "sha512-50COmUVQ8NVKwf8/RrTaG+SU2L/dPAgkcAMfwV5lL00CPtoy3taOcXhdgebzLIKlujJSoAqS7QaqG0JqOw2Svg=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_8_0; aspnetcore = aspnetcore_8_0; + windowsdesktop = windowsdesktop_8_0; }; sdk_8_0 = sdk_8_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index f95c7d72fc177..a851b6e347a5b 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -1,5 +1,6 @@ { buildAspNetCore, + buildWindowsDesktop, buildNetRuntime, buildNetSdk, fetchNupkg, @@ -14,6 +15,11 @@ let version = "9.0.1"; hash = "sha512-j59whFHFna8m2rgyONETv2AyVTcGgNYhynz7sljGIQI9UejOz4lMtoF6ETztgdKcxLM/PQpe3iXrc/1s6cL6uw=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Ref"; + version = "9.0.1"; + hash = "sha512-PK9Be2+r+PAorkffpE0XsCAXDKXhFirxeHxd1abs/D4y5092of8JS8MjCgLrJFBUA/y7eyMsytNP758xc03iPg=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.1"; @@ -339,6 +345,11 @@ let version = "9.0.1"; hash = "sha512-N2LRmh6Iz4Gc9XmSiGOgTYZhHltLY8TUjFGfcykwAKu4Dx5dXuwru2zX+4I4AstYqGWACz6rlJDFIqrzEGIvbQ=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; + version = "9.0.1"; + hash = "sha512-7ia98TMTna1yXxO9HcMzhp6pA6R6B6qynPcVc6jI9YqjgWI4CHWBntn5KLVytQsfuppIn39OrI1d6zWJ/g5Z6A=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.1"; @@ -361,6 +372,11 @@ let version = "9.0.1"; hash = "sha512-yrQ8Mq4CdJ6MO5Pc/8PrlA5yU8XozxuXg4MCRbOIYcOWgJL/S6zW6t0rmspyAlJ3j2PS89NF5bwZyLogM6IZdQ=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; + version = "9.0.1"; + hash = "sha512-2TrMw+TAaqY8NtjW8iWlGWlQzGD/Nsjk12/6uBVV3FbmBFtE8h31m3Yf7ziRQmihybt2xrGGSieYToBxA44WtQ=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.1"; @@ -383,6 +399,11 @@ let version = "9.0.1"; hash = "sha512-JmmvPGzjAhPzt/OJfMqEOSPMCbFKjLSjI3JW+spalcj9R2kze2G3xR23TeTIppSY6M6UqHfYtEDLSRQ2mLjBdg=="; }) + (fetchNupkg { + pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; + version = "9.0.1"; + hash = "sha512-kBhBOa0aEkwoFSS0orXwPAzQnVWXB9GqUk0m2tmHc8S4Ui7rINvFtRWKUuYJxdEknODRMXn5k4i5IW4QKgYWjg=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.1"; @@ -440,6 +461,36 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/6655b880-82dc-43d1-b5b2-f76d6a3c431c/4752d9d4811a2148de7eef5dcfd08441/aspnetcore-runtime-9.0.1-osx-x64.tar.gz"; hash = "sha512-SusJQ4d9v5NfZVTGN9KqGPjvIulpLmzT1xbd4t1UEeSIF2fL6cVUvY7EPCCahqJhlMJhjGDRFboGOOkugEI8wA=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8e308ca2-de0f-4202-9d52-81b0ed50ce01/169ea645ba895a387192fc9ff160a994/aspnetcore-runtime-9.0.1-win-arm64.zip"; + hash = "sha512-UsabaPIqP6ElFxbpamQQL8yXyIfss8mhYMWccOYlsuyKfvT3Fib1IidKHl9MEoa7WLj6MdRgXKSzojlDnkZHKg=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0d79cb49-287b-4cf4-af5d-0fd6c1af4f64/12613555f622bf17c91a6d0d68fd7aa7/aspnetcore-runtime-9.0.1-win-x64.zip"; + hash = "sha512-YTSSvsCJm8RRsRxXICT+yi4GikcfInW1WydsDq6FppXit1grBxAbm8deMsumwZjcUMpl3wVk4cTAJB/kXbYMfQ=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/dac9d379-bc70-4bcf-994b-14dde1467256/5999be7787bd5264aeaadae246cb0e22/aspnetcore-runtime-9.0.1-win-x86.zip"; + hash = "sha512-kVM19g0+8YnFmTcsIEO5oRXPU4oi8/YpcHDKspE6iVF8pp7Lx6oqYAyPD/W6htd+mS09LLXV1eshuGaedpRCiw=="; + }; + }; + }; + + windowsdesktop_9_0 = buildWindowsDesktop { + version = "9.0.1"; + srcs = { + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fa64dc36-e7ac-4742-8ff5-5c17eea57d24/528acce3232887137f7d24aecc67c131/windowsdesktop-runtime-9.0.1-win-arm64.zip"; + hash = "sha512-xi5FhhKblZfMjDI+btiOQ+1s+Eg28zsshqML4luOstjr6rzFCq8WIzoxnQUtXid8W+5ZpUGoEalDNPg9BAsC1A=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e274cb3b-49b9-451e-aa84-be569ed98eb7/61c81caf06d1d11a2fb6eb0f68555097/windowsdesktop-runtime-9.0.1-win-x64.zip"; + hash = "sha512-ElaCXm2CzAXBmuAG9kFx9jrhuRFPyp1AZm5mVGDJpOPUior60fyhXAuUsWp4P988RVKY/lmbzVosNQn5SZOJvg=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/eb821758-fbac-46a2-aa38-e908c0e94b9f/fe3b0722e3c2a0fb9ee8976ac5443c2b/windowsdesktop-runtime-9.0.1-win-x86.zip"; + hash = "sha512-Ff6HkDCHpwV1m6ZHfMnkrYQcL/RLqzWD5W+gbX2qPCXeG7kdpbsvkdqZZENwT8tFlBCs51Y+ywbcEHzykoIOsw=="; + }; }; }; @@ -478,6 +529,18 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/36d3662e-b23c-46cb-994c-3a46bf2b9759/2c090a2be99f96cb33a56183e747e27b/dotnet-runtime-9.0.1-osx-x64.tar.gz"; hash = "sha512-uZfCwPA1DvKbpuhlrAnr7LHTYy4qdWG1q+I70PtqvIwMpziNbPF8WcqH3YFoYE3taDmnsWzqGvvjbKVyNFFeGw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d6ace5f4-cf28-4386-9f9a-9d756fb50763/82d2cebd4f7fc8692f5d5e16787bc1b7/dotnet-runtime-9.0.1-win-arm64.zip"; + hash = "sha512-ISflBk9tRGxL8wYQ9IynSOtn1qjczlXCIJX35ZcgmFM5sH9kuIfdkrpe0gv/EM4Pn9ppAY2knkzC4wUWsHaWOQ=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/057a1dae-2fb6-4adc-ac3f-d3f8c13926d8/6716df81f86b00a9e032134b1bab9d07/dotnet-runtime-9.0.1-win-x64.zip"; + hash = "sha512-MLiAw81sOTVekrVCLowESib7odoVtPH4qJ3EYiliyKNTewdQZMM8hJPYu8kJrowTWlUzEQCA6V7zHjQH6t4pHw=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8ac967c1-7da4-4cd3-ad31-32ff01934f51/e3a1057ef293d962a3a59adc692c1c20/dotnet-runtime-9.0.1-win-x86.zip"; + hash = "sha512-sJFGNLSykjCgAOCwAAWZLrbjcJSGLi0Kngl1s2ba1HRV1tJq7v6VNWMJHyVTi/AO+ddLjAHsp/C6bdKIgWO3lw=="; + }; }; }; @@ -516,10 +579,23 @@ rec { url = "https://download.visualstudio.microsoft.com/download/pr/373e3b64-d88b-4d83-adf3-eb48a6d6e76c/0d24e9cdbb0e75999fc0c17dafb1ea17/dotnet-sdk-9.0.102-osx-x64.tar.gz"; hash = "sha512-Aj6RC2SBmZGDGqDlMEQ/qYX6Zzkg/ykVQa17ekpTLiD1rIn5qRsulWz2mzgh7xNpgoz0bFROGDqFQlrktyXhhw=="; }; + win-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8ca0f979-057c-4bf2-9a7c-3d5feeff533f/2c1517241a46552f2525952acc083f39/dotnet-sdk-9.0.102-win-arm64.zip"; + hash = "sha512-Sqc0OrlrBAPZ1UPR4vEfjxDbxevrYPW+He5FX9h4x38k4XEN4/yFrQhQ05E2gPLSYFEh25NKStb5aec9nW7jNA=="; + }; + win-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/044ede4e-08d0-4c85-8c46-60e8b2e8e340/690f9b2c25bc27062edc71e0ccc2a639/dotnet-sdk-9.0.102-win-x64.zip"; + hash = "sha512-w3E/TbmP7JvLtb4TeOdQWknNs2LiDgYARdyOMg68YuD0IuEl77npZulX7mTjMhneqbQsGKxbjlHdNkjlqhMZxQ=="; + }; + win-x86 = { + url = "https://download.visualstudio.microsoft.com/download/pr/139daba9-b797-4dc9-a5a3-873604311459/90623d54cab92d97f66343147e318d6a/dotnet-sdk-9.0.102-win-x86.zip"; + hash = "sha512-iYIpsckqwZJdcVUDZ1XUUa/NUvOfTyBFVJGMew0Wp4zw7B3wYgjUDI0UzkPYz2YQf52TpaPE5igB1/zDQKc/5Q=="; + }; }; inherit commonPackages hostPackages targetPackages; runtime = runtime_9_0; aspnetcore = aspnetcore_9_0; + windowsdesktop = windowsdesktop_9_0; }; sdk_9_0 = sdk_9_0_1xx; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 80c1ddfeaa718..cef6aeff3fd97 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -483,6 +483,6 @@ stdenv.mkDerivation rec { ]; # build deadlocks intermittently on rosetta # https://github.com/dotnet/runtime/issues/111628 - broken = stdenv.hostPlatform.system == "x86_64-darwin"; + broken = stdenv.hostPlatform.system == "x86_64-darwin" || stdenv.hostPlatform.isWindows; }; } diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d268476c2c14f..2f4db6dbaec54 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -14,7 +14,7 @@ swiftPackages, darwin, icu, - lndir, + buildPackages, substituteAll, nugetPackageHook, xmlstarlet, @@ -26,11 +26,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "${unwrapped.meta.description or "dotnet"} (wrapper)"; - mainProgram = "dotnet"; inherit (unwrapped.meta) homepage license maintainers + mainProgram platforms ; }; @@ -44,7 +44,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] ++ lib.optional (type == "sdk") (substituteAll { src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; + inherit (buildPackages) xmlstarlet; + inherit (buildPackages.xorg) lndir; }); propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c16d3533f94e7..bb6be3b81065d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -684,7 +684,7 @@ with pkgs; makeInitrdNG = callPackage ../build-support/kernel/make-initrd-ng.nix; makeInitrdNGTool = callPackage ../build-support/kernel/make-initrd-ng-tool.nix { }; - makeWrapper = makeShellWrapper; + makeWrapper = if stdenv.targetPlatform.isWindows then makeBinaryWrapper else makeShellWrapper; makeShellWrapper = makeSetupHook { name = "make-shell-wrapper-hook";