From 2a5a994a6bbe3df3141fcd07adb3d9ae88bf4fb3 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Thu, 28 Nov 2024 22:10:26 +0000 Subject: [PATCH 1/3] net9 --- PureGym.App/PureGym.App.fsproj | 2 +- PureGym.Test/PureGym.Test.fsproj | 2 +- flake.lock | 12 ++--- flake.nix | 4 +- nix/deps.nix | 86 ++++++++++++++++++++------------ 5 files changed, 63 insertions(+), 43 deletions(-) diff --git a/PureGym.App/PureGym.App.fsproj b/PureGym.App/PureGym.App.fsproj index 9d99c74..47875b3 100644 --- a/PureGym.App/PureGym.App.fsproj +++ b/PureGym.App/PureGym.App.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 all true diff --git a/PureGym.Test/PureGym.Test.fsproj b/PureGym.Test/PureGym.Test.fsproj index b9af699..13576a8 100644 --- a/PureGym.Test/PureGym.Test.fsproj +++ b/PureGym.Test/PureGym.Test.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false true diff --git a/flake.lock b/flake.lock index ed36ced..7e47444 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6968414..d24e57a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ projectFile = "./PureGym.App/PureGym.App.fsproj"; testProjectFile = "./PureGym.Test/PureGym.Test.fsproj"; pname = "puregym"; - dotnet-sdk = pkgs.dotnet-sdk_8; - dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0; + dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0; version = "0.1"; dotnetTool = toolName: toolVersion: hash: pkgs.stdenvNoCC.mkDerivation rec { diff --git a/nix/deps.nix b/nix/deps.nix index d66574b..fe1d574 100644 --- a/nix/deps.nix +++ b/nix/deps.nix @@ -1,6 +1,11 @@ # This file was automatically generated by passthru.fetch-deps. # Please dont edit it manually, your changes might get overwritten! {fetchNuGet}: [ + (fetchNuGet { + pname = "fantomas"; + version = "6.3.10"; + hash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM="; + }) (fetchNuGet { pname = "ApiSurface"; version = "4.0.43"; @@ -11,11 +16,6 @@ version = "6.1.1"; hash = "sha256-tA9nFJmWvoSOo8oFV6wUuatG57a3QSW0jxADc8AzKe0="; }) - (fetchNuGet { - pname = "fantomas"; - version = "6.3.10"; - hash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM="; - }) (fetchNuGet { pname = "Fastenshtein"; version = "1.0.0.8"; @@ -26,6 +26,21 @@ version = "3.0.0-rc3"; hash = "sha256-4Z9Qv+vccrXWh2Fjdwdmjc1YgW+Dcx73ESkdAnHqxOY="; }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.3.2"; + hash = "sha256-UuzjOUvDAWxQuwI9mMJ5Jd9mwtfYSK7KUhW8wNbbZak="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.3.4"; + hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "5.0.2"; + hash = "sha256-YOoosLEiszPsOOaNAkWhFGU04JJKDOFVoA/ggrZMN10="; + }) (fetchNuGet { pname = "FSharp.Core"; version = "6.0.1"; @@ -38,28 +53,28 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; - version = "6.0.35"; - hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; + version = "6.0.36"; + hash = "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "6.0.35"; - hash = "sha256-jM/HzLumZvI939DrNb8LHnEr/in1Lws0j/FAfdXSzbk="; + version = "6.0.36"; + hash = "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "6.0.35"; - hash = "sha256-2eUqoTcqTU3ebv53IV6yvN9EhkOqnyBRd2tz74HuSsE="; + version = "6.0.36"; + hash = "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "6.0.35"; - hash = "sha256-6mY2uBhvKCpEFJLYX9+f1mpYrWdN69i+14DPjO4U8eo="; + version = "6.0.36"; + hash = "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "6.0.35"; - hash = "sha256-ljEkMgkgfEeqzRnmTubjSK2dzkph0cSQ7+2J986F7HI="; + version = "6.0.36"; + hash = "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU="; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; @@ -73,48 +88,48 @@ }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "6.0.35"; - hash = "sha256-yrtPCYD8skaWnfIoaUdQ1dns0YrypxDocskS2WGxF6g="; + version = "6.0.36"; + hash = "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "6.0.35"; - hash = "sha256-maNzxJQ5oCd86VI4ROzl4RqOV1RNXn3qWjrAfBjr2Y0="; + version = "6.0.36"; + hash = "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "6.0.35"; - hash = "sha256-cBcfv7tnZa2xO5T5VOx3/7EvJ5u4/C4dFnV1Jj6VFPU="; + version = "6.0.36"; + hash = "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "6.0.35"; - hash = "sha256-05wMp5+etiV/vgktqGo8+4XB7FNYxwCUKpJsW48tgvQ="; + version = "6.0.36"; + hash = "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; - version = "6.0.35"; - hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; + version = "6.0.36"; + hash = "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "6.0.35"; - hash = "sha256-jPUhSrzqnH1GNi/c7dSnZSQhFNVGdmlAQkDLdXVWBBc="; + version = "6.0.36"; + hash = "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "6.0.35"; - hash = "sha256-Gf3e0EdBEgq8GcZttTHbKGupFlDyB80nhYpBN0X9Kro="; + version = "6.0.36"; + hash = "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "6.0.35"; - hash = "sha256-IGArFhlq3UzZY93lJ+WrB+zmuu/2o8lVwT7MJKpz6DE="; + version = "6.0.36"; + hash = "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "6.0.35"; - hash = "sha256-EtFBg8yBNhAEQlL97oVGiu05rPMSKLd0wE44zTBT7FI="; + version = "6.0.36"; + hash = "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -176,6 +191,11 @@ version = "6.10.1"; hash = "sha256-jOh27AORk0TIhVePDVAgVhh6FuUo2v3oh/Xapcw7UVI="; }) + (fetchNuGet { + pname = "NUnit"; + version = "4.0.1"; + hash = "sha256-jd1CD5nHVXkpvBNpVDJcJyfTggCHLyDBySVSvtrA8Uk="; + }) (fetchNuGet { pname = "NUnit"; version = "4.1.0"; -- 2.51.0 From 714ca381fffe798a0a85ad4ee847be5ee77d86a2 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Thu, 28 Nov 2024 22:11:28 +0000 Subject: [PATCH 2/3] Fix flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d24e57a..82c15dc 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ }; devShells.default = pkgs.mkShell { buildInputs = - [pkgs.alejandra pkgs.dotnet-sdk_8 pkgs.python3 pkgs.nodePackages.markdown-link-check] + [pkgs.alejandra dotnet-sdk pkgs.python3 pkgs.nodePackages.markdown-link-check] ++ ( if pkgs.stdenv.isDarwin then [pkgs.darwin.apple_sdk.frameworks.CoreServices] -- 2.51.0 From e7bcb76d664e10299ea8d217f79fbfcf7ff41a73 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Thu, 28 Nov 2024 22:13:17 +0000 Subject: [PATCH 3/3] More general flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 82c15dc..8085a02 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,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 = '' runHook preInstall -- 2.51.0