From 1175402b41fb9b782b895fe83f82e2085a4a90ed Mon Sep 17 00:00:00 2001 From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:00:02 +0000 Subject: [PATCH] Fix flake after nixpkgs upgrade (#92) --- .envrc | 1 + .gitignore | 1 + flake.nix | 10 ++-------- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 66a50dc..4cf5467 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ riderModule.iml .vs/ *.log result +.direnv/ diff --git a/flake.nix b/flake.nix index 51746c7..a2907d6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ projectFile = "./AdventOfCode2022.App/AdventOfCode2022.App.fsproj"; testProjectFile = "./AdventOfCode2022.Test/AdventOfCode2022.Test.fsproj"; pname = "AdventOfCode2022"; - dotnet-sdk = pkgs.dotnet-sdk_8; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_8_0; dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; version = "0.0.1"; dotnetTool = toolName: toolVersion: hash: @@ -54,13 +54,7 @@ }; }; devShell = pkgs.mkShell { - buildInputs = with pkgs; [ - (with dotnetCorePackages; - combinePackages [ - dotnet-sdk_8 - dotnetPackages.Nuget - ]) - ]; + buildInputs = [dotnet-sdk]; packages = [ pkgs.alejandra pkgs.nodePackages.markdown-link-check