From 416e036255c1d90f77fe27a9f7c8f401fc8d9dcd Mon Sep 17 00:00:00 2001 From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com> Date: Sun, 15 Dec 2024 22:27:58 +0000 Subject: [PATCH] Net9 SDK (#63) --- .config/dotnet-tools.json | 4 +- PrattParser.Test/PrattParser.Test.fsproj | 2 +- analyzers/analyzers.fsproj | 2 +- flake.lock | 6 +- flake.nix | 8 +-- global.json | 2 +- nix/deps.nix | 92 ++++++++++++++++++++++-- 7 files changed, 98 insertions(+), 18 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 063fce2..26b22da 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "fantomas": { - "version": "6.3.7", + "version": "6.3.16", "commands": [ "fantomas" ] }, "fsharp-analyzers": { - "version": "0.26.0", + "version": "0.28.0", "commands": [ "fsharp-analyzers" ] diff --git a/PrattParser.Test/PrattParser.Test.fsproj b/PrattParser.Test/PrattParser.Test.fsproj index 137e84e..1f71c3e 100644 --- a/PrattParser.Test/PrattParser.Test.fsproj +++ b/PrattParser.Test/PrattParser.Test.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false false diff --git a/analyzers/analyzers.fsproj b/analyzers/analyzers.fsproj index 8c59f41..7f641b2 100644 --- a/analyzers/analyzers.fsproj +++ b/analyzers/analyzers.fsproj @@ -10,7 +10,7 @@ - + diff --git a/flake.lock b/flake.lock index 988f085..27e124c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86e0232..f9750c1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,8 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; pname = "PrattParser"; - dotnet-sdk = pkgs.dotnet-sdk_8; - dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0; + dotnet-runtime = pkgs.dotnetCorePackages.sdk_8_0; version = "0.1"; dotnetTool = dllOverride: toolName: toolVersion: hash: pkgs.stdenvNoCC.mkDerivation rec { @@ -26,7 +26,7 @@ pname = name; version = version; hash = hash; - installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin''; + installPhase = ''mkdir -p $out/bin && cp -r tools/*/any/* $out/bin''; }; installPhase = let dll = @@ -37,7 +37,7 @@ runHook preInstall mkdir -p "$out/lib" cp -r ./bin/* "$out/lib" - makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${name}" --add-flags "$out/lib/${dll}.dll" --set PATH ${pkgs.lib.makeBinPath [pkgs.dotnet-sdk_8]} + makeWrapper "${dotnet-sdk}/bin/dotnet" "$out/bin/${name}" --add-flags "$out/lib/${dll}.dll" --set DOTNET_HOST_PATH "${dotnet-sdk}/bin/dotnet" runHook postInstall ''; }; diff --git a/global.json b/global.json index 391ba3c..cdbb589 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.100", "rollForward": "latestFeature" } } diff --git a/nix/deps.nix b/nix/deps.nix index ebef96b..a61db7e 100644 --- a/nix/deps.nix +++ b/nix/deps.nix @@ -8,13 +8,13 @@ }) (fetchNuGet { pname = "fantomas"; - version = "6.3.7"; - hash = "sha256-tEW1qQTcAqMVwH5tYeyukFQrjel7PrcteubzffgqKvw="; + version = "6.3.16"; + hash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs="; }) (fetchNuGet { pname = "fsharp-analyzers"; - version = "0.26.0"; - hash = "sha256-60Bl36LOb/zVNdH2SBSuQ5O41lP9dKTNZbs5vvYs+3U="; + version = "0.28.0"; + hash = "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8="; }) (fetchNuGet { pname = "FSharp.Core"; @@ -23,14 +23,44 @@ }) (fetchNuGet { pname = "FSharp.Core"; - version = "8.0.403"; - hash = "sha256-3XSQp7JUOU5T6gvSQXNfBF4t4gaX4J4xushH+cfM9mE="; + version = "5.0.2"; + hash = "sha256-YOoosLEiszPsOOaNAkWhFGU04JJKDOFVoA/ggrZMN10="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "9.0.100"; + hash = "sha256-V1q3CjbRvWZqxpi6cXD/R0F7pyXGGtH83M5Z/ITDrp8="; }) (fetchNuGet { pname = "FsUnit"; version = "6.0.0"; hash = "sha256-q87WQf6MqGhzvaQ7WkkUlCdoE94DY0CD5PaXEj64A6M="; }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "8.0.11"; + hash = "sha256-dXJ1h1xyeI+lzdoNiYtmLBzkQnHKZcWSksjuo70yp5k="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "8.0.11"; + hash = "sha256-Nn9i9gSqdjsSpbuS2U562nUB/nCsMjoGuagoHGTgLks="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "8.0.11"; + hash = "sha256-qY1nMywwCPOXxBQwXLeYaNSvu7wiXIp1fWeY8ThA4QY="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "8.0.11"; + hash = "sha256-DzJerzIbUYLmMl/EBOcpHcEzO9OuJ+fmbLJ90ADEKL8="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "8.0.11"; + hash = "sha256-u74pARiTnPqmdxfxiRyhN3X1VEC95uAQGSAcvy3ReAs="; + }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; @@ -46,6 +76,51 @@ version = "17.9.0"; hash = "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="; }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "8.0.11"; + hash = "sha256-x8LMZdbVwjhsXwUbjsQKT61Qd7Y1EopoEGDeKRXKipk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "8.0.11"; + hash = "sha256-brt8CP11GH1hidrkYbAou8mMQ6kr2eStr/oqesK6AnY="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "8.0.11"; + hash = "sha256-o7AS58dmjN8MwwI1TTQ9H36cKjJ08MPfXXcCtblE2Cw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "8.0.11"; + hash = "sha256-O0U9c06Cdl6nEtmUFB3qoSMi2GcFEdVWLFwqED10APU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Ref"; + version = "8.0.11"; + hash = "sha256-lo6MAnvFQ1DBDh+9qdxzOJMgACsvFjj2e5bhreJ4v0I="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "8.0.11"; + hash = "sha256-kwfUZm1hnsikJdpgTNDObdNL54wPO80TYtdNNlzfh54="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "8.0.11"; + hash = "sha256-V55LsR6DmpxARdnZvqoYakebdJ+2cZykTMDThrmQnA0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "8.0.11"; + hash = "sha256-NxiVGeu54YKpQSKqVFVLSDD90ZDFykj/KBGYUCym6PM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "8.0.11"; + hash = "sha256-6HdptW7Wf1fZ8L3sUEpEvRtz5XCRSEcGAwpzVKtOy+o="; + }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; @@ -126,6 +201,11 @@ version = "6.10.0"; hash = "sha256-r8w4/bin+ZQK6AzkuFXhWbteQlzRFY++S1yDTrq0KfQ="; }) + (fetchNuGet { + pname = "NUnit"; + version = "4.0.1"; + hash = "sha256-jd1CD5nHVXkpvBNpVDJcJyfTggCHLyDBySVSvtrA8Uk="; + }) (fetchNuGet { pname = "NUnit"; version = "4.1.0";