Skip to content

Commit 5b5548d

Browse files
authored
Merge pull request #1319 from taylrfnt/feat-darwinModule
introduce `darwinModules` to flake & minor meta cleanup for new doc links
2 parents 2b53f64 + eab2243 commit 5b5548d

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ it above in your description.
2424
-->
2525

2626
[editorconfig]: https://editorconfig.org
27-
[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes
28-
[hacking nvf]: https://notashelf.github.io/nvf/index.xhtml#sec-guidelines
27+
[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/manual/release-notes
28+
[hacking nvf]: https://nvf.notashelf.dev/hacking.html#sec-guidelines
2929

3030
- [ ] I have updated the [changelog] as per my changes
3131
- [ ] I have tested, and self-reviewed my code

docs/manual/release-notes/rl-0.9.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727

2828
## Changelog {#sec-release-0-9-changelog}
2929

30+
[taylrfnt](https://github.com/taylrfnt)
31+
32+
- Introduce a `darwinModule` option for Darwin users. The ergonomics of
33+
importing a `nixosModule` into a Darwin flake were less than ideal, and when
34+
users fork and update npins, they are prone to encountering errors like the
35+
following:
36+
37+
```shell
38+
(class: "nixos") cannot be imported into a module
39+
evaluation that expects class "darwin".
40+
```
41+
3042
[suimong](https://github.com/suimong):
3143

3244
- Fix `vim.tabline.nvimBufferline` where `setupOpts.options.hover` requires

flake.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@
5353
''
5454
self.nixosModules.nvf;
5555
};
56+
57+
darwinModules = {
58+
nvf = import ./flake/modules/nixos.nix {inherit lib inputs;};
59+
default = self.darwinModules.nvf;
60+
};
5661
};
5762

5863
perSystem = {pkgs, ...}: {

0 commit comments

Comments
 (0)