|
5 | 5 | { self, nixpkgs, ... }: |
6 | 6 | let |
7 | 7 | pname = "vim-fennel-syntax"; |
| 8 | + |
8 | 9 | version = "${version_base}+sha.${version_sha}"; |
9 | 10 | version_base = "1.2.0"; |
10 | 11 | version_sha = self.shortRev or self.dirtyShortRev or "unknown"; |
|
23 | 24 | f ( |
24 | 25 | import nixpkgs { |
25 | 26 | inherit system; |
26 | | - overlays = [ overlay ]; |
| 27 | + overlays = [ |
| 28 | + devOverlay |
| 29 | + overlay |
| 30 | + ]; |
27 | 31 | } |
28 | 32 | ) |
29 | 33 | ); |
30 | 34 |
|
31 | | - overlay = final: prev: { |
| 35 | + devOverlay = final: prev: { |
32 | 36 | luajit = prev.luajit.override { |
33 | 37 | packageOverrides = self: super: { |
34 | 38 | gumbo = self.buildLuarocksPackage rec { |
|
43 | 47 | }; |
44 | 48 | }; |
45 | 49 | }; |
| 50 | + formatter = final.writeShellApplication { |
| 51 | + name = "${pname}-formatter"; |
| 52 | + runtimeInputs = with final; [ |
| 53 | + vim-vint |
| 54 | + nixfmt-rfc-style |
| 55 | + ]; |
| 56 | + text = '' |
| 57 | + mapfile -t files < <(git ls-files --exclude-standard) |
| 58 | + for file in "''${files[@]}"; do |
| 59 | + case "''${file##*.}" in |
| 60 | + vim) |
| 61 | + vint "$file" & |
| 62 | + ;; |
| 63 | + nix) |
| 64 | + nixfmt -w80 "$file" & |
| 65 | + ;; |
| 66 | + esac |
| 67 | + done |
| 68 | + ''; |
| 69 | + }; |
| 70 | + }; |
46 | 71 |
|
| 72 | + overlay = final: prev: { |
47 | 73 | m15aVimPlugins = |
48 | 74 | let |
49 | 75 | inherit (final) lib; |
|
63 | 89 | }; |
64 | 90 | } |
65 | 91 | ); |
66 | | - |
67 | | - formatter = final.writeShellApplication { |
68 | | - name = "${pname}-formatter"; |
69 | | - runtimeInputs = with final; [ |
70 | | - nixfmt-rfc-style |
71 | | - vim-vint |
72 | | - ]; |
73 | | - text = '' |
74 | | - mapfile -t files < <(git ls-files --exclude-standard) |
75 | | - for file in "''${files[@]}"; do |
76 | | - case "''${file##*.}" in |
77 | | - nix) |
78 | | - nixfmt -w80 "$file" |
79 | | - ;; |
80 | | - vim) |
81 | | - vint "$file" |
82 | | - ;; |
83 | | - esac |
84 | | - done |
85 | | - ''; |
86 | | - }; |
87 | 92 | }; |
88 | 93 | in |
89 | 94 | { |
90 | | - overlays.default = final: prev: { |
91 | | - inherit (overlay final prev) m15aVimPlugins; |
92 | | - }; |
| 95 | + overlays.default = overlay; |
93 | 96 |
|
94 | 97 | packages = forDefaultSystems (pkgs: { |
95 | 98 | default = pkgs.m15aVimPlugins.${pname}; |
|
0 commit comments