|
7 | 7 | flake-parts.url = "github:hercules-ci/flake-parts"; |
8 | 8 | }; |
9 | 9 |
|
10 | | - outputs = inputs @ { |
11 | | - self, |
12 | | - nixpkgs, |
13 | | - flake-parts, |
14 | | - ... |
15 | | - }: let |
16 | | - name = "papis.nvim"; |
| 10 | + outputs = |
| 11 | + inputs@{ |
| 12 | + self, |
| 13 | + nixpkgs, |
| 14 | + flake-parts, |
| 15 | + ... |
| 16 | + }: |
| 17 | + let |
| 18 | + name = "papis.nvim"; |
17 | 19 |
|
18 | | - plugin-overlay = import ./nix/plugin-overlay.nix { |
19 | | - inherit name self; |
20 | | - }; |
21 | | - in |
22 | | - flake-parts.lib.mkFlake {inherit inputs;} { |
| 20 | + plugin-overlay = import ./nix/plugin-overlay.nix { |
| 21 | + inherit name self; |
| 22 | + }; |
| 23 | + in |
| 24 | + flake-parts.lib.mkFlake { inherit inputs; } { |
23 | 25 | systems = [ |
24 | 26 | "x86_64-linux" |
25 | 27 | "x86_64-darwin" |
26 | 28 | "aarch64-darwin" |
27 | 29 | ]; |
28 | | - perSystem = { |
29 | | - config, |
30 | | - self', |
31 | | - inputs', |
32 | | - system, |
33 | | - ... |
34 | | - }: let |
35 | | - ci-overlay = import ./nix/ci-overlay.nix { |
36 | | - inherit self name; |
37 | | - }; |
| 30 | + perSystem = |
| 31 | + { |
| 32 | + config, |
| 33 | + self', |
| 34 | + inputs', |
| 35 | + system, |
| 36 | + ... |
| 37 | + }: |
| 38 | + let |
| 39 | + ci-overlay = import ./nix/ci-overlay.nix { |
| 40 | + inherit self name; |
| 41 | + }; |
38 | 42 |
|
39 | | - pkgs = import nixpkgs { |
40 | | - inherit system; |
41 | | - overlays = [ |
42 | | - plugin-overlay |
43 | | - ci-overlay |
44 | | - ]; |
45 | | - }; |
| 43 | + pkgs = import nixpkgs { |
| 44 | + inherit system; |
| 45 | + overlays = [ |
| 46 | + plugin-overlay |
| 47 | + ci-overlay |
| 48 | + ]; |
| 49 | + }; |
46 | 50 |
|
47 | | - devShell = pkgs.mkShell { |
48 | | - buildInputs = let |
49 | | - nvim-test = pkgs.writeShellApplication { |
50 | | - name = "nvim-test"; |
51 | | - text = let |
52 | | - test-lib-dir = "~/.cache/papis_test_library"; |
| 51 | + devShell = pkgs.mkShell { |
| 52 | + buildInputs = |
| 53 | + let |
| 54 | + nvim-test = pkgs.writeShellApplication { |
| 55 | + name = "nvim-test"; |
| 56 | + text = |
| 57 | + let |
| 58 | + test-lib-dir = "~/.cache/papis_test_library"; |
| 59 | + in |
| 60 | + # bash |
| 61 | + '' |
| 62 | + ${pkgs.coreutils}/bin/rm -rf ${test-lib-dir} |
| 63 | + ${pkgs.coreutils}/bin/cp -r -r ./tests/files/library ${test-lib-dir} |
| 64 | + ${pkgs.neovim-with-plugin}/bin/nvim -c "lua _Load_papis()" -c "e test.md" |
| 65 | + ''; |
| 66 | + }; |
53 | 67 | in |
54 | | - # bash |
55 | | - '' |
56 | | - ${pkgs.coreutils}/bin/rm -rf ${test-lib-dir} |
57 | | - ${pkgs.coreutils}/bin/cp -r -r ./tests/files/library ${test-lib-dir} |
58 | | - ${pkgs.neovim-with-plugin}/bin/nvim -c "lua _Load_papis()" -c "e test.md" |
59 | | - ''; |
60 | | - }; |
61 | | - in [ |
62 | | - pkgs.sqlitebrowser |
63 | | - pkgs.yq-go |
64 | | - pkgs.luajit |
65 | | - nvim-test |
66 | | - ]; |
67 | | - }; |
68 | | - in { |
69 | | - devShells = { |
70 | | - default = devShell; |
71 | | - inherit devShell; |
72 | | - }; |
| 68 | + [ |
| 69 | + pkgs.sqlitebrowser |
| 70 | + pkgs.yq-go |
| 71 | + pkgs.luajit |
| 72 | + nvim-test |
| 73 | + ]; |
| 74 | + }; |
| 75 | + in |
| 76 | + { |
| 77 | + devShells = { |
| 78 | + default = devShell; |
| 79 | + inherit devShell; |
| 80 | + }; |
73 | 81 |
|
74 | | - packages = rec { |
75 | | - default = papis-nvim; |
76 | | - inherit (pkgs.luajitPackages) papis-nvim; |
77 | | - inherit (pkgs) neovim-with-plugin; |
| 82 | + packages = rec { |
| 83 | + default = papis-nvim; |
| 84 | + inherit (pkgs.luajitPackages) papis-nvim; |
| 85 | + inherit (pkgs) neovim-with-plugin; |
| 86 | + }; |
78 | 87 | }; |
79 | | - }; |
80 | 88 | flake = { |
81 | 89 | overlays.default = plugin-overlay; |
82 | 90 | }; |
|
0 commit comments