1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-06 16:57:08 +00:00
Commit graph

94 commits

Author SHA1 Message Date
Emily
62ba0a2242
Merge pull request #1282 from emilazy/push-uqnyoyklywvo
nix-tools: drop `nixPackage`, overwrite `$PATH` rather than prepending, set `$NIX_PATH`
2025-01-26 21:26:41 +00:00
Emily
b5b7888793 nix-tools: set $NIX_PATH
This will be important once most users are running `sudo
darwin-rebuild` and therefore not getting their environment’s
`$NIX_PATH` passed through.
2025-01-20 05:29:44 +00:00
Emily
4d0ae6980d nix-tools: overwrite $PATH rather than prepending
I don’t see any reason for these scripts to depend on more
environmental state than necessary.
2025-01-20 05:29:44 +00:00
Emily
3d95b01351 nix-tools: make systemPath more readable 2025-01-18 20:33:10 +00:00
Emily
02232f71c5 nix-tools: drop nixPackage
We already put `/nix/var/nix/profiles/default/bin` on the `$PATH`,
and whatever `nix.package` is set to already gets installed into
`/run/current-system/sw/bin`, so this is pointless.
2025-01-18 20:31:54 +00:00
Emily
5665d6c05e darwin-rebuild: pass ${extraBuildFlags[@]} to nix-instantiate
Theoretically required for `darwin-rebuild edit -I darwin-config=…`,
I guess. We also shouldn’t run it for flake‐based setups.
2025-01-18 20:01:22 +00:00
Emily
3924b55553
Merge pull request #1277 from emilazy/push-yxsrvorpzlor
{environment,nix-tools}: correct default `$PATH` ordering to match macOS
2025-01-18 01:11:06 +00:00
Emily
ff1d6384df {environment,nix-tools}: correct default $PATH ordering to match macOS 2025-01-15 23:26:14 +00:00
Emily
c5b7b604ca darwin-rebuild: remove code for macOS < 11 2025-01-14 15:56:20 +00:00
Michael Hoang
23f312e48a nix-tools: set meta.mainProgram 2024-11-18 10:43:28 +11:00
Michael Hoang
1d8c91b40e darwin-rebuild: do not resolve flake path
Backport of c274d045ac

Fixes #549
2024-11-03 12:56:25 +11:00
Michael Hoang
406cb56d06 Back out "Add support for submodules in flakes"
This backs out commit 5452c8c638.
2024-11-03 12:56:25 +11:00
Michael Hoang
7840909b00
Merge pull request #1115 from PhilipBorgesen/align_usage
darwin-rebuild: Align usage description with implementation
2024-10-25 14:25:25 +11:00
Philip Børgesen
c98bb238b1 darwin-rebuild: Align usage description with implementation
This change updates the usage description of darwin-rebuild.sh as
follows:

 * Add options:

     --print-build-logs / -L
     --no-registries
     --commit-lock-file
     --no-write-lock-file
     --override-input

 * Specify that --no-flake and the flake related options are
   mutually exclusive.

 * Specify that --keep-going and -k are aliases.

 * Specify that --keep-failed and -K are aliases.

 * Correct the description of --update-input; only one value follows.

The --no-build-hook argument remains undocumented, like for nix.
2024-10-25 05:07:51 +02:00
Michael Hoang
8c02940d70 users: ensure Full Disk Access is granted before trying to delete users 2024-10-23 01:29:01 +11:00
Michael Hoang
9ee30f2534 darwin-rebuild: add comments explaining the custom sudo logic 2024-10-23 01:11:40 +11:00
Antoine Cotten
b64c1d036f
tools: fix darwin-rebuild changelog
The script returns early when $systemConfig is empty, which prevents the
changelog from being displayed.
2024-09-11 18:27:53 +02:00
Michael Hoang
902d6b65d3 Set default flake directory as /etc/nix-darwin
Backported from 9995a5d59c/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh (L349-L353)
2024-07-13 14:14:11 +10:00
Rubikoid
24f7a3fdf4
Move --offline to group of same behaviour flags 2024-05-18 16:25:53 +03:00
Rubikoid
2a2a311fca
Fix help 2024-05-07 16:02:26 +03:00
Rubikoid
3524643c3d
Fix --offline
Add --substituters flag
2024-05-07 16:02:26 +03:00
Rubikoid
bb17a88bc0
Add offline flag to darwin-rebuild.sh 2024-05-07 16:02:26 +03:00
Thane Gill
492944b0f2
Update darwin-rebuild.zsh-completions
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2024-01-28 18:12:36 -08:00
Thane Gill
0f0478efa6 Add zsh completions to darwin-rebuld by default 2024-01-27 19:37:27 -08:00
Rafael Kitover
f81fbc2bf7
darwin-rebuild: fix sudo invocation on High Sierra
The version of sudo on macOS 10.13 High Sierra does not support the
`--preserve-env=LIST` option syntax, which is used here to preserve
PATH.

Override sudo with a shell function that checks for the availability of
this option syntax, and do not pass PATH otherwise.

Also move the prefix env command in the sudo invocations into the new
sudo function.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2023-12-22 14:40:13 +00:00
Roman Novak
a4b4cf70dc
Update pkgs/nix-tools/darwin-rebuild.sh
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2023-11-09 18:09:45 +01:00
Roman Novak
26a59d504b
fix(#798): darwin-rebuild support for Cyberark EPM
restore sudo environment PATH when Cyberark EPM is setting secure_path in sudo config. Fixes LnL7/nix-darwin/issues/798
2023-11-06 10:24:41 +01:00
zowoq
ab817e5d0e darwin-rebuild: add -H to sudo for $systemConfig/activate 2023-09-25 14:02:52 +10:00
Carl Thomé
22419fddf7
Use LocalHostName 2023-09-19 00:59:27 +02:00
Michael Hoang
0dafe2170d Add darwin-version command 2023-07-14 23:06:46 +10:00
Michael Hoang
5288a72354 Allow flaky installation with darwin-rebuild 2023-07-11 18:59:05 +10:00
Michael Hoang
f70f90c422 flake: add packages.darwin-{option,rebuild} 2023-07-11 18:59:05 +10:00
Bernardo Meurer
9af7fe60b6
feat(darwin-rebuild): support --refresh
This flag allows forcing remote flakes (e.g. `github:foobar/nix-config`)
to be force-refreshed, which is required for quickly
iterating/activating a remote config.
2023-06-28 12:47:32 -04:00
Daiderd Jordan
cb37c35e33
fix darwin-option descriptions
Also drops the eval hacks in favour of jq.
2023-06-25 13:03:52 +02:00
Konrad Malik
d0e36622c1
fix: in URI use proper groups 2023-04-29 14:49:06 +02:00
Konrad Malik
fad0282b5f
add '://' to built flake uri 2023-04-29 14:49:06 +02:00
Domen Kožar
87b9d090ad
Merge pull request #550 from n8henrie/issue_549
Add support for submodules in flakes
2023-01-09 20:10:39 +00:00
Nathan Henrie
5452c8c638 Add support for submodules in flakes
Fixes https://github.com/LnL7/nix-darwin/issues/549
2022-12-14 03:44:26 -07:00
saccarosium
38463b15ec darwin-rebuild: fixing logic error in if statement 2022-12-08 10:00:51 +01:00
saccarosium
da843c0dde darwin-rebuild: use --no-link for flake builds 2022-12-08 09:48:45 +01:00
LightQuantum
184f30c864
Fix darwin rebuild fails with flake and dry-run 2022-10-10 20:24:46 +08:00
Malo Bourgon
1da877d28c Add -H to sudo nix-env [...] to deal with warning
After NixOS/nix#6676, the following warning is displayed when running
`darwin-rebuild switch`:
  warning: $HOME ('/Users/jamie') is not owned by you, falling back to the
  one defined in the 'passwd' file.
2022-08-29 11:59:54 -07:00
Domen Kožar
4fdbb8168f
Merge pull request #340 from hauleth/fix/use-short-hostname
Use short hostname as flake attribute name
2022-03-26 07:11:11 +00:00
Sandro Stikić
ae73fc3b03
Don't reset experimental features 2022-02-04 16:16:08 +08:00
Daiderd Jordan
44da835ac4
add forward compatibility for literalExample deprecation
Fixes #367
2021-10-23 15:06:42 +02:00
Łukasz Niemier
de4239f97c
fix: use short hostname as flake attribute name 2021-07-09 10:12:23 +02:00
Martin Hardselius
1f8eb9b128
Add nix flags to subcommand test
This change removes the need for having

  experimental-features = nix-command flakes

in nix.conf. It should also work outside of flake directories.
2021-03-23 09:49:47 +01:00
Martin Hardselius
4187519820
Make nix flake info fix backwards compatible
This change handles previous nix versions by testing for the presence of
the `metadata` subcommand and falling back on the `info` subcommand if
it does not exist.
2021-03-22 22:17:48 +01:00
Martin Hardselius
93752a83ea
Fix nix flake info error
Fixes "error: 'info' is not a recognised command'"

Issue: #307
2021-03-21 23:54:10 +01:00
Daiderd Jordan
8800c4717d
always prefix flake with darwinConfigurations 2020-10-21 18:30:57 +02:00