Unverified Commit 5706443b authored by David McFarland's avatar David McFarland Committed by GitHub
Browse files

Merge pull request #190129 from corngood/dotnet-sdk 

dotnetCorePackages.dotnet_8: build from source
parents f8bfd48f 043eab9a

pkgs/build-support/dotnet/build-dotnet-module/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ let 
      then nugetDeps

      else mkNugetDeps {

        inherit name;

        nugetDeps = import nugetDeps;

        sourceFile = nugetDeps;

      }

    else throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script.";

pkgs/build-support/dotnet/make-nuget-deps/default.nix

+1 −1
Original line number Diff line number Diff line 
{ linkFarmFromDrvs, fetchurl }:

{ name, nugetDeps, sourceFile ? null }:

{ name, nugetDeps ? import sourceFile, sourceFile ? null }:

linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {

  fetchNuGet = { pname, version, sha256

    , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:

pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh

+15 −2
Original line number Diff line number Diff line
@@ -23,9 +23,16 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 


mapfile -t sources < <(dotnet nuget list source --format short | awk '/^E / { print $2 }')



declare -a remote_sources

declare -A base_addresses



for index in "${sources[@]}"; do

    if [[ -d "$index" ]]; then

        continue

    fi



    remote_sources+=($index)



    base_addresses[$index]=$(

    curl --compressed --netrc -fsL "$index" | \

      jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')
@@ -35,6 +42,7 @@ echo "{ fetchNuGet }: [" 


cd "$pkgs"

for package in *; do

  [[ -d "$package" ]] || continue

  cd "$package"

  for version in *; do

    id=$(xq -r .package.metadata.id "$version"/*.nuspec)
@@ -44,7 +52,12 @@ for package in *; do 
    fi



    used_source="$(jq -r '.source' "$version"/.nupkg.metadata)"

    for source in "${sources[@]}"; do



    if [[ -d "$used_source" ]]; then

        continue

    fi



    for source in "${remote_sources[@]}"; do

      url="${base_addresses[$source]}$package/$version/$package.$version.nupkg"

      if [[ "$source" == "$used_source" ]]; then

        sha256="$(nix-hash --type sha256 --flat --base32 "$version/$package.$version".nupkg)"

pkgs/development/compilers/dotnet/8/default.nix

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{ callPackage

, dotnetCorePackages

, bootstrapSdk

}: callPackage ../dotnet.nix {

  releaseManifestFile = ./release.json;

  releaseInfoFile = ./release-info.json;

  depsFile = ./deps.nix;

  inherit bootstrapSdk;

}

pkgs/development/compilers/dotnet/8/deps.nix

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{ fetchNuGet }: [

  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "8985f0b9855daaf8b4a38f32a91902bdbb99a2f1801a98c68a5013d94842524e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "0496a403691e50662c5aef598248d8cd92ad1da1e93a859aedee5bb91bb9c821"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "0c5k9ckp7zjspyqqzz817jr8pglnn7wxhmv2hfk700swb96qhg0w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.linux-x64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "1pyydnypv9x25p7y35j85f8pxnyxq3w2vc8i84klq90kzgzig5a8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.linux-x64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "7609cfc7fd617a580caba18d458ed644ab799346139b3ead9df9502abe8d0541"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "6a969c2f6261834ab8ec9829cffed5a1a1f35667bf382b7c902d1b26db192e27"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "a8b90caa9ead7defdf8b9570dcb3e0cec146dff892a88fb825fedb7ee0fe620f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.osx-x64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "eade428d642bdbb2271610c5d781a61ab367dbd3e776477a7b5948bda62252b5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.osx-x64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; })

]