Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build(nix): update ci
Browse files Browse the repository at this point in the history
mrcjkb committed Apr 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent f2e3737 commit 00bd32e
Showing 4 changed files with 44 additions and 1 deletion.
17 changes: 17 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -35,6 +35,11 @@
url = "github:nvim-neotest/neotest";
flake = false;
};

nvim-nio = {
url = "github:nvim-neotest/nvim-nio";
flake = false;
};
};

outputs = inputs @ {
@@ -46,6 +51,7 @@
neodev-nvim,
plenary-nvim,
neotest,
nvim-nio,
...
}: let
name = "neotest-haskell";
@@ -57,7 +63,16 @@
"x86_64-linux"
];

ci-overlay = import ./nix/ci-overlay.nix {inherit (inputs) self neodev-nvim plenary-nvim neotest;};
ci-overlay = import ./nix/ci-overlay.nix {
inherit
(inputs)
self
neodev-nvim
plenary-nvim
neotest
nvim-nio
;
};

nvim-plugin-overlay = import ./nix/nvim-plugin-overlay.nix {
inherit name;
4 changes: 4 additions & 0 deletions lua/neotest-haskell/health.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
local health = {}

local h = vim.health or require('health')
---@diagnostic disable-next-line: deprecated
local start = h.start or h.report_start
---@diagnostic disable-next-line: deprecated
local ok = h.ok or h.report_ok
---@diagnostic disable-next-line: deprecated
local error = h.error or h.report_error
---@diagnostic disable-next-line: deprecated
local warn = h.warn or h.report_warn

---@class LuaDependency
7 changes: 7 additions & 0 deletions nix/ci-overlay.nix
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
neodev-nvim,
plenary-nvim,
neotest,
nvim-nio,
}: final: prev:
with final.lib;
with final.stdenv; let
@@ -24,6 +25,11 @@ with final.stdenv; let
src = neotest;
};

nio-plugin = final.pkgs.vimUtils.buildVimPlugin {
name = "nvim-nio";
src = nvim-nio;
};

nvim-treesitter-plugin = final.pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [p.haskell]);

mkPlenaryTest = {
@@ -43,6 +49,7 @@ with final.stdenv; let
plenary-plugin
nvim-treesitter-plugin
neotest-plugin
nio-plugin
];
};
};

0 comments on commit 00bd32e

Please sign in to comment.