From e9fa2f6ce78964993427d525aedf7096c3afdcdf Mon Sep 17 00:00:00 2001 From: "D. Moonfire" Date: Mon, 5 Sep 2022 22:22:10 -0500 Subject: [PATCH] feat: switching to .net6 --- flake.lock | 12 ++++++------ flake.nix | 11 +++++++++-- .../MfGames.Markdown.Gemtext.Tests.csproj | 2 +- .../MfGames.Markdown.Gemtext.csproj | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index a918885..b67b61d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638198142, - "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", + "lastModified": 1662019588, + "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a308775674e178495767df90c419425474582a1", + "rev": "2da64a81275b68fdad38af669afeda43d401e94b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d6a1166..3de25d3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A .NET core library for building tools"; + description = "A .NET core library for easily building CLI tools"; inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; @@ -11,7 +11,14 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { devShell = pkgs.mkShell { - buildInputs = [ pkgs.dotnet-sdk_5 pkgs.nodejs-16_x pkgs.nixfmt ]; + buildInputs = [ + pkgs.dotnet-sdk + pkgs.lefthook + pkgs.convco + pkgs.nodePackages.prettier + pkgs.nixfmt + pkgs.jq + ]; }; }); } diff --git a/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj b/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj index 5aa91ba..9720c17 100644 --- a/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj +++ b/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 MfGames.Markdown.Gemini.Tests diff --git a/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj b/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj index 479b8a7..0139a68 100644 --- a/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj +++ b/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 enable