diff --git a/pkgs/by-name/ma/marksman/deps.json b/pkgs/by-name/ma/marksman/deps.json index 9de1401afc3b..7ed1a5f60a80 100644 --- a/pkgs/by-name/ma/marksman/deps.json +++ b/pkgs/by-name/ma/marksman/deps.json @@ -1,23 +1,33 @@ [ { "pname": "coverlet.collector", - "version": "6.0.2", - "hash": "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo=" + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" }, { "pname": "fantomas", "version": "6.3.16", "hash": "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=" }, + { + "pname": "FSharp.Core", + "version": "6.0.0", + "hash": "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI=" + }, + { + "pname": "FSharp.Core", + "version": "6.0.6", + "hash": "sha256-58TuDbZAOEYdHCXtYNH6Jo9n9pO2+o4vEYEhoj/PYdU=" + }, { "pname": "FSharp.SystemCommandLine", - "version": "0.13.0-beta4", - "hash": "sha256-QDT7vllfe978acAmSXltWXsnG/LZOEWTb1C85vBDBYI=" + "version": "2.0.0", + "hash": "sha256-UCokH9l8iFfhVC8HqwqPhugd0NEgePxwIUTSg0/7l40=" }, { "pname": "FSharpPlus", - "version": "1.6.1", - "hash": "sha256-MGwxfDTg6gJiS88yiqi1OGJk5WmaAFkVniniwF9Ilkc=" + "version": "1.8.0", + "hash": "sha256-XcIPe4EoP2hLmtk5iOULRAK1qk322/juVZ4FK5Hyq7E=" }, { "pname": "Glob", @@ -26,28 +36,23 @@ }, { "pname": "Markdig", - "version": "0.38.0", - "hash": "sha256-5DuDlj+TCDJWP8oJM2WU48ps3HFuUg5P28O/SPcjwGk=" + "version": "0.43.0", + "hash": "sha256-lUdjtLzSxAI0BEMdIgEc3fZ/VR8NO0gKSs1k6mgy6zU=" }, { "pname": "MessagePack", - "version": "2.5.108", - "hash": "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI=" + "version": "2.5.192", + "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU=" }, { "pname": "MessagePack.Annotations", - "version": "2.5.108", - "hash": "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk=" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "7.0.0", - "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + "version": "2.5.192", + "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "18.0.1", + "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY=" }, { "pname": "Microsoft.CSharp", @@ -56,74 +61,49 @@ }, { "pname": "Microsoft.NET.StringTools", - "version": "17.4.0", - "hash": "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo=" + "version": "17.6.3", + "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + "version": "18.0.1", + "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "18.0.1", + "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "18.0.1", + "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4=" }, { - "pname": "Microsoft.VisualStudio.Threading", - "version": "17.6.40", - "hash": "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc=" - }, - { - "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.6.40", - "hash": "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0=" + "pname": "Microsoft.VisualStudio.Threading.Only", + "version": "17.13.61", + "hash": "sha256-OhXEAuF9PZAkZuHqHwdVODLjA/rIMqmD7nXJfVAQWA8=" }, { "pname": "Microsoft.VisualStudio.Validation", - "version": "17.6.11", - "hash": "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + "version": "17.8.8", + "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms=" }, { "pname": "Nerdbank.Streams", - "version": "2.10.66", - "hash": "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI=" - }, - { - "pname": "Newtonsoft.Json", - "version": "13.0.1", - "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + "version": "2.12.87", + "hash": "sha256-BglFZT1nSyJO8mB235sP5yyu51iaGXwRHSOV8aeeY2A=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, { "pname": "Newtonsoft.Json", "version": "9.0.1", @@ -131,13 +111,18 @@ }, { "pname": "Serilog", - "version": "2.11.0", - "hash": "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds=" + "version": "2.10.0", + "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + }, + { + "pname": "Serilog", + "version": "2.12.0", + "hash": "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM=" }, { "pname": "Serilog.Sinks.Console", - "version": "4.0.1", - "hash": "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA=" + "version": "4.1.0", + "hash": "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y=" }, { "pname": "Snapper", @@ -146,8 +131,8 @@ }, { "pname": "StreamJsonRpc", - "version": "2.16.36", - "hash": "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68=" + "version": "2.22.23", + "hash": "sha256-SRk+00fzJk/jA2dbQbYE/udmcZgqVkscgZT8yi+D2NY=" }, { "pname": "System.Collections", @@ -156,29 +141,19 @@ }, { "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" }, { "pname": "System.CommandLine", - "version": "2.0.0-beta4.22272.1", - "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + "version": "2.0.0", + "hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "7.0.2", - "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", @@ -194,20 +169,10 @@ "version": "4.1.0", "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.Pipelines", - "version": "7.0.0", - "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "System.Linq", @@ -219,11 +184,6 @@ "version": "4.1.0", "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -234,21 +194,6 @@ "version": "4.1.0", "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", @@ -256,18 +201,8 @@ }, { "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" }, { "pname": "System.Resources.ResourceManager", @@ -279,41 +214,16 @@ "version": "4.1.0", "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, { "pname": "System.Text.Encoding", "version": "4.0.11", @@ -324,16 +234,6 @@ "version": "4.0.11", "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "7.0.0", - "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=" - }, - { - "pname": "System.Text.Json", - "version": "7.0.3", - "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" - }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", @@ -349,21 +249,6 @@ "version": "4.0.11", "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, - { - "pname": "System.Threading.Tasks.Dataflow", - "version": "7.0.0", - "hash": "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", @@ -376,13 +261,13 @@ }, { "pname": "Tomlyn", - "version": "0.17.0", - "hash": "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY=" + "version": "0.19.0", + "hash": "sha256-TPw6K1JzN1FUyGSpANHu5lDW2mFN1sg0apMNKMOBX+8=" }, { "pname": "xunit", - "version": "2.9.2", - "hash": "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo=" + "version": "2.9.3", + "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c=" }, { "pname": "xunit.abstractions", @@ -391,32 +276,32 @@ }, { "pname": "xunit.analyzers", - "version": "1.16.0", - "hash": "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU=" + "version": "1.18.0", + "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0=" }, { "pname": "xunit.assert", - "version": "2.9.2", - "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4=" + "version": "2.9.3", + "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" }, { "pname": "xunit.core", - "version": "2.9.2", - "hash": "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8=" + "version": "2.9.3", + "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw=" }, { "pname": "xunit.extensibility.core", - "version": "2.9.2", - "hash": "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c=" + "version": "2.9.3", + "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g=" }, { "pname": "xunit.extensibility.execution", - "version": "2.9.2", - "hash": "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80=" + "version": "2.9.3", + "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw=" }, { "pname": "xunit.runner.visualstudio", - "version": "2.8.2", - "hash": "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60=" + "version": "3.1.5", + "hash": "sha256-O5657884QGldszsEWQFCDRTXViFBmZ4GGC+4iU+usSQ=" } ] diff --git a/pkgs/by-name/ma/marksman/package.nix b/pkgs/by-name/ma/marksman/package.nix index 444b35a6ee94..a067a757f511 100644 --- a/pkgs/by-name/ma/marksman/package.nix +++ b/pkgs/by-name/ma/marksman/package.nix @@ -3,23 +3,27 @@ fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - marksman, - testers, + nix-update-script, + versionCheckHook, }: -buildDotnetModule rec { +let pname = "marksman"; - version = "2024-12-18"; + dotnet-sdk = dotnetCorePackages.sdk_9_0_1xx-bin; +in +buildDotnetModule (finalAttrs: { + inherit pname dotnet-sdk; + version = "2025-11-30"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; - rev = version; - sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to="; + tag = finalAttrs.version; + hash = "sha256-rEGMh4QsxTe35psbflYGgjjDDf0TzvItkx/ARE8ZC1E="; }; projectFile = "Marksman/Marksman.fsproj"; - dotnetBuildFlags = [ "-p:VersionString=${version}" ]; + dotnetBuildFlags = [ "-p:VersionString=${finalAttrs.version}" ]; __darwinAllowLocalNetworking = true; @@ -28,22 +32,20 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; postInstall = '' install -m 644 -D -t "$out/share/doc/${pname}" LICENSE ''; passthru = { - updateScript = ./update.sh; - tests.version = testers.testVersion { - package = marksman; - command = "marksman --version"; - }; + updateScript = nix-update-script { }; }; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { description = "Language Server for Markdown"; longDescription = '' Marksman is a program that integrates with your editor @@ -54,12 +56,12 @@ buildDotnetModule rec { references that enable Zettelkasten-like note taking. ''; homepage = "https://github.com/artempyanykh/marksman"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stasjok plusgut ]; platforms = dotnet-sdk.meta.platforms; - mainProgram = "marksman"; + mainProgram = pname; }; -} +}) diff --git a/pkgs/by-name/ma/marksman/update.sh b/pkgs/by-name/ma/marksman/update.sh deleted file mode 100755 index b17097e683c4..000000000000 --- a/pkgs/by-name/ma/marksman/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -#shellcheck shell=bash - -set -eu -o pipefail - -version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/artempyanykh/marksman/releases/latest | jq -e -r .tag_name) -old_version=$(nix-instantiate --eval -A marksman.version | jq -e -r) - -if [[ $version == "$old_version" ]]; then - echo "New version same as old version, nothing to do." >&2 - exit 0 -fi - -update-source-version marksman "$version" - -$(nix-build -A marksman.fetch-deps --no-out-link)