Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Darwin mgmt #37

Merged
merged 22 commits into from
Sep 30, 2024
Merged

Darwin mgmt #37

merged 22 commits into from
Sep 30, 2024

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Sep 30, 2024

Incorporates #21 #34 mostly

lucperkins and others added 17 commits September 23, 2024 17:53
@lucperkins
Remove nix-daemon settings from nix-darwin module
a08d0bf
@lucperkins
Reinstate dnixd settings
d569963
@lucperkins
Use /usr/local/bin path for dnixd
66a2ea8
@lucperkins
Undo renaming the launchd service config
9b5eb0e
@grahamc
Pass 'daemon' to determinate-nidx
ccf80e5
@grahamc
Try to disable the upstream units, and set our own
46f7e9c
@grahamc
Update rev, for determinate-nixd v0.2
ab1d003
@grahamc
flake.lock: Update
f5a1a57 
Flake lock file updates:

• Updated input 'determinate-nixd-aarch64-darwin':
    'https://install.determinate.systems/determinate-nixd/rev/2c18a8f38492d35be64d4e497b720938f17cc9f5/macOS?narHash=sha256-tmW%2BSqn9cautArLTych0mnKXD1abtaAuJGCUCrtUmeo%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/df2a97df391a3a7bb2ec44311b977c3ca1b1d202/macOS?narHash=sha256-KJrmNU5YVs2hSpZZRpjX9Xb%2B1alKIVh5VFiT01HKr4E%3D'
• Updated input 'determinate-nixd-aarch64-linux':
    'https://install.determinate.systems/determinate-nixd/rev/2c18a8f38492d35be64d4e497b720938f17cc9f5/aarch64-linux?narHash=sha256-z5dg%2BqwLOjA4pjiCLReESa9qNYOtMxlaPXQQWNhEymA%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/df2a97df391a3a7bb2ec44311b977c3ca1b1d202/aarch64-linux?narHash=sha256-0mWHIqPLFFO/nUpecZ9FR7lflFBfjlHMbjs2NyJ8u/c%3D'
• Updated input 'determinate-nixd-x86_64-linux':
    'https://install.determinate.systems/determinate-nixd/rev/2c18a8f38492d35be64d4e497b720938f17cc9f5/x86_64-linux?narHash=sha256-8sENexNuv7gsVAeQx1xuJd8IQtociheylIeEjFRYbQI%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/df2a97df391a3a7bb2ec44311b977c3ca1b1d202/x86_64-linux?narHash=sha256-JpUBeI2q8UNdx%2B8qzbbMHfnBD9UpFerjqdj3nqEAF6s%3D'
• Updated input 'nix':
    'https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.7/01920e55-5ccc-7fe8-8252-aadf7ac362ff/source.tar.gz?narHash=sha256-paAmRuIWXbwyqKtOFaPlczSlQgJtZD/Ut1iDiADhczs%3D' (2024-09-19)
  → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.9/0192358e-86eb-7a95-8161-99d09d9a6a06/source.tar.gz?narHash=sha256-1mUkLxoyG/rgceHeJTXcKcySvw5dSzIvAtqd1vaoa1g%3D' (2024-09-27)
• Updated input 'nix/nix':
    'https://api.flakehub.com/f/pinned/NixOS/nix/2.24.7/01920c94-c298-70c1-aff6-98f921fb4c68/source.tar.gz?narHash=sha256-NAyc5MR/T70umcSeMv7y3AVt00ZkmDXGm7LfYKTONfE%3D' (2024-09-19)
  → 'https://api.flakehub.com/f/pinned/NixOS/nix/2.24.9/01923584-fceb-7a8c-bef7-f6d1eb9a0916/source.tar.gz?narHash=sha256-OwJByTdCz1t91ysBqynK%2BifszkoIGEXUn6HE2t82%2Bc8%3D' (2024-09-27)
• Updated input 'nix/nixpkgs':
    'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.634968%2Brev-f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9/0191d88e-5a81-7c67-9eca-2a2f952b405b/source.tar.gz?narHash=sha256-L64N1rpLlXdc94H%2BF6scnrbuEu%2ButC03cDDVvvJGOME%3D' (2024-09-08)
  → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.635457%2Brev-759537f06e6999e141588ff1c9be7f3a5c060106/01922cec-c9c8-788e-8861-26f19bd8d7aa/source.tar.gz?narHash=sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao%3D' (2024-09-25)
• Updated input 'nixpkgs':
    'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.682060%2Brev-20f9370d5f588fb8c72e844c54511cab054b5f40/0191fe7a-9a92-742d-80d8-41f210baba7c/source.tar.gz?narHash=sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4%3D' (2024-09-16)
  → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.683804%2Brev-a1d92660c6b3b7c26fb883500a80ea9d33321be2/01922288-464f-75e2-abd5-54e5b92789a1/source.tar.gz?narHash=sha256-V5LpfdHyQkUF7RfOaDPrZDP%2Boqz88lTJrMT1%2BstXNwo%3D' (2024-09-20)
@grahamc
Update / downgrade our determinate-nixd?
86d6fc9
@grahamc
Use pre-activation I guess? upstream seems to suggest arbitratry acti…
0b15ab2 
…vation scripts don't run
@grahamc
derp
8db652b
@grahamc
?
eedfb96
@grahamc
Go back to the activation script, the other way didn't work
2ea4415
@grahamc
?
c2754fa
@grahamc
work around limitations on unloading pre-existing services
99c08bf
@grahamc
Precreate usr/local/bin
8897bc1
@grahamc
Stop reloading org.nixos.nix-daemon
a584e55
cole-h
cole-h reviewed Sep 30, 2024
View reviewed changes
flake.nix Outdated Show resolved Hide resolved
cole-h
cole-h reviewed Sep 30, 2024
View reviewed changes
flake.nix Outdated Show resolved Hide resolved
cole-h
cole-h reviewed Sep 30, 2024
View reviewed changes
flake.nix Outdated
if test -e /Library/LaunchDaemons/org.nixos.nix-daemon.plist; then
echo "Unloading org.nixos.nix-daemon"
launchctl bootout system /Library/LaunchDaemons/org.nixos.nix-daemon.plist || true
mv /Library/LaunchDaemons/org.nixos.nix-daemon.plist /Library/LaunchDaemons/.before-determinate-nixd.org.nixos.nix-daemon.plist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks funky to me -- since it ends in plist, it'll still get loaded by launchd, no?

This should probably have the before-blahblah at the end, so it "masks" the plist extension.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added .skip to the end.

cole-h
cole-h reviewed Sep 30, 2024
View reviewed changes
flake.nix Outdated
if test -e /Library/LaunchDaemons/org.nixos.darwin-store.plist; then
echo "Unloading org.nixos.darwin-store"
launchctl bootout system /Library/LaunchDaemons/org.nixos.darwin-store.plist || true
mv /Library/LaunchDaemons/org.nixos.darwin-store.plist /Library/LaunchDaemons/.before-determinate-nixd.org.nixos.darwin-store.plist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

cole-h
cole-h reviewed Sep 30, 2024
View reviewed changes
flake.nix Outdated Show resolved Hide resolved
@grahamc grahamc merged commit dd4faff into main Sep 30, 2024
3 checks passed
@grahamc grahamc deleted the darwin-mgmt branch September 30, 2024 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@grahamc @cole-h @lucperkins