diff --git a/Dmarc.Test/Dmarc.Test.fsproj b/Dmarc.Test/Dmarc.Test.fsproj index de1284c..4bba585 100644 --- a/Dmarc.Test/Dmarc.Test.fsproj +++ b/Dmarc.Test/Dmarc.Test.fsproj @@ -14,7 +14,7 @@ - + diff --git a/flake.lock b/flake.lock index a615715..d85956c 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": 1727686113, - "narHash": "sha256-RG+429Uv2W+X5vdZ8mAngtfC1ppzu28rCWw5R7JC3k0=", + "lastModified": 1735523292, + "narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef7226d68ba45b2de3e428e5d4bb4532caffec7b", + "rev": "6d97d419e5a9b36e6293887a89a078cf85f5a61b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 05b55a2..3a42279 100644 --- a/flake.nix +++ b/flake.nix @@ -42,16 +42,18 @@ ''; }; in { - packages = { - fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash; - fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version (builtins.head (builtins.filter (elem: elem.pname == "fsharp-analyzers") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash; + packages = let + deps = builtins.fromJSON (builtins.readFile ./nix/deps.json); + in { + fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") deps)).hash; + fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version (builtins.head (builtins.filter (elem: elem.pname == "fsharp-analyzers") deps)).hash; default = pkgs.buildDotnetModule { inherit pname version dotnet-sdk dotnet-runtime; name = "Dmarc-dotnet"; src = ./.; projectFile = "./Dmarc.App/Dmarc.App.fsproj"; testProjectFile = "./Dmarc.Test/Dmarc.Test.fsproj"; - nugetDeps = ./nix/deps.nix; # `nix build .#default.passthru.fetch-deps && ./result` and put the result here + nugetDeps = ./nix/deps.json; # `nix build .#default.fetch-deps && ./result` and put the result here doCheck = true; }; }; diff --git a/nix/deps.json b/nix/deps.json new file mode 100644 index 0000000..924f0ef --- /dev/null +++ b/nix/deps.json @@ -0,0 +1,127 @@ +[ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.5.0", + "hash": "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY=" + }, + { + "pname": "fantomas", + "version": "6.3.16", + "hash": "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=" + }, + { + "pname": "fsharp-analyzers", + "version": "0.28.0", + "hash": "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8=" + }, + { + "pname": "FSharp.Core", + "version": "5.0.2", + "hash": "sha256-YOoosLEiszPsOOaNAkWhFGU04JJKDOFVoA/ggrZMN10=" + }, + { + "pname": "FSharp.Core", + "version": "6.0.0", + "hash": "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI=" + }, + { + "pname": "FSharp.Core", + "version": "9.0.100", + "hash": "sha256-V1q3CjbRvWZqxpi6cXD/R0F7pyXGGtH83M5Z/ITDrp8=" + }, + { + "pname": "FsUnit", + "version": "7.0.1", + "hash": "sha256-K85CIdxMeFSHEKZk6heIXp/oFjWAn7dBILKrw49pJUY=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" + }, + { + "pname": "MimeKit", + "version": "4.9.0", + "hash": "sha256-V7M7ejLKzE/RZZPtnUVaPlFq4xo8xViBIlDZ7FWBKAA=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.7.112", + "hash": "sha256-vrItlaH5MpBHa4MI1cQgI11NAe4W3XsxR9DizFE7fus=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "NUnit", + "version": "4.0.1", + "hash": "sha256-jd1CD5nHVXkpvBNpVDJcJyfTggCHLyDBySVSvtrA8Uk=" + }, + { + "pname": "NUnit", + "version": "4.3.1", + "hash": "sha256-7XWgjdgEll4gDLa4p9LpizH+bJzFMIvkQ/olpAXJvCE=" + }, + { + "pname": "NUnit3TestAdapter", + "version": "4.6.0", + "hash": "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ=" + }, + { + "pname": "System.Formats.Asn1", + "version": "8.0.1", + "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Security.Cryptography.Pkcs", + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" + } +] diff --git a/nix/deps.nix b/nix/deps.nix deleted file mode 100644 index aaa1b7a..0000000 --- a/nix/deps.nix +++ /dev/null @@ -1,119 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! -{fetchNuGet}: [ - (fetchNuGet { - pname = "BouncyCastle.Cryptography"; - version = "2.5.0"; - hash = "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY="; - }) - (fetchNuGet { - pname = "fantomas"; - version = "6.3.16"; - hash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs="; - }) - (fetchNuGet { - pname = "fsharp-analyzers"; - version = "0.28.0"; - hash = "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8="; - }) - (fetchNuGet { - pname = "FSharp.Core"; - version = "6.0.0"; - hash = "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI="; - }) - (fetchNuGet { - pname = "FSharp.Core"; - version = "9.0.100-beta.24422.2"; - hash = "sha256-J72a8/QJEBfzlZKArJxoYkwY9mkDmZo9qsCRTmKv6lM="; - }) - (fetchNuGet { - pname = "FsUnit"; - version = "7.0.0"; - hash = "sha256-eoHwX2wPrmP8Wgq2v91tWJvQG+5v4iNYG5jMLPwKXNc="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Tasks.Git"; - version = "8.0.0"; - hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "17.12.0"; - hash = "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "17.12.0"; - hash = "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg="; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.Common"; - version = "8.0.0"; - hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.GitHub"; - version = "8.0.0"; - hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.12.0"; - hash = "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.TestHost"; - version = "17.12.0"; - hash = "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="; - }) - (fetchNuGet { - pname = "MimeKit"; - version = "4.9.0"; - hash = "sha256-V7M7ejLKzE/RZZPtnUVaPlFq4xo8xViBIlDZ7FWBKAA="; - }) - (fetchNuGet { - pname = "Nerdbank.GitVersioning"; - version = "3.7.112"; - hash = "sha256-vrItlaH5MpBHa4MI1cQgI11NAe4W3XsxR9DizFE7fus="; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "13.0.1"; - hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; - }) - (fetchNuGet { - pname = "NUnit"; - version = "4.3.1"; - hash = "sha256-7XWgjdgEll4gDLa4p9LpizH+bJzFMIvkQ/olpAXJvCE="; - }) - (fetchNuGet { - pname = "NUnit3TestAdapter"; - version = "4.6.0"; - hash = "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ="; - }) - (fetchNuGet { - pname = "System.Formats.Asn1"; - version = "8.0.1"; - hash = "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="; - }) - (fetchNuGet { - pname = "System.Reflection.Metadata"; - version = "1.6.0"; - hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Pkcs"; - version = "8.0.1"; - hash = "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="; - }) -]