From 19f988cfc14d3ba0aca9f44a59ffcbbd1150aefd Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 13 Jan 2023 21:05:53 +0100 Subject: [PATCH] packages/marksman: drop in favor of upstream package --- packages/lsp/marksman/default.nix | 19 ------------------- packages/packages.nix | 2 -- users/max/home/editor/languages.nix | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 packages/lsp/marksman/default.nix diff --git a/packages/lsp/marksman/default.nix b/packages/lsp/marksman/default.nix deleted file mode 100644 index 7110446..0000000 --- a/packages/lsp/marksman/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ buildDotnetModule, fetchFromGitHub, glibcLocalesUtf8 }: - -buildDotnetModule rec { - pname = "marksman"; - version = "1.0.0-2022-09-13"; - src = fetchFromGitHub { - owner = "artempyanykh"; - repo = "marksman"; - rev = "2022-09-13"; - sha256 = "sha256-87XuapUeeIw+MQ8rosiG7p6SVNOmflBsb3CcvfaUdCU="; - }; - postPatch = '' - substituteInPlace Marksman/Marksman.fsproj \ - --replace 'git describe --always --dirty' 'echo ${src.rev}' - ''; - projectFile = "Marksman.sln"; - nugetDeps = ./deps.nix; - LOCALE_ARCHIVE = "${glibcLocalesUtf8}/lib/locale/locale-archive"; -} diff --git a/packages/packages.nix b/packages/packages.nix index 5ed88a2..bffe1f6 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -56,8 +56,6 @@ in obfuscate = pkgs.callPackage ./apps/obfuscate { }; - marksman = pkgs.callPackage ./lsp/marksman { }; - neovim-gtk = pkgs.callPackage ./apps/neovim-gtk { }; steam-metro-skin = import ./data/misc/steam-metro-skin { inherit (pkgs) fetchzip; }; diff --git a/users/max/home/editor/languages.nix b/users/max/home/editor/languages.nix index 0ec5edb..1b954c4 100644 --- a/users/max/home/editor/languages.nix +++ b/users/max/home/editor/languages.nix @@ -37,7 +37,7 @@ } { language-server = { - command = "${inputs.self.packages.${pkgs.system}.marksman}/bin/marksman"; + command = "${pkgs.marksman}/bin/marksman"; }; name = "markdown"; }