diff --git a/flake.nix b/flake.nix index 27181f0b..4f2f9a22 100644 --- a/flake.nix +++ b/flake.nix @@ -38,12 +38,6 @@ inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; }; }; nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; inputs.nixpkgs.follows = "nixpkgs"; }; - lsp-devtools = { url = "github:CHN-beta/lsp-devtools"; inputs.nixpkgs.follows = "nixpkgs"; }; - esbonio = - { - url = "github:swyddfa/esbonio"; - inputs = { nixpkgs.follows = "nixpkgs"; lsp-devtools.follows = "lsp-devtools"; }; - }; }; outputs = inputs: diff --git a/local/pkgs/default.nix b/local/pkgs/default.nix index e285d5d7..58e83105 100644 --- a/local/pkgs/default.nix +++ b/local/pkgs/default.nix @@ -40,4 +40,5 @@ }; cppcoro = callPackage ./cppcoro {}; date = callPackage ./date {}; + esbonio = python3Packages.callPackage ./esbonio {}; } diff --git a/local/pkgs/esbonio/default.nix b/local/pkgs/esbonio/default.nix new file mode 100644 index 00000000..5261471b --- /dev/null +++ b/local/pkgs/esbonio/default.nix @@ -0,0 +1,11 @@ +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec +{ + pname = "esbonio"; + version = "0.16.3"; + src = fetchPypi + { + inherit pname version; + sha256 = "1ggxdzl95fy0zxpyd1pcylhif1x604wk4wy7sv9322hc84b708zx"; + }; + doCheck = false; +} diff --git a/modules/default.nix b/modules/default.nix index fe59f517..90725ffd 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -25,7 +25,6 @@ inputs: topInputs.napalm.overlays.default topInputs.pnpm2nix-nzbr.overlays.default topInputs.lmix.overlays.default - topInputs.esbonio.overlays.default topInputs.aagl.overlays.default (import "${topInputs.dguibert-nur-packages}/overlays/nvhpc-overlay") (final: prev: diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 38d87e28..95da5371 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -389,7 +389,7 @@ inputs: _pythonPackages = [(pythonPackages: with pythonPackages; [ # required by vscode extensions restrucuredtext - esbonio + localPackages.esbonio ])]; }; users.sharedModules =