Add inline prediction option mirroring the capitalization option #966
Conversation
|
Thank you for the contribution! Looks like the tests are failing, unfortunately. |
|
This is true. I haven't figured out why yet. I've been meaning to take another look but then I got busy 🙃 |
There was a problem hiding this comment.
Looks like all the tests are passing now!
Sorry to nitpick, but we like to maintain a linear history (no merges from master into pull requests) and keep fix‐ups in the same commit (to make git bisect work better and scanning the commit log cleaner). Could you rebase on the upstream commit and squash your two commits together so I can merge this?
$ git rebase b2ee0b3c03b06bd70e4280c65ab8803c3456bb0f
$ git rebase -i HEAD~2
(change "pick" to "f"(ixup) on the fix commit)
|
Ah, alright, no problem. I'll do that when I get back to my computer. |
With 23.05 support dropped, this was pinned to an unsupported version.
These deprecated versions were already made unsupported by LnL7#932.
All supported Nixpkgs versions now support this. This reverts commit a5b0958.
Ensure that LnL7#665 works correctly.
Process substitution behaves better with variables and it's good practice to use `lib.escapeShellArgs`.
As far as I can tell, this isn't required to get fonts to work on NixOS, so we shouldn't require it on nix-darwin either, even if the implementations are superficially similar.
Stricter launchd -> StartCalendarInterval type:
- Verify that the integers passed to `Minute`, `Hour`, etc. are within
range.
- When provided, the value for StartCalendarInterval must be a non-empty
list of calendar intervals and must not contain duplicates entries
(throw an error otherwise).
- For increased flexibility and backwards-compatibility, allow an
attrset to be passed as well (which will be type-checked and is
functionally equivalent to passing a singleton list). Allowing an
attrset or list is precisely in-line with what `launchd.plist(5)`
accepts for StartCalendarInterval.
Migrate `nix.gc.interval` and `nix.optimise.interval` over to use this
new type, and update their defaults to run weekly instead of daily.
Create `modules/launchd/types.nix` file for easier/modular use of
launchd types needed in multiple files.
Documentation:
- Update and improve wording/documentation of launchd's
`StartCalendarInterval`.
- Improve wording/documentation of `nix.gc.interval` and
`nix.optimise.interval` ("time interval" can be misleading as it's
actually a "calendar interval"; e.g. `{ Hour = 3; Minute = 15;}`
runs daily, not every 3.25 hours).
|
I think that should be done, I really appreciate the assist! Please let me know if I need to make any additional changes, thank you! :) EDIT: Crap... I think I made it worse 😑 |
|
Looks like you accidentally moved the new upstream commits after yours – if you run |
Before this commit, aarch64 users building the following configuration
would end up with an aarch64-linux builder, while after it, they get the
x86_64-linux builder they expect:
```nix
nix.linux-builder = {
enable = true;
package = pkgs.darwin.linux-builder-x86_64;
};
```
Before, in order to get an x86_64-linux builder, they would have needed
to use this configuration instead:
```nix
nix.linux-builder = {
enable = true;
config.nixpkgs.hostPlatform = "x86_64-linux";
systems = ["x86_64-linux"];
};
```
The reason for this is that the linux-builder module calls `override` on
the package option, and the `linux-builder-x86_64` package is also
defined using override:
```nix
linux-builder-x86_64 = linux-builder.override {
modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ];
};
```
The module was effectively discarding the `nixpkgs.hostPlatform` option.
Example issue: NixOS/nixpkgs#313784
checks.nix: disable verifyBuildUsers for auto-allocate-uids
|
Sorry for the delayed response - I tried your latest suggestion to no avail, I assume I must not be understanding something? 🤔 I'll keep tinkering |
|
Git’s UI is really awful, it’s not your fault. (I’ll take this opportunity to plug Jujutsu, which makes all of this a lot simpler and easier to recover from; I can’t imagine using Git’s UI directly any more.) In general when working on Nix ecosystem repositories you almost always want to |
|
Jujutsu sounds VERY cool, I'll have to give it a look I'm traveling for work this week, but I'll definitely give your suggestions a try when I can. I really am sorry about all this, I can't tell you how much I appreciate all your help, thank you so much <3 |
No description provided.