Commit graph

30 commits

Author SHA1 Message Date
Silvan Mosberger 4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Robert Hensing 00355648f0 nixos/modules/profiles/macos-builder.nix: Restore as alias 2024-10-08 10:27:11 +02:00
Robert Hensing 1d76033154 Rename nixos/modules/profiles/{macos-builder.nix -> nix-builder-vm.nix} 2024-10-08 10:27:11 +02:00
Robert Hensing 2d11924c9a
macos-builder: readd Nix CLI for debugging (#347205) 2024-10-08 09:58:17 +02:00
Michael Hoang 10bad16926 macos-builder: readd Nix CLI for debugging
See https://github.com/NixOS/nixpkgs/pull/268574#discussion_r1788966194
2024-10-08 12:41:55 +11:00
nicoo 6f26c88376
nixos/macos-builder: pin stateVersion (#342380)
Closes #325610, #325674
2024-10-04 16:09:56 +02:00
Martin Weinelt 4cec81a995
Revert "modules/virtualisation: add shared options, merge various diskSize options" (#340894)
Breaks evaluation of all nixos tests, and is therefore a channel blocker.
2024-09-10 03:12:55 +02:00
phaer 94634e82f8 macos-builder: use virtualisation.diskSize...
...and drop virtualisation.darwin-builder.diskSize.

This makes negative diskSizes illegal.
2024-09-05 15:56:24 +02:00
phaer 04fadac429 run nixfmt-rfc-style 2024-09-05 15:56:22 +02:00
Sandro Jäckel 280e9a5ca4
nixos/nix: move trusted-user to config
This avoids having to define root when trying to add another user as
trusted user, similar to the other options.
2024-07-30 18:18:57 +02:00
Andrew Marshall 24ae983076 darwin.linux-builder: Exit scripts on error
For example, if the user decided to ctrl-c upon getting the sudo
password prompt, the script previously continued on to start the VM, but
that should not be the case.
2024-03-15 08:52:30 -04:00
Robert Hensing f3e9d7f84b darwin.linux-builder: Disable installer tools 2023-11-19 21:33:58 +01:00
Robert Hensing 66b2913797 darwin.linux-builder: Disable evaluation
A remote builder does not need to evaluate anything, so let's trim
it down to (eventually) save some space, and make the purpose of
the builder clear.

Users should evaluate on the host instead.
2023-11-19 21:06:32 +01:00
Robert Hensing 508c310222 darwin.linux-builder: Expose nixosConfig and nixosOptions attributes
I chose not to do nixos.{config, options} because that would make it
look too much like a configuration object, which it is not.

A configuration object I would define as for example the result of
calling NixOS, an attrset with `_type = "configuration";`.

Recreating a configuration object without evalModules is quite
feasible but not guaranteed to be correct, and not maintainable.
2023-10-12 23:10:41 +02:00
Robert Hensing 9443a0b51e darwin.linux-builder: Set meta.position 2023-10-12 22:58:50 +02:00
Michael Hoang 1deed6cd12 linux-builder: fix eval failure 2023-07-23 18:07:48 +10:00
Michael Hoang edef486898 darwin.linux-builder: rename from darwin.builder 2023-07-06 21:33:09 +10:00
Michael Hoang 34f6ce2fc2 darwin.builder: allow overriding configuration 2023-07-06 21:32:08 +10:00
Michael Hoang 98d970bc37 nixos/qemu-vm: use CA certificates from host 2023-07-06 21:32:08 +10:00
Michael Hoang 285f5e858e darwin.builder: use port 31022 by default 2023-07-06 21:32:08 +10:00
Geraint Ballinger 8b2521bdae
nixos/darwin-builder: add disk space options (#224480) 2023-04-07 05:10:49 +02:00
Gabriella Gonzalez 6d89aa8f1d
darwin.builder: auto-login as the builder user (#208772)
… as suggested by @NiklasGollenstede in:

https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1369020601

This simplifies the user experience for logging into and
debugging the machine and also simplifies the instructions for
shutting down the machine gracefully.
2023-01-03 21:12:56 -08:00
Winter 15013b3054
darwin.builder: prefer shutting down over halting VM (#208450)
This is preferable because it prevents things like disk corruption (requiring the user to delete the disk image when starting up) that I consistently ran into.
2023-01-02 07:36:41 -08:00
Robert Hensing 91050a9d9d nixos/macos-builder: Remove unnecessary paragraph
I was considering the broader context of stateVersion, but the
macos builder does not enable documentation, making this paragraph
a distraction.
2022-12-28 14:38:36 +01:00
Robert Hensing 62c8b5bf85 nixos/macos-builder: Simplify error message
The `system` argument is usually implied, and not hard to figure out.

Co-authored-by: Gabriella Gonzalez <Gabriel439@gmail.com>
2022-12-28 14:38:04 +01:00
Robert Hensing 30548793ab darwin.builder: Avoid unnecessary dependency on stateVersion 2022-12-28 14:37:02 +01:00
Gabriella Gonzalez 474198f808 darwin.builder: Fix gratuitous rebuilds
See the discussion starting here:

https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1364760917

The `darwin.builder` derivation had a gratuitous dependency
on the current Nixpkgs revision due to
`config.system.nixos.revision`.  Setting the revision explicitly
to null fixes this problem and prevents the derivation from being
rebuilt on every change to Nixpkgs.
2022-12-26 20:25:56 -06:00
Gabriella Gonzalez 799491feba darwin.builder: Fix system for install-credentials
The script was being mistakenly being built for the guest
system instead of the host system
2022-12-24 08:47:59 -06:00
Gabriella Gonzalez 0b9b09eee6 darwin.builder: Fix supported platforms
See: https://github.com/NixOS/nixpkgs/issues/108984#issuecomment-1364263324

Before this change the supported platforms were unspecified, so
it would default to being only built on `x86_64-linux`.  This
fixes that so that hydra.nixos.org builds and caches the Darwin
build products instead
2022-12-23 13:38:34 -06:00
Gabriella Gonzalez edd1cbf5d4 darwin.builder: init
Fixes https://github.com/NixOS/nixpkgs/issues/108984

This originates from:

https://github.com/Gabriella439/macos-builder

… which in turn originates from:

https://github.com/YorikSar/nixos-vm-on-macos
2022-12-19 17:03:45 -08:00