Add Support for Darwin/macOS Hosts #438

montchr · 2022-02-28T01:39:00Z

Redo of https://github.com/divnix/digga-old/pull/111

Fixes #440 (used to be divnix/digga-old#16)

TODO

Checks succeed in each example flake
- hmOnly
- groupByConfig
- devos
Fix Darwinia.tests = [ allProfiles ] in groupByConfig example
Update devos example for compatibility
Test on a real Apple computer to manage a real system configuration

Miscellaneous/Cleanup

Determine next steps for tracking nix-darwin to address missing lib option (see https://github.com/divnix/digga-old/pull/111#issuecomment-1014661785)
- If Add top-level lib option based on NixOS LnL7/nix-darwin#429 is merged before this PR is ready to go, then update the input URL to point back to the upstream repo
- If the nix-darwin PR mentioned above is not yet merged, then consider forking nix-darwin in the divnix org
- Otherwise, continue tracking https://github.com/montchr/nix-darwin/tree/add-toplevel-option-lib and make that a protected branch
Clean up commit history
Run nix build .#mkApiReference*
Revert changes made for testing purposes
Point the examples' digga inputs to release

Notes

I wanted to take as much "magic" as possible out of the new changes to fup-adapter.nix to make it easier to debug. So there may be some opportunity for introducing some abstractions in that file down the line, but for now I'd like to keep things less complex through repetition.

src/mkFlake/fup-adapter.nix

montchr · 2022-02-28T01:58:34Z

src/mkFlake/fup-adapter.nix

@@ -75,14 +126,10 @@ let
      )
      config.channels;

-    hostDefaults = flake-utils-plus.lib.mergeAny (stripHost config.nixos.hostDefaults) {


https://github.com/divnix/digga-old/pull/111#discussion_r796272327

src/mkFlake/fup-adapter.nix

shell.nix

montchr · 2022-02-28T05:44:30Z

I'm now using digga.lib.mkFlake in all my system configurations, including three darwin systems, one of which is my primary machine. The switch from flake-utils-plus was actually really seamless! More deletions than additions in the diff, which I usually take as a good sign. montchr/dotfield@aa49be3

I'm not yet making use of the home-manager profiles because currently my "user" profiles are laced with a lot of system-scoped config, among other oddities. It's a work in progress.

So with that, I've checked off the "Test on a real Apple computer to manage a real system configuration" task. There's a few more to go but it feels like this is getting pretty close to done 😸

Next up, I'll be taking a look into the DevOS example and identifying what might need updating there.

Pacman99 · 2022-02-28T06:10:23Z

Wow thats amazing :) This is indeed looking close to being done!

You should add your flake to the "In the Wild" section in the README

441: fix: use gnu sed in shell tests for cross-platform compatibility r=montchr a=montchr Darwin's use of BSD `sed` breaks here because BSD `sed` has a different argument signature. Spun off from #438 as suggested in #438 (comment) Co-authored-by: Chris Montgomery <[email protected]>

montchr · 2022-04-24T16:53:19Z

@bjw-s I've force-pushed some updates to this branch, which includes a fix for the issue you ran into while building the example host.

montchr · 2022-04-24T17:53:18Z

@Pacman99 I think this is ready to merge, aside from rebuilding my nix-darwin system with the latest from this branch, in addition to addressing your suggestion:

One change I want to make before merging is to have all the templates refer to the digga release instead of main, so we can test main a bit more before people start using it.

What did you have in mind exactly? Since the examples have all been updated for compatibility with this branch, pinning them to the previous version would break, right? Also feel free to push commits to this branch or open a PR against it. I don't plan on making any more force-pushes at this point so let's consider the history stable.

bjw-s · 2022-04-25T09:31:35Z

@bjw-s I've force-pushed some updates to this branch, which includes a fix for the issue you ran into while building the example host.

Thanks for the update! I can confirm that I am able to get nix build .#darwinConfigurations.delphi.system to work now (delphi is my hostname), however, when running ./result/sw/bin/darwin-rebuild switch --flake . I get this:

building the system configuration...
error: The option `_module.args.pkgs' is defined multiple times.

       Definition values:
       - In `/nix/store/2asxcb3djbp24yz7kg2j7lj5m0yqfh3b-source/eval-config.nix'
       - In `<unknown-file>'
(use '--show-trace' to show detailed location information)

My repo is here, should that provide any additional insight.

Edit:
Additionally, if I set the machine system to aarch64-darwin, the build will fail because nix-index cannot be compiled for it (it seems to be coming from the core.common profile).

I've found this gist (through this NixOS forum post) where the author is overriding the package arch, but unfortunately I have no idea how I would port this to the devos structure.

grimsleydl · 2022-04-27T13:30:12Z

If it helps narrow it down, I get the same error: The option `_module.args.pkgs' is defined multiple times error on an Intel Mac, both with the trivial default config as-is and with the hostname/username adjusted to reflect the actual host.

kid · 2022-04-27T14:00:07Z

that error seems to comes from gytis-ivaskevicius/flake-utils-plus#113

I've been facing the same issue for days while using flake-utils-plus directly with nix-darwin and only found the culprit today

Pacman99 · 2022-04-27T20:37:33Z

Yeah I'm good with merging this directly. I guess I was thinking of a way to encourage people to use the release tag for digga, instead of main. But its fine, the checks pass in this branch and the code all looks good so it should be stable.

LnL7/nix-darwin#429 was merged recently, providing the top-level `lib` option

the version in the 21.11 channel is old and doesn't include support for `aarch64-darwin`. this version does.

montchr · 2022-04-28T00:09:57Z

@bjw-s

Additionally, if I set the machine system to aarch64-darwin, the build will fail because nix-index cannot be compiled for it (it seems to be coming from the core.common profile).

Looks like this is fixed in nix-community/nix-index@0634333 which is not available in the version of nix-index pulled from nixos-21.11. The stable channel version is from 2018! Looks like nixos-unstable currently has a version that should work. I've added it to overrides.nix in e6b14d3 – does that fix the issue you ran into with that package?

I've found this gist (through this NixOS forum post) where the author is overriding the package arch, but unfortunately I have no idea how I would port this to the devos structure.

As an overlay, it could be added directly to channels.nixpkgs-darwin-stable.overlays:

digga/examples/devos/flake.nix

Line 81 in e6b14d3

overlays = [ ];

Or you could, for example, create a file in the overlays/ directory, which would be imported automatically by the existing importOverlays invocation in channels.nixpkgs-darwin-stable.imports.

I don't have a sense of how common a scenario like the one you ran into with nix-index might be – at this point, the M1 Macs have been out for a while so I'm guessing a lot of folks have already updated their packages? nix-index seems like it might be an outlier since I take it you didn't run into that error with any other packages included by default in examples/devos/, and also as mentioned above, the version in the stable channel is very old. Perhaps we could add an overlay like that as a future enchantment later, but I'm not even able to test it at the moment 🙂

montchr · 2022-04-28T00:17:38Z

If it helps narrow it down, I get the same error: The option `_module.args.pkgs' is defined multiple times error on an Intel Mac, both with the trivial default config as-is and with the hostname/username adjusted to reflect the actual host.

@bjw-s @grimsleydl @kid Assuming that the issue is coming from gytis-ivaskevicius/flake-utils-plus#113 do either of these fixes help?

Pacman99 · 2022-04-28T02:01:02Z

Thank you for the amazing work @montchr!! Glad to see Darwin support become a reality.

montchr · 2022-04-28T02:07:39Z

Thanks for the support! It's been a journey.

montchr mentioned this pull request Feb 28, 2022

Add top-level lib option based on NixOS LnL7/nix-darwin#429

Merged

montchr self-assigned this Feb 28, 2022

montchr commented Feb 28, 2022

View reviewed changes

src/mkFlake/fup-adapter.nix Outdated Show resolved Hide resolved

montchr commented Feb 28, 2022

View reviewed changes

src/mkFlake/fup-adapter.nix Show resolved Hide resolved

montchr marked this pull request as ready for review February 28, 2022 02:17

Pacman99 reviewed Feb 28, 2022

View reviewed changes

shell.nix Outdated Show resolved Hide resolved

montchr force-pushed the darwin-support branch from e8423ee to 0e50233 Compare March 5, 2022 16:50

montchr mentioned this pull request Mar 5, 2022

fix: use gnu sed in shell tests for cross-platform compatibility #441

Merged

montchr force-pushed the darwin-support branch from d282cd5 to 2dbbe20 Compare March 11, 2022 05:47

montchr force-pushed the darwin-support branch 2 times, most recently from bcf1acf to dc86f3a Compare March 27, 2022 18:40

montchr mentioned this pull request Mar 27, 2022

"Check & Cachix" workflow failing on main #443

Closed

montchr force-pushed the darwin-support branch from 0e57f15 to 4547745 Compare March 28, 2022 14:08

This comment was marked as resolved.

Sign in to view

bors bot added a commit that referenced this pull request Mar 29, 2022

Try #438:

4daa53d

montchr mentioned this pull request Mar 29, 2022

fix: include darwin in supported systems divnix/std#47

Merged

This comment was marked as outdated.

Sign in to view

montchr mentioned this pull request Mar 30, 2022

Set devshell subflake inputs to track parent flake inputs #445

Closed

montchr force-pushed the darwin-support branch 2 times, most recently from cddc1fc to 3424505 Compare March 30, 2022 20:07

This comment was marked as resolved.

Sign in to view

montchr added 7 commits April 24, 2022 12:27

devos: devshell: use platform checks from stdenv

780620d

devos: devshell: reorder + cleanup

4438b0f

feat: add function to filter hosts from an attrset by system

698551e

darwin: avoid checking unsupported flake outputs

b4f74f5

devos: darwin-specific profile customizations

41a49ae

chore: docs + formatting

8232e94

devos: move common overlays to sharedOverlays for fup passthrough

89d9b3e

montchr force-pushed the darwin-support branch from 413a73e to f5f1e2d Compare April 24, 2022 16:50

montchr added 3 commits April 27, 2022 19:09

docs: update api references

139d6e6

chore: update inputs

dd8d0b7

darwin: standardize nix-darwin input and nixpkgs-darwin-stable usages

64bd638

LnL7/nix-darwin#429 was merged recently, providing the top-level `lib` option

montchr force-pushed the darwin-support branch from 1c39bc2 to 64bd638 Compare April 27, 2022 23:21

devos: override nix-index pkg with latest

e6b14d3

the version in the 21.11 channel is old and doesn't include support for `aarch64-darwin`. this version does.

chore: restore examples digga input branch to main

580fc57

montchr merged commit 6a31b63 into main Apr 28, 2022

montchr deleted the darwin-support branch April 28, 2022 00:24

montchr restored the darwin-support branch April 28, 2022 00:24

montchr mentioned this pull request Apr 28, 2022

devos/darwin: refine users #460

Open

Pacman99 deleted the darwin-support branch May 4, 2022 20:15

montchr mentioned this pull request Aug 3, 2022

use realChannel to overlay #483

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Support for Darwin/macOS Hosts #438

Add Support for Darwin/macOS Hosts #438

montchr commented Feb 28, 2022 •

edited

Loading

montchr Feb 28, 2022

montchr commented Feb 28, 2022

Pacman99 commented Feb 28, 2022

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

montchr commented Apr 24, 2022

montchr commented Apr 24, 2022 •

edited

Loading

bjw-s commented Apr 25, 2022 •

edited

Loading

grimsleydl commented Apr 27, 2022

kid commented Apr 27, 2022 •

edited

Loading

Pacman99 commented Apr 27, 2022

montchr commented Apr 28, 2022

montchr commented Apr 28, 2022

Pacman99 commented Apr 28, 2022

montchr commented Apr 28, 2022

Add Support for Darwin/macOS Hosts #438

Add Support for Darwin/macOS Hosts #438

Conversation

montchr commented Feb 28, 2022 • edited Loading

TODO

Miscellaneous/Cleanup

Notes

montchr Feb 28, 2022

Choose a reason for hiding this comment

montchr commented Feb 28, 2022

Pacman99 commented Feb 28, 2022

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

montchr commented Apr 24, 2022

montchr commented Apr 24, 2022 • edited Loading

bjw-s commented Apr 25, 2022 • edited Loading

grimsleydl commented Apr 27, 2022

kid commented Apr 27, 2022 • edited Loading

Pacman99 commented Apr 27, 2022

montchr commented Apr 28, 2022

montchr commented Apr 28, 2022

Pacman99 commented Apr 28, 2022

montchr commented Apr 28, 2022

montchr commented Feb 28, 2022 •

edited

Loading

montchr commented Apr 24, 2022 •

edited

Loading

bjw-s commented Apr 25, 2022 •

edited

Loading

kid commented Apr 27, 2022 •

edited

Loading